From hdl at users.sourceforge.net  Wed Jun  1 12:18:36 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 01 Jun 2005 03:18:36 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marctagstructure.tmpl,1.27.2.2,1.27.2.3
Message-ID: <E1DdQJ2-0006c7-Tq@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	marctagstructure.tmpl 
Log Message:
Including Automatical change of display


Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.27.2.2
retrieving revision 1.27.2.3
diff -C2 -r1.27.2.2 -r1.27.2.3
*** marctagstructure.tmpl	31 May 2005 21:06:18 -0000	1.27.2.2
--- marctagstructure.tmpl	1 Jun 2005 10:18:24 -0000	1.27.2.3
***************
*** 116,120 ****
  <div id="bloc25">
  <h2 class="parameters">Select a framework</h2>
! <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<select name="frameworkcode">
  		<option value="">Default</option>
--- 116,120 ----
  <div id="bloc25">
  <h2 class="parameters">Select a framework</h2>
! <form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<select name="frameworkcode">
  		<option value="">Default</option>
***************
*** 126,130 ****
  	<input type="submit" value="OK" class="button">
  	<p>
! 	<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True" checked>
  	</p>
  </form>
--- 126,130 ----
  	<input type="submit" value="OK" class="button">
  	<p>
! 	<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True"  OnChange="javascript:document.f.submit()">
  	</p>
  </form>
***************
*** 143,146 ****
--- 143,147 ----
  		<th>Edit</th>
  		<th>Delete</th>
+ 	<tr>
  	<!-- TMPL_LOOP NAME="loop" -->
  	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
***************
*** 155,160 ****
  	</tr>
  	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td colspan=8>
! 			<table colspan=8>
  			<!-- TMPL_LOOP NAME="subfields" -->
  				<tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
--- 156,164 ----
  	</tr>
  	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td>
! 			&nbsp;
! 		</td>
! 		<td colspan=7 border=0>
! 			<table colspan=8 border=0>
  			<!-- TMPL_LOOP NAME="subfields" -->
  				<tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
***************
*** 164,175 ****
  					</td>
  					<td>
! 						Tab :<!-- TMPL_VAR NAME="tab" -->,
! 						<!-- TMPL_IF NAME="kohafield" -->Koha field : <!-- TMPL_VAR NAME="kohafield" -->, <!--/TMPL_IF -->
! 						<!-- TMPL_IF NAME="repeatable" -->Repeatable, <!-- TMPL_ELSE -->Not repeatable,<!-- /TMPL_IF -->
! 						<!-- TMPL_IF NAME="mandatory" -->Mandatory, <!-- TMPL_ELSE -->Not mandatory,<!-- /TMPL_IF -->
! 						<!-- TMPL_IF NAME="seealso" -->see also : <!-- TMPL_VAR NAME="seealso" -->,<!-- /TMPL_IF -->
! 						<!-- TMPL_IF NAME="authorised_value" --> Auth value :<!-- TMPL_VAR NAME="authorised_value" -->,<!-- /TMPL_IF -->
! 						<!-- TMPL_IF NAME="authtypecode" --> Authority :<!-- TMPL_VAR NAME="authtypecode" -->,<!-- /TMPL_IF -->
! 						<!-- TMPL_IF NAME="value_builder" -->Plugin :<!-- TMPL_VAR NAME="value_builder" -->,<!-- /TMPL_IF -->
  					</td>
  					<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
--- 168,193 ----
  					</td>
  					<td>
! 						<!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="repeatable" -->repeatable<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="mandatory" -->Mandatory<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="seealso" -->See<!-- TMPL_ELSE -->&nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="authorised_value" --><!-- TMPL_VAR NAME="authorised_value" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="value_builder" --><!-- TMPL_VAR NAME="value_builder" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						Tab:<!-- TMPL_VAR NAME="tab" -->
  					</td>
  					<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
***************
*** 192,195 ****
--- 210,214 ----
  		<th>Edit</th>
  		<th>Delete</th>
+ 	</tr>
  	<!-- TMPL_LOOP NAME="loop" -->
  	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
***************
*** 223,226 ****
--- 242,250 ----
  <!--/TMPL_IF -->
  	</form>
+ <script language="javascript" type="text/javascript">
+ 	function ChangeDisplay(checkbox) {
+ 		window.
+ 	}
+ </script>
  </div>
  <!-- /TMPL_IF -->




From btoumi at users.sourceforge.net  Wed Jun  1 14:11:40 2005
From: btoumi at users.sourceforge.net (btoumi)
Date: Wed, 01 Jun 2005 05:11:40 -0700
Subject: [Koha-cvs] CVS: koha - Imported sources
Message-ID: <E1DdS4S-0005Yt-53@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21365

Log Message:
import de derniere version cvs

Status:

Vendor Tag:	INITIAL_IMPORT_VENDOR_TAG
Release Tags:	INITIAL_IMPORT_RELEASE_TAG
		

No conflicts created by this import


***** Bogus filespec: -
***** Bogus filespec: Imported
***** Bogus filespec: sources



From btoumi at users.sourceforge.net  Wed Jun  1 14:18:16 2005
From: btoumi at users.sourceforge.net (btoumi)
Date: Wed, 01 Jun 2005 05:18:16 -0700
Subject: [Koha-cvs] CVS: koha - Imported sources
Message-ID: <E1DdSAq-0007BJ-Nd@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27573

Log Message:
test

Status:

Vendor Tag:	INITIAL_IMPORT_VENDOR_TAG
Release Tags:	INITIAL_IMPORT_RELEASE_TAG
		

No conflicts created by this import


***** Bogus filespec: -
***** Bogus filespec: Imported
***** Bogus filespec: sources



From btoumi at users.sourceforge.net  Wed Jun  1 14:37:07 2005
From: btoumi at users.sourceforge.net (btoumi)
Date: Wed, 01 Jun 2005 05:37:07 -0700
Subject: [Koha-cvs] CVS: koha - Imported sources
Message-ID: <E1DdST5-0001ki-7k@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6692

Log Message:
test

Status:

Vendor Tag:	INITIAL_IMPORT_VENDOR_TAG
Release Tags:	INITIAL_IMPORT_RELEASE_TAG
		

No conflicts created by this import


***** Bogus filespec: -
***** Bogus filespec: Imported
***** Bogus filespec: sources



From tipaul at users.sourceforge.net  Wed Jun  1 14:51:04 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 01 Jun 2005 05:51:04 -0700
Subject: [Koha-cvs] CVS: koha/C4 AuthoritiesMarc.pm,1.16,1.17
Message-ID: <E1DdSga-0003XG-FJ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13572/C4

Modified Files:
	AuthoritiesMarc.pm 
Log Message:
some fixes & improvements for dictionnary search in librarian interface

Index: AuthoritiesMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/AuthoritiesMarc.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** AuthoritiesMarc.pm	4 May 2005 15:43:43 -0000	1.16
--- AuthoritiesMarc.pm	1 Jun 2005 12:51:02 -0000	1.17
***************
*** 65,73 ****
  	# the marclist may contain "mainentry". In this case, search the tag_to_report, that depends on
  	# the authtypecode. Then, search on $a of this tag_to_report
  	for (my $i=0;$i<$#{$tags};$i++) {
  		if (@$tags[$i] eq "mainentry") {
- 			my $sth = $dbh->prepare("select auth_tag_to_report from auth_types where authtypecode=?");
- 			$sth->execute($authtypecode);
- 			my ($tag_to_report) = $sth->fetchrow;
  			@$tags[$i] = $tag_to_report."a";
  		}
--- 65,76 ----
[...1010 lines suppressed...]
- #
- # Revision 1.6  2004/08/18 16:00:24  tipaul
- # fixes for authorities management
- #
- # Revision 1.5  2004/07/05 13:37:22  doxulting
- # First step for working authorities
- #
- # Revision 1.4  2004/06/22 11:35:37  tipaul
- # removing % at the beginning of a string to avoid loooonnnngggg searchs
- #
- # Revision 1.3  2004/06/17 08:02:13  tipaul
- # merging tag & subfield in auth_word for better perfs
- #
- # Revision 1.2  2004/06/10 08:29:01  tipaul
- # MARC authority management (continued)
- #
- # Revision 1.1  2004/06/07 07:35:01  tipaul
- # MARC authority management package
- #
--- 968,969 ----




From tipaul at users.sourceforge.net  Wed Jun  1 14:51:04 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 01 Jun 2005 05:51:04 -0700
Subject: [Koha-cvs] CVS: koha/search.marc dictionary.pl,1.5,1.6
Message-ID: <E1DdSga-0003XT-L0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13572/search.marc

Modified Files:
	dictionary.pl 
Log Message:
some fixes & improvements for dictionnary search in librarian interface

Index: dictionary.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.marc/dictionary.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** dictionary.pl	4 May 2005 12:46:27 -0000	1.5
--- dictionary.pl	1 Jun 2005 12:51:02 -0000	1.6
***************
*** 31,34 ****
--- 31,52 ----
  use HTML::Template;
  
+ =head1 NAME
+ 
+ dictionnary.pl : script to search in biblio & authority an existing value
+ 
+ =head1 SYNOPSIS
+ 
+ useful when the user want to search a term before running a query. For example, to see if "computer" is used in the database
+ 
+ The parameter "marclist" tells which field is searched (title, author, subject, but could be anything else)
+ 
+ This script searches in both biblios & authority
+ * in biblio, the script search in all marc fields related to what the user is looking for (for example, if the dictionnary is used on "author", the script searches in biblio.author, but also in additional authors & any MARC field related to author (through the "seealso" MARC constraint)
+ * in authority, the script search everywhere. Thus, the accepted & rejected forms are found.
+ 
+ The script shows all results & the user can choose what he want, that is copied into search form.
+ 
+ =cut
+ 
  my $input = new CGI;
  my $field =$input->param('marclist');
***************
*** 39,45 ****
  #my $kohafield = $input->param('kohafield');
  my @search = $input->param('search');
! warn " ".$search[0];
  my $index = $input->param('index');
! warn " index: ".$index;
  my $op=$input->param('op');
  if (($search[0]) and not ($op eq 'do_search')){
--- 57,63 ----
  #my $kohafield = $input->param('kohafield');
  my @search = $input->param('search');
! # warn " ".$search[0];
  my $index = $input->param('index');
! # warn " index: ".$index;
  my $op=$input->param('op');
  if (($search[0]) and not ($op eq 'do_search')){
***************
*** 64,75 ****
  
  if ($op eq "do_search") {
! 	($template, $loggedinuser, $cookie)
! 			= get_template_and_user({template_name => "search.marc/dictionary.tmpl",
! 					query => $input,
! 					type => $type,
! 					authnotrequired => 0,
! 					flagsrequired => {catalogue => 1},
! 					debug => 1,
! 					});
  	my $sth=$dbh->prepare("Select distinct tagfield,tagsubfield from marc_subfield_structure where kohafield = ?");
  	$sth->execute("$field");
--- 82,88 ----
  
  if ($op eq "do_search") {
! 	#
! 	# searching in biblio
! 	#
  	my $sth=$dbh->prepare("Select distinct tagfield,tagsubfield from marc_subfield_structure where kohafield = ?");
  	$sth->execute("$field");
***************
*** 85,96 ****
  
  	findseealso($dbh,\@tags);
- #	select distinct m1.bibid from biblio,biblioitems,marc_biblio,marc_word as m1 where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and (m1.word  like 'Paul' and m1.tagsubfield in ('200f','710a','711a','712a','701a','702a','700a')) order by biblio.title
- 
  
  	my @results, my $total;
! # 	my ($results,$total) = catalogsearch($dbh,\@tags ,\@and_or,
! # 										\@excluding, \@operator,  \@value,
! # 										$startfrom*$resultsperpage, $resultsperpage,$orderby);
! 	my $strsth="select distinct subfieldvalue, count(marc_subfield_table.bibid) from marc_subfield_table,marc_word where marc_word.word like ? and marc_subfield_table.bibid=marc_word.bibid and marc_word.tagsubfield in ";
  	my $listtags="(";
  	foreach my $tag (@tags){
--- 98,104 ----
  
  	findseealso($dbh,\@tags);
  
  	my @results, my $total;
! 	my $strsth="select distinct subfieldvalue, count(marc_subfield_table.bibid) from marc_subfield_table,marc_word where marc_word.word like ? and marc_subfield_table.bibid=marc_word.bibid and marc_subfield_table.tagorder=marc_word.tagorder and marc_word.tagsubfield in ";
  	my $listtags="(";
  	foreach my $tag (@tags){
***************
*** 99,107 ****
  	$listtags =~s/,$/)/;
  	$strsth .= $listtags." and marc_word.tagsubfield=marc_subfield_table.tag+marc_subfield_table.subfieldcode group by subfieldvalue ";
! 	warn "".$strsth;
  	my $value = uc($search[0]);
  	$value=~s/\*/%/g;
  	$value.= "%" if not($value=~m/%/);
! 	warn " texte : ".$value;
  
  	$sth=$dbh->prepare($strsth);
--- 107,115 ----
  	$listtags =~s/,$/)/;
  	$strsth .= $listtags." and marc_word.tagsubfield=marc_subfield_table.tag+marc_subfield_table.subfieldcode group by subfieldvalue ";
! # 	warn "search in biblio : ".$strsth;
  	my $value = uc($search[0]);
  	$value=~s/\*/%/g;
  	$value.= "%" if not($value=~m/%/);
! # 	warn " texte : ".$value;
  
  	$sth=$dbh->prepare($strsth);
***************
*** 110,114 ****
  	my @catresults;
  	while (my ($value,$ctresults)=$sth->fetchrow) {
! 		warn "countresults : ".$ctresults;
  		push @catresults,{value=> $value, 
  						  even=>($total-$startfrom*$resultsperpage)%2,
--- 118,122 ----
  	my @catresults;
  	while (my ($value,$ctresults)=$sth->fetchrow) {
! # 		warn "countresults : ".$ctresults;
  		push @catresults,{value=> $value, 
  						  even=>($total-$startfrom*$resultsperpage)%2,
***************
*** 129,136 ****
  	$strsth=~s/ OR$/)/;
  	my $strsth = $strsth." and authtypecode is not NULL";
! 	warn $strsth;
  	my $sth=$dbh->prepare($strsth);
  	$sth->execute;
  	
  	my @authresults;
  	my $authnbresults;
--- 137,147 ----
  	$strsth=~s/ OR$/)/;
  	my $strsth = $strsth." and authtypecode is not NULL";
! # 	warn $strsth;
  	my $sth=$dbh->prepare($strsth);
  	$sth->execute;
  	
+ 	#
+ 	# searching in authorities
+ 	#
  	my @authresults;
  	my $authnbresults;
***************
*** 142,146 ****
  #		warn "auth : $authtypecode nbauthresults : $nbresults";
  	}
!  	
  	($template, $loggedinuser, $cookie)
  		= get_template_and_user({template_name => "search.marc/dictionary.tmpl",
--- 153,160 ----
  #		warn "auth : $authtypecode nbauthresults : $nbresults";
  	}
! 	
! 	# 
! 	# OK, filling the template with authorities & biblio entries found.
! 	#
  	($template, $loggedinuser, $cookie)
  		= get_template_and_user({template_name => "search.marc/dictionary.tmpl",
***************
*** 148,152 ****
  				type => $type,
  				authnotrequired => 0,
- 				flagsrequired => {borrowers => 1},
  				flagsrequired => {catalogue => 1},
  				debug => 1,
--- 162,165 ----




From tipaul at users.sourceforge.net  Wed Jun  1 14:51:04 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 01 Jun 2005 05:51:04 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/search.marc dictionary.tmpl,1.4,1.5 search.tmpl,1.24,1.25
Message-ID: <E1DdSga-0003XR-Jy@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	dictionary.tmpl search.tmpl 
Log Message:
some fixes & improvements for dictionnary search in librarian interface

Index: dictionary.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/dictionary.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** dictionary.tmpl	4 May 2005 12:46:28 -0000	1.4
--- dictionary.tmpl	1 Jun 2005 12:51:02 -0000	1.5
***************
*** 53,59 ****
  
  <!-- TMPL_IF Name=search -->
! 	<div class="bloc100">
! 		<h2 class="catalogue">Dictionary Search results</h2>
! 		<!-- TMPL_IF NAME="authresult" -->
  		<div id="resultnumber">
  			<p><!-- TMPL_IF NAME="displayprev" --> 
--- 53,59 ----
  
  <!-- TMPL_IF Name=search -->
! 	<div class="bloc25">
! 	<h2 class="catalogue">Dictionary Search results</h2>
! 	<!-- TMPL_IF NAME="authresult" -->
  		<div id="resultnumber">
  			<p><!-- TMPL_IF NAME="displayprev" --> 
***************
*** 84,97 ****
  				<tr>
  					<th class="catalogue">Summary</th>
! 					<th class="catalogue">Used</th>
  					<th class="catalogue">Select</th>
  				</tr>
  				<!-- TMPL_LOOP NAME="authresult" -->
  					<tr>
! 						<td><!-- TMPL_VAR NAME="summary" --></td>
! 						<td>
! 							<a href="../search.marc/search.pl?type=intranet&amp;op=do_search&amp;marclist=<!-- TMPL_VAR NAME="biblio_fields" -->&amp;operator==&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;and_or=and&amp;excluding=" class="button catalogue"><!-- TMPL_VAR NAME="used" --> biblio(s)
! 						<td><img src="/images/arrow.gif" width="32" hspace="0" vspace="0" border="0">
  						</td>
  						</td>
  					</tr>
--- 84,113 ----
  				<tr>
  					<th class="catalogue">Summary</th>
! 					<th class="catalogue">Used in</th>
  					<th class="catalogue">Select</th>
  				</tr>
  				<!-- TMPL_LOOP NAME="authresult" -->
  					<tr>
! 						<!-- TMPL_IF NAME="even" -->
! 							<td class="hilighted">
! 						<!-- TMPL_ELSE -->
! 							<td>
! 						<!-- /TMPL_IF -->
! 							<!-- TMPL_VAR NAME="summary" -->
  						</td>
+ 						<!-- TMPL_IF NAME="even" -->
+ 							<td class="hilighted">
+ 						<!-- TMPL_ELSE -->
+ 							<td>
+ 						<!-- /TMPL_IF -->
+ 							<!-- TMPL_VAR NAME="used" --> biblio(s)
+ 						</td>
+ 						<!-- TMPL_IF NAME="even" -->
+ 							<td class="hilighted">
+ 						<!-- TMPL_ELSE -->
+ 							<td>
+ 						<!-- /TMPL_IF -->
+ 							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)" class="button catalogue">select</a>
+ 							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)" class="button catalogue">sel&amp;close</a>
  						</td>
  					</tr>
***************
*** 101,106 ****
  		<!-- TMPL_ELSE -->
  			<h3 class="catalogue">No results in Authorities</h3>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF Name=catresult -->	
  		<div id="resultnumber">
  			<p class="resultcount">
--- 117,124 ----
  		<!-- TMPL_ELSE -->
  			<h3 class="catalogue">No results in Authorities</h3>
! 	<!-- /TMPL_IF -->
! 		
! 		
! 	<!-- TMPL_IF Name=catresult -->	
  		<div id="resultnumber">
  			<p class="resultcount">
***************
*** 114,133 ****
  				<tr>
  					<th class="catalogue">Summary</th>
! 					<th class="catalogue">Biblio Count</th>
  					<th class="catalogue">Select</th>
  				</tr>
  				<!-- TMPL_LOOP NAME="catresult" -->
  				<tr>
! 					<td<!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
  								<!-- TMPL_IF name="MARC_ON" -->
! 									<a class="transparent resultlist" href="search.pl?type=<!-- TMPL_VAR NAME="type" ESCAPE="URL" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE="URL" -->&amp;operator=contains&amp;op=do_search&amp;and_or=and&amp;value='<!-- TMPL_VAR Name=value ESCAPE="URL" -->'&amp;excluding="><!-- TMPL_VAR NAME="value" --></a>
  								<!-- TMPL_ELSE -->
! 									<a class="transparent resultlist" href="search.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="value" --></a>				<!-- /TMPL_IF -->
  					</td>
  					<td align="center" <!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
! 						<!-- TMPL_VAR NAME="count" -->
  					</td>
  					<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
! 							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->)" class="button catalogue">Select</a>
  					</td>
  				</tr>
--- 132,157 ----
  				<tr>
  					<th class="catalogue">Summary</th>
! 					<th class="catalogue">Used in</th>
  					<th class="catalogue">Select</th>
  				</tr>
  				<!-- TMPL_LOOP NAME="catresult" -->
  				<tr>
! 					<!-- TMPL_IF NAME="even" -->
! 					<td class="hilighted">
! 					<!-- TMPL_ELSE -->
! 					<td>
! 					<!-- /TMPL_IF -->
  								<!-- TMPL_IF name="MARC_ON" -->
! 									<!-- TMPL_VAR NAME="value" -->
  								<!-- TMPL_ELSE -->
! 									<!-- TMPL_VAR NAME="value" -->
! 								<!-- /TMPL_IF -->
  					</td>
  					<td align="center" <!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
! 						<!-- TMPL_VAR NAME="count" --> biblio(s)
  					</td>
  					<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
! 							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)" class="button catalogue">Select</a>
! 							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)" class="button catalogue">Sel&amp;close</a>
  					</td>
  				</tr>
***************
*** 156,171 ****
  			</p>
  		</div>
! <script language="JavaScript" type="text/javascript">
! function SelectEntry(myentry, myindex){
! 	if (opener.document.f.value[myindex].value!=""){ 
! 		opener.document.f.value[myindex].value=opener.document.f.value[myindex].value+" "+myentry
! 	} else {
! 		opener.document.f.value[myindex].value=myentry
  	}
! }
! </script>
  	</div>
  <!-- /TMPL_IF -->
- <!-- /TMPL_IF -->
  </div>
  </body>
--- 180,199 ----
  			</p>
  		</div>
! 	<!-- /TMPL_IF -->
! 	<script language="JavaScript" type="text/javascript">
! 	function SelectEntry(myentry, myindex, wclose){
! 		if (opener.document.f.value[myindex].value!=""){ 
! 			opener.document.f.value[myindex].value=opener.document.f.value[myindex].value+" "+myentry
! 		} else {
! 			opener.document.f.value[myindex].value=myentry
! 		}
! 		if (wclose == 1) {
! 	// 	alert("closing")
! 			self.close();
! 		}
  	}
! 	</script>
  	</div>
  <!-- /TMPL_IF -->
  </div>
  </body>

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** search.tmpl	4 May 2005 12:52:34 -0000	1.24
--- search.tmpl	1 Jun 2005 12:51:02 -0000	1.25
***************
*** 17,21 ****
  			<input type="hidden" name="op" value="do_search">
  			<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
! 			<label class="label100" for="keyword">Any word</label>
  			<input type="hidden" name="marclist" value="">
  			<input type="hidden" name="and_or" value="and">
--- 17,21 ----
  			<input type="hidden" name="op" value="do_search">
  			<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
! 			<label for="keyword">Any word</label>
  			<input type="hidden" name="marclist" value="">
  			<input type="hidden" name="and_or" value="and">
***************
*** 25,29 ****
  		</p>
  		<p>
! 			<label class="label100" for="title">Title</label>
  			<input type="hidden" name="marclist" value="biblio.title">
  			<input type="hidden" name="and_or" value="and">
--- 25,29 ----
  		</p>
  		<p>
! 			<label for="title">Title</label>
  			<input type="hidden" name="marclist" value="biblio.title">
  			<input type="hidden" name="and_or" value="and">
***************
*** 31,50 ****
  			<input type="hidden" name="operator" value="contains">
  			<input type="text" name="value" id="title" onchange="sql_update()" size="35">
! 			<a href="javascript:Dopop('dictionary.pl?marclist=biblio.title&amp;type=intranet&amp;index=1',1)">
! 				<img src="/intranet-tmpl/default/en/includes/addressbook_section.png" width=12 height=12 alt="dict">
  			</a>
  		</p>
  		<p>
! 			<label class="label100" for="author">Author</label> <input type="hidden" name="marclist" value="biblio.author">
  			<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" id="author" onchange="sql_update()" size="35">
! 			<a href="javascript:Dopop('dictionary.pl?marclist=biblio.author&amp;type=intranet&amp;index=2',2)">
! 				<img src="/intranet-tmpl/default/en/includes/addressbook_section.png" width=12 height=12 alt="dict">
  			</a>
  		</p>
  		<p>
! 			<label class="label100" for="subject">Subject</label>
  			<input type="hidden" name="marclist" value="bibliosubject.subject">
  			<input type="hidden" name="and_or" value="and">
--- 31,50 ----
  			<input type="hidden" name="operator" value="contains">
  			<input type="text" name="value" id="title" onchange="sql_update()" size="35">
! 			<a href="javascript:Dopop('dictionary.pl?marclist=biblio.title&amp;type=intranet&amp;index=1',1)" class="button catalogue">
! 				...
  			</a>
  		</p>
  		<p>
! 			<label for="author">Author</label> <input type="hidden" name="marclist" value="biblio.author">
  			<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" id="author" onchange="sql_update()" size="35">
! 			<a href="javascript:Dopop('dictionary.pl?marclist=biblio.author&amp;type=intranet&amp;index=2',2)" class="button catalogue">
! 				...
  			</a>
  		</p>
  		<p>
! 			<label for="subject">Subject</label>
  			<input type="hidden" name="marclist" value="bibliosubject.subject">
  			<input type="hidden" name="and_or" value="and">
***************
*** 52,61 ****
  			<input type="hidden" name="operator" value="contains">  
  			<input type="text" name="value" id="subject" onchange="sql_update()" size="35">
! 			<a href="javascript:Dopop('dictionary.pl?marclist=bibliosubject.subject&amp;type=intranet&amp;index=3',3)">
! 				<img src="/intranet-tmpl/default/en/includes/addressbook_section.png" width=12 height=12 alt="dict">
  			</a>
  		</p>
  		<p>
! 			<label class="label100" for="itemtype">Item Type</label>
  			<input type="hidden" name="marclist" value="biblioitems.itemtype">
  			<input type="hidden" name="and_or" value="and">
--- 52,61 ----
  			<input type="hidden" name="operator" value="contains">  
  			<input type="text" name="value" id="subject" onchange="sql_update()" size="35">
! 			<a href="javascript:Dopop('dictionary.pl?marclist=bibliosubject.subject&amp;type=intranet&amp;index=3',3)" class="button catalogue">
! 				...
  			</a>
  		</p>
  		<p>
! 			<label for="itemtype">Item Type</label>
  			<input type="hidden" name="marclist" value="biblioitems.itemtype">
  			<input type="hidden" name="and_or" value="and">
***************
*** 65,69 ****
  		</p>
  		<p>
! 				<label class="label100" for="branch">Branch</label>
  				<input type="hidden" name="marclist" value="items.holdingbranch">
  				<input type="hidden" name="and_or" value="and">
--- 65,69 ----
  		</p>
  		<p>
! 				<label for="branch">Branch</label>
  				<input type="hidden" name="marclist" value="items.holdingbranch">
  				<input type="hidden" name="and_or" value="and">
***************
*** 76,80 ****
  		<h2 class="catalogue">Other options</h2>
  		<p>
! 				<label class="label100" for="barcode">Item barcode</label>
  				<input type="hidden" name="marclist" value="items.barcode">
  				<input type="hidden" name="and_or" value="and">
--- 76,80 ----
  		<h2 class="catalogue">Other options</h2>
  		<p>
! 				<label for="barcode">Item barcode</label>
  				<input type="hidden" name="marclist" value="items.barcode">
  				<input type="hidden" name="and_or" value="and">
***************
*** 84,88 ****
  		</p>
  		<p>
! 			<label class="label100" for="callno">Call Number</label>
  			<input type="hidden" name="marclist" value="items.itemcallnumber">
  			<input type="hidden" name="and_or" value="and">
--- 84,88 ----
  		</p>
  		<p>
! 			<label for="callno">Call Number</label>
  			<input type="hidden" name="marclist" value="items.itemcallnumber">
  			<input type="hidden" name="and_or" value="and">
***************
*** 92,96 ****
  		</p>
  		<p>
! 			<label class="label100" for="isbn">ISBN</label>
  			<input type="hidden" name="marclist" value="biblioitems.isbn">
  			<input type="hidden" name="and_or" value="and">
--- 92,96 ----
  		</p>
  		<p>
! 			<label for="isbn">ISBN</label>
  			<input type="hidden" name="marclist" value="biblioitems.isbn">
  			<input type="hidden" name="and_or" value="and">
***************
*** 100,104 ****
  		</p>
  		<p>
! 			<label class="label100" for="publisher">Publisher</label>
  			<input type="hidden" name="marclist" value="biblioitems.publishercode">
  			<input type="hidden" name="and_or" value="and">
--- 100,104 ----
  		</p>
  		<p>
! 			<label for="publisher">Publisher</label>
  			<input type="hidden" name="marclist" value="biblioitems.publishercode">
  			<input type="hidden" name="and_or" value="and">
***************
*** 160,164 ****
  		<p>
  			<input type="submit" value="Start search" class="button catalogue">
! 			<a href="/cgi-bin/koha/search.marc/suggest.pl" onclick="PopupSuggestion(); return false;" class="button catalogue">Suggestions</a>
  		</p>
  	</div>
--- 160,164 ----
  		<p>
  			<input type="submit" value="Start search" class="button catalogue">
! 			<a href="/cgi-bin/koha/search.marc/suggest.pl" onclick="PopupSuggestion(); return false;" class="button catalogue">Spelling suggestion</a>
  		</p>
  	</div>
***************
*** 188,192 ****
  function Dopop(link,i) {
  	var searchstring=document.forms[0].value[i].value;
! 	newin=window.open(link+'&amp;search='+searchstring,"popup",'width=550,height=550,toolbar=false,scrollbars=yes');
  }
  
--- 188,192 ----
  function Dopop(link,i) {
  	var searchstring=document.forms[0].value[i].value;
! 	newin=window.open(link+'&amp;search='+searchstring,"popup",'width=700,height=550,toolbar=false,scrollbars=yes');
  }
  




From btoumi at users.sourceforge.net  Wed Jun  1 15:16:01 2005
From: btoumi at users.sourceforge.net (btoumi)
Date: Wed, 01 Jun 2005 06:16:01 -0700
Subject: [Koha-cvs] CVS: koha - Imported sources
Message-ID: <E1DdT4j-0006kH-AH@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25891

Log Message:
koha cvs

Status:

Vendor Tag:	INITIAL_IMPORT_VENDOR_TAG
Release Tags:	INITIAL_IMPORT_RELEASE_TAG
		

No conflicts created by this import


***** Bogus filespec: -
***** Bogus filespec: Imported
***** Bogus filespec: sources



From hdl at users.sourceforge.net  Wed Jun  1 15:22:09 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 01 Jun 2005 06:22:09 -0700
Subject: [Koha-cvs] CVS: koha/admin marctagstructure.pl,1.25.2.2,1.25.2.3
Message-ID: <E1DdTAf-0007hG-Jt@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29405/admin

Modified Files:
      Tag: rel_2_2
	marctagstructure.pl 
Log Message:
Bug Fixing : Ugly display 
Non Working Arrows at the bottom of page.

Index: marctagstructure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marctagstructure.pl,v
retrieving revision 1.25.2.2
retrieving revision 1.25.2.3
diff -C2 -r1.25.2.2 -r1.25.2.3
*** marctagstructure.pl	31 May 2005 21:06:18 -0000	1.25.2.2
--- marctagstructure.pl	1 Jun 2005 13:22:07 -0000	1.25.2.3
***************
*** 219,222 ****
--- 219,223 ----
  		 $template->param(searchfield => $searchfield);
  	}
+ 	my $cnt=0;
  	if ($dspchoice) {
  		#here, user only wants used tags/subfields displayed
***************
*** 224,228 ****
  		$searchfield=~ s/\'/\\\'/g;
  		my @data=split(' ',$searchfield);
- 		my $count=@data;
  		my $sth=$dbh->prepare("Select marc_tag_structure.tagfield as mts_tagfield,marc_tag_structure.liblibrarian as mts_liblibrarian,marc_tag_structure.libopac as mts_libopac,marc_tag_structure.repeatable as mts_repeatable,marc_tag_structure.mandatory as mts_mandatory,marc_tag_structure.authorised_value as mts_authorized_value,marc_subfield_structure.* from marc_tag_structure LEFT JOIN marc_subfield_structure ON (marc_tag_structure.tagfield=marc_subfield_structure.tagfield AND marc_tag_structure.frameworkcode=marc_subfield_structure.frameworkcode) where (marc_tag_structure.tagfield >= ? and marc_tag_structure.frameworkcode=?) AND marc_subfield_structure.tab>=0 order by marc_tag_structure.tagfield,marc_subfield_structure.tagsubfield");
  		#could be ordoned by tab
--- 225,228 ----
***************
*** 231,234 ****
--- 231,235 ----
  		while (my $data=$sth->fetchrow_hashref){
  			push(@results,$data);
+ 			$cnt++;
  		}
  		$sth->finish;
***************
*** 238,242 ****
  		my $j=1;
  		my $i=$offset;
! 		while ($i < ($offset+$pagesize<scalar(@results)?$offset+$pagesize:scalar(@results))) {
  			if ($toggle eq 0){
  				$toggle=1;
--- 239,243 ----
  		my $j=1;
  		my $i=$offset;
! 		while ($i < ($offset+$pagesize<$cnt?$offset+$pagesize:$cnt)) {
  			if ($toggle eq 0){
  				$toggle=1;
***************
*** 256,260 ****
  			$j=$i;
  			my @internal_loop = ();
! 			while (($results[$i]->{'tagfield'}==$results[$j]->{'tagfield'}) and ($j< ($offset+$pagesize<scalar(@results)?$offset+$pagesize:scalar(@results)))) {
  				if ($toggle eq 0) {
  					$toggle=1;
--- 257,261 ----
  			$j=$i;
  			my @internal_loop = ();
! 			while (($results[$i]->{'tagfield'}==$results[$j]->{'tagfield'}) and ($j< ($offset+$pagesize<$cnt?$offset+$pagesize:$cnt))) {
  				if ($toggle eq 0) {
  					$toggle=1;
***************
*** 274,278 ****
  				$subfield_data{value_builder}= $results[$j]->{'value_builder'};
  				$subfield_data{toggle}	= $toggle;
! 				warn "tagfield :  ".$results[$j]->{'tagfield'}." tagsubfield :".$results[$j]->{'tagsubfield'};
  				push @internal_loop,\%subfield_data;
  				$j++;
--- 275,279 ----
  				$subfield_data{value_builder}= $results[$j]->{'value_builder'};
  				$subfield_data{toggle}	= $toggle;
! # 				warn "tagfield :  ".$results[$j]->{'tagfield'}." tagsubfield :".$results[$j]->{'tagsubfield'};
  				push @internal_loop,\%subfield_data;
  				$j++;
***************
*** 285,306 ****
  		$template->param(select_display => "True",
  						loop => \@loop_data);
- 		if ($offset>0) {
- 			my $prevpage = $offset-$pagesize;
- 			$template->param(isprevpage => $offset,
- 							prevpage=> $prevpage,
- 							searchfield => $searchfield,
- 							script_name => $script_name,
- 							frameworkcode => $frameworkcode,
- 			);
- 		}
- 		if ($offset+$pagesize<$count) {
- 			my $nextpage =$offset+$pagesize;
- 			$template->param(nextpage =>$nextpage,
- 							searchfield => $searchfield,
- 							script_name => $script_name,
- 							frameworkcode => $frameworkcode,
- 			);
- 		}
- 		
  		#  $sth->execute;
  		$sth->finish;
--- 286,289 ----
***************
*** 309,312 ****
--- 292,296 ----
  		my $env;
  		my ($count,$results)=StringSearch($env,$searchfield,$frameworkcode);
+ 		$cnt = $count;
  		my $toggle=0;
  		my @loop_data = ();
***************
*** 330,350 ****
  		}
  		$template->param(loop => \@loop_data);
! 		if ($offset>0) {
! 			my $prevpage = $offset-$pagesize;
! 			$template->param(isprevpage => $offset,
! 							prevpage=> $prevpage,
! 							searchfield => $searchfield,
! 							script_name => $script_name,
! 							frameworkcode => $frameworkcode,
! 			);
! 		}
! 		if ($offset+$pagesize<$count) {
! 			my $nextpage =$offset+$pagesize;
! 			$template->param(nextpage =>$nextpage,
! 							searchfield => $searchfield,
! 							script_name => $script_name,
! 							frameworkcode => $frameworkcode,
! 			);
! 		}
  	}
  } #---- END $OP eq DEFAULT
--- 314,334 ----
  		}
  		$template->param(loop => \@loop_data);
! 	}
! 	if ($offset>0) {
! 		my $prevpage = $offset-$pagesize;
! 		$template->param(isprevpage => $offset,
! 						prevpage=> $prevpage,
! 						searchfield => $searchfield,
! 						script_name => $script_name,
! 						frameworkcode => $frameworkcode,
! 		);
! 	}
! 	if ($offset+$pagesize<$cnt) {
! 		my $nextpage =$offset+$pagesize;
! 		$template->param(nextpage =>$nextpage,
! 						searchfield => $searchfield,
! 						script_name => $script_name,
! 						frameworkcode => $frameworkcode,
! 		);
  	}
  } #---- END $OP eq DEFAULT




From hdl at users.sourceforge.net  Wed Jun  1 15:22:09 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 01 Jun 2005 06:22:09 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marctagstructure.tmpl,1.27.2.3,1.27.2.4
Message-ID: <E1DdTAf-0007hF-K1@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	marctagstructure.tmpl 
Log Message:
Bug Fixing : Ugly display 
Non Working Arrows at the bottom of page.

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.27.2.3
retrieving revision 1.27.2.4
diff -C2 -r1.27.2.3 -r1.27.2.4
*** marctagstructure.tmpl	1 Jun 2005 10:18:24 -0000	1.27.2.3
--- marctagstructure.tmpl	1 Jun 2005 13:22:07 -0000	1.27.2.4
***************
*** 114,226 ****
  <!-- ------------------------------------------------------------------------ -->
  <!-- TMPL_IF NAME="else" -->
! <div id="bloc25">
! <h2 class="parameters">Select a framework</h2>
! <form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 	<select name="frameworkcode">
! 		<option value="">Default</option>
! 	<!-- TMPL_LOOP NAME="frameworkloop" -->
! 		<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="frameworktext" --></option>
! 	<!-- /TMPL_LOOP -->
! 	</select>
! 	<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 	<input type="submit" value="OK" class="button">
! 	<p>
! 	<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True"  OnChange="javascript:document.f.submit()">
! 	</p>
! </form>
! <b>NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script.</b>
! </div>
! <!-- TMPL_IF NAME="select_display" -->
! <div id="bloc100">
! 	<table>
! 	<tr>
! 		<th>Tag</th>
! 		<th>Lib</th>
! 		<th>Repeatable</th>
! 		<th>Mandatory</th>
! 		<th>Authorised<br />value</th>
! 		<th>Subfields</th>
! 		<th>Edit</th>
! 		<th>Delete</th>
! 	<tr>
! 	<!-- TMPL_LOOP NAME="loop" -->
! 	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
! 		<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
! 		<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 		<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 		<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 		<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 	</tr>
! 	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td>
! 			&nbsp;
! 		</td>
! 		<td colspan=7 border=0>
! 			<table colspan=8 border=0>
! 			<!-- TMPL_LOOP NAME="subfields" -->
! 				<tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
! 					<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
! 					<td>
! 						<!-- TMPL_VAR NAME="liblibrarian" -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="repeatable" -->repeatable<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="mandatory" -->Mandatory<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="seealso" -->See<!-- TMPL_ELSE -->&nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="authorised_value" --><!-- TMPL_VAR NAME="authorised_value" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="value_builder" --><!-- TMPL_VAR NAME="value_builder" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						Tab:<!-- TMPL_VAR NAME="tab" -->
! 					</td>
! 					<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 				</tr>
! 			<!-- /TMPL_LOOP -->
! 			</table>
! 		</td>
! 	</tr>
! 	<!-- /TMPL_LOOP -->
! <!-- TMPL_ELSE -->
! <div id="bloc100">
  	<table>
! 	<tr>
! 		<th>Tag</th>
! 		<th>Lib</th>
! 		<th>Repeatable</th>
! 		<th>Mandatory</th>
! 		<th>Authorised<br />value</th>
! 		<th>Subfields</th>
! 		<th>Edit</th>
! 		<th>Delete</th>
! 	</tr>
! 	<!-- TMPL_LOOP NAME="loop" -->
! 	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
! 		<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
! 		<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 		<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 		<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 		<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 	</tr>
! 	<!-- /TMPL_LOOP -->
  	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<input type="hidden" name="op" value="add_form">
--- 114,215 ----
  <!-- ------------------------------------------------------------------------ -->
  <!-- TMPL_IF NAME="else" -->
! 	<div id="bloc25">
! 	<h2 class="parameters">Select a framework</h2>
! 	<form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 		<select name="frameworkcode">
! 			<option value="">Default</option>
! 		<!-- TMPL_LOOP NAME="frameworkloop" -->
! 			<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="frameworktext" --></option>
! 		<!-- /TMPL_LOOP -->
! 		</select>
! 		<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 		<input type="submit" value="OK" class="button">
! 		<p>
! 		<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True" <!-- TMPL_IF Name="select_display"-->checked<!--/TMPL_IF -->  OnChange="javascript:document.f.submit()">
! 		</p>
! 	</form>
! 	<b>NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script.</b>
! 	</div>
! 	<div id="bloc100">
  	<table>
! 		<tr>
! 			<th>Tag</th>
! 			<th>Lib</th>
! 			<th>Repeatable</th>
! 			<th>Mandatory</th>
! 			<th>Authorised<br />value</th>
! 			<th>Subfields</th>
! 			<th>Edit</th>
! 			<th>Delete</th>
! 		<tr>
! 	<!-- TMPL_IF NAME="select_display" -->
! 		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
! 			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
! 			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
! 			<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 			<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 		</tr>
! 		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 			<td>
! 				&nbsp;
! 			</td>
! 			<td colspan=7 border=0>
! 				<table colspan=8 border=0>
! 				<!-- TMPL_LOOP NAME="subfields" -->
! 					<tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
! 						<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
! 						<td>
! 							<!-- TMPL_VAR NAME="liblibrarian" -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="repeatable" -->repeatable<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="mandatory" -->Mandatory<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="seealso" -->See<!-- TMPL_ELSE -->&nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="authorised_value" --><!-- TMPL_VAR NAME="authorised_value" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="value_builder" --><!-- TMPL_VAR NAME="value_builder" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							Tab:<!-- TMPL_VAR NAME="tab" -->
! 						</td>
! 						<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 					</tr>
! 				<!-- /TMPL_LOOP -->
! 				</table>
! 			</td>
! 		</tr>
! 		<!-- /TMPL_LOOP -->
! 	<!-- TMPL_ELSE -->
! 		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
! 			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
! 			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
! 			<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 			<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 		</tr>
! 		<!-- /TMPL_LOOP -->
! 	<!--/TMPL_IF -->
  	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<input type="hidden" name="op" value="add_form">
***************
*** 231,245 ****
  		<input type="submit" class="button" value="Add Tag" title="Add Tag" alt="Add Tag" >
  		<!-- TMPL_IF NAME="isprevpage" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">
  			<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0">
  			</a>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="nextpage" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">
  				<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0">
  			</a>
  		<!-- /TMPL_IF -->
! <!--/TMPL_IF -->
! 	</form>
  <script language="javascript" type="text/javascript">
  	function ChangeDisplay(checkbox) {
--- 220,233 ----
  		<input type="submit" class="button" value="Add Tag" title="Add Tag" alt="Add Tag" >
  		<!-- TMPL_IF NAME="isprevpage" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">
  			<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0">
  			</a>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="nextpage" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">
  				<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0">
  			</a>
  		<!-- /TMPL_IF -->
! </form>
  <script language="javascript" type="text/javascript">
  	function ChangeDisplay(checkbox) {




From tipaul at users.sourceforge.net  Wed Jun  1 15:52:08 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 01 Jun 2005 06:52:08 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marctagstructure.tmpl,1.27.2.4,1.27.2.5
Message-ID: <E1DdTdg-0003dR-3Z@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	marctagstructure.tmpl 
Log Message:
some graphic improvements

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.27.2.4
retrieving revision 1.27.2.5
diff -C2 -r1.27.2.4 -r1.27.2.5
*** marctagstructure.tmpl	1 Jun 2005 13:22:07 -0000	1.27.2.4
--- marctagstructure.tmpl	1 Jun 2005 13:52:05 -0000	1.27.2.5
***************
*** 145,149 ****
  	<!-- TMPL_IF NAME="select_display" -->
  		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
  			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
  			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
--- 145,149 ----
  	<!-- TMPL_IF NAME="select_display" -->
  		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr class="hilighted">
  			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
  			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
***************
*** 160,198 ****
  			</td>
  			<td colspan=7 border=0>
- 				<table colspan=8 border=0>
  				<!-- TMPL_LOOP NAME="subfields" -->
! 					<tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
! 						<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
! 						<td>
  							<!-- TMPL_VAR NAME="liblibrarian" -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="repeatable" -->repeatable<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="mandatory" -->Mandatory<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="seealso" -->See<!-- TMPL_ELSE -->&nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="authorised_value" --><!-- TMPL_VAR NAME="authorised_value" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="value_builder" --><!-- TMPL_VAR NAME="value_builder" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							Tab:<!-- TMPL_VAR NAME="tab" -->
! 						</td>
! 						<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 					</tr>
  				<!-- /TMPL_LOOP -->
- 				</table>
  			</td>
  		</tr>
--- 160,176 ----
  			</td>
  			<td colspan=7 border=0>
  				<!-- TMPL_LOOP NAME="subfields" -->
! 					<p><label>&nbsp;</label>
! 							Tab:<!-- TMPL_VAR NAME="tab" --> | $<!-- TMPL_VAR NAME="tagsubfield" -->
  							<!-- TMPL_VAR NAME="liblibrarian" -->
! 							<!-- TMPL_IF NAME="kohafield" -->,<!-- TMPL_VAR NAME="kohafield" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 							<!-- TMPL_IF NAME="repeatable" -->, repeatable<!-- /TMPL_IF -->
! 							<!-- TMPL_IF NAME="mandatory" -->, Mandatory<!-- /TMPL_IF -->
! 							<!-- TMPL_IF NAME="seealso" -->, See <!-- TMPL_VAR name="seealso" --><!--/TMPL_IF -->
! 							<!-- TMPL_IF NAME="authorised_value" -->, <!-- TMPL_VAR NAME="authorised_value" --><!--/TMPL_IF -->
! 							<!-- TMPL_IF NAME="authtypecode" -->, <!-- TMPL_VAR NAME="authtypecode" --><!--/TMPL_IF -->
! 							<!-- TMPL_IF NAME="value_builder" -->, <!-- TMPL_VAR NAME="value_builder" --><!--/TMPL_IF -->
! 					</p>
  				<!-- /TMPL_LOOP -->
  			</td>
  		</tr>




From hdl at users.sourceforge.net  Wed Jun  1 16:12:14 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 01 Jun 2005 07:12:14 -0700
Subject: [Koha-cvs] CVS: koha/misc overduenotices.pl,1.1.4.2,1.1.4.3
Message-ID: <E1DdTx8-00065l-0W@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23396/misc

Modified Files:
      Tag: rel_2_2
	overduenotices.pl 
Log Message:
Adding Date to messages.
Adding lists of books borrowed with barcode.

One Bug To Fix : use of uninitialized value.


Index: overduenotices.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/overduenotices.pl,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -C2 -r1.1.4.2 -r1.1.4.3
*** overduenotices.pl	28 Apr 2005 10:07:33 -0000	1.1.4.2
--- overduenotices.pl	1 Jun 2005 14:12:10 -0000	1.1.4.3
***************
*** 74,78 ****
  # The following fields are available :
  # <date> <itemcount> <firstname> <lastname> <address1> <address2> <address3> <city> <postcode>
! my $mailtext = "\n\n\nDear library borrower\n\n\n       <date>\n\n       According to our records, you have <itemcount> items that are at\n       least a week overdue for return to the library or renewal.\n       If you have registered a password with the library, you may use it\n       and your library card to login at http://XXX.org\n       to check the status of your account, or you may call any of our branch\n       Please be advised that all library services will be blocked\n       if items are allowed to go more than 30 days overdue.\n\n       Thank you for using your public libraries.\n\n\n                                             <firstname> <lastname>\n                                             <address1>\n                                             <address2>\n                                             <city>  <postcode>\n\n\n\n\n\n";
  #
  # END OF PARAMETERS
--- 74,79 ----
  # The following fields are available :
  # <date> <itemcount> <firstname> <lastname> <address1> <address2> <address3> <city> <postcode>
! my $mailtext = "\n\n\nDear library borrower\n\n\n       <date>\n\n       According to our records, you have <itemcount> items, the description of which follows, that are at\n       least a week overdue for return to the library or renewal:\n		title		author		barcode\n<titles>\n
!        If you have registered a password with the library, you may use it\n       and your library card to login at http://XXX.org\n       to check the status of your account, or you may call any of our branch\n       Please be advised that all library services will be blocked\n       if items are allowed to go more than 30 days overdue.\n\n       Thank you for using your public libraries.\n\n\n                                             <firstname> <lastname>\n                                             <address1>\n                                             <address2>\n                                             <city>  <postcode>\n\n\n\n\n\n";
  #
  # END OF PARAMETERS
***************
*** 85,89 ****
  
  my $dbh = C4::Context->dbh;
! my $sth = $dbh->prepare ("SELECT count(*), issues.borrowernumber,firstname,surname,streetaddress,physstreet,city,zipcode,emailaddress FROM issues,borrowers,categories WHERE returndate IS NULL AND TO_DAYS(NOW())-TO_DAYS(date_due) BETWEEN 0 and 500 AND issues.borrowernumber=borrowers.borrowernumber and borrowers.categorycode=categories.categorycode and categories.overduenoticerequired=1 group by issues.borrowernumber");
  $sth->execute;
  # 
--- 86,92 ----
  
  my $dbh = C4::Context->dbh;
! my $sth = $dbh->prepare ("SELECT COUNT(*), issues.borrowernumber,firstname,surname,streetaddress,physstreet,city,zipcode,emailaddress FROM issues,borrowers,categories WHERE returndate IS NULL AND TO_DAYS(NOW())-TO_DAYS(date_due) BETWEEN 0 and 500 AND issues.borrowernumber=borrowers.borrowernumber and borrowers.categorycode=categories.categorycode and categories.overduenoticerequired=1 group by issues.borrowernumber");
! my $sth2 = $dbh->prepare("SELECT biblio.title,biblio.author,items.barcode FROM issues,items,biblio WHERE items.itemnumber=issues.itemnumber and biblio.biblionumber=items.biblionumber AND issues.borrowernumber=? AND returndate IS NULL AND TO_DAYS(NOW())-TO_DAYS(date_due) BETWEEN 0 and 500");
! 
  $sth->execute;
  # 
***************
*** 92,95 ****
--- 95,99 ----
  my $count = 0;   # to keep track of how many notices are printed
  my $e_count = 0;   # and e-mailed
+ my $date=localtime;
  my ($itemcount,$borrnum,$firstname,$lastname,$address1,$address2,$city,$postcode,$email);
  
***************
*** 103,107 ****
  		$notice =~ s/\<city\>/$city/g;
  		$notice =~ s/\<postcode\>/$postcode/g;
! 	
  	# if not using e-mail notices, comment out the following lines
  		if ($email) {   # or you might check for borrowers.preferredcont 
--- 107,120 ----
  		$notice =~ s/\<city\>/$city/g;
  		$notice =~ s/\<postcode\>/$postcode/g;
! 		$notice =~ s/\<date\>/$date/g;
! 
! 		$sth2->execute($borrnum);
! 		my $titles;
! 		my ($title, $author, $barcode);
! 		while (($title, $author, $barcode) = $sth2->fetchrow){
! 			$titles .= "		$title	$author	$barcode\n";
! 		}
! 		$notice =~ s/\<titles\>/$titles/g;
! 		$sth2->finish;
  	# if not using e-mail notices, comment out the following lines
  		if ($email) {   # or you might check for borrowers.preferredcont 




From hdl at users.sourceforge.net  Wed Jun  1 16:29:38 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 01 Jun 2005 07:29:38 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marctagstructure.tmpl,1.27.2.5,1.27.2.6
Message-ID: <E1DdUDy-0008Rb-OW@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	marctagstructure.tmpl 
Log Message:
Minor display changes

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.27.2.5
retrieving revision 1.27.2.6
diff -C2 -r1.27.2.5 -r1.27.2.6
*** marctagstructure.tmpl	1 Jun 2005 13:52:05 -0000	1.27.2.5
--- marctagstructure.tmpl	1 Jun 2005 14:29:21 -0000	1.27.2.6
***************
*** 163,174 ****
  					<p><label>&nbsp;</label>
  							Tab:<!-- TMPL_VAR NAME="tab" --> | $<!-- TMPL_VAR NAME="tagsubfield" -->
! 							<!-- TMPL_VAR NAME="liblibrarian" -->
! 							<!-- TMPL_IF NAME="kohafield" -->,<!-- TMPL_VAR NAME="kohafield" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 							<!-- TMPL_IF NAME="repeatable" -->, repeatable<!-- /TMPL_IF -->
! 							<!-- TMPL_IF NAME="mandatory" -->, Mandatory<!-- /TMPL_IF -->
! 							<!-- TMPL_IF NAME="seealso" -->, See <!-- TMPL_VAR name="seealso" --><!--/TMPL_IF -->
! 							<!-- TMPL_IF NAME="authorised_value" -->, <!-- TMPL_VAR NAME="authorised_value" --><!--/TMPL_IF -->
! 							<!-- TMPL_IF NAME="authtypecode" -->, <!-- TMPL_VAR NAME="authtypecode" --><!--/TMPL_IF -->
! 							<!-- TMPL_IF NAME="value_builder" -->, <!-- TMPL_VAR NAME="value_builder" --><!--/TMPL_IF -->
  					</p>
  				<!-- /TMPL_LOOP -->
--- 163,167 ----
  					<p><label>&nbsp;</label>
  							Tab:<!-- TMPL_VAR NAME="tab" --> | $<!-- TMPL_VAR NAME="tagsubfield" -->
! 							<!-- TMPL_VAR NAME="liblibrarian" --> <!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!--/TMPL_IF --><!-- TMPL_IF NAME="repeatable" -->, repeatable<!-- /TMPL_IF --><!-- TMPL_IF NAME="mandatory" -->, Mandatory<!-- /TMPL_IF --><!-- TMPL_IF NAME="seealso" -->, See <!-- TMPL_VAR name="seealso" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authorised_value" -->, <!-- TMPL_VAR NAME="authorised_value" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authtypecode" -->, <!-- TMPL_VAR NAME="authtypecode" --><!--/TMPL_IF --><!-- TMPL_IF NAME="value_builder" -->, <!-- TMPL_VAR NAME="value_builder" --><!--/TMPL_IF -->
  					</p>
  				<!-- /TMPL_LOOP -->




From tipaul at users.sourceforge.net  Wed Jun  1 17:54:44 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 01 Jun 2005 08:54:44 -0700
Subject: [Koha-cvs] CVS: koha/misc overduenotices.pl,1.1.4.3,1.1.4.4
Message-ID: <E1DdVYK-0002g1-Dm@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10232/misc

Modified Files:
      Tag: rel_2_2
	overduenotices.pl 
Log Message:
fixing "warning use of uninitialized value in concatenation..."

Index: overduenotices.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/overduenotices.pl,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -C2 -r1.1.4.3 -r1.1.4.4
*** overduenotices.pl	1 Jun 2005 14:12:10 -0000	1.1.4.3
--- overduenotices.pl	1 Jun 2005 15:54:42 -0000	1.1.4.4
***************
*** 110,117 ****
  
  		$sth2->execute($borrnum);
! 		my $titles;
  		my ($title, $author, $barcode);
  		while (($title, $author, $barcode) = $sth2->fetchrow){
! 			$titles .= "		$title	$author	$barcode\n";
  		}
  		$notice =~ s/\<titles\>/$titles/g;
--- 110,117 ----
  
  		$sth2->execute($borrnum);
! 		my $titles="";
  		my ($title, $author, $barcode);
  		while (($title, $author, $barcode) = $sth2->fetchrow){
! 			$titles .= "		".($title?$title:"")."	".($author?$author:"")."	".($barcode?$barcode:"")."\n";
  		}
  		$notice =~ s/\<titles\>/$titles/g;
***************
*** 149,153 ****
  		$notice .= <ODUES>;
  		if ($nomail) {
! 			print "TO => $email\n";
  			print "FROM => $from\n";
  			print "SUBJECT => Koha overdue\n";
--- 149,153 ----
  		$notice .= <ODUES>;
  		if ($nomail) {
! 			print "TO => $email\n" if $email;
  			print "FROM => $from\n";
  			print "SUBJECT => Koha overdue\n";




From tipaul at users.sourceforge.net  Wed Jun  1 20:47:41 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 01 Jun 2005 11:47:41 -0700
Subject: [Koha-cvs] CVS: koha/misc build_marc_Tword.pl,1.1,1.2
Message-ID: <E1DdYFh-0003CN-QO@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12257/misc

Modified Files:
	build_marc_Tword.pl 
Log Message:
new version, doing tag by tag. Should be slower, but requires a lot less memory

Index: build_marc_Tword.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/build_marc_Tword.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** build_marc_Tword.pl	27 May 2005 09:30:24 -0000	1.1
--- build_marc_Tword.pl	1 Jun 2005 18:47:38 -0000	1.2
***************
*** 55,124 ****
  
  # parse every line
! my $query="SELECT biblio.biblionumber,tag,subfieldcode,subfieldvalue,biblio.title FROM marc_subfield_table left join marc_biblio on marc_biblio.bibid=marc_subfield_table.bibid left join biblio on marc_biblio.biblionumber=biblio.biblionumber";
  my $sth=$dbh->prepare($query);
  
! print "******** SELECTING \n";
! $sth->execute;
! print "******** DONE \n";
! $|=1; # flushes output
! 
! my $sthT=$dbh->prepare("select usedin from marc_Tword where tagsubfield=? and word=?");
! my $updateT=$dbh->prepare("update marc_Tword set usedin=? where tagsubfield=? and word=?");
! my $insertT=$dbh->prepare("insert into marc_Tword (tagsubfield,word,usedin) values (?,?,?)");
! my $i=0;
! my $timeneeded;
! # 1st version, slower, but less RAM consumming
! # while (my ($biblionumber, $tag, $subfieldcode, $subfieldvalue, $title) = $sth->fetchrow) {
! # 	next if $ignore_list{"$tag.$subfieldcode"};
! #     $subfieldvalue =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g;
! # 	# remove useless chars in the title.
! #     $title =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g;
! #     my @words = split / /, $subfieldvalue;
! # 	# and retrieve the reversed entry
! # 	foreach my $word (@words) {
! # 		$sthT->execute($tag.$subfieldcode,$word);
! # 		if (my ($usedin) = $sthT->fetchrow) {
! # 			# add the field & save it once again.
! # 			$usedin.=",$biblionumber-$title";
! # 			$updateT->execute($usedin,$tag.$subfieldcode,$word);
! # 		} else {
! # 			$insertT->execute($tag.$subfieldcode,$word,",$title-$biblionumber");
! # 		}
! # 	}
! # 	$timeneeded = gettimeofday - $starttime unless ($i % 100);
! # 	print "$i in $timeneeded s\n" unless ($i % 100);
! # 	print ".";
! # 	$i++;
! # }
! 
! # 2nd version : faster (about 100 times !), bug maybe too much RAM consumming...
! my %largehash;
! print "READING\n";
! while (my ($biblionumber, $tag, $subfieldcode, $subfieldvalue, $title) = $sth->fetchrow) {
! 	next unless $subfieldvalue;
! 	next if $ignore_list{$tag.$subfieldcode};
!     $subfieldvalue =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g;
! 	# remove useless chars in the title.
!     $title =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g;
!     my @words = split / /, $subfieldvalue;
! 	# and retrieve the reversed entry
! 	foreach my $word (@words) {
! 		my $localkey = $tag.$subfieldcode.'|'.uc($word);
! 		$largehash{$localkey}.=",$title-$biblionumber";
  	}
- 	$timeneeded = gettimeofday - $starttime unless ($i % 30000);
- 	print "$i in $timeneeded s\n" unless ($i % 30000);
- 	print "." unless ($i % 500);
- 	$i++;
- }
- $i=0;
- print "WRITING\n";
- foreach my $k (keys %largehash) {
- 	$k =~ /(.*)\|(.*)/;
- 	$insertT->execute($1,$2,$largehash{$k});
- 	$timeneeded = gettimeofday - $starttime unless ($i % 30000);
- 	print "$i in $timeneeded s\n" unless ($i % 30000);
- 	print "." unless ($i % 500);
- 	$i++;
  }
  
--- 55,126 ----
  
  # parse every line
! my $query="SELECT biblio.biblionumber,tag,subfieldcode,subfieldvalue,biblio.title FROM marc_subfield_table left join marc_biblio on marc_biblio.bibid=marc_subfield_table.bibid left join biblio on marc_biblio.biblionumber=biblio.biblionumber and tag=?";
  my $sth=$dbh->prepare($query);
  
! for (my $looptag=0;$looptag<=999;$looptag++) {
! 	print "******** SELECTING ".(sprintf "%03s",$looptag)."\n";
! 	$sth->execute(sprintf "%03s",$looptag);
! 	print "******** DONE \n";
! 	$|=1; # flushes output
! 	
! 	my $sthT=$dbh->prepare("select usedin from marc_Tword where tagsubfield=? and word=?");
! 	my $updateT=$dbh->prepare("update marc_Tword set usedin=? where tagsubfield=? and word=?");
! 	my $insertT=$dbh->prepare("insert into marc_Tword (tagsubfield,word,usedin) values (?,?,?)");
! 	my $i=0;
! 	my $timeneeded;
! 	# 1st version, slower, but less RAM consumming
! 	# while (my ($biblionumber, $tag, $subfieldcode, $subfieldvalue, $title) = $sth->fetchrow) {
! 	# 	next if $ignore_list{"$tag.$subfieldcode"};
! 	#     $subfieldvalue =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g;
! 	# 	# remove useless chars in the title.
! 	#     $title =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g;
! 	#     my @words = split / /, $subfieldvalue;
! 	# 	# and retrieve the reversed entry
! 	# 	foreach my $word (@words) {
! 	# 		$sthT->execute($tag.$subfieldcode,$word);
! 	# 		if (my ($usedin) = $sthT->fetchrow) {
! 	# 			# add the field & save it once again.
! 	# 			$usedin.=",$biblionumber-$title";
! 	# 			$updateT->execute($usedin,$tag.$subfieldcode,$word);
! 	# 		} else {
! 	# 			$insertT->execute($tag.$subfieldcode,$word,",$title-$biblionumber");
! 	# 		}
! 	# 	}
! 	# 	$timeneeded = gettimeofday - $starttime unless ($i % 100);
! 	# 	print "$i in $timeneeded s\n" unless ($i % 100);
! 	# 	print ".";
! 	# 	$i++;
! 	# }
! 	
! 	# 2nd version : faster (about 100 times !), bug maybe too much RAM consumming...
! 	my %largehash;
! 	print "READING\n";
! 	while (my ($biblionumber, $tag, $subfieldcode, $subfieldvalue, $title) = $sth->fetchrow) {
! 		next unless $subfieldvalue;
! 		next if $ignore_list{$tag.$subfieldcode};
! 		$subfieldvalue =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g if $subfieldvalue;
! 		# remove useless chars in the title.
! 		$title =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g if $title;
! 		my @words = split / /, $subfieldvalue;
! 		# and retrieve the reversed entry
! 		foreach my $word (@words) {
! 			my $localkey = $tag.$subfieldcode.'|'.uc($word);
! 			$largehash{$localkey}.=",".substr($title,0,15)."-$biblionumber";
! 		}
! 		$timeneeded = gettimeofday - $starttime unless ($i % 30000);
! 		print "$i in $timeneeded s\n" unless ($i % 30000);
! 		print "." unless ($i % 500);
! 		$i++;
! 	}
! 	$i=0;
! 	print "WRITING\n";
! 	foreach my $k (keys %largehash) {
! 		$k =~ /(.*)\|(.*)/;
! 		$insertT->execute($1,$2,$largehash{$k});
! 		$timeneeded = gettimeofday - $starttime unless ($i % 30000);
! 		print "$i in $timeneeded s\n" unless ($i % 30000);
! 		print "." unless ($i % 500);
! 		$i++;
  	}
  }
  




From tipaul at users.sourceforge.net  Wed Jun  1 20:55:10 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 01 Jun 2005 11:55:10 -0700
Subject: [Koha-cvs] CVS: koha/misc build_marc_Tword.pl,1.2,1.3
Message-ID: <E1DdYMw-0004C7-TL@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16069/misc

Modified Files:
	build_marc_Tword.pl 
Log Message:
new version, doing tag by tag. Should be slower, but requires a lot less memory

Index: build_marc_Tword.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/build_marc_Tword.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** build_marc_Tword.pl	1 Jun 2005 18:47:38 -0000	1.2
--- build_marc_Tword.pl	1 Jun 2005 18:55:08 -0000	1.3
***************
*** 55,59 ****
  
  # parse every line
! my $query="SELECT biblio.biblionumber,tag,subfieldcode,subfieldvalue,biblio.title FROM marc_subfield_table left join marc_biblio on marc_biblio.bibid=marc_subfield_table.bibid left join biblio on marc_biblio.biblionumber=biblio.biblionumber and tag=?";
  my $sth=$dbh->prepare($query);
  
--- 55,59 ----
  
  # parse every line
! my $query="SELECT biblio.biblionumber,tag,subfieldcode,subfieldvalue,biblio.title FROM marc_subfield_table left join marc_biblio on marc_biblio.bibid=marc_subfield_table.bibid left join biblio on marc_biblio.biblionumber=biblio.biblionumber where tag=?";
  my $sth=$dbh->prepare($query);
  
***************
*** 95,99 ****
  	# 2nd version : faster (about 100 times !), bug maybe too much RAM consumming...
  	my %largehash;
! 	print "READING\n";
  	while (my ($biblionumber, $tag, $subfieldcode, $subfieldvalue, $title) = $sth->fetchrow) {
  		next unless $subfieldvalue;
--- 95,101 ----
  	# 2nd version : faster (about 100 times !), bug maybe too much RAM consumming...
  	my %largehash;
! # 	print "READING\n";
! 	$timeneeded = gettimeofday - $starttime unless ($i % 30000);
! 	print "READING $timeneeded s\n";
  	while (my ($biblionumber, $tag, $subfieldcode, $subfieldvalue, $title) = $sth->fetchrow) {
  		next unless $subfieldvalue;




From hdl at users.sourceforge.net  Wed Jun  1 21:55:56 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 01 Jun 2005 12:55:56 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-sendbasket.pl,1.4.2.1,1.4.2.2
Message-ID: <E1DdZJk-0004HK-0I@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16396/opac

Modified Files:
      Tag: rel_2_2
	opac-sendbasket.pl 
Log Message:
Sending basket in OPAC with joined iso2709 biblios 

Index: opac-sendbasket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-sendbasket.pl,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** opac-sendbasket.pl	25 Mar 2005 17:04:28 -0000	1.4.2.1
--- opac-sendbasket.pl	1 Jun 2005 19:55:53 -0000	1.4.2.2
***************
*** 8,11 ****
--- 8,12 ----
  
  use C4::Search;
+ use C4::Biblio;
  use C4::Auth;
  use C4::Interface::CGI::Output;
***************
*** 25,28 ****
--- 26,33 ----
  my $email_add=$query->param('email_add');
  my $email_sender=$query->param('email_sender');
+ my $dbh=C4::Context->dbh;
+ my $sth;
+ $sth=$dbh->prepare("select bibid from marc_biblio where biblionumber=? order by bibid");
+ 
  
  if ($email_add) {
***************
*** 57,60 ****
--- 62,67 ----
  		$dat->{'biblionumber'} = $biblionumber;
  		$dat->{ITEM_RESULTS} = \@items;
+ 		$sth->execute($biblionumber);
+ 		my ($bibid) = $sth->fetchrow;
  		my $record = MARCgetbiblio($dbh,$bibid);
  		$iso2709 .= $record->as_usmarc();




From hdl at users.sourceforge.net  Wed Jun  1 22:05:43 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 01 Jun 2005 13:05:43 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-serial-issues.pl,1.1.2.3,1.1.2.4
Message-ID: <E1DdZTD-0005WW-FV@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21196/opac

Modified Files:
      Tag: rel_2_2
	opac-serial-issues.pl 
Log Message:
FIXING : Bug line 37 missing comma

Index: opac-serial-issues.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-serial-issues.pl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** opac-serial-issues.pl	25 Mar 2005 17:04:28 -0000	1.1.2.3
--- opac-serial-issues.pl	1 Jun 2005 20:05:41 -0000	1.1.2.4
***************
*** 34,38 ****
  $template->param(
  	biblionumber => $query->param('biblionumber'),
! 	subscription_LOOP => $subscriptions
  	suggestion => C4::Context->preference("suggestion"),
  	virtualshelves => C4::Context->preference("virtualshelves"),
--- 34,38 ----
  $template->param(
  	biblionumber => $query->param('biblionumber'),
! 	subscription_LOOP => $subscriptions,
  	suggestion => C4::Context->preference("suggestion"),
  	virtualshelves => C4::Context->preference("virtualshelves"),




From genjimoto at users.sourceforge.net  Wed Jun  1 22:44:07 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 13:44:07 -0700
Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.118,1.119
Message-ID: <E1Dda4N-0002ZF-J3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9798

Modified Files:
	Biblio.pm 
Log Message:
patch from Genji (Waylon R.) to update subjects in MARC tables when systempref has MARC=OFF

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -r1.118 -r1.119
*** Biblio.pm	4 May 2005 15:40:01 -0000	1.118
--- Biblio.pm	1 Jun 2005 20:43:58 -0000	1.119
***************
*** 2057,2060 ****
--- 2057,2072 ----
      my $dbh = C4::Context->dbh;
      my $error = &OLDmodsubject( $dbh, $bibnum, $force, @subject );
+         if ($error eq ''){
+     # When MARC is off, ensures that the MARC biblio table gets updated with new
+     # subjects, of course, it deletes the biblio in marc, and then recreates.
+     # This check is to ensure that no MARC data exists to lose.
+ 
+         if (C4::Context->preference("MARC") eq '0'){
+             my $MARCRecord = &MARCkoha2marcBiblio($dbh,$bibnum);
+             my $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$bibnum);
+             &MARCmodbiblio($dbh,$bibid, $MARCRecord);
+         }
+ 
+     }
      return ($error);
  }    # sub modsubject
***************
*** 2624,2627 ****
--- 2636,2642 ----
  # $Id$
  # $Log$
+ # Revision 1.119  2005/06/01 20:43:58  genjimoto
+ # patch from Genji (Waylon R.) to update subjects in MARC tables when systempref has MARC=OFF
+ #
  # Revision 1.118  2005/05/04 15:40:01  tipaul
  # synch'ing 2.2 and head




From genjimoto at users.sourceforge.net  Wed Jun  1 23:18:43 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 14:18:43 -0700
Subject: [Koha-cvs] CVS: koha/C4 SearchMarc.pm,1.42,1.43
Message-ID: <E1Ddabr-00077c-Dq@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27333

Modified Files:
	SearchMarc.pm 
Log Message:
New Feature: catalogsearch() has a new parameter, $sqlstring. A developer puts into it whatever they want to tack onto the end of the where statement. See usage in opac-search.pl

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** SearchMarc.pm	4 May 2005 15:40:01 -0000	1.42
--- SearchMarc.pm	1 Jun 2005 21:18:39 -0000	1.43
***************
*** 100,104 ****
  }
  
! =head1  my ($count, @results) = catalogsearch($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby);
  
  =head2 $dbh is a link to the DB handler.
--- 100,104 ----
  }
  
! =head1  my ($count, @results) = catalogsearch($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby,$sqlstring);
  
  =head2 $dbh is a link to the DB handler.
***************
*** 147,150 ****
--- 147,154 ----
  (for example title, title DESC,...)
  
+ =head2 $sqlstring
+ 
+ optional argument containing an sql string to be used in the 'where' statement. see usage in opac-search.pl.
+ 
  =head2 RETURNS
  
***************
*** 166,170 ****
  
  sub catalogsearch {
! 	my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby,$desc_or_asc) = @_;
  	# build the sql request. She will look like :
  	# select m1.bibid
--- 170,174 ----
  
  sub catalogsearch {
! 	my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby,$desc_or_asc,$sqlstring) = @_;
  	# build the sql request. She will look like :
  	# select m1.bibid
***************
*** 273,285 ****
  	# Finds the basic results without the NOT requests
  	my ($sql_tables, $sql_where1, $sql_where2) = create_request($dbh,\@normal_tags, \@normal_and_or, \@normal_operator, \@normal_value);
! 
  	$sql_where1 .= "and TO_DAYS( NOW( ) ) - TO_DAYS( biblio.timestamp ) <30" if $orderby =~ "biblio.timestamp";
  	my $sth;
  	if ($sql_where2) {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc");
! 		warn "Q2 : select distinct m1.bibid from biblio,biblioitems,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc term is  @$value";
  	} else {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc");
! 		warn "Q : select distinct m1.bibid from biblio,biblioitems,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc";
  	}
  	$sth->execute();
--- 277,289 ----
  	# Finds the basic results without the NOT requests
  	my ($sql_tables, $sql_where1, $sql_where2) = create_request($dbh,\@normal_tags, \@normal_and_or, \@normal_operator, \@normal_value);
!   $sql_where1 .=" ". $sqlstring;
  	$sql_where1 .= "and TO_DAYS( NOW( ) ) - TO_DAYS( biblio.timestamp ) <30" if $orderby =~ "biblio.timestamp";
  	my $sth;
  	if ($sql_where2) {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc");
! 		warn "Q2 : select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc term is  @$value";
  	} else {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc");
! 		warn "Q : select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc";
  	}
  	$sth->execute();




From genjimoto at users.sourceforge.net  Wed Jun  1 23:35:08 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 14:35:08 -0700
Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.103,1.104
Message-ID: <E1Ddark-0000xv-7W@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/updater
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3674

Modified Files:
	updatedatabase 
Log Message:
New Feature: catalogsearch() has a new parameter, $sqlstring. A developer puts into it whatever they want to tack onto the end of the where statement. See usage in opac-search.pl

Index: updatedatabase
===================================================================
RCS file: /cvsroot/koha/koha/updater/updatedatabase,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -r1.103 -r1.104
*** updatedatabase	4 May 2005 09:04:52 -0000	1.103
--- updatedatabase	1 Jun 2005 21:35:05 -0000	1.104
***************
*** 13,17 ****
  
  # NOTE:  If you do something more than once in here, make it table driven.
! 
  use strict;
  
--- 13,17 ----
  
  # NOTE:  If you do something more than once in here, make it table driven.
! use lib "/usr/koha200pre2/modules";
  use strict;
  
***************
*** 369,372 ****
--- 369,387 ----
  							KEY biblionumber (biblionumber)
  						)",
+     categorytable       => "(categorycode char(5) NOT NULL default '',
+                              description text default '',
+                              itemtypecodes text default '',
+                              PRIMARY KEY (categorycode)
+                             )",
+     subcategorytable       => "(subcategorycode char(5) NOT NULL default '',
+                              description text default '',
+                              itemtypecodes text default '',
+                              PRIMARY KEY (subcategorycode)
+                             )",
+     mediatypetable       => "(mediatypecode char(5) NOT NULL default '',
+                              description text default '',
+                              itemtypecodes text default '',
+                              PRIMARY KEY (mediatypecode)
+                             )",
  );
  
***************
*** 1433,1436 ****
--- 1448,1454 ----
  
  # $Log$
+ # Revision 1.104  2005/06/01 21:35:05  genjimoto
+ # New Feature: catalogsearch() has a new parameter, $sqlstring. A developer puts into it whatever they want to tack onto the end of the where statement. See usage in opac-search.pl
+ #
  # Revision 1.103  2005/05/04 09:04:52  tipaul
  # synch'ing 2.2 and head




From genjimoto at users.sourceforge.net  Wed Jun  1 23:41:05 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 14:41:05 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters admin-home.tmpl,1.35,1.36
Message-ID: <E1DdaxV-0001dZ-MS@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	admin-home.tmpl 
Log Message:
New links to three new table editors: Categorytable, subcategorytable and mediatypetable.

Index: admin-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** admin-home.tmpl	23 Mar 2005 09:26:48 -0000	1.35
--- admin-home.tmpl	1 Jun 2005 21:41:03 -0000	1.36
***************
*** 36,39 ****
--- 36,54 ----
  		</tr>
  
+     <tr>
+       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/itemtypecategory.pl"> Item categories</a></td>
+       <td>Define item categories. (Non-Fiction, Fiction, Non-Fiction and Fiction...)</td>
+     </tr>
+ 
+     <tr>
+       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/itemtypesubcategory.pl"> Item subcategories</a></td>
+       <td>Define item Subcategories. (Junior Fiction, Junior Non fiction.... Adult Fiction.)</td>
+     </tr>
+ 
+     <tr>
+       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/mediatype.pl"> Item mediatypes</a></td>
+       <td>Define item mediatypes. (CD, Video, Book, Game...)</td>
+     </tr>
+ 
  		<tr>
  			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/categorie.pl">Borrower categories</a></td>




From genjimoto at users.sourceforge.net  Thu Jun  2 00:20:19 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 15:20:19 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-searchresults.tmpl,1.22,1.23
Message-ID: <E1DdbZT-0006jl-6p@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac-searchresults.tmpl 
Log Message:
New Feature: Search options sidebar. Feature request of Rachel at katipo.

Index: opac-searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** opac-searchresults.tmpl	4 May 2005 08:58:32 -0000	1.22
--- opac-searchresults.tmpl	1 Jun 2005 22:20:16 -0000	1.23
***************
*** 10,14 ****
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
! 
  <!-- <p class="center"><!-- TMPL_VAR NAME="total" --> results found</p> -->
  	<div id="resultnumber">
--- 10,16 ----
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
! <table width="100%">
! <tr>
! <td width="70%">
  <!-- <p class="center"><!-- TMPL_VAR NAME="total" --> results found</p> -->
  	<div id="resultnumber">
***************
*** 125,128 ****
--- 127,189 ----
  	</table>
  </form>
+ </td>
+ <td width="30%">
+ <!-- fancy writing --> Search options<br>
+ 
+ <!-- TMPL_VAR NAME="searchdesc" -->
+ <br>
+ <!-- TMPL_VAR NAME="total" --> results found.
+ <br>
+ <form name="searchoptions" action="searchoptions.pl" method="get">
+ <input type="hidden" name="nbstatementsori" value="<!-- TMPL_VAR NAME="nbstatements" ESCAPE=HTML-->">
+ <input type="hidden" name="itemtypessearched" value="<!-- TMPL_VAR NAME="itemtypesstring" -->">
+ <input type="hidden" name="orderbyori" value="<!-- TMPL_VAR NAME="orderby" -->">
+ <!-- TMPL_LOOP NAME="searchdata" -->
+ <input type="hidden" name="<!-- TMPL_VAR NAME="term" -->" value="<!-- TMPL_VAR NAME="val" ESCAPE=HTML -->">
+ <!-- /TMPL_LOOP -->
+ <input type="radio" name="searchtype" value="NewSearch"> New Search<br>
+ <input type="radio" name="searchtype" value="SearchWithin" checked> Search Within Results<br>
+ <br>
+ Select a category<br>
+ <input type="checkbox" name="allcategories"> All Categories <br>
+ <!-- TMPL_VAR NAME="categorylist" -->
+ <input type="text" name="keyword"><br>
+ Search using keywords or subject.
+ <input type="submit" value="Quick Search">
+ <br>
+ 
+ Filter by Subcategory<br>
+ <input type="checkbox" name="allsubcategories"> All Subcategories <br>
+ 
+ <select name="subcategorieswanted" size="4" multiple>
+ 
+ <!-- TMPL_VAR NAME="subcategorylist" -->
+ </select><br>
+ 
+ Filter by Media type<br>
+ <input type="checkbox" name="allmediatypes">All Media types<br>
+ <select name="mediatypeswanted" size="4" multiple>
+ <!-- TMPL_VAR NAME="mediatypelist" -->
+ </select><br>
+ 
+ Filter by Item type<br>
+ <input type="checkbox" name="allitemtypes"> All Itemtypes <br>
+ 
+ <select name="itemtypeswanted" size="6" multiple>
+ 
+ <!-- TMPL_VAR NAME="itemtypelist" -->
+ </select><br>
+ 
+ Filter by Branch<br>
+ <input type="checkbox" name="allbranches"> All Branches<br>
+ <select name="brancheswanted" size="6" multiple>
+ <!-- TMPL_VAR NAME="brancheslist" -->
+ </select><br>
+ <input type="checkbox" name="avail"> Only show titles available (Not on loan)<br>
+ <input type="submit" value="Search">
+ </form>
+ </td>
+ </table>
+ 
  	<p class="center">
  		Results <b><i><!-- TMPL_VAR NAME="from" --></i> through <i><!-- TMPL_VAR NAME="to" --></i> of <i><!-- TMPL_VAR NAME="total" --></i></b>




From genjimoto at users.sourceforge.net  Thu Jun  2 01:07:19 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 16:07:19 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-search.pl,1.24,1.25
Message-ID: <E1DdcIx-0004GI-U9@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16344

Modified Files:
	opac-search.pl 
Log Message:
Addition of new table lists: Categorylist, Subcategorylist and Mediatypelist. Renamed classlist to itemtypelist.

Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** opac-search.pl	4 May 2005 09:02:38 -0000	1.24
--- opac-search.pl	1 Jun 2005 23:07:17 -0000	1.25
***************
*** 17,34 ****
  # use C4::Search;
  
- my $classlist='';
  
  my $dbh=C4::Context->dbh;
  my $sth=$dbh->prepare("select description,itemtype from itemtypes order by description");
  $sth->execute;
  while (my ($description,$itemtype) = $sth->fetchrow) {
!     $classlist.="<option value=\"$itemtype\">$description</option>\n";
  }
  
! 
  my $query = new CGI;
  my $op = $query->param("op");
  my $type=$query->param('type');
  
  my $startfrom=$query->param('startfrom');
  $startfrom=0 if(!defined $startfrom);
--- 17,64 ----
  # use C4::Search;
  
  
+ my $itemtypelist;
+ my $brancheslist;
+ my $categorylist;
+ my $subcategorylist;
+ my $mediatypelist;
  my $dbh=C4::Context->dbh;
  my $sth=$dbh->prepare("select description,itemtype from itemtypes order by description");
  $sth->execute;
  while (my ($description,$itemtype) = $sth->fetchrow) {
!     $itemtypelist.="<option value=\"$itemtype\">$description</option>\n";
  }
+ my $sth=$dbh->prepare("select description,subcategorycode from subcategorytable order by description");
+ $sth->execute;
+ while (my ($description,$subcategorycode) = $sth->fetchrow) {
+     $subcategorylist.="<option value=\"$subcategorycode\">$description</option>\n";
+ }
+ my $sth=$dbh->prepare("select description,mediatypecode from mediatypetable order by description");
+ $sth->execute;
+ while (my ($description,$mediatypecode) = $sth->fetchrow) {
+     $mediatypelist.="<option value=\"$mediatypecode\">$description</option>\n";
+ }
+ my $sth=$dbh->prepare("select description,categorycode from categorytable order by description");
+ $sth->execute;
+ while (my ($description,$categorycode) = $sth->fetchrow) {
+     $categorylist .= '<input type="radio" name="categorylist" value="'.$categorycode.'">'.$description.'<br>';
+ }
+ my $sth=$dbh->prepare("select branchname,branchcode from branches order by branchname");
+ $sth->execute;
  
! while (my ($branchname,$branchcode) = $sth->fetchrow) {
!     $brancheslist.="<option value=\"$branchcode\">$branchname</option>\n";
! }
  my $query = new CGI;
  my $op = $query->param("op");
  my $type=$query->param('type');
  
+ my $itemtypesstring=$query->param("itemtypesstring");
+ $itemtypesstring =~s/"//g;
+ my @itemtypes = split ( /\|/, $itemtypesstring);
+ my $branchesstring=$query->param("branchesstring");
+ $branchesstring =~s/"//g;
+ my @branches = split (/\|/, $branchesstring);
+ 
  my $startfrom=$query->param('startfrom');
  $startfrom=0 if(!defined $startfrom);
***************
*** 51,54 ****
--- 81,92 ----
  		}
  	}
+   if ($itemtypesstring ne ''){
+     $searchdesc .= 'filtered by itemtypes ';
+     $searchdesc .= join(" ", at itemtypes)
+   }
+   if ($branchesstring ne ''){
+     $searchdesc .= ' in branches ';
+     $searchdesc .= join(" ", at branches)
+   }
  	$resultsperpage= $query->param('resultsperpage');
  	$resultsperpage = 19 if(!defined $resultsperpage);
***************
*** 71,77 ****
  	}
  	findseealso($dbh,\@tags);
  	my ($results,$total) = catalogsearch($dbh, \@tags,\@and_or,
  										\@excluding, \@operator, \@value,
! 										$startfrom*$resultsperpage, $resultsperpage,$orderby,$desc_or_asc);
  	if ($total ==1) {
  	if (C4::Context->preference("BiblioDefaultView") eq "normal") {
--- 109,145 ----
  	}
  	findseealso($dbh,\@tags);
+     my $sqlstring;
+     if ($itemtypesstring ne ''){
+         $sqlstring = 'and (biblioitems.itemtype IN (';
+         my $itemtypeloop=0;
+         foreach my $itemtype (@itemtypes){
+             if ($itemtype ne ''){
+                 if ($itemtypeloop != 0){
+                     $sqlstring .=','
+                 }
+                 $sqlstring .= '"'.$itemtype.'"';
+                 $itemtypeloop++;
+             }
+         }
+         $sqlstring .= '))'
+     }
+     if ($branchesstring ne ''){
+         $sqlstring .= 'and biblio.biblionumber=items.biblionumber and (items.holdingbranch IN (';
+         my $branchesloop=0;
+         foreach my $branch (@branches){
+             if ($branch ne ''){
+                 if ($branchesloop != 0){
+                     $sqlstring .=','
+                 }
+                 $sqlstring .= '"'.$branch.'"';
+                 $branchesloop++;
+             }
+         }
+         $sqlstring .= '))'
+     }
+ 
  	my ($results,$total) = catalogsearch($dbh, \@tags,\@and_or,
  										\@excluding, \@operator, \@value,
! 										$startfrom*$resultsperpage, $resultsperpage,$orderby,$desc_or_asc,$sqlstring);
  	if ($total ==1) {
  	if (C4::Context->preference("BiblioDefaultView") eq "normal") {
***************
*** 273,276 ****
--- 341,350 ----
  							suggestion => C4::Context->preference("suggestion"),
  							virtualshelves => C4::Context->preference("virtualshelves"),
+                 itemtypelist => $itemtypelist,
+               subcategorylist => $subcategorylist,
+               brancheslist => $brancheslist,
+               categorylist => $categorylist,
+               mediatypelist => $mediatypelist,
+               itemtypesstring => $itemtypesstring,
  							);
  
***************
*** 319,323 ****
  	$sth->finish;
      
! 	$template->param(classlist => $classlist,
  					CGIitemtype => $CGIitemtype,
  					CGIbranch => $CGIbranch,
--- 393,397 ----
  	$sth->finish;
      
! 	$template->param(itemtypelist => $itemtypelist,
  					CGIitemtype => $CGIitemtype,
  					CGIbranch => $CGIbranch,




From genjimoto at users.sourceforge.net  Thu Jun  2 02:48:00 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 17:48:00 -0700
Subject: [Koha-cvs] CVS: koha/opac searchoptions.pl,NONE,1.1
Message-ID: <E1DddsO-0002NV-HI@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9118

Added Files:
	searchoptions.pl 
Log Message:
Processes the Search options sidebar input, and places it into terms and values for opac-search.pl. Also passes along itemtypes to search on, branches to search on, and availablity bool.

--- NEW FILE ---
#!/usr/bin/perl
use strict;
require Exporter;
# Searching within results is done by simply adding on parameters onto the query, being careful to have the requried marclist etc fields.
use C4::Database;
use C4::Interface::CGI::Output;
use C4::Context;
use CGI;
my $query = new CGI;
my $newquery='';
my $allitemtypesbool = $query->param("allitemtypes");
my $allbranchesbool = $query->param("allbranches");
my $allcategoriesbool = $query->param("allcategories");
my $allsubcategoriesbool = $query->param("allsubcategories");
my $allmediatypesbool = $query->param("allmediatypes");
my $nbstatements = $query->param("nbstatementsori");
my $orderby = $query->param("orderbyori");
my @keywords = $query->param("keyword");
my @marclist = $query->param('marclist');
my @and_or = $query->param('and_or');
my @excluding = $query->param('excluding');
my @operator = $query->param('operator');
my @value = $query->param('value');
my $searchtype = $query->param('searchtype');
my $category = $query->param('categorylist');
my @itemtypeswanted = $query->param("itemtypeswanted");
my $itemtypessearched = $query->param("itemtypessearched");
my @mediatypeswanted = $query->param("mediatypeswanted");
my @subcategorieswanted = $query->param("subcategorieswanted");
my @brancheswanted = $query->param("brancheswanted");
my $avail = $query->param("avail");

my $brancheslist;
my $count=0;
my $newquery='';
my $subfoundbool=0;
my $itemtypefoundbool=0;
my $branchfoundbool=0;
my $itemtypeslist;
my $itemtypescatlist;
my $itemtypessubcatlist;
my $mediatypeslist;
$count=0;
my $dbh=C4::Context->dbh;
$newquery='op=do_search&nbstatements='.$nbstatements;
if ($allcategoriesbool eq '' && $category ne ''){

    my $sth=$dbh->prepare("select itemtypecodes from categorytable where categorycode=?");
    $sth->execute($category);
    $itemtypescatlist = $sth->fetchrow .'|';
    $sth->finish;
}
if ($allmediatypesbool eq '' && @mediatypeswanted ne ''){
    foreach my $mediatype (@mediatypeswanted){
        my $sth=$dbh->prepare("select itemtypecodes from mediatypetable where mediatypecode=?");
        $sth->execute($mediatype);
        $mediatypeslist .= $sth->fetchrow.'|';
        $sth->finish;

    }
}
if ($allsubcategoriesbool eq '' && @subcategorieswanted ne ''){
    foreach my $subcategory (@subcategorieswanted){
        my $sth=$dbh->prepare("select itemtypecodes from subcategorytable where subcategorycode=?");
        $sth->execute($subcategory);
        $itemtypessubcatlist .= $sth->fetchrow.'|';
        $sth->finish;

    }
}
if ($allitemtypesbool ne ''){
#warn @itemtypeswanted;
$itemtypeslist .=$itemtypescatlist.$itemtypessubcatlist.$mediatypeslist.$itemtypessearched.join ("|", @itemtypeswanted)
} else {
$itemtypeslist .=$itemtypescatlist.$itemtypessubcatlist.$mediatypeslist.$itemtypessearched
}
#warn $itemtypeslist;
if ($allbranchesbool == 0){
   $brancheslist = join("|", at brancheswanted)
}

if ($searchtype eq 'NewSearch'){

     $newquery .= '&marclist=';
     $newquery .= '&and_or=and';
     $newquery .= '&excluding=';
     $newquery .= '&operator=contains';
     $newquery .= '&value=';
     $newquery .=join(" ", at keywords)
} elsif ($searchtype eq 'SearchWithin'){
    foreach my $marclistitem (@marclist) {
         $newquery .= '&marclist='.$marclist[$count];
         $newquery .= '&and_or='.$and_or[$count];
         $newquery .= '&excluding='.$excluding[$count];
         $newquery .= '&operator=';
         $newquery .= $operator[$count];
         $newquery .= '&value='.$value[$count];
         if ($marclist[$count] eq ''){
             if ($subfoundbool=0){
                $subfoundbool=1;
                $newquery .=" ".join(" ", at keywords)
             }
         }
        $count++;

    }
    if ($subfoundbool == 0 && $query->param('keysub') ne ''){
        $newquery .= '&marclist=&and_or=and&excluding=&operator=contains&value=';
        $newquery .=join(" ", at keywords)
    }
}
$newquery .= '&orderby='.$orderby;
if ($itemtypeslist ne ''){
    $newquery .= '&itemtypesstring="'.$itemtypeslist.'"'
}
if ($brancheslist ne ''){
    $newquery .= '&branchesstring="'.$brancheslist.'"';
}
if ($avail ne ''){
    $newquery .= '&avail=1'
}
print $query->redirect("/cgi-bin/koha/opac-search.pl?$newquery");




From genjimoto at users.sourceforge.net  Thu Jun  2 04:37:34 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 19:37:34 -0700
Subject: [Koha-cvs] CVS: koha/admin mediatype.pl,NONE,1.1
Message-ID: <E1DdfaQ-0000s4-K1@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3308

Added Files:
	mediatype.pl 
Log Message:
script to edit the media type table.

--- NEW FILE ---
#!/usr/bin/perl
# NOTE: 4-character tabs

#script to administer the mediatype table
#modified from the itemtype script written 20/02/2002 by paul.poulain at free.fr
#This script written by waylon at robertson.net.nz at 2nd June, 2005

# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)

# ALGO :
# this script use an $op to know what to do.
# if $op is empty or none of the above values,
#	- the default screen is build (with all records, or filtered datas).
#	- the   user can clic on add, modify or delete record.
# if $op=add_form
#	- if primkey exists, this is a modification,so we read the $primkey record
#	- builds the add/modify form
# if $op=add_validate
#	- the user has just send datas, so we create/modify the record
# if $op=delete_form
#	- we show the record having primkey=$primkey and ask for deletion validation form
# if $op=delete_confirm
#	- we delete the record having primkey=$primkey


# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use CGI;
use C4::Context;
use C4::Output;
use C4::Search;
use C4::Auth;
use C4::Interface::CGI::Output;
use HTML::Template;

sub StringSearch  {
	my ($env,$searchstring,$type)=@_;
	my $dbh = C4::Context->dbh;
	$searchstring=~ s/\'/\\\'/g;
	my @data=split(' ',$searchstring);
	my $count=@data;
	my $sth=$dbh->prepare("Select * from mediatypetable where (description like ?) order by mediatypecode");
	$sth->execute("$data[0]%");
	my @results;
	while (my $data=$sth->fetchrow_hashref){
	push(@results,$data);
	}
	#  $sth->execute;
	$sth->finish;
	return (scalar(@results),\@results);
}

my $input = new CGI;
my $searchfield=$input->param('description');
my $offset=$input->param('offset');
my $script_name="/cgi-bin/koha/admin/mediatype.pl";
my $mediatypecode=$input->param('mediatypecode');
my $pagesize=20;
my $op = $input->param('op');
$searchfield=~ s/\,//g;
my ($template, $borrowernumber, $cookie)
    = get_template_and_user({template_name => "parameters/mediatype.tmpl",
			     query => $input,
			     type => "intranet",
			     authnotrequired => 0,
			     flagsrequired => {parameters => 1, management => 1},
			     debug => 1,
			     });

if ($op) {
$template->param(script_name => $script_name,
						$op              => 1); # we show only the TMPL_VAR names $op
} else {
$template->param(script_name => $script_name,
						else              => 1); # we show only the TMPL_VAR names $op
}
################## ADD_FORM ##################################
# called by default. Used to create form to add or  modify a record
if ($op eq 'add_form') {
	#start the page and read in includes
	#---- if primkey exists, it's a modify action, so read values to modify...
	my $data;
    my $itemtypes;
    my $dbh = C4::Context->dbh;
    my @itemtypesselected;
	if ($mediatypecode) {
    	my $sth=$dbh->prepare("select mediatypecode,description,itemtypecodes from mediatypetable where mediatypecode=?");
		$sth->execute($mediatypecode);
		$data=$sth->fetchrow_hashref;
		$sth->finish;
        @itemtypesselected = split ( /\|/, $data->{'itemtypecodes'} );
	}

    my $sth=$dbh->prepare("select description,itemtype from itemtypes order by description");
    $sth->execute;
    while (my ($description,$itemtype) = $sth->fetchrow) {
        $itemtypes .='<td><input type="checkbox" name="itemtypecodes" value="'.$itemtype.'"';
        if(grep /$itemtype/, at itemtypesselected){
            $itemtypes .=' checked';
        }
        $itemtypes .='>'.$description.'</td>';
    }

	$template->param(mediatypecode => $mediatypecode,
							description => $data->{'description'},
                            itemtypes => $itemtypes
							);
;
													# END $OP eq ADD_FORM
################## ADD_VALIDATE ##################################
# called by add_form, used to insert/modify data in DB
} elsif ($op eq 'add_validate') {
	my $dbh = C4::Context->dbh;
    my @itemtypecodesarray = $input->param('itemtypecodes');
    my $itemtypecodes=join('|', at itemtypecodesarray);
	my $sth=$dbh->prepare("replace mediatypetable (mediatypecode,description,itemtypecodes) values (?,?,?)");
	$sth->execute(
		$input->param('mediatypecode'),$input->param('description'),
		$itemtypecodes
        );
	$sth->finish;
	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=mediatype.pl\"></html>";
	exit;
													# END $OP eq ADD_VALIDATE
################## DELETE_CONFIRM ##################################
# called by default form, used to confirm deletion of data in DB
} elsif ($op eq 'delete_confirm') {
	#start the page and read in includes
	my $dbh = C4::Context->dbh;
	my $sth=$dbh->prepare("select mediatypecode,description,itemtypecodes from mediatypetable where mediatypecode=?");
	$sth->execute($mediatypecode);
	my $data=$sth->fetchrow_hashref;
	$sth->finish;

	$template->param(mediatypecode => $mediatypecode,
							description => $data->{'description'},
							itemtypecodes => $data->{'itemtypecodes'});
													# END $OP eq DELETE_CONFIRM
################## DELETE_CONFIRMED ##################################
# called by delete_confirm, used to effectively confirm deletion of data in DB
} elsif ($op eq 'delete_confirmed') {
	#start the page and read in includes
	my $dbh = C4::Context->dbh;
	my $mediatypecode=uc($input->param('mediatypecode'));
	my $sth=$dbh->prepare("delete from mediatypetable where mediatypecode=?");
	$sth->execute($mediatypecode);
	$sth->finish;
	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=mediatype.pl\"></html>";
	exit;
													# END $OP eq DELETE_CONFIRMED
################## DEFAULT ##################################
} else { # DEFAULT
	my $env;
	my ($count,$results)=StringSearch($env,$searchfield,'web');
	my $toggle=0;
	my @loop_data;
	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
		my %row_data;
		if ($toggle eq 0){
			$toggle=1;
		} else {
			$toggle=0;
		}
		$row_data{toggle} = $toggle;
		$row_data{mediatypecode} = $results->[$i]{mediatypecode};
		$row_data{description} = $results->[$i]{description};
		$row_data{itemtypecodes} = $results->[$i]{itemtypecodes};
		push(@loop_data, \%row_data);
	}
	$template->param(loop => \@loop_data);
	if ($offset>0) {
		my $prevpage = $offset-$pagesize;
		$template->param(previous => "$script_name?offset=".$prevpage);
	}
	if ($offset+$pagesize<$count) {
		my $nextpage =$offset+$pagesize;
		$template->param(next => "$script_name?offset=".$nextpage);
	}
} #---- END $OP eq DEFAULT
output_html_with_http_headers $input, $cookie, $template->output;

# Local Variables:
# tab-width: 4
# End:




From genjimoto at users.sourceforge.net  Thu Jun  2 05:08:25 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 20:08:25 -0700
Subject: [Koha-cvs] CVS: koha/admin itemtypecategory.pl,NONE,1.1
Message-ID: <E1Ddg4H-0004qg-1Y@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18598

Added Files:
	itemtypecategory.pl 
Log Message:
script to edit the category table.

--- NEW FILE ---
#!/usr/bin/perl
# NOTE: 4-character tabs

#script to administer the itemtype categories table
#modified from the itemtype script written 20/02/2002 by paul.poulain at free.fr
#This script written by waylon at robertson.net.nz at 2nd June, 2005
# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)

# ALGO :
# this script use an $op to know what to do.
# if $op is empty or none of the above values,
#	- the default screen is build (with all records, or filtered datas).
#	- the   user can clic on add, modify or delete record.
# if $op=add_form
#	- if primkey exists, this is a modification,so we read the $primkey record
#	- builds the add/modify form
# if $op=add_validate
#	- the user has just send datas, so we create/modify the record
# if $op=delete_form
#	- we show the record having primkey=$primkey and ask for deletion validation form
# if $op=delete_confirm
#	- we delete the record having primkey=$primkey


# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use CGI;
use C4::Context;
use C4::Output;
use C4::Search;
use C4::Auth;
use C4::Interface::CGI::Output;
use HTML::Template;

sub StringSearch  {
	my ($env,$searchstring,$type)=@_;
	my $dbh = C4::Context->dbh;
	$searchstring=~ s/\'/\\\'/g;
	my @data=split(' ',$searchstring);
	my $count=@data;
	my $sth=$dbh->prepare("Select * from categorytable where (description like ?) order by categorycode");
	$sth->execute("$data[0]%");
	my @results;
	while (my $data=$sth->fetchrow_hashref){
	push(@results,$data);
	}
	#  $sth->execute;
	$sth->finish;
	return (scalar(@results),\@results);
}

my $input = new CGI;
my $searchfield=$input->param('description');
my $offset=$input->param('offset');
my $script_name="/cgi-bin/koha/admin/itemtypecategory.pl";
my $categorycode=$input->param('categorycode');
my $pagesize=20;
my $op = $input->param('op');
$searchfield=~ s/\,//g;
my ($template, $borrowernumber, $cookie)
    = get_template_and_user({template_name => "parameters/itemtypecategory.tmpl",
			     query => $input,
			     type => "intranet",
			     authnotrequired => 0,
			     flagsrequired => {parameters => 1, management => 1},
			     debug => 1,
			     });

if ($op) {
$template->param(script_name => $script_name,
						$op              => 1); # we show only the TMPL_VAR names $op
} else {
$template->param(script_name => $script_name,
						else              => 1); # we show only the TMPL_VAR names $op
}
################## ADD_FORM ##################################
# called by default. Used to create form to add or  modify a record
if ($op eq 'add_form') {
	#start the page and read in includes
	#---- if primkey exists, it's a modify action, so read values to modify...
	my $data;
    my $itemtypes;
    my $dbh = C4::Context->dbh;
    my @itemtypesselected;
	if ($categorycode) {
    	my $sth=$dbh->prepare("select categorycode,description,itemtypecodes from categorytable where categorycode=?");
		$sth->execute($categorycode);
		$data=$sth->fetchrow_hashref;
		$sth->finish;
        @itemtypesselected = split ( /\|/, $data->{'itemtypecodes'} );
	}

    my $sth=$dbh->prepare("select description,itemtype from itemtypes order by description");
    $sth->execute;
    while (my ($description,$itemtype) = $sth->fetchrow) {
        $itemtypes .='<td><input type="checkbox" name="itemtypecodes" value="'.$itemtype.'"';
        if(grep /$itemtype/, at itemtypesselected){
            $itemtypes .=' checked';
        }
        $itemtypes .='>'.$description.'</td>';
    }

	$template->param(categorycode => $categorycode,
							description => $data->{'description'},
                            itemtypes => $itemtypes
							);
;
													# END $OP eq ADD_FORM
################## ADD_VALIDATE ##################################
# called by add_form, used to insert/modify data in DB
} elsif ($op eq 'add_validate') {
	my $dbh = C4::Context->dbh;
    my @itemtypecodesarray = $input->param('itemtypecodes');
    my $itemtypecodes=join('|', at itemtypecodesarray);
	my $sth=$dbh->prepare("replace categorytable (categorycode,description,itemtypecodes) values (?,?,?)");
	$sth->execute(
		$input->param('categorycode'),$input->param('description'),
		$itemtypecodes
        );
	$sth->finish;
	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=itemtypecategory.pl\"></html>";
	exit;
													# END $OP eq ADD_VALIDATE
################## DELETE_CONFIRM ##################################
# called by default form, used to confirm deletion of data in DB
} elsif ($op eq 'delete_confirm') {
	#start the page and read in includes
	my $dbh = C4::Context->dbh;
	my $sth=$dbh->prepare("select categorycode,description,itemtypecodes from categorytable where categorycode=?");
	$sth->execute($categorycode);
	my $data=$sth->fetchrow_hashref;
	$sth->finish;

	$template->param(categorycode => $categorycode,
							description => $data->{'description'},
							itemtypecodes => $data->{'itemtypecodes'});
													# END $OP eq DELETE_CONFIRM
################## DELETE_CONFIRMED ##################################
# called by delete_confirm, used to effectively confirm deletion of data in DB
} elsif ($op eq 'delete_confirmed') {
	#start the page and read in includes
	my $dbh = C4::Context->dbh;
	my $itemtype=uc($input->param('categorycode'));
	my $sth=$dbh->prepare("delete from categorytable where categorycode=?");
	$sth->execute($itemtype);
	$sth->finish;
	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=itemtypecategory.pl\"></html>";
	exit;
													# END $OP eq DELETE_CONFIRMED
################## DEFAULT ##################################
} else { # DEFAULT
	my $env;
	my ($count,$results)=StringSearch($env,$searchfield,'web');
	my $toggle=0;
	my @loop_data;
	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
		my %row_data;
		if ($toggle eq 0){
			$toggle=1;
		} else {
			$toggle=0;
		}
		$row_data{toggle} = $toggle;
		$row_data{categorycode} = $results->[$i]{categorycode};
		$row_data{description} = $results->[$i]{description};
		$row_data{itemtypecodes} = $results->[$i]{itemtypecodes};
		push(@loop_data, \%row_data);
	}
	$template->param(loop => \@loop_data);
	if ($offset>0) {
		my $prevpage = $offset-$pagesize;
		$template->param(previous => "$script_name?offset=".$prevpage);
	}
	if ($offset+$pagesize<$count) {
		my $nextpage =$offset+$pagesize;
		$template->param(next => "$script_name?offset=".$nextpage);
	}
} #---- END $OP eq DEFAULT
output_html_with_http_headers $input, $cookie, $template->output;

# Local Variables:
# tab-width: 4
# End:




From genjimoto at users.sourceforge.net  Thu Jun  2 05:31:19 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 20:31:19 -0700
Subject: [Koha-cvs] CVS: koha/admin itemtypesubcategory.pl,NONE,1.1
Message-ID: <E1DdgQR-00084o-0J@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30998

Added Files:
	itemtypesubcategory.pl 
Log Message:
script to edit the item subcategory table.

--- NEW FILE ---
#!/usr/bin/perl
# NOTE: 4-character tabs

#script to administer the itemtype subcategories table
#modified from the itemtype script written 20/02/2002 by paul.poulain at free.fr
#This script written by waylon at robertson.net.nz at 2nd June, 2005
# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)

# ALGO :
# this script use an $op to know what to do.
# if $op is empty or none of the above values,
#	- the default screen is build (with all records, or filtered datas).
#	- the   user can clic on add, modify or delete record.
# if $op=add_form
#	- if primkey exists, this is a modification,so we read the $primkey record
#	- builds the add/modify form
# if $op=add_validate
#	- the user has just send datas, so we create/modify the record
# if $op=delete_form
#	- we show the record having primkey=$primkey and ask for deletion validation form
# if $op=delete_confirm
#	- we delete the record having primkey=$primkey


# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use CGI;
use C4::Context;
use C4::Output;
use C4::Search;
use C4::Auth;
use C4::Interface::CGI::Output;
use HTML::Template;

sub StringSearch  {
	my ($env,$searchstring,$type)=@_;
	my $dbh = C4::Context->dbh;
	$searchstring=~ s/\'/\\\'/g;
	my @data=split(' ',$searchstring);
	my $count=@data;
	my $sth=$dbh->prepare("Select * from subcategorytable where (description like ?) order by subcategorycode");
	$sth->execute("$data[0]%");
	my @results;
	while (my $data=$sth->fetchrow_hashref){
	push(@results,$data);
	}
	#  $sth->execute;
	$sth->finish;
	return (scalar(@results),\@results);
}

my $input = new CGI;
my $searchfield=$input->param('description');
my $offset=$input->param('offset');
my $script_name="/cgi-bin/koha/admin/itemtypesubcategory.pl";
my $subcategorycode=$input->param('subcategorycode');
my $pagesize=20;
my $op = $input->param('op');
$searchfield=~ s/\,//g;
my ($template, $borrowernumber, $cookie)
    = get_template_and_user({template_name => "parameters/itemtypesubcategory.tmpl",
			     query => $input,
			     type => "intranet",
			     authnotrequired => 0,
			     flagsrequired => {parameters => 1, management => 1},
			     debug => 1,
			     });

if ($op) {
$template->param(script_name => $script_name,
						$op              => 1); # we show only the TMPL_VAR names $op
} else {
$template->param(script_name => $script_name,
						else              => 1); # we show only the TMPL_VAR names $op
}
################## ADD_FORM ##################################
# called by default. Used to create form to add or  modify a record
if ($op eq 'add_form') {
	#start the page and read in includes
	#---- if primkey exists, it's a modify action, so read values to modify...
	my $data;
    my $itemtypes;
    my $dbh = C4::Context->dbh;
    my @itemtypesselected;
	if ($subcategorycode) {
    	my $sth=$dbh->prepare("select subcategorycode,description,itemtypecodes from subcategorytable where subcategorycode=?");
		$sth->execute($subcategorycode);
		$data=$sth->fetchrow_hashref;
		$sth->finish;
        @itemtypesselected = split ( /\|/, $data->{'itemtypecodes'} );
	}

    my $sth=$dbh->prepare("select description,itemtype from itemtypes order by description");
    $sth->execute;
    while (my ($description,$itemtype) = $sth->fetchrow) {
        $itemtypes .='<td><input type="checkbox" name="itemtypecodes" value="'.$itemtype.'"';
        if(grep /$itemtype/, at itemtypesselected){
            $itemtypes .=' checked';
        }
        $itemtypes .='>'.$description.'</td>';
    }

	$template->param(subcategorycode => $subcategorycode,
							description => $data->{'description'},
                            itemtypes => $itemtypes
							);
;
													# END $OP eq ADD_FORM
################## ADD_VALIDATE ##################################
# called by add_form, used to insert/modify data in DB
} elsif ($op eq 'add_validate') {
	my $dbh = C4::Context->dbh;
    my @itemtypecodesarray = $input->param('itemtypecodes');
    my $itemtypecodes=join('|', at itemtypecodesarray);
	my $sth=$dbh->prepare("replace subcategorytable (subcategorycode,description,itemtypecodes) values (?,?,?)");
	$sth->execute(
		$input->param('subcategorycode'),$input->param('description'),
		$itemtypecodes
        );
	$sth->finish;
	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=itemtypesubcategory.pl\"></html>";
	exit;
													# END $OP eq ADD_VALIDATE
################## DELETE_CONFIRM ##################################
# called by default form, used to confirm deletion of data in DB
} elsif ($op eq 'delete_confirm') {
	#start the page and read in includes
	my $dbh = C4::Context->dbh;
	my $sth=$dbh->prepare("select subcategorycode,description,itemtypecodes from subcategorytable where subcategorycode=?");
	$sth->execute($subcategorycode);
	my $data=$sth->fetchrow_hashref;
	$sth->finish;

	$template->param(subcategorycode => $subcategorycode,
							description => $data->{'description'},
							itemtypecodes => $data->{'itemtypecodes'});
													# END $OP eq DELETE_CONFIRM
################## DELETE_CONFIRMED ##################################
# called by delete_confirm, used to effectively confirm deletion of data in DB
} elsif ($op eq 'delete_confirmed') {
	#start the page and read in includes
	my $dbh = C4::Context->dbh;
	my $subcategorycode=uc($input->param('subcategorycode'));
	my $sth=$dbh->prepare("delete from subcategorytable where subcategorycode=?");
	$sth->execute($subcategorycode);
	$sth->finish;
	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=itemtypesubcategory.pl\"></html>";
	exit;
													# END $OP eq DELETE_CONFIRMED
################## DEFAULT ##################################
} else { # DEFAULT
	my $env;
	my ($count,$results)=StringSearch($env,$searchfield,'web');
	my $toggle=0;
	my @loop_data;
	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
		my %row_data;
		if ($toggle eq 0){
			$toggle=1;
		} else {
			$toggle=0;
		}
		$row_data{toggle} = $toggle;
		$row_data{subcategorycode} = $results->[$i]{subcategorycode};
		$row_data{description} = $results->[$i]{description};
		$row_data{itemtypecodes} = $results->[$i]{itemtypecodes};
		push(@loop_data, \%row_data);
	}
	$template->param(loop => \@loop_data);
	if ($offset>0) {
		my $prevpage = $offset-$pagesize;
		$template->param(previous => "$script_name?offset=".$prevpage);
	}
	if ($offset+$pagesize<$count) {
		my $nextpage =$offset+$pagesize;
		$template->param(next => "$script_name?offset=".$nextpage);
	}
} #---- END $OP eq DEFAULT
output_html_with_http_headers $input, $cookie, $template->output;

# Local Variables:
# tab-width: 4
# End:




From genjimoto at users.sourceforge.net  Thu Jun  2 05:55:28 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 20:55:28 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters itemtypesubcategory.tmpl,NONE,1.1
Message-ID: <E1Ddgno-0002eG-JD@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	itemtypesubcategory.tmpl 
Log Message:
template to edit the item subcategory table.

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->

<script language="javascript" type="text/javascript">
function _(s) { return s } // dummy function for gettext
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNotNull(f,noalert) {
	if (f.value.length ==0) {
		return false;
	}
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function toUC(f) {
	var x=f.value.toUpperCase();
	f.value=x;
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNum(v,maybenull) {
var n = new Number(v.value);
if (isNaN(n)) {
	return false;
	}
if (maybenull==0 && v.value=='') {
	return false;
}
return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isDate(f) {
	var t = Date.parse(f.value);
	if (isNaN(t)) {
		return false;
	}
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function Check(f) {
	var ok=1;
	var _alertString="";
	var alertString2;
	if (f.subcategorycode.value.length==0) {
		_alertString += "\n- " + _("Subcategorycode missing");
	}
	if (!(isNotNull(window.document.Aform.description,1))) {
		_alertString += "\n- " + _("Description missing");
	}
	if (_alertString.length==0) {
		document.Aform.submit();
	} else {
		alertString2  = _("Form not submitted because of the following problem(s)");
		alertString2 += "\n------------------------------------------------------------------------------------\n";
		alertString2 += _alertString;
		alert(alertString2);
	}
}
</script>
<div id="mainbloc">
<!-- TMPL_IF NAME="add_form" -->
	<!-- TMPL_IF NAME="itemtype" -->
		<h1 class="parameters">Modify Subcategory</h1>
	<!-- TMPL_ELSE -->
		<h1 class="parameters">Add Subcategory</h1>
	<!-- /TMPL_IF -->
	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
		<input type="hidden" name="op" value="add_validate">
		<input type="hidden" name="checked" value="0">
			<!-- TMPL_IF NAME="subcategorycode" -->
				<p><label class="label100">Subcategory Code<label><input type="hidden" name="subcategorycode" value="<!-- TMPL_VAR NAME="subcategorycode" -->"><!-- TMPL_VAR NAME="subcategorycode" --></p>
			<!-- TMPL_ELSE -->
				<p><label class="label100">Subcategory Code<label><input type="text" name="subcategorycode" size="6" maxlength="4" onblur="toUC(this)"></p>
			<!-- /TMPL_IF -->
			<p>
				<label class="label100">Description</label>
				<input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="description" escape=HTML -->">
			</p>
			<p>
				<label class="label100">Itemtypes assigned</label>
                <!-- TMPL_VAR NAME="itemtypes" -->

			</p>

			<p>
				<input type="button" value="OK" class="button" onclick="Check(this.form)">
			</p>
	</form>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirm" -->
		<p><label>Subcategory Code</label><!-- TMPL_VAR NAME="subcategorycode" --></p>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="subcategorycode" value="<!-- TMPL_VAR NAME="subcategorycode" -->">
	<p><label>Description</label><!-- TMPL_VAR NAME="description" --></p>
		<p>CONFIRM DELETION</p>
		<p>
			<input type="submit" value="YES" class="button parameters"></form>
			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO" class="button parameters"></form>
		</p>


<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="else" -->
<h1 class="parameters">Subcategory Admin</h1>
<table>
	<tr>
		<th class="parameters">Code</th>
		<th class="parameters">Description</th>
        <th class="parameters">Itemtype codes</th>
		<th class="parameters">Edit</th>
		<th class="parameters">Delete</th>
	</tr>
	<!-- TMPL_LOOP NAME="loop" -->
		<tr>
			<td><!-- TMPL_VAR NAME="subcategorycode" --></td>
			<td><!-- TMPL_VAR NAME="description" --></td>
			<td><!-- TMPL_VAR NAME="itemtypecodes" --></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&subcategorycode=<!-- TMPL_VAR NAME="subcategorycode" escape="HTML" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&subcategorycode=<!-- TMPL_VAR NAME="subcategorycode" escape="HTML" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
		</tr>
	<!-- /TMPL_LOOP -->
</table>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<input type="hidden" name="op" value="add_form">
	<input type="submit" class="button parameters" value="Add Subcategory" title="Add Subcategory" alt="Add Subcategory" >
	<td width="33%"><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->"><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0"></a><!-- /TMPL_IF --></td>
	<td width="33%"><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->"><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0"></a><!-- /TMPL_IF --></td>
</form>
</div>
<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->




From genjimoto at users.sourceforge.net  Thu Jun  2 05:56:01 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 20:56:01 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters mediatype.tmpl,NONE,1.1
Message-ID: <E1DdgoL-0002hl-7b@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	mediatype.tmpl 
Log Message:
template to edit the mediatype table.

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->

<script language="javascript" type="text/javascript">
function _(s) { return s } // dummy function for gettext
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNotNull(f,noalert) {
	if (f.value.length ==0) {
		return false;
	}
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function toUC(f) {
	var x=f.value.toUpperCase();
	f.value=x;
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNum(v,maybenull) {
var n = new Number(v.value);
if (isNaN(n)) {
	return false;
	}
if (maybenull==0 && v.value=='') {
	return false;
}
return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isDate(f) {
	var t = Date.parse(f.value);
	if (isNaN(t)) {
		return false;
	}
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function Check(f) {
	var ok=1;
	var _alertString="";
	var alertString2;
	if (f.mediatypecode.value.length==0) {
		_alertString += "\n- " + _("mediatypecode missing");
	}
	if (!(isNotNull(window.document.Aform.description,1))) {
		_alertString += "\n- " + _("Description missing");
	}
	if (_alertString.length==0) {
		document.Aform.submit();
	} else {
		alertString2  = _("Form not submitted because of the following problem(s)");
		alertString2 += "\n------------------------------------------------------------------------------------\n";
		alertString2 += _alertString;
		alert(alertString2);
	}
}
</script>
<div id="mainbloc">
<!-- TMPL_IF NAME="add_form" -->
	<!-- TMPL_IF NAME="itemtype" -->
		<h1 class="parameters">Modify mediatype</h1>
	<!-- TMPL_ELSE -->
		<h1 class="parameters">Add mediatype</h1>
	<!-- /TMPL_IF -->
	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
		<input type="hidden" name="op" value="add_validate">
		<input type="hidden" name="checked" value="0">
			<!-- TMPL_IF NAME="mediatypecode" -->
				<p><label class="label100">mediatype Code<label><input type="hidden" name="mediatypecode" value="<!-- TMPL_VAR NAME="mediatypecode" -->"><!-- TMPL_VAR NAME="mediatypecode" --></p>
			<!-- TMPL_ELSE -->
				<p><label class="label100">mediatype Code<label><input type="text" name="mediatypecode" size="6" maxlength="4" onblur="toUC(this)"></p>
			<!-- /TMPL_IF -->
			<p>
				<label class="label100">Description</label>
				<input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="description" escape=HTML -->">
			</p>
			<p>
				<label class="label100">Itemtypes assigned</label>
                <!-- TMPL_VAR NAME="itemtypes" -->

			</p>

			<p>
				<input type="button" value="OK" class="button" onclick="Check(this.form)">
			</p>
	</form>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirm" -->
		<p><label>mediatype Code</label><!-- TMPL_VAR NAME="mediatypecode" --></p>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="mediatypecode" value="<!-- TMPL_VAR NAME="mediatypecode" -->">
	<p><label>Description</label><!-- TMPL_VAR NAME="description" --></p>
		<p>CONFIRM DELETION</p>
		<p>
			<input type="submit" value="YES" class="button parameters"></form>
			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO" class="button parameters"></form>
		</p>


<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="else" -->
<h1 class="parameters">mediatype Admin</h1>
<table>
	<tr>
		<th class="parameters">Code</th>
		<th class="parameters">Description</th>
        <th class="parameters">Itemtype codes</th>
		<th class="parameters">Edit</th>
		<th class="parameters">Delete</th>
	</tr>
	<!-- TMPL_LOOP NAME="loop" -->
		<tr>
			<td><!-- TMPL_VAR NAME="mediatypecode" --></td>
			<td><!-- TMPL_VAR NAME="description" --></td>
			<td><!-- TMPL_VAR NAME="itemtypecodes" --></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&mediatypecode=<!-- TMPL_VAR NAME="mediatypecode" escape="HTML" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&mediatypecode=<!-- TMPL_VAR NAME="mediatypecode" escape="HTML" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
		</tr>
	<!-- /TMPL_LOOP -->
</table>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<input type="hidden" name="op" value="add_form">
	<input type="submit" class="button parameters" value="Add mediatype" title="Add mediatype" alt="Add mediatype" >
	<td width="33%"><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->"><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0"></a><!-- /TMPL_IF --></td>
	<td width="33%"><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->"><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0"></a><!-- /TMPL_IF --></td>
</form>
</div>
<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->




From genjimoto at users.sourceforge.net  Thu Jun  2 05:55:04 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 20:55:04 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters itemtypecategory.tmpl,NONE,1.1
Message-ID: <E1DdgnQ-0002Z0-FS@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	itemtypecategory.tmpl 
Log Message:
template to edit the item category table.

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->

<script language="javascript" type="text/javascript">
function _(s) { return s } // dummy function for gettext
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNotNull(f,noalert) {
	if (f.value.length ==0) {
		return false;
	}
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function toUC(f) {
	var x=f.value.toUpperCase();
	f.value=x;
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNum(v,maybenull) {
var n = new Number(v.value);
if (isNaN(n)) {
	return false;
	}
if (maybenull==0 && v.value=='') {
	return false;
}
return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isDate(f) {
	var t = Date.parse(f.value);
	if (isNaN(t)) {
		return false;
	}
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function Check(f) {
	var ok=1;
	var _alertString="";
	var alertString2;
	if (f.categorycode.value.length==0) {
		_alertString += "\n- " + _("Categorycode missing");
	}
	if (!(isNotNull(window.document.Aform.description,1))) {
		_alertString += "\n- " + _("Description missing");
	}
	if (_alertString.length==0) {
		document.Aform.submit();
	} else {
		alertString2  = _("Form not submitted because of the following problem(s)");
		alertString2 += "\n------------------------------------------------------------------------------------\n";
		alertString2 += _alertString;
		alert(alertString2);
	}
}
</script>
<div id="mainbloc">
<!-- TMPL_IF NAME="add_form" -->
	<!-- TMPL_IF NAME="itemtype" -->
		<h1 class="parameters">Modify Category</h1>
	<!-- TMPL_ELSE -->
		<h1 class="parameters">Add Category</h1>
	<!-- /TMPL_IF -->
	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
		<input type="hidden" name="op" value="add_validate">
		<input type="hidden" name="checked" value="0">
			<!-- TMPL_IF NAME="categorycode" -->
				<p><label class="label100">Category Code<label><input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->"><!-- TMPL_VAR NAME="categorycode" --></p>
			<!-- TMPL_ELSE -->
				<p><label class="label100">Category Code<label><input type="text" name="categorycode" size="6" maxlength="4" onblur="toUC(this)"></p>
			<!-- /TMPL_IF -->
			<p>
				<label class="label100">Description</label>
				<input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="description" escape=HTML -->">
			</p>
			<p>
				<label class="label100">Itemtypes assigned</label>
                <!-- TMPL_VAR NAME="itemtypes" -->

			</p>

			<p>
				<input type="button" value="OK" class="button" onclick="Check(this.form)">
			</p>
	</form>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirm" -->
		<p><label>Category Code</label><!-- TMPL_VAR NAME="categorycode" --></p>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->">
	<p><label>Description</label><!-- TMPL_VAR NAME="description" --></p>
		<p>CONFIRM DELETION</p>
		<p>
			<input type="submit" value="YES" class="button parameters"></form>
			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO" class="button parameters"></form>
		</p>


<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="else" -->
<h1 class="parameters">Category Admin</h1>
<table>
	<tr>
		<th class="parameters">Code</th>
		<th class="parameters">Description</th>
        <th class="parameters">Itemtype codes</th>
		<th class="parameters">Edit</th>
		<th class="parameters">Delete</th>
	</tr>
	<!-- TMPL_LOOP NAME="loop" -->
		<tr>
			<td><!-- TMPL_VAR NAME="categorycode" --></td>
			<td><!-- TMPL_VAR NAME="description" --></td>
			<td><!-- TMPL_VAR NAME="itemtypecodes" --></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&categorycode=<!-- TMPL_VAR NAME="categorycode" escape="HTML" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&categorycode=<!-- TMPL_VAR NAME="categorycode" escape="HTML" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
		</tr>
	<!-- /TMPL_LOOP -->
</table>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<input type="hidden" name="op" value="add_form">
	<input type="submit" class="button parameters" value="Add Category" title="Add Category" alt="Add Category" >
	<td width="33%"><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->"><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0"></a><!-- /TMPL_IF --></td>
	<td width="33%"><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->"><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0"></a><!-- /TMPL_IF --></td>
</form>
</div>
<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->




From genjimoto at users.sourceforge.net  Thu Jun  2 06:36:24 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 21:36:24 -0700
Subject: [Koha-cvs] CVS: koha/opac searchoptions.pl,1.1,1.2
Message-ID: <E1DdhRQ-0007cU-Mm@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29233

Modified Files:
	searchoptions.pl 
Log Message:
minor bugfix

Index: searchoptions.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/searchoptions.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** searchoptions.pl	2 Jun 2005 00:47:58 -0000	1.1
--- searchoptions.pl	2 Jun 2005 04:36:22 -0000	1.2
***************
*** 34,48 ****
  my $count=0;
  my $newquery='';
! my $subfoundbool=0;
! my $itemtypefoundbool=0;
! my $branchfoundbool=0;
  my $itemtypeslist;
  my $itemtypescatlist;
  my $itemtypessubcatlist;
  my $mediatypeslist;
  $count=0;
  my $dbh=C4::Context->dbh;
  $newquery='op=do_search&nbstatements='.$nbstatements;
! if ($allcategoriesbool eq '' && $category ne ''){
  
      my $sth=$dbh->prepare("select itemtypecodes from categorytable where categorycode=?");
--- 34,47 ----
  my $count=0;
  my $newquery='';
! my $keywordfoundbool=0;
  my $itemtypeslist;
  my $itemtypescatlist;
  my $itemtypessubcatlist;
  my $mediatypeslist;
+ 
  $count=0;
  my $dbh=C4::Context->dbh;
  $newquery='op=do_search&nbstatements='.$nbstatements;
! if ($allcategoriesbool == 0 && $category ne ''){
  
      my $sth=$dbh->prepare("select itemtypecodes from categorytable where categorycode=?");
***************
*** 51,55 ****
      $sth->finish;
  }
! if ($allmediatypesbool eq '' && @mediatypeswanted ne ''){
      foreach my $mediatype (@mediatypeswanted){
          my $sth=$dbh->prepare("select itemtypecodes from mediatypetable where mediatypecode=?");
--- 50,54 ----
      $sth->finish;
  }
! if ($allmediatypesbool == 0 && @mediatypeswanted ne ''){
      foreach my $mediatype (@mediatypeswanted){
          my $sth=$dbh->prepare("select itemtypecodes from mediatypetable where mediatypecode=?");
***************
*** 60,64 ****
      }
  }
! if ($allsubcategoriesbool eq '' && @subcategorieswanted ne ''){
      foreach my $subcategory (@subcategorieswanted){
          my $sth=$dbh->prepare("select itemtypecodes from subcategorytable where subcategorycode=?");
--- 59,63 ----
      }
  }
! if ($allsubcategoriesbool == 0 && @subcategorieswanted ne ''){
      foreach my $subcategory (@subcategorieswanted){
          my $sth=$dbh->prepare("select itemtypecodes from subcategorytable where subcategorycode=?");
***************
*** 69,79 ****
      }
  }
! if ($allitemtypesbool ne ''){
! #warn @itemtypeswanted;
  $itemtypeslist .=$itemtypescatlist.$itemtypessubcatlist.$mediatypeslist.$itemtypessearched.join ("|", @itemtypeswanted)
  } else {
  $itemtypeslist .=$itemtypescatlist.$itemtypessubcatlist.$mediatypeslist.$itemtypessearched
  }
! #warn $itemtypeslist;
  if ($allbranchesbool == 0){
     $brancheslist = join("|", at brancheswanted)
--- 68,78 ----
      }
  }
! if ($allitemtypesbool == 0){
! 
  $itemtypeslist .=$itemtypescatlist.$itemtypessubcatlist.$mediatypeslist.$itemtypessearched.join ("|", @itemtypeswanted)
  } else {
  $itemtypeslist .=$itemtypescatlist.$itemtypessubcatlist.$mediatypeslist.$itemtypessearched
  }
! 
  if ($allbranchesbool == 0){
     $brancheslist = join("|", at brancheswanted)
***************
*** 97,102 ****
           $newquery .= '&value='.$value[$count];
           if ($marclist[$count] eq ''){
!              if ($subfoundbool=0){
!                 $subfoundbool=1;
                  $newquery .=" ".join(" ", at keywords)
               }
--- 96,101 ----
           $newquery .= '&value='.$value[$count];
           if ($marclist[$count] eq ''){
!              if ($keywordfoundbool=0){
!                 $keywordfoundbool=1;
                  $newquery .=" ".join(" ", at keywords)
               }
***************
*** 105,109 ****
  
      }
!     if ($subfoundbool == 0 && $query->param('keysub') ne ''){
          $newquery .= '&marclist=&and_or=and&excluding=&operator=contains&value=';
          $newquery .=join(" ", at keywords)
--- 104,108 ----
  
      }
!     if ($keywordfoundbool == 0 && $query->param('keysub') ne ''){
          $newquery .= '&marclist=&and_or=and&excluding=&operator=contains&value=';
          $newquery .=join(" ", at keywords)




From hdl at users.sourceforge.net  Thu Jun  2 15:03:37 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 02 Jun 2005 06:03:37 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-sendbasket.pl,1.4.2.2,1.4.2.3
Message-ID: <E1DdpMH-0004mE-2H@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18305/opac

Modified Files:
      Tag: rel_2_2
	opac-sendbasket.pl 
Log Message:
Sending e-mail with joined file.
Seems to work OK. But I never received the email. 
May be my postfix configuration.

Index: opac-sendbasket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-sendbasket.pl,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -r1.4.2.2 -r1.4.2.3
*** opac-sendbasket.pl	1 Jun 2005 19:55:53 -0000	1.4.2.2
--- opac-sendbasket.pl	2 Jun 2005 13:03:31 -0000	1.4.2.3
***************
*** 130,133 ****
--- 130,135 ----
  	if (sendmail %mail) {
  	# do something if it works....
+ #		warn " ".$mail{body};
+ #		warn " ".$mail{PJ};
  		warn "Mail sent ok\n";
  		$template->param(SENT => "1");




From genjimoto at users.sourceforge.net  Thu Jun  2 15:29:30 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Thu, 02 Jun 2005 06:29:30 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-search.pl,1.25,1.26
Message-ID: <E1DdplK-0008CR-GY@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31474

Modified Files:
	opac-search.pl 
Log Message:
minor bugfix

Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** opac-search.pl	1 Jun 2005 23:07:17 -0000	1.25
--- opac-search.pl	2 Jun 2005 13:29:28 -0000	1.26
***************
*** 409,410 ****
--- 409,411 ----
  else {
  output_html_with_http_headers $query, $cookie, $template->output;
+ }




From gmccullagh at users.sourceforge.net  Thu Jun  2 15:47:49 2005
From: gmccullagh at users.sourceforge.net (gavin)
Date: Thu, 02 Jun 2005 06:47:49 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-search.pl,1.26,1.27
Message-ID: <E1Ddq33-0002LI-FM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8814

Modified Files:
	opac-search.pl 
Log Message:
just declared $totalResults and added an indent at the end


Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** opac-search.pl	2 Jun 2005 13:29:28 -0000	1.26
--- opac-search.pl	2 Jun 2005 13:47:47 -0000	1.27
***************
*** 23,26 ****
--- 23,29 ----
  my $subcategorylist;
  my $mediatypelist;
+ # added by Gavin 
+ my $totalresults;
+ 
  my $dbh=C4::Context->dbh;
  my $sth=$dbh->prepare("select description,itemtype from itemtypes order by description");
***************
*** 181,186 ****
  #      how this is done
  # 4.
! # 
  $totalresults = $total;
  ## This formats the 'search results' string and populates
  ## the 'OPLIN' variable as well as the 'spellcheck' variable
--- 184,190 ----
  #      how this is done
  # 4.
!  
  $totalresults = $total;
+ 
  ## This formats the 'search results' string and populates
  ## the 'OPLIN' variable as well as the 'spellcheck' variable
***************
*** 408,411 ****
  }
  else {
! output_html_with_http_headers $query, $cookie, $template->output;
  }
--- 412,415 ----
  }
  else {
!   output_html_with_http_headers $query, $cookie, $template->output;
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:16:56 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:16:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_100.tmpl,1.4,1.5
Message-ID: <E1DdrRI-0006D3-V0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23811/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_100.tmpl 
Log Message:
Template for 100a field plugin

Index: unimarc_field_100.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_100.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** unimarc_field_100.tmpl	1 Mar 2005 13:41:02 -0000	1.4
--- unimarc_field_100.tmpl	2 Jun 2005 15:16:54 -0000	1.5
***************
*** 1,652 ****
! <html>
! <head>
! <title>UNIMARC Field 100 builder</title>
! </head>
! <body>
  <form name="f_pop" onSubmit="javascript:report()">
! <table>
! 	<tr>
! 		<td>Date d'enregistrement</td>
! 		<td><input type="text" name="f1" maxlength=8 size=9 value="<!-- TMPL_VAR name="f1" -->"></td>
[...1364 lines suppressed...]
+ 		var jour = now.getDate();
+ 		var annee = now.getYear();
+ 
+ 		mois += 1;
+ 		if (mois < 10) { mois = "0" + mois; }
+ 		
+ 		if (annee < 2000) { annee += 1900; }
+ 		
+ 		var dateString = annee + mois + jour;
+ 		return dateString; 
+ 	}
+ 
+ 	function initForm() {
+ 		if (document.f_pop.f1.value == "") { document.f_pop.f1.value = formeDate(); }
+ 	}
+ 
+ 	initForm();
  </script>
! 
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From hdl at users.sourceforge.net  Thu Jun  2 17:19:37 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 02 Jun 2005 08:19:37 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-serial-issues.tmpl,1.2.2.2,1.2.2.3
Message-ID: <E1DdrTt-0006gF-OF@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-serial-issues.tmpl 
Log Message:
Adding history of received and missing serials to simple information

Index: opac-serial-issues.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -r1.2.2.2 -r1.2.2.3
*** opac-serial-issues.tmpl	4 Mar 2005 16:13:55 -0000	1.2.2.2
--- opac-serial-issues.tmpl	2 Jun 2005 15:19:35 -0000	1.2.2.3
***************
*** 75,78 ****
--- 75,79 ----
  		since <b><!-- TMPl_VAR name="startdate" --></b>
  		</p>
+ <!--TMPL_UNLESS Name=fullinfo -->
  		<p><!-- TMPL_VAR name="notes" --></p>
  	<!-- TMPL_IF name="opacnote" -->
***************
*** 82,85 ****
--- 83,99 ----
  		</p>
  	<!-- /TMPL_IF -->
+ 	<!-- TMPL_IF name="recievedlist" -->
+ 		<p>
+ 		<!-- TMPL_VAR name="recievedlist" -->
+ 			are recieved.
+ 		</p>
+ 	<!--/TMPL_IF -->
+ 	<!-- TMPL_IF name="missinglist" -->
+ 	<p>
+ 			<!-- TMPL_VAR name="missinglist" -->
+ 		are missing.
+ 	</p>
+ 	<!--/TMPL_IF -->
+ <!-- /TMPL_UNLESS -->
  </div>
  <!-- /TMPL_LOOP -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:20:00 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:20:00 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_105.tmpl,1.4,1.5
Message-ID: <E1DdrUG-0006ic-FR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25724/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_105.tmpl 
Log Message:
Template for 105a field plugin

Index: unimarc_field_105.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_105.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** unimarc_field_105.tmpl	1 Mar 2005 13:41:02 -0000	1.4
--- unimarc_field_105.tmpl	2 Jun 2005 15:19:57 -0000	1.5
***************
*** 1,1168 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 105</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Illustration 1:</td>

! 		<td>

[...2179 lines suppressed...]
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:15em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value +document.f_pop.f6.value +document.f_pop.f7.value +document.f_pop.f8.value +document.f_pop.f9.value +document.f_pop.f10.value +document.f_pop.f11.value +document.f_pop.f12.value +document.f_pop.f13.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:20:27 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:20:27 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_106.tmpl,1.2,1.3
Message-ID: <E1DdrUh-0006pQ-L2@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26214/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_106.tmpl 
Log Message:
Template for 106a field plugin

Index: unimarc_field_106.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_106.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_106.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_106.tmpl	2 Jun 2005 15:20:25 -0000	1.3
***************
*** 1,81 ****
! <html>
! <head>
! <title>UNIMARC Field 106 builder</title>
! </head>
! <body>
  <form name="f_pop" onSubmit="javascript:report()">
- <table>
- 	<tr>
- 		<td>Texte presentation physique</td>
- 		<td>
- 			<select name="f1" size="1">
- 	                        <!-- TMPL_IF name="f1 " -->
-                                 <option value=" " SELECTED>Aucun</option>
-                         <!-- TMPL_ELSE -->
-                                 <option value=" ">Aucun</option>
-                         <!-- /TMPL_IF -->
  
! 			<!-- TMPL_IF name="f1r" -->
! 				<option value="r" SELECTED>Impression normale</option>
! 			<!-- TMPL_ELSE -->
! 				<option value="r">Impression normale</option>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="f1b" -->
! 				<option value="d" SELECTED>Impression
! 				en gros caractere</option>
! 			<!-- TMPL_ELSE -->
! 				<option value="d">Impression en gros caractere</option>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="f1e" -->
! 				<option value="e" SELECTED>Journal</option>
! 			<!-- TMPL_ELSE -->
! 				<option value="e">Journal</option>
! 	
! 			<!-- /TMPL_IF -->
  
  
- 			<!-- TMPL_IF name="f1f" -->
- 				<option value="f" SELECTED>Caractere braille et moon</option>
- 			<!-- TMPL_ELSE -->
- 				<option value="f">Caractere braille et moon</option>
- 	
- 			<!-- /TMPL_IF -->
- 			<!-- TMPL_IF name="f1g" -->
- 				<option value="g" SELECTED>Micro-impression</option>
- 			<!-- TMPL_ELSE -->
- 				<option value="g">Micro-impression</option>
- 	
- 			<!-- /TMPL_IF -->
- 			<!-- TMPL_IF name="f1h" -->
- 				<option value="h" SELECTED>Manuscrit</option>
- 			<!-- TMPL_ELSE -->
- 				<option value="h">Manuscrit</option>
- 	
- 			<!-- /TMPL_IF -->
- 			<!-- TMPL_IF name="f1i" -->
- 				<option value="i" SELECTED>Multimedia</option>
- 			<!-- TMPL_ELSE -->
- 				<option value="i">Multimedia</option>
- 	
- 			<!-- /TMPL_IF -->
- 			<!-- TMPL_IF name="f1j" -->
- 				<option value="j" SELECTED>Impression en reduction</option>
- 			<!-- TMPL_ELSE -->
- 				<option value="j">Impression en reduction</option>
- 	
- 			<!-- /TMPL_IF -->
- 			<!-- TMPL_IF name="f1z" -->
- 				<option value="z" SELECTED>Autres formes de presentation</option>
- 			<!-- TMPL_ELSE -->
- 				<option value="z">Autres formes de presentation</option>
- 	
- 			<!-- /TMPL_IF -->
- 			</select>
- 		</td>
- 	</tr>
- 	
- 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>
- </table>
  </form>
  <script>
  	function report() {
--- 1,71 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 106a</h1>
  <form name="f_pop" onSubmit="javascript:report()">
  
! <p>
! 	<label style="width:15em;">Texte présentation physique</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1r" -->
! 		<option value="r" SELECTED>Impression normale</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="r">Impression normale</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="d" SELECTED>Impression en gros caractères</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Impression en gros caractères</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Journal</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Journal</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1f" -->
! 		<option value="f" SELECTED>Caractères braille et moon</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Caractères braille et moon</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1g" -->
! 		<option value="g" SELECTED>Micro-impression</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Micro-impression</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1h" -->
! 		<option value="h" SELECTED>Manuscrit</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Manuscrit</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1i" -->
! 		<option value="i" SELECTED>Multimédia</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="i">Multimédia</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1j" -->
! 		<option value="j" SELECTED>Impression en réduction</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="j">Impression en réduction</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1z" -->
! 		<option value="z" SELECTED>Autres formes de présentation</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autres formes de présentation</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
  
+ <br>
+ <p>
+ 	<label style="width:15em;">&nbsp;</label>
+ 	<input type="submit" value="OK" class="button authority">
+ </p>
  
  </form>
+ </div>
  <script>
  	function report() {
***************
*** 87,90 ****
  	}
  </script>
! </body>
! </html>
--- 77,79 ----
  	}
  </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:20:57 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:20:57 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_110.tmpl,1.2,1.3
Message-ID: <E1DdrVB-0006tk-0f@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26457/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_110.tmpl 
Log Message:
Template for 110a field plugin

Index: unimarc_field_110.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_110.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_110.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_110.tmpl	2 Jun 2005 15:20:54 -0000	1.3
***************
*** 1,662 ****
! <html>
! <head>
! <title>UNIMARC Field 106 builder</title>
! </head>
! <body>
  <form name="f_pop" onSubmit="javascript:report()">
! <table>
! 	<tr>
! 		<td>Type de publication en serie</td>
! 		<td>
[...1137 lines suppressed...]
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
  </form>
+ </div>
  <script>
  	function report() {
***************
*** 674,677 ****
  	}
  </script>
! </body>
! </html>
--- 506,508 ----
  	}
  </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:21:21 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:21:21 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_115a.tmpl,1.2,1.3
Message-ID: <E1DdrVZ-0006zq-1B@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26823/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_115a.tmpl 
Log Message:
Template for 115a field plugin

Index: unimarc_field_115a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_115a.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_115a.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_115a.tmpl	2 Jun 2005 15:21:18 -0000	1.3
***************
*** 1,1309 ****
! <html>
! <head>
! <title>UNIMARC Field 115a builder</title>
! </head>
! <body>
  <form name="f_pop" onSubmit="javascript:report()">
! <table>
! 	<tr>
! 		<td>Type de document</td>
! 		<td>
[...2258 lines suppressed...]
! <br>
! <p>
! 	<label style="width:22em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
  </form>
+ </div>
  <script>
  	function report() {
***************
*** 1317,1320 ****
  	}
  </script>
! </body>
! </html>
--- 976,978 ----
  	}
  </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:22:15 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:22:15 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_116.tmpl,1.2,1.3
Message-ID: <E1DdrWR-00078g-Vv@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27379/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_116.tmpl 
Log Message:
Template for 116a field plugin

Index: unimarc_field_116.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_116.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_116.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_116.tmpl	2 Jun 2005 15:22:13 -0000	1.3
***************
*** 1,1585 ****
! <html>
! <head>
! <title>UNIMARC Field 116 builder</title>
! </head>
! <body>
  <form name="f_pop" onSubmit="javascript:report()">
- <table>
- 	<tr>
- 		<td>Presentation materielle</td>
- 		<td>
[...2938 lines suppressed...]
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
  
  </form>
+ </div>
  <script>
  	function report() {
***************
*** 1589,1592 ****
  	}
  </script>
! </body>
! </html>
--- 1375,1378 ----
  	}
  </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->
! 




From doxulting at users.sourceforge.net  Thu Jun  2 17:22:40 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:22:40 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_117.tmpl,1.2,1.3
Message-ID: <E1DdrWq-0007BJ-O5@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27565/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_117.tmpl 
Log Message:
Template for 117a field plugin

Index: unimarc_field_117.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_117.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_117.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_117.tmpl	2 Jun 2005 15:22:38 -0000	1.3
***************
*** 1,801 ****
! <html>
! <head>
! <title>UNIMARC Field 117 builder</title>
! </head>
! <body>
  <form name="f_pop" onSubmit="javascript:report()">
! <table>
! 	<tr>
! 		<td>Presentation materielle</td>
! 		<td>
[...1503 lines suppressed...]
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
  </form>
+ </div>
  <script>
  	function report() {
***************
*** 805,808 ****
  	}
  </script>
! </body>
! </html>
--- 725,727 ----
  	}
  </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:23:15 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:23:15 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_120.tmpl,1.2,1.3
Message-ID: <E1DdrXP-0007HC-VD@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27907/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_120.tmpl 
Log Message:
Template for 120a field plugin

Index: unimarc_field_120.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_120.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_120.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_120.tmpl	2 Jun 2005 15:23:13 -0000	1.3
***************
*** 1,1340 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 120</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Indicateur de couleur:</td>

! 		<td>

[...2388 lines suppressed...]
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:16em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value +document.f_pop.f6.value +document.f_pop.f7.value +document.f_pop.f8.value +document.f_pop.f9.value +document.f_pop.f10.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:23:40 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:23:40 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_121a.tmpl,1.2,1.3
Message-ID: <E1DdrXo-0007Ki-My@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28143/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_121a.tmpl 
Log Message:
Template for 121a field plugin

Index: unimarc_field_121a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_121a.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_121a.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_121a.tmpl	2 Jun 2005 15:23:38 -0000	1.3
***************
*** 1,411 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 121a</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Dimensions physiques:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Bi-dimensionnel</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Bi-dimensionnel</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Tri-dimensionnel</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Tri-dimensionnel</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr><tr>

! 		<td>Image cartographique originale 1:</td>

! 		<td>

! 			<select name="f2" size="1">

! 			<!-- TMPL_IF name="f2 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2a" -->

! 				<option value="a" SELECTED>Manuelle et

! 				par releve</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Manuelle et par releve</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2b" -->

! 				<option value="b" SELECTED>photographique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Photographique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2c" -->

! 				<option value="c" SELECTED>Par ordinateur</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Par ordinateur</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2d" -->

! 				<option value="d" SELECTED>Par

! 				technique de teledetection active</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Par technique de

! 				teledetection active</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2e" -->

! 				<option value="e" SELECTED>Par

! 				technique de teledetection passive</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Par technique de

! 				teledetection passive</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td>		<td>Image cartographique originale 2:</td>

! 		<td>

! 			<select name="f3" size="1">

! 			<!-- TMPL_IF name="f3 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3a" -->

! 				<option value="a" SELECTED>Manuelle et

! 				par releve</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Manuelle et par releve</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3b" -->

! 				<option value="b" SELECTED>photographique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Photographique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3c" -->

! 				<option value="c" SELECTED>Par ordinateur</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Par ordinateur</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3d" -->

! 				<option value="d" SELECTED>Par

! 				technique de teledetection active</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Par technique de

! 				teledetection active</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3e" -->

! 				<option value="e" SELECTED>Par

! 				technique de teledetection passive</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Par technique de

! 				teledetection passive</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr><tr>

! 		<td>Support physique:</td>

! 		<td>

! 			<select name="f4" size="1">

! 			<!-- TMPL_IF name="f4  " -->

! 				<option value="  " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="  ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4aa" -->

! 				<option value="aa" SELECTED>Papier</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="aa">Papier</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ab" -->

! 				<option value="ab" SELECTED>Bois</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ab">Bois</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ac" -->

! 				<option value="ac" SELECTED>Pierre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ac">Pierre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ad" -->

! 				<option value="ad" SELECTED>Metal</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ad">Metal</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ae" -->

! 				<option value="ae" SELECTED>Materiaux synthetiques</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ae">Materiaux synthetiques</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4af" -->

! 				<option value="af" SELECTED>Peau

! 				(parchemin, velin...)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="af">Peau (parchemin, velin...) </option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ag" -->

! 				<option value="ag" SELECTED>Textile (y

! 				compris les fibres synthetiques)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ag">Textile (y compris

! 				les fibres synthetiques)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ah" -->

! 				<option value="ah" SELECTED>Stockage

! 				sur support magnetique - informatique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ah">Stockage sur

! 				support magnetique - informatique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ai" -->

! 				<option value="ai" SELECTED>Stockage

! 				sur support magnetique - non informatique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ai">Stockage sur

! 				support magnetique - non informatique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4aj" -->

! 				<option value="aj" SELECTED>Papier calque</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="aj">Papier calque</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ak" -->

! 				<option value="ak" SELECTED>Carton</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ak">Carton</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ap" -->

! 				<option value="ap" SELECTED>Platre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ap">Platre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4au" -->

! 				<option value="au" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="au">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4az" -->

! 				<option value="az" SELECTED>Autre

! 				procede non-photographique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="az">Autre procede non-photographique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ba" -->

! 				<option value="ba" SELECTED>Positif

! 				sur base flexible</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ba">Positif sur base flexible</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4bb" -->

! 				<option value="bb" SELECTED>Negatif

! 				sur base flexible</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bb">Negatif sur base flexible</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4bc" -->

! 				<option value="bc" SELECTED>Positif

! 				sur base rigide</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bc">Positif sur base rigide</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4bd" -->

! 				<option value="bd" SELECTED>Negatif

! 				sur base rigide</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bd">Negatif sur base rigide</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4bz" -->

! 				<option value="bz" SELECTED>Autre

! 				procede photographique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bz">Autre procede photographique</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr><tr>

! 		<td>Mode de realisation technique:</td>

! 		<td>

! 			<select name="f5" size="1">

! 			<!-- TMPL_IF name="f5 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f5a" -->

! 				<option value="a" SELECTED>Manuscrit</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Manuscrit</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f5b" -->

! 				<option value="b" SELECTED>Imprime</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Imprime</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f5c" -->

! 				<option value="c" SELECTED>Photographie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Photographie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f5d" -->

! 				<option value="d" SELECTED>Microphotographie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Microphotographie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f5u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f5y" -->

! 				<option value="y" SELECTED>N'est pas

! 				le produit final</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="y">N'est pas le produit

! 				final</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f5z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td>

! 	</tr><tr>

! 		<td>Forme de reproduction:</td>

! 		<td>

! 			<select name="f6" size="1">

! 			<!-- TMPL_IF name="f6 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6a" -->

! 				<option value="a" SELECTED>Manuscrit</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Manuscrit</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6b" -->

! 				<option value="b" SELECTED>Imprime</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Imprime</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6c" -->

! 				<option value="c" SELECTED>Photographie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Photographie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6d" -->

! 				<option value="d" SELECTED>Impression

! 				par transfert ligne a ligne</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Impression par

! 				transfert ligne a ligne</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6y" -->

! 				<option value="y" SELECTED>Ce n'est

! 				pas une reproduction</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="y">Ce n'est pas une reproduction</option>

! 			<!-- /TMPL_IF -->

! 		</td>

! 	</tr><tr>

! 		<td>Reperes geodesiques:</td>

! 		<td>

! 			<select name="f7" size="1">

! 			<!-- TMPL_IF name="f7 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7a" -->

! 				<option value="a" SELECTED>Pas de repere</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Pas de repere</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7b" -->

! 				<option value="b" SELECTED>Repere mais

! 				sans systeme de coordonnees</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Repere mais sans

! 				systeme de coordonnees</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7c" -->

! 				<option value="c" SELECTED>Repere avec

! 				systeme de coordonnees</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Repere avec systeme

! 				de coordonnees</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7x" -->

! 				<option value="x" SELECTED>Non applicable</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="x">Non applicable</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td>

! 	</tr>

! <tr>

! 		<td>Forme materielle d'edition:</td>

! 		<td>

! 			<select name="f8" size="1">

! 			<!-- TMPL_IF name="f8 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8a" -->

! 				<option value="a" SELECTED>Publication

! 				autonome</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Publication autonome</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8b" -->

! 				<option value="b" SELECTED>En parties

! 				(CAD publie en serie, en periodique...)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">En parties (CAD

! 				publie en serie, en periodique...)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8c" -->

! 				<option value="c" SELECTED>Atlas</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Atlas</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8d" -->

! 				<option value="d" SELECTED>Supplement

! 				separe d'une revue, d'une monographie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Supplement separe

! 				d'une revue, d'une monographie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8e" -->

! 				<option value="e" SELECTED>Reliee dans

! 				une revue, une monographie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Reliee dans une

! 				revue, une monographie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td>

! 	</tr>

! 

! 

! 

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value +document.f_pop.f6.value +document.f_pop.f7.value +document.f_pop.f8.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,378 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 121a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Dimensions physiques</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Bi-dimensionnel</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Bi-dimensionnel</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Tri-dimensionnel</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Tri-dimensionnel</option>
! 		<!-- /TMPL_IF -->
! 		</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Image cartographique originale 1</label>
! 	<select name="f2" size="1">
! 		<!-- TMPL_IF name="f2 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2a" -->
! 		<option value="a" SELECTED>Manuelle et par relevé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Manuelle et par relevé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2b" -->
! 		<option value="b" SELECTED>Photographique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Photographique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2c" -->
! 		<option value="c" SELECTED>Par ordinateur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Par ordinateur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2d" -->
! 		<option value="d" SELECTED>Par technique de télédétection active</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Par technique de télédétection active</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2e" -->
! 		<option value="e" SELECTED>Par technique de télédétection passive</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Par technique de télédétection passive</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Image cartographique originale 2</label>
! 	<select name="f3" size="1">
! 		<!-- TMPL_IF name="f3 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3a" -->
! 		<option value="a" SELECTED>Manuelle et par relevé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Manuelle et par relevé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3b" -->
! 		<option value="b" SELECTED>Photographique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Photographique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3c" -->
! 		<option value="c" SELECTED>Par ordinateur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Par ordinateur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3d" -->
! 		<option value="d" SELECTED>Par technique de télédétection active</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Par technique de télédétection active</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3e" -->
! 		<option value="e" SELECTED>Par technique de télédétection passive</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Par technique de télédétection passive</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Support physique</label>
! 	<select name="f4" size="1">
! 		<!-- TMPL_IF name="f4  " -->
! 		<option value="  " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="  ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Procédé non photographique :</option>
! 		<!-- TMPL_IF name="f4aa" -->
! 		<option value="aa" SELECTED>Papier</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="aa">Papier</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4ab" -->
! 		<option value="ab" SELECTED>Bois</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ab">Bois</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4ac" -->
! 		<option value="ac" SELECTED>Pierre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ac">Pierre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4ad" -->
! 		<option value="ad" SELECTED>Métal</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ad">Métal</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4ae" -->
! 		<option value="ae" SELECTED>Matériaux synthétiques</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ae">Matériaux synthétiques</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4af" -->
! 		<option value="af" SELECTED>Peau (parchemin, velin...)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="af">Peau (parchemin, velin...) </option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4ag" -->
! 		<option value="ag" SELECTED>Textile (y compris les fibres synthétiques)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ag">Textile (y compris les fibres synthétiques)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4ah" -->
! 		<option value="ah" SELECTED>Stockage sur support magnétique - informatique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ah">Stockage sur support magnétique - informatique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4ai" -->
! 		<option value="ai" SELECTED>Stockage sur support magnétique - non informatique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ai">Stockage sur support magnétique - non informatique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4aj" -->
! 		<option value="aj" SELECTED>Papier calque</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="aj">Papier calque</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4ak" -->
! 		<option value="ak" SELECTED>Carton</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ak">Carton</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4ap" -->
! 		<option value="ap" SELECTED>Plâtre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ap">Plâtre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4au" -->
! 		<option value="au" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="au">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4az" -->
! 		<option value="az" SELECTED>Autre procédé non-photographique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="az">Autre procédé non-photographique</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Procédé photographique :</option>
! 		<!-- TMPL_IF name="f4ba" -->
! 		<option value="ba" SELECTED>Positif sur base flexible transparente ou opaque</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ba">Positif sur base flexible transparente ou opaque</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4bb" -->
! 		<option value="bb" SELECTED>Négatif sur base flexible transparente ou opaque</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bb">Négatif sur base flexible transparente ou opaque</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4bc" -->
! 		<option value="bc" SELECTED>Positif sur base rigide transparente ou opaque</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bc">Positif sur base rigide transparente ou opaque</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4bd" -->
! 		<option value="bd" SELECTED>Négatif sur base rigide transparente ou opaque</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bd">Négatif sur base rigide transparente ou opaque</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4bz" -->
! 		<option value="bz" SELECTED>Autre procédé photographique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bz">Autre procédé photographique</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Mode de réalisation technique</label>
! 	<select name="f5" size="1">
! 		<!-- TMPL_IF name="f5 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5a" -->
! 		<option value="a" SELECTED>Manuscrit</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Manuscrit</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5b" -->
! 		<option value="b" SELECTED>Imprimé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Imprimé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5c" -->
! 		<option value="c" SELECTED>Photographie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Photographie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5d" -->
! 		<option value="d" SELECTED>Microphotographie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Microphotographie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5y" -->
! 		<option value="y" SELECTED>N'est pas le produit final</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="y">N'est pas le produit final</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Forme de reproduction</label>
! 	<select name="f6" size="1">
! 		<!-- TMPL_IF name="f6 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6a" -->
! 		<option value="a" SELECTED>Manuscrit</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Manuscrit</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6b" -->
! 		<option value="b" SELECTED>Imprimé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Imprimé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6c" -->
! 		<option value="c" SELECTED>Photographie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Photographie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6d" -->
! 		<option value="d" SELECTED>Impression par transfert ligne a ligne</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Impression par transfert ligne a ligne</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6y" -->
! 		<option value="y" SELECTED>Ce n'est pas une reproduction</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="y">Ce n'est pas une reproduction</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Repères géodésiques:</label>
! 		<select name="f7" size="1">
! 		<!-- TMPL_IF name="f7 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7a" -->
! 		<option value="a" SELECTED>Pas de repère</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Pas de repère</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7b" -->
! 		<option value="b" SELECTED>Repéré mais sans système de coordonnées</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Repéré mais sans système de coordonnées</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7c" -->
! 		<option value="c" SELECTED>Repéré avec systeme de coordonnées</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Repéré avec systeme de coordonnées</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7x" -->
! 		<option value="x" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="x">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 		</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Forme matérielle d'édition</label>
! 	<select name="f8" size="1">
! 		<!-- TMPL_IF name="f8 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8a" -->
! 		<option value="a" SELECTED>Publication autonome</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Publication autonome</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8b" -->
! 		<option value="b" SELECTED>En parties (c'est-à-dire publié en série, en périodique...)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">En parties (c'est-à-dire publié en série, en périodique...)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8c" -->
! 		<option value="c" SELECTED>Atlas</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Atlas</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8d" -->
! 		<option value="d" SELECTED>Supplément séparé d'une revue, d'une monographie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Supplément séparé d'une revue, d'une monographie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8e" -->
! 		<option value="e" SELECTED>Relié dans une revue, une monographie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Relié dans une revue, une monographie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value +document.f_pop.f6.value +document.f_pop.f7.value +document.f_pop.f8.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:21:50 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:21:50 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_115b.tmpl,1.2,1.3
Message-ID: <E1DdrW2-00074a-Nx@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27127/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_115b.tmpl 
Log Message:
Template for 115b field plugin

Index: unimarc_field_115b.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_115b.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_115b.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_115b.tmpl	2 Jun 2005 15:21:47 -0000	1.3
***************
*** 1,673 ****
! <html>
! <head>
! <title>UNIMARC Field 115b builder</title>
! </head>
! <body>
  <form name="f_pop" onSubmit="javascript:report()">
! <table>
! 	<tr>
! 		<td>Copie (generation)</td>
! 		<td>
[...1174 lines suppressed...]
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
  </form>
+ </div>
  <script>
  	function report() {
***************
*** 682,685 ****
  	}
  </script>
! </body>
! </html>
--- 529,531 ----
  	}
  </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:24:22 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:24:22 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_122.tmpl,1.2,1.3
Message-ID: <E1DdrYU-0007RZ-Jr@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28606/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_122.tmpl 
Log Message:
Template for 122a field plugin

Index: unimarc_field_122.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_122.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_122.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_122.tmpl	2 Jun 2005 15:24:20 -0000	1.3
***************
*** 1,84 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 122</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Ere code:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>La date

! 				tombe avant l'an 1 du calendrier gregorien</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">La date tombe avant

! 				l'an 1 du calendrier gregorien</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1d" -->

! 				<option value="d" SELECTED>La date

! 				tombe apres l'an 1</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">La date tombe apres

! 				l'an 1</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Spatiale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Spatiale</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! <tr>		<td>Annee:</td>

! 		   <td><input type="text" name="f2" maxlength=4 size=5

! 		   value="<!-- TMPL_VAR name="f2" -->">

! 		</td>

! 

! 		<td>Mois:</td>

! 		         <td><input type="text" name="f3" maxlength=2

! 		         size=3

!                    value="<!-- TMPL_VAR name="f3" -->"></td>

! 		<td>Jour:</td>

! 		         <td><input type="text" name="f4" maxlength=2

! 		         size=3

!                    value="<!-- TMPL_VAR name="f4" -->"></td>

! 

! 		<td>Heure:</td>

! 		         <td><input type="text" name="f5" maxlength=2

! 		         size=3

!                    value="<!-- TMPL_VAR name="f5" -->"></td>

! 

! 		</tr>

! 

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! document.f_pop.f2.value=document.f_pop.f2.value+'    ';

! document.f_pop.f3.value=document.f_pop.f3.value+'  ';

! document.f_pop.f4.value=document.f_pop.f4.value+'  ';

! document.f_pop.f5.value=document.f_pop.f5.value+'  ';

! 

! 

! 

! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,4);

! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);

! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);

! document.f_pop.f5.value=document.f_pop.f5.value.substring(0,2);

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value ;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,77 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 122a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:15em;">Code ère</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>La date tombe avant l'an 1 du calendrier grégorien</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">La date tombe avant l'an 1 du calendrier grégorien</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1d" -->
! 		<option value="d" SELECTED>La date tombe après l'an 1 du calendrier grégorien</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">La date tombe après l'an 1 du calendrier grégorien</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:15em;">Année</label>
! 	<input type="text" name="f2" maxlength=4 size=5 value="<!-- TMPL_VAR name="f2" -->">
! </p>
! 
! <p>
! 	<label style="width:15em;">Mois</label>
! 	<input type="text" name="f3" maxlength=2 size=3 value="<!-- TMPL_VAR name="f3" -->">
! </p>
! 
! <p>
! 	<label style="width:15em;">Jour</label>
! 	<input type="text" name="f4" maxlength=2 size=3 value="<!-- TMPL_VAR name="f4" -->">
! </p>
! 
! <p>
! 	<label style="width:15em;">Heure</label>
! 	<input type="text" name="f5" maxlength=2 size=3 value="<!-- TMPL_VAR name="f5" -->">
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:15em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! document.f_pop.f2.value=document.f_pop.f2.value+'    ';
! document.f_pop.f3.value=document.f_pop.f3.value+'  ';
! document.f_pop.f4.value=document.f_pop.f4.value+'  ';
! document.f_pop.f5.value=document.f_pop.f5.value+'  ';
! 
! 
! 
! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,4);
! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
! document.f_pop.f5.value=document.f_pop.f5.value.substring(0,2);
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value ;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:24:46 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:24:46 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_123a.tmpl,1.2,1.3
Message-ID: <E1DdrYs-0007Up-Ez@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28769/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_123a.tmpl 
Log Message:
Template for 123a field plugin

Index: unimarc_field_123a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123a.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_123a.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_123a.tmpl	2 Jun 2005 15:24:44 -0000	1.3
***************
*** 1,47 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 123a</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Type d'echelle:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Echelle lineaire</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Echelle lineaire</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Echelle angulaire</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Echelle angulaire</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1z" -->

! 				<option value="z" SELECTED>Autre type d'echelle</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre type d'echelle</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,48 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 123a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Type d'échelle</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Echelle linéaire</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Echelle linéaire</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Echelle angulaire</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Echelle angulaire</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1z" -->
! 		<option value="z" SELECTED>Autre type d'échelle</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre type d'échelle</option>
! 		<!-- /TMPL_IF -->
! 		</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:25:11 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:25:11 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_123d.tmpl,1.2,1.3
Message-ID: <E1DdrZH-0007am-3d@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29137/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_123d.tmpl 
Log Message:
Template for 123d field plugin

Index: unimarc_field_123d.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123d.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_123d.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_123d.tmpl	2 Jun 2005 15:25:08 -0000	1.3
***************
*** 1,79 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 123d</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Hemisphere:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1w" -->

! 				<option value="w" SELECTED>Ouest</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="w">Ouest</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Est</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Est</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1n" -->

! 				<option value="n" SELECTED>Nord</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="n">Nord</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1s" -->

! 				<option value="s" SELECTED>Sud</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="s">Sud</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 

! <tr>          <td>Degres (completer avec des 0):</td>

!                          <td><input type="text" name="f2" maxlength=3

!                          size=4

!                    value="<!-- TMPL_VAR name="f2" -->"></td>

! </tr>

! <tr>          <td>Minutes (completer avec des 0):</td>

!                          <td><input type="text" name="f3" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f3" -->"></td>

! </tr>

! <tr>          <td>Secondes (completer avec des 0):</td>

!                          <td><input type="text" name="f4" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f4" -->"></td>

! </tr>

! 

! 

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! document.f_pop.f2.value=document.f_pop.f2.value+'   ';

! document.f_pop.f3.value=document.f_pop.f3.value+'  ';

! document.f_pop.f4.value=document.f_pop.f4.value+'  ';

! 

! 

! 

! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);

! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);

! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,79 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 123d</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Hémisphère</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1w" -->
! 		<option value="w" SELECTED>Ouest</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="w">Ouest</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Est</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Est</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1n" -->
! 		<option value="n" SELECTED>Nord</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Nord</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1s" -->
! 		<option value="s" SELECTED>Sud</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="s">Sud</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>	
! 
! <p>
! 	<label style="width:20em;">Degrés (compléter avec des 0)</label>
! 	<input type="text" name="f2" maxlength=3 size=4 value="<!-- TMPL_VAR name="f2" -->">
! </p>
! 
! <p>
! 	<label style="width:20em;">Minutes (compléter avec des 0)</label>
! 	<input type="text" name="f3" maxlength=2 size=3 value="<!-- TMPL_VAR name="f3" -->">
! </p>
! 
! <p>
! 	<label style="width:20em;">Secondes (compléter avec des 0)</label>
! 	<input type="text" name="f4" maxlength=2 size=3 value="<!-- TMPL_VAR name="f4" -->">
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! document.f_pop.f2.value=document.f_pop.f2.value+'   ';
! document.f_pop.f3.value=document.f_pop.f3.value+'  ';
! document.f_pop.f4.value=document.f_pop.f4.value+'  ';
! 
! 
! 
! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:25:37 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:25:37 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_123e.tmpl,1.2,1.3
Message-ID: <E1DdrZh-0007eT-2s@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29371/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_123e.tmpl 
Log Message:
Template for 123e field plugin

Index: unimarc_field_123e.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123e.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_123e.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_123e.tmpl	2 Jun 2005 15:25:34 -0000	1.3
***************
*** 1,79 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 123e</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Hemisphere:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1w" -->

! 				<option value="w" SELECTED>Ouest</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="w">Ouest</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Est</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Est</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1n" -->

! 				<option value="n" SELECTED>Nord</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="n">Nord</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1s" -->

! 				<option value="s" SELECTED>Sud</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="s">Sud</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 

! <tr>          <td>Degres (completer avec des 0):</td>

!                          <td><input type="text" name="f2" maxlength=3

!                          size=4

!                    value="<!-- TMPL_VAR name="f2" -->"></td>

! </tr>

! <tr>          <td>Minutes (completer avec des 0):</td>

!                          <td><input type="text" name="f3" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f3" -->"></td>

! </tr>

! <tr>          <td>Secondes (completer avec des 0):</td>

!                          <td><input type="text" name="f4" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f4" -->"></td>

! </tr>

! 

! 

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! document.f_pop.f2.value=document.f_pop.f2.value+'   ';

! document.f_pop.f3.value=document.f_pop.f3.value+'  ';

! document.f_pop.f4.value=document.f_pop.f4.value+'  ';

! 

! 

! 

! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);

! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);

! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,79 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 123e</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Hémisphère</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1w" -->
! 		<option value="w" SELECTED>Ouest</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="w">Ouest</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Est</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Est</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1n" -->
! 		<option value="n" SELECTED>Nord</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Nord</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1s" -->
! 		<option value="s" SELECTED>Sud</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="s">Sud</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>	
! 
! <p>
! 	<label style="width:20em;">Degrés (compléter avec des 0)</label>
! 	<input type="text" name="f2" maxlength=3 size=4 value="<!-- TMPL_VAR name="f2" -->">
! </p>
! 
! <p>
! 	<label style="width:20em;">Minutes (compléter avec des 0)</label>
! 	<input type="text" name="f3" maxlength=2 size=3 value="<!-- TMPL_VAR name="f3" -->">
! </p>
! 
! <p>
! 	<label style="width:20em;">Secondes (compléter avec des 0)</label>
! 	<input type="text" name="f4" maxlength=2 size=3 value="<!-- TMPL_VAR name="f4" -->">
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! document.f_pop.f2.value=document.f_pop.f2.value+'   ';
! document.f_pop.f3.value=document.f_pop.f3.value+'  ';
! document.f_pop.f4.value=document.f_pop.f4.value+'  ';
! 
! 
! 
! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:24:01 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:24:01 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_121b.tmpl,1.2,1.3
Message-ID: <E1DdrY9-0007P6-65@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28425/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_121b.tmpl 
Log Message:
Template for 121b field plugin

Index: unimarc_field_121b.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_121b.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_121b.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_121b.tmpl	2 Jun 2005 15:23:59 -0000	1.3
***************
*** 1,291 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 121b</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Altitude du capteur:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Terrestre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Terrestre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Aerienne</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Aerienne</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Spatiale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Spatiale</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr><tr>

! 		<td>Orientation du capteur :</td>

! 		<td>

! 			<select name="f2" size="1">

! 			<!-- TMPL_IF name="f2 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2a" -->

! 				<option value="a" SELECTED>Oblique faible</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Oblique faible</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2b" -->

! 				<option value="b" SELECTED>Oblique forte</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Oblique forte</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2c" -->

! 				<option value="c" SELECTED>Verticale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Verticale</option>

! 			<!-- /TMPL_IF -->

! 		</td></tr><tr>		<td>Bandes spectrales (nombre

! 		a deux chiffres 01->99 ou xx (ecrire 01 pour 1):</td>

! 		   <td><input type="text" name="f3" maxlength=2 size=3

! 		   value="<!-- TMPL_VAR name="f3" -->">

! 		</td></tr>

! <tr>

! 		<td>Qualite de l'image:</td>

! 		<td>

! 			<select name="f4" size="1">

! 			<!-- TMPL_IF name="f4 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4a" -->

! 				<option value="a" SELECTED>Faible</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Faible</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4b" -->

! 				<option value="b" SELECTED>Acceptable</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Acceptable</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4c" -->

! 				<option value="c" SELECTED>Bonne</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Bonne</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4d" -->

! 				<option value="d" SELECTED>Tres bonne</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Tres bonne</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr><tr>

! 		<td>Couverture nuageuse exprimee en huitieme:</td>

! 		<td>

! 			<select name="f5" size="1">

! 			<!-- TMPL_IF name="f5 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f51" -->

! 				<option value="1" SELECTED>1/8</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="1">1/8</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f52" -->

! 				<option value="2" SELECTED>2/8</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="2">2/8</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f53" -->

! 				<option value="3" SELECTED>3/8</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="3">3/8</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f54" -->

! 				<option value="4" SELECTED>4/8</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="4">4/8</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f55" -->

! 				<option value="5" SELECTED>5/8</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="5">5/8</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f56" -->

! 				<option value="6" SELECTED>6/8</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="6">6/8</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f57" -->

! 				<option value="7" SELECTED>7/8</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="7">7/8</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f58" -->

! 				<option value="8" SELECTED>Couverture totale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="8">Couverture totale</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr><tr>

! 

! 		       <td>Qualite de l'image:</td>

!                 <td>

!                         <select name="f6" size="1">

!                         <!-- TMPL_IF name="f6 " -->

!                                 <option value=" "

!                 SELECTED>Aucun</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value=" ">Aucun</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f6-" -->

!                                 <option value="-"

!                 SELECTED>Inferieure au cm</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="-">Inferieure au cm</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f61" -->

!                                 <option value="1"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="1">1</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f62" -->

!                                 <option value="2"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="2">2</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f63" -->

!                                 <option value="3"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="3">3</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f64" -->

!                                 <option value="4"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="4">4</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f51" -->

!                                 <option value="5"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="5">5</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f66" -->

!                                 <option value="6"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="6">6</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f71" -->

!                                 <option value="7"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="7">7</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f68" -->

!                                 <option value="8"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="8">8</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f69" -->

!                                 <option value="9"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="9">9</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f6+" -->

!                                 <option value="+"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="+">+</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f6x" -->

!                                 <option value="x"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="x">x</option>

!                         <!-- /TMPL_IF -->

!                         </select>

!                 

! 			<select name="f7" size="1">

! 			<!-- TMPL_IF name="f7 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7c" -->

! 				<option value="c" SELECTED>Centimetres</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Centimetres</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7i" -->

! 				<option value="i" SELECTED>Decimetres</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="i">Decimetres</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7m" -->

! 				<option value="m" SELECTED>Metres</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="m">Metres</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7d" -->

! 				<option value="d" SELECTED>Decametres</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Decametres</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7h" -->

! 				<option value="h" SELECTED>Hectometres</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Hectometres</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7k" -->

! 				<option value="k" SELECTED>Kilometres</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="k">Kilometres</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7x" -->

! 				<option value="x" SELECTED>Non applicable</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="x">Non applicable</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td>

! 	</tr>

! 

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! document.f_pop.f3.value=document.f_pop.f3.value+'  ';

! 

! 

! 

! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value +document.f_pop.f6.value +document.f_pop.f7.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,284 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 121b</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Altitude du capteur</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Terrestre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Terrestre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Aérienne</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Aérienne</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Spatiale</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Spatiale</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Orientation du capteur</label>
! 	<select name="f2" size="1">
! 		<!-- TMPL_IF name="f2 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2a" -->
! 		<option value="a" SELECTED>Oblique faible</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Oblique faible</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2b" -->
! 		<option value="b" SELECTED>Oblique forte</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Oblique forte</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2c" -->
! 		<option value="c" SELECTED>Verticale</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Verticale</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Bandes spectrales</label>
! 	<input type="text" name="f3" maxlength=2 size=3 value="<!-- TMPL_VAR name="f3" -->"> <i>nombre à deux chiffres 01->99 ou xx (ecrire 01 pour 1)</i>
! </p>
! 
! <p>
! 	<label style="width:20em;">Qualité de l'image</label>
! 		<select name="f4" size="1">
! 		<!-- TMPL_IF name="f4 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4a" -->
! 		<option value="a" SELECTED>Faible</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Faible</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4b" -->
! 		<option value="b" SELECTED>Acceptable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Acceptable</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4c" -->
! 		<option value="c" SELECTED>Bonne</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Bonne</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4d" -->
! 		<option value="d" SELECTED>Très bonne</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Très bonne</option>
! 		<!-- /TMPL_IF -->
! 		</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Couverture nuageuse exprimée en huitièmes</label>
! 		<select name="f5" size="1">
! 		<!-- TMPL_IF name="f5 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f51" -->
! 		<option value="1" SELECTED>1/8</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="1">1/8</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f52" -->
! 		<option value="2" SELECTED>2/8</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="2">2/8</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f53" -->
! 		<option value="3" SELECTED>3/8</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="3">3/8</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f54" -->
! 		<option value="4" SELECTED>4/8</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="4">4/8</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f55" -->
! 		<option value="5" SELECTED>5/8</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="5">5/8</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f56" -->
! 		<option value="6" SELECTED>6/8</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="6">6/8</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f57" -->
! 		<option value="7" SELECTED>7/8</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="7">7/8</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f58" -->
! 		<option value="8" SELECTED>Couverture totale</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="8">Couverture totale</option>
! 		<!-- /TMPL_IF -->
! 		</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Valeur moyenne de la résolution au sol</label>
! 		<select name="f6" size="1">
! 		<!-- TMPL_IF name="f6 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6-" -->
! 		<option value="-" SELECTED>Inferieure au cm</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="-">Inferieure au cm</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f61" -->
! 		<option value="1" SELECTED>1</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="1">1</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f62" -->
! 		<option value="2" SELECTED>2</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="2">2</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f63" -->
! 		<option value="3" SELECTED>3</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="3">3</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f64" -->
! 		<option value="4" SELECTED>4</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="4">4</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f65" -->
! 		<option value="5" SELECTED>5</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="5">5</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f66" -->
! 		<option value="6" SELECTED>6</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="6">6</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f67" -->
! 		<option value="7" SELECTED>7</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="7">7</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f68" -->
! 		<option value="8" SELECTED>8</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="8">8</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f69" -->
! 		<option value="9" SELECTED>9</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="9">9</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6+" -->
! 		<option value="+" SELECTED>Supérieure à 9 kilomètres</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="+">Supérieure à 9 kilomètres</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6x" -->
! 		<option value="x" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="x">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! <p>
! 	<label style="width:20em;">Unité métrique</label>
! 	<select name="f7" size="1">
! 		<!-- TMPL_IF name="f7 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7c" -->
! 		<option value="c" SELECTED>Centimètres</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Centimètres</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7i" -->
! 		<option value="i" SELECTED>Décimètres</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="i">Décimètres</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7m" -->
! 		<option value="m" SELECTED>Mètres</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="m">Mètres</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7d" -->
! 		<option value="d" SELECTED>Décamètres</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Décamètres</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7h" -->
! 		<option value="h" SELECTED>Hectomètres</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Hectomètres</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7k" -->
! 		<option value="k" SELECTED>Kilomètres</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="k">Kilomètres</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7x" -->
! 		<option value="x" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="x">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! document.f_pop.f3.value=document.f_pop.f3.value+'  ';
! 
! 
! 
! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value +document.f_pop.f6.value +document.f_pop.f7.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:25:55 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:25:55 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_123f.tmpl,1.2,1.3
Message-ID: <E1DdrZz-0007or-Qv@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29995/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_123f.tmpl 
Log Message:
Template for 123f field plugin

Index: unimarc_field_123f.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123f.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_123f.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_123f.tmpl	2 Jun 2005 15:25:53 -0000	1.3
***************
*** 1,79 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 123f</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Hemisphere:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1w" -->

! 				<option value="w" SELECTED>Ouest</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="w">Ouest</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Est</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Est</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1n" -->

! 				<option value="n" SELECTED>Nord</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="n">Nord</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1s" -->

! 				<option value="s" SELECTED>Sud</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="s">Sud</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 

! <tr>          <td>Degres (completer avec des 0):</td>

!                          <td><input type="text" name="f2" maxlength=3

!                          size=4

!                    value="<!-- TMPL_VAR name="f2" -->"></td>

! </tr>

! <tr>          <td>Minutes (completer avec des 0):</td>

!                          <td><input type="text" name="f3" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f3" -->"></td>

! </tr>

! <tr>          <td>Secondes (completer avec des 0):</td>

!                          <td><input type="text" name="f4" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f4" -->"></td>

! </tr>

! 

! 

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! document.f_pop.f2.value=document.f_pop.f2.value+'   ';

! document.f_pop.f3.value=document.f_pop.f3.value+'  ';

! document.f_pop.f4.value=document.f_pop.f4.value+'  ';

! 

! 

! 

! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);

! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);

! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,79 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 123f</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Hémisphère</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1w" -->
! 		<option value="w" SELECTED>Ouest</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="w">Ouest</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Est</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Est</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1n" -->
! 		<option value="n" SELECTED>Nord</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Nord</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1s" -->
! 		<option value="s" SELECTED>Sud</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="s">Sud</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>	
! 
! <p>
! 	<label style="width:20em;">Degrés (compléter avec des 0)</label>
! 	<input type="text" name="f2" maxlength=3 size=4 value="<!-- TMPL_VAR name="f2" -->">
! </p>
! 
! <p>
! 	<label style="width:20em;">Minutes (compléter avec des 0)</label>
! 	<input type="text" name="f3" maxlength=2 size=3 value="<!-- TMPL_VAR name="f3" -->">
! </p>
! 
! <p>
! 	<label style="width:20em;">Secondes (compléter avec des 0)</label>
! 	<input type="text" name="f4" maxlength=2 size=3 value="<!-- TMPL_VAR name="f4" -->">
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! document.f_pop.f2.value=document.f_pop.f2.value+'   ';
! document.f_pop.f3.value=document.f_pop.f3.value+'  ';
! document.f_pop.f4.value=document.f_pop.f4.value+'  ';
! 
! 
! 
! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:26:19 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:26:19 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_123g.tmpl,1.2,1.3
Message-ID: <E1DdraN-0007rs-Hj@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30203/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_123g.tmpl 
Log Message:
Template for 123g field plugin

Index: unimarc_field_123g.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123g.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_123g.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_123g.tmpl	2 Jun 2005 15:26:17 -0000	1.3
***************
*** 1,79 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 123g</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Hemisphere:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1w" -->

! 				<option value="w" SELECTED>Ouest</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="w">Ouest</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Est</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Est</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1n" -->

! 				<option value="n" SELECTED>Nord</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="n">Nord</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1s" -->

! 				<option value="s" SELECTED>Sud</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="s">Sud</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 

! <tr>          <td>Degres (completer avec des 0):</td>

!                          <td><input type="text" name="f2" maxlength=3

!                          size=4

!                    value="<!-- TMPL_VAR name="f2" -->"></td>

! </tr>

! <tr>          <td>Minutes (completer avec des 0):</td>

!                          <td><input type="text" name="f3" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f3" -->"></td>

! </tr>

! <tr>          <td>Secondes (completer avec des 0):</td>

!                          <td><input type="text" name="f4" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f4" -->"></td>

! </tr>

! 

! 

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! document.f_pop.f2.value=document.f_pop.f2.value+'   ';

! document.f_pop.f3.value=document.f_pop.f3.value+'  ';

! document.f_pop.f4.value=document.f_pop.f4.value+'  ';

! 

! 

! 

! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);

! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);

! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,79 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 123g</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Hémisphère</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1w" -->
! 		<option value="w" SELECTED>Ouest</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="w">Ouest</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Est</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Est</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1n" -->
! 		<option value="n" SELECTED>Nord</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Nord</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1s" -->
! 		<option value="s" SELECTED>Sud</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="s">Sud</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>	
! 
! <p>
! 	<label style="width:20em;">Degrés (compléter avec des 0)</label>
! 	<input type="text" name="f2" maxlength=3 size=4 value="<!-- TMPL_VAR name="f2" -->">
! </p>
! 
! <p>
! 	<label style="width:20em;">Minutes (compléter avec des 0)</label>
! 	<input type="text" name="f3" maxlength=2 size=3 value="<!-- TMPL_VAR name="f3" -->">
! </p>
! 
! <p>
! 	<label style="width:20em;">Secondes (compléter avec des 0)</label>
! 	<input type="text" name="f4" maxlength=2 size=3 value="<!-- TMPL_VAR name="f4" -->">
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! document.f_pop.f2.value=document.f_pop.f2.value+'   ';
! document.f_pop.f3.value=document.f_pop.f3.value+'  ';
! document.f_pop.f4.value=document.f_pop.f4.value+'  ';
! 
! 
! 
! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:26:38 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:26:38 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_123i.tmpl,NONE,1.1
Message-ID: <E1Ddrag-0007vS-Pj@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30434/koha-tmpl/intranet-tmpl/default/fr/value_builder

Added Files:
	unimarc_field_123i.tmpl 
Log Message:
Template for 123i field plugin

--- NEW FILE ---
<!-- TMPL_INCLUDE Name="popup-top.inc" -->
<div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
<h1 class="authority">Assistant champ codé 123i</h1>
<form name="f_pop" onSubmit="javascript:report()">

<p>
	<label style="width:20em;">Hémisphère</label>
	<select name="f1" size="1">
		<!-- TMPL_IF name="f1 " -->
		<option value=" " SELECTED>Aucun</option>
		<!-- TMPL_ELSE -->
		<option value=" ">Aucun</option>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF name="f1w" -->
		<option value="w" SELECTED>Ouest</option>
		<!-- TMPL_ELSE -->
		<option value="w">Ouest</option>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF name="f1e" -->
		<option value="e" SELECTED>Est</option>
		<!-- TMPL_ELSE -->
		<option value="e">Est</option>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF name="f1n" -->
		<option value="n" SELECTED>Nord</option>
		<!-- TMPL_ELSE -->
		<option value="n">Nord</option>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF name="f1s" -->
		<option value="s" SELECTED>Sud</option>
		<!-- TMPL_ELSE -->
		<option value="s">Sud</option>
		<!-- /TMPL_IF -->
	</select>
</p>	

<p>
	<label style="width:20em;">Degrés (compléter avec des 0)</label>
	<input type="text" name="f2" maxlength=3 size=4 value="<!-- TMPL_VAR name="f2" -->">
</p>

<p>
	<label style="width:20em;">Minutes (compléter avec des 0)</label>
	<input type="text" name="f3" maxlength=2 size=3 value="<!-- TMPL_VAR name="f3" -->">
</p>

<p>
	<label style="width:20em;">Secondes (compléter avec des 0)</label>
	<input type="text" name="f4" maxlength=2 size=3 value="<!-- TMPL_VAR name="f4" -->">
</p>


<br>
<p>
	<label style="width:20em;">&nbsp;</label>
	<input type="submit" value="OK" class="button authority">
</p>

</form>
</div>
<script>
	function report() {
document.f_pop.f2.value=document.f_pop.f2.value+'   ';
document.f_pop.f3.value=document.f_pop.f3.value+'  ';
document.f_pop.f4.value=document.f_pop.f4.value+'  ';



document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);


		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
		self.close();
		return false;
	}
</script>
<!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:26:59 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:26:59 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_123j.tmpl,NONE,1.1
Message-ID: <E1Ddrb1-0007yi-JK@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30653/koha-tmpl/intranet-tmpl/default/fr/value_builder

Added Files:
	unimarc_field_123j.tmpl 
Log Message:
Template for 123j field plugin

--- NEW FILE ---
<!-- TMPL_INCLUDE Name="popup-top.inc" -->
<div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
<h1 class="authority">Assistant champ codé 123i</h1>
<form name="f_pop" onSubmit="javascript:report()">

<p>
	<label style="width:20em;">Hémisphère</label>
	<select name="f1" size="1">
		<!-- TMPL_IF name="f1 " -->
		<option value=" " SELECTED>Aucun</option>
		<!-- TMPL_ELSE -->
		<option value=" ">Aucun</option>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF name="f1w" -->
		<option value="w" SELECTED>Ouest</option>
		<!-- TMPL_ELSE -->
		<option value="w">Ouest</option>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF name="f1e" -->
		<option value="e" SELECTED>Est</option>
		<!-- TMPL_ELSE -->
		<option value="e">Est</option>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF name="f1n" -->
		<option value="n" SELECTED>Nord</option>
		<!-- TMPL_ELSE -->
		<option value="n">Nord</option>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF name="f1s" -->
		<option value="s" SELECTED>Sud</option>
		<!-- TMPL_ELSE -->
		<option value="s">Sud</option>
		<!-- /TMPL_IF -->
	</select>
</p>	

<p>
	<label style="width:20em;">Degrés (compléter avec des 0)</label>
	<input type="text" name="f2" maxlength=3 size=4 value="<!-- TMPL_VAR name="f2" -->">
</p>

<p>
	<label style="width:20em;">Minutes (compléter avec des 0)</label>
	<input type="text" name="f3" maxlength=2 size=3 value="<!-- TMPL_VAR name="f3" -->">
</p>

<p>
	<label style="width:20em;">Secondes (compléter avec des 0)</label>
	<input type="text" name="f4" maxlength=2 size=3 value="<!-- TMPL_VAR name="f4" -->">
</p>


<br>
<p>
	<label style="width:20em;">&nbsp;</label>
	<input type="submit" value="OK" class="button authority">
</p>

</form>
</div>
<script>
	function report() {
document.f_pop.f2.value=document.f_pop.f2.value+'   ';
document.f_pop.f3.value=document.f_pop.f3.value+'  ';
document.f_pop.f4.value=document.f_pop.f4.value+'  ';



document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);


		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
		self.close();
		return false;
	}
</script>
<!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:27:22 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:27:22 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_124a.tmpl,1.2,1.3
Message-ID: <E1DdrbO-00082i-Pq@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30874/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_124a.tmpl 
Log Message:
Template for 124a field plugin

Index: unimarc_field_124a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124a.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_124a.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_124a.tmpl	2 Jun 2005 15:27:20 -0000	1.3
***************
*** 1,47 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 124a</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Origine de l'image:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Image non-photographique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Image non-photographique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Image photographique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Image photographique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Image de teledetection</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Image de teledetection</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,49 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 124a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Origine de l'image</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Image non-photographique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Image non-photographique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Image photographique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Image photographique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Image de télédétection</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Image de télédétection</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:27:44 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:27:44 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_124b.tmpl,1.2,1.3
Message-ID: <E1Ddrbk-00085l-JS@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31055/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_124b.tmpl 
Log Message:
Template for 124b field plugin

Index: unimarc_field_124b.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124b.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_124b.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_124b.tmpl	2 Jun 2005 15:27:42 -0000	1.3
***************
*** 1,87 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 124b</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Forme du document cartographique:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Atlas</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Atlas</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Diagramme</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Diagramme</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Globe</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Globe</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1d" -->

! 				<option value="d" SELECTED>Carte</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Carte</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Maquette</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Maquette</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1f" -->

! 				<option value="f" SELECTED>Profil</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Profil</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1g" -->

! 				<option value="g" SELECTED>Image de teledetection</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">Image de teledetection</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1h" -->

! 				<option value="h" SELECTED>Coupe</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Coupe</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1i" -->

! 				<option value="i" SELECTED>Vue</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="i">Vue</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1j" -->

! 				<option value="j" SELECTED>Plan</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="j">Plan</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,90 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 124b</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Forme du document cartographique</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Atlas</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Atlas</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Diagramme</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Diagramme</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Globe</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Globe</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1d" -->
! 		<option value="d" SELECTED>Carte</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Carte</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Maquette</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Maquette</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1f" -->
! 		<option value="f" SELECTED>Profil</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Profil</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1g" -->
! 		<option value="g" SELECTED>Image de télédétection</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Image de télédétection</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1h" -->
! 		<option value="h" SELECTED>Coupe</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Coupe</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1i" -->
! 		<option value="i" SELECTED>Vue</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="i">Vue</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1j" -->
! 		<option value="j" SELECTED>Plan</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="j">Plan</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:28:08 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:28:08 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_124c.tmpl,1.2,1.3
Message-ID: <E1Ddrc8-0008Aj-Uh@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31368/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_124c.tmpl 
Log Message:
Template for 124c field plugin

Index: unimarc_field_124c.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124c.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_124c.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_124c.tmpl	2 Jun 2005 15:28:06 -0000	1.3
***************
*** 1,142 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 124c</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Presentation technique dans le cas d'images photographiques ou non photographiques:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1  " -->

! 				<option value="  " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="  ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1aa" -->

! 				<option value="aa" SELECTED>Anaglyphique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="aa">Anaglyphique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ab" -->

! 				<option value="ab" SELECTED>Polarisee</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ab">Polarisee</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ac" -->

! 				<option value="ac" SELECTED>Planimetrique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ac">Planimetrique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ad" -->

! 				<option value="ad" SELECTED>Carte diagramme</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ad">Carte diagramme</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ae" -->

! 				<option value="ae" SELECTED>Carte par courbes de niveau</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ae">Carte par courbes de niveau</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1af" -->

! 				<option value="af" SELECTED>Carte par points</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="af">Carte par points</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ag" -->

! 				<option value="ag" SELECTED>Carte diagrammatique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ag">Carte diagrammatique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ah" -->

! 				<option value="ah" SELECTED>Choroplethe</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ah">Choroplethe</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ai" -->

! 				<option value="ai" SELECTED>Chorochromatique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ai">Chorochromatique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1aj" -->

! 				<option value="aj" SELECTED>Dasymetrique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="aj">Dasymetrique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ak" -->

! 				<option value="ak" SELECTED>Isoplethe</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ak">Isoplethe</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1am" -->

! 				<option value="am" SELECTED>Anamorphique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="am">Anamorphique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1an" -->

! 				<option value="an" SELECTED>Carte peinte</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="an">Carte peinte</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ao" -->

! 				<option value="ao" SELECTED>Representation des volumes en 2 dimensions</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ao">Representation des volumes en 2 dimensions</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ap" -->

! 				<option value="ap" SELECTED>Carte mentale ou cognitive</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ap">Carte mentale ou cognitive</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1aq" -->

! 				<option value="aq" SELECTED>Vues avec horizon</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="aq">Vues avec horizon</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ar" -->

! 				<option value="ar" SELECTED>Vues sans horizon</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ar">Vues sans horizon</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1as" -->

! 				<option value="as" SELECTED>Infographie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="as">Infographie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1da" -->

! 				<option value="da" SELECTED>Pictocarte</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="da">Pictocarte</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1db" -->

! 				<option value="db" SELECTED>Carte par pointille</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="db">Carte par pointille</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1dc" -->

! 				<option value="dc" SELECTED>Tramee</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="dc">Tramee</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1dd" -->

! 				<option value="dd" SELECTED>Non tramee</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="dd">Non tramee</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,145 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 124c</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:25em;">Présentation technique dans le cas d'images photographiques ou non photographiques</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1  " -->
! 		<option value="  " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="  ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1aa" -->
! 		<option value="aa" SELECTED>Anaglyphique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="aa">Anaglyphique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ab" -->
! 		<option value="ab" SELECTED>Polarisée</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ab">Polarisée</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ac" -->
! 		<option value="ac" SELECTED>Planimétrique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ac">Planimétrique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ad" -->
! 		<option value="ad" SELECTED>Carte diagramme</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ad">Carte diagramme</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ae" -->
! 		<option value="ae" SELECTED>Carte par courbes de niveau</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ae">Carte par courbes de niveau</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1af" -->
! 		<option value="af" SELECTED>Carte par points</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="af">Carte par points</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ag" -->
! 		<option value="ag" SELECTED>Carte diagrammatique (c'est-à-dire cartogramme)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ag">Carte diagrammatique (c'est-à-dire cartogramme)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ah" -->
! 		<option value="ah" SELECTED>Choroplethe</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ah">Choroplethe</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ai" -->
! 		<option value="ai" SELECTED>Chorochromatique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ai">Chorochromatique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1aj" -->
! 		<option value="aj" SELECTED>Dasymétrique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="aj">Dasymétrique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ak" -->
! 		<option value="ak" SELECTED>Isoplethe</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ak">Isoplethe</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1am" -->
! 		<option value="am" SELECTED>Anamorphique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="am">Anamorphique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1an" -->
! 		<option value="an" SELECTED>Carte peinte</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="an">Carte peinte</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ao" -->
! 		<option value="ao" SELECTED>Représentation des volumes en 2 dimensions</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ao">Représentation des volumes en 2 dimensions</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ap" -->
! 		<option value="ap" SELECTED>Carte mentale ou cognitive</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ap">Carte mentale ou cognitive</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1aq" -->
! 		<option value="aq" SELECTED>Vues avec horizon (y compris les vues panoramiques)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="aq">Vues avec horizon (y compris les vues panoramiques)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ar" -->
! 		<option value="ar" SELECTED>Vues sans horizon (y compris les vues panoramiques)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ar">Vues sans horizon (y compris les vues panoramiques)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1as" -->
! 		<option value="as" SELECTED>Infographie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="as">Infographie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1da" -->
! 		<option value="da" SELECTED>Pictocarte</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="da">Pictocarte</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1db" -->
! 		<option value="db" SELECTED>Carte par pointillé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="db">Carte par pointillé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1dc" -->
! 		<option value="dc" SELECTED>Tramée</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="dc">Tramée</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1dd" -->
! 		<option value="dd" SELECTED>Non tramée</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="dd">Non tramée</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:25em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:28:37 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:28:37 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_124d.tmpl,1.2,1.3
Message-ID: <E1Ddrcb-0008E5-BN@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31558/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_124d.tmpl 
Log Message:
Template for 124d field plugin

Index: unimarc_field_124d.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124d.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_124d.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_124d.tmpl	2 Jun 2005 15:28:35 -0000	1.3
***************
*** 1,47 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 124d</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Position de la base pour les images photographiques ou de teledetection:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Terrestre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Terrestre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Aerienne</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Aerienne</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Spatiale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Spatiale</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,49 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 124d</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:25em;">Position de la base pour les images photographiques ou de télédétection</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Terrestre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Terrestre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Aérienne</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Aérienne</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Spatiale</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Spatiale</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:25em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:28:56 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:28:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_124e.tmpl,1.2,1.3
Message-ID: <E1Ddrcu-0008Hs-AM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31810/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_124e.tmpl 
Log Message:
Template for 124e field plugin

Index: unimarc_field_124e.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124e.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_124e.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_124e.tmpl	2 Jun 2005 15:28:54 -0000	1.3
***************
*** 1,47 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 124e</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Categorie du satellite pour la teledetection:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Meteorologique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Meteorologique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Exploration terrestre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Exploration terrestre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Observation spatiale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Observation spatiale</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,49 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 124e</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Catégorie du satellite pour la télédétection</label>
! 		<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Météorologique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Météorologique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Exploration terrestre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Exploration terrestre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Observation spatiale</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Observation spatiale</option>
! 		<!-- /TMPL_IF -->
! 		</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:29:15 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:29:15 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_124f.tmpl,1.2,1.3
Message-ID: <E1DdrdD-0008Lo-CU@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32053/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_124f.tmpl 
Log Message:
Template for 124f field plugin

Index: unimarc_field_124f.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124f.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_124f.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_124f.tmpl	2 Jun 2005 15:29:13 -0000	1.3
***************
*** 1,122 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 124f</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Nom du satellite pour la teledetection:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1  " -->

! 				<option value="  " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="  ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1aa" -->

! 				<option value="aa" SELECTED>Tiros</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="aa">Tiros</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ab" -->

! 				<option value="ab" SELECTED>ATS</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ab">ATS</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ac" -->

! 				<option value="ac" SELECTED>NOAA</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ac">NOAA</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ad" -->

! 				<option value="ad" SELECTED>Nimbus</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ad">Nimbus</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ae" -->

! 				<option value="ae" SELECTED>METEOSAT</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ae">METEOSAT</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ma" -->

! 				<option value="ma" SELECTED>Explorer I</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ma">Explorer I</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1mb" -->

! 				<option value="mb" SELECTED>Explorer II</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="mb">Explorer II</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ga" -->

! 				<option value="ga" SELECTED>ERTS</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ga">ERTS</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gb" -->

! 				<option value="gb" SELECTED>Landsat I</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gb">Landsat I</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gc" -->

! 				<option value="gc" SELECTED>Landsat II</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gc">Landsat II</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gd" -->

! 				<option value="gd" SELECTED>Landsat III</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gd">Landsat III</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ge" -->

! 				<option value="ge" SELECTED>Seasat</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ge">Seasat</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gf" -->

! 				<option value="gf" SELECTED>Skylab</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gf">Skylab</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gg" -->

! 				<option value="gg" SELECTED>Spacelab</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gg">Spacelab</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gk" -->

! 				<option value="gk" SELECTED>Spot 1</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gk">Spot 1</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gl" -->

! 				<option value="gl" SELECTED>Spot 2</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gl">Spot 2</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gm" -->

! 				<option value="gm" SELECTED>Spot 3</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gm">Spot 3</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gz" -->

! 				<option value="gz" SELECTED>Autres codes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gz">Autres codes</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,127 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 124f</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Nom du satellite pour la télédétection</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1  " -->
! 		<option value="  " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="  ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Météorologique :</option>
! 		<!-- TMPL_IF name="f1aa" -->
! 		<option value="aa" SELECTED>Tiros</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="aa">Tiros</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ab" -->
! 		<option value="ab" SELECTED>ATS</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ab">ATS</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ac" -->
! 		<option value="ac" SELECTED>NOAA</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ac">NOAA</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ad" -->
! 		<option value="ad" SELECTED>Nimbus</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ad">Nimbus</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ae" -->
! 		<option value="ae" SELECTED>METEOSAT</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ae">METEOSAT</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Exploration spatiale :</option>
! 		<!-- TMPL_IF name="f1ma" -->
! 		<option value="ma" SELECTED>Explorer I</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ma">Explorer I</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1mb" -->
! 		<option value="mb" SELECTED>Explorer II</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="mb">Explorer II</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Exploration terrestre :</option>
! 		<!-- TMPL_IF name="f1ga" -->
! 		<option value="ga" SELECTED>ERTS</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ga">ERTS</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gb" -->
! 		<option value="gb" SELECTED>Landsat I</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gb">Landsat I</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gc" -->
! 		<option value="gc" SELECTED>Landsat II</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gc">Landsat II</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gd" -->
! 		<option value="gd" SELECTED>Landsat III</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gd">Landsat III</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ge" -->
! 		<option value="ge" SELECTED>Seasat</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ge">Seasat</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gf" -->
! 		<option value="gf" SELECTED>Skylab</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gf">Skylab</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gg" -->
! 		<option value="gg" SELECTED>Spacelab</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gg">Spacelab</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gk" -->
! 		<option value="gk" SELECTED>Spot 1</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gk">Spot 1</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gl" -->
! 		<option value="gl" SELECTED>Spot 2</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gl">Spot 2</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gm" -->
! 		<option value="gm" SELECTED>Spot 3</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gm">Spot 3</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gz" -->
! 		<option value="gz" SELECTED>Autres codes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gz">Autres codes</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:29:35 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:29:35 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_124g.tmpl,1.2,1.3
Message-ID: <E1DdrdX-0008OS-Tk@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32240/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_124g.tmpl 
Log Message:
Template for 124g field plugin

Index: unimarc_field_124g.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124g.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_124g.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_124g.tmpl	2 Jun 2005 15:29:33 -0000	1.3
***************
*** 1,82 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 124g</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Technique d'enregistrement pour les images de teledetection:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1  " -->

! 				<option value="  " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="  ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1aa" -->

! 				<option value="aa" SELECTED>Enregistrement video</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="aa">Enregistrement video</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ab" -->

! 				<option value="ab" SELECTED>Photographie en fausse couleur</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ab">Photographie en fausse couleur</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ac" -->

! 				<option value="ac" SELECTED>Photographie multispectrale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ac">Photographie multispectrale</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ad" -->

! 				<option value="ad" SELECTED>Balayage multispectrale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ad">Balayage multispectrale</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1av" -->

! 				<option value="av" SELECTED>Combinaisons de techniques en faible emission</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="av">Combinaisons de techiques en faible emission</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1da" -->

! 				<option value="da" SELECTED>Balayage par ligne infrarouge</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="da">Balayage par ligne infrarouge</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1dv" -->

! 				<option value="dv" SELECTED>Combinaisons de techniques diverses de detection thermique par infrarouge</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="dv">Combinaisons de techiques diverses de detection thermique par infrarouge</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ga" -->

! 				<option value="ga" SELECTED>Sidelooking Airbone Radar</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ga">Sidelooking Airbone Radar</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gb" -->

! 				<option value="gb" SELECTED>Synthetic Aperture Radar</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gb">Synthetic Aperture Radar</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gc" -->

! 				<option value="gc" SELECTED>Couverture passive par ondes micrometriques</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gc">Couverture passive par onde micrometrique</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,87 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 124g</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:18em;">Technique d'enregistrement pour les images de télédétection</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1  " -->
! 		<option value="  " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="  ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Emission faible :</option>
! 		<!-- TMPL_IF name="f1aa" -->
! 		<option value="aa" SELECTED>Enregistrement vidéo</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="aa">Enregistrement vidéo</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ab" -->
! 		<option value="ab" SELECTED>Photographie en fausse couleur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ab">Photographie en fausse couleur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ac" -->
! 		<option value="ac" SELECTED>Photographie multispectrale</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ac">Photographie multispectrale</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ad" -->
! 		<option value="ad" SELECTED>Balayage multispectral</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ad">Balayage multispectral</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1av" -->
! 		<option value="av" SELECTED>Combinaisons de techniques en faible émission</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="av">Combinaisons de techiques en faible émission</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Détection thermique par infrarouge :</option>
! 		<!-- TMPL_IF name="f1da" -->
! 		<option value="da" SELECTED>Balayage par ligne infrarouge</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="da">Balayage par ligne infrarouge</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1dv" -->
! 		<option value="dv" SELECTED>Combinaisons de techniques diverses de détection thermique par infrarouge</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="dv">Combinaisons de techiques diverses de détection thermique par infrarouge</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Emission d'ondes micrométriques :</option>
! 		<!-- TMPL_IF name="f1ga" -->
! 		<option value="ga" SELECTED>Sidelooking Airbone Radar (SLAR)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ga">Sidelooking Airbone Radar (SLAR)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gb" -->
! 		<option value="gb" SELECTED>Synthetic Aperture Radar (SAR)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gb">Synthetic Aperture Radar (SAR)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gc" -->
! 		<option value="gc" SELECTED>Couverture passive par ondes micrométriques</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gc">Couverture passive par ondes micrométriques</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:18em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:30:07 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:30:07 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_125a.tmpl,1.2,1.3
Message-ID: <E1Ddre3-0008TM-Tf@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32474/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_125a.tmpl 
Log Message:
Template for 125a field plugin

Index: unimarc_field_125a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_125a.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_125a.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_125a.tmpl	2 Jun 2005 15:30:05 -0000	1.3
***************
*** 1,113 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 125a</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Type de partition:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Partition d'orchestre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Partition d'orchestre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Partition miniature ou d'etude</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Partition miniature ou d'etude</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Partition chant, accompagnement reduit pour le piano</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Partition chant, accompagnement reduit pour le piano</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1d" -->

! 				<option value="d" SELECTED>Partition vocale, partition chorale, sans accompagnement</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Partition vocale, partition chorale, sans accompagnement</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Partition condensee, partition de direction a partir du piano</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Partition condensee, partition de direction a partir du piano</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1g" -->

! 				<option value="g" SELECTED>Partition combinee dans laquelle plusieurs voix sont sur la meme portee</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">Partition combinee dans laquelle plusieurs voix sont sur la meme portee</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1m" -->

! 				<option value="m" SELECTED>Formes diverses</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="m">Formes diverses</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1x" -->

! 				<option value="x" SELECTED>Non applicable ce n'est pas une partition</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="x">Non applicable ce n'est pas une partition</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr>

! 		<td>Indicateur de parties:</td>

! 		<td>

! 			<select name="f2" size="1">

! 			<!-- TMPL_IF name="f2 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2a" -->

! 				<option value="a" SELECTED>Parties existantes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Parties existantes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2x" -->

! 				<option value="x" SELECTED>Non applicable</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="x">Non applicable</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2y" -->

! 				<option value="y" SELECTED>Parties inexistantes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="y">Parties inexistantes</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,115 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 125a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Type de partition</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Partition d'orchestre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Partition d'orchestre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Partition miniature ou d'étude</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Partition miniature ou d'étude</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Partition chant, accompagnement réduit pour le piano</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Partition chant, accompagnement réduit pour le piano</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1d" -->
! 		<option value="d" SELECTED>Partition vocale, partition chorale, sans accompagnement</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Partition vocale, partition chorale, sans accompagnement</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Partition condensée, partition de direction à partir du piano</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Partition condensée, partition de direction à partir du piano</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1g" -->
! 		<option value="g" SELECTED>Partition combinée dans laquelle plusieurs voix sont sur la meme portée</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Partition combineée dans laquelle plusieurs voix sont sur la meme portée</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1m" -->
! 		<option value="m" SELECTED>Formes diverses</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="m">Formes diverses</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1x" -->
! 		<option value="x" SELECTED>Non applicable ce n'est pas une partition</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="x">Non applicable ce n'est pas une partition</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Indicateur de parties</label>
! 	<select name="f2" size="1">
! 		<!-- TMPL_IF name="f2 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2a" -->
! 		<option value="a" SELECTED>Parties existantes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Parties existantes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2x" -->
! 		<option value="x" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="x">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2y" -->
! 		<option value="y" SELECTED>Parties inexistantes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="y">Parties inexistantes</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:30:24 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:30:24 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_125b.tmpl,1.2,1.3
Message-ID: <E1DdreK-00005f-L6@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv311/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_125b.tmpl 
Log Message:
Template for 125b field plugin

Index: unimarc_field_125b.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_125b.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_125b.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_125b.tmpl	2 Jun 2005 15:30:22 -0000	1.3
***************
*** 1,137 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 125b</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Forme du document cartographique:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Poesie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Poesie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Theatre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Theatre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Fiction</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Fiction</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1d" -->

! 				<option value="d" SELECTED>Histoire</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Histoire</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Conferences, discours</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Conferences, discours</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1f" -->

! 				<option value="f" SELECTED>Instructions</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Instructions</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1g" -->

! 				<option value="g" SELECTED>Sons</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">Sons</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1h" -->

! 				<option value="h" SELECTED>Autobiographie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Autobiographie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1i" -->

! 				<option value="i" SELECTED>Biographie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="i">Biographie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1j" -->

! 				<option value="j" SELECTED>Essais</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="j">Essais</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1k" -->

! 				<option value="k" SELECTED>Comptes-rendus</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="k">Comptes-rendus</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1l" -->

! 				<option value="l" SELECTED>Memoires</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="l">Memoires</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1m" -->

! 				<option value="m" SELECTED>Repetition</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="m">Repetition</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1n" -->

! 				<option value="n" SELECTED>Entretiens</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="n">Entretiens</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1o" -->

! 				<option value="o" SELECTED>Textes publicitaires</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="o">Textes publicitaires</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1p" -->

! 				<option value="p" SELECTED>Cours de langues</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="p">Cours de langues</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1q" -->

! 				<option value="q" SELECTED>Actes de colloque</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="q">Actes de colloque</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1r" -->

! 				<option value="r" SELECTED>Comedie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="r">Comedie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1s" -->

! 				<option value="s" SELECTED>Contes populaires</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="s">Contes populaires</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1t" -->

! 				<option value="t" SELECTED>Textes sacres</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="t">Textes sacres</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1z" -->

! 				<option value="z" SELECTED>Autres textes litteraires</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autres textes litteraires</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,139 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 125b</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Type de texte écrit</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Poésie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Poésie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Théâtre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Théâtre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Fiction</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Fiction</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1d" -->
! 		<option value="d" SELECTED>Histoire</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Histoire</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Conférences, discours</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Conférences, discours</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1f" -->
! 		<option value="f" SELECTED>Instructions</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Instructions</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1g" -->
! 		<option value="g" SELECTED>Sons</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Sons</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1h" -->
! 		<option value="h" SELECTED>Autobiographie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Autobiographie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1i" -->
! 		<option value="i" SELECTED>Biographie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="i">Biographie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1j" -->
! 		<option value="j" SELECTED>Essais</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="j">Essais</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1k" -->
! 		<option value="k" SELECTED>Comptes-rendus</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="k">Comptes-rendus</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1l" -->
! 		<option value="l" SELECTED>Mémoires</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="l">Mémoires</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1m" -->
! 		<option value="m" SELECTED>Répétition</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="m">Répétition</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1n" -->
! 		<option value="n" SELECTED>Entretiens</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Entretiens</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1o" -->
! 		<option value="o" SELECTED>Textes publicitaires</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="o">Textes publicitaires</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1p" -->
! 		<option value="p" SELECTED>Cours de langues</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="p">Cours de langues</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1q" -->
! 		<option value="q" SELECTED>Actes de colloque</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="q">Actes de colloque</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1r" -->
! 		<option value="r" SELECTED>Comédie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="r">Comédie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1s" -->
! 		<option value="s" SELECTED>Contes populaires</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="s">Contes populaires</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1t" -->
! 		<option value="t" SELECTED>Textes sacrés</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="t">Textes sacrés</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1z" -->
! 		<option value="z" SELECTED>Autres textes littéraires</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autres textes littéraires</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:30:48 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:30:48 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_126a.tmpl,1.2,1.3
Message-ID: <E1Ddrei-000086-4U@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv455/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_126a.tmpl 
Log Message:
Template for 126a field plugin

Index: unimarc_field_126a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_126a.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_126a.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_126a.tmpl	2 Jun 2005 15:30:45 -0000	1.3
***************
*** 1,1076 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 126a</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Presentation materielle:</td>

! 		<td>

[...2128 lines suppressed...]
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value+document.f_pop.f10.value+document.f_pop.f11.value+document.f_pop.f12.value+document.f_pop.f13.value+document.f_pop.f14.value+document.f_pop.f15.value ;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:31:06 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:31:06 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_126b.tmpl,1.2,1.3
Message-ID: <E1Ddrf0-0000CH-SE@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv713/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_126b.tmpl 
Log Message:
Template for 126b field plugin

Index: unimarc_field_126b.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_126b.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_126b.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_126b.tmpl	2 Jun 2005 15:31:04 -0000	1.3
***************
*** 1,194 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 126b</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Type de disque, cylindre ou bande magnetique:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Gravure directe</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Gravure directe</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Production industrielle</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Production industrielle</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Bande "Master"</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Bande "Master"</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1d" -->

! 				<option value="d" SELECTED>Bande reproduite a partir du "master"</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Bande reproduite a partir du master</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Disque "pere" (negatif)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Disque "pere" (negatif)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1f" -->

! 				<option value="f" SELECTED>Disque "mere" (positif)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Disque "mere" (positif)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1g" -->

! 				<option value="g" SELECTED>Matrice (negatif)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">Matrice (negatif)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1h" -->

! 				<option value="h" SELECTED>Pressage de test</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Pressage de test</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr>

! 		<td>Type de document:</td>

! 		<td>

! 			<select name="f2" size="1">

! 			<!-- TMPL_IF name="f2 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2x" -->

! 				<option value="x" SELECTED>Non applicable</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="x">Non applicable</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2g" -->

! 				<option value="g" SELECTED>Cire (gravure directe)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">Cire (gravure directe)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2h" -->

! 				<option value="h" SELECTED>Plastique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Plastique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2a" -->

! 				<option value="a" SELECTED>Laque</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Laque</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2b" -->

! 				<option value="b" SELECTED>Metal</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Metal</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2c" -->

! 				<option value="c" SELECTED>Pressage laque</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Pressage laque</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2d" -->

! 				<option value="d" SELECTED>Pressage plastique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Pressage plastique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2e" -->

! 				<option value="e" SELECTED>Metal et plastique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Metal et plastique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2i" -->

! 				<option value="i" SELECTED>Dos papier</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="i">Dos papier</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2j" -->

! 				<option value="j" SELECTED>Acetate</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="j">Acetate</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2k" -->

! 				<option value="k" SELECTED>P.V.C.</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="k">P.V.C.</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2l" -->

! 				<option value="l" SELECTED>Polyester</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="l">Polyester</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr>

! 		<td>Type de gravure:</td>

! 		<td>

! 			<select name="f3" size="1">

! 			<!-- TMPL_IF name="f3 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3a" -->

! 				<option value="a" SELECTED>Gravure laterale ou combinee</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Gravure laterale ou combinee</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3b" -->

! 				<option value="b" SELECTED>Gravure verticale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Gravure verticale</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3u" -->

! 				<option value="u" SELECTED>Gravure inconnue</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Gravure inconnue</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3x" -->

! 				<option value="x" SELECTED>Non applicable</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="x">Non applicable</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value ;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,199 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 126b</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:22em;">Type de disque, cylindre ou bande magnétique</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Gravure directe</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Gravure directe</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Production industrielle</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Production industrielle</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Bande "master"</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Bande "master"</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1d" -->
! 		<option value="d" SELECTED>Bande reproduite à partir du "master"</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Bande reproduite à partir du "master"</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Disque "père" (négatif)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Disque "père" (négatif)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1f" -->
! 		<option value="f" SELECTED>Disque "mère" (positif)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Disque "mère" (positif)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1g" -->
! 		<option value="g" SELECTED>Matrice (négatif)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Matrice (négatif)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1h" -->
! 		<option value="h" SELECTED>Pressage de test</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Pressage de test</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:22em;">Type de document</label>
! 	<select name="f2" size="1">
! 		<!-- TMPL_IF name="f2 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2x" -->
! 		<option value="x" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="x">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Disques :</option>
! 		<!-- TMPL_IF name="f2a" -->
! 		<option value="a" SELECTED>Laque</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Laque</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2b" -->
! 		<option value="b" SELECTED>Métal</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Métal</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2c" -->
! 		<option value="c" SELECTED>Pressage laque</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Pressage laque</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2d" -->
! 		<option value="d" SELECTED>Pressage plastique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Pressage plastique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2e" -->
! 		<option value="e" SELECTED>Métal et plastique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Métal et plastique</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Cylindres :</option>
! 		<!-- TMPL_IF name="f2g" -->
! 		<option value="g" SELECTED>Cire (gravure directe)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Cire (gravure directe)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2h" -->
! 		<option value="h" SELECTED>Plastique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Plastique</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Bandes :</option>
! 		<!-- TMPL_IF name="f2i" -->
! 		<option value="i" SELECTED>Dos papier</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="i">Dos papier</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2j" -->
! 		<option value="j" SELECTED>Acétate</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="j">Acétate</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2k" -->
! 		<option value="k" SELECTED>P.V.C.</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="k">P.V.C.</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2l" -->
! 		<option value="l" SELECTED>Polyester</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="l">Polyester</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:22em;">Type de gravure</label>
! 	<select name="f3" size="1">
! 		<!-- TMPL_IF name="f3 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3a" -->
! 		<option value="a" SELECTED>Gravure latérale ou combinée</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Gravure latérale ou combinée</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3b" -->
! 		<option value="b" SELECTED>Gravure verticale</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Gravure verticale</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3u" -->
! 		<option value="u" SELECTED>Gravure inconnue</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Gravure inconnue</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3x" -->
! 		<option value="x" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="x">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:22em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value ;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:31:30 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:31:30 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_127.tmpl,1.1,1.2
Message-ID: <E1DdrfO-0000F8-0p@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv890/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_127.tmpl 
Log Message:
Template for 127a field plugin

Index: unimarc_field_127.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_127.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_127.tmpl	24 Nov 2004 16:21:17 -0000	1.1
--- unimarc_field_127.tmpl	2 Jun 2005 15:31:27 -0000	1.2
***************
*** 1,46 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 127</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! <tr>(Completer avec des 0 a gauche)</tr>

! <tr>          <td>Heure:</td>

!                          <td><input type="text" name="f1" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f1" -->"></td>

!           <td>Minutes:</td>

!                          <td><input type="text" name="f2" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f2" -->"></td>

!           <td>Secondes:</td>

!                          <td><input type="text" name="f3" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f3" -->"></td>

! </tr>

! 

! 

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! document.f_pop.f1.value=document.f_pop.f1.value+'   ';

! document.f_pop.f2.value=document.f_pop.f2.value+'  ';

! document.f_pop.f3.value=document.f_pop.f3.value+'  ';

! 

! 

! 

! document.f_pop.f1.value=document.f_pop.f1.value.substring(0,2);

! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,2);

! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,45 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 127a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Durée (compléter avec des 0 à gauche)</label>
! 	<label style="width:6em;">Heures</label><input type="text" name="f1" maxlength=2 size=3 value="<!-- TMPL_VAR name="f1" -->">
! </p>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<label style="width:6em;">Minutes</label><input type="text" name="f2" maxlength=2 size=3 value="<!-- TMPL_VAR name="f2" -->">
! </p>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<label style="width:6em;">Secondes</label><input type="text" name="f3" maxlength=2 size=3 value="<!-- TMPL_VAR name="f3" -->">
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! document.f_pop.f1.value=document.f_pop.f1.value+'   ';
! document.f_pop.f2.value=document.f_pop.f2.value+'  ';
! document.f_pop.f3.value=document.f_pop.f3.value+'  ';
! 
! 
! 
! document.f_pop.f1.value=document.f_pop.f1.value.substring(0,2);
! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,2);
! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:32:52 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:32:52 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_128c.tmpl,1.2,1.3
Message-ID: <E1Ddrgi-0000RV-TD@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1665/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_128c.tmpl 
Log Message:
Template for 128c field plugin

Index: unimarc_field_128c.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_128c.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_128c.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_128c.tmpl	2 Jun 2005 15:32:50 -0000	1.3
***************
*** 1,472 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 128c</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Instruments ou voix dans un ensemble:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1  " -->

! 				<option value="  " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="  ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ba" -->

! 				<option value="ba" SELECTED>Cor</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ba">Cor</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bb" -->

! 				<option value="bb" SELECTED>Trompette</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bb">Trompette</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bc" -->

! 				<option value="bc" SELECTED>Cornet a piston</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bc">Cornet a piston</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bd" -->

! 				<option value="bd" SELECTED>Trombone</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bd">Trombone</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1be" -->

! 				<option value="be" SELECTED>Tuba</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="be">Tuba</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bf" -->

! 				<option value="bf" SELECTED>Saxophone</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bf">Saxophone</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bt" -->

! 				<option value="bt" SELECTED>Ethniques</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bt">Ethniques</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bu" -->

! 				<option value="bu" SELECTED>Non precise (Cuivre)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bu">Non precise (Cuivre)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bz" -->

! 				<option value="bz" SELECTED>Autre cuivre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bz">Autre cuivre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ca" -->

! 				<option value="ca" SELECTED>Mixtes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ca">Mixtes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cb" -->

! 				<option value="cb" SELECTED>Femmes </option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cb">Femmes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cc" -->

! 				<option value="cc" SELECTED>Hommes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cc">Hommes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cd" -->

! 				<option value="cd" SELECTED>Enfants</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cd">Enfants</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ct" -->

! 				<option value="ct" SELECTED>Ethniques</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ct">Ethniques</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cu" -->

! 				<option value="cu" SELECTED>Non precise (Choeurs)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cu">Non precise (Choeurs)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1oa" -->

! 				<option value="oa" SELECTED>Orchestre symphonique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="oa">Orchestre symphonique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ob" -->

! 				<option value="ob" SELECTED>Orchestre de chambre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ob">Orchestre de chambre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1oc" -->

! 				<option value="oc" SELECTED>Orchestres a cordes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="oc">Orchestres a cordes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1od" -->

! 				<option value="od" SELECTED>Fanfare</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="od">Fanfare</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1oe" -->

! 				<option value="oe" SELECTED>Orchestre de danse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="oe">Orchestre de danse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1of" -->

! 				<option value="of" SELECTED>Grand ensemble - orchestre de cuivres</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="of">Grand ensemble - orchestre de cuivres</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ot" -->

! 				<option value="ot" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ot">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ou" -->

! 				<option value="ou" SELECTED>Non precise (orchestre)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ou">Non precise (orchestre)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1oz" -->

! 				<option value="oz" SELECTED>Autre orchestre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="oz">Autre orchestre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pa" -->

! 				<option value="pa" SELECTED>Tympanon</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pa">Tympanon</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pb" -->

! 				<option value="pb" SELECTED>Xylophone</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pb">Xylophone</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pc" -->

! 				<option value="pc" SELECTED>Marimba</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pc">Marimba</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pd" -->

! 				<option value="pd" SELECTED>Tambour, batterie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pd">Tambour, batterie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pt" -->

! 				<option value="pt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pu" -->

! 				<option value="pu" SELECTED>Non precise (percussion)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pu">Non precise (percussion)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pz -->

! 				<option value="pz" SELECTED>Autre percussions</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pz">Autre percussions</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sa" -->

! 				<option value="sa" SELECTED>Violon</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sa">Violon</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sb" -->

! 				<option value="sb" SELECTED>Alto</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sb">Alto</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sc" -->

! 				<option value="sc" SELECTED>Violoncelle</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sc">Violoncelle</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sd" -->

! 				<option value="sd" SELECTED>Contrebasse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sd">Contrebasse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1se" -->

! 				<option value="se" SELECTED>Viole</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="se">Viole</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sf" -->

! 				<option value="sf" SELECTED>Viole d'amour</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sf">Viole d'amour</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sg" -->

! 				<option value="sg" SELECTED>Viole de gambe</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sg">Viole de gambe</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1st" -->

! 				<option value="st" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="st">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1su" -->

! 				<option value="su" SELECTED>Non precise (Corde frottee)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="su">Non precise (Corde frottee)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sz" -->

! 				<option value="sz" SELECTED>Autre (Corde frottee)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sz">Autre (Corde frottee)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1uu" -->

! 				<option value="uu" SELECTED>Non precise (Non precise)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="uu">Non precise (Non precise)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ea" -->

! 				<option value="ea" SELECTED>Synthetiseur</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ea">Synthetiseur</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1eb" -->

! 				<option value="eb" SELECTED>Bande magnetique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="eb">Bande magnetique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ec" -->

! 				<option value="ec" SELECTED>Ordinateur</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ec">Ordinateur</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ed" -->

! 				<option value="ed" SELECTED>Ondes Martenot</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ed">Ondes Martenot</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1eu" -->

! 				<option value="eu" SELECTED>Non precise (Electronique)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="eu">Non precise (Electronique)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ez" -->

! 				<option value="ez" SELECTED>Autre (Electronique)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ez">Autre (Electronique)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ka" -->

! 				<option value="ka" SELECTED>Piano</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ka">Piano</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kb" -->

! 				<option value="kb" SELECTED>Orgue</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kb">Orgue</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kc" -->

! 				<option value="kc" SELECTED>Clavecin</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kc">Clavecin</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kd" -->

! 				<option value="kd" SELECTED>Clavicorde</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kd">Clavicorde</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ke" -->

! 				<option value="ke" SELECTED>Continuo</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ke">Continuo</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kf" -->

! 				<option value="kf" SELECTED>Celesta</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kf">Celesta</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kt" -->

! 				<option value="kt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ku" -->

! 				<option value="ku" SELECTED>Non precise (clavier)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ku">Non precise (clavier)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kz" -->

! 				<option value="kz" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kz">Autre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1va" -->

! 				<option value="va" SELECTED>Soprano</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="va">Soprano</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vb" -->

! 				<option value="vb" SELECTED>Mezzo-soprano</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vb">Mezzo-soprano</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vc" -->

! 				<option value="vc" SELECTED>Alto</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vc">Alto</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vd" -->

! 				<option value="vd" SELECTED>Tenor</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vd">Tenor</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ve" -->

! 				<option value="ve" SELECTED>Baryton</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ve">Baryton</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vf" -->

! 				<option value="vf" SELECTED>Basse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vf">Basse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vg" -->

! 				<option value="vg" SELECTED>Haute contre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vg">Haute contre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vh" -->

! 				<option value="vh" SELECTED>Voix aigues</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vh">Voix aigues</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vi" -->

! 				<option value="vi" SELECTED>Voix medium</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vi">Voix medium</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vj" -->

! 				<option value="vj" SELECTED>Voix graves</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vj">Voix graves</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vt" -->

! 				<option value="vt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vu" -->

! 				<option value="vu" SELECTED>Non precise (Voix precise)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vu">Non precise (Voix precise)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ta" -->

! 				<option value="ta" SELECTED>Harpe</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ta">Harpe</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tb" -->

! 				<option value="tb" SELECTED>Famille de la guitare</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tb">Famille de la guitare</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tc" -->

! 				<option value="tc" SELECTED>Famille du luth</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tc">Famille du luth</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1td" -->

! 				<option value="td" SELECTED>Mandoline</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="td">Mandoline</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tt" -->

! 				<option value="tt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tu" -->

! 				<option value="tu" SELECTED>Non precise (Cordes pincees)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tu">Non precise (Cordes pincees)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tz" -->

! 				<option value="tz" SELECTED>Autre corde pincee</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tz">Autre corde pincee</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wa" -->

! 				<option value="wa" SELECTED>Flute traversiere</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wa">Flute traversiere</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wb" -->

! 				<option value="wb" SELECTED>Hautbois</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wb">Hautbois</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wc" -->

! 				<option value="wc" SELECTED>Clarinette</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wc">Clarinette</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wd" -->

! 				<option value="wd" SELECTED>Basson</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wd">Basson</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1we" -->

! 				<option value="we" SELECTED>Piccolo</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="we">Piccolo</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wf" -->

! 				<option value="wf" SELECTED>Cor anglais</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wf">Cor anglais</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wg" -->

! 				<option value="wg" SELECTED>Clarinette basse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wg">Clarinette basse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wh" -->

! 				<option value="wh" SELECTED>Flute a bec </option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wh">Flute a bec</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wi" -->

! 				<option value="wi" SELECTED>Saxophone</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wi">Saxophone</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wt" -->

! 				<option value="wt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wu" -->

! 				<option value="wu" SELECTED>Non precise</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wu">Non precise</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wz" -->

! 				<option value="wz" SELECTED>Autre bois</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wz">Autre bois</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,493 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 128c</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:10em;">Instruments ou voix pour solistes</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1  " -->
! 		<option value="  " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="  ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Cuivres :</option>
! 		<!-- TMPL_IF name="f1ba" -->
! 		<option value="ba" SELECTED>Cor</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ba">Cor</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bb" -->
! 		<option value="bb" SELECTED>Trompette</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bb">Trompette</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bc" -->
! 		<option value="bc" SELECTED>Cornet à piston</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bc">Cornet à piston</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bd" -->
! 		<option value="bd" SELECTED>Trombone</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bd">Trombone</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1be" -->
! 		<option value="be" SELECTED>Tuba</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="be">Tuba</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bf" -->
! 		<option value="bf" SELECTED>Saxophone</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bf">Saxophone</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bt" -->
! 		<option value="bt" SELECTED>Ethniques</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bt">Ethniques</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bu" -->
! 		<option value="bu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bz" -->
! 		<option value="bz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Choeurs :</option>
! 		<!-- TMPL_IF name="f1ca" -->
! 		<option value="ca" SELECTED>Mixtes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ca">Mixtes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cb" -->
! 		<option value="cb" SELECTED>Femmes </option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cb">Femmes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cc" -->
! 		<option value="cc" SELECTED>Hommes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cc">Hommes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cd" -->
! 		<option value="cd" SELECTED>Enfants</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cd">Enfants</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ct" -->
! 		<option value="ct" SELECTED>Ethniques</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ct">Ethniques</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cu" -->
! 		<option value="cu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Orchestre :</option>
! 		<!-- TMPL_IF name="f1oa" -->
! 		<option value="oa" SELECTED>Orchestre symphonique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="oa">Orchestre symphonique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ob" -->
! 		<option value="ob" SELECTED>Orchestre de chambre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ob">Orchestre de chambre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1oc" -->
! 		<option value="oc" SELECTED>Orchestres à cordes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="oc">Orchestres à cordes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1od" -->
! 		<option value="od" SELECTED>Fanfare</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="od">Fanfare</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1oe" -->
! 		<option value="oe" SELECTED>Orchestre de danse</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="oe">Orchestre de danse</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1of" -->
! 		<option value="of" SELECTED>Grand ensemble - orchestre de cuivres (cuivres doublés ou non, avec ou sans percussions)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="of">Grand ensemble - orchestre de cuivres (cuivres doublés ou non, avec ou sans percussions)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ot" -->
! 		<option value="ot" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ot">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ou" -->
! 		<option value="ou" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ou">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1oz" -->
! 		<option value="oz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="oz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Percussions :</option>
! 		<!-- TMPL_IF name="f1pa" -->
! 		<option value="pa" SELECTED>Tympanon</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pa">Tympanon</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pb" -->
! 		<option value="pb" SELECTED>Xylophone</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pb">Xylophone</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pc" -->
! 		<option value="pc" SELECTED>Marimba</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pc">Marimba</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pd" -->
! 		<option value="pd" SELECTED>Tambour, batterie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pd">Tambour, batterie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pt" -->
! 		<option value="pt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pu" -->
! 		<option value="pu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pz -->
! 		<option value="pz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Cordes frottées :</option>
! 		<!-- TMPL_IF name="f1sa" -->
! 		<option value="sa" SELECTED>Violon</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sa">Violon</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sb" -->
! 		<option value="sb" SELECTED>Alto</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sb">Alto</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sc" -->
! 		<option value="sc" SELECTED>Violoncelle</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sc">Violoncelle</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sd" -->
! 		<option value="sd" SELECTED>Contrebasse</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sd">Contrebasse</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1se" -->
! 		<option value="se" SELECTED>Viole</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="se">Viole</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sf" -->
! 		<option value="sf" SELECTED>Viole d'amour</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sf">Viole d'amour</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sg" -->
! 		<option value="sg" SELECTED>Viole de gambe</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sg">Viole de gambe</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1st" -->
! 		<option value="st" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="st">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1su" -->
! 		<option value="su" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="su">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sz" -->
! 		<option value="sz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Electronique :</option>
! 		<!-- TMPL_IF name="f1ea" -->
! 		<option value="ea" SELECTED>Synthétiseur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ea">Synthétiseur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1eb" -->
! 		<option value="eb" SELECTED>Bande magnétique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="eb">Bande magnétique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ec" -->
! 		<option value="ec" SELECTED>Ordinateur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ec">Ordinateur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ed" -->
! 		<option value="ed" SELECTED>Ondes Martenot</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ed">Ondes Martenot</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1eu" -->
! 		<option value="eu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="eu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ez" -->
! 		<option value="ez" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ez">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Claviers :</option>
! 		<!-- TMPL_IF name="f1ka" -->
! 		<option value="ka" SELECTED>Piano</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ka">Piano</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kb" -->
! 		<option value="kb" SELECTED>Orgue</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kb">Orgue</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kc" -->
! 		<option value="kc" SELECTED>Clavecin</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kc">Clavecin</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kd" -->
! 		<option value="kd" SELECTED>Clavicorde</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kd">Clavicorde</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ke" -->
! 		<option value="ke" SELECTED>Continuo</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ke">Continuo</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kf" -->
! 		<option value="kf" SELECTED>Célesta</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kf">Célesta</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kt" -->
! 		<option value="kt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ku" -->
! 		<option value="ku" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ku">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kz" -->
! 		<option value="kz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Voix :</option>
! 		<!-- TMPL_IF name="f1va" -->
! 		<option value="va" SELECTED>Soprano</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="va">Soprano</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vb" -->
! 		<option value="vb" SELECTED>Mezzo-soprano</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vb">Mezzo-soprano</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vc" -->
! 		<option value="vc" SELECTED>Alto</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vc">Alto</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vd" -->
! 		<option value="vd" SELECTED>Tenor</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vd">Tenor</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ve" -->
! 		<option value="ve" SELECTED>Baryton</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ve">Baryton</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vf" -->
! 		<option value="vf" SELECTED>Basse</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vf">Basse</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vg" -->
! 		<option value="vg" SELECTED>Haute contre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vg">Haute contre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vh" -->
! 		<option value="vh" SELECTED>Voix aiguës</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vh">Voix aiguës</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vi" -->
! 		<option value="vi" SELECTED>Voix médium</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vi">Voix médium</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vj" -->
! 		<option value="vj" SELECTED>Voix graves</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vj">Voix graves</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vt" -->
! 		<option value="vt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vu" -->
! 		<option value="vu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Cordes pincées :</option>
! 		<!-- TMPL_IF name="f1ta" -->
! 		<option value="ta" SELECTED>Harpe</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ta">Harpe</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tb" -->
! 		<option value="tb" SELECTED>Famille de la guitare</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tb">Famille de la guitare</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tc" -->
! 		<option value="tc" SELECTED>Famille du luth</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tc">Famille du luth</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1td" -->
! 		<option value="td" SELECTED>Mandoline</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="td">Mandoline</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tt" -->
! 		<option value="tt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tu" -->
! 		<option value="tu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tz" -->
! 		<option value="tz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Bois :</option>
! 		<!-- TMPL_IF name="f1wa" -->
! 		<option value="wa" SELECTED>Flûte (traversière)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wa">Flûte (traversière)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wb" -->
! 		<option value="wb" SELECTED>Hautbois</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wb">Hautbois</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wc" -->
! 		<option value="wc" SELECTED>Clarinette</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wc">Clarinette</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wd" -->
! 		<option value="wd" SELECTED>Basson</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wd">Basson</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1we" -->
! 		<option value="we" SELECTED>Piccolo</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="we">Piccolo</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wf" -->
! 		<option value="wf" SELECTED>Cor anglais</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wf">Cor anglais</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wg" -->
! 		<option value="wg" SELECTED>Clarinette basse</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wg">Clarinette basse</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wh" -->
! 		<option value="wh" SELECTED>Flûte à bec </option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wh">Flûte à bec</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wi" -->
! 		<option value="wi" SELECTED>Saxophone</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wi">Saxophone</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wt" -->
! 		<option value="wt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wu" -->
! 		<option value="wu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wz" -->
! 		<option value="wz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Non précisé :</option>
! 		<!-- TMPL_IF name="f1uu" -->
! 		<option value="uu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="uu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! 
! <p>
! 	<label style="width:10em;">Nombre</label>
! 	<input type="text" name="f2" maxlength=2 size=3 value="<!-- TMPL_VAR name="f2" -->"> (sur deux chiffres, compléter éventuellement avec un 0)
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:10em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 		document.f_pop.f2.value=document.f_pop.f2.value+'  ';
! 		document.f_pop.f2.value=document.f_pop.f2.value.substring(0,2);
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:33:44 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:33:44 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_135a.tmpl,1.2,1.3
Message-ID: <E1DdrhY-0000b2-Ry@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2244/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_135a.tmpl 
Log Message:
Template for 135a field plugin

Index: unimarc_field_135a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_135a.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_135a.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_135a.tmpl	2 Jun 2005 15:33:42 -0000	1.3
***************
*** 1,65 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 135a</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Type de fichier informatique:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Donnees numeriques</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Donnees numeriques</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Programmes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Programmes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Representations</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Representations</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1d" -->

! 				<option value="d" SELECTED>Texte</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Texte</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1v" -->

! 				<option value="v" SELECTED>Combinaison de donnees</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="v">Combinaison de donnees</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,484 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 135a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Type de fichier informatique</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Données numériques</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Données numériques</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Programmes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Programmes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Représentations</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Représentations</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1d" -->
! 		<option value="d" SELECTED>Texte</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Texte</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Données bibliographiques</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Données bibliographiques</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1f" -->
! 		<option value="f" SELECTED>Fonte</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Fonte</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1g" -->
! 		<option value="g" SELECTED>Jeu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Jeu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1h" -->
! 		<option value="h" SELECTED>Son</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Son</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1i" -->
! 		<option value="i" SELECTED>Multimédia interactif</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="i">Multimédia interactif</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1j" -->
! 		<option value="j" SELECTED>Système en ligne</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="j">Système en ligne</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1v" -->
! 		<option value="v" SELECTED>Combinaison de données</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="v">Combinaison de données</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Type de support utilisé</label>
! 	<select name="f2" size="1">
! 		<!-- TMPL_IF name="f2 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2a" -->
! 		<option value="a" SELECTED>Bande magnétique en cartouche</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Bande magnétique en cartouche</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2b" -->
! 		<option value="b" SELECTED>Puce d'ordinateur en cartouche</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Puce d'ordinateur en cartouche</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2c" -->
! 		<option value="c" SELECTED>Disque optique en cartouche</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Disque optique en cartouche</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2f" -->
! 		<option value="f" SELECTED>Bande magnétique en cassette</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Bande magnétique en cassette</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2h" -->
! 		<option value="h" SELECTED>Bande magnétique pour gros ordinateur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Bande magnétique pour gros ordinateur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2j" -->
! 		<option value="j" SELECTED>Disquette</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="j">Disquette</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2m" -->
! 		<option value="m" SELECTED>Disque magnéto-optique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="m">Disque magnéto-optique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2o" -->
! 		<option value="o" SELECTED>Disque optique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="o">Disque optique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2r" -->
! 		<option value="r" SELECTED>Système en ligne</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="r">Système en ligne</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Couleur</label>
! 	<select name="f3" size="1">
! 		<!-- TMPL_IF name="f3 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3a" -->
! 		<option value="a" SELECTED>Une couleur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Une couleur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3b" -->
! 		<option value="b" SELECTED>Noir et blanc</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Noir et blanc</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3c" -->
! 		<option value="c" SELECTED>Polychrome</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Polychrome</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3g" -->
! 		<option value="g" SELECTED>Gris</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Gris</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3m" -->
! 		<option value="m" SELECTED>Mélangé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="m">Mélangé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3n" -->
! 		<option value="n" SELECTED>Ne s'applique pas</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Ne s'applique pas</option>
! 		<!-- /TMPL_IF -->		
! 		<!-- TMPL_IF name="f3u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Dimensions</label>
! 	<select name="f4" size="1">
! 		<!-- TMPL_IF name="f4 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4a" -->
! 		<option value="a" SELECTED>3 1/2 in</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">3 1/2 in</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4b" -->
! 		<option value="b" SELECTED>12 in</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">12 in</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4g" -->
! 		<option value="g" SELECTED>4 3/4 in ou 12 cm</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">4 3/4 in ou 12 cm</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4i" -->
! 		<option value="i" SELECTED>1 1/8 x 2 3/8 in</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="i">1 1/8 x 2 3/8 in</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4j" -->
! 		<option value="j" SELECTED>3 7/8 x 2 1/2 in</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="j">3 7/8 x 2 1/2 in</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4n" -->
! 		<option value="n" SELECTED>Ne s'applique pas</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Ne s'applique pas</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4o" -->
! 		<option value="o" SELECTED>5 1/4 in</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="o">5 1/4 in</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4v" -->
! 		<option value="v" SELECTED>8 in</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="v">8 in</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Son</label>
! 	<select name="f5" size="1">
! 		<!-- TMPL_IF name="f5 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5#" -->
! 		<option value="#" SELECTED>Pas de son (silencieux)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="#">Pas de son (silencieux)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5a" -->
! 		<option value="a" SELECTED>Il y a du son sur le support</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Il y a du son sur le support</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Bits par pixel</label>
! 	<input type="text" name="f6" maxlength=3 size=3 value="<!-- TMPL_VAR name="f6" -->"> (sur trois caractères)
! </p>
! 
! <p>
! 	<label style="width:20em;">Nombre de formats de fichier</label>
! 	<select name="f7" size="1">
! 		<!-- TMPL_IF name="f7 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7a" -->
! 		<option value="a" SELECTED>Un seul format</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Un seul format</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7m" -->
! 		<option value="m" SELECTED>Formats multiples</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="m">Formats multiples</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Assurance de qualité</label>
! 	<select name="f8" size="1">
! 		<!-- TMPL_IF name="f8 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8a" -->
! 		<option value="a" SELECTED>Absent</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Absent</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8n" -->
! 		<option value="n" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8p" -->
! 		<option value="p" SELECTED>Présent</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="p">Présent</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Source ou antécédent</label>
! 	<select name="f9" size="1">
! 		<!-- TMPL_IF name="f9 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9a" -->
! 		<option value="a" SELECTED>Fichier reproduit depuis un original</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Fichier reproduit depuis un original</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9b" -->
! 		<option value="b" SELECTED>Fichier reproduit depuis un microfilm</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Fichier reproduit depuis un microfilm</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9c" -->
! 		<option value="c" SELECTED>Fichier reproduit d'après un fichier informatique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Fichier reproduit d'après un fichier informatique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9d" -->
! 		<option value="d" SELECTED>Fichier reproduit d'après un intermédiaire qui n'est pas un microfilm</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Fichier reproduit d'après un intermédiaire qui n'est pas un microfilm</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9m" -->
! 		<option value="m" SELECTED>Mélangé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="m">Mélangé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9n" -->
! 		<option value="n" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Compression</label>
! 	<select name="f10" size="1">
! 		<!-- TMPL_IF name="f10 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f10a" -->
! 		<option value="a" SELECTED>Non comprimé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Non comprimé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f10b" -->
! 		<option value="b" SELECTED>Sans pertes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Sans pertes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f10d" -->
! 		<option value="d" SELECTED>Avec des pertes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Avec des pertes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f10m" -->
! 		<option value="m" SELECTED>Mélangé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="m">Mélangé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f10u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Qualité du reformatage</label>
! 	<select name="f11" size="1">
! 		<!-- TMPL_IF name="f11" -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f11a" -->
! 		<option value="a" SELECTED>Accès</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Accès</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f11n" -->
! 		<option value="n" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f11p" -->
! 		<option value="p" SELECTED>Préservation</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="p">Préservation</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f11r" -->
! 		<option value="r" SELECTED>Remplacement</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="r">Remplacement</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f11u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 		document.f_pop.f6.value=document.f_pop.f6.value+'   ';
! 		document.f_pop.f6.value=document.f_pop.f6.value.substring(0,3);
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value+document.f_pop.f10.value+document.f_pop.f11.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:34:19 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:34:19 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_140.tmpl,1.2,1.3
Message-ID: <E1Ddri7-0000gD-MB@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2554/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_140.tmpl 
Log Message:
Template for 140a field plugin

Index: unimarc_field_140.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_140.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_140.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_140.tmpl	2 Jun 2005 15:34:17 -0000	1.3
***************
*** 1,1713 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 140</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Illustration dans le texte 1:</td>

! 		<td>

[...3417 lines suppressed...]
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value+document.f_pop.f10.value+document.f_pop.f11.value+document.f_pop.f12.value+document.f_pop.f13.value+document.f_pop.f14.value+document.f_pop.f15.value+document.f_pop.f16.value+document.f_pop.f17.value+document.f_pop.f18.value+document.f_pop.f19.value+document.f_pop.f20.value+document.f_pop.f21.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:34:43 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:34:43 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_141.tmpl,1.2,1.3
Message-ID: <E1DdriV-0000ij-Ja@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2722/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_141.tmpl 
Log Message:
Template for 141a field plugin

Index: unimarc_field_141.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_141.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_141.tmpl	1 Mar 2005 13:41:03 -0000	1.2
--- unimarc_field_141.tmpl	2 Jun 2005 15:34:40 -0000	1.3
***************
*** 1,386 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 141</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Materiau de reliure 1:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Parchemin, velin</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Parchemin, velin</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Cuir</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Cuir</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Bois</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Bois</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1d" -->

! 				<option value="d" SELECTED>Tissus</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Tissus</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Materiau synthetique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Materiau synthetique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1f" -->

! 				<option value="f" SELECTED>Carton</ption>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Carton</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1g" -->

! 				<option value="g" SELECTED>Papier</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">Papier</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1h" -->

! 				<option value="h" SELECTED>Non relie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Non relie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 	</select>

! 		</td></tr>	<tr>

! 		<td>Materiau de reliure 2:</td>

! 		<td>

! 			<select name="f2" size="1">

! 			<!-- TMPL_IF name="f2 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2a" -->

! 				<option value="a" SELECTED>Parchemin, velin</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Parchemin, velin</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2b" -->

! 				<option value="b" SELECTED>Cuir</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Cuir</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2c" -->

! 				<option value="c" SELECTED>Bois</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Bois</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2d" -->

! 				<option value="d" SELECTED>Tissus</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Tissus</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2e" -->

! 				<option value="e" SELECTED>Materiau synthetique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Materiau synthetique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2f" -->

! 				<option value="f" SELECTED>Carton</ption>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Carton</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2g" -->

! 				<option value="g" SELECTED>Papier</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">Papier</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2h" -->

! 				<option value="h" SELECTED>Non relie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Non relie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 	</select>

! 		</td></tr>	<tr>

! 		<td>Materiau de reliure 3:</td>

! 		<td>

! 			<select name="f3" size="1">

! 			<!-- TMPL_IF name="f3 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3a" -->

! 				<option value="a" SELECTED>Parchemin, velin</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Parchemin, velin</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3b" -->

! 				<option value="b" SELECTED>Cuir</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Cuir</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3c" -->

! 				<option value="c" SELECTED>Bois</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Bois</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3d" -->

! 				<option value="d" SELECTED>Tissus</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Tissus</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3e" -->

! 				<option value="e" SELECTED>Materiau synthetique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Materiau synthetique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3f" -->

! 				<option value="f" SELECTED>Carton</ption>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Carton</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3g" -->

! 				<option value="g" SELECTED>Papier</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">Papier</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3h" -->

! 				<option value="h" SELECTED>Non relie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Non relie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 	</select>

! 		</td></tr>

! 		<td>Type de reliure:</td>

! 		<td>

! 			<select name="f4" size="1">

! 			<!-- TMPL_IF name="f4 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4a" -->

! 				<option value="a" SELECTED>Originale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Originale</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4b" -->

! 				<option value="b" SELECTED>Deuxieme reliure</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Deuxieme reliure</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4c" -->

! 				<option value="c" SELECTED>Reliure moderne</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Reliure moderne</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4d" -->

! 				<option value="d" SELECTED>Restauree, fac simile</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Restauree, fac simile</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4e" -->

! 				<option value="e" SELECTED>Restauree, imitation</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Restauree, imitation</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4f" -->

! 				<option value="f" SELECTED>Reliee avec un autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Reliee avec un autre</ption>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4h" -->

! 				<option value="h" SELECTED>Non relie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Non relie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 		</td></tr>	<tr>

! 		<td>Relie avec:</td>

! 		<td>

! 			<select name="f5" size="1">

! 			<!-- TMPL_IF name="f5 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f50" -->

! 				<option value="0" SELECTED>Relie seul</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="0">Relie seul</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f51" -->

! 				<option value="1" SELECTED>Relie avec d'autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="1">Relie avec d'autre</option>

! 			<!-- /TMPL_IF -->

! 		</td></tr><tr>

! 	<td>Etat de conservation - reliure:</td>

! 		<td>

! 			<select name="f6" size="1">

! 			<!-- TMPL_IF name="f6 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6a" -->

! 				<option value="a" SELECTED>Excellent</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Excellent</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6b" -->

! 				<option value="b" SELECTED>Bon</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Bon</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6c" -->

! 				<option value="c" SELECTED>Usage</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Usage</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6d" -->

! 				<option value="d" SELECTED>Deteriore</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Deteriore</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6e" -->

! 				<option value="e" SELECTED>Dos casse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Dos casse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6f" -->

! 				<option value="f" SELECTED>Pages manquantes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Pages manquantes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! </td></tr><tr>

! 	<td>Etat de conservation - livre 1 :</td>

! 		<td>

! 			<select name="f7" size="1">

! 			<!-- TMPL_IF name="f7 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7a" -->

! 				<option value="a" SELECTED>Excellent</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Excellent</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7b" -->

! 				<option value="b" SELECTED>Bon</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Bon</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7c" -->

! 				<option value="c" SELECTED>Usage</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Usage</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7d" -->

! 				<option value="d" SELECTED>Deteriore</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Deteriore</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7e" -->

! 				<option value="e" SELECTED>Dos casse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Dos casse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7f" -->

! 				<option value="f" SELECTED>Pages manquantes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Pages manquantes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! </td></tr><tr>

! 	<td>Etat de conservation - livre 2 :</td>

! 		<td>

! 			<select name="f8" size="1">

! 			<!-- TMPL_IF name="f8 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8a" -->

! 				<option value="a" SELECTED>Excellent</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Excellent</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8b" -->

! 				<option value="b" SELECTED>Bon</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Bon</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8c" -->

! 				<option value="c" SELECTED>Usage</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Usage</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8d" -->

! 				<option value="d" SELECTED>Deteriore</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Deteriore</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8e" -->

! 				<option value="e" SELECTED>Dos casse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Dos casse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8f" -->

! 				<option value="f" SELECTED>Pages manquantes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Pages manquantes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! </td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,401 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 141a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Matériau de reliure 1</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Parchemin, velin</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Parchemin, velin</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Cuir</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Cuir</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Bois</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Bois</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1d" -->
! 		<option value="d" SELECTED>Tissus</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Tissus</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Matériau synthétique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Matériau synthétique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1f" -->
! 		<option value="f" SELECTED>Carton</ption>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Carton</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1g" -->
! 		<option value="g" SELECTED>Papier</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Papier</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1h" -->
! 		<option value="h" SELECTED>Non relié</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Non relié</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Matériau de reliure 2</label>
! 	<select name="f2" size="1">
! 		<!-- TMPL_IF name="f2 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2a" -->
! 		<option value="a" SELECTED>Parchemin, velin</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Parchemin, velin</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2b" -->
! 		<option value="b" SELECTED>Cuir</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Cuir</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2c" -->
! 		<option value="c" SELECTED>Bois</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Bois</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2d" -->
! 		<option value="d" SELECTED>Tissus</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Tissus</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2e" -->
! 		<option value="e" SELECTED>Matériau synthétique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Matériau synthétique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2f" -->
! 		<option value="f" SELECTED>Carton</ption>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Carton</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2g" -->
! 		<option value="g" SELECTED>Papier</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Papier</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2h" -->
! 		<option value="h" SELECTED>Non relié</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Non relié</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Matériau de reliure 3</label>
! 	<select name="f3" size="1">
! 		<!-- TMPL_IF name="f3 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3a" -->
! 		<option value="a" SELECTED>Parchemin, velin</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Parchemin, velin</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3b" -->
! 		<option value="b" SELECTED>Cuir</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Cuir</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3c" -->
! 		<option value="c" SELECTED>Bois</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Bois</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3d" -->
! 		<option value="d" SELECTED>Tissus</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Tissus</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3e" -->
! 		<option value="e" SELECTED>Matériau synthétique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Matériau synthétique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3f" -->
! 		<option value="f" SELECTED>Carton</ption>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Carton</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3g" -->
! 		<option value="g" SELECTED>Papier</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Papier</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3h" -->
! 		<option value="h" SELECTED>Non relié</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Non relié</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Type de reliure</label>
! 	<select name="f4" size="1">
! 		<!-- TMPL_IF name="f4 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4a" -->
! 		<option value="a" SELECTED>Originale</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Originale</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4b" -->
! 		<option value="b" SELECTED>Deuxième reliure</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Deuxième reliure</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4c" -->
! 		<option value="c" SELECTED>Reliure moderne</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Reliure moderne</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4d" -->
! 		<option value="d" SELECTED>Restaurée, fac-similé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Restaurée, fac-similé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4e" -->
! 		<option value="e" SELECTED>Restaurée, imitation</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Restaurée, imitation</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4f" -->
! 		<option value="f" SELECTED>Relié avec un autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Relié avec un autre</ption>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4h" -->
! 		<option value="h" SELECTED>Non relié</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Non relié</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Relié avec</label>
! 	<select name="f5" size="1">
! 		<!-- TMPL_IF name="f5 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f50" -->
! 		<option value="0" SELECTED>Relié seul</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="0">Relié seul</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f51" -->
! 		<option value="1" SELECTED>Relié avec d'autres</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="1">Relié avec d'autres</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Etat de conservation - reliure</label>
! 	<select name="f6" size="1">
! 		<!-- TMPL_IF name="f6 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6a" -->
! 		<option value="a" SELECTED>Excellent</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Excellent</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6b" -->
! 		<option value="b" SELECTED>Bon</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Bon</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6c" -->
! 		<option value="c" SELECTED>Usagé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Usagé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6d" -->
! 		<option value="d" SELECTED>Détérioré</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Détérioré</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6e" -->
! 		<option value="e" SELECTED>Dos cassé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Dos cassé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6f" -->
! 		<option value="f" SELECTED>Pages manquantes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Pages manquantes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Etat de conservation - livre 1</label>
! 	<select name="f7" size="1">
! 		<!-- TMPL_IF name="f7 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7a" -->
! 		<option value="a" SELECTED>Excellent</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Excellent</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7b" -->
! 		<option value="b" SELECTED>Bon</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Bon</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7c" -->
! 		<option value="c" SELECTED>Usagé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Usagé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7d" -->
! 		<option value="d" SELECTED>Détérioré</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Détérioré</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7e" -->
! 		<option value="e" SELECTED>Dos cassé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Dos cassé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7f" -->
! 		<option value="f" SELECTED>Pages manquantes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Pages manquantes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Etat de conservation - livre 2</label>
! 	<select name="f8" size="1">
! 		<!-- TMPL_IF name="f8 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8a" -->
! 		<option value="a" SELECTED>Excellent</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Excellent</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8b" -->
! 		<option value="b" SELECTED>Bon</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Bon</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8c" -->
! 		<option value="c" SELECTED>Usagé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Usagé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8d" -->
! 		<option value="d" SELECTED>Détérioré</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Détérioré</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8e" -->
! 		<option value="e" SELECTED>Dos cassé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Dos cassé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8f" -->
! 		<option value="f" SELECTED>Pages manquantes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Pages manquantes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:31:56 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:31:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_128a.tmpl,1.2,1.3
Message-ID: <E1Ddrfo-0000Kz-UM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1271/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_128a.tmpl 
Log Message:
Template for 128a field plugin

Index: unimarc_field_128a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_128a.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_128a.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_128a.tmpl	2 Jun 2005 15:31:54 -0000	1.3
***************
*** 1,382 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 128a</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Forme de la composition:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1  " -->

! 				<option value="  " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="  ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ai" -->

! 				<option value="ai" SELECTED>Airs</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ai">Airs</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1an" -->

! 				<option value="an" SELECTED>Hymnes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="an">Hymnes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ar" -->

! 				<option value="ar" SELECTED>Arias</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ar">Arias</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bt" -->

! 				<option value="bt" SELECTED>Ballets</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bt">Ballets</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bd" -->

! 				<option value="bd" SELECTED>Ballades</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bd">Ballades</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bg" -->

! 				<option value="bg" SELECTED>Bluegrass</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bg">Bluegrass</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bl" -->

! 				<option value="bl" SELECTED>Blues</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bl">Blues</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cb" -->

! 				<option value="cb" SELECTED>Chant (non chretien)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cb">Chant (non chretien)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cc" -->

! 				<option value="cc" SELECTED>Chant (chretien)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cc">Chant (chretien)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cl" -->

! 				<option value="cl" SELECTED>Chorale-prelude</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cl">Chorale-prelude</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cg" -->

! 				<option value="cg" SELECTED>Concerto grosso</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cg">Concerto grosso</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ch" -->

! 				<option value="ch" SELECTED>Chorales</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ch">Chorales</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cn" -->

! 				<option value="cn" SELECTED>Canons</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cn">Canons</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1co" -->

! 				<option value="co" SELECTED>Concertos</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="co">Concertos</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cp" -->

! 				<option value="cp" SELECTED>Chansons (Polyphoniques)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cp">Chansons (Polyphoniques)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cr" -->

! 				<option value="cr" SELECTED>Chant de noel</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cr">Chant de noel</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cs" -->

! 				<option value="cs" SELECTED>Musique aleatoire</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cs">Musique aleatoire</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ct" -->

! 				<option value="ct" SELECTED>Cantates</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ct">Cantates</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cy" -->

! 				<option value="cy" SELECTED>Country music</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cy">Country music</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cz" -->

! 				<option value="cz" SELECTED>Canzones</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cz">Canzones</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1df" -->

! 				<option value="df" SELECTED>Danse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="df">Danse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1dv" -->

! 				<option value="dv" SELECTED>Divertimentos</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="dv">Divertimentos</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1fg" -->

! 				<option value="fg" SELECTED>Fugues</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="fg">Fugues</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1fm" -->

! 				<option value="fm" SELECTED>Musique Folklorique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="fm">Musique Folklorique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ft" -->

! 				<option value="ft" SELECTED>Fantaisies</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ft">Fantaisies</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gm" -->

! 				<option value="gm" SELECTED>Gospel</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gm">Gospel</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1hy" -->

! 				<option value="hy" SELECTED>Hymnes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="hy">Hymnes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1in" -->

! 				<option value="in" SELECTED>Intermezzos</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="in">Intermezzos</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1jz" -->

! 				<option value="jz" SELECTED>Jazz</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="jz">Jazz</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1li" -->

! 				<option value="li" SELECTED>Lieder</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="li">Lieder</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1mc" -->

! 				<option value="mc" SELECTED>Comedies musicales,revues</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="mc">Comedies musicales, revues</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1md" -->

! 				<option value="md" SELECTED>Madrigaux</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="md">Madrigaux</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1mi" -->

! 				<option value="mi" SELECTED>Menuets</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="mi">Menuets</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1mr" -->

! 				<option value="mr" SELECTED>Marches</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="mr">Marches</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ms" -->

! 				<option value="ms" SELECTED>Messes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ms">Messes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1mo" -->

! 				<option value="mo" SELECTED>Motets</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="mo">Motets</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1mp" -->

! 				<option value="mp" SELECTED>Bande originale du film</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="mp">Bande originale du film</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1mu" -->

! 				<option value="mu" SELECTED>Formes multiples</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="mu">Formes multiples</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1mz" -->

! 				<option value="mz" SELECTED>Mazurkas</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="mz">Mazurkas</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1nc" -->

! 				<option value="nc" SELECTED>Nocturnes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="nc">Nocturnes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1op" -->

! 				<option value="op" SELECTED>Operas, operettes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="op">Operas, operettes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1or" -->

! 				<option value="or" SELECTED>Oratorios</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="or">Oratorios</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ov" -->

! 				<option value="ov" SELECTED>Ouvertures</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ov">Ouvertures</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pf" -->

! 				<option value="pf" SELECTED>Prelude et fugue</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pf">Prelude et fugue</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pg" -->

! 				<option value="pg" SELECTED>Musique descriptive</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pg">Musique descriptive</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pm" -->

! 				<option value="pm" SELECTED>Passions</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pm">Passions</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1po" -->

! 				<option value="po" SELECTED>Polonaises</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="po">Polonaises</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pp" -->

! 				<option value="pp" SELECTED>Musique populaire</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pp">Musique populaire</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ps" -->

! 				<option value="ps" SELECTED>Passacailles</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ps">Passacailles</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pt" -->

! 				<option value="pt" SELECTED>Chant</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pt">Chant</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pv" -->

! 				<option value="pv" SELECTED>Pavanes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pv">Pavanes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1rc" -->

! 				<option value="rc" SELECTED>Rock</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="rc">Rock</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1rd" -->

! 				<option value="rd" SELECTED>Rondos</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="rd">Rondos</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1rg" -->

! 				<option value="rg" SELECTED>Ragtime</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="rg">Ragtime</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ri" -->

! 				<option value="ri" SELECTED>Ricercari</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ri">Ricercari</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1rp" -->

! 				<option value="rp" SELECTED>Rhapsodies</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="rp">Rhapsodies</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1rq" -->

! 				<option value="rq" SELECTED>Requiem</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="rq">Requiem</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sg" -->

! 				<option value="sg" SELECTED>Chansons, melodies</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sg">Chansons, melodies</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1si" -->

! 				<option value="si" SELECTED>Sinfonias</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="si">Sinfonias</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sn" -->

! 				<option value="sn" SELECTED>Sonates</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sn">Sonates</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sp" -->

! 				<option value="sp" SELECTED>Poemes symphoniques</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sp">Poemes symphoniques</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sq" -->

! 				<option value="sq" SELECTED>Square dance</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sq">Square dance</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1st" -->

! 				<option value="st" SELECTED>Etudes et exercices</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="st">Etudes et exercices</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1su" -->

! 				<option value="su" SELECTED>Suites</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="su">Suites</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sy" -->

! 				<option value="sy" SELECTED>Symphonies</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sy">Symphonies</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tc" -->

! 				<option value="tc" SELECTED>Toccatas</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tc">Toccatas</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ts" -->

! 				<option value="ts" SELECTED>Sonates en trio</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ts">Sonates en trio</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vr" -->

! 				<option value="vr" SELECTED>Variations</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vr">Variations</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wz" -->

! 				<option value="wz" SELECTED>Valses</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wz">Valses</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1zz" -->

! 				<option value="zz" SELECTED>Variations</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="zz">Variations</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,384 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 128a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Forme de la composition</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1  " -->
! 		<option value="  " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="  ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ai" -->
! 		<option value="ai" SELECTED>Airs</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ai">Airs</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1an" -->
! 		<option value="an" SELECTED>Hymnes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="an">Hymnes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ar" -->
! 		<option value="ar" SELECTED>Arias</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ar">Arias</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bt" -->
! 		<option value="bt" SELECTED>Ballets</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bt">Ballets</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bd" -->
! 		<option value="bd" SELECTED>Ballades</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bd">Ballades</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1mp" -->
! 		<option value="mp" SELECTED>Bande originale de film</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="mp">Bande originale de film</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bg" -->
! 		<option value="bg" SELECTED>Bluegrass</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bg">Bluegrass</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bl" -->
! 		<option value="bl" SELECTED>Blues</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bl">Blues</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ct" -->
! 		<option value="ct" SELECTED>Cantates</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ct">Cantates</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cn" -->
! 		<option value="cn" SELECTED>Canons</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cn">Canons</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cz" -->
! 		<option value="cz" SELECTED>Canzones</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cz">Canzones</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sg" -->
! 		<option value="sg" SELECTED>Chansons, mélodies</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sg">Chansons, mélodies</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cp" -->
! 		<option value="cp" SELECTED>Chansons (Polyphoniques)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cp">Chansons (Polyphoniques)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cb" -->
! 		<option value="cb" SELECTED>Chant (non chrétien)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cb">Chant (non chrétien)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cc" -->
! 		<option value="cc" SELECTED>Chant (chrétien)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cc">Chant (chrétien)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pt" -->
! 		<option value="pt" SELECTED>Chant (plusieurs voix)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pt">Chant (plusieurs voix)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cr" -->
! 		<option value="cr" SELECTED>Chants de Noël</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cr">Chants de Noël</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ch" -->
! 		<option value="ch" SELECTED>Chorales</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ch">Chorales</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1mc" -->
! 		<option value="mc" SELECTED>Comédies musicales, revues</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="mc">Comédies musicales, revues</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cg" -->
! 		<option value="cg" SELECTED>Concerto grosso</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cg">Concerto grosso</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1co" -->
! 		<option value="co" SELECTED>Concertos</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="co">Concertos</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cy" -->
! 		<option value="cy" SELECTED>Country music</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cy">Country music</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1df" -->
! 		<option value="df" SELECTED>Danse</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="df">Danse</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1dv" -->
! 		<option value="dv" SELECTED>Divertimentos</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="dv">Divertimentos</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1st" -->
! 		<option value="st" SELECTED>Etudes et exercices</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="st">Etudes et exercices</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1fg" -->
! 		<option value="fg" SELECTED>Fugues</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="fg">Fugues</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ft" -->
! 		<option value="ft" SELECTED>Fantaisies</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ft">Fantaisies</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1mu" -->
! 		<option value="mu" SELECTED>Formes multiples</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="mu">Formes multiples</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gm" -->
! 		<option value="gm" SELECTED>Gospel</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gm">Gospel</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1hy" -->
! 		<option value="hy" SELECTED>Hymnes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="hy">Hymnes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1in" -->
! 		<option value="in" SELECTED>Intermezzos</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="in">Intermezzos</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1jz" -->
! 		<option value="jz" SELECTED>Jazz</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="jz">Jazz</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1li" -->
! 		<option value="li" SELECTED>Lieder</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="li">Lieder</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1md" -->
! 		<option value="md" SELECTED>Madrigaux</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="md">Madrigaux</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1mi" -->
! 		<option value="mi" SELECTED>Menuets</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="mi">Menuets</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1mr" -->
! 		<option value="mr" SELECTED>Marches</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="mr">Marches</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ms" -->
! 		<option value="ms" SELECTED>Messes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ms">Messes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1mo" -->
! 		<option value="mo" SELECTED>Motets</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="mo">Motets</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1mz" -->
! 		<option value="mz" SELECTED>Mazurkas</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="mz">Mazurkas</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pg" -->
! 		<option value="pg" SELECTED>Musique descriptive</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pg">Musique descriptive</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cs" -->
! 		<option value="cs" SELECTED>Musique aléatoire</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cs">Musique aléatoire</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1fm" -->
! 		<option value="fm" SELECTED>Musique folklorique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="fm">Musique folklorique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1nc" -->
! 		<option value="nc" SELECTED>Nocturnes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="nc">Nocturnes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1op" -->
! 		<option value="op" SELECTED>Opéras, opérettes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="op">Opéras, opérettes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1or" -->
! 		<option value="or" SELECTED>Oratorios</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="or">Oratorios</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ov" -->
! 		<option value="ov" SELECTED>Ouvertures</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ov">Ouvertures</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pf" -->
! 		<option value="pf" SELECTED>Prélude et fugue</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pf">Prélude et fugue</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pm" -->
! 		<option value="pm" SELECTED>Passions</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pm">Passions</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1po" -->
! 		<option value="po" SELECTED>Polonaises</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="po">Polonaises</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pp" -->
! 		<option value="pp" SELECTED>Musique populaire</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pp">Musique populaire</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ps" -->
! 		<option value="ps" SELECTED>Passacailles</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ps">Passacailles</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pv" -->
! 		<option value="pv" SELECTED>Pavanes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pv">Pavanes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sp" -->
! 		<option value="sp" SELECTED>Poèmes symphoniques</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sp">Poèmes symphoniques</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cl" -->
! 		<option value="cl" SELECTED>Prélude choral</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cl">Prélude choral</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1rg" -->
! 		<option value="rg" SELECTED>Ragtime</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="rg">Ragtime</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1rq" -->
! 		<option value="rq" SELECTED>Requiems</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="rq">Requiems</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1rp" -->
! 		<option value="rp" SELECTED>Rhapsodies</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="rp">Rhapsodies</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ri" -->
! 		<option value="ri" SELECTED>Ricercari</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ri">Ricercari</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1rc" -->
! 		<option value="rc" SELECTED>Rock</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="rc">Rock</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1rd" -->
! 		<option value="rd" SELECTED>Rondos</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="rd">Rondos</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1si" -->
! 		<option value="si" SELECTED>Sinfonias</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="si">Sinfonias</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sn" -->
! 		<option value="sn" SELECTED>Sonates</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sn">Sonates</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ts" -->
! 		<option value="ts" SELECTED>Sonates en trio</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ts">Sonates en trio</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sq" -->
! 		<option value="sq" SELECTED>Square dance</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sq">Square dance</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1su" -->
! 		<option value="su" SELECTED>Suites</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="su">Suites</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sy" -->
! 		<option value="sy" SELECTED>Symphonies</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sy">Symphonies</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tc" -->
! 		<option value="tc" SELECTED>Toccatas</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tc">Toccatas</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wz" -->
! 		<option value="wz" SELECTED>Valses</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wz">Valses</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vr" -->
! 		<option value="vr" SELECTED>Variations</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vr">Variations</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1zz" -->
! 		<option value="zz" SELECTED>Autres</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="zz">Autres</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:32:23 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:32:23 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_128b.tmpl,1.2,1.3
Message-ID: <E1DdrgF-0000MD-9T@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1362/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_128b.tmpl 
Log Message:
Template for 128b field plugin

Index: unimarc_field_128b.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_128b.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_128b.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_128b.tmpl	2 Jun 2005 15:32:21 -0000	1.3
***************
*** 1,472 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 128b</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Instruments ou voix dans un ensemble:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1  " -->

! 				<option value="  " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="  ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ba" -->

! 				<option value="ba" SELECTED>Cor</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ba">Cor</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bb" -->

! 				<option value="bb" SELECTED>Trompette</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bb">Trompette</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bc" -->

! 				<option value="bc" SELECTED>Cornet a piston</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bc">Cornet a piston</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bd" -->

! 				<option value="bd" SELECTED>Trombone</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bd">Trombone</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1be" -->

! 				<option value="be" SELECTED>Tuba</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="be">Tuba</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bf" -->

! 				<option value="bf" SELECTED>Saxophone</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bf">Saxophone</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bt" -->

! 				<option value="bt" SELECTED>Ethniques</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bt">Ethniques</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bu" -->

! 				<option value="bu" SELECTED>Non precise (Cuivre)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bu">Non precise (Cuivre)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bz" -->

! 				<option value="bz" SELECTED>Autre cuivre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bz">Autre cuivre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ca" -->

! 				<option value="ca" SELECTED>Mixtes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ca">Mixtes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cb" -->

! 				<option value="cb" SELECTED>Femmes </option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cb">Femmes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cc" -->

! 				<option value="cc" SELECTED>Hommes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cc">Hommes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cd" -->

! 				<option value="cd" SELECTED>Enfants</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cd">Enfants</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ct" -->

! 				<option value="ct" SELECTED>Ethniques</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ct">Ethniques</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cu" -->

! 				<option value="cu" SELECTED>Non precise (Choeurs)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cu">Non precise (Choeurs)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1oa" -->

! 				<option value="oa" SELECTED>Orchestre symphonique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="oa">Orchestre symphonique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ob" -->

! 				<option value="ob" SELECTED>Orchestre de chambre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ob">Orchestre de chambre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1oc" -->

! 				<option value="oc" SELECTED>Orchestres a cordes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="oc">Orchestres a cordes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1od" -->

! 				<option value="od" SELECTED>Fanfare</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="od">Fanfare</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1oe" -->

! 				<option value="oe" SELECTED>Orchestre de danse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="oe">Orchestre de danse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1of" -->

! 				<option value="of" SELECTED>Grand ensemble - orchestre de cuivres</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="of">Grand ensemble - orchestre de cuivres</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ot" -->

! 				<option value="ot" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ot">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ou" -->

! 				<option value="ou" SELECTED>Non precise (orchestre)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ou">Non precise (orchestre)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1oz" -->

! 				<option value="oz" SELECTED>Autre orchestre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="oz">Autre orchestre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pa" -->

! 				<option value="pa" SELECTED>Tympanon</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pa">Tympanon</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pb" -->

! 				<option value="pb" SELECTED>Xylophone</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pb">Xylophone</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pc" -->

! 				<option value="pc" SELECTED>Marimba</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pc">Marimba</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pd" -->

! 				<option value="pd" SELECTED>Tambour, batterie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pd">Tambour, batterie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pt" -->

! 				<option value="pt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pu" -->

! 				<option value="pu" SELECTED>Non precise (percussion)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pu">Non precise (percussion)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pz -->

! 				<option value="pz" SELECTED>Autre percussions</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pz">Autre percussions</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sa" -->

! 				<option value="sa" SELECTED>Violon</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sa">Violon</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sb" -->

! 				<option value="sb" SELECTED>Alto</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sb">Alto</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sc" -->

! 				<option value="sc" SELECTED>Violoncelle</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sc">Violoncelle</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sd" -->

! 				<option value="sd" SELECTED>Contrebasse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sd">Contrebasse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1se" -->

! 				<option value="se" SELECTED>Viole</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="se">Viole</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sf" -->

! 				<option value="sf" SELECTED>Viole d'amour</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sf">Viole d'amour</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sg" -->

! 				<option value="sg" SELECTED>Viole de gambe</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sg">Viole de gambe</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1st" -->

! 				<option value="st" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="st">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1su" -->

! 				<option value="su" SELECTED>Non precise (Corde frottee)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="su">Non precise (Corde frottee)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sz" -->

! 				<option value="sz" SELECTED>Autre (Corde frottee)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sz">Autre (Corde frottee)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1uu" -->

! 				<option value="uu" SELECTED>Non precise (Non precise)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="uu">Non precise (Non precise)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ea" -->

! 				<option value="ea" SELECTED>Synthetiseur</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ea">Synthetiseur</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1eb" -->

! 				<option value="eb" SELECTED>Bande magnetique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="eb">Bande magnetique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ec" -->

! 				<option value="ec" SELECTED>Ordinateur</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ec">Ordinateur</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ed" -->

! 				<option value="ed" SELECTED>Ondes Martenot</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ed">Ondes Martenot</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1eu" -->

! 				<option value="eu" SELECTED>Non precise (Electronique)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="eu">Non precise (Electronique)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ez" -->

! 				<option value="ez" SELECTED>Autre (Electronique)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ez">Autre (Electronique)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ka" -->

! 				<option value="ka" SELECTED>Piano</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ka">Piano</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kb" -->

! 				<option value="kb" SELECTED>Orgue</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kb">Orgue</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kc" -->

! 				<option value="kc" SELECTED>Clavecin</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kc">Clavecin</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kd" -->

! 				<option value="kd" SELECTED>Clavicorde</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kd">Clavicorde</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ke" -->

! 				<option value="ke" SELECTED>Continuo</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ke">Continuo</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kf" -->

! 				<option value="kf" SELECTED>Celesta</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kf">Celesta</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kt" -->

! 				<option value="kt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ku" -->

! 				<option value="ku" SELECTED>Non precise (clavier)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ku">Non precise (clavier)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kz" -->

! 				<option value="kz" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kz">Autre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1va" -->

! 				<option value="va" SELECTED>Soprano</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="va">Soprano</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vb" -->

! 				<option value="vb" SELECTED>Mezzo-soprano</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vb">Mezzo-soprano</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vc" -->

! 				<option value="vc" SELECTED>Alto</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vc">Alto</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vd" -->

! 				<option value="vd" SELECTED>Tenor</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vd">Tenor</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ve" -->

! 				<option value="ve" SELECTED>Baryton</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ve">Baryton</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vf" -->

! 				<option value="vf" SELECTED>Basse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vf">Basse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vg" -->

! 				<option value="vg" SELECTED>Haute contre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vg">Haute contre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vh" -->

! 				<option value="vh" SELECTED>Voix aigues</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vh">Voix aigues</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vi" -->

! 				<option value="vi" SELECTED>Voix medium</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vi">Voix medium</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vj" -->

! 				<option value="vj" SELECTED>Voix graves</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vj">Voix graves</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vt" -->

! 				<option value="vt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vu" -->

! 				<option value="vu" SELECTED>Non precise (Voix precise)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vu">Non precise (Voix precise)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ta" -->

! 				<option value="ta" SELECTED>Harpe</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ta">Harpe</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tb" -->

! 				<option value="tb" SELECTED>Famille de la guitare</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tb">Famille de la guitare</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tc" -->

! 				<option value="tc" SELECTED>Famille du luth</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tc">Famille du luth</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1td" -->

! 				<option value="td" SELECTED>Mandoline</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="td">Mandoline</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tt" -->

! 				<option value="tt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tu" -->

! 				<option value="tu" SELECTED>Non precise (Cordes pincees)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tu">Non precise (Cordes pincees)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tz" -->

! 				<option value="tz" SELECTED>Autre corde pincee</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tz">Autre corde pincee</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wa" -->

! 				<option value="wa" SELECTED>Flute traversiere</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wa">Flute traversiere</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wb" -->

! 				<option value="wb" SELECTED>Hautbois</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wb">Hautbois</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wc" -->

! 				<option value="wc" SELECTED>Clarinette</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wc">Clarinette</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wd" -->

! 				<option value="wd" SELECTED>Basson</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wd">Basson</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1we" -->

! 				<option value="we" SELECTED>Piccolo</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="we">Piccolo</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wf" -->

! 				<option value="wf" SELECTED>Cor anglais</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wf">Cor anglais</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wg" -->

! 				<option value="wg" SELECTED>Clarinette basse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wg">Clarinette basse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wh" -->

! 				<option value="wh" SELECTED>Flute a bec </option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wh">Flute a bec</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wi" -->

! 				<option value="wi" SELECTED>Saxophone</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wi">Saxophone</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wt" -->

! 				<option value="wt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wu" -->

! 				<option value="wu" SELECTED>Non precise</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wu">Non precise</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wz" -->

! 				<option value="wz" SELECTED>Autre bois</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wz">Autre bois</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,492 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 128b</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:10em;">Instruments ou voix dans un ensemble</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1  " -->
! 		<option value="  " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="  ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Cuivres :</option>
! 		<!-- TMPL_IF name="f1ba" -->
! 		<option value="ba" SELECTED>Cor</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ba">Cor</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bb" -->
! 		<option value="bb" SELECTED>Trompette</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bb">Trompette</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bc" -->
! 		<option value="bc" SELECTED>Cornet à piston</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bc">Cornet à piston</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bd" -->
! 		<option value="bd" SELECTED>Trombone</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bd">Trombone</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1be" -->
! 		<option value="be" SELECTED>Tuba</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="be">Tuba</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bf" -->
! 		<option value="bf" SELECTED>Saxophone</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bf">Saxophone</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bt" -->
! 		<option value="bt" SELECTED>Ethniques</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bt">Ethniques</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bu" -->
! 		<option value="bu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bz" -->
! 		<option value="bz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Choeurs :</option>
! 		<!-- TMPL_IF name="f1ca" -->
! 		<option value="ca" SELECTED>Mixtes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ca">Mixtes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cb" -->
! 		<option value="cb" SELECTED>Femmes </option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cb">Femmes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cc" -->
! 		<option value="cc" SELECTED>Hommes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cc">Hommes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cd" -->
! 		<option value="cd" SELECTED>Enfants</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cd">Enfants</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ct" -->
! 		<option value="ct" SELECTED>Ethniques</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ct">Ethniques</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cu" -->
! 		<option value="cu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Orchestre :</option>
! 		<!-- TMPL_IF name="f1oa" -->
! 		<option value="oa" SELECTED>Orchestre symphonique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="oa">Orchestre symphonique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ob" -->
! 		<option value="ob" SELECTED>Orchestre de chambre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ob">Orchestre de chambre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1oc" -->
! 		<option value="oc" SELECTED>Orchestres à cordes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="oc">Orchestres à cordes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1od" -->
! 		<option value="od" SELECTED>Fanfare</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="od">Fanfare</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1oe" -->
! 		<option value="oe" SELECTED>Orchestre de danse</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="oe">Orchestre de danse</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1of" -->
! 		<option value="of" SELECTED>Grand ensemble - orchestre de cuivres (cuivres doublés ou non, avec ou sans percussions)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="of">Grand ensemble - orchestre de cuivres (cuivres doublés ou non, avec ou sans percussions)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ot" -->
! 		<option value="ot" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ot">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ou" -->
! 		<option value="ou" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ou">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1oz" -->
! 		<option value="oz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="oz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Percussions :</option>
! 		<!-- TMPL_IF name="f1pa" -->
! 		<option value="pa" SELECTED>Tympanon</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pa">Tympanon</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pb" -->
! 		<option value="pb" SELECTED>Xylophone</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pb">Xylophone</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pc" -->
! 		<option value="pc" SELECTED>Marimba</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pc">Marimba</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pd" -->
! 		<option value="pd" SELECTED>Tambour, batterie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pd">Tambour, batterie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pt" -->
! 		<option value="pt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pu" -->
! 		<option value="pu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pz -->
! 		<option value="pz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Cordes frottées :</option>
! 		<!-- TMPL_IF name="f1sa" -->
! 		<option value="sa" SELECTED>Violon</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sa">Violon</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sb" -->
! 		<option value="sb" SELECTED>Alto</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sb">Alto</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sc" -->
! 		<option value="sc" SELECTED>Violoncelle</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sc">Violoncelle</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sd" -->
! 		<option value="sd" SELECTED>Contrebasse</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sd">Contrebasse</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1se" -->
! 		<option value="se" SELECTED>Viole</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="se">Viole</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sf" -->
! 		<option value="sf" SELECTED>Viole d'amour</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sf">Viole d'amour</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sg" -->
! 		<option value="sg" SELECTED>Viole de gambe</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sg">Viole de gambe</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1st" -->
! 		<option value="st" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="st">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1su" -->
! 		<option value="su" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="su">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sz" -->
! 		<option value="sz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Electronique :</option>
! 		<!-- TMPL_IF name="f1ea" -->
! 		<option value="ea" SELECTED>Synthétiseur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ea">Synthétiseur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1eb" -->
! 		<option value="eb" SELECTED>Bande magnétique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="eb">Bande magnétique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ec" -->
! 		<option value="ec" SELECTED>Ordinateur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ec">Ordinateur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ed" -->
! 		<option value="ed" SELECTED>Ondes Martenot</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ed">Ondes Martenot</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1eu" -->
! 		<option value="eu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="eu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ez" -->
! 		<option value="ez" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ez">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Claviers :</option>
! 		<!-- TMPL_IF name="f1ka" -->
! 		<option value="ka" SELECTED>Piano</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ka">Piano</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kb" -->
! 		<option value="kb" SELECTED>Orgue</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kb">Orgue</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kc" -->
! 		<option value="kc" SELECTED>Clavecin</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kc">Clavecin</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kd" -->
! 		<option value="kd" SELECTED>Clavicorde</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kd">Clavicorde</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ke" -->
! 		<option value="ke" SELECTED>Continuo</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ke">Continuo</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kf" -->
! 		<option value="kf" SELECTED>Célesta</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kf">Célesta</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kt" -->
! 		<option value="kt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ku" -->
! 		<option value="ku" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ku">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kz" -->
! 		<option value="kz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Voix :</option>
! 		<!-- TMPL_IF name="f1va" -->
! 		<option value="va" SELECTED>Soprano</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="va">Soprano</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vb" -->
! 		<option value="vb" SELECTED>Mezzo-soprano</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vb">Mezzo-soprano</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vc" -->
! 		<option value="vc" SELECTED>Alto</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vc">Alto</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vd" -->
! 		<option value="vd" SELECTED>Tenor</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vd">Tenor</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ve" -->
! 		<option value="ve" SELECTED>Baryton</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ve">Baryton</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vf" -->
! 		<option value="vf" SELECTED>Basse</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vf">Basse</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vg" -->
! 		<option value="vg" SELECTED>Haute contre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vg">Haute contre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vh" -->
! 		<option value="vh" SELECTED>Voix aiguës</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vh">Voix aiguës</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vi" -->
! 		<option value="vi" SELECTED>Voix médium</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vi">Voix médium</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vj" -->
! 		<option value="vj" SELECTED>Voix graves</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vj">Voix graves</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vt" -->
! 		<option value="vt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vu" -->
! 		<option value="vu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Cordes pincées :</option>
! 		<!-- TMPL_IF name="f1ta" -->
! 		<option value="ta" SELECTED>Harpe</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ta">Harpe</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tb" -->
! 		<option value="tb" SELECTED>Famille de la guitare</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tb">Famille de la guitare</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tc" -->
! 		<option value="tc" SELECTED>Famille du luth</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tc">Famille du luth</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1td" -->
! 		<option value="td" SELECTED>Mandoline</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="td">Mandoline</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tt" -->
! 		<option value="tt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tu" -->
! 		<option value="tu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tz" -->
! 		<option value="tz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Bois :</option>
! 		<!-- TMPL_IF name="f1wa" -->
! 		<option value="wa" SELECTED>Flûte (traversière)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wa">Flûte (traversière)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wb" -->
! 		<option value="wb" SELECTED>Hautbois</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wb">Hautbois</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wc" -->
! 		<option value="wc" SELECTED>Clarinette</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wc">Clarinette</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wd" -->
! 		<option value="wd" SELECTED>Basson</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wd">Basson</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1we" -->
! 		<option value="we" SELECTED>Piccolo</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="we">Piccolo</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wf" -->
! 		<option value="wf" SELECTED>Cor anglais</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wf">Cor anglais</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wg" -->
! 		<option value="wg" SELECTED>Clarinette basse</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wg">Clarinette basse</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wh" -->
! 		<option value="wh" SELECTED>Flûte à bec </option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wh">Flûte à bec</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wi" -->
! 		<option value="wi" SELECTED>Saxophone</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wi">Saxophone</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wt" -->
! 		<option value="wt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wu" -->
! 		<option value="wu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wz" -->
! 		<option value="wz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Non précisé :</option>
! 		<!-- TMPL_IF name="f1uu" -->
! 		<option value="uu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="uu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:10em;">Nombre</label>
! 	<input type="text" name="f2" maxlength=2 size=3 value="<!-- TMPL_VAR name="f2" -->"> (sur deux chiffres, compléter éventuellement avec un 0)
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:10em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 		document.f_pop.f2.value=document.f_pop.f2.value+'  ';
! 		document.f_pop.f2.value=document.f_pop.f2.value.substring(0,2);
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:33:19 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:33:19 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_130.tmpl,1.2,1.3
Message-ID: <E1Ddrh9-0000V4-Np@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1881/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_130.tmpl 
Log Message:
Template for 130a field plugin

Index: unimarc_field_130.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_130.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_130.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_130.tmpl	2 Jun 2005 15:33:17 -0000	1.3
***************
*** 1,376 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 130</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Presentation materielle:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Carte a fenetre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Carte a fenetre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Microfilm en cartouche</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Microfilm en cartouche</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Microfilm en cassette</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Microfilm en cassette</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1d" -->

! 				<option value="d" SELECTED>Microfilm en bobine</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Microfilm en bobine</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Microfiche</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Microfiche</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1f" -->

! 				<option value="f" SELECTED>Microfiche en cassette</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Microfiche en cassette</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1g" -->

! 				<option value="g" SELECTED>Micro opaque</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">Micro opaque</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1h" -->

! 				<option value="h" SELECTED>Bande microfilm</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Bande microfilm</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr>

! 		<td>Polarite:</td>

! 		<td>

! 			<select name="f2" size="1">

! 			<!-- TMPL_IF name="f2 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2a" -->

! 				<option value="a" SELECTED>Positif</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Positif</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2b" -->

! 				<option value="b" SELECTED>Negatif</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Negatif</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2c" -->

! 				<option value="c" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2d" -->

! 				<option value="d" SELECTED>Plusieurs polarites</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Plusieurs polarites</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr>

! 		<td>Dimensions:</td>

! 		<td>

! 			<select name="f3" size="1">

! 			<!-- TMPL_IF name="f3 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3a" -->

! 				<option value="a" SELECTED>8 mm (microfilm)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">8 mm (microfilm)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3d" -->

! 				<option value="d" SELECTED>16 mm (microfilm)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">16 mm (microfilm)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3f" -->

! 				<option value="f" SELECTED>35 mm (microfilm)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">35 mm (microfilm)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3g" -->

! 				<option value="g" SELECTED>70 mm (microfilm)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">70 mm (microfilm)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3h" -->

! 				<option value="h" SELECTED>105 mm (microfilm)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">105 mm (microfilm)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3l" -->

! 				<option value="l" SELECTED>3 x 5 pouces</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="l">3 x 5 pouces</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3m" -->

! 				<option value="m" SELECTED>4 x 6 pouces</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="m">4 x 6 pouces</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3o" -->

! 				<option value="o" SELECTED>6 x 9 pouces</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="o">6 x 9 pouces</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3p" -->

! 				<option value="p" SELECTED>9 x 19 cm</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="p">9 x 19 cm</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr>

! 		<td>Rapport de reduction:</td>

! 		<td>

! 			<select name="f4" size="1">

! 			<!-- TMPL_IF name="f4 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4a" -->

! 				<option value="a" SELECTED>Faible reduction</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Faible reduction</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4b" -->

! 				<option value="b" SELECTED>Normale (16x - 30x)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Normale (16x - 30x)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4c" -->

! 				<option value="c" SELECTED>Elevee (31x - 60x)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Elevee (31x - 60x)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4d" -->

! 				<option value="d" SELECTED>Tres elevee (61x - 90x)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Tres elevee (61x - 90x)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4e" -->

! 				<option value="e" SELECTED>Ultra elevee (91x -)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Ultra elevee (91x -)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4v" -->

! 				<option value="v" SELECTED>Divers</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="v">Divers</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

!     <tr>

!                 <td>Rapport de reduction specifique</td>

!                 <td><input type="text" name="f5" maxlength=3 size=4 

! value="<!-- TMPL_VAR name="f5" -->"></td>

!         </tr>

! 

! 		</td></tr>

! 	<tr>

! 		<td>Couleur:</td>

! 		<td>

! 			<select name="f6" size="1">

! 			<!-- TMPL_IF name="f6 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6a" -->

! 				<option value="a" SELECTED>Monochrome</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Monochrome</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6b" -->

! 				<option value="b" SELECTED>Couleur</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Couleur</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6v" -->

! 				<option value="v" SELECTED>Divers</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="v">Divers</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr>

! 		<td>Emulsion:</td>

! 		<td>

! 			<select name="f7" size="1">

! 			<!-- TMPL_IF name="f7 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7a" -->

! 				<option value="a" SELECTED>Sel d'argent</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Sel d'argent</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7b" -->

! 				<option value="b" SELECTED>Diazoique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Diazoique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7c" -->

! 				<option value="c" SELECTED>Vesiculaire</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Vesiculaire</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7d" -->

! 				<option value="d" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7u" -->

! 				<option value="u" SELECTED>Emulsions diverses</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Emulsions diverses</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7x" -->

! 				<option value="x" SELECTED>Non applicable</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="x">Non applicable</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr>

! 		<td>Generation (copies):</td>

! 		<td>

! 			<select name="f8" size="1">

! 			<!-- TMPL_IF name="f8 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8a" -->

! 				<option value="a" SELECTED>Premiere generation (master)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Premiere generation (master)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8b" -->

! 				<option value="b" SELECTED>Tirage</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Tirage</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8c" -->

! 				<option value="c" SELECTED>Copie de service</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Copie de service</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8v" -->

! 				<option value="v" SELECTED>Generations diverses</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="v">Generations diverses</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr>

! 		<td>Support de film:</td>

! 		<td>

! 			<select name="f9" size="1">

! 			<!-- TMPL_IF name="f9 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f9a" -->

! 				<option value="a" SELECTED>Support de securite</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Support de securite</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f9b" -->

! 				<option value="b" SELECTED>Il ne s'agit pas d'un support de securite</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Il ne s'agit pas d'un support de securite</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f9u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f9x" -->

! 				<option value="x" SELECTED>Non applicable</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="x">Non applicable</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 	    document.f_pop.f5.value=document.f_pop.f5.value+'   ';

! 

! 

! 

! 	    document.f_pop.f5.value=document.f_pop.f5.value.substring(0,3);

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value ;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,376 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 130a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Présentation matérielle</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Carte à fenêtre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Carte à fenêtre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Microfilm en cartouche</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Microfilm en cartouche</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Microfilm en cassette</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Microfilm en cassette</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1d" -->
! 		<option value="d" SELECTED>Microfilm en bobine</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Microfilm en bobine</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Microfiche</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Microfiche</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1f" -->
! 		<option value="f" SELECTED>Microfiche en cassette</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Microfiche en cassette</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1g" -->
! 		<option value="g" SELECTED>Micro opaque</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Micro opaque</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1h" -->
! 		<option value="h" SELECTED>Bande microfilm</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Bande microfilm</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Polarité</label>
! 	<select name="f2" size="1">
! 		<!-- TMPL_IF name="f2 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2a" -->
! 		<option value="a" SELECTED>Positif</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Positif</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2b" -->
! 		<option value="b" SELECTED>Négatif</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Négatif</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2c" -->
! 		<option value="c" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2d" -->
! 		<option value="d" SELECTED>Plusieurs polarités</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Plusieurs polarités</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Dimensions</label>
! 	<select name="f3" size="1">
! 		<!-- TMPL_IF name="f3 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3a" -->
! 		<option value="a" SELECTED>8 mm (microfilm)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">8 mm (microfilm)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3d" -->
! 		<option value="d" SELECTED>16 mm (microfilm)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">16 mm (microfilm)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3f" -->
! 		<option value="f" SELECTED>35 mm (microfilm)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">35 mm (microfilm)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3g" -->
! 		<option value="g" SELECTED>70 mm (microfilm)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">70 mm (microfilm)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3h" -->
! 		<option value="h" SELECTED>105 mm (microfilm)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">105 mm (microfilm)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3l" -->
! 		<option value="l" SELECTED>3x5 pouces (8x13 cm) (microfiche ou micro opaque)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="l">3x5 pouces (8x13 cm) (microfiche ou micro opaque)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3m" -->
! 		<option value="m" SELECTED>4x6 pouces (10x15 cm) (microfiche ou micro opaque)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="m">4x6 pouces (10x15 cm) (microfiche ou micro opaque)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3o" -->
! 		<option value="o" SELECTED>6x9 pouces (16x23 cm) (microfiche ou micro opaque)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="o">6x9 pouces (16x23 cm) (microfiche ou micro opaque)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3p" -->
! 		<option value="p" SELECTED>3 1/4x7 3/8 pouces (9x19 cm) (carte à fenêtre)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="p">3 1/4x7 3/8 pouces (9x19 cm) (carte à fenêtre)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Rapport de réduction</label>
! 	<select name="f4" size="1">
! 		<!-- TMPL_IF name="f4 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4a" -->
! 		<option value="a" SELECTED>Faible réduction</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Faible réduction</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4b" -->
! 		<option value="b" SELECTED>Normale (16x - 30x)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Normale (16x - 30x)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4c" -->
! 		<option value="c" SELECTED>Elevée (31x - 60x)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Elevée (31x - 60x)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4d" -->
! 		<option value="d" SELECTED>Très élevée (61x - 90x)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Très élevée (61x - 90x)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4e" -->
! 		<option value="e" SELECTED>Ultra élevée (91x -)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Ultra élevée (91x -)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4v" -->
! 		<option value="v" SELECTED>Divers</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="v">Divers</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Rapport de réduction spécifique</label>
! 	<input type="text" name="f5" maxlength=3 size=4 value="<!-- TMPL_VAR name="f5" -->">
! </p>
! 
! <p>
! 	<label style="width:20em;">Couleur</label>
! 	<select name="f6" size="1">
! 		<!-- TMPL_IF name="f6 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6a" -->
! 		<option value="a" SELECTED>Monochrome</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Monochrome</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6b" -->
! 		<option value="b" SELECTED>Couleur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Couleur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6v" -->
! 		<option value="v" SELECTED>Divers</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="v">Divers</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Emulsion</label>
! 	<select name="f7" size="1">
! 			<!-- TMPL_IF name="f7 " -->
! 			<option value=" " SELECTED>Aucun</option>
! 			<!-- TMPL_ELSE -->
! 			<option value=" ">Aucun</option>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="f7a" -->
! 			<option value="a" SELECTED>Sel d'argent</option>
! 			<!-- TMPL_ELSE -->
! 			<option value="a">Sel d'argent</option>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="f7b" -->
! 			<option value="b" SELECTED>Diazoïque</option>
! 			<!-- TMPL_ELSE -->
! 			<option value="b">Diazoïque</option>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="f7c" -->
! 			<option value="c" SELECTED>Vésiculaire</option>
! 			<!-- TMPL_ELSE -->
! 			<option value="c">Vésiculaire</option>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="f7d" -->
! 			<option value="d" SELECTED>Inconnu</option>
! 			<!-- TMPL_ELSE -->
! 			<option value="d">Inconnu</option>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="f7u" -->
! 			<option value="u" SELECTED>Emulsions diverses</option>
! 			<!-- TMPL_ELSE -->
! 			<option value="u">Emulsions diverses</option>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="f7x" -->
! 			<option value="x" SELECTED>Non applicable</option>
! 			<!-- TMPL_ELSE -->
! 			<option value="x">Non applicable</option>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="f7z" -->
! 			<option value="z" SELECTED>Autre</option>
! 			<!-- TMPL_ELSE -->
! 			<option value="z">Autre</option>
! 			<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Génération (copies)</label>
! 	<select name="f8" size="1">
! 		<!-- TMPL_IF name="f8 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8a" -->
! 		<option value="a" SELECTED>Première génération (master)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Première génération (master)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8b" -->
! 		<option value="b" SELECTED>Tirage</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Tirage</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8c" -->
! 		<option value="c" SELECTED>Copie de service</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Copie de service</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8v" -->
! 		<option value="v" SELECTED>Générations diverses</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="v">Générations diverses</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Support de film</label>
! 	<select name="f9" size="1">
! 		<!-- TMPL_IF name="f9 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9a" -->
! 		<option value="a" SELECTED>Support de sécurité</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Support de sécurité</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9b" -->
! 		<option value="b" SELECTED>Il ne s'agit pas d'un support de sécurité</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Il ne s'agit pas d'un support de sécurité</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9x" -->
! 		<option value="x" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="x">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 	    document.f_pop.f5.value=document.f_pop.f5.value+'   ';
! 
! 
! 
! 	    document.f_pop.f5.value=document.f_pop.f5.value.substring(0,3);
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value ;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:37:16 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:37:16 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_100.pl,1.7,1.8
Message-ID: <E1Ddrky-00016y-Fw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4217/value_builder

Modified Files:
	unimarc_field_100.pl 
Log Message:
Plugin for field 100a

Index: unimarc_field_100.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_100.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** unimarc_field_100.pl	7 Jun 2004 10:07:40 -0000	1.7
--- unimarc_field_100.pl	2 Jun 2005 15:37:14 -0000	1.8
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:37:35 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:37:35 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_105.pl,1.1,1.2
Message-ID: <E1DdrlH-0001AU-LV@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4481/value_builder

Modified Files:
	unimarc_field_105.pl 
Log Message:
Plugin for field 105a

Index: unimarc_field_105.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_105.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_105.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_105.pl	2 Jun 2005 15:37:33 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_105.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 105\",'width=1200,height=400,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_105.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 105\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:38:06 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:38:06 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_106.pl,1.1,1.2
Message-ID: <E1Ddrlm-0001DN-LM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4632/value_builder

Modified Files:
	unimarc_field_106.pl 
Log Message:
Plugin for field 106a

Index: unimarc_field_106.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_106.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_106.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_106.pl	2 Jun 2005 15:38:03 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_106.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 106\",'width=500,height=400,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_106.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 106\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:38:26 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:38:26 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_110.pl,1.1,1.2
Message-ID: <E1Ddrm6-0001Hg-1c@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4887/value_builder

Modified Files:
	unimarc_field_110.pl 
Log Message:
Plugin for field 110a

Index: unimarc_field_110.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_110.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_110.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_110.pl	2 Jun 2005 15:38:23 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_110.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 110\",'width=700,height=600,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_110.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 110\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:38:54 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:38:54 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_115a.pl,1.1,1.2
Message-ID: <E1DdrmY-0001K8-6r@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5026/value_builder

Modified Files:
	unimarc_field_115a.pl 
Log Message:
Plugin for field 115a

Index: unimarc_field_115a.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_115a.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_115a.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_115a.pl	2 Jun 2005 15:38:51 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_115a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 115a\",'width=1200,height=600,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_115a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 115a\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:39:35 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:39:35 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_115b.pl,1.1,1.2
Message-ID: <E1DdrnD-0001QH-EP@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5408/value_builder

Modified Files:
	unimarc_field_115b.pl 
Log Message:
Plugin for field 115b

Index: unimarc_field_115b.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_115b.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_115b.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_115b.pl	2 Jun 2005 15:39:33 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_115b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 115b\",'width=1200,height=600,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_115b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 115b\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:40:08 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:40:08 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_116.pl,1.1,1.2
Message-ID: <E1Ddrnk-0001Ws-Na@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5842/value_builder

Modified Files:
	unimarc_field_116.pl 
Log Message:
Plugin for field 116a

Index: unimarc_field_116.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_116.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_116.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_116.pl	2 Jun 2005 15:40:06 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_116.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 116\",'width=1200,height=600,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_116.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 116\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:40:42 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:40:42 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_117.pl,1.1,1.2
Message-ID: <E1DdroI-0001b8-Qk@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6109/value_builder

Modified Files:
	unimarc_field_117.pl 
Log Message:
Plugin for field 117a

Index: unimarc_field_117.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_117.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_117.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_117.pl	2 Jun 2005 15:40:40 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_117.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 117\",'width=600,height=225,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_117.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 117\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:41:01 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:41:01 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_120.pl,1.1,1.2
Message-ID: <E1Ddrob-0001fk-MJ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6387/value_builder

Modified Files:
	unimarc_field_120.pl 
Log Message:
Plugin for field 120a

Index: unimarc_field_120.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_120.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_120.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_120.pl	2 Jun 2005 15:40:59 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_120.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 120\",'width=1200,height=750,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_120.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 120\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:41:23 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:41:23 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_121a.pl,1.1,1.2
Message-ID: <E1Ddrox-0001iU-UD@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6557/value_builder

Modified Files:
	unimarc_field_121a.pl 
Log Message:
Plugin for field 121a

Index: unimarc_field_121a.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_121a.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_121a.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_121a.pl	2 Jun 2005 15:41:20 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_121a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 121a\",'width=1210,height=750,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_121a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 121a\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:41:40 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:41:40 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_121b.pl,1.1,1.2
Message-ID: <E1DdrpE-0001mM-Lq@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6796/value_builder

Modified Files:
	unimarc_field_121b.pl 
Log Message:
Plugin for field 121b

Index: unimarc_field_121b.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_121b.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_121b.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_121b.pl	2 Jun 2005 15:41:38 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_121b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 121b\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_121b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 121b\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:42:11 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:42:11 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_122.pl,1.1,1.2
Message-ID: <E1Ddrpj-0001p7-KX@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6982/value_builder

Modified Files:
	unimarc_field_122.pl 
Log Message:
Plugin for field 122a

Index: unimarc_field_122.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_122.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_122.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_122.pl	2 Jun 2005 15:42:03 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_122.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 122\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_122.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 122\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:42:39 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:42:39 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_123a.pl,1.1,1.2
Message-ID: <E1DdrqB-0001rs-OR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7138/value_builder

Modified Files:
	unimarc_field_123a.pl 
Log Message:
Plugin for field 123a

Index: unimarc_field_123a.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_123a.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_123a.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_123a.pl	2 Jun 2005 15:42:31 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123a\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123a\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:42:56 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:42:56 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_123d.pl,1.1,1.2
Message-ID: <E1DdrqS-0001tf-Ea@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7265/value_builder

Modified Files:
	unimarc_field_123d.pl 
Log Message:
Plugin for field 123d

Index: unimarc_field_123d.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_123d.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_123d.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_123d.pl	2 Jun 2005 15:42:54 -0000	1.2
***************
*** 40,44 ****
  sub plugin_javascript {
  my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
! my $function_name= "123g".(int(rand(100000))+1);
  my $res="
  <script>
--- 40,44 ----
  sub plugin_javascript {
  my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
! my $function_name= "123d".(int(rand(100000))+1);
  my $res="
  <script>
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123g.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123g\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123d.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123d\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }
***************
*** 73,77 ****
  
  my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "value_builder/unimarc_field_123g.tmpl",
  			     query => $input,
  			     type => "intranet",
--- 73,77 ----
  
  my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "value_builder/unimarc_field_123d.tmpl",
  			     query => $input,
  			     type => "intranet",




From doxulting at users.sourceforge.net  Thu Jun  2 17:43:13 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:43:13 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_123e.pl,1.1,1.2
Message-ID: <E1Ddrqj-0001vt-Jg@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7400/value_builder

Modified Files:
	unimarc_field_123e.pl 
Log Message:
Plugin for field 123e

Index: unimarc_field_123e.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_123e.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_123e.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_123e.pl	2 Jun 2005 15:43:11 -0000	1.2
***************
*** 40,44 ****
  sub plugin_javascript {
  my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
! my $function_name= "123g".(int(rand(100000))+1);
  my $res="
  <script>
--- 40,44 ----
  sub plugin_javascript {
  my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
! my $function_name= "123e".(int(rand(100000))+1);
  my $res="
  <script>
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123g.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123g\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123e.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123e\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }
***************
*** 73,77 ****
  
  my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "value_builder/unimarc_field_123g.tmpl",
  			     query => $input,
  			     type => "intranet",
--- 73,77 ----
  
  my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "value_builder/unimarc_field_123e.tmpl",
  			     query => $input,
  			     type => "intranet",




From doxulting at users.sourceforge.net  Thu Jun  2 17:43:30 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:43:30 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_123f.pl,1.1,1.2
Message-ID: <E1Ddrr0-0001xY-MX@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7504/value_builder

Modified Files:
	unimarc_field_123f.pl 
Log Message:
Plugin for field 123f

Index: unimarc_field_123f.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_123f.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_123f.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_123f.pl	2 Jun 2005 15:43:27 -0000	1.2
***************
*** 40,44 ****
  sub plugin_javascript {
  my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
! my $function_name= "123g".(int(rand(100000))+1);
  my $res="
  <script>
--- 40,44 ----
  sub plugin_javascript {
  my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
! my $function_name= "123f".(int(rand(100000))+1);
  my $res="
  <script>
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123g.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123g\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123f.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123f\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }
***************
*** 73,77 ****
  
  my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "value_builder/unimarc_field_123g.tmpl",
  			     query => $input,
  			     type => "intranet",
--- 73,77 ----
  
  my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "value_builder/unimarc_field_123f.tmpl",
  			     query => $input,
  			     type => "intranet",




From doxulting at users.sourceforge.net  Thu Jun  2 17:43:49 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:43:49 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_123g.pl,1.1,1.2
Message-ID: <E1DdrrJ-0001zg-C2@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7647/value_builder

Modified Files:
	unimarc_field_123g.pl 
Log Message:
Plugin for field 123g

Index: unimarc_field_123g.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_123g.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_123g.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_123g.pl	2 Jun 2005 15:43:47 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123g.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123g\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123g.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123g\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:44:04 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:44:04 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_123i.pl,NONE,1.1
Message-ID: <E1DdrrY-00021s-Hx@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7768/value_builder

Added Files:
	unimarc_field_123i.pl 
Log Message:
Plugin for field 123i

--- NEW FILE ---
#!/usr/bin/perl

# $Id: unimarc_field_123i.pl,v 1.1 2005/06/02 15:44:02 doxulting Exp $

# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use C4::Auth;
use CGI;
use C4::Context;
use HTML::Template;
use C4::Search;
use C4::Output;

=head1

plugin_parameters : other parameters added when the plugin is called by the dopop function

=cut
sub plugin_parameters {
my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
return "";
}

sub plugin_javascript {
my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
my $function_name= "123i".(int(rand(100000))+1);
my $res="
<script>
function Focus$function_name(subfield_managed) {
return 1;
}

function Blur$function_name(subfield_managed) {
	return 1;
}

function Clic$function_name(i) {
	defaultvalue=document.forms[0].field_value[i].value;
	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123i.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123i\",'width=800,height=400,toolbar=false,scrollbars=yes');

}
</script>
";

return ($function_name,$res);
}
sub plugin {
my ($input) = @_;
	my %env;

#	my $input = new CGI;
	my $index= $input->param('index');
	my $result= $input->param('result');


	my $dbh = C4::Context->dbh;

my ($template, $loggedinuser, $cookie)
    = get_template_and_user({template_name => "value_builder/unimarc_field_123i.tmpl",
			     query => $input,
			     type => "intranet",
			     authnotrequired => 0,
			     flagsrequired => {parameters => 1},
			     debug => 1,
			     });
	my $f1 = substr($result,0,1);
	my $f2 = substr($result,1,3);
	my $f3 = substr($result,4,2);
	my $f4 = substr($result,6,2);
	$template->param(index => $index,
			 "f1$f1" => $f1,
			 f2 => $f2,
			 f3 => $f3,
			 f4 => $f4);
	print $input->header(-cookie => $cookie),$template->output;
}

1;




From doxulting at users.sourceforge.net  Thu Jun  2 17:44:31 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:44:31 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_123j.pl,NONE,1.1
Message-ID: <E1Ddrrz-00024s-By@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7947/value_builder

Added Files:
	unimarc_field_123j.pl 
Log Message:
Plugin for field 123j

--- NEW FILE ---
#!/usr/bin/perl

# $Id: unimarc_field_123j.pl,v 1.1 2005/06/02 15:44:29 doxulting Exp $

# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use C4::Auth;
use CGI;
use C4::Context;
use HTML::Template;
use C4::Search;
use C4::Output;

=head1

plugin_parameters : other parameters added when the plugin is called by the dopop function

=cut
sub plugin_parameters {
my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
return "";
}

sub plugin_javascript {
my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
my $function_name= "123j".(int(rand(100000))+1);
my $res="
<script>
function Focus$function_name(subfield_managed) {
return 1;
}

function Blur$function_name(subfield_managed) {
	return 1;
}

function Clic$function_name(i) {
	defaultvalue=document.forms[0].field_value[i].value;
	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123j.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123j\",'width=800,height=400,toolbar=false,scrollbars=yes');

}
</script>
";

return ($function_name,$res);
}
sub plugin {
my ($input) = @_;
	my %env;

#	my $input = new CGI;
	my $index= $input->param('index');
	my $result= $input->param('result');


	my $dbh = C4::Context->dbh;

my ($template, $loggedinuser, $cookie)
    = get_template_and_user({template_name => "value_builder/unimarc_field_123j.tmpl",
			     query => $input,
			     type => "intranet",
			     authnotrequired => 0,
			     flagsrequired => {parameters => 1},
			     debug => 1,
			     });
	my $f1 = substr($result,0,1);
	my $f2 = substr($result,1,3);
	my $f3 = substr($result,4,2);
	my $f4 = substr($result,6,2);
	$template->param(index => $index,
			 "f1$f1" => $f1,
			 f2 => $f2,
			 f3 => $f3,
			 f4 => $f4);
	print $input->header(-cookie => $cookie),$template->output;
}

1;




From doxulting at users.sourceforge.net  Thu Jun  2 17:45:04 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:45:04 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_124.pl,1.1,1.2
Message-ID: <E1DdrsW-00029K-Jo@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8220/value_builder

Modified Files:
	unimarc_field_124.pl 
Log Message:
Plugin for field 124

Index: unimarc_field_124.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_124.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_124.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_124.pl	2 Jun 2005 15:44:51 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=500,height=400,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:45:20 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:45:20 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_124a.pl,1.1,1.2
Message-ID: <E1Ddrsm-0002Cv-Ko@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8447/value_builder

Modified Files:
	unimarc_field_124a.pl 
Log Message:
Plugin for field 124a

Index: unimarc_field_124a.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_124a.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_124a.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_124a.pl	2 Jun 2005 15:45:18 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124a\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124a\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:45:52 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:45:52 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_124b.pl,1.1,1.2
Message-ID: <E1DdrtI-0002Hw-I7@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8671/value_builder

Modified Files:
	unimarc_field_124b.pl 
Log Message:
Plugin for field 124b

Index: unimarc_field_124b.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_124b.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_124b.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_124b.pl	2 Jun 2005 15:45:50 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124b\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124b\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:46:13 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:46:13 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_124c.pl,1.1,1.2
Message-ID: <E1Ddrtd-0002Ka-UO@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8915/value_builder

Modified Files:
	unimarc_field_124c.pl 
Log Message:
Plugin for field 124c

Index: unimarc_field_124c.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_124c.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_124c.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_124c.pl	2 Jun 2005 15:46:11 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124c.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124c\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124c.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124c\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:46:30 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:46:30 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_124d.pl,1.1,1.2
Message-ID: <E1Ddrtu-0002OK-OT@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9148/value_builder

Modified Files:
	unimarc_field_124d.pl 
Log Message:
Plugin for field 124d

Index: unimarc_field_124d.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_124d.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_124d.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_124d.pl	2 Jun 2005 15:46:28 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124d.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124d\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124d.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124d\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:46:51 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:46:51 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_124e.pl,1.1,1.2
Message-ID: <E1DdruF-0002RD-0o@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9327/value_builder

Modified Files:
	unimarc_field_124e.pl 
Log Message:
Plugin for field 124e

Index: unimarc_field_124e.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_124e.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_124e.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_124e.pl	2 Jun 2005 15:46:43 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124e.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124e\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124e.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124e\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:47:08 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:47:08 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_124f.pl,1.1,1.2
Message-ID: <E1DdruW-0002Uv-AP@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9557/value_builder

Modified Files:
	unimarc_field_124f.pl 
Log Message:
Plugin for field 124f

Index: unimarc_field_124f.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_124f.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_124f.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_124f.pl	2 Jun 2005 15:47:06 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124f.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124f\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124f.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124f\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:47:37 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:47:37 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_124g.pl,1.1,1.2
Message-ID: <E1Ddruz-0002ZG-6Z@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9807/value_builder

Modified Files:
	unimarc_field_124g.pl 
Log Message:
Plugin for field 124g

Index: unimarc_field_124g.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_124g.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_124g.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_124g.pl	2 Jun 2005 15:47:26 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124g.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124g\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124g.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124g\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:47:53 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:47:53 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_125.pl,1.1,1.2
Message-ID: <E1DdrvF-0002dD-As@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10071/value_builder

Modified Files:
	unimarc_field_125.pl 
Log Message:
Plugin for field 125

Index: unimarc_field_125.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_125.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_125.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_125.pl	2 Jun 2005 15:47:51 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=500,height=400,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:48:18 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:48:18 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_125a.pl,1.1,1.2
Message-ID: <E1Ddrve-0002gA-U6@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10256/value_builder

Modified Files:
	unimarc_field_125a.pl 
Log Message:
Plugin for field 125a

Index: unimarc_field_125a.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_125a.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_125a.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_125a.pl	2 Jun 2005 15:48:14 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_125a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 125a\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_125a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 125a\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:48:38 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:48:38 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_125b.pl,1.1,1.2
Message-ID: <E1Ddrvy-0002kq-L9@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10546/value_builder

Modified Files:
	unimarc_field_125b.pl 
Log Message:
Plugin for field 125b

Index: unimarc_field_125b.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_125b.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_125b.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_125b.pl	2 Jun 2005 15:48:36 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_125b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 125b\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_125b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 125b\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:49:30 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:49:30 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_126b.pl,1.1,1.2
Message-ID: <E1Ddrwo-0002sz-Jq@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11030/value_builder

Modified Files:
	unimarc_field_126b.pl 
Log Message:
Plugin for field 126b

Index: unimarc_field_126b.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_126b.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_126b.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_126b.pl	2 Jun 2005 15:49:28 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_126b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 126b\",'width=1000,height=575,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_126b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 126b\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:49:46 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:49:46 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_127.pl,1.1,1.2
Message-ID: <E1Ddrx4-0002wt-Gg@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11288/value_builder

Modified Files:
	unimarc_field_127.pl 
Log Message:
Plugin for field 127a

Index: unimarc_field_127.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_127.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_127.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_127.pl	2 Jun 2005 15:49:44 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_127.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 127\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_127.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 127\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:50:06 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:50:06 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_128a.pl,1.1,1.2
Message-ID: <E1DdrxO-00031v-U9@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11572/value_builder

Modified Files:
	unimarc_field_128a.pl 
Log Message:
Plugin for field 128a

Index: unimarc_field_128a.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_128a.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_128a.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_128a.pl	2 Jun 2005 15:50:04 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_128a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 128a\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_128a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 128a\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:50:26 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:50:26 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_128b.pl,1.1,1.2
Message-ID: <E1Ddrxi-00033n-1k@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11737/value_builder

Modified Files:
	unimarc_field_128b.pl 
Log Message:
Plugin for field 128b

Index: unimarc_field_128b.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_128b.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_128b.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_128b.pl	2 Jun 2005 15:50:23 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_128b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 128b\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_128b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 128b\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }
***************
*** 81,86 ****
  			     });
  	my $f1 = substr($result,0,2);
  	$template->param(index => $index,
! 			 "f1$f1" => $f1);
  	print $input->header(-cookie => $cookie),$template->output;
  }
--- 81,88 ----
  			     });
  	my $f1 = substr($result,0,2);
+ 	my $f2 = substr($result,2,2);
  	$template->param(index => $index,
! 			 "f1$f1" => $f1,
! 			f2 => $f2);
  	print $input->header(-cookie => $cookie),$template->output;
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:50:41 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:50:41 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_128c.pl,1.1,1.2
Message-ID: <E1Ddrxx-000376-D9@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11927/value_builder

Modified Files:
	unimarc_field_128c.pl 
Log Message:
Plugin for field 128c

Index: unimarc_field_128c.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_128c.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_128c.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_128c.pl	2 Jun 2005 15:50:39 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_128c.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 128c\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_128c.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 128c\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }
***************
*** 81,86 ****
  			     });
  	my $f1 = substr($result,0,2);
  	$template->param(index => $index,
! 			 "f1$f1" => $f1);
  	print $input->header(-cookie => $cookie),$template->output;
  }
--- 81,88 ----
  			     });
  	my $f1 = substr($result,0,2);
+ 	my $f2 = substr($result,2,2);
  	$template->param(index => $index,
! 			 "f1$f1" => $f1,
! 			f2 => $f2);
  	print $input->header(-cookie => $cookie),$template->output;
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:51:02 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:51:02 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_130.pl,1.1,1.2
Message-ID: <E1DdryI-00039J-Uw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12092/value_builder

Modified Files:
	unimarc_field_130.pl 
Log Message:
Plugin for field 130a

Index: unimarc_field_130.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_130.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_130.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_130.pl	2 Jun 2005 15:50:59 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_130.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 130\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_130.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 130\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:48:56 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:48:56 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_126.pl,1.1,1.2
Message-ID: <E1DdrwG-0002oK-Eh@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10767/value_builder

Modified Files:
	unimarc_field_126.pl 
Log Message:
Plugin for field 126

Index: unimarc_field_126.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_126.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_126.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_126.pl	2 Jun 2005 15:48:54 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=500,height=400,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:49:10 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:49:10 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_126a.pl,1.1,1.2
Message-ID: <E1DdrwU-0002qs-5K@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10927/value_builder

Modified Files:
	unimarc_field_126a.pl 
Log Message:
Plugin for field 126a

Index: unimarc_field_126a.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_126a.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_126a.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_126a.pl	2 Jun 2005 15:49:08 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_126a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 126a\",'width=1000,height=575,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_126a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 126a\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:51:36 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:51:36 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_135a.pl,1.1,1.2
Message-ID: <E1Ddryq-0003DU-Kp@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12278/value_builder

Modified Files:
	unimarc_field_135a.pl 
Log Message:
Plugin for field 135a

Index: unimarc_field_135a.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_135a.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_135a.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_135a.pl	2 Jun 2005 15:51:18 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_135a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 135a\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_135a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 135a\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }
***************
*** 84,104 ****
  	my $f3 = substr($result,2,1);
  	my $f4 = substr($result,3,1);
! 	my $f5 = substr($result,4,3);
! 	my $f6 = substr($result,7,1);
  	my $f7 = substr($result,8,1);
  	my $f8 = substr($result,9,1);
  	my $f9 = substr($result,10,1);
  
! 	$template->param(index => $index,
  			 "f1$f1" => $f1,
  			 "f2$f2" => $f2,
  			 "f3$f3" => $f3,
  			 "f4$f4" => $f4,
! 			 "f5" => $f5,
! 			 "f6$f6" => $f6,
  			 "f7$f7" => $f7,
  			 "f8$f8" => $f8,
! 			 "f9$f9" => $f9
! 
  );
  	print $input->header(-cookie => $cookie),$template->output;
--- 84,107 ----
  	my $f3 = substr($result,2,1);
  	my $f4 = substr($result,3,1);
! 	my $f5 = substr($result,4,1);
! 	my $f6 = substr($result,5,3);
  	my $f7 = substr($result,8,1);
  	my $f8 = substr($result,9,1);
  	my $f9 = substr($result,10,1);
+ 	my $f10 = substr($result,11,1);
+ 	my $f11 = substr($result,12,1);
  
! 	$template->param("index" => $index,
  			 "f1$f1" => $f1,
  			 "f2$f2" => $f2,
  			 "f3$f3" => $f3,
  			 "f4$f4" => $f4,
! 			 "f5$f5" => $f5,
! 			 "f6" => $f6,
  			 "f7$f7" => $f7,
  			 "f8$f8" => $f8,
! 			 "f9$f9" => $f9,
! 			 "f10$f10" => $f10,
! 			 "f11$f11" => $f11
  );
  	print $input->header(-cookie => $cookie),$template->output;




From doxulting at users.sourceforge.net  Thu Jun  2 17:51:52 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:51:52 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_140.pl,1.1,1.2
Message-ID: <E1Ddrz6-0003Gz-V3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12548/value_builder

Modified Files:
	unimarc_field_140.pl 
Log Message:
Plugin for field 140a

Index: unimarc_field_140.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_140.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_140.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_140.pl	2 Jun 2005 15:51:50 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_140.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 140\",'width=1000,height=575,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_140.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 140\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:52:09 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:52:09 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_141.pl,1.1,1.2
Message-ID: <E1DdrzN-0003Kx-IX@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12775/value_builder

Modified Files:
	unimarc_field_141.pl 
Log Message:
Plugin for field 141a

Index: unimarc_field_141.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_141.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_141.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_141.pl	2 Jun 2005 15:52:07 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_141.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 141\",'width=1000,height=575,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_141.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 141\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From hdl at users.sourceforge.net  Thu Jun  2 23:04:37 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 02 Jun 2005 14:04:37 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-full-serial-issues.tmpl,NONE,1.1.2.1
Message-ID: <E1Ddwrl-0004dt-Uy@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
      Tag: rel_2_2
	opac-full-serial-issues.tmpl 
Log Message:
Adding full history support to opac serial
Needs fixing

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="opac-top.inc" -->


<!-- TMPL_UNLESS name="popup" -->
<div class="tabbed">
<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>
		<h2 class="catalogue">Subscription information for biblio number : <!-- TMPL_VAR NAME="biblionumber" --> with title : <!-- TMPL_VAR name="bibliotitle" --></h2>

</div>
<!-- /TMPL_UNLESS -->
	<div class="tabs">
	<!-- TMPL_LOOP NAME="years" -->
		<!-- TMPL_IF NAME="year" -->
			<div id="link<!--TMPL_VAR Name="year" -->"><a href="javascript:active(<!-- TMPL_VAR NAME="year" -->)"><!-- TMPL_VAR NAME="year" --></a></div>
		<!-- /TMPL_IF -->
	<!-- /TMPL_LOOP -->
	</div>

	<!-- TMPL_LOOP NAME="years" -->
	<div name="<!-- TMPL_VAR NAME="year" -->XX" id="<!-- TMPL_VAR NAME="year" -->XX" class="tab" style="visibility:visible">
		<table>
			<tr>
				<th> Date
				</th>
				<th> Number
				</th>
				<th> Status
				</th>
			</tr>
			<!-- TMPL_LOOP Name="serials" -->
			<tr>
				<td>
					<!-- TMPL_VAR Name="planneddate" -->
				</td>
				<td>
					<!-- TMPL_VAR Name="serialseq" -->
				</td>
				<td>
					<!-- TMPL_VAR Name="status" -->
				</td>
			</tr>
			<!-- /TMPL_LOOP -->
	</div>
	<!--/TMPL_LOOP -->

<script language="JavaScript" type="text/javascript">
function active(numlayer)
{
	for (i=<!--TMPL_VAR Name="yearmin"-->; i <= <!--TMPL_VAR Name="yearmax"--> ; i++ ) {
		ong = i+"XX";
		link = "link"+i;
		if (numlayer==i) {
			document.getElementById(ong).style.visibility="visible";
		} else {
			document.getElementById(ong).style.visibility="hidden";
		}
	}
}

</script>
</body>
</html>




From hdl at users.sourceforge.net  Thu Jun  2 23:04:37 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 02 Jun 2005 14:04:37 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-serial-issues.pl,1.1.2.4,1.1.2.5
Message-ID: <E1Ddwrl-0004du-Vx@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17766/opac

Modified Files:
      Tag: rel_2_2
	opac-serial-issues.pl 
Log Message:
Adding full history support to opac serial
Needs fixing

Index: opac-serial-issues.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-serial-issues.pl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** opac-serial-issues.pl	1 Jun 2005 20:05:41 -0000	1.1.2.4
--- opac-serial-issues.pl	2 Jun 2005 21:04:35 -0000	1.1.2.5
***************
*** 15,22 ****
--- 15,58 ----
  my $op = $query->param('op');
  my $dbh = C4::Context->dbh;
+ my $selectview = C4::Context->preference("SubscriptionHistory");
+ warn "selectview : ".$selectview;
+ 
  my $sth;
  # my $id;
  my ($template, $loggedinuser, $cookie);
  my $biblionumber = $query->param('biblionumber');
+ if ($selectview eq "full"){
+ my $subscriptions = get_full_subscription_list_from_biblionumber($biblionumber);
+ 
+ my $year;
+ my $yearmin=$subscriptions->[1]{year};
+ warn "yearmin".$yearmin;
+ my $yearmax;
+ my @loopissues;
+ my $yearmax=$subscriptions->[scalar(@$subscriptions)]{year};
+ warn "yearmax".$yearmax;
+ 
+ 
+ ($template, $loggedinuser, $cookie)
+ = get_template_and_user({template_name => "opac-full-serial-issues.tmpl",
+ 				query => $query,
+ 				type => "opac",
+ 				authnotrequired => 1,
+ 				debug => 1,
+ 				});
+ 
+ # replace CR by <br> in librarian note
+ # $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
+ 
+ $template->param(
+ 	biblionumber => $query->param('biblionumber'),
+ 	years => $subscriptions,
+ 	yearmin => $yearmin,
+ 	yearmax =>$yearmax,
+ 	suggestion => C4::Context->preference("suggestion"),
+ 	virtualshelves => C4::Context->preference("virtualshelves"),
+ 	);
+ 
+ } else {
  my $subscriptions = get_subscription_list_from_biblionumber($biblionumber);
  
***************
*** 38,41 ****
  	virtualshelves => C4::Context->preference("virtualshelves"),
  	);
! 
  output_html_with_http_headers $query, $cookie, $template->output;
--- 74,77 ----
  	virtualshelves => C4::Context->preference("virtualshelves"),
  	);
! }
  output_html_with_http_headers $query, $cookie, $template->output;




From hdl at users.sourceforge.net  Thu Jun  2 23:04:38 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 02 Jun 2005 14:04:38 -0700
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.6.2.5,1.6.2.6
Message-ID: <E1Ddwrm-0004e2-Dv@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17766/C4

Modified Files:
      Tag: rel_2_2
	Bull.pm 
Log Message:
Adding full history support to opac serial
Needs fixing

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.6.2.5
retrieving revision 1.6.2.6
diff -C2 -r1.6.2.5 -r1.6.2.6
*** Bull.pm	28 Apr 2005 08:49:40 -0000	1.6.2.5
--- Bull.pm	2 Jun 2005 21:04:35 -0000	1.6.2.6
***************
*** 47,50 ****
--- 47,51 ----
  @EXPORT = qw(&newsubscription &modsubscription &delsubscription &getsubscriptions &getsubscription 
  			&getsubscriptionfrombiblionumber &get_subscription_list_from_biblionumber
+ 			&get_full_subscription_list_from_biblionumber 
  			&modsubscriptionhistory &newissue
  			&getserials &serialchangestatus
***************
*** 167,171 ****
  	my ($biblionumber) = @_;
  	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare('select subscription.*,subscriptionhistory.*,aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle 
  							from subscription 
  							left join subscriptionhistory on subscription.subscriptionid=subscriptionhistory.subscriptionid
--- 168,172 ----
  	my ($biblionumber) = @_;
  	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare('select subscription.*,subscriptionhistory.*,  aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle 
  							from subscription 
  							left join subscriptionhistory on subscription.subscriptionid=subscriptionhistory.subscriptionid
***************
*** 186,189 ****
--- 187,223 ----
  }
  
+ sub get_full_subscription_list_from_biblionumber {
+ 	my ($biblionumber) = @_;
+ 	my $dbh = C4::Context->dbh;
+ 	my $sth = $dbh->prepare('select year(subscription.startdate) as year,subscription.*, aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle 
+ 							from subscription 
+ 							left join aqbudget on subscription.aqbudgetid=aqbudget.aqbudgetid 
+ 							left join aqbooksellers on subscription.aqbooksellerid=aqbooksellers.id 
+ 							left join biblio on biblio.biblionumber=subscription.biblionumber 
+ 							where subscription.biblionumber = ? order by subscription.startdate');
+ 	$sth->execute($biblionumber);
+ 	my @res;
+ 	my $year;
+ 	my @loopissues;
+ 	while (my $subs = $sth->fetchrow_hashref) {
+ 		my $sth2 = $dbh->prepare('select serial.serialseq, serial.planneddate, year(serial.planneddate) as year, serial.status from serial where serial.biblionumber = ? and serial.subscriptionid=? order by serial.planneddate');
+ 		$sth2->execute($biblionumber,$subs->{'subscriptionid'});
+ 		while (my $issues = $sth2->fetchrow_hashref){
+ 				push @loopissues,
+ 					{'planneddate' => $issues->{'planneddate'}, 
+ 					'serialseq' => $issues->{'serialseq'},
+ 					'status' => $issues->{'status'}};
+ # 				warn "planneddate ".$issues->{'planneddate'};
+ # 				warn "serialseq".$issues->{'serialseq'};
+ 		}
+ 		my %cell;
+ 		$cell{'year'}=$subs->{year};
+ 		$cell{'title'}=$subs->{title};
+ 		$cell{'booksellername'}=$subs->{booksellername};
+ 		$cell{'serials'}=\@loopissues;
+ 		push @res,\%cell;
+ 	}
+ 	return \@res;
+ }
  
  sub modsubscription {




From hdl at users.sourceforge.net  Thu Jun  2 23:05:39 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 02 Jun 2005 14:05:39 -0700
Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.100.2.2,1.100.2.3
Message-ID: <E1Ddwsl-0004ki-Fk@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/updater
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18239/updater

Modified Files:
      Tag: rel_2_2
	updatedatabase 
Log Message:
adding variable SubscriptionHistory

Index: updatedatabase
===================================================================
RCS file: /cvsroot/koha/koha/updater/updatedatabase,v
retrieving revision 1.100.2.2
retrieving revision 1.100.2.3
diff -C2 -r1.100.2.2 -r1.100.2.3
*** updatedatabase	29 Mar 2005 15:41:43 -0000	1.100.2.2
--- updatedatabase	2 Jun 2005 21:05:34 -0000	1.100.2.3
***************
*** 848,851 ****
--- 848,862 ----
  	        options		=> ';|tabulation|,|/|\|#'
          },
+         {
+             uniquefieldrequired => 'variable',
+             variable            => 'SubscriptionHistory',
+             value               => ';',
+ 	        forceupdate		=> { 'explanation' => 1,
+ 	    			     'type' => 1,
+ 				     'options' => 1},
+             explanation         => 'Define the information level for serials history in OPAC',
+ 	        type		=> 'Choice',
+ 	        options		=> 'simplified|full'
+         },
      ],
  
***************
*** 1433,1436 ****
--- 1444,1450 ----
  
  # $Log$
+ # Revision 1.100.2.3  2005/06/02 21:05:34  hdl
+ # adding variable SubscriptionHistory
+ #
  # Revision 1.100.2.2  2005/03/29 15:41:43  tipaul
  # * new permissions : management & tools. You now have 2 new permissions :




From genjimoto at users.sourceforge.net  Fri Jun  3 05:51:28 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Thu, 02 Jun 2005 20:51:28 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-search.pl,1.27,1.28
Message-ID: <E1De3DU-0001i3-UN@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6543

Modified Files:
	opac-search.pl 
Log Message:
Search for availablilty feature implemented.

Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** opac-search.pl	2 Jun 2005 13:47:47 -0000	1.27
--- opac-search.pl	3 Jun 2005 03:51:26 -0000	1.28
***************
*** 16,20 ****
  my $firstbiblionumber; # needed for directly sending user to first item
  # use C4::Search;
! 
  
  my $itemtypelist;
--- 16,20 ----
  my $firstbiblionumber; # needed for directly sending user to first item
  # use C4::Search;
! my $totalresults;
  
  my $itemtypelist;
***************
*** 56,60 ****
  my $op = $query->param("op");
  my $type=$query->param('type');
! 
  my $itemtypesstring=$query->param("itemtypesstring");
  $itemtypesstring =~s/"//g;
--- 56,60 ----
  my $op = $query->param("op");
  my $type=$query->param('type');
! my $avail=$query->param('avail');
  my $itemtypesstring=$query->param("itemtypesstring");
  $itemtypesstring =~s/"//g;
***************
*** 141,145 ****
          $sqlstring .= '))'
      }
! 
  	my ($results,$total) = catalogsearch($dbh, \@tags,\@and_or,
  										\@excluding, \@operator, \@value,
--- 141,147 ----
          $sqlstring .= '))'
      }
!   if ($avail){
!     $sqlstring .= "and biblioitems.biblioitemnumber=items.biblioitemnumber and items.itemnumber !=issues.itemnumber and biblio.biblionumber !=reserves.biblionumber and (items.itemlost IS NULL or items.itemlost = 0) and (items.notforloan IS NULL or items.notforloan =0) and (items.wthdrawn IS NULL or items.wthdrawn =0) ";
!   }
  	my ($results,$total) = catalogsearch($dbh, \@tags,\@and_or,
  										\@excluding, \@operator, \@value,




From genjimoto at users.sourceforge.net  Fri Jun  3 05:58:28 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Thu, 02 Jun 2005 20:58:28 -0700
Subject: [Koha-cvs] CVS: koha/C4 SearchMarc.pm,1.43,1.44
Message-ID: <E1De3KG-0002cV-N5@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10028

Modified Files:
	SearchMarc.pm 
Log Message:
Added necessary tables for search for availablity feature into Catalogsearch. Someone needs to speed it up somehow.

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** SearchMarc.pm	1 Jun 2005 21:18:39 -0000	1.43
--- SearchMarc.pm	3 Jun 2005 03:58:26 -0000	1.44
***************
*** 277,289 ****
  	# Finds the basic results without the NOT requests
  	my ($sql_tables, $sql_where1, $sql_where2) = create_request($dbh,\@normal_tags, \@normal_and_or, \@normal_operator, \@normal_value);
!   $sql_where1 .=" ". $sqlstring;
  	$sql_where1 .= "and TO_DAYS( NOW( ) ) - TO_DAYS( biblio.timestamp ) <30" if $orderby =~ "biblio.timestamp";
  	my $sth;
  	if ($sql_where2) {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc");
! 		warn "Q2 : select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc term is  @$value";
  	} else {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc");
! 		warn "Q : select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc";
  	}
  	$sth->execute();
--- 277,289 ----
  	# Finds the basic results without the NOT requests
  	my ($sql_tables, $sql_where1, $sql_where2) = create_request($dbh,\@normal_tags, \@normal_and_or, \@normal_operator, \@normal_value);
!   $sql_where1 .= $sqlstring;
  	$sql_where1 .= "and TO_DAYS( NOW( ) ) - TO_DAYS( biblio.timestamp ) <30" if $orderby =~ "biblio.timestamp";
  	my $sth;
  	if ($sql_where2) {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,issues,reserves,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc");
! 		warn "Q2 : select distinct m1.bibid from biblio,biblioitems,items,issues,reserves,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc term is  @$value";
  	} else {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,issues,reserves,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc");
! 		warn "Q : select distinct m1.bibid from biblio,biblioitems,items,issues,reserves,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc";
  	}
  	$sth->execute();




From genjimoto at users.sourceforge.net  Fri Jun  3 06:15:31 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Thu, 02 Jun 2005 21:15:31 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-search.pl,1.28,1.29
Message-ID: <E1De3al-0004kO-Gm@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18197

Modified Files:
	opac-search.pl 
Log Message:
Added avail into the template parameters

Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** opac-search.pl	3 Jun 2005 03:51:26 -0000	1.28
--- opac-search.pl	3 Jun 2005 04:15:29 -0000	1.29
***************
*** 88,95 ****
--- 88,99 ----
      $searchdesc .= join(" ", at itemtypes)
    }
+ 
    if ($branchesstring ne ''){
      $searchdesc .= ' in branches ';
      $searchdesc .= join(" ", at branches)
    }
+   if ($avail ne ''){
+     $searchdesc .= '. Only available items shown.'
+   }
  	$resultsperpage= $query->param('resultsperpage');
  	$resultsperpage = 19 if(!defined $resultsperpage);
***************
*** 353,356 ****
--- 357,361 ----
                mediatypelist => $mediatypelist,
                itemtypesstring => $itemtypesstring,
+               avail => $avail,
  							);
  




From genjimoto at users.sourceforge.net  Fri Jun  3 06:16:55 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Thu, 02 Jun 2005 21:16:55 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-searchresults.tmpl,1.23,1.24
Message-ID: <E1De3c7-0004uP-V8@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac-searchresults.tmpl 
Log Message:
the avail checkbox now gets checked if the template gets avail in its parameters

Index: opac-searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** opac-searchresults.tmpl	1 Jun 2005 22:20:16 -0000	1.23
--- opac-searchresults.tmpl	3 Jun 2005 04:16:53 -0000	1.24
***************
*** 180,184 ****
  <!-- TMPL_VAR NAME="brancheslist" -->
  </select><br>
! <input type="checkbox" name="avail"> Only show titles available (Not on loan)<br>
  <input type="submit" value="Search">
  </form>
--- 180,188 ----
  <!-- TMPL_VAR NAME="brancheslist" -->
  </select><br>
! 
! <input type="checkbox" name="avail"
! <!-- TMPL_IF NAME="avail" --> checked
! <!-- /TMPL_IF -->
! > Only show titles available (Not on loan)<br>
  <input type="submit" value="Search">
  </form>




From hellen at users.sourceforge.net  Fri Jun  3 13:38:13 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Fri, 03 Jun 2005 04:38:13 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/acqui supplier.tmpl,1.1,1.2
Message-ID: <E1DeAVB-0003io-Vi@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	supplier.tmpl 
Log Message:
translated by hellen

Index: supplier.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui/supplier.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** supplier.tmpl	12 May 2005 19:26:13 -0000	1.1
--- supplier.tmpl	3 Jun 2005 11:38:11 -0000	1.2
***************
*** 18,26 ****
  		</p>
  		<p>
! 			<label>Postal Address</label>
  				<textarea name="company_postal" cols="40" rows="3"><!-- TMPL_VAR NAME="postal" --></textarea>
  		</p>
  		<p>
! 			<label>Physical Address</label>
  			<textarea name="physical" cols="40" rows="4"><!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></textarea>
  		</p>
--- 18,26 ----
  		</p>
  		<p>
! 			<label>Anschrift</label>
  				<textarea name="company_postal" cols="40" rows="3"><!-- TMPL_VAR NAME="postal" --></textarea>
  		</p>
  		<p>
! 			<label>Anschrift 2</label>
  			<textarea name="physical" cols="40" rows="4"><!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></textarea>
  		</p>
***************
*** 51,55 ****
  		</p>
  		<p>
! 			<label>Weiter Rufnummer</label>
  			<input type="text" size="20" name="contact_phone_2" value="<!-- TMPL_VAR NAME="contaltphone" -->">
  		</p>
--- 51,55 ----
  		</p>
  		<p>
! 			<label>Weitere Rufnummer</label>
  			<input type="text" size="20" name="contact_phone_2" value="<!-- TMPL_VAR NAME="contaltphone" -->">
  		</p>
***************
*** 84,88 ****
  		</p>
  		<p>
! 			<label class="label100">List Prices are</label>
  				<select name="list_currency" size="1">
  				<!-- TMPL_LOOP NAME="loop_pricescurrency" -->
--- 84,88 ----
  		</p>
  		<p>
! 			<label class="label100">Listenpreise/label>
  				<select name="list_currency" size="1">
  				<!-- TMPL_LOOP NAME="loop_pricescurrency" -->
***************
*** 100,108 ****
  		</p>
  		<p>
! 			<label class="label100">GST Registered</label>
  				<input type="radio" name="gst" value="1" <!-- TMPL_IF name="gstreg" -->checked<!-- /TMPL_IF -->>Ja <input type="radio" name="gst" value="0" <!-- TMPL_UNLESS name="gstreg" -->checked<!-- /TMPL_UNLESS -->>Nein
  		</p>
  		<p>
! 			<label class="label100">List Item Price Includes GST</label>
  				<input type="radio" name="list_gst" value="1" <!-- TMPL_IF name="listincgst" -->checked<!-- /TMPL_IF -->>Ja <input type="radio" name="list_gst" value="0" <!-- TMPL_UNLESS name="listincgst" -->checked<!-- /TMPL_UNLESS -->>Nein
  		</p>
--- 100,108 ----
  		</p>
  		<p>
! 			<label class="label100">MWST</label>
  				<input type="radio" name="gst" value="1" <!-- TMPL_IF name="gstreg" -->checked<!-- /TMPL_IF -->>Ja <input type="radio" name="gst" value="0" <!-- TMPL_UNLESS name="gstreg" -->checked<!-- /TMPL_UNLESS -->>Nein
  		</p>
  		<p>
! 			<label class="label100">Listenpreis einschl. MWST</label>
  				<input type="radio" name="list_gst" value="1" <!-- TMPL_IF name="listincgst" -->checked<!-- /TMPL_IF -->>Ja <input type="radio" name="list_gst" value="0" <!-- TMPL_UNLESS name="listincgst" -->checked<!-- /TMPL_UNLESS -->>Nein
  		</p>




From hdl at users.sourceforge.net  Fri Jun  3 14:53:10 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 03 Jun 2005 05:53:10 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-serial-issues.pl,1.1.2.5,1.1.2.6
Message-ID: <E1DeBfi-0005tY-B0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22616/opac

Modified Files:
      Tag: rel_2_2
	opac-serial-issues.pl 
Log Message:
Featuring OPAC with Full History Subscription

Index: opac-serial-issues.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-serial-issues.pl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -r1.1.2.5 -r1.1.2.6
*** opac-serial-issues.pl	2 Jun 2005 21:04:35 -0000	1.1.2.5
--- opac-serial-issues.pl	3 Jun 2005 12:53:08 -0000	1.1.2.6
***************
*** 25,35 ****
  my $subscriptions = get_full_subscription_list_from_biblionumber($biblionumber);
  
! my $year;
! my $yearmin=$subscriptions->[1]{year};
! warn "yearmin".$yearmin;
! my $yearmax;
! my @loopissues;
! my $yearmax=$subscriptions->[scalar(@$subscriptions)]{year};
! warn "yearmax".$yearmax;
  
  
--- 25,34 ----
  my $subscriptions = get_full_subscription_list_from_biblionumber($biblionumber);
  
! my $title = $subscriptions->[0]{bibliotitle};
! warn "title ".$title;
! my $yearmin=$subscriptions->[0]{year};
! warn "yearmin ".$yearmin;
! my $yearmax=$subscriptions->[scalar(@$subscriptions)-1]{year};
! warn "yearmax ".$yearmax;
  
  
***************
*** 50,53 ****
--- 49,53 ----
  	yearmin => $yearmin,
  	yearmax =>$yearmax,
+ 	bibliotitle => $title,
  	suggestion => C4::Context->preference("suggestion"),
  	virtualshelves => C4::Context->preference("virtualshelves"),




From hdl at users.sourceforge.net  Fri Jun  3 14:53:10 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 03 Jun 2005 05:53:10 -0700
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.6.2.6,1.6.2.7
Message-ID: <E1DeBfi-0005tk-ME@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22616/C4

Modified Files:
      Tag: rel_2_2
	Bull.pm 
Log Message:
Featuring OPAC with Full History Subscription

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.6.2.6
retrieving revision 1.6.2.7
diff -C2 -r1.6.2.6 -r1.6.2.7
*** Bull.pm	2 Jun 2005 21:04:35 -0000	1.6.2.6
--- Bull.pm	3 Jun 2005 12:53:08 -0000	1.6.2.7
***************
*** 190,220 ****
  	my ($biblionumber) = @_;
  	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare('select year(subscription.startdate) as year,subscription.*, aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle 
! 							from subscription 
  							left join aqbudget on subscription.aqbudgetid=aqbudget.aqbudgetid 
  							left join aqbooksellers on subscription.aqbooksellerid=aqbooksellers.id 
  							left join biblio on biblio.biblionumber=subscription.biblionumber 
! 							where subscription.biblionumber = ? order by subscription.startdate');
  	$sth->execute($biblionumber);
  	my @res;
  	my $year;
  	my @loopissues;
  	while (my $subs = $sth->fetchrow_hashref) {
! 		my $sth2 = $dbh->prepare('select serial.serialseq, serial.planneddate, year(serial.planneddate) as year, serial.status from serial where serial.biblionumber = ? and serial.subscriptionid=? order by serial.planneddate');
! 		$sth2->execute($biblionumber,$subs->{'subscriptionid'});
! 		while (my $issues = $sth2->fetchrow_hashref){
! 				push @loopissues,
! 					{'planneddate' => $issues->{'planneddate'}, 
! 					'serialseq' => $issues->{'serialseq'},
! 					'status' => $issues->{'status'}};
  # 				warn "planneddate ".$issues->{'planneddate'};
  # 				warn "serialseq".$issues->{'serialseq'};
  		}
- 		my %cell;
- 		$cell{'year'}=$subs->{year};
- 		$cell{'title'}=$subs->{title};
- 		$cell{'booksellername'}=$subs->{booksellername};
- 		$cell{'serials'}=\@loopissues;
- 		push @res,\%cell;
  	}
  	return \@res;
--- 190,250 ----
  	my ($biblionumber) = @_;
  	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare('select serial.serialseq, serial.planneddate, serial.status, year(serial.planneddate) as year,subscription.*, aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle 
! 							from serial left join subscription on (serial.subscriptionid=subscription.subscriptionid and subscription.biblionumber=serial.biblionumber)
  							left join aqbudget on subscription.aqbudgetid=aqbudget.aqbudgetid 
  							left join aqbooksellers on subscription.aqbooksellerid=aqbooksellers.id 
  							left join biblio on biblio.biblionumber=subscription.biblionumber 
! 							where subscription.biblionumber = ? order by year,serial.planneddate');
  	$sth->execute($biblionumber);
  	my @res;
  	my $year;
+ 	my $startdate;
+ 	my $aqbooksellername;
+ 	my $bibliotitle;
  	my @loopissues;
+ 	my $first;
  	while (my $subs = $sth->fetchrow_hashref) {
! # 		my $sth2 = $dbh->prepare('select * from serial where serial.biblionumber = ? and serial.subscriptionid=? order by serial.planneddate');
! # 		$sth2->execute($biblionumber,$subs->{'subscriptionid'});
! # 		while (my $issues = $sth2->fetchrow_hashref){
  # 				warn "planneddate ".$issues->{'planneddate'};
  # 				warn "serialseq".$issues->{'serialseq'};
+ # 		}
+ 		if ($year and ($year==$subs->{year})){
+ 			if ($first eq 1){$first=0;}
+ 			my $temp=$res[scalar(@res)-1]->{'serials'};
+ 			push @$temp,
+ 				{'planneddate' => $subs->{'planneddate'}, 
+ 				'serialseq' => $subs->{'serialseq'},
+ 				'status1' => $subs->{'status'}==1,
+ 				'status2' => $subs->{'status'}==2,
+ 				'status3' => $subs->{'status'}==3,
+ 				'status4' => $subs->{'status'}==4,
+ 				};
+ 		}else {
+ 			$year= $subs->{'year'};
+ 			$startdate= $subs->{'startdate'};
+ 			$aqbooksellername= $subs->{'aqbooksellername'};
+ 			$bibliotitle= $subs->{'bibliotitle'};
+ 			$first=1 if (not $year);
+ 			my @temp;
+ 			push @temp,
+ 				{'planneddate' => $subs->{'planneddate'}, 
+ 				'serialseq' => $subs->{'serialseq'},
+ 				'status1' => $subs->{'status'}==1,
+ 				'status2' => $subs->{'status'}==2,
+ 				'status3' => $subs->{'status'}==3,
+ 				'status4' => $subs->{'status'}==4,
+ 				};
+ 			
+ 			push @res,{
+ 				'year'=>$year,
+ 				'startdate'=>$startdate,
+ 				'aqbooksellername'=>$aqbooksellername,
+ 				'bibliotitle'=>$bibliotitle,
+ 				'serials'=>\@temp,
+ 				'first'=>$first 
+ 			};
  		}
  	}
  	return \@res;




From hdl at users.sourceforge.net  Fri Jun  3 14:53:10 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 03 Jun 2005 05:53:10 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-full-serial-issues.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1DeBfi-0005tc-EK@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-full-serial-issues.tmpl 
Log Message:
Featuring OPAC with Full History Subscription

Index: opac-full-serial-issues.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/Attic/opac-full-serial-issues.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac-full-serial-issues.tmpl	2 Jun 2005 21:04:35 -0000	1.1.2.1
--- opac-full-serial-issues.tmpl	3 Jun 2005 12:53:08 -0000	1.1.2.2
***************
*** 3,17 ****
  
  <!-- TMPL_UNLESS name="popup" -->
! <div class="tabbed">
! <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>
- 		<h2 class="catalogue">Subscription information for biblio number : <!-- TMPL_VAR NAME="biblionumber" --> with title : <!-- TMPL_VAR name="bibliotitle" --></h2>
  
  </div>
  <!-- /TMPL_UNLESS -->
! 	<div class="tabs">
  	<!-- TMPL_LOOP NAME="years" -->
  		<!-- TMPL_IF NAME="year" -->
! 			<div id="link<!--TMPL_VAR Name="year" -->"><a href="javascript:active(<!-- TMPL_VAR NAME="year" -->)"><!-- TMPL_VAR NAME="year" --></a></div>
  		<!-- /TMPL_IF -->
  	<!-- /TMPL_LOOP -->
--- 3,16 ----
  
  <!-- TMPL_UNLESS name="popup" -->
! <div class="mainbloc">
! 		<h1 class="catalogue">Subscription information for biblio #<!-- TMPL_VAR NAME="biblionumber" --> with title : <!-- TMPL_VAR name="bibliotitle" --></h1>
  <a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Back to biblio</a>
  
  </div>
  <!-- /TMPL_UNLESS -->
! 	<div class="tabsubs">
  	<!-- TMPL_LOOP NAME="years" -->
  		<!-- TMPL_IF NAME="year" -->
! 			<div id="link<!--TMPL_VAR Name="year" -->" ><a href="javascript:active(<!-- TMPL_VAR NAME="year" -->)"><!-- TMPL_VAR NAME="year" --></a></div>
  		<!-- /TMPL_IF -->
  	<!-- /TMPL_LOOP -->
***************
*** 19,23 ****
  
  	<!-- TMPL_LOOP NAME="years" -->
! 	<div name="<!-- TMPL_VAR NAME="year" -->XX" id="<!-- TMPL_VAR NAME="year" -->XX" class="tab" style="visibility:visible">
  		<table>
  			<tr>
--- 18,22 ----
  
  	<!-- TMPL_LOOP NAME="years" -->
! 	<div name="<!-- TMPL_VAR NAME="year" -->" id="<!-- TMPL_VAR NAME="year" -->" class="tabsub" <!--TMPL_IF Name="first" -->style="visibility:visible"<!--/TMPL_IF -->>
  		<table>
  			<tr>
***************
*** 38,45 ****
  				</td>
  				<td>
! 					<!-- TMPL_VAR Name="status" -->
  				</td>
  			</tr>
  			<!-- /TMPL_LOOP -->
  	</div>
  	<!--/TMPL_LOOP -->
--- 37,48 ----
  				</td>
  				<td>
! 					<!-- TMPL_IF Name="status1" -->Arrived<!-- /TMPL_IF -->
! 					<!-- TMPL_IF Name="status2" -->Waited<!-- /TMPL_IF -->
! 					<!-- TMPL_IF Name="status3" -->Late<!-- /TMPL_IF -->
! 					<!-- TMPL_IF Name="status4" -->Missing<!-- /TMPL_IF -->
  				</td>
  			</tr>
  			<!-- /TMPL_LOOP -->
+ 		</table>
  	</div>
  	<!--/TMPL_LOOP -->
***************
*** 48,53 ****
  function active(numlayer)
  {
! 	for (i=<!--TMPL_VAR Name="yearmin"-->; i <= <!--TMPL_VAR Name="yearmax"--> ; i++ ) {
! 		ong = i+"XX";
  		link = "link"+i;
  		if (numlayer==i) {
--- 51,56 ----
  function active(numlayer)
  {
! 	for (i=<!--TMPL_VAR Name="yearmin"-->; i<=<!--TMPL_VAR Name="yearmax"-->; i++ ) {
! 		ong = i;
  		link = "link"+i;
  		if (numlayer==i) {




From hdl at users.sourceforge.net  Fri Jun  3 15:01:26 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 03 Jun 2005 06:01:26 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.17.2.3,1.17.2.4
Message-ID: <E1DeBni-00074y-6z@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac.css 
Log Message:
adding tabsub for subbscription tabs.

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.17.2.3
retrieving revision 1.17.2.4
diff -C2 -r1.17.2.3 -r1.17.2.4
*** opac.css	18 Mar 2005 09:52:21 -0000	1.17.2.3
--- opac.css	3 Jun 2005 13:01:23 -0000	1.17.2.4
***************
*** 367,370 ****
--- 367,399 ----
  }
  
+ /* for SubscritptionHistory view  */
+ div.tabsubs {
+ 	width:25px;
+ 	position:absolute;
+ 	display:block;
+ 	margin-left:10px;
+ 	margin-top:100px;
+ }
+ 
+ div.tabsubs a {
+ 	display:block;
+ 	font-size: small;
+ 	border: thin solid black;
+ 	margin-right: 2px;
+ 	padding: 15px 30px;
+ 	-moz-border-radius: 5px 0px 0px 5px;
+ }
+ 
+ div.tabsub {
+ 	background-color: #ACE6E6;
+ 	display: block;
+ 	visibility:hidden;
+ 	position:absolute;
+ 	margin-left:72px;
+ 	margin-top:100px;
+ 	margin-right:10%;
+ }
+ 
+ 
  /* for MARC view  */
  div.tabs {




From hdl at users.sourceforge.net  Fri Jun  3 15:27:27 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 03 Jun 2005 06:27:27 -0700
Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.88.2.4,1.88.2.5
Message-ID: <E1DeCCt-0002EM-TQ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8492/misc

Modified Files:
      Tag: rel_2_2
	Install.pm 
Log Message:
Bug Fixing  : PDF::API2 Not mandatory

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.88.2.4
retrieving revision 1.88.2.5
diff -C2 -r1.88.2.4 -r1.88.2.5
*** Install.pm	4 Feb 2005 18:41:42 -0000	1.88.2.4
--- Install.pm	3 Jun 2005 13:27:25 -0000	1.88.2.5
***************
*** 860,865 ****
  	unless (eval {require MARC::Record})     { push @missing,"MARC::Record" };
  	unless (eval {require Mail::Sendmail})   { push @missing,"Mail::Sendmail" };
- 	unless (eval {require PDF::API2})   { push @missing,"PDF::API2" };
  # The following modules are not mandatory, depends on how the library want to use Koha
  	unless (eval {require Net::LDAP})       {
  		if ($#missing>=0) { # only when $#missing >= 0 so this isn't fatal
--- 860,869 ----
  	unless (eval {require MARC::Record})     { push @missing,"MARC::Record" };
  	unless (eval {require Mail::Sendmail})   { push @missing,"Mail::Sendmail" };
  # The following modules are not mandatory, depends on how the library want to use Koha
+ 	unless (eval {require PDF::API2})   { 
+ 			if ($#missing>=0) { # only when $#missing >= 0 so this isn't fatal
+ 				push @missing,"You will need PDF::API2 for barcode generator" 
+ 			}
+ 	}
  	unless (eval {require Net::LDAP})       {
  		if ($#missing>=0) { # only when $#missing >= 0 so this isn't fatal




From gmccullagh at users.sourceforge.net  Fri Jun  3 19:01:55 2005
From: gmccullagh at users.sourceforge.net (gavin)
Date: Fri, 03 Jun 2005 10:01:55 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-search-biblio.pl,NONE,1.1
Message-ID: <E1DeFYR-0004Uw-JB@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15229/opac

Added Files:
	opac-search-biblio.pl 
Log Message:
two new files 
  SearchBiblio.pm forked from SearchMarc.pm
  opac-search-biblio.pl forked from opac-search.pl (just change module)
an attempt at a new search using FULLTEXT indexes.
NB: Boolean won't work without MySQL >v4.0
NNB: Will be slow without indexes added on Biblio table as follows:
  ALTER TABLE biblio ADD FULLTEXT (author,title,unititle,seriestitle);
Only searching on "Any word" field just now. 
more to come.



--- NEW FILE ---
#!/usr/bin/perl
use strict;
require Exporter;

use C4::Auth;
use C4::Interface::CGI::Output;
use C4::Context;
use CGI;
use C4::Database;
use HTML::Template;
use C4::SearchBiblio;
use C4::Acquisition;
use C4::Biblio;
my @spsuggest; # the array for holding suggestions
my $suggest;   # a flag to be set (if there are suggestions it's 1)
my $firstbiblionumber; # needed for directly sending user to first item
# use C4::Search;


my $itemtypelist;
my $brancheslist;
my $categorylist;
my $subcategorylist;
my $mediatypelist;
# added by Gavin 
my $totalresults;

my $dbh=C4::Context->dbh;
my $sth=$dbh->prepare("select description,itemtype from itemtypes order by description");
$sth->execute;
while (my ($description,$itemtype) = $sth->fetchrow) {
    $itemtypelist.="<option value=\"$itemtype\">$description</option>\n";
}
my $sth=$dbh->prepare("select description,subcategorycode from subcategorytable order by description");
$sth->execute;
while (my ($description,$subcategorycode) = $sth->fetchrow) {
    $subcategorylist.="<option value=\"$subcategorycode\">$description</option>\n";
}
my $sth=$dbh->prepare("select description,mediatypecode from mediatypetable order by description");
$sth->execute;
while (my ($description,$mediatypecode) = $sth->fetchrow) {
    $mediatypelist.="<option value=\"$mediatypecode\">$description</option>\n";
}
my $sth=$dbh->prepare("select description,categorycode from categorytable order by description");
$sth->execute;
while (my ($description,$categorycode) = $sth->fetchrow) {
    $categorylist .= '<input type="radio" name="categorylist" value="'.$categorycode.'">'.$description.'<br>';
}
my $sth=$dbh->prepare("select branchname,branchcode from branches order by branchname");
$sth->execute;

while (my ($branchname,$branchcode) = $sth->fetchrow) {
    $brancheslist.="<option value=\"$branchcode\">$branchname</option>\n";
}
my $query = new CGI;
my $op = $query->param("op");
my $type=$query->param('type');

my $itemtypesstring=$query->param("itemtypesstring");
$itemtypesstring =~s/"//g;
my @itemtypes = split ( /\|/, $itemtypesstring);
my $branchesstring=$query->param("branchesstring");
$branchesstring =~s/"//g;
my @branches = split (/\|/, $branchesstring);

my $startfrom=$query->param('startfrom');
$startfrom=0 if(!defined $startfrom);
my ($template, $loggedinuser, $cookie);
my $resultsperpage;
my $searchdesc;

if ($op eq "do_search") {
	my @marclist = $query->param('marclist');
	my @and_or = $query->param('and_or');
	my @excluding = $query->param('excluding');
	my @operator = $query->param('operator');
	my @value = $query->param('value');

	for (my $i=0;$i<=$#marclist;$i++) {
		if ($searchdesc) { # don't put the and_or on the 1st search term
			$searchdesc .= $and_or[$i]." ".$excluding[$i]." ".($marclist[$i]?$marclist[$i]:"*")." ".$operator[$i]." ".$value[$i]." " if ($value[$i]);
		} else {
			$searchdesc = $excluding[$i]." ".($marclist[$i]?$marclist[$i]:"*")." ".$operator[$i]." ".$value[$i]." " if ($value[$i]);
		}
	}
  if ($itemtypesstring ne ''){
    $searchdesc .= 'filtered by itemtypes ';
    $searchdesc .= join(" ", at itemtypes)
  }
  if ($branchesstring ne ''){
    $searchdesc .= ' in branches ';
    $searchdesc .= join(" ", at branches)
  }
	$resultsperpage= $query->param('resultsperpage');
	$resultsperpage = 19 if(!defined $resultsperpage);
	my $orderby = $query->param('orderby');
	my $desc_or_asc = $query->param('desc_or_asc');
	# builds tag and subfield arrays
	my @tags;

	foreach my $marc (@marclist) {
		if ($marc) {
			my ($tag,$subfield) = MARCfind_marc_from_kohafield($dbh,$marc,'');
			if ($tag) {
				push @tags,$dbh->quote("$tag$subfield");
			} else {
				push @tags, $dbh->quote(substr($marc,0,4));
			}
		} else {
			push @tags, "";
		}
	}
	findseealso($dbh,\@tags);
    my $sqlstring;
    if ($itemtypesstring ne ''){
        $sqlstring = 'and (biblioitems.itemtype IN (';
        my $itemtypeloop=0;
        foreach my $itemtype (@itemtypes){
            if ($itemtype ne ''){
                if ($itemtypeloop != 0){
                    $sqlstring .=','
                }
                $sqlstring .= '"'.$itemtype.'"';
                $itemtypeloop++;
            }
        }
        $sqlstring .= '))'
    }
    if ($branchesstring ne ''){
        $sqlstring .= 'and biblio.biblionumber=items.biblionumber and (items.holdingbranch IN (';
        my $branchesloop=0;
        foreach my $branch (@branches){
            if ($branch ne ''){
                if ($branchesloop != 0){
                    $sqlstring .=','
                }
                $sqlstring .= '"'.$branch.'"';
                $branchesloop++;
            }
        }
        $sqlstring .= '))'
    }

	my ($results,$total) = catalogsearch1($dbh, \@tags,\@and_or,
										\@excluding, \@operator, \@value,
										$startfrom*$resultsperpage, $resultsperpage,$orderby,$desc_or_asc,$sqlstring);
	if ($total ==1) {
	if (C4::Context->preference("BiblioDefaultView") eq "normal") {
	     print $query->redirect("/cgi-bin/koha/opac-detail.pl?bib=".@$results[0]->{biblionumber});
	} elsif (C4::Context->preference("BiblioDefaultView") eq "MARC") {
	     print $query->redirect("/cgi-bin/koha/MARCdetail.pl?bib=".@$results[0]->{biblionumber});
	} else {
	     print $query->redirect("/cgi-bin/koha/ISBDdetail.pl?bib=".@$results[0]->{biblionumber});
	}
	exit;
	}
	($template, $loggedinuser, $cookie)
		= get_template_and_user({template_name => "opac-searchresults.tmpl",
				query => $query,
				type => 'opac',
				authnotrequired => 1,
				debug => 1,
				});

	# multi page display gestion
	my $displaynext=0;
	my $displayprev=$startfrom;
	if(($total - (($startfrom+1)*($resultsperpage))) > 0 ){
		$displaynext = 1;
	}

	my @field_data = ();

### Added by JF
## This next does a number of things:
# 1. It allows you to track all the searches made for stats, etc.
# 2. It fixes the 'searchdesc' variable problem by introducing
#         a. 'searchterms' which comes out as 'Keyword: neal stephenson'
#         b. 'phraseorterm' which comes out as 'neal stephenson'
#      both of these are useful for differen purposes ... I use searchterms
#      for display purposes and phraseorterm for passing the search terms
#      to an external source through a url (like a database search)
# 3. It provides the variables necessary for the spellchecking (look below for
#      how this is done
# 4.
 
$totalresults = $total;

## This formats the 'search results' string and populates
## the 'OPLIN' variable as well as the 'spellcheck' variable
## with appropriate values based on the user's search input

my $searchterms; #returned in place of searchdesc for 'results for search'
                 # as a string (can format if need be)

my @spphrases;
my $phraseorterm;
my %searchtypehash = ( # used only for the searchterms string formation
                        # and for spellcheck string
        '0' => 'keyword',
        '1' => 'title',
        '2' => 'author',
        '3' => 'subject',
        '4' => 'series',
        '5' => 'format',
        );

my @searchterm = $query->param('value');

for (my $i=0; $i <= $#searchterm; $i++) {
        my $searchtype = $searchtypehash{$i};
        push @spphrases, $searchterm[$i];
        if ($searchterms) { #don't put and in again
                if ($searchterm[$i]) {
                $phraseorterm.=$searchterm[$i];
                $searchterms.=" AND ".$searchtype." : \'".$searchterm[$i]."\'";
                }
        } else {
                if ($searchterm[$i]) {
                $phraseorterm.=$searchterm[$i];
                $searchterms.=$searchtype.": \'".$searchterm[$i]."\'";
                }
        }
}

# Spellchecck stuff ... needs to use above scheme but must change
# cgi script first
my $phrases = $query->param('value');
#my $searchterms = $query->param('value');
# warn "here is searchterms:".$searchterms;

# FIXME: should be obvious ;-)
#foreach my $phrases (@spphrases) {
$phrases =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\})/ /g;
$phrases =~ s/(\Athe |\Aa |\Aan |)//g;
my $spchkphraseorterm = $phraseorterm;
        $spchkphraseorterm =~ tr/A-Z/a-z/;
        $spchkphraseorterm =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\})/ /g;
        $spchkphraseorterm =~s/(\Aand-or |\Aand\/or |\Aanon |\Aan |\Aa |\Abut |\Aby |\Ade |\Ader |\Adr |\Adu|et |\Afor |\Afrom |\Ain |\Ainto |\Ait |\Amy |\Anot |\Aon |\Aor |\Aper |\Apt |\Aspp |\Ato |\Avs |\Awith |\Athe )/ /g;
        $spchkphraseorterm =~s/( and-or | and\/or | anon | an | a | but | by | de | der | dr | du|et | for | from | in | into | it | my | not | on | or | per | pt | spp | to | vs | with | the )/ /g;
 
        $spchkphraseorterm =~s/  / /g;
my $resultcount = $total;
my $ipaddress = $query->remote_host();
#

if (
#need to create a table to record the search info
#...FIXME: add the script name that creates the table
# 
my $dbhpop=DBI->connect("DBI:mysql:demosuggest:localhost","auth","YourPass")) {

# insert the search info query
my $insertpop = "INSERT INTO phrase_log(phr_phrase,phr_resultcount,phr_ip) VALUES(?,?,?)";

# grab spelling suggestions query
my $getsugg = "SELECT display FROM spellcheck WHERE strcmp(soundex(suggestion), soundex(?)) = 0 order by soundex(suggestion) limit 0,5";

#get spelling suggestions when there are no results
if ($resultcount eq 0) {
        my $sthgetsugg=$dbhpop->prepare($getsugg);
        $sthgetsugg->execute($spchkphraseorterm);
        while (my ($spsuggestion)=$sthgetsugg->fetchrow_array) {
#               warn "==>$spsuggestion";
                #push @spsuggest, +{ spsuggestion => $spsuggestion };
                my %line;
                $line{spsuggestion} = $spsuggestion;
                push @spsuggest,\%line;
                $suggest = 1;
        }
#       warn "==>".$#spsuggest;
        $sthgetsugg->finish;
}
# end of spelling suggestions

my $sthpop=$dbhpop->prepare($insertpop);

#$sthpop->execute($phrases,$resultcount,$ipaddress);
$sthpop->finish;
}
#
### end of tracking stuff  --  jmf at kados dot org
#
$template->param(suggest => $suggest );
$template->param( SPELL_SUGGEST => \@spsuggest );
$template->param( searchterms => $searchterms );
$template->param( phraseorterm => $phraseorterm );
#warn "here's the search terms: ".$searchterms;
#
### end of spelling suggestions
### /Added by JF

	for(my $i = 0 ; $i <= $#marclist ; $i++)
	{
		push @field_data, { term => "marclist", val=>$marclist[$i] };
		push @field_data, { term => "and_or", val=>$and_or[$i] };
		push @field_data, { term => "excluding", val=>$excluding[$i] };
		push @field_data, { term => "operator", val=>$operator[$i] };
		push @field_data, { term => "value", val=>$value[$i] };
	}

	my @numbers = ();

	if ($total>$resultsperpage)
	{
		for (my $i=1; $i<$total/$resultsperpage+1; $i++)
		{
			if ($i<16)
			{
	    		my $highlight=0;
	    		($startfrom==($i-1)) && ($highlight=1);
	    		push @numbers, { number => $i,
					highlight => $highlight ,
					searchdata=> \@field_data,
					startfrom => ($i-1)};
			}
    	}
	}

	my $from = $startfrom*$resultsperpage+1;
	my $to;

 	if($total < (($startfrom+1)*$resultsperpage))
	{
		$to = $total;
	} else {
		$to = (($startfrom+1)*$resultsperpage);
	}
	my $defaultview = 'BiblioDefaultView'.C4::Context->preference('BiblioDefaultView');
	$template->param(results => $results,
							startfrom=> $startfrom,
							displaynext=> $displaynext,
							displayprev=> $displayprev,
							resultsperpage => $resultsperpage,
							orderby => $orderby,
							startfromnext => $startfrom+1,
							startfromprev => $startfrom-1,
							searchdata=>\@field_data,
							total=>$total,
							from=>$from,
							to=>$to,
							numbers=>\@numbers,
							searchdesc=> $searchdesc,
							$defaultview => 1,
							suggestion => C4::Context->preference("suggestion"),
							virtualshelves => C4::Context->preference("virtualshelves"),
                itemtypelist => $itemtypelist,
              subcategorylist => $subcategorylist,
              brancheslist => $brancheslist,
              categorylist => $categorylist,
              mediatypelist => $mediatypelist,
              itemtypesstring => $itemtypesstring,
							);

} else {
	($template, $loggedinuser, $cookie)
		= get_template_and_user({template_name => "opac-search.tmpl",
					query => $query,
					type => "opac",
					authnotrequired => 1,
				});
	
	
	$sth=$dbh->prepare("Select itemtype,description from itemtypes order by description");
	$sth->execute;
	my  @itemtype;
	my %itemtypes;
	push @itemtype, "";
	$itemtypes{''} = "";
	while (my ($value,$lib) = $sth->fetchrow_array) {
		push @itemtype, $value;
		$itemtypes{$value}=$lib;
	}
	
	my $CGIitemtype=CGI::scrolling_list( -name     => 'value',
				-values   => \@itemtype,
				-labels   => \%itemtypes,
				-size     => 1,
				-multiple => 0 );
	$sth->finish;
	
	my @branches;
	my @select_branch;
	my %select_branches;
	my ($count2, at branches)=branches();
	push @select_branch, "";
	$select_branches{''} = "";
	for (my $i=0;$i<$count2;$i++){
		push @select_branch, $branches[$i]->{'branchcode'};#
		$select_branches{$branches[$i]->{'branchcode'}} = $branches[$i]->{'branchname'};
	}
	my $CGIbranch=CGI::scrolling_list( -name     => 'value',
				-values   => \@select_branch,
				-labels   => \%select_branches,
				-size     => 1,
				-multiple => 0 );
	$sth->finish;
    
	$template->param(itemtypelist => $itemtypelist,
					CGIitemtype => $CGIitemtype,
					CGIbranch => $CGIbranch,
					suggestion => C4::Context->preference("suggestion"),
					virtualshelves => C4::Context->preference("virtualshelves"),
	);
}
# ADDED BY JF
if ($totalresults == 1){
    # if its a barcode search by definition we will only have one result.
    # And if we have a result
    # lets jump straight to the detail.pl page
    print $query->redirect("/cgi-bin/koha/opac-detail.pl?bib=$firstbiblionumber");
}
else {
  output_html_with_http_headers $query, $cookie, $template->output;
}




From gmccullagh at users.sourceforge.net  Fri Jun  3 19:01:55 2005
From: gmccullagh at users.sourceforge.net (gavin)
Date: Fri, 03 Jun 2005 10:01:55 -0700
Subject: [Koha-cvs] CVS: koha/C4 SearchBiblio.pm,NONE,1.1
Message-ID: <E1DeFYR-0004Us-Ez@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15229/C4

Added Files:
	SearchBiblio.pm 
Log Message:
two new files 
  SearchBiblio.pm forked from SearchMarc.pm
  opac-search-biblio.pl forked from opac-search.pl (just change module)
an attempt at a new search using FULLTEXT indexes.
NB: Boolean won't work without MySQL >v4.0
NNB: Will be slow without indexes added on Biblio table as follows:
  ALTER TABLE biblio ADD FULLTEXT (author,title,unititle,seriestitle);
Only searching on "Any word" field just now. 
more to come.



--- NEW FILE ---
package C4::SearchBiblio;

# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
require Exporter;
use DBI;
use C4::Context;
use C4::Biblio;
use C4::Date;
use Date::Manip;

use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);

# set the version for version checking
$VERSION = 0.02;

=head1 NAME

C4::Search - Functions for searching the Koha MARC catalog

=head1 FUNCTIONS

This module provides the searching facilities for the Koha MARC catalog

=cut

@ISA = qw(Exporter);
@EXPORT = qw(&catalogsearch1 &catalogsearch &findseealso &findsuggestion &getMARCnotes &getMARCsubjects);

=head1 findsuggestion($dbh,$values);

=head2 $dbh is a link to the DB handler.

use C4::Context;
my $dbh =C4::Context->dbh;

=head2 $values is a word

Searches words with the same soundex, ordered by frequency of use.
Useful to suggest other searches to the users.

=cut

sub findsuggestion {
	my ($dbh,$values) = @_;
	my $sth = $dbh->prepare("SELECT count( * ) AS total, word FROM marc_word WHERE sndx_word = soundex( ? ) AND word <> ? GROUP BY word ORDER BY total DESC");
	my @results;
	for(my $i = 0 ; $i <= $#{$values} ; $i++) {
		if (length(@$values[$i]) >=5) {
			$sth->execute(@$values[$i],@$values[$i]);
			my $resfound = 1;
			my @resline;
			while ((my ($count,$word) = $sth->fetchrow) and $resfound <=10) {
				push @results, "@$values[$i]|$word|$count";
#				$results{@$values[$i]} = \@resline;
				$resfound++;
			}
		}
	}
	return \@results;
}

=head1 findseealso($dbh,$fields);

=head2 $dbh is a link to the DB handler.

use C4::Context;
my $dbh =C4::Context->dbh;

=head2 $fields is a reference to the fields array

This function modify the @$fields array and add related fields to search on.

=cut

sub findseealso {
	my ($dbh, $fields) = @_;
	my $tagslib = MARCgettagslib ($dbh,1);
	for (my $i=0;$i<=$#{$fields};$i++) {
		my ($tag) =substr(@$fields[$i],1,3);
		my ($subfield) =substr(@$fields[$i],4,1);
		@$fields[$i].=','.$tagslib->{$tag}->{$subfield}->{seealso} if ($tagslib->{$tag}->{$subfield}->{seealso});
	}
}

=head1  my ($count, @results) = catalogsearch($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby,$sqlstring);

=head2 $dbh is a link to the DB handler.

use C4::Context;
my $dbh =C4::Context->dbh;

$tags,$and_or, $excluding, $operator, $value are references to array

=head2 $tags

contains the list of tags+subfields (for example : $@tags[0] = '200a')
A field can be a list of fields : '200f','700a','700b','701a','701b'

Example

=head2 $and_or

contains  a list of strings containing and or or. The 1st value is useless.

=head2 $excluding

contains 0 or 1. If 1, then the request is negated.

=head2 $operator

contains contains,=,start,>,>=,<,<= the = and start work on the complete subfield. The contains operator works on every word in the subfield.

examples :
contains home, search home anywhere.
= home, search a string being home.

=head2 $value

contains the value to search
If it contains a * or a %, then the search is partial.

=head2 $offset and $length

returns $length results, beginning at $offset

=head2 $orderby

define the field used to order the request. Any field in the biblio/biblioitem tables can be used. DESC is possible too

(for example title, title DESC,...)

=head2 $sqlstring

optional argument containing an sql string to be used in the 'where' statement. see usage in opac-search.pl.

=head2 RETURNS

returns an array containing hashes. The hash contains all biblio & biblioitems fields and a reference to an item hash. The "item hash contains one line for each callnumber & the number of items related to the callnumber.

=cut

=head2 my $marcnotesarray = &getMARCnotes($dbh,$bibid,$marcflavour);

Returns a reference to an array containing all the notes stored in the MARC database for the given bibid.
$marcflavour ("MARC21" or "UNIMARC") determines which tags are used for retrieving subjects.

=head2 my $marcsubjctsarray = &getMARCsubjects($dbh,$bibid,$marcflavour);

Returns a reference to an array containing all the subjects stored in the MARC database for the given bibid.
$marcflavour ("MARC21" or "UNIMARC") determines which tags are used for retrieving subjects.

=cut

sub catalogsearch1 {
	my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby,$desc_or_asc,$sqlstring) = @_;
#    warn "==================";
#    warn "
#                  db: $dbh,
#                  tags_array: @$tags,
#                  andor_array: @$and_or,
#                  excludes_array: @$excluding, 
#                  operator_array: @$operator, 
#                  value_array: @$value,
#                  start: $offset,
#                  resultsperpage: $length,
#                  orderby: $orderby,
#                  order: $desc_or_asc,  
#                  sqlstring: $sqlstring)\n";
#    warn "==================\n";

    my @cols = ('biblionumber','author','title','unititle','notes','serial','seriestitle',
                'copyrightdate','timestamp','abstract','illus','biblioitemnumber','marc',
                'url','isbn','volumeddesc','classification','publicationyear','pages','number',
                'itemtype','place','issn','size','dewey','publishercode','lccn','volume',
                'subclass', 'volumedate','subtitle','bibid','notforloan',);
                # missing 'CN', 'description', 'odd', 'bn', 'norequests', 'totitem', 
    my @valarray = @$value;
#    warn "@$value\n";
#    warn "$valarray[0]\n";
    my $sql = "
      SELECT biblio.biblionumber, biblio.author, biblio.title, biblio.unititle,
        biblio.notes, biblio.serial, biblio.seriestitle, biblio.copyrightdate,
        biblio.timestamp, biblio.abstract,
        biblioitems.illus, biblioitems.biblioitemnumber, biblioitems.marc,
        biblioitems.url, biblioitems.isbn, biblioitems.volumeddesc,
        biblioitems.classification, biblioitems.publicationyear,
        biblioitems.pages, biblioitems.number, biblioitems.itemtype,
        biblioitems.place, biblioitems.issn, biblioitems.size,
        biblioitems.dewey, biblioitems.publishercode, biblioitems.lccn,
        biblioitems.volume, biblioitems.subclass, biblioitems.volumedate,
        bibliosubtitle.subtitle,
        marc_biblio.bibid,
        items.notforloan, 
        MATCH(biblio.title,biblio.author,biblio.unititle,biblio.seriestitle) 
        AGAINST ('$$value[0]' IN BOOLEAN MODE) as Relevance
      FROM biblio
        LEFT JOIN biblioitems ON biblioitems.biblionumber=biblio.biblionumber
        LEFT JOIN bibliosubtitle ON bibliosubtitle.biblionumber=biblio.biblionumber
        LEFT JOIN marc_biblio ON marc_biblio.biblionumber=biblio.biblionumber
        LEFT JOIN items ON items.biblionumber=biblio.biblionumber
      WHERE MATCH(biblio.title,biblio.author,biblio.unititle,biblio.seriestitle) 
        AGAINST ('$$value[0]' IN BOOLEAN MODE)
      ORDER BY Relevance DESC;";
    warn "$sql\n";
    my $sth = $dbh->prepare($sql);
	$sth->execute;
    my @biblioArray=();
    my $numBooks=0;
    while (my @vals = $sth->fetchrow) {
      my $numcols = $#vals;
      my %biblioEntryHash=();
      for(my $i=0; $i<$numcols; $i++) {
        $biblioEntryHash{$cols[$i]} = $vals[$i];
      }
      $biblioEntryHash{odd} = ((($numBooks+1) % 2) > 0) ? 1 : ""; 
      #FIXME
      $biblioEntryHash{notforloan} = "";
      #warn "\$biblioEntryHash{odd}  = .$biblioEntryHash{odd}.\n";
      push(@biblioArray,\%biblioEntryHash);
      $numBooks++;
    }


# CN: ARRAY(0x89d1540)?  branch + location + callnumber + status
#                       CDI SL (N8KIM) (2) (if several, group them)
# description: ?
# odd: 1 ?
# bn: 501? biblionumber?
# norequests: 0? 
# totitem: 1?

#    my ($res,$numres) = catalogsearch(@_);
#    my @results = @$res;
#    warn "==================\n";
#    warn "\n\tres: @$res:,\n\tnumres: $numres\n";
#    while ( (my ($key, $value) = each(%{$results[0]})) && (my ($key1, $value1) = each(%{$biblioArray[0]})) ) {
#      warn "\t$key => $value\t$key1 => $value1\n";
#    }
#    warn "a. " . $results[0]->{odd} . "\t" . $biblioArray[0]->{odd}. "\n";
#    warn "b. " . $results[1]->{odd} . "\t" . $biblioArray[1]->{odd}. "\n";
#    warn "==================\n";
    #return ($res,$numres);
    return (\@biblioArray,$numBooks);
}

sub catalogsearch {
	my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby,$desc_or_asc,$sqlstring) = @_;
	# build the sql request. She will look like :
	# select m1.bibid
	#		from marc_subfield_table as m1, marc_subfield_table as m2
	#		where m1.bibid=m2.bibid and
	#		(m1.subfieldvalue like "Des%" and m2.subfieldvalue like "27%")

	# last minute stripping out of stuff
	# doesn't work @$value =~ s/\'/ /;
	# @$value = map { $_ =~ s/\'/ /g } @$value;
	
	# "Normal" statements
	my @normal_tags = ();
	my @normal_and_or = ();
	my @normal_operator = ();
	my @normal_value = ();
	# Extracts the NOT statements from the list of statements
	my @not_tags = ();
	my @not_and_or = ();
	my @not_operator = ();
	my @not_value = ();
	my $any_not = 0;
	$orderby = "biblio.title" unless $orderby;
	$desc_or_asc = "ASC" unless $desc_or_asc;
	#last minute stripping out of ' and ,
# paul : quoting, it's done a few lines lated.
# 	foreach $_ (@$value) {
# 		$_=~ s/\'/ /g;
# 		$_=~ s/\,/ /g;
# 	}

# the item.notforloan contains an integer. Every value <>0 means "book unavailable for loan".
# but each library can have it's own table of meaning for each value. Get them
# 1st search if there is a list of authorised values connected to items.notforloan
	my $sth = $dbh->prepare('select authorised_value from marc_subfield_structure where kohafield="items.notforloan"');
	$sth->execute;
	my %notforloanstatus;
	my ($authorised_valuecode) = $sth->fetchrow;
	if ($authorised_valuecode) {
		$sth = $dbh->prepare("select authorised_value,lib from authorised_values where category=?");
		$sth->execute($authorised_valuecode);
		while (my ($authorised_value,$lib) = $sth->fetchrow) {
			$notforloanstatus{$authorised_value} = $lib?$lib:$authorised_value;
		}
	}
	for(my $i = 0 ; $i <= $#{$value} ; $i++)
	{
		# replace * by %
		@$value[$i] =~ s/\*/%/g;
		# remove % at the beginning
		@$value[$i] =~ s/^%//g;
	    @$value[$i] =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g if @$operator[$i] eq "contains";
		if(@$excluding[$i])	# NOT statements
		{
			$any_not = 1;
			if(@$operator[$i] eq "contains")
			{
				foreach my $word (split(/ /, @$value[$i]))	# if operator is contains, splits the words in separate requests
				{
					# remove the "%" for small word (3 letters. (note : the >4 is due to the % at the end)
# 					warn "word : $word";
					$word =~ s/%//g unless length($word)>4;
					unless (C4::Context->stopwords->{uc($word)} or length($word)==1) {	#it's NOT a stopword => use it. Otherwise, ignore
						push @not_tags, @$tags[$i];
						push @not_and_or, "or"; # as request is negated, finds "foo" or "bar" if final request is NOT "foo" and "bar"
						push @not_operator, @$operator[$i];
						push @not_value, $word;
					}
				}
			}
			else
			{
				push @not_tags, @$tags[$i];
				push @not_and_or, "or"; # as request is negated, finds "foo" or "bar" if final request is NOT "foo" and "bar"
				push @not_operator, @$operator[$i];
				push @not_value, @$value[$i];
			}
		}
		else	# NORMAL statements
		{
			if(@$operator[$i] eq "contains") # if operator is contains, splits the words in separate requests
			{
				foreach my $word (split(/ /, @$value[$i]))
				{
					# remove the "%" for small word (3 letters. (note : the >4 is due to the % at the end)
# 					warn "word : $word";
					$word =~ s/%//g unless length($word)>4;
					unless (C4::Context->stopwords->{uc($word)} or length($word)==1) {	#it's NOT a stopword => use it. Otherwise, ignore
						push @normal_tags, @$tags[$i];
						push @normal_and_or, "and";	# assumes "foo" and "bar" if "foo bar" is entered
						push @normal_operator, @$operator[$i];
						push @normal_value, $word;
					}
				}
			}
			else
			{
				push @normal_tags, @$tags[$i];
				push @normal_and_or, @$and_or[$i];
				push @normal_operator, @$operator[$i];
				push @normal_value, @$value[$i];
			}
		}
	}

	# Finds the basic results without the NOT requests
	my ($sql_tables, $sql_where1, $sql_where2) = create_request($dbh,\@normal_tags, \@normal_and_or, \@normal_operator, \@normal_value);
  $sql_where1 .=" ". $sqlstring;
	$sql_where1 .= "and TO_DAYS( NOW( ) ) - TO_DAYS( biblio.timestamp ) <30" if $orderby =~ "biblio.timestamp";
	my $sth;
	if ($sql_where2) {
		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc");
		warn "Q2 : select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc term is  @$value";
	} else {
		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc");
		warn "Q : select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc";
	}
	$sth->execute();
	my @result = ();
        my $subtitle; # Added by JF for Subtitles

	# Processes the NOT if any and there are results
	my ($not_sql_tables, $not_sql_where1, $not_sql_where2);

	if( ($sth->rows) && $any_not )	# some results to tune up and some NOT statements
	{
		($not_sql_tables, $not_sql_where1, $not_sql_where2) = create_request($dbh,\@not_tags, \@not_and_or, \@not_operator, \@not_value);

		my @tmpresult;

		while (my ($bibid) = $sth->fetchrow) {
			push @tmpresult,$bibid;
		}
		my $sth_not;
		warn "NOT : select distinct m1.bibid from $not_sql_tables where $not_sql_where2 and ($not_sql_where1)";
		if ($not_sql_where2) {
			$sth_not = $dbh->prepare("select distinct m1.bibid from $not_sql_tables where $not_sql_where2 and ($not_sql_where1)");
		} else {
			$sth_not = $dbh->prepare("select distinct m1.bibid from $not_sql_tables where $not_sql_where1");
		}
		$sth_not->execute();

		if($sth_not->rows)
		{
			my %not_bibids = ();
			while(my $bibid = $sth_not->fetchrow()) {
				$not_bibids{$bibid} = 1;	# populates the hashtable with the bibids matching the NOT statement
			}

			foreach my $bibid (@tmpresult)
			{
				if(!$not_bibids{$bibid})
				{
					push @result, $bibid;
				}
			}
		}
		$sth_not->finish();
	}
	else	# no NOT statements
	{
		while (my ($bibid) = $sth->fetchrow) {
			push @result,$bibid;
		}
	}

	# we have bibid list. Now, loads title and author from [offset] to [offset]+[length]
	my $counter = $offset;
	# HINT : biblionumber as bn is important. The hash is fills biblionumber with items.biblionumber.
	# so if you dont' has an item, you get a not nice empty value.
	$sth = $dbh->prepare("SELECT biblio.biblionumber as bn,biblio.*, biblioitems.*,marc_biblio.bibid,itemtypes.notforloan,itemtypes.description
							FROM biblio, marc_biblio 
							LEFT JOIN biblioitems on biblio.biblionumber = biblioitems.biblionumber
							LEFT JOIN itemtypes on itemtypes.itemtype=biblioitems.itemtype
							WHERE biblio.biblionumber = marc_biblio.biblionumber AND bibid = ?");
        my $sth_subtitle = $dbh->prepare("SELECT subtitle FROM bibliosubtitle WHERE biblionumber=?"); # Added BY JF for Subtitles
	my @finalresult = ();
	my @CNresults=();
	my $totalitems=0;
	my $oldline;
	my ($oldbibid, $oldauthor, $oldtitle);
	my $sth_itemCN = $dbh->prepare("select items.* from items where biblionumber=?");
	my $sth_issue = $dbh->prepare("select date_due,returndate from issues where itemnumber=?");
	# parse all biblios between start & end.
	while (($counter <= $#result) && ($counter <= ($offset + $length))) {
		# search & parse all items & note itemcallnumber
		$sth->execute($result[$counter]);
		my $continue=1;
		my $line = $sth->fetchrow_hashref;
		my $biblionumber=$line->{bn};
        # Return subtitles first ADDED BY JF
                $sth_subtitle->execute($biblionumber);
                my $subtitle_here.= $sth_subtitle->fetchrow." ";
                chop $subtitle_here;
                $subtitle = $subtitle_here;
#               warn "Here's the Biblionumber ".$biblionumber;
#                warn "and here's the subtitle: ".$subtitle_here;

        # /ADDED BY JF

# 		$continue=0 unless $line->{bn};
# 		my $lastitemnumber;
		$sth_itemCN->execute($biblionumber);
		my @CNresults = ();
		my $notforloan=1; # to see if there is at least 1 item that can be issued
		while (my $item = $sth_itemCN->fetchrow_hashref) {
			# parse the result, putting holdingbranch & itemcallnumber in separate array
			# then all other fields in the main array
			
			# search if item is on loan
			my $date_due;
			$sth_issue->execute($item->{itemnumber});
			while (my $loan = $sth_issue->fetchrow_hashref) {
				if ($loan->{date_due} and !$loan->{returndate}) {
					$date_due = $loan->{date_due};
				}
			}
			# store this item
			my %lineCN;
			$lineCN{holdingbranch} = $item->{holdingbranch};
			$lineCN{itemcallnumber} = $item->{itemcallnumber};
			$lineCN{location} = $item->{location};
			$lineCN{date_due} = format_date($date_due);
			$lineCN{notforloan} = $notforloanstatus{$line->{notforloan}} if ($line->{notforloan}); # setting not forloan if itemtype is not for loan
			$lineCN{notforloan} = $notforloanstatus{$item->{notforloan}} if ($item->{notforloan}); # setting not forloan it this item is not for loan
			$notforloan=0 unless ($item->{notforloan} or $item->{wthdrawn} or $item->{itemlost});
			push @CNresults,\%lineCN;
			$totalitems++;
		}
		# save the biblio in the final array, with item and item issue status
		my %newline;
		%newline = %$line;
		$newline{totitem} = $totalitems;
		# if $totalitems == 0, check if it's being ordered.
		if ($totalitems == 0) {
			my $sth = $dbh->prepare("select count(*) from aqorders where biblionumber=? and datecancellationprinted is NULL");
			$sth->execute($biblionumber);
			my ($ordered) = $sth->fetchrow;
			$newline{onorder} = 1 if $ordered;
		}
		$newline{biblionumber} = $biblionumber;
		$newline{norequests} = 0;
		$newline{norequests} = 1 if ($line->{notforloan}); # itemtype not issuable
		$newline{norequests} = 1 if (!$line->{notforloan} && $notforloan); # itemtype issuable but all items not issuable for instance
                $newline{subtitle} = $subtitle;  # put the subtitle in ADDED BY JF

		my @CNresults2= @CNresults;
		$newline{CN} = \@CNresults2;
		$newline{'even'} = 1 if $#finalresult % 2 == 0;
		$newline{'odd'} = 1 if $#finalresult % 2 == 1;
		$newline{'timestamp'} = format_date($newline{timestamp});
		@CNresults = ();
		push @finalresult, \%newline;
		$totalitems=0;
		$counter++;
	}
	my $nbresults = $#result+1;
	return (\@finalresult, $nbresults);
}

# Creates the SQL Request

sub create_request {
	my ($dbh,$tags, $and_or, $operator, $value) = @_;

	my $sql_tables; # will contain marc_subfield_table as m1,...
	my $sql_where1; # will contain the "true" where
	my $sql_where2 = "("; # will contain m1.bibid=m2.bibid
	my $nb_active=0; # will contain the number of "active" entries. an entry is active if a value is provided.
	my $nb_table=1; # will contain the number of table. ++ on each entry EXCEPT when an OR  is provided.

	my $maxloop=8; # the maximum number of words to avoid a too complex search.
	$maxloop = @$value if @$value<$maxloop;
	
	for(my $i=0; $i<=$maxloop;$i++) {
		if (@$value[$i]) {
			$nb_active++;
			if ($nb_active==1) {
				if (@$operator[$i] eq "start") {
					$sql_tables .= "marc_subfield_table as m$nb_table,";
					$sql_where1 .= "(m1.subfieldvalue like ".$dbh->quote("@$value[$i]%");
					if (@$tags[$i]) {
						$sql_where1 .=" and concat(m1.tag,m1.subfieldcode) in (@$tags[$i])";
					}
					$sql_where1.=")";
				} elsif (@$operator[$i] eq "contains") {
					$sql_tables .= "marc_word as m$nb_table,";
					$sql_where1 .= "(m1.word  like ".$dbh->quote("@$value[$i]");
					if (@$tags[$i]) {
						 $sql_where1 .=" and m1.tagsubfield in (@$tags[$i])";
					}
					$sql_where1.=")";
				} else {
					$sql_tables .= "marc_subfield_table as m$nb_table,";
					$sql_where1 .= "(m1.subfieldvalue @$operator[$i] ".$dbh->quote("@$value[$i]");
					if (@$tags[$i]) {
						 $sql_where1 .=" and concat(m1.tag,m1.subfieldcode) in (@$tags[$i])";
					}
					$sql_where1.=")";
				}
			} else {
				if (@$operator[$i] eq "start") {
					$nb_table++;
					$sql_tables .= "marc_subfield_table as m$nb_table,";
					$sql_where1 .= "@$and_or[$i] (m$nb_table.subfieldvalue like ".$dbh->quote("@$value[$i]%");
					if (@$tags[$i]) {
					 	$sql_where1 .=" and concat(m$nb_table.tag,m$nb_table.subfieldcode) in (@$tags[$i])";
					}
					$sql_where1.=")";
					$sql_where2 .= "m1.bibid=m$nb_table.bibid and ";
				} elsif (@$operator[$i] eq "contains") {
					if (@$and_or[$i] eq 'and') {
						$nb_table++;
						$sql_tables .= "marc_word as m$nb_table,";
						$sql_where1 .= "@$and_or[$i] (m$nb_table.word like ".$dbh->quote("@$value[$i]");
						if (@$tags[$i]) {
							$sql_where1 .=" and m$nb_table.tagsubfield in(@$tags[$i])";
						}
						$sql_where1.=")";
						$sql_where2 .= "m1.bibid=m$nb_table.bibid and ";
					} else {
						$sql_where1 .= "@$and_or[$i] (m$nb_table.word like ".$dbh->quote("@$value[$i]");
						if (@$tags[$i]) {
							$sql_where1 .="  and m$nb_table.tagsubfield in (@$tags[$i])";
						}
						$sql_where1.=")";
						$sql_where2 .= "m1.bibid=m$nb_table.bibid and ";
					}
				} else {
					$nb_table++;
					$sql_tables .= "marc_subfield_table as m$nb_table,";
					$sql_where1 .= "@$and_or[$i] (m$nb_table.subfieldvalue @$operator[$i] ".$dbh->quote(@$value[$i]);
					if (@$tags[$i]) {
					 	$sql_where1 .="  and concat(m$nb_table.tag,m$nb_table.subfieldcode) in (@$tags[$i])";
					}
					$sql_where2 .= "m1.bibid=m$nb_table.bibid and ";
					$sql_where1.=")";
				}
			}
		}
	}

	if($sql_where2 ne "(")	# some datas added to sql_where2, processing
	{
		$sql_where2 = substr($sql_where2, 0, (length($sql_where2)-5)); # deletes the trailing ' and '
		$sql_where2 .= ")";
	}
	else	# no sql_where2 statement, deleting '('
	{
		$sql_where2 = "";
	}
	chop $sql_tables;	# deletes the trailing ','
	return ($sql_tables, $sql_where1, $sql_where2);
}

sub getMARCnotes {
        my ($dbh, $bibid, $marcflavour) = @_;
	my ($mintag, $maxtag);
	if ($marcflavour eq "MARC21") {
	        $mintag = "500";
		$maxtag = "599";
	} else {           # assume unimarc if not marc21
		$mintag = "300";
		$maxtag = "399";
	}

	my $sth=$dbh->prepare("SELECT subfieldvalue,tag FROM marc_subfield_table WHERE bibid=? AND tag BETWEEN ? AND ? ORDER BY tagorder");

	$sth->execute($bibid,$mintag,$maxtag);

	my @marcnotes;
	my $note = "";
	my $tag = "";
	my $marcnote;

	while (my $data=$sth->fetchrow_arrayref) {
		my $value=$data->[0];
		my $thistag=$data->[1];
		if ($value=~/\.$/) {
		        $value=$value . "  ";
		}
		if ($thistag ne $tag && $note ne "") {
		        $marcnote = {marcnote => $note,};
			push @marcnotes, $marcnote;
			$note=$value;
			$tag=$thistag;
		}
		if ($note ne $value) {
		        $note = $note." ".$value;
		}
	}

	if ($note) {
	        $marcnote = {marcnote => $note};
		push @marcnotes, $marcnote;   #load last tag into array
	}

	$sth->finish;
	$dbh->disconnect;

	my $marcnotesarray=\@marcnotes;
	return $marcnotesarray;
}  # end getMARCnotes


sub getMARCsubjects {
    my ($dbh, $bibid, $marcflavour) = @_;
	my ($mintag, $maxtag);
	if ($marcflavour eq "MARC21") {
	        $mintag = "600";
		$maxtag = "699";
	} else {           # assume unimarc if not marc21
		$mintag = "600";
		$maxtag = "619";
	}
	my $sth=$dbh->prepare("SELECT subfieldvalue,subfieldcode FROM marc_subfield_table WHERE bibid=? AND tag BETWEEN ? AND ? ORDER BY tagorder");

	$sth->execute($bibid,$mintag,$maxtag);

	my @marcsubjcts;
	my $subjct = "";
	my $subfield = "";
	my $marcsubjct;

	while (my $data=$sth->fetchrow_arrayref) {
		my $value = $data->[0];
		my $subfield = $data->[1];
		if ($subfield eq "a" && $value ne $subjct) {
		        $marcsubjct = {MARCSUBJCT => $value,};
			push @marcsubjcts, $marcsubjct;
			$subjct = $value;
		}
	}

	$sth->finish;
	$dbh->disconnect;

	my $marcsubjctsarray=\@marcsubjcts;
        return $marcsubjctsarray;
}  #end getMARCsubjects

END { }       # module clean-up code here (global destructor)

1;
__END__

=back

=head1 AUTHOR

Koha Developement team <info at koha.org>

=cut




From hellen at users.sourceforge.net  Sun Jun  5 16:45:20 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sun, 05 Jun 2005 07:45:20 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple addbiblio-nomarc.tmpl,1.1,1.2 addbiblio.tmpl,1.2,1.3 addbooks.tmpl,1.2,1.3 additem-nomarc.tmpl,1.2,1.3 additem.tmpl,1.2,1.3 marcimport.tmpl,1.2,1.3
Message-ID: <E1DewNM-0002qd-0f@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	addbiblio-nomarc.tmpl addbiblio.tmpl addbooks.tmpl 
	additem-nomarc.tmpl additem.tmpl marcimport.tmpl 
Log Message:
translated for 2.2.2 by hellen

Index: addbiblio-nomarc.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/addbiblio-nomarc.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** addbiblio-nomarc.tmpl	12 May 2005 19:26:13 -0000	1.1
--- addbiblio-nomarc.tmpl	5 Jun 2005 14:45:17 -0000	1.2
***************
*** 8,12 ****
  	
  		<!-- TMPL_IF NAME="ERROR" -->
! 			<p class="problem">Please Specify a Title</p>
  		<!-- /TMPL_IF -->
  		
--- 8,12 ----
  	
  		<!-- TMPL_IF NAME="ERROR" -->
! 			<p class="problem">Bitte einen Titel ausw&auml;hlen</p>
  		<!-- /TMPL_IF -->
  		

Index: addbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/addbiblio.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** addbiblio.tmpl	17 May 2005 13:21:35 -0000	1.2
--- addbiblio.tmpl	5 Jun 2005 14:45:17 -0000	1.3
***************
*** 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">Biblionummer : <!-- TMPL_VAR NAME="oldbiblionumber" --></h1>
  	<p>
  		<input type="hidden" name="op" value="addbiblio">

Index: addbooks.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/addbooks.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** addbooks.tmpl	17 May 2005 13:21:35 -0000	1.2
--- addbooks.tmpl	5 Jun 2005 14:45:17 -0000	1.3
***************
*** 13,17 ****
  			<h2 class="catalogue">Um neue bibliografische Daten (und evtl. entsprechende Medien) aufzunehmen, scannen Sie die ISBN/ISSN oder geben Sie sie hier ein.</h2>
  			<p>
! 				<label class="label100" for="title">Title</label>
  				<input type="hidden" name="marclist" value="biblio.title">
  	
--- 13,17 ----
  			<h2 class="catalogue">Um neue bibliografische Daten (und evtl. entsprechende Medien) aufzunehmen, scannen Sie die ISBN/ISSN oder geben Sie sie hier ein.</h2>
  			<p>
! 				<label class="label100" for="title">Titel</label>
  				<input type="hidden" name="marclist" value="biblio.title">
  	
***************
*** 51,55 ****
  		<h2 class="catalogue">Hinweis</h2>
  		<p>Wenn bereits Daten für die ISBN in der Datenbank hinterlegt sind, werden diese angezeigt und k&ouml;nnen bearbeitet werden.<br/>
! 			 Wenn Fremddaten für die ISBN abgerufen wurden sich im Zwischenspeicher befinden, werden diese ebenfalls angezeigt und dienen als Grundlage f&uuml;r einen neuen Datensatz.<br/>
  			 Anderenfalls wird eine leerer Datensatz angelegt und Sie m&uuml;ssen alle Daten selbst eintragen.</p>
  	</div>
--- 51,55 ----
  		<h2 class="catalogue">Hinweis</h2>
  		<p>Wenn bereits Daten für die ISBN in der Datenbank hinterlegt sind, werden diese angezeigt und k&ouml;nnen bearbeitet werden.<br/>
! 			 Wenn Fremddaten für die ISBN abgerufen wurden und sich im Zwischenspeicher befinden, werden diese ebenfalls angezeigt und dienen als Grundlage f&uuml;r einen neuen Datensatz.<br/>
  			 Anderenfalls wird eine leerer Datensatz angelegt und Sie m&uuml;ssen alle Daten selbst eintragen.</p>
  	</div>

Index: additem-nomarc.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/additem-nomarc.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** additem-nomarc.tmpl	17 May 2005 13:21:35 -0000	1.2
--- additem-nomarc.tmpl	5 Jun 2005 14:45:17 -0000	1.3
***************
*** 5,9 ****
  		<p>
  		<!-- TMPL_IF NAME="NOBARCODE" -->
! 			<p class="problem">Sie m&uuml;ssen dem Exemplar einen Strichcode zuordnen</p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="NOBIBLIOITEM" -->
--- 5,9 ----
  		<p>
  		<!-- TMPL_IF NAME="NOBARCODE" -->
! 			<p class="problem">Sie m&uuml;ssen dem Exemplar einen Barcode zuordnen</p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="NOBIBLIOITEM" -->
***************
*** 11,15 ****
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="BARCODEINUSE" -->
! 			<p class="problem">Der Strichcode wird bereits verwendet</p>
  		<!-- /TMPL_IF -->
  		<h2 class="catalogue">BIBLIO SATZ <!-- TMPL_VAR NAME="BIBNUM" --></h2>
--- 11,15 ----
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="BARCODEINUSE" -->
! 			<p class="problem">Der Barcode wird bereits verwendet</p>
  		<!-- /TMPL_IF -->
  		<h2 class="catalogue">BIBLIO SATZ <!-- TMPL_VAR NAME="BIBNUM" --></h2>

Index: additem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/additem.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** additem.tmpl	17 May 2005 13:21:35 -0000	1.2
--- additem.tmpl	5 Jun 2005 14:45:17 -0000	1.3
***************
*** 53,57 ****
  	<input type="hidden" name="itemnum" value="<!-- TMPL_VAR NAME="itemnum" -->">
  	<!-- TMPL_IF name="barcode_not_unique" -->
! 		<div id="problem"><b>FEHLER: Strichcode ist bereits vorhanden<b></div>
  	<!-- /TMPL_IF -->
  	<!-- TMPL_IF name="opisadd" -->
--- 53,57 ----
  	<input type="hidden" name="itemnum" value="<!-- TMPL_VAR NAME="itemnum" -->">
  	<!-- TMPL_IF name="barcode_not_unique" -->
! 		<div id="problem"><b>FEHLER: Barcode ist bereits vorhanden<b></div>
  	<!-- /TMPL_IF -->
  	<!-- TMPL_IF name="opisadd" -->
***************
*** 100,106 ****
  		document.f.submit();
  	} else {
! 		alertString2  = _("Form not submitted because of the following problem(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_errors+_("Pflichtfelder leer (sieh fett dargestellte Unterfelder)");
  		alert(alertString2);
  	}
--- 100,106 ----
  		document.f.submit();
  	} else {
! 		alertString2  = _("Formular nicht bearbeitet wegen der folgenden Probleme");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_errors+_("Pflichtfelder leer (siehe fett dargestellte Unterfelder)");
  		alert(alertString2);
  	}

Index: marcimport.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/marcimport.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** marcimport.tmpl	17 May 2005 13:21:35 -0000	1.2
--- marcimport.tmpl	5 Jun 2005 14:45:17 -0000	1.3
***************
*** 46,50 ****
  	</tr>
  	<tr valign="top">
! 		<td>If ISBN is already in the reservoir: </td>
  		<td><input type="radio" name="overwrite_biblio" value="0" checked> Ignorieren, den vorhandenen Satz behalten<br/>
  			<input type="radio" name="overwrite_biblio" value="1">den vorhandenen Satz &uuml;berschreiben</td>
--- 46,50 ----
  	</tr>
  	<tr valign="top">
! 		<td>Wenn die ISBN bereits im Fremddatenpool ist: </td>
  		<td><input type="radio" name="overwrite_biblio" value="0" checked> Ignorieren, den vorhandenen Satz behalten<br/>
  			<input type="radio" name="overwrite_biblio" value="1">den vorhandenen Satz &uuml;berschreiben</td>




From hellen at users.sourceforge.net  Sun Jun  5 20:10:15 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sun, 05 Jun 2005 11:10:15 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/acqui acqui-home.tmpl,1.2,1.3 acquire.tmpl,1.2,1.3 basket.tmpl,1.2,1.3
Message-ID: <E1DezZf-000731-CN@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	acqui-home.tmpl acquire.tmpl basket.tmpl 
Log Message:
translated for 2.2.2 by hellen

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui/acqui-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** acqui-home.tmpl	4 Jun 2005 14:10:26 -0000	1.2
--- acqui-home.tmpl	5 Jun 2005 18:10:12 -0000	1.3
***************
*** 77,81 ****
  		<p>W&auml;hlen Sie dann einen Einkausfkorb aus bzw. legen Sie einen neuen Korb an. Beachten Sie bitte, dass der neue Korb dem angemeldeten Benutzer zugeordnet wird.</p>
  		<p>Sie m&uuml;ssen das zu bestellende Exemplar einem bestehenden Biblio zuordnen, oder erst einen neuen Biblio anlegen.</p>
! 		<p>Um einen Einkaufskorb zu schlie&szlig;en, klicken Sie auf "Einkaufkorb anzeiegn", dann auf "Einkaufskorb best&auml;tigen".</p>
  	</ul>
  </div>
--- 77,81 ----
  		<p>W&auml;hlen Sie dann einen Einkausfkorb aus bzw. legen Sie einen neuen Korb an. Beachten Sie bitte, dass der neue Korb dem angemeldeten Benutzer zugeordnet wird.</p>
  		<p>Sie m&uuml;ssen das zu bestellende Exemplar einem bestehenden Biblio zuordnen, oder erst einen neuen Biblio anlegen.</p>
! 		<p>Um einen Einkaufskorb zu schlie&szlig;en, klicken Sie auf "Einkaufkorb anzeigen", dann auf "Einkaufskorb best&auml;tigen".</p>
  	</ul>
  </div>

Index: acquire.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui/acquire.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** acquire.tmpl	4 Jun 2005 14:10:26 -0000	1.2
--- acquire.tmpl	5 Jun 2005 18:10:13 -0000	1.3
***************
*** 105,109 ****
  			<th class="acquisition">TITEL</th>
  			<th class="acquisition">VERFASSER</th>
! 			<th class="acquisition">Qty</th>
  			<th class="acquisition">Eingegangen</th>
  		</tr>
--- 105,109 ----
  			<th class="acquisition">TITEL</th>
  			<th class="acquisition">VERFASSER</th>
! 			<th class="acquisition">MENGE</th>
  			<th class="acquisition">Eingegangen</th>
  		</tr>

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui/basket.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** basket.tmpl	4 Jun 2005 14:10:26 -0000	1.2
--- basket.tmpl	5 Jun 2005 18:10:13 -0000	1.3
***************
*** 28,33 ****
  				<th class="acquisition">Titel</th>
  				<th class="acquisition">Verfasser</th>
! 				<th class="acquisition">rrp</th>
! 				<th class="acquisition doNotPrint">est</th>
  				<th class="acquisition">Menge</th>
  				<th class="acquisition">Gesamt</th>
--- 28,33 ----
  				<th class="acquisition">Titel</th>
  				<th class="acquisition">Verfasser</th>
! 				<th class="acquisition">EK-Preis</th>
! 				<th class="acquisition doNotPrint">Nettopreis</th>
  				<th class="acquisition">Menge</th>
  				<th class="acquisition">Gesamt</th>




From tipaul at users.sourceforge.net  Mon Jun  6 11:27:46 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 02:27:46 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.17.2.4,1.17.2.5 opac-top.inc,1.8.2.3,1.8.2.4
Message-ID: <E1DfDta-0008Kj-14@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac.css opac-top.inc 
Log Message:
some CSS improvements (opac works better with opera & konqueror now)

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.17.2.4
retrieving revision 1.17.2.5
diff -C2 -r1.17.2.4 -r1.17.2.5
*** opac.css	3 Jun 2005 13:01:23 -0000	1.17.2.4
--- opac.css	6 Jun 2005 09:27:42 -0000	1.17.2.5
***************
*** 91,99 ****
  	font-weight:bold;
  	font-size: 115%;
- 	text-align : center;
  	vertical-align:top;
  	padding: 2px;
  	width:100%;
- 	margin-left:70px;
  }
  
--- 91,97 ----
***************
*** 143,147 ****
  	border:1px solid #000000;
  	border-collapse:collapse;
! 	width:90%;
  }
  /* header */
--- 141,145 ----
  	border:1px solid #000000;
  	border-collapse:collapse;
! 	position:static;
  }
  /* header */
***************
*** 155,165 ****
  	border-bottom:1px solid #000000;
  	border-top:1px solid #000000;
- 	padding:5px;
  }
  /* standard cell */
  td {
  	font-size:10pt;
  	border-left:1px solid #000000;
  	vertical-align:top;
  }
  
--- 153,171 ----
  	border-bottom:1px solid #000000;
  	border-top:1px solid #000000;
  }
  /* standard cell */
+ 
+ tr {
+ 	display:table-row;
+ 	position:static;
+ }
+ 
  td {
  	font-size:10pt;
  	border-left:1px solid #000000;
  	vertical-align:top;
+ 	position:static;
+ /*	position:relative;*/
+ 	display:table-cell;
  }
  
***************
*** 345,350 ****
  
  #menuline {
- 	float:left;
  	display:block;
  }
  
--- 351,356 ----
  
  #menuline {
  	display:block;
+ 	margin-left:100px;
  }
  
***************
*** 358,365 ****
  
  /* a little spacer. should not be used */
- .spacer {
- 	padding-left:20pt;
- 	float:left;
- }
  .basketspacer {
  	padding-left:8pt;
--- 364,367 ----
***************
*** 370,375 ****
  div.tabsubs {
  	width:25px;
- 	position:absolute;
- 	display:block;
  	margin-left:10px;
  	margin-top:100px;
--- 372,375 ----
***************
*** 387,393 ****
  div.tabsub {
  	background-color: #ACE6E6;
- 	display: block;
  	visibility:hidden;
- 	position:absolute;
  	margin-left:72px;
  	margin-top:100px;
--- 387,391 ----
***************
*** 399,406 ****
  div.tabs {
  	width:10px;
- 	position:absolute;
  	display:block;
- 	margin-left:50px;
- 	margin-top:150px;
  }
  
--- 397,401 ----
***************
*** 414,417 ****
--- 409,420 ----
  }
  
+ div.tabbloc {
+ 	position:absolute;
+ 	display:block;
+ 	top:123px;
+ 	left:42px;
+ 	border: 1px solid black;
+ }
+ 
  div.tab {
  	background-color: #ACE6E6;
***************
*** 419,425 ****
  	visibility:hidden;
  	position:absolute;
! 	margin-left:72px;
! 	margin-top:150px;
! 	margin-right:10%;
  }
  
--- 422,426 ----
  	visibility:hidden;
  	position:absolute;
! 	float:left;
  }
  

Index: opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -C2 -r1.8.2.3 -r1.8.2.4
*** opac-top.inc	25 Mar 2005 16:58:23 -0000	1.8.2.3
--- opac-top.inc	6 Jun 2005 09:27:43 -0000	1.8.2.4
***************
*** 31,41 ****
  <body>
  	<!-- MENUS -->
  	<div id="menuline">
- 		<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo" style="float: left" />
  		<div class="SmallLibraryName"><!--TMPL_VAR name="LibraryName"--></div>
- 		<span class="spacer">&nbsp;</span>
- 		<span class="spacer">&nbsp;</span>
  		<a class="menu" href="/cgi-bin/koha/opac-main.pl" title="Koha home page">Home</a>
- 		<span class="spacer">&nbsp;</span>
  		<a class="menu" href="/cgi-bin/koha/opac-search.pl" title="Advanced search">Advanced search</a>
  		<!-- TMPL_IF NAME="loggedinusername" -->
--- 31,38 ----
  <body>
  	<!-- MENUS -->
+ 	<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo"/>
  	<div id="menuline">
  		<div class="SmallLibraryName"><!--TMPL_VAR name="LibraryName"--></div>
  		<a class="menu" href="/cgi-bin/koha/opac-main.pl" title="Koha home page">Home</a>
  		<a class="menu" href="/cgi-bin/koha/opac-search.pl" title="Advanced search">Advanced search</a>
  		<!-- TMPL_IF NAME="loggedinusername" -->
***************
*** 47,53 ****
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_IF -->
- 		<span class="spacer">&nbsp;</span>
  		<a class="menu" href="/cgi-bin/koha/opac-user.pl" title="Member Home page" >Personal page</a>
- 		<span class="spacer">&nbsp;</span>
  		<a class="menu" href="javascript:openBasket()" title="Biblio basket">Biblio basket <span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a>
  	</div>
--- 44,48 ----




From tipaul at users.sourceforge.net  Mon Jun  6 13:41:10 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 04:41:10 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.15.2.10,1.15.2.11
Message-ID: <E1DfFyg-0003UW-JN@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-detail.tmpl 
Log Message:
* changing unititle label
* hidding "number of items" if there is none

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.15.2.10
retrieving revision 1.15.2.11
diff -C2 -r1.15.2.10 -r1.15.2.11
*** opac-detail.tmpl	19 May 2005 22:43:28 -0000	1.15.2.10
--- opac-detail.tmpl	6 Jun 2005 11:41:08 -0000	1.15.2.11
***************
*** 69,73 ****
  				<!-- 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 -->
--- 69,73 ----
  				<!-- 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>




From tipaul at users.sourceforge.net  Mon Jun  6 14:16:09 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 05:16:09 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-full-serial-issues.tmpl,1.1.2.2,1.1.2.3
Message-ID: <E1DfGWX-00005x-AQ@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-full-serial-issues.tmpl 
Log Message:
small css fixes

Index: opac-full-serial-issues.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/Attic/opac-full-serial-issues.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** opac-full-serial-issues.tmpl	3 Jun 2005 12:53:08 -0000	1.1.2.2
--- opac-full-serial-issues.tmpl	6 Jun 2005 12:16:06 -0000	1.1.2.3
***************
*** 3,11 ****
  
  <!-- TMPL_UNLESS name="popup" -->
! <div class="mainbloc">
! 		<h1 class="catalogue">Subscription information for biblio #<!-- TMPL_VAR NAME="biblionumber" --> with title : <!-- TMPL_VAR name="bibliotitle" --></h1>
! <a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Back to biblio</a>
! 
! </div>
  <!-- /TMPL_UNLESS -->
  	<div class="tabsubs">
--- 3,9 ----
  
  <!-- TMPL_UNLESS name="popup" -->
! <div id="mainbloc">
! 	<h1 class="catalogue">Subscription information for biblio #<!-- TMPL_VAR NAME="biblionumber" --> with title : <!-- TMPL_VAR name="bibliotitle" --></h1>
! 	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Back to biblio</a>
  <!-- /TMPL_UNLESS -->
  	<div class="tabsubs">
***************
*** 47,51 ****
  	</div>
  	<!--/TMPL_LOOP -->
! 
  <script language="JavaScript" type="text/javascript">
  function active(numlayer)
--- 45,49 ----
  	</div>
  	<!--/TMPL_LOOP -->
! </div>
  <script language="JavaScript" type="text/javascript">
  function active(numlayer)




From tipaul at users.sourceforge.net  Mon Jun  6 14:38:18 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 05:38:18 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-MARCdetail.tmpl,1.5.2.1,1.5.2.2
Message-ID: <E1DfGry-0003Ww-99@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-MARCdetail.tmpl 
Log Message:
some css changes, for better compliance & look

Index: opac-MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -C2 -r1.5.2.1 -r1.5.2.2
*** opac-MARCdetail.tmpl	10 Mar 2005 15:52:37 -0000	1.5.2.1
--- opac-MARCdetail.tmpl	6 Jun 2005 12:38:16 -0000	1.5.2.2
***************
*** 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,32 ----
  	<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Add to basket</a>
  </div>
! <div id="mainbloc">
  	<div class="tabs">
  		<!-- TMPL_IF name="0XX" -->
***************
*** 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" -->
--- 62,66 ----
  		<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 ****
--- 320,325 ----
  		</table>
  	</div>
+ </div>
+ </div>
  <script language="JavaScript" type="text/javascript">
  function active(numlayer)




From tipaul at users.sourceforge.net  Mon Jun  6 16:03:58 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:03:58 -0700
Subject: [Koha-cvs] CVS: koha/C4 Output.pm,1.51,1.51.2.1
Message-ID: <E1DfICs-0006pI-K0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26202/C4

Modified Files:
      Tag: rel_2_2
	Output.pm 
Log Message:
adding opacsmallimage parameter if applicable

Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.51
retrieving revision 1.51.2.1
diff -C2 -r1.51 -r1.51.2.1
*** Output.pm	3 Jan 2005 10:58:46 -0000	1.51
--- Output.pm	6 Jun 2005 14:03:54 -0000	1.51.2.1
***************
*** 84,87 ****
--- 84,88 ----
  							theme => $theme,
  							opacstylesheet => $opacstylesheet,
+ 							opacsmallimage => C4::Context->preference('opacsmallimage'),
  							lang => $lang);
  




From tipaul at users.sourceforge.net  Mon Jun  6 16:06:16 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:06:16 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.17.2.5,1.17.2.6
Message-ID: <E1DfIF6-000779-TP@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac.css 
Log Message:
improving stylesheet
(adding title & tabs entries + some minor changes)
works fine on opera & konqueror

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.17.2.5
retrieving revision 1.17.2.6
diff -C2 -r1.17.2.5 -r1.17.2.6
*** opac.css	6 Jun 2005 09:27:42 -0000	1.17.2.5
--- opac.css	6 Jun 2005 14:06:14 -0000	1.17.2.6
***************
*** 51,55 ****
  	border-width:0px;
  	text-align:left;
! 	position:absolute;
  }
  
--- 51,58 ----
  	border-width:0px;
  	text-align:left;
! 	display:inline;
! 	float:left;
! 	padding-left:10px;
! 	padding-right:10px;
  }
  
***************
*** 350,353 ****
--- 353,361 ----
  }
  
+ #title {
+ 	display:block;
+ 	margin-left:0px;
+ }
+ 
  #menuline {
  	display:block;




From tipaul at users.sourceforge.net  Mon Jun  6 16:07:29 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:07:29 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac-top.inc,1.8.2.4,1.8.2.5
Message-ID: <E1DfIGH-0007Jx-Vq@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-top.inc 
Log Message:
splitting title in 2 parts :
* title (logo + title)
* menuline (the menuline)
to be able to have a vertical menuline
* adding parameter to have an alternate image as logo

Index: opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -C2 -r1.8.2.4 -r1.8.2.5
*** opac-top.inc	6 Jun 2005 09:27:43 -0000	1.8.2.4
--- opac-top.inc	6 Jun 2005 14:07:27 -0000	1.8.2.5
***************
*** 31,37 ****
  <body>
  	<!-- MENUS -->
! 	<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo"/>
! 	<div id="menuline">
  		<div class="SmallLibraryName"><!--TMPL_VAR name="LibraryName"--></div>
  		<a class="menu" href="/cgi-bin/koha/opac-main.pl" title="Koha home page">Home</a>
  		<a class="menu" href="/cgi-bin/koha/opac-search.pl" title="Advanced search">Advanced search</a>
--- 31,43 ----
  <body>
  	<!-- MENUS -->
! 	<div id="title">
! 		<!-- TMPL_IF name="opacsmallimage" -->
! 			<img src="<!-- TMPL_VAR name="opacsmallimage"-->" height="50" alt="koha logo"/>
! 		<!-- TMPL_ELSE -->
! 			<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo"/>
! 		<!-- /TMPL_IF -->
  		<div class="SmallLibraryName"><!--TMPL_VAR name="LibraryName"--></div>
+ 	</div>
+ 	<div id="menuline">
  		<a class="menu" href="/cgi-bin/koha/opac-main.pl" title="Koha home page">Home</a>
  		<a class="menu" href="/cgi-bin/koha/opac-search.pl" title="Advanced search">Advanced search</a>




From tipaul at users.sourceforge.net  Mon Jun  6 16:08:38 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:08:38 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-main.tmpl,1.16.2.4,1.16.2.5
Message-ID: <E1DfIHO-0007SY-G5@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-main.tmpl 
Log Message:
* adding parameter to have an alternate image as logo

Index: opac-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl,v
retrieving revision 1.16.2.4
retrieving revision 1.16.2.5
diff -C2 -r1.16.2.4 -r1.16.2.5
*** opac-main.tmpl	18 Mar 2005 09:52:06 -0000	1.16.2.4
--- opac-main.tmpl	6 Jun 2005 14:08:35 -0000	1.16.2.5
***************
*** 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>
  




From tipaul at users.sourceforge.net  Mon Jun  6 16:12:17 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:12:17 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-serial-issues.tmpl,1.2.2.3,1.2.2.4
Message-ID: <E1DfIKv-0007xy-Lr@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-serial-issues.tmpl 
Log Message:


Index: opac-serial-issues.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -r1.2.2.3 -r1.2.2.4
*** opac-serial-issues.tmpl	2 Jun 2005 15:19:35 -0000	1.2.2.3
--- opac-serial-issues.tmpl	6 Jun 2005 14:12:14 -0000	1.2.2.4
***************
*** 2,11 ****
  <!--------------------------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>
--- 2,10 ----
  <!--------------------------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>
! 	<!-- 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>
***************
*** 75,100 ****
  		since <b><!-- TMPl_VAR name="startdate" --></b>
  		</p>
! <!--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" -->
! 		<p>
! 		<!-- TMPL_VAR name="recievedlist" -->
! 			are recieved.
! 		</p>
! 	<!--/TMPL_IF -->
! 	<!-- TMPL_IF name="missinglist" -->
! 	<p>
! 			<!-- TMPL_VAR name="missinglist" -->
! 		are missing.
! 	</p>
! 	<!--/TMPL_IF -->
! <!-- /TMPL_UNLESS -->
! </div>
  <!-- /TMPL_LOOP -->
  </div>
--- 74,99 ----
  		since <b><!-- TMPl_VAR name="startdate" --></b>
  		</p>
! 	<!--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>




From tipaul at users.sourceforge.net  Mon Jun  6 16:11:49 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:11:49 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-searchresults.tmpl,1.20.2.3,1.20.2.4
Message-ID: <E1DfIKT-0007vE-Do@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-searchresults.tmpl 
Log Message:
minor change (to fill a table bottom)

Index: opac-searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl,v
retrieving revision 1.20.2.3
retrieving revision 1.20.2.4
diff -C2 -r1.20.2.3 -r1.20.2.4
*** opac-searchresults.tmpl	25 Mar 2005 17:02:34 -0000	1.20.2.3
--- opac-searchresults.tmpl	6 Jun 2005 14:11:47 -0000	1.20.2.4
***************
*** 115,119 ****
  				<!-- /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>
--- 115,119 ----
  				<!-- /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>




From tipaul at users.sourceforge.net  Mon Jun  6 16:13:24 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:13:24 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-user.tmpl,1.8.2.2,1.8.2.3
Message-ID: <E1DfIM0-00086y-KZ@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-user.tmpl 
Log Message:
minor graphic change + library message shown just after login

Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -C2 -r1.8.2.2 -r1.8.2.3
*** opac-user.tmpl	25 Mar 2005 17:02:59 -0000	1.8.2.2
--- opac-user.tmpl	6 Jun 2005 14:13:22 -0000	1.8.2.3
***************
*** 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" -->




From tipaul at users.sourceforge.net  Mon Jun  6 16:14:01 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:14:01 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-userupdate.tmpl,1.5,1.5.2.1
Message-ID: <E1DfIMb-0008Bz-OO@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-userupdate.tmpl 
Log Message:
minor graphic change + library message shown just after login

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.5.2.1
diff -C2 -r1.5 -r1.5.2.1
*** opac-userupdate.tmpl	12 Nov 2004 16:28:10 -0000	1.5
--- opac-userupdate.tmpl	6 Jun 2005 14:13:59 -0000	1.5.2.1
***************
*** 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>




From tipaul at users.sourceforge.net  Mon Jun  6 16:15:10 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:15:10 -0700
Subject: [Koha-cvs] CVS: koha pay.pl,1.9.2.1,1.9.2.2
Message-ID: <E1DfINi-0008MY-8u@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32105

Modified Files:
      Tag: rel_2_2
	pay.pl 
Log Message:
* fixing a bug
* redirecting to patron page, it's more logic

Index: pay.pl
===================================================================
RCS file: /cvsroot/koha/koha/pay.pl,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -r1.9.2.1 -r1.9.2.2
*** pay.pl	16 Feb 2005 19:16:35 -0000	1.9.2.1
--- pay.pl	6 Jun 2005 14:15:08 -0000	1.9.2.2
***************
*** 56,60 ****
  my $check=0;
  for (my $i=0;$i<@names;$i++){
! 	my$temp=$input->param($names[$i]);
  	if ($temp eq 'wo'){
  		$inp{$names[$i]}=$temp;
--- 56,60 ----
  my $check=0;
  for (my $i=0;$i<@names;$i++){
! 	my $temp=$input->param($names[$i]);
  	if ($temp eq 'wo'){
  		$inp{$names[$i]}=$temp;
***************
*** 65,68 ****
--- 65,69 ----
  		$user=~ s/Foxton/F/i;
  		$user=~ s/Shannon/S/i;
+ 		# FIXME : using array +4, +5, +6 is dirty. Should use arrays for each accountline
  		my $amount=$input->param($names[$i+4]);
  		my $bornum=$input->param($names[$i+5]);
***************
*** 146,150 ****
  	}
  	$bornum=$input->param('bornum');
! 	print $input->redirect("/cgi-bin/koha/pay.pl?bornum=$bornum");
  }
  
--- 147,151 ----
  	}
  	$bornum=$input->param('bornum');
! 	print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$bornum");
  }
  




From tipaul at users.sourceforge.net  Mon Jun  6 16:15:57 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:15:57 -0700
Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.100.2.3,1.100.2.4
Message-ID: <E1DfIOT-0008Rc-Q4@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/updater
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32401/updater

Modified Files:
      Tag: rel_2_2
	updatedatabase 
Log Message:
adding 2 systemparameters to define an alternate image as logo in opac (the image on main page & on each top-left page)

Index: updatedatabase
===================================================================
RCS file: /cvsroot/koha/koha/updater/updatedatabase,v
retrieving revision 1.100.2.3
retrieving revision 1.100.2.4
diff -C2 -r1.100.2.3 -r1.100.2.4
*** updatedatabase	2 Jun 2005 21:05:34 -0000	1.100.2.3
--- updatedatabase	6 Jun 2005 14:15:55 -0000	1.100.2.4
***************
*** 819,822 ****
--- 819,840 ----
          {
              uniquefieldrequired => 'variable',
+             variable            => 'opacsmallimage',
+             value               => '',
+ 	    forceupdate		=> { 'explanation' => 1,
+ 	    			     'type' => 1},
+             explanation         => 'Enter a complete URL to an image, will be on top/left instead of the Koha logo',
+ 	    type		=> 'free',
+         },
+         {
+             uniquefieldrequired => 'variable',
+             variable            => 'opaclargeimage',
+             value               => '',
+ 	    forceupdate		=> { 'explanation' => 1,
+ 	    			     'type' => 1},
+             explanation         => 'Enter a complete URL to an image, will be on the main page, instead of the Koha logo',
+ 	    type		=> 'free',
+         },
+         {
+             uniquefieldrequired => 'variable',
              variable            => 'delimiter',
              value               => ';',
***************
*** 1444,1447 ****
--- 1462,1468 ----
  
  # $Log$
+ # Revision 1.100.2.4  2005/06/06 14:15:55  tipaul
+ # adding 2 systemparameters to define an alternate image as logo in opac (the image on main page & on each top-left page)
+ #
  # Revision 1.100.2.3  2005/06/02 21:05:34  hdl
  # adding variable SubscriptionHistory




From tipaul at users.sourceforge.net  Mon Jun  6 16:16:15 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:16:15 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-main.pl,1.16,1.16.2.1
Message-ID: <E1DfIOl-0008VP-7O@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32650/opac

Modified Files:
      Tag: rel_2_2
	opac-main.pl 
Log Message:
minor change (to fill a table bottom)

Index: opac-main.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-main.pl,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -C2 -r1.16 -r1.16.2.1
*** opac-main.pl	4 Oct 2004 20:20:25 -0000	1.16
--- opac-main.pl	6 Jun 2005 14:16:13 -0000	1.16.2.1
***************
*** 53,56 ****
--- 53,57 ----
  				languages => \@options,
  				textmessaging => $borrower->{textmessaging},
+ 				opaclargeimage => C4::Context->preference("opaclargeimage"),
  );
  output_html_with_http_headers $input, $cookie, $template->output;




From tipaul at users.sourceforge.net  Mon Jun  6 17:23:38 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 08:23:38 -0700
Subject: [Koha-cvs] CVS: koha/C4 SearchMarc.pm,1.36.2.10,1.36.2.11
Message-ID: <E1DfJRy-0001iU-G9@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6460/C4

Modified Files:
      Tag: rel_2_2
	SearchMarc.pm 
Log Message:
adding a systempref to choose either to show or hide "lost" items. Note that "lost items" can be related to an authorised value list, so does not necessary mean "item definetly lost". Even here, some libraries want to see lost items, and some don't want. This parameter will make everybody happy !

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.36.2.10
retrieving revision 1.36.2.11
diff -C2 -r1.36.2.10 -r1.36.2.11
*** SearchMarc.pm	21 May 2005 03:11:04 -0000	1.36.2.10
--- SearchMarc.pm	6 Jun 2005 15:23:35 -0000	1.36.2.11
***************
*** 274,278 ****
  	my ($sql_tables, $sql_where1, $sql_where2) = create_request($dbh,\@normal_tags, \@normal_and_or, \@normal_operator, \@normal_value);
  
! 	$sql_where1 .= "and TO_DAYS( NOW( ) ) - TO_DAYS( biblio.timestamp ) <30" if $orderby =~ "biblio.timestamp";
  	my $sth;
  	if ($sql_where2) {
--- 274,278 ----
  	my ($sql_tables, $sql_where1, $sql_where2) = create_request($dbh,\@normal_tags, \@normal_and_or, \@normal_operator, \@normal_value);
  
! 	$sql_where1 .= "and TO_DAYS( NOW( ) ) - TO_DAYS( biblio.timestamp ) <300" if $orderby =~ "biblio.timestamp";
  	my $sth;
  	if ($sql_where2) {
***************
*** 336,340 ****
  	# HINT : biblionumber as bn is important. The hash is fills biblionumber with items.biblionumber.
  	# so if you dont' has an item, you get a not nice empty value.
! 	$sth = $dbh->prepare("SELECT biblio.biblionumber as bn,biblio.*, biblioitems.*,marc_biblio.bibid,itemtypes.notforloan,itemtypes.description
  							FROM biblio, marc_biblio 
  							LEFT JOIN biblioitems on biblio.biblionumber = biblioitems.biblionumber
--- 336,340 ----
  	# HINT : biblionumber as bn is important. The hash is fills biblionumber with items.biblionumber.
  	# so if you dont' has an item, you get a not nice empty value.
! 	$sth = $dbh->prepare("SELECT biblio.biblionumber as bn,biblioitems.*,biblio.*, marc_biblio.bibid,itemtypes.notforloan,itemtypes.description
  							FROM biblio, marc_biblio 
  							LEFT JOIN biblioitems on biblio.biblionumber = biblioitems.biblionumber
***************
*** 347,351 ****
  	my $oldline;
  	my ($oldbibid, $oldauthor, $oldtitle);
! 	my $sth_itemCN = $dbh->prepare("select items.* from items where biblionumber=? and (itemlost = 0 or itemlost is NULL)");
  	my $sth_issue = $dbh->prepare("select date_due,returndate from issues where itemnumber=?");
  	# parse all biblios between start & end.
--- 347,356 ----
  	my $oldline;
  	my ($oldbibid, $oldauthor, $oldtitle);
! 	my $sth_itemCN;
! 	if (C4::Context->preference('hidelostitem')) {
! 		$sth_itemCN = $dbh->prepare("select items.* from items where biblionumber=? and (itemlost = 0 or itemlost is NULL)");
! 	} else {
! 		$sth_itemCN = $dbh->prepare("select items.* from items where biblionumber=?");
! 	}
  	my $sth_issue = $dbh->prepare("select date_due,returndate from issues where itemnumber=?");
  	# parse all biblios between start & end.




From tipaul at users.sourceforge.net  Mon Jun  6 17:23:39 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 08:23:39 -0700
Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.100.2.4,1.100.2.5
Message-ID: <E1DfJRz-0001ij-F1@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/updater
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6460/updater

Modified Files:
      Tag: rel_2_2
	updatedatabase 
Log Message:
adding a systempref to choose either to show or hide "lost" items. Note that "lost items" can be related to an authorised value list, so does not necessary mean "item definetly lost". Even here, some libraries want to see lost items, and some don't want. This parameter will make everybody happy !

Index: updatedatabase
===================================================================
RCS file: /cvsroot/koha/koha/updater/updatedatabase,v
retrieving revision 1.100.2.4
retrieving revision 1.100.2.5
diff -C2 -r1.100.2.4 -r1.100.2.5
*** updatedatabase	6 Jun 2005 14:15:55 -0000	1.100.2.4
--- updatedatabase	6 Jun 2005 15:23:36 -0000	1.100.2.5
***************
*** 877,880 ****
--- 877,889 ----
  	        options		=> 'simplified|full'
          },
+         {
+             uniquefieldrequired => 'variable',
+             variable            => 'hidelostitems',
+             value               => 'No',
+ 	    forceupdate		=> { 'explanation' => 1,
+ 	    			     'type' => 1},
+             explanation         => 'show or hide "lost" items in OPAC.',
+ 	    type		=> 'YesNo',
+         },
      ],
  
***************
*** 1462,1465 ****
--- 1471,1477 ----
  
  # $Log$
+ # Revision 1.100.2.5  2005/06/06 15:23:36  tipaul
+ # adding a systempref to choose either to show or hide "lost" items. Note that "lost items" can be related to an authorised value list, so does not necessary mean "item definetly lost". Even here, some libraries want to see lost items, and some don't want. This parameter will make everybody happy !
+ #
  # Revision 1.100.2.4  2005/06/06 14:15:55  tipaul
  # adding 2 systemparameters to define an alternate image as logo in opac (the image on main page & on each top-left page)




From tipaul at users.sourceforge.net  Mon Jun  6 17:47:30 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 08:47:30 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-sendbasket.pl,1.4.2.3,1.4.2.4
Message-ID: <E1DfJp4-0005AV-Pt@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19826/opac

Modified Files:
      Tag: rel_2_2
	opac-sendbasket.pl 
Log Message:
fix to send an iso2709 file as attachment

Index: opac-sendbasket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-sendbasket.pl,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -r1.4.2.3 -r1.4.2.4
*** opac-sendbasket.pl	2 Jun 2005 13:03:31 -0000	1.4.2.3
--- opac-sendbasket.pl	6 Jun 2005 15:47:27 -0000	1.4.2.4
***************
*** 90,101 ****
  
  	my $boundary = "====" . time() . "====";
  	$mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
  
! 	$email_header = encode_qp($email_header);
  
! 	$boundary = "--".$boundary;
  
! 	# Writing mail
! 	$mail{body} = <<END_OF_BODY;
  $boundary
  Content-Type: text/plain; charset="iso-8859-1"
--- 90,131 ----
  
  	my $boundary = "====" . time() . "====";
+ # 	$mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
+ # 
+ # 	$email_header = encode_qp($email_header);
+ # 
+ # 	$boundary = "--".$boundary;
+ # 
+ # 	# Writing mail
+ # 	$mail{body} =
  	$mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
  
! 	my $message = encode_qp( "" );
  
! # $file = $^X; # This is the perl executable
! # 
! # open (F, $file) or die "Cannot read $file: $!";
! # binmode F; undef $/;
! $mail{body} = encode_base64($iso2709);
! # close F;
  
! $boundary = '--'.$boundary;
! $mail{body} = <<END_OF_BODY;
! $boundary
! Content-Type: text/plain; charset="iso-8859-1"
! Content-Transfer-Encoding: quoted-printable
! 
! $message
! $boundary
! Content-Type: application/octet-stream; name="basket"
! Content-Transfer-Encoding: base64
! Content-Disposition: attachment; filename="basket"
! 
! $mail{body}
! $boundary--
! END_OF_BODY
! 
! 
! 
! 	 <<END_OF_BODY;
  $boundary
  Content-Type: text/plain; charset="iso-8859-1"
***************
*** 109,113 ****
  END_OF_BODY
  
! $mail{PJ} = $iso2709;
  #	$mail{body} = <<END_OF_BODY;
  #$boundary
--- 139,143 ----
  END_OF_BODY
  
! $mail{attachment} = $iso2709;
  #	$mail{body} = <<END_OF_BODY;
  #$boundary
***************
*** 132,136 ****
  #		warn " ".$mail{body};
  #		warn " ".$mail{PJ};
- 		warn "Mail sent ok\n";
  		$template->param(SENT => "1");
  		$template->param(email_add => $email_add);
--- 162,165 ----




From hdl at users.sourceforge.net  Mon Jun  6 18:01:15 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 06 Jun 2005 09:01:15 -0700
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.6.2.7,1.6.2.8
Message-ID: <E1DfK2N-0006uJ-PS@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26413/C4

Modified Files:
      Tag: rel_2_2
	Bull.pm 
Log Message:
Fixing Bug : Not on first page when viewing opac-full-serial.tmpl

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.6.2.7
retrieving revision 1.6.2.8
diff -C2 -r1.6.2.7 -r1.6.2.8
*** Bull.pm	3 Jun 2005 12:53:08 -0000	1.6.2.7
--- Bull.pm	6 Jun 2005 16:00:56 -0000	1.6.2.8
***************
*** 223,231 ****
  				};
  		}else {
  			$year= $subs->{'year'};
  			$startdate= $subs->{'startdate'};
  			$aqbooksellername= $subs->{'aqbooksellername'};
  			$bibliotitle= $subs->{'bibliotitle'};
- 			$first=1 if (not $year);
  			my @temp;
  			push @temp,
--- 223,231 ----
  				};
  		}else {
+ 			$first=1 if (not $year);
  			$year= $subs->{'year'};
  			$startdate= $subs->{'startdate'};
  			$aqbooksellername= $subs->{'aqbooksellername'};
  			$bibliotitle= $subs->{'bibliotitle'};
  			my @temp;
  			push @temp,




From tipaul at users.sourceforge.net  Mon Jun  6 18:11:00 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 09:11:00 -0700
Subject: [Koha-cvs] CVS: koha/admin checkmarc.pl,1.6,1.6.2.1
Message-ID: <E1DfKBo-00081p-1o@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30805/admin

Modified Files:
      Tag: rel_2_2
	checkmarc.pl 
Log Message:
adding 2 new checkings for MARC setup :
* only 1 MARC tag must be mapped to item tab
* warning if there is NULL in a frameworkcode

Index: checkmarc.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/checkmarc.pl,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** checkmarc.pl	22 Dec 2003 19:16:58 -0000	1.6
--- checkmarc.pl	6 Jun 2005 16:10:57 -0000	1.6.2.1
***************
*** 77,80 ****
--- 77,81 ----
  my $tab = $res2;
  my $subtotal=0;
+ warn "TAGF : $tagfield";
  while (($res,$res2,$field) = $sth->fetchrow) {
  	# (ignore itemnumber, that must be in -1 tab)
***************
*** 97,100 ****
--- 98,118 ----
  	$total++;
  }
+ 
+ $sth = $dbh->prepare("select distinct tagfield from marc_subfield_structure where tab = 10");
+ $sth->execute;
+ my $totaltags = 0;
+ my $list = "";
+ while (($res2) = $sth->fetchrow) {
+ 	$totaltags++;
+ 	$list.=$res2.",";
+ }
+ if ($totaltags > 1) {
+ 	$template->param(itemtags => $list);
+ 	$total++;
+ } else {
+ 	$template->param(itemtags => 0);
+ }
+ 
+ 
  # checks biblioitems.itemtype must be mapped and use authorised_value=itemtype
  $sth = $dbh->prepare("select tagfield,tab,authorised_value from marc_subfield_structure where kohafield = \"biblioitems.itemtype\"");
***************
*** 146,149 ****
--- 164,189 ----
  }
  
+ $sth = $dbh->prepare("select count(*) from marc_biblio where frameworkcode is NULL");
+ $sth->execute;
+ ($res) = $sth->fetchrow;
+ if ($res) {
+ 	$template->param(frameworknull =>1);
+ 	$total++;
+ }
+ $sth = $dbh->prepare("select count(*) from marc_subfield_structure where frameworkcode is NULL");
+ $sth->execute;
+ ($res) = $sth->fetchrow;
+ if ($res) {
+ 	$template->param(frameworknull =>1);
+ 	$total++;
+ }
+ $sth = $dbh->prepare("select count(*) from marc_tag_structure where frameworkcode is NULL");
+ $sth->execute;
+ ($res) = $sth->fetchrow;
+ if ($res) {
+ 	$template->param(frameworknull =>1);
+ 	$total++;
+ }
+ 
  $template->param(total => $total);
  output_html_with_http_headers $input, $cookie, $template->output;




From tipaul at users.sourceforge.net  Mon Jun  6 18:11:00 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 09:11:00 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters checkmarc.tmpl,1.10,1.10.2.1
Message-ID: <E1DfKBo-00081y-Gy@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	checkmarc.tmpl 
Log Message:
adding 2 new checkings for MARC setup :
* only 1 MARC tag must be mapped to item tab
* warning if there is NULL in a frameworkcode

Index: checkmarc.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -r1.10 -r1.10.2.1
*** checkmarc.tmpl	19 Jul 2004 19:20:29 -0000	1.10
--- checkmarc.tmpl	6 Jun 2005 16:10:57 -0000	1.10.2.1
***************
*** 36,39 ****
--- 36,51 ----
  	<!-- /TMPL_IF -->
  	<!-- -------------------------------------------------------------------------------------------------------- -->
+ 	<!-- TMPL_IF NAME="itemtags" -->
+ 		<tr>
+ 			<td><b>Item tag</b></td>
+ 			<td>There is more than 1 MARC tag related to items tab (10) : <!-- TMPL_VAR name="itemtags" --></td>
+ 		</tr>
+ 	<!-- TMPL_ELSE -->
+ 		<tr>
+ 			<td>OK</td>
+ 			<td><i>Only 1 marc tag mapped to items</i></td>
+ 		</tr>
+ 	<!-- /TMPL_IF -->
+ 	<!-- -------------------------------------------------------------------------------------------------------- -->
  	<!-- TMPL_IF NAME="itemtypes_empty" -->
  		<tr>
***************
*** 117,120 ****
--- 129,147 ----
  	<!-- /TMPL_IF -->
  	<!-- -------------------------------------------------------------------------------------------------------- -->
+ 	<!-- TMPL_IF NAME="frameworknull" -->
+ 		<tr>
+ 			<td><b>framework values</b></td>
+ 			<td>there is a null value in a frameworkcode. Check the following tables<br/>
+ 				<li>select * from marc_subfield_structure where frameworkcode is NULL</li>
+ 				<li>select * from marc_tag_structure where frameworkcode is NULL</li>
+ 				<li>select * from marc_biblio where frameworkcode is NULL</li></td>
+ 		</tr>
+ 	<!-- TMPL_ELSE -->
+ 		<tr>
+ 			<td>OK</td>
+ 			<td><i>no NULL value in frameworkcode</i></td>
+ 		</tr>
+ 	<!-- /TMPL_IF -->
+ 	<!-- -------------------------------------------------------------------------------------------------------- -->
  	<!-- TMPL_IF NAME="total" -->
  		<tr>




From tipaul at users.sourceforge.net  Mon Jun  6 18:32:11 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 09:32:11 -0700
Subject: [Koha-cvs] CVS: koha/acqui recieveorder.pl,1.9.2.1,1.9.2.2
Message-ID: <E1DfKWJ-0001xZ-17@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7492/acqui

Modified Files:
      Tag: rel_2_2
	recieveorder.pl 
Log Message:
The correct parameter is supplierid, not id.

Index: recieveorder.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/recieveorder.pl,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -r1.9.2.1 -r1.9.2.2
*** recieveorder.pl	14 Apr 2005 21:21:08 -0000	1.9.2.1
--- recieveorder.pl	6 Jun 2005 16:32:08 -0000	1.9.2.2
***************
*** 33,37 ****
  
  my $input=new CGI;
! my $supplierid=$input->param('id');
  my ($count, at booksellers)=bookseller($supplierid);
  
--- 33,37 ----
  
  my $input=new CGI;
! my $supplierid=$input->param('supplierid');
  my ($count, at booksellers)=bookseller($supplierid);
  




From tipaul at users.sourceforge.net  Mon Jun  6 18:36:45 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 09:36:45 -0700
Subject: [Koha-cvs] CVS: koha/C4 Acquisition.pm,1.9.2.3,1.9.2.4
Message-ID: <E1DfKaj-0002T5-RW@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9430/C4

Modified Files:
      Tag: rel_2_2
	Acquisition.pm 
Log Message:
specifying table order to have aqorders.notes and not biblio.notes in {notes} field

Index: Acquisition.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -C2 -r1.9.2.3 -r1.9.2.4
*** Acquisition.pm	26 May 2005 09:21:29 -0000	1.9.2.3
--- Acquisition.pm	6 Jun 2005 16:36:43 -0000	1.9.2.4
***************
*** 563,567 ****
  	map { push(@searchterms,"$_%","% $_%") } @data;
  	push(@searchterms,$search,$search,$biblio);
! 	my $sth=$dbh->prepare("Select *,biblio.title from aqorders,biblioitems,biblio,aqbasket
  		where aqorders.biblioitemnumber = biblioitems.biblioitemnumber and
  		aqorders.basketno = aqbasket.basketno
--- 563,567 ----
  	map { push(@searchterms,"$_%","% $_%") } @data;
  	push(@searchterms,$search,$search,$biblio);
! 	my $sth=$dbh->prepare("Select biblio.*,biblioitems.*,aqorders.*,aqbasket.*,biblio.title from aqorders,biblioitems,biblio,aqbasket
  		where aqorders.biblioitemnumber = biblioitems.biblioitemnumber and
  		aqorders.basketno = aqbasket.basketno




From rangi at users.sourceforge.net  Tue Jun  7 01:29:38 2005
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Mon, 06 Jun 2005 16:29:38 -0700
Subject: [Koha-cvs] CVS: koha/C4 Acquisition.pm,1.11,1.12
Message-ID: <E1DfR2I-0007Xf-Jy@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28428

Modified Files:
	Acquisition.pm 
Log Message:
Fix for a bug in full acquisitions basket.pl
Ordernumber not showing


Index: Acquisition.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** Acquisition.pm	4 May 2005 15:39:08 -0000	1.11
--- Acquisition.pm	6 Jun 2005 23:29:36 -0000	1.12
***************
*** 105,109 ****
  	my ($basketno,$supplier,$orderby)=@_;
  	my $dbh = C4::Context->dbh;
! 	my $query="Select *,biblio.title from aqorders,biblio,biblioitems
  	left join aqorderbreakdown on aqorderbreakdown.ordernumber=aqorders.ordernumber
  	where basketno='$basketno'
--- 105,109 ----
  	my ($basketno,$supplier,$orderby)=@_;
  	my $dbh = C4::Context->dbh;
! 	my $query="Select *,biblio.title,aqorders.ordernumber from aqorders,biblio,biblioitems
  	left join aqorderbreakdown on aqorderbreakdown.ordernumber=aqorders.ordernumber
  	where basketno='$basketno'




From tipaul at users.sourceforge.net  Tue Jun  7 12:00:51 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 03:00:51 -0700
Subject: [Koha-cvs] CVS: koha/C4 AuthoritiesMarc.pm,1.17,1.18
Message-ID: <E1Dfat9-0006Mi-Li@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24420/C4

Modified Files:
	AuthoritiesMarc.pm 
Log Message:
adding $b to mainentry (in UNIMARC, for personal names, $a is the surname, $b is the firstname)

Index: AuthoritiesMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/AuthoritiesMarc.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** AuthoritiesMarc.pm	1 Jun 2005 12:51:02 -0000	1.17
--- AuthoritiesMarc.pm	7 Jun 2005 10:00:47 -0000	1.18
***************
*** 184,188 ****
  		$newline{biblio_fields} = $tags_using_authtype;
  		$newline{even} = $counter % 2;
! 		$newline{mainentry} = $record->field($mainentrytag)->subfield('a') if $record->field($mainentrytag);
  		$counter++;
  		push @finalresult, \%newline;
--- 184,188 ----
  		$newline{biblio_fields} = $tags_using_authtype;
  		$newline{even} = $counter % 2;
! 		$newline{mainentry} = $record->field($mainentrytag)->subfield('a')." ".$record->field($mainentrytag)->subfield('b') if $record->field($mainentrytag);
  		$counter++;
  		push @finalresult, \%newline;
***************
*** 922,925 ****
--- 922,928 ----
  # $Id$
  # $Log$
+ # Revision 1.18  2005/06/07 10:00:47  tipaul
+ # adding $b to mainentry (in UNIMARC, for personal names, $a is the surname, $b is the firstname)
+ #
  # Revision 1.17  2005/06/01 12:51:02  tipaul
  # some fixes & improvements for dictionnary search in librarian interface




From tipaul at users.sourceforge.net  Tue Jun  7 12:02:03 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 03:02:03 -0700
Subject: [Koha-cvs] CVS: koha/C4 AuthoritiesMarc.pm,1.9.2.5,1.9.2.6
Message-ID: <E1DfauJ-0006VX-Qi@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24943/C4

Modified Files:
      Tag: rel_2_2
	AuthoritiesMarc.pm 
Log Message:
porting dictionnary search from head to 2.2. there is now a ... facing titles, author & subject, to search in biblio & authorities existing values.

Index: AuthoritiesMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/AuthoritiesMarc.pm,v
retrieving revision 1.9.2.5
retrieving revision 1.9.2.6
diff -C2 -r1.9.2.5 -r1.9.2.6
*** AuthoritiesMarc.pm	31 May 2005 14:50:46 -0000	1.9.2.5
--- AuthoritiesMarc.pm	7 Jun 2005 10:02:00 -0000	1.9.2.6
***************
*** 65,73 ****
  	# the marclist may contain "mainentry". In this case, search the tag_to_report, that depends on
  	# the authtypecode. Then, search on $a of this tag_to_report
  	for (my $i=0;$i<$#{$tags};$i++) {
  		if (@$tags[$i] eq "mainentry") {
- 			my $sth = $dbh->prepare("select auth_tag_to_report from auth_types where authtypecode=?");
- 			$sth->execute($authtypecode);
- 			my ($tag_to_report) = $sth->fetchrow;
  			@$tags[$i] = $tag_to_report."a";
  		}
--- 65,76 ----
  	# the marclist may contain "mainentry". In this case, search the tag_to_report, that depends on
  	# the authtypecode. Then, search on $a of this tag_to_report
+ 	# also store main entry MARC tag, to extract it at end of search
+ 	my $mainentrytag;
+ 	my $sth = $dbh->prepare("select auth_tag_to_report from auth_types where authtypecode=?");
+ 	$sth->execute($authtypecode);
+ 	my ($tag_to_report) = $sth->fetchrow;
+ 	$mainentrytag = $tag_to_report;
  	for (my $i=0;$i<$#{$tags};$i++) {
  		if (@$tags[$i] eq "mainentry") {
  			@$tags[$i] = $tag_to_report."a";
  		}
***************
*** 88,91 ****
--- 91,99 ----
  	for(my $i = 0 ; $i <= $#{$value} ; $i++)
  	{
+ 		# replace * by %
+ 		@$value[$i] =~ s/\*/%/g;
+ 		# remove % at the beginning
+ 		@$value[$i] =~ s/^%//g;
+ 	    @$value[$i] =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g if @$operator[$i] eq "contains";
  		if(@$operator[$i] eq "contains") # if operator is contains, splits the words in separate requests
  		{
***************
*** 175,178 ****
--- 183,188 ----
  		$newline{used} = &AUTHcount_usage($result[$counter]);
  		$newline{biblio_fields} = $tags_using_authtype;
+ 		$newline{even} = $counter % 2;
+ 		$newline{mainentry} = $record->field($mainentrytag)->subfield('a')." ".$record->field($mainentrytag)->subfield('b') if $record->field($mainentrytag);
  		$counter++;
  		push @finalresult, \%newline;
***************
*** 917,920 ****
--- 927,933 ----
  # $Id$
  # $Log$
+ # Revision 1.9.2.6  2005/06/07 10:02:00  tipaul
+ # porting dictionnary search from head to 2.2. there is now a ... facing titles, author & subject, to search in biblio & authorities existing values.
+ #
  # Revision 1.9.2.5  2005/05/31 14:50:46  tipaul
  # fix for authority merging. There was a bug on official installs




From tipaul at users.sourceforge.net  Tue Jun  7 12:02:03 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 03:02:03 -0700
Subject: [Koha-cvs] CVS: koha/search.marc dictionary.pl,NONE,1.6.2.2
Message-ID: <E1DfauJ-0006VU-L7@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24943/search.marc

Added Files:
      Tag: rel_2_2
	dictionary.pl 
Log Message:
porting dictionnary search from head to 2.2. there is now a ... facing titles, author & subject, to search in biblio & authorities existing values.

--- NEW FILE ---
#!/usr/bin/perl


# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Auth;
use CGI;
use C4::Search;
use C4::SearchMarc;
use C4::AuthoritiesMarc;
use C4::Context;
use C4::Biblio;
use HTML::Template;

=head1 NAME

dictionnary.pl : script to search in biblio & authority an existing value

=head1 SYNOPSIS

useful when the user want to search a term before running a query. For example, to see if "computer" is used in the database

The parameter "marclist" tells which field is searched (title, author, subject, but could be anything else)

This script searches in both biblios & authority
* in biblio, the script search in all marc fields related to what the user is looking for (for example, if the dictionnary is used on "author", the script searches in biblio.author, but also in additional authors & any MARC field related to author (through the "seealso" MARC constraint)
* in authority, the script search everywhere. Thus, the accepted & rejected forms are found.

The script shows all results & the user can choose what he want, that is copied into search form.

=cut

my $input = new CGI;
my $field =$input->param('marclist');
#warn "field :$field";
my ($tablename, $kohafield)=split /./,$field;
#my $tablename=$input->param('tablename');
$tablename="biblio" unless ($tablename);
#my $kohafield = $input->param('kohafield');
my @search = $input->param('search');
# warn " ".$search[0];
my $index = $input->param('index');
# warn " index: ".$index;
my $op=$input->param('op');
if (($search[0]) and not ($op eq 'do_search')){
	$op='do_search';
}
my $script_name = 'search.marc/dictionary.pl';
my $query;
my $type=$input->param('type');
#warn " ".$type;

my $dbh = C4::Context->dbh;
my ($template, $loggedinuser, $cookie);

my $env;

my $startfrom=$input->param('startfrom');
$startfrom=0 if(!defined $startfrom);
my $searchdesc;
my $resultsperpage;

#warn "Starting process";

if ($op eq "do_search") {
	#
	# searching in biblio
	#
	my $sth=$dbh->prepare("Select distinct tagfield,tagsubfield from marc_subfield_structure where kohafield = ?");
	$sth->execute("$field");
	my (@tags, @and_or, @operator, @excluding, at value);
	
 	while ((my $tagfield,my $tagsubfield,my $liblibrarian) = $sth->fetchrow) {
 		push @tags, $dbh->quote("$tagfield$tagsubfield");
 	}

	$resultsperpage= $input->param('resultsperpage');
	$resultsperpage = 19 if(!defined $resultsperpage);
	my $orderby = $input->param('orderby');

	findseealso($dbh,\@tags);

	my @results, my $total;
	my $strsth="select distinct subfieldvalue, count(marc_subfield_table.bibid) from marc_subfield_table,marc_word where marc_word.word like ? and marc_subfield_table.bibid=marc_word.bibid and marc_subfield_table.tagorder=marc_word.tagorder and marc_word.tagsubfield in ";
	my $listtags="(";
	foreach my $tag (@tags){
		$listtags .= $tag .",";
	}
	$listtags =~s/,$/)/;
	$strsth .= $listtags." and marc_word.tagsubfield=marc_subfield_table.tag+marc_subfield_table.subfieldcode group by subfieldvalue ";
# 	warn "search in biblio : ".$strsth;
	my $value = uc($search[0]);
	$value=~s/\*/%/g;
	$value.= "%" if not($value=~m/%/);
# 	warn " texte : ".$value;

	$sth=$dbh->prepare($strsth);
	$sth->execute($value);
	my $total;
	my @catresults;
	while (my ($value,$ctresults)=$sth->fetchrow) {
# 		warn "countresults : ".$ctresults;
		push @catresults,{value=> $value, 
						  even=>($total-$startfrom*$resultsperpage)%2,
						  count=>$ctresults
						  } if (($total>=$startfrom*$resultsperpage) and ($total<($startfrom+1)*$resultsperpage));
		$total++;
	}
	

	my $strsth="Select distinct authtypecode from marc_subfield_structure where (";
	foreach my $listtags (@tags){
		my @taglist=split /,/,$listtags;
		foreach my $curtag (@taglist){
			$strsth.="(tagfield='".substr($curtag,1,3)."' AND tagsubfield='".substr($curtag,4,1)."') OR";
		}
	}
	
	$strsth=~s/ OR$/)/;
	my $strsth = $strsth." and authtypecode is not NULL";
# 	warn $strsth;
	my $sth=$dbh->prepare($strsth);
	$sth->execute;
	
	#
	# searching in authorities
	#
	my @authresults;
	my $authnbresults;
	while ((my $authtypecode) = $sth->fetchrow) {
		my ($curauthresults,$nbresults) = authoritysearch($dbh,[''],[''],[''],['contains'],
														\@search,$startfrom*$resultsperpage, $resultsperpage,$authtypecode);
		push @authresults, @$curauthresults;
		$authnbresults+=$nbresults;
#		warn "auth : $authtypecode nbauthresults : $nbresults";
	}
	
	# 
	# OK, filling the template with authorities & biblio entries found.
	#
	($template, $loggedinuser, $cookie)
		= get_template_and_user({template_name => "search.marc/dictionary.tmpl",
				query => $input,
				type => $type,
				authnotrequired => 0,
				flagsrequired => {catalogue => 1},
				debug => 1,
				});

	# multi page display gestion
	my $displaynext=0;
	my $displayprev=$startfrom;
	if(($total - (($startfrom+1)*($resultsperpage))) > 0 ) {
		$displaynext = 1;
	}

	my @field_data = ();

	for(my $i = 0 ; $i <= $#tags ; $i++) {
		push @field_data, { term => "marclist", val=>$tags[$i] };
		push @field_data, { term => "and_or", val=>$and_or[$i] };
		push @field_data, { term => "excluding", val=>$excluding[$i] };
		push @field_data, { term => "operator", val=>$operator[$i] };
		push @field_data, { term => "value", val=>$value[$i] };
	}

	my @numbers = ();

	if ($total>$resultsperpage) {
		for (my $i=1; $i<$total/$resultsperpage+1; $i++) {
			if ($i<16) {
	    		my $highlight=0;
	    		($startfrom==($i-1)) && ($highlight=1);
	    		push @numbers, { number => $i,
					highlight => $highlight ,
					searchdata=> \@field_data,
					startfrom => ($i-1)};
			}
    	}
	}

	my $from = $startfrom*$resultsperpage+1;
	my $to;

 	if($total < (($startfrom+1)*$resultsperpage))
	{
		$to = $total;
	} else {
		$to = (($startfrom+1)*$resultsperpage);
	}
	$template->param(anindex => $input->param('index'));
	$template->param(result => \@results,
					 catresult=> \@catresults,
						search => $search[0],
						marclist =>$field,
						authresult => \@authresults,
						nbresults => $authnbresults,
						startfrom=> $startfrom,
						displaynext=> $displaynext,
						displayprev=> $displayprev,
						resultsperpage => $resultsperpage,
						startfromnext => $startfrom+1,
						startfromprev => $startfrom-1,
						searchdata=>\@field_data,
						total=>$total,
						from=>$from,
						to=>$to,
						numbers=>\@numbers,
						MARC_ON => C4::Context->preference("marc"),
						);

 } else {
 	($template, $loggedinuser, $cookie)
 		= get_template_and_user({template_name => "search.marc/dictionary.tmpl",
 				query => $input,
 				type => $type,
				authnotrequired => 0,
 				flagsrequired => {catalogue => 1},
 				debug => 1,
 				});
#warn "type : $type";
 
 }
$template->param(search => $search[0],
					marclist =>$field,
					type=>$type,
					anindex => $input->param('index'));

# Print the page
output_html_with_http_headers $input, $cookie, $template->output;

# Local Variables:
# tab-width: 4
# End:




From tipaul at users.sourceforge.net  Tue Jun  7 12:02:03 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 03:02:03 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/search.marc dictionary.tmpl,NONE,1.5.2.2 search.tmpl,1.21.2.1,1.21.2.2
Message-ID: <E1DfauJ-0006VW-Q6@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	search.tmpl 
Added Files:
      Tag: rel_2_2
	dictionary.tmpl 
Log Message:
porting dictionnary search from head to 2.2. there is now a ... facing titles, author & subject, to search in biblio & authorities existing values.

--- NEW FILE ---
    <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<title>KOHA: Dictionary</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">

<script language="JavaScript" type="text/javascript">
<!-- Hide from old browsers
function openWindow(targeturl, windowname) {
	newwin =
window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
}
function Help() {
	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
}
// end hiding -->
</script>

<link rel="stylesheet" type="text/css" href="/intranet-tmpl/default/en/includes/common-style.css">
<style type="text/css">
.catalogue {
	background-color:#ad11ad;
	color:#FFFFFF;
	background-image:none;
	text-decoration: normal;
	}
a.catalogue:hover {
	background-color: #ad11ad;
	color: #FFFFFF;
	text-decoration: none;
	}
</style>
</head>

<body>
<div id="mainbloc">
	<h1 class="catalogue">Dictionary Search</h1>
	
	<form name="f" method="post" action="/cgi-bin/koha/search.marc/dictionary.pl">
		<div class="bloc25">
			<h2 class="catalogue">Search on</h2>
			<p>
				<input type="hidden" name="op" value="do_search">
				<label class="label100" for="keyword"></label>
				<input type="hidden" name="marclist" value="<!-- TMPL_VAR Name="marclist" -->">
				<input type="text" name="search" value="<!-- TMPL_VAR Name="search" -->" size="35">
				<input type="submit" value="Start search" class="button catalogue">
				<input type="hidden" name="type" value="<!-- TMPL_VAR Name="type" -->">
				<input type="hidden" name="index" value="<!-- TMPL_VAR Name="anindex" ESCAPE="URL" -->">
			</p>
		</div>
	</form>

<!-- TMPL_IF Name=search -->
	<div class="bloc25">
	<h2 class="catalogue">Dictionary Search results</h2>
	<!-- TMPL_IF NAME="authresult" -->
		<div id="resultnumber">
			<p><!-- TMPL_IF NAME="displayprev" --> 
					<a class="resultnumber" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&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="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
					<!-- /TMPL_IF -->
				<!-- /TMPL_LOOP --> 
				<!-- TMPL_IF NAME="displaynext" -->
					<a class="resultnumber" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">Next&gt;&gt;</a>
				<!-- /TMPL_IF -->
			</p>
			<p class="resultcount">
			<!-- TMPL_IF NAME="nbresults" -->
					Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="nbresults" --><!-- TMPL_ELSE -->No results found.
			<!-- /TMPL_IF -->
			</p>
		</div>
		<div id="resultlist">
			<table>
				<tr>
					<th colspan="3" class="catalogue">Authorities</th>
				</tr>
				<tr>
					<th class="catalogue">Summary</th>
					<th class="catalogue">Used in</th>
					<th class="catalogue">Select</th>
				</tr>
				<!-- TMPL_LOOP NAME="authresult" -->
					<tr>
						<!-- TMPL_IF NAME="even" -->
							<td class="hilighted">
						<!-- TMPL_ELSE -->
							<td>
						<!-- /TMPL_IF -->
							<!-- TMPL_VAR NAME="summary" -->
						</td>
						<!-- TMPL_IF NAME="even" -->
							<td class="hilighted">
						<!-- TMPL_ELSE -->
							<td>
						<!-- /TMPL_IF -->
							<!-- TMPL_VAR NAME="used" --> biblio(s)
						</td>
						<!-- TMPL_IF NAME="even" -->
							<td class="hilighted">
						<!-- TMPL_ELSE -->
							<td>
						<!-- /TMPL_IF -->
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)" class="button catalogue">select</a>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)" class="button catalogue">sel&amp;close</a>
						</td>
					</tr>
				<!-- /TMPL_LOOP -->
			</table>
		</div>
		<!-- TMPL_ELSE -->
			<h3 class="catalogue">No results in Authorities</h3>
	<!-- /TMPL_IF -->
		
		
	<!-- TMPL_IF Name=catresult -->	
		<div id="resultnumber">
			<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>
		<div id="resultlist">
			<table>
				<tr>
					<th class="catalogue">Summary</th>
					<th class="catalogue">Used in</th>
					<th class="catalogue">Select</th>
				</tr>
				<!-- TMPL_LOOP NAME="catresult" -->
				<tr>
					<!-- TMPL_IF NAME="even" -->
					<td class="hilighted">
					<!-- TMPL_ELSE -->
					<td>
					<!-- /TMPL_IF -->
								<!-- TMPL_IF name="MARC_ON" -->
									<!-- TMPL_VAR NAME="value" -->
								<!-- TMPL_ELSE -->
									<!-- TMPL_VAR NAME="value" -->
								<!-- /TMPL_IF -->
					</td>
					<td align="center" <!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
						<!-- TMPL_VAR NAME="count" --> biblio(s)
					</td>
					<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)" class="button catalogue">Select</a>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)" class="button catalogue">Sel&amp;close</a>
					</td>
				</tr>
				<!-- /TMPL_LOOP -->
			</table>
		</div>
		<div id="resultnumber">
			<p><!-- TMPL_IF NAME="displayprev" --> 
					<a class="resultnumber" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&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="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
					<!-- /TMPL_IF -->
				<!-- /TMPL_LOOP --> 
				<!-- TMPL_IF NAME="displaynext" -->
					<a class="resultnumber" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">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>
	<!-- /TMPL_IF -->
	<script language="JavaScript" type="text/javascript">
	function SelectEntry(myentry, myindex, wclose){
		if (opener.document.f.value[myindex].value!=""){ 
			opener.document.f.value[myindex].value=opener.document.f.value[myindex].value+" "+myentry
		} else {
			opener.document.f.value[myindex].value=myentry
		}
		if (wclose == 1) {
	// 	alert("closing")
			self.close();
		}
	}
	</script>
	</div>
<!-- /TMPL_IF -->
</div>
</body>
</html>
Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -C2 -r1.21.2.1 -r1.21.2.2
*** search.tmpl	7 Mar 2005 09:49:07 -0000	1.21.2.1
--- search.tmpl	7 Jun 2005 10:02:01 -0000	1.21.2.2
***************
*** 31,34 ****
--- 31,37 ----
  			<input type="hidden" name="operator" value="contains">
  			<input type="text" name="value" id="title" onchange="sql_update()" size="35">
+ 			<a href="javascript:Dopop('dictionary.pl?marclist=biblio.title&amp;type=intranet&amp;index=1',1)" class="button catalogue">
+ 				...
+ 			</a>
  		</p>
  		<p>
***************
*** 38,41 ****
--- 41,47 ----
  			<input type="hidden" name="operator" value="contains">
  			<input type="text" name="value" id="author" onchange="sql_update()" size="35">
+ 			<a href="javascript:Dopop('dictionary.pl?marclist=biblio.author&amp;type=intranet&amp;index=2',2)" class="button catalogue">
+ 				...
+ 			</a>
  		</p>
  		<p>
***************
*** 46,49 ****
--- 52,58 ----
  			<input type="hidden" name="operator" value="contains">  
  			<input type="text" name="value" id="subject" onchange="sql_update()" size="35">
+ 			<a href="javascript:Dopop('dictionary.pl?marclist=bibliosubject.subject&amp;type=intranet&amp;index=3',3)" class="button catalogue">
+ 				...
+ 			</a>
  		</p>
  		<p>
***************
*** 151,155 ****
  		<p>
  			<input type="submit" value="Start search" class="button catalogue">
! 			<a href="/cgi-bin/koha/search.marc/suggest.pl" onclick="PopupSuggestion(); return false;" class="button catalogue">Suggestions</a>
  		</p>
  	</div>
--- 160,164 ----
  		<p>
  			<input type="submit" value="Start search" class="button catalogue">
! 			<a href="/cgi-bin/koha/search.marc/suggest.pl" onclick="PopupSuggestion(); return false;" class="button catalogue">Spelling suggestion</a>
  		</p>
  	</div>
***************
*** 177,180 ****
--- 186,195 ----
  }
  
+ function Dopop(link,i) {
+ 	var searchstring=document.forms[0].value[i].value;
+ 	newin=window.open(link+'&amp;search='+searchstring,"popup",'width=700,height=550,toolbar=false,scrollbars=yes');
+ }
+ 
+ 
  function PopupSuggestion() {
      var strQuery="";




From tipaul at users.sourceforge.net  Tue Jun  7 12:23:16 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 03:23:16 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-dictionary.pl,NONE,1.1.2.1
Message-ID: <E1DfbEq-0000z6-02@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3722/opac

Added Files:
      Tag: rel_2_2
	opac-dictionary.pl 
Log Message:
porting dictionary search to OPAC

--- NEW FILE ---
#!/usr/bin/perl


# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Auth;
use CGI;
use C4::Search;
use C4::SearchMarc;
use C4::AuthoritiesMarc;
use C4::Context;
use C4::Biblio;
use HTML::Template;

=head1 NAME

dictionnary.pl : script to search in biblio & authority an existing value

=head1 SYNOPSIS

useful when the user want to search a term before running a query. For example, to see if "computer" is used in the database

The parameter "marclist" tells which field is searched (title, author, subject, but could be anything else)

This script searches in both biblios & authority
* in biblio, the script search in all marc fields related to what the user is looking for (for example, if the dictionnary is used on "author", the script searches in biblio.author, but also in additional authors & any MARC field related to author (through the "seealso" MARC constraint)
* in authority, the script search everywhere. Thus, the accepted & rejected forms are found.

The script shows all results & the user can choose what he want, that is copied into search form.

=cut

my $input = new CGI;
my $field =$input->param('marclist');
#warn "field :$field";
my ($tablename, $kohafield)=split /./,$field;
#my $tablename=$input->param('tablename');
$tablename="biblio" unless ($tablename);
#my $kohafield = $input->param('kohafield');
my @search = $input->param('search');
# warn " ".$search[0];
my $index = $input->param('index');
# warn " index: ".$index;
my $op=$input->param('op');
if (($search[0]) and not ($op eq 'do_search')){
	$op='do_search';
}
my $script_name = 'opac-dictionary.pl';
my $query;
my $type=$input->param('type');
#warn " ".$type;

my $dbh = C4::Context->dbh;
my ($template, $loggedinuser, $cookie);

my $env;

my $startfrom=$input->param('startfrom');
$startfrom=0 if(!defined $startfrom);
my $searchdesc;
my $resultsperpage;

#warn "Starting process";

if ($op eq "do_search") {
	#
	# searching in biblio
	#
	my $sth=$dbh->prepare("Select distinct tagfield,tagsubfield from marc_subfield_structure where kohafield = ?");
	$sth->execute("$field");
	my (@tags, @and_or, @operator, @excluding, at value);
	
 	while ((my $tagfield,my $tagsubfield,my $liblibrarian) = $sth->fetchrow) {
 		push @tags, $dbh->quote("$tagfield$tagsubfield");
 	}

	$resultsperpage= $input->param('resultsperpage');
	$resultsperpage = 19 if(!defined $resultsperpage);
	my $orderby = $input->param('orderby');

	findseealso($dbh,\@tags);

	my @results, my $total;
	my $strsth="select distinct subfieldvalue, count(marc_subfield_table.bibid) from marc_subfield_table,marc_word where marc_word.word like ? and marc_subfield_table.bibid=marc_word.bibid and marc_subfield_table.tagorder=marc_word.tagorder and marc_word.tagsubfield in ";
	my $listtags="(";
	foreach my $tag (@tags){
		$listtags .= $tag .",";
	}
	$listtags =~s/,$/)/;
	$strsth .= $listtags." and marc_word.tagsubfield=marc_subfield_table.tag+marc_subfield_table.subfieldcode group by subfieldvalue ";
# 	warn "search in biblio : ".$strsth;
	my $value = uc($search[0]);
	$value=~s/\*/%/g;
	$value.= "%" if not($value=~m/%/);
# 	warn " texte : ".$value;

	$sth=$dbh->prepare($strsth);
	$sth->execute($value);
	my $total;
	my @catresults;
	while (my ($value,$ctresults)=$sth->fetchrow) {
# 		warn "countresults : ".$ctresults;
		push @catresults,{value=> $value, 
						  even=>($total-$startfrom*$resultsperpage)%2,
						  count=>$ctresults
						  } if (($total>=$startfrom*$resultsperpage) and ($total<($startfrom+1)*$resultsperpage));
		$total++;
	}
	

	my $strsth="Select distinct authtypecode from marc_subfield_structure where (";
	foreach my $listtags (@tags){
		my @taglist=split /,/,$listtags;
		foreach my $curtag (@taglist){
			$strsth.="(tagfield='".substr($curtag,1,3)."' AND tagsubfield='".substr($curtag,4,1)."') OR";
		}
	}
	
	$strsth=~s/ OR$/)/;
	my $strsth = $strsth." and authtypecode is not NULL";
# 	warn $strsth;
	my $sth=$dbh->prepare($strsth);
	$sth->execute;
	
	#
	# searching in authorities
	#
	my @authresults;
	my $authnbresults;
	while ((my $authtypecode) = $sth->fetchrow) {
		my ($curauthresults,$nbresults) = authoritysearch($dbh,[''],[''],[''],['contains'],
														\@search,$startfrom*$resultsperpage, $resultsperpage,$authtypecode);
		push @authresults, @$curauthresults;
		$authnbresults+=$nbresults;
#		warn "auth : $authtypecode nbauthresults : $nbresults";
	}
	
	# 
	# OK, filling the template with authorities & biblio entries found.
	#
	($template, $loggedinuser, $cookie)
		= get_template_and_user({template_name => "opac-dictionary.tmpl",
				query => $input,
				type => 'opac',
				authnotrequired => 1,
				debug => 1,
				});

	# multi page display gestion
	my $displaynext=0;
	my $displayprev=$startfrom;
	if(($total - (($startfrom+1)*($resultsperpage))) > 0 ) {
		$displaynext = 1;
	}

	my @field_data = ();

	for(my $i = 0 ; $i <= $#tags ; $i++) {
		push @field_data, { term => "marclist", val=>$tags[$i] };
		push @field_data, { term => "and_or", val=>$and_or[$i] };
		push @field_data, { term => "excluding", val=>$excluding[$i] };
		push @field_data, { term => "operator", val=>$operator[$i] };
		push @field_data, { term => "value", val=>$value[$i] };
	}

	my @numbers = ();

	if ($total>$resultsperpage) {
		for (my $i=1; $i<$total/$resultsperpage+1; $i++) {
			if ($i<16) {
	    		my $highlight=0;
	    		($startfrom==($i-1)) && ($highlight=1);
	    		push @numbers, { number => $i,
					highlight => $highlight ,
					searchdata=> \@field_data,
					startfrom => ($i-1)};
			}
    	}
	}

	my $from = $startfrom*$resultsperpage+1;
	my $to;

 	if($total < (($startfrom+1)*$resultsperpage))
	{
		$to = $total;
	} else {
		$to = (($startfrom+1)*$resultsperpage);
	}
	$template->param(anindex => $input->param('index'));
	$template->param(result => \@results,
					 catresult=> \@catresults,
						search => $search[0],
						marclist =>$field,
						authresult => \@authresults,
						nbresults => $authnbresults,
						startfrom=> $startfrom,
						displaynext=> $displaynext,
						displayprev=> $displayprev,
						resultsperpage => $resultsperpage,
						startfromnext => $startfrom+1,
						startfromprev => $startfrom-1,
						searchdata=>\@field_data,
						total=>$total,
						from=>$from,
						to=>$to,
						numbers=>\@numbers,
						MARC_ON => C4::Context->preference("marc"),
						);

 } else {
 	($template, $loggedinuser, $cookie)
 		= get_template_and_user({template_name => "opac-dictionary.tmpl",
 				query => $input,
 				type => 'opac',
				authnotrequired => 1,
 				debug => 1,
 				});
#warn "type : $type";
 
 }
$template->param(search => $search[0],
					marclist =>$field,
					type=>$type,
					anindex => $input->param('index'));

# Print the page
output_html_with_http_headers $input, $cookie, $template->output;

# Local Variables:
# tab-width: 4
# End:




From tipaul at users.sourceforge.net  Tue Jun  7 12:23:15 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 03:23:15 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-dictionary.tmpl,NONE,1.1.2.1 opac-search.tmpl,1.11.2.7,1.11.2.8
Message-ID: <E1DfbEp-0000z3-VL@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-search.tmpl 
Added Files:
      Tag: rel_2_2
	opac-dictionary.tmpl 
Log Message:
porting dictionary search to OPAC

--- NEW FILE ---
<!-- TMPL_INCLUDE name="popup-top.inc"-->
<body>
<div id="mainbloc">
	<h1 class="catalogue">Dictionary Search</h1>
	
	<form name="f" method="post" action="opac-dictionary.pl">
		<div class="bloc25">
			<h2 class="catalogue">Search on</h2>
			<p>
				<input type="hidden" name="op" value="do_search">
				<label class="label100" for="keyword"></label>
				<input type="hidden" name="marclist" value="<!-- TMPL_VAR Name="marclist" -->">
				<input type="text" name="search" value="<!-- TMPL_VAR Name="search" -->" size="35">
				<input type="submit" value="Start search" class="button catalogue">
				<input type="hidden" name="type" value="<!-- TMPL_VAR Name="type" -->">
				<input type="hidden" name="index" value="<!-- TMPL_VAR Name="anindex" ESCAPE="URL" -->">
			</p>
		</div>
	</form>

<!-- TMPL_IF Name=search -->
	<div class="bloc25">
	<h2 class="catalogue">Dictionary Search results</h2>
	<!-- TMPL_IF NAME="authresult" -->
		<div id="resultnumber">
			<p><!-- TMPL_IF NAME="displayprev" --> 
					<a class="resultnumber" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&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="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
					<!-- /TMPL_IF -->
				<!-- /TMPL_LOOP --> 
				<!-- TMPL_IF NAME="displaynext" -->
					<a class="resultnumber" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">Next&gt;&gt;</a>
				<!-- /TMPL_IF -->
			</p>
			<p class="resultcount">
			<!-- TMPL_IF NAME="nbresults" -->
					Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="nbresults" --><!-- TMPL_ELSE -->No results found.
			<!-- /TMPL_IF -->
			</p>
		</div>
		<div id="resultlist">
			<table>
				<tr>
					<th colspan="3" class="catalogue">Authorities</th>
				</tr>
				<tr>
					<th class="catalogue">Summary</th>
					<th class="catalogue">Used in</th>
					<th class="catalogue">Select</th>
				</tr>
				<!-- TMPL_LOOP NAME="authresult" -->
					<tr>
						<!-- TMPL_IF NAME="even" -->
							<td class="hilighted">
						<!-- TMPL_ELSE -->
							<td>
						<!-- /TMPL_IF -->
							<!-- TMPL_VAR NAME="summary" -->
						</td>
						<!-- TMPL_IF NAME="even" -->
							<td class="hilighted">
						<!-- TMPL_ELSE -->
							<td>
						<!-- /TMPL_IF -->
							<!-- TMPL_VAR NAME="used" --> biblio(s)
						</td>
						<!-- TMPL_IF NAME="even" -->
							<td class="hilighted">
						<!-- TMPL_ELSE -->
							<td>
						<!-- /TMPL_IF -->
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)" class="button catalogue">select</a>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)" class="button catalogue">sel&amp;close</a>
						</td>
					</tr>
				<!-- /TMPL_LOOP -->
			</table>
		</div>
		<!-- TMPL_ELSE -->
			<h3 class="catalogue">No results in Authorities</h3>
	<!-- /TMPL_IF -->
		
		
	<!-- TMPL_IF Name=catresult -->	
		<div id="resultnumber">
			<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>
		<div id="resultlist">
			<table>
				<tr>
					<th class="catalogue">Summary</th>
					<th class="catalogue">Used in</th>
					<th class="catalogue">Select</th>
				</tr>
				<!-- TMPL_LOOP NAME="catresult" -->
				<tr>
					<!-- TMPL_IF NAME="even" -->
					<td class="hilighted">
					<!-- TMPL_ELSE -->
					<td>
					<!-- /TMPL_IF -->
								<!-- TMPL_IF name="MARC_ON" -->
									<!-- TMPL_VAR NAME="value" -->
								<!-- TMPL_ELSE -->
									<!-- TMPL_VAR NAME="value" -->
								<!-- /TMPL_IF -->
					</td>
					<td align="center" <!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
						<!-- TMPL_VAR NAME="count" --> biblio(s)
					</td>
					<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)" class="button catalogue">Select</a>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)" class="button catalogue">Sel&amp;close</a>
					</td>
				</tr>
				<!-- /TMPL_LOOP -->
			</table>
		</div>
		<div id="resultnumber">
			<p><!-- TMPL_IF NAME="displayprev" --> 
					<a class="resultnumber" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&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="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
					<!-- /TMPL_IF -->
				<!-- /TMPL_LOOP --> 
				<!-- TMPL_IF NAME="displaynext" -->
					<a class="resultnumber" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">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>
	<!-- /TMPL_IF -->
	<script language="JavaScript" type="text/javascript">
	function SelectEntry(myentry, myindex, wclose){
		if (opener.document.f.value[myindex].value!=""){ 
			opener.document.f.value[myindex].value=opener.document.f.value[myindex].value+" "+myentry
		} else {
			opener.document.f.value[myindex].value=myentry
		}
		if (wclose == 1) {
	// 	alert("closing")
			self.close();
		}
	}
	</script>
	</div>
<!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE name="opac-bottom.inc" -->
Index: opac-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl,v
retrieving revision 1.11.2.7
retrieving revision 1.11.2.8
diff -C2 -r1.11.2.7 -r1.11.2.8
*** opac-search.tmpl	31 May 2005 15:15:28 -0000	1.11.2.7
--- opac-search.tmpl	7 Jun 2005 10:23:13 -0000	1.11.2.8
***************
*** 25,28 ****
--- 25,31 ----
  			<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>
***************
*** 32,35 ****
--- 35,41 ----
  			<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>
***************
*** 40,43 ****
--- 46,52 ----
  			<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>
***************
*** 155,158 ****
--- 164,169 ----
  		<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>




From tipaul at users.sourceforge.net  Tue Jun  7 13:03:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 04:03:54 -0700
Subject: [Koha-cvs] CVS: koha/acqui basket.pl,1.24.2.2,1.24.2.3
Message-ID: <E1DfbsA-0006Fz-Mq@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23970/acqui

Modified Files:
      Tag: rel_2_2
	basket.pl 
Log Message:
adding total to calculate rrp & est prices separately

Index: basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/basket.pl,v
retrieving revision 1.24.2.2
retrieving revision 1.24.2.3
diff -C2 -r1.24.2.2 -r1.24.2.3
*** basket.pl	14 Apr 2005 20:31:38 -0000	1.24.2.2
--- basket.pl	7 Jun 2005 11:03:52 -0000	1.24.2.3
***************
*** 56,59 ****
--- 56,61 ----
  my ($count2, at booksellers)=bookseller($booksellerid);
  
+ # get librarian branch...
+ 
  # if new basket, pre-fill infos
  $basket->{creationdate} = "" unless ($basket->{creationdate});
***************
*** 66,69 ****
--- 68,76 ----
  my $grand_total; # $subttotal + $gist
  
+ # my $line_total_est; # total of each line
+ my $sub_total_est; # total of line totals
+ my $gist_est;      # GST
+ my $grand_total_est; # $subttotal + $gist
+ 
  my @books_loop;
  for (my $i=0;$i<$count;$i++){
***************
*** 71,74 ****
--- 78,82 ----
  	$rrp=curconvert($results[$i]->{'currency'},$rrp);
  
+ 	$sub_total_est+=$results[$i]->{'quantity'}*$results[$i]->{'rrp'};
  	$line_total=$results[$i]->{'quantity'}*$results[$i]->{'ecost'};
  	$sub_total+=$line_total;
***************
*** 99,102 ****
--- 107,112 ----
  $gist=sprintf("%.2f",$sub_total*$prefgist);
  $grand_total=$sub_total+$gist;
+ $grand_total_est = $sub_total_est+sprintf("%.2f",$sub_total_est*$prefgist);
+ $gist_est = sprintf("%.2f",$sub_total_est*$prefgist);
  $template->param(basketno => $basketno,
  				creationdate => $basket->{creationdate},
***************
*** 107,110 ****
--- 117,124 ----
  				booksellerid=> $booksellers[0]->{'id'},
  				name => $booksellers[0]->{'name'},
+ 				address1 => $booksellers[0]->{'address1'},
+ 				address2 => $booksellers[0]->{'address2'},
+ 				address3 => $booksellers[0]->{'address3'},
+ 				address4 => $booksellers[0]->{'address4'},
  				entrydate => format_date($results[0]->{'entrydate'}),
  				books_loop => \@books_loop,
***************
*** 113,116 ****
--- 127,133 ----
  				gist => $gist,
  				grand_total =>$grand_total,
+ 				sub_total_est => $sub_total_est,
+ 				gist_est => $gist_est,
+ 				grand_total_est =>$grand_total_est,
  				currency => $booksellers[0]->{'listprice'},
  				);




From tipaul at users.sourceforge.net  Tue Jun  7 13:03:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 04:03:54 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui basket.tmpl,1.15.2.5,1.15.2.6
Message-ID: <E1DfbsA-0006G0-NV@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	basket.tmpl 
Log Message:
adding total to calculate rrp & est prices separately

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.15.2.5
retrieving revision 1.15.2.6
diff -C2 -r1.15.2.5 -r1.15.2.6
*** basket.tmpl	19 May 2005 22:41:07 -0000	1.15.2.5
--- basket.tmpl	7 Jun 2005 11:03:52 -0000	1.15.2.6
***************
*** 32,38 ****
  				<th class="acquisition doNotPrint">Order</th>
  				<th class="acquisition">Publisher<a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=biblioitems.publishercode" class="acquisition doNotPrint">[order]</a></th>
- 				<th class="acquisition">Isbn</th>
  				<th class="acquisition">Title</th>
- 				<th class="acquisition">Author</th>
  				<th class="acquisition">rrp</th>
  				<th class="acquisition doNotPrint">est</th>
--- 32,36 ----
***************
*** 50,60 ****
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
- 					<td><!-- TMPL_VAR NAME="isbn" --></td>
  					<!-- TMPL_IF name="closedate" -->
! 						<td><!-- TMPL_VAR NAME="title" --></td>
  					<!-- TMPL_ELSE -->
! 						<td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
  					<!-- /TMPL_IF -->
- 					<td><!-- TMPL_VAR NAME="author" --></td>
  					<td><!-- TMPL_VAR NAME="rrp" --></td>
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="ecost" --></td>
--- 48,69 ----
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
  					<!-- TMPL_IF name="closedate" -->
! 						<td><p>
! 							<b><!-- TMPL_VAR NAME="title" --></b><br/>
! 								<!-- TMPL_VAR NAME="author" -->
! 								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! 							</p>
! 						</td>
  					<!-- TMPL_ELSE -->
! 						<td>
! 							<p>
! 							<a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a><br/>
! 								<!-- TMPL_VAR NAME="author" -->
! 								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! 							</p>
! 						</td>
  					<!-- /TMPL_IF -->
  					<td><!-- TMPL_VAR NAME="rrp" --></td>
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="ecost" --></td>
***************
*** 76,92 ****
  			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
  			<tr>
! 				<td colspan="4" rowspan=3>
  					&nbsp;
  				</td>
! 				<th colspan="2" class="acquisition">SubTotal</th>
! 				<th class="acquisition"><!-- TMPL_VAR NAME="currency" --><!-- TMPL_VAR NAME="sub_total" --></th>
! 			</tr>
! 			<tr>
! 				<th colspan="2" class="acquisition">GST</th>
! 				<th class="acquisition"><!-- TMPL_VAR NAME="currency" --><!-- TMPL_VAR NAME="gist" --></th>
! 			</tr>
! 			<tr>
! 				<th colspan="2" class="acquisition">TOTAL</th>
! 				<th class="acquisition"><!-- TMPL_VAR NAME="currency" --><!-- TMPL_VAR NAME="grand_total" --></th>
  			</tr>
  		</table>
--- 85,121 ----
  			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
  			<tr>
! 				<td colspan="2" class="acquisition">
  					&nbsp;
  				</td>
! 				<td class="acquisition number">
! 					<p>Sub total</p>
! 					<p>GST</p>
! 					<p>TOTAL (<!-- TMPL_VAR NAME="currency" -->)</p>
! 				</td>
! 				<td class="acquisition number">
! 					<p><!-- TMPL_VAR NAME="sub_total_est" --></p>
! 					<p><!-- TMPL_VAR NAME="gist_est" --></p>
! 					<p><!-- TMPL_VAR NAME="grand_total_est" --></p>
! 				</td>
! 				<td class="acquisition number">
! 					<p><!-- TMPL_VAR NAME="sub_total" --></p>
! 					<p><!-- TMPL_VAR NAME="gist" --></p>
! 					<p><!-- TMPL_VAR NAME="grand_total" --></p>
! 				</td>
! 				<td class="acquisition">
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 				</td>
! 				<td class="acquisition">
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 				</td>
! 				<td class="acquisition">
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 				</td>
  			</tr>
  		</table>




From tipaul at users.sourceforge.net  Tue Jun  7 14:56:39 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 05:56:39 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui basket.tmpl,1.15.2.6,1.15.2.7
Message-ID: <E1DfddH-00051Q-Oa@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	basket.tmpl 
Log Message:
fix for #958 : showing notes in order list screen. The note can be used for whatever the library want, and should be seen here.
The table has been improved :
* title / isbn / author / note are on the same column, as in marc search
* alternate colors working

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.15.2.6
retrieving revision 1.15.2.7
diff -C2 -r1.15.2.6 -r1.15.2.7
*** basket.tmpl	7 Jun 2005 11:03:52 -0000	1.15.2.6
--- basket.tmpl	7 Jun 2005 12:56:37 -0000	1.15.2.7
***************
*** 45,49 ****
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
! 				<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="color" -->">
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
--- 45,53 ----
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
! 				<!-- TMPL_IF name="odd" -->
! 				<tr class="hilighted">
! 				<!-- TMPL_ELSE -->
! 				<tr>
! 				<!-- /TMPL_IF -->
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
***************
*** 53,57 ****
  								<!-- TMPL_VAR NAME="author" -->
  								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
  							</p>
  						</td>
--- 57,61 ----
  								<!-- TMPL_VAR NAME="author" -->
  								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
  							</p>
  						</td>
***************
*** 62,73 ****
  								<!-- TMPL_VAR NAME="author" -->
  								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
  							</p>
  						</td>
  					<!-- /TMPL_IF -->
! 					<td><!-- TMPL_VAR NAME="rrp" --></td>
! 					<td class="doNotPrint"><!-- TMPL_VAR NAME="ecost" --></td>
! 					<td><!-- TMPL_VAR NAME="quantity" --></td>
! 					<td><!-- TMPL_VAR NAME="line_total" --></td>
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="bookfundid" --></td>
  					<!-- TMPL_IF name="active" -->
--- 66,77 ----
  								<!-- TMPL_VAR NAME="author" -->
  								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
  							</p>
  						</td>
  					<!-- /TMPL_IF -->
! 					<td class="number"><!-- TMPL_VAR NAME="rrp" --></td>
! 					<td class="doNotPrint number"><!-- TMPL_VAR NAME="ecost" --></td>
! 					<td class="number"><!-- TMPL_VAR NAME="quantity" --></td>
! 					<td class="number"><!-- TMPL_VAR NAME="line_total" --></td>
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="bookfundid" --></td>
  					<!-- TMPL_IF name="active" -->
***************
*** 104,108 ****
  				</td>
  				<td class="acquisition">
! 					<p>&nbsp;</p>
  					<p>&nbsp;</p>
  					<p>&nbsp;</p>
--- 108,112 ----
  				</td>
  				<td class="acquisition">
! 					<p><!-- TMPL_VAR name="qty_total" --></p>
  					<p>&nbsp;</p>
  					<p>&nbsp;</p>




From tipaul at users.sourceforge.net  Tue Jun  7 14:56:39 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 05:56:39 -0700
Subject: [Koha-cvs] CVS: koha/C4 Acquisition.pm,1.9.2.4,1.9.2.5
Message-ID: <E1DfddH-00051V-Rh@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19188/C4

Modified Files:
      Tag: rel_2_2
	Acquisition.pm 
Log Message:
fix for #958 : showing notes in order list screen. The note can be used for whatever the library want, and should be seen here.
The table has been improved :
* title / isbn / author / note are on the same column, as in marc search
* alternate colors working

Index: Acquisition.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.9.2.4
retrieving revision 1.9.2.5
diff -C2 -r1.9.2.4 -r1.9.2.5
*** Acquisition.pm	6 Jun 2005 16:36:43 -0000	1.9.2.4
--- Acquisition.pm	7 Jun 2005 12:56:37 -0000	1.9.2.5
***************
*** 105,109 ****
  	my ($basketno,$supplier,$orderby)=@_;
  	my $dbh = C4::Context->dbh;
! 	my $query="Select *,biblio.title from aqorders,biblio,biblioitems
  	left join aqorderbreakdown on aqorderbreakdown.ordernumber=aqorders.ordernumber
  	where basketno='$basketno'
--- 105,109 ----
  	my ($basketno,$supplier,$orderby)=@_;
  	my $dbh = C4::Context->dbh;
! 	my $query="Select biblio.*,biblioitems.*,aqorders.*,aqorderbreakdown.*,biblio.title from aqorders,biblio,biblioitems
  	left join aqorderbreakdown on aqorderbreakdown.ordernumber=aqorders.ordernumber
  	where basketno='$basketno'




From tipaul at users.sourceforge.net  Tue Jun  7 14:56:39 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 05:56:39 -0700
Subject: [Koha-cvs] CVS: koha/acqui basket.pl,1.24.2.3,1.24.2.4
Message-ID: <E1DfddH-00051T-R2@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19188/acqui

Modified Files:
      Tag: rel_2_2
	basket.pl 
Log Message:
fix for #958 : showing notes in order list screen. The note can be used for whatever the library want, and should be seen here.
The table has been improved :
* title / isbn / author / note are on the same column, as in marc search
* alternate colors working

Index: basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/basket.pl,v
retrieving revision 1.24.2.3
retrieving revision 1.24.2.4
diff -C2 -r1.24.2.3 -r1.24.2.4
*** basket.pl	7 Jun 2005 11:03:52 -0000	1.24.2.3
--- basket.pl	7 Jun 2005 12:56:36 -0000	1.24.2.4
***************
*** 73,76 ****
--- 73,78 ----
  my $grand_total_est; # $subttotal + $gist
  
+ my $qty_total;
+ 
  my @books_loop;
  for (my $i=0;$i<$count;$i++){
***************
*** 81,90 ****
  	$line_total=$results[$i]->{'quantity'}*$results[$i]->{'ecost'};
  	$sub_total+=$line_total;
  	my %line;
- 	if ($i % 2){
- 		$line{highlight}=1;
- 	} else {
- 		$line{highlight}=0;
- 	}
  	$line{ordernumber} = $results[$i]->{'ordernumber'};
  	$line{publishercode} = $results[$i]->{'publishercode'};
--- 83,88 ----
  	$line_total=$results[$i]->{'quantity'}*$results[$i]->{'ecost'};
  	$sub_total+=$line_total;
+ 	$qty_total += $results[$i]->{'quantity'};
  	my %line;
  	$line{ordernumber} = $results[$i]->{'ordernumber'};
  	$line{publishercode} = $results[$i]->{'publishercode'};
***************
*** 93,96 ****
--- 91,95 ----
  	$line{basketno}=$basketno;
  	$line{title} = $results[$i]->{'title'};
+ 	$line{notes} = $results[$i]->{'notes'};
  	$line{author} = $results[$i]->{'author'};
  	$line{i} = $i;
***************
*** 102,105 ****
--- 101,105 ----
  	$line{biblionumber} = $results[$i]->{'biblionumber'};
  	$line{bookfundid} = $results[$i]->{'bookfundid'};
+ 	$line{odd} = $i %2;
  	push @books_loop, \%line;
  }
***************
*** 131,134 ****
--- 131,135 ----
  				grand_total_est =>$grand_total_est,
  				currency => $booksellers[0]->{'listprice'},
+ 				qty_total => $qty_total,
  				);
  output_html_with_http_headers $query, $cookie, $template->output;




From tipaul at users.sourceforge.net  Tue Jun  7 15:17:41 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 06:17:41 -0700
Subject: [Koha-cvs] CVS: koha/acqui acqui-home.pl,1.3,1.3.2.1
Message-ID: <E1Dfdxd-00088W-SN@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31177/acqui

Modified Files:
      Tag: rel_2_2
	acqui-home.pl 
Log Message:
warn the user if no budget is defined (& prevent creating an order, as it would be buggy)

Index: acqui-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/acqui-home.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** acqui-home.pl	13 Jul 2004 12:53:00 -0000	1.3
--- acqui-home.pl	7 Jun 2005 13:17:38 -0000	1.3.2.1
***************
*** 64,68 ****
  						totspent => sprintf("%.2f",$totspent),
  						totcomtd => sprintf("%.2f",$totcomtd),
! 						totavail => sprintf("%.2f",$totavail));
  
  output_html_with_http_headers $query, $cookie, $template->output;
--- 64,69 ----
  						totspent => sprintf("%.2f",$totspent),
  						totcomtd => sprintf("%.2f",$totcomtd),
! 						totavail => sprintf("%.2f",$totavail),
! 						nobudget => $#results==-1?1:0);
  
  output_html_with_http_headers $query, $cookie, $template->output;




From tipaul at users.sourceforge.net  Tue Jun  7 15:17:41 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 06:17:41 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui acqui-home.tmpl,1.14,1.14.2.1
Message-ID: <E1Dfdxd-00088U-MD@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	acqui-home.tmpl 
Log Message:
warn the user if no budget is defined (& prevent creating an order, as it would be buggy)

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C2 -r1.14 -r1.14.2.1
*** acqui-home.tmpl	19 Oct 2004 12:24:57 -0000	1.14
--- acqui-home.tmpl	7 Jun 2005 13:17:38 -0000	1.14.2.1
***************
*** 5,8 ****
--- 5,11 ----
  <div id="bloc25">
  	<h2 class="acquisition">Start, receive, modify order</h2>
+ 	<!-- TMPL_IF name="nobudget" -->
+ 		<p class="problem">You must define a budget in parameters</p>
+ 	<!-- TMPL_ELSE -->
  		<form action="/cgi-bin/koha/acqui/order.pl" method="post">
  			Supplier name : <input type="text"  size="25"   name="supplier">
***************
*** 10,13 ****
--- 13,17 ----
  		</form>
  	<p>or <a href="histsearch.pl" class="button acquisition">Search order history</a></p>
+ 	<!-- /TMPL_IF -->
  </div>
  
***************
*** 38,43 ****
  <!-- showbudget-->
  <div id="bloc25">
! 	<form action="/cgi-bin/koha/search.pl">
! 		<h2 class="acquisition">budgets and bookfunds</h2>
  		<table class="noborder">
  			<tr>
--- 42,49 ----
  <!-- showbudget-->
  <div id="bloc25">
! 	<h2 class="acquisition">budgets and bookfunds</h2>
! 	<!-- TMPL_IF name="nobudget" -->
! 		<p class="problem">You must define a budget in parameters</p>
! 	<!-- TMPL_ELSE -->
  		<table class="noborder">
  			<tr>
***************
*** 68,72 ****
  		Use your reload button to get the most recent figures. Committed figures are approximate only, as exchange rates will affect the amount actually paid.
  		</p>
! 	</form>
  </div>
  
--- 74,78 ----
  		Use your reload button to get the most recent figures. Committed figures are approximate only, as exchange rates will affect the amount actually paid.
  		</p>
! 	<!-- /TMPL_IF -->
  </div>
  




From tipaul at users.sourceforge.net  Tue Jun  7 16:35:27 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 07:35:27 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue detail.tmpl,1.17.2.5,1.17.2.6
Message-ID: <E1DffAt-0001NM-8O@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	detail.tmpl 
Log Message:
adding issn & not showing total number of items if there are no

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl,v
retrieving revision 1.17.2.5
retrieving revision 1.17.2.6
diff -C2 -r1.17.2.5 -r1.17.2.6
*** detail.tmpl	27 May 2005 10:02:49 -0000	1.17.2.5
--- detail.tmpl	7 Jun 2005 14:35:23 -0000	1.17.2.6
***************
*** 67,70 ****
--- 67,71 ----
  				<!-- 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>
***************
*** 74,78 ****
  				<!-- 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 -->
--- 75,79 ----
  				<!-- 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>




From oleonard at users.sourceforge.net  Tue Jun  7 22:39:31 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 07 Jun 2005 13:39:31 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui acqui-home.tmpl,1.3.2.1,1.3.2.2
Message-ID: <E1DfkrD-0001RV-Mj@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	acqui-home.tmpl 
Log Message:
Synching with default template

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** acqui-home.tmpl	20 Jan 2005 19:31:57 -0000	1.3.2.1
--- acqui-home.tmpl	7 Jun 2005 20:39:28 -0000	1.3.2.2
***************
*** 6,11 ****
  
  <h1>Acquisitions</h1>
! 
! <div class="details"><form action="/cgi-bin/koha/acqui/order.pl" method="post"><table>
  <caption>Start, Recieve, or Modify Any Order</caption>
  <tr>
--- 6,14 ----
  
  <h1>Acquisitions</h1>
! 	<!-- TMPL_IF name="nobudget" -->
! 		<div class="error">You must define a budget in parameters</div>
! 	<!-- TMPL_ELSE -->
! <div class="details">
! <form action="/cgi-bin/koha/acqui/order.pl" method="post"><table>
  <caption>Start, Recieve, or Modify Any Order</caption>
  <tr>
***************
*** 15,19 ****
--- 18,25 ----
  </table>
  <input type="submit" class="submit" value="Search" /></form>
+ <p>	<form action="histsearch.pl" method="get"><input type="submit" class="submit" value="Search Order History" /></form></p>
  </div>
+ <!-- /TMPL_IF -->
+ 
  <div class="details">
  <form action="/cgi-bin/koha/acqui/acquire.pl" method="post"><table>
***************
*** 66,70 ****
  
  <!-- showbudget-->
! 	<div class="table"><table>
  		<caption>Budgets and Bookfunds</caption>
  			<tr>
--- 72,80 ----
  
  <!-- showbudget-->
! 	<div class="table">
! 		<!-- TMPL_IF name="nobudget" -->
! 		<div class="error">You must define a budget in parameters</div>
! 	<!-- TMPL_ELSE -->
! 	<table>
  		<caption>Budgets and Bookfunds</caption>
  			<tr>
***************
*** 93,97 ****
  				</tfoot>
  			</tr>
! 		</table></div>
  <p>		Use your reload button [ctrl + r] to get the most recent figures.
  		Committed figures are approximate only, as exchange rates will affect the amount actually paid.</p>
--- 103,107 ----
  				</tfoot>
  			</tr>
! 		</table><!-- /TMPL_IF --></div>
  <p>		Use your reload button [ctrl + r] to get the most recent figures.
  		Committed figures are approximate only, as exchange rates will affect the amount actually paid.</p>




From oleonard at users.sourceforge.net  Tue Jun  7 22:39:59 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 07 Jun 2005 13:39:59 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui acqui-home.tmpl,1.4,1.5
Message-ID: <E1Dfkrf-0001XO-2Z@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	acqui-home.tmpl 
Log Message:
Synching with default template

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** acqui-home.tmpl	14 Jan 2005 21:08:45 -0000	1.4
--- acqui-home.tmpl	7 Jun 2005 20:39:56 -0000	1.5
***************
*** 6,11 ****
  
  <h1>Acquisitions</h1>
! 
! <div class="details"><form action="/cgi-bin/koha/acqui/order.pl" method="post"><table>
  <caption>Start, Recieve, or Modify Any Order</caption>
  <tr>
--- 6,14 ----
  
  <h1>Acquisitions</h1>
! 	<!-- TMPL_IF name="nobudget" -->
! 		<div class="error">You must define a budget in parameters</div>
! 	<!-- TMPL_ELSE -->
! <div class="details">
! <form action="/cgi-bin/koha/acqui/order.pl" method="post"><table>
  <caption>Start, Recieve, or Modify Any Order</caption>
  <tr>
***************
*** 15,19 ****
--- 18,25 ----
  </table>
  <input type="submit" class="submit" value="Search" /></form>
+ <p>	<form action="histsearch.pl" method="get"><input type="submit" class="submit" value="Search Order History" /></form></p>
  </div>
+ <!-- /TMPL_IF -->
+ 
  <div class="details">
  <form action="/cgi-bin/koha/acqui/acquire.pl" method="post"><table>
***************
*** 66,70 ****
  
  <!-- showbudget-->
! 	<div class="table"><table>
  		<caption>Budgets and Bookfunds</caption>
  			<tr>
--- 72,80 ----
  
  <!-- showbudget-->
! 	<div class="table">
! 		<!-- TMPL_IF name="nobudget" -->
! 		<div class="error">You must define a budget in parameters</div>
! 	<!-- TMPL_ELSE -->
! 	<table>
  		<caption>Budgets and Bookfunds</caption>
  			<tr>
***************
*** 93,97 ****
  				</tfoot>
  			</tr>
! 		</table></div>
  <p>		Use your reload button [ctrl + r] to get the most recent figures.
  		Committed figures are approximate only, as exchange rates will affect the amount actually paid.</p>
--- 103,107 ----
  				</tfoot>
  			</tr>
! 		</table><!-- /TMPL_IF --></div>
  <p>		Use your reload button [ctrl + r] to get the most recent figures.
  		Committed figures are approximate only, as exchange rates will affect the amount actually paid.</p>




From hellen at users.sourceforge.net  Wed Jun  8 13:28:11 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Wed, 08 Jun 2005 04:28:11 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/catalogue catalogue-home.tmpl,1.2,1.3 detail.tmpl,1.2,1.3 ISBDdetail.tmpl,1.2,1.3 MARCdetail.tmpl,1.2,1.3
Message-ID: <E1DfyjD-0008BR-1P@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	catalogue-home.tmpl detail.tmpl ISBDdetail.tmpl 
	MARCdetail.tmpl 
Log Message:
translated by hellen

Index: catalogue-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/catalogue/catalogue-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** catalogue-home.tmpl	17 May 2005 13:21:35 -0000	1.2
--- catalogue-home.tmpl	8 Jun 2005 11:28:08 -0000	1.3
***************
*** 27,37 ****
  			</select></p>
  			
! 					<p><label class="label100">Search Stil:</label><input type="radio" name="ttype" id=" ttype" value="normal" checked>Normal <input type="radio" name="ttype" value="exact">Exakt</p>
  			</div>
  			
  	<div id="bloc25">
! 		<h2 class="catalogue">Strichcode-Suche</h2>
  		<p>
! 		<label class="label100" for="itemnumber">Strichcode:</label><input type="text"  size="25" id="itemnumber" name="itemnumber"></p>
  </div>
  
--- 27,37 ----
  			</select></p>
  			
! 					<p><label class="label100">Suchart:</label><input type="radio" name="ttype" id=" ttype" value="normal" checked>Normal <input type="radio" name="ttype" value="exact">Exakt</p>
  			</div>
  			
  	<div id="bloc25">
! 		<h2 class="catalogue">Barcode-Suche</h2>
  		<p>
! 		<label class="label100" for="itemnumber">Barcode:</label><input type="text"  size="25" id="itemnumber" name="itemnumber"></p>
  </div>
  

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/catalogue/detail.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** detail.tmpl	17 May 2005 13:21:35 -0000	1.2
--- detail.tmpl	8 Jun 2005 11:28:08 -0000	1.3
***************
*** 34,38 ****
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="author" --><label class="label100"><b>Verfasser</b> </label><!-- TMPL_VAR NAME="author" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="additional" --><label class="label100"><b>Additional Author:</b></label><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><label class="label100"><b>Verlag:</b></label><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" --><br />
  				<!-- TMPL_IF name="publicationyear" --><label class="label100"><b>Ort:</b></label><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
--- 34,38 ----
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="author" --><label class="label100"><b>Verfasser</b> </label><!-- TMPL_VAR NAME="author" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="additional" --><label class="label100"><b>Weitere Verfasser:</b></label><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><label class="label100"><b>Verlag:</b></label><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" --><br />
  				<!-- TMPL_IF name="publicationyear" --><label class="label100"><b>Ort:</b></label><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
***************
*** 72,76 ****
  			<th class="catalogue">Entliehen bis</th>
  			<th class="catalogue">Zuletzt gesehen</th>
! 			<th class="catalogue">Strichcode</th>
  			<th class="catalogue">Band</th>
  		</tr>
--- 72,76 ----
  			<th class="catalogue">Entliehen bis</th>
  			<th class="catalogue">Zuletzt gesehen</th>
! 			<th class="catalogue">Barcode</th>
  			<th class="catalogue">Band</th>
  		</tr>
***************
*** 92,96 ****
  				<!-- TMPL_IF NAME="type" -->
  					<td>
! 						<a href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;item=<!-- TMPL_VAR NAME="itemtype" -->">Fix Itemtype</a>
  					</td>
  				<!-- /TMPL_IF -->
--- 92,96 ----
  				<!-- TMPL_IF NAME="type" -->
  					<td>
! 						<a href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;item=<!-- TMPL_VAR NAME="itemtype" -->">Medientyp &auml;ndern</a>
  					</td>
  				<!-- /TMPL_IF -->

Index: ISBDdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/catalogue/ISBDdetail.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ISBDdetail.tmpl	17 May 2005 13:21:35 -0000	1.2
--- ISBDdetail.tmpl	8 Jun 2005 11:28:08 -0000	1.3
***************
*** 4,8 ****
  	<div id="bibliomenu">
  		<h1 class="catalogue">MARC Biblio : <!-- TMPL_VAR NAME="bibid" --></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="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue">  Edit item  </a>   <a href="javascript:confirm_deletion()" class="button catalogue">  delete  </a>  <a href="MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Complete  </a>  <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normal  </a>  <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD  </a>  <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  Add to shelf  </a>  <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  Print  </a>
  		<!-- TMPL_IF name="subscriptionsnumber" -->
  		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
--- 4,8 ----
  	<div id="bibliomenu">
  		<h1 class="catalogue">MARC Biblio : <!-- TMPL_VAR NAME="bibid" --></h1>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Biblio &auml;ndern  </a>  <a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">  Duplizieren  </a>  <a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue">  Exemplar bearbeiten  </a>   <a href="javascript:confirm_deletion()" class="button catalogue">  l&ouml;schen  </a>  <a href="MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Vollanzeige  </a>  <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normal  </a>  <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD  </a>  <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  Zum Regal hinzuf&uuml;gen  </a>  <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  Drucken  </a>
  		<!-- TMPL_IF name="subscriptionsnumber" -->
  		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">

Index: MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/catalogue/MARCdetail.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** MARCdetail.tmpl	17 May 2005 13:21:35 -0000	1.2
--- MARCdetail.tmpl	8 Jun 2005 11:28:08 -0000	1.3
***************
*** 4,8 ****
  	<div class="tabbed">
  		<h1 class="catalogue">Biblionummer : <!-- TMPL_VAR NAME="biblionumber" --></h1>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Biblio bearbeiten  </a>  <a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">  Duplizieren  </a>  <a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue">  Exemplar bearbeiten  </a>   <a href="javascript:confirm_deletion()" class="button catalogue">  L&ouml;schen  </a>  <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Vollanzeige  </a>  <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normalanzeige  </a>  <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD  </a>  <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  zu vituellem Regal hinzuf&uuml;gen  </a>  <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  Drucken  </a>
  		<!-- TMPL_IF name="subscriptionsnumber" -->
  		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
--- 4,8 ----
  	<div class="tabbed">
  		<h1 class="catalogue">Biblionummer : <!-- TMPL_VAR NAME="biblionumber" --></h1>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Biblio bearbeiten  </a>  <a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">  Duplizieren  </a>  <a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue">  Exemplar bearbeiten  </a>   <a href="javascript:confirm_deletion()" class="button catalogue">  L&ouml;schen  </a>  <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Vollanzeige  </a>  <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normalanzeige  </a>  <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD  </a>  <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  zu virtuellem Regal hinzuf&uuml;gen  </a>  <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  Drucken  </a>
  		<!-- TMPL_IF name="subscriptionsnumber" -->
  		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">




From hellen at users.sourceforge.net  Wed Jun  8 13:28:10 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Wed, 08 Jun 2005 04:28:10 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de about.tmpl,1.2,1.3
Message-ID: <E1DfyjC-0008BO-Tu@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	about.tmpl 
Log Message:
translated by hellen

Index: about.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/about.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** about.tmpl	17 May 2005 13:21:34 -0000	1.2
--- about.tmpl	8 Jun 2005 11:28:08 -0000	1.3
***************
*** 48,51 ****
--- 48,52 ----
  					<p>David Strainchamps</p>
  					<p>Dorian Meid (Deutsche &Uuml;bersetzung)</p>
+ 					<p>Friedrich zur Hellen (Deutsche &Uuml;bersetzung)</p>
  					<p>doXulting (Matthieu Branlat) OPAC basket</p>
  					<p>Ed Summers (einigen code und Perl-Module wie MARC::Record)</p>




From hellen at users.sourceforge.net  Wed Jun  8 13:28:10 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Wed, 08 Jun 2005 04:28:10 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple addbooks.tmpl,1.3,1.4 isbnsearch.tmpl,1.2,1.3
Message-ID: <E1DfyjC-0008BM-TB@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	addbooks.tmpl isbnsearch.tmpl 
Log Message:
translated by hellen

Index: addbooks.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/addbooks.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** addbooks.tmpl	5 Jun 2005 14:45:17 -0000	1.3
--- addbooks.tmpl	8 Jun 2005 11:28:08 -0000	1.4
***************
*** 51,55 ****
  		<h2 class="catalogue">Hinweis</h2>
  		<p>Wenn bereits Daten für die ISBN in der Datenbank hinterlegt sind, werden diese angezeigt und k&ouml;nnen bearbeitet werden.<br/>
! 			 Wenn Fremddaten für die ISBN abgerufen wurden und sich im Zwischenspeicher befinden, werden diese ebenfalls angezeigt und dienen als Grundlage f&uuml;r einen neuen Datensatz.<br/>
  			 Anderenfalls wird eine leerer Datensatz angelegt und Sie m&uuml;ssen alle Daten selbst eintragen.</p>
  	</div>
--- 51,55 ----
  		<h2 class="catalogue">Hinweis</h2>
  		<p>Wenn bereits Daten für die ISBN in der Datenbank hinterlegt sind, werden diese angezeigt und k&ouml;nnen bearbeitet werden.<br/>
! 			 Wenn Fremddaten für die ISBN abgerufen wurden und sich im Fremddatenpool befinden, werden diese ebenfalls angezeigt und dienen als Grundlage f&uuml;r einen neuen Datensatz.<br/>
  			 Anderenfalls wird eine leerer Datensatz angelegt und Sie m&uuml;ssen alle Daten selbst eintragen.</p>
  	</div>

Index: isbnsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/isbnsearch.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** isbnsearch.tmpl	17 May 2005 13:21:35 -0000	1.2
--- isbnsearch.tmpl	8 Jun 2005 11:28:08 -0000	1.3
***************
*** 62,71 ****
  						<td><a href="additem-nomarc.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Exemplare hinzuf&uuml;gen</a></td>
  						<!-- TMPL_ELSE -->
! 						<td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Bearbeite...</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>
--- 62,71 ----
  						<td><a href="additem-nomarc.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Exemplare hinzuf&uuml;gen</a></td>
  						<!-- TMPL_ELSE -->
! 						<td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Bearbeiten</a></td>
  						<!-- /TMPL_IF -->
  						<!-- TMPL_UNLESS NAME="NOTMARC" -->
  						<td>
  							<a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">
! 								Duplizieren
  							</a>
  						</td>
***************
*** 109,113 ****
  	</div>
  	<div id="bloc25">
! 		<h2 class="catalogue">Bibliografische Daten im Zwischenspeicher</h2>
  		<!-- TMPL_IF name="breeding_loop" -->
  			<table>
--- 109,113 ----
  	</div>
  	<div id="bloc25">
! 		<h2 class="catalogue">Bibliografische Daten im Fremddatenpool</h2>
  		<!-- TMPL_IF name="breeding_loop" -->
  			<table>




From oleonard at users.sourceforge.net  Wed Jun  8 19:03:03 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 10:03:03 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui basket.tmpl,1.2.2.3,1.2.2.4
Message-ID: <E1Dg3xH-0004t7-Ag@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	basket.tmpl 
Log Message:
Synching with default template

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -r1.2.2.3 -r1.2.2.4
*** basket.tmpl	21 Apr 2005 21:39:46 -0000	1.2.2.3
--- basket.tmpl	8 Jun 2005 17:03:00 -0000	1.2.2.4
***************
*** 18,21 ****
--- 18,22 ----
  		</div>
  	<!-- /TMPL_UNLESS -->
+ 	
  	<div class="data">
  	<!-- TMPL_IF name="books_loop" -->
***************
*** 25,39 ****
  				<th scope="col">Order</th>
  				<th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=biblioitems.publishercode">Publisher</a></th>
- 				<th scope="col">ISBN</th>
  				<th scope="col">Title</th>
! 				<th scope="col">Author</th>
! 				<th scope="col">rrp</th>
! 				<th scope="col">est</th>
! 				<th scope="col">Qty</th>
  				<th scope="col">Total</th>
  				<th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=aqorderbreakdown.bookfundid,biblioitems.publishercode">Fund</a></th>
  <!-- TMPL_UNLESS name="closedate" -->
  					<th scope="col">Remove</th>
  				<!-- /TMPL_UNLESS -->
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
--- 26,40 ----
  				<th scope="col">Order</th>
  				<th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=biblioitems.publishercode">Publisher</a></th>
  				<th scope="col">Title</th>
! 				<th scope="col">RRP</th>
! 				<th scope="col">Est.</th>
! 				<th scope="col">Qty.</th>
  				<th scope="col">Total</th>
  				<th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=aqorderbreakdown.bookfundid,biblioitems.publishercode">Fund</a></th>
+ <!-- TMPL_IF name="active" -->
  <!-- TMPL_UNLESS name="closedate" -->
  					<th scope="col">Remove</th>
  				<!-- /TMPL_UNLESS -->
+ 					<!-- /TMPL_IF -->
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
***************
*** 41,47 ****
  							<td><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
! 					<td><!-- TMPL_VAR NAME="isbn" --></td>
! 					<td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
! 					<td><!-- TMPL_VAR NAME="author" --></td>
  					<td><!-- TMPL_VAR NAME="rrp" --></td>
  					<td><!-- TMPL_VAR NAME="ecost" --></td>
--- 42,63 ----
  							<td><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
! <!-- TMPL_IF name="closedate" -->
! 						<td><p>
! 							<b><!-- TMPL_VAR NAME="title" --></b><br/>
! 								<!-- TMPL_VAR NAME="author" -->
! 								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! 							</p>
! 						</td>
! 					<!-- TMPL_ELSE -->
! 						<td>
! 							<p>
! 							<a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a><br/>
! 								<!-- TMPL_VAR NAME="author" -->
! 								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! 							</p>
! 						</td>
! 					<!-- /TMPL_IF -->
  					<td><!-- TMPL_VAR NAME="rrp" --></td>
  					<td><!-- TMPL_VAR NAME="ecost" --></td>
***************
*** 49,52 ****
--- 65,69 ----
  					<td><!-- TMPL_VAR NAME="line_total" --></td>
  					<td><!-- TMPL_VAR NAME="bookfundid" --></td>
+ 					<!-- TMPL_IF name="active" -->
  					<!-- TMPL_UNLESS name="closedate" -->
  					<td>
***************
*** 54,75 ****
  						</td>
  					<!-- /TMPL_UNLESS -->
  				</tr>
  			<!-- /TMPL_LOOP -->
  			
  			<tr>
! 				<td colspan="4" rowspan="3">
! 					&nbsp;<input type="hidden" name="number" value="<!-- TMPL_VAR NAME="count" -->" />
! 			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
! 				</td>
! 				<th colspan="2">SubTotal</th>
! 				<th><!-- TMPL_VAR NAME="currency" --> <!-- TMPL_VAR NAME="sub_total" --></th><td rowspan="3" colspan="4">&nbsp;</td>
  			</tr>
  			<tr>
! 				<th colspan="2">GST</th>
! 				<th><!-- TMPL_VAR NAME="currency" --> <!-- TMPL_VAR NAME="gist" --></th>
  			</tr>
  			<tr>
! 				<th colspan="2">TOTAL</th>
! 				<th><!-- TMPL_VAR NAME="currency" --> <!-- TMPL_VAR NAME="grand_total" --></th>
  			</tr>
  		</table>
--- 71,99 ----
  						</td>
  					<!-- /TMPL_UNLESS -->
+ 						<!-- /TMPL_IF -->
  				</tr>
  			<!-- /TMPL_LOOP -->
  			
  			<tr>
! 				<td colspan="2" rowspan="3">
! <input type="hidden" name="number" value="<!-- TMPL_VAR NAME="count" -->" /><input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />	</td>
! 				<th>SubTotal</th>
! 				<th><!-- TMPL_VAR NAME="sub_total_est" --></th>
! 				<th><!-- TMPL_VAR NAME="sub_total" --></td>
! 				<th><!-- TMPL_VAR name="qty_total" --></th>
! 				<td colspan="2" rowspan="3">&nbsp;</td>
! 				
  			</tr>
  			<tr>
! 				<th>GST</th>
! 				<th><!-- TMPL_VAR NAME="gist_est" --></th>
! 				<th><!-- TMPL_VAR NAME="gist" --></th>
! 				<th>&nbsp;</th>
  			</tr>
  			<tr>
! 				<th>TOTAL  (<!-- TMPL_VAR NAME="currency" -->)</th>
! 				<th><!-- TMPL_VAR NAME="grand_total_est" --></th>
! 				<th><!-- TMPL_VAR NAME="grand_total" --></th>
! 				<th>&nbsp;</th>
  			</tr>
  		</table>




From oleonard at users.sourceforge.net  Wed Jun  8 19:03:52 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 10:03:52 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui basket.tmpl,1.4,1.5
Message-ID: <E1Dg3y4-0004z8-5K@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	basket.tmpl 
Log Message:
Synching with rel_2_2.

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** basket.tmpl	2 May 2005 18:06:45 -0000	1.4
--- basket.tmpl	8 Jun 2005 17:03:49 -0000	1.5
***************
*** 18,21 ****
--- 18,22 ----
  		</div>
  	<!-- /TMPL_UNLESS -->
+ 	
  	<div class="data">
  	<!-- TMPL_IF name="books_loop" -->
***************
*** 25,39 ****
  				<th scope="col">Order</th>
  				<th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=biblioitems.publishercode">Publisher</a></th>
- 				<th scope="col">ISBN</th>
  				<th scope="col">Title</th>
! 				<th scope="col">Author</th>
! 				<th scope="col">rrp</th>
! 				<th scope="col">est</th>
! 				<th scope="col">Qty</th>
  				<th scope="col">Total</th>
  				<th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=aqorderbreakdown.bookfundid,biblioitems.publishercode">Fund</a></th>
  <!-- TMPL_UNLESS name="closedate" -->
  					<th scope="col">Remove</th>
  				<!-- /TMPL_UNLESS -->
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
--- 26,40 ----
  				<th scope="col">Order</th>
  				<th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=biblioitems.publishercode">Publisher</a></th>
  				<th scope="col">Title</th>
! 				<th scope="col">RRP</th>
! 				<th scope="col">Est.</th>
! 				<th scope="col">Qty.</th>
  				<th scope="col">Total</th>
  				<th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=aqorderbreakdown.bookfundid,biblioitems.publishercode">Fund</a></th>
+ <!-- TMPL_IF name="active" -->
  <!-- TMPL_UNLESS name="closedate" -->
  					<th scope="col">Remove</th>
  				<!-- /TMPL_UNLESS -->
+ 					<!-- /TMPL_IF -->
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
***************
*** 41,47 ****
  							<td><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
! 					<td><!-- TMPL_VAR NAME="isbn" --></td>
! 					<td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
! 					<td><!-- TMPL_VAR NAME="author" --></td>
  					<td><!-- TMPL_VAR NAME="rrp" --></td>
  					<td><!-- TMPL_VAR NAME="ecost" --></td>
--- 42,63 ----
  							<td><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
! <!-- TMPL_IF name="closedate" -->
! 						<td><p>
! 							<b><!-- TMPL_VAR NAME="title" --></b><br/>
! 								<!-- TMPL_VAR NAME="author" -->
! 								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! 							</p>
! 						</td>
! 					<!-- TMPL_ELSE -->
! 						<td>
! 							<p>
! 							<a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a><br/>
! 								<!-- TMPL_VAR NAME="author" -->
! 								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! 							</p>
! 						</td>
! 					<!-- /TMPL_IF -->
  					<td><!-- TMPL_VAR NAME="rrp" --></td>
  					<td><!-- TMPL_VAR NAME="ecost" --></td>
***************
*** 49,52 ****
--- 65,69 ----
  					<td><!-- TMPL_VAR NAME="line_total" --></td>
  					<td><!-- TMPL_VAR NAME="bookfundid" --></td>
+ 					<!-- TMPL_IF name="active" -->
  					<!-- TMPL_UNLESS name="closedate" -->
  					<td>
***************
*** 54,75 ****
  						</td>
  					<!-- /TMPL_UNLESS -->
  				</tr>
  			<!-- /TMPL_LOOP -->
  			
  			<tr>
! 				<td colspan="4" rowspan="3">
! 					&nbsp;<input type="hidden" name="number" value="<!-- TMPL_VAR NAME="count" -->" />
! 			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
! 				</td>
! 				<th colspan="2">SubTotal</th>
! 				<th><!-- TMPL_VAR NAME="currency" --> <!-- TMPL_VAR NAME="sub_total" --></th><td rowspan="3" colspan="4">&nbsp;</td>
  			</tr>
  			<tr>
! 				<th colspan="2">GST</th>
! 				<th><!-- TMPL_VAR NAME="currency" --> <!-- TMPL_VAR NAME="gist" --></th>
  			</tr>
  			<tr>
! 				<th colspan="2">TOTAL</th>
! 				<th><!-- TMPL_VAR NAME="currency" --> <!-- TMPL_VAR NAME="grand_total" --></th>
  			</tr>
  		</table>
--- 71,99 ----
  						</td>
  					<!-- /TMPL_UNLESS -->
+ 						<!-- /TMPL_IF -->
  				</tr>
  			<!-- /TMPL_LOOP -->
  			
  			<tr>
! 				<td colspan="2" rowspan="3">
! <input type="hidden" name="number" value="<!-- TMPL_VAR NAME="count" -->" /><input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />	</td>
! 				<th>SubTotal</th>
! 				<th><!-- TMPL_VAR NAME="sub_total_est" --></th>
! 				<th><!-- TMPL_VAR NAME="sub_total" --></td>
! 				<th><!-- TMPL_VAR name="qty_total" --></th>
! 				<td colspan="2" rowspan="3">&nbsp;</td>
! 				
  			</tr>
  			<tr>
! 				<th>GST</th>
! 				<th><!-- TMPL_VAR NAME="gist_est" --></th>
! 				<th><!-- TMPL_VAR NAME="gist" --></th>
! 				<th>&nbsp;</th>
  			</tr>
  			<tr>
! 				<th>TOTAL  (<!-- TMPL_VAR NAME="currency" -->)</th>
! 				<th><!-- TMPL_VAR NAME="grand_total_est" --></th>
! 				<th><!-- TMPL_VAR NAME="grand_total" --></th>
! 				<th>&nbsp;</th>
  			</tr>
  		</table>




From oleonard at users.sourceforge.net  Wed Jun  8 19:14:00 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 10:14:00 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui histsearch.tmpl,1.1.2.2,1.1.2.3
Message-ID: <E1Dg47s-00068d-Ff@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	histsearch.tmpl 
Log Message:
Synching with default template

Index: histsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/histsearch.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** histsearch.tmpl	17 Feb 2005 17:49:40 -0000	1.1.2.2
--- histsearch.tmpl	8 Jun 2005 17:13:55 -0000	1.1.2.3
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions: Order Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions: Order Search<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
***************
*** 23,27 ****
  				<th><input type="text" name="author" value="<!-- TMPL_VAR name="author" -->" /></th>
  				<th><input type="text" name="name" value="<!-- TMPL_VAR name="name" -->" /></th>
! 				<th>&nbsp;</th>
  				<th>&nbsp;</th>
  				<th>&nbsp;</th>
--- 23,83 ----
  				<th><input type="text" name="author" value="<!-- TMPL_VAR name="author" -->" /></th>
  				<th><input type="text" name="name" value="<!-- TMPL_VAR name="name" -->" /></th>
! 				<th>					From <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
! 					<input type="text" readonly="readonly" size="10" id="from" name="fromplacedon" value="<!-- TMPL_VAR name="from_placed_on" -->">
! 					<script language="JavaScript" type="text/javascript">
! 						function validate1(date) {
! 							var day = date.getDate();
! 							var month = date.getMonth() + 1;
! 							var year = date.getFullYear();
! 							var weekDay = date.getDay();
! 							var dayMonth = month + '-' + day;
! 							var dateString = year + '-' + month + '-' + day;
! 							var dateTo = document.getElementById('to').value.split("-");
! 							var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
! 							if (date > limitDate) {
! 								return true;
! 							} else {
! 								return false;
! 							}
! 						}
! 						Calendar.setup(
! 							{
! 								inputField : "from",
! 								ifFormat : "%Y-%m-%d",
! 								button : "openCalendarFrom",
! 								disableFunc : validate1,
! 								dateStatusFunc : validate1
! 							}
! 						);
! 					</script>
! 					To <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" border="0" />
! 					<input readonly="readonly" size="10" id="to" name="toplacedon" value="<!-- TMPL_VAR name="to_placed_on" -->" type="text" />
! 					<script type="text/javascript">
! 						function validate2(date) {
! 							var day = date.getDate();
! 							var month = date.getMonth() + 1;
! 							var year = date.getFullYear();
! 							var weekDay = date.getDay();
! 							var dayMonth = month + '-' + day;
! 							var dateString = year + '-' + month + '-' + day;
! 							var dateFrom = document.getElementById('from').value.split("-");
! 							var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
! 							if (limitDate > date) {
! 								return true;
! 							} else {
! 								return false;
! 							}
! 						}
! 
! 						Calendar.setup(
! 							{
! 								inputField : "to",
! 								ifFormat : "%Y-%m-%d",
! 								button : "openCalendarTo",
! 								disableFunc : validate2,
! 								dateStatusFunc : validate2
! 							}
! 						);
! 					</script></th>
  				<th>&nbsp;</th>
  				<th>&nbsp;</th>




From oleonard at users.sourceforge.net  Wed Jun  8 20:38:24 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 11:38:24 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui histsearch.tmpl,1.3,1.4
Message-ID: <E1Dg5RY-0007Y5-Jv@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	histsearch.tmpl 
Log Message:
Synching with rel_2_2.

Index: histsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/histsearch.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** histsearch.tmpl	17 Feb 2005 17:49:44 -0000	1.3
--- histsearch.tmpl	8 Jun 2005 18:38:19 -0000	1.4
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions: Order Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions: Order Search<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
***************
*** 23,27 ****
  				<th><input type="text" name="author" value="<!-- TMPL_VAR name="author" -->" /></th>
  				<th><input type="text" name="name" value="<!-- TMPL_VAR name="name" -->" /></th>
! 				<th>&nbsp;</th>
  				<th>&nbsp;</th>
  				<th>&nbsp;</th>
--- 23,83 ----
  				<th><input type="text" name="author" value="<!-- TMPL_VAR name="author" -->" /></th>
  				<th><input type="text" name="name" value="<!-- TMPL_VAR name="name" -->" /></th>
! 				<th>					From <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
! 					<input type="text" readonly="readonly" size="10" id="from" name="fromplacedon" value="<!-- TMPL_VAR name="from_placed_on" -->">
! 					<script language="JavaScript" type="text/javascript">
! 						function validate1(date) {
! 							var day = date.getDate();
! 							var month = date.getMonth() + 1;
! 							var year = date.getFullYear();
! 							var weekDay = date.getDay();
! 							var dayMonth = month + '-' + day;
! 							var dateString = year + '-' + month + '-' + day;
! 							var dateTo = document.getElementById('to').value.split("-");
! 							var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
! 							if (date > limitDate) {
! 								return true;
! 							} else {
! 								return false;
! 							}
! 						}
! 						Calendar.setup(
! 							{
! 								inputField : "from",
! 								ifFormat : "%Y-%m-%d",
! 								button : "openCalendarFrom",
! 								disableFunc : validate1,
! 								dateStatusFunc : validate1
! 							}
! 						);
! 					</script>
! 					To <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" border="0" />
! 					<input readonly="readonly" size="10" id="to" name="toplacedon" value="<!-- TMPL_VAR name="to_placed_on" -->" type="text" />
! 					<script type="text/javascript">
! 						function validate2(date) {
! 							var day = date.getDate();
! 							var month = date.getMonth() + 1;
! 							var year = date.getFullYear();
! 							var weekDay = date.getDay();
! 							var dayMonth = month + '-' + day;
! 							var dateString = year + '-' + month + '-' + day;
! 							var dateFrom = document.getElementById('from').value.split("-");
! 							var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
! 							if (limitDate > date) {
! 								return true;
! 							} else {
! 								return false;
! 							}
! 						}
! 
! 						Calendar.setup(
! 							{
! 								inputField : "to",
! 								ifFormat : "%Y-%m-%d",
! 								button : "openCalendarTo",
! 								disableFunc : validate2,
! 								dateStatusFunc : validate2
! 							}
! 						);
! 					</script></th>
  				<th>&nbsp;</th>
  				<th>&nbsp;</th>




From oleonard at users.sourceforge.net  Wed Jun  8 20:39:00 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 11:39:00 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple addbiblio.tmpl,1.4.2.5,1.4.2.6
Message-ID: <E1Dg5S8-0007bo-D4@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	addbiblio.tmpl 
Log Message:
Synching with default template

Index: addbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -C2 -r1.4.2.5 -r1.4.2.6
*** addbiblio.tmpl	25 Apr 2005 22:08:39 -0000	1.4.2.5
--- addbiblio.tmpl	8 Jun 2005 18:38:57 -0000	1.4.2.6
***************
*** 12,16 ****
  
  	<form method="post" name="f" id="f" action="addbiblio.pl">
! <h1><!-- TMPL_IF NAME="oldbiblionumtagfield" -->Edit MARC Record Number <!-- TMPL_VAR name="bibid" --><!-- TMPL_ELSE -->Add MARC Record<!-- /TMPL_IF --></h1>
  
  
--- 12,16 ----
  
  	<form method="post" name="f" id="f" action="addbiblio.pl">
! <h1><!-- TMPL_IF NAME="oldbiblionumtagfield" -->Edit MARC Record Number <!-- TMPL_VAR name="oldbiblionumber" --><!-- TMPL_ELSE -->Add MARC Record<!-- /TMPL_IF --> With Framework : <!--TMPL_VAR Name="framework" --></h1>
  
  
***************
*** 430,436 ****
--- 430,438 ----
  			with(document){
  			document.getElementById(ong).style.visibility="hidden";
+ 			if (document.getElementById(link)) {
  			document.getElementById(link).style.color="#669999";
  			document.getElementById(link).style.backgroundColor="#D8DEB8";
  			}
+ 			}
  		}
  	}
***************
*** 564,567 ****
--- 566,574 ----
  }
  
+ function Changefwk(FwkList) {
+   var fwk = FwkList.options[FwkList.selectedIndex].value;
+   window.location = "addbiblio.pl?oldbiblionumber=<!--TMPL_VAR Name="oldbiblionumber"-->&frameworkcode="+fwk;
+ }
+ 
  function AddField(field) {
  	document.forms[0].op.value = "addfield";




From oleonard at users.sourceforge.net  Wed Jun  8 20:39:09 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 11:39:09 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple addbiblio.tmpl,1.6,1.7
Message-ID: <E1Dg5SH-0007d6-5A@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	addbiblio.tmpl 
Log Message:
Synching with rel_2_2.

Index: addbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** addbiblio.tmpl	2 May 2005 18:11:11 -0000	1.6
--- addbiblio.tmpl	8 Jun 2005 18:39:06 -0000	1.7
***************
*** 12,16 ****
  
  	<form method="post" name="f" id="f" action="addbiblio.pl">
! <h1><!-- TMPL_IF NAME="oldbiblionumtagfield" -->Edit MARC Record Number <!-- TMPL_VAR name="bibid" --><!-- TMPL_ELSE -->Add MARC Record<!-- /TMPL_IF --></h1>
  
  
--- 12,16 ----
  
  	<form method="post" name="f" id="f" action="addbiblio.pl">
! <h1><!-- TMPL_IF NAME="oldbiblionumtagfield" -->Edit MARC Record Number <!-- TMPL_VAR name="oldbiblionumber" --><!-- TMPL_ELSE -->Add MARC Record<!-- /TMPL_IF --> With Framework : <!--TMPL_VAR Name="framework" --></h1>
  
  
***************
*** 430,436 ****
--- 430,438 ----
  			with(document){
  			document.getElementById(ong).style.visibility="hidden";
+ 			if (document.getElementById(link)) {
  			document.getElementById(link).style.color="#669999";
  			document.getElementById(link).style.backgroundColor="#D8DEB8";
  			}
+ 			}
  		}
  	}
***************
*** 564,567 ****
--- 566,574 ----
  }
  
+ function Changefwk(FwkList) {
+   var fwk = FwkList.options[FwkList.selectedIndex].value;
+   window.location = "addbiblio.pl?oldbiblionumber=<!--TMPL_VAR Name="oldbiblionumber"-->&frameworkcode="+fwk;
+ }
+ 
  function AddField(field) {
  	document.forms[0].op.value = "addfield";




From oleonard at users.sourceforge.net  Wed Jun  8 20:47:54 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 11:47:54 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple additem.tmpl,1.3.2.4,1.3.2.5
Message-ID: <E1Dg5ak-00008s-IG@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	additem.tmpl 
Log Message:
Synching with default template

Index: additem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/additem.tmpl,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -C2 -r1.3.2.4 -r1.3.2.5
*** additem.tmpl	25 Apr 2005 16:56:08 -0000	1.3.2.4
--- additem.tmpl	8 Jun 2005 18:47:47 -0000	1.3.2.5
***************
*** 5,11 ****
  <div id="main">
  
! <h1>Edit Items for Bibliographic Record <!-- TMPL_VAR NAME="biblionumber" --></h1>
  
! 		<div class="tabitem"><form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR name="biblionumber" -->"><input type="submit" class="submit" value="Edit Bibliographic Record"></form> <form action="acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" name="op" value="duplicate" /><input type="submit" class="submit" value="Duplicate this Record" /></form></div> <div class="tabitem"><form action="/cgi-bin/koha/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View in Catalog"></form> <form action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View MARC in Catalog"></form>  <form action="/cgi-bin/koha/ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View ISBD in Catalog"></form></div>
  
  	<form method="post" action="additem.pl" name="f">
--- 5,11 ----
  <div id="main">
  
! <h1>Items for <em><!-- TMPL_VAR name="title" --></em> <!-- TMPL_IF NAME="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF --> (Record #<!-- TMPL_VAR NAME="biblionumber" -->)</h1>
  
! 		<div class="tabitem"><form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR name="biblionumber" -->"><input type="submit" class="submit" value="Edit Bibliographic Record"></form></div> <div class="tabitem"><form action="/cgi-bin/koha/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View in Catalog"></form> <form action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View MARC in Catalog"></form>  <form action="/cgi-bin/koha/ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View ISBD in Catalog"></form></div>
  
  	<form method="post" action="additem.pl" name="f">




From oleonard at users.sourceforge.net  Wed Jun  8 20:48:36 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 11:48:36 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple additem.tmpl,1.4,1.5
Message-ID: <E1Dg5bQ-0000DE-FW@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	additem.tmpl 
Log Message:
Synching with rel_2_2.

Index: additem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/additem.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** additem.tmpl	2 May 2005 18:11:12 -0000	1.4
--- additem.tmpl	8 Jun 2005 18:48:34 -0000	1.5
***************
*** 5,11 ****
  <div id="main">
  
! <h1>Edit Items for Bibliographic Record <!-- TMPL_VAR NAME="biblionumber" --></h1>
  
! 		<div class="tabitem"><form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR name="biblionumber" -->"><input type="submit" class="submit" value="Edit Bibliographic Record"></form> <form action="acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" name="op" value="duplicate" /><input type="submit" class="submit" value="Duplicate this Record" /></form></div> <div class="tabitem"><form action="/cgi-bin/koha/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View in Catalog"></form> <form action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View MARC in Catalog"></form>  <form action="/cgi-bin/koha/ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View ISBD in Catalog"></form></div>
  
  	<form method="post" action="additem.pl" name="f">
--- 5,11 ----
  <div id="main">
  
! <h1>Items for <em><!-- TMPL_VAR name="title" --></em> <!-- TMPL_IF NAME="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF --> (Record #<!-- TMPL_VAR NAME="biblionumber" -->)</h1>
  
! 		<div class="tabitem"><form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR name="biblionumber" -->"><input type="submit" class="submit" value="Edit Bibliographic Record"></form></div> <div class="tabitem"><form action="/cgi-bin/koha/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View in Catalog"></form> <form action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View MARC in Catalog"></form>  <form action="/cgi-bin/koha/ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View ISBD in Catalog"></form></div>
  
  	<form method="post" action="additem.pl" name="f">




From oleonard at users.sourceforge.net  Wed Jun  8 21:18:55 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 12:18:55 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/authorities authorities.tmpl,1.2,1.3 detail.tmpl,1.2,1.3
Message-ID: <E1Dg64l-0003dC-Hg@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13911/koha-tmpl/intranet-tmpl/npl/en/authorities

Modified Files:
	authorities.tmpl detail.tmpl 
Log Message:
Synching with rel_2_2.

Index: authorities.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** authorities.tmpl	2 May 2005 18:15:31 -0000	1.2
--- authorities.tmpl	8 Jun 2005 19:18:52 -0000	1.3
***************
*** 9,23 ****
  
  <div class="tabbed">
! 	<form method="post" name="f">
! 	<h1>Authority number <!-- TMPL_VAR NAME="authid" --></h1>
  	<p>
! 		<input type="hidden" name="op" value="add">
! 		<input type="hidden" name="addfield_field">
! 		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
! 		<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->">
  		<!-- TMPL_IF name="authid" -->
! 			<input type="button" value="Save" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- TMPL_ELSE -->
! 			<input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- /TMPL_IF -->
  <!--		<a href="javascript:PopupZ3950()" class="button authority">z3950 search</a> -->
--- 9,27 ----
  
  <div class="tabbed">
! 	<form method="post" action="authorities.pl" name="f">
! 	<!-- TMPL_IF name="authid" -->
! 		<h1>Modify authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
! 	<!-- TMPL_ELSE -->
! 		<h1>Adding authority (<!-- TMPL_VAR name="authtypetext" -->)</h1>
! 	<!-- /TMPL_IF -->
  	<p>
! 		<input type="hidden" name="op" value="add" />
! 		<input type="hidden" name="addfield_field" />
! 		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
! 		<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->" />
  		<!-- TMPL_IF name="authid" -->
! 			<input type="button" value="Save" onClick="Check(this.form)" accesskey="w" class="submit" />
  		<!-- TMPL_ELSE -->
! 			<input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="submit" />
  		<!-- /TMPL_IF -->
  <!--		<a href="javascript:PopupZ3950()" class="button authority">z3950 search</a> -->
***************
*** 25,29 ****
  </div>
  
! <br><br><br><br><br><br><br><br><br><br><br>
  
  <!-- TMPL_LOOP NAME="0XX" -->
--- 29,42 ----
  </div>
  
! <!-- TMPL_IF name="duplicateauthid" -->
! 	<div class="error">
! 		<p>Duplicate suspected with <a href="javascript:openWindow('detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&amp;popup=1', 'Duplicate Authority')"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
! 		<p>You must either :</p>
! 		<ul>
! 			<p><input type="checkbox" value="1" name="confirm_not_duplicate" />confirm it's not a duplicate (and click on <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority"> again)</p>
! 			<p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >original authority</a></p>
! 		</ul>
! 	</div>
! <!-- /TMPL_IF -->
  
  <!-- TMPL_LOOP NAME="0XX" -->
***************
*** 172,177 ****
  
  function AddField(field) {
! 	document.forms[0].op.value = "addfield";
! 	document.forms[0].addfield_field.value=field;
  	document.f.submit();
  }
--- 185,190 ----
  
  function AddField(field) {
! 	document.forms[1].op.value = "addfield";
! 	document.forms[1].addfield_field.value=field;
  	document.f.submit();
  }

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/detail.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** detail.tmpl	2 May 2005 18:15:31 -0000	1.2
--- detail.tmpl	8 Jun 2005 19:18:52 -0000	1.3
***************
*** 8,12 ****
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1>Authority number : <!-- TMPL_VAR NAME="authid" --></h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
--- 8,12 ----
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1>Authority number : <!-- TMPL_VAR NAME="authid" -->  <!-- TMPL_IF NAME="authtypetext" -->(<!-- TMPL_VAR name="authtypetext" -->)<!-- /TMPL_IF --></h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
***************
*** 42,48 ****
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Are you sure you want to delete this biblio?');
  	if (is_confirmed) {
! 		window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";
  	}
  }
--- 42,48 ----
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Are you sure you want to delete this authority?');
  	if (is_confirmed) {
! 		window.location="authorities-home.pl?op=delete&amp;authid=<!-- TMPL_VAR NAME="authid" -->";
  	}
  }




From oleonard at users.sourceforge.net  Wed Jun  8 21:19:43 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 12:19:43 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/authorities authorities.tmpl,1.1.2.1,1.1.2.2 detail.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1Dg65X-0003iv-8o@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14245/koha-tmpl/intranet-tmpl/npl/en/authorities

Modified Files:
      Tag: rel_2_2
	authorities.tmpl detail.tmpl 
Log Message:
Synching with default template

Index: authorities.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** authorities.tmpl	19 Apr 2005 19:13:34 -0000	1.1.2.1
--- authorities.tmpl	8 Jun 2005 19:19:40 -0000	1.1.2.2
***************
*** 9,23 ****
  
  <div class="tabbed">
! 	<form method="post" name="f">
! 	<h1>Authority number <!-- TMPL_VAR NAME="authid" --></h1>
  	<p>
! 		<input type="hidden" name="op" value="add">
! 		<input type="hidden" name="addfield_field">
! 		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
! 		<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->">
  		<!-- TMPL_IF name="authid" -->
! 			<input type="button" value="Save" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- TMPL_ELSE -->
! 			<input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- /TMPL_IF -->
  <!--		<a href="javascript:PopupZ3950()" class="button authority">z3950 search</a> -->
--- 9,27 ----
  
  <div class="tabbed">
! 	<form method="post" action="authorities.pl" name="f">
! 	<!-- TMPL_IF name="authid" -->
! 		<h1>Modify authority #<!-- TMPL_VAR NAME="authid" --> <!-- TMPL_IF NAME="authtypetext" -->(<!-- TMPL_VAR name="authtypetext" -->)<!-- /TMPL_IF --></h1>
! 	<!-- TMPL_ELSE -->
! 		<h1>Adding authority <!-- TMPL_IF NAME="authtypetext" -->(<!-- TMPL_VAR name="authtypetext" -->)<!-- /TMPL_IF --></h1>
! 	<!-- /TMPL_IF -->
  	<p>
! 		<input type="hidden" name="op" value="add" />
! 		<input type="hidden" name="addfield_field" />
! 		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
! 		<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->" />
  		<!-- TMPL_IF name="authid" -->
! 			<input type="button" value="Save" onClick="Check(this.form)" accesskey="w" class="submit" />
  		<!-- TMPL_ELSE -->
! 			<input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="submit" />
  		<!-- /TMPL_IF -->
  <!--		<a href="javascript:PopupZ3950()" class="button authority">z3950 search</a> -->
***************
*** 25,29 ****
  </div>
  
! <br><br><br><br><br><br><br><br><br><br><br>
  
  <!-- TMPL_LOOP NAME="0XX" -->
--- 29,42 ----
  </div>
  
! <!-- TMPL_IF name="duplicateauthid" -->
! 	<div class="error">
! 		<p>Duplicate suspected with <a href="javascript:openWindow('detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&amp;popup=1', 'Duplicate Authority')"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
! 		<p>You must either :</p>
! 		<ul>
! 			<p><input type="checkbox" value="1" name="confirm_not_duplicate" />confirm it's not a duplicate (and click on <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority"> again)</p>
! 			<p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >original authority</a></p>
! 		</ul>
! 	</div>
! <!-- /TMPL_IF -->
  
  <!-- TMPL_LOOP NAME="0XX" -->
***************
*** 172,177 ****
  
  function AddField(field) {
! 	document.forms[0].op.value = "addfield";
! 	document.forms[0].addfield_field.value=field;
  	document.f.submit();
  }
--- 185,190 ----
  
  function AddField(field) {
! 	document.forms[1].op.value = "addfield";
! 	document.forms[1].addfield_field.value=field;
  	document.f.submit();
  }

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/detail.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** detail.tmpl	19 Apr 2005 19:13:34 -0000	1.1.2.1
--- detail.tmpl	8 Jun 2005 19:19:40 -0000	1.1.2.2
***************
*** 8,12 ****
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1>Authority number : <!-- TMPL_VAR NAME="authid" --></h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
--- 8,12 ----
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1>Authority number : <!-- TMPL_VAR NAME="authid" -->  <!-- TMPL_IF NAME="authtypetext" -->(<!-- TMPL_VAR name="authtypetext" -->)<!-- /TMPL_IF --></h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
***************
*** 42,48 ****
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Are you sure you want to delete this biblio?');
  	if (is_confirmed) {
! 		window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";
  	}
  }
--- 42,48 ----
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Are you sure you want to delete this authority?');
  	if (is_confirmed) {
! 		window.location="authorities-home.pl?op=delete&amp;authid=<!-- TMPL_VAR NAME="authid" -->";
  	}
  }




From oleonard at users.sourceforge.net  Wed Jun  8 22:04:47 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:04:47 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/catalogue MARCdetail.tmpl,1.4,1.5
Message-ID: <E1Dg6n9-0001Ih-Ef@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	MARCdetail.tmpl 
Log Message:
Synching with rel_2_2.

Index: MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/MARCdetail.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** MARCdetail.tmpl	2 May 2005 20:22:24 -0000	1.4
--- MARCdetail.tmpl	8 Jun 2005 20:04:44 -0000	1.5
***************
*** 5,15 ****
  
  <div id="main">
! <h2>MARC Record for <em><!-- TMPL_VAR NAME="biblio_title" --><!-- TMPL_IF NAME="biblio_subtitle" -->: <!-- TMPL_VAR NAME="biblio_subtitle" --><!-- /TMPL_IF --></em></h2>
  <div class="tabitem"><form action="/cgi-bin/koha/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" value="intra" name="type" /><input type="submit" class="submit" value="Brief Display" /></form><!-- TMPL_IF NAME="norequests" -->&nbsp;<!-- TMPL_ELSE --> <form action="request.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> <input type="submit" class="submit" value="Place Reserve" /></form>
  		<!-- /TMPL_IF --><form action="/cgi-bin/koha/detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Simple Print View" /></form> <!-- TMPL_IF name="subscriptionid" --><form action="/cgi-bin/koha/bull/subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Subscription" class="submit" /></form>
! <form action="/cgi-bin/koha/bull/serial-issues.pl" method="get"><input type="hidden" name="subscriptionid" value="!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Serial Issues" class="submit" /></form><!-- /TMPL_IF -->  <form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Edit MARC" /></form> <form action="/cgi-bin/koha/acqui.simple/additem.pl" method="get"><input type="hidden" name="bibid" value="<!-- TMPL_VAR name="bibid"-->" /><input type="submit" class="submit" value="Edit Items" /></form> <form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="bibid" value="<!-- TMPL_VAR NAME="bibid" -->" /><input type="submit" class="cancel" value="Delete Record" onclick="confirm_deletion(); return false;" /></form></div>
  
  <!-- TMPL_IF NAME="0XX" -->
! <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="0XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 5,17 ----
  
  <div id="main">
! <h2>MARC Record <em><!-- TMPL_VAR NAME="biblionumber" --></em></h2>
  <div class="tabitem"><form action="/cgi-bin/koha/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" value="intra" name="type" /><input type="submit" class="submit" value="Brief Display" /></form><!-- TMPL_IF NAME="norequests" -->&nbsp;<!-- TMPL_ELSE --> <form action="request.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> <input type="submit" class="submit" value="Place Reserve" /></form>
  		<!-- /TMPL_IF --><form action="/cgi-bin/koha/detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Simple Print View" /></form> <!-- TMPL_IF name="subscriptionid" --><form action="/cgi-bin/koha/bull/subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Subscription" class="submit" /></form>
! <form action="/cgi-bin/koha/bull/serial-issues.pl" method="get"><input type="hidden" name="subscriptionid" value="!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Serial Issues" class="submit" /></form><!-- /TMPL_IF -->  </div>
! 
! <div id="controls"><form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Edit MARC" /></form> <form action="/cgi-bin/koha/acqui.simple/additem.pl" method="get"><input type="hidden" name="bibid" value="<!-- TMPL_VAR name="bibid"-->" /><input type="submit" class="submit" value="Edit Items" /></form> <form name="duplicate"><h4>Duplicate</h4> using <!--TMPL_VAR Name="framework" -->Framework <input type="submit" class="submit" value="Duplicate" onclick="Addbiblio('duplicate'); return false;" /></form> <form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="bibid" value="<!-- TMPL_VAR NAME="bibid" -->" /><input type="submit" class="cancel" value="Delete Record" onclick="confirm_deletion(); return false;" /></form></div>
  
  <!-- TMPL_IF NAME="0XX" -->
! <table class="marc">
  	<!-- TMPL_LOOP NAME="0XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 24,32 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="1XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="1XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 26,34 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="1XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="1XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 41,49 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  	 
  <!-- TMPL_IF NAME="2XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="2XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 43,51 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  	 
  <!-- TMPL_IF NAME="2XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="2XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 58,66 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  	 
  <!-- TMPL_IF NAME="3XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="3XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 60,68 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  	 
  <!-- TMPL_IF NAME="3XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="3XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 75,83 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="4XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="4XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 77,85 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="4XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="4XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 92,100 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="5XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="5XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 94,102 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="5XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="5XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 109,117 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="6XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="6XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 111,119 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="6XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="6XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 126,134 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="7XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="7XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 128,136 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="7XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="7XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 143,152 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  	 
  <!-- TMPL_IF NAME="8XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="8XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 145,154 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  	 
  <!-- TMPL_IF NAME="8XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="8XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 161,169 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="9XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="9XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 163,171 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="9XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="9XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 178,186 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="item_header_loop -->
!     <div class="table"><table>
  		<tr>
  			<!-- TMPL_LOOP NAME="item_header_loop" --><th><!-- TMPL_VAR NAME="header_value" --></th><!-- /TMPL_LOOP -->
--- 180,188 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="item_header_loop -->
!     <table>
  		<tr>
  			<!-- TMPL_LOOP NAME="item_header_loop" --><th><!-- TMPL_VAR NAME="header_value" --></th><!-- /TMPL_LOOP -->
***************
*** 191,195 ****
  			</tr>
  		<!-- /TMPL_LOOP -->
!      </table></div>
  <!-- /TMPL_IF -->
  	 </div>
--- 193,197 ----
  			</tr>
  		<!-- /TMPL_LOOP -->
!      </table>
  <!-- /TMPL_IF -->
  	 </div>
***************
*** 201,204 ****
--- 203,214 ----
  	}
  }
+ 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['duplicate'].Frameworks.options[document.forms['duplicate'].Frameworks.selectedIndex].value;
+   window.location = "acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode="+fwk+"&op="+op; 
+ }
  </script>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file




From oleonard at users.sourceforge.net  Wed Jun  8 22:04:17 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:04:17 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/catalogue MARCdetail.tmpl,1.3.2.1,1.3.2.2
Message-ID: <E1Dg6mf-0001Ep-HX@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	MARCdetail.tmpl 
Log Message:
Synching with default template

Index: MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/MARCdetail.tmpl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** MARCdetail.tmpl	30 Mar 2005 22:51:53 -0000	1.3.2.1
--- MARCdetail.tmpl	8 Jun 2005 20:04:14 -0000	1.3.2.2
***************
*** 5,15 ****
  
  <div id="main">
! <h2>MARC Record for <em><!-- TMPL_VAR NAME="biblio_title" --><!-- TMPL_IF NAME="biblio_subtitle" -->: <!-- TMPL_VAR NAME="biblio_subtitle" --><!-- /TMPL_IF --></em></h2>
  <div class="tabitem"><form action="/cgi-bin/koha/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" value="intra" name="type" /><input type="submit" class="submit" value="Brief Display" /></form><!-- TMPL_IF NAME="norequests" -->&nbsp;<!-- TMPL_ELSE --> <form action="request.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> <input type="submit" class="submit" value="Place Reserve" /></form>
  		<!-- /TMPL_IF --><form action="/cgi-bin/koha/detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Simple Print View" /></form> <!-- TMPL_IF name="subscriptionid" --><form action="/cgi-bin/koha/bull/subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Subscription" class="submit" /></form>
! <form action="/cgi-bin/koha/bull/serial-issues.pl" method="get"><input type="hidden" name="subscriptionid" value="!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Serial Issues" class="submit" /></form><!-- /TMPL_IF -->  <form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Edit MARC" /></form> <form action="/cgi-bin/koha/acqui.simple/additem.pl" method="get"><input type="hidden" name="bibid" value="<!-- TMPL_VAR name="bibid"-->" /><input type="submit" class="submit" value="Edit Items" /></form> <form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="bibid" value="<!-- TMPL_VAR NAME="bibid" -->" /><input type="submit" class="cancel" value="Delete Record" onclick="confirm_deletion(); return false;" /></form></div>
  
  <!-- TMPL_IF NAME="0XX" -->
! <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="0XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 5,17 ----
  
  <div id="main">
! <h2>MARC Record <em><!-- TMPL_VAR NAME="biblionumber" --></em></h2>
  <div class="tabitem"><form action="/cgi-bin/koha/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" value="intra" name="type" /><input type="submit" class="submit" value="Brief Display" /></form><!-- TMPL_IF NAME="norequests" -->&nbsp;<!-- TMPL_ELSE --> <form action="request.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> <input type="submit" class="submit" value="Place Reserve" /></form>
  		<!-- /TMPL_IF --><form action="/cgi-bin/koha/detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Simple Print View" /></form> <!-- TMPL_IF name="subscriptionid" --><form action="/cgi-bin/koha/bull/subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Subscription" class="submit" /></form>
! <form action="/cgi-bin/koha/bull/serial-issues.pl" method="get"><input type="hidden" name="subscriptionid" value="!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Serial Issues" class="submit" /></form><!-- /TMPL_IF -->  </div>
! 
! <div id="controls"><form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Edit MARC" /></form> <form action="/cgi-bin/koha/acqui.simple/additem.pl" method="get"><input type="hidden" name="bibid" value="<!-- TMPL_VAR name="bibid"-->" /><input type="submit" class="submit" value="Edit Items" /></form> <form name="duplicate"><h4>Duplicate</h4> using <!--TMPL_VAR Name="framework" -->Framework <input type="submit" class="submit" value="Duplicate" onclick="Addbiblio('duplicate'); return false;" /></form> <form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="bibid" value="<!-- TMPL_VAR NAME="bibid" -->" /><input type="submit" class="cancel" value="Delete Record" onclick="confirm_deletion(); return false;" /></form></div>
  
  <!-- TMPL_IF NAME="0XX" -->
! <table class="marc">
  	<!-- TMPL_LOOP NAME="0XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 24,32 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="1XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="1XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 26,34 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="1XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="1XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 41,49 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  	 
  <!-- TMPL_IF NAME="2XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="2XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 43,51 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  	 
  <!-- TMPL_IF NAME="2XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="2XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 58,66 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  	 
  <!-- TMPL_IF NAME="3XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="3XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 60,68 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  	 
  <!-- TMPL_IF NAME="3XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="3XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 75,83 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="4XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="4XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 77,85 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="4XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="4XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 92,100 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="5XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="5XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 94,102 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="5XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="5XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 109,117 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="6XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="6XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 111,119 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="6XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="6XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 126,134 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="7XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="7XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 128,136 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="7XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="7XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 143,152 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  	 
  <!-- TMPL_IF NAME="8XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="8XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 145,154 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  	 
  <!-- TMPL_IF NAME="8XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="8XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 161,169 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="9XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="9XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 163,171 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="9XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="9XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 178,186 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="item_header_loop -->
!     <div class="table"><table>
  		<tr>
  			<!-- TMPL_LOOP NAME="item_header_loop" --><th><!-- TMPL_VAR NAME="header_value" --></th><!-- /TMPL_LOOP -->
--- 180,188 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="item_header_loop -->
!     <table>
  		<tr>
  			<!-- TMPL_LOOP NAME="item_header_loop" --><th><!-- TMPL_VAR NAME="header_value" --></th><!-- /TMPL_LOOP -->
***************
*** 191,195 ****
  			</tr>
  		<!-- /TMPL_LOOP -->
!      </table></div>
  <!-- /TMPL_IF -->
  	 </div>
--- 193,197 ----
  			</tr>
  		<!-- /TMPL_LOOP -->
!      </table>
  <!-- /TMPL_IF -->
  	 </div>
***************
*** 201,204 ****
--- 203,214 ----
  	}
  }
+ 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['duplicate'].Frameworks.options[document.forms['duplicate'].Frameworks.selectedIndex].value;
+   window.location = "acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode="+fwk+"&op="+op; 
+ }
  </script>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file




From oleonard at users.sourceforge.net  Wed Jun  8 22:15:02 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:15:02 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/catalogue detail.tmpl,1.4.2.3,1.4.2.4 searchresults.tmpl,1.2,1.2.2.1
Message-ID: <E1Dg6x4-0002V2-Dd@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	detail.tmpl searchresults.tmpl 
Log Message:
Synching with default template

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/detail.tmpl,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -r1.4.2.3 -r1.4.2.4
*** detail.tmpl	16 May 2005 17:49:26 -0000	1.4.2.3
--- detail.tmpl	8 Jun 2005 20:14:59 -0000	1.4.2.4
***************
*** 22,31 ****
  			<!-- TMPL_IF NAME="additional" --><li><b>Additional Author:</b> <!-- TMPL_VAR NAME="additional" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="isbn" --><li><strong>ISBN:</strong> <!-- TMPL_VAR NAME="isbn" --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="seriestitle" --><li><b>Series Title:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- TMPL_IF NAME="volume" --><!-- TMPL_VAR NAME="volume" --><!-- /TMPL_IF --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="subject" --><li><b>Subject:</b> <!-- TMPL_VAR NAME="subject" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="copyrightdate" --><li><b>Copyright:</b> <!-- TMPL_VAR NAME="copyrightdate" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="notes" --><li><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="unititle" --><li><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="url" --><li><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a></li><!-- /TMPL_IF -->
  			<!-- Hide from NPL --><!-- TMPL_IF NAME="serial" --><li><b>Serial:</b> <!-- TMPL_VAR NAME="serial" --></li><!-- /TMPL_IF --> <!-- /Hide from NPL -->
  			<li><b>Biblio Record</b> <!-- TMPL_VAR NAME="biblionumber" --></li>
--- 22,33 ----
  			<!-- TMPL_IF NAME="additional" --><li><b>Additional Author:</b> <!-- TMPL_VAR NAME="additional" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="isbn" --><li><strong>ISBN:</strong> <!-- TMPL_VAR NAME="isbn" --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="issn" --><li><strong>ISSN:</strong> <!-- TMPL_VAR NAME="issn" --></li><!-- /TMPL_IF --><!-- TMPL_IF NAME="seriestitle" --><li><b>Series Title:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- TMPL_IF NAME="volume" --><!-- TMPL_VAR NAME="volume" --><!-- /TMPL_IF --></li><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="subjects" --><li><strong>Subject(s):</strong>
! 					<!-- TMPL_LOOP name="subjects" -->
! 						<a href="/cgi-bin/koha/search.pl?type=intra&amp;subjectitems=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP --></li>
! 					<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="copyrightdate" --><li><b>Copyright:</b> <!-- TMPL_VAR NAME="copyrightdate" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="notes" --><li><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="unititle" --><li><b>Alternate Title:</b> <!-- TMPL_VAR NAME="unititle" --></li><!-- /TMPL_IF -->
  			<!-- Hide from NPL --><!-- TMPL_IF NAME="serial" --><li><b>Serial:</b> <!-- TMPL_VAR NAME="serial" --></li><!-- /TMPL_IF --> <!-- /Hide from NPL -->
  			<li><b>Biblio Record</b> <!-- TMPL_VAR NAME="biblionumber" --></li>

Index: searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/searchresults.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** searchresults.tmpl	13 Apr 2004 16:52:55 -0000	1.2
--- searchresults.tmpl	8 Jun 2005 20:15:00 -0000	1.2.2.1
***************
*** 8,12 ****
  	You searched for <span class="ex"><!-- TMPL_VAR NAME="searchdesc" --></span>
  <!-- TMPL_ELSE -->
! 	You did not specify any seach criteria
  <!-- /TMPL_IF -->
  </h3>
--- 8,12 ----
  	You searched for <span class="ex"><!-- TMPL_VAR NAME="searchdesc" --></span>
  <!-- TMPL_ELSE -->
! 	You did not specify any search criteria
  <!-- /TMPL_IF -->
  </h3>




From oleonard at users.sourceforge.net  Wed Jun  8 22:15:29 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:15:29 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/catalogue detail.tmpl,1.5,1.6 searchresults.tmpl,1.2,1.3
Message-ID: <E1Dg6xV-0002Xr-01@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	detail.tmpl searchresults.tmpl 
Log Message:
Synching with rel_2_2.

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/detail.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** detail.tmpl	2 May 2005 20:22:24 -0000	1.5
--- detail.tmpl	8 Jun 2005 20:15:26 -0000	1.6
***************
*** 22,30 ****
  			<!-- TMPL_IF NAME="additional" --><li><b>Additional Author:</b> <!-- TMPL_VAR NAME="additional" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="isbn" --><li><strong>ISBN:</strong> <!-- TMPL_VAR NAME="isbn" --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="seriestitle" --><li><b>Series Title:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- TMPL_IF NAME="volume" --><!-- TMPL_VAR NAME="volume" --><!-- /TMPL_IF --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="subject" --><li><b>Subject:</b> <!-- TMPL_VAR NAME="subject" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="copyrightdate" --><li><b>Copyright:</b> <!-- TMPL_VAR NAME="copyrightdate" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="notes" --><li><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="unititle" --><li><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --></li><!-- /TMPL_IF -->
  			<!-- Hide from NPL --><!-- TMPL_IF NAME="serial" --><li><b>Serial:</b> <!-- TMPL_VAR NAME="serial" --></li><!-- /TMPL_IF --> <!-- /Hide from NPL -->
  			<li><b>Biblio Record</b> <!-- TMPL_VAR NAME="biblionumber" --></li>
--- 22,33 ----
  			<!-- TMPL_IF NAME="additional" --><li><b>Additional Author:</b> <!-- TMPL_VAR NAME="additional" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="isbn" --><li><strong>ISBN:</strong> <!-- TMPL_VAR NAME="isbn" --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="issn" --><li><strong>ISSN:</strong> <!-- TMPL_VAR NAME="issn" --></li><!-- /TMPL_IF --><!-- TMPL_IF NAME="seriestitle" --><li><b>Series Title:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- TMPL_IF NAME="volume" --><!-- TMPL_VAR NAME="volume" --><!-- /TMPL_IF --></li><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="subjects" --><li><strong>Subject(s):</strong>
! 					<!-- TMPL_LOOP name="subjects" -->
! 						<a href="/cgi-bin/koha/search.pl?type=intra&amp;subjectitems=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP --></li>
! 					<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="copyrightdate" --><li><b>Copyright:</b> <!-- TMPL_VAR NAME="copyrightdate" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="notes" --><li><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="unititle" --><li><b>Alternate Title:</b> <!-- TMPL_VAR NAME="unititle" --></li><!-- /TMPL_IF -->
  			<!-- Hide from NPL --><!-- TMPL_IF NAME="serial" --><li><b>Serial:</b> <!-- TMPL_VAR NAME="serial" --></li><!-- /TMPL_IF --> <!-- /Hide from NPL -->
  			<li><b>Biblio Record</b> <!-- TMPL_VAR NAME="biblionumber" --></li>

Index: searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/searchresults.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** searchresults.tmpl	13 Apr 2004 16:52:55 -0000	1.2
--- searchresults.tmpl	8 Jun 2005 20:15:26 -0000	1.3
***************
*** 8,12 ****
  	You searched for <span class="ex"><!-- TMPL_VAR NAME="searchdesc" --></span>
  <!-- TMPL_ELSE -->
! 	You did not specify any seach criteria
  <!-- /TMPL_IF -->
  </h3>
--- 8,12 ----
  	You searched for <span class="ex"><!-- TMPL_VAR NAME="searchdesc" --></span>
  <!-- TMPL_ELSE -->
! 	You did not specify any search criteria
  <!-- /TMPL_IF -->
  </h3>




From oleonard at users.sourceforge.net  Wed Jun  8 22:36:32 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:36:32 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members memberentry.tmpl,1.3.2.3,1.3.2.4
Message-ID: <E1Dg7Hs-0005Vf-Re@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21096/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
      Tag: rel_2_2
	memberentry.tmpl 
Log Message:
Synching with default template

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/memberentry.tmpl,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -C2 -r1.3.2.3 -r1.3.2.4
*** memberentry.tmpl	7 Apr 2005 17:06:16 -0000	1.3.2.3
--- memberentry.tmpl	8 Jun 2005 20:36:30 -0000	1.3.2.4
***************
*** 46,51 ****
  	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
  		<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
- 		<input type="hidden" name="joining" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
- 		<input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="expiry" -->">
  		<input type="hidden" name="type" value="borrowers">
  		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
--- 46,49 ----
***************
*** 85,105 ****
  
  	<tr><th>Addresses:</th><td colspan="4"><fieldset><legend>Mailing Address</legend><label for="streetaddress"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->><a name="address" id="address">Address:</a> </label><input type="text" id="streetaddress" name="streetaddress" size="25" value="<!-- TMPL_VAR NAME="address" -->"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->>
! <br><label for="city"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF -->><a name="#city" id="#city">City, State:</a></label> <input type="text" id="city" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF -->>
  <br><label for="zipcode">Zip Code:</label> <input type="text" id="zipcode" name="zipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="zipcode" -->"></fieldset>
  
  <fieldset><legend>Street Address (if different)</legend>
! <label for="physstreet">Address:</label><input type="text" id="physstreet" name="physstreet" size="25" value="<!-- TMPL_VAR NAME="physstreet" -->">
! <br><label for="streetcity">City, State: </label><input type="text" id="streetcity" name="streetcity" size="20" value="<!-- TMPL_VAR NAME="streetcity" -->">
! <br><label for="homezipcode">Zip Code:</label><input type="text" id="homezipcode" name="homezipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="homezipcode" -->">
  </fieldset>
  </td></tr>
  
! 	<tr><th><label for="phone">Phone (Home):</label> </th><td colspan="4"><input type="text" id="phone" name="phone" size="20" value="<!-- TMPL_VAR NAME="phone" -->"></td></tr>
! 	<tr><th><label for="phoneday">Phone (Daytime):</label> </th><td colspan="4"><input type="text" id="phoneday" name="phoneday" size="20" value="<!-- TMPL_VAR NAME="phoneday" -->"></td></tr>
! 	<tr><th><label for="faxnumber">Fax: </label></th><td colspan="4"><input type="text" id="faxnumber" name="faxnumber" size="20" value="<!-- TMPL_VAR NAME="faxnumber" -->"></td></tr>
! 	<tr><th><label for="emailaddress">Email :</label> </th><td colspan="4"><input type="text" id="emailaddress" name="emailaddress" size="40" value="<!-- TMPL_VAR NAME="emailaddress" -->"></td></tr>
  			</tr>
  	<tr><th><label for="textmessaging">Patron message:</label><p> (appears in OPAC)</p></th><td colspan="4"><textarea id="textmessaging" name="textmessaging" cols="30" rows="3"><!-- TMPL_VAR NAME="textmessaging" --></textarea></td></tr>
  	<tr><th><label for="borrowernotes">Circulation note:</label> <p>(appears in Circulation)</p> </th><td colspan="4"><textarea id="borrowernotes" name="borrowernotes" cols="30" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td></tr>
  			</table></div>
  
--- 83,118 ----
  
  	<tr><th>Addresses:</th><td colspan="4"><fieldset><legend>Mailing Address</legend><label for="streetaddress"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->><a name="address" id="address">Address:</a> </label><input type="text" id="streetaddress" name="streetaddress" size="25" value="<!-- TMPL_VAR NAME="address" -->"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->>
! <br><label for="city"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF -->><a name="#city" id="#city">City, State:</a></label> <input type="text" id="city" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF --> />
  <br><label for="zipcode">Zip Code:</label> <input type="text" id="zipcode" name="zipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="zipcode" -->"></fieldset>
  
  <fieldset><legend>Street Address (if different)</legend>
! <label for="physstreet">Address:</label><input type="text" id="physstreet" name="physstreet" size="25" value="<!-- TMPL_VAR NAME="physstreet" -->" />
! <br><label for="streetcity">City, State: </label><input type="text" id="streetcity" name="streetcity" size="20" value="<!-- TMPL_VAR NAME="streetcity" -->" />
! <br><label for="homezipcode">Zip Code:</label><input type="text" id="homezipcode" name="homezipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="homezipcode" -->" /> 
  </fieldset>
  </td></tr>
  
! 	<tr><th><label for="phone">Phone (Home):</label> </th><td colspan="4"><input type="text" id="phone" name="phone" size="20" value="<!-- TMPL_VAR NAME="phone" -->" /></td></tr>
! 	<tr><th><label for="phoneday">Phone (Daytime):</label> </th><td colspan="4"><input type="text" id="phoneday" name="phoneday" size="20" value="<!-- TMPL_VAR NAME="phoneday" -->" /></td></tr>
! 	<tr><th><label for="faxnumber">Fax: </label></th><td colspan="4"><input type="text" id="faxnumber" name="faxnumber" size="20" value="<!-- TMPL_VAR NAME="faxnumber" -->" /></td></tr>
! 	<tr><th><label for="emailaddress">Email :</label> </th><td colspan="4"><input type="text" id="emailaddress" name="emailaddress" size="40" value="<!-- TMPL_VAR NAME="emailaddress" -->" /></td></tr>
  			</tr>
  	<tr><th><label for="textmessaging">Patron message:</label><p> (appears in OPAC)</p></th><td colspan="4"><textarea id="textmessaging" name="textmessaging" cols="30" rows="3"><!-- TMPL_VAR NAME="textmessaging" --></textarea></td></tr>
  	<tr><th><label for="borrowernotes">Circulation note:</label> <p>(appears in Circulation)</p> </th><td colspan="4"><textarea id="borrowernotes" name="borrowernotes" cols="30" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td></tr>
+ 
+ 			<tr>
+ 				<!-- TMPL_IF NAME="addAction" -->
+ 					<th>Joining date (leave blank for today): </th>
+ 					<td colspan="4"><input type="text" name="joining" size="12" maxlength="10" value="<!-- TMPL_VAR name="joining" -->" /></td>
+ 				<!-- TMPL_ELSE -->
+ 					<th>Joining date: </th>
+ 					<td colspan="4"><!-- TMPL_VAR name="joining" --></td>
+ 				<!-- /TMPL_IF -->
+ 			</tr>
+ 			<tr>
+ 				<th>Expiry date (leave blank for auto calc): </th>
+ 				<td><input type="text" name="expiry" size="12" maxlength="10" value="<!-- TMPL_VAR name="expiry" -->" /></td>
+ 			</tr>
+ 
  			</table></div>
  




From oleonard at users.sourceforge.net  Wed Jun  8 22:36:34 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:36:34 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members memberentry.tmpl,1.6,1.7
Message-ID: <E1Dg7Hu-0005Vu-6R@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21086/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
	memberentry.tmpl 
Log Message:
Synching with rel_2_2.

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/memberentry.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** memberentry.tmpl	2 May 2005 20:21:12 -0000	1.6
--- memberentry.tmpl	8 Jun 2005 20:36:32 -0000	1.7
***************
*** 46,51 ****
  	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
  		<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
- 		<input type="hidden" name="joining" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
- 		<input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="expiry" -->">
  		<input type="hidden" name="type" value="borrowers">
  		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
--- 46,49 ----
***************
*** 61,65 ****
  	<!-- TMPL_UNLESS name="institution" --><tr><th><label for="title">Salutation:</label></th><td colspan="4"><!-- TMPL_VAR NAME="Mr" -->
  				<select name="title" id="title">
! 					<option <!-- TMPL_VAR NAME="title_selected_ " --> value=" ">No Title</option>
  					<option value="Miss" <!-- TMPL_VAR NAME="title_Miss" -->>Miss</option>
  					<option value="Mrs" <!-- TMPL_VAR NAME="title_Mrs" -->>Mrs</option>
--- 59,63 ----
  	<!-- TMPL_UNLESS name="institution" --><tr><th><label for="title">Salutation:</label></th><td colspan="4"><!-- TMPL_VAR NAME="Mr" -->
  				<select name="title" id="title">
! 					<option <!-- TMPL_VAR NAME="title_selected_ " --> value="">No Title</option>
  					<option value="Miss" <!-- TMPL_VAR NAME="title_Miss" -->>Miss</option>
  					<option value="Mrs" <!-- TMPL_VAR NAME="title_Mrs" -->>Mrs</option>
***************
*** 85,105 ****
  
  	<tr><th>Addresses:</th><td colspan="4"><fieldset><legend>Mailing Address</legend><label for="streetaddress"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->><a name="address" id="address">Address:</a> </label><input type="text" id="streetaddress" name="streetaddress" size="25" value="<!-- TMPL_VAR NAME="address" -->"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->>
! <br><label for="city"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF -->><a name="#city" id="#city">City, State:</a></label> <input type="text" id="city" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF -->>
  <br><label for="zipcode">Zip Code:</label> <input type="text" id="zipcode" name="zipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="zipcode" -->"></fieldset>
  
  <fieldset><legend>Street Address (if different)</legend>
! <label for="physstreet">Address:</label><input type="text" id="physstreet" name="physstreet" size="25" value="<!-- TMPL_VAR NAME="physstreet" -->">
! <br><label for="streetcity">City, State: </label><input type="text" id="streetcity" name="streetcity" size="20" value="<!-- TMPL_VAR NAME="streetcity" -->">
! <br><label for="homezipcode">Zip Code:</label><input type="text" id="homezipcode" name="homezipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="homezipcode" -->">
  </fieldset>
  </td></tr>
  
! 	<tr><th><label for="phone">Phone (Home):</label> </th><td colspan="4"><input type="text" id="phone" name="phone" size="20" value="<!-- TMPL_VAR NAME="phone" -->"></td></tr>
! 	<tr><th><label for="phoneday">Phone (Daytime):</label> </th><td colspan="4"><input type="text" id="phoneday" name="phoneday" size="20" value="<!-- TMPL_VAR NAME="phoneday" -->"></td></tr>
! 	<tr><th><label for="faxnumber">Fax: </label></th><td colspan="4"><input type="text" id="faxnumber" name="faxnumber" size="20" value="<!-- TMPL_VAR NAME="faxnumber" -->"></td></tr>
! 	<tr><th><label for="emailaddress">Email :</label> </th><td colspan="4"><input type="text" id="emailaddress" name="emailaddress" size="40" value="<!-- TMPL_VAR NAME="emailaddress" -->"></td></tr>
  			</tr>
  	<tr><th><label for="textmessaging">Patron message:</label><p> (appears in OPAC)</p></th><td colspan="4"><textarea id="textmessaging" name="textmessaging" cols="30" rows="3"><!-- TMPL_VAR NAME="textmessaging" --></textarea></td></tr>
  	<tr><th><label for="borrowernotes">Circulation note:</label> <p>(appears in Circulation)</p> </th><td colspan="4"><textarea id="borrowernotes" name="borrowernotes" cols="30" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td></tr>
  			</table></div>
  
--- 83,118 ----
  
  	<tr><th>Addresses:</th><td colspan="4"><fieldset><legend>Mailing Address</legend><label for="streetaddress"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->><a name="address" id="address">Address:</a> </label><input type="text" id="streetaddress" name="streetaddress" size="25" value="<!-- TMPL_VAR NAME="address" -->"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->>
! <br><label for="city"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF -->><a name="#city" id="#city">City, State:</a></label> <input type="text" id="city" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF --> />
  <br><label for="zipcode">Zip Code:</label> <input type="text" id="zipcode" name="zipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="zipcode" -->"></fieldset>
  
  <fieldset><legend>Street Address (if different)</legend>
! <label for="physstreet">Address:</label><input type="text" id="physstreet" name="physstreet" size="25" value="<!-- TMPL_VAR NAME="physstreet" -->" />
! <br><label for="streetcity">City, State: </label><input type="text" id="streetcity" name="streetcity" size="20" value="<!-- TMPL_VAR NAME="streetcity" -->" />
! <br><label for="homezipcode">Zip Code:</label><input type="text" id="homezipcode" name="homezipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="homezipcode" -->" /> 
  </fieldset>
  </td></tr>
  
! 	<tr><th><label for="phone">Phone (Home):</label> </th><td colspan="4"><input type="text" id="phone" name="phone" size="20" value="<!-- TMPL_VAR NAME="phone" -->" /></td></tr>
! 	<tr><th><label for="phoneday">Phone (Daytime):</label> </th><td colspan="4"><input type="text" id="phoneday" name="phoneday" size="20" value="<!-- TMPL_VAR NAME="phoneday" -->" /></td></tr>
! 	<tr><th><label for="faxnumber">Fax: </label></th><td colspan="4"><input type="text" id="faxnumber" name="faxnumber" size="20" value="<!-- TMPL_VAR NAME="faxnumber" -->" /></td></tr>
! 	<tr><th><label for="emailaddress">Email :</label> </th><td colspan="4"><input type="text" id="emailaddress" name="emailaddress" size="40" value="<!-- TMPL_VAR NAME="emailaddress" -->" /></td></tr>
  			</tr>
  	<tr><th><label for="textmessaging">Patron message:</label><p> (appears in OPAC)</p></th><td colspan="4"><textarea id="textmessaging" name="textmessaging" cols="30" rows="3"><!-- TMPL_VAR NAME="textmessaging" --></textarea></td></tr>
  	<tr><th><label for="borrowernotes">Circulation note:</label> <p>(appears in Circulation)</p> </th><td colspan="4"><textarea id="borrowernotes" name="borrowernotes" cols="30" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td></tr>
+ 
+ 			<tr>
+ 				<!-- TMPL_IF NAME="addAction" -->
+ 					<th>Joining date (leave blank for today): </th>
+ 					<td colspan="4"><input type="text" name="joining" size="12" maxlength="10" value="<!-- TMPL_VAR name="joining" -->" /></td>
+ 				<!-- TMPL_ELSE -->
+ 					<th>Joining date: </th>
+ 					<td colspan="4"><!-- TMPL_VAR name="joining" --></td>
+ 				<!-- /TMPL_IF -->
+ 			</tr>
+ 			<tr>
+ 				<th>Expiry date (leave blank for auto calc): </th>
+ 				<td><input type="text" name="expiry" size="12" maxlength="10" value="<!-- TMPL_VAR name="expiry" -->" /></td>
+ 			</tr>
+ 
  			</table></div>
  




From oleonard at users.sourceforge.net  Wed Jun  8 22:43:11 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:43:11 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ circulation.tmpl,1.15,1.16
Message-ID: <E1Dg7OJ-0006bM-ED@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25311/koha-tmpl/intranet-tmpl/npl/en/circ

Modified Files:
	circulation.tmpl 
Log Message:
Synching with rel_2_2.

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** circulation.tmpl	3 May 2005 18:32:12 -0000	1.15
--- circulation.tmpl	8 Jun 2005 20:43:07 -0000	1.16
***************
*** 47,50 ****
--- 47,53 ----
  				<li>No more renewals possible</li>
  			<!-- /TMPL_IF -->
+ 			<!-- TMPL_IF NAME="EXPIRED" -->
+ 				<li>Patron's card is expired</li>
+ 			<!-- /TMPL_IF -->
  			</ul>
  		</div>




From oleonard at users.sourceforge.net  Wed Jun  8 22:43:14 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:43:14 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ circulation.tmpl,1.6.2.9,1.6.2.10
Message-ID: <E1Dg7OM-0006bq-Uh@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25358/koha-tmpl/intranet-tmpl/npl/en/circ

Modified Files:
      Tag: rel_2_2
	circulation.tmpl 
Log Message:
Synching with default template

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl,v
retrieving revision 1.6.2.9
retrieving revision 1.6.2.10
diff -C2 -r1.6.2.9 -r1.6.2.10
*** circulation.tmpl	3 May 2005 18:31:34 -0000	1.6.2.9
--- circulation.tmpl	8 Jun 2005 20:43:12 -0000	1.6.2.10
***************
*** 47,50 ****
--- 47,53 ----
  				<li>No more renewals possible</li>
  			<!-- /TMPL_IF -->
+ 			<!-- TMPL_IF NAME="EXPIRED" -->
+ 				<li>Patron's card is expired</li>
+ 			<!-- /TMPL_IF -->
  			</ul>
  		</div>




From oleonard at users.sourceforge.net  Wed Jun  8 22:53:14 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:53:14 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/reports borrowers_out.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1Dg7Y2-0007tK-RU@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30287/koha-tmpl/intranet-tmpl/npl/en/reports

Modified Files:
      Tag: rel_2_2
	borrowers_out.tmpl 
Log Message:
Synching with default template

Index: borrowers_out.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports/borrowers_out.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** borrowers_out.tmpl	21 Apr 2005 19:38:11 -0000	1.1.2.1
--- borrowers_out.tmpl	8 Jun 2005 20:53:12 -0000	1.1.2.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
***************
*** 77,80 ****
--- 77,96 ----
  				<td><input type="text" name="Filter" id="borrowercategory" value="" /></td>
  			</tr>
+ 						<tr class="hilighted">
+ 				<td>&nbsp;</td>
+ 				<td>&nbsp;</td>
+ 				<td><label for="issuessince">Without issues since:</label> </td>
+ 				<td><input size="10" id="to" id="issuessince" name="Filter" value="" type="text" />
+ 						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" />
+ 							<script type="text/javascript">
+ 								Calendar.setup(
+ 									{
+ 										inputField : "to",
+ 										ifFormat : "%Y-%m-%d",
+ 										button : "openCalendarTo",
+ 									}
+ 								);
+ 							</script></td>
+ 			</tr>
  		</tbody>
  	</table>




From oleonard at users.sourceforge.net  Wed Jun  8 22:53:16 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:53:16 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/reports borrowers_out.tmpl,1.2,1.3
Message-ID: <E1Dg7Y4-0007ti-8r@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30276/koha-tmpl/intranet-tmpl/npl/en/reports

Modified Files:
	borrowers_out.tmpl 
Log Message:
Synching with rel_2_2.

Index: borrowers_out.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports/borrowers_out.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** borrowers_out.tmpl	2 May 2005 20:08:28 -0000	1.2
--- borrowers_out.tmpl	8 Jun 2005 20:53:14 -0000	1.3
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
***************
*** 77,80 ****
--- 77,96 ----
  				<td><input type="text" name="Filter" id="borrowercategory" value="" /></td>
  			</tr>
+ 						<tr class="hilighted">
+ 				<td>&nbsp;</td>
+ 				<td>&nbsp;</td>
+ 				<td><label for="issuessince">Without issues since:</label> </td>
+ 				<td><input size="10" id="to" id="issuessince" name="Filter" value="" type="text" />
+ 						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" />
+ 							<script type="text/javascript">
+ 								Calendar.setup(
+ 									{
+ 										inputField : "to",
+ 										ifFormat : "%Y-%m-%d",
+ 										button : "openCalendarTo",
+ 									}
+ 								);
+ 							</script></td>
+ 			</tr>
  		</tbody>
  	</table>




From oleonard at users.sourceforge.net  Wed Jun  8 23:22:30 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 14:22:30 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters checkmarc.tmpl,1.2.2.1,1.2.2.2 marctagstructure.tmpl,1.2.2.3,1.2.2.4
Message-ID: <E1Dg80M-0003Nl-OY@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12916/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
      Tag: rel_2_2
	checkmarc.tmpl marctagstructure.tmpl 
Log Message:
Synching with default template

Index: checkmarc.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/checkmarc.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** checkmarc.tmpl	4 Feb 2005 19:24:46 -0000	1.2.2.1
--- checkmarc.tmpl	8 Jun 2005 21:22:22 -0000	1.2.2.2
***************
*** 41,44 ****
--- 41,56 ----
  <!-- /TMPL_IF -->
  <!-- -->
+ 	<!-- TMPL_IF NAME="itemtags" -->
+ 		<tr>
+ 			<td><b>Item tag</b></td>
+ 			<td>There is more than 1 MARC tag related to items tab (10) : <!-- TMPL_VAR name="itemtags" --></td>
+ 		</tr>
+ 	<!-- TMPL_ELSE -->
+ 		<tr>
+ 			<td>OK</td>
+ 			<td><i>Only 1 MARC tag mapped to items</i></td>
+ 		</tr>
+ 	<!-- /TMPL_IF -->
+ 	<!--  -->
  <!-- TMPL_IF name="itemtype" -->
  	<tr>
***************
*** 97,100 ****
--- 109,128 ----
  	</tr>
  <!-- /TMPL_IF -->
+ 
+ 	<!-- TMPL_IF NAME="frameworknull" -->
+ 		<tr>
+ 			<td><b>framework values</b></td>
+ 			<td>there is a null value in a frameworkcode. Check the following tables<br/>
+ 				<li>select * from marc_subfield_structure where frameworkcode is NULL</li>
+ 				<li>select * from marc_tag_structure where frameworkcode is NULL</li>
+ 				<li>select * from marc_biblio where frameworkcode is NULL</li></td>
+ 		</tr>
+ 	<!-- TMPL_ELSE -->
+ 		<tr>
+ 			<td>OK</td>
+ 			<td><i>no NULL value in frameworkcode</i></td>
+ 		</tr>
+ 	<!-- /TMPL_IF -->
+ 
  <!-- -->
  <!-- TMPL_IF name="total" -->

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -r1.2.2.3 -r1.2.2.4
*** marctagstructure.tmpl	30 Mar 2005 19:57:22 -0000	1.2.2.3
--- marctagstructure.tmpl	8 Jun 2005 21:22:28 -0000	1.2.2.4
***************
*** 119,123 ****
  <!-- TMPL_IF NAME="else" -->
  
! <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  <label for="frameworkcode">Select a framework: </label>
  	<select id="frameworkcode" name="frameworkcode">
--- 119,123 ----
  <!-- TMPL_IF NAME="else" -->
  
! <form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  <label for="frameworkcode">Select a framework: </label>
  	<select id="frameworkcode" name="frameworkcode">
***************
*** 130,133 ****
--- 130,136 ----
  	<input type="text" name="searchfield" id="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
  	<input type="submit" value="Search" class="submit">
+ 			<p>
+ 		<label for="select_display">Display only used Tags/Subfields</label> <input type="checkbox" name="select_display" id="select_display" value="True"<!-- TMPL_IF Name="select_display"--> checked="checked"<!--/TMPL_IF -->  onchange="this.form.submit();" />
+ 		</p>
  </form>
  <p class="note">NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script.</p>
***************
*** 143,146 ****
--- 146,176 ----
  		<th>Edit</th>
  		<th>Delete</th>
+ 				<tr>
+ 	<!-- TMPL_IF NAME="select_display" -->
+ 		<!-- TMPL_LOOP NAME="loop" -->
+ 			<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
+ 			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
+ 			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
+ 			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+ 			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+ 			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
+ 			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
+ 			<td><a href="<!-- TMPL_VAR NAME="edit" -->">Edit</a></td>
+ 			<td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
+ 		</tr>
+ 			<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
+ 			<td>
+ 				&nbsp;
+ 			</td>
+ 			<td colspan="7">
+ 				<!-- TMPL_LOOP NAME="subfields" -->
+ 					<p>	Tab:<!-- TMPL_VAR NAME="tab" --> | $<!-- TMPL_VAR NAME="tagsubfield" -->
+ 							<!-- TMPL_VAR NAME="liblibrarian" --> <!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!--/TMPL_IF --><!-- TMPL_IF NAME="repeatable" -->, repeatable<!-- /TMPL_IF --><!-- TMPL_IF NAME="mandatory" -->, Mandatory<!-- /TMPL_IF --><!-- TMPL_IF NAME="seealso" -->, See <!-- TMPL_VAR name="seealso" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authorised_value" -->, <!-- TMPL_VAR NAME="authorised_value" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authtypecode" -->, <!-- TMPL_VAR NAME="authtypecode" --><!--/TMPL_IF --><!-- TMPL_IF NAME="value_builder" -->, <!-- TMPL_VAR NAME="value_builder" --><!--/TMPL_IF -->
+ 					</p>
+ 				<!-- /TMPL_LOOP -->
+ 			</td>
+ 		</tr>
+ 		<!-- /TMPL_LOOP -->
+ 	<!-- TMPL_ELSE -->
  	<!-- TMPL_LOOP NAME="loop" -->
  	<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
***************
*** 155,161 ****
  	</tr>
  	<!-- /TMPL_LOOP -->
  	</table>
  <div id="pages">	<!-- TMPL_IF NAME="isprevpage" -->
! 			<a class="pages" href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">&lt;&lt; Previous</a>
  		<!-- /TMPL_IF --><form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<input type="hidden" name="op" value="add_form">
--- 185,192 ----
  	</tr>
  	<!-- /TMPL_LOOP -->
+ 	<!--/TMPL_IF -->
  	</table>
  <div id="pages">	<!-- TMPL_IF NAME="isprevpage" -->
! 			<a class="pages" href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">&lt;&lt; Previous</a>
  		<!-- /TMPL_IF --><form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<input type="hidden" name="op" value="add_form">
***************
*** 166,171 ****
  	</form>
  		<!-- TMPL_IF NAME="nextpage" -->
! 			<a class="pages" href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">Next &gt;&gt;</a>
  		<!-- /TMPL_IF --></div>
  </div>
  <!-- /TMPL_IF -->
--- 197,207 ----
  	</form>
  		<!-- TMPL_IF NAME="nextpage" -->
! 			<a class="pages" href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">Next &gt;&gt;</a>
  		<!-- /TMPL_IF --></div>
+ 		<script language="javascript" type="text/javascript">
+ 	function ChangeDisplay(checkbox) {
+ 		window.
+ 	}
+ </script>
  </div>
  <!-- /TMPL_IF -->




From oleonard at users.sourceforge.net  Wed Jun  8 23:23:46 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 14:23:46 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters checkmarc.tmpl,1.3,1.4 marctagstructure.tmpl,1.7,1.8
Message-ID: <E1Dg81a-0003b3-2D@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13662/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
	checkmarc.tmpl marctagstructure.tmpl 
Log Message:
Synching with rel_2_2.

Index: checkmarc.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/checkmarc.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** checkmarc.tmpl	4 Feb 2005 19:26:14 -0000	1.3
--- checkmarc.tmpl	8 Jun 2005 21:23:43 -0000	1.4
***************
*** 41,44 ****
--- 41,56 ----
  <!-- /TMPL_IF -->
  <!-- -->
+ 	<!-- TMPL_IF NAME="itemtags" -->
+ 		<tr>
+ 			<td><b>Item tag</b></td>
+ 			<td>There is more than 1 MARC tag related to items tab (10) : <!-- TMPL_VAR name="itemtags" --></td>
+ 		</tr>
+ 	<!-- TMPL_ELSE -->
+ 		<tr>
+ 			<td>OK</td>
+ 			<td><i>Only 1 MARC tag mapped to items</i></td>
+ 		</tr>
+ 	<!-- /TMPL_IF -->
+ 	<!--  -->
  <!-- TMPL_IF name="itemtype" -->
  	<tr>
***************
*** 97,100 ****
--- 109,128 ----
  	</tr>
  <!-- /TMPL_IF -->
+ 
+ 	<!-- TMPL_IF NAME="frameworknull" -->
+ 		<tr>
+ 			<td><b>framework values</b></td>
+ 			<td>there is a null value in a frameworkcode. Check the following tables<br/>
+ 				<li>select * from marc_subfield_structure where frameworkcode is NULL</li>
+ 				<li>select * from marc_tag_structure where frameworkcode is NULL</li>
+ 				<li>select * from marc_biblio where frameworkcode is NULL</li></td>
+ 		</tr>
+ 	<!-- TMPL_ELSE -->
+ 		<tr>
+ 			<td>OK</td>
+ 			<td><i>no NULL value in frameworkcode</i></td>
+ 		</tr>
+ 	<!-- /TMPL_IF -->
+ 
  <!-- -->
  <!-- TMPL_IF name="total" -->

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** marctagstructure.tmpl	2 May 2005 19:56:15 -0000	1.7
--- marctagstructure.tmpl	8 Jun 2005 21:23:43 -0000	1.8
***************
*** 119,123 ****
  <!-- TMPL_IF NAME="else" -->
  
! <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  <label for="frameworkcode">Select a framework: </label>
  	<select id="frameworkcode" name="frameworkcode">
--- 119,123 ----
  <!-- TMPL_IF NAME="else" -->
  
! <form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  <label for="frameworkcode">Select a framework: </label>
  	<select id="frameworkcode" name="frameworkcode">
***************
*** 130,133 ****
--- 130,136 ----
  	<input type="text" name="searchfield" id="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
  	<input type="submit" value="Search" class="submit">
+ 			<p>
+ 		<label for="select_display">Display only used Tags/Subfields</label> <input type="checkbox" name="select_display" id="select_display" value="True"<!-- TMPL_IF Name="select_display"--> checked="checked"<!--/TMPL_IF -->  onchange="this.form.submit();" />
+ 		</p>
  </form>
  <p class="note">NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script.</p>
***************
*** 143,146 ****
--- 146,176 ----
  		<th>Edit</th>
  		<th>Delete</th>
+ 				<tr>
+ 	<!-- TMPL_IF NAME="select_display" -->
+ 		<!-- TMPL_LOOP NAME="loop" -->
+ 			<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
+ 			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
+ 			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
+ 			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+ 			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+ 			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
+ 			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
+ 			<td><a href="<!-- TMPL_VAR NAME="edit" -->">Edit</a></td>
+ 			<td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
+ 		</tr>
+ 			<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
+ 			<td>
+ 				&nbsp;
+ 			</td>
+ 			<td colspan="7">
+ 				<!-- TMPL_LOOP NAME="subfields" -->
+ 					<p>	Tab:<!-- TMPL_VAR NAME="tab" --> | $<!-- TMPL_VAR NAME="tagsubfield" -->
+ 							<!-- TMPL_VAR NAME="liblibrarian" --> <!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!--/TMPL_IF --><!-- TMPL_IF NAME="repeatable" -->, repeatable<!-- /TMPL_IF --><!-- TMPL_IF NAME="mandatory" -->, Mandatory<!-- /TMPL_IF --><!-- TMPL_IF NAME="seealso" -->, See <!-- TMPL_VAR name="seealso" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authorised_value" -->, <!-- TMPL_VAR NAME="authorised_value" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authtypecode" -->, <!-- TMPL_VAR NAME="authtypecode" --><!--/TMPL_IF --><!-- TMPL_IF NAME="value_builder" -->, <!-- TMPL_VAR NAME="value_builder" --><!--/TMPL_IF -->
+ 					</p>
+ 				<!-- /TMPL_LOOP -->
+ 			</td>
+ 		</tr>
+ 		<!-- /TMPL_LOOP -->
+ 	<!-- TMPL_ELSE -->
  	<!-- TMPL_LOOP NAME="loop" -->
  	<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
***************
*** 155,161 ****
  	</tr>
  	<!-- /TMPL_LOOP -->
  	</table>
  <div id="pages">	<!-- TMPL_IF NAME="isprevpage" -->
! 			<a class="pages" href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">&lt;&lt; Previous</a>
  		<!-- /TMPL_IF --><form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<input type="hidden" name="op" value="add_form">
--- 185,192 ----
  	</tr>
  	<!-- /TMPL_LOOP -->
+ 	<!--/TMPL_IF -->
  	</table>
  <div id="pages">	<!-- TMPL_IF NAME="isprevpage" -->
! 			<a class="pages" href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">&lt;&lt; Previous</a>
  		<!-- /TMPL_IF --><form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<input type="hidden" name="op" value="add_form">
***************
*** 166,171 ****
  	</form>
  		<!-- TMPL_IF NAME="nextpage" -->
! 			<a class="pages" href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">Next &gt;&gt;</a>
  		<!-- /TMPL_IF --></div>
  </div>
  <!-- /TMPL_IF -->
--- 197,207 ----
  	</form>
  		<!-- TMPL_IF NAME="nextpage" -->
! 			<a class="pages" href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">Next &gt;&gt;</a>
  		<!-- /TMPL_IF --></div>
+ 		<script language="javascript" type="text/javascript">
+ 	function ChangeDisplay(checkbox) {
+ 		window.
+ 	}
+ </script>
  </div>
  <!-- /TMPL_IF -->




From hellen at users.sourceforge.net  Thu Jun  9 10:37:44 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 09 Jun 2005 01:37:44 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/acqui acqui-home.tmpl,1.3,1.4
Message-ID: <E1DgIXo-0002UP-D5@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	acqui-home.tmpl 
Log Message:
translated by hellen

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui/acqui-home.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** acqui-home.tmpl	5 Jun 2005 18:10:12 -0000	1.3
--- acqui-home.tmpl	9 Jun 2005 08:37:41 -0000	1.4
***************
*** 1,3 ****
--- 1,4 ----
  <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
+ <!-- version 1.14.2.1, Tue Jun 7 13:17:38 200, geaendert 080605 by hellen -->
  <div id="mainbloc">
  
***************
*** 5,8 ****
--- 6,12 ----
  <div id="bloc25">
  	<h2 class="acquisition">Beginnen, Eingangsbearbeitung, &auml;ndern von Bestellungen</h2>
+ 	<!-- TMPL_IF name="nobudget" -->
+   	                 <p class="problem">Sie m&uuml;ssen unter Parameter ein Budget definieren</p>
+   	         <!-- TMPL_ELSE -->
  		<form action="/cgi-bin/koha/acqui/order.pl" method="post">
  			Lieferantenname: <input type="text"  size="25"   name="supplier">
***************
*** 10,13 ****
--- 14,18 ----
  		</form>
  	<p>oder <a href="histsearch.pl" class="button acquisition"> Suche Bestellhistorie</a></p>
+ 	<!-- /TMPL_IF -->
  </div>
  
***************
*** 40,48 ****
  	<form action="/cgi-bin/koha/search.pl">
  		<h2 class="acquisition">Etats und Budgets</h2>
  		<table class="noborder">
  			<tr>
  				<th class="acquisition">Etats</th>
! 				<th class="acquisition">Total</th>
! 				<th class="acquisition">geschenkt</th>
  				<th class="acquisition">Verausgabt</th>
  				<th class="acquisition">Verf&uuml;gbar </th>
--- 45,56 ----
  	<form action="/cgi-bin/koha/search.pl">
  		<h2 class="acquisition">Etats und Budgets</h2>
+ 		<!-- TMPL_IF name="nobudget" -->
+   	                 <p class="problem">Sie m&uuml;sen unter Parameter ein Budget definieren</p>
+   	         <!-- TMPL_ELSE -->
  		<table class="noborder">
  			<tr>
  				<th class="acquisition">Etats</th>
! 				<th class="acquisition">Gesamt</th>
! 				<th class="acquisition">Geschenkt</th>
  				<th class="acquisition">Verausgabt</th>
  				<th class="acquisition">Verf&uuml;gbar </th>
***************
*** 66,72 ****
  		</table>
  		<p>
! Benutzen Sie den "neu laden"-Button des Browsers zur Anzeige der aktuellen Werte. Die angezeigten Werte sind nur ungef&auml;hre Werte, da bei Zahlung eines Betrags der dann aktuelle Wechselkurs berechnet wird.
  		</p>
! 	</form>
  </div>
  
--- 74,80 ----
  		</table>
  		<p>
! Benutzen Sie den "neu laden"-Button des Browsers zur Anzeige der aktuellen Betr&auml;ge. Die angezeigten Werte sind nur ungef&auml;hre Werte, da bei Zahlung eines Betrags der dann aktuelle Wechselkurs berechnet wird.
  		</p>
! 	<!-- /TMPL_IF -->
  </div>
  
***************
*** 74,81 ****
  	<h2 class="acquisition">HILFE Bestellungen</h2>
  	<ul>
! 		<p>Zu Beginn einer Bestellung, eines direkten Kaufs oder Eingabe eines Geschenks, suchen Sie zuerst nach einem Lieferanten. Falls n&ouml;tig, f&uuml;gen Sie einen neuen hinzu.</p>
  		<p>W&auml;hlen Sie dann einen Einkausfkorb aus bzw. legen Sie einen neuen Korb an. Beachten Sie bitte, dass der neue Korb dem angemeldeten Benutzer zugeordnet wird.</p>
  		<p>Sie m&uuml;ssen das zu bestellende Exemplar einem bestehenden Biblio zuordnen, oder erst einen neuen Biblio anlegen.</p>
! 		<p>Um einen Einkaufskorb zu schlie&szlig;en, klicken Sie auf "Einkaufkorb anzeigen", dann auf "Einkaufskorb best&auml;tigen".</p>
  	</ul>
  </div>
--- 82,89 ----
  	<h2 class="acquisition">HILFE Bestellungen</h2>
  	<ul>
! 		<p>Zu Beginn eines Erwerbungsvorgangs, gleichg&uuml;ltig, ob es eine Bestellung, ein direkter Kauf oder ein Geschenk ist, mu&szlig; zuerst ein Lieferant aufgerufen werden. Falls n&ouml;tig, f&uuml;gen Sie einen neuen hinzu.</p>
  		<p>W&auml;hlen Sie dann einen Einkausfkorb aus bzw. legen Sie einen neuen Korb an. Beachten Sie bitte, dass der neue Korb dem angemeldeten Benutzer zugeordnet wird.</p>
  		<p>Sie m&uuml;ssen das zu bestellende Exemplar einem bestehenden Biblio zuordnen, oder erst einen neuen Biblio anlegen.</p>
! 		<p>Um einen Einkaufskorb zu schlie&szlig;en, klicken Sie auf "Einkaufskorb anzeigen", dann auf "Einkaufskorb best&auml;tigen".</p>
  	</ul>
  </div>




From hellen at users.sourceforge.net  Thu Jun  9 10:37:44 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 09 Jun 2005 01:37:44 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/help/admin biblio_framework.tmpl,1.1,1.2
Message-ID: <E1DgIXo-0002Ua-I0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/help/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9482/koha-tmpl/intranet-tmpl/default/de/help/admin

Modified Files:
	biblio_framework.tmpl 
Log Message:
translated by hellen

Index: biblio_framework.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/help/admin/biblio_framework.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** biblio_framework.tmpl	12 May 2005 19:26:15 -0000	1.1
--- biblio_framework.tmpl	9 Jun 2005 08:37:42 -0000	1.2
***************
*** 1,6 ****
  <!-- TMPL_INCLUDE NAME="help-top.inc" -->
  	<h1>Biblio Framework</h1>
! 	<p>biblio frameworks are used to catalogue your biblios.</p>
! 	<p>Unlike Koha 2.0, in this version you can have more than 1 framework to catalogate differently various materials. You can, for example, define 1 framework for monographies, 1 framework for serials, 1 framework for URL...</p>
! 	<p>Once a framework type is created, you can clic on "MARC structure" to define the exact MARC structure. The first time, Koha will ask you to select an existing framework to copy into the new one. Thus, you don't have to define all the MARC structure</p>
! <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
--- 1,6 ----
  <!-- TMPL_INCLUDE NAME="help-top.inc" -->
  	<h1>Biblio Framework</h1>
! 	<p>Biblio Frameworks werden zur Katalogisierung ihrer Biblios ben&ouml;tigt.</p>
! 	<p>Im Gegensatz zu Koha 2.0 kann man mehr als ein Framework f&uuml;r die Katalogisierung unterschiedlicher Materialien definieren. Sie k&ouml;nnen z.B. 1 Framework f&uuml;r Monographien, 1 Framework f&uuml;r Serien, 1 Framework f&uuml;r URL's usw. einrichten.</p>
! 	<p>Ist ein Framework angelegt, klicken sie auf "MARC structure" zur Definition der speziellen MARC-Struktur. Zuerst fragt Koha sie, ob ein bereits existierendes in das neue Framework kopiert werden soll. Dies ist sinnvoll, damit nicht die komplette MARC-Struktur neu angelegt werden mu&szlig;.</p>
! <!-- TMPL_INCLUDE name="help-bottom.inc" -->




From hellen at users.sourceforge.net  Thu Jun  9 10:37:44 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 09 Jun 2005 01:37:44 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/z3950 searchresult.tmpl,1.1,1.2
Message-ID: <E1DgIXo-0002Uj-M1@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/z3950
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9482/koha-tmpl/intranet-tmpl/default/de/z3950

Modified Files:
	searchresult.tmpl 
Log Message:
translated by hellen

Index: searchresult.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/z3950/searchresult.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** searchresult.tmpl	12 May 2005 19:27:06 -0000	1.1
--- searchresult.tmpl	9 Jun 2005 08:37:42 -0000	1.2
***************
*** 47,51 ****
  				<p>Nichts gefunden</p>
  	<!-- /TMPL_IF -->
! 	<!-- TMPL_IF NAME="numberpending" --><h1 class="catalogue">Still <!-- TMPL_VAR NAME="numberpending" --> requests to go</h1><!-- /TMPL_IF -->
  	<script language="javascript" type="text/javascript">
  		function Import(GetThisOne) {
--- 47,51 ----
  				<p>Nichts gefunden</p>
  	<!-- /TMPL_IF -->
! 	<!-- TMPL_IF NAME="numberpending" --><h1 class="catalogue">Noch <!-- TMPL_VAR NAME="numberpending" --> Anfrage(n) zu erledigen</h1><!-- /TMPL_IF -->
  	<script language="javascript" type="text/javascript">
  		function Import(GetThisOne) {




From hellen at users.sourceforge.net  Thu Jun  9 10:37:44 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 09 Jun 2005 01:37:44 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/bookshelves addbookbybiblionumber.tmpl,1.2,1.3 shelves.tmpl,1.2,1.3
Message-ID: <E1DgIXo-0002UZ-H8@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/bookshelves
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9482/koha-tmpl/intranet-tmpl/default/de/bookshelves

Modified Files:
	addbookbybiblionumber.tmpl shelves.tmpl 
Log Message:
translated by hellen

Index: addbookbybiblionumber.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/bookshelves/addbookbybiblionumber.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** addbookbybiblionumber.tmpl	17 May 2005 13:21:35 -0000	1.2
--- addbookbybiblionumber.tmpl	9 Jun 2005 08:37:42 -0000	1.3
***************
*** 7,11 ****
  	<p><label>Verfasser</label><!-- TMPL_VAR NAME="author" --></p>
  	<p><label>Zum virtuellen Regal <!-- TMPL_VAR NAME="CGIbookshelves" --> hinzuf&uuml;gen</label></p>
! 	<p>oder zu einem neuen virtuellem Regal hinzuf&uuml;gen </p>
  	<p><input type="text" name="newbookshelf" maxlength=40 size=40>
  		<select name="category">
--- 7,11 ----
  	<p><label>Verfasser</label><!-- TMPL_VAR NAME="author" --></p>
  	<p><label>Zum virtuellen Regal <!-- TMPL_VAR NAME="CGIbookshelves" --> hinzuf&uuml;gen</label></p>
! 	<p>oder zu einem neuen virtuellen Regal hinzuf&uuml;gen </p>
  	<p><input type="text" name="newbookshelf" maxlength=40 size=40>
  		<select name="category">

Index: shelves.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/bookshelves/shelves.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** shelves.tmpl	17 May 2005 13:21:35 -0000	1.2
--- shelves.tmpl	9 Jun 2005 08:37:42 -0000	1.3
***************
*** 36,40 ****
  	<div id="bloc25">
  		<form>
! 		<h2 class="catalogue">Buch mittels Strichcode hinzuf&uuml;gen</h2>
  			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
  			<input type="hidden" name="modifyshelfcontents" value="1">
--- 36,40 ----
  	<div id="bloc25">
  		<form>
! 		<h2 class="catalogue">Buch mittels Barcode hinzuf&uuml;gen</h2>
  			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
  			<input type="hidden" name="modifyshelfcontents" value="1">
***************
*** 48,52 ****
  	<!-- /TMPL_IF -->
  	<div id="bloc25">
! 		<a href="shelves.pl" class="button catalogue">Shelf-Liste</a>
  	</div>
  <!-- TMPL_ELSE -->
--- 48,52 ----
  	<!-- /TMPL_IF -->
  	<div id="bloc25">
! 		<a href="shelves.pl" class="button catalogue">Regalliste</a>
  	</div>
  <!-- TMPL_ELSE -->
***************
*** 93,97 ****
  					</select>
  				</p>
! 				<p> <li>ein privates Regal wird durch Sie verwaltet und kann nur von Ihnen eingesehen werden</li>
  					<li> Ein &ouml;ffentliches Regal wird durch Sie verwaltet, kann aber von jedermann eingesehen werden.</li>
  					<li> Ein freies Regal kann von jedem Benutzer bearbeitet und betrachtet werden.</li>
--- 93,97 ----
  					</select>
  				</p>
! 				<p> <li>Ein privates Regal wird durch Sie verwaltet und kann nur von Ihnen eingesehen werden</li>
  					<li> Ein &ouml;ffentliches Regal wird durch Sie verwaltet, kann aber von jedermann eingesehen werden.</li>
  					<li> Ein freies Regal kann von jedem Benutzer bearbeitet und betrachtet werden.</li>
***************
*** 165,169 ****
  				</select>
  			</p>
! 				<p> <li>ein privates Regal wird durch Sie verwaltet und kann nur von Ihnen eingesehen werden</li>
  					<li> Ein &ouml;ffentliches Regal wird durch Sie verwaltet, kann aber von jedermann eingesehen werden.</li>
  					<li> Ein freies Regal kann von jedem Benutzer bearbeitet und betrachtet werden.</li>
--- 165,169 ----
  				</select>
  			</p>
! 				<p> <li>Ein privates Regal wird durch Sie verwaltet und kann nur von Ihnen eingesehen werden</li>
  					<li> Ein &ouml;ffentliches Regal wird durch Sie verwaltet, kann aber von jedermann eingesehen werden.</li>
  					<li> Ein freies Regal kann von jedem Benutzer bearbeitet und betrachtet werden.</li>




From hellen at users.sourceforge.net  Thu Jun  9 10:37:44 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 09 Jun 2005 01:37:44 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/help nohelp.tmpl,1.1,1.2
Message-ID: <E1DgIXo-0002Ue-KI@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/help
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9482/koha-tmpl/intranet-tmpl/default/de/help

Modified Files:
	nohelp.tmpl 
Log Message:
translated by hellen

Index: nohelp.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/help/nohelp.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** nohelp.tmpl	12 May 2005 19:26:15 -0000	1.1
--- nohelp.tmpl	9 Jun 2005 08:37:42 -0000	1.2
***************
*** 1,4 ****
  <!-- TMPL_INCLUDE NAME="help-top.inc" -->
  	<h1>Online Hilfe</h1>
! 	<p>Sorry, keine Hilfe f&uuml;r diesen Punkt</p>
! <!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
--- 1,4 ----
  <!-- TMPL_INCLUDE NAME="help-top.inc" -->
  	<h1>Online Hilfe</h1>
! 	<p>Sorry, keine Hilfe f&uuml;r diesen Punkt verf&uuml;gbar</p>
! <!-- TMPL_INCLUDE NAME="help-bottom.inc" -->




From oleonard at users.sourceforge.net  Thu Jun  9 18:19:21 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 09:19:21 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/search.marc dictionary.tmpl,NONE,1.1.2.1 search.tmpl,1.6.2.4,1.6.2.5
Message-ID: <E1DgPkX-0006i8-Ta@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	search.tmpl 
Added Files:
      Tag: rel_2_2
	dictionary.tmpl 
Log Message:
Adding authority search functionality to intranet advanced search page, to synch with default template

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Dictionary Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<div id="main-compact">
	<h1>Dictionary Search</h1>
	<div class="form"><form name="f" method="post" action="/cgi-bin/koha/search.marc/dictionary.pl">
	<input type="hidden" name="op" value="do_search" />
				<label for="keyword">Search for keyword(s): </label>
				<input type="hidden" name="marclist" value="<!-- TMPL_VAR Name="marclist" -->" />
				<input type="text" name="search" value="<!-- TMPL_VAR Name="search" -->" size="35" />
				<input type="submit" value="Start search" class="submit" />
				<input type="hidden" name="type" value="<!-- TMPL_VAR Name="type" -->" />
				<input type="hidden" name="index" value="<!-- TMPL_VAR Name="anindex" ESCAPE="URL" -->" /></form></div>

<!-- TMPL_IF Name=search -->
	<!-- TMPL_IF NAME="authresult" -->
		<div id="pages">
			<!-- TMPL_IF NAME="displayprev" --> 
					<a class="pages" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
				<!-- /TMPL_IF -->
				<!-- TMPL_LOOP NAME="numbers" -->
					<!-- TMPL_IF NAME="highlight" -->
						<span class="current"><!-- TMPL_VAR NAME="number" --></span>
					<!-- TMPL_ELSE --> 
						<a class="pages" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
					<!-- /TMPL_IF -->
				<!-- /TMPL_LOOP --> 
				<!-- TMPL_IF NAME="displaynext" -->
					<a class="pages" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">Next&gt;&gt;</a>
				<!-- /TMPL_IF -->
			</div>
			<div id="results">
			<!-- TMPL_IF NAME="nbresults" -->
					Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="nbresults" --> in Authorities<!-- TMPL_ELSE -->No results found.
			<!-- /TMPL_IF -->
			</div>
		
		<div id="resultlist">
			<table>
				<caption>Authority Results</caption>
				<tr>
					<th>Summary</th>
					<th>Used in</th>
					<th>Select</th>
				</tr>
				<!-- TMPL_LOOP NAME="authresult" -->
					<!-- TMPL_IF NAME="even" --><tr class="hilighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
					<td>
							<!-- TMPL_VAR NAME="summary" -->
						</td>
						<td>
							<!-- TMPL_VAR NAME="used" --> records(s)
						</td>
							<td>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)">Select</a> | 
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)">Sel. &amp; close</a>
						</td>
					</tr>
				<!-- /TMPL_LOOP -->
			</table>
		</div>
		<!-- TMPL_ELSE -->
			<h3>No results in Authorities</h3>
	<!-- /TMPL_IF -->
		
		
	<!-- TMPL_IF Name="catresult" -->
	<h2>Catalog Results</h2>
			<div id="results">
			<!-- TMPL_IF NAME="total" -->
					Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --> in the Catalog<!-- TMPL_ELSE -->No results found.
			<!-- /TMPL_IF -->
		</div>
			<table>
				<tr>
					<th>Summary</th>
					<th>Used in</th>
					<th>Select</th>
				</tr>
				<!-- TMPL_LOOP NAME="catresult" -->
				<!-- TMPL_IF NAME="even" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
				<td>
					<!-- TMPL_IF name="MARC_ON" -->
									<!-- TMPL_VAR NAME="value" -->
								<!-- TMPL_ELSE -->
									<!-- TMPL_VAR NAME="value" -->
								<!-- /TMPL_IF -->
					</td>
					<td>
						<!-- TMPL_VAR NAME="count" --> records(s)
					</td>
					<td>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)">Select</a> | 
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)">Sel. &amp; close</a>
					</td>
				</tr>
				<!-- /TMPL_LOOP -->
			</table>
		<div id="pages">
			<!-- TMPL_IF NAME="displayprev" --> 
					<a class="pages" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
				<!-- /TMPL_IF -->
				<!-- TMPL_LOOP NAME="numbers" -->
					<!-- TMPL_IF NAME="highlight" -->
						<span class="current"><!-- TMPL_VAR NAME="number" --></span>
					<!-- TMPL_ELSE --> 
						<a class="pages" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
					<!-- /TMPL_IF -->
				<!-- /TMPL_LOOP --> 
				<!-- TMPL_IF NAME="displaynext" -->
					<a class="pages" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">Next&gt;&gt;</a>
				<!-- /TMPL_IF -->
</div>
			<div id="results">
			<!-- TMPL_IF NAME="total" -->
					Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --> in the Catalog<!-- TMPL_ELSE -->No results found.
			<!-- /TMPL_IF -->
			</div>
		
	<!-- /TMPL_IF -->
	<script language="JavaScript" type="text/javascript">
	function SelectEntry(myentry, myindex, wclose){
		if (opener.document.f.value[myindex].value!=""){ 
			opener.document.f.value[myindex].value=opener.document.f.value[myindex].value+" "+myentry
		} else {
			opener.document.f.value[myindex].value=myentry
		}
		if (wclose == 1) {
	// 	alert("closing")
			self.close();
		}
	}
	</script>
	</div>
<!-- /TMPL_IF -->
</div>
</body>
</html>
Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc/search.tmpl,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -C2 -r1.6.2.4 -r1.6.2.5
*** search.tmpl	19 Apr 2005 19:31:16 -0000	1.6.2.4
--- search.tmpl	9 Jun 2005 16:19:19 -0000	1.6.2.5
***************
*** 28,32 ****
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="title" name="value" onchange="sql_update()" size="35" accesskey="t" /></td>
  		</tr>
  		<tr>
--- 28,34 ----
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="title" name="value" onchange="sql_update()" size="35" accesskey="t" />			<a href="javascript:Dopop('dictionary.pl?marclist=biblio.title&amp;type=intranet&amp;index=1',1)" class="button catalogue">
! 				<strong>...</strong>
! 			</a></td>
  		</tr>
  		<tr>
***************
*** 36,40 ****
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="author" name="value" onchange="sql_update()" size="35" accesskey="a" /></td>
  		</tr>
  		<tr>
--- 38,44 ----
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="author" name="value" onchange="sql_update()" size="35" accesskey="a" />			<a href="javascript:Dopop('dictionary.pl?marclist=biblio.author&amp;type=intranet&amp;index=2',2)" class="button catalogue">
! 				<strong>...</strong>
! 			</a></td>
  		</tr>
  		<tr>
***************
*** 44,48 ****
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />  
! 			<input type="text" id="subject" name="value" onchange="sql_update()" size="35" accesskey="s" /></td>
  		</tr>
  <tr><th><label for="seriestitle">Series title</label></th><td>			
--- 48,54 ----
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />  
! 			<input type="text" id="subject" name="value" onchange="sql_update()" size="35" accesskey="s" />			<a href="javascript:Dopop('dictionary.pl?marclist=bibliosubject.subject&amp;type=intranet&amp;index=3',3)" class="button catalogue">
! 				<strong>...</strong>
! 			</a></td>
  		</tr>
  <tr><th><label for="seriestitle">Series title</label></th><td>			
***************
*** 189,192 ****
--- 195,203 ----
  }
  
+ function Dopop(link,i) {
+ 	var searchstring=document.forms[4].value[i].value;
+ 	newin=window.open(link+'&amp;search='+searchstring,"popup",'width=700,height=550,toolbar=false,scrollbars=yes');
+ }
+ 
  function PopupSuggestion() {
      var strQuery="";




From hellen at users.sourceforge.net  Thu Jun  9 19:54:33 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 09 Jun 2005 10:54:33 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple additem.tmpl,1.3,1.4
Message-ID: <E1DgREf-0003J8-Ty@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	additem.tmpl 
Log Message:
translated by hellen

Index: additem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/additem.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** additem.tmpl	5 Jun 2005 14:45:17 -0000	1.3
--- additem.tmpl	9 Jun 2005 17:54:31 -0000	1.4
***************
*** 6,10 ****
  	<div class="tabbed">
  		<h1 class="catalogue">Biblionummer: <!-- TMPL_VAR NAME="biblionumber" --></h1>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Bibliografische daten bearbeiten  </a>
  		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">  Duplizieren  </a>
  		<a href="../MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  MARC  </a>
--- 6,10 ----
  	<div class="tabbed">
  		<h1 class="catalogue">Biblionummer: <!-- TMPL_VAR NAME="biblionumber" --></h1>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Bibliografische Daten bearbeiten  </a>
  		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">  Duplizieren  </a>
  		<a href="../MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  MARC  </a>




From hellen at users.sourceforge.net  Thu Jun  9 19:54:34 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 09 Jun 2005 10:54:34 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/errors 404.tmpl,1.1,1.2
Message-ID: <E1DgREg-0003JJ-8e@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12634/koha-tmpl/intranet-tmpl/default/de/errors

Modified Files:
	404.tmpl 
Log Message:
translated by hellen

Index: 404.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/errors/404.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 404.tmpl	12 May 2005 19:26:14 -0000	1.1
--- 404.tmpl	9 Jun 2005 17:54:32 -0000	1.2
***************
*** 5,11 ****
  <h2>Fehler 404</h2>
  <ul>
! <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>
--- 5,11 ----
  <h2>Fehler 404</h2>
  <ul>
! <li>Dieser Fehler besagt, dass die aufgerufene Seite nicht existiert.</li>	
! <li>Um diesen Fehler zu melden, k&ouml;nnen Sie eine Mail <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">an den Koha Administrator schicken</a>.</li>
! <li>&Uuml;ber das Men&uuml; k&ouml;nnen Sie andere Bereiche von Koha ausw&auml;hlen.</li>
  </ul>
  </div>




From hellen at users.sourceforge.net  Thu Jun  9 19:54:34 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 09 Jun 2005 10:54:34 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/parameters categorie.tmpl,1.1,1.2 issuingrules.tmpl,1.1,1.2
Message-ID: <E1DgREg-0003JY-T6@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12634/koha-tmpl/intranet-tmpl/default/de/parameters

Modified Files:
	categorie.tmpl issuingrules.tmpl 
Log Message:
translated by hellen

Index: categorie.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/categorie.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** categorie.tmpl	12 May 2005 19:26:35 -0000	1.1
--- categorie.tmpl	9 Jun 2005 17:54:32 -0000	1.2
***************
*** 97,101 ****
  			</tr>
  			<tr>
! 				<td>G&uuml;ltigkeitsdauer</td>
  				<td>
  					<input type="text" name="enrolmentperiod" size="3" maxlength="2" value="<!-- TMPL_VAR NAME="enrolmentperiod" -->"> Jahr(e)
--- 97,101 ----
  			</tr>
  			<tr>
! 				<td>G&uuml;ltigkeit</td>
  				<td>
  					<input type="text" name="enrolmentperiod" size="3" maxlength="2" value="<!-- TMPL_VAR NAME="enrolmentperiod" -->"> Jahr(e)
***************
*** 173,178 ****
  			</tr>
  			<tr>
! 				<td>G&uuml;ltigkeitsdauer</td>
! 				<td><!-- TMPL_VAR NAME="enrolmentperiod" --> Jashr(e)</td>
  			</tr>
  			<tr>
--- 173,178 ----
  			</tr>
  			<tr>
! 				<td>G&uuml;ltigkeit</td>
! 				<td><!-- TMPL_VAR NAME="enrolmentperiod" --> Jahr(e)</td>
  			</tr>
  			<tr>
***************
*** 182,186 ****
  			<tr>
  				<td>Mindestalter</td>
! 				<td><!-- TMPL_VAR NAME="dateofbirthrequired" --> Jashr(e)</td>
  			</tr>
  			<tr>
--- 182,186 ----
  			<tr>
  				<td>Mindestalter</td>
! 				<td><!-- TMPL_VAR NAME="dateofbirthrequired" --> Jahr(e)</td>
  			</tr>
  			<tr>
***************
*** 251,258 ****
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Kategorie</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Beschreibung</b></td>
! 				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>G&uuml;ltigkeitsdauer</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Geb&uuml;hr</b></td>
! 				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Obere Altersgrenze</b></td>
! 				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Mindestalter</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>&Uuml;berf&auml;llig</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Vormerkung</b></td>
--- 251,258 ----
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Kategorie</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Beschreibung</b></td>
! 				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>G&uuml;ltigkeit</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Geb&uuml;hr</b></td>
! 				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Max. Alter</b></td>
! 				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Min. Alter</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>&Uuml;berf&auml;llig</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Vormerkung</b></td>

Index: issuingrules.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/issuingrules.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** issuingrules.tmpl	12 May 2005 19:26:35 -0000	1.1
--- issuingrules.tmpl	9 Jun 2005 17:54:32 -0000	1.2
***************
*** 1,8 ****
  <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="parameters">Definition der Ausleihkonditionen f&uuml;r <!-- TMPL_VAR NAME="branch" --></h1>
  	<div id="bloc25">
  		<h2 class="parameters">TIPP f&uuml;r Ausleihen</h2>
! 		<p>Each box needs to be filled with issuelength, maxissues</p>
  		<p> - z.B.: 21,5 = 21 Tage Leihfrist und max. 5 Ausleihen</p>
  		<h2 class="parameters">TIPP f&uuml;r Mahngeb&uuml;hren</h2>
--- 1,8 ----
  <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="parameters">Definition der Ausleihkonditionen <!-- TMPL_VAR NAME="branch" --></h1>
  	<div id="bloc25">
  		<h2 class="parameters">TIPP f&uuml;r Ausleihen</h2>
! 		<p>Jedes Feld mu&szlig; mit Leihfrist und Anzahl der Ausleihen gef&uuml;llt werden</p>
  		<p> - z.B.: 21,5 = 21 Tage Leihfrist und max. 5 Ausleihen</p>
  		<h2 class="parameters">TIPP f&uuml;r Mahngeb&uuml;hren</h2>
***************
*** 17,21 ****
  		<ul>
  			<li>selbe Zweigstelle und selbe Benutzerkategorie, Medientyp *</li>
! 			<li> selbe Zweigstelle und selber Medientyp, Benutzerkategorie *</li>
  			<li>selber Medientyp und Benutzerkategorie, Zweigstelle *</li>
  			<li>&uuml;berall</li>
--- 17,21 ----
  		<ul>
  			<li>selbe Zweigstelle und selbe Benutzerkategorie, Medientyp *</li>
! 			<li>selbe Zweigstelle und selber Medientyp, Benutzerkategorie *</li>
  			<li>selber Medientyp und Benutzerkategorie, Zweigstelle *</li>
  			<li>&uuml;berall</li>




From hellen at users.sourceforge.net  Thu Jun  9 19:54:34 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 09 Jun 2005 10:54:34 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/catalogue MARCdetail.tmpl,1.3,1.4
Message-ID: <E1DgREg-0003JD-4b@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	MARCdetail.tmpl 
Log Message:
translated by hellen

Index: MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/catalogue/MARCdetail.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** MARCdetail.tmpl	8 Jun 2005 11:28:08 -0000	1.3
--- MARCdetail.tmpl	9 Jun 2005 17:54:31 -0000	1.4
***************
*** 363,367 ****
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Are you sure you want to delete this biblio?');
  	if (is_confirmed) {
  		window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";
--- 363,367 ----
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Wollen Sie diesen Biblio wirklich l&ouml;schen?');
  	if (is_confirmed) {
  		window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";




From oleonard at users.sourceforge.net  Thu Jun  9 20:21:42 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 11:21:42 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-dictionary.tmpl,NONE,1.1.2.1 opac-search.tmpl,1.1.2.6,1.1.2.7
Message-ID: <E1DgRew-00073F-9h@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-search.tmpl 
Added Files:
      Tag: rel_2_2
	opac-dictionary.tmpl 
Log Message:
Adding authority search functionality to OPAC advanced search page, to synch with default template

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Dictionary Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

<div id="window">
	<h1>Dictionary Search</h1>
	
	<div class="content-block"><form name="f" method="post" action="opac-dictionary.pl">
				<input type="hidden" name="op" value="do_search" />
				<label for="keyword">Keyword(s): </label>
				<input type="hidden" name="marclist" value="<!-- TMPL_VAR Name="marclist" -->" />
				<input type="text" name="search" value="<!-- TMPL_VAR Name="search" -->" size="20" />
				<input type="submit" value="Start search" class="submit" />
				<input type="hidden" name="type" value="<!-- TMPL_VAR Name="type" -->" />
				<input type="hidden" name="index" value="<!-- TMPL_VAR Name="anindex" ESCAPE="URL" -->" />
	</form></div>

<!-- TMPL_IF Name=search -->
	<!-- TMPL_IF NAME="authresult" -->
		<div class="pages">
			<!-- TMPL_IF NAME="displayprev" --> 
					<a class="nav" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
				<!-- /TMPL_IF -->
				<!-- TMPL_LOOP NAME="numbers" -->
					<!-- TMPL_IF NAME="highlight" -->
						<span class="current"><!-- TMPL_VAR NAME="number" --></span>
					<!-- TMPL_ELSE --> 
						<a class="nav" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
					<!-- /TMPL_IF -->
				<!-- /TMPL_LOOP --> 
				<!-- TMPL_IF NAME="displaynext" -->
					<a class="nav" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">Next&gt;&gt;</a>
				<!-- /TMPL_IF -->
</div>
			<div id="results">
			<!-- TMPL_IF NAME="nbresults" -->
					Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="nbresults" --> in Authorities.<!-- TMPL_ELSE -->No results found in Authorities.
			<!-- /TMPL_IF -->
		</div>

			<table>
				<tr>
					<th colspan="3">Authorities</th>
				</tr>
				<tr>
					<th>Summary</th>
					<th>Used in</th>
					<th>Select</th>
				</tr>
				<!-- TMPL_LOOP NAME="authresult" -->
					<!-- TMPL_IF NAME="even" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
							<td>
							<!-- TMPL_VAR NAME="summary" -->
						</td>
						<td>
							<!-- TMPL_VAR NAME="used" --> record(s)
						</td>
							<td>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)" class="button catalogue">Select</a> | 
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)" class="button catalogue">Sel &amp; close</a>
						</td>
					</tr>
				<!-- /TMPL_LOOP -->
			</table>
		<!-- TMPL_ELSE -->
			<h4>No results in Authorities</h4>
	<!-- /TMPL_IF -->
		
		
	<!-- TMPL_IF Name=catresult -->	
	<h3>Catalog Search Results</h3>
		<div id="results">
			<!-- TMPL_IF NAME="total" -->
					Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --> in the catalog<!-- TMPL_ELSE -->No results found in the catalog.
			<!-- /TMPL_IF -->
		</div>

			<table>
				<tr>
					<th>Summary</th>
					<th>Used in</th>
					<th>Select</th>
				</tr>
				<!-- TMPL_LOOP NAME="catresult" -->
				<!-- TMPL_IF NAME="even" --><tr class="highlight"><!-- TMPL_ELSE --><!-- /TMPL_IF -->
				<td>
							<!-- TMPL_IF name="MARC_ON" -->
									<!-- TMPL_VAR NAME="value" -->
								<!-- TMPL_ELSE -->
									<!-- TMPL_VAR NAME="value" -->
								<!-- /TMPL_IF -->
					</td>
					<td>
						<!-- TMPL_VAR NAME="count" --> record(s)
					</td>
					<td>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)" class="button catalogue">Select</a> | 
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)" class="button catalogue">Sel &amp; close</a>
					</td>
				</tr>
				<!-- /TMPL_LOOP -->
			</table>

		<div class="pages">
			<!-- TMPL_IF NAME="displayprev" --> 
					<a class="nav" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
				<!-- /TMPL_IF -->
				<!-- TMPL_LOOP NAME="numbers" -->
					<!-- TMPL_IF NAME="highlight" -->
						<span class="current"><!-- TMPL_VAR NAME="number" --></span>
					<!-- TMPL_ELSE --> 
						<a class="nav" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
					<!-- /TMPL_IF -->
				<!-- /TMPL_LOOP --> 
				<!-- TMPL_IF NAME="displaynext" -->
					<a class="nav" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">Next&gt;&gt;</a>
				<!-- /TMPL_IF -->

			<div id="results">
			<!-- TMPL_IF NAME="total" -->
					Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --> in the catalog.<!-- TMPL_ELSE -->No results found in the catalog.
			<!-- /TMPL_IF -->
		</div>
		
	<!-- /TMPL_IF -->
	<script language="JavaScript" type="text/javascript">
	function SelectEntry(myentry, myindex, wclose){
		if (opener.document.f.value[myindex].value!=""){ 
			opener.document.f.value[myindex].value=opener.document.f.value[myindex].value+" "+myentry
		} else {
			opener.document.f.value[myindex].value=myentry
		}
		if (wclose == 1) {
	// 	alert("closing")
			self.close();
		}
	}
	</script>
<!-- /TMPL_IF -->

</div>

</body>
</html>
Index: opac-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-search.tmpl,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -r1.1.2.6 -r1.1.2.7
*** opac-search.tmpl	21 Apr 2005 20:06:55 -0000	1.1.2.6
--- opac-search.tmpl	9 Jun 2005 18:21:40 -0000	1.1.2.7
***************
*** 51,60 ****
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="title" name="value" /></td></tr>
  <tr><th><label for="author">Author</label></th><td><input type="hidden" name="marclist" value="biblio.author" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="author" name="value" /></td></tr>
  <tr><th><label for="subject">Subject</label></th><td>			
  			<input type="hidden" name="marclist" value="bibliosubject.subject" />
--- 51,60 ----
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="title" name="value" /><a href="javascript:Dopop('opac-dictionary.pl?marclist=biblio.title&amp;type=intranet&amp;index=1',1)"><strong>...</strong></a></td></tr>
  <tr><th><label for="author">Author</label></th><td><input type="hidden" name="marclist" value="biblio.author" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="author" name="value" /><a href="javascript:Dopop('opac-dictionary.pl?marclist=biblio.author&amp;type=intranet&amp;index=2',2)"><strong>...</strong></a></td></tr>
  <tr><th><label for="subject">Subject</label></th><td>			
  			<input type="hidden" name="marclist" value="bibliosubject.subject" />
***************
*** 62,66 ****
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />  
! 			<input type="text" id="subject" name="value" size="35" /></td></tr>
  <tr><th><label for="seriestitle">Series title</label></th><td>			
  			<input type="hidden" name="marclist" value="biblio.seriestitle" />
--- 62,66 ----
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />  
! 			<input type="text" id="subject" name="value" size="35" /><a href="javascript:Dopop('opac-dictionary.pl?marclist=bibliosubject.subject&amp;type=intranet&amp;index=3',3)"><strong>...</strong></a></td></tr>
  <tr><th><label for="seriestitle">Series title</label></th><td>			
  			<input type="hidden" name="marclist" value="biblio.seriestitle" />




From oleonard at users.sourceforge.net  Thu Jun  9 21:21:13 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 12:21:13 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-detail.tmpl,1.1.2.3,1.1.2.4
Message-ID: <E1DgSaX-00072T-7t@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-detail.tmpl 
Log Message:
Bugfix for display problem

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** opac-detail.tmpl	17 Mar 2005 22:19:54 -0000	1.1.2.3
--- opac-detail.tmpl	9 Jun 2005 19:21:10 -0000	1.1.2.4
***************
*** 7,17 ****
  <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
  <div class="details">
! <!-- Display for NPL // <div class="detail-sidebar">
! <!-- TMPL_IF NAME="isbn" --><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn" -->.01.MZZZZZZZ.jpg" alt="Book Cover Image" /><!-- /TMPL_IF -->  //Display for NPL -->
  <div class="operations">
  <ul>
  <!-- TMPL_UNLESS NAME="norequests" --><li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Place Reserve</a></li><!-- /TMPL_UNLESS -->
  <li><a class="detail" href="/cgi-bin/koha/opac-MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">MARC View</a></li>
! <!-- Hide from NPL // <li><a class="isbd" href="/cgi-bin/koha/opac-ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD</a></li> //Hide from NPL -->
  <li><a class="print" href="/cgi-bin/koha/opac-detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Print</a></li>
  <!-- TMPL_IF name="virtualshelves" --><li><a class="shelf" href="/cgi-bin/koha/opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Add to My Book List</a></li><!-- /TMPL_IF -->
--- 7,17 ----
  <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
  <div class="details">
! <div class="detail-sidebar">
! <!-- Display for NPL // <!-- TMPL_IF NAME="isbn" --><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn" -->.01.MZZZZZZZ.jpg" alt="Book Cover Image" /><!-- /TMPL_IF -->  //Display for NPL -->
  <div class="operations">
  <ul>
  <!-- TMPL_UNLESS NAME="norequests" --><li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Place Reserve</a></li><!-- /TMPL_UNLESS -->
  <li><a class="detail" href="/cgi-bin/koha/opac-MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">MARC View</a></li>
! <!-- Hide from NPL --> <li><a class="isbd" href="/cgi-bin/koha/opac-ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD</a></li> <!-- Hide from NPL -->
  <li><a class="print" href="/cgi-bin/koha/opac-detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Print</a></li>
  <!-- TMPL_IF name="virtualshelves" --><li><a class="shelf" href="/cgi-bin/koha/opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Add to My Book List</a></li><!-- /TMPL_IF -->




From oleonard at users.sourceforge.net  Thu Jun  9 21:21:19 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 12:21:19 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-detail.tmpl,1.3,1.4
Message-ID: <E1DgSad-00073Q-Ur@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac-detail.tmpl 
Log Message:
Bugfix for display problem, enabling Amazon cover images

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-detail.tmpl	25 Jan 2005 22:47:21 -0000	1.3
--- opac-detail.tmpl	9 Jun 2005 19:21:17 -0000	1.4
***************
*** 7,22 ****
  <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
  <div class="details">
! <!-- Display for NPL 			<div style="float: right; padding: 5px;">
! <img src="/cgi-bin/koha/imgcheck.pl?image_location=/usr/local/images2/<!-- TMPL_VAR NAME="isbn" -->.jpg" alt="Book Cover Image" />
  </div>
!  /Display for NPL --><h2><!-- TMPL_VAR NAME="title" --></h2>
! <!-- TMPL_IF NAME="author" --><h3 class="author">By <!-- TMPL_VAR NAME="author" --></h3><!-- /TMPL_IF --> 
  
  <table>
! <!-- TMPL_IF NAME="subtitle" --><tr><th>Subtitle: </th><td><!-- TMPL_VAR NAME="subtitle" --></td></tr><!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="abstract" --><tr><th>Format:</th><td><!-- TMPL_VAR NAME="abstract" --></td></tr><!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="copyrightdate" -->
      <tr><th>Copyright:</th><td><!-- TMPL_VAR NAME="copyrightdate" --></td></tr>
  <!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="isbn" -->
  	    <tr><th>ISBN:</th><td><!-- TMPL_VAR NAME="isbn" --></td></tr>
--- 7,38 ----
  <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
  <div class="details">
! <div class="detail-sidebar">
! <!-- Display for NPL // <!-- TMPL_IF NAME="isbn" --><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn" -->.01.MZZZZZZZ.jpg" alt="Book Cover Image" /><!-- /TMPL_IF -->  //Display for NPL -->
! <div class="operations">
! <ul>
! <!-- TMPL_UNLESS NAME="norequests" --><li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Place Reserve</a></li><!-- /TMPL_UNLESS -->
! <li><a class="detail" href="/cgi-bin/koha/opac-MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">MARC View</a></li>
! <!-- Hide from NPL --> <li><a class="isbd" href="/cgi-bin/koha/opac-ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD</a></li> <!-- Hide from NPL -->
! <li><a class="print" href="/cgi-bin/koha/opac-detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Print</a></li>
! <!-- TMPL_IF name="virtualshelves" --><li><a class="shelf" href="/cgi-bin/koha/opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Add to My Book List</a></li><!-- /TMPL_IF -->
! <li><a class="cart" href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Add to My Book Bag</a></li>
! </ul>
  </div>
! <div class="further">
! <h4>Search for this title in:</h4>
! <ul><!-- Display for NPL // <li><a href="http://search3.webfeat.org/cgi-bin/webfeat.dll?Command=Search&BypassSessData=yes&noserial=1&Databases=wf_sirsdiscover,wf_elibrary2_e,wf_ebonline,wf_healthsourceconsumer,wf_masterfileprem,wf_newspapersource&wf_cat=0&Client_ID=oplin&wf_all_years=yes&wf_field1=wf_keyword&wf_term1=<!-- TMPL_VAR NAME="title" -->&rurl=http%3A//www.oplin.org/&wut_code=OH0156">Local Databases (OPLIN)</a></li> //Display for NPL -->
! <li><a href="http://www.google.com/search?q=<!-- TMPL_VAR NAME="title" -->%20england+site:worldcatlibraries.org">Other Libraries(WorldCat)</a></li>
! <li><a href="http://www.scholar.google.com/scholar?q=<!-- TMPL_VAR NAME="title" -->">Other Databases (Google Scholar)</a></li></ul></div>
! </div>
! <h2><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="subtitle" --> <span class="subtitle"><!-- TMPL_VAR NAME="subtitle" --></span><!-- /TMPL_IF --></h2>
! <!-- TMPL_IF NAME="author" --><h3 class="author">By <a href="/cgi-bin/koha/opac-search.pl?marclist=biblio.author&and_or=and&excluding=&operator=contains&value=<!-- TMPL_VAR NAME="author" -->.&resultsperpage=20&orderby=biblio.title&op=do_search"><!-- TMPL_VAR NAME="author" --></a></h3><!-- /TMPL_IF --> 
  
  <table>
! 
  <!-- TMPL_IF NAME="abstract" --><tr><th>Format:</th><td><!-- TMPL_VAR NAME="abstract" --></td></tr><!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="copyrightdate" -->
      <tr><th>Copyright:</th><td><!-- TMPL_VAR NAME="copyrightdate" --></td></tr>
  <!-- /TMPL_IF -->
+ 			<!-- TMPL_IF NAME="seriestitle" --><tr><th>Series Title:</th><td><a href="/cgi-bin/koha/opac-search.pl?marclist=biblio.seriestitle&and_or=and&excluding=&operator=contains&value=<!-- TMPL_VAR NAME="seriestitle" ESCAPE=URL -->.&resultsperpage=20&orderby=biblio.title&op=do_search"><!-- TMPL_VAR NAME="seriestitle" --></a><!-- TMPL_IF NAME="volume" --><!-- TMPL_VAR NAME="volume" --><!-- /TMPL_IF --></td></tr><!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="isbn" -->
  	    <tr><th>ISBN:</th><td><!-- TMPL_VAR NAME="isbn" --></td></tr>
***************
*** 31,38 ****
  	<tr><th>Physical Details: </th><td><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></td></tr>
  <!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="notes" -->
! <tr><th>Notes:</th><td><div class="notes"><!-- TMPL_VAR NAME="notes" --></div></td></tr>
! 	<!-- /TMPL_IF -->
! 	<!-- /TMPL_LOOP -->
  	
  <!-- TMPL_UNLESS NAME="MARCSUBJCTS" -->
--- 47,58 ----
  	<tr><th>Physical Details: </th><td><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></td></tr>
  <!-- /TMPL_IF -->
+ <!-- /TMPL_LOOP -->
+ 
+ <!-- TMPL_UNLESS NAME="MARCNOTES" -->
+ <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
  <!-- TMPL_IF NAME="notes" -->
! <tr><th>Notes:</th><td><div class="notes"><!-- TMPL_VAR NAME="notes" --></div></td></tr><!-- /TMPL_IF -->
! <!-- /TMPL_LOOP -->
! <!-- /TMPL_UNLESS -->
  	
  <!-- TMPL_UNLESS NAME="MARCSUBJCTS" -->
***************
*** 42,47 ****
  <!-- /TMPL_UNLESS -->
  
! <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
!  <tr><th>Record No.:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr> <!-- /TMPL_LOOP -->
  
  <!-- TMPL_IF NAME="MARCNOTES" -->
--- 62,67 ----
  <!-- /TMPL_UNLESS -->
  
! <!-- Hide from NPL --> <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
!  <tr><th>Record No.:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr> <!-- /TMPL_LOOP --> <!-- Hide from NPL -->
  
  <!-- TMPL_IF NAME="MARCNOTES" -->
***************
*** 56,76 ****
  	<!-- /TMPL_IF -->
  </table>
! 
! <!-- TMPL_UNLESS NAME="norequests" -->
!     <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
!     <input type="submit" name="submit"  value="Place Reserve" class="icon reserve" />
!     <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
!     </form>
! <!-- /TMPL_UNLESS -->
! 
! <form class="inline" action="opac-MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon detail" value="MARC View" /></form>
! 
! <form class="inline" action="opac-ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon isbd" value="ISBD" /></form>
! 
! <form class="inline" action="opac-detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon print" value="Print" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form>
! 
! <form class="inline" action="opac-addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="icon shelf" value="Add to Shelf" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form>
! 
! <form class="inline"><input type="submit" class="icon cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
  </div>
  
--- 76,80 ----
  	<!-- /TMPL_IF -->
  </table>
! <br clear="right" />
  </div>
  




From oleonard at users.sourceforge.net  Thu Jun  9 21:41:02 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 12:41:02 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull subscription-renew.tmpl,1.1,1.1.2.1
Message-ID: <E1DgSti-0001T0-OE@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5611/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
      Tag: rel_2_2
	subscription-renew.tmpl 
Log Message:
Fixing to conform with NPL template design

Index: subscription-renew.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-renew.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** subscription-renew.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- subscription-renew.tmpl	9 Jun 2005 19:41:00 -0000	1.1.2.1
***************
*** 1,20 ****
! <!-- TMPL_INCLUDE NAME="main-top-blank.inc" -->
! <div>
  
! <h1>subscription renewal for <!-- TMPL_VAR name="bibliotitle" --></h1>
  
! <form name="f" method="post">
! 	<div>
! 		<input type="hidden" name="op" value="renew">
! 		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
! 		<p><label>start date</label><input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->"></p>
! 		<p>Subscription length :</p>
! 		<p><label>Number of num</label><input type="text" name="numberlength" value="<!-- TMPL_VAR name="numberlength" -->"></p>
! 		<p><label>Number of weeks</label><input type="text" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></p>
! 		<p><label>Number of months</label><input type="text" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></p>
! 		<p>Note for the librarian that will manage your renewal request</p>
! 		<ul><textarea name="note" rows="10" cols="60"></textarea></ul>
! 		<input type="submit" value="Request a renewal" class="submit">
! 	</div>
  </form>
  </div>
--- 1,19 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Subscription Renewal for <!-- TMPL_VAR name="bibliotitle" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <div id="main-compact">
  
! <h1>Subscription Renewal for <!-- TMPL_VAR name="bibliotitle" --></h1>
  
! <form name="f" method="post" action="subscription-renew.pl">
! 	<div class="data">
! 		<table><tr><th><label>Start Date: </label></th><td><input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" /><input type="hidden" name="op" value="renew" /><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /></td></tr></table>	
! 		
! 	<table><caption>Subscription Length:</caption>
! 	<tr><th><label for="numberlength">Number of Issues: </label></th><td><input type="text" name="numberlength" id="numberlength" value="<!-- TMPL_VAR name="numberlength" -->"></td></tr>
! 	<tr><th><label for="weeklength">Number of Weeks: </label></th><td><input type="text" name="weeklength" id="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></td></tr>
! 	<tr><th><label for="monthlength">Number of Months: </label></th><td><input type="text" name="monthlength" id="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></td></tr>
! 	<tr><th><label for="note">Comments for the librarian that will manage your renewal request:</label></th><td><textarea name="note" id="note" rows="3" cols="30"></textarea></td></tr>
! 	</table>
! 	<p><input type="submit" value="Request a renewal" class="submit" /></p>
! </div>
  </form>
  </div>




From oleonard at users.sourceforge.net  Thu Jun  9 21:41:46 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 12:41:46 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull subscription-renew.tmpl,1.1,1.2
Message-ID: <E1DgSuQ-0001aM-Jo@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6075/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
	subscription-renew.tmpl 
Log Message:
Fixing to conform with NPL template design

Index: subscription-renew.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-renew.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** subscription-renew.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- subscription-renew.tmpl	9 Jun 2005 19:41:44 -0000	1.2
***************
*** 1,20 ****
! <!-- TMPL_INCLUDE NAME="main-top-blank.inc" -->
! <div>
  
! <h1>subscription renewal for <!-- TMPL_VAR name="bibliotitle" --></h1>
  
! <form name="f" method="post">
! 	<div>
! 		<input type="hidden" name="op" value="renew">
! 		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
! 		<p><label>start date</label><input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->"></p>
! 		<p>Subscription length :</p>
! 		<p><label>Number of num</label><input type="text" name="numberlength" value="<!-- TMPL_VAR name="numberlength" -->"></p>
! 		<p><label>Number of weeks</label><input type="text" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></p>
! 		<p><label>Number of months</label><input type="text" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></p>
! 		<p>Note for the librarian that will manage your renewal request</p>
! 		<ul><textarea name="note" rows="10" cols="60"></textarea></ul>
! 		<input type="submit" value="Request a renewal" class="submit">
! 	</div>
  </form>
  </div>
--- 1,19 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Subscription Renewal for <!-- TMPL_VAR name="bibliotitle" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <div id="main-compact">
  
! <h1>Subscription Renewal for <!-- TMPL_VAR name="bibliotitle" --></h1>
  
! <form name="f" method="post" action="subscription-renew.pl">
! 	<div class="data">
! 		<table><tr><th><label>Start Date: </label></th><td><input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" /><input type="hidden" name="op" value="renew" /><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /></td></tr></table>	
! 		
! 	<table><caption>Subscription Length:</caption>
! 	<tr><th><label for="numberlength">Number of Issues: </label></th><td><input type="text" name="numberlength" id="numberlength" value="<!-- TMPL_VAR name="numberlength" -->"></td></tr>
! 	<tr><th><label for="weeklength">Number of Weeks: </label></th><td><input type="text" name="weeklength" id="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></td></tr>
! 	<tr><th><label for="monthlength">Number of Months: </label></th><td><input type="text" name="monthlength" id="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></td></tr>
! 	<tr><th><label for="note">Comments for the librarian that will manage your renewal request:</label></th><td><textarea name="note" id="note" rows="3" cols="30"></textarea></td></tr>
! 	</table>
! 	<p><input type="submit" value="Request a renewal" class="submit" /></p>
! </div>
  </form>
  </div>




From oleonard at users.sourceforge.net  Thu Jun  9 23:16:22 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 14:16:22 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-full-serial-issues.tmpl,NONE,1.1.2.1
Message-ID: <E1DgUNy-0007DL-Q2@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
      Tag: rel_2_2
	opac-full-serial-issues.tmpl 
Log Message:
Full view for opac-serials.  Includes tabbed view ported from addbiblio in the intranet, but still haven't figured out how to get the container div to extend to the bottom of the content

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Serials
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!--TMPL_INCLUDE NAME="masthead_adv.inc" -->
<!--TMPL_INCLUDE NAME="navigation.inc" -->



<!-- TMPL_UNLESS name="popup" -->
<div id="main">
	<h2>Subscription information for <em><!-- TMPL_VAR name="bibliotitle" --></em></h2>
	<form action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon brief" value="Normal View" /></form>
<!-- /TMPL_UNLESS -->

	<div class="tabs">
	<!-- TMPL_LOOP NAME="years" -->
		<!-- TMPL_IF NAME="year" -->
			<a href="#" onclick="active(<!-- TMPL_VAR NAME="year" -->); return false;" id="link<!-- TMPL_VAR NAME="year" -->"><!-- TMPL_VAR NAME="year" --></a>
		<!-- /TMPL_IF -->
	<!-- /TMPL_LOOP -->
	</div>

	<!-- TMPL_LOOP NAME="years" -->
	<div name="<!-- TMPL_VAR NAME="year" -->" id="<!-- TMPL_VAR NAME="year" -->" class="tab" <!--TMPL_IF Name="first" -->style="visibility:visible"<!--/TMPL_IF -->>
		<table>
			<caption><!-- TMPL_VAR NAME="year" --> Issues</caption>
			<tr>
				<th> Date
				</th>
				<th> Number
				</th>
				<th> Status
				</th>
			</tr>
			<!-- TMPL_LOOP Name="serials" -->
			<tr>
				<td>
					<!-- TMPL_VAR Name="planneddate" -->
				</td>
				<td>
					<!-- TMPL_VAR Name="serialseq" -->
				</td>
				<td>
					<!-- TMPL_IF Name="status1" -->Arrived<!-- /TMPL_IF -->
					<!-- TMPL_IF Name="status2" -->Waited<!-- /TMPL_IF -->
					<!-- TMPL_IF Name="status3" -->Late<!-- /TMPL_IF -->
					<!-- TMPL_IF Name="status4" -->Missing<!-- /TMPL_IF -->
				</td>
			</tr>
			<!-- /TMPL_LOOP -->
		</table>
	</div>
	<!--/TMPL_LOOP -->
</div>
<script language="JavaScript" type="text/javascript">
function active(numlayer)
{
	for (i=<!--TMPL_VAR Name="yearmin"-->; i<=<!--TMPL_VAR Name="yearmax"-->; i++ ) {
		ong = i;
		link = "link"+i;
		if (numlayer==i) {
			document.getElementById(ong).style.visibility="visible";
			document.getElementById(link).style.color="#000066";
			document.getElementById(link).style.backgroundColor="#FFFFCC";
		} else {
			document.getElementById(ong).style.visibility="hidden";
			if (document.getElementById(link)) {
			document.getElementById(link).style.color="#669999";
			document.getElementById(link).style.backgroundColor="#D8DEB8";
			}
		}
	}
}
<!-- TMPL_LOOP name="years" -->
<!-- TMPL_IF NAME="first" -->
	active(<!-- TMPL_VAR NAME="year" -->);
<!-- /TMPL_IF -->
	<!--/TMPL_LOOP -->
</script>
</body>
</html>




From oleonard at users.sourceforge.net  Thu Jun  9 23:16:56 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 14:16:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-full-serial-issues.tmpl,1.1,1.2
Message-ID: <E1DgUOW-0007Gj-0u@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	opac-full-serial-issues.tmpl 
Log Message:
Full view for opac-serials.  Includes tabbed view ported from addbiblio in the intranet, but still haven't figured out how to get the container div to extend to the bottom of the content





From oleonard at users.sourceforge.net  Thu Jun  9 23:17:34 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 14:17:34 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes marc-editor.css,1.1,1.1.2.1
Message-ID: <E1DgUP8-0007M9-T1@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	marc-editor.css 
Log Message:
Updated to work with full serials display

Index: marc-editor.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/marc-editor.css,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** marc-editor.css	20 Oct 2004 19:15:06 -0000	1.1
--- marc-editor.css	9 Jun 2005 21:17:31 -0000	1.1.2.1
***************
*** 1,41 ****
  div.tabs {
! 	width:10px;
! 	position:absolute;
! 	margin-left:50px;
! 	margin-top:120px;
  }
  
  div.tabs a {
  	display:block;
! 	font-size: small;
! 	border: thin solid black;
! 	margin-right: 2px;
! 	padding: 10px 10px;
! 	-moz-border-radius: 5px 0px 0px 5px;
  }
  
  div.tab {
! 	background-color: #FFFFCC;
  	display: block;
  	visibility:hidden;
! 	position:absolute;
! 
! }
! td {
! 	border:0px;
  }
  
! .MARCtag { /* style for tag definition (700 - Statement of responsability) */
! 	font-weight:bold;
! 	color:#FF6600;
! 	background-color:FFFFFF;
! 	background-image:none;
! 	border-bottom: 1px solid #999900;
! 	margin-right:30%;
  }
  
! .labelsubfield { /* style for each subfield (like : a Publication year), just before the biblio subfield */
! 	float:left;
! 	width: 12em;
! 	margin-left:30px;
  }
--- 1,91 ----
+ div.tabbed {
+ 	/*border : 1px solid red;
+ 	position: absolute;*/
+ 	margin-left:5%;
+ 	width:90%;
+ /*	display:block;*/
+ }
+ 
  div.tabs {
! /*	border : 1px solid aqua;*/
! 	float : left;
! 	margin : 5px 0 0 0;
! /*	position:absolute;
! 	margin-left: .5em;
! 	margin-top:110px;*/
  }
  
  div.tabs a {
  	display:block;
! 	background-color: #D8DEB8;
! 	color: #000066;
! 	font-weight : bold;
! 	text-decoration : none;
! 	border-bottom : 1px solid #999933;
! 	border-left : 1px solid #999933;
! 	border-right : 1px solid #FFFFCC;
! 	border-top : 1px solid #FFFFCC;
! 	margin : 0 0 2px 0;
! 	padding: 10px 5px 10px 5px;
! 	
! }
! 
! div.tabs a:hover {
! 	background-color : #CCFF99;
! 	border-left : 1px solid #000066;
! 	border-bottom : 1px solid #000066;
  }
  
  div.tab {
! 	background-color : #FFFFCC;
! 	border : 1px solid #D8DEB8;
! 	border-top : 1px solid #FFFFCC;
  	display: block;
  	visibility:hidden;
! 	position : absolute;
! 	margin : 5px 0 0 55px;
! 	padding : 3px 3px 3px 10px;
! 	width : 70%;
! 	/*margin-top:110px;*/
  }
  
! /* style for tag definition (e.g. 700 - Statement of responsibility) */
! .MARCtag { 
! 	clear : left;
! 	color : #000000;
! 	background-color : #FFFFCC;
! 	border-top : 7px solid #FFFFCC;
! 	border-bottom : thin solid #CCCC99;
! 	font-weight : bold;
! 	font-size : .8em;
! 	margin-top : 5px;
  }
  
! div.tab p {
! 	margin : 3px;
! }	
! 
! /* style for each subfield (e.g.: Publication year), just before the biblio subfield */
! .labelsubfield { 
! 	background-color : #FFFFE1;
! /*	border : 1px solid red;*/
! 	clear : left;
! 	float : left;
! 	font-size : .8em;
! 	font-weight : normal;
! 	width : 12em;
! 	margin-left : 30px;
! 	display : inline;
  }
+ 
+ #loading {
+ 	position: absolute;
+ 	top: 3em;
+ 	left: 3em;
+ 	padding: 1em;
+ 	mozopacity: 50%;
+ 	background-color: #FFFFFF;
+ 	border: 10px solid #CCCC99;
+ 	font-size: 1.5em;
+ 	z-index: 999;
+ 	}
\ No newline at end of file




From oleonard at users.sourceforge.net  Thu Jun  9 23:17:56 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 14:17:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes marc-editor.css,1.1,1.2
Message-ID: <E1DgUPU-0007PV-6d@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	marc-editor.css 
Log Message:
Updated to work with full serials display

Index: marc-editor.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/marc-editor.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** marc-editor.css	20 Oct 2004 19:15:06 -0000	1.1
--- marc-editor.css	9 Jun 2005 21:17:54 -0000	1.2
***************
*** 1,41 ****
  div.tabs {
! 	width:10px;
! 	position:absolute;
! 	margin-left:50px;
! 	margin-top:120px;
  }
  
  div.tabs a {
  	display:block;
! 	font-size: small;
! 	border: thin solid black;
! 	margin-right: 2px;
! 	padding: 10px 10px;
! 	-moz-border-radius: 5px 0px 0px 5px;
  }
  
  div.tab {
! 	background-color: #FFFFCC;
  	display: block;
  	visibility:hidden;
! 	position:absolute;
! 
! }
! td {
! 	border:0px;
  }
  
! .MARCtag { /* style for tag definition (700 - Statement of responsability) */
! 	font-weight:bold;
! 	color:#FF6600;
! 	background-color:FFFFFF;
! 	background-image:none;
! 	border-bottom: 1px solid #999900;
! 	margin-right:30%;
  }
  
! .labelsubfield { /* style for each subfield (like : a Publication year), just before the biblio subfield */
! 	float:left;
! 	width: 12em;
! 	margin-left:30px;
  }
--- 1,91 ----
+ div.tabbed {
+ 	/*border : 1px solid red;
+ 	position: absolute;*/
+ 	margin-left:5%;
+ 	width:90%;
+ /*	display:block;*/
+ }
+ 
  div.tabs {
! /*	border : 1px solid aqua;*/
! 	float : left;
! 	margin : 5px 0 0 0;
! /*	position:absolute;
! 	margin-left: .5em;
! 	margin-top:110px;*/
  }
  
  div.tabs a {
  	display:block;
! 	background-color: #D8DEB8;
! 	color: #000066;
! 	font-weight : bold;
! 	text-decoration : none;
! 	border-bottom : 1px solid #999933;
! 	border-left : 1px solid #999933;
! 	border-right : 1px solid #FFFFCC;
! 	border-top : 1px solid #FFFFCC;
! 	margin : 0 0 2px 0;
! 	padding: 10px 5px 10px 5px;
! 	
! }
! 
! div.tabs a:hover {
! 	background-color : #CCFF99;
! 	border-left : 1px solid #000066;
! 	border-bottom : 1px solid #000066;
  }
  
  div.tab {
! 	background-color : #FFFFCC;
! 	border : 1px solid #D8DEB8;
! 	border-top : 1px solid #FFFFCC;
  	display: block;
  	visibility:hidden;
! 	position : absolute;
! 	margin : 5px 0 0 55px;
! 	padding : 3px 3px 3px 10px;
! 	width : 70%;
! 	/*margin-top:110px;*/
  }
  
! /* style for tag definition (e.g. 700 - Statement of responsibility) */
! .MARCtag { 
! 	clear : left;
! 	color : #000000;
! 	background-color : #FFFFCC;
! 	border-top : 7px solid #FFFFCC;
! 	border-bottom : thin solid #CCCC99;
! 	font-weight : bold;
! 	font-size : .8em;
! 	margin-top : 5px;
  }
  
! div.tab p {
! 	margin : 3px;
! }	
! 
! /* style for each subfield (e.g.: Publication year), just before the biblio subfield */
! .labelsubfield { 
! 	background-color : #FFFFE1;
! /*	border : 1px solid red;*/
! 	clear : left;
! 	float : left;
! 	font-size : .8em;
! 	font-weight : normal;
! 	width : 12em;
! 	margin-left : 30px;
! 	display : inline;
  }
+ 
+ #loading {
+ 	position: absolute;
+ 	top: 3em;
+ 	left: 3em;
+ 	padding: 1em;
+ 	mozopacity: 50%;
+ 	background-color: #FFFFFF;
+ 	border: 10px solid #CCCC99;
+ 	font-size: 1.5em;
+ 	z-index: 999;
+ 	}
\ No newline at end of file




From oleonard at users.sourceforge.net  Thu Jun  9 23:18:50 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 14:18:50 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes doc-head-close.inc,1.1.2.1,1.1.2.2
Message-ID: <E1DgUQM-0007W1-Gh@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	doc-head-close.inc 
Log Message:
Including marc-editor.css for full serials display

Index: doc-head-close.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/doc-head-close.inc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** doc-head-close.inc	17 Mar 2005 21:36:49 -0000	1.1.2.1
--- doc-head-close.inc	9 Jun 2005 21:18:44 -0000	1.1.2.2
***************
*** 5,8 ****
--- 5,9 ----
  <style type="text/css"> 
  	@import url(<TMPL_VAR NAME="themelang">/includes/opac.css);
+ 	@import url(<TMPL_VAR NAME="themelang">/includes/marc-editor.css);	
  </style>
  <script type="text/javascript" language="javascript" src="<TMPL_VAR NAME="themelang">/includes/script.js"></script>




From oleonard at users.sourceforge.net  Thu Jun  9 23:19:08 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 14:19:08 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes doc-head-close.inc,1.1,1.2
Message-ID: <E1DgUQe-0007XL-SM@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	doc-head-close.inc 
Log Message:
Including marc-editor.css for full serials display

Index: doc-head-close.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/doc-head-close.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** doc-head-close.inc	20 Oct 2004 19:15:06 -0000	1.1
--- doc-head-close.inc	9 Jun 2005 21:19:06 -0000	1.2
***************
*** 2,7 ****
--- 2,9 ----
  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
  <meta http-equiv="Content-Language" content="en-us" />
+ <link rel="shortcut icon" href="<TMPL_VAR NAME="themelang">/includes/favicon.ico" type="image/x-icon" />
  <style type="text/css"> 
  	@import url(<TMPL_VAR NAME="themelang">/includes/opac.css);
+ 	@import url(<TMPL_VAR NAME="themelang">/includes/marc-editor.css);	
  </style>
  <script type="text/javascript" language="javascript" src="<TMPL_VAR NAME="themelang">/includes/script.js"></script>




From oleonard at users.sourceforge.net  Thu Jun  9 23:20:55 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 14:20:55 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes intranet.css,1.5.2.9,1.5.2.10
Message-ID: <E1DgUSN-0007o4-C4@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29940/koha-tmpl/intranet-tmpl/npl/en/includes

Modified Files:
      Tag: rel_2_2
	intranet.css 
Log Message:
Adding 'control box' styles for MARC detail screens

Index: intranet.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/intranet.css,v
retrieving revision 1.5.2.9
retrieving revision 1.5.2.10
diff -C2 -r1.5.2.9 -r1.5.2.10
*** intranet.css	20 Apr 2005 21:30:48 -0000	1.5.2.9
--- intranet.css	9 Jun 2005 21:20:53 -0000	1.5.2.10
***************
*** 624,628 ****
  	margin : 3px 0px 5px 0px;
  	padding : 0px;
! 	width : 95%;
  }
  
--- 624,628 ----
  	margin : 3px 0px 5px 0px;
  	padding : 0px;
! 	width : auto;
  }
  
***************
*** 1229,1231 ****
--- 1229,1244 ----
  .accesskey {
  	text-decoration : underline;
+ }
+ 
+ div#controls {
+ 	float: right;
+ 	margin-left : .7em;
+ 	width : 15%;
+ }
+ 
+ div#controls form {
+ 	background-color : #FFFFCC;
+ 	font-size : 80%;
+ 	margin : .3em 0;
+ 	padding : .3em;
  }
\ No newline at end of file




From hdl at users.sourceforge.net  Fri Jun 10 10:40:11 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 10 Jun 2005 01:40:11 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ selectbranchprinter.tmpl,1.6,1.6.2.1 branchtransfers.tmpl,1.12,1.12.2.1
Message-ID: <E1Dgf3j-0005IV-Ts@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	selectbranchprinter.tmpl branchtransfers.tmpl 
Log Message:
Fixing : css class error on titles.

Index: selectbranchprinter.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/selectbranchprinter.tmpl,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** selectbranchprinter.tmpl	19 Jul 2004 19:58:38 -0000	1.6
--- selectbranchprinter.tmpl	10 Jun 2005 08:40:09 -0000	1.6.2.1
***************
*** 2,6 ****
  
  <div id="mainbloc">
! <h1>Circulation: Select Printer and Branch Settings</h1>
  
  <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
--- 2,6 ----
  
  <div id="mainbloc">
! <h1 class="circulation">Circulation: Select Printer and Branch Settings</h1>
  
  <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
***************
*** 30,34 ****
  <!-- /TMPL_IF --></p>
  <p><input type="hidden" name="setcookies" value="1">
! <input type="submit" value="Submit" type="changesettings" class="button"></p>
  </form>
  
--- 30,34 ----
  <!-- /TMPL_IF --></p>
  <p><input type="hidden" name="setcookies" value="1">
! <input type="submit" value="Submit" type="changesettings" class="button circulation"></p>
  </form>
  

Index: branchtransfers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -r1.12 -r1.12.2.1
*** branchtransfers.tmpl	5 Nov 2004 10:18:24 -0000	1.12
--- branchtransfers.tmpl	10 Jun 2005 08:40:09 -0000	1.12.2.1
***************
*** 1,15 ****
  <!-- TMPL_INCLUDE Name="circulation-top.inc" -->
  <div id="mainbloc">
- <div class="bloc25">
- <a class="button" href="circulation.pl">
- Next Borrower</a>
- <a class="button" href="returns.pl">
- Returns</a>
- </div>
  
! <h1>Circulation: Transfers</h1>
  <b>Branch:</b> <!-- TMPL_VAR NAME="genbrname" --> &nbsp;
  <b>Printer:</b> <!-- TMPL_VAR NAME="genprname" -->
! <a href="selectbranchprinter.pl" class="button">Change Settings</a>
  <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
  <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
--- 1,9 ----
  <!-- TMPL_INCLUDE Name="circulation-top.inc" -->
  <div id="mainbloc">
  
! <h1 class="circulation">Circulation: Transfers</h1>
  <b>Branch:</b> <!-- TMPL_VAR NAME="genbrname" --> &nbsp;
  <b>Printer:</b> <!-- TMPL_VAR NAME="genprname" -->
! <a href="selectbranchprinter.pl" class="button circulation">Change Settings</a>
  <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
  <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
***************
*** 17,21 ****
  <!-- TMPL_IF Name="found" -->
  	<table>
! 	<tr><th>Reserve Found</th></tr>
  	<tr><td>
  	<!-- TMPL_IF Name="reserved" -->
--- 11,15 ----
  <!-- TMPL_IF Name="found" -->
  	<table>
! 	<tr><th class="circulation">Reserve Found</th></tr>
  	<tr><td>
  	<!-- TMPL_IF Name="reserved" -->
***************
*** 38,45 ****
  				<!-- TMPL_IF Name="waiting" --><input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
  					<input type="hidden" name="request" value="KillWaiting">
! 					<input type="submit" value="Cancel" class="button">
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF Name="reserved" --><input type="hidden" name="request" value="SetWaiting">
! 					<input type="submit" value="Waiting" class="button"><!-- /TMPL_IF -->
  			</form></p>
  
--- 32,39 ----
  				<!-- TMPL_IF Name="waiting" --><input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
  					<input type="hidden" name="request" value="KillWaiting">
! 					<input type="submit" value="Cancel" class="button circulation">
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF Name="reserved" --><input type="hidden" name="request" value="SetWaiting">
! 					<input type="submit" value="Waiting" class="button circulation"><!-- /TMPL_IF -->
  			</form></p>
  
***************
*** 58,62 ****
  			<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
  			<input type="hidden" name="request" value="KillReserved">
! 			<input type="submit" value="Cancel" class="button">
  			</form></p>
  		<!-- /TMPL_IF -->
--- 52,56 ----
  			<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
  			<input type="hidden" name="request" value="KillReserved">
! 			<input type="submit" value="Cancel" class="button circulation">
  			</form></p>
  		<!-- /TMPL_IF -->
***************
*** 70,74 ****
  				<input type="hidden" name="tb-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="tobrcd" -->">
  			<!-- /TMPL_LOOP -->
! 			<input type="submit" value="Ignore" class="button">
  			</form></p>
  
--- 64,68 ----
  				<input type="hidden" name="tb-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="tobrcd" -->">
  			<!-- /TMPL_LOOP -->
! 			<input type="submit" value="Ignore" class="button circulation">
  			</form></p>
  
***************
*** 77,81 ****
  <!-- TMPL_ELSE -->
  	<table>
! 	<tr><th>Messages</th></tr>
  	<tr><td>
  	<!-- TMPL_IF Name="reqmessage" -->
--- 71,75 ----
  <!-- TMPL_ELSE -->
  	<table>
! 	<tr><th class="circulation">Messages</th></tr>
  	<tr><td>
  	<!-- TMPL_IF Name="reqmessage" -->
***************
*** 125,130 ****
  		<p>
  		<table border="1" cellpadding="5" cellspacing="0" bgcolor="#dddddd">
! 		<tr><th colspan="6">Transfered Items</th></tr>
! 		<tr><th>Barcode</th><th>Title</th><th>Author</th><th>Type</th><th>From</th><th>To</th></tr>
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td align="center" bgcolor="<!-- TMPL_VAR NAME="color" -->">
--- 119,124 ----
  		<p>
  		<table border="1" cellpadding="5" cellspacing="0" bgcolor="#dddddd">
! 		<tr><th colspan="6" class="circulation">Transfered Items</th></tr>
! 		<tr><th class="circulation">Barcode</th><th class="circulation">Title</th><th class="circulation">Author</th><th class="circulation">Type</th><th class="circulation">From</th><th class="circulation">To</th></tr>
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td align="center" bgcolor="<!-- TMPL_VAR NAME="color" -->">
***************
*** 140,143 ****
--- 134,143 ----
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
+ <div class="bloc25">
+ <a class="button circulation" href="circulation.pl">
+ Next Borrower</a>
+ <a class="button circulation" href="returns.pl">
+ Returns</a>
+ </div>
  
  </div>




From shedges at users.sourceforge.net  Mon Jun 13 12:24:31 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Mon, 13 Jun 2005 03:24:31 -0700
Subject: [Koha-cvs] CVS: koha-doc/fr/opac - New directory
Message-ID: <E1Dhm7L-0003nL-6J@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/fr/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14570/fr/opac

Log Message:
Directory /cvsroot/koha/koha-doc/fr/opac added to the repository





From shedges at users.sourceforge.net  Mon Jun 13 12:25:00 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Mon, 13 Jun 2005 03:25:00 -0700
Subject: [Koha-cvs] CVS: koha-doc/fr/opac/CatKOHAimages - New directory
Message-ID: <E1Dhm7o-0003rp-31@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/fr/opac/CatKOHAimages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14857/fr/opac/CatKOHAimages

Log Message:
Directory /cvsroot/koha/koha-doc/fr/opac/CatKOHAimages added to the repository





From shedges at users.sourceforge.net  Mon Jun 13 12:26:57 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Mon, 13 Jun 2005 03:26:57 -0700
Subject: [Koha-cvs] CVS: koha-doc/fr/opac CatKOHA.xml,NONE,1.1
Message-ID: <E1Dhm9h-000473-QT@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/fr/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15727/fr/opac

Added Files:
	CatKOHA.xml 
Log Message:
Adding Bib. de soc. CNRS opac users guide

--- NEW FILE ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
<article>
  <title>Catalogue KOHA : mode d’emploi</title>

  <articleinfo>
    <pubdate>2005-06-11</pubdate>

    <copyright>
      <year>2005</year>

      <holder>Bibliothèque de sociologie du CNRS, Paris</holder>
    </copyright>

    <legalnotice>
      <para>Document sous licence Gnu-GPL</para>

      <para>This document is related to Koha and is licensed to you under the
      GNU General Public License version 2 or later (<ulink
      url="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</ulink>).</para>

      <para>Koha-related documents may be reproduced and distributed in whole
      or in part, in any medium physical or electronic, as long as this
      copyright notice is retained on all copies.</para>

      <para>You may create a derivative work and distribute it provided that
      you:</para>

      <orderedlist>
        <listitem>
          <para>License the derivative work with this same license, or the
          Linux Documentation Project License (<ulink
          url="http://www.tldp.org/COPYRIGHT.html">http://www.tldp.org/COPYRIGHT.html</ulink>).
          Include a copyright notice and at least a pointer to the license
          used.</para>
        </listitem>

        <listitem>
          <para>Give due credit to previous authors and major
          contributors.</para>
        </listitem>
      </orderedlist>

      <para>Commercial redistribution is allowed and encouraged; however, the
      author would like to be notified of any such distributions.</para>

      <para>No liability for the contents of this document can be accepted.
      Use the concepts, examples and information at your own risk. There may
      be errors and inaccuracies, that could be damaging to your system.
      Proceed with caution, and although this is highly unlikely, the
      author(s) do not take any responsibility.</para>

      <para>All copyrights are held by their by their respective owners,
      unless specifically noted otherwise. Use of a term in this document
      should not be regarded as affecting the validity of any trademark or
      service mark. Naming of particular products or brands should not be seen
      as endorsements.</para>
    </legalnotice>

    <revhistory>
      <revision>
        <revnumber>2.2.2</revnumber>

        <date>2005-06-11</date>

        <revdescription>
          <para>Initial XML markup.</para>
        </revdescription>
      </revision>
    </revhistory>
  </articleinfo>

  <section>
    <title>Le catalogue</title>

    <para>Le catalogue rassemble tous les documents acquis par la
    bibliothèque. Il contient également la liste complète des périodiques
    disponibles et environ 5000 notices descriptives correspondant à des
    articles de périodiques (20 revues analysées).</para>

    <para>Il permet d’effectuer des recherches documentaires à partir du fonds
    de la bibliothèque et de connaître la disponibilité d’un document à
    emprunter ou à consulter.</para>

    <section>
      <title>Page d’accueil et modes d’accès</title>

      <para>La catalogue se consulte sur le web : <ulink
      url="http://catalogue.bibliothequedesociologie.cnrs.fr">http://catalogue.bibliothequedesociologie.cnrs.fr</ulink>.
      Il est vivement recommandé d’utiliser le navigateur Mozilla, disponible
      gratuitement sur Internet.</para>

      <para>Vous avez le choix d’accéder au catalogue de manière anonyme ou en
      vous identifiant (réservé aux lecteurs inscrits à la
      bibliothèque).</para>

      <figure>
        <title>Page d’accueil</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image1.gif" />
          </imageobject>
        </mediaobject>
      </figure>

      <para>Vous pouvez modifier la langue de l’interface si vous le souhaitez
      (mais la langue d’indexation des documents est le français. Seules
      quelques notices ont fait l’objet d’un résumé dans une autre
      langue).</para>
    </section>

    <section>
      <title>Pour s’identifier</title>

      <para>Saisissez votre identifiant (nom de famille en minuscules) et le
      mot de passe fourni au moment de votre inscription (si vous avez oublié
      votre mot de passe, contactez la bibliothèque).</para>

      <figure>
        <title>Identification</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image2.gif" />
          </imageobject>
        </mediaobject>
      </figure>

      <para>L’accès en mode « Identifié » vous permet de consulter vos
      informations personnelles, d’effectuer des suggestions d’achats pour la
      bibliothèque, de vous constituer des étagères virtuelles.</para>

      <warning>
        <para>Attention : pensez à vous déconnecter à la fin de votre
        consultation.</para>
      </warning>
    </section>
  </section>

  <section>
    <title>Méthode de recherche : quelques conseils</title>

    <itemizedlist>
      <listitem>
        <para>Les recherches peuvent s'effectuer en texte intégral ou porter
        sur des champs ou des critères précis : auteur, titre, année de
        publication, éditeur ... </para>
      </listitem>

      <listitem>
        <para>Il n'est pas nécessaire de respecter les combinaisons
        majuscules/minuscules, les signes diacritiques (accent, tréma) ...
        </para>
      </listitem>

      <listitem>
        <para>Une recherche est faite sur tous les mots que vous entrez. Les
        mots vides sont ignorés. Si vous entrez, par exemple "les cadres en
        France" dans le titre, la liste de réponses contiendra tous les
        documents avec cadre ET France dans le titre ou le sous-titre. "Les"
        et « En » seront exclus.</para>
      </listitem>

      <listitem>
        <para>Si vous voulez entrer une partie de mot, mettez une * ou un % à
        la fin du mot. Par exemple, "urbanis*" donnera "urbanisme" mais aussi
        "urbanistique", « urbanisation », etc. </para>
      </listitem>
    </itemizedlist>

    <section>
      <title>Deux modes de recherche vous sont proposés : </title>

      <variablelist>
        <varlistentry>
          <term>Recherche simple</term>

          <listitem>
            <para>Allez sur la page d’accueil et tapez un ou plusieurs termes
            dans la zone de saisie. Cliquez sur OK<figure>
                <title>Recherche simple</title>

                <mediaobject>
                  <imageobject>
                    <imagedata fileref="CatKOHAimages/image3.gif" />
                  </imageobject>
                </mediaobject>
              </figure></para>

            <para>Les termes saisis dans cette zone sont par défaut reliés par
            l'opérateur ET.</para>
          </listitem>
        </varlistentry>

        <varlistentry>
          <term>Recherche avancée</term>

          <listitem>
            <para>Cliquez sur Recherche avancée<figure>
                <title>Recherche avancée</title>

                <mediaobject>
                  <imageobject>
                    <imagedata fileref="CatKOHAimages/image4.gif" />
                  </imageobject>
                </mediaobject>
              </figure></para>

            <para>Tapez un ou plusieurs termes dans la zone "N’importe où". La
            recherche portera sur tous les éléments de la notice du document.
            Les termes saisis dans cette zone sont par défaut reliés par
            l'opérateur ET.</para>

            <para><emphasis role="bold">ou</emphasis></para>

            <para>Tapez un ou plusieurs termes dans les zones dédiées aux
            informations souhaitées (auteur, titre, etc.). Entre chaque zone,
            l’opérateur par défaut est le « ET ».</para>

            <para>Zone Titre : vous pouvez entrer un titre complet ou partiel.
            La recherche sera faite aussi sur les sous-titres et les autres
            champs relatifs au titre.</para>

            <para>Zone auteur : vous pouvez entrer un nom ou un prénom. La
            recherche est aussi faite sur les co-auteurs et les autres champs
            en relation (traducteur, illustrateur...). N'oubliez pas qu'un
            auteur peut concerner un auteur physique (Pierre Bourdieu) ou
            moral (CNRS...).</para>

            <para>Une recherche plus sélective est possible en précisant : un
            type de document : périodiques, article de périodiques, thèse,
            rapport, etc.</para>
          </listitem>
        </varlistentry>
      </variablelist>
    </section>
  </section>

  <section>
    <title>Affichage des résultats</title>

    <section>
      <title>Affichage sous forme de liste</title>

      <para>Cet affichage vous permet de vérifier la disponibilité des
      documents et leur localisation (Cote)</para>

      <itemizedlist>
        <listitem>
          <para>Cliquez sur le titre pour consulter la notice.</para>
        </listitem>

        <listitem>
          <para>Cochez les notices à ajouter dans votre panier.</para>
        </listitem>

        <listitem>
          <para>Cliquez sur « réserver » pour réserver un document :
          <emphasis>le document ne pourra pas être emprunté par un autre
          lecteur.</emphasis> La réservation s’annule automatiquement au bout
          de 3 semaines ou lorsque vous avez emprunté le document. Si le
          document est déjà réservé par un autre lecteur, votre demande sera
          mise en file d’attente.</para>

          <note>
            <para>Attention : la réservation n'est pas une commande. Pour
            obtenir l’ouvrage réservé, il faut remplir un formulaire de prêt
            en salle de lecture.</para>
          </note>
        </listitem>
      </itemizedlist>

      <figure>
        <title>Affichage sous forme de liste</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image5.gif" />
          </imageobject>
        </mediaobject>
      </figure>
    </section>

    <section>
      <title>Format d’affichage SIMPLE</title>

      <para>Vous pouvez « rebondir » sur les mots clés de la notice pour une
      nouvelle recherche</para>

      <figure>
        <title>Format d’affichage SIMPLE</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image6.gif" />
          </imageobject>
        </mediaobject>
      </figure>
    </section>

    <section>
      <title>Format d’affichage ISBD (International Standard Book
      Description)</title>

      <para>Vous pouvez récupérer cette notice dans un traitement de texte en
      effectuant un Copier/Coller</para>

      <figure>
        <title>Format d’affichage ISBD</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image7.gif" />
          </imageobject>
        </mediaobject>
      </figure>
    </section>

    <section>
      <title>Format d’affichage « Notice Complète »</title>

      <para>Cliquez sur les onglets (0/1/2/3) pour visualiser les
      informations. L’onglet « Items » contient les indications relatives aux
      exemplaires (la cote par exemple)</para>

      <figure>
        <title>Notice Complète</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image8.gif" />
          </imageobject>
        </mediaobject>
      </figure>
    </section>
  </section>

  <section>
    <title>Informations lecteurs</title>

    <para>Pour consulter vos informations, il faut vous identifier.</para>

    <para>Pour modifier vos coordonnées, cliquez sur «mettre à jour » et
    indiquez quelles sont les données à corriger.</para>

    <figure>
      <title>Informations lecteurs</title>

      <mediaobject>
        <imageobject>
          <imagedata fileref="CatKOHAimages/image9.gif" />
        </imageobject>
      </mediaobject>
    </figure>
  </section>

  <section>
    <title>Panier</title>

    <para>Pour se constituer un panier, cochez les notices dans la liste des
    résultats et cliquez sur « Ajoutez les éléments cochés au panier »:
    <figure>
        <title>Ajoutez les éléments cochés au panier</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image10.gif" />
          </imageobject>
        </mediaobject>
      </figure></para>

    <para>Cliquez sur « Panier de notice » pour visualisez les notices
    sélectionnées<figure>
        <title>Panier de notice</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image11.gif" />
          </imageobject>
        </mediaobject>
      </figure></para>

    <para>Pour visualiser une notice dans un autre format d’affichage, cliquez
    sur le titre du document.</para>

    <para>Vous pouvez imprimer les notices du panier ou les envoyer par
    mél.<figure>
        <title>Les envoyer par mél</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image12.gif" />
          </imageobject>
        </mediaobject>
      </figure></para>
  </section>

  <section>
    <title>Étagères virtuelles</title>

    <para>Cette fonctionnalité vous permet de sélectionner un ensemble de
    documents et de conserver la sélection d’une session à l’autre
    (contrairement au Panier qui disparaît à l’issue de chaque consultation du
    catalogue).</para>

    <para>Pour créer ou consulter une étagère virtuelle, il faut vous
    identifier.</para>

    <itemizedlist>
      <listitem>
        <para>Cliquez sur « Étagères virtuelles » à partir de la page
        d’accueil, pour consulter les étagères déjà créées.</para>
      </listitem>

      <listitem>
        <para>Pour créer une nouvelle étagère, cliquez sur créer une nouvelle
        étagère.</para>
      </listitem>
    </itemizedlist>

    <para>Il existe 3 catégories d’étagères : </para>

    <orderedlist>
      <listitem>
        <para>Une étagère virtuelle privée est gérée par vous seul, et ne peut
        être vue que de vous.</para>
      </listitem>

      <listitem>
        <para>Une étagère publique peut être vue par tous, mais gérée
        uniquement par vous.</para>
      </listitem>

      <listitem>
        <para>Une étagère libre peut être gérée par n'importe quel
        utilisateur.</para>
      </listitem>
    </orderedlist>

    <figure>
      <title>Étagères virtuelles</title>

      <mediaobject>
        <imageobject>
          <imagedata fileref="CatKOHAimages/image13.gif" />
        </imageobject>
      </mediaobject>
    </figure>

    <para>Lorsque vous consultez le catalogue, vous pouvez sélectionner une ou
    plusieurs notices à ajouter dans l'étagère : cliquez sur la notice et
    ensuite sur la fonction « Ajouter dans l’étagère ». Sélectionnez l’étagère
    dans laquelle vous souhaitez déposer la notice.</para>
  </section>

  <section>
    <title>Suggestions d’achat</title>

    <para>Cette fonctionnalité vous permet de proposer des suggestions
    d’acquisition à l’équipe de la bibliothèque. Vous recevrez automatiquement
    un mél en réponse à votre suggestion d’achat.</para>

    <para>Pour consulter vos suggestions, sélectionnez « moi-même » dans la
    colonne «Suggéré par » et cliquez sur « Chercher » </para>

    <figure>
      <title>Suggestions d’achat</title>

      <mediaobject>
        <imageobject>
          <imagedata fileref="CatKOHAimages/image14.gif" />
        </imageobject>
      </mediaobject>
    </figure>

    <para>Lorsque vous saisissez une suggestion, remplissez la grille de
    manière la plus précise possible. Ajoutez dans la zone « Note » les
    éventuels commentaires que vous auriez à formuler.<figure>
        <title>Saisir une nouvelle suggestion</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image15.gif" />
          </imageobject>
        </mediaobject>
      </figure></para>
  </section>
</article>



From shedges at users.sourceforge.net  Mon Jun 13 12:31:17 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Mon, 13 Jun 2005 03:31:17 -0700
Subject: [Koha-cvs] CVS: koha-doc/fr migrer_ses_donnees.xml,1.2,NONE scripts ligne de commande.xml,1.2,NONE
Message-ID: <E1DhmDt-0004ir-Ld@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/fr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18139/fr

Removed Files:
	migrer_ses_donnees.xml scripts ligne de commande.xml 
Log Message:
Removing duplicate documents that have been moved to subdirectories.

--- migrer_ses_donnees.xml DELETED ---

***** Bogus filespec: scripts
***** Bogus filespec: ligne
***** Bogus filespec: de
--- commande.xml DELETED ---




From shedges at users.sourceforge.net  Mon Jun 13 13:08:53 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Mon, 13 Jun 2005 04:08:53 -0700
Subject: [Koha-cvs] CVS: koha-doc codingguidelines.xml,NONE,1.1
Message-ID: <E1DhmoH-00016o-CR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4193

Added Files:
	codingguidelines.xml 
Log Message:
draft of coding standards and guidelines

--- NEW FILE ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
<article>
  <title>Koha Coding Standards and Guidelines for Contributors</title>

  <section>
    <title>Introduction</title>

    <para>As in other free and open source software projects, Koha contains
    code that has been contributed to the project by many different
    developers. Koha is now a complex piece of software, and we'd like
    continue to improve the overall code standards to make it easier for new
    developers to join the project, and to make existing code easier to
    maintain. These standards and guidelines are intended to give Koha a
    reasonably consistent style throughout the code and to ensure
    maintainability.</para>

    <para>When you commit new code to Koha, please do your best to comply with
    these guidelines -- it will increase the chances of your code become part
    of a stable Koha release. And if you find code in Koha that doesn't comply
    with these guidelines, please feel free to fix it, just as you would
    correct any bug.</para>
  </section>

  <section>
    <title>Code style</title>

    <para>Koha code should conform to the guidelines defined in the <ulink
    url="http://perldoc.perl.org/perlstyle.html">perlstyle</ulink> man page as
    they apply to code details (indenting, etc.). As for the general structure
    of the code, all Koha code must be separated into three types:</para>

    <itemizedlist>
      <listitem>
        <para>the Perl code;</para>
      </listitem>

      <listitem>
        <para>the database (DB) access code; and</para>
      </listitem>

      <listitem>
        <para>the HTML code.</para>
      </listitem>
    </itemizedlist>

    <para>These three code types, as well as the Koha naming conventions, are
    explained in the following sections.</para>

    <section>
      <title>HTML</title>

      <para>All code controlling the "appearance layer" is contained in
      <filename>HTML::Template</filename> files. These files are located in
      the <filename>koha-tmpl</filename> directory in CVS (currently <ulink
      url="http://sourceforge.net/cvs/?group_id=16466">http://sourceforge.net/cvs/?group_id=16466</ulink>).
      They must contain all the code controlling the presentation layer. There
      are at least two good reasons for this:</para>

      <itemizedlist>
        <listitem>
          <para>the look of Koha can be changed by rewriting only the
          templates, changing nothing in the Perl code itself; and</para>
        </listitem>

        <listitem>
          <para>there is a tool to translate templates, so it's the only way
          to localise our preferred ILS.</para>
        </listitem>
      </itemizedlist>

      <para>Almost all the actual Koha presentation pages use templates. Only
      a few exceptions (that can be considered bugs) remain at the time of
      writing.</para>

      <section>
        <title>Templates location</title>

        <para>The <filename>koha-tmpl</filename> directory contains two
        different sub-directories: <filename>opac-tmpl</filename> and
        <filename>intranet-tmpl</filename>. Under those two are the themes
        directories, and one directory for each language -- for example,
        <filename>intranet-tmpl/default/en</filename> for English default
        templates. The templates should be stored in a directory that
        parallels the location of the Perl scripts. For example, the Perl
        scripts located in the <filename>$KOHA/acqui.simple</filename>
        directory should use templates located in
        <filename>$KOHA/koha-tmpl/intranet-tmpl/&lt;theme&gt;/&lt;language&gt;/acqui.simple</filename>.</para>

        <para><emphasis>Exceptions:</emphasis></para>

        <itemizedlist>
          <listitem>
            <para>Scripts located in <filename>$KOHA/admin/</filename> use
            templates located in
            <filename>$KOHA/intranet-tmpl/&lt;theme&gt;/&lt;language&gt;/parameters/</filename></para>
          </listitem>

          <listitem>
            <para>Some scripts in <filename>$KOHA/members/</filename> use
            templates located in
            <filename>$KOHA/intranet-tmpl/&lt;theme&gt;/&lt;language&gt;/</filename></para>
          </listitem>

          <listitem>
            <para>Simple HTML "includes" files for placing standard headers
            and footers on Koha pages are located in
            <filename>$KOHA/intranet-tmpl/&lt;theme&gt;/&lt;language&gt;/includes/</filename></para>
          </listitem>
        </itemizedlist>

        <para>When modifying templates, you should only modify the English one
        manually. All other languages are automatically generated from the
        English templates through a <filename>.po</filename> file and the
        script located in
        <filename>misc/translator/tmpl_process3.pl</filename>.</para>
      </section>

      <section>
        <title>Online help</title>

        <para>The
        <filename>$KOHA/koha-tmpl/&lt;theme&gt;/&lt;language&gt;/help</filename>
        directory contains online help. Under the <filename>help</filename>
        directory is a complete copy of the Koha directory structure, with
        templates using the same name as the "true" templates. These templates
        must contain online help. The <filename>$KOHA/help.pl</filename>
        script is called when the user clicks on "Help," which opens/shows the
        templates in this directory.</para>

        <para>PLEASE write online help when you add features.</para>
      </section>

      <section>
        <title>Template content</title>

        <para>There is usually only one template for a given
        <filename>.pl</filename> file. For example, the template related to
        <filename>circulation/returns.pl</filename> should be
        <filename>circulation/returns.tmpl</filename>.</para>

        <para>If there are different possible behaviours, they should be
        separated by a <varname>TMPL_IF</varname>. For example,
        <filename>$KOHA/koha-tmpl/intranet-tmpl/&lt;theme&gt;/&lt;language&gt;/parameters</filename>
        contains:</para>

        <programlisting>&lt;!-- TMPL_IF name="add_form" --&gt;</programlisting>

        <para>that controls what is shown when the user wants to add something
        (as determined by the Perl script):</para>

        <programlisting>if ($op) {
$template-&gt;param(script_name =&gt; $script_name,
$op              =&gt; 1);  # We show only the TMPL_VAR names $op.
} else {
$template-&gt;param(script_name =&gt; $script_name,
else              =&gt; 1); # We show only the TMPL_VAR names $op.
}</programlisting>

        <para>Note that some scripts use two different templates, depending on
        what the user wants to do. This is sometimes a mistake in Koha design,
        sometimes not. For example, in
        <filename>$KOHA/opac/opac-search.pl</filename>, we can use the
        <filename>opac-search</filename> or
        <filename>opac-searchresults</filename> template, depending on the
        step of the search. Both templates are big, so merging them would not
        be a good idea for maintenance and readability of Koha code.</para>
      </section>
    </section>

    <section>
      <title>DB access</title>

      <para>No database (DB) access routines should ever be included in
      <filename>.pl</filename> files. All DB access routines should be in the
      <filename>C4</filename> directory, in <filename>.pm</filename> modules.
      There is one <filename>.pm</filename> module for each logical "librarian
      activity." For example, everything related to circulation must be in
      <filename>C4/Circulation/Circ2.pm</filename>.</para>

      <para>All inclusion of Perl variables in SQL commands should be done
      through <userinput>prepare()</userinput> statements with
      <userinput>?</userinput> placeholders, and then using
      <userinput>bind()</userinput> and/or <userinput>execute()</userinput>
      calls. This helps with security and other testing.</para>

      <para>The <filename>C4/Context.pm</filename> module contains everything
      related to technical variables (creating a DB handler, getting a
      systempreference, etc.).</para>

      <para>The <filename>C4/Koha.pm</filename> module contains everything
      related to things that are useful everywhere in Koha, such as getting a
      branch list or a branch detail. (At the time of writing, this module
      probably should be improved. Some subroutines, for instance, are located
      in other modules but would be better here.)</para>

      <para><emphasis>Exception:</emphasis> parameters management scripts. For
      historic reasons, and because they don't do anything complex in the
      database, all scripts in <filename>$KOHA/admin/</filename> deal directly
      with the database. This is not really a bug, even if it does seem to
      break the rule. (Think of it as "the exception that proves the
      rule.")</para>
    </section>

    <section>
      <title>Perl scripts</title>

      <para>Perl scripts are the scripts that are run from
      <filename>cgi-bin</filename> (or <filename>mod_perl</filename>). They
      all have (almost) the same behaviour:</para>

      <itemizedlist>
        <listitem>
          <para>read parameters;</para>
        </listitem>

        <listitem>
          <para>open an <filename>HTML::Template</filename> file (that checks
          the user rights to access the page if needed -- if the user doesn't
          have the correct permissions, show a "sorry no access" page and
          end);</para>
        </listitem>

        <listitem>
          <para>depending on the parameters (often, in a
          <varname>$op</varname> variable, but not always), run subroutines
          from a <filename>C4/*.pm</filename> package to do something in the
          database;</para>
        </listitem>

        <listitem>
          <para>using the parameters and the results of the previous
          operations, fill the template; and</para>
        </listitem>

        <listitem>
          <para>send the template to the user.</para>
        </listitem>
      </itemizedlist>

      <para>Some scripts are run on the command line. They all are located in
      the <filename>misc</filename> directory. The <filename>misc</filename>
      directory does not contain any scripts that can be run as
      <filename>cgi-bin</filename>.</para>

      <para>Command line scripts executed without any parameters should return
      a "help" listing of possible parameters and exit without doing
      anything.</para>
    </section>

    <section>
      <title>Naming conventions</title>

      <section>
        <title>Script names</title>

        <para>The script names must be related to what they do, and they must
        be located in a directory that is related to a logical "librarian
        activity". For example, all scripts related to circulation are in
        <filename>$KOHA/circ/</filename>.</para>

        <para><emphasis>Exceptions:</emphasis></para>

        <itemizedlist>
          <listitem>
            <para>The <filename>acqui.simple</filename> directory contains all
            the code for MARC cataloguing. The directory name obviously is not
            related to the "librarian activity," but it's historic.</para>
          </listitem>

          <listitem>
            <para>The <filename>bull</filename> directory is related to
            serials management. Most of the code in this directory was
            developed in France, and "serials management" is "bulletinage" in
            French -- but in general, script and directory names should be in
            English.</para>
          </listitem>

          <listitem>
            <para>Some scripts related to borrowers are still in the
            <filename>$KOHA/</filename> directory (<filename>pay.pl</filename>
            for example).</para>
          </listitem>
        </itemizedlist>
      </section>

      <section>
        <title>Variable names</title>

        <para>Variables can be of three types:</para>

        <itemizedlist>
          <listitem>
            <para>Perl variables;</para>
          </listitem>

          <listitem>
            <para>template variables; or</para>
          </listitem>

          <listitem>
            <para>hash entries from a SQL request.</para>
          </listitem>
        </itemizedlist>

        <para>All three variables should have the same name. For example, if
        you get the field <varname>issuelength</varname> from the
        <filename>issuingrules</filename> table, then you should have a
        <userinput>&lt;!-- TMPL_VAR name="issuelength" --&gt;</userinput> in
        the template, and either a <varname>$issuelength</varname> or
        <varname>$issuingrules-&gt;{'issuelength'}</varname> variable in the
        Perl code.</para>

        <para>Sometimes you must use the same field/variable from two
        different points of view. In this case, use two variable names, with
        something distinctive before the "simple" name. For example if you
        need "librarian name" and "borrower name" from
        <varname>borrowers.surname</varname>, use
        <varname>librariansurname</varname> and
        <varname>borrowersurname</varname>.</para>
      </section>
    </section>
  </section>

  <section>
    <title>Commenting style</title>

    <para>Scripts and modules in Koha are expected to contain clear and
    helpful comments to assist other developers who want to work on the code.
    Despite the availability of external documentation, source code listings
    should be able to stand on their own, because external documentation may
    not adequately describe the details and intent of the developer(s). Please
    make sure you include enough comments to keep your coding intentions
    understandable, and try to follow these guidelines:</para>

    <orderedlist>
      <listitem>
        <para>Please write your comments in English or request
        translation.</para>

        <para>Write in complete sentences, capitalize the first word, and put
        two spaces after the end of each sentence (so that the Emacs sentence
        commands will work).</para>

        <para>Comments should start with a # and a single space.</para>
      </listitem>

      <listitem>
        <para>Comment your code when you do something that someone else may
        not think is "trivial." In other words, comment anything that is not
        readily obvious in the code.</para>
      </listitem>

      <listitem>
        <para>Each Koha file should begin with a block comment
        containing:</para>

        <orderedlist>
          <listitem>
            <para>basic information about the file, such as file name,
            version, date, author:<programlisting># addbiblio.pl, v 1.52.2.6, 2005/05/19, tipaul</programlisting></para>
          </listitem>

          <listitem>
            <para>the standard Koha copyright message:<programlisting># Copyright 2000-2005 Katipo Communications
# Copyright 2005 &lt;author or employer&gt;
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA</programlisting></para>
          </listitem>
        </orderedlist>
      </listitem>

      <listitem>
        <para>All block comments should consist of one or more paragraphs
        built out of complete sentences, and each sentence should end in a
        period.</para>

        <para>Block comments generally apply to some (or all) code that
        follows them, and are indented to the same level as that code. Each
        line of a block comment starts with a # and a single space (unless it
        is indented text inside the comment). Paragraphs inside a block
        comment are separated by a line containing a single #. Block comments
        are best surrounded by a blank line above and below them.</para>
      </listitem>

      <listitem>
        <para>Provide comments at the beginning of every function (unless the
        function is very short and its purpose is obvious) indicating the
        function's purpose, assumptions, and limitations.</para>

        <para>The comments should be a brief introduction to understand why
        the function exists and what it can do. Document how it does it, too,
        if that is not obvious.</para>

        <para>Place a blank line between a function and its description.
        Include information about the sorts of arguments it gets, and what the
        possible values of arguments mean and are used for. Also explain the
        significance of the return value, if there is one.</para>
      </listitem>

      <listitem>
        <para>Use comments on code that consists of loops and logic branches.
        These are key areas that will assist the reader when reading source
        code.</para>
      </listitem>

      <listitem>
        <para>Try to avoid adding comments at the end of a line of code;
        end-line comments make code more difficult to read.</para>

        <para>End-line comments are appropriate, however, when annotating
        variable declarations. In this case, try to align all end-line
        comments at a common tab stop. (End-line comments should be separated
        by at least two spaces from the statement.)</para>
      </listitem>

      <listitem>
        <para>When modifying code, always keep the commenting around it up to
        date.</para>

        <para>Keeping the comments up-to-date when the code changes is a
        priority -- comments that contradict the code are worse than no
        comments! Identify the change with the date and your user name.</para>
      </listitem>

      <listitem>
        <para>Avoid using clutter comments, such as an entire line of
        asterisks. Instead, use white space to separate comments from
        code.</para>

        <para>Avoid the use of superfluous or inappropriate comments, such as
        humorous sidebar remarks.</para>
      </listitem>

      <listitem>
        <para>To prevent recurring problems, always use comments on bug fixes
        and work-around code, especially in this team environment.</para>

        <para>When you want to leave notes about functionalities to be added,
        put <userinput>TODO:</userinput> in front of the actual comments so
        developers can easily search for them.</para>

        <para>When you want to leave notes about bugs to be fixed, put
        <userinput>FIXME:</userinput> in front of the actual comments so
        developers can easily search for them.</para>
      </listitem>
    </orderedlist>

    <para>One other type of comment that developers may overlook is the cvs
    log message added when committing a file, but these comments are also very
    important. The messages should never be omitted and should give enough
    description to let other developers know what you are doing without having
    to read the code itself. In the case of bug fixes, it is also recommended
    that the messages include the bug number and the bug title, as well as a
    brief description of the fix.</para>
  </section>

  <section>
    <title>POD style (in modules)</title>

    <para>Koha modules should be documented with extensive comments written in
    POD ("Plain Old Documentation") format. Instructions for the POD markup
    language can be found in the <ulink
    url="http://perldoc.perl.org/perlpod.html">perlpod</ulink> man
    page.</para>

    <para>POD comments should include as least the following headings:</para>

    <variablelist>
      <varlistentry>
        <term>NAME</term>

        <listitem>
          <para>The name of the module and a very brief description of the
          type of functions contained in the module.</para>
        </listitem>
      </varlistentry>

      <varlistentry>
        <term>SYNOPSIS</term>

        <listitem>
          <para>This may give an example of how to access the module from a
          script, but it may also contain any general discussion of the
          purpose or behavior of the module's functions, and discussion of
          changes made to the module.</para>
        </listitem>
      </varlistentry>

      <varlistentry>
        <term>DESCRIPTION</term>

        <listitem>
          <para>If not included in the SYNOPSIS, a general description of the
          module's purpose should appear here.</para>
        </listitem>
      </varlistentry>

      <varlistentry>
        <term>FUNCTIONS</term>

        <listitem>
          <para>Descriptions of each function in the module, beginning with an
          example of how the function is called and continuing with a
          description of the behavior of the function.</para>
        </listitem>
      </varlistentry>

      <varlistentry>
        <term>AUTHOR</term>

        <listitem>
          <para>This will generally be the "Koha Development Team," but may
          also be an individual developer who has made significant
          contributions to the module. Give a contact e-mail address.</para>
        </listitem>
      </varlistentry>
    </variablelist>

    <para>For two examples, see the POD comments in the
    <filename>Search.pm</filename> module (<userinput>perldoc
    Search.pm</userinput>) and the <filename>Biblio.pm</filename>
    module.</para>
  </section>
</article>



From tipaul at users.sourceforge.net  Mon Jun 13 17:12:21 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 13 Jun 2005 08:12:21 -0700
Subject: [Koha-cvs] CVS: koha/misc/translator/po css_opac_fr_FR.po,1.6.2.4,1.6.2.5 default_intranet_fr_FR.po,1.5.2.5,1.5.2.6
Message-ID: <E1Dhqbt-0002qF-CF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10372/misc/translator/po

Modified Files:
      Tag: rel_2_2
	css_opac_fr_FR.po default_intranet_fr_FR.po 
Log Message:
translation update for 2.2.3 release

Index: css_opac_fr_FR.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/css_opac_fr_FR.po,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -C2 -r1.6.2.4 -r1.6.2.5
*** css_opac_fr_FR.po	31 Mar 2005 07:47:01 -0000	1.6.2.4
--- css_opac_fr_FR.po	13 Jun 2005 15:12:03 -0000	1.6.2.5
***************
*** 9,14 ****
  msgstr ""
  "Project-Id-Version: css_opac_fr_FR\n"
! "POT-Creation-Date: 2005-03-30 15:44+0200\n"
! "PO-Revision-Date: 2005-03-30 16:34+0200\n"
  "Last-Translator: POULAIN <paul at koha-fr.org>\n"
  "Language-Team: fr_FR\n"
--- 9,14 ----
  msgstr ""
  "Project-Id-Version: css_opac_fr_FR\n"
! "POT-Creation-Date: 2005-06-13 14:55+0200\n"
[...2358 lines suppressed...]
  msgid "week"
  msgstr "semaine"
  
! #: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:40
  msgid "year"
  msgstr "année"
--- 2296,2308 ----
  msgstr "vol. %s"
  
! #: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:54
! msgid "wednesday"
! msgstr "mercredi"
! 
! #: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:17
  msgid "week"
  msgstr "semaine"
  
! #: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:41
  msgid "year"
  msgstr "année"

Index: default_intranet_fr_FR.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_fr_FR.po,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -C2 -r1.5.2.5 -r1.5.2.6
*** default_intranet_fr_FR.po	7 Apr 2005 12:02:10 -0000	1.5.2.5
--- default_intranet_fr_FR.po	13 Jun 2005 15:12:13 -0000	1.5.2.6
***************
*** 9,14 ****
  msgstr ""
  "Project-Id-Version: default_intranet_fr_FR\n"
! "POT-Creation-Date: 2005-04-06 14:34+0200\n"
! "PO-Revision-Date: 2005-04-06 14:45+0200\n"
  "Last-Translator: POULAIN <paul at koha-fr.org>\n"
  "Language-Team: fr_FR\n"
--- 9,14 ----
  msgstr ""
  "Project-Id-Version: default_intranet_fr_FR\n"
! "POT-Creation-Date: 2005-06-07 16:19+0200\n"
[...7442 lines suppressed...]
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:144
! #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:140
  msgid "value"
  msgstr "valeur"
***************
*** 13394,13399 ****
  msgstr "semaine"
  
- #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:24
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:25
  msgid "will result in the following issues numbers :"
  msgstr "Donnera les numéros de parution suivants"
--- 13585,13590 ----
  msgstr "semaine"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:25
+ #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:24
  msgid "will result in the following issues numbers :"
  msgstr "Donnera les numéros de parution suivants"




From joshferraro at users.sourceforge.net  Tue Jun 14 20:24:25 2005
From: joshferraro at users.sourceforge.net (Joshua Ferraro)
Date: Tue, 14 Jun 2005 11:24:25 -0700
Subject: [Koha-cvs] CVS: koha/misc/sql-datas/english sample_usmarc.readme,NONE,1.1.2.1
Message-ID: <E1DiG5J-0006OS-NQ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/sql-datas/english
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24497

Added Files:
      Tag: rel_2_2
	sample_usmarc.readme 
Log Message:
readme for sample usmarc file.


--- NEW FILE ---
The included sample_usmarc.mrc can be used to demonstrate
import of a set of MARC21 (iso2709) records. The set includes
about 3K records. Note that if you want holdings to work
correctly you'll have to tweak the records to match your
local configuration. To import the records use the 
bulkmarcimport tool in misc/migration_tools/

If you have questions feel free to ask them on the list
or email me directly.

Joshua Ferraro
jmf at liblime dot com




From joshferraro at users.sourceforge.net  Wed Jun 15 01:18:55 2005
From: joshferraro at users.sourceforge.net (Joshua Ferraro)
Date: Tue, 14 Jun 2005 16:18:55 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes favicon.ico,1.1,1.2
Message-ID: <E1DiKgJ-0005GA-DC@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	favicon.ico 
Log Message:
to get rid of pesky log message complaining about favicon.ico






From joshferraro at users.sourceforge.net  Wed Jun 15 01:22:13 2005
From: joshferraro at users.sourceforge.net (Joshua Ferraro)
Date: Tue, 14 Jun 2005 16:22:13 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl favicon.ico,NONE,1.1
Message-ID: <E1DiKjV-0005dL-LM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21595

Added Files:
	favicon.ico 
Log Message:
Getting rid of pesky favicon.ico log message


--- NEW FILE ---


>?ÿÿÿ

ÿÿÿ67789:;ÿÿÿ

ÿÿÿ010234ÿ5ÿÿÿ

ÿÿÿ,-./ÿÿÿÿÿ

ÿÿÿ'()*+ÿÿÿÿÿÿ

ÿÿÿ
$

ÿÿÿÿ

ÿÿÿÿÿ	ÿÿÿÿÿ

ÿÿÿÿ



From hdl at users.sourceforge.net  Wed Jun 15 15:21:25 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 15 Jun 2005 06:21:25 -0700
Subject: [Koha-cvs] CVS: koha/C4 SearchMarc.pm,1.44,1.45
Message-ID: <E1DiXpd-0008Lv-3n@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31993/C4

Modified Files:
	SearchMarc.pm 
Log Message:
Deleting joined tables without condition.
Issues, reserves, items.
Major Bug fixed : Catalogsearch would work no more. 

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** SearchMarc.pm	3 Jun 2005 03:58:26 -0000	1.44
--- SearchMarc.pm	15 Jun 2005 13:21:22 -0000	1.45
***************
*** 281,289 ****
  	my $sth;
  	if ($sql_where2) {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,issues,reserves,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc");
! 		warn "Q2 : select distinct m1.bibid from biblio,biblioitems,items,issues,reserves,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc term is  @$value";
  	} else {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,issues,reserves,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc");
! 		warn "Q : select distinct m1.bibid from biblio,biblioitems,items,issues,reserves,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc";
  	}
  	$sth->execute();
--- 281,289 ----
  	my $sth;
  	if ($sql_where2) {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc");
! 		warn "Q2 : select distinct m1.bibid from biblio,biblioitems,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc term is  @$value";
  	} else {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc");
! 		warn "Q : select distinct m1.bibid from biblio,biblioitems,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc";
  	}
  	$sth->execute();




From hdl at users.sourceforge.net  Wed Jun 15 18:09:46 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 15 Jun 2005 09:09:46 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-MARCdetail.pl,1.6,1.7
Message-ID: <E1DiaSY-000682-F3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23328/opac

Modified Files:
	opac-MARCdetail.pl 
Log Message:
Displaying dashed isbn.

Index: opac-MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-MARCdetail.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** opac-MARCdetail.pl	4 May 2005 09:02:38 -0000	1.6
--- opac-MARCdetail.pl	15 Jun 2005 16:09:42 -0000	1.7
***************
*** 118,121 ****
--- 118,124 ----
  				if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{isurl}) {
  					$subfield_data{marc_value}="<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";
+ 				} elsif ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{kohafield} eq "biblioitems.isbn") {
+ #					warn " tag : ".$tagslib->{$fields[$x_i]->tag()}." subfield :".$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}. "ISBN : ".$subf[$i][1]."PosttraitementISBN :".DisplayISBN($subf[$i][1]);
+ 					$subfield_data{marc_value}=DisplayISBN($subf[$i][1]);
  				} else {
  					if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{authtypecode}) {




From hdl at users.sourceforge.net  Wed Jun 15 18:09:46 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 15 Jun 2005 09:09:46 -0700
Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.119,1.120
Message-ID: <E1DiaSY-000685-Ga@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23328/C4

Modified Files:
	Biblio.pm 
Log Message:
Displaying dashed isbn.

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.119
retrieving revision 1.120
diff -C2 -r1.119 -r1.120
*** Biblio.pm	1 Jun 2005 20:43:58 -0000	1.119
--- Biblio.pm	15 Jun 2005 16:09:43 -0000	1.120
***************
*** 71,74 ****
--- 71,75 ----
    
    &FindDuplicate
+   &DisplayISBN
  );
  
***************
*** 476,479 ****
--- 477,481 ----
      my ( $dbh, $bibid ) = @_;
      my $record = MARC::Record->new();
+ #	warn "". $bidid;
  
      #---- TODO : the leader is missing
***************
*** 2621,2625 ****
  	return;
  }
! 
  END { }    # module clean-up code here (global destructor)
  
--- 2623,2661 ----
  	return;
  }
! sub DisplayISBN {
! 	my ($isbn)=@_;
! 	my $seg1;
! 	if(substr($isbn, 0, 1) <=7) {
! 		$seg1 = substr($isbn, 0, 1);
! 	} elsif(substr($isbn, 0, 2) <= 94) {
! 		$seg1 = substr($isbn, 0, 2);
! 	} elsif(substr($isbn, 0, 3) <= 995) {
! 		$seg1 = substr($isbn, 0, 3);
! 	} elsif(substr($isbn, 0, 4) <= 9989) {
! 		$seg1 = substr($isbn, 0, 4);
! 	} else {
! 		$seg1 = substr($isbn, 0, 5);
! 	}
! 	my $x = substr($isbn, length($seg1));
! 	my $seg2;
! 	if(substr($x, 0, 2) <= 19) {
! # 		if(sTmp2 < 10) sTmp2 = "0" sTmp2;
! 		$seg2 = substr($x, 0, 2);
! 	} elsif(substr($x, 0, 3) <= 699) {
! 		$seg2 = substr($x, 0, 3);
! 	} elsif(substr($x, 0, 4) <= 8399) {
! 		$seg2 = substr($x, 0, 4);
! 	} elsif(substr($x, 0, 5) <= 89999) {
! 		$seg2 = substr($x, 0, 5);
! 	} elsif(substr($x, 0, 6) <= 9499999) {
! 		$seg2 = substr($x, 0, 6);
! 	} else {
! 		$seg2 = substr($x, 0, 7);
! 	}
! 	my $seg3=substr($x,length($seg2));
! 	$seg3=substr($seg3,0,length($seg3)-1) ;
! 	my $seg4 = substr($x, -1, 1);
! 	return "$seg1-$seg2-$seg3-$seg4";
! }
  END { }    # module clean-up code here (global destructor)
  
***************
*** 2636,2639 ****
--- 2672,2678 ----
  # $Id$
  # $Log$
+ # Revision 1.120  2005/06/15 16:09:43  hdl
+ # Displaying dashed isbn.
+ #
  # Revision 1.119  2005/06/01 20:43:58  genjimoto
  # patch from Genji (Waylon R.) to update subjects in MARC tables when systempref has MARC=OFF




From hdl at users.sourceforge.net  Wed Jun 15 18:09:46 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 15 Jun 2005 09:09:46 -0700
Subject: [Koha-cvs] CVS: koha MARCdetail.pl,1.26,1.27
Message-ID: <E1DiaSY-00068B-O3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23328

Modified Files:
	MARCdetail.pl 
Log Message:
Displaying dashed isbn.

Index: MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/MARCdetail.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** MARCdetail.pl	1 Mar 2005 13:40:47 -0000	1.26
--- MARCdetail.pl	15 Jun 2005 16:09:44 -0000	1.27
***************
*** 116,121 ****
--- 116,125 ----
  				$subfield_data{marc_lib}=$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{lib};
  				$subfield_data{link}=$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{link};
+ # 				warn "tag : ".$tagslib->{$fields[$x_i]->tag()}." subfield :".$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}."lien koha? : "$subfield_data{link};
  				if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{isurl}) {
  					$subfield_data{marc_value}="<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";
+ 				} elsif ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{kohafield} eq "biblioitems.isbn") {
+ #					warn " tag : ".$tagslib->{$fields[$x_i]->tag()}." subfield :".$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}. "ISBN : ".$subf[$i][1]."PosttraitementISBN :".DisplayISBN($subf[$i][1]);
+ 					$subfield_data{marc_value}=DisplayISBN($subf[$i][1]);
  				} else {
  					if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{authtypecode}) {




From hdl at users.sourceforge.net  Wed Jun 15 21:55:16 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 15 Jun 2005 12:55:16 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.19,1.20
Message-ID: <E1Didym-0005r5-Qo@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac.css 
Log Message:
Displaying overdues with red font.


Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** opac.css	4 May 2005 08:58:30 -0000	1.19
--- opac.css	15 Jun 2005 19:55:14 -0000	1.20
***************
*** 268,271 ****
--- 268,282 ----
  /* BLOCS */
  
+ #problem {
+ 	color: white;
+ 	font-weight:bold;
+ 	background-color:red;
+ }
+ .problem {
+ 	color: white;
+ 	font-weight:bold;
+ 	background-color:red;
+ }
+ 
  /* the mainbloc : everything is in mainbloc, except menu */
  #mainbloc {




From hdl at users.sourceforge.net  Wed Jun 15 21:55:17 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 15 Jun 2005 12:55:17 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-user.tmpl,1.9,1.10
Message-ID: <E1Didyn-0005rB-0O@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac-user.tmpl 
Log Message:
Displaying overdues with red font.


Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** opac-user.tmpl	4 May 2005 08:58:32 -0000	1.9
--- opac-user.tmpl	15 Jun 2005 19:55:14 -0000	1.10
***************
*** 61,69 ****
  			</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>
--- 61,71 ----
  			</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>
***************
*** 71,85 ****
  						<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>
--- 73,76 ----




From hdl at users.sourceforge.net  Thu Jun 16 17:06:25 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 16 Jun 2005 08:06:25 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes intranet-main.css,1.4,1.4.2.1
Message-ID: <E1Divwn-0008PW-Ar@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	intranet-main.css 
Log Message:
adding rapid links to pages inside

Index: intranet-main.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/intranet-main.css,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** intranet-main.css	30 Jul 2004 14:29:40 -0000	1.4
--- intranet-main.css	16 Jun 2005 15:06:22 -0000	1.4.2.1
***************
*** 55,59 ****
  	text-align:center;
  	background-color:#ad11ad;
! 	color: #FFFFFF;
  	text-decoration: normal;
  	font-weight: bold;
--- 55,59 ----
  	text-align:center;
  	background-color:#ad11ad;
! 	color: #000000;
  	text-decoration: normal;
  	font-weight: bold;
***************
*** 84,87 ****
--- 84,106 ----
  }
  
+ h2 {
+ 	margin-top:0px;
+ 	margin-bottom:4px;
+ 	text-align:center;
+ 	padding:0px;
+ 	font-size:125%;
+ 	padding-left:10px;
+ 	padding-right:10px;
+ 	padding-bottom:3px;
+ 	padding-top:3px;
+ }
+ h2.reports{
+ 	text-align:center;
+ 	background-color: #6b7cbe;
+ 	color: #FFFFFF;
+ 	text-decoration: normal;
+ 	font-weight: bold;
+ }
+ 
  h1.circulation{
  	text-align:center;
***************
*** 92,95 ****
--- 111,123 ----
  }
  
+ h1.authority {
+ 	text-align:center;
+ 	background-color: #6b7cbe;
+ 	color:#000000;
+ 	text-decoration: normal;
+ 	font-weight: bold;
+ 	background-image:none;
+ 	}
+ 
  h1.parameters{
  	text-align:center;
***************
*** 121,125 ****
  	cursor: hand;
  	background-color:#ad11ad;
! 	color:#FFFFFF;
  	font-weight: bold;
  	border:1px solid #000000;
--- 149,153 ----
  	cursor: hand;
  	background-color:#ad11ad;
! 	color:#000000;
  	font-weight: bold;
  	border:1px solid #000000;
***************
*** 127,131 ****
  	}
  
! a.members {
  	font-weight: normal;
  	text-decoration: none;
--- 155,167 ----
  	}
  
! .little {
! 	font-weight: normal;
! 	font-size:10pt;
! 	padding:0px 0px 0px 0px;
! 	text-decoration: none;
! 	line-height:100%;
! 	}
! 
! .members {
  	font-weight: normal;
  	text-decoration: none;
***************
*** 135,139 ****
  	line-height:200%;
  	}
! a.members:hover {
  	background-color: #86c268;
  	border:1px solid #000000;
--- 171,175 ----
  	line-height:200%;
  	}
! .members:hover {
  	background-color: #86c268;
  	border:1px solid #000000;
***************
*** 144,148 ****
  	}
  
! a.acquisition {
  	font-weight: normal;
  	text-decoration: none;
--- 180,200 ----
  	}
  
! a.authority {
! 	font-weight: normal;
! 	text-decoration: none;
! 	cursor: hand;
! 	color:#777777;
! 	font-weight: bold;
! 	line-height:200%;
! 	}
! a.authority:hover {
! 	background-color: #6b7cbe;
! 	border:1px solid #000000;
! 	color: #000000;
! 	text-decoration: none;
! 	font-weight: bold;
! 	}
! 
! .acquisition {
  	font-weight: normal;
  	text-decoration: none;
***************
*** 152,156 ****
  	line-height:200%;
  	}
! a.acquisition:hover {
  	background-color: #ffdf61;
  	border:1px solid #000000;
--- 204,208 ----
  	line-height:200%;
  	}
! .acquisition:hover {
  	background-color: #ffdf61;
  	border:1px solid #000000;
***************
*** 169,172 ****
--- 221,225 ----
  	line-height:200%;
  	}
+ 
  a.reports:hover {
  	background-color: #6b7cbe;
***************
*** 178,182 ****
  	}
  
! a.circulation {
  	font-weight: normal;
  	text-decoration: none;
--- 231,235 ----
  	}
  
! .circulation {
  	font-weight: normal;
  	text-decoration: none;
***************
*** 186,190 ****
  	line-height:200%;
  	}
! a.circulation:hover {
  	background-color: #be6170;
  	border:1px solid #000000;
--- 239,243 ----
  	line-height:200%;
  	}
! .circulation:hover {
  	background-color: #be6170;
  	border:1px solid #000000;
***************
*** 262,263 ****
--- 315,323 ----
  	padding:0px;
  }
+ 
+ #bloc25, .bloc25 {
+ 	float:left;
+ 	border:1px solid #000000;
+ 	margin:0px;
+ 	padding:0px;
+ }




From hdl at users.sourceforge.net  Thu Jun 16 17:06:26 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 16 Jun 2005 08:06:26 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en intranet-main.tmpl,1.25,1.25.2.1
Message-ID: <E1Divwo-0008Pg-1J@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	intranet-main.tmpl 
Log Message:
adding rapid links to pages inside

Index: intranet-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -C2 -r1.25 -r1.25.2.1
*** intranet-main.tmpl	20 Sep 2004 15:25:22 -0000	1.25
--- intranet-main.tmpl	16 Jun 2005 15:06:23 -0000	1.25.2.1
***************
*** 43,46 ****
--- 43,55 ----
  			layer.style.visibility = 'hidden';
  		}
+ 		function addauthority() {
+ 			X = document.forms["f"].authtype.value;
+ 			window.location="/cgi-bin/koha/authorities/authorities.pl?authtypecode="+X;
+ 		}
+ 		function searchauthority() {
+ 			X = document.forms["f"].authtype2.value;
+ 			Y = document.forms["f"].value.value;
+ 			window.location="/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&authtypecode="+X+"&value="+Y+"&marclist=&and_or=and&excluding=&operator=contains";
+ 		}
  	</script>
  	<script language="javascript" type="text/javascript">
***************
*** 115,126 ****
  			<h1 class="acquisition">Acquisitions</h1>
  			Order items, receive orders, set budgets...
  		</div>
  		<div id="Hint4" class="hint">
  			<h1 class="reports">Reports</h1>
  			All the system reports
  		</div>
  		<div id="Hint5" class="hint">
! 			<h1 class="reports">Authorities</h1>
  			Authorities management &amp; searches
  		</div>
  		<div id="Hint6" class="hint">
--- 124,204 ----
  			<h1 class="acquisition">Acquisitions</h1>
  			Order items, receive orders, set budgets...
+ 			<form action="/cgi-bin/koha/acqui/order.pl" method="post">
+ 			Supplier name : <input type="text"  size="25"   name="supplier">
+ 			<input type="submit" class="button acquisition" value="OK">
+ 			</form>
+ 			<p>or <a href="histsearch.pl" class="button acquisition">Search order history</a></p>
+ 			
  		</div>
  		<div id="Hint4" class="hint">
  			<h1 class="reports">Reports</h1>
  			All the system reports
+ 			<div id="bloc25">
+ 			<h2 class="reports">Stats</h2>
+ 			<ul>
+ 			<li>on catalogue
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/inventory.pl">Inventory/Stocktaking</a></p>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalogue by itemtype</a></p>
+ 			<li>on issues
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/stats.pl?time=yesterday">Till Reconcipation:</a> Daily Report (yesterday)</p>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/stats.pl?time=today">Till Reconcipation:</a> Daily Report (today)</p>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/overdue.pl">Overdue items</a></p>
+ 			</ul>
+ 			</div>
+ 			<div id="bloc25">
+ 			<h2 class="reports">Stat wizards</h2>
+ 			<table>
+ 			<tr>
+ 			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions</a></td>
+ 			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/borrowers_stats.pl">Borrowers</a></td>
+ 			</tr>
+ 			<tr>
+ 			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/catalogue_stats.pl">Catalogue</a></td>
+ 			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/issues_stats.pl">Circulation</a></td>
+ 			</tr>
+ 			</table>
+ 			</div>
+ 			<div id="bloc25">
+ 			<h2 class="reports">Top Lists</h2>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/bor_issues_top.pl">Most issuing Borrowers</a></p>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/cat_issues_top.pl">Most issued items</a></p>
+ 			</div>
  		</div>
+ 		
  		<div id="Hint5" class="hint">
! 			<h1 class="authority">Authorities</h1>
  			Authorities management &amp; searches
+ 			<form name="f" >
+ 				<h2 >
+ 					<select name="authtype">
+ 					<!-- TMPL_LOOP NAME="authtypesloop" -->
+ 						<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
+ 							<!-- TMPL_VAR NAME="authtypetext" -->
+ 						</option>
+ 					<!-- /TMPL_LOOP -->
+ 					</select>
+ 					<a href="javascript:addauthority()" class="authority">Add Authority</a>
+ 				</h2>
+ 				<h2>Search 
+ 				<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
+ 				in
+ 					<select name="authtype2">
+ 					<!-- TMPL_LOOP NAME="authtypesloop" -->
+ 						<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
+ 							<!-- TMPL_VAR NAME="authtypetext" -->
+ 						</option>
+ 					<!-- /TMPL_LOOP -->
+ 					</select>
+ 				</h2>
+ 				<input type="hidden" name="marclist" value="">
+ 				<input type="hidden" name="and_or" value="and">
+ 				<input type="hidden" name="excluding" value="">
+ 				<input type="hidden" name="operator" value="contains">
+ 				<input type="hidden" name="op" value="do_search">
+ 				<img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0">
+ 				<a href="javascript:searchauthority()" class="authority">
+ 					Search
+ 				</a>
+ 			</form>
  		</div>
  		<div id="Hint6" class="hint">
***************
*** 133,136 ****
--- 211,230 ----
  			<h1 class="circulation">Circulation</h1>
  			Work at the front desk on Issues and returns using only a barcode reader and a mouse
+ 				<h2 class="circulation">
+ 					Issue
+ 				</h2>
+ 				<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+ 					<p>Enter borrower card number or partial last name <input name="findborrower">
+ 					<input type="submit" value="OK" class="button circulation"></p>
+ 				</form>
+ 				<h2 class="circulation">
+ 					Return
+ 				</h2>
+ 				<form method="post" action="/cgi-bin/koha/circ/returns.pl">
+ 				<p>Enter Book Barcode</p>
+ 				<label class="label20">Item Barcode:</label><input name="barcode" size="10">
+ 				<input type="submit" value="OK" class="button circulation">
+ 				</form>
+ 
  		</div>
  <!-- MAIN MENU -->




From hdl at users.sourceforge.net  Thu Jun 16 17:06:26 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 16 Jun 2005 08:06:26 -0700
Subject: [Koha-cvs] CVS: koha mainpage.pl,1.9,1.9.2.1
Message-ID: <E1Divwo-0008Pi-2E@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32277

Modified Files:
      Tag: rel_2_2
	mainpage.pl 
Log Message:
adding rapid links to pages inside

Index: mainpage.pl
===================================================================
RCS file: /cvsroot/koha/koha/mainpage.pl,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -r1.9 -r1.9.2.1
*** mainpage.pl	22 Dec 2003 14:54:53 -0000	1.9
--- mainpage.pl	16 Jun 2005 15:06:23 -0000	1.9.2.1
***************
*** 8,13 ****
--- 8,24 ----
  use CGI;
  use C4::Auth;
+ use C4::AuthoritiesMarc;
+ use C4::Koha;
  
  my $query = new CGI;
+ my $authtypes = getauthtypes;
+ my @authtypesloop;
+ foreach my $thisauthtype (sort { $authtypes->{$a} <=> $authtypes->{$b} } keys %$authtypes) {
+ 	my %row =(value => $thisauthtype,
+ 				authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
+ 			);
+ 	push @authtypesloop, \%row;
+ }
+ 
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "intranet-main.tmpl",
***************
*** 25,28 ****
--- 36,40 ----
  my $marc_p = C4::Context->boolean_preference("marc");
  $template->param(NOTMARC => !$marc_p);
+ $template->param(authtypesloop => \@authtypesloop);
  
  output_html_with_http_headers $query, $cookie, $template->output;




From tipaul at users.sourceforge.net  Thu Jun 16 17:35:29 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:35:29 -0700
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.6.2.8,1.6.2.9
Message-ID: <E1DiwOv-0003tX-Pz@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14962/C4

Modified Files:
      Tag: rel_2_2
	Bull.pm 
Log Message:
formating dates to user format

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.6.2.8
retrieving revision 1.6.2.9
diff -C2 -r1.6.2.8 -r1.6.2.9
*** Bull.pm	6 Jun 2005 16:00:56 -0000	1.6.2.8
--- Bull.pm	16 Jun 2005 15:35:27 -0000	1.6.2.9
***************
*** 102,105 ****
--- 102,106 ----
  	return @issuelist;
  }
+ 
  sub newsubscription {
  	my ($auser,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber,
***************
*** 141,144 ****
--- 142,146 ----
  	return $subscriptionid;
  }
+ 
  sub getsubscription {
  	my ($subscriptionid) = @_;
***************
*** 179,185 ****
--- 181,194 ----
  	while (my $subs = $sth->fetchrow_hashref) {
  		$subs->{startdate} = format_date($subs->{startdate});
+ 		$subs->{histstartdate} = format_date($subs->{histstartdate});
  		$subs->{opacnote} =~ s/\n/\<br\/\>/g;
  		$subs->{missinglist} =~ s/\n/\<br\/\>/g;
  		$subs->{recievedlist} =~ s/\n/\<br\/\>/g;
+ 		$subs->{"periodicity".$subs->{periodicity}} = 1;
+ 		if ($subs->{enddate} eq '0000-00-00') {
+ 			$subs->{enddate}='';
+ 		} else {
+ 			$subs->{enddate} = format_date($subs->{enddate});
+ 		}
  		push @res,$subs;
  	}
***************
*** 215,219 ****
  			my $temp=$res[scalar(@res)-1]->{'serials'};
  			push @$temp,
! 				{'planneddate' => $subs->{'planneddate'}, 
  				'serialseq' => $subs->{'serialseq'},
  				'status1' => $subs->{'status'}==1,
--- 224,228 ----
  			my $temp=$res[scalar(@res)-1]->{'serials'};
  			push @$temp,
! 				{'planneddate' => format_date($subs->{'planneddate'}), 
  				'serialseq' => $subs->{'serialseq'},
  				'status1' => $subs->{'status'}==1,
***************
*** 225,234 ****
  			$first=1 if (not $year);
  			$year= $subs->{'year'};
! 			$startdate= $subs->{'startdate'};
  			$aqbooksellername= $subs->{'aqbooksellername'};
  			$bibliotitle= $subs->{'bibliotitle'};
  			my @temp;
  			push @temp,
! 				{'planneddate' => $subs->{'planneddate'}, 
  				'serialseq' => $subs->{'serialseq'},
  				'status1' => $subs->{'status'}==1,
--- 234,243 ----
  			$first=1 if (not $year);
  			$year= $subs->{'year'};
! 			$startdate= format_date($subs->{'startdate'});
  			$aqbooksellername= $subs->{'aqbooksellername'};
  			$bibliotitle= $subs->{'bibliotitle'};
  			my @temp;
  			push @temp,
! 				{'planneddate' => format_date($subs->{'planneddate'}), 
  				'serialseq' => $subs->{'serialseq'},
  				'status1' => $subs->{'status'}==1,




From tipaul at users.sourceforge.net  Thu Jun 16 17:37:18 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:37:18 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/circ - New directory
Message-ID: <E1DiwQg-000401-Nd@sc8-pr-cvs1.sourceforge.net>

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

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/help/circ added to the repository
--> Using per-directory sticky tag `rel_2_2'





From tipaul at users.sourceforge.net  Thu Jun 16 17:37:50 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:37:50 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/export - New directory
Message-ID: <E1DiwRC-00041b-Mg@sc8-pr-cvs1.sourceforge.net>

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

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/help/export added to the repository
--> Using per-directory sticky tag `rel_2_2'





From tipaul at users.sourceforge.net  Thu Jun 16 17:38:07 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:38:07 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/import - New directory
Message-ID: <E1DiwRT-00042G-9R@sc8-pr-cvs1.sourceforge.net>

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

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/help/import added to the repository
--> Using per-directory sticky tag `rel_2_2'





From tipaul at users.sourceforge.net  Thu Jun 16 17:38:38 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:38:38 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/export marc.tmpl,NONE,1.1.2.1
Message-ID: <E1DiwRy-00045a-Pw@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
      Tag: rel_2_2
	marc.tmpl 
Log Message:
online help (missing files or cvs problem on my computer)

--- NEW FILE ---
<!-- TMPL_INCLUDE name="help-top.inc" -->
<h1>iso 2709 export</h1>
<p>This is a tool to export your bibliographic records in standard MARC communications format (ISO2709). It exports only the basic bibliographic information with no holdings information other than any holdings information originally loaded into Koha using the bulkmarcimport tool.</p>

<p>You are asked to provide a starting biblio record number and an ending number for the export. If you want to export all of your records, leave the start and end numbers blank.</p>

<p>Records are downloaded to the workstation that requests the export and are saved in a file called "marc.pl."</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->




From tipaul at users.sourceforge.net  Thu Jun 16 17:38:38 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:38:38 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/circ circulation.tmpl,NONE,1.1.2.1 returns.tmpl,NONE,1.1.2.1
Message-ID: <E1DiwRy-00045W-NZ@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
      Tag: rel_2_2
	circulation.tmpl returns.tmpl 
Log Message:
online help (missing files or cvs problem on my computer)

--- NEW FILE ---
<!-- TMPL_INCLUDE name="help-top.inc" -->
<h1>Circulation / Issues help</h1>
<p>Before you begin, it is very important that you take note of the branch and printer settings and change them if necessary. This should only have to be done the first time you do circulations from a workstation, after which a browser cookie will remember the correct settings. If you do circulations under the wrong branch settings (for example, your branch setting is "Suburb," but you are actually working at the "Downtown" branch), then Koha will reset the location of all items scanned to the incorrect branch (Suburb) and the statistical reports will credit all circulations to the wrong branch.</p>

<p>Now start by scanning the borrower's barcode or type in their name to find their account. Once Koha has found the borrower, you will see a new form for scanning or typing the item's identifying number (usually a barcode).</p>

<p>If you wish to have this item and all subsequent items in this transaction to have a date due other than the default date due defined for the item type, use the "Sticky Due Date" to set the date due before scanning the first item.</p>

<p>If the issuing has nothing specific, it will be done immediatly and shown (with other borrower issues) at bottom.</p>
<p>If the issuing is problematic, then another box will appear (in <b>RED</b>) and ask for confirmation if possible. If the issuing is really impossible (for example, the barcode does not exist), then you can't confirm the issue. If it is possible but has something that needs confirmation (like item being issued to another borrower, or borrower having issued too many items), then you must confirm the issuing. If the confirmation means another operation (if item is issued to another borrower, then issuing also means make the return), then it's also done</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE name="help-top.inc" -->
<h1>Circulation / Returns help</h1>
<p>Before you begin, it is very important that you take note of the branch and printer settings and change them if necessary. This should only have to be done the first time you do circulations (or returns) from a workstation, after which a browser cookie will remember the correct settings. If you do returns under the wrong branch settings (for example, your branch setting is "Suburb," but you are actually working at the "Downtown" branch), then Koha will reset the location of all items scanned to the incorrect branch (Suburb).</p>

<p>Now simply scan or type the returned item's identifying number (usually a barcode) in the box provided.</p>

<p>The return is done and if there is something specific for the item or the borrower (like borrower having debts), a red box will warn you</p>
<p>If the item has been requested by someone else, you also are asked to validate the request. If you confirm it, item is changed to a "waiting" status and you should warn the borrower that the item is available</p>
<p>If the item is requested by someone in anothe branch, then you must validate the transfer too</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->




From tipaul at users.sourceforge.net  Thu Jun 16 17:38:38 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:38:38 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/import breeding.tmpl,NONE,1.1.2.1
Message-ID: <E1DiwRy-00045f-Sz@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
      Tag: rel_2_2
	breeding.tmpl 
Log Message:
online help (missing files or cvs problem on my computer)

--- NEW FILE ---
<!-- TMPL_INCLUDE name="help-top.inc" -->
<h1>Import iso2709 file</h1>
<p>This is one of the screens you will see frequently if you are starting from scratch.</p>
<p>It is useful to import a bunch of iso2709 biblios that can be used later for a quick cataloguing</p>
<p>First, you need to browse your computer to find the MARC record that you grabbed for your item. Click on</p>
<p>Choose File to browse.</p>
<p>If you aren't sure if you've already imported a record, keep the radio button set to</p>
<p>Ignore this one, keep the existing one.</p>
<p>You can "name" the import to help you when you need to choose between more than 1 imported biblio (or just want to keep trace on where the biblios comes from)</p>
<p>You can also change char encoding between MARC21 and UNIMARC</p>
<p>You don't need to actually name every import, so you don't need to fill in this box if you don't want to. It is useful for telling imports apart if you've more than one of the same record.</p>
<p><b>IMPORTANT : This tool is NOT intended to import iso2709 in your ACTIVE DB. If you need to migrate datas from another ILS, then you must consider $kohaInstall/scripts/misc/bulkmarcimport.pl</b></p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->




From tipaul at users.sourceforge.net  Thu Jun 16 17:39:53 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:39:53 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/images filefind.png,NONE,1.1.2.1
Message-ID: <E1DiwTB-0004GI-HD@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
      Tag: rel_2_2
	filefind.png 
Log Message:
adding the little glass to CVS

--- NEW FILE ---
‰PNG



T}ø¨¤ì€
ùÛºsôÙÇŽ~Ÿé馧×&B%"tttpñâEöïßÀ׌¡×.òQž\PÌåLmB(æZè˯§¯»�öÅEŽýà‡œ;wŽ“'ÊÏ~òct:Óô×’W,ÝùóçI¥RÌÍÍ1::ÊŽ¯ràÀ7xqp_î	­ÚXL¥1$$›ÒÝ)ËÅ?¼ÍÙ³LOÏðúë{yÿ—¿
áår9wãÆ
J¥sssÜ»w�¹¹9–ª‹|ò¯Û«¶Ôøø8ccc+³tÃÃË_Â÷}vîÜÅáÇ)‹O­„
ÃÏóð}Ÿžž
œ(¬(¬¤qQ¥x˜]�`%DG\ùàòª*•J
`¥†�jØ(ÄŠ©ÃDx6áÅ©X°6Ùó¬<
 
122ÂìgŸ¯
¡¬µ	@T�NÂd‡¸åYjØúþòº	ó®^½êFFF˜¯
ˆ;wîÐÛÛë



From tipaul at users.sourceforge.net  Thu Jun 16 17:41:12 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:41:12 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac-top.inc,1.8.2.5,1.8.2.6
Message-ID: <E1DiwUS-0004VF-7Z@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-top.inc 
Log Message:
changing popup size

Index: opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc,v
retrieving revision 1.8.2.5
retrieving revision 1.8.2.6
diff -C2 -r1.8.2.5 -r1.8.2.6
*** opac-top.inc	6 Jun 2005 14:07:27 -0000	1.8.2.5
--- opac-top.inc	16 Jun 2005 15:41:09 -0000	1.8.2.6
***************
*** 25,29 ****
  	var MSG_NO_RECORD_ADDED = _("No biblio added");
  	function Dopop(link) {
! 		newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
  	}
  	</script>
--- 25,29 ----
  	var MSG_NO_RECORD_ADDED = _("No biblio added");
  	function Dopop(link) {
! 		newin=window.open(link,'popup','width=700,height=500,toolbar=false,scrollbars=yes');
  	}
  	</script>




From tipaul at users.sourceforge.net  Thu Jun 16 17:40:17 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:40:17 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.17.2.6,1.17.2.7
Message-ID: <E1DiwTZ-0004IG-VB@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac.css 
Log Message:
minor changes in css for better IE compliance

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.17.2.6
retrieving revision 1.17.2.7
diff -C2 -r1.17.2.6 -r1.17.2.7
*** opac.css	6 Jun 2005 14:06:14 -0000	1.17.2.6
--- opac.css	16 Jun 2005 15:40:15 -0000	1.17.2.7
***************
*** 169,173 ****
  	vertical-align:top;
  	position:static;
- /*	position:relative;*/
  	display:table-cell;
  }
--- 169,172 ----
***************
*** 379,405 ****
  /* for SubscritptionHistory view  */
  div.tabsubs {
! 	width:25px;
! 	margin-left:10px;
! 	margin-top:100px;
  }
  
  div.tabsubs a {
- 	display:block;
  	font-size: small;
  	border: thin solid black;
  	margin-right: 2px;
! 	padding: 15px 30px;
! 	-moz-border-radius: 5px 0px 0px 5px;
  }
  
  div.tabsub {
  	background-color: #ACE6E6;
  	visibility:hidden;
! 	margin-left:72px;
! 	margin-top:100px;
! 	margin-right:10%;
  }
  
- 
  /* for MARC view  */
  div.tabs {
--- 378,402 ----
  /* for SubscritptionHistory view  */
  div.tabsubs {
! 	margin-left:150px;
! 	position:inline;
  }
  
  div.tabsubs a {
  	font-size: small;
  	border: thin solid black;
  	margin-right: 2px;
! 	padding: 10px 10px;
! 	-moz-border-radius: 5px 5px 0px 0px;
  }
  
  div.tabsub {
  	background-color: #ACE6E6;
+ 	position:absolute;
  	visibility:hidden;
! 	margin-left:150px;
! 	margin-top:0px;
! border:4px;
  }
  
  /* for MARC view  */
  div.tabs {




From tipaul at users.sourceforge.net  Thu Jun 16 17:42:12 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:42:12 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-full-serial-issues.tmpl,1.1.2.3,1.1.2.4
Message-ID: <E1DiwVQ-0004b0-7e@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-full-serial-issues.tmpl 
Log Message:
* css change for better IE compliance
* adding switch from complete to compact history view

Index: opac-full-serial-issues.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/Attic/opac-full-serial-issues.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** opac-full-serial-issues.tmpl	6 Jun 2005 12:16:06 -0000	1.1.2.3
--- opac-full-serial-issues.tmpl	16 Jun 2005 15:42:03 -0000	1.1.2.4
***************
*** 3,7 ****
  
  <!-- TMPL_UNLESS name="popup" -->
- <div id="mainbloc">
  	<h1 class="catalogue">Subscription information for biblio #<!-- TMPL_VAR NAME="biblionumber" --> with title : <!-- TMPL_VAR name="bibliotitle" --></h1>
  	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Back to biblio</a>
--- 3,6 ----
***************
*** 10,16 ****
  	<!-- TMPL_LOOP NAME="years" -->
  		<!-- TMPL_IF NAME="year" -->
! 			<div id="link<!--TMPL_VAR Name="year" -->" ><a href="javascript:active(<!-- TMPL_VAR NAME="year" -->)"><!-- TMPL_VAR NAME="year" --></a></div>
  		<!-- /TMPL_IF -->
  	<!-- /TMPL_LOOP -->
  	</div>
  
--- 9,16 ----
  	<!-- TMPL_LOOP NAME="years" -->
  		<!-- TMPL_IF NAME="year" -->
! 			<a  class="tabsubs" href="javascript:active(<!-- TMPL_VAR NAME="year" -->)"><!-- TMPL_VAR NAME="year" --></a>
  		<!-- /TMPL_IF -->
  	<!-- /TMPL_LOOP -->
+ 	<a class="tabsubs" href="opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->&selectview=small">Compact view</a>
  	</div>
  
***************
*** 45,50 ****
  	</div>
  	<!--/TMPL_LOOP -->
- </div>
  <script language="JavaScript" type="text/javascript">
  function active(numlayer)
  {
--- 45,50 ----
  	</div>
  	<!--/TMPL_LOOP -->
  <script language="JavaScript" type="text/javascript">
+ active(<!-- TMPL_VAR name="yearmin" -->);
  function active(numlayer)
  {




From tipaul at users.sourceforge.net  Thu Jun 16 17:43:46 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:43:46 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-searchresults.tmpl,1.20.2.4,1.20.2.5
Message-ID: <E1DiwWw-0004ud-E1@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-searchresults.tmpl 
Log Message:
changing some html (minor)

Index: opac-searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl,v
retrieving revision 1.20.2.4
retrieving revision 1.20.2.5
diff -C2 -r1.20.2.4 -r1.20.2.5
*** opac-searchresults.tmpl	6 Jun 2005 14:11:47 -0000	1.20.2.4
--- opac-searchresults.tmpl	16 Jun 2005 15:43:44 -0000	1.20.2.5
***************
*** 54,69 ****
  				<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 -->
--- 54,68 ----
  				<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 -->




From tipaul at users.sourceforge.net  Thu Jun 16 17:44:34 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:44:34 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-serial-issues.tmpl,1.2.2.4,1.2.2.5
Message-ID: <E1DiwXi-0004yS-0k@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-serial-issues.tmpl 
Log Message:
proofread & better english & better look

Index: opac-serial-issues.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -C2 -r1.2.2.4 -r1.2.2.5
*** opac-serial-issues.tmpl	6 Jun 2005 14:12:14 -0000	1.2.2.4
--- opac-serial-issues.tmpl	16 Jun 2005 15:44:31 -0000	1.2.2.5
***************
*** 3,11 ****
  <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>
  	<!-- 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" -->
--- 3,13 ----
  <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" -->
***************
*** 43,70 ****
  		<!-- /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 -->
***************
*** 72,77 ****
  			<!-- TMPL_IF name="monthlength" --><!-- TMPL_VAR name="monthlength" --> months<!-- /TMPL_IF -->
  			</b>
- 		since <b><!-- TMPl_VAR name="startdate" --></b>
  		</p>
  	<!--TMPL_UNLESS Name=fullinfo -->
  		<p><!-- TMPL_VAR name="notes" --></p>
--- 71,77 ----
  			<!-- 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>




From tipaul at users.sourceforge.net  Thu Jun 16 17:46:01 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:46:01 -0700
Subject: [Koha-cvs] CVS: koha/misc/migration_tools check_marc_definition.pl,1.1.2.2,1.1.2.3
Message-ID: <E1DiwZ7-00058n-PK@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/migration_tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19752/misc/migration_tools

Modified Files:
      Tag: rel_2_2
	check_marc_definition.pl 
Log Message:
improving script with a new parameter to show all the subfields usage.

Index: check_marc_definition.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/migration_tools/check_marc_definition.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** check_marc_definition.pl	7 Apr 2005 12:00:57 -0000	1.1.2.2
--- check_marc_definition.pl	16 Jun 2005 15:45:59 -0000	1.1.2.3
***************
*** 15,22 ****
  use Getopt::Long;
  my ( $input_marc_file, $number) = ('',0);
! my ($version,$confirm);
  GetOptions(
      'h' => \$version,
      'c' => \$confirm,
  );
  
--- 15,23 ----
  use Getopt::Long;
  my ( $input_marc_file, $number) = ('',0);
! my ($version,$confirm,$all);
  GetOptions(
      'h' => \$version,
      'c' => \$confirm,
+ 	'a' => \$all,
  );
  
***************
*** 26,29 ****
--- 27,32 ----
  It show all fields/subfields that are in the MARC DB but NOT in any tab (= fields used but not visible) Usually, this means you made an error in your MARC editor. Sometimes, this is something normal.
  
+ options
+ \t-a : will show all subfields usages, not only subfields in tab ignore that are used.
  Enter $0 -c to run this script (the -c being here only to "confirm"
  EOF
***************
*** 38,47 ****
  my %tags;
  my $sth2 = $dbh->prepare("select tab,liblibrarian,kohafield from marc_subfield_structure where tagfield=? and tagsubfield=? and frameworkcode=?");
  while (my ($total,$tag,$subfield,$frameworkcode) = $sth->fetchrow) {
  	$sth2->execute($tag,$subfield,$frameworkcode);
  	$tags{$frameworkcode." / ".$tag." / ".$subfield} ++;
  	my ($tab,$liblibrarian,$kohafield) = $sth2->fetchrow;
! 	if ($tab eq -1 && $kohafield ne "biblio.biblionumber" && $kohafield ne "biblioitems.biblioitemnumber" && $kohafield ne "items.itemnumber") {
! 		print "Tab ignore for framework $frameworkcode, $tag\$$subfield - $liblibrarian (used $total times)\n";
  	}
  }
--- 41,57 ----
  my %tags;
  my $sth2 = $dbh->prepare("select tab,liblibrarian,kohafield from marc_subfield_structure where tagfield=? and tagsubfield=? and frameworkcode=?");
+ if ($all) {
+ 	print "framework|tag|subfield|value|used|tab\n";
+ }
  while (my ($total,$tag,$subfield,$frameworkcode) = $sth->fetchrow) {
  	$sth2->execute($tag,$subfield,$frameworkcode);
  	$tags{$frameworkcode." / ".$tag." / ".$subfield} ++;
  	my ($tab,$liblibrarian,$kohafield) = $sth2->fetchrow;
! 	if ($all) {
! 		print $frameworkcode."|".$tag.'|$'.$subfield."|".$liblibrarian."|".$total."|".$tab."\n";
! 	} else {
! 		if ($tab eq -1 && $kohafield ne "biblio.biblionumber" && $kohafield ne "biblioitems.biblioitemnumber" && $kohafield ne "items.itemnumber") {
! 			print "Tab ignore for framework $frameworkcode, $tag\$$subfield - $liblibrarian (used $total times)\n";
! 		}
  	}
  }




From tipaul at users.sourceforge.net  Thu Jun 16 17:47:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:47:54 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-serial-issues.pl,1.1.2.6,1.1.2.7
Message-ID: <E1Diwaw-0005Qk-MA@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20840/opac

Modified Files:
      Tag: rel_2_2
	opac-serial-issues.pl 
Log Message:
switching to complete or standard history view

Index: opac-serial-issues.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-serial-issues.pl,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -r1.1.2.6 -r1.1.2.7
*** opac-serial-issues.pl	3 Jun 2005 12:53:08 -0000	1.1.2.6
--- opac-serial-issues.pl	16 Jun 2005 15:47:52 -0000	1.1.2.7
***************
*** 15,20 ****
  my $op = $query->param('op');
  my $dbh = C4::Context->dbh;
! my $selectview = C4::Context->preference("SubscriptionHistory");
! warn "selectview : ".$selectview;
  
  my $sth;
--- 15,20 ----
  my $op = $query->param('op');
  my $dbh = C4::Context->dbh;
! my $selectview = $query->param('selectview');
! $selectview = C4::Context->preference("SubscriptionHistory") unless $selectview;
  
  my $sth;
***************
*** 23,77 ****
  my $biblionumber = $query->param('biblionumber');
  if ($selectview eq "full"){
! my $subscriptions = get_full_subscription_list_from_biblionumber($biblionumber);
! 
! my $title = $subscriptions->[0]{bibliotitle};
! warn "title ".$title;
! my $yearmin=$subscriptions->[0]{year};
! warn "yearmin ".$yearmin;
! my $yearmax=$subscriptions->[scalar(@$subscriptions)-1]{year};
! warn "yearmax ".$yearmax;
! 
! 
! ($template, $loggedinuser, $cookie)
! = get_template_and_user({template_name => "opac-full-serial-issues.tmpl",
! 				query => $query,
! 				type => "opac",
! 				authnotrequired => 1,
! 				debug => 1,
! 				});
! 
! # replace CR by <br> in librarian note
! # $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
! 
! $template->param(
! 	biblionumber => $query->param('biblionumber'),
! 	years => $subscriptions,
! 	yearmin => $yearmin,
! 	yearmax =>$yearmax,
! 	bibliotitle => $title,
! 	suggestion => C4::Context->preference("suggestion"),
! 	virtualshelves => C4::Context->preference("virtualshelves"),
! 	);
  
  } else {
! my $subscriptions = get_subscription_list_from_biblionumber($biblionumber);
! 
! ($template, $loggedinuser, $cookie)
! = get_template_and_user({template_name => "opac-serial-issues.tmpl",
! 				query => $query,
! 				type => "opac",
! 				authnotrequired => 1,
! 				debug => 1,
! 				});
! 
! # replace CR by <br> in librarian note
! # $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
! 
! $template->param(
! 	biblionumber => $query->param('biblionumber'),
! 	subscription_LOOP => $subscriptions,
! 	suggestion => C4::Context->preference("suggestion"),
! 	virtualshelves => C4::Context->preference("virtualshelves"),
! 	);
  }
  output_html_with_http_headers $query, $cookie, $template->output;
--- 23,77 ----
  my $biblionumber = $query->param('biblionumber');
  if ($selectview eq "full"){
! 	my $subscriptions = get_full_subscription_list_from_biblionumber($biblionumber);
! 	
! 	my $title = $subscriptions->[0]{bibliotitle};
! # 	warn "title ".$title;
! 	my $yearmin=$subscriptions->[0]{year};
! # 	warn "yearmin ".$yearmin;
! 	my $yearmax=$subscriptions->[scalar(@$subscriptions)-1]{year};
! # 	warn "yearmax ".$yearmax;
! 	
! 	
! 	($template, $loggedinuser, $cookie)
! 	= get_template_and_user({template_name => "opac-full-serial-issues.tmpl",
! 					query => $query,
! 					type => "opac",
! 					authnotrequired => 1,
! 					debug => 1,
! 					});
! 	
! 	# replace CR by <br> in librarian note
! 	# $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
! 	
! 	$template->param(
! 		biblionumber => $query->param('biblionumber'),
! 		years => $subscriptions,
! 		yearmin => $yearmin,
! 		yearmax =>$yearmax,
! 		bibliotitle => $title,
! 		suggestion => C4::Context->preference("suggestion"),
! 		virtualshelves => C4::Context->preference("virtualshelves"),
! 		);
  
  } else {
! 	my $subscriptions = get_subscription_list_from_biblionumber($biblionumber);
! 	
! 	($template, $loggedinuser, $cookie)
! 	= get_template_and_user({template_name => "opac-serial-issues.tmpl",
! 					query => $query,
! 					type => "opac",
! 					authnotrequired => 1,
! 					debug => 1,
! 					});
! 	
! 	# replace CR by <br> in librarian note
! 	# $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
! 	
! 	$template->param(
! 		biblionumber => $query->param('biblionumber'),
! 		subscription_LOOP => $subscriptions,
! 		suggestion => C4::Context->preference("suggestion"),
! 		virtualshelves => C4::Context->preference("virtualshelves"),
! 		);
  }
  output_html_with_http_headers $query, $cookie, $template->output;




From tipaul at users.sourceforge.net  Thu Jun 16 17:49:09 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:49:09 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-user.pl,1.14.2.2,1.14.2.3
Message-ID: <E1Diwc9-0005cu-3i@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21579/opac

Modified Files:
      Tag: rel_2_2
	opac-user.pl 
Log Message:
adding opac text messaging to login page.

Index: opac-user.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-user.pl,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -C2 -r1.14.2.2 -r1.14.2.3
*** opac-user.pl	25 Mar 2005 17:04:28 -0000	1.14.2.2
--- opac-user.pl	16 Jun 2005 15:49:05 -0000	1.14.2.3
***************
*** 137,143 ****
  $template->param(WAITING => \@waiting);
  $template->param(waiting_count => $wcount,
! 			     LibraryName => C4::Context->preference("LibraryName"),
! 					suggestion => C4::Context->preference("suggestion"),
! 					virtualshelves => C4::Context->preference("virtualshelves"),
  );
  
--- 137,144 ----
  $template->param(WAITING => \@waiting);
  $template->param(waiting_count => $wcount,
! 				LibraryName => C4::Context->preference("LibraryName"),
! 				suggestion => C4::Context->preference("suggestion"),
! 				virtualshelves => C4::Context->preference("virtualshelves"),
! 				textmessaging => $borr->{textmessaging},
  );
  




From tipaul at users.sourceforge.net  Thu Jun 16 17:49:42 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:49:42 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_123i.pl,NONE,1.1.2.2 unimarc_field_123j.pl,NONE,1.1.2.2 unimarc_field_225a.pl,1.8.2.2,1.8.2.3
Message-ID: <E1Diwcg-0005fE-NE@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21727/value_builder

Modified Files:
      Tag: rel_2_2
	unimarc_field_225a.pl 
Added Files:
      Tag: rel_2_2
	unimarc_field_123i.pl unimarc_field_123j.pl 
Log Message:
missing plugins

--- NEW FILE ---
#!/usr/bin/perl

# $Id: unimarc_field_123i.pl,v 1.1.2.2 2005/06/16 15:49:40 tipaul Exp $

# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use C4::Auth;
use CGI;
use C4::Context;
use HTML::Template;
use C4::Search;
use C4::Output;

=head1

plugin_parameters : other parameters added when the plugin is called by the dopop function

=cut
sub plugin_parameters {
my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
return "";
}

sub plugin_javascript {
my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
my $function_name= "123i".(int(rand(100000))+1);
my $res="
<script>
function Focus$function_name(subfield_managed) {
return 1;
}

function Blur$function_name(subfield_managed) {
	return 1;
}

function Clic$function_name(i) {
	defaultvalue=document.forms[0].field_value[i].value;
	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123i.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123i\",'width=800,height=400,toolbar=false,scrollbars=yes');

}
</script>
";

return ($function_name,$res);
}
sub plugin {
my ($input) = @_;
	my %env;

#	my $input = new CGI;
	my $index= $input->param('index');
	my $result= $input->param('result');


	my $dbh = C4::Context->dbh;

my ($template, $loggedinuser, $cookie)
    = get_template_and_user({template_name => "value_builder/unimarc_field_123i.tmpl",
			     query => $input,
			     type => "intranet",
			     authnotrequired => 0,
			     flagsrequired => {parameters => 1},
			     debug => 1,
			     });
	my $f1 = substr($result,0,1);
	my $f2 = substr($result,1,3);
	my $f3 = substr($result,4,2);
	my $f4 = substr($result,6,2);
	$template->param(index => $index,
			 "f1$f1" => $f1,
			 f2 => $f2,
			 f3 => $f3,
			 f4 => $f4);
	print $input->header(-cookie => $cookie),$template->output;
}

1;

--- NEW FILE ---
#!/usr/bin/perl

# $Id: unimarc_field_123j.pl,v 1.1.2.2 2005/06/16 15:49:40 tipaul Exp $

# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use C4::Auth;
use CGI;
use C4::Context;
use HTML::Template;
use C4::Search;
use C4::Output;

=head1

plugin_parameters : other parameters added when the plugin is called by the dopop function

=cut
sub plugin_parameters {
my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
return "";
}

sub plugin_javascript {
my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
my $function_name= "123j".(int(rand(100000))+1);
my $res="
<script>
function Focus$function_name(subfield_managed) {
return 1;
}

function Blur$function_name(subfield_managed) {
	return 1;
}

function Clic$function_name(i) {
	defaultvalue=document.forms[0].field_value[i].value;
	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123j.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123j\",'width=800,height=400,toolbar=false,scrollbars=yes');

}
</script>
";

return ($function_name,$res);
}
sub plugin {
my ($input) = @_;
	my %env;

#	my $input = new CGI;
	my $index= $input->param('index');
	my $result= $input->param('result');


	my $dbh = C4::Context->dbh;

my ($template, $loggedinuser, $cookie)
    = get_template_and_user({template_name => "value_builder/unimarc_field_123j.tmpl",
			     query => $input,
			     type => "intranet",
			     authnotrequired => 0,
			     flagsrequired => {parameters => 1},
			     debug => 1,
			     });
	my $f1 = substr($result,0,1);
	my $f2 = substr($result,1,3);
	my $f3 = substr($result,4,2);
	my $f4 = substr($result,6,2);
	$template->param(index => $index,
			 "f1$f1" => $f1,
			 f2 => $f2,
			 f3 => $f3,
			 f4 => $f4);
	print $input->header(-cookie => $cookie),$template->output;
}

1;





From tipaul at users.sourceforge.net  Thu Jun 16 17:51:07 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:51:07 -0700
Subject: [Koha-cvs] CVS: koha/z3950 processz3950queue,1.13.2.1,1.13.2.2
Message-ID: <E1Diwe3-0005mu-98@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/z3950
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22225/z3950

Modified Files:
      Tag: rel_2_2
	processz3950queue 
Log Message:
fix for UNIMARC BNF behaviour (now work as expected)

Index: processz3950queue
===================================================================
RCS file: /cvsroot/koha/koha/z3950/processz3950queue,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -C2 -r1.13.2.1 -r1.13.2.2
*** processz3950queue	30 Mar 2005 09:53:39 -0000	1.13.2.1
--- processz3950queue	16 Jun 2005 15:51:05 -0000	1.13.2.2
***************
*** 281,292 ****
  									for ($i=1; $i<=(($numresults<80) ? ($numresults) : (80)); $i++) {
  										my $rec=$rs->record($i);
!  										my $marcdata;
! 										# use render() or rawdata() depending on the type of the returned record
! 										if (ref($rec) eq "Net::Z3950::Record::USMARC") {
! 											$marcdata = $rec->rawdata();
! 										}
! 										if (ref($rec) eq "Net::Z3950::Record::UNIMARC") {
! 											$marcdata = $rec->rawdata();
! 										}
  										$globalencoding = ref($rec);
   										$result.=$marcdata;
--- 281,285 ----
  									for ($i=1; $i<=(($numresults<80) ? ($numresults) : (80)); $i++) {
  										my $rec=$rs->record($i);
!  										my $marcdata = $rec->rawdata();
  										$globalencoding = ref($rec);
   										$result.=$marcdata;




From tipaul at users.sourceforge.net  Thu Jun 16 17:50:24 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:50:24 -0700
Subject: [Koha-cvs] CVS: koha/z3950/server zed-koha-server.pl,1.4,1.4.2.1
Message-ID: <E1DiwdM-0005it-8P@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/z3950/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21986/z3950/server

Modified Files:
      Tag: rel_2_2
	zed-koha-server.pl 
Log Message:
bugfix in SQL query. Now the z3950 server works...

Index: zed-koha-server.pl
===================================================================
RCS file: /cvsroot/koha/koha/z3950/server/zed-koha-server.pl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** zed-koha-server.pl	3 Jun 2004 01:48:19 -0000	1.4
--- zed-koha-server.pl	16 Jun 2005 15:50:22 -0000	1.4.2.1
***************
*** 58,62 ****
  use C4::Biblio;
  use strict;
! my $dbh = C4::Context->dbh;
  my @bib_list;		## Stores the list of biblionumbers in a query 
  			## I should eventually move this to different scope
--- 58,62 ----
  use C4::Biblio;
  use strict;
! # my $dbh = C4::Context->dbh;
  my @bib_list;		## Stores the list of biblionumbers in a query 
  			## I should eventually move this to different scope
***************
*** 86,89 ****
--- 86,90 ----
  sub run_query {		## Run the query and store the biblionumbers: 
  	my ($sql_query, $query, $args) = @_;
+ 		my $dbh = C4::Context->dbh;
         	my $sth_get = $dbh->prepare("$sql_query");
  
***************
*** 145,149 ****
  		print "The query was:\n";        
  		print "$query\n";
! 		my $sql_query = "SELECT marc_biblio.bibid FROM marc_biblio RIGHT JOIN biblio ON marc_biblio.biblionumber = biblio.biblionumber WHERE biblio.isbn LIKE ?";
  		&run_query($sql_query, $query, $args);
  
--- 146,150 ----
  		print "The query was:\n";        
  		print "$query\n";
! 		my $sql_query = "SELECT marc_biblio.bibid FROM marc_biblio RIGHT JOIN biblioitems ON marc_biblio.biblionumber = biblioitems.biblionumber WHERE biblioitems.isbn LIKE ?";
  		&run_query($sql_query, $query, $args);
  
***************
*** 269,392 ****
          $offset -= 1;                   ## because $args->{OFFSET} 1 = record #1
          chomp (my $bibid = $bib_list[$offset]); ## Not sure about this
!                 ## print "the bibid is:$bibid\n";
!                 my $MARCRecord = &MARCgetbiblio($dbh,$bibid);
!                 my $recordstring=$MARCRecord->as_usmarc();
!                 ## print "here is my record: $recordstring\n";
! 
! 		## Troubleshooting:
! 		## use Data::Dumper;
! 		## Dumper $recordstring;
! 		## open (MARC, ">/root/marc.dump");
!                 ## print MARC "$recordstring";
! 		## close MARC;
! 		
! 		## Convert from 852/4 to 952:
! 		## 942a --> 852a  Organization code
! 		## 952b --> 852b  Home branch
! 		## 942k --> 852h  Classification
! 		## 952p --> 852p  Barcode
! 
! my $record = MARC::Record->new_from_usmarc($recordstring);
!     my @fields942 = $record->field('942');
!     my $field842 = $fields942[0];
! 	my ($field952, $sub852a, $sub852k, $sub852b, $sub852p, $sub852h);
!        
! 
! ## while ( my $record = $batch->next() ) {
!   ##  my @fields942 = $record->field('942');
!   ##  my $field842 = $fields942[0];
!   ##     #grab first 942 (only need one, they are same for all items)
!   ##  my $sub852a = ($field842->subfield('a') || '');
!   ##  my $sub852h = ($field842->subfield('k') || '');
! 
!   ##  my @fields952 = $record->field('952');
!   ##  foreach my $field952 (@fields952) {   #get all 952s
!   ##      my $sub852b = ($field952->subfield('b') || '');
!   ##      my $sub852p = ($field952->subfield('p') || '');
! 
! 
! #grab first 942 (only need one, they are same for all items)
! 	unless (! $field952){
! 		$sub852a = ($field952->subfield('a') || '') ;
! }
! 	unless (! $field952){ #->subfield('k')) { 
! 		$sub852k = ($field952->subfield('k') || '') ;
! 
! }
! 
!     my @fields952 = $record->field('952');
!     foreach my $field952 (@fields952) {   #get all 952s
!         
!         unless (! $field952) { #->subfield('b')) { 
! 		$sub852b = ($field952->subfield('b') || '') ;
! } 
!  unless (! $field952) { #->subfield('p')) { 
! 		$sub852p = ($field952->subfield('p') || '') ;
! }
!      #make it one big happy family
!         my $new852 = MARC::Field->new(
!                                       852,'','',
!                                       'a' => $sub852a,
! 				      'b' => $sub852b,
!                                       'h' => $sub852h,
!                                       'p' => $sub852p,
!                                       );
!         $record->append_fields($new852);
! 
! }
! 
! my $recordstringdone = $record->as_usmarc();
! 
  		## Set the REP_FORM
! 		$args->{REP_FORM} = &Net::Z3950::OID::usmarc;
  		
  		## Return the record string to the client 
! 	        $args->{RECORD} = $recordstringdone;
  
  }
  
- # That's all folks!
- # 
- # OLD OLD OLD OLD
- 
- sub fetch_handler_old {
- 	my ($args) = @_;	
- 	# warn "in fetch_handler";	## troubleshooting
- 	my $offset = $args->{OFFSET};
- 	$offset -= 1;			## because $args->{OFFSET} 1 = record #1
- 	chomp (my $bibid = $bib_list[$offset]);	## Not sure about this
-         my $sql_query = "SELECT tag, subfieldcode, subfieldvalue FROM marc_subfield_table where bibid=?";
- 	my $sth_get = $dbh->prepare("$sql_query");
-         $sth_get->execute($bibid);
- 	
- 	## create a MARC::Record object 
-         my $rec = MARC::Record->new();
- 
- 	## create the fields
-         while (my @data=$sth_get->fetchrow_array) {
- 
-         	my $tag = $data[0];
-        		my $subfieldcode = $data[1];
-         	my $subfieldvalue = $data[2];
- 
-         	my $field = MARC::Field->new(
-                 	                          $tag,'','',
-                         	                  $subfieldcode => $subfieldvalue,
-                                 	    );
  
-  	       	$rec->append_fields($field);
- 		
- 		## build the marc string and put into $record         
-         	my $tmp_record = $rec->as_usmarc();
- 		my $reclen = length $tmp_record;
- 		my $baseaddr = "$reclen + dirlen";
- #		set_leader_lengths($reclen,$baseaddr);
- 		my $record = $rec->as_usmarc(); 	
- 		$args->{RECORD} = $record;
- 	}
- 
- }
- 
- 	
  ## This stuff doesn't work yet...I should include boolean searching someday
  ## though
--- 270,287 ----
          $offset -= 1;                   ## because $args->{OFFSET} 1 = record #1
          chomp (my $bibid = $bib_list[$offset]); ## Not sure about this
! 				## print "the bibid is:$bibid\n";
! 				my $dbh = C4::Context->dbh;
! 				my $MARCRecord = &MARCgetbiblio($dbh,$bibid);
! 				$MARCRecord->leader('     nac  22     1u 4500');
  		## Set the REP_FORM
! 		$args->{REP_FORM} = &Net::Z3950::OID::unimarc;
  		
  		## Return the record string to the client 
! 			$args->{RECORD} = $MARCRecord->as_usmarc();
! # 	        $args->{RECORD} = $recordstringdone;
  
  }
  
  
  ## This stuff doesn't work yet...I should include boolean searching someday
  ## though




From hellen at users.sourceforge.net  Thu Jun 16 20:31:32 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 16 Jun 2005 11:31:32 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/bookshelves shelves.tmpl,1.3,1.4
Message-ID: <E1Diz9I-0005uR-As@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/bookshelves
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22530/koha-tmpl/intranet-tmpl/default/de/bookshelves

Modified Files:
	shelves.tmpl 
Log Message:
translated by hellen

Index: shelves.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/bookshelves/shelves.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** shelves.tmpl	9 Jun 2005 08:37:42 -0000	1.3
--- shelves.tmpl	16 Jun 2005 18:31:25 -0000	1.4
***************
*** 11,15 ****
  				<tr colspan="4">
  					<th class="catalogue">l&ouml;schen</th>
! 					<th class="catalogue">Strichcode</th>
  					<th class="catalogue">Titel</th>
  					<th class="catalogue">Verfasser</th>
--- 11,15 ----
  				<tr colspan="4">
  					<th class="catalogue">l&ouml;schen</th>
! 					<th class="catalogue">Barcode</th>
  					<th class="catalogue">Titel</th>
  					<th class="catalogue">Verfasser</th>
***************
*** 28,32 ****
  			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
  			<!-- TMPL_IF name="manageshelf" -->
! 				<input type="submit" value="Ausgew&auml;hlte exemplare l&ouml;schen" class="button catalogue">
  			<!-- /TMPL_IF -->
  		</div>
--- 28,32 ----
  			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
  			<!-- TMPL_IF name="manageshelf" -->
! 				<input type="submit" value="Ausgew&auml;hlte Exemplare l&ouml;schen" class="button catalogue">
  			<!-- /TMPL_IF -->
  		</div>
***************
*** 106,110 ****
  	<!-- TMPL_ELSE -->
  		<div id="bloc25">
! 			<h2 class="catalogue">Shelf-Liste</h2>
  			<table class="small">
  				<tr>
--- 106,110 ----
  	<!-- TMPL_ELSE -->
  		<div id="bloc25">
! 			<h2 class="catalogue">Regalliste</h2>
  			<table class="small">
  				<tr>
***************
*** 145,149 ****
  		</div>
  		<div id="bloc25">
! 			<a href="shelves.pl?shelves=1" class="button catalogue">Virtueles Regal hinzuf&uuml;gen oder l&ouml;schen</a>
  		</div>
  	<!-- /TMPL_IF -->
--- 145,149 ----
  		</div>
  		<div id="bloc25">
! 			<a href="shelves.pl?shelves=1" class="button catalogue">Virtuelles Regal hinzuf&uuml;gen oder l&ouml;schen</a>
  		</div>
  	<!-- /TMPL_IF -->




From hellen at users.sourceforge.net  Thu Jun 16 20:31:32 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 16 Jun 2005 11:31:32 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/parameters aqbudget.tmpl,1.1,1.2
Message-ID: <E1Diz9I-0005ua-HE@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22530/koha-tmpl/intranet-tmpl/default/de/parameters

Modified Files:
	aqbudget.tmpl 
Log Message:
translated by hellen

Index: aqbudget.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/aqbudget.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** aqbudget.tmpl	12 May 2005 19:26:35 -0000	1.1
--- aqbudget.tmpl	16 Jun 2005 18:31:30 -0000	1.2
***************
*** 107,111 ****
  			</p>
  			<p>
! 				<label class="label100">Name des Etats</label><!-- TMPL_VAR NAME="bookfundname" -->
  			</p>
  		<!-- /TMPL_IF -->
--- 107,111 ----
  			</p>
  			<p>
! 				<label class="label100">Etatname</label><!-- TMPL_VAR NAME="bookfundname" -->
  			</p>
  		<!-- /TMPL_IF -->




From hdl at users.sourceforge.net  Thu Jun 16 21:10:12 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 16 Jun 2005 12:10:12 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bull statecollection.tmpl,1.5,1.6
Message-ID: <E1Dizki-00032s-Tf@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	statecollection.tmpl 
Log Message:
Adding 2 status to serial issues :
	- delete : to delete the current issue
	- not issued : to distinguish missing from not issued serial number.

Index: statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** statecollection.tmpl	4 May 2005 08:52:51 -0000	1.5
--- statecollection.tmpl	16 Jun 2005 19:10:09 -0000	1.6
***************
*** 54,57 ****
--- 54,67 ----
  						<option value="4">Missing</option>
  					<!-- /TMPL_IF -->
+ 					<!--TMPL_IF name="status5" -->
+ 						<option value="5" selected>Not issued</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="5">Not issued</option>
+ 					<!-- /TMPL_IF -->
+ 					<!--TMPL_IF name="status6" -->
+ 						<option value="6" selected>Delete</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="6">Delete</option>
+ 					<!-- /TMPL_IF -->
  				</select>
  			</td>
***************
*** 98,101 ****
--- 108,115 ----
  		<p>Missing issues</p>
  		<p>&nbsp;<textarea name="missinglist" COLS=60 ROWS=2><!-- TMPL_VAR name="missinglist" --></textarea></p>
+ 		<!--TMPL_IF Name="notissuedlist"-->
+ 		<p>Not issued</p>
+ 		<p>&nbsp;<textarea name="notissuedlist" COLS=60 ROWS=2><!-- TMPL_VAR name="notissuedlist" --></textarea></p>
+ 		<!--/TMPL_IF-->
  		<p>Opac's note</p>
  		<p>&nbsp;<textarea name="opacnote" COLS=60 ROWS=5><!-- TMPL_VAR name="opacnote" --></textarea></p>




From hdl at users.sourceforge.net  Thu Jun 16 21:10:15 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 16 Jun 2005 12:10:15 -0700
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.9,1.10
Message-ID: <E1Dizkl-00033Q-Pr@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11586/C4

Modified Files:
	Bull.pm 
Log Message:
Adding 2 status to serial issues :
	- delete : to delete the current issue
	- not issued : to distinguish missing from not issued serial number.

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Bull.pm	4 May 2005 15:40:01 -0000	1.9
--- Bull.pm	16 Jun 2005 19:10:10 -0000	1.10
***************
*** 51,55 ****
  			&Find_Next_Date, &Get_Next_Seq
  			&hassubscriptionexpired &subscriptionexpirationdate &subscriptionrenew
! 			&getSupplierListWithLateIssues &GetLateIssues);
  
  sub getSupplierListWithLateIssues {
--- 51,55 ----
  			&Find_Next_Date, &Get_Next_Seq
  			&hassubscriptionexpired &subscriptionexpirationdate &subscriptionrenew
! 			&getSupplierListWithLateIssues &GetLateIssues &serialdelete);
  
  sub getSupplierListWithLateIssues {
***************
*** 275,279 ****
  	my $dbh = C4::Context->dbh;
  	# status = 2 is "arrived"
! 	my $sth=$dbh->prepare("select serialid,serialseq, status, planneddate from serial where subscriptionid = ? and status <>2 and status <>4");
  	$sth->execute($subscriptionid);
  	my @serials;
--- 275,279 ----
  	my $dbh = C4::Context->dbh;
  	# status = 2 is "arrived"
! 	my $sth=$dbh->prepare("select serialid,serialseq, status, planneddate from serial where subscriptionid = ? and status <>2 and status <>4 and status <>5");
  	$sth->execute($subscriptionid);
  	my @serials;
***************
*** 289,296 ****
  }
  
! sub serialchangestatus {
! 	my ($serialid,$serialseq,$planneddate,$status)=@_;
! # 	warn "($serialid,$serialseq,$planneddate,$status)";
! 	# 1st, get previous status : if we change from "waited" to something else, then we will have to create a new "waited" entry
  	my $dbh = C4::Context->dbh;
  	my $sth = $dbh->prepare("select subscriptionid,status from serial where serialid=?");
--- 289,294 ----
  }
  
! sub serialdelete {
! 	my ($serialid,$serialseq)=@_;
  	my $dbh = C4::Context->dbh;
  	my $sth = $dbh->prepare("select subscriptionid,status from serial where serialid=?");
***************
*** 298,314 ****
  	my ($subscriptionid,$oldstatus) = $sth->fetchrow;
  	# change status & update subscriptionhistory
! 	$sth = $dbh->prepare("update serial set serialseq=?,planneddate=?,status=? where serialid = ?");
! 	$sth->execute($serialseq,$planneddate,$status,$serialid);
  	$sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
  	$sth->execute($subscriptionid);
  	my ($missinglist,$recievedlist) = $sth->fetchrow;
! 	if ($status eq 2) {
! 		$recievedlist .= ",$serialseq";
! 	}
! 	if ($status eq 4) {
! 		$missinglist .= ",$serialseq";
! 	}
  	$sth=$dbh->prepare("update subscriptionhistory set recievedlist=?, missinglist=? where subscriptionid=?");
  	$sth->execute($recievedlist,$missinglist,$subscriptionid);
  	# create new waited entry if needed (ie : was a "waited" and has changed)
  	if ($oldstatus eq 1 && $status ne 1) {
--- 296,336 ----
  	my ($subscriptionid,$oldstatus) = $sth->fetchrow;
  	# change status & update subscriptionhistory
! 	my $sth = $dbh->prepare("delete * from serial  where serialid = ?");
! 	$sth->execute($serialid);
  	$sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
  	$sth->execute($subscriptionid);
  	my ($missinglist,$recievedlist) = $sth->fetchrow;
! 	$recievedlist =~ s/",$serialseq"//;
! 	$missinglist =~ s/",$serialseq"//;
  	$sth=$dbh->prepare("update subscriptionhistory set recievedlist=?, missinglist=? where subscriptionid=?");
  	$sth->execute($recievedlist,$missinglist,$subscriptionid);
+ }
+ 
+ sub serialchangestatus {
+ 	my ($serialid,$serialseq,$planneddate,$status)=@_;
+ # 	warn "($serialid,$serialseq,$planneddate,$status)";
+ 	# 1st, get previous status : if we change from "waited" to something else, then we will have to create a new "waited" entry
+ 	my $dbh = C4::Context->dbh;
+ 	my $sth = $dbh->prepare("select subscriptionid,status from serial where serialid=?");
+ 	$sth->execute($serialid);
+ 	my ($subscriptionid,$oldstatus) = $sth->fetchrow;
+ 	# change status & update subscriptionhistory
+ 	if ($status eq 6){
+ 		delissue($serialseq, $subscriptionid) 
+ 	}else{
+ 		$sth = $dbh->prepare("update serial set serialseq=?,planneddate=?,status=? where serialid = ?");
+ 		$sth->execute($serialseq,$planneddate,$status,$serialid);
+ 		$sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
+ 		$sth->execute($subscriptionid);
+ 		my ($missinglist,$recievedlist) = $sth->fetchrow;
+ 		if ($status eq 2) {
+ 			$recievedlist .= ",$serialseq";
+ 		}
+ 		$missinglist .= ",$serialseq" if ($status eq 4) ;
+ 		$missinglist .= ",not issued $serialseq" if ($status eq 5);
+ 		$sth=$dbh->prepare("update subscriptionhistory set recievedlist=?, missinglist=? where subscriptionid=?");
+ 		$sth->execute($recievedlist,$missinglist,$subscriptionid);
+ 	}
+ 
  	# create new waited entry if needed (ie : was a "waited" and has changed)
  	if ($oldstatus eq 1 && $status ne 1) {
***************
*** 335,338 ****
--- 357,367 ----
  }
  
+ sub delissue {
+ 	my ($serialseq,$subscriptionid) = @_;
+ 	my $dbh = C4::Context->dbh;
+ 	my $sth = $dbh->prepare("delete from serial where serialseq= ? and subscriptionid= ? ");
+ 	$sth->execute($serialseq,$subscriptionid);
+ }
+ 
  sub Get_Next_Date(@) {
  	my ($planneddate,$subscription) = @_;




From tipaul at users.sourceforge.net  Fri Jun 17 14:31:46 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Fri, 17 Jun 2005 05:31:46 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-auth.tmpl,1.3,1.3.2.1 opac-MARCdetail.tmpl,1.5.2.2,1.5.2.3 opac-user.tmpl,1.8.2.3,1.8.2.4
Message-ID: <E1DjG0g-0000bi-Od@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-auth.tmpl opac-MARCdetail.tmpl opac-user.tmpl 
Log Message:
last commits before 2.2.3
* css fixes for better IE compliance
* adding LibraryName parameter in login screen

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.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** opac-auth.tmpl	8 Dec 2004 10:26:32 -0000	1.3
--- opac-auth.tmpl	17 Jun 2005 12:31:44 -0000	1.3.2.1
***************
*** 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-MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -C2 -r1.5.2.2 -r1.5.2.3
*** opac-MARCdetail.tmpl	6 Jun 2005 12:38:16 -0000	1.5.2.2
--- opac-MARCdetail.tmpl	17 Jun 2005 12:31:44 -0000	1.5.2.3
***************
*** 28,32 ****
  	<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Add to basket</a>
  </div>
- <div id="mainbloc">
  	<div class="tabs">
  		<!-- TMPL_IF name="0XX" -->
--- 28,31 ----
***************
*** 321,325 ****
  	</div>
  </div>
- </div>
  <script language="JavaScript" type="text/javascript">
  function active(numlayer)
--- 320,323 ----

Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -C2 -r1.8.2.3 -r1.8.2.4
*** opac-user.tmpl	6 Jun 2005 14:13:22 -0000	1.8.2.3
--- opac-user.tmpl	17 Jun 2005 12:31:44 -0000	1.8.2.4
***************
*** 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" -->
  
--- 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" -->
  




From tipaul at users.sourceforge.net  Fri Jun 17 14:31:46 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Fri, 17 Jun 2005 05:31:46 -0700
Subject: [Koha-cvs] CVS: koha/C4 Auth.pm,1.36.2.2,1.36.2.3
Message-ID: <E1DjG0g-0000bN-Bp@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2234/C4

Modified Files:
      Tag: rel_2_2
	Auth.pm 
Log Message:
last commits before 2.2.3
* css fixes for better IE compliance
* adding LibraryName parameter in login screen

Index: Auth.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Auth.pm,v
retrieving revision 1.36.2.2
retrieving revision 1.36.2.3
diff -C2 -r1.36.2.2 -r1.36.2.3
*** Auth.pm	28 Apr 2005 08:26:39 -0000	1.36.2.2
--- Auth.pm	17 Jun 2005 12:31:43 -0000	1.36.2.3
***************
*** 400,404 ****
  
  	my $self_url = $query->url(-absolute => 1);
! 	$template->param(url => $self_url);
  	$template->param(\%info);
  	$cookie=$query->cookie(-name => 'sessionID',
--- 400,404 ----
  
  	my $self_url = $query->url(-absolute => 1);
! 	$template->param(url => $self_url, LibraryName=> => C4::Context->preference("LibraryName"),);
  	$template->param(\%info);
  	$cookie=$query->cookie(-name => 'sessionID',




From tipaul at users.sourceforge.net  Fri Jun 17 14:31:46 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Fri, 17 Jun 2005 05:31:46 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.17.2.7,1.17.2.8
Message-ID: <E1DjG0g-0000bS-Hb@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac.css 
Log Message:
last commits before 2.2.3
* css fixes for better IE compliance
* adding LibraryName parameter in login screen

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.17.2.7
retrieving revision 1.17.2.8
diff -C2 -r1.17.2.7 -r1.17.2.8
*** opac.css	16 Jun 2005 15:40:15 -0000	1.17.2.7
--- opac.css	17 Jun 2005 12:31:44 -0000	1.17.2.8
***************
*** 401,406 ****
  /* for MARC view  */
  div.tabs {
! 	width:10px;
  	display:block;
  }
  
--- 401,408 ----
  /* for MARC view  */
  div.tabs {
! 	width:15px;
  	display:block;
+ 	margin-top:70px;
+ 	margin-left:40px;
  }
  
***************
*** 417,423 ****
  	position:absolute;
  	display:block;
! 	top:123px;
! 	left:42px;
  	border: 1px solid black;
  }
  
--- 419,427 ----
  	position:absolute;
  	display:block;
! 	top:140px;
! 	left:62px;
! 	margin-right:0px;
  	border: 1px solid black;
+ 	background-color:none;
  }
  
***************
*** 428,431 ****
--- 432,437 ----
  	position:absolute;
  	float:left;
+ 	margin-right:0px;
+ 	background-color:none;
  }
  




From hdl at users.sourceforge.net  Fri Jun 17 15:44:27 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 17 Jun 2005 06:44:27 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.18,1.19
Message-ID: <E1DjH91-0001Hs-9M@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac-detail.tmpl 
Log Message:
Detailing the three latest issues on OPAC for serials

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** opac-detail.tmpl	4 May 2005 08:58:31 -0000	1.18
--- opac-detail.tmpl	17 Jun 2005 13:44:25 -0000	1.19
***************
*** 158,167 ****
  	</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>
--- 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>




From hdl at users.sourceforge.net  Fri Jun 17 15:44:27 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 17 Jun 2005 06:44:27 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-detail.pl,1.18,1.19
Message-ID: <E1DjH91-0001Ho-84@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4905/opac

Modified Files:
	opac-detail.pl 
Log Message:
Detailing the three latest issues on OPAC for serials

Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** opac-detail.pl	4 May 2005 09:02:38 -0000	1.18
--- opac-detail.pl	17 Jun 2005 13:44:25 -0000	1.19
***************
*** 30,34 ****
  my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
  my ($websitecount, @websites)             = &getwebsites($biblionumber);
- my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
  
  $dat->{'count'}=@items;
--- 30,33 ----
***************
*** 67,70 ****
--- 66,83 ----
  my $sitearray=\@websites;
  
+ #coping with subscriptions
+ my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
+ my @subscriptions = getsubscriptions($dat->{title},$dat->{issn},$biblionumber);
+ my @subs;
+ foreach my $subscription (@subscriptions){
+ 	warn "subsid :".$subscription->{subscriptionid};
+ 	my %cell;
+ 	$cell{subscriptionid}= $subscription->{subscriptionid};
+ 	$cell{subscriptionnotes}= $subscription->{notes};
+ 	#get the three latest serials.
+ 	$cell{latestserials}=getlatestserials($subscription->{subscriptionid},3);
+ 	push @subs, \%cell;
+ }
+ 
  $template->param(BIBLIO_RESULTS => $resultsarray,
  				ITEM_RESULTS => $itemsarray,
***************
*** 72,75 ****
--- 85,89 ----
  				SITE_RESULTS => $sitearray,
  				subscriptionsnumber => $subscriptionsnumber,
+ 				subscriptions => \@subs,
  			     LibraryName => C4::Context->preference("LibraryName"),
  				suggestion => C4::Context->preference("suggestion"),
***************
*** 108,111 ****
  output_html_with_http_headers $query, $cookie, $template->output;
  
! output_html_with_http_headers $query, $cookie, $template->output;
  
--- 122,125 ----
  output_html_with_http_headers $query, $cookie, $template->output;
  
! #output_html_with_http_headers $query, $cookie, $template->output;
  




From hdl at users.sourceforge.net  Fri Jun 17 15:44:27 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 17 Jun 2005 06:44:27 -0700
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.10,1.11
Message-ID: <E1DjH91-0001Hw-CM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4905/C4

Modified Files:
	Bull.pm 
Log Message:
Detailing the three latest issues on OPAC for serials

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Bull.pm	16 Jun 2005 19:10:10 -0000	1.10
--- Bull.pm	17 Jun 2005 13:44:25 -0000	1.11
***************
*** 51,55 ****
  			&Find_Next_Date, &Get_Next_Seq
  			&hassubscriptionexpired &subscriptionexpirationdate &subscriptionrenew
! 			&getSupplierListWithLateIssues &GetLateIssues &serialdelete);
  
  sub getSupplierListWithLateIssues {
--- 51,55 ----
  			&Find_Next_Date, &Get_Next_Seq
  			&hassubscriptionexpired &subscriptionexpirationdate &subscriptionrenew
! 			&getSupplierListWithLateIssues &GetLateIssues &serialdelete &getlatestserials);
  
  sub getSupplierListWithLateIssues {
***************
*** 288,291 ****
--- 288,306 ----
  	return ($totalissues, at serials);
  }
+ sub getlatestserials{
+ 	my ($subscriptionid,$limit) =@_;
+ 	my $dbh = C4::Context->dbh;
+ 	# status = 2 is "arrived"
+ 	my $strsth="select serialid,serialseq, status, planneddate from serial where subscriptionid = ? and (status =2 or status=4) order by planneddate DESC LIMIT 0,$limit";
+ 	my $sth=$dbh->prepare($strsth);
+ 	$sth->execute($subscriptionid);
+ 	my @serials;
+ 	while(my $line = $sth->fetchrow_hashref) {
+ 		$line->{"status".$line->{status}} = 1; # fills a "statusX" value, used for template status select list
+ 		$line->{"planneddate"} = format_date($line->{"planneddate"});
+ 		push @serials,$line;
+ 	}
+ 	return \@serials;
+ }
  
  sub serialdelete {
***************
*** 317,321 ****
  	# change status & update subscriptionhistory
  	if ($status eq 6){
! 		delissue($serialseq, $subscriptionid) 
  	}else{
  		$sth = $dbh->prepare("update serial set serialseq=?,planneddate=?,status=? where serialid = ?");
--- 332,336 ----
  	# change status & update subscriptionhistory
  	if ($status eq 6){
! 		delissue($serialseq, $subscriptionid); 
  	}else{
  		$sth = $dbh->prepare("update serial set serialseq=?,planneddate=?,status=? where serialid = ?");




From tipaul at users.sourceforge.net  Fri Jun 17 17:51:56 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Fri, 17 Jun 2005 08:51:56 -0700
Subject: [Koha-cvs] CVS: koha/bull statecollection.pl,1.3.2.3,1.3.2.4
Message-ID: <E1DjJ8O-0002Sp-ME@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9456/bull

Modified Files:
      Tag: rel_2_2
	statecollection.pl 
Log Message:
bugfix : when saving a special issue, "arrived" and "missing" status must be stored in history as well.

Index: statecollection.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/statecollection.pl,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -C2 -r1.3.2.3 -r1.3.2.4
*** statecollection.pl	28 Apr 2005 08:26:38 -0000	1.3.2.3
--- statecollection.pl	17 Jun 2005 15:51:54 -0000	1.3.2.4
***************
*** 39,42 ****
--- 39,43 ----
  			serialchangestatus($serialids[$i],$serialseqs[$i],format_date_in_iso($planneddates[$i]),$status[$i]) unless ($hassubscriptionexpired && $oldstatus == 1);
  		} else {
+ 			# add a special issue
  			if ($serialseqs[$i]) {
  				my $subscription=getsubscription($subscriptionid);




From tipaul at users.sourceforge.net  Fri Jun 17 17:53:37 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Fri, 17 Jun 2005 08:53:37 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-dictionary.pl,1.1.2.1,1.1.2.2
Message-ID: <E1DjJA1-0002ih-6j@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10444/opac

Modified Files:
      Tag: rel_2_2
	opac-dictionary.pl 
Log Message:
special bugfix for HDL : when doing X+Y on 2 fields that can have a numeric value, you will get X+Y as result. What you wanted to do was concat(X,Y), to have 700+9 being 7009 and not 709 ;-)

Index: opac-dictionary.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/Attic/opac-dictionary.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac-dictionary.pl	7 Jun 2005 10:23:13 -0000	1.1.2.1
--- opac-dictionary.pl	17 Jun 2005 15:53:35 -0000	1.1.2.2
***************
*** 106,110 ****
  	}
  	$listtags =~s/,$/)/;
! 	$strsth .= $listtags." and marc_word.tagsubfield=marc_subfield_table.tag+marc_subfield_table.subfieldcode group by subfieldvalue ";
  # 	warn "search in biblio : ".$strsth;
  	my $value = uc($search[0]);
--- 106,110 ----
  	}
  	$listtags =~s/,$/)/;
! 	$strsth .= $listtags." and marc_word.tagsubfield=concat(marc_subfield_table.tag,marc_subfield_table.subfieldcode) group by subfieldvalue ";
  # 	warn "search in biblio : ".$strsth;
  	my $value = uc($search[0]);




From tipaul at users.sourceforge.net  Fri Jun 17 17:53:37 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Fri, 17 Jun 2005 08:53:37 -0700
Subject: [Koha-cvs] CVS: koha/search.marc dictionary.pl,1.6.2.2,1.6.2.3
Message-ID: <E1DjJA1-0002il-9O@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10444/search.marc

Modified Files:
      Tag: rel_2_2
	dictionary.pl 
Log Message:
special bugfix for HDL : when doing X+Y on 2 fields that can have a numeric value, you will get X+Y as result. What you wanted to do was concat(X,Y), to have 700+9 being 7009 and not 709 ;-)

Index: dictionary.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.marc/dictionary.pl,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -C2 -r1.6.2.2 -r1.6.2.3
*** dictionary.pl	7 Jun 2005 10:02:01 -0000	1.6.2.2
--- dictionary.pl	17 Jun 2005 15:53:35 -0000	1.6.2.3
***************
*** 106,110 ****
  	}
  	$listtags =~s/,$/)/;
! 	$strsth .= $listtags." and marc_word.tagsubfield=marc_subfield_table.tag+marc_subfield_table.subfieldcode group by subfieldvalue ";
  # 	warn "search in biblio : ".$strsth;
  	my $value = uc($search[0]);
--- 106,110 ----
  	}
  	$listtags =~s/,$/)/;
! 	$strsth .= $listtags." and marc_word.tagsubfield=concat(marc_subfield_table.tag,marc_subfield_table.subfieldcode) group by subfieldvalue ";
  # 	warn "search in biblio : ".$strsth;
  	my $value = uc($search[0]);




From tipaul at users.sourceforge.net  Fri Jun 17 17:51:56 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Fri, 17 Jun 2005 08:51:56 -0700
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.6.2.9,1.6.2.10
Message-ID: <E1DjJ8O-0002St-PG@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9456/C4

Modified Files:
      Tag: rel_2_2
	Bull.pm 
Log Message:
bugfix : when saving a special issue, "arrived" and "missing" status must be stored in history as well.

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.6.2.9
retrieving revision 1.6.2.10
diff -C2 -r1.6.2.9 -r1.6.2.10
*** Bull.pm	16 Jun 2005 15:35:27 -0000	1.6.2.9
--- Bull.pm	17 Jun 2005 15:51:54 -0000	1.6.2.10
***************
*** 406,409 ****
--- 406,420 ----
  	my $sth = $dbh->prepare("insert into serial (serialseq,subscriptionid,biblionumber,status, planneddate) values (?,?,?,?,?)");
  	$sth->execute($serialseq,$subscriptionid,$biblionumber,$status, $planneddate);
+ 	$sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
+ 	$sth->execute($subscriptionid);
+ 	my ($missinglist,$recievedlist) = $sth->fetchrow;
+ 	if ($status eq 2) {
+ 		$recievedlist .= ",$serialseq";
+ 	}
+ 	if ($status eq 4) {
+ 		$missinglist .= ",$serialseq";
+ 	}
+ 	$sth=$dbh->prepare("update subscriptionhistory set recievedlist=?, missinglist=? where subscriptionid=?");
+ 	$sth->execute($recievedlist,$missinglist,$subscriptionid);
  }
  




From tipaul at users.sourceforge.net  Fri Jun 17 17:54:42 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Fri, 17 Jun 2005 08:54:42 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui basket.tmpl,1.15.2.7,1.15.2.8
Message-ID: <E1DjJB4-0002sN-A7@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	basket.tmpl 
Log Message:
bugfix : some columns where "doNotPrint" style & should not

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.15.2.7
retrieving revision 1.15.2.8
diff -C2 -r1.15.2.7 -r1.15.2.8
*** basket.tmpl	7 Jun 2005 12:56:37 -0000	1.15.2.7
--- basket.tmpl	17 Jun 2005 15:54:40 -0000	1.15.2.8
***************
*** 31,35 ****
  			<tr valign="top" bgcolor="#ffdf61">
  				<th class="acquisition doNotPrint">Order</th>
! 				<th class="acquisition">Publisher<a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=biblioitems.publishercode" class="acquisition doNotPrint">[order]</a></th>
  				<th class="acquisition">Title</th>
  				<th class="acquisition">rrp</th>
--- 31,35 ----
  			<tr valign="top" bgcolor="#ffdf61">
  				<th class="acquisition doNotPrint">Order</th>
! 				<th class="acquisition">Publisher<a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=biblioitems.publishercode" class="acquisition">[order]</a></th>
  				<th class="acquisition">Title</th>
  				<th class="acquisition">rrp</th>
***************
*** 53,62 ****
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
  					<!-- TMPL_IF name="closedate" -->
! 						<td><p>
  							<b><!-- TMPL_VAR NAME="title" --></b><br/>
  								<!-- TMPL_VAR NAME="author" -->
  								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! 							</p>
  						</td>
  					<!-- TMPL_ELSE -->
--- 53,61 ----
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
  					<!-- TMPL_IF name="closedate" -->
! 						<td>
  							<b><!-- TMPL_VAR NAME="title" --></b><br/>
  								<!-- TMPL_VAR NAME="author" -->
  								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --><p class="doNotPrint"><i><!--TMPL_VAR name="notes" --></i></p><!-- /TMPL_IF -->
  						</td>
  					<!-- TMPL_ELSE -->




From hdl at users.sourceforge.net  Fri Jun 17 18:37:03 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 17 Jun 2005 09:37:03 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters systempreferences.tmpl,1.31,1.32
Message-ID: <E1DjJq3-0001CX-49@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	systempreferences.tmpl 
Log Message:
Displaying system preferences by category

Index: systempreferences.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** systempreferences.tmpl	11 Feb 2005 16:52:53 -0000	1.31
--- systempreferences.tmpl	17 Jun 2005 16:37:00 -0000	1.32
***************
*** 137,140 ****
--- 137,176 ----
  	<!-- TMPL_IF NAME="else" -->
  	<h1>System preferences admin</h1>
+ 	<table>
+ 		<tr>
+ 			<td>
+ 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin">Admin
+ 				</a>
+ 			</td>
+ 			<td>
+ 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions">Acquisitions
+ 				</a>
+ 			</td>
+ 			<td>
+ 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities">Authorities
+ 				</a>
+ 			</td>
+ 			<td>
+ 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue">Catalogue
+ 				</a>
+ 			</td>
+ 			<td>
+ 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation">Circulation
+ 				</a>
+ 			</td>
+ 			<td>
+ 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members">Members
+ 				</a>
+ 			</td>
+ 			<td>
+ 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC">OPAC
+ 				</a>
+ 			</td>
+ 			<td>
+ 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=">Others
+ 				</a>
+ 			</td>
+ 		</tr>
+ 	</table>
  	<form action="/cgi-bin/koha/admin/systempreferences.pl" method="post">
  		<input type="text" name="searchfield" value="">




From hdl at users.sourceforge.net  Fri Jun 17 18:37:03 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 17 Jun 2005 09:37:03 -0700
Subject: [Koha-cvs] CVS: koha/admin systempreferences.pl,1.23,1.24
Message-ID: <E1DjJq3-0001Cc-B6@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4576/admin

Modified Files:
	systempreferences.pl 
Log Message:
Displaying system preferences by category

Index: systempreferences.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** systempreferences.pl	11 Feb 2005 16:24:11 -0000	1.23
--- systempreferences.pl	17 Jun 2005 16:37:01 -0000	1.24
***************
*** 50,53 ****
--- 50,79 ----
  
  
+ my %tabsysprefs;
+ $tabsysprefs{acquisitions}="Acquisitions";
+ $tabsysprefs{gist}="Acquisitions";
+ $tabsysprefs{authoritysep}="Authorities";
+ $tabsysprefs{ISBD}="Catalogue";
+ $tabsysprefs{marc}="Catalogue";
+ $tabsysprefs{marcflavour}="Catalogue";
+ $tabsysprefs{SubscriptionHistory}="Catalogue";
+ $tabsysprefs{maxoutstanding}="Circulation";
+ $tabsysprefs{printcirculationslips}="Circulation";
+ $tabsysprefs{suggestion}="Circulation";
+ $tabsysprefs{automembernum}="Members";
+ $tabsysprefs{noissuescharge}="Circulation";
+ $tabsysprefs{opacthemes}="OPAC";
+ $tabsysprefs{opaclanguages}="OPAC";
+ $tabsysprefs{LibraryName}="OPAC";
+ $tabsysprefs{opacstylesheet}="OPAC";
+ $tabsysprefs{BiblioDefaultView}="OPAC";
+ $tabsysprefs{hidelostitem}="OPAC";
+ $tabsysprefs{KohaAdmin}="Admin";
+ $tabsysprefs{checkdigit}="Admin";
+ $tabsysprefs{dateformat}="Admin";
+ $tabsysprefs{insecure}="Admin";
+ $tabsysprefs{ldapinfos}="Admin";
+ $tabsysprefs{ldapserver}="Admin";
+ 
  sub StringSearch  {
  	my ($env,$searchstring,$type)=@_;
***************
*** 56,71 ****
  	my @data=split(' ',$searchstring);
  	my $count=@data;
- 	my $sth=$dbh->prepare("Select variable,value,explanation,type,options from systempreferences where (variable like ?) order by variable");
- 	$sth->execute("$data[0]%");
  	my @results;
  	my $cnt=0;
! 	while (my $data=$sth->fetchrow_hashref){
! 		push(@results,$data);
! 		$cnt ++;
  	}
- 	$sth->finish;
  	return ($cnt,\@results);
  }
  
  my $input = new CGI;
  my $searchfield=$input->param('searchfield');
--- 82,119 ----
  	my @data=split(' ',$searchstring);
  	my $count=@data;
  	my @results;
  	my $cnt=0;
! 	if ($type){
! 		foreach my $syspref (sort keys %tabsysprefs){
! 			if ($tabsysprefs{$syspref} eq $type){
! 				my $sth=$dbh->prepare("Select variable,value,explanation,type,options from systempreferences where (variable like ?) order by variable");
! 				$sth->execute($syspref);
! 				while (my $data=$sth->fetchrow_hashref){
! 					push(@results,$data);
! 					$cnt ++;
! 				}
! 				$sth->finish;
! 			}
! 		}
! 	}else {
! 		my $strsth ="Select variable,value,explanation,type,options from systempreferences where variable not in (";  
! 		foreach my $syspref (keys %tabsysprefs){
! 			$strsth .= $dbh->quote($syspref).",";
! 		}
! 		$strsth =~ s/,$/) /;
! 		$strsth .= " order by variable";
! 		warn $strsth;
! 		my $sth=$dbh->prepare($strsth);
! 		$sth->execute();
! 		while (my $data=$sth->fetchrow_hashref){
! 			push(@results,$data);
! 			$cnt ++;
! 		}
! 		$sth->finish;
  	}
  	return ($cnt,\@results);
  }
  
+ 
  my $input = new CGI;
  my $searchfield=$input->param('searchfield');
***************
*** 279,295 ****
  ################## DEFAULT ##################################
  } else { # DEFAULT
  	if  ($searchfield ne '') {
  		 $template->param(searchfield => "<p>You Searched for <strong>$searchfield</strong></p>");
  	}
  	my $env;
! 	my ($count,$results)=StringSearch($env,$searchfield,'web');
  	my $toggle=0;
  	my @loop_data = ();
  	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
! 	  	if ($toggle eq 0){
  			$toggle=1;
! 	  	} else {
  			$toggle=0;
! 	  	}
  		my %row_data;  # get a fresh hash for the row data
  		$row_data{variable} = $results->[$i]{'variable'};
--- 327,346 ----
  ################## DEFAULT ##################################
  } else { # DEFAULT
+ 	#Adding tab management for system preferences
+ 	my $tab=$input->param('tab');
+ 	
  	if  ($searchfield ne '') {
  		 $template->param(searchfield => "<p>You Searched for <strong>$searchfield</strong></p>");
  	}
  	my $env;
! 	my ($count,$results)=StringSearch($env,$searchfield,$tab);
  	my $toggle=0;
  	my @loop_data = ();
  	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
! 		if ($toggle eq 0){
  			$toggle=1;
! 		} else {
  			$toggle=0;
! 		}
  		my %row_data;  # get a fresh hash for the row data
  		$row_data{variable} = $results->[$i]{'variable'};




From hellen at users.sourceforge.net  Sat Jun 18 12:33:32 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 18 Jun 2005 03:33:32 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/parameters checkmarc.tmpl,1.1,1.2
Message-ID: <E1Djado-00031x-1R@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11617/koha-tmpl/intranet-tmpl/default/de/parameters

Modified Files:
	checkmarc.tmpl 
Log Message:
translated by hellen

Index: checkmarc.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/checkmarc.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** checkmarc.tmpl	12 May 2005 19:26:35 -0000	1.1
--- checkmarc.tmpl	18 Jun 2005 10:33:29 -0000	1.2
***************
*** 2,10 ****
  
  <div id="mainbloc">
! 	<h1>&uuml;berpr&uuml;fe MARC Setup</h1>
  	<table>
  		<tr>
  			<th>Test</th>
! 			<th>Treffer</th>
  		</tr>
  	<!-- -------------------------------------------------------------------------------------------------------- -->
--- 2,10 ----
  
  <div id="mainbloc">
! 	<h1>&Uuml;berpr&uuml;fung der MARC-Struktur</h1>
  	<table>
  		<tr>
  			<th>Test</th>
! 			<th>Meldung</th>
  		</tr>
  	<!-- -------------------------------------------------------------------------------------------------------- -->
***************
*** 12,16 ****
  		<tr>
  			<td><b>itemnum</b></td>
! 			<td><li>The field itemnum MUST be mapped </li>
  				<li>The correspounding subfield MUST be in with -1 (ignore) tab</td>
  		</tr>
--- 12,16 ----
  		<tr>
  			<td><b>itemnum</b></td>
! 			<td><li>Das Feld itemnum MUSS zugeordnet sein </li>
  				<li>The correspounding subfield MUST be in with -1 (ignore) tab</td>
  		</tr>




From hellen at users.sourceforge.net  Sat Jun 18 12:33:31 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 18 Jun 2005 03:33:31 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/members moremember.tmpl,1.1,1.2
Message-ID: <E1Djadn-00031t-VL@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11617/koha-tmpl/intranet-tmpl/default/de/members

Modified Files:
	moremember.tmpl 
Log Message:
translated by hellen

Index: moremember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/members/moremember.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** moremember.tmpl	12 May 2005 19:26:35 -0000	1.1
--- moremember.tmpl	18 Jun 2005 10:33:29 -0000	1.2
***************
*** 10,14 ****
  		<!-- TMPL_UNLESS name="I" --><label class="label100">Zweitanschrift: </label><!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR NAME="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" --><br>
  		<label class="label100">Tel.: </label><!-- TMPL_VAR NAME="phone" --><br><!-- /TMPL_UNLESS -->
! 		<label class="label100">Phone daytime: </label><!-- TMPL_VAR NAME="phoneday" --><br>
  		<label class="label100">Fax: </label><!-- TMPL_VAR NAME="faxnumber" --><br>
  		<label class="label100">E-mail: </label><a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a><br>
--- 10,14 ----
  		<!-- TMPL_UNLESS name="I" --><label class="label100">Zweitanschrift: </label><!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR NAME="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" --><br>
  		<label class="label100">Tel.: </label><!-- TMPL_VAR NAME="phone" --><br><!-- /TMPL_UNLESS -->
! 		<label class="label100">Tel. tags&uuml;ber: </label><!-- TMPL_VAR NAME="phoneday" --><br>
  		<label class="label100">Fax: </label><!-- TMPL_VAR NAME="faxnumber" --><br>
  		<label class="label100">E-mail: </label><a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a><br>
***************
*** 29,42 ****
  		<!-- /TMPL_UNLESS -->
  		<label class="label100">Kontakt: </label><!-- TMPL_VAR NAME="contactname" --><br>
! 		<label class="label100">Phone: </label><!-- TMPL_VAR NAME="altphone" --><br>
  		<!-- TMPL_UNLESS name="I" -->
! 			<label class="label100">Relationship: </label><!-- TMPL_VAR NAME="altrelationship" --><br>
  		<!-- /TMPL_UNLESS -->
  		<label class="label100">Bemerkung: </label><!-- TMPL_VAR NAME="altnotes" -->
  		<!-- TMPL_IF NAME="sort1" -->
! 			<p><label class="label100">Sort field 1 : </label><!-- TMPL_VAR NAME="sort1" --></p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="sort2" -->
! 			<p><label class="label100">Sort field 2 : </label><!-- TMPL_VAR NAME="sort2" --></p>
  		<!-- /TMPL_IF -->
  		</p>
--- 29,42 ----
  		<!-- /TMPL_UNLESS -->
  		<label class="label100">Kontakt: </label><!-- TMPL_VAR NAME="contactname" --><br>
! 		<label class="label100">Tel: </label><!-- TMPL_VAR NAME="altphone" --><br>
  		<!-- TMPL_UNLESS name="I" -->
! 			<label class="label100">Bezug: </label><!-- TMPL_VAR NAME="altrelationship" --><br>
  		<!-- /TMPL_UNLESS -->
  		<label class="label100">Bemerkung: </label><!-- TMPL_VAR NAME="altnotes" -->
  		<!-- TMPL_IF NAME="sort1" -->
! 			<p><label class="label100">Sortierung 1 : </label><!-- TMPL_VAR NAME="sort1" --></p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="sort2" -->
! 			<p><label class="label100">Sortierung 2 : </label><!-- TMPL_VAR NAME="sort2" --></p>
  		<!-- /TMPL_IF -->
  		</p>
***************
*** 81,89 ****
  	
  <!-- TMPL_IF NAME="flagged" -->	<div class="bloc25">
! 		<h2 class="members">Member Flags</h2>
  		<ul>
! 		<!-- TMPL_IF NAME="debarred" --><li>Member is debarred.</li><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="gonenoaddress" --><li>Member's address is in doubt.</li><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="lost" --><li>Member's card has been reported lost.</li><!-- /TMPL_IF -->
  		</ul>
  	</div><!-- /TMPL_IF -->
--- 81,89 ----
  	
  <!-- TMPL_IF NAME="flagged" -->	<div class="bloc25">
! 		<h2 class="members">Benutzer-Flags</h2>
  		<ul>
! 		<!-- TMPL_IF NAME="debarred" --><li>Benutzer ist gesperrt.</li><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="gonenoaddress" --><li>Benutzeradresse zweifelhaft.</li><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="lost" --><li>Benutzerausweis als verloren gemeldet.</li><!-- /TMPL_IF -->
  		</ul>
  	</div><!-- /TMPL_IF -->




From rangi at users.sourceforge.net  Mon Jun 20 03:01:08 2005
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Sun, 19 Jun 2005 18:01:08 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-sendbasket.pl,1.5,1.6
Message-ID: <E1DkAey-0004Xw-O8@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17237

Modified Files:
	opac-sendbasket.pl 
Log Message:
This simply wasnt working before.
It is now not erroring, not sure if its actually sending mail, working on
that now


Index: opac-sendbasket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-sendbasket.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** opac-sendbasket.pl	4 May 2005 09:02:38 -0000	1.5
--- opac-sendbasket.pl	20 Jun 2005 01:01:06 -0000	1.6
***************
*** 6,94 ****
  use MIME::QuotedPrint;
  use MIME::Base64;
! 
  use C4::Search;
  use C4::Auth;
  use C4::Interface::CGI::Output;
  use HTML::Template;
  
  my $query = new CGI;
  
! my ($template, $borrowernumber, $cookie) 
!     = get_template_and_user({template_name => "opac-sendbasketform.tmpl",
! 			     query => $query,
! 			     type => "opac",
! 			     authnotrequired => 1,
! 			     flagsrequired => {borrow => 1},
! 			 });
! 
! my $bib_list=$query->param('bib_list');
! my $email_add=$query->param('email_add');
! my $email_sender=$query->param('email_sender');
! 
! if ($email_add) {
! 	my $email_from = C4::Context->preference('KohaAdminEmailAddress');
! 
! 	my %mail = (	 To      => $email_add,
! 						 From    => $email_from);
! 
! 	my ($template2, $borrowernumber, $cookie) 
!     = get_template_and_user({template_name => "opac-sendbasket.tmpl",
! 			     query => $query,
! 			     type => "opac",
! 			     authnotrequired => 1,
! 			     flagsrequired => {borrow => 1},
! 			 });
! 
! 	my @bibs = split(/\//, $bib_list);
! 	my @results;
! 	my $iso2709;
! 	foreach my $biblionumber (@bibs) {
! 		$template2->param(biblionumber => $biblionumber);
! 
! 		my $dat = &bibdata($biblionumber);
! 		my ($authorcount, $addauthor) = &addauthor($biblionumber);
! 		my @items                     = &ItemInfo(undef, $biblionumber, 'opac');
! 
! 		$dat->{'additional'}=$addauthor->[0]->{'author'};
! 		for (my $i = 1; $i < $authorcount; $i++) {
! 			$dat->{'additional'} .= "|" . $addauthor->[$i]->{'author'};
! 		}
  
! 		$dat->{'biblionumber'} = $biblionumber;
! 		$dat->{ITEM_RESULTS} = \@items;
! 		my $record = MARCgetbiblio($dbh,$bibid);
! 		$iso2709 .= $record->as_usmarc();
  
! 		push (@results, $dat);
! 	}
! 
! 	my $resultsarray=\@results;
! 	$template2->param(BIBLIO_RESULTS => $resultsarray,
! 					email_sender => $email_sender);
! 
! 	# Getting template result
! 	my $template_res = $template2->output();
! 
! 	# Analysing information and getting mail properties
! 	if ($template_res =~ /<SUBJECT>\n(.*)\n<END_SUBJECT>/s) { $mail{'subject'} = $1; }
! 	else { $mail{'subject'} = "no subject"; }
! 
! 	my $email_header = "";
! 	if ($template_res =~ /<HEADER>\n(.*)\n<END_HEADER>/s) { $email_header = $1; }
! 
! 	my $email_file = "basket.txt";
! 	if ($template_res =~ /<FILENAME>\n(.*)\n<END_FILENAME>/s) { $email_file = $1; }
! 
! 	if ($template_res =~ /<MESSAGE>\n(.*)\n<END_MESSAGE>/s) { $mail{'body'} = $1; }
  
! 	my $boundary = "====" . time() . "====";
! 	$mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
  
! 	$email_header = encode_qp($email_header);
  
! 	$boundary = "--".$boundary;
  
! 	# Writing mail
! 	$mail{body} = <<END_OF_BODY;
  $boundary
  Content-Type: text/plain; charset="iso-8859-1"
--- 6,113 ----
  use MIME::QuotedPrint;
  use MIME::Base64;
! use C4::Context;
  use C4::Search;
  use C4::Auth;
  use C4::Interface::CGI::Output;
+ use C4::Biblio;
  use HTML::Template;
  
  my $query = new CGI;
  
! my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
!     {
!         template_name   => "opac-sendbasketform.tmpl",
!         query           => $query,
!         type            => "opac",
!         authnotrequired => 1,
!         flagsrequired   => { borrow => 1 },
!     }
! );
! 
! my $bib_list     = $query->param('bib_list');
! my $email_add    = $query->param('email_add');
! my $email_sender = $query->param('email_sender');
  
! my $dbh = C4::Context->dbh();
  
! if ($email_add) {
!     my $email_from = C4::Context->preference('KohaAdminEmailAddress');
  
!     my %mail = (
!         To   => $email_add,
!         From => $email_from
!     );
! 
!     my ( $template2, $borrowernumber, $cookie ) = get_template_and_user(
!         {
!             template_name   => "opac-sendbasket.tmpl",
!             query           => $query,
!             type            => "opac",
!             authnotrequired => 1,
!             flagsrequired   => { borrow => 1 },
!         }
!     );
! 
!     my @bibs = split ( /\//, $bib_list );
!     my @results;
!     my $iso2709;
!     foreach my $biblionumber (@bibs) {
!         $template2->param( biblionumber => $biblionumber );
! 
!         my $dat = &bibdata($biblionumber);
!         my ( $authorcount, $addauthor ) = &addauthor($biblionumber);
!         my @items = &ItemInfo( undef, $biblionumber, 'opac' );
! 
!         $dat->{'additional'} = $addauthor->[0]->{'author'};
!         for ( my $i = 1 ; $i < $authorcount ; $i++ ) {
!             $dat->{'additional'} .= "|" . $addauthor->[$i]->{'author'};
!         }
! 
!         $dat->{'biblionumber'} = $biblionumber;
!         $dat->{ITEM_RESULTS} = \@items;
!         my $record = MARCgetbiblio( $dbh, $biblionumber );
!         $iso2709 .= $record->as_usmarc();
! 
!         push ( @results, $dat );
!     }
! 
!     my $resultsarray = \@results;
!     $template2->param(
!         BIBLIO_RESULTS => $resultsarray,
!         email_sender   => $email_sender
!     );
! 
!     # Getting template result
!     my $template_res = $template2->output();
! 
!     # Analysing information and getting mail properties
!     if ( $template_res =~ /<SUBJECT>\n(.*)\n<END_SUBJECT>/s ) {
!         $mail{'subject'} = $1;
!     }
!     else { $mail{'subject'} = "no subject"; }
! 
!     my $email_header = "";
!     if ( $template_res =~ /<HEADER>\n(.*)\n<END_HEADER>/s ) {
!         $email_header = $1;
!     }
! 
!     my $email_file = "basket.txt";
!     if ( $template_res =~ /<FILENAME>\n(.*)\n<END_FILENAME>/s ) {
!         $email_file = $1;
!     }
! 
!     if ( $template_res =~ /<MESSAGE>\n(.*)\n<END_MESSAGE>/s ) {
!         $mail{'body'} = $1;
!     }
! 
!     my $boundary = "====" . time() . "====";
!     $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
  
!     $email_header = encode_qp($email_header);
  
!     $boundary = "--" . $boundary;
  
!     # Writing mail
!     $mail{body} = <<END_OF_BODY;
  $boundary
  Content-Type: text/plain; charset="iso-8859-1"
***************
*** 102,142 ****
  END_OF_BODY
  
! $mail{PJ} = $iso2709;
! #	$mail{body} = <<END_OF_BODY;
! #$boundary
! #Content-Type: text/plain; charset="iso-8859-1"
! #Content-Transfer-Encoding: quoted-printable
! #
! #$email_header
! #
! #$boundary
! #Content-Type: text/plain; name="$email_file"
! #Content-Transfer-Encoding: quoted-printable
! #Content-Disposition: attachment; filename="$email_file"
! #
! #$mail{'body'}
! #
! #$boundary--
! #END_OF_BODY
! 
! 	# Sending mail
! 	if (sendmail %mail) {
! 	# do something if it works....
! 		warn "Mail sent ok\n";
! 		$template->param(SENT => "1");
! 		$template->param(email_add => $email_add);
! 	} else {
! 		# do something if it doesnt work....
! 		warn "Error sending mail: $Mail::Sendmail::error \n";
! 	}
  
! 	output_html_with_http_headers $query, $cookie, $template->output;
  }
  else {
! 	$template->param(bib_list => $bib_list);
! 	$template->param(url => "/cgi-bin/koha/opac-sendbasket.pl",
! 	suggestion => C4::Context->preference("suggestion"),
! 	virtualshelves => C4::Context->preference("virtualshelves"),
! 	);
! 	output_html_with_http_headers $query, $cookie, $template->output;
  }
--- 121,148 ----
  END_OF_BODY
  
!     # Sending mail
!     if ( sendmail %mail ) {
! 
!         # do something if it works....
!         warn "Mail sent ok\n";
!         $template->param( SENT      => "1" );
!         $template->param( email_add => $email_add );
!     }
!     else {
! 
!         # do something if it doesnt work....
!         warn "Error sending mail: $Mail::Sendmail::error \n";
!         warn "$mail{'body'}";
!     }
  
!     output_html_with_http_headers $query, $cookie, $template->output;
  }
  else {
!     $template->param( bib_list => $bib_list );
!     $template->param(
!         url            => "/cgi-bin/koha/opac-sendbasket.pl",
!         suggestion     => C4::Context->preference("suggestion"),
!         virtualshelves => C4::Context->preference("virtualshelves"),
!     );
!     output_html_with_http_headers $query, $cookie, $template->output;
  }




From hdl at users.sourceforge.net  Mon Jun 20 12:14:15 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 20 Jun 2005 03:14:15 -0700
Subject: [Koha-cvs] CVS: koha/acqui histsearch.pl,1.1,1.2
Message-ID: <E1DkJIF-0001xz-0i@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7362/acqui

Modified Files:
	histsearch.pl 
Log Message:
Displaying search results count

Index: histsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/histsearch.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** histsearch.pl	19 Oct 2004 12:24:56 -0000	1.1
--- histsearch.pl	20 Jun 2005 10:14:12 -0000	1.2
***************
*** 24,28 ****
  			     });
  my $order_loop= &histsearch($title,$author,$name);
! $template->param(suggestions_loop => $order_loop,
  				title => $title,
  				author => $author,
--- 24,30 ----
  			     });
  my $order_loop= &histsearch($title,$author,$name);
! 
! $template->param(numresults => scalar(@$order_loop),
! 				suggestions_loop => $order_loop,
  				title => $title,
  				author => $author,




From hdl at users.sourceforge.net  Mon Jun 20 12:14:14 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 20 Jun 2005 03:14:14 -0700
Subject: [Koha-cvs] CVS: koha/members member.pl,1.5,1.6
Message-ID: <E1DkJIE-0001xc-OT@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7362/members

Modified Files:
	member.pl 
Log Message:
Displaying search results count

Index: member.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/member.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** member.pl	7 Mar 2005 08:55:30 -0000	1.5
--- member.pl	20 Jun 2005 10:14:12 -0000	1.6
***************
*** 106,109 ****
--- 106,110 ----
  $template->param( 
  			member          => $member,
+ 			numresults      => $count,
  			resultsloop     => \@resultsdata );
  




From hdl at users.sourceforge.net  Mon Jun 20 12:14:14 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 20 Jun 2005 03:14:14 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui histsearch.tmpl,1.2,1.3
Message-ID: <E1DkJIE-0001xl-Ra@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	histsearch.tmpl 
Log Message:
Displaying search results count

Index: histsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** histsearch.tmpl	1 Mar 2005 13:40:51 -0000	1.2
--- histsearch.tmpl	20 Jun 2005 10:14:12 -0000	1.3
***************
*** 2,5 ****
--- 2,7 ----
  <div id="mainbloc">
  	<h1 class="acquisition">Order search</h1>
+ 	<p class="resultcount"><!-- TMPL_VAR Name ="numresults" --> orders were found.
+ 	 </p>
  	<table>
  		<tr>




From hdl at users.sourceforge.net  Mon Jun 20 12:14:14 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 20 Jun 2005 03:14:14 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members member.tmpl,1.15,1.16 member-quicksearch-results.tmpl,1.1,1.2
Message-ID: <E1DkJIE-0001xj-Qu@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	member.tmpl member-quicksearch-results.tmpl 
Log Message:
Displaying search results count

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** member.tmpl	1 Mar 2005 13:40:54 -0000	1.15
--- member.tmpl	20 Jun 2005 10:14:12 -0000	1.16
***************
*** 18,21 ****
--- 18,23 ----
  <div class="bloc100">
  	<div class="bloctitle">You Searched for <!-- TMPL_VAR NAME="member" --></div>
+ 	<p class="resultcount"><!-- TMPL_VAR Name ="numresults" --> members were found.
+ 	 </p>
  	<table>
  		<tr>

Index: member-quicksearch-results.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** member-quicksearch-results.tmpl	13 Jan 2005 22:41:54 -0000	1.1
--- member-quicksearch-results.tmpl	20 Jun 2005 10:14:12 -0000	1.2
***************
*** 5,8 ****
--- 5,10 ----
  
  <div class="bloc100">
+ 	<p><!-- TMPL_VAR Name ="numresults" --> records match you search.
+ 	 </p>
  	<table>
  		<tr>




From hdl at users.sourceforge.net  Mon Jun 20 12:28:11 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 20 Jun 2005 03:28:11 -0700
Subject: [Koha-cvs] CVS: koha/reports acquisitions_stats.pl,1.5,1.6
Message-ID: <E1DkJVj-0004F9-QR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/reports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16241/reports

Modified Files:
	acquisitions_stats.pl 
Log Message:
Reordering dates with usual order and not alphabetical one

Index: acquisitions_stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/acquisitions_stats.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** acquisitions_stats.pl	4 May 2005 09:02:38 -0000	1.5
--- acquisitions_stats.pl	20 Jun 2005 10:28:09 -0000	1.6
***************
*** 272,296 ****
                                                
  # 1st, loop rows.                             
! 	my $linefield;                               
  	if (($line =~/closedate/) and ($podsp == 1)) {
  		#Display by day
! 		$linefield .="dayname($line)";  
  	} elsif (($line=~/closedate/) and ($podsp == 2)) {
  		#Display by Month
  		$linefield .="monthname($line)";  
  	} elsif (($line=~/closedate/) and ($podsp == 3)) {
  		#Display by Year
  		$linefield .="Year($line)";
  	} elsif (($line =~/received/) and ($rodsp == 1)) {
  		#Display by day
  		$linefield .="dayname($line)";  
  	} elsif (($line=~/received/) and ($rodsp == 2)) {
  		#Display by Month
  		$linefield .="monthname($line)";  
  	} elsif (($line=~/received/) and ($rodsp == 3)) {
  		#Display by Year
  		$linefield .="Year($line)";
  	} else {
  		$linefield .= $line;
  	}  
  	
--- 272,304 ----
                                                
  # 1st, loop rows.                             
! 	my $linefield;
! 	my $lineorder;                               
  	if (($line =~/closedate/) and ($podsp == 1)) {
  		#Display by day
! 		$linefield .="dayname($line)";
! 		$lineorder .="weekday($line)";  
  	} elsif (($line=~/closedate/) and ($podsp == 2)) {
  		#Display by Month
  		$linefield .="monthname($line)";  
+ 		$lineorder .="month($line)";  
  	} elsif (($line=~/closedate/) and ($podsp == 3)) {
  		#Display by Year
  		$linefield .="Year($line)";
+ 		$lineorder .="Year($line)";
  	} elsif (($line =~/received/) and ($rodsp == 1)) {
  		#Display by day
  		$linefield .="dayname($line)";  
+ 		$lineorder .="weekday($line)";  
  	} elsif (($line=~/received/) and ($rodsp == 2)) {
  		#Display by Month
  		$linefield .="monthname($line)";  
+ 		$lineorder .="month($line)";  
  	} elsif (($line=~/received/) and ($rodsp == 3)) {
  		#Display by Year
  		$linefield .="Year($line)";
+ 		$lineorder .="Year($line)";
  	} else {
  		$linefield .= $line;
+ 		$lineorder .= $line;
  	}  
  	
***************
*** 313,317 ****
   	}
  	$strsth .=" group by $linefield";
! 	$strsth .=" order by $linefield";
  	warn "". $strsth;
  	
--- 321,325 ----
   	}
  	$strsth .=" group by $linefield";
! 	$strsth .=" order by $lineorder";
  	warn "". $strsth;
  	
***************
*** 338,361 ****
--- 346,377 ----
  # 2nd, loop cols.
  	my $colfield;
+ 	my $colorder;
  	if (($column =~/closedate/) and ($podsp == 1)) {
  		#Display by day
  		$colfield .="dayname($column)";  
+ 		$colorder .="weekday($column)";  
  	} elsif (($column=~/closedate/) and ($podsp == 2)) {
  		#Display by Month
  		$colfield .="monthname($column)";  
+ 		$colorder .="month($column)";  
  	} elsif (($column=~/closedate/) and ($podsp == 3)) {
  		#Display by Year
  		$colfield .="Year($column)";
+ 		$colorder .="Year($column)";
  	} elsif (($column =~/received/) and ($rodsp == 1)) {
  		#Display by day
  		$colfield .="dayname($column)";  
+ 		$colorder .="weekday($column)";  
  	} elsif (($column=~/received/) and ($rodsp == 2)) {
  		#Display by Month
  		$colfield .="monthname($column)";  
+ 		$colorder .="month($column)";  
  	} elsif (($column=~/received/) and ($rodsp == 3)) {
  		#Display by Year
  		$colfield .="Year($column)";
+ 		$colorder .="Year($column)";
  	} else {
  		$colfield .= $column;
+ 		$colorder .= $column;
  	}  
  	
***************
*** 378,387 ****
   	}
  	$strsth2 .=" group by $colfield";
! 	$strsth2 .=" order by $colfield";
   	warn "". $strsth2;
  	
  	my $sth2 = $dbh->prepare( $strsth2 );
  	if (( @colfilter ) and ($colfilter[1])){
! 		warn "from : ".$colfilter[0]." To  :".$colfilter[1];
  		$sth2->execute("'".$colfilter[0]."'","'".$colfilter[1]."'");
  	} elsif ($colfilter[0]) {
--- 394,403 ----
   	}
  	$strsth2 .=" group by $colfield";
! 	$strsth2 .=" order by $colorder";
   	warn "". $strsth2;
  	
  	my $sth2 = $dbh->prepare( $strsth2 );
  	if (( @colfilter ) and ($colfilter[1])){
! #		warn "from : ".$colfilter[0]." To  :".$colfilter[1];
  		$sth2->execute("'".$colfilter[0]."'","'".$colfilter[1]."'");
  	} elsif ($colfilter[0]) {
***************
*** 439,443 ****
  	@$filters[7]=~ s/\*/%/g if (@$filters[7]);
  	$strcalc .= " AND aqorders.sort2 like '" . @$filters[7] ."'" if ( @$filters[7] );
! 	$strcalc .= " group by $linefield, $colfield order by $linefield,$colfield";
  	warn "". $strcalc;
  	my $dbcalc = $dbh->prepare($strcalc);
--- 455,459 ----
  	@$filters[7]=~ s/\*/%/g if (@$filters[7]);
  	$strcalc .= " AND aqorders.sort2 like '" . @$filters[7] ."'" if ( @$filters[7] );
! 	$strcalc .= " group by $linefield, $colfield order by $lineorder,$colorder";
  	warn "". $strcalc;
  	my $dbcalc = $dbh->prepare($strcalc);




From tipaul at users.sourceforge.net  Mon Jun 20 15:12:14 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 06:12:14 -0700
Subject: [Koha-cvs] CVS: koha/admin systempreferences.pl,1.24,1.25
Message-ID: <E1DkM4U-0001MD-BO@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5189/admin

Modified Files:
	systempreferences.pl 
Log Message:
improving systempref selector :
* showing active tab better
* removing useless filter form
* adding some systemprefs to their correct tab

Index: systempreferences.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** systempreferences.pl	17 Jun 2005 16:37:01 -0000	1.24
--- systempreferences.pl	20 Jun 2005 13:12:11 -0000	1.25
***************
*** 60,64 ****
  $tabsysprefs{maxoutstanding}="Circulation";
  $tabsysprefs{printcirculationslips}="Circulation";
! $tabsysprefs{suggestion}="Circulation";
  $tabsysprefs{automembernum}="Members";
  $tabsysprefs{noissuescharge}="Circulation";
--- 60,64 ----
  $tabsysprefs{maxoutstanding}="Circulation";
  $tabsysprefs{printcirculationslips}="Circulation";
! $tabsysprefs{suggestion}="Acquisitions";
  $tabsysprefs{automembernum}="Members";
  $tabsysprefs{noissuescharge}="Circulation";
***************
*** 75,78 ****
--- 75,81 ----
  $tabsysprefs{ldapinfos}="Admin";
  $tabsysprefs{ldapserver}="Admin";
+ $tabsysprefs{itemcallnumber}="Catalogue";
+ $tabsysprefs{maxreserves}="Circulation";
+ $tabsysprefs{virtualshelves}="OPAC";
  
  sub StringSearch  {
***************
*** 135,142 ****
  if ($op) {
  $template->param(script_name => $script_name,
! 						$op              => 1); # we show only the TMPL_VAR names $op
  } else {
  $template->param(script_name => $script_name,
! 						else              => 1); # we show only the TMPL_VAR names $op
  }
  
--- 138,145 ----
  if ($op) {
  $template->param(script_name => $script_name,
! 						$op              => 1,); # we show only the TMPL_VAR names $op
  } else {
  $template->param(script_name => $script_name,
! 						else              => 1,); # we show only the TMPL_VAR names $op
  }
  
***************
*** 352,356 ****
  		push(@loop_data, \%row_data);
  	}
! 	$template->param(loop => \@loop_data);
  	if ($offset>0) {
  		my $prevpage = $offset-$pagesize;
--- 355,359 ----
  		push(@loop_data, \%row_data);
  	}
! 	$template->param(loop => \@loop_data, $tab => 1);
  	if ($offset>0) {
  		my $prevpage = $offset-$pagesize;




From tipaul at users.sourceforge.net  Mon Jun 20 15:12:14 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 06:12:14 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters systempreferences.tmpl,1.32,1.33
Message-ID: <E1DkM4U-0001MH-Ec@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	systempreferences.tmpl 
Log Message:
improving systempref selector :
* showing active tab better
* removing useless filter form
* adding some systemprefs to their correct tab

Index: systempreferences.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** systempreferences.tmpl	17 Jun 2005 16:37:00 -0000	1.32
--- systempreferences.tmpl	20 Jun 2005 13:12:12 -0000	1.33
***************
*** 140,180 ****
  		<tr>
  			<td>
! 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin">Admin
! 				</a>
  			</td>
  			<td>
! 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions">Acquisitions
! 				</a>
  			</td>
  			<td>
! 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities">Authorities
! 				</a>
  			</td>
  			<td>
! 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue">Catalogue
! 				</a>
  			</td>
  			<td>
! 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation">Circulation
! 				</a>
  			</td>
  			<td>
! 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members">Members
! 				</a>
  			</td>
  			<td>
! 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC">OPAC
! 				</a>
  			</td>
  			<td>
! 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=">Others
! 				</a>
  			</td>
  		</tr>
  	</table>
- 	<form action="/cgi-bin/koha/admin/systempreferences.pl" method="post">
- 		<input type="text" name="searchfield" value="">
- 		<input type="reset" name="reset" value="clr">
- 	</form>
  	<!-- TMPL_VAR NAME="searchfield" -->
  	<table border="0" cellspacing="0" cellpadding="2">
--- 140,200 ----
  		<tr>
  			<td>
! 				<!-- TMPL_IF name="Admin" -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin" class="button">Admin</a>
! 				<!-- TMPL_ELSE -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin">Admin</a>
! 				<!-- /TMPL_IF -->
  			</td>
  			<td>
! 				<!-- TMPL_IF name="Acquisitions" -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions" class="button">Acquisitions</a>
! 				<!-- TMPL_ELSE -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions">Acquisitions</a>
! 				<!-- /TMPL_IF -->
  			</td>
  			<td>
! 				<!-- TMPL_IF name="Authorities" -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities" class="button">Authorities</a>
! 				<!-- TMPL_ELSE -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities">Authorities</a>
! 				<!-- /TMPL_IF -->
  			</td>
  			<td>
! 				<!-- TMPL_IF name="Catalogue" -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue" class="button">Catalogue</a>
! 				<!-- TMPL_ELSE -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue">Catalogue</a>
! 				<!-- /TMPL_IF -->
  			</td>
  			<td>
! 				<!-- TMPL_IF name="Circulation" -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation" class="button">Circulation</a>
! 				<!-- TMPL_ELSE -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation">Circulation</a>
! 				<!-- /TMPL_IF -->
  			</td>
  			<td>
! 				<!-- TMPL_IF name="Members" -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members" class="button">Members</a>
! 				<!-- TMPL_ELSE -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members">Members</a>
! 				<!-- /TMPL_IF -->
  			</td>
  			<td>
! 				<!-- TMPL_IF name="OPAC" -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC" class="button">OPAC</a>
! 				<!-- TMPL_ELSE -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC">OPAC</a>
! 				<!-- /TMPL_IF -->
  			</td>
  			<td>
! 				<!-- TMPL_IF name="Others" -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=" class="button">Others</a>
! 				<!-- TMPL_ELSE -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=">Others</a>
! 				<!-- /TMPL_IF -->
  			</td>
  		</tr>
  	</table>
  	<!-- TMPL_VAR NAME="searchfield" -->
  	<table border="0" cellspacing="0" cellpadding="2">




From tipaul at users.sourceforge.net  Mon Jun 20 15:15:49 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 06:15:49 -0700
Subject: [Koha-cvs] CVS: koha/acqui acqui-home.pl,1.3,1.4 basket.pl,1.25,1.26 histsearch.pl,1.2,1.3
Message-ID: <E1DkM7x-0001o4-TY@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6858/acqui

Modified Files:
	acqui-home.pl basket.pl histsearch.pl 
Log Message:
synch'ing 2.2 and head

Index: acqui-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/acqui-home.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** acqui-home.pl	13 Jul 2004 12:53:00 -0000	1.3
--- acqui-home.pl	20 Jun 2005 13:15:46 -0000	1.4
***************
*** 64,68 ****
  						totspent => sprintf("%.2f",$totspent),
  						totcomtd => sprintf("%.2f",$totcomtd),
! 						totavail => sprintf("%.2f",$totavail));
  
  output_html_with_http_headers $query, $cookie, $template->output;
--- 64,69 ----
  						totspent => sprintf("%.2f",$totspent),
  						totcomtd => sprintf("%.2f",$totcomtd),
! 						totavail => sprintf("%.2f",$totavail),
! 						nobudget => $#results==-1?1:0);
  
  output_html_with_http_headers $query, $cookie, $template->output;

Index: basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/basket.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** basket.pl	4 May 2005 08:45:03 -0000	1.25
--- basket.pl	20 Jun 2005 13:15:46 -0000	1.26
***************
*** 56,59 ****
--- 56,61 ----
  my ($count2, at booksellers)=bookseller($booksellerid);
  
+ # get librarian branch...
+ 
  # if new basket, pre-fill infos
  $basket->{creationdate} = "" unless ($basket->{creationdate});
***************
*** 66,69 ****
--- 68,78 ----
  my $grand_total; # $subttotal + $gist
  
+ # my $line_total_est; # total of each line
+ my $sub_total_est; # total of line totals
+ my $gist_est;      # GST
+ my $grand_total_est; # $subttotal + $gist
+ 
+ my $qty_total;
+ 
  my @books_loop;
  for (my $i=0;$i<$count;$i++){
***************
*** 71,82 ****
  	$rrp=curconvert($results[$i]->{'currency'},$rrp);
  
  	$line_total=$results[$i]->{'quantity'}*$results[$i]->{'ecost'};
  	$sub_total+=$line_total;
  	my %line;
- 	if ($i % 2){
- 		$line{highlight}=1;
- 	} else {
- 		$line{highlight}=0;
- 	}
  	$line{ordernumber} = $results[$i]->{'ordernumber'};
  	$line{publishercode} = $results[$i]->{'publishercode'};
--- 80,88 ----
  	$rrp=curconvert($results[$i]->{'currency'},$rrp);
  
+ 	$sub_total_est+=$results[$i]->{'quantity'}*$results[$i]->{'rrp'};
  	$line_total=$results[$i]->{'quantity'}*$results[$i]->{'ecost'};
  	$sub_total+=$line_total;
+ 	$qty_total += $results[$i]->{'quantity'};
  	my %line;
  	$line{ordernumber} = $results[$i]->{'ordernumber'};
  	$line{publishercode} = $results[$i]->{'publishercode'};
***************
*** 85,88 ****
--- 91,95 ----
  	$line{basketno}=$basketno;
  	$line{title} = $results[$i]->{'title'};
+ 	$line{notes} = $results[$i]->{'notes'};
  	$line{author} = $results[$i]->{'author'};
  	$line{i} = $i;
***************
*** 94,97 ****
--- 101,105 ----
  	$line{biblionumber} = $results[$i]->{'biblionumber'};
  	$line{bookfundid} = $results[$i]->{'bookfundid'};
+ 	$line{odd} = $i %2;
  	push @books_loop, \%line;
  }
***************
*** 99,102 ****
--- 107,112 ----
  $gist=sprintf("%.2f",$sub_total*$prefgist);
  $grand_total=$sub_total+$gist;
+ $grand_total_est = $sub_total_est+sprintf("%.2f",$sub_total_est*$prefgist);
+ $gist_est = sprintf("%.2f",$sub_total_est*$prefgist);
  $template->param(basketno => $basketno,
  				creationdate => $basket->{creationdate},
***************
*** 107,110 ****
--- 117,124 ----
  				booksellerid=> $booksellers[0]->{'id'},
  				name => $booksellers[0]->{'name'},
+ 				address1 => $booksellers[0]->{'address1'},
+ 				address2 => $booksellers[0]->{'address2'},
+ 				address3 => $booksellers[0]->{'address3'},
+ 				address4 => $booksellers[0]->{'address4'},
  				entrydate => format_date($results[0]->{'entrydate'}),
  				books_loop => \@books_loop,
***************
*** 113,117 ****
--- 127,135 ----
  				gist => $gist,
  				grand_total =>$grand_total,
+ 				sub_total_est => $sub_total_est,
+ 				gist_est => $gist_est,
+ 				grand_total_est =>$grand_total_est,
  				currency => $booksellers[0]->{'listprice'},
+ 				qty_total => $qty_total,
  				);
  output_html_with_http_headers $query, $cookie, $template->output;

Index: histsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/histsearch.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** histsearch.pl	20 Jun 2005 10:14:12 -0000	1.2
--- histsearch.pl	20 Jun 2005 13:15:46 -0000	1.3
***************
*** 13,16 ****
--- 13,18 ----
  my $author = $input->param('author');
  my $name = $input->param('name');
+ my $from_placed_on = $input->param('fromplacedon');
+ my $to_placed_on = $input->param('toplacedon');
  
  my $dbh = C4::Context->dbh;
***************
*** 23,33 ****
  			     debug => 1,
  			     });
! my $order_loop= &histsearch($title,$author,$name);
! 
! $template->param(numresults => scalar(@$order_loop),
! 				suggestions_loop => $order_loop,
  				title => $title,
  				author => $author,
  				name => $name,
  );
  output_html_with_http_headers $input, $cookie, $template->output;
--- 25,35 ----
  			     debug => 1,
  			     });
! my $order_loop= &histsearch($title,$author,$name,$from_placed_on,$to_placed_on);
! $template->param(suggestions_loop => $order_loop,
  				title => $title,
  				author => $author,
  				name => $name,
+ 				from_placed_on =>$from_placed_on,
+ 				to_placed_on =>$to_placed_on
  );
  output_html_with_http_headers $input, $cookie, $template->output;




From tipaul at users.sourceforge.net  Mon Jun 20 15:16:13 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 06:16:13 -0700
Subject: [Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.55,1.56 isbnsearch.pl,1.16,1.17
Message-ID: <E1DkM8L-0001s1-0d@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui.simple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7168/acqui.simple

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

Index: addbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/addbiblio.pl,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -r1.55 -r1.56
*** addbiblio.pl	4 May 2005 08:45:22 -0000	1.55
--- addbiblio.pl	20 Jun 2005 13:16:10 -0000	1.56
***************
*** 186,190 ****
  			$cgidir = C4::Context->intranetdir."/value_builder";
  		} 
! 		my $plugin=$cgidir."/".$tagslib->{$tag}->{$subfield}->{'value_builder'};
  		require $plugin;
  		my $extended_param = plugin_parameters($dbh,$rec,$tagslib,$i,$tabloop);
--- 186,190 ----
  			$cgidir = C4::Context->intranetdir."/value_builder";
  		} 
! 		my $plugin=$cgidir."/".$tagslib->{$tag}->{$subfield}->{'value_builder'}; 
  		require $plugin;
  		my $extended_param = plugin_parameters($dbh,$rec,$tagslib,$i,$tabloop);
***************
*** 341,352 ****
  my $dbh = C4::Context->dbh;
  my $bibid;
  if ($oldbiblionumber) {
  	$bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$oldbiblionumber);
  	# find framework type
! 	$frameworkcode = &MARCfind_frameworkcode($dbh,$bibid) if $bibid;
  }else {
  	$bibid = $input->param('bibid');
! 	$frameworkcode = &MARCfind_frameworkcode($dbh,$bibid) if $bibid;
  }
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "acqui.simple/addbiblio.tmpl",
--- 341,355 ----
  my $dbh = C4::Context->dbh;
  my $bibid;
+ 
+ 
  if ($oldbiblionumber) {
  	$bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$oldbiblionumber);
  	# find framework type
! 	$frameworkcode = &MARCfind_frameworkcode($dbh,$bibid) if ($bibid and not ($frameworkcode));
  }else {
  	$bibid = $input->param('bibid');
! 	$frameworkcode = &MARCfind_frameworkcode($dbh,$bibid) if ($bibid and not ($frameworkcode));
  }
+ $frameworkcode='' if ($frameworkcode eq 'Default');
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "acqui.simple/addbiblio.tmpl",
***************
*** 358,361 ****
--- 361,387 ----
  			     });
  
+ #Getting the list of all frameworks
+ my $queryfwk =$dbh->prepare("select frameworktext, frameworkcode from biblio_framework");
+ $queryfwk->execute;
+ my %select_fwk;
+ my @select_fwk;
+ my $curfwk;
+ push @select_fwk,"Default";
+ $select_fwk{"Default"} = "Default";
+ while (my ($description, $fwk) =$queryfwk->fetchrow) {
+ 	push @select_fwk, $fwk;
+ 	$select_fwk{$fwk} = $description;
+ }
+ $curfwk=$frameworkcode;
+ my $framework=CGI::scrolling_list( -name     => 'Frameworks',
+ 			-id => 'Frameworks',
+ 			-default => $curfwk,
+ 			-OnChange => 'Changefwk(this);',
+ 			-values   => \@select_fwk,
+ 			-labels   => \%select_fwk,
+ 			-size     => 1,
+ 			-multiple => 0 );
+ $template->param( framework => $framework);
+ 
  $tagslib = &MARCgettagslib($dbh,1,$frameworkcode);
  my $record=-1;
***************
*** 401,404 ****
--- 427,431 ----
  		my $oldbibitemnum;
  		if ($is_a_modif) {
+ 			NEWmodbiblioframework($dbh,$bibid,$frameworkcode);
  			NEWmodbiblio($dbh,$record,$bibid,$frameworkcode);
  		} else {
***************
*** 435,468 ****
  	my @ind_tag = $input->param('ind_tag');
  	my @indicator = $input->param('indicator');
- 	splice(@tags,$addedfield,0,$tags[$addedfield]);
- 	splice(@subfields,$addedfield,0,$subfields[$addedfield]);
- 	splice(@values,$addedfield,0,$values[$addedfield]);
- 	splice(@ind_tag,$addedfield,0,$ind_tag[$addedfield]);
- 	my %indicators;
- 	for (my $i=0;$i<=$#ind_tag;$i++) {
- 		$indicators{$ind_tag[$i]} = $indicator[$i];
- 	}
- # search the part of the array to duplicate.
- 	my $start=0;
- 	my $end=0;
- 	my $started;
- 	for (my $i=$#tags;$i>0;$i--) {
- 		$end=$i if ($end eq 0 && $tags[$i] == $addedfield);
- 		$start=$i if ($end>0 && $tags[$i] eq $addedfield);
- 		last if ($end>0 && $tags[$i] ne $addedfield);
- 	}
- 	# add an empty line in all arrays. This forces a new field in MARC::Record.
- 	splice(@tags,$end+1,0,'');
- 	splice(@subfields,$end+1,0,'');
- 	splice(@values,$end+1,0,'');
- 	splice(@ind_tag,$end+1,0,'');
- 	splice(@indicator,$end+1,0,'');
- # then duplicate the field.
- 	splice(@tags,$end+2,0, at tags[$start..$end]);
- 	splice(@subfields,$end+2,0, at subfields[$start..$end]);
- 	splice(@values,$end+2,0, at values[$start..$end]);
- 	splice(@ind_tag,$end+2,0, at ind_tag[$start..$end]);
- 	splice(@indicator,$end+2,0, at indicator[$start..$end]);
- 
  	my %indicators;
  	for (my $i=0;$i<=$#ind_tag;$i++) {
--- 462,465 ----
***************
*** 470,473 ****
--- 467,473 ----
  	}
  	my $record = MARChtml2marc($dbh,\@tags,\@subfields,\@values,%indicators);
+ 	# adding an empty field
+ 	my $field = MARC::Field->new("$addedfield",'','','a'=> "");
+ 	$record->append_fields($field);
  	build_tabs ($template, $record, $dbh,$encoding);
  	build_hidden_data;
***************
*** 496,500 ****
  		$oldbiblionumber= "";
  	}
! 
  	build_tabs ($template, $record, $dbh,$encoding);
  	build_hidden_data;
--- 496,500 ----
  		$oldbiblionumber= "";
  	}
!  
  	build_tabs ($template, $record, $dbh,$encoding);
  	build_hidden_data;

Index: isbnsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/isbnsearch.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** isbnsearch.pl	4 May 2005 08:45:33 -0000	1.16
--- isbnsearch.pl	20 Jun 2005 13:16:10 -0000	1.17
***************
*** 125,195 ****
  	}
  
!     if ( $count < ( $offset + $num ) ) {
!         $total = $count;
!     }
!     else {
!         $total = $offset + $num;
!     }    # else
! 
!     my @loop_data = ();
!     my $toggle;
!     for ( my $i = $offset ; $i < $total ; $i++ ) {
!         if ( $i % 2 ) {
!             $toggle = 0;
!         } else {
!             $toggle = 1;
!         }
!         my %row_data;    # get a fresh hash for the row data
!         $row_data{toggle}        = $toggle;
!         $row_data{biblionumber}  = $results[$i]->{'biblionumber'};
!         $row_data{title}         = $results[$i]->{'title'};
!         $row_data{author}        = $results[$i]->{'author'};
!         $row_data{copyrightdate} = $results[$i]->{'copyrightdate'};
! 		$row_data{classification} = $results[$i]->{'classification'};
!         $row_data{NOTMARC}       = !$marc_p;	
!         push ( @loop_data, \%row_data );
!     }
!     $template->param( startfrom => $offset + 1 );
!     ( $offset + $num <= $count )
!       ? ( $template->param( endat => $offset + $num ) )
!       : ( $template->param( endat => $count ) );
!     $template->param( numrecords => $count );
!     my $nextstartfrom = ( $offset + $num < $count ) ? ( $offset + $num ) : (-1);
!     my $prevstartfrom = ( $offset - $num >= 0 ) ? ( $offset - $num ) : (-1);
!     $template->param( nextstartfrom => $nextstartfrom );
!     my $displaynext = 1;
!     my $displayprev = 0;
!     ( $nextstartfrom == -1 ) ? ( $displaynext = 0 ) : ( $displaynext = 1 );
!     ( $prevstartfrom == -1 ) ? ( $displayprev = 0 ) : ( $displayprev = 1 );
!     $template->param( displaynext => $displaynext );
!     $template->param( displayprev => $displayprev );
!     my @numbers = ();
!     my $term;
!     my $value;
! 
!     if ($isbn) {
!         $term  = "isbn";
!         $value = $isbn;
!     }
!     else {
!         $term  = "title";
!         $value = $title;
!     }
!     if ( $count > 10 ) {
!         for ( my $i = 1 ; $i < $count / 10 + 1 ; $i++ ) {
!             if ( $i < 16 ) {
!                 my $highlight = 0;
!                 ( $offset == ( $i - 1 ) * 10 ) && ( $highlight = 1 );
!                 push @numbers,
!                   {
!                     number    => $i,
!                     highlight => $highlight,
!                     term      => $term,
!                     value     => $value,
!                     startfrom => ( $i - 1 ) * 10
!                 };
!             }
!         }
!     }
  
      # fill with books in breeding farm
--- 125,151 ----
  	}
  
! 	my @numbers = ();
! 
! 	if ($total>$resultsperpage) {
! 		for (my $i=1; $i<$total/$resultsperpage+1; $i++) {
! 			if ($i<16) {
! 	    		my $highlight=0;
! 	    		($startfrom==($i-1)) && ($highlight=1);
! 	    		push @numbers, { number => $i,
! 					highlight => $highlight ,
! 					searchdata=> \@field_data,
! 					startfrom => ($i-1)};
! 			}
!     	}
! 	}
! 	my $from = $startfrom*$resultsperpage+1;
! 	my $to;
! 
! 	if($total < (($startfrom+1)*$resultsperpage))
! 	{
! 		$to = $total;
! 	} else {
! 		$to = (($startfrom+1)*$resultsperpage);
! 	}
  
      # fill with books in breeding farm




From tipaul at users.sourceforge.net  Mon Jun 20 15:17:19 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 06:17:19 -0700
Subject: [Koha-cvs] CVS: koha/admin checkmarc.pl,1.6,1.7 itemtypes.pl,1.18,1.19 marctagstructure.pl,1.28,1.29
Message-ID: <E1DkM9P-00022T-Bd@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7703/admin

Modified Files:
	checkmarc.pl itemtypes.pl marctagstructure.pl 
Log Message:
synch'ing 2.2 and head

Index: checkmarc.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/checkmarc.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** checkmarc.pl	22 Dec 2003 19:16:58 -0000	1.6
--- checkmarc.pl	20 Jun 2005 13:17:16 -0000	1.7
***************
*** 77,80 ****
--- 77,81 ----
  my $tab = $res2;
  my $subtotal=0;
+ warn "TAGF : $tagfield";
  while (($res,$res2,$field) = $sth->fetchrow) {
  	# (ignore itemnumber, that must be in -1 tab)
***************
*** 97,100 ****
--- 98,118 ----
  	$total++;
  }
+ 
+ $sth = $dbh->prepare("select distinct tagfield from marc_subfield_structure where tab = 10");
+ $sth->execute;
+ my $totaltags = 0;
+ my $list = "";
+ while (($res2) = $sth->fetchrow) {
+ 	$totaltags++;
+ 	$list.=$res2.",";
+ }
+ if ($totaltags > 1) {
+ 	$template->param(itemtags => $list);
+ 	$total++;
+ } else {
+ 	$template->param(itemtags => 0);
+ }
+ 
+ 
  # checks biblioitems.itemtype must be mapped and use authorised_value=itemtype
  $sth = $dbh->prepare("select tagfield,tab,authorised_value from marc_subfield_structure where kohafield = \"biblioitems.itemtype\"");
***************
*** 146,149 ****
--- 164,189 ----
  }
  
+ $sth = $dbh->prepare("select count(*) from marc_biblio where frameworkcode is NULL");
+ $sth->execute;
+ ($res) = $sth->fetchrow;
+ if ($res) {
+ 	$template->param(frameworknull =>1);
+ 	$total++;
+ }
+ $sth = $dbh->prepare("select count(*) from marc_subfield_structure where frameworkcode is NULL");
+ $sth->execute;
+ ($res) = $sth->fetchrow;
+ if ($res) {
+ 	$template->param(frameworknull =>1);
+ 	$total++;
+ }
+ $sth = $dbh->prepare("select count(*) from marc_tag_structure where frameworkcode is NULL");
+ $sth->execute;
+ ($res) = $sth->fetchrow;
+ if ($res) {
+ 	$template->param(frameworknull =>1);
+ 	$total++;
+ }
+ 
  $template->param(total => $total);
  output_html_with_http_headers $input, $cookie, $template->output;

Index: itemtypes.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/itemtypes.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** itemtypes.pl	23 Mar 2005 09:44:59 -0000	1.18
--- itemtypes.pl	20 Jun 2005 13:17:16 -0000	1.19
***************
*** 177,184 ****
  		}
  		$row_data{toggle} = $toggle;
! 		$row_data{itemtype} = $results->[$i]{'itemtype'};
! 		$row_data{description} = $results->[$i]{'description'};
! 		$row_data{renewalsallowed} = $results->[$i]{'renewalsallowed'};
! 		$row_data{rentalcharge} = sprintf("%.2f",$results->[$i]{'rentalcharge'});
  		push(@loop_data, \%row_data);
  	}
--- 177,185 ----
  		}
  		$row_data{toggle} = $toggle;
! 		$row_data{itemtype} = $results->[$i]{itemtype};
! 		$row_data{description} = $results->[$i]{description};
! 		$row_data{renewalsallowed} = $results->[$i]{renewalsallowed};
! 		$row_data{notforloan} = $results->[$i]{notforloan};
! 		$row_data{rentalcharge} = sprintf("%.2f",$results->[$i]{rentalcharge});
  		push(@loop_data, \%row_data);
  	}

Index: marctagstructure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marctagstructure.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** marctagstructure.pl	1 Mar 2005 13:40:50 -0000	1.28
--- marctagstructure.pl	20 Jun 2005 13:17:17 -0000	1.29
***************
*** 43,46 ****
--- 43,47 ----
  my $offset=$input->param('offset');
  my $op = $input->param('op');
+ my $dspchoice = $input->param('select_display');
  my $pagesize=20;
  
***************
*** 217,243 ****
  		 $template->param(searchfield => $searchfield);
  	}
! 	my $env;
! 	my ($count,$results)=StringSearch($env,$searchfield,$frameworkcode);
! 	my $toggle=0;
! 	my @loop_data = ();
! 	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
! 	  	if ($toggle eq 0){
! 			$toggle=1;
! 	  	} else {
! 			$toggle=0;
! 	  	}
! 		my %row_data;  # get a fresh hash for the row data
! 		$row_data{tagfield} = $results->[$i]{'tagfield'};
! 		$row_data{liblibrarian} = $results->[$i]{'liblibrarian'};
! 		$row_data{repeatable} = $results->[$i]{'repeatable'};
! 		$row_data{mandatory} = $results->[$i]{'mandatory'};
! 		$row_data{authorised_value} = $results->[$i]{'authorised_value'};
! 		$row_data{subfield_link} ="marc_subfields_structure.pl?tagfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
! 		$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
! 		$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
! 		$row_data{toggle} = $toggle;
! 		push(@loop_data, \%row_data);
  	}
- 	$template->param(loop => \@loop_data);
  	if ($offset>0) {
  		my $prevpage = $offset-$pagesize;
--- 218,317 ----
  		 $template->param(searchfield => $searchfield);
  	}
! 	my $cnt=0;
! 	if ($dspchoice) {
! 		#here, user only wants used tags/subfields displayed
! 		my $env;
! 		$searchfield=~ s/\'/\\\'/g;
! 		my @data=split(' ',$searchfield);
! 		my $sth=$dbh->prepare("Select marc_tag_structure.tagfield as mts_tagfield,marc_tag_structure.liblibrarian as mts_liblibrarian,marc_tag_structure.libopac as mts_libopac,marc_tag_structure.repeatable as mts_repeatable,marc_tag_structure.mandatory as mts_mandatory,marc_tag_structure.authorised_value as mts_authorized_value,marc_subfield_structure.* from marc_tag_structure LEFT JOIN marc_subfield_structure ON (marc_tag_structure.tagfield=marc_subfield_structure.tagfield AND marc_tag_structure.frameworkcode=marc_subfield_structure.frameworkcode) where (marc_tag_structure.tagfield >= ? and marc_tag_structure.frameworkcode=?) AND marc_subfield_structure.tab>=0 order by marc_tag_structure.tagfield,marc_subfield_structure.tagsubfield");
! 		#could be ordoned by tab
! 		$sth->execute($data[0], $frameworkcode);
! 		my @results = ();
! 		while (my $data=$sth->fetchrow_hashref){
! 			push(@results,$data);
! 			$cnt++;
! 		}
! 		$sth->finish;
! 		
! 		my $toggle=0;
! 		my @loop_data = ();
! 		my $j=1;
! 		my $i=$offset;
! 		while ($i < ($offset+$pagesize<$cnt?$offset+$pagesize:$cnt)) {
! 			if ($toggle eq 0){
! 				$toggle=1;
! 			} else {
! 				$toggle=0;
! 			}
! 			my %row_data;  # get a fresh hash for the row data
! 			$row_data{tagfield} = $results[$i]->{'mts_tagfield'};
! 			$row_data{liblibrarian} = $results[$i]->{'mts_liblibrarian'};
! 			$row_data{repeatable} = $results[$i]->{'mts_repeatable'};
! 			$row_data{mandatory} = $results[$i]->{'mts_mandatory'};
! 			$row_data{authorised_value} = $results[$i]->{'mts_authorised_value'};
! 			$row_data{subfield_link} ="marc_subfields_structure.pl?op=add_form&tagfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
! 			$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
! 			$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
! 			$row_data{toggle} = $toggle;
! 			$j=$i;
! 			my @internal_loop = ();
! 			while (($results[$i]->{'tagfield'}==$results[$j]->{'tagfield'}) and ($j< ($offset+$pagesize<$cnt?$offset+$pagesize:$cnt))) {
! 				if ($toggle eq 0) {
! 					$toggle=1;
! 				} else {
! 					$toggle=0;
! 				}
! 				my %subfield_data;
! 				$subfield_data{tagsubfield} = $results[$j]->{'tagsubfield'};
! 				$subfield_data{liblibrarian} = $results[$j]->{'liblibrarian'};
! 				$subfield_data{kohafield} = $results[$j]->{'kohafield'};
! 				$subfield_data{repeatable} = $results[$j]->{'repeatable'};
! 				$subfield_data{mandatory} = $results[$j]->{'mandatory'};
! 				$subfield_data{tab} = $results[$j]->{'tab'};
! 				$subfield_data{seealso} = $results[$j]->{'seealso'};
! 				$subfield_data{authorised_value} = $results[$j]->{'authorised_value'};
! 				$subfield_data{authtypecode}= $results[$j]->{'authtypecode'};
! 				$subfield_data{value_builder}= $results[$j]->{'value_builder'};
! 				$subfield_data{toggle}	= $toggle;
! # 				warn "tagfield :  ".$results[$j]->{'tagfield'}." tagsubfield :".$results[$j]->{'tagsubfield'};
! 				push @internal_loop,\%subfield_data;
! 				$j++;
! 			}
! 			$row_data{'subfields'}=\@internal_loop;
! 			push(@loop_data, \%row_data);
! #			undef @internal_loop;
! 			$i=$j;
! 		}
! 		$template->param(select_display => "True",
! 						loop => \@loop_data);
! 		#  $sth->execute;
! 		$sth->finish;
! 	} else {
! 		#here, normal old style : display every tags
! 		my $env;
! 		my ($count,$results)=StringSearch($env,$searchfield,$frameworkcode);
! 		$cnt = $count;
! 		my $toggle=0;
! 		my @loop_data = ();
! 		for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
! 			if ($toggle eq 0){
! 				$toggle=1;
! 			} else {
! 				$toggle=0;
! 			}
! 			my %row_data;  # get a fresh hash for the row data
! 			$row_data{tagfield} = $results->[$i]{'tagfield'};
! 			$row_data{liblibrarian} = $results->[$i]{'liblibrarian'};
! 			$row_data{repeatable} = $results->[$i]{'repeatable'};
! 			$row_data{mandatory} = $results->[$i]{'mandatory'};
! 			$row_data{authorised_value} = $results->[$i]{'authorised_value'};
! 			$row_data{subfield_link} ="marc_subfields_structure.pl?tagfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
! 			$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
! 			$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
! 			$row_data{toggle} = $toggle;
! 			push(@loop_data, \%row_data);
! 		}
! 		$template->param(loop => \@loop_data);
  	}
  	if ($offset>0) {
  		my $prevpage = $offset-$pagesize;
***************
*** 247,253 ****
  						script_name => $script_name,
  						frameworkcode => $frameworkcode,
! 		 );
  	}
! 	if ($offset+$pagesize<$count) {
  		my $nextpage =$offset+$pagesize;
  		$template->param(nextpage =>$nextpage,
--- 321,327 ----
  						script_name => $script_name,
  						frameworkcode => $frameworkcode,
! 		);
  	}
! 	if ($offset+$pagesize<$cnt) {
  		my $nextpage =$offset+$pagesize;
  		$template->param(nextpage =>$nextpage,




From tipaul at users.sourceforge.net  Mon Jun 20 15:17:59 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 06:17:59 -0700
Subject: [Koha-cvs] CVS: koha/authorities authorities-home.pl,1.9,1.10 authorities.pl,1.11,1.12 blinddetail-biblio-search.pl,1.4,1.5 detail.pl,1.2,1.3
Message-ID: <E1DkMA3-0002Bn-CP@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8375/authorities

Modified Files:
	authorities-home.pl authorities.pl 
	blinddetail-biblio-search.pl detail.pl 
Log Message:
synch'ing 2.2 and head

Index: authorities-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/authorities-home.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** authorities-home.pl	1 Mar 2005 13:40:50 -0000	1.9
--- authorities-home.pl	20 Jun 2005 13:17:56 -0000	1.10
***************
*** 88,95 ****
  	my @field_data = ();
  
! 
  	for(my $i = 0 ; $i <= $#marclist ; $i++)
  	{
! 		push @field_data, { term => "marclist", val=>$marclist[$i] };
  		push @field_data, { term => "and_or", val=>$and_or[$i] };
  		push @field_data, { term => "excluding", val=>$excluding[$i] };
--- 88,96 ----
  	my @field_data = ();
  
! 	# we must get parameters once again. Because if there is a mainentry, it has been replaced by something else during the search, thus the links next/previous would not work anymore 
! 	my @marclist_ini = $query->param('marclist');
  	for(my $i = 0 ; $i <= $#marclist ; $i++)
  	{
! 		push @field_data, { term => "marclist", val=>$marclist_ini[$i] };
  		push @field_data, { term => "and_or", val=>$and_or[$i] };
  		push @field_data, { term => "excluding", val=>$excluding[$i] };

Index: authorities.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/authorities.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** authorities.pl	4 May 2005 08:51:07 -0000	1.11
--- authorities.pl	20 Jun 2005 13:17:56 -0000	1.12
***************
*** 240,243 ****
--- 240,244 ----
  				$tag_data{tag} = $tag;
  				$tag_data{tag_lib} = $tagslib->{$tag}->{lib};
+ 				$tag_data{repeatable} = $tagslib->{$tag}->{repeatable};
  				$tag_data{indicator} = $indicator;
  				$tag_data{subfield_loop} = \@subfields_data;
***************
*** 366,404 ****
  	my @ind_tag = $input->param('ind_tag');
  	my @indicator = $input->param('indicator');
- 	splice(@tags,$addedfield,0,$tags[$addedfield]);
- 	splice(@subfields,$addedfield,0,$subfields[$addedfield]);
- 	splice(@values,$addedfield,0,$values[$addedfield]);
- 	splice(@ind_tag,$addedfield,0,$ind_tag[$addedfield]);
  	my %indicators;
  	for (my $i=0;$i<=$#ind_tag;$i++) {
  		$indicators{$ind_tag[$i]} = $indicator[$i];
  	}
! # search the part of the array to duplicate.
! 	my $start=0;
! 	my $end=0;
! 	my $started;
! 	for (my $i=0;$i<=$#tags;$i++) {
! 		$start=$i if ($start eq 0 && $tags[$i] == $addedfield);
! 		$end=$i if ($start>0 && $tags[$i] eq $addedfield);
! 		last if ($start>0 && $tags[$i] ne $addedfield);
! 	}
! # add an empty line in all arrays. This forces a new field in MARC::Record.
! 	splice(@tags,$end+1,0,'');
! 	splice(@subfields,$end+1,0,'');
! 	splice(@values,$end+1,0,'');
! 	splice(@ind_tag,$end+1,0,'');
! 	splice(@indicator,$end+1,0,'');
! # then duplicate the field.
! 	splice(@tags,$end+2,0, at tags[$start..$end]);
! 	splice(@subfields,$end+2,0, at subfields[$start..$end]);
! 	splice(@values,$end+2,0, at values[$start..$end]);
! 	splice(@ind_tag,$end+2,0, at ind_tag[$start..$end]);
! 	splice(@indicator,$end+2,0, at indicator[$start..$end]);
  
- 	my %indicators;
- 	for (my $i=0;$i<=$#ind_tag;$i++) {
- 		$indicators{$ind_tag[$i]} = $indicator[$i];
- 	}
- 	my $record = MARChtml2marc($dbh,\@tags,\@subfields,\@values,%indicators);
  	build_tabs ($template, $record, $dbh,$encoding);
  	build_hidden_data;
--- 367,378 ----
  	my @ind_tag = $input->param('ind_tag');
  	my @indicator = $input->param('indicator');
  	my %indicators;
  	for (my $i=0;$i<=$#ind_tag;$i++) {
  		$indicators{$ind_tag[$i]} = $indicator[$i];
  	}
! 	my $record = AUTHhtml2marc($dbh,\@tags,\@subfields,\@values,%indicators);
! 	my $field = MARC::Field->new("$addedfield",'','','a'=> "");
! 	$record->append_fields($field);
  
  	build_tabs ($template, $record, $dbh,$encoding);
  	build_hidden_data;
***************
*** 418,422 ****
  }
  
! if ($authid) {
  	build_tabs ($template, $record, $dbh,$encoding);
  	build_hidden_data;
--- 392,397 ----
  }
  
! unless ($op) {
! # 	warn "BUILDING";
  	build_tabs ($template, $record, $dbh,$encoding);
  	build_hidden_data;
***************
*** 432,436 ****
  	);
  
! 	my $authtypes = getauthtypes;
  my @authtypesloop;
  foreach my $thisauthtype (keys %$authtypes) {
--- 407,411 ----
  	);
  
! my $authtypes = getauthtypes;
  my @authtypesloop;
  foreach my $thisauthtype (keys %$authtypes) {
***************
*** 443,446 ****
  }
  
! $template->param(authtypesloop => \@authtypesloop);
  output_html_with_http_headers $input, $cookie, $template->output;
--- 418,423 ----
  }
  
! $template->param(authtypesloop => \@authtypesloop,
! 				authtypetext => $authtypes->{$authtypecode}{'authtypetext'},
! 				);
  output_html_with_http_headers $input, $cookie, $template->output;

Index: blinddetail-biblio-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/blinddetail-biblio-search.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** blinddetail-biblio-search.pl	16 Sep 2004 09:45:44 -0000	1.4
--- blinddetail-biblio-search.pl	20 Jun 2005 13:17:56 -0000	1.5
***************
*** 80,84 ****
  my @loop_data =();
  if ($authid) {
- warn "report $authtypecode => ".$auth_type->{auth_tag_to_report}.$record->as_formatted;
  	foreach my $field ($record->field($auth_type->{auth_tag_to_report})) {
  			my @subfields_data;
--- 80,83 ----

Index: detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/detail.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** detail.pl	8 Nov 2004 19:46:11 -0000	1.2
--- detail.pl	20 Jun 2005 13:17:56 -0000	1.3
***************
*** 144,147 ****
--- 144,148 ----
  				count => $count,
  				biblio_fields => $biblio_fields,
+ 				authtypetext => $authtypes->{$authtypecode}{'authtypetext'},
  				authtypesloop => \@authtypesloop);
  output_html_with_http_headers $query, $cookie, $template->output;




From tipaul at users.sourceforge.net  Mon Jun 20 15:18:47 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 06:18:47 -0700
Subject: [Koha-cvs] CVS: koha/bull statecollection.pl,1.4,1.5
Message-ID: <E1DkMAp-0002HI-W3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8739/bull

Modified Files:
	statecollection.pl 
Log Message:
synch'ing 2.2 and head

Index: statecollection.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/statecollection.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** statecollection.pl	1 Mar 2005 13:40:50 -0000	1.4
--- statecollection.pl	20 Jun 2005 13:18:45 -0000	1.5
***************
*** 32,40 ****
  # change status except, if subscription has expired, for the "waited" issue.
  if ($op eq 'serialchangestatus') {
! 	my $sth = $dbh->prepare("select subscriptionid,status from serial where serialid=?");
  	for (my $i=0;$i<=$#serialids;$i++) {
  		$sth->execute($serialids[$i]);
! 		my ($x,$oldstatus) = $sth->fetchrow;
! 		serialchangestatus($serialids[$i],$serialseqs[$i],format_date_in_iso($planneddates[$i]),$status[$i]) unless ($hassubscriptionexpired && $oldstatus == 1);
  	}
  }
--- 32,48 ----
  # change status except, if subscription has expired, for the "waited" issue.
  if ($op eq 'serialchangestatus') {
! 	my $sth = $dbh->prepare("select status from serial where serialid=?");
  	for (my $i=0;$i<=$#serialids;$i++) {
  		$sth->execute($serialids[$i]);
! 		my ($oldstatus) = $sth->fetchrow;
! 		if ($serialids[$i]) {
! 			serialchangestatus($serialids[$i],$serialseqs[$i],format_date_in_iso($planneddates[$i]),$status[$i]) unless ($hassubscriptionexpired && $oldstatus == 1);
! 		} else {
! 			# add a special issue
! 			if ($serialseqs[$i]) {
! 				my $subscription=getsubscription($subscriptionid);
! 				newissue($serialseqs[$i],$subscriptionid,$subscription->{biblionumber},$status[$i], format_date_in_iso($planneddates[$i]));
! 			}
! 		}
  	}
  }




From tipaul at users.sourceforge.net  Mon Jun 20 16:10:05 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:10:05 -0700
Subject: [Koha-cvs] CVS: koha/C4 Accounts2.pm,1.22,1.23 Acquisition.pm,1.12,1.13 AuthoritiesMarc.pm,1.18,1.19 Auth.pm,1.38,1.39 Auth_with_ldap.pm,1.3,1.4 Biblio.pm,1.120,1.121 Bull.pm,1.11,1.12 Context.pm,1.20,1.21 Members.pm,1.7,1.8 Output.pm,1.51,1.52 SearchMarc.pm,1.45,1.46
Message-ID: <E1DkMyT-0000Nz-UD@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1223/C4

Modified Files:
	Accounts2.pm Acquisition.pm AuthoritiesMarc.pm Auth.pm 
	Auth_with_ldap.pm Biblio.pm Bull.pm Context.pm Members.pm 
	Output.pm SearchMarc.pm 
Log Message:
synch'ing 2.2 and head

Index: Accounts2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Accounts2.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** Accounts2.pm	9 Dec 2003 15:03:00 -0000	1.22
--- Accounts2.pm	20 Jun 2005 14:10:00 -0000	1.23
***************
*** 302,310 ****
    }
    if ($itemnum ne ''){
- #FIXME to use ? before uncommenting
- #     my $sth=$dbh->prepare("Select * from items where barcode='$itemnum'");
- #     $sth->execute;
- #     my $data=$sth->fetchrow_hashref;
- #     $sth->finish;
      $desc.=" ".$itemnum;
      my $sth=$dbh->prepare("INSERT INTO	accountlines
--- 302,305 ----
***************
*** 314,318 ****
       $sth->execute($bornum, $accountno, $amount, $desc, $type, $amountleft, $itemnum);
    } else {
-     $desc=$dbh->quote($desc);
      my $sth=$dbh->prepare("INSERT INTO	accountlines
  			(borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding)
--- 309,312 ----

Index: Acquisition.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** Acquisition.pm	6 Jun 2005 23:29:36 -0000	1.12
--- Acquisition.pm	20 Jun 2005 14:10:00 -0000	1.13
***************
*** 105,109 ****
  	my ($basketno,$supplier,$orderby)=@_;
  	my $dbh = C4::Context->dbh;
! 	my $query="Select *,biblio.title,aqorders.ordernumber from aqorders,biblio,biblioitems
  	left join aqorderbreakdown on aqorderbreakdown.ordernumber=aqorders.ordernumber
  	where basketno='$basketno'
--- 105,109 ----
  	my ($basketno,$supplier,$orderby)=@_;
  	my $dbh = C4::Context->dbh;
! 	my $query="Select biblio.*,biblioitems.*,aqorders.*,aqorderbreakdown.*,biblio.title from aqorders,biblio,biblioitems
  	left join aqorderbreakdown on aqorderbreakdown.ordernumber=aqorders.ordernumber
  	where basketno='$basketno'
***************
*** 563,567 ****
  	map { push(@searchterms,"$_%","% $_%") } @data;
  	push(@searchterms,$search,$search,$biblio);
! 	my $sth=$dbh->prepare("Select *,biblio.title from aqorders,biblioitems,biblio,aqbasket
  		where aqorders.biblioitemnumber = biblioitems.biblioitemnumber and
  		aqorders.basketno = aqbasket.basketno
--- 563,567 ----
  	map { push(@searchterms,"$_%","% $_%") } @data;
  	push(@searchterms,$search,$search,$biblio);
! 	my $sth=$dbh->prepare("Select biblio.*,biblioitems.*,aqorders.*,aqbasket.*,biblio.title from aqorders,biblioitems,biblio,aqbasket
  		where aqorders.biblioitemnumber = biblioitems.biblioitemnumber and
  		aqorders.basketno = aqbasket.basketno
***************
*** 598,610 ****
  
  sub histsearch {
! 	my ($title,$author,$name)=@_;
  	my $dbh= C4::Context->dbh;
! 	my $query = "select biblio.title,aqorders.basketno,name,aqbasket.creationdate,aqorders.datereceived, aqorders.quantity, aqorders.ecost
! 							from aqorders,aqbasket,aqbooksellers,biblio 
! 							where aqorders.basketno=aqbasket.basketno and aqbasket.booksellerid=aqbooksellers.id and
! 							biblio.biblionumber=aqorders.biblionumber";
  	$query .= " and biblio.title like ".$dbh->quote("%".$title."%") if $title;
  	$query .= " and biblio.author like ".$dbh->quote("%".$author."%") if $author;
  	$query .= " and name like ".$dbh->quote("%".$name."%") if $name;
  	my $sth = $dbh->prepare($query);
  	$sth->execute;
--- 598,612 ----
  
  sub histsearch {
! 	my ($title,$author,$name,$from_placed_on,$to_placed_on)=@_;
  	my $dbh= C4::Context->dbh;
! 	my $query = "select biblio.title,aqorders.basketno,name,aqbasket.creationdate,aqorders.datereceived, aqorders.quantity, aqorders.ecost from aqorders,aqbasket,aqbooksellers,biblio 
! where aqorders.basketno=aqbasket.basketno and aqbasket.booksellerid=aqbooksellers.id and
! biblio.biblionumber=aqorders.biblionumber";
  	$query .= " and biblio.title like ".$dbh->quote("%".$title."%") if $title;
  	$query .= " and biblio.author like ".$dbh->quote("%".$author."%") if $author;
  	$query .= " and name like ".$dbh->quote("%".$name."%") if $name;
+ 	$query .= " and creationdate >" .$dbh->quote($from_placed_on) if $from_placed_on;
+ 	$query .= " and creationdate<".$dbh->quote($to_placed_on) if $to_placed_on;
+ 	warn "C4:Acquisition : ".$query;
  	my $sth = $dbh->prepare($query);
  	$sth->execute;

Index: AuthoritiesMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/AuthoritiesMarc.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** AuthoritiesMarc.pm	7 Jun 2005 10:00:47 -0000	1.18
--- AuthoritiesMarc.pm	20 Jun 2005 14:10:00 -0000	1.19
***************
*** 667,671 ****
--- 667,673 ----
  			if (@$rtags[$i] <10) {
  				$prevvalue= @$rvalues[$i];
+ 				undef $field;
  			} else {
+ 				undef $prevvalue;
  				$field = MARC::Field->new( (sprintf "%03s",@$rtags[$i]), substr($indicators{@$rtags[$i]},0,1),substr($indicators{@$rtags[$i]},1,1), @$rsubfields[$i] => @$rvalues[$i]);
  			}
***************
*** 675,679 ****
  				$prevvalue=@$rvalues[$i];
  			} else {
! 				if (@$rvalues[$i]) {
  					$field->add_subfields(@$rsubfields[$i] => @$rvalues[$i]);
  				}
--- 677,681 ----
  				$prevvalue=@$rvalues[$i];
  			} else {
! 				if (length(@$rvalues[$i])>0) {
  					$field->add_subfields(@$rsubfields[$i] => @$rvalues[$i]);
  				}
***************
*** 683,688 ****
  	}
  	# the last has not been included inside the loop... do it now !
! 	$record->add_fields($field);
! # 	warn $record->as_formatted;
  	return $record;
  }
--- 685,689 ----
  	}
  	# the last has not been included inside the loop... do it now !
! 	$record->add_fields($field) if $field;
  	return $record;
  }
***************
*** 922,925 ****
--- 923,929 ----
  # $Id$
  # $Log$
+ # Revision 1.19  2005/06/20 14:10:00  tipaul
+ # synch'ing 2.2 and head
+ #
  # Revision 1.18  2005/06/07 10:00:47  tipaul
  # adding $b to mainentry (in UNIMARC, for personal names, $a is the surname, $b is the firstname)

Index: Auth.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Auth.pm,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** Auth.pm	4 May 2005 15:40:01 -0000	1.38
--- Auth.pm	20 Jun 2005 14:10:00 -0000	1.39
***************
*** 400,404 ****
  
  	my $self_url = $query->url(-absolute => 1);
! 	$template->param(url => $self_url);
  	$template->param(\%info);
  	$cookie=$query->cookie(-name => 'sessionID',
--- 400,404 ----
  
  	my $self_url = $query->url(-absolute => 1);
! 	$template->param(url => $self_url, LibraryName=> => C4::Context->preference("LibraryName"),);
  	$template->param(\%info);
  	$cookie=$query->cookie(-name => 'sessionID',

Index: Auth_with_ldap.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Auth_with_ldap.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Auth_with_ldap.pm	4 May 2005 15:40:01 -0000	1.3
--- Auth_with_ldap.pm	20 Jun 2005 14:10:00 -0000	1.4
***************
*** 138,142 ****
  		$template->param(USER_INFO => \@bordat,
  		);
- 		
  		# We are going to use the $flags returned by checkauth
  		# to create the template's parameters that will indicate
--- 138,141 ----
***************
*** 164,167 ****
--- 163,167 ----
  			$template->param(CAN_user_catalogue => 1); }
  		
+ 
  		if ($flags->{parameters} == 1) {
  			$template->param(CAN_user_parameters => 1);	
***************
*** 169,175 ****
--- 169,177 ----
  			$template->param(CAN_user_tools => 1); }
  		
+ 
  		if ($flags->{borrowers} == 1) {
  			$template->param(CAN_user_borrowers => 1); }
  		
+ 
  		if ($flags->{permissions} == 1) {
  			$template->param(CAN_user_permission => 1); }
***************
*** 178,190 ****
--- 180,196 ----
  			$template->param(CAN_user_reserveforothers => 1); }
  		
+ 
  		if ($flags->{borrow} == 1) {
  			$template->param(CAN_user_borrow => 1); }
  		
+ 
  		if ($flags->{reserveforself} == 1) {
  			$template->param(CAN_user_reserveforself => 1); }
  		
+ 
  		if ($flags->{editcatalogue} == 1) {
  			$template->param(CAN_user_editcatalogue => 1); }
  		
+ 
  		if ($flags->{updatecharges} == 1) {
  			$template->param(CAN_user_updatecharge => 1); }

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -r1.120 -r1.121
*** Biblio.pm	15 Jun 2005 16:09:43 -0000	1.120
--- Biblio.pm	20 Jun 2005 14:10:00 -0000	1.121
***************
*** 59,62 ****
--- 59,63 ----
    &NEWmodbiblio &NEWmoditem
    &NEWdelbiblio &NEWdelitem
+   &NEWmodbiblioframework
  
    &MARCaddbiblio &MARCadditem
***************
*** 930,934 ****
              $row->{'author'},'' );
      }
!     my $sth2 =
        $dbh->prepare(" SELECT subject FROM bibliosubject WHERE biblionumber=?");
      $sth2->execute($biblionumber);
--- 931,935 ----
              $row->{'author'},'' );
      }
!     $sth2 =
        $dbh->prepare(" SELECT subject FROM bibliosubject WHERE biblionumber=?");
      $sth2->execute($biblionumber);
***************
*** 937,941 ****
              $row->{'subject'},'' );
      }
!     my $sth2 =
        $dbh->prepare(
          " SELECT subtitle FROM bibliosubtitle WHERE biblionumber=?");
--- 938,942 ----
              $row->{'subject'},'' );
      }
!     $sth2 =
        $dbh->prepare(
          " SELECT subtitle FROM bibliosubtitle WHERE biblionumber=?");
***************
*** 1044,1048 ****
--- 1045,1051 ----
  			if (@$rtags[$i] <10) {
  				$prevvalue= @$rvalues[$i];
+ 				undef $field;
  			} else {
+ 				undef $prevvalue;
  				$field = MARC::Field->new( (sprintf "%03s",@$rtags[$i]), substr($indicators{@$rtags[$i]},0,1),substr($indicators{@$rtags[$i]},1,1), @$rsubfields[$i] => @$rvalues[$i]);
  # 			warn "1=>".@$rtags[$i].@$rsubfields[$i]." = ".@$rvalues[$i].": ".$field->as_formatted;
***************
*** 1062,1066 ****
  	}
  	# the last has not been included inside the loop... do it now !
! 	$record->add_fields($field);
  # 	warn "HTML2MARC=".$record->as_formatted;
  	return $record;
--- 1065,1069 ----
  	}
  	# the last has not been included inside the loop... do it now !
! 	$record->add_fields($field) if $field;
  # 	warn "HTML2MARC=".$record->as_formatted;
  	return $record;
***************
*** 1101,1105 ****
  	}
  # modify publicationyear to keep only the 1st year found
! 	my $temp = $result->{'publicationyear'};
  	$temp =~ m/c(\d\d\d\d)/; # search cYYYY first
  	if ($1>0) {
--- 1104,1108 ----
  	}
  # modify publicationyear to keep only the 1st year found
! 	$temp = $result->{'publicationyear'};
  	$temp =~ m/c(\d\d\d\d)/; # search cYYYY first
  	if ($1>0) {
***************
*** 1275,1278 ****
--- 1278,1287 ----
  }
  
+ sub NEWmodbiblioframework {
+ 	my ($dbh,$bibid,$frameworkcode) =@_;
+ 	my $sth = $dbh->prepare("Update marc_biblio SET frameworkcode=? WHERE bibid=$bibid");
+ 	$sth->execute($frameworkcode);
+ 	return 1;
+ }
  sub NEWmodbiblio {
  	my ($dbh,$record,$bibid,$frameworkcode) =@_;
***************
*** 1348,1352 ****
  
      # add itemnumber to MARC::Record before adding the item.
!     my $sth =
        $dbh->prepare(
  "select tagfield,tagsubfield from marc_subfield_structure where frameworkcode=? and kohafield=?"
--- 1357,1361 ----
  
      # add itemnumber to MARC::Record before adding the item.
!     $sth =
        $dbh->prepare(
  "select tagfield,tagsubfield from marc_subfield_structure where frameworkcode=? and kohafield=?"
***************
*** 1458,1462 ****
      $sth =
        $dbh->prepare(
! "insert into biblio set biblionumber  = ?, title = ?, author = ?, copyrightdate = ?, serial = ?, seriestitle = ?, notes = ?, abstract = ?"
      );
      $sth->execute(
--- 1467,1471 ----
      $sth =
        $dbh->prepare(
! "insert into biblio set biblionumber  = ?, title = ?, author = ?, copyrightdate = ?, serial = ?, seriestitle = ?, notes = ?, abstract = ?, unititle = ?"
      );
      $sth->execute(
***************
*** 1464,1468 ****
          $biblio->{'author'}, $biblio->{'copyrightdate'},
          $biblio->{'serial'},             $biblio->{'seriestitle'},
!         $biblio->{'notes'},  $biblio->{'abstract'}
      );
  
--- 1473,1478 ----
          $biblio->{'author'}, $biblio->{'copyrightdate'},
          $biblio->{'serial'},             $biblio->{'seriestitle'},
!         $biblio->{'notes'},  $biblio->{'abstract'},
! 		$biblio->{'unititle'},
      );
  
***************
*** 2672,2675 ****
--- 2682,2688 ----
  # $Id$
  # $Log$
+ # Revision 1.121  2005/06/20 14:10:00  tipaul
+ # synch'ing 2.2 and head
+ #
  # Revision 1.120  2005/06/15 16:09:43  hdl
  # Displaying dashed isbn.

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** Bull.pm	17 Jun 2005 13:44:25 -0000	1.11
--- Bull.pm	20 Jun 2005 14:10:01 -0000	1.12
***************
*** 47,50 ****
--- 47,51 ----
  @EXPORT = qw(&newsubscription &modsubscription &delsubscription &getsubscriptions &getsubscription 
  			&getsubscriptionfrombiblionumber &get_subscription_list_from_biblionumber
+ 			&get_full_subscription_list_from_biblionumber 
  			&modsubscriptionhistory &newissue
  			&getserials &serialchangestatus
***************
*** 101,104 ****
--- 102,106 ----
  	return @issuelist;
  }
+ 
  sub newsubscription {
  	my ($auser,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber,
***************
*** 140,143 ****
--- 142,146 ----
  	return $subscriptionid;
  }
+ 
  sub getsubscription {
  	my ($subscriptionid) = @_;
***************
*** 167,171 ****
  	my ($biblionumber) = @_;
  	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare('select subscription.*,subscriptionhistory.*,aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle 
  							from subscription 
  							left join subscriptionhistory on subscription.subscriptionid=subscriptionhistory.subscriptionid
--- 170,174 ----
  	my ($biblionumber) = @_;
  	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare('select subscription.*,subscriptionhistory.*,  aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle 
  							from subscription 
  							left join subscriptionhistory on subscription.subscriptionid=subscriptionhistory.subscriptionid
***************
*** 178,184 ****
--- 181,194 ----
  	while (my $subs = $sth->fetchrow_hashref) {
  		$subs->{startdate} = format_date($subs->{startdate});
+ 		$subs->{histstartdate} = format_date($subs->{histstartdate});
  		$subs->{opacnote} =~ s/\n/\<br\/\>/g;
  		$subs->{missinglist} =~ s/\n/\<br\/\>/g;
  		$subs->{recievedlist} =~ s/\n/\<br\/\>/g;
+ 		$subs->{"periodicity".$subs->{periodicity}} = 1;
+ 		if ($subs->{enddate} eq '0000-00-00') {
+ 			$subs->{enddate}='';
+ 		} else {
+ 			$subs->{enddate} = format_date($subs->{enddate});
+ 		}
  		push @res,$subs;
  	}
***************
*** 186,189 ****
--- 196,263 ----
  }
  
+ sub get_full_subscription_list_from_biblionumber {
+ 	my ($biblionumber) = @_;
+ 	my $dbh = C4::Context->dbh;
+ 	my $sth = $dbh->prepare('select serial.serialseq, serial.planneddate, serial.status, year(serial.planneddate) as year,subscription.*, aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle 
+ 							from serial left join subscription on (serial.subscriptionid=subscription.subscriptionid and subscription.biblionumber=serial.biblionumber)
+ 							left join aqbudget on subscription.aqbudgetid=aqbudget.aqbudgetid 
+ 							left join aqbooksellers on subscription.aqbooksellerid=aqbooksellers.id 
+ 							left join biblio on biblio.biblionumber=subscription.biblionumber 
+ 							where subscription.biblionumber = ? order by year,serial.planneddate');
+ 	$sth->execute($biblionumber);
+ 	my @res;
+ 	my $year;
+ 	my $startdate;
+ 	my $aqbooksellername;
+ 	my $bibliotitle;
+ 	my @loopissues;
+ 	my $first;
+ 	while (my $subs = $sth->fetchrow_hashref) {
+ # 		my $sth2 = $dbh->prepare('select * from serial where serial.biblionumber = ? and serial.subscriptionid=? order by serial.planneddate');
+ # 		$sth2->execute($biblionumber,$subs->{'subscriptionid'});
+ # 		while (my $issues = $sth2->fetchrow_hashref){
+ # 				warn "planneddate ".$issues->{'planneddate'};
+ # 				warn "serialseq".$issues->{'serialseq'};
+ # 		}
+ 		if ($year and ($year==$subs->{year})){
+ 			if ($first eq 1){$first=0;}
+ 			my $temp=$res[scalar(@res)-1]->{'serials'};
+ 			push @$temp,
+ 				{'planneddate' => format_date($subs->{'planneddate'}), 
+ 				'serialseq' => $subs->{'serialseq'},
+ 				'status1' => $subs->{'status'}==1,
+ 				'status2' => $subs->{'status'}==2,
+ 				'status3' => $subs->{'status'}==3,
+ 				'status4' => $subs->{'status'}==4,
+ 				};
+ 		}else {
+ 			$first=1 if (not $year);
+ 			$year= $subs->{'year'};
+ 			$startdate= format_date($subs->{'startdate'});
+ 			$aqbooksellername= $subs->{'aqbooksellername'};
+ 			$bibliotitle= $subs->{'bibliotitle'};
+ 			my @temp;
+ 			push @temp,
+ 				{'planneddate' => format_date($subs->{'planneddate'}), 
+ 				'serialseq' => $subs->{'serialseq'},
+ 				'status1' => $subs->{'status'}==1,
+ 				'status2' => $subs->{'status'}==2,
+ 				'status3' => $subs->{'status'}==3,
+ 				'status4' => $subs->{'status'}==4,
+ 				};
+ 			
+ 			push @res,{
+ 				'year'=>$year,
+ 				'startdate'=>$startdate,
+ 				'aqbooksellername'=>$aqbooksellername,
+ 				'bibliotitle'=>$bibliotitle,
+ 				'serials'=>\@temp,
+ 				'first'=>$first 
+ 			};
+ 		}
+ 	}
+ 	return \@res;
+ }
+ 
  
  sub modsubscription {
***************
*** 301,323 ****
  		push @serials,$line;
  	}
! 	return \@serials;
! }
! 
! sub serialdelete {
! 	my ($serialid,$serialseq)=@_;
! 	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare("select subscriptionid,status from serial where serialid=?");
! 	$sth->execute($serialid);
! 	my ($subscriptionid,$oldstatus) = $sth->fetchrow;
! 	# change status & update subscriptionhistory
! 	my $sth = $dbh->prepare("delete * from serial  where serialid = ?");
! 	$sth->execute($serialid);
! 	$sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
  	$sth->execute($subscriptionid);
! 	my ($missinglist,$recievedlist) = $sth->fetchrow;
! 	$recievedlist =~ s/",$serialseq"//;
! 	$missinglist =~ s/",$serialseq"//;
! 	$sth=$dbh->prepare("update subscriptionhistory set recievedlist=?, missinglist=? where subscriptionid=?");
! 	$sth->execute($recievedlist,$missinglist,$subscriptionid);
  }
  
--- 375,382 ----
  		push @serials,$line;
  	}
! 	$sth=$dbh->prepare("select count(*) from serial where subscriptionid=?");
  	$sth->execute($subscriptionid);
! 	my ($totalissues) = $sth->fetchrow;
! 	return ($totalissues, at serials);
  }
  
***************
*** 370,380 ****
  	my $sth = $dbh->prepare("insert into serial (serialseq,subscriptionid,biblionumber,status, planneddate) values (?,?,?,?,?)");
  	$sth->execute($serialseq,$subscriptionid,$biblionumber,$status, $planneddate);
! }
! 
! sub delissue {
! 	my ($serialseq,$subscriptionid) = @_;
! 	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare("delete from serial where serialseq= ? and subscriptionid= ? ");
! 	$sth->execute($serialseq,$subscriptionid);
  }
  
--- 429,443 ----
  	my $sth = $dbh->prepare("insert into serial (serialseq,subscriptionid,biblionumber,status, planneddate) values (?,?,?,?,?)");
  	$sth->execute($serialseq,$subscriptionid,$biblionumber,$status, $planneddate);
! 	$sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
! 	$sth->execute($subscriptionid);
! 	my ($missinglist,$recievedlist) = $sth->fetchrow;
! 	if ($status eq 2) {
! 		$recievedlist .= ",$serialseq";
! 	}
! 	if ($status eq 4) {
! 		$missinglist .= ",$serialseq";
! 	}
! 	$sth=$dbh->prepare("update subscriptionhistory set recievedlist=?, missinglist=? where subscriptionid=?");
! 	$sth->execute($recievedlist,$missinglist,$subscriptionid);
  }
  


Index: Members.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Members.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Members.pm	4 May 2005 15:40:01 -0000	1.7
--- Members.pm	20 Jun 2005 14:10:01 -0000	1.8
***************
*** 100,104 ****
  	my $dbh = C4::Context->dbh;
  	$data{'dateofbirth'}=format_date_in_iso($data{'dateofbirth'});
- 	$data{'joining'}=format_date_in_iso($data{'joining'});
  	$data{'expiry'}=format_date_in_iso($data{'expiry'});
  	my $query="update borrowers set title='$data{'title'}',expiry='$data{'expiry'}',
--- 100,103 ----
***************
*** 106,110 ****
  	streetaddress='$data{'streetaddress'}',faxnumber='$data{'faxnumber'}',firstname='$data{'firstname'}',
  	altnotes='$data{'altnotes'}',dateofbirth='$data{'dateofbirth'}',contactname='$data{'contactname'}',
! 	emailaddress='$data{'emailaddress'}',dateenrolled='$data{'joining'}',streetcity='$data{'streetcity'}',
  	altrelationship='$data{'altrelationship'}',othernames='$data{'othernames'}',phoneday='$data{'phoneday'}',
  	categorycode='$data{'categorycode'}',city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}',
--- 105,109 ----
  	streetaddress='$data{'streetaddress'}',faxnumber='$data{'faxnumber'}',firstname='$data{'firstname'}',
  	altnotes='$data{'altnotes'}',dateofbirth='$data{'dateofbirth'}',contactname='$data{'contactname'}',
! 	emailaddress='$data{'emailaddress'}',streetcity='$data{'streetcity'}',
  	altrelationship='$data{'altrelationship'}',othernames='$data{'othernames'}',phoneday='$data{'phoneday'}',
  	categorycode='$data{'categorycode'}',city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}',
***************
*** 131,135 ****
--- 130,143 ----
  	my $dbh = C4::Context->dbh;
  	$data{'dateofbirth'}=format_date_in_iso($data{'dateofbirth'});
+ 	$data{'joining'} = &ParseDate("today") unless $data{'joining'};
  	$data{'joining'}=format_date_in_iso($data{'joining'});
+ 	# if expirydate is not set, calculate it from borrower category subscription duration
+ 	unless ($data{'expiry'}) {
+ 		my $sth = $dbh->prepare("select enrolmentperiod from categories where categorycode=?");
+ 		$sth->execute($data{'categorycode'});
+ 		my ($enrolmentperiod) = $sth->fetchrow;
+ 		$enrolmentperiod = 12 unless ($enrolmentperiod);
+ 		$data{'expiry'} = &DateCalc($data{'joining'},"$enrolmentperiod years");
+ 	}
  	$data{'expiry'}=format_date_in_iso($data{'expiry'});
  # 	$data{'borrowernumber'}=NewBorrowerNumber();

Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -r1.51 -r1.52
*** Output.pm	3 Jan 2005 10:58:46 -0000	1.51
--- Output.pm	20 Jun 2005 14:10:01 -0000	1.52
***************
*** 84,87 ****
--- 84,88 ----
  							theme => $theme,
  							opacstylesheet => $opacstylesheet,
+ 							opacsmallimage => C4::Context->preference('opacsmallimage'),
  							lang => $lang);
  

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** SearchMarc.pm	15 Jun 2005 13:21:22 -0000	1.45
--- SearchMarc.pm	20 Jun 2005 14:10:01 -0000	1.46
***************
*** 340,344 ****
  	# HINT : biblionumber as bn is important. The hash is fills biblionumber with items.biblionumber.
  	# so if you dont' has an item, you get a not nice empty value.
! 	$sth = $dbh->prepare("SELECT biblio.biblionumber as bn,biblio.*, biblioitems.*,marc_biblio.bibid,itemtypes.notforloan,itemtypes.description
  							FROM biblio, marc_biblio 
  							LEFT JOIN biblioitems on biblio.biblionumber = biblioitems.biblionumber
--- 340,344 ----
  	# HINT : biblionumber as bn is important. The hash is fills biblionumber with items.biblionumber.
  	# so if you dont' has an item, you get a not nice empty value.
! 	$sth = $dbh->prepare("SELECT biblio.biblionumber as bn,biblioitems.*,biblio.*, marc_biblio.bibid,itemtypes.notforloan,itemtypes.description
  							FROM biblio, marc_biblio 
  							LEFT JOIN biblioitems on biblio.biblionumber = biblioitems.biblionumber
***************
*** 351,355 ****
  	my $oldline;
  	my ($oldbibid, $oldauthor, $oldtitle);
! 	my $sth_itemCN = $dbh->prepare("select items.* from items where biblionumber=?");
  	my $sth_issue = $dbh->prepare("select date_due,returndate from issues where itemnumber=?");
  	# parse all biblios between start & end.
--- 351,360 ----
  	my $oldline;
  	my ($oldbibid, $oldauthor, $oldtitle);
! 	my $sth_itemCN;
! 	if (C4::Context->preference('hidelostitem')) {
! 		$sth_itemCN = $dbh->prepare("select items.* from items where biblionumber=? and (itemlost = 0 or itemlost is NULL)");
! 	} else {
! 		$sth_itemCN = $dbh->prepare("select items.* from items where biblionumber=?");
! 	}
  	my $sth_issue = $dbh->prepare("select date_due,returndate from issues where itemnumber=?");
  	# parse all biblios between start & end.




From tipaul at users.sourceforge.net  Mon Jun 20 16:10:42 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:10:42 -0700
Subject: [Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.93,1.94 Fines.pm,1.10,1.11
Message-ID: <E1DkMz4-0000Rg-Pr@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Circulation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1597/C4/Circulation

Modified Files:
	Circ2.pm Fines.pm 
Log Message:
synch'ing 2.2 and head

Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -r1.93 -r1.94
*** Circ2.pm	15 May 2005 04:34:09 -0000	1.93
--- Circ2.pm	20 Jun 2005 14:10:30 -0000	1.94
***************
*** 609,613 ****
  	$sth->execute($cat_borrower, $type, $branch_borrower);
  	my $result = $sth->fetchrow_hashref;
! # 	warn "==>".$result->{maxissueqty};
  	if (defined($result)) {
  		$sth2->execute($borrower->{'borrowernumber'}, "%$type%");
--- 609,613 ----
  	$sth->execute($cat_borrower, $type, $branch_borrower);
  	my $result = $sth->fetchrow_hashref;
! #	warn "==>".$result->{maxissueqty};
  	if (defined($result)) {
  		$sth2->execute($borrower->{'borrowernumber'}, "%$type%");
***************
*** 628,632 ****
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my $alreadyissued = $sth2->fetchrow;
  		return ("c $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}
--- 628,633 ----
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my ($alreadyissued) = $sth3->fetchrow;
! 		warn "HERE : $alreadyissued / ($result->{maxissueqty} for $borrower->{'borrowernumber'}";
  		return ("c $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}
***************
*** 644,648 ****
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my $alreadyissued = $sth2->fetchrow;
  		return ("e $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}
--- 645,649 ----
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my $alreadyissued = $sth3->fetchrow;
  		return ("e $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}
***************
*** 668,672 ****
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my $alreadyissued = $sth2->fetchrow;
  		return ("h $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}
--- 669,673 ----
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my $alreadyissued = $sth3->fetchrow;
  		return ("h $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}
***************
*** 699,702 ****
--- 700,706 ----
  		$issuingimpossible{DEBARRED} = 1;
  	}
+ 	if (&Date_Cmp(&ParseDate($borrower->{expiry}),&ParseDate("today"))<0) {
+ 		$issuingimpossible{EXPIRED} = 1;
+ 	}
  #
  # BORROWER STATUS
***************
*** 767,771 ****
  			my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
  			$needsconfirmation{RESERVE_WAITING} = "$resborrower->{'firstname'} $resborrower->{'surname'} ($resborrower->{'cardnumber'}, $branchname)";
! 			CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'});
  		} elsif ($restype eq "Reserved") {
  			# The item is on reserve for someone else.
--- 771,775 ----
  			my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
  			$needsconfirmation{RESERVE_WAITING} = "$resborrower->{'firstname'} $resborrower->{'surname'} ($resborrower->{'cardnumber'}, $branchname)";
! 			# CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'}); Doesn't belong in a checking subroutine.
  		} elsif ($restype eq "Reserved") {
  			# The item is on reserve for someone else.
***************
*** 842,846 ****
  				my $branches = getbranches();
  				my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
! 				CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'});
  			} elsif ($restype eq "Reserved") {
  				warn "Reserved";
--- 846,852 ----
  				my $branches = getbranches();
  				my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
!                 if ($cancelreserve){
!     				CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'});
!                 }
  			} elsif ($restype eq "Reserved") {
  				warn "Reserved";
***************
*** 853,861 ****
  					CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'});
  					# also cancel reserve on biblio related to this item
! 					my $st_Fbiblio = $dbh->prepare("select biblionumber from items where itemnumber=?");
! 					$st_Fbiblio->execute($res->{'itemnumber'});
! 					my $biblionumber = $st_Fbiblio->fetchrow;
! 					CancelReserve($biblionumber,0,$res->{'borrowernumber'});
! 					warn "CancelReserve $res->{'itemnumber'}, $res->{'borrowernumber'}";
  				} else {
  # 					my $tobrcd = ReserveWaiting($res->{'itemnumber'}, $res->{'borrowernumber'});
--- 859,867 ----
  					CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'});
  					# also cancel reserve on biblio related to this item
! 					#my $st_Fbiblio = $dbh->prepare("select biblionumber from items where itemnumber=?");
! 					#$st_Fbiblio->execute($res->{'itemnumber'});
! 					#my $biblionumber = $st_Fbiblio->fetchrow;
! 					#CancelReserve($biblionumber,0,$res->{'borrowernumber'});
! 					#warn "CancelReserve $res->{'itemnumber'}, $res->{'borrowernumber'}";
  				} else {
  # 					my $tobrcd = ReserveWaiting($res->{'itemnumber'}, $res->{'borrowernumber'});
***************
*** 1619,1622 ****
--- 1625,1637 ----
  		}
  		$sth2->finish;
+ 		my ($resfound, $resrec) = CheckReserves($itemno);
+ 		if ($resfound) {
+ 			$renewokay = 0;
+ 		}
+ 		my ($resfound, $resrec) = CheckReserves($itemno);
+                 if ($resfound) {
+                         $renewokay = 0;
+                 }
+ 
  	}
  	$sth1->finish;

Index: Fines.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Fines.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Fines.pm	1 Mar 2005 03:08:00 -0000	1.10
--- Fines.pm	20 Jun 2005 14:10:31 -0000	1.11
***************
*** 152,157 ****
    biblioitems.itemtype=itemtypes.itemtype and
    categoryitem.itemtype=itemtypes.itemtype and
!   categoryitem.categorycode=? and
!   (items.itemlost <> 1 or items.itemlost is NULL)");
  #  print $query;
    $sth->execute($itemnumber,$bortype);
--- 152,156 ----
    biblioitems.itemtype=itemtypes.itemtype and
    categoryitem.itemtype=itemtypes.itemtype and
!   categoryitem.categorycode=? and (items.itemlost <> 1 or items.itemlost is NULL)");
  #  print $query;
    $sth->execute($itemnumber,$bortype);




From tipaul at users.sourceforge.net  Mon Jun 20 16:13:24 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:13:24 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui acqui-home.tmpl,1.14,1.15 basket.tmpl,1.21,1.22 histsearch.tmpl,1.3,1.4
Message-ID: <E1DkN1g-0000uX-Qi@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	acqui-home.tmpl basket.tmpl histsearch.tmpl 
Log Message:
synch'ing 2.2 and head

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** acqui-home.tmpl	19 Oct 2004 12:24:57 -0000	1.14
--- acqui-home.tmpl	20 Jun 2005 14:13:12 -0000	1.15
***************
*** 5,8 ****
--- 5,11 ----
  <div id="bloc25">
  	<h2 class="acquisition">Start, receive, modify order</h2>
+ 	<!-- TMPL_IF name="nobudget" -->
+ 		<p class="problem">You must define a budget in parameters</p>
+ 	<!-- TMPL_ELSE -->
  		<form action="/cgi-bin/koha/acqui/order.pl" method="post">
  			Supplier name : <input type="text"  size="25"   name="supplier">
***************
*** 10,13 ****
--- 13,17 ----
  		</form>
  	<p>or <a href="histsearch.pl" class="button acquisition">Search order history</a></p>
+ 	<!-- /TMPL_IF -->
  </div>
  
***************
*** 38,43 ****
  <!-- showbudget-->
  <div id="bloc25">
! 	<form action="/cgi-bin/koha/search.pl">
! 		<h2 class="acquisition">budgets and bookfunds</h2>
  		<table class="noborder">
  			<tr>
--- 42,49 ----
  <!-- showbudget-->
  <div id="bloc25">
! 	<h2 class="acquisition">budgets and bookfunds</h2>
! 	<!-- TMPL_IF name="nobudget" -->
! 		<p class="problem">You must define a budget in parameters</p>
! 	<!-- TMPL_ELSE -->
  		<table class="noborder">
  			<tr>
***************
*** 68,72 ****
  		Use your reload button to get the most recent figures. Committed figures are approximate only, as exchange rates will affect the amount actually paid.
  		</p>
! 	</form>
  </div>
  
--- 74,78 ----
  		Use your reload button to get the most recent figures. Committed figures are approximate only, as exchange rates will affect the amount actually paid.
  		</p>
! 	<!-- /TMPL_IF -->
  </div>
  

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** basket.tmpl	4 May 2005 08:52:49 -0000	1.21
--- basket.tmpl	20 Jun 2005 14:13:22 -0000	1.22
***************
*** 18,21 ****
--- 18,28 ----
  		</div>
  	<!-- /TMPL_UNLESS -->
+ 	<div id="bloc25" style="align:right">
+ 		<p><!-- TMPL_VAR name="name" --></p>
+ 		<p><!-- TMPL_VAR name="address1" --></p>
+ 		<p><!-- TMPL_VAR name="address2" --></p>
+ 		<p><!-- TMPL_VAR name="address3" --></p>
+ 		<p><!-- TMPL_VAR name="address4" --></p>
+ 	</div>
  	<div id="bloc100">
  	<h2 class="acquisition">Order</h2>
***************
*** 24,31 ****
  			<tr valign="top" bgcolor="#ffdf61">
  				<th class="acquisition doNotPrint">Order</th>
! 				<th class="acquisition">Publisher<a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=biblioitems.publishercode" class="acquisition doNotPrint">[order]</a></th>
! 				<th class="acquisition">Isbn</th>
  				<th class="acquisition">Title</th>
- 				<th class="acquisition">Author</th>
  				<th class="acquisition">rrp</th>
  				<th class="acquisition doNotPrint">est</th>
--- 31,36 ----
  			<tr valign="top" bgcolor="#ffdf61">
  				<th class="acquisition doNotPrint">Order</th>
! 				<th class="acquisition">Publisher<a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=biblioitems.publishercode" class="acquisition">[order]</a></th>
  				<th class="acquisition">Title</th>
  				<th class="acquisition">rrp</th>
  				<th class="acquisition doNotPrint">est</th>
***************
*** 40,57 ****
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
! 				<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="color" -->">
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
- 					<td><!-- TMPL_VAR NAME="isbn" --></td>
  					<!-- TMPL_IF name="closedate" -->
! 						<td><!-- TMPL_VAR NAME="title" --></td>
  					<!-- TMPL_ELSE -->
! 						<td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
  					<!-- /TMPL_IF -->
! 					<td><!-- TMPL_VAR NAME="author" --></td>
! 					<td><!-- TMPL_VAR NAME="rrp" --></td>
! 					<td class="doNotPrint"><!-- TMPL_VAR NAME="ecost" --></td>
! 					<td><!-- TMPL_VAR NAME="quantity" --></td>
! 					<td><!-- TMPL_VAR NAME="line_total" --></td>
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="bookfundid" --></td>
  					<!-- TMPL_IF name="active" -->
--- 45,76 ----
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
! 				<!-- TMPL_IF name="odd" -->
! 				<tr class="hilighted">
! 				<!-- TMPL_ELSE -->
! 				<tr>
! 				<!-- /TMPL_IF -->
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
  					<!-- TMPL_IF name="closedate" -->
! 						<td>
! 							<b><!-- TMPL_VAR NAME="title" --></b><br/>
! 								<!-- TMPL_VAR NAME="author" -->
! 								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --><p class="doNotPrint"><i><!--TMPL_VAR name="notes" --></i></p><!-- /TMPL_IF -->
! 						</td>
  					<!-- TMPL_ELSE -->
! 						<td>
! 							<p>
! 							<a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a><br/>
! 								<!-- TMPL_VAR NAME="author" -->
! 								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! 							</p>
! 						</td>
  					<!-- /TMPL_IF -->
! 					<td class="number"><!-- TMPL_VAR NAME="rrp" --></td>
! 					<td class="doNotPrint number"><!-- TMPL_VAR NAME="ecost" --></td>
! 					<td class="number"><!-- TMPL_VAR NAME="quantity" --></td>
! 					<td class="number"><!-- TMPL_VAR NAME="line_total" --></td>
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="bookfundid" --></td>
  					<!-- TMPL_IF name="active" -->
***************
*** 69,85 ****
  			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
  			<tr>
! 				<td colspan="4" rowspan=3>
  					&nbsp;
  				</td>
! 				<th colspan="2" class="acquisition">SubTotal</th>
! 				<th class="acquisition"><!-- TMPL_VAR NAME="currency" --><!-- TMPL_VAR NAME="sub_total" --></th>
! 			</tr>
! 			<tr>
! 				<th colspan="2" class="acquisition">GST</th>
! 				<th class="acquisition"><!-- TMPL_VAR NAME="currency" --><!-- TMPL_VAR NAME="gist" --></th>
! 			</tr>
! 			<tr>
! 				<th colspan="2" class="acquisition">TOTAL</th>
! 				<th class="acquisition"><!-- TMPL_VAR NAME="currency" --><!-- TMPL_VAR NAME="grand_total" --></th>
  			</tr>
  		</table>
--- 88,124 ----
  			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
  			<tr>
! 				<td colspan="2" class="acquisition">
  					&nbsp;
  				</td>
! 				<td class="acquisition number">
! 					<p>Sub total</p>
! 					<p>GST</p>
! 					<p>TOTAL (<!-- TMPL_VAR NAME="currency" -->)</p>
! 				</td>
! 				<td class="acquisition number">
! 					<p><!-- TMPL_VAR NAME="sub_total_est" --></p>
! 					<p><!-- TMPL_VAR NAME="gist_est" --></p>
! 					<p><!-- TMPL_VAR NAME="grand_total_est" --></p>
! 				</td>
! 				<td class="acquisition number">
! 					<p><!-- TMPL_VAR NAME="sub_total" --></p>
! 					<p><!-- TMPL_VAR NAME="gist" --></p>
! 					<p><!-- TMPL_VAR NAME="grand_total" --></p>
! 				</td>
! 				<td class="acquisition">
! 					<p><!-- TMPL_VAR name="qty_total" --></p>
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 				</td>
! 				<td class="acquisition">
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 				</td>
! 				<td class="acquisition">
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 				</td>
  			</tr>
  		</table>

Index: histsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** histsearch.tmpl	20 Jun 2005 10:14:12 -0000	1.3
--- histsearch.tmpl	20 Jun 2005 14:13:22 -0000	1.4
***************
*** 31,34 ****
--- 31,93 ----
  				</th>
  				<th class="acquisition">
+ 					From <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
+ 					<input type="text" readonly="readonly" size="10" id="from" name="fromplacedon" value="<!-- TMPL_VAR name="from_placed_on" -->">
+ 					<script language="JavaScript" type="text/javascript">
+ 						function validate1(date) {
+ 							var day = date.getDate();
+ 							var month = date.getMonth() + 1;
+ 							var year = date.getFullYear();
+ 							var weekDay = date.getDay();
+ 							var dayMonth = month + '-' + day;
+ 							var dateString = year + '-' + month + '-' + day;
+ 							var dateTo = document.getElementById('to').value.split("-");
+ 							var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
+ 							if (date > limitDate) {
+ 								return true;
+ 							} else {
+ 								return false;
+ 							}
+ 						}
+ 						Calendar.setup(
+ 							{
+ 								inputField : "from",
+ 								ifFormat : "%Y-%m-%d",
+ 								button : "openCalendarFrom",
+ 								disableFunc : validate1,
+ 								dateStatusFunc : validate1
+ 							}
+ 						);
+ 					</script>
+ 					To <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
+ 					<input readonly="readonly" size="10" id="to" name="toplacedon" value="<!-- TMPL_VAR name="to_placed_on" -->" type="text">
+ 					<script type="text/javascript">
+ 						function validate2(date) {
+ 							var day = date.getDate();
+ 							var month = date.getMonth() + 1;
+ 							var year = date.getFullYear();
+ 							var weekDay = date.getDay();
+ 							var dayMonth = month + '-' + day;
+ 							var dateString = year + '-' + month + '-' + day;
+ 							var dateFrom = document.getElementById('from').value.split("-");
+ 							var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
+ 							if (limitDate > date) {
+ 								return true;
+ 							} else {
+ 								return false;
+ 							}
+ 						}
+ 
+ 						Calendar.setup(
+ 							{
+ 								inputField : "to",
+ 								ifFormat : "%Y-%m-%d",
+ 								button : "openCalendarTo",
+ 								disableFunc : validate2,
+ 								dateStatusFunc : validate2
+ 							}
+ 						);
+ 					</script>
+ 				</th>
+ 				<th class="acquisition">
  					&nbsp;
  				</th>
***************
*** 77,79 ****
--- 136,139 ----
  	</table>
  </div>
+ 
  <!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->




From tipaul at users.sourceforge.net  Mon Jun 20 16:16:06 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:16:06 -0700
Subject: [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
Message-ID: <E1DkN4I-0001E8-1K@sc8-pr-cvs1.sourceforge.net>

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>




From tipaul at users.sourceforge.net  Mon Jun 20 16:17:07 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:17:07 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/authorities authorities.tmpl,1.9,1.10 detail.tmpl,1.4,1.5
Message-ID: <E1DkN5H-0001PQ-Em@sc8-pr-cvs1.sourceforge.net>

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

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

Index: authorities.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** authorities.tmpl	4 May 2005 08:52:51 -0000	1.9
--- authorities.tmpl	20 Jun 2005 14:17:04 -0000	1.10
***************
*** 4,8 ****
  <div class="tabbed">
  	<form method="post" name="f">
! 	<h1 class="authority">Authority number <!-- TMPL_VAR NAME="authid" --></h1>
  	<p>
  		<input type="hidden" name="op" value="add">
--- 4,12 ----
  <div class="tabbed">
  	<form method="post" name="f">
! 	<!-- TMPL_IF name="authid" -->
! 		<h1 class="authority">Modify authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
! 	<!-- TMPL_ELSE -->
! 		<h1 class="authority">Adding authority (<!-- TMPL_VAR name="authtypetext" -->)</h1>
! 	<!-- /TMPL_IF -->
  	<p>
  		<input type="hidden" name="op" value="add">
***************
*** 21,28 ****
  <!-- TMPL_IF name="duplicateauthid" -->
  	<div class="problem">
! 		<p>Duplicate suspected with <a href='javascript:openWindow("detail.pl?authid=<!-- TMPL_VAR name="duplicateauthnumber" -->&popup=1", "Duplicate Authority")' class="button authority"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
  		<p>You must either :</p>
  		<ul>
! 			<p><input type="checkbox" value=1 name="confirm_not_duplicate">confirm it's not a duplicate (and click on Add Auth again)</p>
  			<p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >original authority</a></p>
  		</ul>
--- 25,32 ----
  <!-- TMPL_IF name="duplicateauthid" -->
  	<div class="problem">
! 		<p>Duplicate suspected with <a href='javascript:openWindow("detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&popup=1", "Duplicate Authority")' class="button authority"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
  		<p>You must either :</p>
  		<ul>
! 			<p><input type="checkbox" value=1 name="confirm_not_duplicate">confirm it's not a duplicate (and click on <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority"> again)</p>
  			<p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >original authority</a></p>
  		</ul>
***************
*** 30,43 ****
  <!-- /TMPL_IF -->
  
- <!-- TMPL_IF name="duplicateauthnumber" -->
- 	<div class="problem">
- 		<p>Duplicate suspected with <a href='javascript:openWindow("detail.pl?authid=<!-- TMPL_VAR name="duplicateauthnumber" -->&popup=1", "Duplicate Authority")' class="button authority"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
- 		<p>You must either :</p>
- 		<ul>
- 			<p><input type="checkbox" value=1 name="confirm_not_duplicate">confirm it's not a duplicate (and click on Add Auth again)</p>
- 			<p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >edit items</a> from this duplicate Authority</p>
- 		</ul>
- 	</div>
- <!-- /TMPL_IF -->
  <!-- TMPL_LOOP NAME="0XX" -->
  	<!-- TMPL_IF name="tag" -->
--- 34,37 ----
***************
*** 185,190 ****
  
  function AddField(field) {
! 	document.forms[0].op.value = "addfield";
! 	document.forms[0].addfield_field.value=field;
  	document.f.submit();
  }
--- 179,184 ----
  
  function AddField(field) {
! 	document.forms[1].op.value = "addfield";
! 	document.forms[1].addfield_field.value=field;
  	document.f.submit();
  }

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** detail.tmpl	4 May 2005 08:52:51 -0000	1.4
--- detail.tmpl	20 Jun 2005 14:17:04 -0000	1.5
***************
*** 2,6 ****
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1 class="authority">Authority number : <!-- TMPL_VAR NAME="authid" --></h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
--- 2,6 ----
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1 class="authority">Authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">




From tipaul at users.sourceforge.net  Mon Jun 20 16:17:51 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:17:51 -0700
Subject: [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
Message-ID: <E1DkN5z-0001VY-6o@sc8-pr-cvs1.sourceforge.net>

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>
  




From tipaul at users.sourceforge.net  Mon Jun 20 16:18:44 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:18:44 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ branchtransfers.tmpl,1.12,1.13 circulation.tmpl,1.37,1.38 selectbranchprinter.tmpl,1.6,1.7
Message-ID: <E1DkN6q-0001gB-5T@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	branchtransfers.tmpl circulation.tmpl selectbranchprinter.tmpl 
Log Message:
synch'ing 2.2 and head

Index: branchtransfers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** branchtransfers.tmpl	5 Nov 2004 10:18:24 -0000	1.12
--- branchtransfers.tmpl	20 Jun 2005 14:18:41 -0000	1.13
***************
*** 1,15 ****
  <!-- TMPL_INCLUDE Name="circulation-top.inc" -->
  <div id="mainbloc">
- <div class="bloc25">
- <a class="button" href="circulation.pl">
- Next Borrower</a>
- <a class="button" href="returns.pl">
- Returns</a>
- </div>
  
! <h1>Circulation: Transfers</h1>
  <b>Branch:</b> <!-- TMPL_VAR NAME="genbrname" --> &nbsp;
  <b>Printer:</b> <!-- TMPL_VAR NAME="genprname" -->
! <a href="selectbranchprinter.pl" class="button">Change Settings</a>
  <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
  <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
--- 1,9 ----
  <!-- TMPL_INCLUDE Name="circulation-top.inc" -->
  <div id="mainbloc">
  
! <h1 class="circulation">Circulation: Transfers</h1>
  <b>Branch:</b> <!-- TMPL_VAR NAME="genbrname" --> &nbsp;
  <b>Printer:</b> <!-- TMPL_VAR NAME="genprname" -->
! <a href="selectbranchprinter.pl" class="button circulation">Change Settings</a>
  <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
  <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
***************
*** 17,21 ****
  <!-- TMPL_IF Name="found" -->
  	<table>
! 	<tr><th>Reserve Found</th></tr>
  	<tr><td>
  	<!-- TMPL_IF Name="reserved" -->
--- 11,15 ----
  <!-- TMPL_IF Name="found" -->
  	<table>
! 	<tr><th class="circulation">Reserve Found</th></tr>
  	<tr><td>
  	<!-- TMPL_IF Name="reserved" -->
***************
*** 38,45 ****
  				<!-- TMPL_IF Name="waiting" --><input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
  					<input type="hidden" name="request" value="KillWaiting">
! 					<input type="submit" value="Cancel" class="button">
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF Name="reserved" --><input type="hidden" name="request" value="SetWaiting">
! 					<input type="submit" value="Waiting" class="button"><!-- /TMPL_IF -->
  			</form></p>
  
--- 32,39 ----
  				<!-- TMPL_IF Name="waiting" --><input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
  					<input type="hidden" name="request" value="KillWaiting">
! 					<input type="submit" value="Cancel" class="button circulation">
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF Name="reserved" --><input type="hidden" name="request" value="SetWaiting">
! 					<input type="submit" value="Waiting" class="button circulation"><!-- /TMPL_IF -->
  			</form></p>
  
***************
*** 58,62 ****
  			<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
  			<input type="hidden" name="request" value="KillReserved">
! 			<input type="submit" value="Cancel" class="button">
  			</form></p>
  		<!-- /TMPL_IF -->
--- 52,56 ----
  			<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
  			<input type="hidden" name="request" value="KillReserved">
! 			<input type="submit" value="Cancel" class="button circulation">
  			</form></p>
  		<!-- /TMPL_IF -->
***************
*** 70,74 ****
  				<input type="hidden" name="tb-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="tobrcd" -->">
  			<!-- /TMPL_LOOP -->
! 			<input type="submit" value="Ignore" class="button">
  			</form></p>
  
--- 64,68 ----
  				<input type="hidden" name="tb-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="tobrcd" -->">
  			<!-- /TMPL_LOOP -->
! 			<input type="submit" value="Ignore" class="button circulation">
  			</form></p>
  
***************
*** 77,81 ****
  <!-- TMPL_ELSE -->
  	<table>
! 	<tr><th>Messages</th></tr>
  	<tr><td>
  	<!-- TMPL_IF Name="reqmessage" -->
--- 71,75 ----
  <!-- TMPL_ELSE -->
  	<table>
! 	<tr><th class="circulation">Messages</th></tr>
  	<tr><td>
  	<!-- TMPL_IF Name="reqmessage" -->
***************
*** 125,130 ****
  		<p>
  		<table border="1" cellpadding="5" cellspacing="0" bgcolor="#dddddd">
! 		<tr><th colspan="6">Transfered Items</th></tr>
! 		<tr><th>Barcode</th><th>Title</th><th>Author</th><th>Type</th><th>From</th><th>To</th></tr>
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td align="center" bgcolor="<!-- TMPL_VAR NAME="color" -->">
--- 119,124 ----
  		<p>
  		<table border="1" cellpadding="5" cellspacing="0" bgcolor="#dddddd">
! 		<tr><th colspan="6" class="circulation">Transfered Items</th></tr>
! 		<tr><th class="circulation">Barcode</th><th class="circulation">Title</th><th class="circulation">Author</th><th class="circulation">Type</th><th class="circulation">From</th><th class="circulation">To</th></tr>
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td align="center" bgcolor="<!-- TMPL_VAR NAME="color" -->">
***************
*** 140,143 ****
--- 134,143 ----
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
+ <div class="bloc25">
+ <a class="button circulation" href="circulation.pl">
+ Next Borrower</a>
+ <a class="button circulation" href="returns.pl">
+ Returns</a>
+ </div>
  
  </div>

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** circulation.tmpl	4 May 2005 08:52:53 -0000	1.37
--- circulation.tmpl	20 Jun 2005 14:18:41 -0000	1.38
***************
*** 184,187 ****
--- 184,190 ----
  				<p class="problem">No more renewals possible</p>
  			<!-- /TMPL_IF -->
+ 			<!-- TMPL_IF NAME="EXPIRED" -->
+ 				<p class="problem">Borrower card expired</p>
+ 			<!-- /TMPL_IF -->
  			<br/>
  		<!-- /TMPL_IF -->

Index: selectbranchprinter.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/selectbranchprinter.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** selectbranchprinter.tmpl	19 Jul 2004 19:58:38 -0000	1.6
--- selectbranchprinter.tmpl	20 Jun 2005 14:18:41 -0000	1.7
***************
*** 2,6 ****
  
  <div id="mainbloc">
! <h1>Circulation: Select Printer and Branch Settings</h1>
  
  <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
--- 2,6 ----
  
  <div id="mainbloc">
! <h1 class="circulation">Circulation: Select Printer and Branch Settings</h1>
  
  <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
***************
*** 30,34 ****
  <!-- /TMPL_IF --></p>
  <p><input type="hidden" name="setcookies" value="1">
! <input type="submit" value="Submit" type="changesettings" class="button"></p>
  </form>
  
--- 30,34 ----
  <!-- /TMPL_IF --></p>
  <p><input type="hidden" name="setcookies" value="1">
! <input type="submit" value="Submit" type="changesettings" class="button circulation"></p>
  </form>
  




From tipaul at users.sourceforge.net  Mon Jun 20 16:18:57 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:18:57 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/circ circulation.tmpl,1.1,1.2 returns.tmpl,1.1,1.2
Message-ID: <E1DkN73-0001hW-R5@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	circulation.tmpl returns.tmpl 
Log Message:
synch'ing 2.2 and head






From tipaul at users.sourceforge.net  Mon Jun 20 16:18:57 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:18:57 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/admin marc_subfields_structure.tmpl,1.1,1.2
Message-ID: <E1DkN73-0001hV-QF@sc8-pr-cvs1.sourceforge.net>

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

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

Index: marc_subfields_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** marc_subfields_structure.tmpl	19 Nov 2004 15:13:11 -0000	1.1
--- marc_subfields_structure.tmpl	20 Jun 2005 14:18:55 -0000	1.2
***************
*** 21,25 ****
  <li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
  <li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
! <li>link : useless for instance</li>
  </ul>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- 21,30 ----
  <li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
  <li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
! <li>link : If you enter a field/subfield here (200b), a little glass appears after the subfield. If the user clic on the glass, a search is done on the DB for the field/subfield with the same value. Can be used for 2 main topic : 
! 	<ul>
! 		<li>on a field like author (200f in UNIMARC), put 200f here, you will be able to see all biblios with the same author</li>
! 		<li>on a field that is a link (4xx) to reach another biblio. For example, put 011a in 464$x, will find the serial that was previously with this issn. With the 4xx pligin, you get a powerful tool to manage biblios connected to biblios</li>
! 	</ul>
! </li>
  </ul>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->




From tipaul at users.sourceforge.net  Mon Jun 20 16:18:57 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:18:57 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/export marc.tmpl,1.1,1.2
Message-ID: <E1DkN73-0001hY-SB@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	marc.tmpl 
Log Message:
synch'ing 2.2 and head





From tipaul at users.sourceforge.net  Mon Jun 20 16:19:53 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:19:53 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes/calendar calendar.js,1.1,1.2 calendar-setup.js,1.1,1.2
Message-ID: <E1DkN7x-0001vc-2U@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	calendar.js calendar-setup.js 
Log Message:
synch'ing 2.2 and head






From tipaul at users.sourceforge.net  Mon Jun 20 16:19:53 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:19:53 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes acquisitions-top.inc,1.26,1.27 common-print.css,1.1,1.2 common-style.css,1.35,1.36 intranet-main.css,1.4,1.5 marc-top.inc,1.12,1.13
Message-ID: <E1DkN7x-0001w0-IF@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	acquisitions-top.inc common-print.css common-style.css 
	intranet-main.css marc-top.inc 
Log Message:
synch'ing 2.2 and head

Index: acquisitions-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** acquisitions-top.inc	8 Mar 2005 14:15:29 -0000	1.26
--- acquisitions-top.inc	20 Jun 2005 14:19:50 -0000	1.27
***************
*** 6,9 ****
--- 6,19 ----
  <link rel="stylesheet" type="text/css" media="print" href="<!-- TMPL_VAR name="themelang" -->/includes/common-print.css">
  <link rel="stylesheet" type="text/css" media="screen" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
+ <!-- Additions for Calendar-system -->
+ <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
+ <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar.js">
+ </script>
+ <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-en.js">
+ </script>
+ <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-setup.js">
+ </script>
+ <!-- /Additions for Calendar-system -->
+ 
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  <script language="JavaScript" type="text/javascript">

Index: common-print.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/common-print.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** common-print.css	8 Mar 2005 10:37:31 -0000	1.1
--- common-print.css	20 Jun 2005 14:19:50 -0000	1.2
***************
*** 34,36 ****
  {
  	display: block;
! }
\ No newline at end of file
--- 34,38 ----
  {
  	display: block;
! }
! 
! 

Index: common-style.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** common-style.css	20 Jan 2005 18:03:33 -0000	1.35
--- common-style.css	20 Jun 2005 14:19:50 -0000	1.36
***************
*** 75,78 ****
--- 75,79 ----
  	border:0px;
  	border-collapse:collapse;
+ 	font-size:10pt;
  	margin : auto;
  }

Index: intranet-main.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/intranet-main.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** intranet-main.css	30 Jul 2004 14:29:40 -0000	1.4
--- intranet-main.css	20 Jun 2005 14:19:50 -0000	1.5
***************
*** 55,59 ****
  	text-align:center;
  	background-color:#ad11ad;
! 	color: #FFFFFF;
  	text-decoration: normal;
  	font-weight: bold;
--- 55,59 ----
  	text-align:center;
  	background-color:#ad11ad;
! 	color: #000000;
  	text-decoration: normal;
  	font-weight: bold;
***************
*** 84,87 ****
--- 84,106 ----
  }
  
+ h2 {
+ 	margin-top:0px;
+ 	margin-bottom:4px;
+ 	text-align:center;
+ 	padding:0px;
+ 	font-size:125%;
+ 	padding-left:10px;
+ 	padding-right:10px;
+ 	padding-bottom:3px;
+ 	padding-top:3px;
+ }
+ h2.reports{
+ 	text-align:center;
+ 	background-color: #6b7cbe;
+ 	color: #FFFFFF;
+ 	text-decoration: normal;
+ 	font-weight: bold;
+ }
+ 
  h1.circulation{
  	text-align:center;
***************
*** 92,95 ****
--- 111,123 ----
  }
  
+ h1.authority {
+ 	text-align:center;
+ 	background-color: #6b7cbe;
+ 	color:#000000;
+ 	text-decoration: normal;
+ 	font-weight: bold;
+ 	background-image:none;
+ 	}
+ 
  h1.parameters{
  	text-align:center;
***************
*** 121,125 ****
  	cursor: hand;
  	background-color:#ad11ad;
! 	color:#FFFFFF;
  	font-weight: bold;
  	border:1px solid #000000;
--- 149,153 ----
  	cursor: hand;
  	background-color:#ad11ad;
! 	color:#000000;
  	font-weight: bold;
  	border:1px solid #000000;
***************
*** 127,131 ****
  	}
  
! a.members {
  	font-weight: normal;
  	text-decoration: none;
--- 155,167 ----
  	}
  
! .little {
! 	font-weight: normal;
! 	font-size:10pt;
! 	padding:0px 0px 0px 0px;
! 	text-decoration: none;
! 	line-height:100%;
! 	}
! 
! .members {
  	font-weight: normal;
  	text-decoration: none;
***************
*** 135,139 ****
  	line-height:200%;
  	}
! a.members:hover {
  	background-color: #86c268;
  	border:1px solid #000000;
--- 171,175 ----
  	line-height:200%;
  	}
! .members:hover {
  	background-color: #86c268;
  	border:1px solid #000000;
***************
*** 144,148 ****
  	}
  
! a.acquisition {
  	font-weight: normal;
  	text-decoration: none;
--- 180,200 ----
  	}
  
! a.authority {
! 	font-weight: normal;
! 	text-decoration: none;
! 	cursor: hand;
! 	color:#777777;
! 	font-weight: bold;
! 	line-height:200%;
! 	}
! a.authority:hover {
! 	background-color: #6b7cbe;
! 	border:1px solid #000000;
! 	color: #000000;
! 	text-decoration: none;
! 	font-weight: bold;
! 	}
! 
! .acquisition {
  	font-weight: normal;
  	text-decoration: none;
***************
*** 152,156 ****
  	line-height:200%;
  	}
! a.acquisition:hover {
  	background-color: #ffdf61;
  	border:1px solid #000000;
--- 204,208 ----
  	line-height:200%;
  	}
! .acquisition:hover {
  	background-color: #ffdf61;
  	border:1px solid #000000;
***************
*** 169,172 ****
--- 221,225 ----
  	line-height:200%;
  	}
+ 
  a.reports:hover {
  	background-color: #6b7cbe;
***************
*** 178,182 ****
  	}
  
! a.circulation {
  	font-weight: normal;
  	text-decoration: none;
--- 231,235 ----
  	}
  
! .circulation {
  	font-weight: normal;
  	text-decoration: none;
***************
*** 186,190 ****
  	line-height:200%;
  	}
! a.circulation:hover {
  	background-color: #be6170;
  	border:1px solid #000000;
--- 239,243 ----
  	line-height:200%;
  	}
! .circulation:hover {
  	background-color: #be6170;
  	border:1px solid #000000;
***************
*** 262,263 ****
--- 315,323 ----
  	padding:0px;
  }
+ 
+ #bloc25, .bloc25 {
+ 	float:left;
+ 	border:1px solid #000000;
+ 	margin:0px;
+ 	padding:0px;
+ }

Index: marc-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** marc-top.inc	2 Dec 2004 16:43:28 -0000	1.12
--- marc-top.inc	20 Jun 2005 14:19:50 -0000	1.13
***************
*** 62,67 ****
  <!-- /TMPL_UNLESS -->
  <!-- TMPL_IF NAME="loggedinusername" -->
!     <p align="left">Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
  <!-- TMPL_ELSE -->
!     <p align="left"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
  <!-- /TMPL_IF -->
--- 62,67 ----
  <!-- /TMPL_UNLESS -->
  <!-- TMPL_IF NAME="loggedinusername" -->
!     <p> Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
  <!-- TMPL_ELSE -->
!     <p><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
  <!-- /TMPL_IF -->




From tipaul at users.sourceforge.net  Mon Jun 20 16:20:08 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:20:08 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members memberentry.tmpl,1.35,1.36 pay.tmpl,1.8,1.9
Message-ID: <E1DkN8C-00021G-0u@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	memberentry.tmpl pay.tmpl 
Log Message:
synch'ing 2.2 and head

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** memberentry.tmpl	4 May 2005 08:59:59 -0000	1.35
--- memberentry.tmpl	20 Jun 2005 14:20:05 -0000	1.36
***************
*** 40,45 ****
  	<!-- /TMPL_IF -->
  	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
- 		<input type="hidden" name="joining" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
- 		<input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="expiry" -->">
  		<input type="hidden" name="type" value="borrowers">
  		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
--- 40,43 ----
***************
*** 239,242 ****
--- 237,251 ----
  			</tr>
  			<tr>
+ 				<!-- TMPL_IF NAME="addAction" -->
+ 					<td>Joining date (leave blank for today)</td>
+ 					<td><input type="text" name="joining" size="12" maxlength="10" value="<!-- TMPL_VAR name="joining" -->"></td>
+ 				<!-- TMPL_ELSE -->
+ 					<td>Joining date</td>
+ 					<td><!-- TMPL_VAR name="joining" --></td>
+ 				<!-- /TMPL_IF -->
+ 				<td>Expiry date (leave blank for auto calc)</td>
+ 				<td><input type="text" name="expiry" size="12" maxlength="10" value="<!-- TMPL_VAR name="expiry" -->"></td>
+ 			</tr>
+ 			<tr>
  				<td>Borrower message (appears in OPAC)</td>
  				<td colspan="4"><textarea name="textmessaging" cols="70" rows="3"><!-- TMPL_VAR NAME="textmessaging" --></textarea></td>

Index: pay.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/pay.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** pay.tmpl	19 Jul 2004 20:33:52 -0000	1.8
--- pay.tmpl	20 Jun 2005 14:20:05 -0000	1.9
***************
*** 3,24 ****
  <h1>Pay Fines for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
  
! 	<form action="/cgi-bin/koha/pay.pl" method="post">
! <table cellspacing="0" cellpadding="5" border="1">
! <tr valign="top">
! 	<td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan="4"><b>FINES &amp; CHARGES</b></td>
! 	<td bgcolor="#99cc33" background="/images/background-mem.gif" colspan="4"><b>AMOUNT OWING</b></td>
  </tr>
  	
  <!-- TMPL_LOOP NAME="loop_pay" -->
! <tr valign="top">
! 	<td><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->"><input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="no" checked="checked">Unpaid
! 	<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="yes">Pay
! 	<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="wo">Writeoff
! 	<input type="hidden" name="itemnumber<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="itemnumber" -->">
! 	<input type="hidden" name="accounttype<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="accounttype" -->">
! 	<input type="hidden" name="amount<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="amount'}" -->">
! 	<input type="hidden" name="out<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="amountoutstanding" -->">
! 	<input type="hidden" name="bornum<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="bornum" -->">
! 	<input type="hidden" name="accountno<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="accountno" -->">
  	</td>
  	<td><!-- TMPL_VAR NAME="description" --> <!-- TMPL_VAR NAME="title" --></td>
--- 3,26 ----
  <h1>Pay Fines for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
  
! <form action="/cgi-bin/koha/pay.pl" method="post">
! <table>
! <tr>
! 	<th colspan="3">FINES &amp; CHARGES</th>
! 	<th colspan="2">AMOUNT OWING</th>
  </tr>
  	
  <!-- TMPL_LOOP NAME="loop_pay" -->
! <tr>
! 	<td>
! 		<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
! 		<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="no" checked="checked">Unpaid
! 		<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="yes">Pay
! 		<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="wo">Writeoff
! 		<input type="hidden" name="itemnumber<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="itemnumber" -->">
! 		<input type="hidden" name="accounttype<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="accounttype" -->">
! 		<input type="hidden" name="amount<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="amount'}" -->">
! 		<input type="hidden" name="out<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="amountoutstanding" -->">
! 		<input type="hidden" name="bornum<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="bornum" -->">
! 		<input type="hidden" name="accountno<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="accountno" -->">
  	</td>
  	<td><!-- TMPL_VAR NAME="description" --> <!-- TMPL_VAR NAME="title" --></td>
***************
*** 29,36 ****
  <!-- /TMPL_LOOP -->
  <tr valign="top">
! 	<td colspan="4" align="right"><b>Total Due</b></td>
! 	<td><b><!-- TMPL_VAR NAME="total" --></b></td>
! 	</tr>
! 	<tr valign="top">
  	<td colspan="5" align="right">
  	<input type="submit" name="submit"  value="Pay" class="button"></td>
--- 31,38 ----
  <!-- /TMPL_LOOP -->
  <tr valign="top">
! 	<th colspan="4" align="right">Total Due</th>
! 	<th><!-- TMPL_VAR NAME="total" --></th>
! </tr>
! <tr>
  	<td colspan="5" align="right">
  	<input type="submit" name="submit"  value="Pay" class="button"></td>
***************
*** 39,43 ****
  </form>
  
! <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Return</a> to Member Record
  </div>
  <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
--- 41,45 ----
  </form>
  
! <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" class="button member">Return to Member Record </a>
  </div>
  <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->




From tipaul at users.sourceforge.net  Mon Jun 20 16:21:04 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:21:04 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters admin-home.tmpl,1.36,1.37 checkmarc.tmpl,1.10,1.11 marc_subfields_structure.tmpl,1.41,1.42 marctagstructure.tmpl,1.29,1.30 printers.tmpl,1.12,1.13 z3950servers.tmpl,1.16,1.17
Message-ID: <E1DkN96-0002A8-D8@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	admin-home.tmpl checkmarc.tmpl marc_subfields_structure.tmpl 
	marctagstructure.tmpl printers.tmpl z3950servers.tmpl 
Log Message:
synch'ing 2.2 and head

Index: admin-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** admin-home.tmpl	1 Jun 2005 21:41:03 -0000	1.36
--- admin-home.tmpl	20 Jun 2005 14:21:01 -0000	1.37
***************
*** 36,54 ****
  		</tr>
  
-     <tr>
-       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/itemtypecategory.pl"> Item categories</a></td>
-       <td>Define item categories. (Non-Fiction, Fiction, Non-Fiction and Fiction...)</td>
-     </tr>
- 
-     <tr>
-       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/itemtypesubcategory.pl"> Item subcategories</a></td>
-       <td>Define item Subcategories. (Junior Fiction, Junior Non fiction.... Adult Fiction.)</td>
-     </tr>
- 
-     <tr>
-       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/mediatype.pl"> Item mediatypes</a></td>
-       <td>Define item mediatypes. (CD, Video, Book, Game...)</td>
-     </tr>
- 
  		<tr>
  			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/categorie.pl">Borrower categories</a></td>
--- 36,39 ----

Index: checkmarc.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** checkmarc.tmpl	19 Jul 2004 19:20:29 -0000	1.10
--- checkmarc.tmpl	20 Jun 2005 14:21:01 -0000	1.11
***************
*** 36,39 ****
--- 36,51 ----
  	<!-- /TMPL_IF -->
  	<!-- -------------------------------------------------------------------------------------------------------- -->
+ 	<!-- TMPL_IF NAME="itemtags" -->
+ 		<tr>
+ 			<td><b>Item tag</b></td>
+ 			<td>There is more than 1 MARC tag related to items tab (10) : <!-- TMPL_VAR name="itemtags" --></td>
+ 		</tr>
+ 	<!-- TMPL_ELSE -->
+ 		<tr>
+ 			<td>OK</td>
+ 			<td><i>Only 1 marc tag mapped to items</i></td>
+ 		</tr>
+ 	<!-- /TMPL_IF -->
+ 	<!-- -------------------------------------------------------------------------------------------------------- -->
  	<!-- TMPL_IF NAME="itemtypes_empty" -->
  		<tr>
***************
*** 117,120 ****
--- 129,147 ----
  	<!-- /TMPL_IF -->
  	<!-- -------------------------------------------------------------------------------------------------------- -->
+ 	<!-- TMPL_IF NAME="frameworknull" -->
+ 		<tr>
+ 			<td><b>framework values</b></td>
+ 			<td>there is a null value in a frameworkcode. Check the following tables<br/>
+ 				<li>select * from marc_subfield_structure where frameworkcode is NULL</li>
+ 				<li>select * from marc_tag_structure where frameworkcode is NULL</li>
+ 				<li>select * from marc_biblio where frameworkcode is NULL</li></td>
+ 		</tr>
+ 	<!-- TMPL_ELSE -->
+ 		<tr>
+ 			<td>OK</td>
+ 			<td><i>no NULL value in frameworkcode</i></td>
+ 		</tr>
+ 	<!-- /TMPL_IF -->
+ 	<!-- -------------------------------------------------------------------------------------------------------- -->
  	<!-- TMPL_IF NAME="total" -->
  		<tr>

Index: marc_subfields_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** marc_subfields_structure.tmpl	1 Mar 2005 13:40:55 -0000	1.41
--- marc_subfields_structure.tmpl	20 Jun 2005 14:21:01 -0000	1.42
***************
*** 1,4 ****
- <!-- clarification needed about this page. many questions... what is Lib? a Library? -->
- 
  <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
  
--- 1,2 ----
***************
*** 8,12 ****
  	<h1>
  	<!-- TMPL_IF NAME="use-heading-flags-p" -->
! 	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit MARC subfields constraints<!-- /TMPL_IF -->
  	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
  	</h1>
--- 6,10 ----
  	<h1>
  	<!-- TMPL_IF NAME="use-heading-flags-p" -->
! 	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit MARC subfields constraints for framework <!-- TMPL_IF name="frameworkcode" --><!-- TMPL_VAR NAME="frameworkcode" --><!-- TMPL_ELSE -->default<!-- /TMPL_IF --><!-- /TMPL_IF -->
  	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
  	</h1>
***************
*** 20,50 ****
  			<h2 class="parameters">Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
  			<h3>MARC constraints</h3>
! 			<p>
! 				<label>&nbsp;</label><!-- TMPL_VAR NAME="repeatable" --> repeatable 
! 				<!-- TMPL_VAR NAME="mandatory" --> mandatory
! 			</p>
! 			<p>
! 				<label>&nbsp;</label>
! 				<label>Search also</label><input type="text" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size=20> (example for 200a : '200c','200d','200e'...)
! 			</p>
! 			<p><label>&nbsp;</label><label>Koha link:</label> <!-- TMPL_VAR NAME="kohafield" --></p>
  			<h3>Editor constaints</h3>
! 			<p> <label>&nbsp;</label>
! 				<label>Text for librarian</label>
! 				<input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80">
! 			</p>
! 			<p>
! 				<label>&nbsp;</label>
! 				<label>Text for OPAC</label> <input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80">
! 			</p>
! 			<p><label>&nbsp;</label><label>Managed in tab</label> <!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT managed by Koha)</p>
! 			<p><label>&nbsp;</label><!-- TMPL_VAR NAME="hidden" --> hidden (subfield is managed, but hidden. -should be filled by a plugin or thesaurus-)</p>
! 			<p><label>&nbsp;</label><!-- TMPL_VAR NAME="isurl" --> URL (if checked, it means that the subfield is an URL and can be clicked</p>
! 			<p>
! 				<label>&nbsp;</label><label>Auth value:</label> <!-- TMPL_VAR NAME="authorised_value" -->
! 				or thesaurus: <!-- TMPL_VAR NAME="authtypes" -->
! 				or plugin: <!-- TMPL_VAR NAME="value_builder" -->
! 				or link: <input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5"> (exemple :200b)
! 			</p>
  		</td>
  		</tr>
--- 18,54 ----
  			<h2 class="parameters">Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
  			<h3>MARC constraints</h3>
! 			<ul>
! 				<p>
! 					<!-- TMPL_VAR NAME="repeatable" --> repeatable 
! 					<!-- TMPL_VAR NAME="mandatory" --> mandatory
! 				</p>
! 				<!-- TMPL_IF name="frameworkcode" -->
! 					<p>Search also: <i>(meaningful only for default framework)</i></p>
! 				<!-- TMPL_ELSE -->
! 					<p>
! 						Search also: <input type="text" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size=20> (example for 200a : '200c','200d','200e'...)
! 					</p>
! 				<!-- /TMPL_IF -->
! 				<p>Koha link:<!-- TMPL_VAR NAME="kohafield" --></p>
! 			</ul>
  			<h3>Editor constaints</h3>
! 			<ul>
! 				<p>Text for librarian: <input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80">
! 				</p>
! 				<p>Text for OPAC: <input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80">
! 				</p>
! 				<p>Managed in tab<!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT managed by Koha)</p>
! 				<p><!-- TMPL_VAR NAME="hidden" --> hidden (subfield is managed, but hidden. -should be filled by a plugin or thesaurus-)</p>
! 				<p><!-- TMPL_VAR NAME="isurl" --> URL (if checked, it means that the subfield is an URL and can be clicked</p>
! 				<p>
! 					<label>Auth value:</label> <!-- TMPL_VAR NAME="authorised_value" -->
! 					or thesaurus: <!-- TMPL_VAR NAME="authtypes" -->
! 					or plugin: <!-- TMPL_VAR NAME="value_builder" -->
! 				</p>
! 				<p>
! 					<label>&nbsp;</label>Link to field :
! 					<input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5"> (exemple :200b)
! 				</p>
! 			</ul>
  		</td>
  		</tr>
***************
*** 52,61 ****
  	</table>
  	<input type="submit" value="OK">
- 	<p>Note: in the last column, you can choose:
- 	<ul><li>An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table.</li>
- 	<li>A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table.</li>
- 	<li>A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically.</li>
- 	</ul>
- 	</p>
  	</form>
  <!-- /TMPL_IF -->
--- 56,59 ----

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** marctagstructure.tmpl	14 Apr 2005 14:15:01 -0000	1.29
--- marctagstructure.tmpl	20 Jun 2005 14:21:01 -0000	1.30
***************
*** 112,155 ****
  	</form>
  <!-- /TMPL_IF -->
- 
  <!-- ------------------------------------------------------------------------ -->
  <!-- TMPL_IF NAME="else" -->
! <div id="bloc25">
! <h2 class="parameters">Select a framework</h2>
! <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 	<select name="frameworkcode">
! 		<option value="">Default</option>
! 	<!-- TMPL_LOOP NAME="frameworkloop" -->
! 		<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="frameworktext" --></option>
! 	<!-- /TMPL_LOOP -->
! 	</select>
! 	<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 	<input type="submit" value="OK" class="button">
! </form>
! <b>NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script.</b>
! </div>
! <div id="bloc100">
  	<table>
! 	<tr>
! 		<th>Tag</th>
! 		<th>Lib</th>
! 		<th>Repeatable</th>
! 		<th>Mandatory</th>
! 		<th>Authorised<br />value</th>
! 		<th>Subfields</th>
! 		<th>Edit</th>
! 		<th>Delete</th>
! 	<!-- TMPL_LOOP NAME="loop" -->
! 	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
! 		<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
! 		<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 		<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 		<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 		<td><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->" class="button">subfields</a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkdcode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 	</tr>
! 	<!-- /TMPL_LOOP -->
  	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<input type="hidden" name="op" value="add_form">
--- 112,186 ----
  	</form>
  <!-- /TMPL_IF -->
  <!-- ------------------------------------------------------------------------ -->
  <!-- TMPL_IF NAME="else" -->
! 	<div id="bloc25">
! 	<h2 class="parameters">Select a framework</h2>
! 	<form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 		<select name="frameworkcode">
! 			<option value="">Default</option>
! 		<!-- TMPL_LOOP NAME="frameworkloop" -->
! 			<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="frameworktext" --></option>
! 		<!-- /TMPL_LOOP -->
! 		</select>
! 		<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 		<input type="submit" value="OK" class="button">
! 		<p>
! 		<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True" <!-- TMPL_IF Name="select_display"-->checked<!--/TMPL_IF -->  OnChange="javascript:document.f.submit()">
! 		</p>
! 	</form>
! 	<b>NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script.</b>
! 	</div>
! 	<div id="bloc100">
  	<table>
! 		<tr>
! 			<th>Tag</th>
! 			<th>Lib</th>
! 			<th>Repeatable</th>
! 			<th>Mandatory</th>
! 			<th>Authorised<br />value</th>
! 			<th>Subfields</th>
! 			<th>Edit</th>
! 			<th>Delete</th>
! 		<tr>
! 	<!-- TMPL_IF NAME="select_display" -->
! 		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr class="hilighted">
! 			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
! 			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
! 			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
! 			<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 			<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 		</tr>
! 		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 			<td>
! 				&nbsp;
! 			</td>
! 			<td colspan=7 border=0>
! 				<!-- TMPL_LOOP NAME="subfields" -->
! 					<p><label>&nbsp;</label>
! 							Tab:<!-- TMPL_VAR NAME="tab" --> | $<!-- TMPL_VAR NAME="tagsubfield" -->
! 							<!-- TMPL_VAR NAME="liblibrarian" --> <!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!--/TMPL_IF --><!-- TMPL_IF NAME="repeatable" -->, repeatable<!-- /TMPL_IF --><!-- TMPL_IF NAME="mandatory" -->, Mandatory<!-- /TMPL_IF --><!-- TMPL_IF NAME="seealso" -->, See <!-- TMPL_VAR name="seealso" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authorised_value" -->, <!-- TMPL_VAR NAME="authorised_value" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authtypecode" -->, <!-- TMPL_VAR NAME="authtypecode" --><!--/TMPL_IF --><!-- TMPL_IF NAME="value_builder" -->, <!-- TMPL_VAR NAME="value_builder" --><!--/TMPL_IF -->
! 					</p>
! 				<!-- /TMPL_LOOP -->
! 			</td>
! 		</tr>
! 		<!-- /TMPL_LOOP -->
! 	<!-- TMPL_ELSE -->
! 		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
! 			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
! 			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
! 			<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 			<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 		</tr>
! 		<!-- /TMPL_LOOP -->
! 	<!--/TMPL_IF -->
  	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<input type="hidden" name="op" value="add_form">
***************
*** 160,175 ****
  		<input type="submit" class="button" value="Add Tag" title="Add Tag" alt="Add Tag" >
  		<!-- TMPL_IF NAME="isprevpage" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">
  			<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0">
  			</a>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="nextpage" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">
  				<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0">
  			</a>
  		<!-- /TMPL_IF -->
! 	</form>
  </div>
  <!-- /TMPL_IF -->
  </div>
  <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
--- 191,212 ----
  		<input type="submit" class="button" value="Add Tag" title="Add Tag" alt="Add Tag" >
  		<!-- TMPL_IF NAME="isprevpage" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">
  			<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0">
  			</a>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="nextpage" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">
  				<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0">
  			</a>
  		<!-- /TMPL_IF -->
! </form>
! <script language="javascript" type="text/javascript">
! 	function ChangeDisplay(checkbox) {
! 		window.
! 	}
! </script>
  </div>
  <!-- /TMPL_IF -->
+ 
  </div>
  <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: printers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** printers.tmpl	19 Jul 2004 19:20:29 -0000	1.12
--- printers.tmpl	20 Jun 2005 14:21:01 -0000	1.13
***************
*** 1,205 ****
  <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
  
! <!-- TMPL_IF NAME="add_form" -->
!         <script language="javascript" type="text/javascript">
! 	function _(s) { return s } // dummy function for gettext
!         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
!         function isNotNull(f,noalert) {
!                 if (f.value.length ==0) {
!    return false;
!                 }
!                 return true;
!         }
!         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
!         function toUC(f) {
!                 var x=f.value.toUpperCase();
!                 f.value=x;
!                 return true;
!         }
!         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
!         function isNum(v,maybenull) {
!         var n = new Number(v.value);
!         if (isNaN(n)) {
!                 return false;
!                 }
!         if (maybenull==0 && v.value=='') {
!                 return false;
!         }
!         return true;
!         }
!         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
!         function isDate(f) {
!                 var t = Date.parse(f.value);
!                 if (isNaN(t)) {
!                         return false;
!                 }
!         }
!         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
!         function Check(f) {
!                 var ok=1;
!                 var _alertString="";
!                 var alertString2;
!                 if (f.printername.value.length==0) {
!                         _alertString += "\n- " + _("printer name missing");
!                 }
!                 if (f.printqueue.value.length==0) {
!                         _alertString += "\n- " + _("Queue missing");
!                 }
!                 if (_alertString.length==0) {
!                         document.Aform.submit();
!                 } else {
!                         alertString2  = _("Form not submitted because of the following problem(s)");
!                         alertString2 += "\n------------------------------------------------------------------------------------\n";
!                         alertString2 += _alertString;
!                         alert(alertString2);
!                 }
!         }
!         </script>
! 
! 	<!-- TMPL_IF NAME="searchfield" -->
! 		<h1>Modify printer</h1>
! 	<!-- TMPL_ELSE -->
! 		<h1>Add printer</h1>
  	<!-- /TMPL_IF -->
! 
!         <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
!         <input type="hidden" name="op" value="add_validate">
!         
! 
! 	<table>
! 
! 	<!-- TMPL_IF NAME="searchfield" -->
! 		<tr>
! 			<td>Printer Name</td>
! 			<td>
! 				<input type="hidden" name="printername" value="<!-- TMPL_VAR NAME="searchfield" -->"><!-- TMPL_VAR NAME="searchfield" -->
! 			</td>
! 		</tr>
! 	<!-- TMPL_ELSE -->
! 		<tr>
! 			<td>Printer Name</td>
! 			<td>
! 				<input type="text" name="printername" size="50" maxlength="50">
! 			</td>
! 		</tr>
  	<!-- /TMPL_IF -->
! 
!         	<tr>
! 			<td>Queue</td>
! 			<td><input type="text" name="printqueue" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printqueue" -->"> </td>
! 		</tr>
!         	<tr>
! 			<td>Type</td>
! 			<td><input type="text" name="printtype" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printtype" -->"> </td>
! 		</tr>
!         	<tr>
! 			<td> </td>
! 			<td><input type="button" value="OK" onclick="Check(this.form)"></td>
! 		</tr>
!         </table>
!         </form>
! 
! <!-- /TMPL_IF -->
! 
! <!-- TMPL_IF NAME="add_validate" -->
! 	Data recorded
!         <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
!         <input type="submit" value="OK">
!         </form>
! <!-- /TMPL_IF -->
! 
! <!-- TMPL_IF NAME="delete_confirm" -->
! 	<table border="0" cellspacing="0" cellpadding="5">
! 		<tr bgcolor="#99cc33">
! 			<td background="/images/background-mem.gif"><b>Printer</b></td>
! 			<td background="/images/background-mem.gif"><b><!-- TMPL_VAR NAME="searchfield" --></b></td>
! 		</tr>
! 
!         	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 			<input type="hidden" name="op" value="delete_confirmed">
! 			<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
!         
! 		<tr>
! 			<td>Queue</td>
! 			<td><!-- TMPL_VAR NAME="printqueue" --></td>
! 		</tr>
!         	<tr>
! 			<td>Type</td>
! 			<td><!-- TMPL_VAR NAME="printtype" --></td>
! 		</tr>
!         	<tr>
! 			<td colspan="2" align="center">CONFIRM DELETION</td>
! 		</tr>
!         	<tr>
! 			<td>
! 				<input type="submit" value="YES">
! 				</form>
! 			</td>
! 			<td>
  				<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 				<input type="submit" value="NO">
! 				</form>
! 			</td>
! 		</tr>
! 	</table>
! <!-- /TMPL_IF -->
! 
! <!-- TMPL_IF NAME="delete_confirmed" -->
! 	Data deleted
! 	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 		<input type="submit" value="OK">
! 	</form>
! <!-- /TMPL_IF -->
! 
! <!-- TMPL_IF NAME="else" -->
! 	<h2>Printer admin</h2>
!         <form action="<!-- TMPL_VAR NAME="script_name">" method="post">
!                 <input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
!                 <input type="reset" name="reset" value="clr">
!         </form>
! 
! 	<!-- TMPL_IF NAME="searchfield" -->
! 		You searched for <b><!-- TMPL_VAR NAME="searchfield" --></b>
  	<!-- /TMPL_IF -->
- 
- 	<table border="0" cellspacing="0" cellpadding="5">
- 		<tr bgcolor="#99cc33">
- 			<td background="/images/background-mem.gif"><b>Name</b></td>
- 			<td background="/images/background-mem.gif"><b>Queue</b></td>
- 			<td background="/images/background-mem.gif"><b>Type</b></td>
- 			<td background="/images/background-mem.gif"> </td>
- 			<td background="/images/background-mem.gif"> </td>
- 		</tr>
- 		<!-- TMPL_LOOP NAME="loop" -->
- 		<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
- 			<td><!-- TMPL_VAR NAME="printername" --></td>
- 			<td><!-- TMPL_VAR NAME="printqueue" --></td>
- 			<td><!-- TMPL_VAR NAME="printtype" --></td>
- 			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->">Edit</a></td>
-                         <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->">Delete</a></td>
- 		</tr>
- 		<!-- /TMPL_LOOP -->
- 	</table>
- 
- 	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-         <input type="hidden" name="op" value="add_form">
  	
! 	<!-- TMPL_IF NAME="offsetgtzero" -->
! 		<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Prev</a>
  	<!-- /TMPL_IF -->
! 
! 	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
! 
! 	<!-- TMPL_IF NAME="ltcount" -->
! 		<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">Next &gt;&gt;</a>	
! 	<!-- /TMPL_iF -->
! 
!         <br>
! 	<input type="submit" class="button" value="Add printer" alt="Add printer">
! 	<br>
!         </form>
! 
! <!-- /TMPL_IF -->
! 
  
  <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
--- 1,181 ----
  <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
  
! <div id="mainbloc">
! 		<h1>Printer admin</h1>
! 	<!-- TMPL_IF NAME="add_form" -->
! 			<script language="javascript" type="text/javascript">
! 		function _(s) { return s } // dummy function for gettext
! 			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
! 			function isNotNull(f,noalert) {
! 					if (f.value.length ==0) {
! 	return false;
! 					}
! 					return true;
! 			}
! 			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
! 			function toUC(f) {
! 					var x=f.value.toUpperCase();
! 					f.value=x;
! 					return true;
! 			}
! 			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
! 			function isNum(v,maybenull) {
! 			var n = new Number(v.value);
! 			if (isNaN(n)) {
! 					return false;
! 					}
! 			if (maybenull==0 && v.value=='') {
! 					return false;
! 			}
! 			return true;
! 			}
! 			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
! 			function isDate(f) {
! 					var t = Date.parse(f.value);
! 					if (isNaN(t)) {
! 							return false;
! 					}
! 			}
! 			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
! 			function Check(f) {
! 					var ok=1;
! 					var _alertString="";
! 					var alertString2;
! 					if (f.printername.value.length==0) {
! 							_alertString += "\n- " + _("printer name missing");
! 					}
! 					if (f.printqueue.value.length==0) {
! 							_alertString += "\n- " + _("Queue missing");
! 					}
! 					if (_alertString.length==0) {
! 							document.Aform.submit();
! 					} else {
! 							alertString2  = _("Form not submitted because of the following problem(s)");
! 							alertString2 += "\n------------------------------------------------------------------------------------\n";
! 							alertString2 += _alertString;
! 							alert(alertString2);
! 					}
! 			}
! 			</script>
! 	<div id="bloc25">
! 		<!-- TMPL_IF NAME="searchfield" -->
! 			<h2 class="parameters">Modify printer</h2>
! 		<!-- TMPL_ELSE -->
! 			<h2 class="parameters">Add printer</h2>
! 		<!-- /TMPL_IF -->
! 	
! 			<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
! 				<input type="hidden" name="op" value="add_validate">
! 				<!-- TMPL_IF NAME="searchfield" -->
! 						<p><label>Printer Name</label><input type="hidden" name="printername" value="<!-- TMPL_VAR NAME="searchfield" -->"><!-- TMPL_VAR NAME="searchfield" --></p>
! 				<!-- TMPL_ELSE -->
! 						<p><label>Printer Name</label><input type="text" name="printername" size="50" maxlength="50"></p>
! 				<!-- /TMPL_IF -->
! 				<p><label>Queue</label><input type="text" name="printqueue" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printqueue" -->"> </p>
! 				<p><label>Type</label><input type="text" name="printtype" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printtype" -->"> </p>
! 				<p><input type="button" value="OK" onclick="Check(this.form)" class="button"></p>
! 			</form>
! 	</div>
  	<!-- /TMPL_IF -->
! 	
! 	<!-- TMPL_IF NAME="add_validate" -->
! 		Data recorded
! 			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 			<input type="submit" value="OK" class="button">
! 			</form>
  	<!-- /TMPL_IF -->
! 	
! 	<!-- TMPL_IF NAME="delete_confirm" -->
! 		<table border="0" cellspacing="0" cellpadding="5">
! 			<tr bgcolor="#99cc33">
! 				<td background="/images/background-mem.gif"><b>Printer</b></td>
! 				<td background="/images/background-mem.gif"><b><!-- TMPL_VAR NAME="searchfield" --></b></td>
! 			</tr>
! 	
  				<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 				<input type="hidden" name="op" value="delete_confirmed">
! 				<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 			
! 			<tr>
! 				<td>Queue</td>
! 				<td><!-- TMPL_VAR NAME="printqueue" --></td>
! 			</tr>
! 				<tr>
! 				<td>Type</td>
! 				<td><!-- TMPL_VAR NAME="printtype" --></td>
! 			</tr>
! 				<tr>
! 				<td colspan="2" align="center">CONFIRM DELETION</td>
! 			</tr>
! 				<tr>
! 				<td>
! 					<input type="submit" value="YES">
! 					</form>
! 				</td>
! 				<td>
! 					<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 					<input type="submit" value="NO">
! 					</form>
! 				</td>
! 			</tr>
! 		</table>
  	<!-- /TMPL_IF -->
  	
! 	<!-- TMPL_IF NAME="delete_confirmed" -->
! 		Data deleted
! 		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 			<input type="submit" value="OK">
! 		</form>
  	<!-- /TMPL_IF -->
! 	
! 	<!-- TMPL_IF NAME="else" -->
! 			<form action="<!-- TMPL_VAR NAME="script_name">" method="post">
! 					<input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 					<input type="reset" name="reset" value="clr">
! 			</form>
! 	
! 		<!-- TMPL_IF NAME="searchfield" -->
! 			You searched for <b><!-- TMPL_VAR NAME="searchfield" --></b>
! 		<!-- /TMPL_IF -->
! 	
! 		<table border="0" cellspacing="0" cellpadding="5">
! 			<tr bgcolor="#99cc33">
! 				<td background="/images/background-mem.gif"><b>Name</b></td>
! 				<td background="/images/background-mem.gif"><b>Queue</b></td>
! 				<td background="/images/background-mem.gif"><b>Type</b></td>
! 				<td background="/images/background-mem.gif"> </td>
! 				<td background="/images/background-mem.gif"> </td>
! 			</tr>
! 			<!-- TMPL_LOOP NAME="loop" -->
! 			<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
! 				<td><!-- TMPL_VAR NAME="printername" --></td>
! 				<td><!-- TMPL_VAR NAME="printqueue" --></td>
! 				<td><!-- TMPL_VAR NAME="printtype" --></td>
! 				<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->" class="button">Edit</a></td>
! 							<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->" class="button">Delete</a></td>
! 			</tr>
! 			<!-- /TMPL_LOOP -->
! 		</table>
! 	
! 		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 			<input type="hidden" name="op" value="add_form">
! 		
! 		<!-- TMPL_IF NAME="offsetgtzero" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Prev</a>
! 		<!-- /TMPL_IF -->
! 	
! 		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
! 	
! 		<!-- TMPL_IF NAME="ltcount" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">Next &gt;&gt;</a>	
! 		<!-- /TMPL_iF -->
! 	
! 			<br>
! 		<input type="submit" class="button" value="Add printer" alt="Add printer">
! 		<br>
! 			</form>
! 	
! 	<!-- /TMPL_IF -->
! </div>
  
  <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: z3950servers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** z3950servers.tmpl	13 Sep 2004 15:31:13 -0000	1.16
--- z3950servers.tmpl	20 Jun 2005 14:21:01 -0000	1.17
***************
*** 214,218 ****
  				</tr>
  				<!-- TMPL_LOOP NAME="loop" -->
! 				<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
  					<td><!-- TMPL_VAR NAME="name" --></td>
  					<td><!-- TMPL_VAR NAME="host" --></td>
--- 214,218 ----
  				</tr>
  				<!-- TMPL_LOOP NAME="loop" -->
! 				<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="hilighted"><!-- /TMPL_IF -->
  					<td><!-- TMPL_VAR NAME="name" --></td>
  					<td><!-- TMPL_VAR NAME="host" --></td>




From tipaul at users.sourceforge.net  Mon Jun 20 16:21:20 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:21:20 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/reports borrowers_out.tmpl,1.1,1.2
Message-ID: <E1DkN9M-0002CM-Vo@sc8-pr-cvs1.sourceforge.net>

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

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

Index: borrowers_out.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/reports/borrowers_out.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** borrowers_out.tmpl	24 Mar 2005 15:19:48 -0000	1.1
--- borrowers_out.tmpl	20 Jun 2005 14:21:18 -0000	1.2
***************
*** 73,76 ****
--- 73,92 ----
  				<td><input type="text" name="Filter" value=""></td>
  			</tr>
+ 			<tr class="hilighted">
+ 				<td>&nbsp;</td>
+ 				<td>&nbsp;</td>
+ 				<td>Without issues since</td>
+ 				<td><input size="10" id="to" name="Filter" value="" type="text">
+ 						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
+ 							<script type="text/javascript">
+ 								Calendar.setup(
+ 									{
+ 										inputField : "to",
+ 										ifFormat : "%Y-%m-%d",
+ 										button : "openCalendarTo",
+ 									}
+ 								);
+ 							</script></td>
+ 			</tr>
  		</tbody>
  	</table>




From tipaul at users.sourceforge.net  Mon Jun 20 16:21:42 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:21:42 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en boraccount.tmpl,1.10,1.11 intranet-main.tmpl,1.25,1.26 mancredit.tmpl,1.3,1.4 maninvoice.tmpl,1.3,1.4
Message-ID: <E1DkN9i-0002EO-QO@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	boraccount.tmpl intranet-main.tmpl mancredit.tmpl 
	maninvoice.tmpl 
Log Message:
synch'ing 2.2 and head

Index: boraccount.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/boraccount.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** boraccount.tmpl	26 Nov 2004 20:32:17 -0000	1.10
--- boraccount.tmpl	20 Jun 2005 14:21:39 -0000	1.11
***************
*** 1,47 ****
  <!-- TMPL_INCLUDE NAME="members-top.inc" -->
! 
! <!-- The manual invoice and credit buttons -->
! 
! <h1>Account for <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a></h1><P>
! <a class="button" href="/cgi-bin/koha/maninvoice.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Create Manual Invoice</a>
! &nbsp;
! <a class="button" href="/cgi-bin/koha/mancredit.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Create Manual Credit</a>
! <center>
! <p>
! 
! <!-- The table with the account items -->
! 
! <table  cellspacing="0"  cellpadding="5" border="1" >
! 
!   <tr valign="top">
!     <td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif" colspan="2"><b>FINES &amp; CHARGES</td>
!     <td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif" colspan="1"><b>AMOUNT</td>
!     <td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif" colspan="1"><b>STILL OWING</td>
!   </tr>
! 
!   <!-- TMPL_LOOP NAME="accounts" -->
! 
!     <tr valign="top">
!       <td><!-- TMPL_VAR NAME="date" --></td>
!       <td><!-- TMPL_VAR NAME="description" --><!-- TMPL_IF NAME="printtitle" --> <!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF --></td>
!       <td><!-- TMPL_VAR NAME="amount" --></td>
!       <td><!-- TMPL_VAR NAME="amountoutstanding" --></td>
!     </tr>
! 
!   <!-- /TMPL_LOOP -->
! 
!   <tr valign="top">
!     <td></td>
!     <td colspan="2"><b>Total Due</b></td>
!     <td><b><!-- TMPL_VAR NAME="total" --></b></td>
!   </tr>
! 
! </table>
! 
! <br clear="all">
! <p> &nbsp; </p>
! 
! <!-- endmenu (member) -->
! 
  <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
  
--- 1,39 ----
  <!-- TMPL_INCLUDE NAME="members-top.inc" -->
! <div id="mainbloc">
! 	<!-- The manual invoice and credit buttons -->
! 	
! 	<h1>Account for <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a></h1><P>
! 	<a class="button" href="/cgi-bin/koha/maninvoice.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Create Manual Invoice</a>
! 	&nbsp;
! 	<a class="button" href="/cgi-bin/koha/mancredit.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Create Manual Credit</a>
! 	<!-- The table with the account items -->
! 	
! 	<table>
! 	
! 	<tr>
! 		<th>FINES &amp; CHARGES</th>
! 		<th>AMOUNT</th>
! 		<th>STILL OWING</th>
! 	</tr>
! 	
! 	<!-- TMPL_LOOP NAME="accounts" -->
! 	
! 		<tr>
! 		<td><!-- TMPL_VAR NAME="date" --> <!-- TMPL_VAR NAME="description" --><!-- TMPL_IF NAME="printtitle" --> <!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF --></td>
! 		<td><!-- TMPL_VAR NAME="amount" --></td>
! 		<td><!-- TMPL_VAR NAME="amountoutstanding" --></td>
! 		</tr>
! 	
! 	<!-- /TMPL_LOOP -->
! 	
! 	<tr>
! 		<th>Total Due</th>
! 		<th colspan="2"><!-- TMPL_VAR NAME="total" --></th>
! 	</tr>
! 	
! 	</table>
! 	
! 	<!-- endmenu (member) -->
! </div>
  <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
  

Index: intranet-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** intranet-main.tmpl	20 Sep 2004 15:25:22 -0000	1.25
--- intranet-main.tmpl	20 Jun 2005 14:21:39 -0000	1.26
***************
*** 43,46 ****
--- 43,55 ----
  			layer.style.visibility = 'hidden';
  		}
+ 		function addauthority() {
+ 			X = document.forms["f"].authtype.value;
+ 			window.location="/cgi-bin/koha/authorities/authorities.pl?authtypecode="+X;
+ 		}
+ 		function searchauthority() {
+ 			X = document.forms["f"].authtype2.value;
+ 			Y = document.forms["f"].value.value;
+ 			window.location="/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&authtypecode="+X+"&value="+Y+"&marclist=&and_or=and&excluding=&operator=contains";
+ 		}
  	</script>
  	<script language="javascript" type="text/javascript">
***************
*** 115,126 ****
  			<h1 class="acquisition">Acquisitions</h1>
  			Order items, receive orders, set budgets...
  		</div>
  		<div id="Hint4" class="hint">
  			<h1 class="reports">Reports</h1>
  			All the system reports
  		</div>
  		<div id="Hint5" class="hint">
! 			<h1 class="reports">Authorities</h1>
  			Authorities management &amp; searches
  		</div>
  		<div id="Hint6" class="hint">
--- 124,204 ----
  			<h1 class="acquisition">Acquisitions</h1>
  			Order items, receive orders, set budgets...
+ 			<form action="/cgi-bin/koha/acqui/order.pl" method="post">
+ 			Supplier name : <input type="text"  size="25"   name="supplier">
+ 			<input type="submit" class="button acquisition" value="OK">
+ 			</form>
+ 			<p>or <a href="histsearch.pl" class="button acquisition">Search order history</a></p>
+ 			
  		</div>
  		<div id="Hint4" class="hint">
  			<h1 class="reports">Reports</h1>
  			All the system reports
+ 			<div id="bloc25">
+ 			<h2 class="reports">Stats</h2>
+ 			<ul>
+ 			<li>on catalogue
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/inventory.pl">Inventory/Stocktaking</a></p>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalogue by itemtype</a></p>
+ 			<li>on issues
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/stats.pl?time=yesterday">Till Reconcipation:</a> Daily Report (yesterday)</p>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/stats.pl?time=today">Till Reconcipation:</a> Daily Report (today)</p>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/overdue.pl">Overdue items</a></p>
+ 			</ul>
+ 			</div>
+ 			<div id="bloc25">
+ 			<h2 class="reports">Stat wizards</h2>
+ 			<table>
+ 			<tr>
+ 			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions</a></td>
+ 			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/borrowers_stats.pl">Borrowers</a></td>
+ 			</tr>
+ 			<tr>
+ 			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/catalogue_stats.pl">Catalogue</a></td>
+ 			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/issues_stats.pl">Circulation</a></td>
+ 			</tr>
+ 			</table>
+ 			</div>
+ 			<div id="bloc25">
+ 			<h2 class="reports">Top Lists</h2>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/bor_issues_top.pl">Most issuing Borrowers</a></p>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/cat_issues_top.pl">Most issued items</a></p>
+ 			</div>
  		</div>
+ 		
  		<div id="Hint5" class="hint">
! 			<h1 class="authority">Authorities</h1>
  			Authorities management &amp; searches
+ 			<form name="f" >
+ 				<h2 >
+ 					<select name="authtype">
+ 					<!-- TMPL_LOOP NAME="authtypesloop" -->
+ 						<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
+ 							<!-- TMPL_VAR NAME="authtypetext" -->
+ 						</option>
+ 					<!-- /TMPL_LOOP -->
+ 					</select>
+ 					<a href="javascript:addauthority()" class="authority">Add Authority</a>
+ 				</h2>
+ 				<h2>Search 
+ 				<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
+ 				in
+ 					<select name="authtype2">
+ 					<!-- TMPL_LOOP NAME="authtypesloop" -->
+ 						<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
+ 							<!-- TMPL_VAR NAME="authtypetext" -->
+ 						</option>
+ 					<!-- /TMPL_LOOP -->
+ 					</select>
+ 				</h2>
+ 				<input type="hidden" name="marclist" value="">
+ 				<input type="hidden" name="and_or" value="and">
+ 				<input type="hidden" name="excluding" value="">
+ 				<input type="hidden" name="operator" value="contains">
+ 				<input type="hidden" name="op" value="do_search">
+ 				<img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0">
+ 				<a href="javascript:searchauthority()" class="authority">
+ 					Search
+ 				</a>
+ 			</form>
  		</div>
  		<div id="Hint6" class="hint">
***************
*** 133,136 ****
--- 211,230 ----
  			<h1 class="circulation">Circulation</h1>
  			Work at the front desk on Issues and returns using only a barcode reader and a mouse
+ 				<h2 class="circulation">
+ 					Issue
+ 				</h2>
+ 				<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+ 					<p>Enter borrower card number or partial last name <input name="findborrower">
+ 					<input type="submit" value="OK" class="button circulation"></p>
+ 				</form>
+ 				<h2 class="circulation">
+ 					Return
+ 				</h2>
+ 				<form method="post" action="/cgi-bin/koha/circ/returns.pl">
+ 				<p>Enter Book Barcode</p>
+ 				<label class="label20">Item Barcode:</label><input name="barcode" size="10">
+ 				<input type="submit" value="OK" class="button circulation">
+ 				</form>
+ 
  		</div>
  <!-- MAIN MENU -->

Index: mancredit.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/mancredit.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** mancredit.tmpl	19 Jul 2004 21:41:29 -0000	1.3
--- mancredit.tmpl	20 Jun 2005 14:21:40 -0000	1.4
***************
*** 1,22 ****
  <!-- TMPL_INCLUDE Name="members-top.inc" -->
! 
! <Center><h3>Manual Credit</h3></center>
! <form action="/cgi-bin/koha/mancredit.pl" method="post">
! <table cellpadding="2" cellspacing="0" border="0">
! <input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
! <tr><td><b>Borrowernumber<b></td><td><!-- TMPL_VAR NAME="bornum" --></td></tr>
! <tr><td><b>Type</b></td><Td>
! <select name="type">
! <option value="C">Credit</option>
! <option value="BAY">Baycorp Adjustment</option>
! <option value="WORK">Worked off</option>
! </select>
! </td></tr>
! <tr><td><b>Itemnumber</b></td><td><input type="text" name="itemnum"></td></tr>
! <tr><td><b>Description</b></td><td><input type="text" name="desc" size="50"></td></tr>
! <tr><td><b>Amount</b></td><td><input type="text" name="amount"></td></tr>
! <tr><td><input type="submit" name="add" value="Add"></td></tr>
! </table>
! </form>
! 
  <!-- TMPL_INCLUDE Name="members-bottom.inc" -->
\ No newline at end of file
--- 1,20 ----
  <!-- TMPL_INCLUDE Name="members-top.inc" -->
! <div id="mainbloc">
! 	<h1 class="member">Manual Credit</h1>
! 	<form action="/cgi-bin/koha/mancredit.pl" method="post">
! 		<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
! 		<p><label class="label100">Borrowernumber</label><!-- TMPL_VAR NAME="bornum" --></p>
! 		<p><label class="label100">Type</label>
! 			<select name="type">
! 				<option value="C">Credit</option>
! 				<option value="BAY">Baycorp Adjustment</option>
! 				<option value="WORK">Worked off</option>
! 			</select>
! 		</p>
! 		<p><label class="label100">Itemnumber</label><input type="text" name="itemnum"></p>
! 		<p><label class="label100">Description</label><input type="text" name="desc" size="50"></p>
! 		<p><label class="label100">Amount</label><input type="text" name="amount"></p>
! 		<p><input type="submit" name="add" value="Add" class="button"></p>
! 	</form>
! </div>
  <!-- TMPL_INCLUDE Name="members-bottom.inc" -->
\ No newline at end of file

Index: maninvoice.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/maninvoice.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** maninvoice.tmpl	19 Jul 2004 21:41:29 -0000	1.3
--- maninvoice.tmpl	20 Jun 2005 14:21:40 -0000	1.4
***************
*** 1,25 ****
  <!-- TMPL_INCLUDE Name="members-top.inc" -->
! 
! <Center><h3>Manual Invoice</h3></center>
! <form action="/cgi-bin/koha/maninvoice.pl" method="post">
! <table cellpadding="2" cellspacing="0" border="0">
! <input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
! <tr><td><b>Borrowernumber<b></td><td><!-- TMPL_VAR NAME="bornum" --></td></tr>
! <tr><td><b>Type</b></td><Td>
! <select name="type">
! <option value="L">Lost Item</option>
! <option value="F">Fine</option>
! <option value="A">Account Management Fee</option>
! <option value="N">New Card</option>
! <option value="M">Sundry</option>
! <option value="REF">Cash Refund</option>
! </select>
! </td></tr>
! <tr><td><b>Itemnumber</b></td><td><input type="text" name="itemnum"></td></tr>
! <tr><td><b>Description</b></td><td><input type="text" name="desc" size="50"></td></tr>
! <tr><td><b>Amount</b></td><td><input type="text" name="amount"></td></tr>
! <tr><td><input type="submit" name="add" value="Add"></td></tr>
! </table>
! </form>
! 
  <!-- TMPL_INCLUDE Name="members-bottom.inc" -->
--- 1,25 ----
  <!-- TMPL_INCLUDE Name="members-top.inc" -->
! <div id="mainbloc">
! 	<h1 class="member">Manual Invoice</h1>
! 	<form action="/cgi-bin/koha/maninvoice.pl" method="post">
! 	<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
! 	<p><label class="label100">Borrowernumber </label><!-- TMPL_VAR NAME="bornum" --></p>
! 	<p>
! 		<label class="label100"><b>Type</label>
! 		<select name="type">
! 			<option value="L">Lost Item</option>
! 			<option value="F">Fine</option>
! 			<option value="A">Account Management Fee</option>
! 			<option value="N">New Card</option>
! 			<option value="M">Sundry</option>
! 			<option value="REF">Cash Refund</option>
! 		</select>
! 	</p>
! 	<p><label class="label100">Itemnumber</label><input type="text" name="itemnum"></p>
! 	<p><label class="label100">Description</label><input type="text" name="desc" size="50"></p>
! 	<p><label class="label100">Amount</label><input type="text" name="amount"></p>
! 	<p><label class="label100"><input type="submit" class="button" name="add" value="Add"></p>
! 	</table>
! 	</form>
! </div>
  <!-- TMPL_INCLUDE Name="members-bottom.inc" -->




From tipaul at users.sourceforge.net  Mon Jun 20 16:22:32 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:22:32 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/images filefind.png,1.1,1.2
Message-ID: <E1DkNAW-0002Mw-1E@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	filefind.png 
Log Message:
synch'ing 2.2 and head





From tipaul at users.sourceforge.net  Mon Jun 20 16:22:32 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:22:32 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.20,1.21 opac-top.inc,1.10,1.11
Message-ID: <E1DkNAW-0002N6-9J@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac.css opac-top.inc 
Log Message:
synch'ing 2.2 and head

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** opac.css	15 Jun 2005 19:55:14 -0000	1.20
--- opac.css	20 Jun 2005 14:22:29 -0000	1.21
***************
*** 51,55 ****
  	border-width:0px;
  	text-align:left;
! 	position:absolute;
  }
  
--- 51,58 ----
  	border-width:0px;
  	text-align:left;
! 	display:inline;
! 	float:left;
! 	padding-left:10px;
! 	padding-right:10px;
  }
  
***************
*** 91,99 ****
  	font-weight:bold;
  	font-size: 115%;
- 	text-align : center;
  	vertical-align:top;
  	padding: 2px;
  	width:100%;
- 	margin-left:70px;
  }
  
--- 94,100 ----
***************
*** 143,147 ****
  	border:1px solid #000000;
  	border-collapse:collapse;
! 	width:90%;
  }
  /* header */
--- 144,148 ----
  	border:1px solid #000000;
  	border-collapse:collapse;
! 	position:static;
  }
  /* header */
***************
*** 155,165 ****
  	border-bottom:1px solid #000000;
  	border-top:1px solid #000000;
- 	padding:5px;
  }
  /* standard cell */
  td {
  	font-size:10pt;
  	border-left:1px solid #000000;
  	vertical-align:top;
  }
  
--- 156,173 ----
  	border-bottom:1px solid #000000;
  	border-top:1px solid #000000;
  }
  /* standard cell */
+ 
+ tr {
+ 	display:table-row;
+ 	position:static;
+ }
+ 
  td {
  	font-size:10pt;
  	border-left:1px solid #000000;
  	vertical-align:top;
+ 	position:static;
+ 	display:table-cell;
  }
  
***************
*** 355,361 ****
  }
  
  #menuline {
- 	float:left;
  	display:block;
  }
  
--- 363,374 ----
  }
  
+ #title {
+ 	display:block;
+ 	margin-left:0px;
+ }
+ 
  #menuline {
  	display:block;
+ 	margin-left:100px;
  }
  
***************
*** 369,376 ****
  
  /* a little spacer. should not be used */
- .spacer {
- 	padding-left:20pt;
- 	float:left;
- }
  .basketspacer {
  	padding-left:8pt;
--- 382,385 ----
***************
*** 378,388 ****
  }
  
  /* for MARC view  */
  div.tabs {
! 	width:10px;
! 	position:absolute;
  	display:block;
! 	margin-left:50px;
! 	margin-top:150px;
  }
  
--- 387,419 ----
  }
  
+ /* for SubscritptionHistory view  */
+ div.tabsubs {
+ 	margin-left:150px;
+ 	position:inline;
+ }
+ 
+ div.tabsubs a {
+ 	font-size: small;
+ 	border: thin solid black;
+ 	margin-right: 2px;
+ 	padding: 10px 10px;
+ 	-moz-border-radius: 5px 5px 0px 0px;
+ }
+ 
+ div.tabsub {
+ 	background-color: #ACE6E6;
+ 	position:absolute;
+ 	visibility:hidden;
+ 	margin-left:150px;
+ 	margin-top:0px;
+ border:4px;
+ }
+ 
  /* for MARC view  */
  div.tabs {
! 	width:15px;
  	display:block;
! 	margin-top:70px;
! 	margin-left:40px;
  }
  
***************
*** 396,399 ****
--- 427,440 ----
  }
  
+ div.tabbloc {
+ 	position:absolute;
+ 	display:block;
+ 	top:140px;
+ 	left:62px;
+ 	margin-right:0px;
+ 	border: 1px solid black;
+ 	background-color:none;
+ }
+ 
  div.tab {
  	background-color: #ACE6E6;
***************
*** 401,407 ****
  	visibility:hidden;
  	position:absolute;
! 	margin-left:72px;
! 	margin-top:150px;
! 	margin-right:10%;
  }
  
--- 442,448 ----
  	visibility:hidden;
  	position:absolute;
! 	float:left;
! 	margin-right:0px;
! 	background-color:none;
  }
  

Index: opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** opac-top.inc	4 May 2005 08:58:30 -0000	1.10
--- opac-top.inc	20 Jun 2005 14:22:30 -0000	1.11
***************
*** 25,29 ****
  	var MSG_NO_RECORD_ADDED = _("No biblio added");
  	function Dopop(link) {
! 		newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
  	}
  	</script>
--- 25,29 ----
  	var MSG_NO_RECORD_ADDED = _("No biblio added");
  	function Dopop(link) {
! 		newin=window.open(link,'popup','width=700,height=500,toolbar=false,scrollbars=yes');
  	}
  	</script>
***************
*** 31,41 ****
  <body>
  	<!-- MENUS -->
! 	<div id="menuline">
! 		<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo" style="float: left" />
  		<div class="SmallLibraryName"><!--TMPL_VAR name="LibraryName"--></div>
! 		<span class="spacer">&nbsp;</span>
! 		<span class="spacer">&nbsp;</span>
  		<a class="menu" href="/cgi-bin/koha/opac-main.pl" title="Koha home page">Home</a>
- 		<span class="spacer">&nbsp;</span>
  		<a class="menu" href="/cgi-bin/koha/opac-search.pl" title="Advanced search">Advanced search</a>
  		<!-- TMPL_IF NAME="loggedinusername" -->
--- 31,44 ----
  <body>
  	<!-- MENUS -->
! 	<div id="title">
! 		<!-- TMPL_IF name="opacsmallimage" -->
! 			<img src="<!-- TMPL_VAR name="opacsmallimage"-->" height="50" alt="koha logo"/>
! 		<!-- TMPL_ELSE -->
! 			<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo"/>
! 		<!-- /TMPL_IF -->
  		<div class="SmallLibraryName"><!--TMPL_VAR name="LibraryName"--></div>
! 	</div>
! 	<div id="menuline">
  		<a class="menu" href="/cgi-bin/koha/opac-main.pl" title="Koha home page">Home</a>
  		<a class="menu" href="/cgi-bin/koha/opac-search.pl" title="Advanced search">Advanced search</a>
  		<!-- TMPL_IF NAME="loggedinusername" -->
***************
*** 47,53 ****
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_IF -->
- 		<span class="spacer">&nbsp;</span>
  		<a class="menu" href="/cgi-bin/koha/opac-user.pl" title="Member Home page" >Personal page</a>
- 		<span class="spacer">&nbsp;</span>
  		<a class="menu" href="javascript:openBasket()" title="Biblio basket">Biblio basket <span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a>
  	</div>
--- 50,54 ----




From tipaul at users.sourceforge.net  Mon Jun 20 16:25:19 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:25:19 -0700
Subject: [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
Message-ID: <E1DkNDD-0002bu-BQ@sc8-pr-cvs1.sourceforge.net>

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>




From tipaul at users.sourceforge.net  Mon Jun 20 16:26:06 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:26:06 -0700
Subject: [Koha-cvs] CVS: koha/localfile/modified_authorities DO_NOT_REMOVE,1.1,1.2
Message-ID: <E1DkNDy-0002ki-4w@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/localfile/modified_authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10499/localfile/modified_authorities

Added Files:
	DO_NOT_REMOVE 
Log Message:
synch'ing 2.2 and head





From tipaul at users.sourceforge.net  Mon Jun 20 16:26:23 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:26:23 -0700
Subject: [Koha-cvs] CVS: koha/misc/release notes release_notes_223.txt,1.1,1.2
Message-ID: <E1DkNEE-0002mc-WE@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/release notes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10680/misc/release notes

Added Files:
	release_notes_223.txt 
Log Message:
synch'ing 2.2 and head

***** Bogus filespec: notes




From tipaul at users.sourceforge.net  Mon Jun 20 16:26:06 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:26:06 -0700
Subject: [Koha-cvs] CVS: koha/members memberentry.pl,1.9,1.10
Message-ID: <E1DkNDy-0002kj-52@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10499/members

Modified Files:
	memberentry.pl 
Log Message:
synch'ing 2.2 and head

Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/memberentry.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** memberentry.pl	4 May 2005 09:01:58 -0000	1.9
--- memberentry.pl	20 Jun 2005 14:26:03 -0000	1.10
***************
*** 129,138 ****
  		print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrowernumber");
  		}
- 		
- 	if($destination eq "circ"){
- 		print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$data{'cardnumber'}");
- 	} else {
- 		print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$data{'borrowernumber'}");
- 		}
  	}
  }
--- 129,132 ----
***************
*** 242,246 ****
  	$template->param(	actionType 		=> $actionType,
  				destination => $destination,
! 				member          => $member,
  				address         => $data->{'streetaddress'},
  				firstname       => $data->{'firstname'},
--- 236,240 ----
  	$template->param(	actionType 		=> $actionType,
  				destination => $destination,
! 				borrowernumber          => $borrowernumber,
  				address         => $data->{'streetaddress'},
  				firstname       => $data->{'firstname'},
***************
*** 268,273 ****
  				relshiploop	=> \@relshipdata,
  				"title_".$data->{'title'} => " SELECTED ",
! 				dateenrolled	=> $data->{'dateenrolled'},
! 				expiry		=> $data->{'expiry'},
  				cardnumber	=> $cardnumber,
  				dateofbirth	=> $data->{'dateofbirth'},
--- 262,267 ----
  				relshiploop	=> \@relshipdata,
  				"title_".$data->{'title'} => " SELECTED ",
! 				joining	=> format_date($data->{'dateenrolled'}),
! 				expiry		=> format_date($data->{'expiry'}),
  				cardnumber	=> $cardnumber,
  				dateofbirth	=> $data->{'dateofbirth'},




From tipaul at users.sourceforge.net  Mon Jun 20 16:27:51 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:27:51 -0700
Subject: [Koha-cvs] CVS: koha/misc/sql-datas/english sample_usmarc.mrc,1.1,1.2 sample_usmarc.readme,1.1,1.2
Message-ID: <E1DkNFf-0002yC-ST@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/sql-datas/english
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10788/misc/sql-datas/english

Added Files:
	sample_usmarc.mrc sample_usmarc.readme 
Log Message:
synch'ing 2.2 and head






From tipaul at users.sourceforge.net  Mon Jun 20 16:28:23 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:28:23 -0700
Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.90,1.91 overduenotices.pl,1.3,1.4
Message-ID: <E1DkNGB-00030Y-OG@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11485/misc

Modified Files:
	Install.pm overduenotices.pl 
Log Message:
synch'ing 2.2 and head

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -r1.90 -r1.91
*** Install.pm	27 May 2005 13:33:42 -0000	1.90
--- Install.pm	20 Jun 2005 14:28:10 -0000	1.91
***************
*** 3,7 ****
  
  # Copyright 2000-2002 Katipo Communications
! # Contains parts Copyright 2003-5 MJ Ray
  #
  # This file is part of Koha.
--- 3,7 ----
  
  # Copyright 2000-2002 Katipo Communications
! # Contains parts Copyright 2003-4 MJ Ray
  #
  # This file is part of Koha.
***************
*** 860,865 ****
  	unless (eval {require MARC::Record})     { push @missing,"MARC::Record" };
  	unless (eval {require Mail::Sendmail})   { push @missing,"Mail::Sendmail" };
- 	unless (eval {require PDF::API2})   { push @missing,"PDF::API2" };
  # The following modules are not mandatory, depends on how the library want to use Koha
  	unless (eval {require Net::LDAP})       {
  		if ($#missing>=0) { # only when $#missing >= 0 so this isn't fatal
--- 860,869 ----
  	unless (eval {require MARC::Record})     { push @missing,"MARC::Record" };
  	unless (eval {require Mail::Sendmail})   { push @missing,"Mail::Sendmail" };
  # The following modules are not mandatory, depends on how the library want to use Koha
+ 	unless (eval {require PDF::API2})   { 
+ 			if ($#missing>=0) { # only when $#missing >= 0 so this isn't fatal
+ 				push @missing,"You will need PDF::API2 for barcode generator" 
+ 			}
+ 	}
  	unless (eval {require Net::LDAP})       {
  		if ($#missing>=0) { # only when $#missing >= 0 so this isn't fatal
***************
*** 1952,1958 ****
  
  		startsysout();
! 		system("$mysqldir/bin/mysql '-u$user' -e \"insert into branches (branchcode,branchname,issuing) values ('$branchcode', '$branch', 1)\" '$database'");
! 		system("$mysqldir/bin/mysql '-u$user' -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\" '$database'");
! 		system("$mysqldir/bin/mysql '-u$user' -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\" '$database'");
  
  		my $printername='lp';
--- 1956,1962 ----
  
  		startsysout();
! 		system("$mysqldir/bin/mysql -u$user -e \"insert into branches (branchcode,branchname,issuing) values ('$branchcode', '$branch', 1)\" $database");
! 		system("$mysqldir/bin/mysql -u$user -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\" $database");
! 		system("$mysqldir/bin/mysql -u$user -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\" $database");
  
  		my $printername='lp';
***************
*** 1973,1977 ****
  		}
  		startsysout();	
! 		system("$mysqldir/bin/mysql '-u$user' -e \"insert into printers (printername,printqueue,printtype) values ('$printername', '$printerqueue', '')\" '$database'");
  	}
  	my $language;
--- 1977,1981 ----
  		}
  		startsysout();	
! 		system("$mysqldir/bin/mysql -u$user -e \"insert into printers (printername,printqueue,printtype) values ('$printername', '$printerqueue', '')\" $database");
  	}
  	my $language;
***************
*** 1983,1987 ****
  	}
  	startsysout();	
! 	system("$mysqldir/bin/mysql '-u$user' -e \"update systempreferences set value='$language' where variable='opaclanguages'\" '$database'");
  	my @dirs;
  	if (-d "scripts/misc/sql-datas") {
--- 1987,1991 ----
  	}
  	startsysout();	
! 	system("$mysqldir/bin/mysql -u$user -e \"update systempreferences set value='$language' where variable='opaclanguages'\" $database");
  	my @dirs;
  	if (-d "scripts/misc/sql-datas") {
***************
*** 2154,2158 ****
  
  setmysqlclipass($pass); 
! open (MD, "$mysqldir/bin/mysqldump '--user=$user' --host=$hostname '$database'|");
  
  (open BF, ">$backupdir/Koha.backup_$date") || (die "Error opening up backup file $backupdir/Koha.backup_$date: $!\n");
--- 2158,2162 ----
  
  setmysqlclipass($pass); 
! open (MD, "$mysqldir/bin/mysqldump --user=$user --host=$hostname $database|");
  
  (open BF, ">$backupdir/Koha.backup_$date") || (die "Error opening up backup file $backupdir/Koha.backup_$date: $!\n");

Index: overduenotices.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/overduenotices.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** overduenotices.pl	4 May 2005 09:02:37 -0000	1.3
--- overduenotices.pl	20 Jun 2005 14:28:12 -0000	1.4
***************
*** 74,78 ****
  # The following fields are available :
  # <date> <itemcount> <firstname> <lastname> <address1> <address2> <address3> <city> <postcode>
! my $mailtext = "\n\n\nDear library borrower\n\n\n       <date>\n\n       According to our records, you have <itemcount> items that are at\n       least a week overdue for return to the library or renewal.\n       If you have registered a password with the library, you may use it\n       and your library card to login at http://XXX.org\n       to check the status of your account, or you may call any of our branch\n       Please be advised that all library services will be blocked\n       if items are allowed to go more than 30 days overdue.\n\n       Thank you for using your public libraries.\n\n\n                                             <firstname> <lastname>\n                                             <address1>\n                                             <address2>\n                                             <city>  <postcode>\n\n\n\n\n\n";
  #
  # END OF PARAMETERS
--- 74,79 ----
  # The following fields are available :
  # <date> <itemcount> <firstname> <lastname> <address1> <address2> <address3> <city> <postcode>
! my $mailtext = "\n\n\nDear library borrower\n\n\n       <date>\n\n       According to our records, you have <itemcount> items, the description of which follows, that are at\n       least a week overdue for return to the library or renewal:\n		title		author		barcode\n<titles>\n
!        If you have registered a password with the library, you may use it\n       and your library card to login at http://XXX.org\n       to check the status of your account, or you may call any of our branch\n       Please be advised that all library services will be blocked\n       if items are allowed to go more than 30 days overdue.\n\n       Thank you for using your public libraries.\n\n\n                                             <firstname> <lastname>\n                                             <address1>\n                                             <address2>\n                                             <city>  <postcode>\n\n\n\n\n\n";
  #
  # END OF PARAMETERS
***************
*** 85,89 ****
  
  my $dbh = C4::Context->dbh;
! my $sth = $dbh->prepare ("SELECT count(*), issues.borrowernumber,firstname,surname,streetaddress,physstreet,city,zipcode,emailaddress FROM issues,borrowers,categories WHERE returndate IS NULL AND TO_DAYS(NOW())-TO_DAYS(date_due) BETWEEN 0 and 500 AND issues.borrowernumber=borrowers.borrowernumber and borrowers.categorycode=categories.categorycode and categories.overduenoticerequired=1 group by issues.borrowernumber");
  $sth->execute;
  # 
--- 86,92 ----
  
  my $dbh = C4::Context->dbh;
! my $sth = $dbh->prepare ("SELECT COUNT(*), issues.borrowernumber,firstname,surname,streetaddress,physstreet,city,zipcode,emailaddress FROM issues,borrowers,categories WHERE returndate IS NULL AND TO_DAYS(NOW())-TO_DAYS(date_due) BETWEEN 0 and 500 AND issues.borrowernumber=borrowers.borrowernumber and borrowers.categorycode=categories.categorycode and categories.overduenoticerequired=1 group by issues.borrowernumber");
! my $sth2 = $dbh->prepare("SELECT biblio.title,biblio.author,items.barcode FROM issues,items,biblio WHERE items.itemnumber=issues.itemnumber and biblio.biblionumber=items.biblionumber AND issues.borrowernumber=? AND returndate IS NULL AND TO_DAYS(NOW())-TO_DAYS(date_due) BETWEEN 0 and 500");
! 
  $sth->execute;
  # 
***************
*** 92,95 ****
--- 95,99 ----
  my $count = 0;   # to keep track of how many notices are printed
  my $e_count = 0;   # and e-mailed
+ my $date=localtime;
  my ($itemcount,$borrnum,$firstname,$lastname,$address1,$address2,$city,$postcode,$email);
  
***************
*** 103,107 ****
  		$notice =~ s/\<city\>/$city/g;
  		$notice =~ s/\<postcode\>/$postcode/g;
! 	
  	# if not using e-mail notices, comment out the following lines
  		if ($email) {   # or you might check for borrowers.preferredcont 
--- 107,120 ----
  		$notice =~ s/\<city\>/$city/g;
  		$notice =~ s/\<postcode\>/$postcode/g;
! 		$notice =~ s/\<date\>/$date/g;
! 
! 		$sth2->execute($borrnum);
! 		my $titles="";
! 		my ($title, $author, $barcode);
! 		while (($title, $author, $barcode) = $sth2->fetchrow){
! 			$titles .= "		".($title?$title:"")."	".($author?$author:"")."	".($barcode?$barcode:"")."\n";
! 		}
! 		$notice =~ s/\<titles\>/$titles/g;
! 		$sth2->finish;
  	# if not using e-mail notices, comment out the following lines
  		if ($email) {   # or you might check for borrowers.preferredcont 
***************
*** 136,140 ****
  		$notice .= <ODUES>;
  		if ($nomail) {
! 			print "TO => $email\n";
  			print "FROM => $from\n";
  			print "SUBJECT => Koha overdue\n";
--- 149,153 ----
  		$notice .= <ODUES>;
  		if ($nomail) {
! 			print "TO => $email\n" if $email;
  			print "FROM => $from\n";
  			print "SUBJECT => Koha overdue\n";




From tipaul at users.sourceforge.net  Mon Jun 20 16:33:35 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:33:35 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-dictionary.pl,1.1,1.2 opac-detail.pl,1.19,1.20 opac-main.pl,1.16,1.17 opac-search.pl,1.29,1.30 opac-sendbasket.pl,1.6,1.7 opac-serial-issues.pl,1.3,1.4 opac-user.pl,1.16,1.17
Message-ID: <E1DkNLD-0003sh-Lt@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14868/opac

Modified Files:
	opac-detail.pl opac-main.pl opac-search.pl opac-sendbasket.pl 
	opac-serial-issues.pl opac-user.pl 
Added Files:
	opac-dictionary.pl 
Log Message:
synch'ing 2.2 and head


Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** opac-detail.pl	17 Jun 2005 13:44:25 -0000	1.19
--- opac-detail.pl	20 Jun 2005 14:33:32 -0000	1.20
***************
*** 30,33 ****
--- 30,34 ----
  my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
  my ($websitecount, @websites)             = &getwebsites($biblionumber);
+ my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
  
  $dat->{'count'}=@items;
***************
*** 85,89 ****
  				SITE_RESULTS => $sitearray,
  				subscriptionsnumber => $subscriptionsnumber,
- 				subscriptions => \@subs,
  			     LibraryName => C4::Context->preference("LibraryName"),
  				suggestion => C4::Context->preference("suggestion"),
--- 86,89 ----
***************
*** 124,125 ****
--- 124,127 ----
  #output_html_with_http_headers $query, $cookie, $template->output;
  
+ output_html_with_http_headers $query, $cookie, $template->output;
+ 

Index: opac-main.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-main.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** opac-main.pl	4 Oct 2004 20:20:25 -0000	1.16
--- opac-main.pl	20 Jun 2005 14:33:32 -0000	1.17
***************
*** 53,56 ****
--- 53,57 ----
  				languages => \@options,
  				textmessaging => $borrower->{textmessaging},
+ 				opaclargeimage => C4::Context->preference("opaclargeimage"),
  );
  output_html_with_http_headers $input, $cookie, $template->output;

Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** opac-search.pl	3 Jun 2005 04:15:29 -0000	1.29
--- opac-search.pl	20 Jun 2005 14:33:32 -0000	1.30
***************
*** 9,13 ****
  use C4::Database;
  use HTML::Template;
! use C4::SearchMarc;
  use C4::Acquisition;
  use C4::Biblio;
--- 9,13 ----
  use C4::Database;
  use HTML::Template;
! use C4::SearchMarcTest;
  use C4::Acquisition;
  use C4::Biblio;
***************
*** 412,416 ****
  }
  # ADDED BY JF
! if ($totalresults == 1){
      # if its a barcode search by definition we will only have one result.
      # And if we have a result
--- 412,416 ----
  }
  # ADDED BY JF
! #if ($totalresults == 1){
      # if its a barcode search by definition we will only have one result.
      # And if we have a result

Index: opac-sendbasket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-sendbasket.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** opac-sendbasket.pl	20 Jun 2005 01:01:06 -0000	1.6
--- opac-sendbasket.pl	20 Jun 2005 14:33:32 -0000	1.7
***************
*** 8,11 ****
--- 8,12 ----
  use C4::Context;
  use C4::Search;
+ use C4::Biblio;
  use C4::Auth;
  use C4::Interface::CGI::Output;
***************
*** 15,106 ****
  my $query = new CGI;
  
! my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
!     {
!         template_name   => "opac-sendbasketform.tmpl",
!         query           => $query,
!         type            => "opac",
!         authnotrequired => 1,
!         flagsrequired   => { borrow => 1 },
!     }
! );
! 
! my $bib_list     = $query->param('bib_list');
! my $email_add    = $query->param('email_add');
! my $email_sender = $query->param('email_sender');
  
- my $dbh = C4::Context->dbh();
  
  if ($email_add) {
!     my $email_from = C4::Context->preference('KohaAdminEmailAddress');
  
!     my %mail = (
!         To   => $email_add,
!         From => $email_from
!     );
! 
!     my ( $template2, $borrowernumber, $cookie ) = get_template_and_user(
!         {
!             template_name   => "opac-sendbasket.tmpl",
!             query           => $query,
!             type            => "opac",
!             authnotrequired => 1,
!             flagsrequired   => { borrow => 1 },
!         }
!     );
! 
!     my @bibs = split ( /\//, $bib_list );
!     my @results;
!     my $iso2709;
!     foreach my $biblionumber (@bibs) {
!         $template2->param( biblionumber => $biblionumber );
! 
!         my $dat = &bibdata($biblionumber);
!         my ( $authorcount, $addauthor ) = &addauthor($biblionumber);
!         my @items = &ItemInfo( undef, $biblionumber, 'opac' );
! 
!         $dat->{'additional'} = $addauthor->[0]->{'author'};
!         for ( my $i = 1 ; $i < $authorcount ; $i++ ) {
!             $dat->{'additional'} .= "|" . $addauthor->[$i]->{'author'};
!         }
! 
!         $dat->{'biblionumber'} = $biblionumber;
!         $dat->{ITEM_RESULTS} = \@items;
!         my $record = MARCgetbiblio( $dbh, $biblionumber );
!         $iso2709 .= $record->as_usmarc();
! 
!         push ( @results, $dat );
!     }
! 
!     my $resultsarray = \@results;
!     $template2->param(
!         BIBLIO_RESULTS => $resultsarray,
!         email_sender   => $email_sender
!     );
! 
!     # Getting template result
!     my $template_res = $template2->output();
! 
!     # Analysing information and getting mail properties
!     if ( $template_res =~ /<SUBJECT>\n(.*)\n<END_SUBJECT>/s ) {
!         $mail{'subject'} = $1;
!     }
!     else { $mail{'subject'} = "no subject"; }
! 
!     my $email_header = "";
!     if ( $template_res =~ /<HEADER>\n(.*)\n<END_HEADER>/s ) {
!         $email_header = $1;
!     }
! 
!     my $email_file = "basket.txt";
!     if ( $template_res =~ /<FILENAME>\n(.*)\n<END_FILENAME>/s ) {
!         $email_file = $1;
!     }
! 
!     if ( $template_res =~ /<MESSAGE>\n(.*)\n<END_MESSAGE>/s ) {
!         $mail{'body'} = $1;
!     }
  
!     my $boundary = "====" . time() . "====";
!     $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
  
      $email_header = encode_qp($email_header);
--- 16,73 ----
  my $query = new CGI;
  
! my ($template, $borrowernumber, $cookie) 
!     = get_template_and_user({template_name => "opac-sendbasketform.tmpl",
! 			     query => $query,
! 			     type => "opac",
! 			     authnotrequired => 1,
! 			     flagsrequired => {borrow => 1},
! 			 });
! 
! my $bib_list=$query->param('bib_list');
! my $email_add=$query->param('email_add');
! my $email_sender=$query->param('email_sender');
! my $dbh=C4::Context->dbh;
! my $sth;
! $sth=$dbh->prepare("select bibid from marc_biblio where biblionumber=? order by bibid");
  
  
  if ($email_add) {
! 	my $email_from = C4::Context->preference('KohaAdminEmailAddress');
! 
! 	my %mail = (	 To      => $email_add,
! 						 From    => $email_from);
  
! 	my ($template2, $borrowernumber, $cookie) 
!     = get_template_and_user({template_name => "opac-sendbasket.tmpl",
! 			     query => $query,
! 			     type => "opac",
! 			     authnotrequired => 1,
! 			     flagsrequired => {borrow => 1},
! 			 });
! 
! 	my @bibs = split(/\//, $bib_list);
! 	my @results;
! 	my $iso2709;
! 	foreach my $biblionumber (@bibs) {
! 		$template2->param(biblionumber => $biblionumber);
! 
! 		my $dat = &bibdata($biblionumber);
! 		my ($authorcount, $addauthor) = &addauthor($biblionumber);
! 		my @items                     = &ItemInfo(undef, $biblionumber, 'opac');
! 
! 		$dat->{'additional'}=$addauthor->[0]->{'author'};
! 		for (my $i = 1; $i < $authorcount; $i++) {
! 			$dat->{'additional'} .= "|" . $addauthor->[$i]->{'author'};
! 		}
! 
! 		$dat->{'biblionumber'} = $biblionumber;
! 		$dat->{ITEM_RESULTS} = \@items;
! 		$sth->execute($biblionumber);
! 		my ($bibid) = $sth->fetchrow;
! 		my $record = MARCgetbiblio($dbh,$bibid);
! 		$iso2709 .= $record->as_usmarc();
  
! 		push (@results, $dat);
! 	}
  
      $email_header = encode_qp($email_header);
***************
*** 108,113 ****
      $boundary = "--" . $boundary;
  
!     # Writing mail
!     $mail{body} = <<END_OF_BODY;
  $boundary
  Content-Type: text/plain; charset="iso-8859-1"
--- 75,129 ----
      $boundary = "--" . $boundary;
  
! 	# Analysing information and getting mail properties
! 	if ($template_res =~ /<SUBJECT>\n(.*)\n<END_SUBJECT>/s) { $mail{'subject'} = $1; }
! 	else { $mail{'subject'} = "no subject"; }
! 
! 	my $email_header = "";
! 	if ($template_res =~ /<HEADER>\n(.*)\n<END_HEADER>/s) { $email_header = $1; }
! 
! 	my $email_file = "basket.txt";
! 	if ($template_res =~ /<FILENAME>\n(.*)\n<END_FILENAME>/s) { $email_file = $1; }
! 
! 	if ($template_res =~ /<MESSAGE>\n(.*)\n<END_MESSAGE>/s) { $mail{'body'} = $1; }
! 
! 	my $boundary = "====" . time() . "====";
! # 	$mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
! # 
! # 	$email_header = encode_qp($email_header);
! # 
! # 	$boundary = "--".$boundary;
! # 
! # 	# Writing mail
! # 	$mail{body} =
! 	$mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
! 
! 	my $message = encode_qp( "" );
! 
! # $file = $^X; # This is the perl executable
! # 
! # open (F, $file) or die "Cannot read $file: $!";
! # binmode F; undef $/;
! $mail{body} = encode_base64($iso2709);
! # close F;
! 
! $boundary = '--'.$boundary;
! $mail{body} = <<END_OF_BODY;
! $boundary
! Content-Type: text/plain; charset="iso-8859-1"
! Content-Transfer-Encoding: quoted-printable
! 
! $message
! $boundary
! Content-Type: application/octet-stream; name="basket"
! Content-Transfer-Encoding: base64
! Content-Disposition: attachment; filename="basket"
! 
! $mail{body}
! $boundary--
! END_OF_BODY
! 
! 
! 
! 	 <<END_OF_BODY;
  $boundary
  Content-Type: text/plain; charset="iso-8859-1"
***************
*** 121,148 ****
  END_OF_BODY
  
!     # Sending mail
!     if ( sendmail %mail ) {
! 
!         # do something if it works....
!         warn "Mail sent ok\n";
!         $template->param( SENT      => "1" );
!         $template->param( email_add => $email_add );
!     }
!     else {
! 
!         # do something if it doesnt work....
!         warn "Error sending mail: $Mail::Sendmail::error \n";
!         warn "$mail{'body'}";
!     }
  
      output_html_with_http_headers $query, $cookie, $template->output;
  }
  else {
!     $template->param( bib_list => $bib_list );
!     $template->param(
!         url            => "/cgi-bin/koha/opac-sendbasket.pl",
!         suggestion     => C4::Context->preference("suggestion"),
!         virtualshelves => C4::Context->preference("virtualshelves"),
!     );
!     output_html_with_http_headers $query, $cookie, $template->output;
  }
--- 137,178 ----
  END_OF_BODY
  
! $mail{attachment} = $iso2709;
! #	$mail{body} = <<END_OF_BODY;
! #$boundary
! #Content-Type: text/plain; charset="iso-8859-1"
! #Content-Transfer-Encoding: quoted-printable
! #
! #$email_header
! #
! #$boundary
! #Content-Type: text/plain; name="$email_file"
! #Content-Transfer-Encoding: quoted-printable
! #Content-Disposition: attachment; filename="$email_file"
! #
! #$mail{'body'}
! #
! #$boundary--
! #END_OF_BODY
! 
! 	# Sending mail
! 	if (sendmail %mail) {
! 	# do something if it works....
! #		warn " ".$mail{body};
! #		warn " ".$mail{PJ};
! 		$template->param(SENT => "1");
! 		$template->param(email_add => $email_add);
! 	} else {
! 		# do something if it doesnt work....
! 		warn "Error sending mail: $Mail::Sendmail::error \n";
! 	}
  
      output_html_with_http_headers $query, $cookie, $template->output;
  }
  else {
! 	$template->param(bib_list => $bib_list);
! 	$template->param(url => "/cgi-bin/koha/opac-sendbasket.pl",
! 	suggestion => C4::Context->preference("suggestion"),
! 	virtualshelves => C4::Context->preference("virtualshelves"),
! 	);
! 	output_html_with_http_headers $query, $cookie, $template->output;
  }

Index: opac-serial-issues.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-serial-issues.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-serial-issues.pl	4 May 2005 09:02:38 -0000	1.3
--- opac-serial-issues.pl	20 Jun 2005 14:33:32 -0000	1.4
***************
*** 15,41 ****
  my $op = $query->param('op');
  my $dbh = C4::Context->dbh;
  my $sth;
  # my $id;
  my ($template, $loggedinuser, $cookie);
  my $biblionumber = $query->param('biblionumber');
! my $subscriptions = get_subscription_list_from_biblionumber($biblionumber);
! 
! ($template, $loggedinuser, $cookie)
! = get_template_and_user({template_name => "opac-serial-issues.tmpl",
! 				query => $query,
! 				type => "opac",
! 				authnotrequired => 1,
! 				debug => 1,
! 				});
! 
! # replace CR by <br> in librarian note
! # $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
! 
! $template->param(
! 	biblionumber => $query->param('biblionumber'),
! 	subscription_LOOP => $subscriptions
! 	suggestion => C4::Context->preference("suggestion"),
! 	virtualshelves => C4::Context->preference("virtualshelves"),
! 	);
  
  output_html_with_http_headers $query, $cookie, $template->output;
--- 15,77 ----
  my $op = $query->param('op');
  my $dbh = C4::Context->dbh;
+ my $selectview = $query->param('selectview');
+ $selectview = C4::Context->preference("SubscriptionHistory") unless $selectview;
+ 
  my $sth;
  # my $id;
  my ($template, $loggedinuser, $cookie);
  my $biblionumber = $query->param('biblionumber');
! if ($selectview eq "full"){
! 	my $subscriptions = get_full_subscription_list_from_biblionumber($biblionumber);
! 	
! 	my $title = $subscriptions->[0]{bibliotitle};
! # 	warn "title ".$title;
! 	my $yearmin=$subscriptions->[0]{year};
! # 	warn "yearmin ".$yearmin;
! 	my $yearmax=$subscriptions->[scalar(@$subscriptions)-1]{year};
! # 	warn "yearmax ".$yearmax;
! 	
! 	
! 	($template, $loggedinuser, $cookie)
! 	= get_template_and_user({template_name => "opac-full-serial-issues.tmpl",
! 					query => $query,
! 					type => "opac",
! 					authnotrequired => 1,
! 					debug => 1,
! 					});
! 	
! 	# replace CR by <br> in librarian note
! 	# $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
! 	
! 	$template->param(
! 		biblionumber => $query->param('biblionumber'),
! 		years => $subscriptions,
! 		yearmin => $yearmin,
! 		yearmax =>$yearmax,
! 		bibliotitle => $title,
! 		suggestion => C4::Context->preference("suggestion"),
! 		virtualshelves => C4::Context->preference("virtualshelves"),
! 		);
  
+ } else {
+ 	my $subscriptions = get_subscription_list_from_biblionumber($biblionumber);
+ 	
+ 	($template, $loggedinuser, $cookie)
+ 	= get_template_and_user({template_name => "opac-serial-issues.tmpl",
+ 					query => $query,
+ 					type => "opac",
+ 					authnotrequired => 1,
+ 					debug => 1,
+ 					});
+ 	
+ 	# replace CR by <br> in librarian note
+ 	# $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
+ 	
+ 	$template->param(
+ 		biblionumber => $query->param('biblionumber'),
+ 		subscription_LOOP => $subscriptions,
+ 		suggestion => C4::Context->preference("suggestion"),
+ 		virtualshelves => C4::Context->preference("virtualshelves"),
+ 		);
+ }
  output_html_with_http_headers $query, $cookie, $template->output;

Index: opac-user.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-user.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** opac-user.pl	4 May 2005 09:02:38 -0000	1.16
--- opac-user.pl	20 Jun 2005 14:33:32 -0000	1.17
***************
*** 137,143 ****
  $template->param(WAITING => \@waiting);
  $template->param(waiting_count => $wcount,
! 			     LibraryName => C4::Context->preference("LibraryName"),
! 					suggestion => C4::Context->preference("suggestion"),
! 					virtualshelves => C4::Context->preference("virtualshelves"),
  );
  
--- 137,144 ----
  $template->param(WAITING => \@waiting);
  $template->param(waiting_count => $wcount,
! 				LibraryName => C4::Context->preference("LibraryName"),
! 				suggestion => C4::Context->preference("suggestion"),
! 				virtualshelves => C4::Context->preference("virtualshelves"),
! 				textmessaging => $borr->{textmessaging},
  );
  




From tipaul at users.sourceforge.net  Mon Jun 20 16:34:47 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:34:47 -0700
Subject: [Koha-cvs] CVS: koha/reports borrowers_out.pl,1.2,1.3
Message-ID: <E1DkNMN-00046z-Mw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/reports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15651/reports

Modified Files:
	borrowers_out.pl 
Log Message:
synch'ing 2.2 and head

Index: borrowers_out.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/borrowers_out.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** borrowers_out.pl	4 May 2005 09:02:38 -0000	1.2
--- borrowers_out.pl	20 Jun 2005 14:34:45 -0000	1.3
***************
*** 160,164 ****
  #
  	my @loopfilter;
! 	for (my $i=0;$i<=6;$i++) {
  		my %cell;
  		if ( @$filters[$i] ) {
--- 160,164 ----
  #
  	my @loopfilter;
! 	for (my $i=0;$i<=2;$i++) {
  		my %cell;
  		if ( @$filters[$i] ) {
***************
*** 168,171 ****
--- 168,172 ----
  			$cell{filter} .= @$filters[$i];
  			$cell{crit} .="Bor Cat" if ($i==0);
+ 			$cell{crit} .="Without issues since" if ($i==1);
  			push @loopfilter, \%cell;
  		}
***************
*** 229,239 ****
  	my $strcalc ;
  	
! # Processing average loanperiods
  	$strcalc .= "SELECT CONCAT( borrowers.surname , \"\\t\",borrowers.firstname, \"\\t\", borrowers.cardnumber)";
  	$strcalc .= " , $colfield " if ($colfield);
! 	$strcalc .= " FROM borrowers LEFT JOIN issues ON  issues.borrowernumber=borrowers.borrowernumber WHERE issues.borrowernumber is null";
  	@$filters[0]=~ s/\*/%/g if (@$filters[0]);
  	$strcalc .= " AND borrowers.categorycode like '" . @$filters[0] ."'" if ( @$filters[0] );
! 	
  	$strcalc .= " group by borrowers.borrowernumber";
  	$strcalc .= ", $colfield" if ($column);
--- 230,253 ----
  	my $strcalc ;
  	
! # Processing calculation
  	$strcalc .= "SELECT CONCAT( borrowers.surname , \"\\t\",borrowers.firstname, \"\\t\", borrowers.cardnumber)";
  	$strcalc .= " , $colfield " if ($colfield);
! 	$strcalc .= " FROM borrowers ";
! 	$strcalc .= "WHERE 1 ";
  	@$filters[0]=~ s/\*/%/g if (@$filters[0]);
  	$strcalc .= " AND borrowers.categorycode like '" . @$filters[0] ."'" if ( @$filters[0] );
! 	if (@$filters[1]){
! 		my $queryfilter = $dbh->prepare("SELECT DISTINCT borrowernumber FROM issues where issues.timestamp>?");
! 		$queryfilter->execute(@$filters[1]);
! 		while (my ($bornum)=$queryfilter->fetchrow){
! 			$strcalc .= " AND borrowers.borrowernumber <> $bornum ";
! 		}
! 	} else {
! 		my $queryfilter = $dbh->prepare("SELECT DISTINCT borrowernumber FROM issues ");
! 		$queryfilter->execute;
! 		while (my ($bornum)=$queryfilter->fetchrow){
! 			$strcalc .= " AND borrowers.borrowernumber <> $bornum ";
! 		}
! 	}
  	$strcalc .= " group by borrowers.borrowernumber";
  	$strcalc .= ", $colfield" if ($column);




From tipaul at users.sourceforge.net  Mon Jun 20 16:36:47 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:36:47 -0700
Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.104,1.105
Message-ID: <E1DkNOJ-0004MS-Cq@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/updater
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16715/updater

Modified Files:
	updatedatabase 
Log Message:
synch'ing 2.2 and head

Index: updatedatabase
===================================================================
RCS file: /cvsroot/koha/koha/updater/updatedatabase,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -r1.104 -r1.105
*** updatedatabase	1 Jun 2005 21:35:05 -0000	1.104
--- updatedatabase	20 Jun 2005 14:36:44 -0000	1.105
***************
*** 834,837 ****
--- 834,855 ----
          {
              uniquefieldrequired => 'variable',
+             variable            => 'opacsmallimage',
+             value               => '',
+ 	    forceupdate		=> { 'explanation' => 1,
+ 	    			     'type' => 1},
+             explanation         => 'Enter a complete URL to an image, will be on top/left instead of the Koha logo',
+ 	    type		=> 'free',
+         },
+         {
+             uniquefieldrequired => 'variable',
+             variable            => 'opaclargeimage',
+             value               => '',
+ 	    forceupdate		=> { 'explanation' => 1,
+ 	    			     'type' => 1},
+             explanation         => 'Enter a complete URL to an image, will be on the main page, instead of the Koha logo',
+ 	    type		=> 'free',
+         },
+         {
+             uniquefieldrequired => 'variable',
              variable            => 'delimiter',
              value               => ';',
***************
*** 863,866 ****
--- 881,904 ----
  	        options		=> ';|tabulation|,|/|\|#'
          },
+         {
+             uniquefieldrequired => 'variable',
+             variable            => 'SubscriptionHistory',
+             value               => ';',
+ 	        forceupdate		=> { 'explanation' => 1,
+ 	    			     'type' => 1,
+ 				     'options' => 1},
+             explanation         => 'Define the information level for serials history in OPAC',
+ 	        type		=> 'Choice',
+ 	        options		=> 'simplified|full'
+         },
+         {
+             uniquefieldrequired => 'variable',
+             variable            => 'hidelostitems',
+             value               => 'No',
+ 	    forceupdate		=> { 'explanation' => 1,
+ 	    			     'type' => 1},
+             explanation         => 'show or hide "lost" items in OPAC.',
+ 	    type		=> 'YesNo',
+         },
      ],
  
***************
*** 1448,1457 ****
  
  # $Log$
! # Revision 1.104  2005/06/01 21:35:05  genjimoto
! # New Feature: catalogsearch() has a new parameter, $sqlstring. A developer puts into it whatever they want to tack onto the end of the where statement. See usage in opac-search.pl
! #
! # Revision 1.103  2005/05/04 09:04:52  tipaul
  # synch'ing 2.2 and head
  #
  # Revision 1.100.2.2  2005/03/29 15:41:43  tipaul
  # * new permissions : management & tools. You now have 2 new permissions :
--- 1486,1501 ----
  
  # $Log$
! # Revision 1.105  2005/06/20 14:36:44  tipaul
  # synch'ing 2.2 and head
  #
+ # Revision 1.100.2.5  2005/06/06 15:23:36  tipaul
+ # adding a systempref to choose either to show or hide "lost" items. Note that "lost items" can be related to an authorised value list, so does not necessary mean "item definetly lost". Even here, some libraries want to see lost items, and some don't want. This parameter will make everybody happy !
+ #
+ # Revision 1.100.2.4  2005/06/06 14:15:55  tipaul
+ # adding 2 systemparameters to define an alternate image as logo in opac (the image on main page & on each top-left page)
+ #
+ # Revision 1.100.2.3  2005/06/02 21:05:34  hdl
+ # adding variable SubscriptionHistory
+ #
  # Revision 1.100.2.2  2005/03/29 15:41:43  tipaul
  # * new permissions : management & tools. You now have 2 new permissions :




From tipaul at users.sourceforge.net  Mon Jun 20 16:36:47 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:36:47 -0700
Subject: [Koha-cvs] CVS: koha/search.marc dictionary.pl,1.6,1.7
Message-ID: <E1DkNOJ-0004ML-02@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16715/search.marc

Modified Files:
	dictionary.pl 
Log Message:
synch'ing 2.2 and head

Index: dictionary.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.marc/dictionary.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** dictionary.pl	1 Jun 2005 12:51:02 -0000	1.6
--- dictionary.pl	20 Jun 2005 14:36:44 -0000	1.7
***************
*** 106,110 ****
  	}
  	$listtags =~s/,$/)/;
! 	$strsth .= $listtags." and marc_word.tagsubfield=marc_subfield_table.tag+marc_subfield_table.subfieldcode group by subfieldvalue ";
  # 	warn "search in biblio : ".$strsth;
  	my $value = uc($search[0]);
--- 106,110 ----
  	}
  	$listtags =~s/,$/)/;
! 	$strsth .= $listtags." and marc_word.tagsubfield=concat(marc_subfield_table.tag,marc_subfield_table.subfieldcode) group by subfieldvalue ";
  # 	warn "search in biblio : ".$strsth;
  	my $value = uc($search[0]);




From tipaul at users.sourceforge.net  Mon Jun 20 16:37:17 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:37:17 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_123i.pl,1.1,1.2 unimarc_field_123j.pl,1.1,1.2
Message-ID: <E1DkNOn-0004Q8-PA@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16867/value_builder

Modified Files:
	unimarc_field_123i.pl unimarc_field_123j.pl 
Log Message:
synch'ing 2.2 and head






From tipaul at users.sourceforge.net  Mon Jun 20 16:37:17 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:37:17 -0700
Subject: [Koha-cvs] CVS: koha/z3950/server zed-koha-server.pl,1.4,1.5
Message-ID: <E1DkNOn-0004QA-PJ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/z3950/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16867/z3950/server

Modified Files:
	zed-koha-server.pl 
Log Message:
synch'ing 2.2 and head

Index: zed-koha-server.pl
===================================================================
RCS file: /cvsroot/koha/koha/z3950/server/zed-koha-server.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** zed-koha-server.pl	3 Jun 2004 01:48:19 -0000	1.4
--- zed-koha-server.pl	20 Jun 2005 14:37:15 -0000	1.5
***************
*** 58,62 ****
  use C4::Biblio;
  use strict;
! my $dbh = C4::Context->dbh;
  my @bib_list;		## Stores the list of biblionumbers in a query 
  			## I should eventually move this to different scope
--- 58,62 ----
  use C4::Biblio;
  use strict;
! # my $dbh = C4::Context->dbh;
  my @bib_list;		## Stores the list of biblionumbers in a query 
  			## I should eventually move this to different scope
***************
*** 86,89 ****
--- 86,90 ----
  sub run_query {		## Run the query and store the biblionumbers: 
  	my ($sql_query, $query, $args) = @_;
+ 		my $dbh = C4::Context->dbh;
         	my $sth_get = $dbh->prepare("$sql_query");
  
***************
*** 145,149 ****
  		print "The query was:\n";        
  		print "$query\n";
! 		my $sql_query = "SELECT marc_biblio.bibid FROM marc_biblio RIGHT JOIN biblio ON marc_biblio.biblionumber = biblio.biblionumber WHERE biblio.isbn LIKE ?";
  		&run_query($sql_query, $query, $args);
  
--- 146,150 ----
  		print "The query was:\n";        
  		print "$query\n";
! 		my $sql_query = "SELECT marc_biblio.bibid FROM marc_biblio RIGHT JOIN biblioitems ON marc_biblio.biblionumber = biblioitems.biblionumber WHERE biblioitems.isbn LIKE ?";
  		&run_query($sql_query, $query, $args);
  
***************
*** 269,392 ****
          $offset -= 1;                   ## because $args->{OFFSET} 1 = record #1
          chomp (my $bibid = $bib_list[$offset]); ## Not sure about this
!                 ## print "the bibid is:$bibid\n";
!                 my $MARCRecord = &MARCgetbiblio($dbh,$bibid);
!                 my $recordstring=$MARCRecord->as_usmarc();
!                 ## print "here is my record: $recordstring\n";
! 
! 		## Troubleshooting:
! 		## use Data::Dumper;
! 		## Dumper $recordstring;
! 		## open (MARC, ">/root/marc.dump");
!                 ## print MARC "$recordstring";
! 		## close MARC;
! 		
! 		## Convert from 852/4 to 952:
! 		## 942a --> 852a  Organization code
! 		## 952b --> 852b  Home branch
! 		## 942k --> 852h  Classification
! 		## 952p --> 852p  Barcode
! 
! my $record = MARC::Record->new_from_usmarc($recordstring);
!     my @fields942 = $record->field('942');
!     my $field842 = $fields942[0];
! 	my ($field952, $sub852a, $sub852k, $sub852b, $sub852p, $sub852h);
!        
! 
! ## while ( my $record = $batch->next() ) {
!   ##  my @fields942 = $record->field('942');
!   ##  my $field842 = $fields942[0];
!   ##     #grab first 942 (only need one, they are same for all items)
!   ##  my $sub852a = ($field842->subfield('a') || '');
!   ##  my $sub852h = ($field842->subfield('k') || '');
! 
!   ##  my @fields952 = $record->field('952');
!   ##  foreach my $field952 (@fields952) {   #get all 952s
!   ##      my $sub852b = ($field952->subfield('b') || '');
!   ##      my $sub852p = ($field952->subfield('p') || '');
! 
! 
! #grab first 942 (only need one, they are same for all items)
! 	unless (! $field952){
! 		$sub852a = ($field952->subfield('a') || '') ;
! }
! 	unless (! $field952){ #->subfield('k')) { 
! 		$sub852k = ($field952->subfield('k') || '') ;
! 
! }
! 
!     my @fields952 = $record->field('952');
!     foreach my $field952 (@fields952) {   #get all 952s
!         
!         unless (! $field952) { #->subfield('b')) { 
! 		$sub852b = ($field952->subfield('b') || '') ;
! } 
!  unless (! $field952) { #->subfield('p')) { 
! 		$sub852p = ($field952->subfield('p') || '') ;
! }
!      #make it one big happy family
!         my $new852 = MARC::Field->new(
!                                       852,'','',
!                                       'a' => $sub852a,
! 				      'b' => $sub852b,
!                                       'h' => $sub852h,
!                                       'p' => $sub852p,
!                                       );
!         $record->append_fields($new852);
! 
! }
! 
! my $recordstringdone = $record->as_usmarc();
! 
  		## Set the REP_FORM
! 		$args->{REP_FORM} = &Net::Z3950::OID::usmarc;
  		
  		## Return the record string to the client 
! 	        $args->{RECORD} = $recordstringdone;
  
  }
  
- # That's all folks!
- # 
- # OLD OLD OLD OLD
- 
- sub fetch_handler_old {
- 	my ($args) = @_;	
- 	# warn "in fetch_handler";	## troubleshooting
- 	my $offset = $args->{OFFSET};
- 	$offset -= 1;			## because $args->{OFFSET} 1 = record #1
- 	chomp (my $bibid = $bib_list[$offset]);	## Not sure about this
-         my $sql_query = "SELECT tag, subfieldcode, subfieldvalue FROM marc_subfield_table where bibid=?";
- 	my $sth_get = $dbh->prepare("$sql_query");
-         $sth_get->execute($bibid);
- 	
- 	## create a MARC::Record object 
-         my $rec = MARC::Record->new();
- 
- 	## create the fields
-         while (my @data=$sth_get->fetchrow_array) {
- 
-         	my $tag = $data[0];
-        		my $subfieldcode = $data[1];
-         	my $subfieldvalue = $data[2];
- 
-         	my $field = MARC::Field->new(
-                 	                          $tag,'','',
-                         	                  $subfieldcode => $subfieldvalue,
-                                 	    );
  
-  	       	$rec->append_fields($field);
- 		
- 		## build the marc string and put into $record         
-         	my $tmp_record = $rec->as_usmarc();
- 		my $reclen = length $tmp_record;
- 		my $baseaddr = "$reclen + dirlen";
- #		set_leader_lengths($reclen,$baseaddr);
- 		my $record = $rec->as_usmarc(); 	
- 		$args->{RECORD} = $record;
- 	}
- 
- }
- 
- 	
  ## This stuff doesn't work yet...I should include boolean searching someday
  ## though
--- 270,287 ----
          $offset -= 1;                   ## because $args->{OFFSET} 1 = record #1
          chomp (my $bibid = $bib_list[$offset]); ## Not sure about this
! 				## print "the bibid is:$bibid\n";
! 				my $dbh = C4::Context->dbh;
! 				my $MARCRecord = &MARCgetbiblio($dbh,$bibid);
! 				$MARCRecord->leader('     nac  22     1u 4500');
  		## Set the REP_FORM
! 		$args->{REP_FORM} = &Net::Z3950::OID::unimarc;
  		
  		## Return the record string to the client 
! 			$args->{RECORD} = $MARCRecord->as_usmarc();
! # 	        $args->{RECORD} = $recordstringdone;
  
  }
  
  
  ## This stuff doesn't work yet...I should include boolean searching someday
  ## though




From tipaul at users.sourceforge.net  Mon Jun 20 16:37:53 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:37:53 -0700
Subject: [Koha-cvs] CVS: koha/z3950 processz3950queue,1.14,1.15
Message-ID: <E1DkNPN-0004aL-VM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/z3950
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17418/z3950

Modified Files:
	processz3950queue 
Log Message:
synch'ing 2.2 and head

Index: processz3950queue
===================================================================
RCS file: /cvsroot/koha/koha/z3950/processz3950queue,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** processz3950queue	4 May 2005 09:04:52 -0000	1.14
--- processz3950queue	20 Jun 2005 14:37:51 -0000	1.15
***************
*** 281,292 ****
  									for ($i=1; $i<=(($numresults<80) ? ($numresults) : (80)); $i++) {
  										my $rec=$rs->record($i);
!  										my $marcdata;
! 										# use render() or rawdata() depending on the type of the returned record
! 										if (ref($rec) eq "Net::Z3950::Record::USMARC") {
! 											$marcdata = $rec->rawdata();
! 										}
! 										if (ref($rec) eq "Net::Z3950::Record::UNIMARC") {
! 											$marcdata = $rec->rawdata();
! 										}
  										$globalencoding = ref($rec);
   										$result.=$marcdata;
--- 281,285 ----
  									for ($i=1; $i<=(($numresults<80) ? ($numresults) : (80)); $i++) {
  										my $rec=$rs->record($i);
!  										my $marcdata = $rec->rawdata();
  										$globalencoding = ref($rec);
   										$result.=$marcdata;




From tipaul at users.sourceforge.net  Mon Jun 20 16:37:55 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:37:55 -0700
Subject: [Koha-cvs] CVS: koha help.pl,1.1,1.2 mainpage.pl,1.9,1.10 MARCdetail.pl,1.27,1.28
Message-ID: <E1DkNPP-0004aj-6E@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17418

Modified Files:
	help.pl mainpage.pl MARCdetail.pl 
Log Message:
synch'ing 2.2 and head

Index: help.pl
===================================================================
RCS file: /cvsroot/koha/koha/help.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** help.pl	3 Jun 2004 10:22:59 -0000	1.1
--- help.pl	20 Jun 2005 14:37:51 -0000	1.2
***************
*** 30,34 ****
  	unless (-e "$htdocs/$theme/$lang/$tmplbase") {
  		$tmplbase="help/nohelp.tmpl";
! 		my ($theme, $lang) = themelanguage($htdocs, $tmplbase, "intranet");
  	}
  	my $template = HTML::Template->new(filename      => "$htdocs/$theme/$lang/$tmplbase",
--- 30,34 ----
  	unless (-e "$htdocs/$theme/$lang/$tmplbase") {
  		$tmplbase="help/nohelp.tmpl";
! 		($theme, $lang) = themelanguage($htdocs, $tmplbase, "intranet");
  	}
  	my $template = HTML::Template->new(filename      => "$htdocs/$theme/$lang/$tmplbase",

Index: mainpage.pl
===================================================================
RCS file: /cvsroot/koha/koha/mainpage.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** mainpage.pl	22 Dec 2003 14:54:53 -0000	1.9
--- mainpage.pl	20 Jun 2005 14:37:52 -0000	1.10
***************
*** 8,13 ****
--- 8,24 ----
  use CGI;
  use C4::Auth;
+ use C4::AuthoritiesMarc;
+ use C4::Koha;
  
  my $query = new CGI;
+ my $authtypes = getauthtypes;
+ my @authtypesloop;
+ foreach my $thisauthtype (sort { $authtypes->{$a} <=> $authtypes->{$b} } keys %$authtypes) {
+ 	my %row =(value => $thisauthtype,
+ 				authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
+ 			);
+ 	push @authtypesloop, \%row;
+ }
+ 
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "intranet-main.tmpl",
***************
*** 25,28 ****
--- 36,40 ----
  my $marc_p = C4::Context->boolean_preference("marc");
  $template->param(NOTMARC => !$marc_p);
+ $template->param(authtypesloop => \@authtypesloop);
  
  output_html_with_http_headers $query, $cookie, $template->output;

Index: MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/MARCdetail.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** MARCdetail.pl	15 Jun 2005 16:09:44 -0000	1.27
--- MARCdetail.pl	20 Jun 2005 14:37:52 -0000	1.28
***************
*** 66,74 ****
  my $biblionumber=$query->param('bib');
  my $bibid = $query->param('bibid');
  my $popup = $query->param('popup'); # if set to 1, then don't insert links, it's just to show the biblio
  
  $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber) unless $bibid;
  $biblionumber = &MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid) unless $biblionumber;
! my $itemtype = &MARCfind_frameworkcode($dbh,$bibid);
  my $tagslib = &MARCgettagslib($dbh,1,$itemtype);
  
--- 66,78 ----
  my $biblionumber=$query->param('bib');
  my $bibid = $query->param('bibid');
+ my $itemtype = $query->param('frameworkcode');
  my $popup = $query->param('popup'); # if set to 1, then don't insert links, it's just to show the biblio
  
  $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber) unless $bibid;
  $biblionumber = &MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid) unless $biblionumber;
! $itemtype = &MARCfind_frameworkcode($dbh,$bibid) if not ($itemtype);
! $itemtype = '' if ($itemtype eq 'Default');
! warn "itemtype :".$itemtype;
! 
  my $tagslib = &MARCgettagslib($dbh,1,$itemtype);
  
***************
*** 84,87 ****
--- 88,115 ----
  			     });
  
+ #Getting the list of all frameworks
+ my $queryfwk =$dbh->prepare("select frameworktext, frameworkcode from biblio_framework");
+ $queryfwk->execute;
+ my %select_fwk;
+ my @select_fwk;
+ my $curfwk;
+ push @select_fwk,"Default";
+ $select_fwk{"Default"} = "Default";
+ while (my ($description, $fwk) =$queryfwk->fetchrow) {
+ 	push @select_fwk, $fwk;
+ 	$select_fwk{$fwk} = $description;
+ }
+ $curfwk=$itemtype;
+ warn "current fwk :".$curfwk ;
+ my $framework=CGI::scrolling_list( -name     => 'Frameworks',
+ 			-id => 'Frameworks',
+ 			-default => $curfwk,
+ 			-OnChange => 'Changefwk(this);',
+ 			-values   => \@select_fwk,
+ 			-labels   => \%select_fwk,
+ 			-size     => 1,
+ 			-multiple => 0 );
+ 
+ $template->param( framework => $framework);
  # fill arrays
  my @loop_data =();




From tipaul at users.sourceforge.net  Mon Jun 20 16:39:15 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:39:15 -0700
Subject: [Koha-cvs] CVS: koha pay.pl,1.11,1.12 search.pl,1.35,1.36
Message-ID: <E1DkNQh-0004lu-00@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18131

Modified Files:
	pay.pl search.pl 
Log Message:
synch'ing 2.2 and head

Index: pay.pl
===================================================================
RCS file: /cvsroot/koha/koha/pay.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** pay.pl	1 Mar 2005 13:40:47 -0000	1.11
--- pay.pl	20 Jun 2005 14:39:01 -0000	1.12
***************
*** 56,60 ****
  my $check=0;
  for (my $i=0;$i<@names;$i++){
! 	my$temp=$input->param($names[$i]);
  	if ($temp eq 'wo'){
  		$inp{$names[$i]}=$temp;
--- 56,60 ----
  my $check=0;
  for (my $i=0;$i<@names;$i++){
! 	my $temp=$input->param($names[$i]);
  	if ($temp eq 'wo'){
  		$inp{$names[$i]}=$temp;
***************
*** 65,68 ****
--- 65,69 ----
  		$user=~ s/Foxton/F/i;
  		$user=~ s/Shannon/S/i;
+ 		# FIXME : using array +4, +5, +6 is dirty. Should use arrays for each accountline
  		my $amount=$input->param($names[$i+4]);
  		my $bornum=$input->param($names[$i+5]);
***************
*** 146,150 ****
  	}
  	$bornum=$input->param('bornum');
! 	print $input->redirect("/cgi-bin/koha/pay.pl?bornum=$bornum");
  }
  
--- 147,151 ----
  	}
  	$bornum=$input->param('bornum');
! 	print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$bornum");
  }
  

Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.pl,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** search.pl	7 Apr 2004 22:43:04 -0000	1.35
--- search.pl	20 Jun 2005 14:39:11 -0000	1.36
***************
*** 20,23 ****
--- 20,30 ----
  
  # $Log$
+ # Revision 1.36  2005/06/20 14:39:11  tipaul
+ # synch'ing 2.2 and head
+ #
+ # Revision 1.35.2.1  2005/05/27 10:02:50  hdl
+ # Bug Fixing : Using old search.pl with subjectitems In normal mode display.
+ # Problem : Changing Page doesn't work.
+ #
  # Revision 1.35  2004/04/07 22:43:04  rangi
  # Fix for bug 217
***************
*** 100,104 ****
  foreach my $term (qw(keyword subject author illustrator itemnumber
  		     isbn date-before class dewey branch title abstract
! 		     publisher ttype))
  {
  	my $value = $query->param($term);
--- 107,111 ----
  foreach my $term (qw(keyword subject author illustrator itemnumber
  		     isbn date-before class dewey branch title abstract
! 		     publisher ttype subjectitems))
  {
  	my $value = $query->param($term);




From slef at users.sourceforge.net  Mon Jun 20 19:05:20 2005
From: slef at users.sourceforge.net (MJ Ray)
Date: Mon, 20 Jun 2005 10:05:20 -0700
Subject: [Koha-cvs] CVS: koha/z3950 z3950-daemon-launch.sh,1.4,1.5
Message-ID: <E1DkPi4-0008G5-Ae@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/z3950
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31711

Modified Files:
	z3950-daemon-launch.sh 
Log Message:
Removed -s from su call after Thomas D reports it breaks FreeBSD

Index: z3950-daemon-launch.sh
===================================================================
RCS file: /cvsroot/koha/koha/z3950/z3950-daemon-launch.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** z3950-daemon-launch.sh	5 Nov 2003 23:33:45 -0000	1.4
--- z3950-daemon-launch.sh	20 Jun 2005 17:05:17 -0000	1.5
***************
*** 33,37 ****
  fi
  
! su -s /bin/sh -c $KohaZ3950Shell - $RunAsUser &
  
  exit
--- 33,38 ----
  fi
  
! #MJR: removed -s option, as we have a #! at the start of z3950-daemon-shell.sh
! su -c $KohaZ3950Shell - $RunAsUser &
  
  exit
***************
*** 39,42 ****
--- 40,46 ----
  #--------------
  # $Log$
+ # Revision 1.5  2005/06/20 17:05:17  slef
+ # Removed -s from su call after Thomas D reports it breaks FreeBSD
+ #
  # Revision 1.4  2003/11/05 23:33:45  slef
  # Now figures out what directory the scripts are in




From hdl at users.sourceforge.net  Tue Jun 21 09:39:23 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 21 Jun 2005 00:39:23 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members member.tmpl,1.16,1.17 member-quicksearch-results.tmpl,1.2,1.3
Message-ID: <E1DkdLv-0006BO-4R@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	member.tmpl member-quicksearch-results.tmpl 
Log Message:
Displaying line counter 

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** member.tmpl	20 Jun 2005 10:14:12 -0000	1.16
--- member.tmpl	21 Jun 2005 07:39:20 -0000	1.17
***************
*** 22,25 ****
--- 22,26 ----
  	<table>
  		<tr>
+ 			<th>&nbsp;</th>
  			<th>Card</th>
  			<th>Surname</th>
***************
*** 37,40 ****
--- 38,42 ----
  				<tr bgcolor="white">
  			<!-- /TMPL_IF -->
+ 				<td><!-- TMPL_VAR NAME="count" --></td>
  				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
  				<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" --></a></td>

Index: member-quicksearch-results.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** member-quicksearch-results.tmpl	20 Jun 2005 10:14:12 -0000	1.2
--- member-quicksearch-results.tmpl	21 Jun 2005 07:39:20 -0000	1.3
***************
*** 21,25 ****
  				<tr bgcolor="white">
  			<!-- /TMPL_IF -->
! 				<td><form action="member-search-results.pl" method="get"><input type="button" class="button" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','request','member'); return false;" /></form></td>
  				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
  				<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" --></a></td>
--- 21,25 ----
  				<tr bgcolor="white">
  			<!-- /TMPL_IF -->
! 				<td><!-- TMPL_VAR NAME="count" --><form action="member-search-results.pl" method="get"><input type="button" class="button" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','request','member'); return false;" /></form></td>
  				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
  				<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" --></a></td>




From hdl at users.sourceforge.net  Tue Jun 21 09:42:26 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 21 Jun 2005 00:42:26 -0700
Subject: [Koha-cvs] CVS: koha/members member.pl,1.6,1.7
Message-ID: <E1DkdOs-0006TL-Ee@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24852/members

Modified Files:
	member.pl 
Log Message:
Adding countlines

Index: member.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/member.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** member.pl	20 Jun 2005 10:14:12 -0000	1.6
--- member.pl	21 Jun 2005 07:42:24 -0000	1.7
***************
*** 90,93 ****
--- 90,94 ----
    my %row = (
    	background => $background,
+ 		count => $i + 1,
          borrowernumber => $results->[$i]{'borrowernumber'},
          cardnumber => $results->[$i]{'cardnumber'},




From hdl at users.sourceforge.net  Tue Jun 21 12:09:41 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 21 Jun 2005 03:09:41 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui histsearch.tmpl,1.4,1.5
Message-ID: <E1DkfhN-0000Ec-Lr@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	histsearch.tmpl 
Log Message:
Adding line counter

Index: histsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** histsearch.tmpl	20 Jun 2005 14:13:22 -0000	1.4
--- histsearch.tmpl	21 Jun 2005 10:09:39 -0000	1.5
***************
*** 109,113 ****
  			<tr>
  				<td>
! 					&nbsp;
  				</td>
  				<td>
--- 109,113 ----
  			<tr>
  				<td>
! 					<!-- TMPL_VAR Name="count"-->
  				</td>
  				<td>




From tipaul at users.sourceforge.net  Tue Jun 21 16:50:30 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 21 Jun 2005 07:50:30 -0700
Subject: [Koha-cvs] CVS: koha/authorities auth_finder.pl,1.5.2.2,1.5.2.3
Message-ID: <E1Dkk58-0004Ia-8C@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16360/authorities

Modified Files:
      Tag: rel_2_2
	auth_finder.pl 
Log Message:
bugfix for next/previous and number links on result list, when long list of results

Index: auth_finder.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/auth_finder.pl,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -C2 -r1.5.2.2 -r1.5.2.3
*** auth_finder.pl	7 Apr 2005 10:03:24 -0000	1.5.2.2
--- auth_finder.pl	21 Jun 2005 14:50:26 -0000	1.5.2.3
***************
*** 93,98 ****
  
  
  	for(my $i = 0 ; $i <= $#marclist ; $i++) {
! 		push @field_data, { term => "marclist", val=>$marclist[$i] };
  		push @field_data, { term => "and_or", val=>$and_or[$i] };
  		push @field_data, { term => "excluding", val=>$excluding[$i] };
--- 93,99 ----
  
  
+ 	my @marclist_ini = $query->param('marclist'); # get marclist again, as the previous one has been modified by catalogsearch (mainentry replaced by field name
  	for(my $i = 0 ; $i <= $#marclist ; $i++) {
! 		push @field_data, { term => "marclist", val=>$marclist_ini[$i] };
  		push @field_data, { term => "and_or", val=>$and_or[$i] };
  		push @field_data, { term => "excluding", val=>$excluding[$i] };
***************
*** 158,162 ****
  $template->param(authtypesloop => \@authtypesloop,
  				authtypecode => $authtypecode);
- warn "CAT : $authtypecode";
  
  # Print the page
--- 159,162 ----




From tipaul at users.sourceforge.net  Tue Jun 21 16:50:31 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 21 Jun 2005 07:50:31 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/authorities searchresultlist-auth.tmpl,1.5.2.2,1.5.2.3
Message-ID: <E1Dkk59-0004J3-QL@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	searchresultlist-auth.tmpl 
Log Message:
bugfix for next/previous and number links on result list, when long list of results

Index: searchresultlist-auth.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -C2 -r1.5.2.2 -r1.5.2.3
*** searchresultlist-auth.tmpl	18 Mar 2005 09:42:26 -0000	1.5.2.2
--- searchresultlist-auth.tmpl	21 Jun 2005 14:50:26 -0000	1.5.2.3
***************
*** 46,50 ****
  			<p>
  				<!-- TMPL_IF name="displayprev" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  						<img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
  					</a>
--- 46,50 ----
  			<p>
  				<!-- TMPL_IF name="displayprev" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  						<img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
  					</a>
***************
*** 54,63 ****
  						<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
  					<!-- TMPL_ELSE -->
! 						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  							<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
  					<!-- /TMPL_IF -->
  				<!-- /TMPL_LOOP -->
  				<!-- TMPL_IF name="displaynext" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  						<img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
  				<!-- /TMPL_IF -->
--- 54,63 ----
  						<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
  					<!-- TMPL_ELSE -->
! 						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  							<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
  					<!-- /TMPL_IF -->
  				<!-- /TMPL_LOOP -->
  				<!-- TMPL_IF name="displaynext" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  						<img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
  				<!-- /TMPL_IF -->




From tipaul at users.sourceforge.net  Tue Jun 21 15:34:29 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 21 Jun 2005 06:34:29 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marctagstructure.tmpl,1.27.2.6,1.27.2.7
Message-ID: <E1DkitZ-0003bE-8C@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	marctagstructure.tmpl 
Log Message:
template creators : REMEMBER that TRANSLATOR tool really HATES <!-- TMPL_IF --> inside a standard html tag, like :
<td <!-- tmpl_if name="x">class="x"<!-- /TMPL_IF -->> or
<input ... <!-- tmpl_if name="y" --> checked<!-- /TMPL_IF -->>

pls alway write :
<!-- TMPL_IF name="y" -->
	<input ... checked>
<!-- TMPL_ELSE -->
	<input ...>
<!-- /TMPL_IF -->

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.27.2.6
retrieving revision 1.27.2.7
diff -C2 -r1.27.2.6 -r1.27.2.7
*** marctagstructure.tmpl	1 Jun 2005 14:29:21 -0000	1.27.2.6
--- marctagstructure.tmpl	21 Jun 2005 13:34:26 -0000	1.27.2.7
***************
*** 125,130 ****
  		<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
  		<input type="submit" value="OK" class="button">
! 		<p>
! 		<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True" <!-- TMPL_IF Name="select_display"-->checked<!--/TMPL_IF -->  OnChange="javascript:document.f.submit()">
  		</p>
  	</form>
--- 125,133 ----
  		<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
  		<input type="submit" value="OK" class="button">
! 		<p><!-- TMPL_IF Name="select_display"-->
! 				<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True" checked OnChange="javascript:document.f.submit()">
! 			<!-- TMPL_ELSE -->
! 				<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True" OnChange="javascript:document.f.submit()">
! 			<!--/TMPL_IF --> 
  		</p>
  	</form>




From oleonard at users.sourceforge.net  Wed Jun 22 00:05:33 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 21 Jun 2005 15:05:33 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-detail.tmpl,1.1.2.4,1.1.2.5
Message-ID: <E1Dkqs9-0000Ci-2W@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-detail.tmpl 
Log Message:
Removing extra junk from WorldCat query string

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** opac-detail.tmpl	9 Jun 2005 19:21:10 -0000	1.1.2.4
--- opac-detail.tmpl	21 Jun 2005 22:05:30 -0000	1.1.2.5
***************
*** 22,27 ****
  <h4>Search for this title in:</h4>
  <ul><!-- Display for NPL // <li><a href="http://search3.webfeat.org/cgi-bin/webfeat.dll?Command=Search&BypassSessData=yes&noserial=1&Databases=wf_sirsdiscover,wf_elibrary2_e,wf_ebonline,wf_healthsourceconsumer,wf_masterfileprem,wf_newspapersource&wf_cat=0&Client_ID=oplin&wf_all_years=yes&wf_field1=wf_keyword&wf_term1=<!-- TMPL_VAR NAME="title" -->&rurl=http%3A//www.oplin.org/&wut_code=OH0156">Local Databases (OPLIN)</a></li> //Display for NPL -->
! <li><a href="http://www.google.com/search?q=<!-- TMPL_VAR NAME="title" -->%20england+site:worldcatlibraries.org">Other Libraries(WorldCat)</a></li>
! <li><a href="http://www.scholar.google.com/scholar?q=<!-- TMPL_VAR NAME="title" -->">Other Databases (Google Scholar)</a></li></ul></div>
  </div>
  <h2><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="subtitle" --> <span class="subtitle"><!-- TMPL_VAR NAME="subtitle" --></span><!-- /TMPL_IF --></h2>
--- 22,27 ----
  <h4>Search for this title in:</h4>
  <ul><!-- Display for NPL // <li><a href="http://search3.webfeat.org/cgi-bin/webfeat.dll?Command=Search&BypassSessData=yes&noserial=1&Databases=wf_sirsdiscover,wf_elibrary2_e,wf_ebonline,wf_healthsourceconsumer,wf_masterfileprem,wf_newspapersource&wf_cat=0&Client_ID=oplin&wf_all_years=yes&wf_field1=wf_keyword&wf_term1=<!-- TMPL_VAR NAME="title" -->&rurl=http%3A//www.oplin.org/&wut_code=OH0156">Local Databases (OPLIN)</a></li> //Display for NPL -->
! <li><a href="http://www.google.com/search?q=<!-- TMPL_VAR NAME="title" ESCAPE="url" -->+site:worldcatlibraries.org">Other Libraries(WorldCat)</a></li>
! <li><a href="http://www.scholar.google.com/scholar?q=<!-- TMPL_VAR NAME="title" ESCAPE="url" -->">Other Databases (Google Scholar)</a></li></ul></div>
  </div>
  <h2><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="subtitle" --> <span class="subtitle"><!-- TMPL_VAR NAME="subtitle" --></span><!-- /TMPL_IF --></h2>




From hdl at users.sourceforge.net  Wed Jun 22 11:36:26 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 22 Jun 2005 02:36:26 -0700
Subject: [Koha-cvs] CVS: koha/acqui newbiblio.pl,1.21,1.22
Message-ID: <E1Dl1ek-0005Uo-QO@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21033/acqui

Modified Files:
	newbiblio.pl 
Log Message:
Adding scrolling list for sort1 and sort2

Index: newbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** newbiblio.pl	14 Sep 2004 12:09:52 -0000	1.21
--- newbiblio.pl	22 Jun 2005 09:36:24 -0000	1.22
***************
*** 25,28 ****
--- 25,29 ----
  use CGI;
  use C4::Context;
+ use C4::Input;
  use C4::Database;
  use C4::Auth;
***************
*** 140,143 ****
--- 141,159 ----
  			-multiple => 0 );
  
+ my $CGIsort1 = buildCGIsort("Bsort1","sort1",$data->{'sort1'});
+ if ($CGIsort1) {
+ 	$template->param(CGIsort1 => $CGIsort1);
+ } else {
+ 	$template->param( sort1 => $data->{'sort1'});
+ }
+ 
+ my $CGIsort2 = buildCGIsort("Bsort2","sort2",$data->{'sort2'});
+ if ($CGIsort2) {
+ 	$template->param(CGIsort2 =>$CGIsort2);
+ } else {
+ 	$template->param( sort2 => $data->{'sort2'});
+ }
+ 			
+ 			
  # fill template
  $template->param( existing => $biblio,
***************
*** 173,178 ****
  						ecost => $data->{'ecost'},
  						notes => $data->{'notes'},
- 						sort1 => $data->{'sort1'},
- 						sort2 => $data->{'sort2'},
  						publishercode => $data->{'publishercode'});
  
--- 189,192 ----




From hdl at users.sourceforge.net  Wed Jun 22 11:36:26 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 22 Jun 2005 02:36:26 -0700
Subject: [Koha-cvs] CVS: koha/members memberentry.pl,1.10,1.11
Message-ID: <E1Dl1ek-0005UP-Dp@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21033/members

Modified Files:
	memberentry.pl 
Log Message:
Adding scrolling list for sort1 and sort2

Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/memberentry.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** memberentry.pl	20 Jun 2005 14:26:03 -0000	1.10
--- memberentry.pl	22 Jun 2005 09:36:24 -0000	1.11
***************
*** 61,64 ****
--- 61,66 ----
  my $destination=$input->param('destination');
  
+ 
+ 
  my $nok;
  # if a add or modify is requested => check validity of data.
***************
*** 233,237 ****
--- 235,254 ----
  				-size     => 1,
  				-multiple => 0 );
+ 				
  
+ 	my $CGIsort1 = buildCGIsort("Bsort1","sort1",$data->{'sort1'});
+ 	if ($CGIsort1) {
+ 		$template->param(CGIsort1 => $CGIsort1);
+ 	} else {
+ 		$template->param( sort1 => $data->{'sort1'});
+ 	}
+ 
+ 	my $CGIsort2 = buildCGIsort("Bsort2","sort2",$data->{'sort2'});
+ 	if ($CGIsort2) {
+ 		$template->param(CGIsort2 =>$CGIsort2);
+ 	} else {
+ 		$template->param( sort2 => $data->{'sort2'});
+ 	}
+ 	
  	$template->param(	actionType 		=> $actionType,
  				destination => $destination,
***************
*** 266,271 ****
  				cardnumber	=> $cardnumber,
  				dateofbirth	=> $data->{'dateofbirth'},
- 				sort1 => $data->{'sort1'},
- 				sort2 => $data->{'sort2'},
  				dateformat      => display_date_format(),
  			        modify          => $modify,
--- 283,286 ----




From hdl at users.sourceforge.net  Wed Jun 22 11:36:26 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 22 Jun 2005 02:36:26 -0700
Subject: [Koha-cvs] CVS: koha/C4 Input.pm,1.16,1.17
Message-ID: <E1Dl1ek-0005Uh-Na@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21033/C4

Modified Files:
	Input.pm 
Log Message:
Adding scrolling list for sort1 and sort2

Index: Input.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Input.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** Input.pm	28 Nov 2003 14:06:57 -0000	1.16
--- Input.pm	22 Jun 2005 09:36:24 -0000	1.17
***************
*** 22,25 ****
--- 22,26 ----
  require Exporter;
  use C4::Context;
+ use CGI;
  
  use vars qw($VERSION @ISA @EXPORT);
***************
*** 50,53 ****
--- 51,55 ----
  @EXPORT = qw(
  	&checkdigit &checkvalidisbn
+ 	&buildCGIsort
  );
  
***************
*** 141,175 ****
  #   of 10 digits and valid checksum
  sub checkvalidisbn {
!         use strict;
!         my ($q)=@_ ;	# Input: ISBN number
! 
!         my $isbngood = 0; # Return: true or false
! 
!         $q=~s/x$/X/g;           # upshift lower case X
!         $q=~s/[^X\d]//g;
!         $q=~s/X.//g;
!         
! 	#return 0 if $q is not ten digits long
! 	if (length($q)!=10) {
! 		return 0;
! 	}
  	
! 	#If we get to here, length($q) must be 10
!         my $checksum=substr($q,9,1);
!         my $isbn=substr($q,0,9);
!         my $i;
!         my $c=0;
!         for ($i=0; $i<9; $i++) {
!             my $digit=substr($q,$i,1);
!             $c+=$digit*(10-$i);
!         }
  	$c %= 11;
!         ($c==10) && ($c='X');
!         $isbngood = $c eq $checksum;
! 
!         return $isbngood;
  
  } # sub checkvalidisbn
  
  END { }       # module clean-up code here (global destructor)
  
--- 143,214 ----
  #   of 10 digits and valid checksum
  sub checkvalidisbn {
! 	use strict;
! 	my ($q)=@_ ;	# Input: ISBN number
! 	
! 	my $isbngood = 0; # Return: true or false
! 	
! 	$q=~s/x$/X/g;   # upshift lower case X
! 	$q=~s/[^X\d]//g;
! 	$q=~s/X.//g;
  	
! 		#return 0 if $q is not ten digits long
! 		if (length($q)!=10) {
! 			return 0;
! 		}
! 		
! 		#If we get to here, length($q) must be 10
! 	my $checksum=substr($q,9,1);
! 	my $isbn=substr($q,0,9);
! 	my $i;
! 	my $c=0;
! 	for ($i=0; $i<9; $i++) {
! 		my $digit=substr($q,$i,1);
! 		$c+=$digit*(10-$i);
! 	}
  	$c %= 11;
! 	($c==10) && ($c='X');
! 	$isbngood = $c eq $checksum;
! 	return $isbngood;
  
  } # sub checkvalidisbn
  
+ =item buildCGISort
+ 
+   $CGIScrollingList = &BuildCGISort($name string, $input_name string);
+ 
+ Returns the scrolling list with name $input_name, built on authorised Values named $name.
+ Returns NULL if no authorised values found
+ 
+ =cut
+ #'
+ #--------------------------------------
+ # Determine if a number is a valid ISBN number, according to length
+ #   of 10 digits and valid checksum
+ sub buildCGIsort {
+     use strict;
+ 	my ($name,$input_name,$data) = @_;
+ 	my $dbh=C4::Context->dbh;
+ 	my $query=qq{SELECT * FROM authorised_values WHERE category=?};
+ 	my $sth=$dbh->prepare($query);
+ 	$sth->execute($name);
+ 	my $CGISort;
+ 	if ($sth->rows>0){
+ 		my @values;
+ 		my %labels;
+ 		for (my $i =0;$i<=$sth->rows;$i++){
+ 			my $results = $sth->fetchrow_hashref;
+  			push @values, $results->{authorised_value};
+  			$labels{$results->{authorised_value}}=$results->{lib};
+ 		}
+  		$CGISort= CGI::scrolling_list(
+  					-name => $input_name,
+  					-values => \@values,
+  					-labels => \%labels,
+ 					-default=> $data,
+  					-size => 1,
+  					-multiple => 0);
+ 	} 
+ 	return $CGISort;
+ }
  END { }       # module clean-up code here (global destructor)
  




From hdl at users.sourceforge.net  Wed Jun 22 11:36:26 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 22 Jun 2005 02:36:26 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui newbiblio.tmpl,1.19,1.20
Message-ID: <E1Dl1ek-0005Ud-Kv@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	newbiblio.tmpl 
Log Message:
Adding scrolling list for sort1 and sort2

Index: newbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** newbiblio.tmpl	4 May 2005 08:52:49 -0000	1.19
--- newbiblio.tmpl	22 Jun 2005 09:36:24 -0000	1.20
***************
*** 199,207 ****
  		<p>
  			<label class="label100">Sort field 1</label>
! 			<input type="text" size="20" name=sort1 value="<!-- TMPL_VAR NAME="sort1" -->">
  		</p>
  		<p>
  			<label class="label100">Sort field 2</label>
! 			<input type="text" size="20" name=sort2 value="<!-- TMPL_VAR NAME="sort2" -->">
  		</p>
  		<p>
--- 199,215 ----
  		<p>
  			<label class="label100">Sort field 1</label>
! 			<!-- TMPL_IF Name="CGIsort1" -->
! 				<!-- TMPL_VAR Name="CGIsort1" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
! 			<!--/TMPL_IF -->
  		</p>
  		<p>
  			<label class="label100">Sort field 2</label>
! 			<!-- TMPL_IF Name="CGIsort2" -->
! 				<!-- TMPL_VAR Name="CGIsort2" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
! 			<!--/TMPL_IF -->
  		</p>
  		<p>




From hdl at users.sourceforge.net  Wed Jun 22 11:36:26 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 22 Jun 2005 02:36:26 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members memberentry.tmpl,1.36,1.37
Message-ID: <E1Dl1ek-0005UU-I2@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	memberentry.tmpl 
Log Message:
Adding scrolling list for sort1 and sort2

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** memberentry.tmpl	20 Jun 2005 14:20:05 -0000	1.36
--- memberentry.tmpl	22 Jun 2005 09:36:24 -0000	1.37
***************
*** 270,274 ****
  				<td>Sorting field 1</td>
  				<td colspan="4">
! 					<input type="text" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
  				</td>
  			</tr>
--- 270,278 ----
  				<td>Sorting field 1</td>
  				<td colspan="4">
! 					<!-- TMPL_IF Name="CGIsort1" -->
! 						<!-- TMPL_VAR Name="CGIsort1" -->
! 					<!-- TMPL_ELSE -->
! 						<input type="text" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
! 					<!--/TMPL_IF -->
  				</td>
  			</tr>
***************
*** 276,280 ****
  				<td>Sorting field 2</td>
  				<td colspan="4">
! 					<input type="text" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
  				</td>
  			</tr>
--- 280,288 ----
  				<td>Sorting field 2</td>
  				<td colspan="4">
! 					<!-- TMPL_IF Name="CGIsort2" -->
! 						<!-- TMPL_VAR Name="CGIsort2" -->
! 					<!-- TMPL_ELSE -->
! 						<input type="text" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
! 					<!--/TMPL_IF -->
  				</td>
  			</tr>




From tipaul at users.sourceforge.net  Wed Jun 22 14:45:39 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 22 Jun 2005 05:45:39 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac-top.inc,1.8.2.6,1.8.2.7
Message-ID: <E1Dl4br-0003nY-TS@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-top.inc 
Log Message:
changing image size (on top-left)

Index: opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc,v
retrieving revision 1.8.2.6
retrieving revision 1.8.2.7
diff -C2 -r1.8.2.6 -r1.8.2.7
*** opac-top.inc	16 Jun 2005 15:41:09 -0000	1.8.2.6
--- opac-top.inc	22 Jun 2005 12:45:37 -0000	1.8.2.7
***************
*** 33,37 ****
  	<div id="title">
  		<!-- TMPL_IF name="opacsmallimage" -->
! 			<img src="<!-- TMPL_VAR name="opacsmallimage"-->" height="50" alt="koha logo"/>
  		<!-- TMPL_ELSE -->
  			<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo"/>
--- 33,37 ----
  	<div id="title">
  		<!-- TMPL_IF name="opacsmallimage" -->
! 			<img src="<!-- TMPL_VAR name="opacsmallimage"-->" height="65" alt="koha logo"/>
  		<!-- TMPL_ELSE -->
  			<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo"/>




From tipaul at users.sourceforge.net  Wed Jun 22 14:46:55 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 22 Jun 2005 05:46:55 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-dictionary.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1Dl4d5-0003wq-0O@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-dictionary.tmpl 
Log Message:
small changes in template look

Index: opac-dictionary.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-dictionary.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac-dictionary.tmpl	7 Jun 2005 10:23:13 -0000	1.1.2.1
--- opac-dictionary.tmpl	22 Jun 2005 12:46:52 -0000	1.1.2.2
***************
*** 20,27 ****
  
  <!-- TMPL_IF Name=search -->
! 	<div class="bloc25">
! 	<h2 class="catalogue">Dictionary Search results</h2>
  	<!-- TMPL_IF NAME="authresult" -->
  		<div id="resultnumber">
  			<p><!-- TMPL_IF NAME="displayprev" --> 
  					<a class="resultnumber" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
--- 20,28 ----
  
  <!-- TMPL_IF Name=search -->
! 	<h1>Dictionary Search results</h1>
  	<!-- TMPL_IF NAME="authresult" -->
+ 	<div class="bloc20">
  		<div id="resultnumber">
+ 			<h2>Values in authorities</h2>
  			<p><!-- TMPL_IF NAME="displayprev" --> 
  					<a class="resultnumber" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
***************
*** 82,91 ****
  			</table>
  		</div>
! 		<!-- TMPL_ELSE -->
! 			<h3 class="catalogue">No results in Authorities</h3>
  	<!-- /TMPL_IF -->
  		
  		
  	<!-- TMPL_IF Name=catresult -->	
  		<div id="resultnumber">
  			<p class="resultcount">
--- 83,93 ----
  			</table>
  		</div>
! 	</div>
  	<!-- /TMPL_IF -->
  		
  		
  	<!-- TMPL_IF Name=catresult -->	
+ 	<div class="bloc20">
+ 		<h2>Values in biblios</h2>
  		<div id="resultnumber">
  			<p class="resultcount">




From tipaul at users.sourceforge.net  Wed Jun 22 14:48:10 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 22 Jun 2005 05:48:10 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-MARCdetail.tmpl,1.5.2.3,1.5.2.4
Message-ID: <E1Dl4eI-00047l-A6@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-MARCdetail.tmpl 
Log Message:
minor css changes

Index: opac-MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -C2 -r1.5.2.3 -r1.5.2.4
*** opac-MARCdetail.tmpl	17 Jun 2005 12:31:44 -0000	1.5.2.3
--- opac-MARCdetail.tmpl	22 Jun 2005 12:48:08 -0000	1.5.2.4
***************
*** 77,81 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 77,81 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
***************
*** 101,105 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 101,105 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
***************
*** 125,129 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 125,129 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
***************
*** 149,153 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 149,153 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
***************
*** 173,177 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 173,177 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
***************
*** 197,201 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 197,201 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
***************
*** 221,225 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 221,225 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
***************
*** 245,249 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 245,249 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
***************
*** 269,273 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 269,273 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
***************
*** 293,297 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 293,297 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>




From tipaul at users.sourceforge.net  Wed Jun 22 14:49:30 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 22 Jun 2005 05:49:30 -0700
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_fr_FR.po,1.5.2.6,1.5.2.7
Message-ID: <E1Dl4fa-0004G0-06@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16133/misc/translator/po

Modified Files:
      Tag: rel_2_2
	default_intranet_fr_FR.po 
Log Message:
updated french translation

Index: default_intranet_fr_FR.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_fr_FR.po,v
retrieving revision 1.5.2.6
retrieving revision 1.5.2.7
diff -C2 -r1.5.2.6 -r1.5.2.7
*** default_intranet_fr_FR.po	13 Jun 2005 15:12:13 -0000	1.5.2.6
--- default_intranet_fr_FR.po	22 Jun 2005 12:49:22 -0000	1.5.2.7
***************
*** 9,14 ****
  msgstr ""
  "Project-Id-Version: default_intranet_fr_FR\n"
! "POT-Creation-Date: 2005-06-07 16:19+0200\n"
! "PO-Revision-Date: 2005-06-10 17:47+0200\n"
  "Last-Translator: POULAIN <paul at koha-fr.org>\n"
  "Language-Team: fr_FR\n"
--- 9,14 ----
  msgstr ""
  "Project-Id-Version: default_intranet_fr_FR\n"
! "POT-Creation-Date: 2005-06-21 15:28+0200\n"
[...1547 lines suppressed...]
--- 13443,13448 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:155
! #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:156
! #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:182
  msgid "subfields"
  msgstr "sous-champs"
***************
*** 13551,13555 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:144
! #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:140
  msgid "value"
  msgstr "valeur"
--- 13609,13613 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:144
! #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:143
  msgid "value"
  msgstr "valeur"




From tipaul at users.sourceforge.net  Wed Jun 22 14:49:53 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 22 Jun 2005 05:49:53 -0700
Subject: [Koha-cvs] CVS: koha/misc/translator/po css_opac_pl_PL.po,NONE,1.1.2.1
Message-ID: <E1Dl4fx-0004Hq-6F@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16462/misc/translator/po

Added Files:
      Tag: rel_2_2
	css_opac_pl_PL.po 
Log Message:
polish translation for OPAC

--- NEW FILE ---
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
#
# --- !! WERSJA ROBOCZA !! --- 
#
# bledy w tlumaczeniu sa sukcesywnie poprawiane
# wszelkie bledy/sugestie prosze zglaszac na emaila
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: css_opac_pl\n"
"POT-Creation-Date: 2005-06-20 14:04+0200\n"
"PO-Revision-Date: 2005-06-21 00:29+0200\n"
"Last-Translator: Wojciech Zatorski <wojciech at zatorski.net>\n"
"Language-Team: Polish \n"
"MIME-Version: 1.0\n"
[...2341 lines suppressed...]
#~ msgid "Only show titles available (Not on loan)"
#~ msgstr "Pokaż tylko tytuły dostępnych (nie wypożyczonych)"

#~ msgid "Search"
#~ msgstr "Wyszukaj"

#~ msgid "Search options"
#~ msgstr "Opcje wyszukiwania"

#~ msgid "Search using keywords or subject."
#~ msgstr "Wyszukiwanie przy użyciu haseł kluczowych lub tematów."

#~ msgid "Select a category"
#~ msgstr "Wybierz kategorie"

#~ msgid "Unititle:"
#~ msgstr "Tytuł ujednolicony:"

#~ msgid "since <b>%s</b>"
#~ msgstr "od <b>%s</b>"




From tipaul at users.sourceforge.net  Wed Jun 22 14:51:12 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 22 Jun 2005 05:51:12 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-ISBDdetail.pl,1.5.2.3,1.5.2.4
Message-ID: <E1Dl4hE-0004RR-KE@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17046/opac

Modified Files:
      Tag: rel_2_2
	opac-ISBDdetail.pl 
Log Message:
bugfix (in repeated subfield separator position)

Index: opac-ISBDdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-ISBDdetail.pl,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -C2 -r1.5.2.3 -r1.5.2.4
*** opac-ISBDdetail.pl	25 Mar 2005 17:04:27 -0000	1.5.2.3
--- opac-ISBDdetail.pl	22 Jun 2005 12:51:10 -0000	1.5.2.4
***************
*** 115,119 ****
  						my $subfieldvalue = get_authorised_value_desc($tag, $subf[$i][0], $subf[$i][1], '', $dbh);
  						my $tagsubf = $tag.$subfieldcode;
! 						$calculated =~ s/\{(.?.?.?)$tagsubf(.*?)\}/$1$subfieldvalue\{$1$tagsubf$2\}$2/g;
  					}
  					# field builded, store the result
--- 115,119 ----
  						my $subfieldvalue = get_authorised_value_desc($tag, $subf[$i][0], $subf[$i][1], '', $dbh);
  						my $tagsubf = $tag.$subfieldcode;
! 						$calculated =~ s/\{(.?.?.?)$tagsubf(.*?)\}/$1$subfieldvalue$2\{$1$tagsubf$2\}/g;
  					}
  					# field builded, store the result




From hdl at users.sourceforge.net  Wed Jun 22 15:12:22 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 22 Jun 2005 06:12:22 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/acqui - New directory
Message-ID: <E1Dl51i-0006vC-Rd@sc8-pr-cvs1.sourceforge.net>

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

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/help/acqui added to the repository





From hdl at users.sourceforge.net  Wed Jun 22 15:14:14 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 22 Jun 2005 06:14:14 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/acqui newbiblio.tmpl,NONE,1.1
Message-ID: <E1Dl53W-0007Dn-Bp@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	newbiblio.tmpl 
Log Message:
Online Help on Scrolling_list building for sort1 and sort2.
Minor Bug Fix for newbiblio.pl : Bsort becomes Asort

--- NEW FILE ---
<!-- TMPL_INCLUDE name="help-top.inc" -->
<h1>Add Biblio help</h1>

<p>sort1 and sort2 may now be related to a list of Authorized Values. All you have to do is define a Asort1 or Asort2 category of authorised values and enter the desired values into these categories. You will then be able to use them through Add/Modify Biblio Page</p>





From hdl at users.sourceforge.net  Wed Jun 22 15:14:14 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 22 Jun 2005 06:14:14 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/members memberentry.tmpl,1.1,1.2
Message-ID: <E1Dl53W-0007Dk-B3@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	memberentry.tmpl 
Log Message:
Online Help on Scrolling_list building for sort1 and sort2.
Minor Bug Fix for newbiblio.pl : Bsort becomes Asort

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/help/members/memberentry.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** memberentry.tmpl	22 Dec 2004 16:12:45 -0000	1.1
--- memberentry.tmpl	22 Jun 2005 13:14:12 -0000	1.2
***************
*** 1,4 ****
--- 1,7 ----
  <!-- TMPL_INCLUDE name="help-top.inc" -->
  <h1>Add member help</h1>
+ 
+ <p>sort1 and sort2 may now be related to a list of Authorized Values. All you have to do is define a Bsort1 or Bsort2 category of authorised values and enter the desired values into these categories. You will then be able to use them through Add/Modify Member Page</p>
+ 
  <h2>Add Member, person</h2>
  <p>This is the form for adding a new single member to the database. There is also a form for organisations, such as other libraries and non profit organisations you might lend to. You should use the Add Organisation tab at the top of the Member page for that.</p>




From hdl at users.sourceforge.net  Wed Jun 22 15:14:14 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 22 Jun 2005 06:14:14 -0700
Subject: [Koha-cvs] CVS: koha/acqui newbiblio.pl,1.22,1.23
Message-ID: <E1Dl53W-0007Dr-Fw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27695/acqui

Modified Files:
	newbiblio.pl 
Log Message:
Online Help on Scrolling_list building for sort1 and sort2.
Minor Bug Fix for newbiblio.pl : Bsort becomes Asort

Index: newbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** newbiblio.pl	22 Jun 2005 09:36:24 -0000	1.22
--- newbiblio.pl	22 Jun 2005 13:14:12 -0000	1.23
***************
*** 141,145 ****
  			-multiple => 0 );
  
! my $CGIsort1 = buildCGIsort("Bsort1","sort1",$data->{'sort1'});
  if ($CGIsort1) {
  	$template->param(CGIsort1 => $CGIsort1);
--- 141,145 ----
  			-multiple => 0 );
  
! my $CGIsort1 = buildCGIsort("Asort1","sort1",$data->{'sort1'});
  if ($CGIsort1) {
  	$template->param(CGIsort1 => $CGIsort1);
***************
*** 148,152 ****
  }
  
! my $CGIsort2 = buildCGIsort("Bsort2","sort2",$data->{'sort2'});
  if ($CGIsort2) {
  	$template->param(CGIsort2 =>$CGIsort2);
--- 148,152 ----
  }
  
! my $CGIsort2 = buildCGIsort("Asort2","sort2",$data->{'sort2'});
  if ($CGIsort2) {
  	$template->param(CGIsort2 =>$CGIsort2);




From hdl at users.sourceforge.net  Thu Jun 23 10:58:34 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 23 Jun 2005 01:58:34 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/search.marc suggest.tmpl,1.2,1.3
Message-ID: <E1DlNXe-0007CW-Ni@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	suggest.tmpl 
Log Message:
Closing suggest window after selection

Index: suggest.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/suggest.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** suggest.tmpl	19 Jul 2004 20:59:34 -0000	1.2
--- suggest.tmpl	23 Jun 2005 08:58:30 -0000	1.3
***************
*** 45,49 ****
  //			}
  //			opener.document.location= "../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR NAME="oldbiblionumber" -->&breedingid="+GetThisOne;
! //			self.close();
  //			return false;
  		}
--- 45,49 ----
  //			}
  //			opener.document.location= "../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR NAME="oldbiblionumber" -->&breedingid="+GetThisOne;
! 			self.close();
  //			return false;
  		}




From shedges at users.sourceforge.net  Thu Jun 23 13:25:04 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 23 Jun 2005 04:25:04 -0700
Subject: [Koha-cvs] CVS: koha-doc/es/sysadmin - New directory
Message-ID: <E1DlPpQ-0001nl-50@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/es/sysadmin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6880/sysadmin

Log Message:
Directory /cvsroot/koha/koha-doc/es/sysadmin added to the repository





From shedges at users.sourceforge.net  Thu Jun 23 13:25:28 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 23 Jun 2005 04:25:28 -0700
Subject: [Koha-cvs] CVS: koha-doc/es/sysadmin/templates - New directory
Message-ID: <E1DlPpo-0001qe-FG@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/es/sysadmin/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7085/sysadmin/templates

Log Message:
Directory /cvsroot/koha/koha-doc/es/sysadmin/templates added to the repository





From shedges at users.sourceforge.net  Thu Jun 23 13:26:21 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 23 Jun 2005 04:26:21 -0700
Subject: [Koha-cvs] CVS: koha-doc/es/sysadmin/templates/imágenes - New directory
Message-ID: <E1DlPqf-0001xn-Gh@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/es/sysadmin/templates/imágenes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7514/sysadmin/templates/imágenes

Log Message:
Directory /cvsroot/koha/koha-doc/es/sysadmin/templates/imágenes added to the repository





From shedges at users.sourceforge.net  Thu Jun 23 13:27:11 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 23 Jun 2005 04:27:11 -0700
Subject: [Koha-cvs] CVS: koha-doc/es/sysadmin/templates traduccion.xml,NONE,1.1
Message-ID: <E1DlPrT-00025u-5v@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/es/sysadmin/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7990/sysadmin/templates

Added Files:
	traduccion.xml 
Log Message:
Initial xml markup

--- NEW FILE ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<article>
  <title>Traducción de “Templates� de KOHA</title>

  <articleinfo>
    <pubdate>2005-06-22</pubdate>

    <author>
      <firstname>J. Martín</firstname>

      <surname>Longo</surname>

      <email>jmlongo AT uncu.edu.ar</email>
    </author>

    <copyright>
      <year>2005</year>

      <holder>J. Martín Longo</holder>
    </copyright>

    <legalnotice>
      <para>El documento se entrega bajo licencia GNU-GPL</para>

      <para>This document is related to Koha and is licensed to you under the
      GNU General Public License version 2 or later (<ulink
      url="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</ulink>).</para>

      <para>Koha-related documents may be reproduced and distributed in whole
      or in part, in any medium physical or electronic, as long as this
      copyright notice is retained on all copies.</para>

      <para>You may create a derivative work and distribute it provided that
      you:</para>

      <orderedlist>
        <listitem>
          <para>License the derivative work with this same license, or the
          Linux Documentation Project License (<ulink
          url="http://www.tldp.org/COPYRIGHT.html">http://www.tldp.org/COPYRIGHT.html</ulink>).
          Include a copyright notice and at least a pointer to the license
          used.</para>
        </listitem>

        <listitem>
          <para>Give due credit to previous authors and major
          contributors.</para>
        </listitem>
      </orderedlist>

      <para>Commercial redistribution is allowed and encouraged; however, the
      author would like to be notified of any such distributions.</para>

      <para>No liability for the contents of this document can be accepted.
      Use the concepts, examples and information at your own risk. There may
      be errors and inaccuracies, that could be damaging to your system.
      Proceed with caution, and although this is highly unlikely, the
      author(s) do not take any responsibility.</para>

      <para>All copyrights are held by their by their respective owners,
      unless specifically noted otherwise. Use of a term in this document
      should not be regarded as affecting the validity of any trademark or
      service mark. Naming of particular products or brands should not be seen
      as endorsements.</para>
    </legalnotice>

    <revhistory>
      <revision>
        <revnumber>2.2.2</revnumber>

        <date>2005-06-22</date>

        <revdescription>
          <para>Initial XML markup.</para>
        </revdescription>
      </revision>
    </revhistory>
  </articleinfo>

  <section>
    <title>Introducción</title>

    <note>
      <para><emphasis>Nota aclaratoria:</emphasis> Se supone, en todos los
      ejemplos, que se ha descargado el archivo
      <filename>koha-2.1.1.tar.gz</filename> y se lo ha desempaquetado en el
      directorio 'home' del usuario 'usuario'. Por lo tanto, se debería contar
      con un directorio <filename>koha-2.1.1</filename> en el directorio
      <filename>/home/usuario/</filename></para>

      <para>En cada sistema, se deberán adecuar los nombres de directorios y
      de usuarios como corresponda.</para>
    </note>

    <para>La internacionalización de KOHA puede lograrse mediante la
    traducción de los textos contenidos en los archivos '.tmpl' (que viene de
    Template) contenidos en
    <filename>/home/usuario/koha-2.1.1/intranet-html/intranet-tmpl/default/en</filename></para>

    <para>En ocasiones anteriores, el procedimiento de traducción que se ha
    seguido ha sido el de copiar todo el contenido del directorio mencionado
    al directorio
    <filename>/home/usuario/koha-2.1.1/intranet-html/intranet-tmpl/default/es</filename>
    y, posteriormente, configurar KOHA para que utilice el idioma
    español.</para>

    <para>Este procedimiento, si bien ha dado resultados aceptables, es
    bastante lento y trabajoso, ya que se deben buscar una por una las cadenas
    de texto a traducir dentro de cada archivo '.tmpl', al tiempo que quien
    realiza el trabajo se debe cuidar de no modificar ninguna etiqueta o
    marca, ya que eso produce errores en la visualización.</para>

    <para>Por este motivo, se ha optado por la utilización del script
    <filename>tmpl_process3.pl</filename> (provisto en la distribución de
    KOHA). Este script toma como entrada el archivo o un directorio que
    contenga los archivos que se quiera traducir y genera como salida un único
    archivo con formato específico y extensión '.po' (que viene de Portable
    Object) conteniendo todas las cadenas de texto que pueden ser traducidas.
    Este tipo de archivos es un estándar en el trabajo de internacionalización
    de software en el mundo del Software Libre y, por lo tanto, hay
    herramientas desarrolladas para su tratamiento.</para>

    <para>El presente tutorial pretende mostrar el uso del script
    <filename>tmpl_process3.pl</filename> y, posteriormente, sentar las bases
    para la utilización de una herramienta para el tratamiento del archivo
    '.po' generado por el mismo (en este caso, la herramienta
    <application>Kbabel</application>).</para>
  </section>

  <section>
    <title>Usando tmpl_process3.pl para generar archivos '.po'</title>

    <para>El script <filename>tmpl_process3.pl</filename> se encuentra ubicado
    en <filename>/home/usuario/koha-2.1.1/scripts/misc/translator/</filename>
    y depende algunos módulos ubicados en ese mismo directorio. Por lo tanto,
    para poder ejecutarlo, se deberá estar ubicado en el directorio
    <filename>/home/usuario/koha-2.1.1/scripts/misc/translator/</filename><example>
        <title>Ejemplo:</title>

        <programlisting>usuario at host: cd /home/usuario/koha-2.1.1/scripts/misc/translator/

usuario at host: ./tmpl_process3.pl --help</programlisting>
      </example></para>

    <para>Los comandos mostrados en el ejemplo producirán como salida el
    listado de las opciones y el modo de uso del script, como se muestra a
    continuación:</para>

    <programlisting>Usage: ./tmpl_process3.pl create [OPTION]
  or:  ./tmpl_process3.pl update [OPTION]
  or:  ./tmpl_process3.pl install [OPTION]
  or:  ./tmpl_process3.pl --help
Create or update PO files from templates, or install translated templates.

  -i, --input=SOURCE          Get or update strings from SOURCE file.
                              SOURCE is a directory if -r is also specified.
  -o, --outputdir=DIRECTORY   Install translation(s) to specified DIRECTORY
      --pedantic-warnings     Issue warnings even for detected problems
                              which are likely to be harmless
  -r, --recursive             SOURCE in the -i option is a directory
  -s, --str-file=FILE         Specify FILE as the translation (po) file
                              for input (install) or output (create, update)
  -x, --exclude=REGEXP        Exclude files matching the given REGEXP
      --help                  Display this help and exit

The -o option is ignored for the "create" and "update" actions.
Try `perldoc ./tmpl_process3.pl' for perhaps more information.</programlisting>

    <para>Para crear un archivo 'circ_es.po' que contenga los textos de todos
    los templates contenidos en el directorio 'circ' de la intranet de KOHA
    que están en inglés, el procedimiento sería el siguiente:</para>

    <programlisting>usuario at host: cd /home/usuario/koha-2.1.1/scripts/misc/translator/

usuario at host: ./tmpl_process3.pl create -r -i /home/usuario/koha-2.1.1/intranet-html/intranet-tmpl/default/en/circ/ -s /home/usuario/traduccion/circ_es.po</programlisting>

    <para>En el ejemplo anterior:</para>

    <itemizedlist>
      <listitem>
        <para>'<emphasis role="bold">create</emphasis>' indica que se debe
        generar un archivo '.po'.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-r</emphasis> indica que el proceso se
        realizará sobre un directorio.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-i</emphasis> indica el directorio en el
        que se encuentran los archivos de los que se extraerán las cadenas de
        texto.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-s</emphasis> indica el directorio y el
        nombre del archivo '.po' a crear.</para>
      </listitem>
    </itemizedlist>

    <para>Al ejecutar el comando anterior es posible que se generen algunas
    advertencias o 'warnings' por cuestiones de sintaxis.</para>

    <para>Al ejecutar el ejemplo sugerido, se produjo la siguiente salida en
    el equipo de prueba:</para>

    <programlisting>Warning: Can't determine original templates' charset, defaulting to ISO-8859-1
Removing empty file /home/jmlongo/tmp/temp.po
xgettext.pl: Warning (negligible): selectbranchprinter.tmpl: line 15: Suggest ESCAPE=HTML for TMPL_VAR in attribute "value": "&lt;!-- TMPL_VAR NAME="value" --&gt;"
xgettext.pl: Warning (negligible): selectbranchprinter.tmpl: Further similar negligible warnings will not be reported, use --pedantic for details
xgettext.pl: Warning: returns.tmpl: line 17: Strange attribute syntax: /cgi-bin/koha/moremember.pl?bornum=&lt;!-- TMPL_VAR NAME="bornum" --&gt;", "Member"); return false;"
xgettext.pl: Warning: branchtransfers.tmpl: line 20: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
xgettext.pl: Warning: branchtransfers.tmpl: line 22: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
xgettext.pl: Warning: branchtransfers.tmpl: line 98: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
xgettext.pl: Warning: branchtransfers.tmpl: line 128: Probably missing whitespace before or missing quotation mark near: Item", 480, 640); return false;"
The create seems to be successful.</programlisting>

    <para>A pesar de estas advertencias, la última línea (<emphasis
    role="bold">The create seems to be successful.</emphasis>) indica que el
    proceso ha tenido éxito y que se cuenta con el archivo '.po' en el lugar y
    con el nombre seleccionados. Este archivo deberá ser abierto usando KBabel
    para iniciar el proceso de traducción.</para>
  </section>

  <section>
    <title>Usando KBabel para traducir un archivo '.po'</title>

    <para>La aplicación <application>KBabel</application> presenta cuatro
    áreas, dentro de la ventana principal, cada una de ellas orientada a una
    utilidad en especial. Con esta aplicación se trabaja traduciendo una a una
    las cadenas de texto que están contenidas en el archivo '.po' generado
    anteriormente.</para>

    <para>Para lograr esto de manera eficiente,
    <application>KBabel</application> pone a disposición distintas
    herramientas, como se muestra en la siguiente captura de pantalla:</para>

    <figure>
      <title>Screenshot 1</title>

      <mediaobject>
        <imageobject>
          <imagedata fileref="imágenes/image1.gif" />
        </imageobject>
      </mediaobject>
    </figure>

    <itemizedlist>
      <listitem>
        <para>El área marcada en la figura como <emphasis role="bold">Texto
        Original</emphasis> es de sólo lectura y presenta la cadena de texto
        que se está traduciendo.</para>
      </listitem>

      <listitem>
        <para>El área marcada en la figura como <emphasis role="bold">Texto
        Traducido</emphasis> es el lugar donde se escribe la traducción de lo
        que aparece en el cuadro <emphasis role="bold">Texto
        Original</emphasis>.</para>
      </listitem>

      <listitem>
        <para>El área marcada en la figura como <emphasis
        role="bold">Comentarios y Nombres de Archivos</emphasis> es el lugar
        donde aparecen los comentarios que los desarrolladores dejaron al
        momento de crear el template que se está traduciendo, con el objetivo
        de hacer alguna aclaración. Además, aparece el nombre del o los
        archivos en los cuales está contenida la cadena de texto que se está
        traduciendo.</para>
      </listitem>

      <listitem>
        <para>El área marcada en la figura como <emphasis
        role="bold">Contexto</emphasis> es el lugar en el que aparecen las
        cadenas de texto anteriores y posteriores a la que se está
        traduciendo, como una ayuda para saber en qué contexto se encuentra la
        frase que se está traduciendo.</para>
      </listitem>
    </itemizedlist>

    <section>
      <title>Ejemplos</title>

      <para>Algunos delimitadores y etiquetas no deben ser modificados en la
      traducción</para>

      <figure>
        <title>Screenshot 2</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="imágenes/image2.gif" />
          </imageobject>
        </mediaobject>
      </figure>

      <para>Cuando la traducción implique el uso de acentos y caracteres
      especiales, los mismos deberán ser reemplazados por las entidades
      correspondientes, para evitar problemas a la hora de la
      visualización.</para>

      <figure>
        <title>Screenshot 3</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="imágenes/image3.gif" />
          </imageobject>
        </mediaobject>
      </figure>

      <para>Para navegar entre las cadenas de texto y realizar algunas
      funciones útiles, se pueden utilizar los íconos de la barra de
      herramientas o atajos de teclado.</para>

      <informaltable>
        <tgroup cols="2">
          <tbody>
            <row>
              <entry align="center" valign="middle"><emphasis
              role="bold">Función</emphasis></entry>

              <entry align="center" valign="middle"><emphasis
              role="bold">Teclado</emphasis></entry>
            </row>

            <row>
              <entry>Ver el la cadena de texto anterior</entry>

              <entry><emphasis role="bold">RePág</emphasis></entry>
            </row>

            <row>
              <entry>Ver el la cadena de texto siguiente</entry>

              <entry><emphasis role="bold">AvPág</emphasis></entry>
            </row>

            <row>
              <entry>Ver el la cadena de texto anterior no traducida</entry>

              <entry><emphasis role="bold">Alt+RePág</emphasis></entry>
            </row>

            <row>
              <entry>Ver el la cadena de texto siguiente no traducida</entry>

              <entry><emphasis role="bold">Alt+AvPág</emphasis></entry>
            </row>

            <row>
              <entry>Copiar la cadena de texto que está en la ventana de Texto
              Original a la ventana de traducción</entry>

              <entry><emphasis role="bold">Ctrl+Espacio</emphasis></entry>
            </row>
          </tbody>
        </tgroup>
      </informaltable>
    </section>
  </section>

  <section>
    <title>Usando tmpl_process3.pl para generar “templates� traducidos</title>

    <para>Siguiendo los ejemplos anteriores, hemos creado, en primer lugar, un
    archivo '.po' con nombre <filename>circ_es.po</filename> conteniendo todas
    las cadenas de texto extraídas de todos los 'templates' que están en el
    directorio
    <filename>/home/usuario/koha-2.1.1/intranet-html/intranet-tmpl/default/en/circ</filename>.</para>

    <para>Por otro lado, ya hemos utilizado <application>KBABEL</application>
    para realizar la traducción de todas esas cadenas de texto.</para>

    <para>Finalmente, sólo resta la generación de los nuevos 'templates'
    traducidos en un directorio a elección, siempre y cuando tenga una copia
    de los 'templates' originales. A los efectos de este ejemplo, crearemos
    los templates traducidos en el directorio
    <filename>/home/usuario/koha-2.1.1/intranet-html/intranet-tmpl/default/es/circ</filename>.</para>

    <para>Para lograr esto, utilizaremos nuevamente el script
    <filename>tmpl_process3.pl</filename> pero con parámetros ligeramente
    distintos:</para>

    <programlisting>usuario at host: cd /home/usuario/koha-2.1.1/scripts/misc/translator/ 

usuario at host: ./tmpl_process3.pl install -s /home/usuario/traduccion/ circ_es.po -r -i /home/usuario/koha-2.1.1/intranet-html/intranet-tmpl/default/en/circ/ -o /home/usuario/koha-2.1.1/intranet-html/intranet-tmpl/default/es/circ/</programlisting>

    <para>En el ejemplo anterior:</para>

    <itemizedlist>
      <listitem>
        <para>'<emphasis role="bold">install</emphasis>' indica que se
        generarán 'templates' a partir de un archivo '.po'.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-r</emphasis> indica que el proceso se
        realizará sobre un directorio.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-i</emphasis> indica el directorio en el
        que se encuentran los 'templates' originales de los cuales se
        extrajeron las cadenas de texto.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-s</emphasis> indica el directorio en el
        que se crearán los 'templates' traducidos.</para>
      </listitem>
    </itemizedlist>

    <para>Al igual que durante la creación del archivo '.po', al ejecutar el
    comando sugerido, pueden producirse advertencias. La siguiente es la
    salida obtenido en el equipo de prueba:</para>

    <programlisting>Warning: Can't determine original templates' charset, defaulting to ISO-8859-1
Creating /home/jmlongo/documentos/koha/koha-2.1.1/intranet-html/intranet-tmpl/default/pl/circ//selectbranchprinter.tmpl...
tmpl_process3.pl: Warning (negligible): selectbranchprinter.tmpl: line 15: Suggest ESCAPE=HTML for TMPL_VAR in attribute "value": "&lt;!-- TMPL_VAR NAME="value" --&gt;"
tmpl_process3.pl: Warning (negligible): selectbranchprinter.tmpl: Further similar negligible warnings will not be reported, use --pedantic for details
Creating /home/jmlongo/documentos/koha/koha-2.1.1/intranet-html/intranet-tmpl/default/pl/circ//returns.tmpl...
tmpl_process3.pl: Warning: returns.tmpl: line 17: Strange attribute syntax: /cgi-bin/koha/moremember.pl?bornum=&lt;!-- TMPL_VAR NAME="bornum" --&gt;", "Member"); return false;"
Creating /home/jmlongo/documentos/koha/koha-2.1.1/intranet-html/intranet-tmpl/default/pl/circ//circulation.tmpl...
Creating /home/jmlongo/documentos/koha/koha-2.1.1/intranet-html/intranet-tmpl/default/pl/circ//branchtransfers.tmpl...
tmpl_process3.pl: Warning: branchtransfers.tmpl: line 20: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
tmpl_process3.pl: Warning: branchtransfers.tmpl: line 22: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
tmpl_process3.pl: Warning: branchtransfers.tmpl: line 98: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
tmpl_process3.pl: Warning: branchtransfers.tmpl: line 128: Probably missing whitespace before or missing quotation mark near: Item", 480, 640); return false;"
The install seems to be successful.</programlisting>

    <para>A pesar de estas advertencias, la última línea (<emphasis
    role="bold">The install seems to be successful.</emphasis>) indica que el
    proceso ha tenido éxito y que se cuenta con un juego de 'templates'
    traducidos en
    <filename>/home/usuario/koha-2.1.1/intranet-html/intranet-tmpl/default/es/circ</filename>.</para>

    <para>Para comprobar el éxito de este proceso, basta con abrir cualquiera
    de los 'templates' contenidos en el directorio mencionado con el editor de
    texto prefereido.</para>
  </section>

  <section>
    <title>Consultas, quejas y propuestas</title>

    <para>Si tiene alguna consulta acerca del proceso descrito en este
    documento, o quiere realizar alguna propuesta (o plantear una queja, ¿por
    qué no?) que sirva para mejorarlo, puede contactarse con Martín Longo
    (<email>jmlongo AT uncu.edu.ar</email>)</para>
  </section>
</article>



From shedges at users.sourceforge.net  Thu Jun 23 13:29:51 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 23 Jun 2005 04:29:51 -0700
Subject: [Koha-cvs] CVS: koha-doc/en/sysadmin/templates/imagesfolder - New directory
Message-ID: <E1DlPu3-0002Yn-IP@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/en/sysadmin/templates/imagesfolder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9833/templates/imagesfolder

Log Message:
Directory /cvsroot/koha/koha-doc/en/sysadmin/templates/imagesfolder added to the repository





From shedges at users.sourceforge.net  Thu Jun 23 13:29:16 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 23 Jun 2005 04:29:16 -0700
Subject: [Koha-cvs] CVS: koha-doc/en/sysadmin/templates - New directory
Message-ID: <E1DlPtU-0002Rs-Ad@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/en/sysadmin/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9367/templates

Log Message:
Directory /cvsroot/koha/koha-doc/en/sysadmin/templates added to the repository





From shedges at users.sourceforge.net  Thu Jun 23 13:30:20 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 23 Jun 2005 04:30:20 -0700
Subject: [Koha-cvs] CVS: koha-doc/en/sysadmin/templates translation.xml,NONE,1.1
Message-ID: <E1DlPuW-0002e4-G0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/en/sysadmin/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10138/templates

Added Files:
	translation.xml 
Log Message:
Initial xml markup

--- NEW FILE ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
<article>
  <title>KOHA's Template Translation</title>

  <articleinfo>
    <pubdate>2005-06-22</pubdate>

    <author>
      <firstname>J. Martin</firstname>

      <surname>Longo</surname>

      <email>jmlongo AT uncu.edu.ar</email>
    </author>

    <copyright>
      <year>2005</year>

      <holder>J. Martin Longo</holder>
    </copyright>

    <legalnotice>
      <para>This document is related to Koha and is licensed to you under the
      GNU General Public License version 2 or later (<ulink
      url="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</ulink>).</para>

      <para>Koha-related documents may be reproduced and distributed in whole
      or in part, in any medium physical or electronic, as long as this
      copyright notice is retained on all copies.</para>

      <para>You may create a derivative work and distribute it provided that
      you:</para>

      <orderedlist>
        <listitem>
          <para>License the derivative work with this same license, or the
          Linux Documentation Project License (<ulink
          url="http://www.tldp.org/COPYRIGHT.html">http://www.tldp.org/COPYRIGHT.html</ulink>).
          Include a copyright notice and at least a pointer to the license
          used.</para>
        </listitem>

        <listitem>
          <para>Give due credit to previous authors and major
          contributors.</para>
        </listitem>
      </orderedlist>

      <para>Commercial redistribution is allowed and encouraged; however, the
      author would like to be notified of any such distributions.</para>

      <para>No liability for the contents of this document can be accepted.
      Use the concepts, examples and information at your own risk. There may
      be errors and inaccuracies, that could be damaging to your system.
      Proceed with caution, and although this is highly unlikely, the
      author(s) do not take any responsibility.</para>

      <para>All copyrights are held by their by their respective owners,
      unless specifically noted otherwise. Use of a term in this document
      should not be regarded as affecting the validity of any trademark or
      service mark. Naming of particular products or brands should not be seen
      as endorsements.</para>
    </legalnotice>

    <revhistory>
      <revision>
        <revnumber>2.2.2</revnumber>

        <date>2005-06-22</date>

        <revdescription>
          <para>Initial XML markup.</para>
        </revdescription>
      </revision>
    </revhistory>
  </articleinfo>

  <section>
    <title>Introduction</title>

    <note>
      <para>It's assumed, in every example, that you have downloaded the file
      <filename>koha-2.x.tar.gz</filename> and that you have unpacked it in
      the 'home' directory of the 'user' user. Provided this, you should have
      a <filename>koha-2.x</filename> directory under
      <filename>/home/user/</filename></para>

      <para>In each system, directory and user names should be replaced
      accordingly.</para>
    </note>

    <para>KOHA internationalization can be achieved in several ways. Not so
    long ago, it was necesary to copy the entire
    <filename>/home/usuario/koha-2.x/intranet-html/intranet-tmpl/default/en</filename>
    directory into another (i.e.
    <filename>/home/usuario/koha-2.x/intranet-html/intranet-tmpl/default/es</filename>)
    then manually edit each one of the templates contained in the newly
    created directory, translating the text strings they contain, trying, of
    course, not to touch or change anything else. Once the translation was
    finished, it was only necesary to configure KOHA's 'opaclanguages' System
    Preference to use the new language (i.e. es).</para>

    <para>This procedure works and has produced acceptable results but is,
    obviously, very slow and difficult.</para>

    <para>Now, thanks to KOHA's developer team, we have the
    <filename>tmpl_process3.pl</filename> script (provided with the KOHA
    distribution).</para>

    <para>In short, this script takes the file or directory that we want to
    translate (i.e.
    <filename>/home/usuario/koha-2.x/intranet-html/intranet-tmpl/default/en</filename>)
    and generates a single '.po' file (.po comes from Portable Object)
    containing only the text strings contained inside KOHA's template files.
    This type of file is a format standard in the software
    internationalization work in the Free Software world and, because of this,
    there are several tools developed to edit them.</para>

    <para>The present tutorial aims to show how to use the
    <filename>tmpl_process3.pl</filename> script to generate a '.po' file from
    KOHA's templates, introduce the use of one of the tools developed for
    '.po' files treatment (<application>Kbabel</application>) and then the use
    of the <filename>tmpl_process3.pl</filename> script again, to generate a
    set of translated templates for use in our KOHA installation.</para>
  </section>

  <section>
    <title>Using tmpl_process3.pl to generate a '.po' file</title>

    <para>The <filename>tmpl_process3.pl</filename> script lives under the
    <filename>/home/usuario/koha-2.x/scripts/misc/translator/</filename>
    directory and depends on some modules located under the same directory.
    Because of this, in order for it to work, the script must be run from
    inside that directory.</para>

    <example>
      <title>Running tmpl_process3.pl</title>

      <programlisting>user at host: cd /home/usuario/koha-2.x/scripts/misc/translator/ 

user at host: ./tmpl_process3.pl --help</programlisting>
    </example>

    <para>The previous command will produce, as output, a list of options and
    a little help about the script's usage, as shown below:</para>

    <programlisting>Usage: ./tmpl_process3.pl create [OPTION]
  or:  ./tmpl_process3.pl update [OPTION]
  or:  ./tmpl_process3.pl install [OPTION]
  or:  ./tmpl_process3.pl --help
Create or update PO files from templates, or install translated templates.

  -i, --input=SOURCE          Get or update strings from SOURCE file.
                              SOURCE is a directory if -r is also specified.
  -o, --outputdir=DIRECTORY   Install translation(s) to specified DIRECTORY
      --pedantic-warnings     Issue warnings even for detected problems
                              which are likely to be harmless
  -r, --recursive             SOURCE in the -i option is a directory
  -s, --str-file=FILE         Specify FILE as the translation (po) file
                              for input (install) or output (create, update)
  -x, --exclude=REGEXP        Exclude files matching the given REGEXP
      --help                  Display this help and exit

The -o option is ignored for the "create" and "update" actions.
Try `perldoc ./tmpl_process3.pl' for perhaps more information.</programlisting>

    <para>To create a 'circ_es.po' containing the text strings of the English
    templates located in the 'circ' directory of the KOHA's intranet, the
    procedure would be:</para>

    <programlisting>user at host: cd /home/user/koha-2.x/scripts/misc/translator/ 

user at host: ./tmpl_process3.pl create -r -i /home/user/koha-2.x/intranet-html/intranet-tmpl/default/en/circ/ -s /home/user/translation/circ_es.po</programlisting>

    <para>In the above example:</para>

    <itemizedlist>
      <listitem>
        <para>'<emphasis role="bold">create</emphasis>' indicates that we want
        to create a new '.po' file.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-r</emphasis> indicates that the source is
        a directory.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-i</emphasis> indicates the path from
        where the text string will be extracted.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-s</emphasis> indicates the path and name
        of the '.po' file that will be created.</para>
      </listitem>
    </itemizedlist>

    <para>When running the script, there may be some 'warnings' about syntax
    errors in the original templates.</para>

    <para>Output will look like this:</para>

    <programlisting>Warning: Can't determine original templates' charset, defaulting to ISO-8859-1
Removing empty file /home/user/tmp/temp.po
xgettext.pl: Warning (negligible): selectbranchprinter.tmpl: line 15: Suggest ESCAPE=HTML for TMPL_VAR in attribute "value": "&lt;!-- TMPL_VAR NAME="value" --&gt;"
xgettext.pl: Warning (negligible): selectbranchprinter.tmpl: Further similar negligible warnings will not be reported, use --pedantic for details
xgettext.pl: Warning: returns.tmpl: line 17: Strange attribute syntax: /cgi-bin/koha/moremember.pl?bornum=&lt;!-- TMPL_VAR NAME="bornum" --&gt;", "Member"); return false;"
xgettext.pl: Warning: branchtransfers.tmpl: line 20: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
xgettext.pl: Warning: branchtransfers.tmpl: line 22: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
xgettext.pl: Warning: branchtransfers.tmpl: line 98: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
xgettext.pl: Warning: branchtransfers.tmpl: line 128: Probably missing whitespace before or missing quotation mark near: Item", 480, 640); return false;"
The create seems to be successful.</programlisting>

    <para>Despite these warnings, the last line (<emphasis role="bold">The
    create seems to be successful.</emphasis>) indicates that the process has
    ended successfully and that now we have our brand new 'circ_es.po' file in
    <filename>/home/user/translation/</filename> so now we can use
    <application>Kbabel</application> to begin the translation process.</para>
  </section>

  <section>
    <title>Using KBabel to translate a '.po' file</title>

    <para>The <application>KBabel</application> application presents four
    areas, inside the mail window, each one oriented to a particular function.
    You'll work translating the text strings extracted from the templates one
    by one.</para>

    <para>To achieve this efficiently, <application>KBabel</application> gives
    you several tools, as can be seen in the next screenshot:</para>

    <figure>
      <title>Screenshot 1</title>

      <mediaobject>
        <imageobject>
          <imagedata fileref="imagesfolder/image1.gif" />
        </imageobject>
      </mediaobject>
    </figure>

    <itemizedlist>
      <listitem>
        <para>The area marked as <emphasis role="bold">Original
        Text</emphasis> is read only and displays the text string to be
        translated.</para>
      </listitem>

      <listitem>
        <para>The area marked as <emphasis role="bold">Translated
        Text</emphasis> is where we will write the translation of the string
        displayed in the <emphasis role="bold">Original Text</emphasis>
        area.</para>
      </listitem>

      <listitem>
        <para>The area marked as <emphasis role="bold">File Names</emphasis>
        displays the path and name of the template files where the text string
        being translated was extracted from.</para>
      </listitem>

      <listitem>
        <para>The area marked as <emphasis role="bold">Context</emphasis>
        displays the previous and next text strings to the one being
        translated, to provide some help about the context of the current text
        string.</para>
      </listitem>
    </itemizedlist>

    <section>
      <title>Examples</title>

      <para>Some tags and markups should not be modified during
      translation:</para>

      <figure>
        <title>Screenshot 2</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="imagesfolder/image2.gif" />
          </imageobject>
        </mediaobject>
      </figure>

      <para>Whenever the translation implies the use of accented words or
      special characters, they should be replaced with the corresponding
      entities, to avoid visualisation problems or errors.</para>

      <figure>
        <title>Screenshot 3</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="imagesfolder/image3.gif" />
          </imageobject>
        </mediaobject>
      </figure>

      <para>To navigate between text strings and launch some useful commands,
      there are shortcuts in the toolbar and many keyboard key
      combinations.</para>

      <informaltable>
        <tgroup cols="2">
          <tbody>
            <row>
              <entry align="center" valign="middle"><emphasis
              role="bold">Command</emphasis></entry>

              <entry align="center" valign="middle"><emphasis
              role="bold">Keyboard</emphasis></entry>
            </row>

            <row>
              <entry>Next text string</entry>

              <entry><emphasis role="bold">PgDown</emphasis></entry>
            </row>

            <row>
              <entry>Previous text string</entry>

              <entry><emphasis role="bold">PgUp</emphasis></entry>
            </row>

            <row>
              <entry>Next not translated text string</entry>

              <entry><emphasis role="bold">Alt+PgDown</emphasis></entry>
            </row>

            <row>
              <entry>Previous not translated text string</entry>

              <entry><emphasis role="bold">Alt+PgUp</emphasis></entry>
            </row>

            <row>
              <entry>Copy the text string displayed on the Original Text area
              to the Translated Text area</entry>

              <entry><emphasis role="bold">Ctrl+Space</emphasis></entry>
            </row>
          </tbody>
        </tgroup>
      </informaltable>
    </section>
  </section>

  <section>
    <title>Using tmpl_process3.pl to generate translated templates</title>

    <para>Following the previous examples, we have created a '.po' file named
    <filename>circ_es.po</filename> containing all the text strings present in
    the templates located at
    <filename>/home/user/koha-2.x/intranet-html/intranet-tmpl/default/en/circ</filename></para>

    <para>Afterwards, we used <application>Kbabel</application> to translate
    all those text strings.</para>

    <para>Finally, we only need to generate a new set of translated templates,
    using the original ones as a basis. For this example, we will create our
    new set of translated templates in the
    <filename>/home/user/koha-2.x/intranet-html/intranet-tmpl/default/es/circ</filename>
    directory.</para>

    <para>To achieve this, we'll use the <filename>tmpl_process3.pl</filename>
    script again, but with slightly different parameters:</para>

    <programlisting>user at host: cd /home/user/koha-2.x/scripts/misc/translator/ 

user at host: ./tmpl_process3.pl install -s /home/user/translation/circ_es.po -r -i /home/user/koha-2.x/intranet-html/intranet-tmpl/default/en/circ/ -o /home/user/koha-2.x/intranet-html/intranet-tmpl/default/es/circ/</programlisting>

    <para>In the above example:</para>

    <itemizedlist>
      <listitem>
        <para>'<emphasis role="bold">install</emphasis>' indicates that we
        want to create a set of templates from a '.po' file.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-r</emphasis> indicates that the target is
        a directory.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-i</emphasis> indicates the path where the
        original templates are located (the ones we extracted the text strings
        from).</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-s</emphasis> indicates the path and name
        of the '.po' file that will be used in the process.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-o</emphasis> indicates the path where the
        new set of translated templates will be created.</para>
      </listitem>
    </itemizedlist>

    <para>As happened when we launched the script to create the '.po' file,
    there may be some 'warnings' about syntax errors in the original
    templates.</para>

    <para>Output will look like this:</para>

    <programlisting>Warning: Can't determine original templates' charset, defaulting to ISO-8859-1
Creating /home/jmlongo/documentos/koha/koha-2.1.1/intranet-html/intranet-tmpl/default/pl/circ//selectbranchprinter.tmpl...
tmpl_process3.pl: Warning (negligible): selectbranchprinter.tmpl: line 15: Suggest ESCAPE=HTML for TMPL_VAR in attribute "value": "&lt;!-- TMPL_VAR NAME="value" --&gt;"
tmpl_process3.pl: Warning (negligible): selectbranchprinter.tmpl: Further similar negligible warnings will not be reported, use --pedantic for details
Creating /home/jmlongo/documentos/koha/koha-2.1.1/intranet-html/intranet-tmpl/default/pl/circ//returns.tmpl...
tmpl_process3.pl: Warning: returns.tmpl: line 17: Strange attribute syntax: /cgi-bin/koha/moremember.pl?bornum=&lt;!-- TMPL_VAR NAME="bornum" --&gt;", "Member"); return false;"
Creating /home/jmlongo/documentos/koha/koha-2.1.1/intranet-html/intranet-tmpl/default/pl/circ//circulation.tmpl...
Creating /home/jmlongo/documentos/koha/koha-2.1.1/intranet-html/intranet-tmpl/default/pl/circ//branchtransfers.tmpl...
tmpl_process3.pl: Warning: branchtransfers.tmpl: line 20: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
tmpl_process3.pl: Warning: branchtransfers.tmpl: line 22: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
tmpl_process3.pl: Warning: branchtransfers.tmpl: line 98: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
tmpl_process3.pl: Warning: branchtransfers.tmpl: line 128: Probably missing whitespace before or missing quotation mark near: Item", 480, 640); return false;"
The install seems to be successful.</programlisting>

    <para>Despite these warnings, the last line (<emphasis role="bold">The
    install seems to be successful.</emphasis>) indicates that the process has
    ended successfully and that now we have our brand new set of translated
    templates at
    <filename>/home/user/koha-2.x/intranet-html/intranet-tmpl/default/es/circ</filename>
    directory.</para>

    <para>To verify this you can use your favorite text editor to open one of
    the various templates located in that directory.</para>
  </section>

  <section>
    <title>Questions, complaints and proposals</title>

    <para>If you have any questions about the process outlined in this
    document or a comment that helps to improve it, you can reach me (Martin
    Longo) at <email>jmlongo AT uncu.edu.ar</email>.</para>
  </section>
</article>



From slef at users.sourceforge.net  Fri Jun 24 14:19:36 2005
From: slef at users.sourceforge.net (MJ Ray)
Date: Fri, 24 Jun 2005 05:19:36 -0700
Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.91,1.92
Message-ID: <E1Dln9k-0007iB-Nm@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29581

Modified Files:
	Install.pm 
Log Message:
perldoc and prototype updates

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -r1.91 -r1.92
*** Install.pm	20 Jun 2005 14:28:10 -0000	1.91
--- Install.pm	24 Jun 2005 12:19:34 -0000	1.92
***************
*** 20,25 ****
  # Suite 330, Boston, MA  02111-1307 USA
  #
! # Recent Authors
! # MJR: my.cnf, etcdir, prefix, new display, apache conf, copying fixups
  
  use strict;
--- 20,24 ----
  # Suite 330, Boston, MA  02111-1307 USA
  #
! # Current maintainer MJR slef at users.sourceforge.net
[...1186 lines suppressed...]
  
  =cut
  
! sub loadconfigfile {
      my %configfile;
  
--- 2174,2186 ----
  
  
! =item C<loadconfigfile()>
  
! Opens the existing koha.conf file and gets its values, saving the
! values to some global variables.  If the existing koha.conf file
! cannot be opened for any reason, the file is silently ignored.
  
  =cut
  
! sub loadconfigfile () {
      my %configfile;
  




From genjimoto at users.sourceforge.net  Sat Jun 25 07:22:02 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Fri, 24 Jun 2005 22:22:02 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-detail.pl,1.20,1.21
Message-ID: <E1Dm37C-0004FY-Ev@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16290

Modified Files:
	opac-detail.pl 
Log Message:
Added code to support search options sidebar ref to http://katipo.co.nz/gallery/koha2-4/search_ideas_details_001

Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** opac-detail.pl	20 Jun 2005 14:33:32 -0000	1.20
--- opac-detail.pl	25 Jun 2005 05:22:00 -0000	1.21
***************
*** 33,40 ****
  
  $dat->{'count'}=@items;
! 
  $dat->{'additional'}=$addauthor->[0]->{'author'};
  for (my $i = 1; $i < $authorcount; $i++) {
          $dat->{'additional'} .= " ; " . $addauthor->[$i]->{'author'};
  } # for
  
--- 33,43 ----
  
  $dat->{'count'}=@items;
! my @author;
  $dat->{'additional'}=$addauthor->[0]->{'author'};
  for (my $i = 1; $i < $authorcount; $i++) {
          $dat->{'additional'} .= " ; " . $addauthor->[$i]->{'author'};
+         my %authorpush;
+         $authorpush{author} =$addauthor->[$i]->{'author'};
+         push @author, \%authorpush
  } # for
  
***************
*** 61,64 ****
--- 64,90 ----
  
  my @results = ($dat,);
+ my @title;
+ 
+ 
+ foreach my $word (split(" ", $dat->{'title'})){
+         unless (length($word) == 4){
+                 $word =~s/\%//g
+         }
+         unless (C4::Context->stopwords->{uc($word)} or length($word)==1) {
+         my %titlepush;
+         $titlepush{title} =$word;
+                 push @title, \%titlepush;
+         }#it's NOT a stopword => use it. Otherwise, ignore
+ }
+ foreach my $word (split(" ", $dat->{'author'})){
+         unless (length($word) == 4){
+                 $word =~s/\%//g
+         }
+         unless (C4::Context->stopwords->{uc($word)} or length($word)==1) {
+         my %authorpush;
+         $authorpush{author}=$word;
+                 push @author, \%authorpush;
+         }#it's NOT a stopword => use it. Otherwise, ignore
+ }
  
  my $resultsarray=\@results;
***************
*** 66,69 ****
--- 92,98 ----
  my $webarray=\@webbiblioitems;
  my $sitearray=\@websites;
+ my $titlewords=\@title;
+ my $authorwords=\@author;
+ 
  
  #coping with subscriptions
***************
*** 89,92 ****
--- 118,123 ----
  				suggestion => C4::Context->preference("suggestion"),
  				virtualshelves => C4::Context->preference("virtualshelves"),
+         titlewords => $titlewords,
+         authorwords => $authorwords,
  );
    ## Amazon.com stuff
***************
*** 121,127 ****
  =cut
  output_html_with_http_headers $query, $cookie, $template->output;
- 
- #output_html_with_http_headers $query, $cookie, $template->output;
- 
- output_html_with_http_headers $query, $cookie, $template->output;
- 
--- 152,153 ----




From genjimoto at users.sourceforge.net  Sat Jun 25 07:26:16 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Fri, 24 Jun 2005 22:26:16 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-search.pl,1.30,1.31
Message-ID: <E1Dm3BI-0004dc-Je@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17784

Modified Files:
	opac-search.pl 
Log Message:
restored search for available books functionality while ensuring that a search not asking about the availablity doesn't take longer than normal. Achieved via new parameter in SearchMarc::Catalogsearch called $extratables.

Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** opac-search.pl	20 Jun 2005 14:33:32 -0000	1.30
--- opac-search.pl	25 Jun 2005 05:26:14 -0000	1.31
***************
*** 9,13 ****
  use C4::Database;
  use HTML::Template;
! use C4::SearchMarcTest;
  use C4::Acquisition;
  use C4::Biblio;
--- 9,13 ----
  use C4::Database;
  use HTML::Template;
! use C4::SearchMarc;
  use C4::Acquisition;
  use C4::Biblio;
***************
*** 117,120 ****
--- 117,121 ----
  	findseealso($dbh,\@tags);
      my $sqlstring;
+     my $extratables;
      if ($itemtypesstring ne ''){
          $sqlstring = 'and (biblioitems.itemtype IN (';
***************
*** 134,137 ****
--- 135,139 ----
          $sqlstring .= 'and biblio.biblionumber=items.biblionumber and (items.holdingbranch IN (';
          my $branchesloop=0;
+         $extratables = ',items';
          foreach my $branch (@branches){
              if ($branch ne ''){
***************
*** 146,154 ****
      }
    if ($avail){
      $sqlstring .= "and biblioitems.biblioitemnumber=items.biblioitemnumber and items.itemnumber !=issues.itemnumber and biblio.biblionumber !=reserves.biblionumber and (items.itemlost IS NULL or items.itemlost = 0) and (items.notforloan IS NULL or items.notforloan =0) and (items.wthdrawn IS NULL or items.wthdrawn =0) ";
    }
  	my ($results,$total) = catalogsearch($dbh, \@tags,\@and_or,
  										\@excluding, \@operator, \@value,
! 										$startfrom*$resultsperpage, $resultsperpage,$orderby,$desc_or_asc,$sqlstring);
  	if ($total ==1) {
  	if (C4::Context->preference("BiblioDefaultView") eq "normal") {
--- 148,157 ----
      }
    if ($avail){
+   	$extratables .= ',items,issues,reserves';
      $sqlstring .= "and biblioitems.biblioitemnumber=items.biblioitemnumber and items.itemnumber !=issues.itemnumber and biblio.biblionumber !=reserves.biblionumber and (items.itemlost IS NULL or items.itemlost = 0) and (items.notforloan IS NULL or items.notforloan =0) and (items.wthdrawn IS NULL or items.wthdrawn =0) ";
    }
  	my ($results,$total) = catalogsearch($dbh, \@tags,\@and_or,
  										\@excluding, \@operator, \@value,
! 										$startfrom*$resultsperpage, $resultsperpage,$orderby,$desc_or_asc,$sqlstring, $extratables);
  	if ($total ==1) {
  	if (C4::Context->preference("BiblioDefaultView") eq "normal") {
***************
*** 412,416 ****
  }
  # ADDED BY JF
! #if ($totalresults == 1){
      # if its a barcode search by definition we will only have one result.
      # And if we have a result
--- 415,419 ----
  }
  # ADDED BY JF
! if ($totalresults == 1){
      # if its a barcode search by definition we will only have one result.
      # And if we have a result




From genjimoto at users.sourceforge.net  Sat Jun 25 07:35:31 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Fri, 24 Jun 2005 22:35:31 -0700
Subject: [Koha-cvs] CVS: koha/C4 SearchMarc.pm,1.46,1.47
Message-ID: <E1Dm3KF-0005oB-UL@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22287

Modified Files:
	SearchMarc.pm 
Log Message:
New code making a search not needing to use tables not already used in searching.. doesn't take longer than normal. Achieved via new parameter in Catalogsearch called $extratables.

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** SearchMarc.pm	20 Jun 2005 14:10:01 -0000	1.46
--- SearchMarc.pm	25 Jun 2005 05:35:29 -0000	1.47
***************
*** 151,154 ****
--- 151,159 ----
  optional argument containing an sql string to be used in the 'where' statement. see usage in opac-search.pl.
  
+ =head2 $extratables
+ 
+ optional argument containing extra tables to search. Used in conjunction with $sqlstring. See usage in opac-search.pl.
+ String... so ',items,issues,reserves' allows the items, issues and reserves tables to be used.in a where.
+ 
  =head2 RETURNS
  
***************
*** 170,174 ****
  
  sub catalogsearch {
! 	my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby,$desc_or_asc,$sqlstring) = @_;
  	# build the sql request. She will look like :
  	# select m1.bibid
--- 175,179 ----
  
  sub catalogsearch {
! 	my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby,$desc_or_asc,$sqlstring, $extratables) = @_;
  	# build the sql request. She will look like :
  	# select m1.bibid
***************
*** 278,281 ****
--- 283,287 ----
  	my ($sql_tables, $sql_where1, $sql_where2) = create_request($dbh,\@normal_tags, \@normal_and_or, \@normal_operator, \@normal_value);
    $sql_where1 .= $sqlstring;
+   $sql_tables .= $extratables;
  	$sql_where1 .= "and TO_DAYS( NOW( ) ) - TO_DAYS( biblio.timestamp ) <30" if $orderby =~ "biblio.timestamp";
  	my $sth;




From genjimoto at users.sourceforge.net  Sat Jun 25 07:59:10 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Fri, 24 Jun 2005 22:59:10 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.20,1.21
Message-ID: <E1Dm3h8-0000IN-6r@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac-detail.tmpl 
Log Message:
New search options bar implemented as per http://katipo.co.nz/gallery/koha2-4/search_ideas_details_001

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** opac-detail.tmpl	20 Jun 2005 14:25:00 -0000	1.20
--- opac-detail.tmpl	25 Jun 2005 05:59:08 -0000	1.21
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
! 
  <div id="bibliomenu">
  	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
--- 1,7 ----
  <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
! <table width="100%">
! <tr>
! <td width="70%">
  <div id="bibliomenu">
  	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
***************
*** 80,84 ****
  				</p>
  				<!-- TMPL_IF name="count" -->
! 					<p><b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" --></p>
  				<!-- /TMPL_IF -->
  			</td>
--- 82,86 ----
  				</p>
  				<!-- TMPL_IF name="count" -->
! 				<p><b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" --></p>
  				<!-- /TMPL_IF -->
  			</td>
***************
*** 169,171 ****
--- 171,206 ----
  	</div>
  </div>
+ </td>
+ <td width="30%">
+ Search Options:<br>
+ Select keywords from list<br>
+ <br>
+ <form name="searchoptions" action="searchoptions.pl" method="get">
+ <input type="hidden" name="searchtype" value="NewSearch">
+ Titles:<br>
+ <!-- TMPL_LOOP NAME="titlewords" -->
+ <input type="checkbox" name="keyword" value="<!-- TMPL_VAR NAME="title" -->"><!-- TMPL_VAR NAME="title" --><br>
+ <!-- /TMPL_LOOP --><br>
+ Authors:<br>
+ <!-- TMPL_LOOP NAME="authorwords" -->
+ <input type="checkbox" name="keyword" value="<!-- TMPL_VAR NAME="author" -->"><!-- TMPL_VAR NAME="author" --><br>
+ <!-- /TMPL_LOOP --><br>
+ Subjects:<br>
+ <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+ <!-- TMPL_LOOP NAME="subjects" -->
+ <input type="checkbox" name="keyword" value="<!-- TMPL_VAR NAME="subject" -->"><!-- TMPL_VAR NAME="subject" --><br>
+ <!-- /TMPL_LOOP --><br>
+ Itemtype:<br>
+ <input type="checkbox" name="itemtypeswanted" value="<!-- TMPL_VAR NAME="itemtype" -->">
+ !-- TMPL_IF name="description" -->
+ <!-- TMPL_VAR name="description" -->
+ <!-- TMPL_ELSE -->
+ <!-- TMPL_VAR NAME="itemtype" -->
+ <!-- /TMPL_IF -->
+ <!-- /TMPL_LOOP --><br>
+ <input type="submit" value="Search">
+ </form>
+ </td>
+ </tr>
+ </table>
  <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->




From genjimoto at users.sourceforge.net  Sat Jun 25 08:56:50 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Fri, 24 Jun 2005 23:56:50 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.21,1.22
Message-ID: <E1Dm4aw-0006zh-0G@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac-detail.tmpl 
Log Message:
minor fix

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** opac-detail.tmpl	25 Jun 2005 05:59:08 -0000	1.21
--- opac-detail.tmpl	25 Jun 2005 06:56:47 -0000	1.22
***************
*** 193,197 ****
  Itemtype:<br>
  <input type="checkbox" name="itemtypeswanted" value="<!-- TMPL_VAR NAME="itemtype" -->">
! !-- TMPL_IF name="description" -->
  <!-- TMPL_VAR name="description" -->
  <!-- TMPL_ELSE -->
--- 193,197 ----
  Itemtype:<br>
  <input type="checkbox" name="itemtypeswanted" value="<!-- TMPL_VAR NAME="itemtype" -->">
! <!-- TMPL_IF name="description" -->
  <!-- TMPL_VAR name="description" -->
  <!-- TMPL_ELSE -->




From genjimoto at users.sourceforge.net  Sat Jun 25 09:26:52 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Sat, 25 Jun 2005 00:26:52 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-searchresults.tmpl,1.25,1.26
Message-ID: <E1Dm540-00024j-3b@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac-searchresults.tmpl 
Log Message:
Fix so clicking on numbers carries over the itemtype and availaiblity search parameters

Index: opac-searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** opac-searchresults.tmpl	20 Jun 2005 14:25:00 -0000	1.25
--- opac-searchresults.tmpl	25 Jun 2005 07:26:49 -0000	1.26
***************
*** 17,29 ****
  		<p class="center">
  			<!-- TMPL_IF NAME=displayprev -->
! 				<a class="results" href="opac-search.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;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search">&lt;&lt;Previous</a>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME="numbers" -->
  				<!-- TMPL_IF NAME="highlight" --><!-- TMPL_VAR NAME="number" --><!-- TMPL_ELSE -->
! 					<a class="results" href="opac-search.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;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
  			<!-- 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;</a>
  				<!-- /TMPL_IF -->
  		</p>
--- 17,32 ----
  		<p class="center">
  			<!-- TMPL_IF NAME=displayprev -->
! 				<a class="results" href="opac-search.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;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search
! 				<!-- TMPL_IF NAME="itemtypesstring">&itemtypesstring=<!-- TMPL_VAR NAME="itemtypesstring"><!-- /TMPL_IF --><!-- TMPL_IF NAME="avail" -->&avail=1<!-- /TMPL_IF -->">&lt;&lt;Previous</a>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME="numbers" -->
  				<!-- TMPL_IF NAME="highlight" --><!-- TMPL_VAR NAME="number" --><!-- TMPL_ELSE -->
! 					<a class="results" href="opac-search.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;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search
! 					<!-- TMPL_IF NAME="itemtypesstring">&itemtypesstring=<!-- TMPL_VAR NAME="itemtypesstring"><!-- /TMPL_IF --><!-- TMPL_IF NAME="avail" -->&avail=1<!-- /TMPL_IF -->"><!-- TMPL_VAR NAME="number" --></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
  			<!-- 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
! 				<!-- TMPL_IF NAME="itemtypesstring">&itemtypesstring=<!-- TMPL_VAR NAME="itemtypesstring"><!-- /TMPL_IF --><!-- TMPL_IF NAME="avail" -->&avail=1<!-- /TMPL_IF -->">Next &gt;&gt;</a>
  				<!-- /TMPL_IF -->
  		</p>
***************
*** 196,208 ****
  		<p class="center">
  			<!-- TMPL_IF NAME="displayprev" -->
! 				<a class="results" href="opac-search.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;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search">&lt;&lt;Previous</a>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME="numbers" -->
  				<!-- TMPL_IF NAME="highlight" --><!-- TMPL_VAR NAME="number" --><!-- TMPL_ELSE -->
! 					<a class="results" href="opac-search.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;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
  			<!-- 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;</a>
  				<!-- /TMPL_IF -->
  		</p>
--- 199,214 ----
  		<p class="center">
  			<!-- TMPL_IF NAME="displayprev" -->
! 				<a class="results" href="opac-search.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;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search
! 				<!-- TMPL_IF NAME="itemtypesstring">&itemtypesstring=<!-- TMPL_VAR NAME="itemtypesstring"><!-- /TMPL_IF --><!-- TMPL_IF NAME="avail" -->&avail=1<!-- /TMPL_IF -->">&lt;&lt;Previous</a>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME="numbers" -->
  				<!-- TMPL_IF NAME="highlight" --><!-- TMPL_VAR NAME="number" --><!-- TMPL_ELSE -->
! 					<a class="results" href="opac-search.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;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search
! 					<!-- TMPL_IF NAME="itemtypesstring">&itemtypesstring=<!-- TMPL_VAR NAME="itemtypesstring"><!-- /TMPL_IF --><!-- TMPL_IF NAME="avail" -->&avail=1<!-- /TMPL_IF -->"><!-- TMPL_VAR NAME="number" --></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
  			<!-- 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
! 				<!-- TMPL_IF NAME="itemtypesstring">&itemtypesstring=<!-- TMPL_VAR NAME="itemtypesstring"><!-- /TMPL_IF --><!-- TMPL_IF NAME="avail" -->&avail=1<!-- /TMPL_IF -->">Next &gt;&gt;</a>
  				<!-- /TMPL_IF -->
  		</p>




From hellen at users.sourceforge.net  Sat Jun 25 14:55:05 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:55:05 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/parameters admin-home.tmpl,1.1,1.2
Message-ID: <E1DmABd-0007ZC-Ai@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28983/koha-tmpl/intranet-tmpl/default/de/parameters

Modified Files:
	admin-home.tmpl 
Log Message:
adjustments for 2.2.3

Index: admin-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/admin-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** admin-home.tmpl	12 May 2005 19:26:35 -0000	1.1
--- admin-home.tmpl	25 Jun 2005 12:55:02 -0000	1.2
***************
*** 35,39 ****
  			<td>Medientypen definieren</td>
  		</tr>
! 
  		<tr>
  			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/categorie.pl">Benutzerkategorien</a></td>
--- 35,52 ----
  			<td>Medientypen definieren</td>
  		</tr>
! <tr>
!       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/itemtypecategory.pl"> Exemplarkategorien</a></td>
!       <td>Definition von Exemplarkategorien. (Sachliteratur, Sch&ouml;ne Literatur...)</td>
!     </tr>
! 
!     <tr>
!       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/itemtypesubcategory.pl"> Exemplarunterkategorien</a></td>
!       <td>Definition der Unterkategorien. (Sch&ouml;ne Literatur Jugendliche, Sachliteratur Jugendliche.... Sch&ouml;ne Literatur Erwachsene.)</td>
!     </tr>
! 
!     <tr>
!       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/mediatype.pl"> Exemplarmedientypen</a></td>
!       <td>Definition der Exemplarmedientypen. (CD, Video, Buch, Spiel...)</td>
!     </tr>
  		<tr>
  			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/categorie.pl">Benutzerkategorien</a></td>




From hellen at users.sourceforge.net  Sat Jun 25 14:58:55 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:55 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de mancredit.tmpl,1.2,1.3
Message-ID: <E1DmAFL-0007xd-HK@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	mancredit.tmpl 
Log Message:
adjustments for 2.2.3

Index: mancredit.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/mancredit.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** mancredit.tmpl	17 May 2005 13:21:35 -0000	1.2
--- mancredit.tmpl	25 Jun 2005 12:58:53 -0000	1.3
***************
*** 10,14 ****
  <option value="C">Gutschrift</option>
  <option value="BAY">Baycorp Adjustment</option>
! <option value="WORK">Arbeitsleistung</option>
  </select>
  </td></tr>
--- 10,14 ----
  <option value="C">Gutschrift</option>
  <option value="BAY">Baycorp Adjustment</option>
! <option value="WORK">Erledigt</option>
  </select>
  </td></tr>




From hellen at users.sourceforge.net  Sat Jun 25 14:58:56 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/bull statecollection.tmpl,1.2,1.3
Message-ID: <E1DmAFM-0007y6-5E@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30254/koha-tmpl/intranet-tmpl/default/de/bull

Modified Files:
	statecollection.tmpl 
Log Message:
adjustments for 2.2.3

Index: statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/bull/statecollection.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** statecollection.tmpl	17 May 2005 13:21:35 -0000	1.2
--- statecollection.tmpl	25 Jun 2005 12:58:53 -0000	1.3
***************
*** 35,43 ****
  			<td>
  				<input type="hidden" name="serialid" value="<!-- TMPL_VAR name="serialid" -->">
! 				<select name="status" size="1">					
! 						<option value="1" <!--TMPL_IF name="status1" -->selected<!-- /TMPL_IF -->>erwartet</option>		
! 						<option value="2" <!--TMPL_IF name="status2" -->selected<!-- /TMPL_IF -->>eingegangen</option>
! 						<option value="3" <!--TMPL_IF name="status3" -->selected<!-- /TMPL_IF -->>versp&auml;tet</option>					
! 						<option value="4" <!--TMPL_IF name="status4" -->selected<!-- /TMPL_IF -->>&uuml;berf&auml;llig</option>					
  				</select>
  			</td>
--- 35,57 ----
  			<td>
  				<input type="hidden" name="serialid" value="<!-- TMPL_VAR name="serialid" -->">
! 				<select name="status" size="1">	
! 					<!--TMPL_IF name="status1" -->				
! 						<option value="1" selected>erwartet</option>
! 						<!-- /TMPL_IF -->
! 						<!--TMPL_IF name="status2" -->		
! 						<option value="2" selected>eingegangen</option>
! 						<!-- /TMPL_ELSE -->
! 						<option value="2" selected>eingegangen</option>
! 						<!-- /TMPL_IF -->
! 						<!--TMPL_IF name="status3" -->
! 						<option value="3"selected>versp&auml;tet</option>
! 						<!-- /TMPL_ELSE -->
! 						<option value="3"selected>versp&auml;tet</option>
! 						<!-- /TMPL_IF -->
! 						 <!--TMPL_IF name="status4" -->					
! 						<option value="4"selected>&uuml;berf&auml;llig</option>
! 						<!-- /TMPL_ELSE -->
! 						<option value="4"selected>&uuml;berf&auml;llig</option>
! 						<!-- /TMPL_IF -->					
  				</select>
  			</td>
***************
*** 55,59 ****
  				<input type="hidden" name="serialid" value="0">
  				<select name="status" size="1">
- 						<option value="1">erwartet</option>				
  						<option value="2">eingegangen</option>
  						<option value="3" selected>versp&auml;tet</option>
--- 69,72 ----




From hellen at users.sourceforge.net  Sat Jun 25 14:58:56 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/authorities authorities.tmpl,1.1,1.2
Message-ID: <E1DmAFM-0007y2-4Q@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30254/koha-tmpl/intranet-tmpl/default/de/authorities

Modified Files:
	authorities.tmpl 
Log Message:
adjustments for 2.2.3

Index: authorities.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities/authorities.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** authorities.tmpl	12 May 2005 19:26:14 -0000	1.1
--- authorities.tmpl	25 Jun 2005 12:58:53 -0000	1.2
***************
*** 4,8 ****
  <div class="tabbed">
  	<form method="post" name="f">
! 	<h1 class="authority">Authority number <!-- TMPL_VAR NAME="authid" --></h1>
  	<p>
  		<input type="hidden" name="op" value="add">
--- 4,12 ----
  <div class="tabbed">
  	<form method="post" name="f">
! 	<!-- TMPL_IF name="authid" -->
! 		<h1 class="authority">Modify authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
! 	<!-- TMPL_ELSE -->
! 		<h1 class="authority">Adding authority (<!-- TMPL_VAR name="authtypetext" -->)</h1>
! 	<!-- /TMPL_IF -->
  	<p>
  		<input type="hidden" name="op" value="add">
***************
*** 11,17 ****
  		<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->">
  		<!-- TMPL_IF name="authid" -->
! 			<input type="button" value="Speichern" onclick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- TMPL_ELSE -->
! 			<input type="button" value="Authority hinzuf&uuml;gen" onclick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- /TMPL_IF -->
  	</p>
--- 15,21 ----
  		<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->">
  		<!-- TMPL_IF name="authid" -->
! 			<input type="button" value="Save" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- TMPL_ELSE -->
! 			<input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- /TMPL_IF -->
  	</p>
***************
*** 19,22 ****
--- 23,36 ----
  
  <br><br><br><br><br><br><br><br><br><br><br>
+ <!-- TMPL_IF name="duplicateauthid" -->
+ 	<div class="problem">
+ 		<p>Duplicate suspected with <a href='javascript:openWindow("detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&popup=1", "Duplicate Authority")' class="button authority"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
+ 		<p>You must either :</p>
+ 		<ul>
+ 			<p><input type="checkbox" value=1 name="confirm_not_duplicate">confirm it's not a duplicate (and click on <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority"> again)</p>
+ 			<p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >original authority</a></p>
+ 		</ul>
+ 	</div>
+ <!-- /TMPL_IF -->
  
  <!-- TMPL_LOOP NAME="0XX" -->
***************
*** 133,138 ****
  		alertString2  = _("Form not submitted because of the following problem(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_missing_mandatory_tags +_("Pflichttags leer");
! 		alertString2 += "\n- "+ total_missing_mandatory_subfields +_("Pflichtfeld leer (sieh fett dargestellte Unterfelder)");
  		alert(alertString2);
  	} else {
--- 147,152 ----
  		alertString2  = _("Form not submitted because of the following problem(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_missing_mandatory_tags +_(" mandatory tags empty");
! 		alertString2 += "\n- "+ total_missing_mandatory_subfields +_(" mandatory fields empty (see bold subfields)");
  		alert(alertString2);
  	} else {
***************
*** 165,170 ****
  
  function AddField(field) {
! 	document.forms[0].op.value = "addfield";
! 	document.forms[0].addfield_field.value=field;
  	document.f.submit();
  }
--- 179,184 ----
  
  function AddField(field) {
! 	document.forms[1].op.value = "addfield";
! 	document.forms[1].addfield_field.value=field;
  	document.f.submit();
  }




From hellen at users.sourceforge.net  Sat Jun 25 14:58:56 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/catalogue MARCdetail.tmpl,1.4,1.5 detail.tmpl,1.3,1.4 searchresults.tmpl,1.2,1.3
Message-ID: <E1DmAFM-0007yJ-Bs@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	MARCdetail.tmpl detail.tmpl searchresults.tmpl 
Log Message:
adjustments for 2.2.3

Index: MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/catalogue/MARCdetail.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** MARCdetail.tmpl	9 Jun 2005 17:54:31 -0000	1.4
--- MARCdetail.tmpl	25 Jun 2005 12:58:53 -0000	1.5
***************
*** 4,8 ****
  	<div class="tabbed">
  		<h1 class="catalogue">Biblionummer : <!-- TMPL_VAR NAME="biblionumber" --></h1>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Biblio bearbeiten  </a>  <a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">  Duplizieren  </a>  <a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue">  Exemplar bearbeiten  </a>   <a href="javascript:confirm_deletion()" class="button catalogue">  L&ouml;schen  </a>  <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Vollanzeige  </a>  <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normalanzeige  </a>  <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD  </a>  <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  zu virtuellem Regal hinzuf&uuml;gen  </a>  <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  Drucken  </a>
  		<!-- TMPL_IF name="subscriptionsnumber" -->
  		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
--- 4,29 ----
  	<div class="tabbed">
  		<h1 class="catalogue">Biblionummer : <!-- TMPL_VAR NAME="biblionumber" --></h1>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Biblio bearbeiten
! 		  </a>
! 		    <a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">
! 		      Duplizieren 
! 		       </a>  <a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue">
! 		         Exemplar bearbeiten
! 			   </a>   <a href="javascript:confirm_deletion()" class="button catalogue">
! 			     L&ouml;schen 
! 			      </a> 
! 			       <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue"> 
! 			        Vollanzeige
! 				  </a> 
! 				   <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normalanzeige
! 				     </a>
! 				       <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD
! 				         </a> 
! 					  <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
! 					    zu vituellem Regal hinzuf&uuml;gen
! 					      </a> 
! 					       <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
! 					         Drucken
! 						   </a>
  		<!-- TMPL_IF name="subscriptionsnumber" -->
  		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
***************
*** 363,367 ****
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Wollen Sie diesen Biblio wirklich l&ouml;schen?');
  	if (is_confirmed) {
  		window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";
--- 384,388 ----
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Are you sure you want to delete this biblio?');
  	if (is_confirmed) {
  		window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/catalogue/detail.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** detail.tmpl	8 Jun 2005 11:28:08 -0000	1.3
--- detail.tmpl	25 Jun 2005 12:58:53 -0000	1.4
***************
*** 5,9 ****
  	<h1 class="catalogue"><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->) <!-- TMPL_VAR NAME="class" --></h1>
  	<div class="bibliomenu">
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Biblio bearbeiten  </a>  <a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">  Duplizieren  </a>  <a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue">  Exemplar bearbeiten  </a>   <a href="javascript:confirm_deletion()" class="button catalogue">  L&ouml;schen  </a>  <a href="MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  MARC-Vollanzeige  </a>  <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normalanzeige  </a>  <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD  </a>  <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  zu virtuellem Regal hinzuf&uuml;gen  </a>  <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  Drucken  </a>
  		<!-- TMPL_IF name="subscriptionsnumber" -->
  		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
--- 5,31 ----
  	<h1 class="catalogue"><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->) <!-- TMPL_VAR NAME="class" --></h1>
  	<div class="bibliomenu">
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Biblio bearbeiten
! 		  </a>
! 		    <a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">
! 		     Duplizieren 
! 		      </a>
! 		        <a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue">
! 			  Exemplar bearbeiten
! 			    </a>
! 			       <a href="javascript:confirm_deletion()" class="button catalogue">
! 			         L&ouml;schen 
! 				  </a>
! 				    <a href="MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  MARC-Vollanzeige
! 				      </a>
! 				        <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normalanzeige
! 					  </a>
! 					    <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD
! 					      </a>
! 					        <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
! 						  zu virtuellem Regal hinzuf&uuml;gen
! 						    </a>
! 						      <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
! 						        Drucken
! 							  </a>
  		<!-- TMPL_IF name="subscriptionsnumber" -->
  		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
***************
*** 34,38 ****
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="author" --><label class="label100"><b>Verfasser</b> </label><!-- TMPL_VAR NAME="author" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="additional" --><label class="label100"><b>Weitere Verfasser:</b></label><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><label class="label100"><b>Verlag:</b></label><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" --><br />
  				<!-- TMPL_IF name="publicationyear" --><label class="label100"><b>Ort:</b></label><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
--- 56,60 ----
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="author" --><label class="label100"><b>Verfasser</b> </label><!-- TMPL_VAR NAME="author" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="additional" --><label class="label100"><b>Additional Author:</b></label><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><label class="label100"><b>Verlag:</b></label><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" --><br />
  				<!-- TMPL_IF name="publicationyear" --><label class="label100"><b>Ort:</b></label><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
***************
*** 72,76 ****
  			<th class="catalogue">Entliehen bis</th>
  			<th class="catalogue">Zuletzt gesehen</th>
! 			<th class="catalogue">Barcode</th>
  			<th class="catalogue">Band</th>
  		</tr>
--- 94,98 ----
  			<th class="catalogue">Entliehen bis</th>
  			<th class="catalogue">Zuletzt gesehen</th>
! 			<th class="catalogue">Strichcode</th>
  			<th class="catalogue">Band</th>
  		</tr>
***************
*** 92,96 ****
  				<!-- TMPL_IF NAME="type" -->
  					<td>
! 						<a href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;item=<!-- TMPL_VAR NAME="itemtype" -->">Medientyp &auml;ndern</a>
  					</td>
  				<!-- /TMPL_IF -->
--- 114,118 ----
  				<!-- TMPL_IF NAME="type" -->
  					<td>
! 						<a href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;item=<!-- TMPL_VAR NAME="itemtype" -->">Fix Itemtype</a>
  					</td>
  				<!-- /TMPL_IF -->

Index: searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/catalogue/searchresults.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** searchresults.tmpl	17 May 2005 13:21:35 -0000	1.2
--- searchresults.tmpl	25 Jun 2005 12:58:53 -0000	1.3
***************
*** 63,67 ****
  		<!-- TMPL_IF NAME=not-available-p -->Nicht verf&uuml;gbar<!-- TMPL_IF NAME=not-available-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME=lost-p -->Exemplar vermi&szlig;t<!-- TMPL_IF NAME=lost-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME=withdrawn-p -->Ausgemustert<!-- TMPL_IF NAME=withdrawn-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME=on-loan-p -->Entliehen<!-- TMPL_IF NAME=on-loan-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
  		<!-- TMPL_ELSE -->
--- 63,67 ----
  		<!-- TMPL_IF NAME=not-available-p -->Nicht verf&uuml;gbar<!-- TMPL_IF NAME=not-available-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME=lost-p -->Exemplar vermi&szlig;t<!-- TMPL_IF NAME=lost-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME=withdrawn-p -->Gel&ouml;scht<!-- TMPL_IF NAME=withdrawn-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME=on-loan-p -->Entliehen<!-- TMPL_IF NAME=on-loan-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
  		<!-- TMPL_ELSE -->




From hellen at users.sourceforge.net  Sat Jun 25 14:58:56 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple addbiblio.tmpl,1.3,1.4 additem.tmpl,1.4,1.5 isbnsearch.tmpl,1.3,1.4
Message-ID: <E1DmAFM-0007yD-7g@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	addbiblio.tmpl additem.tmpl isbnsearch.tmpl 
Log Message:
adjustments for 2.2.3

Index: addbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/addbiblio.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** addbiblio.tmpl	5 Jun 2005 14:45:17 -0000	1.3
--- addbiblio.tmpl	25 Jun 2005 12:58:53 -0000	1.4
***************
*** 2,6 ****
  <div class="tabbed">
  	<form method="post" name="f">
! 	<h1 class="catalogue">Biblionummer : <!-- 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" --></h1>
  	<p>
  		<input type="hidden" name="op" value="addbiblio">
***************
*** 9,15 ****
  		<input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="oldbiblionumber" -->">
  		<!-- TMPL_IF name="bibid" -->
! 			<BUTTON value="Save" onclick="Check(this.form)" accesskey="s" class="button catalogue">&Auml;nderungen <u>s</u>ichern</BUTTON>
  		<!-- TMPL_ELSE -->
! 			<BUTTON value="Add biblio" onclick="Check(this.form)" accesskey="n" class="button catalogue"><u>N</u>euer Eintrag</BUTTON>
  		<!-- /TMPL_IF -->
  		<a href="javascript:PopupZ3950()" class="button catalogue">z3950 Suche</a>
--- 9,15 ----
  		<input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="oldbiblionumber" -->">
  		<!-- TMPL_IF name="bibid" -->
! 			<input type ="button" value="Speichern" onclick="Check(this.form)" accesskey="w" class="button catalogue">
  		<!-- TMPL_ELSE -->
! 			<input type ="button" value="Biblio hinzuf&uuml;gen" onclick="Check(this.form)" accesskey="w" class="button catalogue">
  		<!-- /TMPL_IF -->
  		<a href="javascript:PopupZ3950()" class="button catalogue">z3950 Suche</a>

Index: additem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/additem.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** additem.tmpl	9 Jun 2005 17:54:31 -0000	1.4
--- additem.tmpl	25 Jun 2005 12:58:53 -0000	1.5
***************
*** 5,14 ****
  	<input type="hidden" name="bibid" value="<!-- TMPL_VAR NAME="bibid" -->">
  	<div class="tabbed">
! 		<h1 class="catalogue">Biblionummer: <!-- TMPL_VAR NAME="biblionumber" --></h1>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Bibliografische Daten bearbeiten  </a>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">  Duplizieren  </a>
! 		<a href="../MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  MARC  </a>
! 		<a href="../detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normal  </a>
! 		<a href="../ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD  </a>
  	</div>
  	<!-- TMPL_IF name="item_loop" -->
--- 5,19 ----
  	<input type="hidden" name="bibid" value="<!-- TMPL_VAR NAME="bibid" -->">
  	<div class="tabbed">
! 	<h1 class="catalogue"><!-- TMPL_VAR name="title" --> (<!-- TMPL_VAR name="author" --> Biblionummer:<!-- TMPL_VAR NAME="biblionumber" -->)</h1>
! 				<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
! 				  Biblio bearbeiten  </a>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">
! 		  Duplizieren  </a>
! 		<a href="../MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
! 		  MARC  </a>
! 		<a href="../detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
! 		  Normal  </a>
! 		<a href="../ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
! 		  ISBD  </a>
  	</div>
  	<!-- TMPL_IF name="item_loop" -->
***************
*** 53,57 ****
  	<input type="hidden" name="itemnum" value="<!-- TMPL_VAR NAME="itemnum" -->">
  	<!-- TMPL_IF name="barcode_not_unique" -->
! 		<div id="problem"><b>FEHLER: Barcode ist bereits vorhanden<b></div>
  	<!-- /TMPL_IF -->
  	<!-- TMPL_IF name="opisadd" -->
--- 58,62 ----
  	<input type="hidden" name="itemnum" value="<!-- TMPL_VAR NAME="itemnum" -->">
  	<!-- TMPL_IF name="barcode_not_unique" -->
! 		<div id="problem"><b>FEHLER: Strichcode ist bereits vorhanden<b></div>
  	<!-- /TMPL_IF -->
  	<!-- TMPL_IF name="opisadd" -->
***************
*** 100,106 ****
  		document.f.submit();
  	} else {
! 		alertString2  = _("Formular nicht bearbeitet wegen der folgenden Probleme");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_errors+_("Pflichtfelder leer (siehe fett dargestellte Unterfelder)");
  		alert(alertString2);
  	}
--- 105,111 ----
  		document.f.submit();
  	} else {
! 		alertString2  = _("Form not submitted because of the following problem(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_errors+_("Pflichtfelder leer (sieh fett dargestellte Unterfelder)");
  		alert(alertString2);
  	}

Index: isbnsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/isbnsearch.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** isbnsearch.tmpl	8 Jun 2005 11:28:08 -0000	1.3
--- isbnsearch.tmpl	25 Jun 2005 12:58:53 -0000	1.4
***************
*** 12,16 ****
  	</div>
  	<div id="bloc25">
! 		<h2 class="catalogue">Ergebnisse in der Datenbank</h2>
  		<!-- TMPL_IF name="loop" -->
  			<div id="resultnumber">
--- 12,16 ----
  	</div>
  	<div id="bloc25">
! 		<h2 class="catalogue">Biblios in der Datenbank</h2>
  		<!-- TMPL_IF name="loop" -->
  			<div id="resultnumber">
***************
*** 32,36 ****
  					<!-- 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">
! 							Weitere &gt;&gt;
  						</a>
  					<!-- /TMPL_IF -->
--- 32,36 ----
  					<!-- 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">
! 							Weitere&gt;&gt;
  						</a>
  					<!-- /TMPL_IF -->
***************
*** 38,44 ****
  			<p class="resultcount">
  				<!-- TMPL_IF NAME="total" -->
! 					Treffer <i><!-- TMPL_VAR NAME="from" --></i> bis <i><!-- TMPL_VAR NAME="to" --></i>
  				<!-- TMPL_ELSE -->
! 					Keine Treffer
  				<!-- /TMPL_IF -->
  			</p>
--- 38,44 ----
  			<p class="resultcount">
  				<!-- TMPL_IF NAME="total" -->
! 					Ergebnisse <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" -->
  				<!-- TMPL_ELSE -->
! 					Nichts gefunden.
  				<!-- /TMPL_IF -->
  			</p>
***************
*** 62,71 ****
  						<td><a href="additem-nomarc.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Exemplare hinzuf&uuml;gen</a></td>
  						<!-- TMPL_ELSE -->
! 						<td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Bearbeiten</a></td>
  						<!-- /TMPL_IF -->
  						<!-- TMPL_UNLESS NAME="NOTMARC" -->
  						<td>
  							<a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">
! 								Duplizieren
  							</a>
  						</td>
--- 62,71 ----
  						<td><a href="additem-nomarc.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Exemplare hinzuf&uuml;gen</a></td>
  						<!-- TMPL_ELSE -->
! 						<td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Bearbeiten...</a></td>
  						<!-- /TMPL_IF -->
  						<!-- TMPL_UNLESS NAME="NOTMARC" -->
  						<td>
  							<a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">
! 								Duplikate
  							</a>
  						</td>
***************
*** 92,96 ****
  					<!-- 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">
! 							Weitere &gt;&gt;
  						</a>
  					<!-- /TMPL_IF -->
--- 92,96 ----
  					<!-- 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">
! 							Weitere&gt;&gt;
  						</a>
  					<!-- /TMPL_IF -->
***************
*** 98,113 ****
  			<p class="resultcount">
  				<!-- TMPL_IF NAME="total" -->
! 					Treffer <i><!-- TMPL_VAR NAME="from" --></i> bis <i><!-- TMPL_VAR NAME="to" --></i>
  				<!-- TMPL_ELSE -->
! 					Keine Treffer
  				<!-- /TMPL_IF -->
  			</p>
  		</div>
  		<!-- TMPL_ELSE -->
! 			<p>Keine</p>
  		<!-- /TMPL_IF -->
  	</div>
  	<div id="bloc25">
! 		<h2 class="catalogue">Bibliografische Daten im Fremddatenpool</h2>
  		<!-- TMPL_IF name="breeding_loop" -->
  			<table>
--- 98,113 ----
  			<p class="resultcount">
  				<!-- TMPL_IF NAME="total" -->
! 					Ergebnisse <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" -->
  				<!-- TMPL_ELSE -->
! 					Nichts gefunden.
  				<!-- /TMPL_IF -->
  			</p>
  		</div>
  		<!-- TMPL_ELSE -->
! 			<p>None</p>
  		<!-- /TMPL_IF -->
  	</div>
  	<div id="bloc25">
! 		<h2 class="catalogue">Biblios im fremddatenpool</h2>
  		<!-- TMPL_IF name="breeding_loop" -->
  			<table>
***************
*** 129,133 ****
  							
  							<!-- TMPL_ELSE -->
! 							<td><a href="addbiblio.pl?breedingid=<!-- TMPL_VAR NAME="id" -->" class="button catalogue">Biblio zur Datenbank hinzuf&uuml;gen</a></td>
  							<!-- /TMPL_IF -->
  						</tr>
--- 129,133 ----
  							
  							<!-- TMPL_ELSE -->
! 							<td><a href="addbiblio.pl?breedingid=<!-- TMPL_VAR NAME="id" -->" class="button catalogue">Biblio hinzuf&uuml;gen</a></td>
  							<!-- /TMPL_IF -->
  						</tr>
***************
*** 139,143 ****
  	</div>
  	<div id="bloc25">
! 		<h2 class="catalogue">Biblio zur Datenbank hinzuf&uuml;gen</h2>
  		<p class="center">
  		<!-- TMPL_IF NAME="NOTMARC" -->
--- 139,143 ----
  	</div>
  	<div id="bloc25">
! 		<h2 class="catalogue">Biblio hinzuf&uuml;gen</h2>
  		<p class="center">
  		<!-- TMPL_IF NAME="NOTMARC" -->




From hellen at users.sourceforge.net  Sat Jun 25 14:58:56 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/acqui acqui-home.tmpl,1.4,1.5 basket.tmpl,1.3,1.4 newbiblio.tmpl,1.2,1.3
Message-ID: <E1DmAFM-0007y9-76@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	acqui-home.tmpl basket.tmpl newbiblio.tmpl 
Log Message:
adjustments for 2.2.3

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui/acqui-home.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** acqui-home.tmpl	9 Jun 2005 08:37:41 -0000	1.4
--- acqui-home.tmpl	25 Jun 2005 12:58:53 -0000	1.5
***************
*** 6,18 ****
  <div id="bloc25">
  	<h2 class="acquisition">Beginnen, Eingangsbearbeitung, &auml;ndern von Bestellungen</h2>
! 	<!-- TMPL_IF name="nobudget" -->
!   	                 <p class="problem">Sie m&uuml;ssen unter Parameter ein Budget definieren</p>
!   	         <!-- TMPL_ELSE -->
! 		<form action="/cgi-bin/koha/acqui/order.pl" method="post">
  			Lieferantenname: <input type="text"  size="25"   name="supplier">
  			<input type="submit" class="button acquisition" value="OK">
  		</form>
  	<p>oder <a href="histsearch.pl" class="button acquisition"> Suche Bestellhistorie</a></p>
- 	<!-- /TMPL_IF -->
  </div>
  
--- 6,14 ----
  <div id="bloc25">
  	<h2 class="acquisition">Beginnen, Eingangsbearbeitung, &auml;ndern von Bestellungen</h2>
!   	        <form action="/cgi-bin/koha/acqui/order.pl" method="post">
  			Lieferantenname: <input type="text"  size="25"   name="supplier">
  			<input type="submit" class="button acquisition" value="OK">
  		</form>
  	<p>oder <a href="histsearch.pl" class="button acquisition"> Suche Bestellhistorie</a></p>
  </div>
  
***************
*** 35,39 ****
  	<h2 class="acquisition">zu pr&uuml;fende Vorschl&auml;ge</h2>
  		<!-- TMPL_IF name="suggestion" -->
! 			<!--TMPL_VAR NAME="suggestion" --> offene Anschaffungsvorschl%auml;ge <a href="/cgi-bin/koha/suggestion/acceptorreject.pl" class="button acquisition">Manage</a>
  		<!-- TMPL_ELSE -->
  			Keine Anschaffungsvorschl&auml;ge offen
--- 31,35 ----
  	<h2 class="acquisition">zu pr&uuml;fende Vorschl&auml;ge</h2>
  		<!-- TMPL_IF name="suggestion" -->
! 			<!--TMPL_VAR NAME="suggestion" --> suggestions waiting <a href="/cgi-bin/koha/suggestion/acceptorreject.pl" class="button acquisition">Manage</a>
  		<!-- TMPL_ELSE -->
  			Keine Anschaffungsvorschl&auml;ge offen
***************
*** 43,58 ****
  <!-- showbudget-->
  <div id="bloc25">
! 	<form action="/cgi-bin/koha/search.pl">
  		<h2 class="acquisition">Etats und Budgets</h2>
- 		<!-- TMPL_IF name="nobudget" -->
-   	                 <p class="problem">Sie m&uuml;sen unter Parameter ein Budget definieren</p>
-   	         <!-- TMPL_ELSE -->
  		<table class="noborder">
  			<tr>
  				<th class="acquisition">Etats</th>
! 				<th class="acquisition">Gesamt</th>
  				<th class="acquisition">Geschenkt</th>
  				<th class="acquisition">Verausgabt</th>
! 				<th class="acquisition">Verf&uuml;gbar </th>
  			</tr>
  			<!-- TMPL_LOOP NAME="loop_budget" -->
--- 39,51 ----
  <!-- showbudget-->
  <div id="bloc25">
! 		<form action="/cgi-bin/koha/search.pl">	
  		<h2 class="acquisition">Etats und Budgets</h2>
  		<table class="noborder">
  			<tr>
  				<th class="acquisition">Etats</th>
! 				<th class="acquisition">Total</th>
  				<th class="acquisition">Geschenkt</th>
  				<th class="acquisition">Verausgabt</th>
! 				<th class="acquisition">Verf&uuml;gbar</th>
  			</tr>
  			<!-- TMPL_LOOP NAME="loop_budget" -->
***************
*** 66,70 ****
  			<!-- /TMPL_LOOP -->
  			<tr>
! 				<th class="acquisition" align="right">Gesamt</th>
  				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="total" --></th>
  				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="totspent" --></th>
--- 59,63 ----
  			<!-- /TMPL_LOOP -->
  			<tr>
! 				<th class="acquisition" align="right">Total</th>
  				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="total" --></th>
  				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="totspent" --></th>
***************
*** 74,80 ****
  		</table>
  		<p>
! Benutzen Sie den "neu laden"-Button des Browsers zur Anzeige der aktuellen Betr&auml;ge. Die angezeigten Werte sind nur ungef&auml;hre Werte, da bei Zahlung eines Betrags der dann aktuelle Wechselkurs berechnet wird.
  		</p>
! 	<!-- /TMPL_IF -->
  </div>
  
--- 67,73 ----
  		</table>
  		<p>
! 		Benutzen Sie den "neu laden"-Button des Browsers zur Anzeige der aktuellen Betr&auml;ge. Die angezeigten Werte sind nur ungef&auml;hre Werte, da bei Zahlung eines Betrags der dann aktuelle Wechselkurs berechnet wird.
  		</p>
! 	 </form>
  </div>
  

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui/basket.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** basket.tmpl	5 Jun 2005 18:10:13 -0000	1.3
--- basket.tmpl	25 Jun 2005 12:58:53 -0000	1.4
***************
*** 1,4 ****
  <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
! 
  <div id="mainbloc">
  	<h1 class="acquisition"><!-- TMPL_UNLESS name="basketno" -->Neu <!-- /TMPL_UNLESS -->Einkaufskorb <b><!-- TMPL_VAR NAME="basketno" --> </b>f&uuml;r <a href="supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a></h1><br />
--- 1,4 ----
  <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
! <!-- angepasst fuer 2.2.3, hellen, 24/06/05 -->
  <div id="mainbloc">
  	<h1 class="acquisition"><!-- TMPL_UNLESS name="basketno" -->Neu <!-- /TMPL_UNLESS -->Einkaufskorb <b><!-- TMPL_VAR NAME="basketno" --> </b>f&uuml;r <a href="supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a></h1><br />
***************
*** 7,12 ****
  			<h2 class="acquisition">Korb-Info</h2>
  			<p><label class="label100">Korb-Nummer<label> <!-- TMPL_VAR NAME="basketno" --></p>
! 			<p><label class="label100">Bearbeitet von<label><!-- TMPL_VAR NAME="authorisedbyname" --></p>
! 			<p><label class="label100">Begonnen am<label> <!-- TMPL_VAR NAME="creationdate" --></p>
  			<p><label class="label100">f&uuml;r<label> <!-- TMPL_VAR NAME="booksellerid" --></p>
  			<p><label class="label100">Rechnungsnummer </label><!-- TMPL_VAR NAME="booksellerinvoicenumber" --></p>
--- 7,12 ----
  			<h2 class="acquisition">Korb-Info</h2>
  			<p><label class="label100">Korb-Nummer<label> <!-- TMPL_VAR NAME="basketno" --></p>
! 			<p><label class="label100">Managed by<label><!-- TMPL_VAR NAME="authorisedbyname" --></p>
! 			<p><label class="label100">open on<label> <!-- TMPL_VAR NAME="creationdate" --></p>
  			<p><label class="label100">f&uuml;r<label> <!-- TMPL_VAR NAME="booksellerid" --></p>
  			<p><label class="label100">Rechnungsnummer </label><!-- TMPL_VAR NAME="booksellerinvoicenumber" --></p>
***************
*** 28,35 ****
  				<th class="acquisition">Titel</th>
  				<th class="acquisition">Verfasser</th>
! 				<th class="acquisition">EK-Preis</th>
! 				<th class="acquisition doNotPrint">Nettopreis</th>
! 				<th class="acquisition">Menge</th>
! 				<th class="acquisition">Gesamt</th>
  				<th class="acquisition doNotPrint">Etat <a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=aqorderbreakdown.bookfundid,biblioitems.publishercode">[Bestellung]</a></th>
  				<!-- TMPL_IF name="active" -->
--- 28,35 ----
  				<th class="acquisition">Titel</th>
  				<th class="acquisition">Verfasser</th>
! 				<th class="acquisition">rrp</th>
! 				<th class="acquisition doNotPrint">est</th>
! 				<th class="acquisition">Qty</th>
! 				<th class="acquisition">Total</th>
  				<th class="acquisition doNotPrint">Etat <a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=aqorderbreakdown.bookfundid,biblioitems.publishercode">[Bestellung]</a></th>
  				<!-- TMPL_IF name="active" -->
***************
*** 91,100 ****
  		<!-- TMPL_UNLESS name="closedate" -->
  		<div id="bloc25">
! 			<h2 class="acquisition">Weitere Bestellung</h2>
  			<form action="/cgi-bin/koha/acqui/newbasket2.pl" method="post">
  				<input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->">
  				<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
  				<p>von einem vorhandenen Biblio </b><input type="text"  size="25"   name="search"><input type="submit" class="button acquisition" value="Suche"></p>
! 				<p>oder <a href="/cgi-bin/koha/acqui/suggestion-select.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition"> f&uuml;r einen Anschaffungsvorschlag </a> <a href="/cgi-bin/koha/acqui/newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition"> Neuer Biblio </a>
  				</p>
  			</form>
--- 91,105 ----
  		<!-- TMPL_UNLESS name="closedate" -->
  		<div id="bloc25">
! 			<h2 class="acquisition">Add order line</h2>
  			<form action="/cgi-bin/koha/acqui/newbasket2.pl" method="post">
  				<input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->">
  				<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
  				<p>von einem vorhandenen Biblio </b><input type="text"  size="25"   name="search"><input type="submit" class="button acquisition" value="Suche"></p>
! 				<p>oder
! 				 <a href="/cgi-bin/koha/acqui/suggestion-select.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">
! 				  f&uuml;r einen Anschaffungsvorschlag
! 				   </a> <a href="/cgi-bin/koha/acqui/newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">
! 				    Neuer Biblio
! 				     </a>
  				</p>
  			</form>

Index: newbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui/newbiblio.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** newbiblio.tmpl	4 Jun 2005 14:10:26 -0000	1.2
--- newbiblio.tmpl	25 Jun 2005 12:58:53 -0000	1.3
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  <script language="javascript" type="text/javascript">
! 
  <!--
  function update(f){
--- 1,5 ----
  <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  <script language="javascript" type="text/javascript">
! <!-- aktualisiert fuer 2.2.3, hellen 24/06/05 -->
  <!--
  function update(f){
***************
*** 87,90 ****
--- 87,91 ----
  	<!-- /TMPL_LOOP -->
  	<a href="basket.pl?basket=<!-- TMPL_VAR NAME="basket" -->" class="button acquisition">Korb ansehen</a> <h1 class="acquisition">
+ 	<h1 class="acquisition">
  		<!-- TMPL_IF name="ordnum" -->
  			Bestellung bearbeiten (Zeile #<!-- TMPL_VAR NAME="ordnum" -->)
***************
*** 94,98 ****
  		 <!-- TMPL_IF name="suggestionid" -->(bestimmt durch Vorschlag)<!-- /TMPL_IF -->
  	</h1>
! 	Einkaufkorb f&uuml;r <!-- TMPL_VAR NAME="name" -->
  	<div id="bloc25">
  		<h2 class="acquisition">Katalog-Details</h2>
--- 95,99 ----
  		 <!-- TMPL_IF name="suggestionid" -->(bestimmt durch Vorschlag)<!-- /TMPL_IF -->
  	</h1>
! 	Shopping Basket For <!-- TMPL_VAR NAME="name" -->
  	<div id="bloc25">
  		<h2 class="acquisition">Katalog-Details</h2>
***************
*** 142,146 ****
  		</p>
  		<p>
! 			<label class="label100">Serie</label>
  			<!-- TMPL_IF name="biblio" -->
  				<input type="hidden" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->"><!-- TMPL_VAR NAME="seriestitle" -->
--- 143,147 ----
  		</p>
  		<p>
! 			<label class="label100">Serien</label>
  			<!-- TMPL_IF name="biblio" -->
  				<input type="hidden" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->"><!-- TMPL_VAR NAME="seriestitle" -->
***************
*** 181,185 ****
  		</p>
  		<p>
! 			<label class="label100"><b>GESAMTSUMME</b></label>
  			<input type="text" size="20" name="total" value="" onchange="update(this.form)">
  		</p>
--- 182,186 ----
  		</p>
  		<p>
! 			<label class="label100"><b>BUDGETED TOTAL</b></label>
  			<input type="text" size="20" name="total" value="" onchange="update(this.form)">
  		</p>




From hellen at users.sourceforge.net  Sat Jun 25 14:58:56 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/help/members memberentry.tmpl,1.1,1.2
Message-ID: <E1DmAFM-0007yG-8t@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/help/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30254/koha-tmpl/intranet-tmpl/default/de/help/members

Modified Files:
	memberentry.tmpl 
Log Message:
adjustments for 2.2.3

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/help/members/memberentry.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** memberentry.tmpl	12 May 2005 19:26:15 -0000	1.1
--- memberentry.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE name="help-top.inc" -->
! <h1>Hilfe f&uuml;r Benutzer hinzuf&uuml;gen</h1>
! <h2>Benutzer hinzuf&uuml;gen, Person</h2>
  <p>This is the form for adding a new single member to the database. There is also a form for organisations, such as other libraries and non profit organisations you might lend to. You should use the Add Organisation tab at the top of the Member page for that.</p>
  <p>Every field with an asterisk must be filled out, or you will get an error, and the record will not be added to the database.</p>
--- 1,8 ----
  <!-- TMPL_INCLUDE name="help-top.inc" -->
! <h1>Hilfe: Benutzer hinzuf&uuml;gen</h1>
! 
! <p>sort1 and sort2 may now be related to a list of Authorized Values. All you have to do is define a Bsort1 or Bsort2 category of authorised values and enter the desired values into these categories. You will then be able to use them through Add/Modify Member Page</p>
! 
! <h2>Add Member, person</h2>
  <p>This is the form for adding a new single member to the database. There is also a form for organisations, such as other libraries and non profit organisations you might lend to. You should use the Add Organisation tab at the top of the Member page for that.</p>
  <p>Every field with an asterisk must be filled out, or you will get an error, and the record will not be added to the database.</p>
***************
*** 8,12 ****
  <p>The clear all Fields button will reset the page to a blank form in case you made a mistake.</p>
  
! <h2>Benutzer hinzuf&uuml;gen, Institution</h2>
  <p>This is the form for adding a group of members. Suppose you had a YMCA group, or lend books to other Libraries. This would be the form to use for that purpose.</p>
  <p>Every field with an asterisk must be filled out, or you will get an error, and the record will not be added to the database.</p>
--- 11,15 ----
  <p>The clear all Fields button will reset the page to a blank form in case you made a mistake.</p>
  
! <h2>Add Member, Institutional</h2>
  <p>This is the form for adding a group of members. Suppose you had a YMCA group, or lend books to other Libraries. This would be the form to use for that purpose.</p>
  <p>Every field with an asterisk must be filled out, or you will get an error, and the record will not be added to the database.</p>




From hellen at users.sourceforge.net  Sat Jun 25 14:58:57 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:57 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/parameters marc_subfields_structure.tmpl,1.1,1.2 marctagstructure.tmpl,1.1,1.2 printers.tmpl,1.1,1.2 systempreferences.tmpl,1.1,1.2 z3950servers.tmpl,1.1,1.2
Message-ID: <E1DmAFN-0007z9-GB@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30254/koha-tmpl/intranet-tmpl/default/de/parameters

Modified Files:
	marc_subfields_structure.tmpl marctagstructure.tmpl 
	printers.tmpl systempreferences.tmpl z3950servers.tmpl 
Log Message:
adjustments for 2.2.3

Index: marc_subfields_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/marc_subfields_structure.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** marc_subfields_structure.tmpl	12 May 2005 19:26:35 -0000	1.1
--- marc_subfields_structure.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 20,24 ****
  			<ul>
  				<p>
! 					<!-- TMPL_VAR NAME="repeatable" --> repeatable  <!-- TMPL_VAR NAME="mandatory" --> mandatory
  				</p>
  				<!-- TMPL_IF name="frameworkcode" -->
--- 20,25 ----
  			<ul>
  				<p>
! 					<!-- TMPL_VAR NAME="repeatable" --> repeatable 
! 					<!-- TMPL_VAR NAME="mandatory" --> mandatory
  				</p>
  				<!-- TMPL_IF name="frameworkcode" -->
***************
*** 41,48 ****
  				<p><!-- TMPL_VAR NAME="isurl" --> URL (if checked, it means that the subfield is an URL and can be clicked</p>
  				<p>
! 					<label>Auth value:</label> <!-- TMPL_VAR NAME="authorised_value" --> oder Thesaurus: <!-- TMPL_VAR NAME="authtypes" --> oder Plugin: <!-- TMPL_VAR NAME="value_builder" -->
  				</p>
  				<p>
! 					<label>&nbsp;</label>Link to field :  <input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5"> (exemple :200b)
  				</p>
  			</ul>
--- 42,52 ----
  				<p><!-- TMPL_VAR NAME="isurl" --> URL (if checked, it means that the subfield is an URL and can be clicked</p>
  				<p>
! 					<label>Auth value:</label> <!-- TMPL_VAR NAME="authorised_value" -->
! 					or thesaurus: <!-- TMPL_VAR NAME="authtypes" -->
! 					or plugin: <!-- TMPL_VAR NAME="value_builder" -->
  				</p>
  				<p>
! 					<label>&nbsp;</label>Link to field :
! 					<input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5"> (exemple :200b)
  				</p>
  			</ul>
***************
*** 63,67 ****
  	</tr>
  	<tr><td>&nbsp;</td><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
! 	<tr><td colspan="2" align="center">L&ouml;schen best&auml;tigen</td></tr>
  	<tr>
  		<td>
--- 67,71 ----
  	</tr>
  	<tr><td>&nbsp;</td><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
! 	<tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>
  	<tr>
  		<td>
***************
*** 72,76 ****
  				<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->">
  				<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
! 				<input type="submit" value="JA">
  			</form>
  		</td>
--- 76,80 ----
  				<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->">
  				<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
! 				<input type="submit" value="YES">
  			</form>
  		</td>
***************
*** 81,85 ****
  				<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->">
  				<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
! 				<input type="submit" value="NEIN">
  			</form>
  		</td>
--- 85,89 ----
  				<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->">
  				<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
! 				<input type="submit" value="NO">
  			</form>
  		</td>
***************
*** 89,93 ****
  <!-- TMPL_IF NAME="delete_confirmed" -->
  <!-- ------------------------------------------------------------------------ -->
! 	Daten gel&ouml;scht
  	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
  	<input type="submit" value="OK">
--- 93,97 ----
  <!-- TMPL_IF NAME="delete_confirmed" -->
  <!-- ------------------------------------------------------------------------ -->
! 	Data deleted
  	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
  	<input type="submit" value="OK">
***************
*** 104,110 ****
  <tr>
  	<th>Subfield</th>
! 	<th>Texte</th>
  	<th>Constraints</th>
! 	<th>L&ouml;schen</th>
  <!-- TMPL_LOOP NAME="loop" -->
  <tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
--- 108,114 ----
  <tr>
  	<th>Subfield</th>
! 	<th>Text</th>
  	<th>Constraints</th>
! 	<th>Delete</th>
  <!-- TMPL_LOOP NAME="loop" -->
  <tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
***************
*** 122,131 ****
  		<!-- TMPL_ELSE -->
  			Tab :<!-- TMPL_VAR NAME="tab" -->,
! 			<!-- TMPL_IF NAME="kohafield" -->Koha-Feld : <!-- TMPL_VAR NAME="kohafield" -->, <!--/TMPL_IF -->
! 			<!-- TMPL_IF NAME="repeatable" -->Wiederholbar, <!-- TMPL_ELSE -->Nicht wiederholbar<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="mandatory" -->Obligatorisch, <!-- TMPL_ELSE -->Nicht obligatorisch,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="seealso" -->siehe auch: <!-- TMPL_VAR NAME="seealso" --><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="hidden" -->versteckt<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="isurl" -->ist ein URL<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="authorised_value" --> Auth value :<!-- TMPL_VAR NAME="authorised_value" -->,<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="authtypecode" --> Authority :<!-- TMPL_VAR NAME="authtypecode" -->,<!-- /TMPL_IF -->
--- 126,135 ----
  		<!-- TMPL_ELSE -->
  			Tab :<!-- TMPL_VAR NAME="tab" -->,
! 			<!-- TMPL_IF NAME="kohafield" -->Koha field : <!-- TMPL_VAR NAME="kohafield" -->, <!--/TMPL_IF -->
! 			<!-- TMPL_IF NAME="repeatable" -->Repeatable, <!-- TMPL_ELSE -->Not repeatable,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="mandatory" -->Mandatory, <!-- TMPL_ELSE -->Not mandatory,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="seealso" -->see also : <!-- TMPL_VAR NAME="seealso" -->,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="hidden" -->hidden,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="isurl" -->is an url,<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="authorised_value" --> Auth value :<!-- TMPL_VAR NAME="authorised_value" -->,<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="authtypecode" --> Authority :<!-- TMPL_VAR NAME="authtypecode" -->,<!-- /TMPL_IF -->
***************
*** 143,147 ****
  </a>
  <!-- TMPL_IF NAME="previous" -->
! 	<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="vorheriges" alt="vorheriges" border="0">
  	</a><!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="next" -->
--- 147,151 ----
  </a>
  <!-- TMPL_IF NAME="previous" -->
! 	<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0" >
  	</a><!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="next" -->

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/marctagstructure.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** marctagstructure.tmpl	12 May 2005 19:26:35 -0000	1.1
--- marctagstructure.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 116,120 ****
  <!-- TMPL_IF NAME="else" -->
  <div id="bloc25">
! <h2 class="parameters">Framework ausw%auml;hlen</h2>
  <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<select name="frameworkcode">
--- 116,120 ----
  <!-- TMPL_IF NAME="else" -->
  <div id="bloc25">
! <h2 class="parameters">Framework ausw&auml;hlen</h2>
  <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<select name="frameworkcode">

Index: printers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/printers.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** printers.tmpl	12 May 2005 19:26:35 -0000	1.1
--- printers.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 43,47 ****
  					var alertString2;
  					if (f.printername.value.length==0) {
! 							_alertString += "\n- " + _("Druckername fehlt ");
  					}
  					if (f.printqueue.value.length==0) {
--- 43,47 ----
  					var alertString2;
  					if (f.printername.value.length==0) {
! 							_alertString += "\n- " + _("Druckername fehlt");
  					}
  					if (f.printqueue.value.length==0) {
***************
*** 51,55 ****
  							document.Aform.submit();
  					} else {
! 							alertString2  = _("Form not submitted because of the following problem(s)");
  							alertString2 += "\n------------------------------------------------------------------------------------\n";
  							alertString2 += _alertString;
--- 51,55 ----
  							document.Aform.submit();
  					} else {
! 							alertString2  = _("Form wird nicht unterstuetzt wegen der folgenden Probleme");
  							alertString2 += "\n------------------------------------------------------------------------------------\n";
  							alertString2 += _alertString;
***************
*** 60,64 ****
  	<div id="bloc25">
  		<!-- TMPL_IF NAME="searchfield" -->
! 			<h2 class="parameters">Drucker bearbeiten</h2>
  		<!-- TMPL_ELSE -->
  			<h2 class="parameters">Drucker hinzuf&uuml;gen</h2>
--- 60,64 ----
  	<div id="bloc25">
  		<!-- TMPL_IF NAME="searchfield" -->
! 			<h2 class="parameters">Drucker &auml;ndern</h2>
  		<!-- TMPL_ELSE -->
  			<h2 class="parameters">Drucker hinzuf&uuml;gen</h2>
***************
*** 80,84 ****
  	
  	<!-- TMPL_IF NAME="add_validate" -->
! 		Daten gespeichert
  			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  			<input type="submit" value="OK" class="button">
--- 80,84 ----
  	
  	<!-- TMPL_IF NAME="add_validate" -->
! 		Daten hinzugef&uuml;gt
  			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  			<input type="submit" value="OK" class="button">
***************
*** 106,110 ****
  			</tr>
  				<tr>
! 				<td colspan="2" align="center">L&ouml;schen best&auml;tigen</td>
  			</tr>
  				<tr>
--- 106,110 ----
  			</tr>
  				<tr>
! 				<td colspan="2" align="center">L&Ouml;SCHUNG BEST&Auml;TIGEN</td>
  			</tr>
  				<tr>
***************
*** 132,140 ****
  			<form action="<!-- TMPL_VAR NAME="script_name">" method="post">
  					<input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 					<input type="reset" name="reset" value="l&ouml;schen">
  			</form>
  	
  		<!-- TMPL_IF NAME="searchfield" -->
! 			You searched for <b><!-- TMPL_VAR NAME="searchfield" --></b>
  		<!-- /TMPL_IF -->
  	
--- 132,140 ----
  			<form action="<!-- TMPL_VAR NAME="script_name">" method="post">
  					<input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 					<input type="reset" name="reset" value="clr">
  			</form>
  	
  		<!-- TMPL_IF NAME="searchfield" -->
! 			Sie suchten nach <b><!-- TMPL_VAR NAME="searchfield" --></b>
  		<!-- /TMPL_IF -->
  	
***************
*** 153,157 ****
  				<td><!-- TMPL_VAR NAME="printtype" --></td>
  				<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->" class="button">Bearbeiten</a></td>
! 							<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->" class="button">L&ouml;schen</a></td>
  			</tr>
  			<!-- /TMPL_LOOP -->
--- 153,157 ----
  				<td><!-- TMPL_VAR NAME="printtype" --></td>
  				<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->" class="button">Bearbeiten</a></td>
! 				<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->" class="button">L&ouml;schen</a></td>
  			</tr>
  			<!-- /TMPL_LOOP -->
***************
*** 162,166 ****
  		
  		<!-- TMPL_IF NAME="offsetgtzero" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Prev</a>
  		<!-- /TMPL_IF -->
  	
--- 162,166 ----
  		
  		<!-- TMPL_IF NAME="offsetgtzero" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Vorherige</a>
  		<!-- /TMPL_IF -->
  	
***************
*** 168,176 ****
  	
  		<!-- TMPL_IF NAME="ltcount" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">N&auml;chster &gt;&gt;</a>	
  		<!-- /TMPL_iF -->
  	
  			<br>
! 		<input type="submit" class="button" value="Drucker hinzuf&uuml;gen" alt="Drucker hinzuf&uuml;gen">
  		<br>
  			</form>
--- 168,176 ----
  	
  		<!-- TMPL_IF NAME="ltcount" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">N&auml;chste &gt;&gt;</a>	
  		<!-- /TMPL_iF -->
  	
  			<br>
! 		<input type="submit" class="button" value="Drucker hinzuf&uuml;gen" alt="Add printer">
  		<br>
  			</form>

Index: systempreferences.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/systempreferences.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** systempreferences.tmpl	12 May 2005 19:26:35 -0000	1.1
--- systempreferences.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 40,52 ****
  			var alertString2;
  			if (f.variable.value.length==0) {
! 				_alertString += "\n- " + _("variable missing");
  			}
  			if (f.value.value.length==0) {
! 				_alertString += "\n- " + _("value missing");
  			}
  			if (_alertString.length==0) {
  				document.Aform.submit();
  			} else {
! 				alertString2  = _("Form not submitted because of the following problem(s)");
  				alertString2 += "\n------------------------------------------------------------------------------------\n";
  				alertString2 += _alertString;
--- 40,52 ----
  			var alertString2;
  			if (f.variable.value.length==0) {
! 				_alertString += "\n- " + _("Variable fehlt");
  			}
  			if (f.value.value.length==0) {
! 				_alertString += "\n- " + _("Wert fehlt");
  			}
  			if (_alertString.length==0) {
  				document.Aform.submit();
  			} else {
! 				alertString2  = _("Daten wegen der folgenden Probleme nicht gespeichert");
  				alertString2 += "\n------------------------------------------------------------------------------------\n";
  				alertString2 += _alertString;
***************
*** 89,93 ****
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF NAME="type-yesno" -->
! 					<input type="radio" name="value" value="1"<!-- TMPL_IF NAME="value-yes" --> checked<!-- /TMPL_IF -->>Ja <input type="radio" name="value" value="0"<!-- TMPL_IF NAME="value-no" --> checked<!-- /TMPL_IF -->>Nein
  				<!-- /TMPL_IF -->
  	
--- 89,94 ----
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF NAME="type-yesno" -->
! 					<input type="radio" name="value" value="1"<!-- TMPL_IF NAME="value-yes" --> checked<!-- /TMPL_IF -->>Ja 
! 					<input type="radio" name="value" value="0"<!-- TMPL_IF NAME="value-no" --> checked<!-- /TMPL_IF -->>Nein
  				<!-- /TMPL_IF -->
  	

Index: z3950servers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/z3950servers.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** z3950servers.tmpl	12 May 2005 19:26:35 -0000	1.1
--- z3950servers.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 64,68 ****
  							document.Aform.submit();
  					} else {
! 							alertString2  = _("Form not submitted because of the following problem(s)");
  							alertString2 += "\n------------------------------------------------------------------------------------\n";
  							alertString2 += _alertString;
--- 64,68 ----
  							document.Aform.submit();
  					} else {
! 							alertString2  = _("Daten wegen der folgenden Probleme nicht gespeichert");
  							alertString2 += "\n------------------------------------------------------------------------------------\n";
  							alertString2 += _alertString;
***************
*** 191,195 ****
  	
  	<!-- TMPL_IF NAME="else" -->
! 			<h1 class="parameters">Admin Z39.50 Server</h1>
  			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  				<input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
--- 191,195 ----
  	
  	<!-- TMPL_IF NAME="else" -->
! 			<h1 class="parameters">Administration Z39.50 Server</h1>
  			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  				<input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
***************
*** 197,201 ****
  			</form>
  			<!-- TMPL_IF NAME="searchfield" -->
! 				You searched for <b><!-- TMPL_VAR NAME="searchfield" --></b>
  			<!-- /TMPL_IF -->
  			<table>
--- 197,201 ----
  			</form>
  			<!-- TMPL_IF NAME="searchfield" -->
! 				Sie suchten nach <b><!-- TMPL_VAR NAME="searchfield" --></b>
  			<!-- /TMPL_IF -->
  			<table>




From hellen at users.sourceforge.net  Sat Jun 25 14:58:57 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:57 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/reports borrowers_out.tmpl,1.1,1.2
Message-ID: <E1DmAFN-0007yy-0a@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/reports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30254/koha-tmpl/intranet-tmpl/default/de/reports

Modified Files:
	borrowers_out.tmpl 
Log Message:
adjustments for 2.2.3

Index: borrowers_out.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/reports/borrowers_out.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** borrowers_out.tmpl	12 May 2005 19:26:35 -0000	1.1
--- borrowers_out.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 1,3 ****
--- 1,4 ----
  <!-- TMPL_INCLUDE NAME="reportswcal-top.inc" -->
+ <!-- angepasst fuer 2.2.3, hellen 24/06/05 -->
  <div id="mainbloc" >
  
***************
*** 80,84 ****
  		<input type="radio" checked name="output" value="screen" > In ein Browserfenster
  		<br>
! 		<input type="radio" name="output" value="file"> In eine Datei <input type="text" name="basename" value="Export"> In eine Anwendung <!-- TMPL_VAR NAME="CGIextChoice" --> <!-- TMPL_VAR NAME="CGIsepChoice" -->
  	</p>
  	</div>
--- 81,87 ----
  		<input type="radio" checked name="output" value="screen" > In ein Browserfenster
  		<br>
! 		<input type="radio" name="output" value="file"> In eine Datei <input type="text" name="basename" value="Export"> In eine Anwendung
! 		<!-- TMPL_VAR NAME="CGIextChoice" -->
! 		<!-- TMPL_VAR NAME="CGIsepChoice" -->
  	</p>
  	</div>




From hellen at users.sourceforge.net  Sat Jun 25 14:58:56 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/includes acquisitions-top.inc,1.1,1.2 common-style.css,1.1,1.2 marc-top.inc,1.1,1.2
Message-ID: <E1DmAFM-0007ye-MX@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30254/koha-tmpl/intranet-tmpl/default/de/includes

Modified Files:
	acquisitions-top.inc common-style.css marc-top.inc 
Log Message:
adjustments for 2.2.3

Index: acquisitions-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/includes/acquisitions-top.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** acquisitions-top.inc	12 May 2005 19:26:16 -0000	1.1
--- acquisitions-top.inc	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 34,38 ****
  <div id="menubar">
  	<span class="koha"><a class="home" href="/cgi-bin/koha/mainpage.pl">Koha</a></span>
! 	<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Erwerbung</a> <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Katalog</a> <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Ausleihe</a> <a class="members" href="/cgi-bin/koha/members/members-home.pl">Benutzer</a> <a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> <a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a> <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameter</a> <a class="about" href="/cgi-bin/koha/about.pl">&Uuml;ber</a> <a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Hilfe</a>
  </div>
  <!-- TMPL_IF NAME="loggedinusername" -->
--- 34,46 ----
  <div id="menubar">
  	<span class="koha"><a class="home" href="/cgi-bin/koha/mainpage.pl">Koha</a></span>
! 	<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Erwerbung</a> 
! 	<a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Katalog</a>
! 	<a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Ausleihe</a> 
! 	<a class="members" href="/cgi-bin/koha/members/members-home.pl">Benutzer</a> 
! 	<a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> 
! 	<a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a> 
! 	<a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameter</a> 
! 	<a class="about" href="/cgi-bin/koha/about.pl">&Uuml;ber</a> 
! 	<a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Hilfe</a>
  </div>
  <!-- TMPL_IF NAME="loggedinusername" -->

Index: common-style.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/includes/common-style.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** common-style.css	12 May 2005 19:26:16 -0000	1.1
--- common-style.css	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 75,79 ****
  	border:0px;
  	border-collapse:collapse;
- 	font-size:10pt;
  	margin : auto;
  }
--- 75,78 ----

Index: marc-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/includes/marc-top.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** marc-top.inc	12 May 2005 19:26:16 -0000	1.1
--- marc-top.inc	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 43,51 ****
  	<div id="menubar">
  		<span class="koha"><a class="home" href="/cgi-bin/koha/mainpage.pl">Koha</a></span>
! 		<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Erwerbung</a> <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Katalog</a> <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Ausleihe</a> <a class="members" href="/cgi-bin/koha/members/members-home.pl">Benutzer</a> <a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> <a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a> <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameter</a> <a class="about" href="/cgi-bin/koha/about.pl">&Uuml;ber</a> <a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Hilfe</a>
  	</div>
  	<div id="submenu">
  		<span class="koha">Optionen &gt;&gt;&nbsp;&nbsp;</span>
! 		<a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&amp;type=intranet" class="submenu2">Suche</a> <a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&amp;type=intranet" class="submenu">Biblio hinzuf&uuml;gen</a> <a class="submenu2" href="/cgi-bin/koha/bull-home.pl">Serie</a> <a href="/cgi-bin/koha/bookshelves/shelves.pl" class="submenu">Virtuelle Regale</a>
  	</div>
  <!-- /TMPL_UNLESS -->
--- 43,62 ----
  	<div id="menubar">
  		<span class="koha"><a class="home" href="/cgi-bin/koha/mainpage.pl">Koha</a></span>
! 		<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Erwerbung</a> 
! 		<a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Katalog</a> 
! 		<a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Ausleihe</a> 
! 		<a class="members" href="/cgi-bin/koha/members/members-home.pl">Benutzer</a> 
! 		<a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> 
! 		<a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a> 
! 		<a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameter</a> 
! 		<a class="about" href="/cgi-bin/koha/about.pl">&Uuml;ber</a> 
! 		<a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Hilfe</a>
  	</div>
  	<div id="submenu">
  		<span class="koha">Optionen &gt;&gt;&nbsp;&nbsp;</span>
! 		<a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&amp;type=intranet" class="submenu2">Suche</a> 
! 		<a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&amp;type=intranet" class="submenu">Biblio hinzuf&uuml;gen</a> 
! 		<a class="submenu2" href="/cgi-bin/koha/bull-home.pl">Serie</a> 
! 		<a href="/cgi-bin/koha/bookshelves/shelves.pl" class="submenu">Virtuelle Regale</a>
  	</div>
  <!-- /TMPL_UNLESS -->




From hellen at users.sourceforge.net  Sat Jun 25 14:58:56 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/members member.tmpl,1.1,1.2 memberentry.tmpl,1.1,1.2 pay.tmpl,1.1,1.2
Message-ID: <E1DmAFM-0007yn-T6@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30254/koha-tmpl/intranet-tmpl/default/de/members

Modified Files:
	member.tmpl memberentry.tmpl pay.tmpl 
Log Message:
adjustments for 2.2.3

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/members/member.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** member.tmpl	12 May 2005 19:26:35 -0000	1.1
--- member.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 2,10 ****
  <div id="mainbloc">
  <h1>Benutzersuche</h1>
! 
  <div class="bloc100">
  	<div class="bloctitle">Suche nach</div>
  	<form action="/cgi-bin/koha/members/member.pl" method="post">
! 		<input type="text" name="member" value="<!-- TMPL_VAR NAME="member" -->">  order by 
  		<select name="orderby">
  			<option value="surname,firstname">Nachname</option>
--- 2,11 ----
  <div id="mainbloc">
  <h1>Benutzersuche</h1>
! <!-- angepasst fuer 2.2.3, hellen 24/06/05 -->
  <div class="bloc100">
  	<div class="bloctitle">Suche nach</div>
  	<form action="/cgi-bin/koha/members/member.pl" method="post">
! 		<input type="text" name="member" value="<!-- TMPL_VAR NAME="member" -->">
! 		  order by 
  		<select name="orderby">
  			<option value="surname,firstname">Nachname</option>
***************
*** 47,51 ****
  	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
  	<input type="submit" class="button" value="Benutzer hinzuf&uuml;gen" title="Benutzer hinzuf&uuml;gen" alt="Benutzer hinzuf&uuml;gen">
! 	<input type="radio" name="categorycode" value="" checked>Erwachsener <input type="radio" name="categorycode" value="I" >Organisation
  	<input type="hidden" name="actionType" value="Add">
  	</form>
--- 48,53 ----
  	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
  	<input type="submit" class="button" value="Benutzer hinzuf&uuml;gen" title="Benutzer hinzuf&uuml;gen" alt="Benutzer hinzuf&uuml;gen">
! 	<input type="radio" name="categorycode" value="" checked>Erwachsener
! 	<input type="radio" name="categorycode" value="I" >Organisation
  	<input type="hidden" name="actionType" value="Add">
  	</form>

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/members/memberentry.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** memberentry.tmpl	12 May 2005 19:26:35 -0000	1.1
--- memberentry.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 1,4 ****
  <!-- TMPL_INCLUDE NAME="members-top.inc" -->
! 
  <div id="mainbloc">
  	<!-- TMPL_IF NAME="addAction" -->
--- 1,4 ----
  <!-- TMPL_INCLUDE NAME="members-top.inc" -->
! <!-- angepasst fuer 2.2.3, hellen 24/06/05 -->
  <div id="mainbloc">
  	<!-- TMPL_IF NAME="addAction" -->
***************
*** 102,106 ****
  				<td colspan="2">
  				<!-- TMPL_UNLESS name="institution" -->
! 					<input type="radio" name="sex" value="F"<!-- TMPL_IF NAME="female" --> checked<!-- /TMPL_IF -->>F  <input type="radio" name="sex" value="M"<!-- TMPL_UNLESS name="female" --> checked<!-- /TMPL_UNLESS -->> M
  				<!-- /TMPL_UNLESS -->
  
--- 102,109 ----
  				<td colspan="2">
  				<!-- TMPL_UNLESS name="institution" -->
! 					<input type="radio" name="sex" value="F"<!-- TMPL_IF NAME="female" --> checked<!-- /TMPL_IF -->>F  
! 					<input type="radio" name="sex" value="M"<!-- TMPL_UNLESS NAME="female" --> checked<!-- /TMPL_UNLESS -->>M  
! 					
! 
  				<!-- /TMPL_UNLESS -->
  
***************
*** 248,252 ****
  				<tr>
  					<td colspan="2"><!-- TMPL_VAR NAME="html" --></td>
! 					<td colspan="3"><input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR NAME="yes" -->>Ja <input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="0" <!-- TMPL_VAR NAME="no" -->>Nein
  					</td>
  				</tr>
--- 251,256 ----
  				<tr>
  					<td colspan="2"><!-- TMPL_VAR NAME="html" --></td>
! 					<td colspan="3"><input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR NAME="yes" -->>Ja 
! 					<input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="0" <!-- TMPL_VAR NAME="no" -->>Nein
  					</td>
  				</tr>

Index: pay.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/members/pay.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** pay.tmpl	12 May 2005 19:26:35 -0000	1.1
--- pay.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 1,3 ****
--- 1,4 ----
  <!-- TMPL_INCLUDE NAME="members-top.inc" -->
+ <!-- angepasst fuer 2.2.3, hellen 24/06/05 -->
  <div id="mainbloc">
  <h1>Zahlung Mahngeb&uuml;hren f&uuml;r <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
***************
*** 12,16 ****
  <!-- TMPL_LOOP NAME="loop_pay" -->
  <tr valign="top">
! 	<td><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->"><input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="no" checked="checked">Unpaid  <input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="yes">Pay  <input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="wo">Writeoff
  	<input type="hidden" name="itemnumber<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="itemnumber" -->">
  	<input type="hidden" name="accounttype<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="accounttype" -->">
--- 13,19 ----
  <!-- TMPL_LOOP NAME="loop_pay" -->
  <tr valign="top">
! 	<td><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->"><input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="no" checked="checked">Unbezahlt
! 	<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="yes">Zahlen 
! 	<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="wo">Abschreiben
  	<input type="hidden" name="itemnumber<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="itemnumber" -->">
  	<input type="hidden" name="accounttype<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="accounttype" -->">




From hellen at users.sourceforge.net  Sat Jun 25 14:58:56 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/circ branchtransfers.tmpl,1.2,1.3 circulation.tmpl,1.2,1.3 selectbranchprinter.tmpl,1.2,1.3
Message-ID: <E1DmAFM-0007yL-CY@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30254/koha-tmpl/intranet-tmpl/default/de/circ

Modified Files:
	branchtransfers.tmpl circulation.tmpl selectbranchprinter.tmpl 
Log Message:
adjustments for 2.2.3

Index: branchtransfers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/circ/branchtransfers.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** branchtransfers.tmpl	17 May 2005 13:21:35 -0000	1.2
--- branchtransfers.tmpl	25 Jun 2005 12:58:53 -0000	1.3
***************
*** 6,10 ****
  
  <h1>Ausleihe: Leihverkehr</h1>
! <b>Zweigstelle:</b> <!-- TMPL_VAR NAME="genbrname" --> &nbsp; <b>Drucker:</b> <!-- TMPL_VAR NAME="genprname" --> <a href="selectbranchprinter.pl" class="button">Einstellungen &auml;ndern</a>
  <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
  <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
--- 6,12 ----
  
  <h1>Ausleihe: Leihverkehr</h1>
! <b>Zweigstelle:</b> <!-- TMPL_VAR NAME="genbrname" --> &nbsp;
!  <b>Drucker:</b> <!-- TMPL_VAR NAME="genprname" -->
!  <a href="selectbranchprinter.pl" class="button">Einstellungen &auml;ndern</a>
  <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
  <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/circ/circulation.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** circulation.tmpl	17 May 2005 13:21:35 -0000	1.2
--- circulation.tmpl	25 Jun 2005 12:58:53 -0000	1.3
***************
*** 11,15 ****
  		<h2 class="circulation">Parameter</h2>
  		<p>
! 			<b>Zweigstelle:</b> <!-- TMPL_VAR NAME="branchname" --> &nbsp; <b>Drucker:</b> <!-- TMPL_VAR NAME="printername" --> <a href="selectbranchprinter.pl" class="button circulation">Einstellungen &auml;ndern</a>
  		</p>
  	
--- 11,16 ----
  		<h2 class="circulation">Parameter</h2>
  		<p>
! 			<b>Zweigstelle:</b> <!-- TMPL_VAR NAME="branchname" --> &nbsp; 
! 			<b>Drucker:</b> <!-- TMPL_VAR NAME="printername" --> <a href="selectbranchprinter.pl" class="button circulation">Einstellungen &auml;ndern</a>
  		</p>
  	

Index: selectbranchprinter.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/circ/selectbranchprinter.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** selectbranchprinter.tmpl	17 May 2005 13:21:35 -0000	1.2
--- selectbranchprinter.tmpl	25 Jun 2005 12:58:53 -0000	1.3
***************
*** 30,34 ****
  <!-- /TMPL_IF --></p>
  <p><input type="hidden" name="setcookies" value="1">
! <input value="Abschicken" type="changesettings" class="button"></p>
  </form>
  
--- 30,34 ----
  <!-- /TMPL_IF --></p>
  <p><input type="hidden" name="setcookies" value="1">
! <input type="submit" value="Abschicken" type="changesettings" class="button"></p>
  </form>
  




From shedges at users.sourceforge.net  Mon Jun 27 02:47:44 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Sun, 26 Jun 2005 17:47:44 -0700
Subject: [Koha-cvs] CVS: koha-doc codingguidelines.xml,1.1,1.2
Message-ID: <E1Dmhmq-0006gG-DC@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25672

Modified Files:
	codingguidelines.xml 
Log Message:
Added warning about TMPL_IF inside html tags

Index: codingguidelines.xml
===================================================================
RCS file: /cvsroot/koha/koha-doc/codingguidelines.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** codingguidelines.xml	13 Jun 2005 11:08:51 -0000	1.1
--- codingguidelines.xml	27 Jun 2005 00:47:42 -0000	1.2
***************
*** 159,162 ****
--- 159,173 ----
  }</programlisting>
  
+         <para>Be aware that Koha's translation tool cannot handle
+         <userinput>&lt;!-- TMPL_IF --&gt;</userinput> inside a standard HTML
+         tag, like:<programlisting>&lt;td &lt;!-- tmpl_if name="x"&gt;class="x"&lt;!-- /TMPL_IF --&gt;&gt; or
+ &lt;input ... &lt;!-- tmpl_if name="y" --&gt; checked&lt;!-- /TMPL_IF --&gt;&gt;</programlisting></para>
+ 
+         <para>PLEASE always write:<programlisting>&lt;!-- TMPL_IF name="y" --&gt;
+     &lt;input ... checked&gt;
+ &lt;!-- TMPL_ELSE --&gt;
+     &lt;input ...&gt;
+ &lt;!-- /TMPL_IF --&gt;</programlisting></para>
+ 
          <para>Note that some scripts use two different templates, depending on
          what the user wants to do. This is sometimes a mistake in Koha design,




From tipaul at users.sourceforge.net  Mon Jun 27 15:11:24 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 27 Jun 2005 06:11:24 -0700
Subject: [Koha-cvs] CVS: koha/misc/zebra/unimarc - New directory
Message-ID: <E1DmtOW-0002JJ-2M@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/zebra/unimarc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8833/misc/zebra/unimarc

Log Message:
Directory /cvsroot/koha/koha/misc/zebra/unimarc added to the repository





From tipaul at users.sourceforge.net  Mon Jun 27 15:11:12 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 27 Jun 2005 06:11:12 -0700
Subject: [Koha-cvs] CVS: koha/misc/zebra - New directory
Message-ID: <E1DmtOK-0002H4-97@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/zebra
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8723/misc/zebra

Log Message:
Directory /cvsroot/koha/koha/misc/zebra added to the repository





From tipaul at users.sourceforge.net  Mon Jun 27 15:13:20 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 27 Jun 2005 06:13:20 -0700
Subject: [Koha-cvs] CVS: koha/misc/zebra/unimarc explain.att,NONE,1.1 unimarc.abs,NONE,1.1 unimarc.mar,NONE,1.1 unimarc.tag,NONE,1.1 zebra.cfg,NONE,1.1
Message-ID: <E1DmtQO-0002Yd-Uf@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/zebra/unimarc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9796

Added Files:
	explain.att unimarc.abs unimarc.mar unimarc.tag zebra.cfg 
Log Message:
some parameter files for zebra for UNIMARC. Just for testing & sharing purposes for instance.

--- NEW FILE ---
# The Explain Attribute Set
#
# $Id: explain.att,v 1.1 2005/06/27 13:13:17 tipaul Exp $
name explain
reference Exp-1

att 1			ExplainCategory
att 2			HumanStringLanguage
att 3			DatabaseName
att 4			Targetname
att 5			AttributeSetOID
att 6			RecordSyntaxOID
att 7			TagSetOID
att 8			ExtendedServicesOID
att 9			DateAdded
att 10			DateChanged
att 11			DateExpired
att 12			ElementSetName
att 13			ProcessingContext
att 14			ProcessingName
att 15			TermListName
att 16			SchemaOID
att 17			Producer
att 18			Supplier
att 19			Availability
att 20			Proprietary
att 21			UserFee

--- NEW FILE ---
name unimarc
reference Usmarc
attset bib1.att
tagset unimarc.tag

marc unimarc.mar

esetname B @
esetname F @

elm 700            Author                  -
elm 700/?          Author                  -
elm 700/?/a        Author                  !:w

#elm 701            Author                  -
#elm 701/?          Author                  -
#elm 701/?/a        Author                  !:w

elm 200            Title                   -
elm 200/?          Title                   -
elm 200/?/a        Title                   !:w,!:p
elm 200/?/e        Title                   !:w,!:p 

elm 210            Publisher               -
elm 210/?          Publisher               -
elm 210/?/c        Publisher               !:w
elm 210/?/d        Date-of-publication     !:w



--- NEW FILE ---
name unimarc
reference Usmarc

--- NEW FILE ---
# pseudo-tagset for unimarc (bib)

name unimarc
type 4

tag 701 701 string
tag 200 200 string
tag 210 210 string
tag 225 225 string
tag 010 010 string
tag 100 100 string
tag 005 005 generalizedtime
tag 615 615 string
tag 995 995 string



--- NEW FILE ---
# Simple Zebra configuration file that defines
# a database with USMARC records.
# $Id: zebra.cfg,v 1.1 2005/06/27 13:13:17 tipaul Exp $
#
# Where are the config files located?
profilePath: ${srcdir:-.}:${srcdir:-.}/../tab

# Files that describe the attribute sets supported.
attset: bib1.att
attset: explain.att

# Specify record type
recordType: grs.marc.unimarc

# Lock File Area
lockDir: lock

# Temp File area for result sets
setTmpDir: tmp

# Temp File area for index program
keyTmpDir: tmp

# Approx. Memory usage during indexing
memMax: 4




From hellen at users.sourceforge.net  Mon Jun 27 21:24:02 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Mon, 27 Jun 2005 12:24:02 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/includes auth-bottom.inc,1.1,1.2 auth-top.inc,1.1,1.2
Message-ID: <E1DmzD8-0005ap-9b@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21124/koha-tmpl/intranet-tmpl/default/de/includes

Modified Files:
	auth-bottom.inc auth-top.inc 
Log Message:
adjustments for 2.2.3

Index: auth-bottom.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/includes/auth-bottom.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** auth-bottom.inc	12 May 2005 19:26:16 -0000	1.1
--- auth-bottom.inc	27 Jun 2005 19:23:33 -0000	1.2
***************
*** 8,12 ****
  <a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Erwerbung</a> ||
  <a href="/cgi-bin/koha/circ/circulation.pl">Ausleihe</a> ||
! <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> ||
  <a href="/cgi-bin/koha/reports-home.pl">Reports</a> ||
  <a href="/cgi-bin/koha/admin-home.pl">Parameter</a> ||
--- 8,12 ----
  <a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Erwerbung</a> ||
  <a href="/cgi-bin/koha/circ/circulation.pl">Ausleihe</a> ||
! <a href="/cgi-bin/koha/authorities/authorities-home.pl">Autorit&auml;ten</a> ||
  <a href="/cgi-bin/koha/reports-home.pl">Reports</a> ||
  <a href="/cgi-bin/koha/admin-home.pl">Parameter</a> ||

Index: auth-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/includes/auth-top.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** auth-top.inc	12 May 2005 19:26:16 -0000	1.1
--- auth-top.inc	27 Jun 2005 19:23:36 -0000	1.2
***************
*** 3,7 ****
  <html>
  <head>
! <title>KOHA INTRANET: Authorities</title>
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  
--- 3,7 ----
  <html>
  <head>
! <title>KOHA INTRANET: Authorit&auml;ten</title>
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  
***************
*** 17,21 ****
  <script language="JavaScript" type="text/javascript">
  function Help() {
! 	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
  }
  
--- 17,21 ----
  <script language="JavaScript" type="text/javascript">
  function Help() {
! 	newin=window.open("/cgi-bin/koha/help.pl","Koha Hilfe",'width=600,height=600,toolbar=false,scrollbars=yes');
  }
  
***************
*** 74,78 ****
  	</select>
  	<a href="javascript:addauthority()" class="submenu2">
! 		Authority hinzuf&uuml;gen
  	</a>
  </div>
--- 74,78 ----
  	</select>
  	<a href="javascript:addauthority()" class="submenu2">
! 		Autorit&auml;t hinzuf&uuml;gen
  	</a>
  </div>
***************
*** 81,84 ****
      <p align="left">Angemeldet als: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Abmelden</a>]</p>
  <!-- TMPL_ELSE -->
!     <p align="left"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
  <!-- /TMPL_IF -->
--- 81,84 ----
      <p align="left">Angemeldet als: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Abmelden</a>]</p>
  <!-- TMPL_ELSE -->
!     <p align="left"><a href="/cgi-bin/koha/opac-user.pl">Anmelden</a> bei Koha</p>
  <!-- /TMPL_IF -->




From hellen at users.sourceforge.net  Mon Jun 27 21:25:15 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Mon, 27 Jun 2005 12:25:15 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/authorities auth_finder.tmpl,1.1,1.2 authorities-home.tmpl,1.1,1.2 authorities.tmpl,1.2,1.3 detail-biblio-search.tmpl,1.1,1.2 detail.tmpl,1.1,1.2 searchresultlist-auth.tmpl,1.1,1.2 searchresultlist.tmpl,1.1,1.2
Message-ID: <E1DmzEJ-0005jM-GM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21124/koha-tmpl/intranet-tmpl/default/de/authorities

Modified Files:
	auth_finder.tmpl authorities-home.tmpl authorities.tmpl 
	detail-biblio-search.tmpl detail.tmpl 
	searchresultlist-auth.tmpl searchresultlist.tmpl 
Log Message:
adjustments for 2.2.3

Index: auth_finder.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities/auth_finder.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** auth_finder.tmpl	12 May 2005 19:26:14 -0000	1.1
--- auth_finder.tmpl	27 Jun 2005 19:23:28 -0000	1.2
***************
*** 2,6 ****
  <div id="mainbloc">
  
! <h1 class="authority">Authority search</h1>
  
  <form name="f" method="post">
--- 2,6 ----
  <div id="mainbloc">
  
! <h1 class="authority">Autorit&auml;tensuche</h1>
  
  <form name="f" method="post">
***************
*** 11,37 ****
  		<h2 class="authority">Suche nach</h2>
  		<p>
! 			<label class="label100">Authority type</label>
  			<!-- TMPL_VAR NAME="authtypecode" -->
  			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
  		</p>
  		<p>
! 			<label class="label100">Main entry</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->">
  			<input type="hidden" name="marclist" value="mainentry">
  			<input type="hidden" name="and_or" value="and">
  			<input type="hidden" name="excluding" value="">
  			<select name="operator">
! 				<option value="start">start by</option>
! 				<option value="contains">contains</option>
  			</select>
  			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
  		</p>
  		<p>
! 			<label class="label100">Anywhere</label><input type="text" name="value">
  			<input type="hidden" name="marclist" value="">
  			<input type="hidden" name="and_or" value="and">
  			<input type="hidden" name="excluding" value="">
  			<select name="operator">
! 				<option value="contains">contains</option>
! 				<option value="start">start by</option>
  			</select>
  			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
--- 11,37 ----
  		<h2 class="authority">Suche nach</h2>
  		<p>
! 			<label class="label100">Autorit&auml;tstyp</label>
  			<!-- TMPL_VAR NAME="authtypecode" -->
  			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
  		</p>
  		<p>
! 			<label class="label100">Haupteintrag</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->">
  			<input type="hidden" name="marclist" value="mainentry">
  			<input type="hidden" name="and_or" value="and">
  			<input type="hidden" name="excluding" value="">
  			<select name="operator">
! 				<option value="start">starten mit</option>
! 				<option value="contains">enth&auml;lt</option>
  			</select>
  			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
  		</p>
  		<p>
! 			<label class="label100">Irgendwo</label><input type="text" name="value">
  			<input type="hidden" name="marclist" value="">
  			<input type="hidden" name="and_or" value="and">
  			<input type="hidden" name="excluding" value="">
  			<select name="operator">
! 				<option value="contains">enth&auml;lt</option>
! 				<option value="start">starten mit</option>
  			</select>
  			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">

Index: authorities-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities/authorities-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** authorities-home.tmpl	12 May 2005 19:26:14 -0000	1.1
--- authorities-home.tmpl	27 Jun 2005 19:23:31 -0000	1.2
***************
*** 2,6 ****
  <div id="mainbloc">
  
! <h1 class="authority">Authority search</h1>
  
  <form name="f" method="post">
--- 2,6 ----
  <div id="mainbloc">
  
! <h1 class="authority">Autorit&auml;tensuche</h1>
  
  <form name="f" method="post">
***************
*** 19,23 ****
  		</h2>
  		<p>
! 			<label class="label100">Main entry</label>
  			<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
  			<input type="hidden" name="marclist" value="mainentry">
--- 19,23 ----
  		</h2>
  		<p>
! 			<label class="label100">Haupteintrag</label>
  			<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
  			<input type="hidden" name="marclist" value="mainentry">
***************
*** 25,34 ****
  			<input type="hidden" name="excluding" value="">
  			<select name="operator">
! 				<option value="contains">contains</option>
! 				<option value="start">start by</option>
  			</select>
  		</p>
  		<p>
! 			<label class="label100">Anywhere</label>
  			<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
  			<input type="hidden" name="marclist" value="">
--- 25,34 ----
  			<input type="hidden" name="excluding" value="">
  			<select name="operator">
! 				<option value="contains">enth&auml;lt</option>
! 				<option value="start">starten mit</option>
  			</select>
  		</p>
  		<p>
! 			<label class="label100">Irgendwo</label>
  			<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
  			<input type="hidden" name="marclist" value="">
***************
*** 36,41 ****
  			<input type="hidden" name="excluding" value="">
  			<select name="operator">
! 				<option value="contains">contains</option>
! 				<option value="start">start by</option>
  			</select>
  		</p>
--- 36,41 ----
  			<input type="hidden" name="excluding" value="">
  			<select name="operator">
! 				<option value="contains">enth&auml;lt</option>
! 				<option value="start">starten mit</option>
  			</select>
  		</p>

Index: authorities.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities/authorities.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** authorities.tmpl	25 Jun 2005 12:58:53 -0000	1.2
--- authorities.tmpl	27 Jun 2005 19:23:32 -0000	1.3
***************
*** 5,11 ****
  	<form method="post" name="f">
  	<!-- TMPL_IF name="authid" -->
! 		<h1 class="authority">Modify authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
  	<!-- TMPL_ELSE -->
! 		<h1 class="authority">Adding authority (<!-- TMPL_VAR name="authtypetext" -->)</h1>
  	<!-- /TMPL_IF -->
  	<p>
--- 5,11 ----
  	<form method="post" name="f">
  	<!-- TMPL_IF name="authid" -->
! 		<h1 class="authority">Autorit&auml;t &auml;ndern<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
  	<!-- TMPL_ELSE -->
! 		<h1 class="authority">Autorit&auml;t hinzuf&uuml;gen (<!-- TMPL_VAR name="authtypetext" -->)</h1>
  	<!-- /TMPL_IF -->
  	<p>
***************
*** 15,21 ****
  		<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->">
  		<!-- TMPL_IF name="authid" -->
! 			<input type="button" value="Save" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- TMPL_ELSE -->
! 			<input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- /TMPL_IF -->
  	</p>
--- 15,21 ----
  		<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->">
  		<!-- TMPL_IF name="authid" -->
! 			<input type="button" value="Speichern" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- TMPL_ELSE -->
! 			<input type="button" value="Autorit&auml;t hinzuf&uuml;gen" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- /TMPL_IF -->
  	</p>
***************
*** 25,33 ****
  <!-- TMPL_IF name="duplicateauthid" -->
  	<div class="problem">
! 		<p>Duplicate suspected with <a href='javascript:openWindow("detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&popup=1", "Duplicate Authority")' class="button authority"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
! 		<p>You must either :</p>
  		<ul>
! 			<p><input type="checkbox" value=1 name="confirm_not_duplicate">confirm it's not a duplicate (and click on <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority"> again)</p>
! 			<p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >original authority</a></p>
  		</ul>
  	</div>
--- 25,33 ----
  <!-- TMPL_IF name="duplicateauthid" -->
  	<div class="problem">
! 		<p>Duplikat vermutlich mit <a href='javascript:openWindow("detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&popup=1", "Duplicate Authority")' class="button authority"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
! 		<p>Sie m&uuml;sen entweder :</p>
  		<ul>
! 			<p><input type="checkbox" value=1 name="confirm_not_duplicate">best&auml;tigen, da&szlig; es kein Duplikat ist (und auf den Button <input type="button" value="Autorit&auml;t hinzuf&uuml;gen" onClick="Check(this.form)" accesskey="w" class="button authority"> klicken)</p>
! 			<p>oder zur <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >originalen Autorit&auml;t gehen</a></p>
  		</ul>
  	</div>
***************
*** 145,152 ****
  	var alertString2;
  	if (total_errors!=0) {
! 		alertString2  = _("Form not submitted because of the following problem(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_missing_mandatory_tags +_(" mandatory tags empty");
! 		alertString2 += "\n- "+ total_missing_mandatory_subfields +_(" mandatory fields empty (see bold subfields)");
  		alert(alertString2);
  	} else {
--- 145,152 ----
  	var alertString2;
  	if (total_errors!=0) {
! 		alertString2  = _("Daten wegen der folgenden Probleme nicht gespeichert");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_missing_mandatory_tags +_(" Pflichttag leer");
! 		alertString2 += "\n- "+ total_missing_mandatory_subfields +_(" Pflichttags leer (siehe fett abgebildete Subfields)");
  		alert(alertString2);
  	} else {

Index: detail-biblio-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities/detail-biblio-search.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** detail-biblio-search.tmpl	12 May 2005 19:26:14 -0000	1.1
--- detail-biblio-search.tmpl	27 Jun 2005 19:23:32 -0000	1.2
***************
*** 2,6 ****
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1 class="authority">Authority number : <!-- TMPL_VAR NAME="authid" --></h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
--- 2,6 ----
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1 class="authority">Autorit&auml;tsnummer : <!-- TMPL_VAR NAME="authid" --></h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
***************
*** 39,43 ****
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Are you sure you want to delete this biblio?');
  	if (is_confirmed) {
  		window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";
--- 39,43 ----
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Sind Sie sicher, da&szlig Sie diesen Biblio l&ouml;schen wollen?');
  	if (is_confirmed) {
  		window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities/detail.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** detail.tmpl	12 May 2005 19:26:14 -0000	1.1
--- detail.tmpl	27 Jun 2005 19:23:32 -0000	1.2
***************
*** 2,6 ****
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1 class="authority">Authority number : <!-- TMPL_VAR NAME="authid" --></h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
--- 2,6 ----
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1 class="authority">Autorit&auml;tsnummer: <!-- TMPL_VAR NAME="authid" --></h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
***************
*** 9,13 ****
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png">
  	</a>
! 	<a href="javascript:Dopop('detailprint.pl?authid=<!-- TMPL_VAR NAME="authid" -->')" class="button authority">  Print  </a>  <a href="../search.marc/search.pl?type=intranet&amp;op=do_search&amp;marclist=<!-- TMPL_VAR NAME="biblio_fields" -->&amp;operator==&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;and_or=and&amp;excluding=" class="button authority"><!-- TMPL_VAR name="count" --> biblios</a>
  </div>
  
--- 9,13 ----
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png">
  	</a>
! 	<a href="javascript:Dopop('detailprint.pl?authid=<!-- TMPL_VAR NAME="authid" -->')" class="button authority">  Drucken  </a>  <a href="../search.marc/search.pl?type=intranet&amp;op=do_search&amp;marclist=<!-- TMPL_VAR NAME="biblio_fields" -->&amp;operator==&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;and_or=and&amp;excluding=" class="button authority"><!-- TMPL_VAR name="count" --> biblios</a>
  </div>
  
***************
*** 34,38 ****
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Are you sure you want to delete this authority?');
  	if (is_confirmed) {
  		window.location="authorities-home.pl?op=delete&amp;authid=<!-- TMPL_VAR NAME="authid" -->";
--- 34,38 ----
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Sid Sie sicher, da&szlig Sie diese Autorit&auml;t l&ouml;schen wollen?');
  	if (is_confirmed) {
  		window.location="authorities-home.pl?op=delete&amp;authid=<!-- TMPL_VAR NAME="authid" -->";

Index: searchresultlist-auth.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities/searchresultlist-auth.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** searchresultlist-auth.tmpl	12 May 2005 19:26:14 -0000	1.1
--- searchresultlist-auth.tmpl	27 Jun 2005 19:23:33 -0000	1.2
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE NAME="auth-search-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="authority">Authority search results</h1>
  	<div id="bloc25">
  		<form name="f" method="post" action="auth_finder.pl">
--- 1,5 ----
  <!-- TMPL_INCLUDE NAME="auth-search-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="authority">Autorit&auml;ten: Suchergebnisse</h1>
  	<div id="bloc25">
  		<form name="f" method="post" action="auth_finder.pl">
***************
*** 10,36 ****
  				<h2 class="authority">Suche nach</h2>
  				<p>
! 					<label class="label100">Authority type</label>
  					<!-- TMPL_VAR NAME="authtypecode" -->
  					<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
  				</p>
  				<p>
! 					<label class="label100">Main entry</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->">
  					<input type="hidden" name="marclist" value="mainentry">
  					<input type="hidden" name="and_or" value="and">
  					<input type="hidden" name="excluding" value="">
  					<select name="operator">
! 						<option value="start">start by</option>
! 						<option value="contains">contains</option>
  					</select>
  					<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
  				</p>
  				<p>
! 					<label class="label100">Anywhere</label><input type="text" name="value">
  					<input type="hidden" name="marclist" value="">
  					<input type="hidden" name="and_or" value="and">
  					<input type="hidden" name="excluding" value="">
  					<select name="operator">
! 						<option value="contains">contains</option>
! 						<option value="start">start by</option>
  					</select>
  					<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
--- 10,36 ----
  				<h2 class="authority">Suche nach</h2>
  				<p>
! 					<label class="label100">Autorit&auml;tstyp</label>
  					<!-- TMPL_VAR NAME="authtypecode" -->
  					<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
  				</p>
  				<p>
! 					<label class="label100">Haupteintrag</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->">
  					<input type="hidden" name="marclist" value="mainentry">
  					<input type="hidden" name="and_or" value="and">
  					<input type="hidden" name="excluding" value="">
  					<select name="operator">
! 						<option value="start">Start mit</option>
! 						<option value="contains">enth&auml;lt</option>
  					</select>
  					<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
  				</p>
  				<p>
! 					<label class="label100">Irgendwo</label><input type="text" name="value">
  					<input type="hidden" name="marclist" value="">
  					<input type="hidden" name="and_or" value="and">
  					<input type="hidden" name="excluding" value="">
  					<select name="operator">
! 						<option value="contains">enth&auml;lt</option>
! 						<option value="start">Start mit</option>
  					</select>
  					<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
***************
*** 75,80 ****
  				<tr>
  					<th class="authority">Zusammenfassung</th>
! 					<th class="authority">Used</th>
! 					<th class="authority">Get It!</th>
  				</tr>
  				<tr>
--- 75,80 ----
  				<tr>
  					<th class="authority">Zusammenfassung</th>
! 					<th class="authority">Verwendet</th>
! 					<th class="authority">Nehmen!</th>
  				</tr>
  				<tr>

Index: searchresultlist.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities/searchresultlist.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** searchresultlist.tmpl	12 May 2005 19:26:14 -0000	1.1
--- searchresultlist.tmpl	27 Jun 2005 19:23:33 -0000	1.2
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE NAME="auth-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="authority">Authority search results</h1>
  	<div id="resultnumber">
  		<p>
--- 1,5 ----
  <!-- TMPL_INCLUDE NAME="auth-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="authority">Autorit&auml;ten-Suchergebnisse</h1>
  	<div id="resultnumber">
  		<p>
***************
*** 36,40 ****
  			<tr>
  				<th class="authority">Zusammenfassung</th>
! 				<th class="authority">Used in</th>
  				<th class="authority">Zeige</th>
  				<th class="authority">L&ouml;schen</th>
--- 36,40 ----
  			<tr>
  				<th class="authority">Zusammenfassung</th>
! 				<th class="authority">Verwendet in</th>
  				<th class="authority">Zeige</th>
  				<th class="authority">L&ouml;schen</th>




From genjimoto at users.sourceforge.net  Tue Jun 28 00:22:56 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Mon, 27 Jun 2005 15:22:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.22,1.23
Message-ID: <E1Dn20G-0007kh-DJ@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac-detail.tmpl 
Log Message:
CSSed the sidebar implementation

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** opac-detail.tmpl	25 Jun 2005 06:56:47 -0000	1.22
--- opac-detail.tmpl	27 Jun 2005 22:22:52 -0000	1.23
***************
*** 1,7 ****
  <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
! <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
! <table width="100%">
! <tr>
! <td width="70%">
  <div id="bibliomenu">
  	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
--- 1,5 ----
  <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
! <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css"/>
! 
  <div id="bibliomenu">
  	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
***************
*** 32,36 ****
  	<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Add to basket</a>
  </div>
! 
  <div id="mainbloc">
  	<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
--- 30,34 ----
  	<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Add to basket</a>
  </div>
! <div id="homebloc">
  <div id="mainbloc">
  	<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
***************
*** 171,176 ****
  	</div>
  </div>
! </td>
! <td width="30%">
  Search Options:<br>
  Select keywords from list<br>
--- 169,174 ----
  	</div>
  </div>
! </div>
! <div id="rightbloc">
  Search Options:<br>
  Select keywords from list<br>
***************
*** 201,206 ****
  <input type="submit" value="Search">
  </form>
! </td>
! </tr>
! </table>
  <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
--- 199,202 ----
  <input type="submit" value="Search">
  </form>
! </div>
  <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->




From genjimoto at users.sourceforge.net  Tue Jun 28 00:24:01 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Mon, 27 Jun 2005 15:24:01 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.21,1.22
Message-ID: <E1Dn21J-0007t8-Jm@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac.css 
Log Message:
theres a leftbloc. Why not a rightbloc? There is now.

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** opac.css	20 Jun 2005 14:22:29 -0000	1.21
--- opac.css	27 Jun 2005 22:23:58 -0000	1.22
***************
*** 312,316 ****
  	border:0;
  }
! 
  #bottombloc {
  	width:100%;
--- 312,320 ----
  	border:0;
  }
! #rightbloc {
! 	float:right;
! 	width:40%;
! 	border:0;
! }
  #bottombloc {
  	width:100%;




From genjimoto at users.sourceforge.net  Tue Jun 28 00:26:31 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Mon, 27 Jun 2005 15:26:31 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-detail.pl,1.21,1.22
Message-ID: <E1Dn23j-00087x-0U@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31154

Modified Files:
	opac-detail.pl 
Log Message:
Moved the title words splitting, changed the authorwords routine abit. added a check for author and additionalauthors. No use having checkboxes for non-existant data.

Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** opac-detail.pl	25 Jun 2005 05:22:00 -0000	1.21
--- opac-detail.pl	27 Jun 2005 22:26:16 -0000	1.22
***************
*** 32,42 ****
  my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
  
  $dat->{'count'}=@items;
  my @author;
  $dat->{'additional'}=$addauthor->[0]->{'author'};
  for (my $i = 1; $i < $authorcount; $i++) {
          $dat->{'additional'} .= " ; " . $addauthor->[$i]->{'author'};
          my %authorpush;
!         $authorpush{author} =$addauthor->[$i]->{'author'};
          push @author, \%authorpush
  } # for
--- 32,66 ----
  my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
  
+ my @title;
  $dat->{'count'}=@items;
  my @author;
+ if ($dat->{'author'}){
+ 	my %authorpush; 
+ 	$authorpush{author}=$dat->{'author'};
+ 	push @author, \%authorpush
+ }
  $dat->{'additional'}=$addauthor->[0]->{'author'};
+ if ($dat->{'additional'}){
+ 	my %authorpush;
+ 	$authorpush{author} =$addauthor->[0]->{'author'};
+ 	push @author, \%authorpush
+ }
+ 
+ foreach my $word (split(" ", $dat->{'title'})){
+         unless (length($word) == 4){
+                 $word =~s/\%//g
+         }
+         unless (C4::Context->stopwords->{uc($word)} or length($word)==1) {
+         my %titlepush;
+         $titlepush{title} =$word;
+                 push @title, \%titlepush;
+         }#it's NOT a stopword => use it. Otherwise, ignore
+ }
+ 
  for (my $i = 1; $i < $authorcount; $i++) {
          $dat->{'additional'} .= " ; " . $addauthor->[$i]->{'author'};
+     
          my %authorpush;
!         $authorpush{author}=$addauthor->[$i]->{'author'};
          push @author, \%authorpush
  } # for
***************
*** 64,90 ****
  
  my @results = ($dat,);
- my @title;
  
  
! foreach my $word (split(" ", $dat->{'title'})){
!         unless (length($word) == 4){
!                 $word =~s/\%//g
!         }
!         unless (C4::Context->stopwords->{uc($word)} or length($word)==1) {
!         my %titlepush;
!         $titlepush{title} =$word;
!                 push @title, \%titlepush;
!         }#it's NOT a stopword => use it. Otherwise, ignore
! }
! foreach my $word (split(" ", $dat->{'author'})){
!         unless (length($word) == 4){
!                 $word =~s/\%//g
!         }
!         unless (C4::Context->stopwords->{uc($word)} or length($word)==1) {
!         my %authorpush;
!         $authorpush{author}=$word;
!                 push @author, \%authorpush;
!         }#it's NOT a stopword => use it. Otherwise, ignore
! }
  
  my $resultsarray=\@results;
--- 88,96 ----
  
  my @results = ($dat,);
  
  
! 
! 
! 
  
  my $resultsarray=\@results;




From hdl at users.sourceforge.net  Tue Jun 28 00:58:44 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 27 Jun 2005 15:58:44 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl favicon.ico,NONE,1.1.2.2
Message-ID: <E1Dn2Yu-0003Ip-2v@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12657/koha-tmpl

Added Files:
      Tag: rel_2_2
	favicon.ico 
Log Message:
Adding favicon.ico

--- NEW FILE ---


>?ÿÿÿ

ÿÿÿ67789:;ÿÿÿ

ÿÿÿ010234ÿ5ÿÿÿ

ÿÿÿ,-./ÿÿÿÿÿ

ÿÿÿ'()*+ÿÿÿÿÿÿ

ÿÿÿ
$

ÿÿÿÿ

ÿÿÿÿÿ	ÿÿÿÿÿ

ÿÿÿÿ



From hdl at users.sourceforge.net  Tue Jun 28 01:03:11 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 27 Jun 2005 16:03:11 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes favicon.ico,NONE,1.1.2.1
Message-ID: <E1Dn2dD-0003oi-KH@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
      Tag: rel_2_2
	favicon.ico 
Log Message:
Adding favicon.ico to default en... Getting rid of favicon.ico warning in logs

--- NEW FILE ---


>?ÿÿÿ

ÿÿÿ67789:;ÿÿÿ

ÿÿÿ010234ÿ5ÿÿÿ

ÿÿÿ,-./ÿÿÿÿÿ

ÿÿÿ'()*+ÿÿÿÿÿÿ

ÿÿÿ
$

ÿÿÿÿ

ÿÿÿÿÿ	ÿÿÿÿÿ

ÿÿÿÿ



From hdl at users.sourceforge.net  Tue Jun 28 01:06:59 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 27 Jun 2005 16:06:59 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/catalogue detail.tmpl,1.9.2.1,1.9.2.2
Message-ID: <E1Dn2gt-0004FV-CW@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	detail.tmpl 
Log Message:
Reporting Doxulting Fix on a french template.

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/detail.tmpl,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -r1.9.2.1 -r1.9.2.2
*** detail.tmpl	17 Feb 2005 13:06:28 -0000	1.9.2.1
--- detail.tmpl	27 Jun 2005 23:06:42 -0000	1.9.2.2
***************
*** 29,33 ****
  				<!-- TMPL_IF name="additional" --><label class="label100"><b>Additional Author:</b></label><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><label class="label100"><b>édité par :</b></label><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" --><br />
! 				<!-- TMPL_IF name="publicationyear" --><label class="label100"><b>S'inscrire </b></label><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
  				<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
  				<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br />
--- 29,33 ----
  				<!-- TMPL_IF name="additional" --><label class="label100"><b>Additional Author:</b></label><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><label class="label100"><b>édité par :</b></label><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" --><br />
! 				<!-- TMPL_IF name="publicationyear" --><label class="label100"><b>en </b></label><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
  				<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
  				<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br />




From hdl at users.sourceforge.net  Tue Jun 28 01:10:59 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 27 Jun 2005 16:10:59 -0700
Subject: [Koha-cvs] CVS: koha/z3950 z3950-daemon-launch.sh,1.4,1.4.4.1
Message-ID: <E1Dn2kl-0004fz-1f@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/z3950
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17937/z3950

Modified Files:
      Tag: rel_2_2
	z3950-daemon-launch.sh 
Log Message:
Removing -s from su call after Thomas D reports it breaks FreeBSD

Index: z3950-daemon-launch.sh
===================================================================
RCS file: /cvsroot/koha/koha/z3950/z3950-daemon-launch.sh,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -r1.4 -r1.4.4.1
*** z3950-daemon-launch.sh	5 Nov 2003 23:33:45 -0000	1.4
--- z3950-daemon-launch.sh	27 Jun 2005 23:10:55 -0000	1.4.4.1
***************
*** 33,37 ****
  fi
  
! su -s /bin/sh -c $KohaZ3950Shell - $RunAsUser &
  
  exit
--- 33,37 ----
  fi
  
! su -c $KohaZ3950Shell - $RunAsUser &
  
  exit
***************
*** 39,42 ****
--- 39,45 ----
  #--------------
  # $Log$
+ # Revision 1.4.4.1  2005/06/27 23:10:55  hdl
+ # Removing -s from su call after Thomas D reports it breaks FreeBSD
+ #
  # Revision 1.4  2003/11/05 23:33:45  slef
  # Now figures out what directory the scripts are in




From hdl at users.sourceforge.net  Tue Jun 28 01:24:10 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 27 Jun 2005 16:24:10 -0700
Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.115.2.13,1.115.2.14
Message-ID: <E1Dn2xW-0006E7-AF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23754/C4

Modified Files:
      Tag: rel_2_2
	Biblio.pm 
Log Message:
Display dashed ISBN


Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.115.2.13
retrieving revision 1.115.2.14
diff -C2 -r1.115.2.13 -r1.115.2.14
*** Biblio.pm	31 May 2005 12:44:26 -0000	1.115.2.13
--- Biblio.pm	27 Jun 2005 23:24:06 -0000	1.115.2.14
***************
*** 72,75 ****
--- 72,76 ----
    
    &FindDuplicate
+   &DisplayISBN
  );
  
***************
*** 2630,2633 ****
--- 2631,2671 ----
  }
  
+ sub DisplayISBN {
+ 	my ($isbn)=@_;
+ 	my $seg1;
+ 	if(substr($isbn, 0, 1) <=7) {
+ 		$seg1 = substr($isbn, 0, 1);
+ 	} elsif(substr($isbn, 0, 2) <= 94) {
+ 		$seg1 = substr($isbn, 0, 2);
+ 	} elsif(substr($isbn, 0, 3) <= 995) {
+ 		$seg1 = substr($isbn, 0, 3);
+ 	} elsif(substr($isbn, 0, 4) <= 9989) {
+ 		$seg1 = substr($isbn, 0, 4);
+ 	} else {
+ 		$seg1 = substr($isbn, 0, 5);
+ 	}
+ 	my $x = substr($isbn, length($seg1));
+ 	my $seg2;
+ 	if(substr($x, 0, 2) <= 19) {
+ # 		if(sTmp2 < 10) sTmp2 = "0" sTmp2;
+ 		$seg2 = substr($x, 0, 2);
+ 	} elsif(substr($x, 0, 3) <= 699) {
+ 		$seg2 = substr($x, 0, 3);
+ 	} elsif(substr($x, 0, 4) <= 8399) {
+ 		$seg2 = substr($x, 0, 4);
+ 	} elsif(substr($x, 0, 5) <= 89999) {
+ 		$seg2 = substr($x, 0, 5);
+ 	} elsif(substr($x, 0, 6) <= 9499999) {
+ 		$seg2 = substr($x, 0, 6);
+ 	} else {
+ 		$seg2 = substr($x, 0, 7);
+ 	}
+ 	my $seg3=substr($x,length($seg2));
+ 	$seg3=substr($seg3,0,length($seg3)-1) ;
+ 	my $seg4 = substr($x, -1, 1);
+ 	return "$seg1-$seg2-$seg3-$seg4";
+ }
+ 
+ 
  END { }    # module clean-up code here (global destructor)
  
***************
*** 2644,2647 ****
--- 2682,2688 ----
  # $Id$
  # $Log$
+ # Revision 1.115.2.14  2005/06/27 23:24:06  hdl
+ # Display dashed ISBN
+ #
  # Revision 1.115.2.13  2005/05/31 12:44:26  tipaul
  # patch from Genji (Waylon R.) to update subjects in MARC tables when systempref has MARC=OFF




From hdl at users.sourceforge.net  Tue Jun 28 01:24:38 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 27 Jun 2005 16:24:38 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-MARCdetail.pl,1.4.2.3,1.4.2.4
Message-ID: <E1Dn2xy-0006K0-Qm@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23754/opac

Modified Files:
      Tag: rel_2_2
	opac-MARCdetail.pl 
Log Message:
Display dashed ISBN


Index: opac-MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-MARCdetail.pl,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -r1.4.2.3 -r1.4.2.4
*** opac-MARCdetail.pl	25 Mar 2005 17:04:27 -0000	1.4.2.3
--- opac-MARCdetail.pl	27 Jun 2005 23:24:06 -0000	1.4.2.4
***************
*** 118,121 ****
--- 118,124 ----
  				if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{isurl}) {
  					$subfield_data{marc_value}="<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";
+ 				} elsif ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{kohafield} eq "biblioitems.isbn") {
+ #					warn " tag : ".$tagslib->{$fields[$x_i]->tag()}." subfield :".$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}. "ISBN : ".$subf[$i][1]."PosttraitementISBN :".DisplayISBN($subf[$i][1]);
+ 					$subfield_data{marc_value}=DisplayISBN($subf[$i][1]);
  				} else {
  					if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{authtypecode}) {




From hdl at users.sourceforge.net  Tue Jun 28 01:24:10 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 27 Jun 2005 16:24:10 -0700
Subject: [Koha-cvs] CVS: koha MARCdetail.pl,1.25.2.9,1.25.2.10
Message-ID: <E1Dn2xW-0006EI-S3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23754

Modified Files:
      Tag: rel_2_2
	MARCdetail.pl 
Log Message:
Display dashed ISBN


Index: MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/MARCdetail.pl,v
retrieving revision 1.25.2.9
retrieving revision 1.25.2.10
diff -C2 -r1.25.2.9 -r1.25.2.10
*** MARCdetail.pl	25 May 2005 09:34:40 -0000	1.25.2.9
--- MARCdetail.pl	27 Jun 2005 23:24:08 -0000	1.25.2.10
***************
*** 146,149 ****
--- 146,152 ----
  				if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{isurl}) {
  					$subfield_data{marc_value}="<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";
+ 				} elsif ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{kohafield} eq "biblioitems.isbn") {
+ #					warn " tag : ".$tagslib->{$fields[$x_i]->tag()}." subfield :".$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}. "ISBN : ".$subf[$i][1]."PosttraitementISBN :".DisplayISBN($subf[$i][1]);
+ 					$subfield_data{marc_value}=DisplayISBN($subf[$i][1]);
  				} else {
  					if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{authtypecode}) {




From hdl at users.sourceforge.net  Tue Jun 28 02:08:23 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 27 Jun 2005 17:08:23 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.17.2.8,1.17.2.9
Message-ID: <E1Dn3eJ-000457-3Q@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac.css 
Log Message:
Displaying overdue items  with red color... English version

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.17.2.8
retrieving revision 1.17.2.9
diff -C2 -r1.17.2.8 -r1.17.2.9
*** opac.css	17 Jun 2005 12:31:44 -0000	1.17.2.8
--- opac.css	28 Jun 2005 00:08:20 -0000	1.17.2.9
***************
*** 276,279 ****
--- 276,290 ----
  /* BLOCS */
  
+ #problem {
+ 	color: white;
+ 	font-weight:bold;
+ 	background-color:red;
+ }
+ .problem {
+ 	color: white;
+ 	font-weight:bold;
+ 	background-color:red;
+ }
+ 
  /* the mainbloc : everything is in mainbloc, except menu */
  #mainbloc {




From hdl at users.sourceforge.net  Tue Jun 28 02:08:23 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 27 Jun 2005 17:08:23 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-user.tmpl,1.8.2.4,1.8.2.5
Message-ID: <E1Dn3eJ-00045D-Fp@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-user.tmpl 
Log Message:
Displaying overdue items  with red color... English version

Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -C2 -r1.8.2.4 -r1.8.2.5
*** opac-user.tmpl	17 Jun 2005 12:31:44 -0000	1.8.2.4
--- opac-user.tmpl	28 Jun 2005 00:08:20 -0000	1.8.2.5
***************
*** 67,81 ****
  				<!-- 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>
--- 67,74 ----
  				<!-- TMPL_LOOP NAME="ISSUES" -->
  					<!-- TMPL_IF name="overdue"-->
! 						<tr class="problem">
  					<!-- TMPL_ELSE -->
  						<tr>
+ 					<!-- /TMPL_IF-->
  							<td><!-- TMPL_VAR NAME="title" --></td>
  							<td><!-- TMPL_VAR NAME="author" --></td>
***************
*** 86,90 ****
  							<td><!-- TMPL_IF NAME="status" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
  						</tr>
- 					<!-- /TMPL_IF -->
  				<!-- /TMPL_LOOP -->
  			</table>
--- 79,82 ----




From hdl at users.sourceforge.net  Tue Jun 28 09:35:51 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 00:35:51 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-detail.pl,1.14.2.3,1.14.2.4
Message-ID: <E1DnAdL-0005Fn-4u@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20116/opac

Modified Files:
      Tag: rel_2_2
	opac-detail.pl 
Log Message:
Adding not issued and delete state to state collection
And display the three latest numbers of every subscription received or lacked in opac.

Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.14.2.3
retrieving revision 1.14.2.4
diff -C2 -r1.14.2.3 -r1.14.2.4
*** opac-detail.pl	25 Mar 2005 17:04:27 -0000	1.14.2.3
--- opac-detail.pl	28 Jun 2005 07:35:48 -0000	1.14.2.4
***************
*** 30,35 ****
  my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
  my ($websitecount, @websites)             = &getwebsites($biblionumber);
- my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
  
  $dat->{'count'}=@items;
  
--- 30,48 ----
  my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
  my ($websitecount, @websites)             = &getwebsites($biblionumber);
  
+  #coping with subscriptions
+  my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
+  my @subscriptions = getsubscriptions($dat->{title},$dat->{issn},$biblionumber);
+  my @subs;
+  foreach my $subscription (@subscriptions){
+  	warn "subsid :".$subscription->{subscriptionid};
+  	my %cell;
+  	$cell{subscriptionid}= $subscription->{subscriptionid};
+  	$cell{subscriptionnotes}= $subscription->{notes};
+  	#get the three latest serials.
+  	$cell{latestserials}=getlatestserials($subscription->{subscriptionid},3);
+  	push @subs, \%cell;
+  }
+  
  $dat->{'count'}=@items;
  
***************
*** 71,74 ****
--- 84,88 ----
  				WEB_RESULTS => $webarray,
  				SITE_RESULTS => $sitearray,
+ 				subscriptions => \@subs,
  				subscriptionsnumber => $subscriptionsnumber,
  			     LibraryName => C4::Context->preference("LibraryName"),




From hdl at users.sourceforge.net  Tue Jun 28 09:35:51 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 00:35:51 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.15.2.11,1.15.2.12
Message-ID: <E1DnAdL-0005G1-MC@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-detail.tmpl 
Log Message:
Adding not issued and delete state to state collection
And display the three latest numbers of every subscription received or lacked in opac.

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.15.2.11
retrieving revision 1.15.2.12
diff -C2 -r1.15.2.11 -r1.15.2.12
*** opac-detail.tmpl	6 Jun 2005 11:41:08 -0000	1.15.2.11
--- opac-detail.tmpl	28 Jun 2005 07:35:49 -0000	1.15.2.12
***************
*** 158,170 ****
  			</tr>
  		<!-- /TMPL_LOOP -->
  	</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>
  </div>
--- 158,204 ----
  			</tr>
  		<!-- /TMPL_LOOP -->
+ 	
  	</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 :Click <a href="/cgi-bin/koha/opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" title="Serial issues"> here to look for Issues</a> we have or don't have</p>
! 		</div>
!  	<!-- /TMPL_IF -->
  	</div>
  </div>




From hdl at users.sourceforge.net  Tue Jun 28 09:35:51 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 00:35:51 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bull statecollection.tmpl,1.4.2.1,1.4.2.2
Message-ID: <E1DnAdL-0005G0-MI@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	statecollection.tmpl 
Log Message:
Adding not issued and delete state to state collection
And display the three latest numbers of every subscription received or lacked in opac.

Index: statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** statecollection.tmpl	25 Mar 2005 16:46:40 -0000	1.4.2.1
--- statecollection.tmpl	28 Jun 2005 07:35:49 -0000	1.4.2.2
***************
*** 54,57 ****
--- 54,67 ----
  						<option value="4">Missing</option>
  					<!-- /TMPL_IF -->
+ 					<!--TMPL_IF name="status5" -->
+ 						<option value="5" selected>Not issued</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="5">Not issued</option>
+ 					<!-- /TMPL_IF -->
+ 					<!--TMPL_IF name="status6" -->
+ 						<option value="6" selected>Delete</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="6">Delete</option>
+ 					<!-- /TMPL_IF -->
  				</select>
  			</td>




From hdl at users.sourceforge.net  Tue Jun 28 09:35:51 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 00:35:51 -0700
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.6.2.10,1.6.2.11
Message-ID: <E1DnAdL-0005G6-PV@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20116/C4

Modified Files:
      Tag: rel_2_2
	Bull.pm 
Log Message:
Adding not issued and delete state to state collection
And display the three latest numbers of every subscription received or lacked in opac.

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.6.2.10
retrieving revision 1.6.2.11
diff -C2 -r1.6.2.10 -r1.6.2.11
*** Bull.pm	17 Jun 2005 15:51:54 -0000	1.6.2.10
--- Bull.pm	28 Jun 2005 07:35:49 -0000	1.6.2.11
***************
*** 49,53 ****
  			&get_full_subscription_list_from_biblionumber 
  			&modsubscriptionhistory &newissue
! 			&getserials &serialchangestatus
  			&Find_Next_Date, &Get_Next_Seq
  			&hassubscriptionexpired &subscriptionexpirationdate &subscriptionrenew
--- 49,53 ----
  			&get_full_subscription_list_from_biblionumber 
  			&modsubscriptionhistory &newissue
! 			&getserials &getlatestserials &serialchangestatus
  			&Find_Next_Date, &Get_Next_Seq
  			&hassubscriptionexpired &subscriptionexpirationdate &subscriptionrenew
***************
*** 348,352 ****
  	my $dbh = C4::Context->dbh;
  	# status = 2 is "arrived"
! 	my $sth=$dbh->prepare("select serialid,serialseq, status, planneddate from serial where subscriptionid = ? and status <>2 and status <>4");
  	$sth->execute($subscriptionid);
  	my @serials;
--- 348,352 ----
  	my $dbh = C4::Context->dbh;
  	# status = 2 is "arrived"
! 	my $sth=$dbh->prepare("select serialid,serialseq, status, planneddate from serial where subscriptionid = ? and status <>2 and status <>4 and status <>5");
  	$sth->execute($subscriptionid);
  	my @serials;
***************
*** 362,365 ****
--- 362,385 ----
  }
  
+ # get the $limit's latest serials arrived or missing for a given subscription
+ sub getlatestserials{
+ 	my ($subscriptionid,$limit) =@_;
+ 	my $dbh = C4::Context->dbh;
+ 	# status = 2 is "arrived"
+ 	my $strsth="select serialid,serialseq, status, planneddate from serial where subscriptionid = ? and (status =2 or status=4) order by planneddate DESC LIMIT 0,$limit";
+ 	my $sth=$dbh->prepare($strsth);
+ 	$sth->execute($subscriptionid);
+ 	my @serials;
+ 	while(my $line = $sth->fetchrow_hashref) {
+ 		$line->{"status".$line->{status}} = 1; # fills a "statusX" value, used for template status select list
+ 		$line->{"planneddate"} = format_date($line->{"planneddate"});
+ 		push @serials,$line;
+ 	}
+ 	$sth=$dbh->prepare("select count(*) from serial where subscriptionid=?");
+ 	$sth->execute($subscriptionid);
+ 	my ($totalissues) = $sth->fetchrow;
+ 	return \@serials;
+ }
+ 
  sub serialchangestatus {
  	my ($serialid,$serialseq,$planneddate,$status)=@_;
***************
*** 371,387 ****
  	my ($subscriptionid,$oldstatus) = $sth->fetchrow;
  	# change status & update subscriptionhistory
! 	$sth = $dbh->prepare("update serial set serialseq=?,planneddate=?,status=? where serialid = ?");
! 	$sth->execute($serialseq,$planneddate,$status,$serialid);
! 	$sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
! 	$sth->execute($subscriptionid);
! 	my ($missinglist,$recievedlist) = $sth->fetchrow;
! 	if ($status eq 2) {
! 		$recievedlist .= ",$serialseq";
! 	}
! 	if ($status eq 4) {
! 		$missinglist .= ",$serialseq";
  	}
- 	$sth=$dbh->prepare("update subscriptionhistory set recievedlist=?, missinglist=? where subscriptionid=?");
- 	$sth->execute($recievedlist,$missinglist,$subscriptionid);
  	# create new waited entry if needed (ie : was a "waited" and has changed)
  	if ($oldstatus eq 1 && $status ne 1) {
--- 391,410 ----
  	my ($subscriptionid,$oldstatus) = $sth->fetchrow;
  	# change status & update subscriptionhistory
! 	if ($status eq 6){
! 		delissue($serialseq, $subscriptionid) 
! 	}else{
! 		$sth = $dbh->prepare("update serial set serialseq=?,planneddate=?,status=? where serialid = ?");
! 		$sth->execute($serialseq,$planneddate,$status,$serialid);
! 		$sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
! 		$sth->execute($subscriptionid);
! 		my ($missinglist,$recievedlist) = $sth->fetchrow;
! 		if ($status eq 2) {
! 			$recievedlist .= ",$serialseq";
! 		}
! 		$missinglist .= ",$serialseq" if ($status eq 4) ;
! 		$missinglist .= ",not issued $serialseq" if ($status eq 5);
! 		$sth=$dbh->prepare("update subscriptionhistory set recievedlist=?, missinglist=? where subscriptionid=?");
! 		$sth->execute($recievedlist,$missinglist,$subscriptionid);
  	}
  	# create new waited entry if needed (ie : was a "waited" and has changed)
  	if ($oldstatus eq 1 && $status ne 1) {
***************
*** 419,422 ****
--- 442,452 ----
  }
  
+ sub delissue {
+ 	my ($serialseq,$subscriptionid) = @_;
+ 	my $dbh = C4::Context->dbh;
+ 	my $sth = $dbh->prepare("delete from serial where serialseq= ? and subscriptionid= ? ");
+ 	$sth->execute($serialseq,$subscriptionid);
+ }
+ 
  sub Get_Next_Date(@) {
  	my ($planneddate,$subscription) = @_;




From hdl at users.sourceforge.net  Tue Jun 28 11:37:19 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 02:37:19 -0700
Subject: [Koha-cvs] CVS: koha/admin systempreferences.pl,1.22.2.1,1.22.2.2
Message-ID: <E1DnCWt-0005f1-JZ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21713/admin

Modified Files:
      Tag: rel_2_2
	systempreferences.pl 
Log Message:
Adding system preference category.
Managing them in tabs.
Taking Paul's first improvements on Head Version into account.

Index: systempreferences.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -C2 -r1.22.2.1 -r1.22.2.2
*** systempreferences.pl	11 Feb 2005 16:23:31 -0000	1.22.2.1
--- systempreferences.pl	28 Jun 2005 09:37:17 -0000	1.22.2.2
***************
*** 49,52 ****
--- 49,80 ----
  use C4::Context;
  
+ my %tabsysprefs;
+ $tabsysprefs{acquisitions}="Acquisitions";
+ $tabsysprefs{gist}="Acquisitions";
+ $tabsysprefs{authoritysep}="Authorities";
+ $tabsysprefs{ISBD}="Catalogue";
+ $tabsysprefs{marc}="Catalogue";
+ $tabsysprefs{marcflavour}="Catalogue";
+ $tabsysprefs{SubscriptionHistory}="Catalogue";
+ $tabsysprefs{maxoutstanding}="Circulation";
+ $tabsysprefs{printcirculationslips}="Circulation";
+ $tabsysprefs{suggestion}="Acquisitions";
+ $tabsysprefs{automembernum}="Members";
+ $tabsysprefs{noissuescharge}="Circulation";
+ $tabsysprefs{opacthemes}="OPAC";
+ $tabsysprefs{opaclanguages}="OPAC";
+ $tabsysprefs{LibraryName}="OPAC";
+ $tabsysprefs{opacstylesheet}="OPAC";
+ $tabsysprefs{BiblioDefaultView}="OPAC";
+ $tabsysprefs{hidelostitem}="OPAC";
+ $tabsysprefs{KohaAdmin}="Admin";
+ $tabsysprefs{checkdigit}="Admin";
+ $tabsysprefs{dateformat}="Admin";
+ $tabsysprefs{insecure}="Admin";
+ $tabsysprefs{ldapinfos}="Admin";
+ $tabsysprefs{ldapserver}="Admin";
+ $tabsysprefs{itemcallnumber}="Catalogue";
+ $tabsysprefs{maxreserves}="Circulation";
+ $tabsysprefs{virtualshelves}="OPAC";
  
  sub StringSearch  {
***************
*** 56,68 ****
  	my @data=split(' ',$searchstring);
  	my $count=@data;
- 	my $sth=$dbh->prepare("Select variable,value,explanation,type,options from systempreferences where (variable like ?) order by variable");
- 	$sth->execute("$data[0]%");
  	my @results;
  	my $cnt=0;
! 	while (my $data=$sth->fetchrow_hashref){
! 		push(@results,$data);
! 		$cnt ++;
  	}
- 	$sth->finish;
  	return ($cnt,\@results);
  }
--- 84,117 ----
  	my @data=split(' ',$searchstring);
  	my $count=@data;
  	my @results;
  	my $cnt=0;
! 	if ($type){
! 		foreach my $syspref (sort keys %tabsysprefs){
! 			if ($tabsysprefs{$syspref} eq $type){
! 				my $sth=$dbh->prepare("Select variable,value,explanation,type,options from systempreferences where (variable like ?) order by variable");
! 				$sth->execute($syspref);
! 				while (my $data=$sth->fetchrow_hashref){
! 					push(@results,$data);
! 					$cnt++;
! 				}
! 				$sth->finish;
! 			}
! 		}
! 	} else {
! 		my $strsth ="Select variable,value,explanation,type,options from systempreferences where variable not in (";  
! 		foreach my $syspref (keys %tabsysprefs){
! 			$strsth .= $dbh->quote($syspref).",";
! 		}
! 		$strsth =~ s/,$/) /;
! 		$strsth .= " order by variable";
! 		warn $strsth;
! 		my $sth=$dbh->prepare($strsth);
! 		$sth->execute();
! 		while (my $data=$sth->fetchrow_hashref){
! 			push(@results,$data);
! 			$cnt++;
! 		}
! 		$sth->finish;
  	}
  	return ($cnt,\@results);
  }
***************
*** 279,287 ****
  ################## DEFAULT ##################################
  } else { # DEFAULT
! 	if  ($searchfield ne '') {
! 		 $template->param(searchfield => "<p>You Searched for <strong>$searchfield</strong></p>");
! 	}
  	my $env;
! 	my ($count,$results)=StringSearch($env,$searchfield,'web');
  	my $toggle=0;
  	my @loop_data = ();
--- 328,336 ----
  ################## DEFAULT ##################################
  } else { # DEFAULT
! 	#Adding tab management for system preferences
! 	my $tab=$input->param('tab');
! 	
  	my $env;
! 	my ($count,$results)=StringSearch($env,$searchfield,$tab);
  	my $toggle=0;
  	my @loop_data = ();
***************
*** 301,305 ****
  		push(@loop_data, \%row_data);
  	}
! 	$template->param(loop => \@loop_data);
  	if ($offset>0) {
  		my $prevpage = $offset-$pagesize;
--- 350,355 ----
  		push(@loop_data, \%row_data);
  	}
! 	$tab=($tab?$tab:"Others");
! 	$template->param(loop => \@loop_data, $tab => 1);
  	if ($offset>0) {
  		my $prevpage = $offset-$pagesize;




From hdl at users.sourceforge.net  Tue Jun 28 11:37:19 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 02:37:19 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters systempreferences.tmpl,1.29.2.2,1.29.2.3
Message-ID: <E1DnCWt-0005ew-FS@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	systempreferences.tmpl 
Log Message:
Adding system preference category.
Managing them in tabs.
Taking Paul's first improvements on Head Version into account.

Index: systempreferences.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl,v
retrieving revision 1.29.2.2
retrieving revision 1.29.2.3
diff -C2 -r1.29.2.2 -r1.29.2.3
*** systempreferences.tmpl	11 Feb 2005 16:48:13 -0000	1.29.2.2
--- systempreferences.tmpl	28 Jun 2005 09:37:17 -0000	1.29.2.3
***************
*** 137,145 ****
  	<!-- TMPL_IF NAME="else" -->
  	<h1>System preferences admin</h1>
! 	<form action="/cgi-bin/koha/admin/systempreferences.pl" method="post">
! 		<input type="text" name="searchfield" value="">
! 		<input type="reset" name="reset" value="clr">
! 	</form>
! 	<!-- TMPL_VAR NAME="searchfield" -->
  	<table border="0" cellspacing="0" cellpadding="2">
  	<tr valign="top" bgcolor="#99cc33">
--- 137,216 ----
  	<!-- TMPL_IF NAME="else" -->
  	<h1>System preferences admin</h1>
! 	<table>
! 		<tr>
! 			<td>
! 				<!--TMPL_IF Name="Admin"-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin" class="button">Admin
! 					</a>
! 				<!--TMPL_ELSE-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin">Admin
! 					</a>
! 				<!--/TMPL_IF-->
! 			</td>
! 			<td>
! 				<!--TMPL_IF Name="Acquisitions"-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions" class="button">Acquisitions
! 					</a>
! 				<!--TMPL_ELSE-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions">Acquisitions
! 					</a>
! 				<!--/TMPL_IF-->
! 			</td>
! 			<td>
! 				<!--TMPL_IF Name="Authorities"-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities" class="button">Authorities
! 					</a>
! 				<!--TMPL_ELSE-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities">Authorities
! 					</a>
! 				<!--/TMPL_IF-->
! 			</td>
! 			<td>
! 				<!--TMPL_IF Name="Catalogue"-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue" class="button">Catalogue
! 					</a>
! 				<!--TMPL_ELSE-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue">Catalogue
! 					</a>
! 				<!--/TMPL_IF-->
! 			</td>
! 			<td>
! 				<!--TMPL_IF Name="Circulation"-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation" class="button">Circulation
! 					</a>
! 				<!--TMPL_ELSE-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation">Circulation
! 					</a>
! 				<!--/TMPL_IF-->
! 			</td>
! 			<td>
! 				<!--TMPL_IF Name="Members"-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members" class="button">Members
! 					</a>
! 				<!--TMPL_ELSE-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members">Members
! 					</a>
! 				<!--/TMPL_IF-->
! 			</td>
! 			<td>
! 				<!--TMPL_IF Name="OPAC"-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC" class="button">OPAC
! 					</a>
! 				<!--TMPL_ELSE-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC">OPAC
! 					</a>
! 				<!--/TMPL_IF-->
! 			</td>
! 			<td>
! 				<!--TMPL_IF Name="Others"-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=" class="button">Others
! 					</a>
! 				<!--TMPL_ELSE-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=">Others
! 					</a>
! 				<!--/TMPL_IF-->
! 			</td>
! 		</tr>
! 	</table>
  	<table border="0" cellspacing="0" cellpadding="2">
  	<tr valign="top" bgcolor="#99cc33">




From hdl at users.sourceforge.net  Tue Jun 28 12:15:14 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 03:15:14 -0700
Subject: [Koha-cvs] CVS: koha/reports acquisitions_stats.pl,1.4.2.2,1.4.2.3
Message-ID: <E1DnD7a-00024a-6R@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/reports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7912/reports

Modified Files:
      Tag: rel_2_2
	acquisitions_stats.pl 
Log Message:
Minor bug Fix: Displaying Months and day in usual order.

Index: acquisitions_stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/acquisitions_stats.pl,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -r1.4.2.2 -r1.4.2.3
*** acquisitions_stats.pl	7 Apr 2005 12:18:43 -0000	1.4.2.2
--- acquisitions_stats.pl	28 Jun 2005 10:15:11 -0000	1.4.2.3
***************
*** 272,296 ****
                                                
  # 1st, loop rows.                             
! 	my $linefield;                               
  	if (($line =~/closedate/) and ($podsp == 1)) {
  		#Display by day
  		$linefield .="dayname($line)";  
  	} elsif (($line=~/closedate/) and ($podsp == 2)) {
  		#Display by Month
  		$linefield .="monthname($line)";  
  	} elsif (($line=~/closedate/) and ($podsp == 3)) {
  		#Display by Year
  		$linefield .="Year($line)";
  	} elsif (($line =~/received/) and ($rodsp == 1)) {
  		#Display by day
  		$linefield .="dayname($line)";  
  	} elsif (($line=~/received/) and ($rodsp == 2)) {
  		#Display by Month
  		$linefield .="monthname($line)";  
  	} elsif (($line=~/received/) and ($rodsp == 3)) {
  		#Display by Year
  		$linefield .="Year($line)";
  	} else {
  		$linefield .= $line;
  	}  
  	
--- 272,304 ----
                                                
  # 1st, loop rows.                             
! 	my $linefield;
! 	my $lineorder;                               
  	if (($line =~/closedate/) and ($podsp == 1)) {
  		#Display by day
  		$linefield .="dayname($line)";  
+ 		$lineorder .="weekday($line)";  
  	} elsif (($line=~/closedate/) and ($podsp == 2)) {
  		#Display by Month
  		$linefield .="monthname($line)";  
+ 		$lineorder .="month($line)";  
  	} elsif (($line=~/closedate/) and ($podsp == 3)) {
  		#Display by Year
  		$linefield .="Year($line)";
+ 		$lineorder .=$linefield;  
  	} elsif (($line =~/received/) and ($rodsp == 1)) {
  		#Display by day
  		$linefield .="dayname($line)";  
+ 		$lineorder .="weekday($line)";  
  	} elsif (($line=~/received/) and ($rodsp == 2)) {
  		#Display by Month
  		$linefield .="monthname($line)";  
+ 		$lineorder .="month($line)";  
  	} elsif (($line=~/received/) and ($rodsp == 3)) {
  		#Display by Year
  		$linefield .="Year($line)";
+ 		$lineorder .=$linefield;  
  	} else {
  		$linefield .= $line;
+ 		$lineorder .=$linefield;  
  	}  
  	
***************
*** 313,317 ****
   	}
  	$strsth .=" group by $linefield";
! 	$strsth .=" order by $linefield";
  	warn "". $strsth;
  	
--- 321,325 ----
   	}
  	$strsth .=" group by $linefield";
! 	$strsth .=" order by $lineorder";
  	warn "". $strsth;
  	
***************
*** 338,361 ****
  # 2nd, loop cols.
  	my $colfield;
  	if (($column =~/closedate/) and ($podsp == 1)) {
  		#Display by day
! 		$colfield .="dayname($column)";  
  	} elsif (($column=~/closedate/) and ($podsp == 2)) {
  		#Display by Month
  		$colfield .="monthname($column)";  
  	} elsif (($column=~/closedate/) and ($podsp == 3)) {
  		#Display by Year
  		$colfield .="Year($column)";
  	} elsif (($column =~/received/) and ($rodsp == 1)) {
  		#Display by day
  		$colfield .="dayname($column)";  
  	} elsif (($column=~/received/) and ($rodsp == 2)) {
  		#Display by Month
  		$colfield .="monthname($column)";  
  	} elsif (($column=~/received/) and ($rodsp == 3)) {
  		#Display by Year
  		$colfield .="Year($column)";
  	} else {
  		$colfield .= $column;
  	}  
  	
--- 346,377 ----
  # 2nd, loop cols.
  	my $colfield;
+ 	my $colorder;
  	if (($column =~/closedate/) and ($podsp == 1)) {
  		#Display by day
! 		$colfield .="dayname($column)";
! 		$colorder .="weekday($column)";
  	} elsif (($column=~/closedate/) and ($podsp == 2)) {
  		#Display by Month
  		$colfield .="monthname($column)";  
+ 		$colorder .="month($column)";
  	} elsif (($column=~/closedate/) and ($podsp == 3)) {
  		#Display by Year
  		$colfield .="Year($column)";
+ 		$colorder .= $colfield;
  	} elsif (($column =~/received/) and ($rodsp == 1)) {
  		#Display by day
  		$colfield .="dayname($column)";  
+ 		$colorder .="weekday($column)";
  	} elsif (($column=~/received/) and ($rodsp == 2)) {
  		#Display by Month
  		$colfield .="monthname($column)";  
+ 		$colorder .="month($column)";
  	} elsif (($column=~/received/) and ($rodsp == 3)) {
  		#Display by Year
  		$colfield .="Year($column)";
+ 		$colorder .= $colfield;
  	} else {
  		$colfield .= $column;
+ 		$colorder .= $colfield;
  	}  
  	
***************
*** 378,382 ****
   	}
  	$strsth2 .=" group by $colfield";
! 	$strsth2 .=" order by $colfield";
   	warn "". $strsth2;
  	
--- 394,398 ----
   	}
  	$strsth2 .=" group by $colfield";
! 	$strsth2 .=" order by $colorder";
   	warn "". $strsth2;
  	
***************
*** 439,443 ****
  	@$filters[7]=~ s/\*/%/g if (@$filters[7]);
  	$strcalc .= " AND aqorders.sort2 like '" . @$filters[7] ."'" if ( @$filters[7] );
! 	$strcalc .= " group by $linefield, $colfield order by $linefield,$colfield";
  	warn "". $strcalc;
  	my $dbcalc = $dbh->prepare($strcalc);
--- 455,459 ----
  	@$filters[7]=~ s/\*/%/g if (@$filters[7]);
  	$strcalc .= " AND aqorders.sort2 like '" . @$filters[7] ."'" if ( @$filters[7] );
! 	$strcalc .= " group by $linefield, $colfield order by $lineorder,$colorder";
  	warn "". $strcalc;
  	my $dbcalc = $dbh->prepare($strcalc);




From hdl at users.sourceforge.net  Tue Jun 28 12:17:57 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 03:17:57 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/search.marc suggest.tmpl,1.2,1.2.2.1
Message-ID: <E1DnDAD-0002Oj-HC@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	suggest.tmpl 
Log Message:
Closing Suggest Window choice made

Index: suggest.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/suggest.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** suggest.tmpl	19 Jul 2004 20:59:34 -0000	1.2
--- suggest.tmpl	28 Jun 2005 10:17:55 -0000	1.2.2.1
***************
*** 45,49 ****
  //			}
  //			opener.document.location= "../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR NAME="oldbiblionumber" -->&breedingid="+GetThisOne;
! //			self.close();
  //			return false;
  		}
--- 45,49 ----
  //			}
  //			opener.document.location= "../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR NAME="oldbiblionumber" -->&breedingid="+GetThisOne;
! 			self.close();
  //			return false;
  		}




From hdl at users.sourceforge.net  Tue Jun 28 12:21:31 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 03:21:31 -0700
Subject: [Koha-cvs] CVS: koha/members member.pl,1.2.2.3,1.2.2.4
Message-ID: <E1DnDDf-0002yl-Bx@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11373/members

Modified Files:
      Tag: rel_2_2
	member.pl 
Log Message:
Adding Result counts and line counters to 
- histsearch (search order)
- members search

Index: member.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/member.pl,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -r1.2.2.3 -r1.2.2.4
*** member.pl	1 Mar 2005 13:13:42 -0000	1.2.2.3
--- member.pl	28 Jun 2005 10:21:29 -0000	1.2.2.4
***************
*** 90,93 ****
--- 90,94 ----
    my %row = (
    	background => $background,
+ 	count => $i+1,
          borrowernumber => $results->[$i]{'borrowernumber'},
          cardnumber => $results->[$i]{'cardnumber'},
***************
*** 106,109 ****
--- 107,111 ----
  $template->param( 
  			member          => $member,
+ 			numresults		=> $count,
  			resultsloop     => \@resultsdata );
  




From hdl at users.sourceforge.net  Tue Jun 28 12:21:31 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 03:21:31 -0700
Subject: [Koha-cvs] CVS: koha/C4 Acquisition.pm,1.9.2.5,1.9.2.6
Message-ID: <E1DnDDf-0002z4-NK@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11373/C4

Modified Files:
      Tag: rel_2_2
	Acquisition.pm 
Log Message:
Adding Result counts and line counters to 
- histsearch (search order)
- members search

Index: Acquisition.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.9.2.5
retrieving revision 1.9.2.6
diff -C2 -r1.9.2.5 -r1.9.2.6
*** Acquisition.pm	7 Jun 2005 12:56:37 -0000	1.9.2.5
--- Acquisition.pm	28 Jun 2005 10:21:29 -0000	1.9.2.6
***************
*** 612,616 ****
--- 612,618 ----
  	$sth->execute;
  	my @order_loop;
+ 	my $cnt=1;
  	while (my $line = $sth->fetchrow_hashref) {
+ 		$line->{count}=$cnt++;
  		push @order_loop, $line;
  	}




From hdl at users.sourceforge.net  Tue Jun 28 12:21:31 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 03:21:31 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui histsearch.tmpl,1.1.2.2,1.1.2.3
Message-ID: <E1DnDDf-0002z0-JY@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	histsearch.tmpl 
Log Message:
Adding Result counts and line counters to 
- histsearch (search order)
- members search

Index: histsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** histsearch.tmpl	26 May 2005 09:21:29 -0000	1.1.2.2
--- histsearch.tmpl	28 Jun 2005 10:21:29 -0000	1.1.2.3
***************
*** 2,5 ****
--- 2,7 ----
  <div id="mainbloc">
  	<h1 class="acquisition">Order search</h1>
+ 	<p class="resultcount"><!-- TMPL_VAR Name ="numresults" --> orders were found.
+ 	 </p>
  	<table>
  		<tr>
***************
*** 104,108 ****
  			<tr>
  				<td>
! 					&nbsp;
  				</td>
  				<td>
--- 106,110 ----
  			<tr>
  				<td>
! 					<!-- TMPL_VAR NAME="count" -->
  				</td>
  				<td>




From hdl at users.sourceforge.net  Tue Jun 28 12:21:31 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 03:21:31 -0700
Subject: [Koha-cvs] CVS: koha/acqui histsearch.pl,1.1.2.1,1.1.2.2
Message-ID: <E1DnDDf-0002z9-Py@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11373/acqui

Modified Files:
      Tag: rel_2_2
	histsearch.pl 
Log Message:
Adding Result counts and line counters to 
- histsearch (search order)
- members search

Index: histsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/histsearch.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** histsearch.pl	26 May 2005 09:21:30 -0000	1.1.2.1
--- histsearch.pl	28 Jun 2005 10:21:29 -0000	1.1.2.2
***************
*** 27,30 ****
--- 27,31 ----
  my $order_loop= &histsearch($title,$author,$name,$from_placed_on,$to_placed_on);
  $template->param(suggestions_loop => $order_loop,
+ 				numresults => scalar(@$order_loop),
  				title => $title,
  				author => $author,




From hdl at users.sourceforge.net  Tue Jun 28 12:21:31 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 03:21:31 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members member.tmpl,1.14.2.1,1.14.2.2 member-quicksearch-results.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1DnDDf-0002ys-I1@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	member.tmpl member-quicksearch-results.tmpl 
Log Message:
Adding Result counts and line counters to 
- histsearch (search order)
- members search

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -C2 -r1.14.2.1 -r1.14.2.2
*** member.tmpl	17 Feb 2005 12:49:09 -0000	1.14.2.1
--- member.tmpl	28 Jun 2005 10:21:29 -0000	1.14.2.2
***************
*** 18,23 ****
--- 18,26 ----
  <div class="bloc100">
  	<div class="bloctitle">You Searched for <!-- TMPL_VAR NAME="member" --></div>
+ 	<p class="resultcount"><!-- TMPL_VAR Name ="numresults" --> members were found.
+ 	 </p>
  	<table>
  		<tr>
+ 			<th>&nbsp;</th>
  			<th>Card</th>
  			<th>Surname</th>
***************
*** 35,38 ****
--- 38,42 ----
  				<tr bgcolor="white">
  			<!-- /TMPL_IF -->
+ 				<td><!-- TMPL_VAR NAME="count" --></td>
  				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
  				<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" --></a></td>

Index: member-quicksearch-results.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** member-quicksearch-results.tmpl	18 Jan 2005 21:57:05 -0000	1.1.2.1
--- member-quicksearch-results.tmpl	28 Jun 2005 10:21:29 -0000	1.1.2.2
***************
*** 5,8 ****
--- 5,10 ----
  
  <div class="bloc100">
+ 	<p class="resultcount"><!-- TMPL_VAR Name ="numresults" --> members were found.
+ 	 </p>
  	<table>
  		<tr>
***************
*** 19,23 ****
  				<tr bgcolor="white">
  			<!-- /TMPL_IF -->
! 				<td><form action="member-search-results.pl" method="get"><input type="button" class="button" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','request','member'); return false;" /></form></td>
  				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
  				<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" --></a></td>
--- 21,26 ----
  				<tr bgcolor="white">
  			<!-- /TMPL_IF -->
! 				<td><!-- TMPL_VAR NAME="count" -->
! <form action="member-search-results.pl" method="get"><input type="button" class="button" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','request','member'); return false;" /></form></td>
  				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
  				<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" --></a></td>




From hdl at users.sourceforge.net  Tue Jun 28 13:52:00 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 04:52:00 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members memberentry.tmpl,1.33.2.4,1.33.2.5
Message-ID: <E1DnEdE-0007Ma-JP@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	memberentry.tmpl 
Log Message:
Adding choice lists for sort1/Sort2 For biblios and patrons management.
Commiting along Help Modifications

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl,v
retrieving revision 1.33.2.4
retrieving revision 1.33.2.5
diff -C2 -r1.33.2.4 -r1.33.2.5
*** memberentry.tmpl	19 May 2005 21:52:46 -0000	1.33.2.4
--- memberentry.tmpl	28 Jun 2005 11:51:58 -0000	1.33.2.5
***************
*** 270,274 ****
  				<td>Sorting field 1</td>
  				<td colspan="4">
! 					<input type="text" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
  				</td>
  			</tr>
--- 270,278 ----
  				<td>Sorting field 1</td>
  				<td colspan="4">
! 					<!-- TMPL_IF Name="CGIsort1" -->
! 						<!-- TMPL_VAR Name="CGIsort1" -->
! 					<!-- TMPL_ELSE -->
! 						<input type="text" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
! 					<!--/TMPL_IF -->
  				</td>
  			</tr>
***************
*** 276,280 ****
  				<td>Sorting field 2</td>
  				<td colspan="4">
! 					<input type="text" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
  				</td>
  			</tr>
--- 280,288 ----
  				<td>Sorting field 2</td>
  				<td colspan="4">
! 					<!-- TMPL_IF Name="CGIsort2" -->
! 						<!-- TMPL_VAR Name="CGIsort2" -->
! 					<!-- TMPL_ELSE -->
! 						<input type="text" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
! 					<!--/TMPL_IF -->
  				</td>
  			</tr>




From hdl at users.sourceforge.net  Tue Jun 28 13:52:00 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 04:52:00 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/acqui newbiblio.tmpl,NONE,1.1.2.2
Message-ID: <E1DnEdE-0007Mg-OT@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
      Tag: rel_2_2
	newbiblio.tmpl 
Log Message:
Adding choice lists for sort1/Sort2 For biblios and patrons management.
Commiting along Help Modifications

--- NEW FILE ---
<!-- TMPL_INCLUDE name="help-top.inc" -->
<h1>Add Biblio help</h1>

<p>sort1 and sort2 may now be related to a list of Authorized Values. All you have to do is define a Asort1 or Asort2 category of authorised values and enter the desired values into these categories. You will then be able to use them through Add/Modify Biblio Page</p>





From hdl at users.sourceforge.net  Tue Jun 28 13:52:00 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 04:52:00 -0700
Subject: [Koha-cvs] CVS: koha/members memberentry.pl,1.5.2.4,1.5.2.5
Message-ID: <E1DnEdE-0007MP-6Q@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28209/members

Modified Files:
      Tag: rel_2_2
	memberentry.pl 
Log Message:
Adding choice lists for sort1/Sort2 For biblios and patrons management.
Commiting along Help Modifications

Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/memberentry.pl,v
retrieving revision 1.5.2.4
retrieving revision 1.5.2.5
diff -C2 -r1.5.2.4 -r1.5.2.5
*** memberentry.pl	19 May 2005 21:52:46 -0000	1.5.2.4
--- memberentry.pl	28 Jun 2005 11:51:57 -0000	1.5.2.5
***************
*** 233,236 ****
--- 233,250 ----
  				-size     => 1,
  				-multiple => 0 );
+ 	
+ 	my $CGIsort1 = buildCGIsort("Bsort1","sort1",$data->{'sort1'});
+ 	if ($CGIsort1) {
+ 		$template->param(CGIsort1 => $CGIsort1);
+ 	} else {
+ 		$template->param( sort1 => $data->{'sort1'});
+ 	}
+ 	
+ 	my $CGIsort2 = buildCGIsort("Bsort2","sort2",$data->{'sort2'});
+ 	if ($CGIsort2) {
+ 		$template->param(CGIsort2 =>$CGIsort2);
+ 	} else {
+ 		$template->param( sort2 => $data->{'sort2'});
+ 	}
  
  	$template->param(	actionType 		=> $actionType,
***************
*** 266,271 ****
  				cardnumber	=> $cardnumber,
  				dateofbirth	=> $data->{'dateofbirth'},
- 				sort1 => $data->{'sort1'},
- 				sort2 => $data->{'sort2'},
  				dateformat      => display_date_format(),
  			        modify          => $modify,
--- 280,283 ----




From hdl at users.sourceforge.net  Tue Jun 28 13:52:01 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 04:52:01 -0700
Subject: [Koha-cvs] CVS: koha/C4 Input.pm,1.16,1.16.4.1
Message-ID: <E1DnEdF-0007N9-PJ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28209/C4

Modified Files:
      Tag: rel_2_2
	Input.pm 
Log Message:
Adding choice lists for sort1/Sort2 For biblios and patrons management.
Commiting along Help Modifications

Index: Input.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Input.pm,v
retrieving revision 1.16
retrieving revision 1.16.4.1
diff -C2 -r1.16 -r1.16.4.1
*** Input.pm	28 Nov 2003 14:06:57 -0000	1.16
--- Input.pm	28 Jun 2005 11:51:58 -0000	1.16.4.1
***************
*** 50,53 ****
--- 50,54 ----
  @EXPORT = qw(
  	&checkdigit &checkvalidisbn
+ 	&buildCGIsort
  );
  
***************
*** 172,175 ****
--- 173,211 ----
  } # sub checkvalidisbn
  
+ =item buildCGISort
+ 
+   $CGIScrollingList = &BuildCGISort($name string, $input_name string);
+ 
+ Returns the scrolling list with name $input_name, built on authorised Values named $name.
+ Returns NULL if no authorised values found
+ 
+ =cut
+ sub buildCGIsort {
+     use strict;
+ 	my ($name,$input_name,$data) = @_;
+ 	my $dbh=C4::Context->dbh;
+ 	my $query=qq{SELECT * FROM authorised_values WHERE category=?};
+ 	my $sth=$dbh->prepare($query);
+ 	$sth->execute($name);
+ 	my $CGISort;
+ 	if ($sth->rows>0){
+ 		my @values;
+ 		my %labels;
+ 		for (my $i =0;$i<=$sth->rows;$i++){
+ 			my $results = $sth->fetchrow_hashref;
+  			push @values, $results->{authorised_value};
+  			$labels{$results->{authorised_value}}=$results->{lib};
+ 		}
+  		$CGISort= CGI::scrolling_list(
+  					-name => $input_name,
+  					-values => \@values,
+  					-labels => \%labels,
+ 					-default=> $data,
+  					-size => 1,
+  					-multiple => 0);
+ 	}
+ 	$sth->finish; 
+ 	return $CGISort;
+ }
  END { }       # module clean-up code here (global destructor)
  




From hdl at users.sourceforge.net  Tue Jun 28 13:52:01 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 04:52:01 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui newbiblio.tmpl,1.15.2.2,1.15.2.3
Message-ID: <E1DnEdF-0007Mn-2s@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	newbiblio.tmpl 
Log Message:
Adding choice lists for sort1/Sort2 For biblios and patrons management.
Commiting along Help Modifications

Index: newbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl,v
retrieving revision 1.15.2.2
retrieving revision 1.15.2.3
diff -C2 -r1.15.2.2 -r1.15.2.3
*** newbiblio.tmpl	8 Mar 2005 14:02:17 -0000	1.15.2.2
--- newbiblio.tmpl	28 Jun 2005 11:51:58 -0000	1.15.2.3
***************
*** 199,207 ****
  		<p>
  			<label class="label100">Sort field 1</label>
! 			<input type="text" size="20" name=sort1 value="<!-- TMPL_VAR NAME="sort1" -->">
  		</p>
  		<p>
  			<label class="label100">Sort field 2</label>
! 			<input type="text" size="20" name=sort2 value="<!-- TMPL_VAR NAME="sort2" -->">
  		</p>
  		<p>
--- 199,215 ----
  		<p>
  			<label class="label100">Sort field 1</label>
! 			<!-- TMPL_IF Name="CGIsort1" -->
! 				<!-- TMPL_VAR Name="CGIsort1" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
! 			<!--/TMPL_IF -->
  		</p>
  		<p>
  			<label class="label100">Sort field 2</label>
! 			<!-- TMPL_IF Name="CGIsort2" -->
! 				<!-- TMPL_VAR Name="CGIsort2" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
! 			<!--/TMPL_IF -->
  		</p>
  		<p>




From hdl at users.sourceforge.net  Tue Jun 28 13:52:01 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 04:52:01 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/members memberentry.tmpl,1.1,1.1.2.1
Message-ID: <E1DnEdF-0007Ml-2H@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	memberentry.tmpl 
Log Message:
Adding choice lists for sort1/Sort2 For biblios and patrons management.
Commiting along Help Modifications

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/help/members/memberentry.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** memberentry.tmpl	22 Dec 2004 16:12:45 -0000	1.1
--- memberentry.tmpl	28 Jun 2005 11:51:58 -0000	1.1.2.1
***************
*** 1,4 ****
--- 1,8 ----
  <!-- TMPL_INCLUDE name="help-top.inc" -->
  <h1>Add member help</h1>
+ 
+ 
+ <p>sort1 and sort2 may now be related to a list of Authorized Values. All you have to do is define a Bsort1 or Bsort2 category of authorised values and enter the desired values into these categories. You will then be able to use them through Add/Modify Member Page</p>
+ 
  <h2>Add Member, person</h2>
  <p>This is the form for adding a new single member to the database. There is also a form for organisations, such as other libraries and non profit organisations you might lend to. You should use the Add Organisation tab at the top of the Member page for that.</p>




From hdl at users.sourceforge.net  Tue Jun 28 13:52:02 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 04:52:02 -0700
Subject: [Koha-cvs] CVS: koha/acqui newbiblio.pl,1.21,1.21.2.1
Message-ID: <E1DnEdG-0007NK-DT@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28209/acqui

Modified Files:
      Tag: rel_2_2
	newbiblio.pl 
Log Message:
Adding choice lists for sort1/Sort2 For biblios and patrons management.
Commiting along Help Modifications

Index: newbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -C2 -r1.21 -r1.21.2.1
*** newbiblio.pl	14 Sep 2004 12:09:52 -0000	1.21
--- newbiblio.pl	28 Jun 2005 11:51:59 -0000	1.21.2.1
***************
*** 31,34 ****
--- 31,35 ----
  use C4::Search;
  use C4::Output;
+ use C4::Input;
  use C4::Interface::CGI::Output;
  use HTML::Template;
***************
*** 140,143 ****
--- 141,159 ----
  			-multiple => 0 );
  
+ #Build sort lists
+ my $CGIsort1 = buildCGIsort("Asort1","sort1",$data->{'sort1'});
+ if ($CGIsort1) {
+ 	$template->param(CGIsort1 => $CGIsort1);
+ } else {
+ 	$template->param( sort1 => $data->{'sort1'});
+ }
+ 
+ my $CGIsort2 = buildCGIsort("Asort2","sort2",$data->{'sort2'});
+ if ($CGIsort2) {
+ 	$template->param(CGIsort2 =>$CGIsort2);
+ } else {
+ 	$template->param( sort2 => $data->{'sort2'});
+ }
+ 
  # fill template
  $template->param( existing => $biblio,
***************
*** 173,178 ****
  						ecost => $data->{'ecost'},
  						notes => $data->{'notes'},
- 						sort1 => $data->{'sort1'},
- 						sort2 => $data->{'sort2'},
  						publishercode => $data->{'publishercode'});
  
--- 189,192 ----




From rangi at users.sourceforge.net  Wed Jun 29 02:05:23 2005
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Tue, 28 Jun 2005 17:05:23 -0700
Subject: [Koha-cvs] CVS: koha modbibitem.pl,1.14,1.15
Message-ID: <E1DnQ4x-0007qi-Gp@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29825

Modified Files:
	modbibitem.pl 
Log Message:
We dont use images as buttons in the templates anymore, fixing the code to reflect that


Index: modbibitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/modbibitem.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** modbibitem.pl	13 Jul 2004 12:55:01 -0000	1.14
--- modbibitem.pl	29 Jun 2005 00:05:21 -0000	1.15
***************
*** 44,48 ****
  my $data=bibitemdata($bibitemnum);
  my $biblio=$input->param('biblio');
! my $submit=$input->param('submit.x');
  if ($submit eq ''){
    print $input->redirect("deletebiblioitem.pl?biblioitemnumber=$bibitemnum&biblionumber=$biblio");
--- 44,48 ----
  my $data=bibitemdata($bibitemnum);
  my $biblio=$input->param('biblio');
! my $submit=$input->param('submit');
  if ($submit eq ''){
    print $input->redirect("deletebiblioitem.pl?biblioitemnumber=$bibitemnum&biblionumber=$biblio");




From rangi at users.sourceforge.net  Wed Jun 29 03:00:51 2005
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Tue, 28 Jun 2005 18:00:51 -0700
Subject: [Koha-cvs] CVS: koha/acqui newbiblio.pl,1.23,1.24
Message-ID: <E1DnQwd-0007HT-T2@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27605

Modified Files:
	newbiblio.pl 
Log Message:
Some of the values from the bookseller table werent being passed through to the templates


Index: newbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** newbiblio.pl	22 Jun 2005 13:14:12 -0000	1.23
--- newbiblio.pl	29 Jun 2005 01:00:49 -0000	1.24
***************
*** 170,173 ****
--- 170,176 ----
  						listprice => $booksellers[0]->{'listprice'},
  						gstreg => $booksellers[0]->{'gstreg'},
+                                                 invoiceinc => $booksellers[0]->{'invoiceincgst'},                              
+                                                 invoicedisc => $booksellers[0]->{'invoicedisc'},                               
+                                                 nocalc => $booksellers[0]->{'nocalc'},
  						name => $booksellers[0]->{'name'},
  						currency => $booksellers[0]->{'listprice'},




From rangi at users.sourceforge.net  Wed Jun 29 03:03:08 2005
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Tue, 28 Jun 2005 18:03:08 -0700
Subject: [Koha-cvs] CVS: koha/acqui updatesupplier.pl,1.5,1.6
Message-ID: <E1DnQyq-0007Wt-Cv@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28793

Modified Files:
	updatesupplier.pl 
Log Message:
Removing a line that was adding a \ in front of every ' in a suppliers name


Index: updatesupplier.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/updatesupplier.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** updatesupplier.pl	13 Jul 2004 12:53:00 -0000	1.5
--- updatesupplier.pl	29 Jun 2005 01:03:06 -0000	1.6
***************
*** 36,40 ****
  
  $data{'name'}=$input->param('company');
- $data{'name'}=~ s/\'/\\\'/g;
  $data{'postal'}=$input->param('company_postal');
  my $address=$input->param('physical');
--- 36,39 ----




From rangi at users.sourceforge.net  Wed Jun 29 03:16:39 2005
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Tue, 28 Jun 2005 18:16:39 -0700
Subject: [Koha-cvs] CVS: koha/acqui basket.pl,1.26,1.27
Message-ID: <E1DnRBv-0000ht-UA@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2657

Modified Files:
	basket.pl 
Log Message:
Formatting the creation date correctly


Index: basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/basket.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** basket.pl	20 Jun 2005 13:15:46 -0000	1.26
--- basket.pl	29 Jun 2005 01:16:37 -0000	1.27
***************
*** 110,114 ****
  $gist_est = sprintf("%.2f",$sub_total_est*$prefgist);
  $template->param(basketno => $basketno,
! 				creationdate => $basket->{creationdate},
  				authorisedby => $basket->{authorisedby},
  				authorisedbyname => $basket->{authorisedbyname},
--- 110,114 ----
  $gist_est = sprintf("%.2f",$sub_total_est*$prefgist);
  $template->param(basketno => $basketno,
! 				creationdate => format_date($basket->{creationdate}),
  				authorisedby => $basket->{authorisedby},
  				authorisedbyname => $basket->{authorisedbyname},




From rangi at users.sourceforge.net  Wed Jun 29 04:01:05 2005
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Tue, 28 Jun 2005 19:01:05 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-sendbasket.pl,1.7,1.8
Message-ID: <E1DnRsv-0006x2-QR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26427

Modified Files:
	opac-sendbasket.pl 
Log Message:
Fixing a bug caused by the syncing with the 2.2 branch


Index: opac-sendbasket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-sendbasket.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** opac-sendbasket.pl	20 Jun 2005 14:33:32 -0000	1.7
--- opac-sendbasket.pl	29 Jun 2005 02:01:03 -0000	1.8
***************
*** 71,78 ****
  	}
  
!     $email_header = encode_qp($email_header);
! 
!     $boundary = "--" . $boundary;
! 
  	# Analysing information and getting mail properties
  	if ($template_res =~ /<SUBJECT>\n(.*)\n<END_SUBJECT>/s) { $mail{'subject'} = $1; }
--- 71,76 ----
  	}
  
!     # Getting template result                                                                                             
!     my $template_res = $template2->output();
  	# Analysing information and getting mail properties
  	if ($template_res =~ /<SUBJECT>\n(.*)\n<END_SUBJECT>/s) { $mail{'subject'} = $1; }




From hdl at users.sourceforge.net  Thu Jun 30 10:56:35 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 30 Jun 2005 01:56:35 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marctagstructure.tmpl,1.27.2.7,1.27.2.8
Message-ID: <E1DnuqZ-00012N-5T@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	marctagstructure.tmpl 
Log Message:
Adding TAG Input Field to MARCtagstructure When adding a field.

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.27.2.7
retrieving revision 1.27.2.8
diff -C2 -r1.27.2.7 -r1.27.2.8
*** marctagstructure.tmpl	21 Jun 2005 13:34:26 -0000	1.27.2.7
--- marctagstructure.tmpl	30 Jun 2005 08:56:32 -0000	1.27.2.8
***************
*** 66,70 ****
  		<input type="hidden" name="op" value="add_validate">
  		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
! 		<p><label>Tag<label><!-- TMPL_VAR NAME="searchfield" --></p>
  		<p><label>Lib for librarians</label><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape=HTML -->" size="80" maxlength="100"></p>
  		<p><label>Lib for opac</label><input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="80" maxlength="100"></p>
--- 66,75 ----
  		<input type="hidden" name="op" value="add_validate">
  		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
! 		<p><label>Tag<label><!-- TMPL_IF Name="searchfield" -->
! 		<!-- TMPL_VAR NAME="searchfield" -->
! 		<!-- TMPL_ELSE -->
! 		<input type="text" name="tagfield" value="" escape=HTML -->
! 		<!-- /TMPL_IF -->
! 		</p>
  		<p><label>Lib for librarians</label><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape=HTML -->" size="80" maxlength="100"></p>
  		<p><label>Lib for opac</label><input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="80" maxlength="100"></p>




From oleonard at users.sourceforge.net  Thu Jun 30 21:53:32 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 12:53:32 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui histsearch.tmpl,1.1.2.3,1.1.2.4
Message-ID: <E1Do56K-00044A-Vs@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	histsearch.tmpl 
Log Message:
Synching with default template

Index: histsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/histsearch.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** histsearch.tmpl	8 Jun 2005 17:13:55 -0000	1.1.2.3
--- histsearch.tmpl	30 Jun 2005 19:53:20 -0000	1.1.2.4
***************
*** 5,8 ****
--- 5,9 ----
  <div id="main">
  	<h1>Order search</h3>
+ 	<div class="results"><!-- TMPL_VAR Name ="numresults" --> orders were found.</div>
  	<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post"><table>
  		<tr>
***************
*** 87,91 ****
  		<!-- TMPL_LOOP NAME="suggestions_loop" -->
  			<tr>
! 				<td>&nbsp;</td>
  				<td><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
  				<td><!-- TMPL_VAR NAME="author" --></td>
--- 88,92 ----
  		<!-- TMPL_LOOP NAME="suggestions_loop" -->
  			<tr>
! 				<td><!-- TMPL_VAR NAME="count" --></td>
  				<td><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
  				<td><!-- TMPL_VAR NAME="author" --></td>




From oleonard at users.sourceforge.net  Thu Jun 30 21:54:31 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 12:54:31 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui histsearch.tmpl,1.4,1.5
Message-ID: <E1Do57H-00049p-S2@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	histsearch.tmpl 
Log Message:
Synching with rel_2_2.

Index: histsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/histsearch.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** histsearch.tmpl	8 Jun 2005 18:38:19 -0000	1.4
--- histsearch.tmpl	30 Jun 2005 19:54:23 -0000	1.5
***************
*** 5,8 ****
--- 5,9 ----
  <div id="main">
  	<h1>Order search</h3>
+ 	<div class="results"><!-- TMPL_VAR Name ="numresults" --> orders were found.</div>
  	<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post"><table>
  		<tr>
***************
*** 87,91 ****
  		<!-- TMPL_LOOP NAME="suggestions_loop" -->
  			<tr>
! 				<td>&nbsp;</td>
  				<td><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
  				<td><!-- TMPL_VAR NAME="author" --></td>
--- 88,92 ----
  		<!-- TMPL_LOOP NAME="suggestions_loop" -->
  			<tr>
! 				<td><!-- TMPL_VAR NAME="count" --></td>
  				<td><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
  				<td><!-- TMPL_VAR NAME="author" --></td>




From oleonard at users.sourceforge.net  Thu Jun 30 22:01:17 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:01:17 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui newbiblio.tmpl,1.3,1.4
Message-ID: <E1Do5Dp-00057x-Qg@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	newbiblio.tmpl 
Log Message:
Synching with rel_2_2.

Index: newbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** newbiblio.tmpl	2 May 2005 18:06:49 -0000	1.3
--- newbiblio.tmpl	30 Jun 2005 20:01:15 -0000	1.4
***************
*** 144,149 ****
  		<tr><th><label for="invoice">Invoice Number *</label></th><td><input type="text" size="20" id="invoice" name="invoice"  value="<!-- TMPL_VAR name="invoice" -->" /></td></tr>
  		<tr><th><label for="notes-details">Notes</label></th><td><input type="text" size="20" id="notes-details" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" /></td></tr>
! 		<tr><th><label for="sort1">Sort field 1</label></th><td><input type="text" size="20" id="sort1" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" /></td></tr>
! 		<tr><th><label for="sort2">Sort field 2</label></th><td><input type="text" size="20" id="sort2" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" /></td></tr>
  		</table></div>
  		<p>The 'Sort' fields are available for your own usage. They can be useful for stat purposes</p>	
--- 144,159 ----
  		<tr><th><label for="invoice">Invoice Number *</label></th><td><input type="text" size="20" id="invoice" name="invoice"  value="<!-- TMPL_VAR name="invoice" -->" /></td></tr>
  		<tr><th><label for="notes-details">Notes</label></th><td><input type="text" size="20" id="notes-details" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" /></td></tr>
! 		<tr><th><label for="sort1">Sort field 1</label></th><td>
! 		<!-- TMPL_IF Name="CGIsort1" -->
! 				<!-- TMPL_VAR Name="CGIsort1" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" id="sort1" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
! 			<!--/TMPL_IF -->
! 	</td></tr>
! 		<tr><th><label for="sort2">Sort field 2</label></th><td><!-- TMPL_IF Name="CGIsort2" -->
! 				<!-- TMPL_VAR Name="CGIsort2" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" id="sort2" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
! 			<!--/TMPL_IF --></td></tr>
  		</table></div>
  		<p>The 'Sort' fields are available for your own usage. They can be useful for stat purposes</p>	




From oleonard at users.sourceforge.net  Thu Jun 30 22:02:43 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:02:43 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui newbiblio.tmpl,1.2.2.1,1.2.2.2
Message-ID: <E1Do5FD-0005JW-EG@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	newbiblio.tmpl 
Log Message:
Synching with default template

Index: newbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** newbiblio.tmpl	14 Apr 2005 21:28:27 -0000	1.2.2.1
--- newbiblio.tmpl	30 Jun 2005 20:02:40 -0000	1.2.2.2
***************
*** 144,149 ****
  		<tr><th><label for="invoice">Invoice Number *</label></th><td><input type="text" size="20" id="invoice" name="invoice"  value="<!-- TMPL_VAR name="invoice" -->" /></td></tr>
  		<tr><th><label for="notes-details">Notes</label></th><td><input type="text" size="20" id="notes-details" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" /></td></tr>
! 		<tr><th><label for="sort1">Sort field 1</label></th><td><input type="text" size="20" id="sort1" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" /></td></tr>
! 		<tr><th><label for="sort2">Sort field 2</label></th><td><input type="text" size="20" id="sort2" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" /></td></tr>
  		</table></div>
  		<p>The 'Sort' fields are available for your own usage. They can be useful for stat purposes</p>	
--- 144,159 ----
  		<tr><th><label for="invoice">Invoice Number *</label></th><td><input type="text" size="20" id="invoice" name="invoice"  value="<!-- TMPL_VAR name="invoice" -->" /></td></tr>
  		<tr><th><label for="notes-details">Notes</label></th><td><input type="text" size="20" id="notes-details" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" /></td></tr>
! 		<tr><th><label for="sort1">Sort field 1</label></th><td>
! 		<!-- TMPL_IF Name="CGIsort1" -->
! 				<!-- TMPL_VAR Name="CGIsort1" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" id="sort1" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
! 			<!--/TMPL_IF -->
! 	</td></tr>
! 		<tr><th><label for="sort2">Sort field 2</label></th><td><!-- TMPL_IF Name="CGIsort2" -->
! 				<!-- TMPL_VAR Name="CGIsort2" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" id="sort2" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
! 			<!--/TMPL_IF --></td></tr>
  		</table></div>
  		<p>The 'Sort' fields are available for your own usage. They can be useful for stat purposes</p>	




From oleonard at users.sourceforge.net  Thu Jun 30 22:09:09 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:09:09 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/authorities searchresultlist-auth.tmpl,1.2,1.3
Message-ID: <E1Do5LR-0006BN-6i@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23723/koha-tmpl/intranet-tmpl/npl/en/authorities

Modified Files:
	searchresultlist-auth.tmpl 
Log Message:
Synching with rel_2_2.

Index: searchresultlist-auth.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/searchresultlist-auth.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** searchresultlist-auth.tmpl	2 May 2005 18:15:31 -0000	1.2
--- searchresultlist-auth.tmpl	30 Jun 2005 20:09:06 -0000	1.3
***************
*** 37,41 ****
  			<p>
  				<!-- TMPL_IF name="displayprev" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet">
  						<img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
  					</a>
--- 37,41 ----
  			<p>
  				<!-- TMPL_IF name="displayprev" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  						<img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
  					</a>
***************
*** 45,54 ****
  						<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
  					<!-- TMPL_ELSE -->
! 						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet">
  							<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
  					<!-- /TMPL_IF -->
  				<!-- /TMPL_LOOP -->
  				<!-- TMPL_IF name="displaynext" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet">
  						<img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
  				<!-- /TMPL_IF -->
--- 45,54 ----
  						<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
  					<!-- TMPL_ELSE -->
! 						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  							<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
  					<!-- /TMPL_IF -->
  				<!-- /TMPL_LOOP -->
  				<!-- TMPL_IF name="displaynext" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  						<img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
  				<!-- /TMPL_IF -->




From oleonard at users.sourceforge.net  Thu Jun 30 22:11:43 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:11:43 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/authorities searchresultlist-auth.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1Do5Nv-0006hL-FJ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25735/koha-tmpl/intranet-tmpl/npl/en/authorities

Modified Files:
      Tag: rel_2_2
	searchresultlist-auth.tmpl 
Log Message:
Synching with default template

Index: searchresultlist-auth.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/searchresultlist-auth.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** searchresultlist-auth.tmpl	19 Apr 2005 19:13:34 -0000	1.1.2.1
--- searchresultlist-auth.tmpl	30 Jun 2005 20:11:41 -0000	1.1.2.2
***************
*** 37,41 ****
  			<p>
  				<!-- TMPL_IF name="displayprev" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet">
  						<img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
  					</a>
--- 37,41 ----
  			<p>
  				<!-- TMPL_IF name="displayprev" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  						<img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
  					</a>
***************
*** 45,54 ****
  						<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
  					<!-- TMPL_ELSE -->
! 						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet">
  							<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
  					<!-- /TMPL_IF -->
  				<!-- /TMPL_LOOP -->
  				<!-- TMPL_IF name="displaynext" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet">
  						<img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
  				<!-- /TMPL_IF -->
--- 45,54 ----
  						<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
  					<!-- TMPL_ELSE -->
! 						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  							<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
  					<!-- /TMPL_IF -->
  				<!-- /TMPL_LOOP -->
  				<!-- TMPL_IF name="displaynext" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  						<img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
  				<!-- /TMPL_IF -->




From oleonard at users.sourceforge.net  Thu Jun 30 22:17:23 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:17:23 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull statecollection.tmpl,1.2.2.1,1.2.2.2
Message-ID: <E1Do5TP-0007Sz-Vv@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28637/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
      Tag: rel_2_2
	statecollection.tmpl 
Log Message:
Synching with default template

Index: statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/statecollection.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** statecollection.tmpl	10 Jan 2005 17:05:03 -0000	1.2.2.1
--- statecollection.tmpl	30 Jun 2005 20:17:20 -0000	1.2.2.2
***************
*** 70,73 ****
--- 70,83 ----
  						<option value="4">Missing</option>
  					<!-- /TMPL_IF -->
+ 					<!--TMPL_IF name="status5" -->
+ 						<option value="5" selected>Not issued</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="5">Not issued</option>
+ 					<!-- /TMPL_IF -->
+ 					<!--TMPL_IF name="status6" -->
+ 						<option value="6" selected>Delete</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="6">Delete</option>
+ 					<!-- /TMPL_IF -->
  				</select>
  			</td>




From oleonard at users.sourceforge.net  Thu Jun 30 22:19:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:19:18 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull statecollection.tmpl,1.3,1.4
Message-ID: <E1Do5VG-0007hj-71@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29578/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
	statecollection.tmpl 
Log Message:
Synching with rel_2_2.

Index: statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/statecollection.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** statecollection.tmpl	10 Jan 2005 17:02:54 -0000	1.3
--- statecollection.tmpl	30 Jun 2005 20:19:15 -0000	1.4
***************
*** 70,73 ****
--- 70,83 ----
  						<option value="4">Missing</option>
  					<!-- /TMPL_IF -->
+ 					<!--TMPL_IF name="status5" -->
+ 						<option value="5" selected>Not issued</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="5">Not issued</option>
+ 					<!-- /TMPL_IF -->
+ 					<!--TMPL_IF name="status6" -->
+ 						<option value="6" selected>Delete</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="6">Delete</option>
+ 					<!-- /TMPL_IF -->
  				</select>
  			</td>




From oleonard at users.sourceforge.net  Thu Jun 30 22:26:39 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:26:39 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member-quicksearch-results.tmpl,1.1,1.2
Message-ID: <E1Do5cN-0000CC-MR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv699/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
	member-quicksearch-results.tmpl 
Log Message:
Synching with rel_2_2.

Index: member-quicksearch-results.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/member-quicksearch-results.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** member-quicksearch-results.tmpl	13 Jan 2005 21:50:28 -0000	1.1
--- member-quicksearch-results.tmpl	30 Jun 2005 20:26:37 -0000	1.2
***************
*** 2,9 ****
  
  <div id="main-compact">
! 
! <div class="table"><table>
    <tr>
!   	<th>&nbsp;</th>
      <th>Card</th>
      <th>Name (Cat.)</th>
--- 2,9 ----
  
  <div id="main-compact">
! <div class="results"><!-- TMPL_VAR Name ="numresults" --> patrons found.</div>
! <table>
    <tr>
!   	<th colspan="2">&nbsp;</th>
      <th>Card</th>
      <th>Name (Cat.)</th>
***************
*** 17,21 ****
      <tr>
      <!-- /TMPL_IF -->
! 	 <td><form action="member-search-results.pl" method="get"><input type="button" class="submit" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','mainform','member'); return false;" /></form></td>
        <td><!-- TMPL_VAR NAME="cardnumber" --></td>
        <td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> (<!-- TMPL_VAR NAME="categorycode" -->)</td>
--- 17,21 ----
      <tr>
      <!-- /TMPL_IF -->
! 	 <td><!-- TMPL_VAR NAME="count" --></td><td><form action="member-search-results.pl" method="get"><input type="button" class="submit" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','mainform','member'); return false;" /></form></td>
        <td><!-- TMPL_VAR NAME="cardnumber" --></td>
        <td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> (<!-- TMPL_VAR NAME="categorycode" -->)</td>
***************
*** 24,28 ****
    <!-- /TMPL_LOOP -->
    <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
! </table></div>
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
--- 24,28 ----
    <!-- /TMPL_LOOP -->
    <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
! </table>
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file




From oleonard at users.sourceforge.net  Thu Jun 30 22:27:09 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:27:09 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member-quicksearch-results.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1Do5cr-0000G0-QU@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv691/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
      Tag: rel_2_2
	member-quicksearch-results.tmpl 
Log Message:
Synching with default template

Index: member-quicksearch-results.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/member-quicksearch-results.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** member-quicksearch-results.tmpl	18 Jan 2005 21:55:17 -0000	1.1.2.1
--- member-quicksearch-results.tmpl	30 Jun 2005 20:27:07 -0000	1.1.2.2
***************
*** 2,9 ****
  
  <div id="main-compact">
! 
! <div class="table"><table>
    <tr>
!   	<th>&nbsp;</th>
      <th>Card</th>
      <th>Name (Cat.)</th>
--- 2,9 ----
  
  <div id="main-compact">
! <div class="results"><!-- TMPL_VAR Name ="numresults" --> patrons found.</div>
! <table>
    <tr>
!   	<th colspan="2">&nbsp;</th>
      <th>Card</th>
      <th>Name (Cat.)</th>
***************
*** 17,21 ****
      <tr>
      <!-- /TMPL_IF -->
! 	 <td><form action="member-search-results.pl" method="get"><input type="button" class="submit" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','mainform','member'); return false;" /></form></td>
        <td><!-- TMPL_VAR NAME="cardnumber" --></td>
        <td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> (<!-- TMPL_VAR NAME="categorycode" -->)</td>
--- 17,21 ----
      <tr>
      <!-- /TMPL_IF -->
! 	 <td><!-- TMPL_VAR NAME="count" --></td><td><form action="member-search-results.pl" method="get"><input type="button" class="submit" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','mainform','member'); return false;" /></form></td>
        <td><!-- TMPL_VAR NAME="cardnumber" --></td>
        <td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> (<!-- TMPL_VAR NAME="categorycode" -->)</td>
***************
*** 24,28 ****
    <!-- /TMPL_LOOP -->
    <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
! </table></div>
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
--- 24,28 ----
    <!-- /TMPL_LOOP -->
    <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
! </table>
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file




From oleonard at users.sourceforge.net  Thu Jun 30 22:34:11 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:34:11 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member.tmpl,1.4.2.3,1.4.2.4
Message-ID: <E1Do5jf-0001K0-Pi@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5043/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
      Tag: rel_2_2
	member.tmpl 
Log Message:
Synching with default template

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/member.tmpl,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -r1.4.2.3 -r1.4.2.4
*** member.tmpl	7 Apr 2005 17:03:31 -0000	1.4.2.3
--- member.tmpl	30 Jun 2005 20:34:09 -0000	1.4.2.4
***************
*** 5,11 ****
  
  <div id="main">
! <div class="table"><table>
! 	<caption>Patron Search Results</caption>
    <tr>
      <th>Card</th>
      <th>Name</th>
--- 5,13 ----
  
  <div id="main">
!     <h3>Results for Search: <span class="ex"><!-- TMPL_VAR NAME="member" --></span></h3>
! 	<div class="results"><!-- TMPL_VAR Name ="numresults" --> patrons found.</div>
! <table>
    <tr>
+   	<th>&nbsp;</th>
      <th>Card</th>
      <th>Name</th>
***************
*** 13,17 ****
      <th>Address</th>
      <th>OD/Issues</th>
! <!--     <th>Charges</th> -->
      <th>Notes</th>
  	<th>&nbsp;</th>
--- 15,19 ----
      <th>Address</th>
      <th>OD/Issues</th>
! 	<!-- Hide from NPL --><th>Charges</th><!-- /Hide from NPL -->
      <th>Notes</th>
  	<th>&nbsp;</th>
***************
*** 24,27 ****
--- 26,30 ----
      <tr>
      <!-- /TMPL_IF -->
+ 		<td><!-- TMPL_VAR NAME="count" --></td>
        <td><!-- TMPL_VAR NAME="cardnumber" --> (<a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->" title="Issue to this Patron">Issue</a>)</td>
        <td><a class="searchresults" href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> </td>
***************
*** 29,33 ****
        <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></td>
        <td><!-- TMPL_VAR NAME="odissue" --></td>
! <!--       <td><!-- TMPL_VAR NAME="fines" --></td> -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
  	  <td><a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;modify=edit">Edit</a></td>
--- 32,36 ----
        <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></td>
        <td><!-- TMPL_VAR NAME="odissue" --></td>
! 		<!-- Hide from NPL --><td><!-- TMPL_VAR NAME="fines" --></td><!-- /Hide from NPL -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
  	  <td><a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;modify=edit">Edit</a></td>
***************
*** 35,39 ****
    <!-- /TMPL_LOOP -->
    <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
! </table></div>
  <div class="tabitem"><form action="/cgi-bin/koha/members/memberentry.pl" method="post"><input type="hidden" name="categorycode" value="" /><input type="hidden" name="actionType" value="Add" />
  	<input type="submit" class="submit" value="Add New Patron" /></form>
--- 38,43 ----
    <!-- /TMPL_LOOP -->
    <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
! </table>
! 
  <div class="tabitem"><form action="/cgi-bin/koha/members/memberentry.pl" method="post"><input type="hidden" name="categorycode" value="" /><input type="hidden" name="actionType" value="Add" />
  	<input type="submit" class="submit" value="Add New Patron" /></form>




From oleonard at users.sourceforge.net  Thu Jun 30 22:34:12 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:34:12 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member.tmpl,1.6,1.7
Message-ID: <E1Do5jg-0001KA-3e@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5053/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
	member.tmpl 
Log Message:
Synching with rel_2_2.

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/member.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** member.tmpl	2 May 2005 20:21:12 -0000	1.6
--- member.tmpl	30 Jun 2005 20:34:09 -0000	1.7
***************
*** 5,11 ****
  
  <div id="main">
! <div class="table"><table>
! 	<caption>Patron Search Results</caption>
    <tr>
      <th>Card</th>
      <th>Name</th>
--- 5,13 ----
  
  <div id="main">
!     <h3>Results for Search: <span class="ex"><!-- TMPL_VAR NAME="member" --></span></h3>
! 	<div class="results"><!-- TMPL_VAR Name ="numresults" --> patrons found.</div>
! <table>
    <tr>
+   	<th>&nbsp;</th>
      <th>Card</th>
      <th>Name</th>
***************
*** 13,17 ****
      <th>Address</th>
      <th>OD/Issues</th>
! <!--     <th>Charges</th> -->
      <th>Notes</th>
  	<th>&nbsp;</th>
--- 15,19 ----
      <th>Address</th>
      <th>OD/Issues</th>
! 	<!-- Hide from NPL --><th>Charges</th><!-- /Hide from NPL -->
      <th>Notes</th>
  	<th>&nbsp;</th>
***************
*** 24,27 ****
--- 26,30 ----
      <tr>
      <!-- /TMPL_IF -->
+ 		<td><!-- TMPL_VAR NAME="count" --></td>
        <td><!-- TMPL_VAR NAME="cardnumber" --> (<a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->" title="Issue to this Patron">Issue</a>)</td>
        <td><a class="searchresults" href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> </td>
***************
*** 29,33 ****
        <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></td>
        <td><!-- TMPL_VAR NAME="odissue" --></td>
! <!--       <td><!-- TMPL_VAR NAME="fines" --></td> -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
  	  <td><a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;modify=edit">Edit</a></td>
--- 32,36 ----
        <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></td>
        <td><!-- TMPL_VAR NAME="odissue" --></td>
! 		<!-- Hide from NPL --><td><!-- TMPL_VAR NAME="fines" --></td><!-- /Hide from NPL -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
  	  <td><a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;modify=edit">Edit</a></td>
***************
*** 35,39 ****
    <!-- /TMPL_LOOP -->
    <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
! </table></div>
  <div class="tabitem"><form action="/cgi-bin/koha/members/memberentry.pl" method="post"><input type="hidden" name="categorycode" value="" /><input type="hidden" name="actionType" value="Add" />
  	<input type="submit" class="submit" value="Add New Patron" /></form>
--- 38,43 ----
    <!-- /TMPL_LOOP -->
    <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
! </table>
! 
  <div class="tabitem"><form action="/cgi-bin/koha/members/memberentry.pl" method="post"><input type="hidden" name="categorycode" value="" /><input type="hidden" name="actionType" value="Add" />
  	<input type="submit" class="submit" value="Add New Patron" /></form>




From oleonard at users.sourceforge.net  Thu Jun 30 22:36:51 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:36:51 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members memberentry.tmpl,1.3.2.4,1.3.2.5
Message-ID: <E1Do5mF-0001hE-Fb@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6465/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
      Tag: rel_2_2
	memberentry.tmpl 
Log Message:
Synching with default template

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/memberentry.tmpl,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -C2 -r1.3.2.4 -r1.3.2.5
*** memberentry.tmpl	8 Jun 2005 20:36:30 -0000	1.3.2.4
--- memberentry.tmpl	30 Jun 2005 20:36:49 -0000	1.3.2.5
***************
*** 146,151 ****
  </table>
  <table><caption>Additional Fields</caption>
! 	<tr><th><label for="sort1">Sorting field 1</label></th><td><input type="text" id="sort1" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->"></td><td rowspan="2"><p>These fields are available for your own usage. They can be useful for statistical purposes</p></td></tr>
! 	<tr><th><label for="sort2">Sorting field 2</label></th><td><input type="text" id="sort2" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->"></td></tr>
  </table>
  </div>
--- 146,159 ----
  </table>
  <table><caption>Additional Fields</caption>
! 	<tr><th><label for="sort1">Sorting field 1</label></th><td><!-- TMPL_IF Name="CGIsort1" -->
! 						<!-- TMPL_VAR Name="CGIsort1" -->
! 					<!-- TMPL_ELSE -->
! 						<input type="text" name="sort1" id="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
! 					<!--/TMPL_IF --></td><td rowspan="2"><p>These fields are available for your own usage. They can be useful for statistical purposes</p></td></tr>
! 	<tr><th><label for="sort2">Sorting field 2</label></th><td><!-- TMPL_IF Name="CGIsort2" -->
! 						<!-- TMPL_VAR Name="CGIsort2" -->
! 					<!-- TMPL_ELSE -->
! 						<input type="text" name="sort2" id="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
! 					<!--/TMPL_IF --></td></tr>
  </table>
  </div>




From oleonard at users.sourceforge.net  Thu Jun 30 22:37:17 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:37:17 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members memberentry.tmpl,1.7,1.8
Message-ID: <E1Do5mf-0001kw-VT@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6642/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
	memberentry.tmpl 
Log Message:
Synching with rel_2_2.

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/memberentry.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** memberentry.tmpl	8 Jun 2005 20:36:32 -0000	1.7
--- memberentry.tmpl	30 Jun 2005 20:37:00 -0000	1.8
***************
*** 146,151 ****
  </table>
  <table><caption>Additional Fields</caption>
! 	<tr><th><label for="sort1">Sorting field 1</label></th><td><input type="text" id="sort1" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->"></td><td rowspan="2"><p>These fields are available for your own usage. They can be useful for statistical purposes</p></td></tr>
! 	<tr><th><label for="sort2">Sorting field 2</label></th><td><input type="text" id="sort2" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->"></td></tr>
  </table>
  </div>
--- 146,159 ----
  </table>
  <table><caption>Additional Fields</caption>
! 	<tr><th><label for="sort1">Sorting field 1</label></th><td><!-- TMPL_IF Name="CGIsort1" -->
! 						<!-- TMPL_VAR Name="CGIsort1" -->
! 					<!-- TMPL_ELSE -->
! 						<input type="text" name="sort1" id="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
! 					<!--/TMPL_IF --></td><td rowspan="2"><p>These fields are available for your own usage. They can be useful for statistical purposes</p></td></tr>
! 	<tr><th><label for="sort2">Sorting field 2</label></th><td><!-- TMPL_IF Name="CGIsort2" -->
! 						<!-- TMPL_VAR Name="CGIsort2" -->
! 					<!-- TMPL_ELSE -->
! 						<input type="text" name="sort2" id="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
! 					<!--/TMPL_IF --></td></tr>
  </table>
  </div>




From shedges at users.sourceforge.net  Mon Jun 13 12:28:58 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Mon, 13 Jun 2005 03:28:58 -0700
Subject: [Koha-cvs] CVS: koha-doc/fr/opac/CatKOHAimages image10.gif,NONE,1.1 image11.gif,NONE,1.1 image12.gif,NONE,1.1 image13.gif,NONE,1.1 image14.gif,NONE,1.1 image15.gif,NONE,1.1 image1.gif,NONE,1.1 image2.gif,NONE,1.1 image3.gif,NONE,1.1 image4.gif,NONE,1.1 image5.gif,NONE,1.1 image6.gif,NONE,1.1 image7.gif,NONE,1.1 image8.gif,NONE,1.1 image9.gif,NONE,1.1
Message-ID: <E1DhmBe-0004Ng-Ib@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/fr/opac/CatKOHAimages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16589/fr/opac/CatKOHAimages

Added Files:
	image10.gif image11.gif image12.gif image13.gif image14.gif 
	image15.gif image1.gif image2.gif image3.gif image4.gif 
	image5.gif image6.gif image7.gif image8.gif image9.gif 
Log Message:
images for CatKOHA.xml document

--- NEW FILE ---
GIF89a©

ð
-<?	>N>I%5A3;@7D;CD
BRGOKWO`Ud'DH(JW(RZ7IH9LU;QK7PV&Oa*Ve1N`5Vd(bp6am7gv@@ 	AKICNPBRHGWT@\dAkyEn‚o¢¥¯¯}¶¶xþˆ¸¸’¯³–º»¡º¼‹¾À—¼Â£¼Ã†Á¼™À¾ªÌ¼®Ô¿´×¼ŽÌÊ�ÍЋÐÍ�ÔÑ”ÌÍ–ÍИÍГÑΓÑÒ–ÓÙ•ÙÕšÑÓœÖØœÙÔ�ÛÚ—ÒâšÖãœÝãžàÖžáÝžãâ£È˧ÌѦÓÍ£ÓÓ£ÕÙ£ÚÕ£ÜÛªÔÓ«ÕÙ«ÙÖ«ÛÛ±ËʵÎÒ¸ÙÉ´ÚÚ¬Ìå¥Þà¥Ýì¯Óã«Ýá­Üì©Þð¶Ýâ­àϧàפáÝ©á׫âݬèݼâÍ´âÔ³âÝ·èÓ¼âÓ¼âݼèÕ¼èÝ¥âã¥åé¦èä¦êé«ää¬æè¬èå¬èè¥åó­äò­äø¬êð­èø¬ðí®òñ¯ôù²äâ±åé³éå²êê»ãâ»âèºéå»ëë°äñ±æú´íð²ëú¼ãñ»íñ¾éü³ñí¼ðá»ñí¼øî´òñ³ñøµøô¶ûø»òó¼õø»ùô¼ùúЦ�Ù·œÎ»³Ùº¦â¾©à¿°ÐÓžÌÍ¢ÉÇ·ÏѪÛìÛǶ×Ø©ÜÜ·Þà­Þà´èŬéʶêÓ»òË­ó̵òÒ­üؽâä­çéºîð¼òí½òô½ÂÙËÄÚÛ×ÊÀÛÙÄØÛÚÃÝâØÝåÁâÌÁãÒÍñÛ×æÇÙè×ÛôÌÝñÖÃèéÅìòÄñìÂóóÃõùÂùõÃûûÊóóÊõùËùöËüü×åçÕéõÕõåÔûûåÍÁë×ÆìÝÒúÚÅôÜÒëëÆëêÔíñÅéúÙûäÊûèÔúüÊüýÕçèéæëóêþâéùúöëçôíòýýã÷úùÿ
Ü
v«Ý´ÚrG˜¸Û&wÄdÛ­·Úf÷—våö®ºÛr;/tö*X\ºÊ½Û¯¡çÂKn¿6ŽfØ¿ƒ‘Û˜wñÖFˆátˆ+dÐN1ôt†abüêëq¿ãê;íÈ"ƒ‹¯·Ô"�mæáºßT·‚5Õ«ú�Eó}T!;ÌéUµz>ëL+2ßüsH�À

4Ý4
QÀB¢@…'P�
RxB«ðA(DÁ„(<¡
SȺ°…0|¡cHê�
7Ì¡	q˜BÚ°†@ü¡ÿƒ˜B>¡
$â—¨Ä&F
‰&¡AØ(žðˆM at C®Ð„&DaMØ®
R !ªPALr2ƒœ”B9Ê
–R”¢%;ùÉNZr
Tpea)K,Г¯Œ%.g©KLò²–d¥+KyAT~2
™Ì¤oiJT6Ó”¤Lå(WéI
Öò–¾´e/-MN
3ƒ „¦8EÙJpZ“”è§)U™Áj^0�ä´&&áÇTN¡p,‚²pÿµ
@mmhڒਉ!	MCÎ ªapÂÚp¶aDH¨ æ"t´u¨ 2XÏg†Ó�«Œ¥9³	Ne>1•àl§qéIjªž§$&Tç–Ð!’‹H]êTGT¡Õ¨ÂjP—: Õ¥.©‡°IP‰*ÕÖ5©J½ªVŸZÔ­Z•«FM]U¡Ö®R©K�êTœúÕ¨¶¬7é*YßêU¬²µ¬p…+TϺԛõ'}ÅUé:W¬•¯OÅkZÛ×´Zõ_Íêb™µˆŒ$‚±�˜*Zƒ:Œ@¶ª�elc½ÊW·Š5²jí*^·
V¤vÕ&vµkêЀ‰
ÿP�Ü`rH@â³·ì­p‡KÜâ÷¸ÈM®r—ËÜæ:÷¹Ð�®t§KÝêZw¸^¼îsqèÜìË-
ÀCz(Qðà'xÁ	` ^ôÊ`¡p!À	L(ä=ŒP%zµ‡D˜Bá Ã&6±X A2	*oqS 
"31…Mö ShÂ3iÄ‘‰>�¡MëD 2Ñ=ìa
À%|EìÁšèƒ„ù`
2b¾

=è!l¸„)ú°Ÿáù‚)ü€
,
«`ÂôÆQqÛª#
‹ð}ê!ª BA	rp‰ 
7�® }±31h°5
Á28§p™°h�	¼!grÀÄ[@	š‚Rq€ÈhÀ¼�	}¸TbˆVYv	Ý0Äb_u
Öh[žÀãˆ7�КPy'Š½
,ïñ*«w€5ѧÀx%¦ØÆØæÇxó…
~0bÆ
@ž@ç�š�	h †l°
˜
eÐnj ƒP_upŽ¯èÁxP&	P‹€iæÖ
Qð„ŒÝ€™c |u	Œ×„¢y‰€A%ŠT—€
�y	ëö
x0`õxfZ�	…�Æaôù»Ùö‰Ÿ²)‰
‘Y9Ñ„
›0ãŸAŒiu¡™Ebøù#JŒ© —@bZYPÁø)Š¶Yia¢0£š
Zv šŸŠ£QQ¡Á æ±›Ú2°)•ÅA¤“WiQ*Š2
<Š %úšš ŸôeÃãJ üy_³9:Cq€Ã‚u`[èp’Ó€7Ù”c0
Y 	ä`¶u}¸`¢uª¨šªªºª¬Úª®úª°«²zª:«¶z«¸š«Œåš0
­Ê
¬Ì`­Ø:¬Ö
¬Ëªך¬÷ÀË
ÙJ¬ËÚ®ë
®ÇŠ­Ö*­Ç:¯Õ¬íú­Ä
¯ßZ¯Òš¬Ãz
+°þz­¯ÁÊ®óª¬ój®îº®
›°á:¬Øš­Âº°æ®Úª±òº¯
Û±ó
¯
[¯
;­Äº+²+¬Û¬øú¯[°+®‹± ÿ±3‹³#‹²õÚ³K¬Ê ®àŠ³íú³à£�ð«Êªè€Ò�P{kùpk, ÆêϪ³K¬ð 

³Úê®+;Ç¿:ÅÙ›¿êz¸â
²+ÉA‹±=›®÷@ˆœ®æZ±³;»ö
Ë‹µƒÜ¶ð 
fg~
l€så
…-J;…„PÅ
…nöÞ=q	~@Ü=bé=›æ�ß#FPˆd
1Üø�”gßúgß=Aà
1’þß7vcÂÝàÜ=ßÎßòÝÞê}ßåaÜù-ÜÁ
”2èfòÝM–ß8—àÎßÅ]â>b.b
ÁÝæÍâ"æ† ÜÜ}ãö]ß0þß;nãNà9ä8ŽàDÞãîãî½ãEnÜFŽãNäGåJžäL~ß»B	�˜kø€ý€¶öû�k�€	•‹_
	�@	� ½†xàO

ywî!,þ±_‘746SîQnv5³+ñ!ÄòušŠ2cv²H3²hwêQéñ!,`!4W÷*‚’鲚F£u¦>êp˜ŠøÑ43‚çéJqw™õ]±®ua‘+ã…êŸNwË^®Žw¼nvcW+ªì´nê4¼²Ýž,U^ýÁŸ kçÞñêÉf›	9xS±‡TÚŒf_Cxq(‚Ø¡P˜@
Ô9凶I^¤ ïq5	¯	h {À{x€f0„ HŠ‰x	¯	ý¾zZzÈ™œåðß�
‡x¨	® ›¡ "ÿ/ï&�KØèpX®@€S¡
X'g§
Aó;(Ú—�è¹»!¡róCñ©±¤
H¸+Yp�žÃ™ÁÙðAóˆñч ¯	éG+03r@‡h ®P‚1ïð;…‹ð
‡�éø‡àó03„f-ãT"ð+Èsè	}gÅuЮ­SŠõ%ôg·3‚÷ ÊùŠØ#371xà	•ç4*¦•t"	Ê-
UÑ„—\Á‚”EÊcD64H‘�PA/&ùäEJêÐÄ­ý~2HñÚ³1¾ð„2. }”.þø‹É…ôÑC)ƒ´ÑG뢼2H˜
är¿÷Üsë
Mt+Ì$a²îÈ5‡üÑÍ-±s±áÔ2¼9ÕÜ�ŒrÎF¬ðC%ÿ÷2>
„3Ì@kT¯O+÷<1ë0¹�F¸Q¤ÓNýó�»|Ú(B€
 ¬@:a#ŒÆÁ«�L°0'‰ÒxJ€
‰Oœßi¸Œöé°ŽMä^÷¸×ÞŽTÌcõÈÅ'ò±†¼b»ÇG Ò‘‚œ_ƒøF#Ö�‘9¼Ç2ˆHÉ"Ê°Š‘Ì$§Çf’’‡„£9iÇQ†²�£œ¢!ó8ÈAð’°¼å#yC?ø¡ƒÀ`åÈC÷9“ö`a-(€`æ’ŽÅd&
 ÈìÑÿÐ�Åt`k˜L>
 ÑÌž!ƒY¿R
0{õp`3,¨=6æO
@�îùóž
�&·	 ÓŸ÷˜‡6¯Y at eÀo�`÷8ÊÌNPÑä^ö.è¿zìÔ¦îÄh
Ä8£¨PXîR†_…dé‘Dy‘‹gÕ^5YINær¢¨Dd
ªºJTµ«Kä##9IGYvOo¼GU÷(Ãi&R�§,è+)?9R–ÿö`Æ
#[ÊĉœôccÊÀZtˆÇD¬%õ™ÄÉ’s�y”*\9ÙWíѱ‡žÌë=R‹È¹v¯¶ñ¸‡RåÇQ{À¦Y­ì]�ˆÍÎ/œþËieúÎy›
ì<1]múÂ-fÿiC
úßL.N
pR=ú‚P/MiCÇ>’�mPq&V{|dÆ;ÛñÞúc€þà¨
€F3¢\4o÷JzÓÒC©ÉÌI_øÔ	öƒñØ'"øÌ	L©Jm{Ïs2�£*–ÿ1!�ëÜb0{¾.fñhCmW±ªíãmXW-+’YFd	kÙÉ޵̒ܲ(7ÙÊ/_6•„¤l-áœÃ¢†uÊGõêœuéeÀZ“Í ÄæÙÇ1O¹“�d¥$§LË2U—rþrOÇìH9?
r�%´pWÁ!?‹xÉK@͈:Ø
Ô¦.õ©�S³ºÔ®¶ƒKH=ëðÔá-¶žõ>mëR§Úר6õ¬aëC›×âµ~­êT³zÕÊÎ
´a�Ÿd3Ø£nÑ[ä mn›zÔ½¾ö²Ånr[ÛÜã>÷¬‹½,„â”ÈÂ"B¡'H@âiÊ#$qˆU`!MéÃ!ÿ>p�<àÔ&u¸g½ìo£šÔßþô"¾‡«<à‡@O~
3†ÖóÜÀº³ÀÖcÀÖ£
¨¿×KÂÀþ{=w Á>4†ßKÁÖs„ÃLÁúó¿ÿ[‡†dغaˆˆ@P”8ñ˜A’(ñ“ý�¾“#™—¡™èc>	™#!�ù—'Y‘bëì)€xøÂþƒÆwè~hvh~¸…wh‡mÜÆhÔFzhpG|Fo4ÇsDÇs„À/dGmäFmLÇx”ÇsÔBo¬GMô¿|\À}ÌÇy„ÆräÇnLÅþ+Gs\‡wAxôÇt|=ü«‡vøZØ™4XŠÿÀX„^ÒƒSP
…Ð	uPÙ¨ÙÐPôPÿѵ}P=ÐEеP
½ÐÅPuÐP[P
MÑUÑEÑEÐ-Ñ
°ˆRÀ„ÿ	P™0ÒüÄ8
ÖX
4‡ÿLÐç>Hôø�™M”Lˆòˆg¦å8ß‚V å|CkMÀW�cœ˜ë°Žòèó:¸WØUx�A	ƒDeJðsM …:À‚-çׄms‹òð�‰ætñh0À
J˜·ExØ(‘˜¸ô Jˆ‹AÁ4PQf"‘N_‘‘Éò
ÕFódLpÀ9pLÞE‡ÿ€Îõ:
«Æ‹ƒ¸„šÀé Šó6,8ƒà
‹�Lðƒü]¨ÝÔÏ¢,úeÔ_ýÔ¿ú«ýÖýÙ‡}Õ‡
ÿÔ—}Ý73æÚ÷}Õ?}ÖþÞ_}×þØ÷}¨¨}äŸ}Ö‡~ßÿ}æw~ã¯~åÇþâW~aÎþè~aÖ~á¿þáÏ}aFþÓïýÝ7ýïÇýæ'~ðÿ~Þ—ýÐ}„G�g©>0„�N·xægˆK™5º„
6;vna¹rÝV|¸pZ¸|6ì·råÇ�)?f<X/çÄu÷%»²c͉;Sf¬V¬&8
&Xåÿ€'ÞÆÏ~ÇÍ_xKÚ7av·Õ¤‹e†i_Öq¹ßšWfGvò�xyrÚ#’&›L§œ?äó>ÿ(Ú�¢Š¦ðÏqÉQ9i‚ð$¨£=Ì\Ê\�:6·’m®÷$’WÊž�Ë5#"
$Ú¦_�ËTzå=íy�<÷CŸŽšÞÃ!{D*Hbx°’·ª¯EÚf=]Þê=úá×áqúýz&môxw*´W^Zæ‹2g^xI’÷¤Ÿ´Y_¹Þ"Y¤uÊ<™ ¬.«,ª¥Þ#ß²÷0ùëq[î»ê¥E{3Ú!I/�ÔaZ�‚Ãsp‚k
0Ûªû"Lk�"Ζá–ý6·ž±Ê-BÉÿ"�Êi�Tº;c¿ËR¤2
|eÀõ­{�
Œ§3Z€'’ÑM7­uuV×ó�aÞf]ÏÊÆÜ2Á-sz1
`-àÕ¦
,d¢ªX0Å*b�KèòMP%2L ,©)ÿ#šV‘Ôe±iM
–¶¾5¦m]GñZÓœ ­e�kNP¦×µÖ¯xm#‹×²þ"råîÈÊֵε²eE¬[kº»¶¯M,ZkלÈõ®‹,c÷–Ò~6°oík_qGYÆâõ±q5,#^›[Í¢L²³•+mÏZÚÔšµ²„Å-j�«WåÂv¸Ìýko{[ÚÒ®õ¬9F
@ˆ½”èÈG?ÂÛ(EíÃ’ÀÄ%^Ó”|–ˆPDo1±‰@x0HO


láûepˆ�Â=p&à€o ¢lèÄ�	-x£X‡8¨JéL\¥{0…ö�	Sèa	„§Mq†Kô�,!9D#r¢‰),`Ñdh„7ÑàLì�ÕoaC#´`Q…ôÁ¢}ØD
4h"Ófu&2ÁˆC脾¸ƒÉŽ$˜cÞð
šØ‚¡vJ]$C�¶à
L$@
˜ø©“…C l�õ^pê
2l·'þà
tÔHv¸h"Å'|ÒJz6ÿ>é
!i‘.©ƒ6)“>©“&i’
”Vi”©’^©–Zi–Ó–~©•zi¿ì•ÊP‡É•(Ë©ì¹ÌAOùø‘ªŠsœ©íÌ MJxR©|º¿œ©ñ)ìXÏë°Ðz2T¢Ò'Š\ŠôÐÒ ¾ŽwÞiå�¢ixdŒ?<ê+j0íÏ¢BñdM}†�·j0Ý©]‰ß$ÔuвœEÕ†øA&â©–P	røR}Ë‹ºÈ{¤“ÒzúGÜ	
‘‰§TJù”Š} êwé28­ÉPÐÞP+
“ÿ-ô|LÄNÒy.Q…¬zœÉºâÌýP+<¼hê†É¹>̪¤¹kÀxN�dß@@iŒén­§ÚƒÍ¾+ÄJÀ.˜®±ð̦4C
XG®
7¹,I1áÁi0Kº™ÆÍãΚ,eª¤x
ŽBp8uKcÎ¥D‹H•É´¨ÿQ¢=¤¸­!d0P×£1áÄ$HÁ²Gͦ:‘âJ¡/á‘	ONàœH¢´ˆÑ¢½Œöb
̈0àK�ÿþ%¬x‘¦¾�_*¼HraÀùBf¤)sfÂ�0cÆÔwôbJ”°ˆƒéÐ"<˜ðØ©cçRí®·qãîhQn߸{ûùý{÷î®Åo÷¹Ô;÷næáG÷�<PŸLÕ]Ò]]»tìϱ7J¾<9oï�„çN¼{ðòÆ››÷îü<ôë]××//~;ýçkƒÃ¶î|ë¾®lC0»ø°+.?áà#ð6í´+®«»°ºüÔ°«E�-€8ʈ‹O¬U\1E]dÿÑE*Pl±ÆiT1Çy|‘GeœñG!�²È#�rÇ[¤‹%“,2JodòÅ ­„É-§|rJ.o¼ÒG(¡ÓJ$Q4“G(±rM/ÓÄQË9¹”ÑI/ÛLÒÄ,ÛlQ
,4Ñ„;c
)¤¨"Ñ*…‚ÑG!�TÒI)­ÔÒK1ÍTÓIåtÓOA
UÔQI-R(¬èTÒNS5ÕÕPY…B
TU}5T4ä�ÕÔ�ƒ0É0áKØ¿„}¬Øc�MÙe•m–Ùg��Úi¥­–Úk­ÍÛmµí–Ûo½
ÜqÅ-—\hO[¤Ž
yå…^|ùÝÿÑ{óÅW_�	Øà‚>Xá„	†8àƒïõ·âŠ÷�â�#8ã�?¾¸_�ùíWdIîøä•£˜Âå—aŽyŠ(T)ŠH£f1êøÁÐ)Z6b‘"ŽBŒ
2`WŒ$àuùD¢e>ÔàŽÇÖØcDÉF˜e‹KÞׯ:	À,28Š'ÜmBï&òæÛow
ÿ[ð¾÷ö»p½	ß;qÄg¼ñÅ
?<ñÉ%¯¼ïÀ1\sÈ9o<òÂw<òÌIלñÒQÿ\ñÕS·`¾Ý�wÞ(
z0�<Ì%Tˆ	ðƒá÷WÀ
P„t¡ýxB:p‚9D C
ð…1œ¡—,Ú�0´ŸÁ	M„Sx�"½
°a
)�¢áu¸„jØ ÏFX°¡�ðÀˆØÄæ8-$#ìPÿ¬:Tk¨çŠV³Ì•­dý”©ÅjêR�Õ¤+¨ÈêQ±®«µªLÝ*a®êTdª`}LX!ÃU¾uªÝúéZÏjV·ª¨™a+³ŠÊ	<p‚Â3BÄ01VSìaÛ0†#Œam0‚ï+ØÁN–²•µìe1›YÍn–³�õìgAZÑŽ–´¥5íiQ›ZÕ®ö³‚’C@Á€D­¡ímo{‰F
c
ß@Š7Øà‰E|£pÀÃÒÐ
¤‰!ÞXCö�†@
‰xïH
Ž1pž C&¼a=
8bl°ŽvÆ!Ot›Ð	41opƒ'x Å"° Šo™Èl ñ8â" X^f£+:Q—5xc9‡ØŠÅÐ	E§!
å8*Öp	oh¢~`C Pñ�#{Ã
 Ã¥=q†LLÃ
eA
(qG)æŠ)Í_Ð Ž:¨á”á†Ò€Š=PÂÂ5ÊP6|œ
®øBĉ:l˜ÕǾßsôa
ßÄ×=�s\bšÈÄ<�MrŒáž€CõÙ@è5PZŒ�DÐ@Ä€hÃ6
ê+Ì`º�
¾.¾a
ÐËö ü`Ná	Î`èÏÿØ€öÀ¡¶Jâ`Ä
*Æà¾AR�6á½AåÌ¡
¦áìŒ
Ø (°èàÐ`Ò Å.¡	Æ�8¡DŒ2ö .ÔÀŠŽRá
RaÈÀ<�˲¢Ó`2�óþŽò"
%óz­3J£2
1~�¦J£3ì0ב/:�/’+ü@
�‹
öB�3L°Àá8CPN�^K‘B
0zo¡D¾Þ€ìÀ ùBa!!ÂàFa4Š‘zï½CÁÚ‘ûgåAÅ�
Œð0Ž-ôTÒX¯%-ãñ,£ñ&)A2j²×à×Î04Úp¶r2Do/~r4ˆ¥Ù$4 Ïo+Ï¯ò4r’ò@1£0!
ö‡
å5�6C]\aä@² Pú
Œ
j¦ÔÀ¾áÂBˆ\!¶o
0Aû|E˜ô°)P°@4�ÿjÕ˾Ží`
Ü€à fj†
È
ÆÒ#
L�j†ÔáZ7ÁdZƒG�Höh²Æ7í6ÇLcSÊUΕ3b³¾Ä`–3
`�IÙó̓¦n’Ä`ÔÀÔ
ÂÁ°àÑ°@:ÐÈ€+0O�8ÓÈÿš t“²Ë÷·AÅÔ (X¢

ZC<Á¢àV¾aø>L
~ùÀü—3eš °201Xê±{Ã×Âá„ÐàÒ.Áú
�
¬Sˆ
e:¡øØàN[#Om9ˆÒOIã&³�,ë‡
0£¾ÜOÜï/”Ñ#X	ÃW(AsÏp/èU³ [#]ú"¾âk/fÓs{÷ÐÐ`XÊs‰‘

¶
Hh¯n¸{¹°2ô~¯�cÞVä
À"ZH!qá@¿�ð­WXÔát6Ñ  sû>ÁFáÍTA
–·@ˆÙÀGrÒ=A
º
ßó?_ï•¡ð?àq_òϾï5ÿ:¿ò
€ñï!õ
ßøÿ>ó‘ÿò{¿ñ‹ß‚Áò%ŸöÿÞ_ô•§
½·TEôT¤é‡ìxçÜŽÙ!‡V[-R§cSI¢e›}—ñf˜g÷\²ÈK°¡¤‚)›Ã
+ä�‚ÊöÓ�ŽCÿqØb(=d¤=ÌtGT3¦‘Òz×Æf�iCiTîiÁƒ"IÔjÛ‘F}rØÞH÷€Ô�B±E¯¾‘†ÔÑ@Ùv�µÇ×Þ¶ñEJ�BÝEº�Dl1”Œ=ÿ2Ôg3Á´‘@Fá¦ï»'´�|
¬ÒBѾÉàxï@À8tñ=Êd«½‘ÖÌŸÅ"ý‹rHêƶò@é¡D¡
)ÃÓ$	‡CFI,±JänkÐ"�PˆƒÑu®tÑËòE™;’tÒm\Ò¾Ñ
ÆÖDNßëîi#eD‘Û!73vtèv×L
Íè;ñ»uGü-]tÙFWÎ~Æ,’¹ÁŒC׫UÎÅt™¸–ÿÀtå6G¤QÅ"!f±Î8Ú#x½îNäÛ„ÓMî@l§íw!=9µõY9ÈfGyIÒiäÑJ«{$µà–Gd¶
`$e›ÞØ?yMGÏѹý••=ÏmH‘£(C+ë’h
x�¯\	1‹¹¤ÔYÎPÁÎh¤w0{ˆÆ)¡�hòÇ }$m"‘
èc 
h&Û¨E ”ùÇ&Q·Â£ €”QÆ
•¢Å’°q}caIF$
[¼ªrªˆÑ/W±MÓ
`-…u’Tƒ"#òÈ¥¬q†»ÚT=¦ÖÌM‡?ëkNÛ–/›5C0bÓ
)r�\„)ÑÚŠ(ï±*¡œäh �!Ò@��eå-¿ !ÇFÕž»ìq�ÚyQU¨Ub’œªISø±>¬mê-[™Ó‰¢Á
iI&º>ErL$
R¬µr•ƒóã�BT<ܘ){Q@Óå?­ècºER*Y)æ�Âù´À	‘c”_7‡í±ì#°±ÝP�ÃmÿñC"ÕOËh\X1Éœ‰C
4ìA[X#¦Œ	ßS¢ö¾ÿ=#|�üßßøǾñŸ|ãÿñÎüñï|ç3bøÓþñƒ¿üïooùÅ÷ý%”üó×üÅWÿó™üò'Ÿüׯÿ÷·�üêÛùà‡ù©,ÿ}ÖgÊ·å§|í—~Ì}Œp~x}Áç}}Ô÷µç~	È-ñ€è€÷'�Þ'~â'€8‚ø×€!Ø€'¸€ê�È��°�Ð@ê& Ò�
ñÀƒ¼$nû0”p	—ÀŠpŠ@	�À„”€}e°›
�€	„
šÀuà	ž€	epyl{ž°‘œð
u§	u€	’·؇h
XÀ
a
[ 	)
z‹ð
x¢¨ç	,ŠS𘥷5šÉ™µw‡€¡€	.¡	—ðz!Z$º°pÜ“¢p·®pZК€¢pW‡ðzµ'yªÀlX 
¦`¢ª€¯‹®€š£À¤Nº5`ðz’W{°øxh°O
¾ç
ñÇ RZ”Ф˜P‡ðš‡°©‰	¡ z®Wr`h`�ê
uÀœÚç
Rz©‹@
‹@¨
Z°¢˜@cðz
ˆ™èÿ
e@
4:})Š	® Åç®p¢Y€¤@
ž�¢·eÀ	— š˜
[ 
}P°ç¤Ûó
[à•Ìv‰pyÊlh
’
dÊ ®ð
žÀ¹§	ªÀyª •p±àT`
¦
g 
2tÛ
ˆ	yugy—P 	S
gÐ	°�à	týI�
Y0zu

F0
c X°

�¬l°	lp	ê
Ë
Œ€{‹À	0Èk€
m¹'û
WŒ³ß`j€	0ê 	1
{­ÇžI¿Ü‘ÚzàðÂÜ`‘eÀž°	P¶Þ@˜Þ°ê0—ÐŒÁØŸSÀ
Ó` ›` c0
Ý` œð	j`¤ð‡
€Ý ®dÀÁæ
Q`¡PzRJÌ“úyƒz>j˜Ð
Ø
h€
Xgð
›Ð#ÜgÀ�°Â"Ìÿ»©{Ë}0~BXwxp
eÖâX�â ¯)ƒ”`‹à	AH¸§™{uç	ºÊA|za}›ª™š€ÄÜ”±•�¥Yðyj`@Íuð
·{p{ŒI
“JÍœŠ§r€‡ ªc€	f y’WÙkÊ¡íÖ¾¼£ÃŒ›W|g¥rð‡Ýà¿}j½-	¡ ¡Ð—g�÷	u÷	Œ€̦¥)Ú‘Õ:ea- É â°fÐ
•‡ÿßu°Q
�ÊçÄl°�°»ˆ
u šf 
9ݚнŒؘ°Ó‡ð
Ÿ—©G	¦P—€Ø™'Œ¨Wz¦—¡?Šà ¢W­¤«v7¨îº£Ü·¬¯`–eª¨žP™ y3ýሠ	a�0è
�
ª€}¦
±ŸŒU½~Ë€@Ìl›{‰ªä»l
~°Ðkª:žÉ©ê°h,1ºl€æй™Ë:î	³g¢Ä÷»žÀ®¨—܉ž¢®g¡â°¬ˆº›ChÇÏ]Çå—–Í9ˆSVÞŠ0©ÿŠšØœOIµ)ê¬è“¦“6ëè�Q‹ÁÇŠ‰H�å)‹ NëÈ9eŸè¦ŽXùY�ïw�™È“ÂŒß9�ß	ëÇþ�ŠÈ–8¼=çW€“h�¶~	dN“^£DÍ
0‘dÛ³…{„°
X’x�´ø|h§ñ)•­Ž�;¹ñ2	€*Ùí±}Ü)~Ü)‰¸i›Õiëµ÷{
x›Ì‰”¾ž.™ò¢îó;i�›^îiì#™Œ¼x�ÅØñÒ÷ì
Èÿ|fùé¿©–ØØl£èŸ+›œî°=܇lMó÷Œ}ØPi€Ê‰µ_h '{
ýÙ	¦¼ð£|Ì´›»šðR
jp‘À‚	䯚Ç�
™[ßð
g
Ì€2c¦?ÿ
„ÇÂ	;5
ÿ+nÂÕTóÐÅc„qFû«ñE_¼‘F{”qGƒÜqH!‹”G"[T’Ç�dÒC"›”rF(!¼JBLëÏŸÎÁçK|úó2U؇9«TíÁ{

<þ°É¬Ù³’G\é@ª¦¨Ü”—;ÏÖms�ý[ŠÄzÖÁ¦¦N\ÿ-U
4¼ô]“ÅPƒÙ®ìÌv+@¦ €>f&¨dV¬d92¿ÒSx¦iG¥êáÆm1P	jóNS©9ÙR7Â1�¦Fã"ý<R|[³Só$pÈÏ´	•Ò,±ÆD3�C¢°«Ð<.šª$wíoœ�t¬–ì{\	ç�P½m“¾^h×£±šñûâó¶Z6îHã»Ûß°æQË…ZfFÿ¤/"û£¦@sœ
mCë}žFFBê’ÇÊá2d˜™-óÏs´N”§Wˆo|ëX¤„É ýî¸þ5Üj>™®
=²¬¼gxýmÕ¨.CXëu7±ýø@À~cI“!{
€5ØC‹T¢xŒ§x¹¥‹¡x	¤ 	— Íª°Í–ÀMÙ¼ÍØDÅ•èŃ	70€^øL£¤‡bˆI�M²\ÊÐÜÊ�\ʯJ­ÜÉ«”ËbÿpKzPNœ\˨lÌbèθ´L¾Íbp‡ôüL¯”Îê<O¸¬å¼JÈ$Ïö|O÷4ÏüœÌýÊbÏ®tL�„K"„C8Ç;…²ã
 
†
Ë)E%[pËcOv€6ÀƒÀp‹—�E»Œì[‹¦³‹°èH•Ø‰�œV¬¨Hkå¼É¨ƒ”p…R·tÉzxUeU—TF K±TK˜t‡SUWx%Ô1MWxUך”Ó5UUzðÌì¼ÊzýW€…IU�É€-XeÒa¨sUWcPÆ%Ô‚]×5�Xx…NŠeR
@ÕwHXà‡a 
X[jŒ€é5UÛõÅ—üZžÔÕÚ%†U†ÇíI�©0eš\
°X»5Š³@Û«àx¼`…Öž8¿Eèƒ,�‡whIOM˜Ruݵá—MX·%h‡È
F�ÉÚ¦
Ì“	´èŠÇÀM¨%ÚÉ(V	´óôÀÇ–üßîäÉE•
øÚÊ\£Œ€Îä‡[ˆ€¼¤ÜT×w¸…
˜:!†îŒ
#„¹€à£d¦dUvHX€Îæ5~K¯åZ:QHU…ÞzÎZ<¾ÛZ¸ãs­Eõã~uW^èÎ(nÉqÓŵES„=T`eUÖ’:˜èؽàX´kŒH½Ú¡è‹M„œaJ–Ð7}KÍôß…åI€KöL‡êÉFJ.FcTõɇ}i]åÉKÏ~˱TF˜íÉ„ÕÕ˜í̆•X.׉ÝÉC
Íž´]‰aˆ½ÊT–mµ4YÙžã'^ÙÝNãÅL×Uí–K0fdc(ê©•
Ä‹f°<YÓ.S†<HÆÿ\ÈÆmÿ¥i±ìcå¾NHk¤´ìêL×ÈNʼÄZ
€ëî
Y|ïd.Ú
É­ðcžÉ¼˜ÍžF`…& MØ
ÈbMf R}Ê?vNº|ð®dSºQ³üJ·ð–¤N<]W^ÅP
ŸðûŒK
ÏðËÄpw €_ėmP¿ä
¿`Š¦‹UÌÍ
žVpŸòÀЋ“˜F¨pÀ‚N>H®
8È„|Gƒ>€ƒM¸„@€ƒE„>ÀƒÇƒK@ø„G=…ox<¨<€<`ƒˆ¯x=x‰Ïx‹ßøŒ—ø‚¯ƒ:¸6€Œ_�‡xŠOù‰ÿ_y•oy–yŠ‡xƒ§xƒ·<°ƒK�xˆG½>¸„‚ïy6Èù�Ç çx£—x„?ø„ǃE`ú¤G=‘0ø½{x„ß88ƒÿ÷œ?ú�Oúˆ'yŒ÷†ˆ÷„K O8ƒS؃Eð5à‘g‘€oHÍ{¿÷„oz¼¯ƒžïƒ�ÿ`Ÿïû½‡Áÿz®Gùœgø@˜x“¯ƒ‹'øªØ»½ÓŠï; –X9Ôs9ÔË|Îç|ÍßüÏÇ|Íw9Ò}Ï/ýÎ}ÓýÎÇ|Ö}LðLà„ ‚1ƒ)1Þ×}18ß~á×}%
,x‘¢C‰5
ܨÏâƈ/ò³râʈ/[–ü¸1ãÎ�ö8M™1hÈ›;cÿö¬š3ëÕ®K6=9ñeÁ•WGžÝçôçF­9ç¶l¹víC’�>Äz¶îß»…cÎÝÜstÚ´/+¯=|9ó>‰PwV{¹ðײ£#ÎÞHý¢ÃÙCWL¼}êÅ~%â>œq|Åž}Û÷zŒ·&uÔÑM
\ èÀB0‚tÿdÁ
R0	F
N0Š¤Ïø× Œ‰d$'AÉ»¨Å.‚1Œ[¼ØIȈ-š1�h\cÙxÆ6Âñ�r$É¿èE0Ú‘ŽcÌ£ûØE5Æ�rdÅÈG?†ñ�ˆ#!‰G=žd$’¤ãÄ
X Ã%`„
`b
+Ù=q

2ƒ°P# 
—TÈÚpI8¤

¦#[šŠF4²�·lKÛwËF!ñ‚÷¼áýázËÆ^ôº¾íeï{é+ß÷Z½ê5ïØ.6’±Õ½ö5[S$_õx¾ì-o‚÷‹_þM
]°|Çû]’tͽPðyxòÖWM
`ˆÐ!	¨
^‚`B1LÁ‹(‚>Ù…&4
$ŒƒâP:ÿD�!Zù³&ôAˆb ƒÊàÙ,Ô¡	EÈ›Âæ^”8¾ë¥ï…¬eñJ
˜†oÓ@ŒaÿÐnqë�&¦)8J0ÎrŽ3Þâlç9Ëy¦žéÜç¼ýù΂4¡mè9+Ïu–ó¢­ç8?š�
,À¨Ó#Ä%ö€
2ÂgÈÞ¶E‰PP"ŒÞö�']iEËYÓvNµ£ÿ<êK:Õ⦦޶‹E°Õcòž7½ë}¤�Õ;ÿßöÖw¾ÁÆïyûûßwoöïñ;à	8Ãå�o‡[hkúV8Å
N¦°ÑÛ#ÍݸGð"#,”!
F PŽ‹Ð*SäÁqpÜ$œ!
HØxbR 6�
¯Å@n-4A#òø’6¾q…g¬ßk8Ä~ð¯�hÒÛúÙŒš…EQ
€Nð°Ö¸u
Z{¢ÊLHPìaNT˜Ÿàu¯GAíd_;ÝÙn÷³¿]€À¼{¾…³Û]í�Š{×ñŠcI‰}ð8^;0ö¯7ìcOûØ#_wÈ÷}ìUÐzä-�ö¹“ý#Š_<èËwÇçýì}_½ÛÙnø»w=ì—ÿ2;í÷~©¾Kxò· Ë]¾ò½÷Þê.·½Ë7Ï{Ó×Þìiß»Ü/…'ÜR‰_ùÚ7¿uHmþòÌO”õ	Ÿûíû]€Z�Z·ú­Àh•Z,]„ú»µÕ÷»?þðŸÿJå_úãßþæ_¿þû_Íü ýù_ÿ
`
d at VGABÇAdB"äB*dÿCjGC2dDB¤A¤>>$fTdFjd>NdDnäGþ£@Ï
�t‚,i¨’LÏ�'¨C*ùÖô8iJæ
JŠ«�œä¸ž«¹–+¹êÎá λêO‡¦ëX«»Æ«½âk½êë½ê+»º»â¨I
l»lî¬ÁìÁ¬ÿî\cdB
À>œ­dJr&pƒ*	©*áAx‚|f¨7@ªœ>)BÍ>ÃÍ&ÀÌiÎ’�:�Ò3à

¯í¦îÝÔ�ï*lî¶nóÊ®óº.ôJïóºÃ2ƒJÓ' È	 %ÆöÃÅf,ǺÀÜ
&„¬‰*BJ–ìÝàAÊ®ªš@àä}ÂÓÊé¯r‚Ìöè4¨!(ÔB¨¬ÌÒéÔl,‚kb‚
ãÁÎ^’7`kp¢
%,%°ÁôpBwm
°åÅú?øÃ?pò>ˆ
#<²o
2ô¼{‹/µírèJíâ´‹Bø‰5#àG~çù˜Bw�41Bÿ(Di)Š&{øÁ H²@Yb(B:­dĈu†&®ÎùxBë>L<š#œƒ2ÞhwpB„&‚b{
"ÈÁ*„ËÁÂ%p)|-&�³c‚¬$‚¤$)@�‚)ì
Ÿ%úƒ&B¢!ˆul�Bjz9ÞÄcµ¤±f·&xªRt)­cçJšo—w9œÁÔ>Íyî;9qJ#H˜+B%„�"(B(8ŒÊÃYüÀüÁ3‚�hØ�‰*6ÔM›yâeô…û;;º™ˆ†;�ª8‹/N®#ÞœOãï" /¾�¬¤ç³ã&jâ%ÎNR“ÙËèê,ò‰þMêË;;¦ñÿêN쵡d;& Y='‚Žè+åK’¾Õ+‡&˜s¹«nœÅ�îÛxµé‹$k„ˆ8Á›ŠíØú5‚b6ƒ¾¬f/Bx{öUúApÓ²˜N)¸w,ìex³î˜
ÔOA;@ TkÛÚRP@7lB7<{
°©û¥KŒÀB™
E“M¼!¤
<(ã”ÝH­-ŒÔ·΀¥c‹0Ãå¬Ø*œDM4qCŽ_s’á
råG_ò$�2HÃnæò&
£WºÏiÍù®ŒTª2èsÜ¡UÖ/�‰�7€Aà Ä›iqÒ�Ú/YÛY	!
uO@/‡‚Éc°�
ö
`

p€AüxÃZCá<!7T`�(Ã}ÖpŠ¤=(BxŠ
t’¡¨qh!”ÀCÕ¸r5JLCÉ©Ã%n´>W‰ÇIÓx
G%áF°"Â`q‚ÝX
÷4G¯DX ˆÅªB‘Kp¥$‚C7)Brãœxå%ð�Ài¬-}ÈÄ�ð�M4â:½|Àñ,h"—ØÃ}¾V†oüýC&‚õ2ñ¡Tp@£“Ü¥¦Ð�{Ýpƒ
¢=hΠ$ã°KHp˜•Üx2̨.XH…ð#/<<²ÄáÒt¤œAgØC8°ðÏYÍÈá êš Í·™BÿH‚4;ˆ(2˜cB‰Ò°†r
,˜CBâ„,"	JÔÁlrJ&4ч2Da
!+Ò�Å
#2!Õ*„!ÑÄ!°°
¢6eˆLg˸Ãû:›ªBCb$¥ºÉÓJˆfÞ-ØØ‚”ìðHA
8
.:‚±Ùºlûd*#FÁoJ�Sþ10¤
3oˆxÎÒ(AdŽÛR/9$q*ÆÖÌ¢ >oD!Ð)@q>®jì"ÿã:¸cˆþ¦2á*ªðüÆø¨¢+1:'ó´à4EL§"Ý� •F
5!ÑÀ<­ ,'ÆÀ"dj£ HDf�V±Ù‚Qìn਑Àä�#äTá0z	­¦æ×æ(pÎÐ1ä8o"#B*Ø"¹ÂAÁ;!:›&ÄIM
͂˺£jêÏ+ÍI
˜ÇVÊ
`œ(7<¡;è
%¾ŠPÆÀ$૾
„Pâ$`¡	Ì¡®é¼Ná�’ï
K.iìð
Ó�2ð³1“Ô2ÿ0�l±Ëo2)Q2'232ÇÎä8S4G34Eó
7s1S2Q“1¹Â03ó) ó4ßí
£†0m11m’6¯ƒ4{“17s0GÓ3a“1	I<v#Lî
‘BLªFª&D�
A
|­°@ÔF§Ð!º
© ¤¾
€Èá‰V,5`‡�ȉºAfÎâ`féaªÒàmTâ�B¬�šNÈ,`m ÄIï�üˆ9)‘9™3C
%Vn˜tƒ/XÎÖm.…�Ö`à†
¼
‹ŠjR.¡å‚$Dàf/È Qj¦�
…œ¥ ’¢}xQ§˜	!6¡¤Ø@Ê`\å^ˆÉFÒhf%¤â
ÒR<Àao@“ÒPР̬@C!ªü¸Œ¯q÷ݶÿìÙ.µq]:¦í1só17�°És#s!×s+WîpCÕr5·qP1Kò•qó1ƒvÚºvm×3wìs?“uyWtw“wiwuGsU7m1iC÷0Yt‡wv™t—×w�׋y§7z‹7rõjrRÞp’¯A\Oä+ªÆ%™¿ÂaƒHfã“lÌ^á òѶ`*8AMð@fÎB_xÏÀ"(ÁÆø× *ÂøwD¶
¡ža�!

Ú¸ŽÛ˜©¡�ûŽåX!
á


Á�
Áò@Ž	�áø@ô¢©ŽÀ
Ä Æa£

à!F V½7¶d½¥,ýy=
Ü7VÁÃ#
ÓAòÝŠ�<8dãiÁ3¥=ÌÐÅ�@ÛÙz«±}Ç—µ05ƒ”¢Uô‹±ùÊxܽ´&DÒ–:®@Íb‹�€èš›V�ÿ5ŽË£³ÐÎ;_3÷ÆdN»®Èë³ÂÖ›Ö2Š.Ko³5‚ú)E0ñÒ³kª,N
»¬¾ÊKÐ"—4ºÜ2÷¤³�?ÿló�>úä£ÏtéPåêLœ¶
qA°‚K�@ÊdK¨å­v£2Œ3�ìX5åÐóŠëš5Se§LdÐÀóåtÍõj÷’ÑAÍ�ÇÓÖ|ï³5[sÖŸ¶AsV‘|¢
}s´YGË/´QsêvÛ¿>ªÞNgÍ÷À°
�¶á£’\¢šXÓåOÄ1=HÉmÍîæ§I %qÝ)ÁÉ͵Ô<Ù³Ó
÷›-´8ÝË£æ8ÿ\.Öòb~ιmkíÿ®ûŽ/ïAË»®±¢ªJê×þzÍwÔëê×é´C­ùw¹™äª>÷¼ŒAS³ûÒwÁŠ}Ðêýîýeíìóø]ë¦h+¿9=»ñud­ÝÞS%ãWkåÔö³ÉÌ®\qÜÍx5´Ú-bŸ�èZU£ÒM�xc*ܹF‹ø�`)�œ±Î“¡xhMK�ÛäÀ•–!˜³OnƽV¤J³[ÍNs›¥X+H
M‚l’!­ªtˆúÑRRC¨!)JC–†f°"=¤“°˜
€F‚î‘“¤g6E¯Ñê+i²È27¥Ò!d6<¡Ê–bš‘bN¥ôÿ
B¼¢“5.Ž.õQÀûF%—@Ä-&�X3°C£'ùd^t	’“­ èD�ó "íE«s0<]É¡xš*c•$#�¹ªKkE�
™&b%™GTÅÊÌÁsKAy©d5Š­ƒ%äƒ62–åy°˜™‰Yõªä̯-Q{W®ÁÀ“ 7µˆG%ȵõ�4�!­ˆŠ˜4¨ròBm)<æ!
¶Î$0Ɉ[>+7JI=™æL]¢¨�L9hDVTÒ‚-p2�5ÓeözÒ[Y˳é]
Š"ÛžZ5d«ùóŸwaøDX©)“uv¬/àqôªœJà‰•� AHÏ8Þô¤)b•1ñ‘ÿéVžÎß¹âE¿=…ÿ“Ï�*BËöÎ_®ë"L‚y¬Ásà�’Ó†èê¿äŠ¯càHž×]²òEzà‚dëW«aADQ8©ž¹ŒÉüú%+žúöè�
m
F¾¨µ««Íí†ã¶¹Ñ¦>h‰ûp7C¶ÂŸÍ6U—–ÉuÁÀ÷ƾ‹Ënp9àù·Ô’Þðw¯hïb8Bj_à(F£ånå’ùÕ/gLm¶±J<Z
ÜæÊW³HÆì£5l~ùŽÃî笘øŽ~¡^™n6¬}¼aŒ39�HÖ¯
]k
|žâXç5ÿŽ_æ«:ïé¨c™Ëɹª\®À7†ÜÜ@wÙí§&¾Éçj,Ÿàššµ¡fˆJ>%7œ
�´oª,RnYs†…"3ãÕO±<‘n½…FØã\64Eø€�8��ãV�˜�èoÿѤÕefse0+Of(è¡OÇGÌ 
t5ú�y/áB¡Å„yÊb
�U:²±i %ÐF¹Hò!ô
¦fJà�ú¥ƒà1:�ú¦ÿ…À„ð#Š¥„úÖ ¤€€¨K�JpªK`ª6z£Ì:§)*¢Û
¢…Z¨(®!*®©š¢5Z®ƒ@®(
®ãÚ®éê®ê
¯æZ®6:¯õú®øJ®ß*¯èz£6úôz£ìZ¯”p‰Ð
@—Ð{�°ð
˜€	—À¡0vp	žà	”à~Á—	�à{ø{—p	ë9ª@	lЕ{@	”€¦ 	‡Pš€h hÐa@	�p{³D
®P+;²”€
hpJ{”�	‹ ±Œ€	Œ°´I› Ë�PµT{”2Ô\¹µ[›µ[;µSK›Çq	´I¶ë{ÿÇÑŒ`¶[ÛµkkµaK›R·e›	ZÛ·[«	çè{ZÛ•Z·�K¶};±|KµjÛ¶´©	!¶ ‹¶N[·‹�	X˶h·(¶�A[‹	šA‡ë·!kºZK¶ˆ;·c‹µ¬›º~‹º‚;»ªk¹–»ºkë�·‹µ®»¶¯K»¿{»¦Ë™Ð¿
‡ 
up
Y 	[`7Ûß�	u�	®€}ð³}P¤`±°7{Qû´]ù½´	¾†·˜€·†ÁÿOKÁ<ÁS;±f·¬·
,µO›ÁlÁ ü½&ÌÁœ·Lµ.ÌÁ€;ÂxÁyëÂ!<Á<ÁßûÁ�ËÂlÂ;l¶8ü´›ËÂŒÄ]‰Ä/\ÃÇQÄœÃÌÁ1ÜÄ+¬·ܵ-lÃ/ŒÄ¡{Å3ÌÄK|Â\ëÁ]Ì°
gg²›À	¥PŒ /k¸PkÆÜÃ&2:̵F\†[¶¼ÁeK¸´µpÁÿf|··K<̱LÌUÌÁ%ì9>ì˜ðÄzË*„;±¼¬Å¹ŒÅüË=L›ü½7œÂ"LÆAÍ#ÜÍèµ-²ëÌÂG¬ÌS‹Î%ÃAÎäœË1L˼LÂÑËRëÄó<иœŽå<ņkÆq›	~àº	»�`è 
ÔÀíÀÍø°(`éH

ŒÀÀ߸
¸C̹j
ÁâŒÄx·f�ËNüÄ&LÂh¸“½Õ¿ÜÞbmΖýÎ
LØÄÜÅa­ÂœýÕœ�ÐLÜÍ
îßNÄ=¬Ù	®×õýÓMÕÿíÃÌtø¬ß
;Éxà¯�³MÛÓ±#p�°Ç
 Ð†«¹¬	›0ÜÜ€Óð†LÞÓ€ÀÔÞà
dðÒÜà
j0ÜÞ�ÛœÀ
=
à-5›ÁU]¶S«Þ¼á*®ßÁŒÍŠØ_½ÁhK ]¶Ú¬ÁÅLÐdØxŽâpûç£
ÏaýÙ/|Åh-ØõœÖ¡½áå\µٜÞrûÂ\
ßh®Åý,ÁOìÞìãzmÎ~Í=êz½Îhíéq}Ð*~¶�ݳ+
ë�l
u0xà
•Œip	ÞÀ—°²¤ÌâPœ Ý
,�æ
Q‹åól²–»òû
f 	®°”±'{ô{€ªphð
”,µC»ÂŽ	uÍ‹°²‹à
Ç¡È5¸ªµRkÞo¶~±N¿ÿ�ØþØò½îbé¿¸ +µálÕ¡íÙfŽîȸ6ŒÁ
ÍÕ˜€¹…ËÕB<òr]ægŸÕ¼Äy×ãÍêNæá+êƒßáw½ÕU¾-¾%lÞ‡�ŽËìÁ¢]µVLú�º3Ìö¶Lâ[Ýïëùõ-º|àù½á
À	¯ÏÃŒôÌ	ºmàŠ€[k²ý{¹‡²f XÐô¯ 	”€ЯWÐôh°¯°áuð
Uð²âPšPO[W¯	YpÞ‹\yþªÐ³-K	4+³è¨
YÍVõœ Ûßý7þâÿô
ðÝâWFˆ†‚¼d®LŸKÿ}ú,bÓ
W(aÃ6\sE“>D»„/MœÔ¤‘DÄDÅ
Ç4Ñp}L5àX@6
}c
ÝX8`"®Š¥f"ª BSá5u¨
f
<h¤cÀÄG$6“ö¨F<œÀÿë–.rÙê|´ÅEŒ B=
_ZM_/–¾ˆ]„°GEÍ@ãƒX±˜ñ"žXÕ
=�=𾤃ƒñ4	Ö6\¢ð�CƒPvb­êóàÖoà¸	î!þ—
èDG¦�å)tÈ&Aƒ+ª:#¢
hµ‹0…Ýr£o„Ÿ®ñPÏñM�ÀÃS`†•ÀD5^Q
]<R5˜
C(`ã
3°7ÓÚC±‹�­¬•C
qA;Ò„Lw°=|�`ƒºÁM¨[Tø†‡ØP‡o 
Q0‡O
¤<s¨¡×éR7t¼ÉP‚�h„—;„†=T¬�½„È¡ÿá�l0TòÑ�™~½eíƨ± Ž
Ë€þ2|H®ž@ƒo¸„oøÓQž¢ò9oð:A?™Ð„+hKaƒ¤`*¹[„bC”1ÐéÈÓa£QC¿�À§²Nð
,ø±Œ¸�IQ	[Q
¡Ð„W §äÁ„W‘‰½¸NŒ-p¨H±èWû
š>;Pƒqy”‘P‡(Ào(À¸¿NPÜ
™ðK±üQˆYÉp�9¨'6ø†��$;Jø�K8ƒ�’/Äs™È„ã™pÚ¬8à;©°´`F 
*‚Šœè"UY
�‘�Ý�ÿ1ûŠ¤ó$
‹è‰§
5¨U�:1¹‘ ©˜q
昉6d§X„-艘¨È‰bû „-¸”Ÿ:Aƒ-h”CH„dÌÅ݉•X‹‹,0‹R̲H
SˆOx…, …‚À‹OÀ“{4…£pÑPG[t….“�MNxm¼¹¯à’‡‰‘0ÃTHF	æX”Zã0˜yù‰�«
O ™8
:	eTŽÚxªPàM¸„Ë@R¸ˆ[

…ÀÇÃ`´ã@?ÝÀÿÇC@§JX=8„J8SØ‚XPŽ�Q…G»¤ûˆ‘¢ƒ� ˆ¡“ß՘	¿"�ô™˜.R
Ñ£MË¢7‹áàÆÁ–A3èE™~ɧ¨™0ÿÈ„h	“¤ÙƒF¸aªžx…A�
°qh
L(¨@uàFq$‰œ”„ ‰É�9º°˜"ôA¼H,m”±Ø”±ÄbÍÄÚ	Ø|M±hMÙÕ”Íß¼KØ,JI�Ý´"àÔÍÕÎò@ÎŽŠŒ‘±ÞLνÒmìœûMçÔÆÜ$Nî|MíÜ+ð¬æDNá\N+bKŒhŽäì°h�#Ø”ž»”Ê«lÿ“é†
TƒÙµØ6

‡[ª¦–
€q(°fRTú¥›*1‚ñŽ&

Y
öœN¯¥4ììÎ�IÖóå[óÌWøuÏè¤_ŽLV¼°QóL�%b¨M^ž"æ…
ø�‹.å^r­Ö+.uÛ`µË ®4ñŒS`Í>s_ºUÚo-Ö_�“ V_aýÎ�aÖé¥Òâ´‹L,bŽ“ˆ³÷ˆ• �äÜ3˜‘Qšàoð—0ì-
L¨%>¨zª§jòƒj2èK„K0¥­ã�6j#†®&újÙòChh†>¨[ÅE¥ BH­"ƒNr¦žQT@ð�–Ë„ïI†î6¥yœ3è„Äyš	¢IÐ¥	
ZT9šþHЈZèzòÿƒMP†¶¦>hƒ^ê§Þhƒn¹©^j¥™ê…nê£Î꣦ê§^è®æ豆j­®§­þê³Þh±æj³N­®ê¶&묎k¯>ë´–ë·¶ë¨Fj²¶ë¿>j´†j…Ök¥1l«n9¼챞êÆîJ€M€yð‡Êö}ø}¨lÍžm˜}ЇtЇ{ð‡
÷p~ð‡v(
lfOYD˜!æ„ÈóçN‰A�jԧТ@“êTéS¦P�F…jµ*S©M�6EêUëW¬Y‘‚-ö+Ù³]µ2Z¤‰ÐE‰úT Û÷Ïy÷±Ð7ñ`Ïœöl¾§ÌgÉI'ÂãÙ³±Df
B8ùÞ<Ç=JFÓr½�Ë<KlÜÌ¿Ê“Sû„g™²aƒþèMlf[°SܺwkÞºû7pݽqÏüxpÇÅ‘3oÿîÛ9ôèÒyüÒ¢LpýÁŒ÷!‡*^¼`ÁBE6þœ
ecª’ÚÓH#™×eô¼Û¦=€5
¢‚Tªù)`„yûR‚ÊyëïˆÄ�ŸLœÆ—=dòe=Fli©“MŒ˜Ì4·Ü­Í(�6Ò_ð@·~|Pɧêä Ê–
wX
¿¼À–Aƒ¼ØƘÁƲ¿	
ŭȇ9)À©÷àµWH3ì­~dÿH\M¬›ÃnË­G at g+63¹Ž8ZF´�d�
ă‘@(mD
`ÐäE8ÍgüQä¹þ7»üÕ�•šôG0Ô€Eì`ÑQÎvãÄ	­N
Ø[%õ^r°‘É%³!ZEü¡€‚ÜÍzd¬Ù=èAÌÍ¡Î…D¡‰+²(fHÍb0D`Ã
¢‚Œ†J.”ÑT6ÿÎîѸå:×·ºH$u5Ù€ž×¼æInôø£Ô f±âYÌ2
ý4×ÈÔ‹0uœÒ-ÖdSÏ*¸—+“¼x»s½„5BôäädJBlú/¥é·H
�gæÎá$‘A†Ó„�â;̽ÞCÓþØ1îÚÉhpXl†OﯢE'MôæÍ
)À ½fÌQ•†%A†ý@TÍäŠì	î<—ËZo¼‡ÂÜÏhÒN$„ïÐÌeÆ뀄BÀžžˆÏûÄÙ٥†B©Já@FEü�°øŒËý ÄPÖ«ˆÍ¢Ù‡=5CBQm¬.q‹ÎQ½±Ôÿ8�ì•^Al�úPj ÓŒ�Ï
„{PWZÎF¼›=€OlpKÝÁ”@‘Ê
 ßü<DMD$`R‰XÍÕDÒÌNôÎÈÕVÁ•`d%ÄíÅH‹<#Ñž¥Á[|¨I£X	%¶[®èÈcµü„M=TÛN@½ÔUÅå”Ød´[iI—‹èËË@�ž¸ˆN†ÿhËdàÛdäZŽ}}YÅtmŒÈðDx�D�Íšia_«‘„·€•"¾V¯
`n­„pmÈ¡™`jÜÒ‰<žcXäÌ,":ΘwµMyUO>ÂãƒÉHr<S Ñ‰˜pE~d³ì‹ƺ¤=
--- NEW FILE ---
GIF89a9«
ð


!&$+*,,2
0-
333:	=;&*,436>G?DA@LYPZK`Qghl
œ¡�¢
¤¨«¥
¨©±°¦§©±µµ%„„$…Š$Š…#ŠŒ*„…*„Š*ˆ†*ŠŒ%Š’#“‹&œŽ —‘$“›$˜’"››)“”)–š+�œ2‚ƒ0ŽŽ=…�0‰‘6—˜$£�0£”#£¢%«®, ¤,¨¦(±§/·µ6§¨F„‚A�ŸK�«~¬ª{¶¶¹Ä�«´ˆ¸º”·º ®·¡º¼‹½Á–½Â£½ÂŒÁ½™Ã¿¡Â¿ŒÊÊ�ÎÑ�ÐÍŒÒÒ”ÌÍ—ÎГÐΗÒÓ�ÙâœáÜ‹ëê�ãâ—íò–ñõ¦Ê˨ËÐ¥ÑΧÙÙ²ÉÌ´ÍÒ±Ñ͵ÙÛ©Ýá¯ÞðºÝã±ßö¨áÝ·àÞ¬æç¬çñ¬ðì¬óò´åæ¸íñ·ñí¹óóÀÇÍÂÙÜßÝÎÚÞØÂÝâÔÜäÄàÞ×áÙÄçéÅìñÃñîÆööÓçêÔìòÑñîÔùûàÝÚâãÜèéæêìñçúýóìéóïðöðî÷÷ù
°ž}@ÀîßÀƒ€cÎ-‰nñ’‚çÏcÃf­›úlÙÔ±ßþÛÀîÕxWÿçNxméµiÇÆî½<õð|Ï–Ïû7}àíÇëïž|õ3h"…ƒ`ñÅ…¨QÉs4]l„w
uûý¦k÷u×߆ý! Àr$qHM_¢Å¨(a
t,®÷€
J.ž˜Šî™ñr£
LÚ§o0·Þ°æºÓ
`
ÌÛM9Ò�;¹�_üÁîX;�6Ü\.½‹’ƒ-³0Ï2µzcªêÚà†L;)%ÓO4Ít•‹H‘‡àXºùælžLú›oÚ79Ýr¬mòF3h§4õ‰[°j†�êT6n„ƒØD¶@&(`Ê6¦AXÙ	Ò°”Ù`5¿8ÅIlW[Äè�
±Å	
SŽÆ´¥?iP[ÚR�|A}é”IËÂðÓ¡¨O%êH;JSšnE(ç4'PIZÒ¡ò4ª'ýB–š–ò„3éËfB̺M›ä«W5§UÃ0@´

߸¢ÜÚô�k,ËÒ¨4‚G�hÔ#
 »8u
o 젇ͺ�¹v
 “G¹´Q
Dc×P‡
ì3Ë;þðij£NïgŸÙÚOw.®‰ìo’å~x·^ívœ»ã#/Ž¸‹Ýðˆ÷†åï>ùÎg‘ïj²{á+?úÇëŠ|/ÝÛÝŽÉ2žôq4ýÚU/yÚ7þó‹{ÞËûµƒ¾‡�‡üšþ{Ï¿^S4|}ðçî&ÆŸ^øχâð�ïyÂW_ø¶/›
4
»T*ä&-¤KBYP}²)ó0ïÐ'ü³/€,Ô4‚¥Fš¤)}âŽn¢ß�
ÊÐD™�Üó“ös÷Ò'É€C
¤Ü°FÂR¤2�´A¤
2Ô'†ØB
	Ë
t”
,4ö˜Û3©Õdw˜Ø0
Ó,ìÐ
v²9C�R8×@•è†ƒŸƒâÖÀ
S/Ób5U3/ëpùÙ
õ

ŽðB3ä (¨Ù�ÙðÍ25mBŠ‰Ñ•ÒÑôÑäœ
`œ€C‰
ð
P•ç‰
n
 
xçÍ›8oä¼Më�l6lËÄ�“†àš6q¼|p,Þ2näÄÁCˆ0�À‚$0
rI ¨àxÄÉ©iÄ™j­f2©?µ¾ì/Ó"óK2D3ÍþÒoM-Ù„Ó͹䄲¤Ð
³Ì3Ý\“N´²qP¤ÐºS͸ÿèDTÏñ“-?ÛŒÌÌ=5zôLHç|³BoÆ`�TD/Àòz
Éäh,Dý8l¿1į¼í¤ÌB
Ì:û4ûÏV+ÛìÓ_7z²æð²u2íÀ±Ð#íæó•@cÿ›6Àü¢¥k×bÜHXkýCÖWd{%—Ûgõ;–ZÊÔ�UÛrÇÍëÜÀ¶­³À[7Töºdo¥ÌÙu÷åwÞcé]k›÷Ø«�ÃÁ
k΀0T5QV
	V7³ÇÄù&ÙêþCq¿¾Î{°X‚¡;ØÅzI>°c”Ç3ðÄçN¶Ô?Wa�YfPi~ÙæšsÆy¾–y>ïç™…ÐdöìehõêÛ5Í×ãЛnÿº9€ŽTcU�-¾9MZ¯	›q–ÃôM6¥TÑ£×®7h
Ç›dÊIkšfÈ‘­dà
[™oši&œeV|ÝeÂ
^øpœáheÒ:>-l2[LŒDZøf
�œßÒiœl g:á]_yàcÓçÓš.­æ’jæ©ø�Gj¤ß›
‡9Ž\ÿHü°›ïaÃ|jqFZúò<þÁoxjQFÿŒ1�äu®Çó`C’ÿϵÙˆÜ2¦¿iL‡9à@Þ4ÊÑÀàycßx�2Æ¡=Œ4cxI‘aë–a at K…£DÞð$hüqäy±ûápÆg¦p$ƒuÌŠË8l÷‘q¸®ÉȈZœŽb€ãwðÈ˱CäÅî}_l†2V˜þñï7mdã�çº0õå…s¤ŸG¼÷@EÁQ?<\Î5 
Ïìeÿó†åð!Ä@¬D_€ÌH ¸
¨u¤WGéÈíص™©ÈWˆÆ1D)Œcã¤,¥)‡¡Jc$ÃÈH1�!ËY&CËÀÅ-‘ò¯
©P€°þÓ
nε¬l+0ørN�{Uà’C¶ÄhïzÑ{Ûô’½¶�F
,¯aò¸R[dª²&g0¼e-¨ñH6¾¡ƒzð#úðG í Ðf¨¡è¤å�
p0‹i#¤ó–§3�.tˆÓSŸðĸKwÚÓ‰Ç8¢�€ 2öìX
B‚V$(`Ç7½²S‚ðD˜Ú(j¬�¹Y¯�££òhª4;�OÛØõÂ$&�m7G5[Òyâ92‚
A.šhÁs¼jgF.ÆÛ_àœÑ>™×ˆ§Èà
ÄÀÔÀ
äÀôÀû³�nPáºN*.ÿ(7RŒS99‘©–ȘnY�sÃ

*‚ªªô
€ià(sª&Ôh5£š*v0€ì‹(’B&%±A>}Ò
Â`�kP,̉^¨©9¦Óº£

zP¡TûAÑR’nˆBÿ $)‰B+D�k
›€
�ðˆãˆ*‡+Š
±¹ê ”þ°Å뙎¦ø†ÛŠ‰
Ú”dèE_”ÅÙˆœPŽz
µˆ�Lâ=VÄïrº!#pX£�y::Ú#ÍÄ1�P„ºøŒñ18Á2í G¶èÃÉ©ÇïøÇα¾ùCÁqDHHC7ù˜ÁÐ,	€Õcÿ‹™D²l¤Ò{Ç`¼È˜q™õÉ”©	¬¨ X&
«f¢w¨†¢ú'c"Ý 	ݘÞ0Bw§ƒò5¡z‡iÀÂi ‡V£JÂðªÓR­!‡kH)»‚
YûAÞðBÑ-€†u¢
kŠ©€XD¦â³Búj5w
óÌÀŽ0~¬ÄÇ(ÄP	�„±��t0WÉŒÍ8ÁNÂGç0˜,/ÌEò¸0Ì´L�¨ÌʲÏtA‹È�Ï»��!MýøÌ–é¤Ï¬ÁúèCpÈ»6;�QY�ÓPÂqÁÿÆèD©�ˆHv¡/
Á
ª˜ªŽºç”Å¢o(#�wH#Ú¹Þp
Jù”/�
’`ŽMé0&Sq(‡’¨"bŽÚ‹ix‡‘P:ü
àH¤Ò„FªDŠo(‡g̈RÜ! í£Ãçô†rPr‹i0 l	¤ÈŽ]5â�ø”µŒèH
öD5‚O[4MÓÚ€¢iÛ”lØŠ�ð.Šd‹È‰†ð×!‡
„ØÉžõŠ êÙ§zª^jK �*ž-¦
Öˆ¾Îàòà`–ûªÃAY”þøà~”N.aVàáö–a6`žá¶áæá:¡ábgaÈaK#b9ù†á±ÒééÕ$ÅÉØ6ñÄØÈGòƒÔ«R
€ÿjB€>Ud!!‡X5ž´PP‰81iðž§p
<»�Û¨‰às®õkª¢ÛÉ�ìó=,‰5úB4r@��"èÃ�=b–¢|
xh
˜F2q0	Ø@4Ø:m"ìã
x JlÒJ(¶+A’rˆ=x¸i‘q3€³gŠƒg|¥ö¹ºÓgÃ;k|FkWZë|~g€hT’ëQk‚h·Æëv®gwŽç¶v»²Ž†	¹‹ùšZæL“b0ØȬÉÄx¶P†m0ÍŒ¸ŒlPŽo؆lØLD—¼Àñ:h(/1Ã-°ëc
�Іkp€¿
ª9
w…ÏøjùWøÛˆI(†嫉‘z˜&[Œô@´Ûˆ�šø'­Ð=Ò)«qÓÜq#'Ž¼n¥Á“VŽ›;‚
Åäæm™·ŒÚh»¦MÁ@lârëOœ´zËıl9îÚ¸‘îžÀ­%·iï®Í§í¥8or+‡Ñ¸Œâ’"Íè-hƤK3~sZµ©S¬Y�&tÓ¨Y¿†
»õìS§SÑjeëöíV¨iÑ2½
÷.^¥Låf­Êt¯Y¾TÙÿ®œW©Z¸†ÅrÍæ.€ÜÅm{#'”7vä„ñóÅs0_:f¬öÛ_½qÕîåÊ5â®Ü
ЭÛS‹7µµ<xÐo¡â‚'ÕæmZÂ�âVÞ<Ø�`KÄ«£6S›MnónÃ[Š$*ðàeÜÚ{&Ï2qv–ÚÇ«7}¨ÚóAqb&Zð2¶fã°%Ŷ_?Þ`SÙ€qÙ•‘2–yó
FÕ�Ó6å(£Ÿ~]
Èß8ÍHæš[…öaVa­õTkÒmU
žÖ\“q¸•Y‰iU–‰c½ˆ–_‘…xXdÚøZR:ˆ-b·×läÜf@~€
hŸ�%a¦Yã‡äL“Àÿ5ÝX“�A]r0õˆ�NÓh
�s›oT«G5{{Eu³ìY„T37uÃæx·‰}{â؉õXo
WvFÍiÓͤóŠ€6„>užRA}­6àPi˜”ؼQmÕÞŒÇl[ê�Zß×{“×6ß\
(.¯"’‡[ÜOÁ)ßÞŠn…·�€GÞð�›f4�%
-±[(FŒ£Tn¡¼:Äx�2RÇ(˜ìª<¤Œ wÈ!Tç¼óg¢õLÚR‚eÒöóhR’6}öÕ÷ìöÞ�ö<õÖƒ_½øÛ�ß½ùákO>ûß»Ï=ÿ÷è·o?ýëã/ýüëן½üö§>Òì�gý`ù@ÿéo� ü
x=¾/~ü£àÿÄ÷À"ЂL_8A†Pƒ#a%x>¦P„+DaïÇÂ*†
4á+HÃÎð†ÖƒÒ	
سÑ0JßëÞAƒCó1ðyK<¢úœÈD(&‘ˆS´^µ÷D,V{U„·F,ŠQ‡d¼â¥øE3ª�MÔ¢ó×Æ5fQ‰q|£×(G8ê�VìcÿèÆ@zq�],ãóhH&’ŽÏ{’hL†Ÿm`pD,`�¸1ëk7A†oh“$@qc%	»ˆ7¤
‚häÎ)3ÿqÜ€G€�øÆ7’1¬e¥9Ü�=¼¤Ì,YÆ©„"œ¸”'+úŠÇÁþU;¶,
**Ú›n”ùË s6÷9K�ÀÙr„cË
|�ƒnoˆk½åù68Þ%žï:ð½ïuÈòÀŠtÁ„صÇVJ2^‚�I°”žyç}ÿ
ˆu°„Ën––¿­IKjîÆ8
¦<ΡŽy ¿õˆ»¸‹
zcítòöÒŒL¢ç�tÒ“œ¤|(
Ñ3Éo>ôyÆüå+¿òЧ|ò­Oýé7OúÞï~÷§/þí;ßy�?ø‘?ùï'Ÿñ_0Cûyò3?ûô¿ÿøó�ÿê—¿ÿù?ÿUOÏøœ_ôqŸäàùyßñiŸõ=ßó}_õ%`åUžóýÐñQÒùüL ÈŸøD þ!`RŸõ= ýE_úIÞz ãu øpÏg<-ž ­•ÂÐö,B
!;áž¼C6(ÃœÂÑ™
¥Oû0Ð
j 
‘ü=äUãö¼ ãmÁ ¦�
PZÑá$®"1z¢
cóqb&žã:^Å!.–ÿâR#¢þä‘ûÌ_
V^*^ÉáÏ„c
úã#©¢"Þ£7c.Š"9é£AFb*$CrP8b M$qÐF>R$¢�@2’"�côXÏ%ŠÚ)¢¢H’õ�"~$0úcö"=®U%B¤DžÑJ#Ú ÏHbÕ$BvQEã.rb<ž£ø ‘&
RPÚãÖ£:äOÎãGRbSb$@î"ÿ0åHFÒIc,úŒI"¥
I£'ê¢ád-îäNêaV 
*š†ªa\ª¬þH`ˆê§Ú꤫®²F«†Œ¢NLñèH±öβ.ªÆ8è`ÜÅͨ�΄FEj�Š¾…�Ø…\°hŒVÎÂÄ8À1D/Ã1ƒ0»²ÿ«0$ƒ0 ƒ»2Ø+2$1è+2ô«¿ƒ¿&ýúk¿â+Áö뾃Á¬¿Úk2àëìÄæ+ÁC¿
,Á,ÀlÂê«Çì¾rl¾ZlÀÆ+É
¬Çî+¾¬Å¢lÇìÄJ¬½.ìÁò+̢콒¬ÌR,Î:,2´¬ÎNlËþ,ÅmÐŽìņlÊJ¬Î~l¾ÆëÅ"ìÒ"C1ÄlÃ^­ÕNìÌf-ÅìÆ"Ã×J¬ÓþkÍžlȬÍö+Àâk¢-È¢íÙŽ¬À-ζ«ÝÚ­1C/œk¶¤Ë|ÒU–�>ê’pFõa¤gè©VÄX³¨ËŒÔ…Y�˜.i
_Ã
çLÄ/öžá¯0›@J$�4Ãåªk2$C-GC
HT ¤<²ñJÁˆv�•€¸ƒoÙMe4®QÁƒeØe(WŸ’’eäDEÇ€E4¹€Ã€ÄD941ºà
6ü/Í2ÐÆ1_t °DMcCQÕ2È‹SR
gƒ1é‹:—g½=!¨ü
9Ìe¤³(óXÉKL+´¾|8ÄP“§4n Je–1ÌEpRnø47Läì‡Dãɳå“Gp¨E04SsCØìgeÄ€ÅP6O�
7ä´W„o	Š(=„CäD ¤Y±ÜD< ÿÃqTÆàìµ^ŠJ#†–ì¨,À…9ͬ1üBÞÞ2ßÒèÐœÈBE*Îèò‘óÐêŒI�7dÃ7lƒÌC>ðC?øq·>ÁY߈8ÈŽk<ÈIÅ…©ƒá@Gµô†ä¤�«\ÇÞtðñFoxwÚxZK¤Í©Ì‡w«Ç縇z¯7{G‡8\y|÷Æu›8Øwoàw±±„}Û7|ë·yôwKø{Ów�ß÷�¸|›Çó·ƒ#ø~#ø|/øzÏ·;„΀Ç÷ƒg8„O¸ƒÏ÷{;ÆSxƒG¸‚sxƒ{8„ø‰'8~SøŠ?8�Ã8ŠCø‰«¸Ëø�Ÿ·�s¸}ã	L¨ÿC
0K2 Û~Ø“¢ð
Ø4C8èÇ8¬K:W‡2WÆ4ìSHX3øSF¤Ju¼¾È•J»t<
®Á8SL/¾ÒÂeXšfà°g›bÿ®¬m€3뱤ڪè$ÿزðÀø"p'˜ÄQfœdÄ)‡/ìJÒ�¥Øt²¡q¼);!¿còÉtî¥�"Qm(¯ËÑ®¬‹º!¬
CNãV-Að¶ìK0¸´s
ré5ˆ
Úd -ŒŠpÿ¾¡JXê(ê5´qªC]ceÚpª²œ:,¦êKªI�ª6Þ�Ô¬:u«[VRÇqÕ¨fCÜrêYÑ*¬lœUqkýªâ¾W³ÎU­rë\Ý
×·Žµ®îÈëXËj×mì®…]«^éÚÖ¶®�½ëa¯ºXÆJÖ¬võ+[ÝÊÖ¾æ²b}ë_kØ»ŽvLŠì^CKÖËú¯ví«Z�J×±Â5¬�…ki7+×Ãvö²|mos»ÙÊFã
NE�žÐ$˜–h8MiUhê‡æaL=MM`4C]S†$»Õm©N�ƒ&’Êe6ã�Kr�«]’öf&½ÉImÒÝôzCJ9+½‚Þ¹ÿ¸·5ñ%/|Iyßíª³K^Òo—œÄÞ’Ò÷Àâ-°@ýËʘ¬—Â�™ÐI¼íÔH`aJhJK«HeHòåˆ=½r¡ÓŒR»F׳wÆVMvk\§ßؾ;öq†eüãœy¾u±‘YìS$7XÇDÎèób¼d²p;Ä�Ê,£ûüòr'Íy2WÈ‘
à"ƘÆ1Ðœf5¯™ÍhŽF›ág9Ï™Îu¶ó�ñœg9¿yÎ|>†Ÿõìæ4:Ð…6ô¡�hEÛÙÏ„f³£éÜhEKãÌÑÀZd'ïR!Å;ž²\•§Lw”�1È©é›ê%Y,çÈ
õm”ïÊØâd™–ª¢8�]S8@®¨ÅmdKŠÖZ5°¹qTãø
Ú4êÁ�ï‘ã�g¤ãt€£E@@~)w÷ÆÄDwc#ÓÀ
Œá¸í”‹ˆårG3Æ¡�ŽÈÇ©ñ@QªÚW�*q'UFG²'¢ŽÏO>ÉãD)¾i ‰Bùü’
‚ãkÜÞpÇ1´ñµ|§ÏãFªŠ^r àˆÞ¾†�’‘«îQçê®<�KL8�6Ã…‚ÿ 0¥E¡.£O#P9Ê!
5
n,*ª
À\·¹‡
QéSÖ
ÅRæ§W€°aQ@ÆXeþè
(
EŒÉú¨‰ÏA
ÇHI#Š§�GÄÿV�ÄÀË1¾AÚáî
ö�úÁ¸Qx Çzd~ ÌŽÁÖ†
>O’Á’AÙ‘‰!Ðä‘kmvMÖä‘��ù
­á›¯ùÈ3œ°P
zÌ‚S�ƒ)è ÔŒ£õPÊ¡¾¬‚bLä�Ib¸�*¥�¡~âJzT˜º
�á 
a¸¡âg«rE8Žá]:Np¤¡hTE\°�[Ia®U`0ÎÛÄaà¡xƇ[‘ïš°ãA.B®akŽ|’¡\ºGòà¡;áÁ�ÿV¥_Çájˆð¶‹ÁH¯5¼,Õš¬cJfS#Áj‚zðDz\‚F÷qY-r!wrëDE'wLPô•6
Tˢìf	9®¢”JV4Ê1ҋʺ§Zu´o%h®áº“v !VEýê�p¤!«†Ã(ãa¤
>JÇR¸¡`VißCENnéŽÎEX
Äek`hämU¤akà(l£è'”u¼í'°*
Óo!ö�ºl7döÇN‰Fþ)3yÈä+7¤¬Ç(wËN
8ð©öF£¾òäcwB€Eÿ_¢£¤Ã/dje“#Äd”¢*ƒF]�ÓW@¦!
†åžÅ¸ázUä'°�z�jrå'ÀgHê!>À‡:®in‡kË�¢Á~dEµãšÄG;¸¡Ž�Œ|¡…CÎçq¤†:®¡Ú§è®ZäaÈA$Iú,eÞc&;n8´#�‘Ö‘Ü
hÞåZß%d€FJGàÁsfwx¶\J¬tû'ÎC�
øœ2
0R,¤4Ö5Ì'¼¬…-è/(*2÷d=y”ÿi&nT,8•ö΢q5�7Ð$xüi ÒŽB<Ù<Fâw
öšty©£w$:¬Eû¨@ NåÚø‹|ÃÇqg:`¶(†|ÈGä”|Âu<0´úq¶#Ë‹\GµÔôÄ°x:BËù.ò(‘> #®õ“a–'|/BVL5¾œÌ#/ò–\Ê‘<Êt‚õ|Ïù¼Ïý¼IÇ�ñC•ìáÔ¤®Ûd¦n<ÄøºU�"Æ:ª`?C#·I´¤¼˜ÉŠ¿ ¬¿
‰{¾(ÄÛ=28¬ÛØa¦~9p+ðý¡
Ø–ÎÖV2"7�DÍþìGt×Êž×оíÝ~í9/7ÿÑìmhÖÁƒÀO’äèì$Ä#ªÖG½Eζ,Úýv"@˜AlWÔI7È0ºG-¶�ïåˆÔÊÒŸdÖý!jHµ#û²3¨“
?m½AE´×0Ôì;îß¾õ]?7Õ¾õWß4éqÖ¢AôÈ"»N™ì·%Bö0C­ÑkOÓ6í¸*‚ŽpO÷~ÈŒæ´ùÝ™Ÿùqˆ/¤ßù­¿ù£¿NÏúë”ûßôG e^‡ƒz!
R

(|‚2
Ÿž“òY)�ÿ•w0Ñ@–b¹Õšc qCŽ7‰…NNX†Y­aÔŠYm§Î&Ø6?äÃ?þK¬?úèp
7Ó´j[mÛvª`¢ÿ	àÎ4´™UÖnÍì†Íne5CcÞB«Ìn[™µc¹}ÓŒ2߀¶-nb%6N6Þdc¯8Ø<KÖºè6ó�2
æoƒ\árÅÁrÐ…n‹Ÿ!nèMQ"¹Á*pˆ«"œ™lÀÁ,Úˆ1¬ ¸XåDÿ)‚cNäeÃ
³lŠw3`

+KÇÉÒn®„–U˜?®ÑT©«V!ãÉ~&s{.«*A6
Š­ªÌáŽé‡ÀAð•Û€\cöØW¾=ƒËü «$b½)ÖÛbW¶¦‘�¢xcýŠõ¥
 |´#Ç4Ê�.o8ã—*ŒL•è�Vé�U“ÝdèWHž
‰]¹_Q¹H1¡.U‚M£«^u± PŒ,biPÈâ°�µƒy¼…>(–Ô
Æaÿ‘Q˜6Z²µ-r¹®¢j±zÖEBÓU#\áv_˜*QJÓ‚¨<e(»›?[¦2”7ayáÊÂRÆÍ0¥Ü"#¸²Ä ÑU•é!áÀp«Î WWYÝ«&ýÇ8qaC"K™ÈJ°,„\ƒ+Á€5âa�šÀã
)
ÌŸw·
I³ÐTŒ¬åaöhUÞ0‚à
ë}}Ö_ã¬yck
(€�ø€X�øm(oø�‚Øn xn"x‚$˜‚&øyyÕ€x�˜�.˜(ƒHƒ88�,¸98‚;X‚@¸‚BØ‚n:˜u�£Xàe0	°C9Á
Ú�
9Aã@;‚q]]Ñ
õ 
ÞàS²&Öã„LAfEÝà
AƆ9AHĆñ°°€0XðY 	�ñÀV‘åâp
Ã5Ó RFáZ"!"•9
dÝ
àu š]pð1qY±a‹¤¦Õ€eÚÃŒ…Hˆ‘Ǩ†GdñphvÓòHŒùŽrhŒ!éŽÂh-Õ¢
å°@eðŠ
à
Öù-F~&
X¤;¹%D•äAt8ÿ
àp™|³Läl¨T¶Q?ýÑÔ–¨ _`’€
°aØ:Ë£,#FÑ – R¾*‡×š×:ñÀ<ÚOÿ)Tzs7 	c
šÝ€
Úcd‘:ØãQP>2!QîÐ
ê
Pçy§³ e®>æ
Ôr]f„Dœ6

 ŒW&
9e(•Dä@	
à“žƒeqƒ=â€

ÿIÁP
‹Ô9Êæüˆ×
Ï:ßœÍÝôÍmÒìx
ñk
3à	„�‚Z €±-}P
ÍÎ=Íë‹á,Ô
=ÎqcŠÚ IMÅÄ@
L0[ðÿwîWv«§QÐàSð‰°x`€¶N×z„“I@	
P?Ê°
D¥‹Âh
EqMÒðïHFõpÆ
t¤‚A‡“Eá
°™NÇËÉPt˜
ÙZí}ì7ÜØö ~`SðXð’y\mÚƧ}¸ÙÕ-Ù°Wo¦'{ºÇ|£]+‚Rà‚ð ‡0~ _ðƒ#8S
XÜ–‡ûÿwn'¯öÖóíwým+Ý„^s÷ôp9GôäVèµïx¥Ú	Žà¸Oý«‡öò'qÑ?oñÞRoåk®ÿ‚ÓI¿mÙoÙ×~¾$F ƒ}úø1ø%Ì—/eÀ�AØð¡À‹3ú	CpàÇ‹?bôø0ŒÉ‘KšÓ$Ȇ1f<ùòdÉ–)ej̉Q#Í�>}²$	RèKœ5W¦	Æ¡Í�.OŠtY´¨J¨AGV}ºó¤Ó•"‡Ê”*uæWšLK"uhçÚ0i–�k’ªU¬GçÚ,rf_®J£.;°¤×›QÓr]*éÉ@7ã2ôSLƒS5oÞüÓ.çš EOÝRæ‹ÏCª“íY£OMÎÜÊeÙ�L)Ö¥F˜1�œ,[mî©ÇñJ®Q/F§uy÷=zð'[ÿ´^½*�ksªpèÄ/gI5o[ÚâÑߘ˜<ʾrW</Ç¿çµoÍ1v`·d›Ì¿í´sŽ½ÞÀêí£œª
l½]+N¬õ(|«ÙTʱ»Œ{°¸µòk�9Ú&쯫Ú$»ê<äí«éb‹±;_ìî,3ı/ìhji¦èì¬ö„‹G•E˜ê�Â9ŠŽ'²*T¯Å²�\É#Ýê‚é>ÁÒ
QÇú”\L ˆ8š«'ÇÈ2’)+tïºïš$+¿ý0\PÌ(dR¶£
w98m
°IH[„É[ýž4`ê^;ð,;
U(¢ðõlA¯rÑ®ñø²c‹¡ûéÂÐft¸Ï3CͺBUwÂ}=öµ7‚�ƒkáVat:mæôPçM–V*Unö¡Eëš“Øn¯lÝŸEÞöSwý]Jød,oXÅ=Êz™«˜µiíÓ‰éê⯬^¥•R¸ã–{nÿºë¶ûî»-Á{o¾íÖ»oÀ|pÂ7üpÄÿ;qÆï{qÃ!w|r¼%¯œòÉ#‰Ä½×€›’I–˜
•/´$;¬¼QÝmTÇ›l¼y=ö×e·=›ÚqW]wØs÷}÷ÜW�ÝvÛgÿ½wà“w]yÜ_§öÙ—G~zây·þøë•Ç&zì»gÞûé³ÿøå�ÿ{ôÏWŸøêÁ¿yâ±¾øõÝ·?ý÷í7zØo÷Ÿ{éÝOzùK_ûð¼Ýyc{
4ßõœ÷¼øP‚ê#`ÿ¸Á
Õ]puäÇ
ä …@D&@Y]	½ñ
–)dá
YøBº†ªCá½!ÃÚÐÿ…8´a}øÃòP…@"WWD#‰3¬¡�˜D(FqˆR<¢êvøÃ%RQ‹0l¢³¸Å‘¯ã8.hFqhã
RŽ‹”Þê
iCE*2†U„áiGq2….ÄãÃøÃLÎñ‹VL¡$õ¨BLž2‘�td+óFJ®ò’SäS)Ê~c…Ü /»¡F:t&0)D¡M)».JñuM,"GIËzrˆÌŒeIIÊzR†Ï¼¦3W×EkÒ°›”Ôæ&ÇÆ+–3‡Ùd¢uy;“œçÿla,M˜ÎOÞsža¬!;i¹ÍJ3Ÿè$èeØO}´ 
�á

®Œh/ãç¯#G7ržW^N£âÜ(Ǿ‹#Úâ€G×�-�zLƒâѣýarwÜ܈:¸§q€
]°ÝP|“á^–ããP²ÇAóf”CbÞ†j±±u€¿®,oÆ8ØMw¸{ÃåáXÆŒœ�qˆÃÇÀ¹á»C|:·ú4†ío2’ëˈÇëŽqvp`ÿcÒÉÀô0Xéh
»iÿ¨‡¦”HËNpHn¨h¨Gw°é“­"m
h6*„È*|C¼A¹µB
ˆ[º}C¼ÅÛfcÛ½ÕÄœË[¶¥ÂÀÍ[ÂÕ[¿Í[ºMܺ]\ƽÁŵÛÇ�ܹ•AɀɅ\̵BÊÝ\Í­Û¹•\Î
ÝÆí\Æ]Éí\»MÝÓMÝ	D]ÕU\Õu\Ù-ݸå\Ë5ÝÆ}]Î�\ÒE]×¥[ÝõÝÕ^È%ÞÓå]Ñ¥\ä�Üá½[
P
æ'*ÛafgÞ"!ÊéšRg�þé^.fš†æ�~fP›¨rv�zƒ)d²§Nú¤î}�­b£y!ãOÊ¢dâ&†Ê^íM;wEüª;­»¶æ*¾’³1
=ÐÏ,½^#6t¾}ƒ ²=p=¶:;0j<j­¹Ú>ix‡Y«¸ÚK†wÈ!M…¶qȶk1{ìYcʨhpÓ¦ü£´[†Y»ÖžLl@×#¿{ʆ“ÛlGJ*¤nm×~mØŽmÙ*qÈâ»(£-¢	;¢'õ Ö�Ž/衦Â%£–#–¾Dæ¼­‹D—S­‹Å8±}=éS­ìÌ~ÿ‡L?r8;nH;rH»³Š¶Uúì¨|½´£fºã7
Î;J6jƒ`’õ)ó…-i;°mµ=ƒÍÙŸu©ðB†xOãk¬x¨…ÿ7•-TÝ;¸ã$¶5E)P›m§rµC꣪pWcmÏp ÂpR*$wZ^.%=r¡ìì^Ù15mAÉ.f%顶3J2_n0€´°f€
�‡lø%
hȹfë†w€†
À€lMžÓ9°xˆh0€x@!4ÅÎ4
؆ºìö½BõÊ×¼ÍÖšE7)u8Í$5Oz6ZP9xi;Uœ…ÖqØáoÂyHŸ7Ì9•ÜPIM'�€Ï
G™[ß}×]ˆÜ‰H܉xô
g‰¿aãN
d\
> E6®ª¢N¬®hš¬‹ž©’¥€ú‘§Uªtè8Ê4#(góy&Ô¦¬¢ô6Ë.4¡oý±eq‰×]uxQ¤S¶�5釓íù!%v1òŠÝ�7Zä]ÜPdÀ–Ýt£%8Ë€97`N¨$¾YjKॕ†¤’ýf	¦Á‚N9µ”NBßqTi*N9ñà�Àú"‰$2õ$Ž_ïËÐÆ“#²7ñ0<0É%ó×Ʊ7M=½ÄSÓ4Ó¨lÕÌGlpÐ~E˜Œ;âHCÿV­	ÚF–sÅƉ�[s¬-g#“3g=ÉTDkgè	XNÆâdCŽ~ÅÈ Ä>Oع:a†ÙB[›ì”¢mfU_uWQ—��²2mÁ ‰Ä
;ë=ùEb‡1fß2Úëm�û,Ž;
Øh�
ÆÑ�,ÃÖXÿ`í@Ži$ äè†4ŽnÐîtÝ(GÇâ‘…	@*
û_ŠAî󡨃""ÀRFžf)*“äÀ㸣jˆ’„„ÄÀaPE\B§`êRÛqHµ`Z6Ë#iÆBØ©i`ä'Ç	ÁÁò@�d%!´G4’��ßÄ$‡‚ç…P/ÈR‘*³@tu(™Ôipñ‚ Þæ„ ê‹K!;Ê9ŽŠCQ é­B–Ñ0$}½“9AJ4bàc«ÄQÍh{ÂÐÎqžë�&Y/f3Ñ„æS/Åh<vµ%Å·M•—hÜ"Ì·Ê�͹ 7™EÿÒMWâ€h¼C

Î:ÐJTy»ý5ð×J._ãzCÿýI(7qj•þ]å¦kð¿PQ¨##„	Š1mE1qÞ€$Jh€Íyˆ
žäËyÍ^�<àz‘Q«xÛã
h6(–8!5Ξ4îb‚²#;h}(�þ§‚Þç7fÇ….èƒèY`:î§8†¨~è}ˬœc>‡À´—|I&~ �°¡%ºŠ=ªhœ¸[ˆä&!F`dˆ»qS�
)�i‘©‘¾á‘f¡’2i“Ž¡oþDŽòŸŠNÈOd‹Q„çê%}5‘ÒŒAbgÿ6íD€ÌŠR
\ŒŸ@vE’zß’ “¶)•¾éœÂi�ÞW‡°©wÈi‡€Gž†›’ǘä!ˆlÊú©ÇxúãaØ—˜V¡™¶ßo¦ˆp8Ù1,K<XŽ’ù
x!æftj§’
b’ͨ‚ÙT¨rjªæÖ§ò‰ª†j«nF©nª©¾*­Îª­Æj®âê«êª«žª¬þ*«æVª*«‚*¯Ö*°"&«îª²ªª¨–j²öj¬B+µ¶jµþE©.+¬fë´"+°âê¶þª§rê°ö*ªZ«­bkªºƒ¹Òj%ë³ò‰¨Z«®š+½6ë´¢k¾J«©Š+­ö+¸nê¹^+ŸH«;¬Ì²Ãÿ;`F‘œ‹šÒL¶ôÅí#|Ëa€
{X¦qúKŠbfPFf¸P4CÉ–¬1Ê¢¬É²ìɦ¬1À¬Ë¶ìÌҬ˪,ËÞlÌ®,ÍælÊÖìÏÖìÎíÐÞìК¬Ð¶lÑâ¬Ì®lÏ"íÒ>­Ï­ÒíÌRmÐJ­Ñ^mÕÊlÒú¬ÓVmÓríØ’mÙš­×š-Ø>-ÉFƒfTF¤^ þå›zl Å2Œž'í™2ùh%ffÎÆ•ì0Úm2C2 ƒâ&ËJC®8ÌGÐRÌKGlØ7
Â.Ã߉N¬­La!ƒÍÀt*1O,"_<à‘DaÅC5DŠ¡Ä7¸C4ðÕ@D+vƒ±a‰‘ƒ6ÜY7äò¼¸CM,ƒÆ˜ŒÂ°‹�e�‘ƒ0 �YDPD7¨Ã�bÕQlKœ;ŒVI
Õ0 8cƒq‘˜_,Q¥—QÒÈZ<,ÃÂÒ”¼p½pÃHýÓžÅ2˜ÿÈ̲C5ßöWÉÖÜjɉC5œ.-
†6LOH`”$=®ó^ôš��Mؼà6ÄgŠË"Ï\ƒq™œ8T3H�ƒ
íLE\ä)rÎŒŒDIs7LV9$�è´ëfÃâþ1®[£u�Ï97q™”(j‚ÞÓÜ“HÉÅš[£öíÆ�ù°:¤Ã=Ü>ìÃ>äƒ>ÔÀ-™ZHÊì–Û…#„z¨ÒÉÏ5ÞÏÙýÝë½ÝóýÝSÅÍ©¨)‹’‰ž©íýáJßã½T\žâû=âJ�ì½ãCþþæ	 pEP�Cˆ‘PD*¯þZŒMÞO$Ÿ]å©…ãiŠºH¾P<þÿÎñ=ì›ÅëË>íßþ�ä¾î;~ïû=¿LEìû~ïËþïû›ñ'HÂ$;îb¼;ÀN®©± —À”‡¸A&WCI—Öè©|ÈÃ>�}?ˆ¿?�¿?ì
ÖÄ‘ƒ¯›;cäÄqƒw¬›5zÑâ
{wM\¹iîÄiÛÛ¸
F0YvíÚ‘%ëŽìûwïÛ»sþ¼øð齫_ÿ^½ùíó“#?þ|zðûù÷ßßÞ¿
*È#c�!æᅠᯊ<Ú˜ãŽ=ÿŽÈɆBƘ‘+ïã”7N¢a bæc†a™c–]Žèf™užù˜ë¬Câ�Jb,ufèæœ�¶Èåa²®±ë²+Yåª;Vúe�lfš ¥±¶l™c»k¤Sþ:ëŽrFûëd¤q
põTÜGÇÍÌ3»œ7µ|íÅW¶Pù-tÒÁÁi&àÒä€
Eh%ºPŠ"t¡x;è*
ŠÐ2VT£«D¤ÀÚÕ®†jt¢'�(C3Q�²”¡U(D+ªÒ�>Ô¡3UiDišS�®T¢(uèK

Q>¦Í©LšQ¡B4†›Ò&›qJ>G3£!“¿àu(x¡ÿÉ`å½HÙœ:Šé_Ú$s“ÆD•&‡ G=rÁ€
‡J~±µ_Þ­”áÄkVT�»é¥ÔY¿èŽ
�	…“éÿL°½1f
{2ØØç8”�ÂSÙ&ÎëÝ® �#§q…¹P§ÍwÝnm
ÚÝ â¢Øœ6¯¹Ð…‚ó	'÷>G¾©D”¼æ]ÉŠ6¯éï¨"eå¬j²†ÖL=b2¡@ã|šP5€5•£`
ç
ÝŒü£Îü]l̹n•ºS�	¾©Ë|R5a]lÚÔïJ­µ¼êöcsŠ€ËNˆ׸Æ9`"m 

4ªÍ�HÆAˆ¸�ÖJÇp!Äaº6Ì$Í6Je[zèp�¥8ËÃà‹%

q%Ê8eŸ�X~(oD#*Fcô`PÞ&… @M»Èð60L
‘­“AVŒŽtlãTŽ
*°×P(ØL%Ô:±ªŠY~­&´N4x¥‚�ÙvåÄÁV2ØÈaíÍ+3¦¡¸ÎÚâ�XZè´áW´®Ü!úNSlÃÀÀaWÆA`¥©íÅÄÑf¥VÆ
‹º±ÌØUºQ9ŽÍYŽ�Ä<Hk‘ßج�q»:¯ÝVÑÌt1Ýò¨?lªzQC04îKV/ÝD_ÂÅÀbQcð�Ðp—(Àq†¢¯�Í—²BP³zGêaB”ÿrBV²t®
&„âÌi×p¥æÀ—þiæÜaDÎAÌ

•2à?å”
'c·
®aV´A
°Éqj)5§¡ÀR.¼Î[
º¬±+áç2¾Dñ‹º
	QÏVÿ¯�úò,ë,0	�ECO6鄪‰Ò‰ùrG*î›`ØaC`‚I]ëµPãµ,Ä
`Aê2ÔÈ�ÙbŠS¬À&7œë“ò ^n”6ßÔrݘo>0H‡‘n´»àx]²8Qê&àÎjKP4—ÕíNŽyºÐxy—™nLÃŒ‡9™‹ù—ÏxÝ”9š}Yš	ÊÏ
Aµ¹›uyš-(œ›ùš§ÿ9—ËÙœéò½Y™MÏ›™CÀÀšíÌQÞù–íF­â��—ùŠJ^[ð”ÆhSp¬v¬ZTÌíñÜJs¡ËŠëlòš�6$š‘ûø$Z¢'­$Ú,š£+º2ù¢7:7ù£s㤿Á.#£1z£iâ5”[ú¥;ÚØHš»r¤-¤mÚ§y3Ùbˆ¨_š¥k¤'Ú¨iZ£mú¨5º©9ú¤¡zª™Úªaº¤Áh¢³ú©¥z©o:¦hz¨
,¦Sšª‘¬Å:¦Ç:¤Ûz¬Áa¤áZ¤“¤5Z¥oÚ¦ïú¬¡:¯A-®ÕÚ­=ú®óÚ¤w¥Ñº©�:±µº¦ÁA¨CÿÏË*hp"ˆŽF‘oR/­,‚6	ÞÚÍŽÌLÂHÒŒÍP>L[µ›cµ7¯ªX;½TÛÝZ{¨O_Û´·sÛ¶¥µ›¾h»Rv;[p[¸k¹y;¹'å·s[¶1ã¹™{\¢ÛR„ÛºaÛØî&¹2D[²›#Ê~�:5ò@õö•M0!åÌ´Óˆ)0
ÀÌ0côl¹€îD¤¢#
b$€>1c1†>#zF"€éÝ"Õ™é•Þ/œ~è‰
볞1ŽA º

Zð‚Ì ÿ§¼2�ƒ|`¨@jP€áAXÂþ`£ý©ÆØ'ŸÛu¨>>é²ø­kY«tÕñƒ¶¾‘¹+%c>H¢\àƒü@@‚”ñ
³ÜŽ9ÛÒŽ¼ÂW
D#Mðè†4â

wHãG�F<¾XÆ£eÚ86ÌH¦iÔÃñ˜ã¡¦W�cˆãÿ�ó›^ŽÁ&ý�� Š‡g”&l/ƨûBEÈ69R?â@¤Ž´a£4¹°sŠ$ûxCB^iY…ùM*mhÃUºR•„ÙÜ*µU˜=¥2•{Råo²ñ"oIJ0ÀÔV.ƒ9KŸì)—ÂAf2…sKŸ“•¾t¦.¥y»`R³šÌ„æ4µyÍÔió™Ñüf6»)Knú‰€‹|SÄv(;e!NŸ¸ÁŽNgt¥›Žv>ÄMVÖ‹›³Ü4 �«ÔäÜÀJ
Lƒâ°Æ
ŽÂZÄ
åHÉà%Á'Ò@<~øOiE„˜–™¦#wGÀ…'‡òg­7z
ÂϦ4+Ëvy—"e½Ñ„Ó TD‡ÜQt¢u$Êp$ñã
ÂPNò#"ÖxÆ”TÆà
B’4òj²Fè7þIF‚
ÙPŒ©Œ­F’ÿBØ"+h�
Öa­ö‹Eè‹MøNaxE6”�‡9ˆ‡ŒûNA™iˆQOŽ6X¦#iNPoö‚6è�úh
ðE‘\9òtøUÃØy<ih^	”ÂØ}¦oN	Pòñ
¼Ø‹>‰y´Øƒ,ÂOÄá‚›wVwaï©-Xhˆ~²…�F�£7©MïvEeVCÿú¸-Á¡’yzyÖ@–ô
@,>Ê�™F��ø,ÓHµ’†Ú=R¼‚!Î(b
�:/ž 
Éúhj|5d(¹§!î"" ¹‚"¶V�@ÜÖAî�#å`fŠ’À…´Œ?õÒ€
c´3²l§ÖAº{ð@#à 
1À"âŒÛ[x¡i%µk4lX¤*vÏl'²y
Œÿ#‚_mîPð
P”DŽ2='­BqÒ
ﵺ÷ìfÖˆ�&ü^^8yƒÞŒÅç
{
C½š:&™ÈIf.cê9g
#Ë*9Âr#?´8ä
´qÑ›näŠ*&iâ1àqÎœÆ�6µ�‡§çŠÓ�ÃGA#óJS¡k@C‘0´ å€rš	G·²K�iÆ™F›8§Ùï)˜žJÈ¡NÏ‚ª*ÏÂ&©î\Ò¦!ê¤
uOÅJ5¦�ê&
q¦9ð©X/ü”¬r¦Á†œI‹Ô
VÝìFÿœkºa–Ynš
0¿0å
#�.hJã„Ú›)ž �K®c
`‡5®�
ktƒM E=xâ8Ç}#fž„Õ
ä ‘1TBgKCcT’¥
uì.
`ÐJ
h7b4ãՉà
¨§ÁwzÑÔ™|á
f¨±i8€è¤ëØ
®@o¸D
9ØF™¨ùU‰«¥ÃP78ûžÆWvXDZØ ËäݹŒgÒ‹¼q½´žÝsýìÉu
¨
<À�˜‚18ø‰èzÄñEUÜ">´˜˜�(x0ÄC$Âa„	 ÓªS$DSL1…@ �Bgð
ц
mÚ½åÛ¾õÛ¿ÜÀÜÁ%\0è>*RoÍQM%ÜÆuÜÇÕÆEZ=RȵÜËÝ[pª\Ìå\Î-kZoºV—›A‚„´Ò³áRÊ=	�uÝ’Ð.c)Œêâ´Y¡‡

©žƒx£˜�¶ÜžëÕ¶lö5ˆ]Ž8’6!©ž
IìŸÖÒf‹igT©'9&fmúE†*w_†‹–Y~šälÝj%ë®:gçr_rƽªh­~è­#yVEå±Q�uÝ–_™ZnŒÊ† U
w»Š]FÕÄ[¨ìÇ:EhphC2XRŒkÚ¨®�!®k¢Â�N¨-a(/f¤¯ª‹©¥#¢Û£ÇúRëbÍ�yâ^²Ö8ï½X¢šÍý·1À

œ4CVM­Ý_æ™—°:UZqµ%Îì°©‚Åÿ;+gÔÑ¡{+3¶1µ±]é¢Pq¦Úç‹Òš4oØC}b{ø´ûíáž®&>vkËZj¿tî\!¶Ÿø1’CÜ×½&‰h°^�R]°Õ&â»íŠÙÒ.é©g˜_jSŽ)¯_,c«ëk²ªÊ¬véÒ­#r­­¥¡w+8¼Ô­6EsòY÷úªkçè³ÌD�õ˜×Mÿ}©Ëû¶Âü~ÿ8Ž»þýqš;9�¹ÖJÝ{
DD
ÞŽOpékÄ/Œ¡�n|cÉ02”Áe�#ç¨G9±�zì#ÛXÇ2øqŽuÜã™G@¾q�y|d!áÈHºq’‰¤$&3YI?.ò’’,CîÈÉ=’¡“…$í€IHZ’‘�ŒcA)IOž’–†T%,ßØÊMâñ�µÔ¤ q	ÌXªò•³„å.YYJD•Š¼¤/™Ë`RšÏ¤¤3ãÍd"’�vøæÉ0….¨!SZM Nÿ¨
ì\g;ßÏy³žî¤ç=í)Ïv泟òüç<
ªO~Ÿì<¨A:Ð…úS¡
e¨@*Ñ}NÔ¡½hB
Q‹t£ŨG+R�Þ“¤Õ¨HKÊÑ�š”£(=)AGºÒ”^4
@€ø©
V®uìY‹ØÅêµ±o,[
U²–±•åª7ºÁ
¬rc³ÞH†8°q€4ÿ"[x–@Šª
odÃíVcËÚ׺¶¨ØÀªl]‹ÛÚ궶[íímc+Žlжµ¾µín{ÛÚw¸¾Ýmk‰ËZÝÒö¸º…mr‘kÝåæ–»Ó¥îw»›]àòֻʯyµ+ÞèÒö¼ÛE/|ßËÜÛb¶äu¯x™;Ûé
—º¡å¯zgëÜþæ·Àå�¯�ñ;]öø¸²•mt÷«àóbW¾n®}Ó{ßÐr¸¨Æ�°u#,ÝO8À%¾¯‰µë
n€ƒÞh1Œ±áŽì!!�PPj½�Uq|ã¨=6*�½±
÷xÇÞøqQ‡Y$CöÈIÖ±“ŸÙ&9²D†2•�ä'sÙÇÿGl�¿Ñä-{9ËWÞ2VÅìe #YÈ‘ýñ�˼æ8µÈV.ê–{g#W9ÊxnsQí\g-ãÙÍXf«™›g¶ÒyÍnl‘{,æH_ùÏ_´“—ÜgD·YɃ¶4”‰é;[yÇ�.µ¥ÕÌæ;™Ç£5¬CMhY›™Ñ«¾4®Ù*è@w™×µ‡8ÈQT³XÚ
ï†QYÌ
r´¸�Ãßøƒ`CYØ´.4Ëwld0ëX懶9–ùló`çæ:¯9Ðg~óC‡šæ7v̇ó¡ÏéB:Ñ�>åB=èU¯zÒ}þbšïè7ÇÔŸ~ó®Ç|æ\ÿùÕ¥®u0ƒ=èf»ØÑu²3ÝêXvzÛËNuµ�}ïk‡;Ö_÷ºÞì5Ïû¦Õ.Ž¼#^ì�—ûÚe]qÍ’£³Ý0
:Ùée °)à§e z fß
vß~Ã	º^·QZ	zðé^¸=œÒm[¢5ÛÈqÃåÉ�tQDHŸä)áì媩ޑ^¸™ F›»ÍßìñÆÑ^ǹáÒ¡B µµÞçaÚ籡ùÿm\ìÉŸ½ÉáZY›õ!"¢*bÀõ[ì�  Î`)bQ�\¨m–8laÞHAädQ"!Þ™ž°±\ŸÍàçaÕÎ�] žÍ`•…ÑUá$Ê"ÕÍ"+æ"½�Þ—)�ÑÙ_Õ¹bùMœ,ZÜ”5¢•aÔ%žŽµÝ+&#©áâ4*c0þߎµ�2*ãÒýâ-†›4¾œËM]3¾âÅ‘£àå¢ÌY·õ!1V"ØõXgUÞåÕÁQ˜ÉüÕ3š#ÄQ°mÃ?–¢@d@
d7d"B¤B"dB6äB>$°AäA6$CN¤A:$CbäB–¢Db$GRdD†dG>dfi$EnäIÿŠ¤I¦äFN$JºdJf¤JÂdGª$AÞ$G*äHš¤EÞ$MÎdE®äC‚\MeI¤HeIòäEBdP¢$NŽäQÊ$P"$–mƒ6˜bÅmÛ�¹Ø¡a⺈Oø¡>ÊÚÞáVŠÃ88
ƒ1{²g{ƒ|Î'}Ö§}Þç}Â'~î'~ê'}ú'"þç€Æg}("h�.è|"(|:h~Ƨ~*h‚6¨….¨€Úg†^èƒÊg‡Êç†(ƒŽ(ƒRh„¨‰z¨ˆ^èˆ
¨‹®è‡è„C2$Ã1 CzÖå1À8¬–#Néq–%²æ•OTÄŸ³•åšÕ@¦e6€64S�C3P)•&8X)•N—ŽU—vé–z©˜~©˜–)™NÖX�©šžéš¶)›¾©˜†)œÎéXÉ©›6CšÒižÞ)�ÿö)Ÿþ)šú)˜š) Vé�ªi¡v)¡ú©¡Ži &*¢¾Ø–†)nEi
«²«²6ë‚9kô¹á‡±²Ž[µþ*´ZÙµR«µ²U2Ã0 ç0¼j«F¸ƒämê>6Œa™´uƒ&òN'FŸËU¢¦U¡À¡c
@4Øè1C�&ÀÁ
C9ƒ8tV<x–ŽM7,9�ƒ4,ƒ½ºØ4ÄÃ4,Ã8(ChI9`6, 7”ÃÃ.C°ÿMƒ7”žÈ’C<Dƒ
8�Ã1ÄÃäŠÃ5ă6°-
€$ÛâÙf¡,ÆíÅ.Ü‚ÃÁîo1,�ÎçyFC
‹q°é/Go"œeÜ)GœeŽ©'	\F®¹–!‡œc„riv$gnº‘Rnšq‘›e¾,gØâIFCdÀÁ�vĨ@!ÿ—ÈF-›ñfšqÄ)œc°‰f›r¦‰›eü$&#qÜA®�<Ò�
êÆpš!GœiºìFÁ/#åF§d¾ô†e¼‡ÏeÂ
'Ámš™¦-¥œÔ›Ló¼4#°È<©Nrê‡Êx¤
MÙ„HB	"èK¹ü,µÀ(‘
Rœq¤’ÓŒ°„k™_ƒTÖEa|,'¹ÈYÒLlêÑsœn<ÍvÇa³´OþJ%0#oà§G�
äÈ)AÅvHm´©-àdfÅfoâ9ÒT
Sþ4lfÓnüÜNr*çwœä’xÈ‘ÆÉdP6Tc5v &süw€4Xq"žÆ mÿ=®íEl° ÀþdÐE
“¾C=Z°A+”0Œ	™D·À\õófvÒig|ðÉ'ô™§‡in@¿ñoio¶ÑÐòèFc�A†oc
ï©{¢!¡ªÇlb.�+ÿ|�0âH)Jƒ>¶˜]'9?JÎoží›)ÙB“®}'}¢

%„¨6Ê0°Ö?êÆ›X”Kä#·ûèÇní ”ArvÚ€r*¨c½ðZ/ÂÜÑ
u�—ÓiF˜:Ôáiw<×ÓÚðô9ºqv¤zÕªfµ6Ø�éT_ºÓŽá4yÓê[—úÖ½öõ¯q
ìRocÓ¼6ˆmlLwÙ›Ö±�M^]›×¥®v³—í`o›¼ãØ4´Ÿíìq�ÜÊ·¶³�nc�û×ʶ6·Óÿmêc{ÚÆV6¼ÑÍísË›Ùøî·6œÍïm»ØáþµG�MÁÙ?q“sÒô[þ(·§uPž­VÊ/ðòK®õF.¿á}Œ\³DôÈw°Ä*qr»LC08Èa€¢0êaŽИ]~#
¥×ZRî�j–¯ˆ{,gï�™Ç,ôœ)�éK_úrmu©O�êU·úÕ±žu­o�ë]÷ú×ÿ³§qX£(GË?> »Á(â"¼î¼ZR¦öm©lø7~à„h=è
v ƒ! `ÞXFh‰û¶C

b9àá*à5ã%ªAÎa$¬�F‚è�;,@‡êa< Íb
µÁÿ
5¥‡â´

§Á
Çá ááÅ­"- 
ã!’Â5àšË\ÎNÀôp1³ sëðPò1é°Y²£U’ó&S
‰DÞ!ß °jALêáv,Læ,¯¡	ÇíÞáKâ�JòäðêÁÿšsOBÈ9'ÅêAj$SÊÁâáa<"È�CXPKƒ*¹tR¢ázê¡$ŒÁøÄÿLåÁ¦!üÊ¡ZÅFˆïÑ–Á9÷ãðü�2!Õ#uR)µR£®½S³Ð®EÜÑOí@dAè`µäÎ$;õêÐ�¸dDLF�~qõà$#\O?ÿ”ætâZ¦@\EKôή@Œ$WFJ¾%`ÎnMmG4¦G°áÙ´áX™u*¯…*±
SüÄ_š•C¦Aø"e*ÿkC¬ðñés–¡Z÷cÖtOLQdMŽ*-p\SÔRíUï5Wt3-UD:ÉáÍ’æÿÛoU5ñi@ÅÎp4–Ï.dcd—šÆ¯ÿT•Â
/]5%¨2a?EàXê¤Yfª%gZ2#ä¢J1 N€è~îpµKâD«åö{«79¯zQ4ΰ—{=4{»W{á02­ŽòÄ×{ÃCÖ×|Ë7~É—|ÙήWiš5
U¦!
S¥/i#x¦O¸V
åu܆Ó
"H¤!
Ï2Ód3e@¢¡°
U¸”¨òผs1DB9=æK(ÿêKcé+eº
.¤áÏàÅ
™±Y  Ü Ü�|F Ö“5ök€'úE9|Ã=ü³ãwíD<“6Ò}á÷¶õ˜q!’E•f~¹W¢MœóúÃ% ÚŸ	ú€ýc�¿—�ݱÑDCD5¤G©”9�a¤±OÕ5ñ°@ 9ÇHˆ4„è´ÿ¼ô´ðG˜:¼tNÙÆ#Ž�'{DôTȦ4I6† –‰²³Á,8l!råVÆ!„�e?ÊtVæââ�LøcQÅÁL™·G"Æ9 øTÂâáâ!UÄÕH#&”
ã�N¿ÄHëAÊ¥áҥႧ2
÷[¨ÒÔM½æ&tqë|Åß8%6ëNzŽ“üD#õ°õpµMš“æåà¤×jôÌD—¼´í·|IÇW|`J9DU¨•hŒÄ9#f*PÊšhxdœì„�ó¶AZydbÓTBÀdVüÅ?¦
S»óhD<wKVJ 2CuËKO¤UZ•aÿ¢aC’–`<‚OÒ{My•Yõ‹O¼kRÆaØÕ[¹½ÜëôŸ!Cv›³ÞWÆaü~ßVÉz�Éw@Ô¶š`/�²Áv¸.Ú¡3>ÆU\3aœávw Ÿ¦ÎV	ç1D•Ü
q³Ç0rçëµ³þ¶è>
Iõ‘ùwê˜}“Æ’Ÿœ6œÓ\'¦
¸6äÜÍg	õiw)SX7d}Ïöhãð„]Á
UÔ$Y¥¤ÁˆFOnöÝ×ôìä5S*ýƒQ
…P¥²C~7ï½�a´5\ù#»à|[u¢ÁRß[t³A]ÿKC®jSüë&“±£Nå¥NÉa½ ùC×›C]óó/1¡9ÿÿëRßé«NoÑSK?`¯
‚ÃæM¶ƒ6|8P`Ć½‘£HÜÄ�9V§±cÂoIùåGˆ,=¶¬¸
eK™
i¶¬‰³¡É›yRüf"H—DEzCirhGp5ŠÛùP"Ó£#ƒfÌÉRÛ
g…Þ@Nµ$OÄk–þy³�QöqWÎ7”)DŽ€ß&&"p¶’äu·×�{gP•æùŸ¢Œ>zãm1qŠÌZ*YâÐMYÜ€3\DgõÔU¶‘ÂwíÑ"f‰ßÀ\ÛÐ4ñ4ƒÑUºÖl³ÎÜ7Ž2Ø”³Ì…C+cÜN4Në{#5Ï£ŸÎµa¾:ÐêD+s,Fzâ4:’aùÂ…=»NídWä]öؾ?U8y
±Luÿj”A?MËö•$TçgåË�þïÝ.Ô³�iÕítkv4œqë‚
†¾ÅåoÕ1˜Ÿ¬-DU‡q‡3ÎâÇ+T•J`ó	fz¹š<�qÞx‘7’q2E¨!§SH3šQq,#~Þ@ÐÈA™Æu¦EÓ˜Í@•m-«WÇ0Ï2Äq‘Šˆ°1öáÊ°ñ¹ix«tL|ÈNÆb=l��zŽFBç1#NPâˆóÒ°ý]HG[S³(Ž–±f(䙟ã„,éY…nò« †ðÃ8¦¥Q5úB
“�	)ΧÁ�[#
EÑù®vŒ`#á†;²q�x~žÏô—óÎC"Ʊò–ÒH
Di¸CK-Íà¡�µ’C܈O)ÄÉŠÓ0À;7`ÜUï˜<œú"iÀƒfä Ç
ƒZx¬Òb««Ø1P¦¼„l
©ð ì;p
x°Šª¬L_”8n¬u—/¢™¢¦±Èx
8‹Ç
«ÞÐTÝ8G
�wlX¬ô€F<�áh
€Úˆ3m0\¯NÃ×@ù±ë‘HwX
ÝÐ< ‘Ènàù
€¾Œ9
ÏÀGݺ˜pÔÛ‹Ý°*6”A™xÄZ3M€¡e�Ä�ÛŸfjZÝòn¼
pÖ"Ckái
yœÖzüâ~×`ZÒpT¾f
@f	èVóÀpf‹#`WÑð[Øpp
p
a`Ì£ƒ'¶|
Á/YèEWÃ<ËH]‡E~pn#ªgLbuŠDS/
ÑTÇb!	5ÃWNõ}­ù•õ}zfXJÄ-Tñ0'¡ä
­3ËÂ@žÃQÆ�*Ñ�BüU^M×
’™WQ9J7b!I{âðžæQCÌãõpÍùTA¤
p
ê 
•¹Wñ`Û1•¹/Ñà
ÚÙW?ecßGÇPúUßw_^$zv%bÒðP“åPPƒ;ïÿù4Ì	26’ÂIhXsÇ c×@m×àŸ£SC›I3RÓëu5,*ZqbÝå
•É2×t`¸¤–h’wG‘
±V%g¢4Qe1F¦(3Â.ä+E?jùOÒ³'ï�—Áó
 f¯54”a1¸“FW“ÉpJGD,f1™rË5¡¨�ó„'ôt(„žÅÉEqÊ ^(ótÄG”B�c>1
BÃc,A<ñ9
Q>Z¦
	Ñ°Š3çÑ2<f`Ä5ã0‘åCž{¶ªÄs©ã1æV±—¬ÃbBé�²8(c2994´Ç<Ê€tv�±:@”FäÀEˆ94æÿ
aPÃ<ç¢æ¡£¸z“vÇ™qßÚ2Û ¨Áªð3b¡ó„çÁ2¯*­*…�tAÄB,ÃEM
5ã
œœ\1
p‰#WrÅ/#i?£«-„c©Q zÆ©ñT …×u¸s‡•–=dRi
—rÙ79ù�A%" yq
›Â<4Ó\ea¬ÑZ·d6&…_C"›$R3
Ë DCsM541³³:Á¬S`ÁC�qBGásÄ34S>"„\;‘�2ð#4€ªA£-s;µS:çO56ó´Ñ©³Η;à ¸ÿ…;;4ãp”a¬àù5-
CˆÙBƒ+4z5¸5ä
Ä¥Yr&9b?Òÿ\,ŃCT1–›eÁ èk'”É謈ôAÍà\ŧ_ú²y'/†r>/â?5ë(+Åd;;'à|¶"Ó 
«¸Q/v.ni
ç­[7uü|™fêUªF—=j´iÃo]nËÕìÒ¢dÏ~�¨T"Ú³p¹’M;·aݳbáÖåk·oÙ½výš<øî`¼}N\¸±ã¼hÿ6^¼˜±á£•	–;qk`Í“Ë"¦K”rƽ§Å�F\óß¹¡[‹nØ”-9‰¶#û­hSqPåX¥Z<˜/ǪíÊümX¶_ÊcÛ|º7ß»óþìÚ[õŒ_£Ã][oX¿n�¿ýÚ}l{¢ðË÷~?ÿ®üÍv�G·¿\{÷ýüóŽ©øÀÂ�º¢üFA
ÝR‹:ÏZ[½ú23°ì¶qëü"ÿ7äŽBî¾ì­µóŒDÀªsîA!+�Bgš
ÇFíÀË-¼¥pKê)†«0Â(Î�µÓ0I‰XÔ±¹Ã먰ª=,¥c;°øsÈK±¶ürÌ(¥4ñÂ'ÃóL2Í,“LuC3I0Ól‹É5ñÜqO>ßt³Í9ÃóN6]S:ÔÎ:£¬N¼>ÅtqÌö¶r±Ã3+õ†›Õ„;ÎäŒ$.+í'NÓ´´ÁŒ¦#±¨ëèã²=
«L+ú¶ÁKOAÕ$SÎ>´W^
%Xc	OÑ2í,VX@�5QÚaÍ£–Í›º(Q±tË3X¦H‚6Ä4Ÿ·Üd¹�ÿtµüÄÉfÕnÉ\ŠÜ<%rÈäHõ�Ïkÿ,”]è&‘X¯.ô`ƒ�ê7á„Ñ%xa†ýt.bŠ}­8Ù‹3ÖXPˆ7fxbýö…ðKnô+J¸«À ®ª©D”9L¹t™ÖßÆ|ñ¾ÑT�Ñe�¦ØÜž/ºàH	E¸âŽ…zç¤ý¥ÓO§£nê^¯UŠ,ðXœ(©º¾‚*�O�ûT9Ô8œÈlö8¾Љa¬¸ViÑæ×Q…•®Öâ£Ý\˜Ñ�!n´hª±%:ob¿M»ï ›Æc£“vðB�C\
¼’·¢—v‚\9ߪH]�Jž§ü5¯&çkòiCDZHéÆ®u¨‡&÷é;[Wÿ×ÐÙ¯=õLÇ]ÙÞsÞv)å„=p¾ýûxà­
þvÖ•Ña�'þù7¯÷6ø£ÇÅ>Ru5}Ì许¡·¬ÊíÅ·HQ[FmÙ2#°×¢²Ç]ÇÁ&ò¥÷Í©
­èG1šP”Ú”¥.uèBšQ Þ§•èLu
Ô–Öô§)íhCyšÓc§Ç0jM�ŠÔ“c¦
F2ü9ÓªU¤+UiêѤ~´ØàE4 Á@ýK>:ªYp‚ä‡ãà‹ežcš^J•"NŠ(ùLF2*Œ¯&±‹ÕjO
*Ψ
¤ËðÆ2°�“”ãFiÆRªô�ÏL߇2lŽq€ƒ²à
·A±	q•AŽd�£ñuÇlÅ
ýiã×ÍÈÆ4V£ãÔV¶)³Å
‡:;�ËÆxÖ>ˆÈ!n`Ã|%#‡“—Â_ppcÝg7®Á¡n¬&¶ß	ïŽËÁæfäÚ¿HÆF9âqŒhԃĖÕìK°±�RÄ]Ɉ‡6fYõÅÆ»3Ò`ckã'è�‡7’á�m”ã“žŠ;ªýkóŽcá$nÜÁ•™Üs5ý-qpÛÕ\w(ñŠÈc=rp$Cäî-7ZŒ�i”cäÄÇ4~{v— FÈuìo�ܵæýF2Þ��hô¤î¸ÿx8tŽ
෕Ŧo¸Æ±ŒÕàvµ½QQf=Ÿß:–¸™uxCíý]nS2‘8¦3ýwLþÒ
ùI
Al¸†­Û i ¹j£»’siP
§x°´qx·¢ð¹	t‡e¸Ö¢—_{‡ÕødH`ø¨h˜ªÑ[©�¢*£ŠÃËÅ9yŠ�PQÈûÿpÃa˜G©™
0
0
��ô#GÈ5ó9?
£8²˜x¹½Û¶†(™çŒIˆ
¸ëÙ	'£€s�‡�|A`i€t„L’‡-*BlkG¦´zÀôK|¤†nˆ†y€!
5

5
w ÆjèzøHk�€ åKy<Gç3¶•äP|„Á‡¤Pm Æ‡dE
•v@?E?§ì†jÀÇj8‡s FzàBtdzY†x@ò£
"!�‘¹®—�–öø­ÛA˜Iñ�ÎS†€Ê³ÆÂ3Rt¬€Â…®šâSM
EY€k(9ŽŒÿ©‡:eV(„T0ÝMlØ�VhpÖÁ|
»í¾n0
P�¿J=Ñ	ôR¦TBº­z Íî+¾9=”mp>_•u�‡hHIzˆª46²eÓk°:¥V6í†5M
t\FˆÙO}
z
ò“J´U±í¾}|
€
àUmµÕH¡|Š/pØc˜€
”Ž¿¤h­x .ÿàÓ]›Ñ—Sô0Ÿq(@Þ“Znè-qÀ§Š9¬Ä=ÝÃ’ólÛk¥ä¶GÌ6ù“jnpNQ·¢
”@¥ß
ºe
Ó¥DïµìMá”	í\Ë4àkÊ’¹j£ä;éÒžìØúÀw«jŠØ‰ÿÙÜP¯míVá’yùó
LL
Üú†~Ó•m�	kº®ohþ¥æôöoü6ojÖï—q¿ïÇñÏqOp‹Jò~ñ_¨ü�©ÐsñÏñjŽñ�ñ¯ï‰"ªGp¯Úqü.¬§Nìæªë6ÅÝSj–º V’WäàÖŽ˜V/ᾇt¸‡{Ø9ÏæÖ8ñÝK¥ÁÙ
l€h¨:£ªb@¬8;Ædx³7k¬B�³8û…é-†l®^IO†b˜tK¿tKßDb8ôEGb(a,¬y•W,/òRrL¯^d
ʵ¢8†Q¼xP­ï¨iÀáÞÊjàŠ¯9²çZ[põO÷ôMïuc¼ôpoõq÷tqwb õr×tclwFßtMGõBGõ¢uP/÷ê½õ_—tF§tVŸuVõ|?øI÷wL§u\÷t�×tbœ÷8CÆAt°)°Êøl†ô®2/ï,¬ù³éî�y9lq!ª /Ù +Ù
yÀ‡äÞ‡~˜yð}ø
w°¦
Šî_YŠÔr€Pvˆîý™ñø
$��q Œ8�_#õcz©¯˜Ɔzð…0Ìø�‹k§ Ãæÿ«_íV’G¡8éÓŸqXÆ
VI'á†y™¯ù~¨ùšï
w€K{JÁ¨n
ìoFÐqÄôJœð¾[ÜïÀûæÛ/¾Ó²È"ŒðÁ	ák±½øndLq
ÈFÜ¡Õ
#½á’dCKiÓUGoáñŽR#‰ØèG.¡dŽkü#!ÆläçR9 ’Xä¢F°E3R‘òCIq
?ŒtŸIh%FCR”¢%)ÝWÊS¢’GâÇ5 ˜®oˆ–±Ü#T¦*olƒGõ{IL,w k•‘�Œƒ
º¦ØGO½Ï4»
Ò�’ôž(åè1¦aŒ_
7ê' Êmñ&]äÏû¸Ç6zQ]
:�—ÞçŽäÐ�U‘!�”Ld{æU·ê¼gZÕe;Yá6¸¬šµ`)›X»ù;‚•-®3[Ýf7»±3e	C˜]÷Z¸p–“cwý×]XŠHc!Ò84¶&ÎÇBÖ°ŒM`÷*±„Ïxú
œEôêW¾n¯šýlá"‹‘ÂŽó¯åì`[kÚÍ:챚-­aŒ\8À¦95æ'=•-0Z±Ñÿš–å*ç™1˜¦\îSØXKdöT h m`»âÈ.wµáŽEuã»ê8‡6¬k]u¨£¼é%¯6Ø‹]ö¦WèU¯|ëßîâ7¿úÝ/ûk_ôºc¾è0�làX¾VðzÝqø½×y¬Ž
®o7ÊË`¿Â>‡…elãôÞ8Ç:Þ±€c¼à
û˜Ç<2�#ì]q¼#�¢"
ùŸb™äŠ“#.Mt\æ².¹dd–~bÙeYÊ
àèHƒÀÒMÙ`®š},ÚÉ
æÄ‚ür‘DçS–�éœÞg
ßîYà šú‘98Ê;À4˜6�H²x™ç¤à~ •s¡J!)U)�¤*ÊäLÒdMÚ¤”ˆƒ¹%	šÒN!�*Eù åÄÿÛ•µ	ŠÈU½!WÖ±
G
“Šà'Q¢Ë
Z3„'²
P�‰Ãÿ•6Œ§Š”ƒ™ 
á+‘ˆÙY7$
�`ƒåiº9€KÖàˆ¾µO›aKCš\£¥ŽÆyƒœ!P¥0âÉÃÑ
ß4‡

s¨(5³./ê1eè’¤Q¥ æ’µp&Ë’µm¦2V³ðvà¥1`”}53ˆ�*ÿ§ûÑ6ü.•¼Ož©õ1˜g&o<(è1tƒ¹JCxÖÃúh1„aÃÑ"!ïÄÆ•\¦qhˆÃ28l�âCrŽ
ÝR`
ê°�uVêÏ4\@Õ>œîyK}‚¼
­aãŒÈ8˜¼>.K³Ï5
iÉ~.éö‘{W.IµRŽ¬RÓ¤‰²®
šˆ09y¶Ù8P’¥ß+„㈠y¦•·YÄ…k&ªˆ;¨H�îúHp·RçtˆC•3ˆ y¹+çtN‡Ñ±¬ÙNcÙ±×0–OcÈ
qusçð�Ϊ0ó4n¬sqñ
†»ŠÈÿ…0ÄV­7ÃÛT”Ú1�Z‚7Ã1tœ7lZS‘(÷—»pê~ù‘i#¤ò=‡Vž’/tƒ(ž9â—²Šª*•ìD%íìœs;ê²f½
¯¼£Îo\ƒF7¼¶èúy66°FÔ¿ƒ6À0ÄÃe¼6¤I4Lgý%
®%
ÏCù¼ŠÑ<-«¥>•ÊOÿEQ+¯
X6	›ãŽà¡®éà˜}=ɯ’¼
2›i¤ŒI
mœ@m\I›
Pw8"mÈæ6´A€1è�ih,–
7ÜQëP¤a52 ¤*¦ÄC
h<H¤i`@,£@JÈ!
¹ÈqoSjR™ÊÔN-•q•|Y&×T°	JÙøRŸÆÆƨ,ÅJ¹Rb©8U±ª©…ºŠeâb†�Æwô@F<Žd�ƒIG%F9èúÂe0é…Í@HWš
°r äZ4B¨ç
òÑvt£
q$%Ñš‘Š„3ÆD«)ƒ–| Å°•îhbÒñf&{Ù�œí(gÞj1U29�òø+EÞ¼.K1d»kº�×màA¦´/d�h9sêà¡£'‡Ë:ªï
©rœ‡4ƒ€óøcNRtg�pdG! j[è/ΨVÐ	ÊGˆÜAPK7¨G±œwm;aè[íQÑ“÷5ìvû†Å>v»ö…ìe'[ÙÍf¶³©ýlk'Û×~Hµ¡eoC«p*zˆ´�Mîe_[ÙÄ>Z^v"a—…)MyŠŽÆš˜Æ€aUg�Ù:uI²…8m•t0šÒ
eAáN38Â-eÿ=|áox7’¥
u8
ãN;Ã!~p‰<ã!ùÅI®ðŽ/|ØêèÆÅ?Îqh�æ/GøƾpƒWä6øÎAnòž‹è/9Æ¡¥r–c| ×jƇt }â�šÂ�ž¬ˆkcã8ŸøÖwîô®;]ç?7¹×}îr²Ÿíi;Ï×.öŒGÜí^¿ºÓ>âŽ�Ð’n€¡ê¥pU2¦8„Dt(«dÂ�ªIå-P€úSfšâ æS³mŠiç-4§èÚdn«§"Ï,q…0“äç'y%®òƒáL†m[
’3wñ·Ûã‡H÷(!òC®ŠU¹ô›È;zU§ÇA¾ÿOÆ€é=nç{8­ÑxZ�/}ë_¿-½¿K¢Ú©Áp€W¹¼¥Š<~ðªÒ÷e"%+Á­��¡ÒX—bL

¬‡„
á°Ê_*ÿüÏ-ª9\B£¤¦.øÌ,À*ö6C‘ð
%D…O®§
°¸Jëÿ<Ï+˜Ä*<PÌ.ÃAÐ
QoClÄzÑ„ùV,pdÑõà-¹Aìúïoñ‹&ªgOâÐn&	©¯üÈV&gØ`2
ï‘jìßïúÚ
òÆ-‰¦ø¼�ÁZåòÆBíq�ê‘÷xOõøqùöúêB‡¦ø¥Á¥I�ô
òIÏ‘ïS’ù°O²Qîq?LQK(Œ¨.Ò ÿíñÔTäÂr"?o%°d‹Šf0¶è)Æ(VfRÄL²&)2$ѦV8Ì!?oÃV'iÒªÈÄRŠ¨â(Obm°dGœ½¢™b‘)Æ®ñ•±*¬ñ?Ò ³Ê�TÂøÄRôÐŽêöGFdeøÞFï§-éH‹Îò÷(%-ÓÒOÆr.ݲ.ïòÑR.öÒPöŽ0_ñõÔf,G‘-ç-«0·¯/s¯H-ÈÈQØ’ø“,�Ïý.S/5ólÚ’-Üoñôh3ËÈ/Ó2.OS+2s+:“,¿h4G3„Æ!'S’l

gT£%FÇfFSâ„|ðF»*PP+Ÿ"F/…Ô‹ô‘Ô*zTGaôHIPIutI™G3ÑHO"J¯tI›Ô%†´K©tK¿ÔÝ¢bHe±-¼ô™MOPJw0K�´KôHiTJÿÙôGÁ”K±"G…4¥tMw”LôKQ›!²–Ä×*/'Œ¹ï	
çT
¯‘$C8Ýbóž2cÄ÷†�Sû�ûp¿T{°IµMÐIKõTG°U;°U•UŸ"UiÕIUVQUT5±m5QsÕWƒUW{õUkÕW]õU[¯¬ÏMÍ”�UX;ÕU‘uT;uVo•°�CxR"³„ZÉ'ñR£02(unJr}T]Å@E2&š,êáF˜…Þèm_Nñ^½Í´*g×üEÙöUE,m_
Ö`�íMË`mÇ_ÚÌa	v`ÙPañÕÒŠÍמŒa}-b/6c
6Êÿ*VÊš
b1v`
öb¶×6¶Íü•dMeáŒÙ¶aýµdQÖcñua7¶rHÖb‹mfmveïh-ÍdK¶c#Vb¶_!Vew-boöiVj%öeû5ióf³Öhvfñõc»íeVlÿUfVŸò"<b	/ÃßÄÐóêíp€SÆ‚Ó&Ùï-C¶ÁHà®!¢¡þ—p×pqWq—q×qr#WrW&wp£ar+×r¡
s1ws?tCWtG—tK—t£
þön

¬¬6ƒÔ­¦ˆÏ^ÌTÊqR¯2]/…�l…Ââ‚Bß2* ’!ŽÁ„áxÿ�Ay——y›×yŸz£Wz�Œ¡z­{³7y—y‘w{™Wª7|›÷z§·{¿×ˆ���Ð×z‘
~á—x��~éwì·~‹�Š!~‹Á‘�~÷×ê—~xÙ·Œ¡x8â7~øü7‚“¡æ—x+x€F”a€é—x“á~ëW�ã÷à—€‰·ƒ�w~	¸~?øƒX�×€EXˆa„!|?‡—ap8„Á)XáW†‘¡x•—}Õ·|™·z—8z›X{§·yÇWŠ©XŠ—÷z½Wyµ‰³ŠÁwŠ¡÷|½w~£a
³ÃÀâžÇ/wÉo'n„‚ñZüÇq•ûX¤uXw÷±o¥
K£ÿPÚ3H‰Še[ö8p"%ô"
J´¨Q à¼�Ãvm€Nq“…Êí&Ô›Uʼn”ãç‹0a¼~	Œ�R½}»Iιqå”­õ–�n6mã¶mSVnÜ´i>ÓÝv[
¬Þ4r0—a«wLâ»

¢½s'.^õiÐÜÁ«L+¹iôt.+§M€mêÆE'N\¹cãhƒ�6Ó¼3Ž4ÉÄ#Î4õ�7ÜáõÎ4ñ�Ï4
7&÷yð­o€Û‡?ü¡o×Ê\…¸Í†ÐHâ1 ±ÄÄ8Q1P|b§HÅ*ZñŠUL¥¨E,z±‹I£Ÿ¨Å2F‘‰Ñ8FÓÈD4Ç�Š##Ó¤ÄðâÀ˜�
›9£Æè6z¡Æ@B½PÆÓxŒi
²Ç
dIÉhlr›ÄÆ	HhD“˜œc ‰É5b²’„\¤q0É‹O¦ò”‹QãmZÿ	Ç]â²רeiÒ¸JcÒ•»Tä+}ÃÄ9Êñ™ºå3�	&.±’�if£ÍÆÈñš‰Á¦4uÙFnŽS›ª„æ8!EMp¢SŽÍØÄv•¹”-tkIJ™ò‡•Eme…b
¨W|ò�qŒ£Là8Þæ1¸|ðÃýØ¡>ô
„w­®tEá\<`
à
R
Œ´!õè
P€
:
OC
°ˆ8®ñmh¨êFÜŽB“Z =!bJÕߥ
id °`×
rwm˜ýb—F‚¥q�ªÞ]CÁÆ
¤qP6Kƒª0†[d$ù‰¤ú´±ƒÿINFO/la+v¥Jµ|2¢Ôïõ�r=‰÷­Ÿ„w(·ßɼr¿{�À¾'¤'½ëcozÓÿõP>ì|Oüå/¿ù§�>óŸ?}×£þø©>õ‹}éw?ø©o=6܀ܒssFÓÙþ¹g·Å	ýCÓÏ·–—Ód	èÆJÒ?ˆ(€ïp

PŠ
Б(„£#yh

™]å!ä0RPy(Šîp-s0Q�ÙhÌHDÍÙ•¦ÃœC
�«U†RY�SÉtKÙqI¦•ày�j¹@`8žÚ	dè
äH/‹–žÔ©­…&¥6îP;wæ	–MG–Ü9'–�Á¹�þä!e²Oâ!àÐ
@g ZszaBà C at G¡
9Z¡+9j1f‰&Dœ¸‚ýa¡æ¡Ú zBÔ¢›s8"4&Ôö#Ü&.òç�†…Èõ�ð)BXø–:QaR±‰²Z?g�ÿyOâx•Cº—BAÿm$gs³ŸÙ¹@Œ‚•ÿi¥Añ�BÑ–«uQrˆ�!œx¶6lr—o7Pª˜#Žò—-¶�jòÙ!"ê
Ë€osv¢uó/Ù¢¢iˆ¡iò¡2ĉÊ¡å¡î€Ü0Ëb#¨&¨Ê
ÎÀ
õb&ö²Ot{úh=Qqõ•]ã23ñ`ñ€iФjIªO9ªÓÙœL‰¤³:Ôf‡cº�¶z–S–:Ú¦B$«oJ¬5m~é,¦·šžZi&x¶&nms¥O1D‰(Z¡f2˜ÜŠ‡
34'§)¢œÙR/±ƒ:	Ts‘ө꘨³�þÁ!ÓC¦I*—ß"g‚ÿ/”'â°õ‚6E�
C
ò‘0Ç0gÁš9E§èižÝ8eÓ°Qj:JÊ(b:Òi­.Ç—ÞY¬?á¥#«R*‡T:W•ôøÙ 
rÖ¡µYQD
êÜPmaàQJ‹"âR¦4§aV=â 
iÑ
Ö”›•SxÕrfàR™ÌOÝÞÕÉaÙí¦¾ü«KŒQõ�ÿ–
”9ëi³ù™ÞkÝÂ\]Õ^z²Ü¹©ô—Š®P	.1Á.á ñbe ´¢¡ê"à’ã¥ùj�Šs¨Oj¡M9y*ŸPVÔ´½±ŽøBqh“ c³¡|¾¡
JO d½Ó£-ƒÃlïBÖ«sB°cs&AÂ-•]…[ï2.ã†�>±p9ÍÄZ6ÕÍ£Â*¬$üê}IÕϨ²Jn¬]�Ü~.®ìºð's´Ähú´P~þÖ-LÍá˜%	
ðÅe/‾xš=2.`ˆ
¦Q§wÀ&¬¥±@Çw°«æÞiäÿAЛf¼
 ž¥'+—}–žjØaNX¬±FžŽd¢‹®×T¬Çn¤�'ÅnÝ©‘<wv…GG®‘fœz”)Çᤰ‰Ç–rÚƒˆ"w áŠÃwJ2&žq´
`„â1æ‚h®IÑÍf² _wÞAKœx~)@±IM³mH]TÒDW³ì2¾&ós2qpMoÇ‚ŒÖÅ…,/ÄNó«Ò¶³UðÃåÒF
ÓÃ)Zæ-ëÆ9:ªlx¢ŠåîxGå	x'ñÑeòèš=VŽ͸£�Æ#¤Þ¸f#Brd…”—�•FAÂ8î8¥§m°YØ0@½±<}O•Œ$óHˆ
--- NEW FILE ---
GIF89ax

ð
‹‡‹Š
š™ŒŠŽ�‘�‘Œ�‘“˜™•š™““—˜›–››› �¤ ›	££¢¢¤¨ª¬¡ &†‰"Ž‘%�Œ(“–4‹Œ5��5”•#¤¤Dœ�zµ·zåç�~u�}d¹rF¹~X·~bÜ\ÓXÊcÜd	ÛiÞpÌh%Ëm2Ìp*Ëu8Ûl%Ûo0Ùr)Ùs1è\
ç^ø]
èkçpýf
ôjýq	øsæm#år$åz6õx$ó|4ÆzIÅ}RÚzC‡ƒv�Šmœˆy›�|¯ƒ\·�Nµ€Y¬…j¡‡y¥�}²„d¶�p·�qÞ�<í�)êƒ8ü�'ö†8Ç€NÆ€T؃GÙ‰UÊ’oÛ–iØ™véˆGä‰Ué’Wö‹Dû”KûšVê—eáœrúœfþ¢Zÿ³\éªý§hý¬tÿµjþ¸xÿÄ{ŠŒ‚Š“Š‡˜“”�ƒ‘�…Ž¨Ÿ„»¼—ªª—¶¦–¿¾«›Ž¡¥—³©Ÿ¦¬¨”¿Â•Â¿ªÑ¾¿Ã´‹ÆÇ�ÎÓ‰ÛÛ™ÈÉ›ÎÒœÑÍ›ÖÖ�Üä™Þâ�âÞŒèéŽñëŒõõ—ëí–íñ•ðí“ññ¥ËË¥ÍÒ£ÒΧÙÙµÈγÎÕµÚιÝÛªÞá¹Ýá©âݶáݬçç¦ìñ¬ðí¦ôö²åç¹íñ·ðí¹óóØ´œÚ¼¨ï±‚þº…ý¼“ö¾£ÍÀ°ØŶÿljþÊ—ÿÐŒÿÒšëìéË·íѼþË¥÷Ì´þÔ¨ý×¹ÿâ¬ÿà´ÅÌÅÄØÌÂÜØÙËÂÕÖÔÁßâÃãÝÔôßÃèêÅíñÁñîÆõöÑïïÕôëÔùúèÎÁëÕÅéÞÑûÚÄôÝÑéã×þãÉþëÕþòÛçëäìóêéøòôîäüòçøøòÿ
MéÒ§N£*•ÚtªÕªX‹feªµ+ׯP¯z
»•ìXªgÅ‚E»V­Ù¶e£æ ŒØ±a)ñª<óf1cÁnl3pà¿>#˜¥_ÁCy2áÇ…/'μù²äÎœ53�ø³hÓ�Q{&=tkÖªmj~)ófÎ`1‹C¼Û/K•¹�ÿNœøð•Ç‹#W¹\8såГK>ݹuãÌm+K)€Ø°cÆsÿc–7ï÷açÑCŸ^/ú»éïŸÿ¾~|ûðׯ¿»Ÿ½üXøÕ×ßzöÝçß�íµG‚¸ ƒ*!|
J˜ …¦4˜a9é†]rÄ1Ün"†Xâ‰(¦¨âŠ,¶è"ŠÇQV]ç¸ÞIä\bÉs ÑFnФ�nY¤‘Byä’L¶1¤’tD©$“K¶!å‘tÌA‡•RÎÑ—W2åHv)%”a*™	–YŠ¹¤™Z’ùd›r™$’E:™g^~i¥›o²i§�wjèš[~9‡tHЉ>ûü2LŒ*R*ãM–ª„Š¶¥´)‰Ÿzʨ£Šê¡n¥¢zj¨ª’ºjª›Šÿˆ©J&u¨W1èüò†süqE`+ì°Äkì±`p
†V@�ÅЖ!ÅP|¡²ÄŠ‘-Ú‚Ñ…Ý&+n°á+°ÚK.ºÂ*«l·À*K¬¼Â¦Ëí°Ú–ë-×`ã/6_„+†²]pa0úb«p±ôûÅ=ùø³�0™nGܧ1çש¼e—L¬²~ÌÓÆ-©´1f!{¬²É·¼òJS

í»±QÜã�Ä(=Gb¦¿}ã¬#÷\Š¶‘,b¦Ñ'ïüô+5V¢o ³¬ªŒ%

7<,êŸÓÍ·Ó×TòE°_l-=ØDÑÅ�Kš5¬ð-„•Á
¬š7qq…!
�°F8”&Ai´Í‘(¹Ä ¶ØMv~X°Æ ˆj$Mià˜Ÿ7œö….P
Iãßý°u.Ô�ƒÝàÂ@¹Éoo+¬ÄÿÜÕ-÷µ‹}ÅÂĈ‡½‘(E#sÌožÈœMù&EÊ+¥>¶"ŸÜÆ%Û[Þo¤ç©•ýF|¿¹:̇¾4¨‰pŒcû�#2la]Û¼PGr!¬€É!²Ô5, ­/Xî:¤±ìˆDyÑˈŒ–ý‘~ÐFÆóo
CÁü(†Ýå_Áƒ ¹Å…:–ΗÁ‚B°…/ŒAXÀú!ßu/d"L}ô]$Çu¬_’Óœ
›d%‹g"Å
D«$#Ë,%Ïw¦ìy”ŠY;?yÿ¢U>ïb"B#xn¥Ž_\‚G~¸‚"åÈP$JísáÀºÐ…+X£lô°ÆÂ
U¸(>´ŽjTãÕhš5®1‰1t

ߨ‡<¾!QBΫ¡PUX–�|üƒ�££?)ÃÅef"Óžñ´*Ö“}ìdüTY§ðy"W©
8wQ%·1&]ž“LªÈXÆôdVd˜MïøÇ%"`vÓéR{ˆÔÁÝÍY;O	·Ô¨Ž5'U
*WÕ™!õ¬MvëS§:Õ˜ÂMW1å‰�fBötö’#Œuà
 ØwÔ!€s
<qkÇÀr®@Øk<¡Ç
* >@
ÐdÄi}Q>4c3
‡QEû�"R[:fU¦d#㇡”1ÛÓ"lè[vxƒ½q‡a€â@
¤ß°?C:ô0ö
è•5˜¥ZZƒÖiŒÆ†…ö’ñH=ÃÑU ƒb•¢"xx[¨¦i…ˆœBVšäb¿Ù"$£edê�2A4Ê5ô@4Š¤øÐ
Ú€Ûp‡J÷ ÷ÿ`4>ºSj4�Z¨>ú§‘z¨Û0`:ú
Ú�e©p%³Búa\¦Ú¦lšªÆ…¢Y…ª«
¢`f)Çqlù$J¾…2ê"›âŽ¼±�fôeÙƒcg"ª¢lÄ:¦¿Jiõ†Á1É@
³–Ë´NK¸(v§ˆVF7&³ì8ѦbºiÒt÷°¨;eÚÓºaä›0Ù´|øIQ+«{2¯;°F½ªK¶ŽK æ¸jUl¶k·É;»v‹¼Ê»¬3Ö›&ã=$#ˆbD¸úº½IÏS½¼û)ÿ¶‚¨»¦‘i$ã{" ;†"‘iî›}"¿í›ÊI¿ð{iòû¾7r¿õ›¿ö+¿ý‹¿óë¿,À�À<dú;À‘ÀìÀü{¿,ÁÿËÀ	À\À*bÁlÀ¼ÀÅ€s²©s°)Â;u©™Â(¼Â*ÜÂ,üÂ.Ã0<Ã2\Ã4|Ã6Ü™:t;¬™D§Ã#šC›3GĈyÄFœÄE¼ÄHÌÄJÜÄPüÄRìÄTÅUt?ÌÃg7ÅVÜÄ ÉÃ'›>Üs6¬tE‡Ãh\Æi¼ÆjÜÆlüÆnÇ(¼s-¼uˆYuF‡š0œÇ6wÆwœ˜dÈDœ™H÷ņ¼Ä„LÂ?ÿwtœYÈ‹\švÜÇzLÈsÃ6Ç€¼Å—¬ÂF\ÉŽ)Ç Ç¢ʤüÆWg˜‡	8
F©±ÿPpÞ¶
ý<—Ѧ Ø
À€¼`
xQ
6ÓdB&*/*J3–Ù˜½ÙšÝÙœýÙžÚ =Ú¢]Ú¤}Ú¦�Ú¨½ÚªÝÚ¬ýÚ®Û°=Û²]Û´�Ù0f#î+dûZglºg¨ê¯°j¢Ã�¸(HÜÂ�ÜÇmÜQ†ÜË]ÜЭÜÍÍÜÎ=ÝÑýÜÒ]ÝÚMÝÜ}ÝÍÿm7ƒvac=V<6S¦æ=)æM²É¹mwÄ1)ÉsiçÍé]3$eù]ßÈ!ß^¹gõýß~æß1!ßý�{^ààÎß
>	à~àÎà>à¹A²wç†ð{µ/#f_µl#R¶$>â&~1%Žâ'.â*Þâ,þâ!¾·)
Wãm}¥–XÈ雾ì¡ã=þãê
äB®ã
DhðàÀ.b"„QbÁ0Åä¢åL™(_ÆhØpâH‚I–c2%F–+]ª<y˽|þö+–S§NcÉröÖsgNŸC�
ZT§Ò£@…&¦ì(R©Sw
]Z+P¦KƒéüšSYÒ©€u¦Ø¥Lsþ`©SnË„.Ž4˜7%oô¶Ñû&Í6oß¾yƒ¶§K—2×°E³æ­°áÉâbÁîÞfkà
w»ç­Ñ0]ž`ÛVø/_"
™ÿ7Àá õ
æKßmßèYçÍ%/w#„IWbr¹3ýùëG¬+ÒœÁ”†5úµ¨R¦P±ò„:«Ò§ØÉ+[lûα߭zÕÚt}Öb
‘3‰$’3$Ç·±p9�DŒ2îynŸdŽ‘ï'ðÞ+ʺb°Û©«ùœ*ʽ)‰R¯ºé~‚ê=«ºò2¼,w²¯K±„Aç6îd�¸’Ä3É3 ‰ìšIÎ è"‚îCЈÿ
ÃPˆ½HÑ�MT FÔÑG%…TRM-ÍsÀ‹Â
 `Ÿ†IÖbõ’ª`‚uRYå”_63f˜YΩ`›i®9g™WŽÙe�wòùgžožùg¢…æg¥‘Þ9¿bóÛù*ŸÿÜÖd2‡âr>ù˜²Ò˜¡°œjj]±Š×óŒ@ºd ŽÏë¬|í	ªu”	o˜c˜—X”	ÌùþfÙm)ã‹ú`©/f˜Z†ºÅªaŒq;ª ÈD|¨X–Ižab9&–¨“Á)'§oYÁ„N?ÁJÁt^?Áu×c½v`ǽvÝi¯�öØ×=xáM �x㋽xäƒ_¾wçy7^÷æs¾zà‡ç}úäMà
âŠÒJŸÀ’a~Ke2
2eƒàÅ9Z
³ÃÀ€à9tQ
ë 3xÑŠdÀcTÇ0Ρž¶¢»`âSi'2ã´É†2VÑŽv
Cç8
‰


X;h`€ðØ…Û¡@ÒI[;ðÀs$u
ëxŠÛr,/1ùs¬ã»
ÿ†¢Ž³��ñ–ƒI>²ˆ›Úb«Áœ8–b	½¨˜•�Sy;rs½0i°a;³‘ÀÚ›ÔG¤@.ñ+¶b1©=<ôŠ:d=’¹9�A8¼áR;;Tê[ÄŸ¸@†éš%LðHð ½T[éš[ÁĬ²ÜÅT	ÀÝ#7´êE3鎗“Ä
£ìˆBO”ÅL¼%4ÅX¢:V!ÆÑËÂÐñ)­ð,cL´Ši”;]¼÷)ºœ£œY:7,é½
=ϵÐOz{8¨
¥Ð8Nã„LÚ<N
•Ò�Ò*UO}·1C¤€h—]
ž`v¶à
Æ`Þàþ`
v\üxœü
›Ê®ÏYÄLÇöD†Ã–½®a&>NG±‹–âUb ‡M¸MЄ7à�7°$~ƒ%NbþHâ'Vb(–â(Vb'^â#†b&¾â-Öâ)>b+Nâ*æâ).â"~ÿ3Nâ">b*.ã3^b%vã6†c%nc3†ã:Öb-Æã<Þã0¦ã8~ã0îã%.â'¶"΄LpƒD¶LèSø…½ú¿SökÈãÅäLóÈB”�–"K†ýÈ:°?À‚/@åTVåTö‚VFåÖXeU†eT&ƒ3 ƒ[¾åV&/ ƒ/håYþ‚2Xå[ŽåUÖ
_Fe+ æ_æå/Èå]žåfîfNe2°eîˆaîå^væmîfj¦ehveU~fd†eavfXÎf/@çXgV.fw†å^ç(8å5ø†xŽ“åÜ’ÆKŽÅsSÆ�DÜ‚V\ƒÞÛá+ï
i<9	/ÀŒph<nØeï>ŒHîDYŒ1Ø‚1XŸvì‚ŸH¿	9¼ÂÔ¦@™)¾ÿ#dG_¼Â<%s,·‰Ù½ÄI†µh‹·Àé'ˆ.¨ÇÀÙŽ[¯„Ï�J°k¨Jƒv¿†—�ù!ì'8ƒI¨›Ÿ„™_	�è‚3@Ièykˆ†H@„/¸ñ�ˆ-xó{W„- l…XŒ2HI€Œ—�†IH„ææ=àykð�'	1ûš¯†JÈk—.E�>�yIP>¨ú”P”�&øæj�t»ë^ˆ\EÓ�À©ó¿´:;
ì˜ñ0Èþ^`ÑxŒq¶p·ð‡
…ŧ¾t9¥V¾ÒÅwñ‘�’b™íLXõ—†õð�õðOéN¡ýŠ†•¨ð’èiCqô¹húÍßmƒ§‹ÝoiÎ?	„OÛ‰'q…/PˆdÅŠ	80Y0cÉ
lÈ°!Ĉ
#R,ø�"D
À
3HØ¥Lsü`	æ$Ê”*W²DÉ…åË—'eά	&æÍ•&SŠQ¹³%Ð�4UÆäÂå‹5oà¼UûÒ²'P0;¡æ\Ù¥åДY«V•éÕeT•Xîùó·�ØÅ�‹­5¬b0�ÊÞTxÑb0e

´‹Qâ¿{÷ÿâe›¶î]ˆÔÈñX±aêÈ…Y2,æ•4qnë9*=аaóm�"hI£:£Œ˜.Š$Aóf�t5IˆÈ<9)¦L%Ûà å)	ÛµIzº¼çil•ÊŒaÞE�#J×H_“´&
““c*ݾF©P!IÖ®y©z5ìf­\‡Æ×ü™(˜±e÷¡ƒŒ‘1E
%T�€Ñ5˜Z‡– A®…ÐEmñ—`ˆ5èׄzá¥×„9&PG¡’H\ÆYN(ª˜"W™}Ö™NeXÎ7áD³†g,Â
=ßGFZŒ±…[�qE Ò|ó�mWp×tCO7ܘaÅ<öÈÍÿW}�M8Û„ƒ
QDâM�ÝR�h%a@ÉM=÷tƒ�@nñŒø݇՟õe6V>fóßA
† „.Š`…Š
& FÆÄ¡aXÌ\�6Ø×ak
°Ñ@ÃXZÌ9¿\âÆ&þä"¬±Ê
Æh.i
ud˜ÁÍ’ôàúE%à,é�!W8áM7KbcÅIWÌØ#6_xa…5K2Ù^€™¬5W\

7SzSÈ]ˆ!ÆQ]„a®ÕÞúÅ{³Ê;¯TO‚aîU„*)¨fªÐZZˆ „þ¶õ¥’&ü—„›6úW2
#tð€�šÖd–X‡‰ñÒû±¼a Õë7Õ¢ÿ7Ð,wïÕðÊd8ÞÐ3³¯Xxµ¶Zc³³'{…œ[(Õ
8ÕDá…h(â�7ÜØú
¯ØPRFP ËäÎ7ƒ¼õ¼d�eV2þ%©bœá£	"ÌPÁm‘€˜Ô(]nÊ Û?zq©†ñB–½Ê5ဂQš=ZcF †[uo‹‚E“ÇðÁT8æ-…A>eýLˆDa1>¬6E¤\º„‘í/Ü¡ò±Ù´¯ÞÐÅ –Œ0ÀhòI
XР�ƒ¯‹HÄþcºŠÈu³‹ÝÙ !d.ÐD’—�¨nl3¬C4"»Cºè9þÁ}ð£ˆF<"“¨Ä%2±‰NDâ>–Å'R±ŠIœ¢³¨Å-r‘û ¢;øáŽec'L[é B:�íBxé×ëZ(¾îa.\AØ8�Qu¤#}1†2ŒŒc#t†,$"‡‘HE2r‘‰|d##	ÉIF22‰Œ#iÉ…n“�”¤&ÒÇBj²”že&¹IˆD²’ ÿ¼d)UËQÒr•±ˆ*#C�e$CÅ›¤B:	Il`l¼c
g71¶³��Z[^¤Ç†Äí-
ÂÖµ1§+ô0•Òº$ª¢~	Æ2˜‘^$ƒe\È2èrªf†31è„L`¸J¶‡ÒRÑ'ÿ!’U^0#ÈpÅF1bÈaÀô´ …-nq‹YÌB¯}½.p±×ZìÕ¯‚,.fAØ¿ÊB¯²ÀE-hÙÇÎB²=l_gqXÉ–�½«-<‹É’6´xµÅhñzZ\ –´“ígm�ÚÙª¯¬íjg{[Ú†¶·£}íniØÐ~Vµ¨ý-hm!‹W2¡¡XcÎÑN²Å!aäB„€

eô¹—Êèˆü%Ãúé‚ø1“b˜NX©…1ØÂ
|
†à
š`¶`¦ ¸‰›š ‚
Ø,C‘±MK5
¿1Ù=)ˆüÿßØ1,3ÄB,èý
„+pJ,¼Å14Z.ŶÂ/AÔ2Ã�
ƒ+ÀC,tÄ2d§DœC,¸Â9M!2€)•Õ2¸Ã*ƒ+X“ ™Ñ�˜‘©pJ*ÈE*øaé´3¤¡¥há2”áþ™J,°E$*ŒPý”1\b]"&ƒ©@†¥|bu�¢(†¢©Œ¢)†"*ž¢*¦"+®¢+¶",¾¢,¢+",¤B[É£$ÄÃhÄQÓêEa`�-„ù “	];¬‚:DÙë‘œ0˜\îÉ/ÀB1¬Ó’ÙSZT”2áëU7rãHE
À-†8ÞE‘M VWĬÞ'c¤
’>J	-™K-Lc$Õ¢ø`Ã
%9¦$QÒÐ]š&bôNê#!DP‰Uf–J-(_Eç-ÈV-Ô‚,ØBdUçuZg-ôVhuçvZ'v*—la§d‘gvš§vŽ'wb§,tçiIVd�gxn'zŠgwf'~Þçvžg‚'vîg}Ò§{ÊÖŠ§wþ§qáÕu’–,¼&JŠ#u5’C-xc“é—(ƒà Ù!/ØáTÑÐ
@ØYA€UFdèlVÄ�AF
ØB1,ØuR‚å�t…M'£éu㜙Ü:�Â_À9
ÜÂ…jí`„Û’�¥
ÄèdPUiƒxÿä&~
Ô	C”E™:Ã94±?1G±Oq£ì2¤<€ß5BËÔ	yfØTÔ1ˆq8bTØ*Ÿ1I�1jƒ•·ñGE†ä‚©(á
ïÅSh¿õ&¡.ÔPòp
µÑF…
P)Tïq	UÌéŒÛ4™Y	€8Ä>$K7àC�$ËÌ|Ã=|C�|r(ƒ²'“²(—r�ÐL*£2*ÓÌ6Ѓ<
oò¤4ð¬1³¬
€<ØÉ=dÃ,
5´0ÎQÿŽÕD¼�o>Š0ëÒú21
q&Ü‹ûeÎùgÂ}0�æÛ§½Rî=S:¦ÞŸÑfj&dö=6§¬ûfÜ>¿?{ÿº}Ý\Ñ•¶*ÊRÿþß4cú½æG&æ'}æ3µåo~Pfþç_>è·½c֯꫾éƒfç‡~ç³¾æ˾蓾á—>g¾c@ÏATžá;’žŸ“Õ,K:ò'|A°ÓÿJ*K.¿ózô7?ÀU¿ò'?öo?ó‡ñÍ¿ÿö_÷Sÿù:ö»ÔúK?òs¿ó·òï1ñËÿó—#ü#¿ýÀ
L€
À
NÁ.)¤i?4NÆ;iÌó¹Åb*OV0æ€\~!†˜a–q¥cŠIF™e-¦˜c$-†QI)­´ÒL%e4™H?Õ4™dŒÙrÎ#³·ÓN½ãËI0ºÀCu)mã0·ûT•ÕV<�ÕSØç|	'�-ácP 
»Ì•k-5›NeÝüÕÑç¬ÆÓ‘•Ù÷‘þÏ–þ”¾zéë§
þ?ãÏþ‘5±<ˆsêÏpÜ#&�N)VóÎTàxÀ&¨A0H`°% AHàAŠ0„,áMHB¦�…(tá	a¸ÂÊ0†-¬ámHCæ�‡8ôá
�¸Ã
1ˆ=,â�HD%&‘‰Htâ�8€€Š â¯X€
h‹]ôâÁF1Ž‘Œe4ãјF5®‘�mtãáG9–Q
˜Ã4f1‘ILes™Å””·F…2I�*T�"5©I7lŽJ›~3¥*OIMp†“œ«ç6ÇiÎr¦“�èt'6Û	ÏwžSžõ¤ç=×9Ï|ÚsŸøTç?ãéÏ€ö“ 
TŸr)¨`úÒOùÑš‘¤Mazә攧/Õé{ŠÿSŸu§C5ªP‘ZÔ¤õ¨Ju*S—úS©ªO�jS«šÕ«F•ª[µjWÁŠU¯j5¦£*†
”ÇH©¥)e_J#™¾ô¥5
ÊNÓ¤6u©-]ŒZ\zÔ˜žÔ©IýêMÇÚÿÕ¨¥¬e}i\ÛzÖ½Öu­i}k^ï:ؾ¶±ÕHÅV´º¦½n–µÌÞPM;¿Ô–vµ±}mm[›ÛÙîö¶ó«Üjš4ÂÓ¼¨6•aìJWšSí&î­	k^ËÞÄ¥”®ß=oLë›Ýò>¿ÿ
ðû[à'øÁy�ê»vJrÊh”ÃégÃA¾¿ä¸�AÑCÖyÓT¦@>)‘<à
ù¾GžòM‹<å˜b9ÈWóM¯\å5¯yÌ[>s›ëç'ßù¤pòÿ|è=çyÎ�NôN½Uè5Æ‘D•mB‹Ê›ÕÜqžm\d¬oÝÇ\×z×Áþu±_=ìdOr¥úüÌ'w¹pÉÿØÅ/~1Žq
ã
‰°×P
Ô@	º
— 
‰0ð°��å
º
ǦòÙ'®0ÓÚ¢m[ëROÏ
Ú$
•\
ÊÀ¼!B+D6°Áô
°
°
Âaî!À
6¯ac¹;µ3ºÁjó!ðAB¿�rö¬�˜Ó]ÿ·1
€2=ýË=ù”1«Îа`Õt®JñõI»Ìî‘,öM_q¯d4ª4ì 
LÓn¥qwÒ ”ºAdEÀ¡¢€&5B½
®ÀÎÀbEÖ¬à+
j?Ê@¼@xÖÁ¾@ÜÖaG�>7$Á ¬�JáΠ° ¸áª¡Yst£á°À
!¾ás­¡HÉ
¨À|¹¡¾“K%¶A;ôá\î‘öèJùtÇÄío»K»ê³‘˜NM•2µøš>eq'x/ôIòƒÿ-2„{Ò&�ñ:·¸
¨À.£àˆ³Ç€î�Bç68·}a·,£À¸óºA°`¸3ÁvjÛ—
žÑ
¤4|­¡!Ÿ xvQ)¡
žawûÀ,·€vÛVj_ÓÀø¢·
°!|å–Lò¥WJ'”Ê
¶Sêá,ômå–n÷GYR§1�KØ÷
€
´€�Ò€%%媢(sáôêfйkMã’0.T†«7X!/sMòt#Ê ½4†Q¢ CKÖ¬á”U
(!~¿�º
\“7H» ‚·Œ�˜ž¸„#A†'T"JU:´ÿxö¬¡¶ '¿Òˆ_r}Íؾ`‘shCÖ�½
ìò¢ 
¾`½ yQ×
’TQéA•c×8³“¡ñ
\­

&Rȵ‰½�¬
r
úrAø¯E8„CÒD¡ZdÁŒÁõ˜ºšødO™±Á•£•ž ®aˆ½¡Ê€GŸ@"�zG6Nv]E¹Ãà ¶"ÔvMõù@¨7dE¸
]sthi{t™z;4Wyð’øàX«WQû¡/—SEÉq°û8�
9¢)ž}Ìãþ“º³oãzºôTN
‹º¦
_ýÕp8Ó·JÆ�Ð�a)—P:�¿àì2ä;® °À&Û¼à
È zŸ
èÛ
Ð`²�sÊ`¥Ë@´À/ÙòC£à
¬À
Ì ”	œ¹»@r¶¢ACÕ9ÿC4È€®€¿õ€”7·àÈÀÈÀCÓ˜I™ ÊÀ.ù€7ITÆEü¶
¶ ’´H)’	Î@Å·

fHC°°(DÁcØB!Á@©-„Ám[Ø‚šH.ìp¢;Lä):Ñ!ÿ”Ríì�>:Q·yÔ¡‰TèC;ŠÑ”îŸ,µ§K[úP‘vá	YÀ‡©öAŒ/zs‹�M9¦š•ñE8â¦;ù²4þt;êifN–ŒÆ@º)ªÍR‡Aüg«\íªW¿
Ö°Šu¬[ǤbÖ{4­f=«TºÚV·¾µ)0�IYÑ
׶âU®s5�}dbW<†Ã¬qkaÉŠØÄV*Þð?þ�S‹½Ê©Aªßæ¸Ùͤþ´s™Uœ+
˜¿j†î2SÕMAx!Œ_`¢æø‡?ú
ÛØÊv¶´­­mo‹ÛÜêv·±Õo{ûÛØ¾ýmq‡ëÛáw¹ºEî>ŠëZ@öÿèøE3Ô�lš—ìÜnjĸ‹qñG:•Õh«è¿^öVÆ"Æ1šUÊ삺ä@:ÈAŒûæ—À
�,xx}çJÌ ¼Àðà
²Bv›Qtxv¸`EuX"h#H‚%H‚&ˆ‚+h‚*ø�/X‚Çp2Hƒ·°‚¶
‘�6eÏöŠ�Ñ‹þÇî•SÉ0
ê0
A��ã2Ö¨µ°ï$ ŽU	�! mižã‰Žm¹žèyžï9žì	ò9�âxžò9Žì‰Ÿî™žøYÿžä©Ÿó	 ÿÙžóyŸŸç‰ üéžßè�æé éY�ê) ë	Y	=HUØò“ŠÁŠåTTäÇ2°
�äXª *ÿüø�›º©æ™ª©ºž°Ê©¡úž™�)«îh�¡«û˜©ó˜ŽŽ=`¶�{·{
‘ŠHbh—1@<y¢¹
h¦ÐÃ0®“é­
�¸¥»P
}v$ìÐ
€¶c+™ŠIšç
€
�ÉÐÿ¤”i’Ê 
<š}–{VD—ÇP¥‹”šªZ) èùÃóŸBŒ»EÜ
VÄ@¬ÄIŸCŒÄOœÄ?ìÄNLÄUüÄâxÄT\ÄV<Å[¼Ä^<ÄÀÔ‹ƒ}f#˜6“xwK9o¯Gwͺ1ÃÀ± £®�iÊÀ«0¼°
ÁšÔȼ
ò¼@®püü™ÓùÇËÐ
°€thÆp±àg›æΕ
¥üÏY–±¬pÑ|ÆbćFù®
lÂ3=š Ó5�Ó9­Ó;ÍÓ=íÓ?
ÔA-ÔCMÔE­Ó€
I²!èq¤%µ�¦ÿ^¡$~À,€®ðÇXÍ¿Ñ·ÌÀ*ýk
ËËà‡Æxd=†
=†6.y�dísù×ÐòÌÐ~fdÍ/-xÍdd­°`b´£ás_x×~¸"4œ×®p×AGzn‡€Ô‡8(U4Ìk—‡Ù™­Ù›
o9¬¯€’N–?›æg”gµüÂÐk$‹¥q˜ÇZl}Áøás¾ˆ+£$^ÍÇÙuY|&£½ñçfœq½¨a
82ü{‘<éÜÏ}‘~÷ÜÓMÝÕmÝ×�ÝÙ­ÝÛ]ÝjÜ{ËÞ¸ÁÆç,¾Ȥi’&©w
‘ÁP
àîp¦6r�–½àœ5ZÆpÜç÷dHà˜ô{hrþ*3)#<qx‡1<Ê°I~“FFÖ·—Ý„½lTmîSA6^tÞzp^æ!#æH~ºÜ}DrãŒ{²|…8ÎƆÑa^ÀÉ¢
à_6jiä ¦ …ä�‘|�†wM2Ë7ÎÉR‘¸Œ{õƒÿèyÎåæ­yÑDÞ“%iĸ?lNá˜È¹whëš÷mà�ê·¾n*ó½‹ØÀ¾*�<ìË-ì¼bìÄÎ+ÝÆë´Þ{ÑÉ#íÑîwnà�æZFÚ²±à
Ã

»˜
œ~©ë
Õ|Þì$
2LUëÅ×ç,BŒV´ÍÞq¤t›MØ€:2ÜÎôMïÿôs–Û¦]ܯ¡…îw}‹AÝî�
í ¨l¸nA�@ªExù‹=V^Ô$åÕ‡Ë?ÿYà›Æ‘+¢„@£Îh0H}.„{Ï÷}ï÷ø�/øƒOøAˆ>hÆ»} O{âá�Õà½e�¶�˜ÐÈàJ˜©tÆã‹J¨IšÁŒ³B|&g#snd.M»�+»Q<°±¿* ±Ÿ·Ÿ0pû+€û·ß)`û¼ßû·¯ûÃÏû¿û¸¿<0ÆÃ?ü0üÌüΟûÔ_üÇOý¸¯û¶¯üÙoýÎÿû½ïÆßûÂ?þÓŸáß<P
D 
–aqG’f´ñ¡Íá_Îÿ"rÇHåNuŒÿ®$k§«X±d“¹*ƬÃe˶‹Y0XË‚m<ÆJ™«�ÊxS¦,/XÁŠ)3ÆËØÁcÉHšIRe1c	®ÜL£J^Q[6¬¡+WË(Êl§lÍ
1D¶@|kÄ8LqEÐü"ŒÅmÑÅM´Q´E„ñÄQäEuTñFcä±EsTK…[zMBÛ €˜Ö|é*œ²¼Ò¤dàË
­äA«]­1UcÚÎòvgºŠímìÔoi´³°…ÍKŠk“-¸78Y
7|`”“T®}’f¿òUÔšKÅÕÄÍADbàÚÆ8Æ£Ri1á+$Á*Þq�yüã	3˜Áð:…\ä#‹KÊQ	H˜1Ù#d\Rn­¤â9fÙ«ëD²jÀ¢%©„YÆÇHM”rÿBÔ¦3'æTmCš¥}ÅÚä–×¥•:_8á¹NÅ’øg?:€´ 	}è@£ËHÊ£@ËÚŸö-Ò“¶
¥-]iL_ZÓ™æô¦=ÍéÜld=•}Íe÷K›ª|°>Òa�ŒsVŸž™DÈ®žPyZ³1ïf=#
Κç|Z:Êy˨ݙø°ÂêÜlKÖÂ8G/8w&
Ö^XûŽyœíÿ„×uÆwoè“*
Ô‰¢›3cÃËó/½s@%[�Y«}#.:1æó»§36ÞÚ$
¾+>英3@Ì2>°�56!é#6d¾á¢£
Á9R<
¬¾Kâµ
¸î;Æ6„>4¶œ°˜K?NTB–\
SÁ:+Ô·°œK
t1Ëãž7Ü$�¼|«-»Eé«H«àž:ú˜0´0Zù=æã5È‹H§TÊÍr5.ÉÍì°ê¸Kyð‡Âܸ’›?´C»×‹½|(LTNÖs¹äüEÔ
TK,ûÅñ<ÅÜlM
BO3Ì[;‡qˆ6{ðÃû{P�P	½?ž¤ÐP¬ć�P=…
‡„ñs³ªIŒ¤H’¼‰{Ó°Y±<•°$ôdϾë-¿A5…<…K¥<'`Ì7‘œ:;Æ�´È­(ËúlÑ{5DQ¯¢¼	»	¥ÏKʯܰaÈrÈÒ,-íR/ýR/%r0t@‡_@.S0=S'Â
_Á!SºÁ‘S�ŒK%+:ÿ”<ìëÇáQtCZĤ�Ú0ÿœ3ÝèÑ>õ™ë¤7Ì™áÚ2D½”FÅ
ûS”Ã_”5œ‚Í[E�)u[O¦„H�ü*KÐ:T¼…EÞÓÔÔJ€¬ÓXÔ7kÅÝ<ËïÛÅ=žãÏ´<‘L¸2lK"õ»Ž\Ò•£½‰:KÃ;tc°IëBÿSÀíìÔ�$¶±4U9ý€ëžÃ<I=ÒÍ”È[aMݼã+P(µ
DýQTå²�¡E=ÖìsH«ìÎ@eR‚|Å=å·fÔÌo%Uv½��ŸÊ±1ƒmqV¦Û±
K°ïû*΋H<‚3¬X_Ä·xåŠ,TÀ{Ýѵ¾ª(Í+s·}É_û?s=Ù›éÍVÿUƼÊ};-w�ÃàB§,S¼Š¤Ó	YØ›: 3K±	ûŽýÚ�yÅM%!.ù,{T¬Å³¬S±úѯÚØ—í=�,C�“>øŒ’µ#íÚí³Y3HïAÔ®õ5ßÔ¼¨Ø«ðOY#Á�uµC]:†õ¾ú”Õè«XÏC …Ë\lXqûÑò4O}ý;iõ0%Ã7
Þ°£7¡|µUE
)¨´ÞÀ+KŽ…[J-ÈÝ0‡ìa[QÛXu¼
CU�fìC1?&©ãÓX$5²6öVSÆ>Ùd¾Îòb™�À¡;;Z‡Uè%ÚäK0¤eh›h‰2 }h‡NZ†~ÍŠ¦h�îh,‹è�é�&i“îh�>i•–h‘ÿÚ•î,5©Žú\�±:›¾iœÎi�ÞižîiŸþi j¡¶º¥j£>j¤Nj¥^j¦¶:ƒ.Šþ‚lA™Ú0@œ²j¬¾j­Îj®Þj¯îj°þj±k²k³.k´>ë­žêyÙª´~kµ†k¹Žkºžk¬
¶®êºÞk°
Úo3'ð5Wó4ó— gŒ?òös
§s
uO 0×ó/ö:oqdóI÷õ
BŒ;_s`òXŸðü¡ög§Œ»0ów nÇõ[wpwq'q°Iñ7§ó8¯vÇsvOuc'ó3op ŸðFïrzÿôjwòjÿô×õvïskwrcçv]çwrOørWx†Oô0ß&' 
_ _Wutÿv÷&ó§÷hÏø#×øŽOöX iÏòŠ (_õÿ×tÃÐõf_x˜ox™�ù€Ÿø/·sh ‚‡r,öÊð÷_tŽgôPwtΰôˆ¿óÌ x‹ïùoø”ù]Ÿø’ö	§ù™ÏúrÇ�� K÷ö&úŸß°už¿ø£‘tWoz'Ÿz”÷y®±ú‚Çq!úwçò6—ónçóy/ú¦9w¬|­Wx¤Ñ±�ˆ

Ð
fÏ¢*}>͹TçO¥HWö¬Ù’¥
®N�í9u,Õ²dÏšM‹v­Ú¶g¯ºtÙ5K¶+6ìX±dÁ’	ó+8á†÷¬ìááÆŽQÆê¶,Oº`‡^f{“hÒ•Q¡­,š³ÔÉ3•ZÿZšig¨Ÿu®6-[óìÚ´oOÆú”®\—�!ðØo.x¹„
à厰
¨óuNX€
ÓJ2Ë@Ý
eT¡R&Yhn&Ô…±möäš·–šë­bh)Ü•W2±ØY1É°Ì_ˆò2 at 2Ù蜲ê4ûÜ_ð(L³¼
ÌÑŽ2ê ƒDË´ßtÂÀÓ*ð[L;œ0£L1Ë0ÃËÆ˸"q;ÃãÊsÉ´1'ð0s̸O¹:o”ûRve~XŠ&gﶕÕiXq¥%­4óK´Ñ´uÿá¬$a2¯Ô‚Œ-SËbK-ÆØ‚õÕQÛ¢
2²ãµ*Æ SK-°Ø"uÙµLͶ,egmõ+Sã"-$x–7©µ�V4¾’é »ôµV*½y_ë¹G3î7ãE�à†"tå�
Ü
--- NEW FILE ---
GIF89a¹
ð

HI
›¡¢š
¤¤'‡‰)™¢!¤ž$©¬U‡ˆh‡‡eŠ�h•—tŠˆv‹‘w’Šx––z�¦w§©ˆ3�FŒU-˜d:°T¬Y'ªc,©f7·d)¸j7ºt;€\D�lQ„xf‚}y–|f´xP®a¼`ÑZÁ\$ÙhÖt-ô\
J´¨Ñ£H“*]Ê´©Ó§GU²d†ŒªÕªT[&{¹•eW­`]~E6våزdêM+v­Y·l߶õÊîÙºtçÊ]‹ö®Þ¸y÷,¸¯ÝÃã¬ø¯áÄ€3Ž¼˜0eÇ•%[öË7³gÌ ;‡¬¹ôgѨIŸV
:™kbX™e5ë:ÙìÙP�Ê–ýRªÊßÈ€_雸ñáÈ‹'?®¼9óçË£;—}ºõêØ©k¿¾=;÷ïÞÃwÿž¼øòèÏ«7Ï>}ûõîãßÿ¾¾|ûôï+Œj1Ü+13oj¡ÅŒmfõçUVÍ
º«àM^aKjŒ‡ ®
,”lðÁ'üâž~Š
_l
lÄØdCO6ØÔJä‡T¬�6Ó¨J�6Øl1"«bFž\xœM!&‡\�ã"R3‰-kƒ1~~ѲŪ’*´ÐxÜaHŪêô!Ä*ìôÓPG-µ‹êò£Ï>Ǩ´Õ@Ý;•Vóî5…Èh9Lc©ôŸÚé ÑFj<õÜt×mw’w˜<¢Ä^lÿ
+Š_ðø·­Ãê=xxøÌa<ÐÙr"­wñM÷=l‹�Gl2Ä´Zn¹Ä—ßmú騧^mºÚÔ³?ÞTµo—É
k¬‚¼
0†1]°ƒ*)�ªK”�adèB6P}ª30LW²?T™…2 º&]´cÞ8†.2éŽ\°£·xF-–¼äá
ùÆîO3Š¡‹ªè¢?ÿa†3˜1ev<
C'w—n^k,Bá(H„Â=0ŠmlæßØF)¶±

,¢¡à€Â{±‹]Ì@áÐ:Ìwá‹tLbÁ$àÆÙ�wXæšø±3Ž�§À@PøÒ‘Ž7/¸Þ¸Å
'
fP
ÝF
)�‹º¸« vÆŠv¶°`À	0×ÞÐvªP
 p
.p�v
&@Ž

ÛøªÀxFÎp
ñˆ@Ž
oùÊpÃÀ!À•–�”ÐYÙ•¸�ƒtak¶3lš$Y¹!<¡kZ’MGdƒP1;dÂ%'ø‚0ˆƒO‚`ÅU’tDµƒ˜nq&…
¯à.³ÆHÚ´C¤U(Eƒ»D“Æ�b(›�YM,±&½yl]qš3YM®ñ%X±š´Ô;=a6ºNœ$œ»vC\#F³!›Ï–T`‚š¾£›^&›\Â�<¡›Çÿ㟞eÓ »	›ÄF_Ql3è)áF×Ußt¿Ùe.�j2!‡D '& 
ú¥’)lp:øžl
 yº§:q§:¡¡VV
²d[qJ
ÿÚE„ZI’Ÿ\"E5�6�H|z�r
‚‚Ewª�z¦}ú¦CtD¸
ÊÁÙ5T3“
õ`1Ÿ«³Z«@s1"c«¸Z«õ@
±Š«"#««r«�s1»š«Æ
«Äz¬Àš¬Àº¬ÃŠ«±º*É*«ô
!î9ª;§x¶A©“y²/FÔGcÄžÂc6žÊH\’ªOU;,áxîà
3£3±ÿ

*õÀ´£´33ß0%Lë´;;´E

¢lj¹Ž™²`ªô‚|+w˱-
˜*l•
‹6“»°Y¨# &*�øYaÏ°f¢�^ë`ô3S´E{¶g».Ð*Ñ;½Ê˳ØKÊÛ¼ÚK½Ò+µÐÿ;3׋½Ü[Ê{½â*è;½Õû¼Ÿr½ð
òèFày®xR*¥RóØHL/\†MÜøÉKIÌe û»t�?�¸Œ!D}j®L°—ûk»c&³Ã¿èú¯,DÃÃC²yë±kìÈÀÂE~˹1üG#;»qú -<»óÚ�˜z»d¨|Èz±¤ÿKÁ6Á ãš;^£˜‹AÈ=¡¹ƒüºÃ„´k¹ËƽËI5Ÿ.a|N…G¶Tµð
Ƞʬ¬S­|<¬¼LÎÔÊ´<K.u˳¬I¶¬ËºìO°¬Ê·Ü¥³¼ÊÀ˯L̯
C‡Õ‹¡ ‹àõ]çU
ðåîìn
¤°
ÖP
«�_úe_ü`ùÞ¹`ÿž
wÑ@
¤¸`n ý0ÿ'
Ú%Œ[sðsæU^Ö°
gï0—_æ5_õu
e§_»`ó`ÿ_Ÿð½pÆPð�ð
“-DÖâDŠ%B”˜‘áƈ5vYqâÇ‹EžD™R¥E“!+–\ɣ̘-SÂ|9’£J’;}ºD	ócК2qE
4©Î™K“6öj³dÀj1c6€³„«BMvt¡2dÉj]íF
=yk«¬‘²VÊýük«ìßïu_ýüÆzõ2Æ—
«"Wj¨\Üq¡‹nlŠHU
’¢$kzÈ+'j¢&cÌ)¨›*êJ¯b”¨ª)�kH§D:RÊ›PÊqJ¿D&ʲ˜‘
FevÌj«®nÔr"²:†!
“J!:ˆÍ4‡u	N£ª©$6Oº(IPÇıF�’T³Ç²*ò–K‡Æý	Çq§l(Ïs¹-Ó«‹´ô–Ü%•z1Ui³­ˆa)ƒüw#~EZ©ˆ¥²I¨¢“
ÒGž•8‚Q4^â&—°ABq[-âX‘Á³&)�yɘ…YÊøŒ¨ˆQÉH&uA‹Z8ã’®0Ë%kQÇZPRT©#á\á#WÌia¥.ÞQÇ‘´+ÎxD”qɲD
—Ùå¶ÈR•af­—KCæÒ’†LbB�}ŠÄäXRG/)ÿì$n¤ñEÅ”ˆLˆ†ÄˆšœÂºÞÎv,„á6I'ÈÆáH[Ý‹
ßU¿ùÁNI.Ò’�ˆ¸}®aC¤×9§à)o%aâòb2b
R`”OcýX3xáv€ §_ë¨/ÊgR•f£ÉÔÍ&ä1“2ÃÿÅrJ�rÈ#øIÌ©6¹'ÇdO†! Mäò¦Ni=qt÷º0F¶	LßgëȵÚÐVI²º3çäÞåÙ½³�
5IPWT+ÅLh‰´Jy²êÒ\‘3g°b
}jä2fO[È2Éy„šm1€1Eo`'
´
ÿn
@@Þ1€
r 
Å>;D¤��I‰l4œ… 5캊¥˜¬”A™=²©4€*“îZššQ"tY!,®°h†V��JFB‚¬zŒ£AÓ;ŠqI<ˆœ4ÿÁÃCÕ
92ˆ6”£gPÈqù‘(ü¬pÔ³'É–l|¨¸#d�8ëç¹#áœCó²˜xÆI®�p¢F6±Åõã9¢
žÁ9kcC>Š‚„Ã*º¶i³¬“ë¥t at CC™�\§³ÇDqœå›.Éœ€Á´�K†ˆTÉ¿[øCCN¤ÀP|3ä	­ÐÖ‹¦j/j at e¹´Â#°B+I2í
¬˜“ñ
ÆÂöÒ��lv€
‹?á+3)VX²¡É«ƒ@ÿ­Ÿº®Â²™«?Ñ…¶j“

²f€
2R°÷

AÐ?¹:–Ê@±™©ŸVðÐ}!š8B™€Ï_hXûLºBgÐG�€'É
ͪíiˆ3¢N
‘€�¢f8Ì
0cUÓ
f‹Zÿ¢Z3µS¸ÕÉ~I7¡?,ššž(>6â˜ç"5Sûelˆ˜ô‘˜¼=dø˜â"­°=˜Ñ1Â¥‰½²Èœ…è®gX¥ŸA0gõ�Ù2b`HˆƒÐÈî2¯­â*#{°vP…W›µM»ºŽ £9��d	ñP„9”éY_…È\ßEÙ
ƒÐ…0Iˆ~�žÉÞßLÓ¡AÅ-Ë�Ï-¶™Iºì
OÃò‘ši%ˆMÒ­V
\‰\ñ53r,šˆEm—Í­’2š!¦Z0#ZEàø]$IĨYxÝWI9j…ðI"}É�	‹bR
É"à,~‚UËc}‡ûZØUq….‡åA¶•×LN¡ÄŠ	Ód‹”«Û™7NÃ"³ ¯=‘£ý¢Š><[Ã…¢™á…ôf½¯î
š¸Õ™¹�™dîH͉¬E’EÖqç 
5Ñ©
LÎ¥»Œ?«0;;ašóË?tĆ’�2z�š°©w솈rÅæ¤NÿF‰bÃl¯+"*±;ÐfMªw 
9†™

$c«aÀd½…
Ȭ
Ó¼»Ôü¡"Pv8úyðNª«™�±W8þõÍ
dCOúôs P\ˆ‡E™”Q«MÖ*uNÁŠŒòN³;1kÍ
\Ú°p^j½;@‘R™Zκ#kЙ¢êÊV†—zÑí“åŒ?ý£Ò°"\h‡
ëñ†Òä+Áúžcxë6ªcèªñáh{E0y
]Hšb(¥	oáæÍgÈ;®€;ÿ„�¡‹”¡Y® qÀR£cزh%£‰ˆ�™e”S‹Ð¨Ÿwh#Ó2zG¹Ý^‹ˆòÂò³”k݆ÈO‰ˆU!#³x02'6™qy
V2K5:㎑–T+C1KÌÌ¡Gº8sQP<%Œo<eej©¥žj*«©îש®ò40«¾z+ª¹ªz©®½¦Š*~¿þ:®ÅæeªI¡
ë+³¯¢å+~µ%m¨—NÛ(¦Îþb0ìèRyä™	éL?â÷wä‚å¸+וŠ¾äãVqeZ”™ˆ
6¤¹>9öa{õ6IT¸%R·ï»âí4$3fµ©éTp90fáÖQW³åÕÚ1ìŒP=ÙÐ32=Ô€rÿ6Ú¤,rÈ*‹¬
ÉÙÔ#r64£Ì2Î(‡|sÍ#«LÏÌ0�L3Ñô¨³6H-³Ë6×LôÓF¯Ì2
ßw'®.ª�b•^“XÑKR`?UÜùêgÉÎ{¿£®:Y¤K)â�4ÝÞy�Ñ.^xùÕ1Nz‚cщ–qÇ”à¶6€,r=õ|C
T
íŽz¾²#©ÉüÈt�‘xü=Õ
&z™Lä…ôS;s¥§>;ÿ�
Ää®àá†%ßëM1ŠñŠcˆ
X÷hÕB�5M‚ÂÿW‹Bö„GPmuTÅÅ–Kê†:J%T]yô’¶ê;ó±k\ó:S—
Sq5¬R5Åö®³ë]#›&ʘdM�uki�A‹FÝ„"Ç“*$5ä#ŠmÇKcÑÎçÚºGÒowF	mxö¦Ó²U©J	íR$%ÕIšu'ɲíL;Ú@éNI»M’I’
Û¶ît%KI¦f{°­>׶ª”¬{ÂÉÞv)•ië_�Ú[$9Ô#Äu.qw›Þ¬â•½õ]L+z©Ky†
†9lcÇåÇ®R0ìüTa]YØO�ipH0\aÿj¾!N0’{¬`,kY/_^s•§üá’Äžq^XÜ‘(ÛYÆ(Ʋˆ«$,ÂìYzNŽñ›×l;!ãø-C.s°|h8;ºÏq™‹r’Kd°ÒÅ3
“¥˜ö„jZI3Œ"™¤(#*­¦HT6¢dȺնžµ¬ÅÒ”UÓÚ#¹†õF‚�™Y›S¼>v¯…]ëX»åÕÉîõª_}ëaCûÖ²^v«ÍËjÿWûׄÙ5aŽMlbߺÕÊ®v·Ã­mº8{×åÞö»©½m¥,ÚêN7¹a
m^/[ØãævR¼ÝT±`߶´™]ì¤Ü$ׇuÃ|-ï†ß[â°67´Žp\[|ÜìN÷µÝqcßú0/¶ÀC>nŠû{ã*�÷aôýk•ûã/‡x¶£½êz«åæ
I%ý`Þ1”áÑÞ–ày¼àUTHX�HR<‡ÈA]Ì�¡–á’áša¦!®¡¦†ÂaÊá‚!Þ¡æ!Öáâaêaâ
"â¢!&â "â"*b!6"$>¢$ú¡#Rb$Zâ$"&n¢&v"#fâ'rb(zb%’â%š"(–b6+¶¢+¾",Æ¢,Î"-Ö¢-Þ".æ¢.î"/ö¢/þ"0†È.ålC1ã%V²-£26#3>£3F#4N£4V#5^£5f#6n£6v#7~£7†#8Ž£8–#9ž£9¦#:®c7&‡¦<NÿD	Ÿ»x=ržÁpÖƤÃ",´A¤�@ž�¤A$B&¤B.$C6¤C>$DF¤DN$EV¤E^$Ff¤Fn$Gv¤G~$H†¤HŽ$I–¤Inä¤�
Í4àA�rÁ}&(}"Ây®gÍ°§‚¶Ì4ÂÂÜ
{(b§Y^%sr§vJ'w’hdb'uŠ%‹vç‹V¦‹Ž&Švæ�Ú¨wâèŽæèQªf=ðÃ>¸¦õaÿ‡
6`Qˆžó”ßÖÕ3
lÀb¬Ä^lÁnlÃz,ÁRìÄf,È:ìÉVlȦlÊ–,Ķ¬Èª,ÊR,̾,Êú«ÉÚ,ÈÂl¿âìÍvìÅf,Çš¬Ï­ÆzlÀ~ìÈ~¬Î.-ÉvìÑ&-ή,Â*¬Ðí¿^­ÎFíÏ>,×~­ÒjmÕf-ÔŽí×N­×¢-ØZmÙ*-ÙZìÖª-Úší1øÂ10ÃÝÖÕFØEzàŽ  ™R+f”ÿ­b|DoøFâ.nG0.G8.B5®ä>®¡Ano\îäFÿ.åj®åN.æn®ær.èv®èŽ®çš.ê~nè:®ê’nëfîç’néÊnì®í¢nèòí†Äîânï*îíæîêVnðÊ®î/êòÆéoé2ïìïæöî릮ï.¯ôVoôbïóbïô2o÷2îñBîÅ®ü1!‘¬È‹�ŸM®–¢…3t
4�˜§yæšrÁ¨iþêØ

¯°
«ð ÀðBÐ0Â
ÓA@Ã÷0B
Fß×�‹>›à>³Iøó(	û>ž¢¡N,¢Hß²G«ƒ2(Ã1À¯d@ÁOüh4›å¦yvA¦Ž4
ø
˜§œç¨
§pÞÁGAàÁLŸ§‚ÄOü!à�OÛ� 0!ôôÿþÁPõu¨B!
<|ý(
Ï�õ7Vó�ó·ðõÏ�ö¼
ö_ÿZsÔÁÔA'ÐA4èp,ñàðùq4À
(±úŸÿüó:ÿWCó?@|X-Zµ:?‘ªFêS¨†IEŒªÔ*‹¥B…Z¥‘£E�5~Tõ1×*Q¹z¡¼µ*Jc%UµDYÌÛ-^¾r+–óÁ
ÔPÁ-´Ð¬ÜFüÐC¹úk®™c1·Üþêÿ°«f¬D[´±­þ¸*]¬Çu$’«‹DÑÄ™0E
¿Š«2VÌå
¾©‡ži§µ‡Úk±ÍVÛm¹íÖÛoÁ
×[{
—þS(eÓ,ÅbðJ§„i롦l
�þ:Vm¦DQ…*òÒop£™Éˆ’”µ@Ž)Kù#T²å”ÊXe†â‚UÇ”­œå)#ÊÌ°r1‡!Ë/M9KSî—¥¤¥`ìR ]xï�=•¡×¯ƒÍš ò¡$k'å”OGØTKùfDR!r=y§o$Eé)iD[ù•7ÙY¼¤ñËxegÅ¢¹¡¡É“9ÛÛ�ë�qŒ		‡K‡26U¦s*Q�ë•Cªœkâ�‘V2g6oFIäíÑŒmaâ+)§=‰QÃ^°â—”Rí)M|"›˜œ+É4š5u•rˆ>ôÑtœ¼ÃéL{ÚÿD�e$Ø #¹¯ŽeQ~.½ÓïÞ¹Ð)²™VôcBË"G£0hœúæ®”ª+ÁÔCî‹Ç—½Iöˆ­
jPŠ,5™ZØ‘ ŒÒØñ¨HTÿ=/‰¨ƒ©$Ï™×yê”OUZa»šÕ½¦3T´©Í
†çnú€¸
¡–0ôàü !�aø`æ ª�ÌŽîæ çNè°AÈŽîðŽïê ïä.:á
 ¡
‘ ªá"OoQ!F�òâ
ª� "Ï‚!>áH!ªáb!8Q!®aHáó¬aJ¡I¡¬aHÏ,¢`ñõváõpÑ%t¡ ¢vâŠÁ‚Q'~£,‚-­ÖG£d,xE©ÿšÑPž1Çš‰¨…õ
Å ‰›<R~Ï¢ñÁ‘·qP|¬œÌUÀ'žŽ$L^!/D�
zð&à¹@kî¶À, q2
,
ï`
5’þ`
Ò¦oè ²ìø ;À!Mrü
à€ïà þPéÀï A;á²ã±
@ò¬á)3Ï0‘²ƒ¡v¡`^ÑzÁ#®¡$Ö’õnñqñ%^Â|‘ÿy1¥ã7€ñ4²ŠØ®¤fˆèÐEh–{˜è£ª'§†dE^G1ͨaF¯@¥ÅˆìªR‹‚…c$å‘ø¨Æ€Ñ(£:ŽŸª¡DFŸ€h2+išøJ2kgxfL×8Ïö'2I§d„*�)EØASh“IØ¡{

8)æyh­+¨yv%ã,ÁJ/\ádÔXtá¦OeÝ
H›!š�žA+º—°a>3Ÿ˦T…JsvyRì,Þ‚-¦‚WŠT i™vz©·z­÷z±7{µw{¹·{§Wh Ö¶M>×[c§Òª4Æ$éÆWDì5Oj­©LpgfÿÕ›ÊW]{Gê2C³‹J]÷…aÜŸ€Ä~‘bÖOÏôc©B0e¬yñ„cF—™Ê3æá(*ã>Þ
ÿšÁ0ºbb+àºD1dXA›CXaXá|¹Â9XaX�m¥Ó´èNfiDJÙz„JÎ<l£-”ÁX!„uA
y~E�)xNÚ	­º‚”CaäÊŽ&˜\9µG˜J^LL]¡:
äbß
4–X†A &ÄÈA;
¤“€€!—›�Z�Fxà)²Ã'²£ŒB;t-ÿŠ�r
Ø!€tÁ.¶7
M‡(`¬jx�)K
ËË‚ŒTå˜|ÞBÂiEߤ6¨b2&=”©/š¡<ìðC•Oჵ5eC8wç�×\eÉûü–›
Rö9šW•÷ƒÿB£zé.€áÈ:’ØP-gªô«jS=Þjuÿƒ:
ØÄPÍ“fjvŸÆK=�§Ù§YE]Ｘ
þQâ¯Èp¹lŒŠÔv;‰:ÐÍ=p¨ž¤ªaé*+ IÌC·€jC3ØÐ$E at HûCBÕI˜Šrø]¨ç‘O›VmGZAUØBÜAœ›ÄÖTÊXÈ¢Û1™m
Ss	J�½: žK„7¶,ff4Ë*¹ÙPE†°3�Øý–·)—CFœ¥»�
ø›W©ýü©xÇ×T_ÿBÅÔÜ؈ä]Ìïg‘ûâad�›Û«ÌÜ�]Ì¥z›‘9Íïý”�Â)ë=[±±[‚ÕÄ5m¦1ûƒ©Gw-’u%âÑ'æQÄ°Ðd,W| �
Ût8Ómr?÷´ÃÑ°Ðœ¢ŒfwLÌ0³{|ÅS¸^Qôx.*›
%w(m­Â~‘d†D^Ûaǹä1óVh~Økì´§gÎÇ�¾Ô]—̈Y}‹Š}çI›&>N@þ’8_Rh böÕ‚&Í‘�¨ã5è¢Ã´XâôÕŒÚEɶ"4B8� »T
ƒ:<ÍV­iœ�I?Ljó-^ ²e?Œ¼a3ˆ[`…xrî­‘Q–ìÐtÜ»e&²ça
XòŽ.Þˆ@uÀØ—_„Ã�3!‚é5@3·4à‹ÎÇŒ32=ÓÎ/
�‹3óŒÞ'@1õ¹ÃL.Ê—Þ
¼ŸÂÌ´+§*…6:_9Bè*
üLž
a
]MºÀxL.ì
}ôº�
³^¢ù *!ã´M”2^‘ŸkI5O÷R…ŽÝ¡Šy43;]1æ¼!ZiˆFÜY +Þ–KUÛYZëµÔIYÑ¢ÙvÂ>ïK ¾W¢è³9É„ º®‘1µ]‡q—‘¬íÊŒŸ¤RGCñaìœ23u:ß ^`±c�"š�ÉA

¢…2Ó —…—0�yM£_‘"4s&|œÑ4!®Ó-BvEÑ"²"c}ªò>M“3M
ׂtèXC¦s²Â…—9ŒX÷Æ{’#B*n±‹‘N	¢#<WQéqD€e!‚¤$å"q•aGòX(-Et.2@Ÿ,Ïf<E’%€+×Â�Zwt±�éa+ &H†B\Gq
£ñ@ÀNx
ó€ÄÕ(Å`ƒ„Ó4ÜwS™Yöã
ˀqǀ1&
h&Ljo8•Uâ
ÂÇ!È`(€E0ª@*G5
žž¸ %ê¢èé¤.*y±az¹É HŠèIœQÃ9M1‘£z¹±¤Ÿx '*à9IÚžF&2ª¢fA¢%�¡
™T1yA

‹|Á8½j‹��‹ÉÁ‹æ
©‘*©“J©‘º¨ŒZ©Žz©›š¨œš©�ÙÀÖð
ú
¯Þ%«½`uHKÉ�BœUz[§pŠ ¦8¦+
Š7JnªE*¢LÊŠÅQï)Š]*«©¦y


,E´çÎM ¾p—È u/F8
Ê‚ÏPQÙòjÆó
5:òÐ+cÐ�Ð	­ÐÍÐ
íÐ
Ñ-Ñ

¦æôË<š¢2š� Ûi¦­ÉÊÎa ëÊêK8ZþÊÉò¤GzJÀ)�£˜7D¾	œ7÷ÿäQÎþ*MPqMN±¯X$ÒÄÕ„±våÖˆÁûÚÕeMf]Õg�Õc½ÕjÍV$Õb­ÖÒóÖXD×s�Õw]ˆQEyíÕpÖ`
ŒAl­‹iMÔX-Ñ×{�Þásäׂ½vÒd×p�R�,RqMr�Öný×�½Ù{¡ÕÝÖT=ÚwÝÖ"´¯Á¬Ö[}§ž½–
Ú§
Úfí?iݯ^ÝÚ¼§cÍÚŸ½£·=Û +ܼ}×]ÍÚ¶-ÙÀ=×r-Ù’
£Ä݇ÍÛcÝÕ‹]Ø©ÍÝ–-×QºÖ�Ú•M}ÍÚÒ#ÈQƒS&ÉÌÊBñ§m
þã)¾†<žã'®ª0~áWÞåM¾âÅFåNà*nà[æHžâ^áN¾ßBþá~,{Vàžæ:ŽåÔSl8Žä[sæc®â®xúýço>膾ªŽ÷
uvÙÌcÌÉÊyq »²×û¾ÄÌŸo:ÊqaÒß«'-ÿ¤(Í�Âñ™š.˧Ì'û¤¾Ô¥L°BÝê&[ëMºé8:°Ÿꜞ¢JÚé¿®¤Â©�ÿ)Ì'{9ۛ뷎 ¡> ½^ëPV˶Ò¬>¿¬Ç½;Ý+Z¦}
Êg�’aP6¤KÊ œØŒ¾sQFßΧ§ÁŠ¶|¦˜çí�©ê¬yì¨ùÊdºyÿš¿±>ëð½£9ÜçÞËA�¾Ð.²«žF-§œž£‰-î?z²î®Ÿ¬ŽÆ\ɾ¥VºÉÁì¿uŠœ«ü¯Dª¥ }�]¤!ñÏð.íÔ®Ò¢Ãq¢‰³ïŸ\y²¹ àËí£.e·,ðzaðk:ž¯i¦*?Ìʾó0¿ÿrú±¨A²«øÒ@šÓ
%<¨Ã	#Œ™bªe+µÒªDøZdñÅ�`t1Fg´QFkÌñF{äñǃôQH ‡4²H$‰TòÈ%“dòI'£lrJ(©”²J,¯ÔÒJ.³ìrK/ÃsL¹*ÌÌaþÚÐÃŒ²ŠèÁ°ÞìJN3Ç*P!fŽ9†EI„‘Dú\dPB5t‘D}ÄÐD]dÑGM´QD…RF+”REÅ´ÐI	åÔSR
uSÿKKÍ”ÒQ#uuUQS}TMkítÖXY•õÓ\c5ôRIkmXS…Ý5X]U•Öd%VT•ÅÕfoå•Z_�]¶×hµ�¶ÒjK½Ül­E¶\qÏíÖÜbÃuuÜSmM·]tßUW^{é55P~ƒ�„œ4jSÁ�³š¨Í‚ùcçCöô\�8À
¢¥@`²¦¤ÿ†€i˜ŽææJï:ã.ˆ«»Ü￳
¼!¯Ž)Æ™�ÒiÄ
7Öø¢/*¯œrʽÈ|óË;×ÜóÌ-}tË9/ýsÌ?WtÔ[OÝtÕ_w½õÕ9—ývÏcŸ÷Ú;Ç]öÞw>øßg'^xàC·�tæ›/=tçY�^tè+Ÿ|zì³ÏÞtî¥×½xØ¿G^wÖÁ'_|ó�7öåÓWÞ÷ñÙ‡ßýÓã§ý}ûS_�yè·¨‡ŸzìãìAXèV‘$o\™ÉX>D'‚U$+¯8“ãÜp†5lazøëù W<í�®z!$aôÂG†0…Ú[áörWÂb/†žÃÃ4°‘�l`Cÿ:ÄF¿ð/|
=Ô"ðp‡&Ñ$Ä!zh
îO‰SÌ_ˆ?*f‘…/D!UèÅ-Jñ‹bãË8ÅžÐüÐ?¸9)d`
Dœ›Ä·¯à)oe¡ A,¹(òO„õë eH=çaŒˆ$ãÙ¼’¤“¤ 9FF†1“.¼ä/÷…ңؠXL¹Ä;1ô`%=zˆ‹qÁ†b-gy‡þá�–=<D!l˜
D¢t[°ƒ!¦�ÃiLãxØ.ƒ8Dl,³‰ˆ8Ä4¸…0ÐE¤fùB³‡¼dæù2YIEÖÏ{&£#ɘHJv±“œÿÜä!çiÏzn0ž˜T§×ØÆ7–E‚w¼÷&ƒæÑ€h¡àAŠñGÉ]²ƒçKçó¼~Þ“3¬d;ŠO4jñ£úÌâGA¹ÊU²‡Ø0ƒJzd£b¥»Ŷ ?3E¼˜�Âe+ÍÆ!~xm°~N©!J`Žì†8äÂäºP±ŸÆt©gó6bš�BpA§8dj(fN+’‹ÕcëZáÇHCvt¤üTâ\áYR‘æ¯]âÿô!Àú %¡‰²@¢ˆ(,„;ŒàbXÁèI+ɨÅ1
¹ˆjQ³›ålg=ûYІV´[ðêJ9:Ò¦”@¬Üÿ�
Ô‹¢´Øð&(µ�Rov�7¼í!*¦Ó˜N,ŠÖäno‹�ë-ñcÅ!4èÒëQ›ÆT%])ZìfW»ÛånwAûzðcûFƒbäŒA¡xd¬cã’P–F
ªìã0xZïæW¿ûåoµhܘªT«°¼êĹÓÂòx¢6lÝ"×zâ$bÌÒËx¬DåaU�ëCü~Á7äíJŸ†_fC§;œ†!’‹]»úWÆ3¦1w·Þ¿¶­'úÐW ø ƒ–!í­SˆÛÈÆ@CÚ üÖXÊS¦r•³«¿%f9z×\î
§±C>ب§Ô$g±ÿle4§YÍi¾±_Ã1"
¡E1qË‘+–ô`G¶ãˆ£Œc4¢‰C.ÆD':ÑvX´¢�èGCºÑ“æB¤+MéKKšÒ–Ž4§1ÝiGZÔš&µ§I�iT£ÚÔ©õ¦C}êV—úÕ¬5­a]kS?Ú¬Šæu¦wÝkLŸ
Ñ_ȸ€‡0HLÙ\p‚±Í&±Dÿ°ªfSô¯=1^[šÚ–îµ±“ý…_o׳^u¹É}nW§[ÖêV5º×ýîv³;Öñ†÷¼í=nyã»Þú6öþ@�ñ’×BêuÌÀ‡0D)E¶ÓAìœ!eÈGO“HG?úa�|äøÈ8Ç5¾qÿŽo<ã×xÉ;.ò�“¼äÿxÊYîr“£Üä+§9ÉSÞqš{\æ/ÏùÉkÞs�ÃçBßùÈaôŸÝç7úÒg®t›?½çQç9Ñ…>ó“óÜæ,7:Èo.ò‘ã\êCçºÓ�.u™Ÿ�é*O{ÓÅ^t�Çüêqw¹ÎÞs”Û=ìu¹ÞÕÞr¶ß�ï�ßûÊó.ö¿ÓÝïC<ØË>xÇÞð}G<ã_y¼Së™'|â'¯ñ}d|zzÅ1”Q%ûØ+�•�X
zp8©~Bp.{ØãŒf0oÊXÆ€‚•ÔŸ+ÂÏ
ñbüß«¨øÊ?>ó“|çùÒ�¾Š ýáWÿúÖÏ>ö—ïý惟?Âß>€ˆŸú¾�¿úßç>XÔ�þð·ÿ+ïýÝÏ}ø?_þ^±ÿüñ_ÿÿ»?õ@ýˆú¬­ÀŠ÷¸�ƒ�Âa½Ãz½�08ø@=�=ßË@
Ü@ì@ü@AL8®p�c@ÅéŠ9R¸�"ÅZ¸ ¸ƒ
‹‰È¿
„�WÑ4D]HÃ%‘ù”�bx…öÈÕÊÿ´PÐÍÑÍO­œOýÑ�›}CíÏ5ÒÐ#}Q�&ÕÏÑ�QýQõÐ
P…ÑåR�Rú0Ò
5Ò*µ½©ReýÐÅÑVp†v
xß	¨€$ˆÖ
&€(Ð
@�kPNxåâèìâ2Ø
Ë@e^¼�K²œ“´”ô�B<]<�êïµjÜ^ª†K„c |Žó:F}³2‚	ˆà±%€#Xƒ†â¸>6Q…_=È€Þ߸¶‚[�a, „;XL.è>`
W_ˆ
=ÇsÚ¯ý2G>6¬7¡j„à³?�êºqKêËÃbP°©É1Ìž\²$ÒÁü¡ÿ.Ì *Lì7ÌÂÞ‚ÅìdãUd7BZ%?èaõÕZíƒÌ,M?øƒÈÖÌÓ¤Í<àƒÕ´VAȃi½M6„i¸V€th� A�
Š6Â:|FSmB…ÔV¬­Z�jÐ6F”MšÈOÑLV«f-å'k+?‘²FªÚÌU4c^#µjÛ¶U«¬íä¹sתn»vÝ2ÖKÔ®^»Ò©2v¬—‚¨Â‰Z
s°Æ+ƒÌÙ`ã6ˆAþn‚^-œ‡¢W4¯„¡ŒX8µß¡Ðƒ,ŒÚ’¤y‰ÏF”Ó’�Â7>òåH{ùÓaîZGÄø‘ˆ?TâôR·#2±ˆá; þª(D$1‹E$†óÒóÇíî-F”"•È„¦2MéDÜ3Rô ¸#j©`T££8>9ðKN «'u†Dfä“^C¼í®/cÆ/žñeLÈé¨%+iÉKb2“šÜ$';éÉJî‚jq…ÚðŸµEŒÇkc
M(CêІBô¡
Õg8
IHÔ¡±s\]âûNª¥¥j7%L·¸¾óz¨�æ])L“»¥èâW»2©xƒ4_¶Þ”¼¼Ìîq·*Hp"˜}<2L"ñeHºt«û,b¿qX
UGL½Mq�'_¤íòv1}”ÊTå•(¬½Äoý°;ÝåÜ(�§ã¯™Æ|<4ÞO¹<õ‹Q}¸]ýI÷­¬c_šOÄÞjª¯Àx쀓XKÚmÙK‹æj
øÿx|^"t=�Í¢jµŒÜ¥c¾éªß&U×ÞÏj’Œé’r‰Î
O0Pƒ[Ô9ƒš§÷ý4ð¦f¶ô‘‹™¯Kx3™šÎå.<–ÛÁ*sW~çÎÐR �¼«éaS¦=}síÊàËP2z`�Åz¶´Ú0­iýYYÚê²N'-fêÚǾV¶°%,c�~uÆÒÖëËvl@¥ÐÊþ³K—-f	[Ú�RC
š…`û`¥ÅQœAL[Ì0<Î{é—J’rN9£YQþ-¡�‰æ™ÑIÉQÁýR&Ü+õH
ÉâíQ�\Iƒ!¡^�âúLPWÍHr¤bz¨¢7!Î+΋+¦â,Ê"¾ ŽÎ¤"œåb-²"+ò+®b-Î"ã¥äUÜnå—é’%ªŽÒß"~qñ¡î)b¹!üÄÙU¹á��Y5.S™,ýÑYn¡Ü‘Ì^úÍE—r	S‘ã”¼Ó &Ï”ÐãíT`Ò\pé™ñ
£=ê5jJ—¥’‘§2$ÁU*Ë-ªmê7ö¤¶Sªîá¨j*7yjNž*Å…êͪ©2j®:Þ¬’6uÜ1¢Y;ú}e\å”ZámÞ¤n5Ét+§¶Õ8écÉO+âa“XO
¶äHŽàJNŽ	9�¯v+·’k¹šë��kºjký¥k»ŠY¶rë9%¦µá4' ªã©EÓ´ÎÎü� +�ÚêœÕUÂUÕ›¹ÏMâˆÿjQzÙ�
Ïa¤
Š„ë¯æª]%W
ùjÛ|ˆ–ÐPa(!qæÈú|ä²êvã0n«�
³° DA Ä L‚BÈ0CÈ0F@„OÃGLCDüpDñƒDHTƒIÔ�5|BKЄL4ñL�B¯BÇ„Oü„cñ5¬B/ø„S¬ÂÿQpq/„±kJ/”±.ôB1ä‚1¨q1€ÅÐh*â�m*UìÃ&mèv.	²U-Wq.¯®ÄžTÚ�¯²YÏãŽ	6¡� 	Å®¬×ö±Åv‰s42ðØ]"G‰Ð¶­Þvn'»m(ë$32(›²(³'K2*×1(�.%;îèº2)³2,¯rŸò,ëÛ_(F
�ð£ð! 0 
èv(h1oqr‡±5
¬öV´„549L¨Ä* €
pZã/4˯ÍSzZO³
ÿ¯
ws7ƒ8§ºb½:÷�<Çs;Çó“p!¤p
;ý	Ÿ0Ôÿ:Bt „¯tWF,„
3q5ôXïnEl‚HlÄmÏÄH<9r[1PÀ4ÜÓ=rkÊ–7·/Š¦L…/ø‚.øý¥ø‚p”…/ÈÊù¬%Sì<_8þ¿¸Ô—<þäÿ‹ÿêåk ÇI>`èÏÞTàu% oîYùýȤÉÙ½zë–™<=2¼³ÿ¥Y·Nš6çq^ÇÇwä›ÂNæ¬ÄU˜kRª-IvÂÆ!ƒ~£Ïé‘‹¸^¹H�
‘!V«!2ˆ_5¬øP!ƆÊÖbÆ0bH‘	S,0‘+Y¶tùfL™096L™Ì#3�
?ÂTióe²ž"S6CI´%³d,?…)´åÒˆ?#öŠ¬'Ô�RyÎLÚ5êÕ�ÀĆJµ*וj#jmkv%Ù’V»ºÅêujÿU tïöÉ—%[‡oÕrì°l_±C3z¸.±½%s�øïØ¡µ~~<Æ
¯)ùN‰ã'~ÿ×ïKÌÀ…·wß6uJb¦›Vïù³óp ÁŸ®W�Ú©™ ’˽«nâÀÇš
ŒÀÀsÉ.ÅöCí¥c‚̦û äË¿Ì<,+Âô*Ì
3¨Ø2¼ÁˆºÊÂ
'ɱ£˜‘ë!�,C0µÐ
é˜c�!m)И¦¦Ü¾jO9™Ì“)5”kñ¯ã¤ÿ,+<�tj†Âø´Ô²ª�’\©¦×ÒM™XbÑ
Ô\“Í6i€Á7Ót“Î:í¼Ï<õÜ“Ï>õ„
d¡…–Çnê®C°ŒQ+·,*À[Ú2HCìé±	í*꿵‚kj½GÁbn%,½
)›LÁ˜rLÌBÃB�UíJŒD#2u&´j
ª!Y{šè³Ë&ñRjè²aJª
]tq&
lÁ™éðÄJ8K_°¸W<ô`(DÍ{ü„c!éùîlW“•;µ•#ͱgfÄ�åà(3"ÔÏw=ÿ¦i[³Šy”¡M�ŒF™el
ÿe”²€¬
Ç™ØÇ)Ú€|蟶3茿ÝÂ2(!l+š
w€RWœ/ZyŒ\ÈãíÞXàæo
¸b„†®À3Ù/Ã_ø"p¶ÁMSß
æ½/¨ãpÉq§R!WÖÇÇâq[%Ü�ô»}jÑPÁÅŠQ˜º1ÉÆóqß…ûYŸ‘D�qm�i[4ä›m¶ Ÿò!�Ë$H‚‘’''äÝIH/©ô€9®.�áÖ‘SgZž!dÉèÂ1üæÒ
žáéŒÂªRCŠ
–áËà
€âÁ1†
oŒn
)ýìˆE€¡ôfXáä�òÞÅ“\ÿABij�”�.ͬl¾Ž¡Z©\Á#¼Ež�è^¡ ¢€àªˆ¢£rát
°LÏn#�€ÁÍš�rg4Öê ¨]ÎP]ZA4ž-¡h,´Dä:*âfeäÖÇWnŒ@äs”ÆD¾¯BÕª�Æ|Ï? 	�šÌw¦æQôP£ôÂRré=.Î/„Éht¤øðBEÈ."QUL8<‘„°Ï!Z0¹ðçTæåA„ħ~Ã$Œ.ÙápaFx¡]Lâ$Nâ5žA¦Pô”€!”î\ˆ‘§E¬¼…æ
è	Kª|鵬Œs^�¿²Ïý®Êø#WIUP¤ÞBK ª&—â
¦&kå"¤Åž¸ð¢Q”rÊD¸ð®kx©^zŒCT
�²§C.E+�&R~†Â$'¼Ì�GY~BºÜѯ�aÎ.\ðæJXá”P
e`ó3/å/ä–´3¢ö®àÂÿ¨$8%ÈÂ2
'zdpæqMŽT"&u"Js€
h@t`
h秥:#ä�¼B&33TB�ТyŒòjRÅ0>õnc‰þ'¢S¥²}ò”
•ùVÈRúð)¼‚�¸3$¾’VcY°¢q´¿f±YfÄ„–HQ"�Zá»ÚÐsõ”ðÆ1ø/FþKì[
”^I”ÄðÀ%!ÈÅ[NI–"Hß*F>¢p!mER�Ì´€TCYfÊ$Â0Û$uh¨N††âäÿ–M4†Mpà
‰�¸A‚As9W4—î�ÁèͳBÖ*‡Òt•gGè-T¦¯¤ÔF'g2iY��úÑ^Š¶BXbŽrvËÅÌÕ|Þ/cM«;
u)•r‘„FKuÿÔŒòÔkv«O‘Rœ“ãŒF.^ñ2*PäŒLmu<b_¦ƒ*&"%îÊ$=""Îw#pâªtf&·g+´—�ÚQiS—åþâ(T‚4AŽ!z¤ J”€ÝUõ¸Žë
Ø€?‚K�‡�*˜À Xõèô~6XqÇÍpÏ^¸Q¢Îqv͵«|¥àÒ{€7&Z¤*
ñ*¢×wú
�âv«s{1ÿ® ÈƒÏÅ‚öhy	Ê4Îc?eâðs(š†ÊTÑxQxzž¯V’¸ÊlöÊfª¦t"j™GGl:ä¦Y€49ÃC9x6€B5Ð8KÖ8�-‹+ÈŽ‘§^€¯U�%|jmÊÄv
Þ!ªÜ…?ñ~KK$
§qšá,éR”rá

0­0ÓŒ.Àð•’K-±S_€ùц\‡¬
;;Ft¹2$·jw�ŸÍØИeÙJ;¬üât�ÌÀzîƒ=��Ì Ç˜˜Q•15£XÈÒþ5¦§¡/qÍR;®„e¸Â0Ñ93•ÑÍ-/ù�~媴c á
Æ	{ô°†	Ká± ÕÚöŒ¦ŒneûÕý˜Ö³Ä	Lj‘{.öE†8*…D<O��
Ä–é§HÅ`ÅèF2Œ†Ñ)åAÀBDŒ‡4dt� Òæ(-v-ÏpE2”QžQÏjåyÚBZ3ð}/|ÈÈ—é°–°‰Ðÿb‘PI*è/ˆô1kþªI€˜ÑÆp¹°_
$bÀŒµ0D!"L2œ1ô,ï0­p†Ô4&ˆ@m è¡›C÷>§Ì£!-sšÆ4„Dêw_ÛZ+^)"ŽIxÖs…2”"ôôE³à#Æb¥#,/<™¯x4
¯ ¶Ã_®’‰	â–Ægœâ•�¬E¥"Å£æ¥dïÙÑ	bGÆJ’ÿ’õÖ&"’ÝPD^\ˆ-›‰O`3@YÅ„Rd<#-&{µ !²Žn³xG•’²MB’ÿ©¨Ï*V±fli˜Ã”$–øâ–ÿy1œÝ¶Æ^}-QU0–áIº"e<*HÊæ!ÑYâ û��p÷£X±�¿P ÝÖØˉ&ŠbéIœ3žÑ£¾€�•£[XyÇ#�¶b“eÜ‹�J™1[&Nce«" ‰hº˜!­˜²em
¢ÿ*]Zß÷±»&n�hBéA0)½¥«)iÅèÔ©%‡Œn˜=JF“
0†€_‹3j3ÂzSLÒV§—[«–Ø
Œ6
tsE­j-öÊ£ßùKcüŠn�±
õ0�æÄŸz&ª>†<Tq¬3@'UUÜ5à
[aí
Š;R‚‹yôéé<)âÇ&"÷³ïHï
n!H$—0W¨…"ŠT2*ç/WÕ
º°PA0
óuUç8,AâQú
™'`ÆtUÁ
Vcxß²{ &!éA×fjQ1#na ð^ÿRà&
7Q™§g³±c1q×Æϵ&¦±ã
¸h¡¨­7Õ0Y×xy
~�’=Ãaÿ~ö¼0cª <J£O†a=3‚Îàm F€1ÎÀF‰?)QGhaŽ’s¢*P©*d™pß-áB9u…i2X¸1œù†]ˆSA!sC3¼x†“r5g‡5AàUUI²©JÅ:57UX.¨rŒ1“¢CyÑúø¬Ð+1Ñ+ !áa7ê÷
RDB¾V®
Èå¢¬@ dÃî�+¬3@!£ad´1‘	²,ÿOA¡ªçqAá›eÓ+
ªFa•у>�‚X‰¢ZÑsR�Ô] #LÐA8½Y y!^¾F6½2öÙ ~6j£=$–#‡KĆ*ô¢li6Å ^ª P'¡%:™�p£UeÓé£1§`R¢ø2CU\Ëi6Å4jõ?â+ÁiRŹ ²N³@0©ô4ï
«žÂ	l
ïpA1™š¡úmT\)cdµ2ô¹d¦
yY¡ã„œ®à§ÊPSφJ3(
õ
„c6Û�/`ƒE3b誅NÿÂóB á36jRÊ+Sš¥¯@ âe™}Ä/3sžI­&wHwÅ1Ó0‚ÔG9—Os›
Ã!"B§#›ã%Q;ÂYI-‘'â*î±7:)RÛñ?­Ð3½jA5:˜áAA€IÑ20Ág
•Ò>C¯õ!Šb!`#Š±Ã+@¡ Ái$’“ä ÿÓ	åFZ¢ê4Í0D'»ˆdùyÁ
<`‹}ø4sx3BF…è䙵J8T¡
¢¨)“K_㵚†ÙÚ¼Îû¼Ï+RÐ{HS-ãÚr뺅ښSå…S×k™`XA/g0C†rá\
S‡çú“´½&w§Ow8ft5Áu2Ò!Ï¢»§)ØÇ�­[Av¨&ìÀ}âÞ co“Ë!ì
í�!ª±tSÿW™qA)‘H1}˜˜:ñå*1YDîG`íÀbªÑÛr¹°{GÖ‚_!�1á,æ)g¶”)±¸Þ Àß5{&!â‘Ê›	qíÀr×iî±Iq8¢(2'Ô%ŽÂ§²b?‚~FbÌà
ÐÈ~~Áz.aqò  €
Ñ9óöS‡Œ‚ĘÏ!

ðÃÐ*1à†IQŒIÑwì¡BT‡?Ã�\j² Ê
&è-s,3¼PÄ‘a]v1HYÒ^a0Ì
EqÿÇRCÊ
øE–"£HG†i„cÁó—ƒW9dKa.®1D1Ž.²Â€ÄG'®ñ½
¦wï€òäÀ Y/~æ!–sV€Ó8„¤Zž0¥…–]^½žõ†á½Ú›HôÜ™
>Îî˽ìEàMðhˆ­ÖJÎý|šÎÛ1ê›Ááãµ0d
á^ðÿñª	ò"?ò!oð$�0í<½	~ò,ßò.à/ó0¿ð)÷ßß«Î
Ó/8_HKÏ%¿óû®rf„†AgÏt³†;ݪôÕµ{åšš
càD‰0#¾)ïG	à]ƒ¾/õ¾ò3�ïPo…ýÎñðìàžïÿžù<Y˜ñÍ‹ÏGÿàò<÷îö¯öb1t?Î\˜½2Ÿ÷Õz÷.ô,¯ó%HNóõþ¼ØjpåeöŸ1çÑ/÷ŽS�ù‘ôß•õco¾Üå1Õë­
šO_X÷.üRÕe†x÷Û¥]ßÅÇZúîù¾¸¿÷¹Oú2x­I�÷Oôòš½WÈõh¿ö]óàù”­ºïál/ø‰t…±yýAëõÍ‹Äg?üîü_ør?øù®û!£ñ”¿õì¥Î™9Zç�ï�ýPûŸ¿ö™/I„oA·†÷:Ìß­
œ:”­Aˆ`!

Zv#͘ƒf¤k˜cP£Yã¢ì–ìXƒpáv}ŒÒffÁ3Ç‚�{WïÏœy	º•É6*ZºŒ%ËåéR¥×Éœ³&†ŠW"Å‘ž13•	€Ø°ˆ›K6ë�²aéœ{ƒî�[ôéÑ©§ƒÎ
;t_Ǭw�Þ›/oÞ­C7_>ݱcëÝo?=ýüðëÇß÷•.?yòÿ½Øåb‡rÚ)© ‰†iª•ÙœÑådRƦ†‚Ð ‡Ä�ehr(™;Æ!ÂZò�¡*Ä°ÂSdñB“ZqÅ]œÑD“Á1GulF¥dn
É$e€*$_¬Q™…4i¨&q<	-�nrÆ¥Y~LL¾*
²šnúr²½¾:Í6Ð~첯£¦bs­ßlËÉ7ŽÃj¨ßºä¯”<ºl¬ÖXÂsO9{«¨2ûtOÐú¬­°9!ûÓ¶¼JúH “˜ag$Œªh5¾þh¤‰~¨]žÑ…�¾á‡žl\…5›Wg•ÕÕZe­•XcÕuÖ^wõ•W`ƒµ×\_öÿ×diµµYdŸÍ
£Æ£®¢È<)ö�[¬
¨¡�W½±n‡Ü\Ý
ÉLö@	Þ„Ô	Ê–CÅø¤6¦
ÕšÔ²†,.h¢§R
$·¢GOª´\ed#
®
Š�µdne–ÏÏ<Tºq
nC	U¨Íù î\î<­û(OIQuZÊBà&sÿžù-ì”\–$7Í!öÌY›kë
V+#F¿3„‡Cq�מQ`ã½
Ô@K@�°½§ ‘Yï»?
š
áXŒW
@%
Ec‰,¤Ð�”=UÓ§�CtT ±¿C%¾Œb�
Îàá
þà&áaNá.aFá>a†áŽa–áÆáÖaæáöaââîá &ââFâ#6b%nâ"Nb(&âÀû¡™K+Ž
ªÁâ-v-.Öâ.ã/ã9ñb2c3ã+>c5Nã,Fã7fc8vã8¦ã9¶ã2®c<¾ã5Þã6Öã?æc@öã@&äA6d9dD.dE>ä<^dGnä>fäI†dJ–äJÆäKÖäDÎdNÞÿäGþäHödOÞÚ5åSFåTVåUfåVvåW†åX–åY¦åZ¶å[Æå\Öå]æå^öå_þå“æa&æb6æcFædVæeNeÂ#<œpæňæš�æ'$Œi®fgÎæÂÛf•ëæúfjžfi¶frÆæq¾fkgsVgt^çtÖfw–çr†gnžçs¦çwÖç{nç|æçxöç€Æç�îg‚hƒ¶g�.è…>h†Nh„öæ~h‡Žh…nè‹žhŒ®hˆgt6k6<ÏðŠ‘&B’&é*4¼),é•Fé•>i•6éK“é—v­š†é™–é–Ži›æé�NéžÆi ¦éŸöi—Îé›Öÿé &j–Fê¦꤆j§^ê¨~j©fêªÆꩶ꡾j­Îê®k®ë£þê±› 	™Þfzfk�v붆ëqÄ@4À
·pP=ˆ‘ˆöP„Gh„Mpƒ384xx‡—ø‰§øŠ·ø‹ÇøŒ×ø�çøŽ÷ø�ù�ù‘'ù’7ù“Gù”Wù•gù–wù—‡ù˜—ù”7ƒM8ƒF P€«Ôd Z€×ÜRÒ
ÇÿÛ~Ÿ(A†öX4hƒ8X5È5Pƒ5À«Çú«×z¬_ƒ®÷ú¯û°û±'û²7û³Gû´Wûµgû¶wû·‡û¸—û¹§ûº·û»Çû¼×û½çû¾÷û²Ï(P1€V‘rp¾4eÀêrÚÑ4È÷Vlå¨�H‡E8ƒ8
T¸áˆ	6¬(pà–0ÚêÕËÇY²�Éj}Df2™É”)Kª™2ÙG”-_²l	¬eMd7Uæܹr¦Éb™1K×茛5["dêô)Ô¨R§FHõ*Ö¬Z·ríêõ+Ø°bµZ+µ Ô²XÑŽUkö-ܸrçÒ­k÷nÔ-õøñ�é(àÀ‚‘•ÌiJÃ&óL¸å± FÝœQŠ×ªD‰bÝ~åÜÕ3WÐ[E“mkzóÙ§¢ïHe�ÚmÙ�w¾pùò¥ ZÒUñÒÕ�Õ÷UàT…O%ž5ò°Æw3äÿüEß}‘S,dM˜‹
³6t±v Ù�5ûûw¦÷”éUjrrå/ÌßúVk¿¹êƒ÷33dŠÙ饥€
˜_SX`‚
.èŸ�:8`ƒFa…
RxŸ~]Ü�Ç_l1â\lqfwÜqâËy±Ôgx’�6Óàñ …Åñ¶–…î‡ßC=öˆã�C^(¤†	"9¡’E&ÉÙƒLBy¡”2Èä•ó=ÝtŽ�×Òu:}t^c^ÒÄ�Nê¥Tž—ÇUL:‰PfƒMò›Žu.‡g‘|¡ŸyúY þÙT Ç
Ê#¢†
ÊTˆØÐ3i6•js)6µuÁ6•fÿ“)Œ;z�Ç4ôrãVK…šã|­Ê\•Žþ†á‚‰Âj(¡�yk¡Áõj'‚‹úª+°YþzœT[êÃOdÊæÞv„%C™e>víz8m7íuá�Dm˜3u;Ø1‘}”Î"n4²†|9º¸›fSzõnŸ¼‰ ±÷ÖI+� ÉûŸ¿VöǪ‘
Ûïo[h“
=ÙPµ}qG2M6õ|
ÆÄVQüâ‰"†ZÖˆ¶Ñ¢ˆ"ˆ"`€
q‹
ÓX
<…
?€¡6 ºòQ+€aQD^ˆÈ°@P†ˆá¾æ5Ÿ
³6ù�I%é)ŒMÌtHDF+&†)F1”‘Îÿ�#]•ùÛ4ã)ÏyÒ3U—j6~é”H]1T_ „§´¡B-V®’»g¦Té¹ZÂ6š¬ek"‰¾Òx«
ƒëjé-¤lD¬	Ñïzy©(&¯ž&=)Jëi•-ЃúØÇ0\ÂŒê¤Ó:àÄß8s¿›²M&7‘I¸¶)˜ê„¤ÇHÄ*328®‘_ü
TïÈŸ©BuQT½jU³ŠÕ­jµ«\ýªWÃ
Ö²$3GìXYV4:J…�g_ݲQ¢BXªr¶ñ =a´R¥»ÍïF-eE.3•>CÄ5‡ DÍ^„9/ÄîZˆX!¨±ÉÊEµQA²jSë%U±’ÿv¬¥=­iS‹ÚÕªÖ´/ÚË>`*SdT§}6qŸ 9&Æ„G¨3ɦ`€ËÈ°M‹s«RªÜå2÷’ÉœT§€·»,"®µœ"(ö»‘â®a­;!©Öº[nÖ“³h at q¼�ðS™z
í&§LÜ–½tX¥jiÞæò·¿þ`Se$†¶@)äýОj…)<åñ­N߇˜’R%FIêN¡ÖžöIaõ0ˆ±â9ƪÄ$>ñˆSlb£8V�‚ëíZ‡�àÝÌY�‘z“'"{îü�	2Ã["âz`˜~¢/vJƇ(ˆ"å¹TªDÝ覡¶†Á”ÿ­C"*ÛFÖŒÃ"^1š[¬f³9Ím^³›ã¼¸Ùqä¥nºVØ~ÛDZf\`RÌ´ü(®–8«&Æ@JôÉÿ2ºÑ�v&[Dó ;<™ã‚J•×lèJ=#`VV…›	ËѦ>µIÕrèÔCÞ J#÷\ŸÀoMή½THñš×çBC’²hT»Ø'ÕÌиr¢Ͻ3F•\†­#¶»ÚÖžg5÷á
sQX[Èxp‚Ëi¶3‘›§¸6Ûw^®•E&ítÃ&Ú`‡�IFö>Ƚ%«ï|óßþÞ÷¿û
ð�¼à
?8Ánð„3|áW8Äñ‡K¼â_ÿÕRD¦oƒ¨
à+Â\Ç™òÑ=�…Nà‚$ºÔ©,T_9¤@²—ÏΠªš™Íos›�_|â>·øÏ{ô¡½èA?:Ñ‘nô¤'Ürv°æK½Ab<ÆlkÛµþîw˜trÏ9L—�qÔG4bÆ»ÚÓ®öµ³½ín;Üã.÷¹Ó½îv¿;Þó®÷½ï}ÓpŸ”6òêvÁ£�s„<’Ùž×Å‹×Ri?üá/y»Óh“‚}ß3¯ùÍs¾óžÿ<èCÿµØCDñÒ¸ÎõøTë¼þcÙÈÝ’b¼�åš
(ÂѾäƒ/¾Ç‡ï÷ñ{—~�/Ëâ>Ž/|ä¿øÄG¾òÿŸŸ|çúůþ²–�ýèH?û͇>÷·¯}¾X_øâÿ~ù»O}òGÿüê¿>û×~øƒüó7üíŸ~÷oŸþÓ×ûå_؃ð ù=ß
à>¼ÔòùžK- ê"`óI`ñ™ŸÆÖÆ–F`ö½NàK_ï-ß‚`
šß	r zß
6 ð¹`ÿ-ðŸýÙÃðyŸ`Âß
ö þýà
ê üáàúà÷!ó¡.!>ŸÆà_Ú B!^!fáòC2aöàú
>”¡<¤C¹ÐMYšà�„á™NÅ!Û¸ûŒ[ÛÔD18C1ä<Àƒ7ÿxC: a ⃠nÛâ!C"n6¢!b: b"Fâ#6â$2"$b#"%V"'bâ'b(&b&v¢%v¢'j"(¢*žâ&ºb'Âb+Nâ,Ž¢#Ê¢(²")ê¢)âb*Þ"/æ¢-î"*–âN¢2:"!n¢'~b F¢$¢*>c5*â4š"!2â2V£&#(â Úâ0^c%öb+R# Fâ1ã4–ã&
"-zc4n£92ã;Þ£$æ£9î£=öc=Σ*ú£@£<â¢Aòã5$BÆ£BÒãAÂc,Žc.º‰yKꉋaTKê™u°qQÇLÝ:½ÂbÿœÞc€Ów°pÍ�KúžµdüpMú‘M®dMΤNâ$OæävÄ$Pö¤NÆdPþÄPædRþ$OåQ%QÞ$SêYa,åM½äJšJVeTªdT~åMr%S*%û˜[SåSN¥Y†¥ ±ä¡[^¥m¥›¹Åe9Íå[ÎOZ¾å]Òe[îe]æ_å]–eO†éÁáJ8ÃL8K¶
¥…Nå†"e‡rh†z(†~åˆ.¥O–¨ˆ~¨S²(X†èY‚¤‰¾ž‹žh‡Ú¨„º¨ŠÂè…‚hcT¨TéŒr(ŠæŽéN"iŠ)ˆ)M)“¦%”®¨zàæL¡Ç`(hM ˜I€›Œ(vh^êYVGKrÝž¥©š®)›¶©›¾)œÆ©œÎ)�Ö©�Þ)žæ©žî)Ÿÿö©ŸWN¸3@èlÊ¥Gn©erdH†_xK!k&¦ëu¦JP*2�„IX*¦^jJhj§vjIxª¦†j`xj¦–꧞*`˜*§®jª¶*P°ª¥Î„¬¢ªªÂ*­¾ê¬¶D­ºê­îj¥êª­Âꦫ®’j°fj¨’ª±*ë¯"+±B+«>ë¯ò*³
kµ:+§Šê²jk³Æê°~k®zk¸Bë¸^ª¹ò*¨Þ깊«º’«¯¢+»¾«¼â*½ºk²Öë´âêéÕ¦ÂcÚ'¤féKÈžM�nÁé×	RH´¦˜.´°©{D(uØŸëÅf,�*†ƒª˜Š¤ÆzlÇÊ¡Ÿ>iŽÿâéÈ2jy¥™WȾ,Ì’¬³2C3pK¸”Ä8uKw(ª´ š–›eþE¸±Ç1¼Â¬¶Gg690ƒ/èÄM
…™j%ah%áZíN¤íV0¨m¹ÄíÜNËÜÎ-mÅM{ÌTRnPÂZy43ÄTåNáELQ®›T-0D†ãZm{¨mÚƒºnÜdm™*C{°ƒ×*í
Åí ú.íÒî1Ðî ¾îç~®Øu­òªØ½.ño¹ÿÐnòz­ØMoÖºí×Z¯×¦غ.ØÆ®÷V®Øjo÷r[çv®ÞCúž/m1ouDÆû¢-óúmûbnü¶‡3¸í –‹ØÅMþ‚o¹ïþ~îõ^/Ú¶oùn/ðF¯Ûæ/þ–ËׂíP°/3Ü„.è­3¸BÌnð›Ú'¯ydÁžìÊ‚^ÇÂz�žÞÝ61
é#H?é2�i¦,Ä�Bä6dŽh	¤ÉCÌ,³ÍAÿØdšAðÌ“ÎAª‰&š:ª±“N?£Yq¦h¤©ÃÏjªùäF«QôQkª!Ek>±FSRHÙÔN5µf•UH
eiJÙf•P´"%ÕUÐ¥—UzéÅ[�Éå–^Ò©µ—]ÌÙ5—^rùÉ™c|áÅn|!'"V^	­˜cr‘ç¥Ô|Âë.„Ü™6¢wŽi‡—aðRêÚbJ
¯kCs%µbØñ¥Y¦\yFvÈQÅwt•g­˜9¦˜at‘˜cÜaç–{syè]¦e‡ÜØzº™fR�c´b‡©w†ñÆc_Ža§¢bXN¢c¼yV\>i,wFÖ—v¼i§�fZ¦–‚ÿ€‘«™àxøžuñÅcžÝy‡dØQå™Ø\¾¯yÈ
¤bÞÉ¥YœÉ!lj�‚w©’}‚w˜²†iç`].êH•wœ!Ø—wâíè%s“:†™¼Ù1·˜yX9æ–®
Ÿ'íÔ
»³«Ø
@ìÜ�<ô,ï?ïÛóËÇÛüóÑÍS/¿Ò侨üc"S§\=o]Ç^��È"'°@‰,¸
	˜€‹Á(’
Ö�h
ª
9DFJ¡
¼³B.0$!I
ƒ¬ä<>	z
 


ðÑ¡ΫC›è7üa
�@B‘D/z9“ÓBñu„r‹b<F1ZñÆ´ð8o
…pQ2òE¡db±w}@±r!”pC+¶EFg’‹¨ùðâåä1D1KvƒŽB)–fë
ƒpL(»Ho
µ’‹Wä‹3á…9ä!
ø¢“Bá…zD×›±$
O~zªP¢ZJä}j
($@Då)R¬Â¥œ‰¨N˜Âmìb�È w±3
e¢0†VjÕßRê·®O�AàR:1¸Ô zr\cäc-·1E¼ø¢´4l|·�´W`Î#(�¨ëæⶮ
n›áéÚ¦C¥$Â;˜òŒZ ÅDðµ/ÿe´BiC(åRùêL‚Ò4ß¾/´}A[aÓv:´õEfïèڀɚ˜´í†k‹±]O+Í°¦y¦�Ĺ˜‚œ

e¬Å`Ç›¾Ã�”0Æpåæ	
Û‰ÇÞIÈôcå„2ž€å¤�;@Nš„,ŸZ"Š
Á`龀ɸ`É‚ÇDL$G¾
Á
ô ÁÎŽLô`1×àJs0	ÁM
áLè
K§, °ì<Ä8¤WËrÈË@¤,ãÒ,áÒFˆuéÈryóìxDF¬{þ€Gú òÀø 2ó
]Ì1‡R¤)O'*yRAÊC
E
äT•2ž¼©vÇ0·#žJ‡Ro.‡¬##8†¨!¤—zµá°!°á¦W{³!®!|ÁáÈ—zÁaz­áz«÷¶á¬A|Ç÷À÷Þ7|¿áæ|Á®
Ô
|ÝWÜÃ7|ë··ÂWØ€»A�¯áè!|Û·Ù÷Ö��ù÷º!ÒÁŒáB¸€AØVáÐ
J¸СX¸„A¸RØ<8f˃U„=X�€i¶f/XðƒuXýÑôȬÖ^A‰�ÁÜ
‰§%à˜©dXAƆÿ<F”<†â”>^¢q$édzC*ê#)ÌB=,Nfknrèâ:ÒÂ7�#9PBuSƒ!”Ãã4*^FÂÂh)"�}¦$åÂ&lö#Ø‚â¸)âf
!÷&2b:‚)¤0òƒØvÖ�y28äb3K)”áÂã^ç60Ã;¸ƒ)ŠÌ’×¢&’Áiæ¥(·7hÁiÂFP¡¦#€Á!C4+8n‚"¤Ë-Ö-#ˆÆ#D‚lTÂ29
!†Ø"Â#²‰
är6yy#$6RÉp*kgvA®wa,Æ>ì+WU(w×qÎy<
éxÁ#u×Ùxcu<èY>Œ×r®5˜ÿ
±£vóû�=µsԉĸÿO㻕ÀíúlÅ#(±c³¨|ÿʯ#¡«ülÊ1‡i?âËÁ|Ë¿|˽œ@V0ÞiÄoLTCœtˆVÙÁñ›Äi¼)á¼Íñ<ÏKNÏ­	ã��ܘu$ð;ÌÃïyÍklRé©Uï|œ½Î?gæ²²R™�	[\—PÆZnOlÇ;\™¤Ã,γûÍkõ*¤ÂÓŸãÄÓúĸ#0ÄÝØÕaÝ�jõ+5UÄ“·¼y¬Ÿ!}<h¿[Œ×ÃÑ÷ܽ׉Øï\Ù•=Ù�y‘½Ùí|Î�Îç›Ãž}Ƙ’ÄÄ+?çÇ-5S×°Æ^lSáy¾ËÐ>öyÅ:ÚqLyïY Oƒ�ÿâuÆ‚r¾;ÖI‡Ö[�ÿßi}ÕuݯãßYÝqnÝ®¥|Â|ØžÏÉÐÁ^ÇÓCÕá»Ù�}Ï3žŸ!ž¾ÑÝâQLÞ=þØá]
";ì‹Q•	ËÛÇfnäq#
]ÎØý<V“ä3ÜÛ
ç¶ÛÆŠ?"|žILÒ×CÔyh¤¢ÚA)Hf‡=˜†YƃïH�¤Þ駞ê«>ë±ÞéwøŽhØê¹>ì§>ê�êwøë·¾ëÅ^퟾“¸þŽä¡p@Â5·=
ü´ßÛt`ž@ ŸC.ÄíIÚ{ÜÚßV×\ä}Ã?•œ9ݼ¼÷»çq|›"~⻣œWçè±ÝuÓûsòûï;ßsT�½çœ½ËÐÒ‹]ÿx]óiÜ+Ï?Ž¼ï·�¼Å™U%<ÆÃcêc½G‚2Ðíj
æI“äG—?‘¥¦Œ™Å‰È>6Kæñ˜�oôªZ½š�^Öl[µzí
ö«Ø°dÇš-‹ö¬Ú´ié
ÿ
ß-ÐÞÅä·NUÚl¨§‰bŒ(
Ô
êŸü|#¨5U¡Šúé§ðM=�~3
=]µ*’]•�¸óÊWE–>�N‰2³�7tš�1­§�›ãÀ––Ñù76’dKÆÓ
U+h…<‰ oTƤ1Gº�Û†J"ˆ"‹7Fõ’PŸ#˜áèM–	5Ò·ž£^E†�‰b<ôU"n•k²Uÿüê!†’n¤eGd΄oÀx†.<Ð�¬¬ìs ËÙÈ…ªdŠê‰_ñ™\k¦Õl\“f£z™Í5)AS‡Ú•ØV²‡³JùÇv¼x›—Š�.Ê-¦ŽLãþY_;.Gƒ¹‘�‚„Z„²d6ëd!GÒJÁ¹‹¶cB¥rD´ÿGôyf]
`‰5¡°ÂŽDì˜`ÄLÅ\›L°®€2›§Q­±¥ØÀ(œ¤¥ý
Ác
±Œ>ʸ†mû…ÛGiË5„)å–ˆ2\ñŽV0Ã13Wwøª’OÊi�Ø˼Ö(ƒÌU$3UW^U»B‘Ëp½
Wu檟
£'!fñãéR†µžc°D¨ÂWƹ³4åµ¾ŒÖ³ÿãV”íHÚ~‹¥ÜòL‰
BhEVm~û®¨ó“‰$Õ(PÚ§F	¢8 ÿŠV^ñOrõÁÅÍí]›Ípj_£¦>—ï¡Aõ–ÂjÈ°Yè¢ó¸…7¼ì`{ØÄ.¶±��ìdÿ+{Ù^Œ2tÑZø<þä³ÿÌä¸OZF~‹%žZ»ß‡J-¡W*u‹ÝÛSI‘&ÜóDUtÇF¬(•‰’Nå�h³¹’Ž÷ÍóI*	‚F�8ò+ª¤Á,Äö87¼²moÇíR³±
âSCHtÖ(KD_[ÏoØoU:Ãý&ëµp´‹�r_èâ+Gy1€
ó˜ãå/—yÌi~s”ÏÜæ.ï¹Ëm.sœýæ3÷¹Î^s¢ýç</úËuá
d8£H±$˜R4_EV§ÞŸ®ÜQ*ΫÓvÜL‚L8¹ž-àIhSx¬?ÊJ–víƒ=Ém*G<ÚT`‘y÷KÔ]ŸooÿY±|ðE¥ÓrM„Äž¶{œ}v‚Ež(Œ‹m¤Þ>Yó×ß	ý0i}šH·ÔÞûµ%SópDq¯à¾—Ëïɾkxª½Õðt��¾n±­p÷‹úo)­›ñuÿ‘Ù×>÷2ZL2t
]·Õ0”1oPIñ�u÷ßáBvÊËË&›•c½-"z‹]hzôÜX-Á¿ðâ¡?Àº}y („a¯@—õüyEHY²ZJshßjú&yŽn·A~gXnVhx&kn“#ö¶M‘‘ÍðÍÀ0wKõQI•KVSòA$‚QV7äRħ‚³�Èà‚'ÿˆƒ!¡'(0Ø‚šÅ0IUƒ*Xu‘ƒI%ÅmS³vK	Æ,HsæG$ܶYbÃ`ý9Ú¡)ÆaÆQ€ýµ6ŽVwÒ¢b«öJ+dr>_rgŒ6I®–a!ÆAw#Zž²”QÔ‡q%om·X,X׆.ÁgõýcnÞ“XíR/ZgS§!×–Tñ
†tXá‚Š.1Š ø‰`£nY—.!TP9’mä¶"ð3>ôOEQ46i…‡Èq�ÖwÆ’
†ˆ“÷6“•-¿ØB4FXtf,—cŸ�R‘üçš$wˆaQF‹�ÄqgÍQqÿˆyFò_§Qô÷hžägURKC607{ó0Åð
Ç€ž¶‰Ò¡øTwÆ_#P½
�I‚]2�_£z	Y�á²úø�™D�I�«¨,@ö�¨hŒîÆuÕ§A²Hén…dmƒX‹Üèb¢6¢ꇅêã€{wv—‘á¸qÉ“’•i&å7ZH5ÙñS˜!Ä(,„‡ëá‡l×H7H‚d$_ÒŠCBB¤—+î‚;˜GöÈÊ •›sÆgœa+vA–ei–a‰–H�0kY|`)–Ç7–mÙ–n—hY—uƒ1X•]·b}™Aã§uxt×_Ĩ‘¡WJr(zùÿÕq—GBí6Ž×è‹p‡‘’spØ&~ˆ[¬…JõC+üÈ"”ÿ—%;5w
g+iHóƅʈyŠuI€†Xü³8Ö~äcÍ!gj¨Å›À(›!CöòƒËA.Zbzr�™SÑx0áœñ(�ÌI�ËI�·O¡Ø9�Ë�ßé�ÝùœÛ·š5Ö…„’
G‡^â~§ø_35‚Á”%jí¹ž
H™åi†ùh§èŸ£–9ÂAb	u#…o|y’ä©@zn†4%õ³Hã¡{g§8‚÷~Ô>Ü÷Ÿ
£#j£2Zƒ6Ê££={E˜K=j„C*b=J£:j£Ij¤*ø¢4¤7º¢Q¥;Š£Fh¥9ú£>Ê¥N*¤\º¥/*¥#Z£Pz£YÚ¥A¥^º¥D„VJ£a
§hJ¥\ʤvJ§ljdrÀ
¬±¬ÀÊ«¾zOËzª¥Ú¬ºšªË
­¶
­µÊ­ÈúªÂÿÚªÕÊÒê©âú©ØzKÂ*­²Š®¼Ú­§ª­­z«Î¯à:«ïš® ª®ÃªªÛ:®£ê¯ÿ*°®¬

싆aç½QO
ÀŒ2èÑ‘%{.=zud´’%›^ë:\¾tñRÞüyôæï”_§Ë—/xäÙâåÎý;ðõïÏ?¾|
4Ð@CL��Bd°ÁB"$B

dB@Ñ°�A
	ÿd�qDKœfÄiÄ hX\qÅ£¹(£†ª±Fš?!¥š�@ÂÑ mrWiéÈ]¬ée•kV1f•›rÚIÊŸz1Æ,yñFK^’òå˜bŽ
ÆK¤œ{jªaØqnM6ÛtóM8ã”sN:ë\;óÔsO>û|O?ôÎ@ç´ÐCýSQ?]Q=%”Ñ<›q€v€
†:ë¤K˜f€±.™ZžÛ®˜ux¢>/ÞÛ‚>/à‹U=ûìëb=ý´°`‚	ŒØb¾YûÛï‹üðøï¿
Pùì`‡5+˜	òƒ€Iˆùâ‚øÃ…
ñL@ð
ÔP·4ÄMü}è"ŠÆZ$¢U
ˆj�³^0Z‘À&2‘{ÅS`"ÁI*°Px0¤J®ñ	•\%F*Å6hÒ&ÕäIRja•r‘1�Y©† ;F.N¦1 R’eÎA##KzR”¦T¥+eiKÑ8Hÿ—ÆT¦3¥iMmzSœÖÔ‘9-é ™
*Q5:Å(ÕT2Ù2&ÒÎv›ì”Öh�ðX!þÀ Pød!ïa^óœp„]eáap‚V9<êÅ
N¸
~*	
z
tUlD7»YYAC˜@*	0ƒÐa�£­A4ÐYUn`
õúÄüW€Œ¶
Ò’Â<É5Á�u ¥PG	#ú\ˆõD'N‚¡9šQ��Ì£E™/XH-ÒÜiÙHôvÿŠ¼']ï
iÞ;–Ší…/!ÙËR˜¾×½ùm©|9y^=Ê.’óµïJé;^B¾üU©€_ºH4‚ªvÕÑž†
€>Ñv.;ãv�\�ª¨ybE¬÷P
]¦ƒ;UÜ	iÐ
Ôø¬4:�ªnÀ�fèq
<ñ	Òòèœ-ּΜ„¤%JZòˆÑ¢!£õ€Mf²Â‰VTº1ì…GƒrŒ^t´£ÿÙå!˜tˆ;Q!rÃ{Ô/OcÊ`WÇÚ¦>5©¬ë‹àžØÖ‹ôïMa½ë0þz¦
vY¨X»ÿPŽ¼V/3>Åo@
#�yàãž-ŒXƒŠ›ÊÁ¢Ò³ªLeì äcÁàa{
;fÀ°bX¶&êÄëxeØŽZ
Ú†�³†kP4pð`Éà€Gp¨Z!Bœ˜Mû‰–[9�j9Fü�‘¹•Y‘’"Úá¢ÿ°H$@Ù¢µÄ"´/´”"¹l˹$)·L$3ªKðJ¯³TEl¤)¬ãEŸK?b´Ž@¨ÃÅ,°®;ÌÙq¶Nº¿'úÄ/B»ôs/'bªU;0°Ä\ºú¢µ.2ÅLTºö“F"
ª²•�1³ÓÆ<ò°cè†ð`•ô(K�ö°báÍüÀüÿàžáD–têy&hYNi’¦jÊ?¸éœÎnñ�p³
‘Ó;½‘9ï,q§:(€)¨†Q€ƒ™D
i †‹h‘�	‰ã§‘¡
’�8’ªJš°Jz‹©¨B\…\P¹.Y9]ØÊì
ËŸjÐT3J‰Pÿ	m¶¤$
}¢Ã$MOÉE±LèƘŠÅX¤:uT@—âuÑÅ¢gKÍŸcºøƒ�Ý£c„Ž²LÍüRª5ÌWÀ£3¯�
FnÄÑa´ÑP1RqŒv0ÇÈT©Ù
K£ÕQFd¸ÙA‰�1êY²;OŒ¤˱ü®�)¨mÚ–i™!šÚ ];"G›ûf @eÐVª”	“W`ÿrœ9±4V±”97
¢cP†·Ug€[ºe†×¢%¢Z›SXCj×\œFÄ\L�EFTLÛ!EÜÒ$ÚÀmL_;?S¼Ø…}0OÄŽ]\”òF[DÀ‡]F	£E^¬\#ÒЀMÚƒÅ:JQz=#�X¿<݆5LÓ͵…ͬ›Ìä¢
3ªƒÝÀÜy

](‹o”ÅÚñ["ª°ží”¼e©eÚï:©¼}ÜiÚéE*�•¢»�K”Òðu™Zx`XñÕ…gP†%êÙëµÛèP™7"»“ª0ö•¼MÒžUß“A†’ù.²ÓÞ÷àø•æÅYƒµQË5Æ1Z]Î}Ýÿ¿D#Ǽ\û»Ü)ªÝ
.¯PöÑZ¼aœb°ÿ
fŠULXkj�\'*QP"¡²dÞ=¿ÃÆÛ±fC†¶Q›=Ù·ŒØ÷ªËªŽsD)t4Àí�lÅVb8l1Bàøb“MÚ09Z¢?)v\ËÛ±ÙµsãY€mím0íÑNmÑ^mˆ�ÓíÕ~mÙ6mÖ>íÒŽmÚ®mÔ~mÕîmÝæmÜþmßÞíáîâ>nãîÓÎ�Vh…o$L¢Öj_¤å&$ÒtE•ºÑÑœ¤§Û`±¯ …aV~` 寎µÕÝàoQºÝA2E;Ú\ÙíܦÞQbž°J"Zstlwu]rü©Ä.Ǧ€¿5¢ï$�£òòo(òïÿ
F©OÌÝ-*“5"³fµJ
ìÖf
FX¡…NH•†Sq¸á†
Nè T2Õ¡‰V%K-+ªeÓn³ý%nñ§_L–ñWgy¥tÐŒ4ígŒ¤ÅXŸ‘(Q6dc0%¤kpý˜cd9)Vå�î
‰—”[ÇXi©&R”í˜TÆ礗²Í¨˜K$!wÞ—EŽ	gF
…ì±×B›k
9Ø2K2Ê´8RFsN	c“&5™L�±Ù'%nBÞ¨%f±ÚÖk\"YÚ¹7®‰c~G–™%aüeù×¹‚¥ÄnKäz¦0mçð‘ÈÔËÒ|þ�öfsývhŸç–*HŸ&7îŠdÖâ̟Ψè+ΰb ÏÊL.,ãŽ*4#ÃèC*ä™}ž©ÙŒW¦*ÙIŒ±+êÒíî×ïlÂÅÈÌAÍà 
0ЀC×_síõÖ>qýõØ[×PvÙ^‹½¶Ùb³MöO^«íSr·íSÜb½·Üf»}¶ßoë]¸às÷ý÷àpÿë½-´
Ûëf—~I}¦ç¡•©—ÑLª$1_ãÛIû^¬î˜•û;1¾²ÆpaMÂÊ°|-¡«ú–‡Çt«§Ã{VizQ&1�=×q¸”»Jfa¥‡VGÎDîJpÓõü²+ÊÜ|L¥ŒÞäLpjn¥ºLÉÖs²[l\ÿùeãfKŒØîÈÀ÷ÑA­ 

gfÑŒf<ãÀˆ\ä\áé'­
«:“E–ì¨ví:Z]¥Ç•<C]ú‘”ŽØò=e´â,}z|Ð2ì�R߃Œû<Ù‘O¦™$˜Š!È™µâ?zÔ¥¸öXÃŒ~´—ézT°Ç(QwD2	«úvÕÄiÑÓ”9L	VS¤—ýâ;uI37ëÒÑ2S±QÑ°$S×dúƒÌwÇT™ãæ�w¿¸€Ó‘…á¢iFrŒ¨…hêtM1CŸ’
³ÿ7�YF2þôfr¬HÏhHB´K
hšEL(ÍÃŒVèâ)c#SB4WÐì‘3RA‰t/(
ÏI»ìˆ2b‰ŒïŒË1¬HÆ3Zñg´Bh¯êÈ `&ËVt³$ƒ
$ûdi‰g´qc‚£PYUÉ4†#mRÚ5»º¿§1©ž4	Õcú¹‘ÔsFFlaHŒø#¦]5�’¤‘;Ï0²r$˜+Q+‘Å#}é>F[˜˜`ñÆ'†É’^S#’–"±jƒ=‹;•Ø<€n´HTÒôˆ15‡2+
\ø&§ÿ†ÿ/ÚA½B
ãÌüñ…NÒ\°¾Àc1ðˆe^ÙE
§ÓÁû¡eÐâŒ/Ù4EŽk±R+‹+Š²3šáçAš6=ì(†C|qÞcäB"™úc3&âíGýBÄx+@ÐŒ[Ì
™¹ŒŽW¥S0­Õ‰yØKH[¾
{@Ù;ÜÅ
õ¥Þo°ƒéÿ�Û?É—ýá_ÏÄÍT
þÄ)1Jp
y„
¦És	¨ŠÅ¤Ç£
+Š�øÀŸ
*Êñ%£;þ
â1R¢/l‡øÈ€2ˆoÙ%jG¡ƒ+P_.X]ÌÑ�
@Ï8�TB PÂÌåÂn
€/�‡zÄ儹Ž@ѨÐÈë6ÌiÔ�ˆ	цýU¹@¦á]Æ‚Ín8Ò;îW;ž]„ùÝZ\AÊ ‰Ý“áI¦È°Þã×�rÜŸ­Ž}„9ÇgEÎh<%¼Ã€øOÔ‚n!C¡ð‘_)êB
•Ìg©t
,Òÿ atµBo¬2|èLÀi
jŒèÐç0Çy*3éc*׌vj¦Á9uI`4Q0UØX5ÑÒGKŒ<vªèLjò kBé¹ÖP¨¨‰¯AOl”@j¢:¡Ëhi^Ö䘣_<¤<Ž—Ò¾±Ûã¹BZ~OÏÐQ¥’zÍ0`�Q	­‘ZªõÈ’¤Êõ‡•ÑR¡

­RDÒ’,5•G•Õ”@ÿébÞÕcŒÒ/4‡3Ä£0mÓ:­i=mÔJíÓbÐÔ>Ê
Þïˆàßæš/ðäf˜ÛªIAÅÔ\U‘OlŠAÆŒ„HH€`=R÷a¡dêB+ÌÃ)
ØÊ
Ü€
…µ”ïXøD!S…WhËÜàÀ<C<ÜC<ˆÃ9”Ã9ÿC9Œ1C0ÄD‚|å„FvÄ}Ƀá�4‰„EOÉŠMg�0¼�«c$áºrN½–p9©¥±”g>o¹R¦ÝzŽc.áÂþ�§
³Àz™Î	“:*[/{`þÐÏAe�Ø-&[GÅ:›ÑoõÒ›¶-yPÏ0¤{$ 0¹I„.ÌÃ1ðHþ“¥àšEJYî¥Õ=
%R+È
ÀÖØ
”o
à@
ñzíx˜G¿±µ¢3óBKX2€“
™@Èv³Hù
4
ì@²èŠP´ô/Øt9|*p·0lr0C90# ™iF¸îÕ.ã‡ã½u¬Ý²‰éè·Úqå½è2Çòƒ‘bªúÀ*FÅyǃ<
	‹»Ä§àW;óð¸c\ð­…p©Sæª]¼”´ÿÔ›ø`¸:r]µéšjÞõ¸ûlá“Å©·ADÉÑ3°Bž°CŽ
ð („‰‘y‰�×JÉܽeGDègkjS)Ã),CFXÙ;´Ã"mס[\Æ7غΩº@áLP"ºó�
0@²ÌÍ
øq—�
GÛŠlôñ¶àcHQ¨À;1P~åS>ÂÃ/üB'
9$f¡OiŽëyÓ}Ï£÷\äk6øóÖ7ruõ¢ç­¥Û½#SŽ*!@r™Â`5é§õáv<¡ã§úÄ{º…íº":ï›w7:
—�•ÌóžƒFöÏ ýIs´­òêQk¼Ã™lHQÖEæÒ§-ª×îÿÕ�hO‘Í„h±Å©G¡ô	tíŇè9µ1Ù<ISC2dÉ4(�Y3`&k6Pà1o
Õ Ø†fŸžM*öàR¢j‹’-ˆZ…t‘òÕzõïÚ†À&M‹÷pà²x{UüØmX³��Óš,²aÇ]É~•œòAb	Sf9ï0
4ÌÞËK3
ÛjÆ¿:"£OÅ¿2ÛJ¾£`DƲ!�ÚqÇ©ˆœ²Ç£vLë Îä‚’4¬¾4rLÅž4’­.?+3+/´‘H¼d4è̃–ÄÒH+¹"j;f˜Q�µ£ì*¾»
³,hfŽAÔTÂEÚÏÿ.íÅ‘ZP	>Ü/ƒÃ¬0!=ýQ2ˆ-“«vgäkÉ3í:·ÔB×ÔL.¶¿­™Ç×Ä>“pAém/�aË2°gsl2ÔÊÚúÊ^ÉcæRl¿×Û´1=—êsëC‹!n³é$ˆÚüì“G¢dW}äÍB]±ÙÉ,߉!g÷3ϧØT¥:NÕgZ32·¦:ff;g™%‚ª'¦<Ë,ã3G»ƒ®zÜ'•Orí’;qÎßZ÷ñσ×w¡õ°USc½•<}Þi§©ü•·.‘ÃYÀÆ>‰/2ãÓ�6E—ôŽ*{ªÖ“‚™¨¨eI`AL”.£90{!f¢š¡¡Ž.ÿ”Ë¡ü„›¹Å†û;Õe¾@õ­Ïlƒ—S�Ä™øÙð}ðÉŠŸ–‡bøϘNRXw£¢¦�b’»þ”®¤iÇxE™Î2B(9¤¶{Û¨Ø9ÚÉ3hl‹£EªÅ9©ƒ;¬ÑÍvˆ%¶ÑÑowJàèB“%
>
‚@ô Ú õÄ!Lu5#TÀ¶´m/ú亢7¬¼ñŒ–à]hö³ç±Ãt„,ã…×AÏqbT¥UDWÖQ“0ÃÍt¶A>.*Ž‚Îënù(8ÉMpœ½Ü˜ÔÝ‘uàZ[]W7<Õ/“BšËØ~Ħþ³\`Ia¨^#¦·!fŽÚüÿÒ{Èu®l*,+Ë´V/ùö.‚�sw‚B`/µÙ>ö¯¥¢Y	C)¿|†!›—ûÆäÎUþNq¥T(oœ$'21[ÖR‹å&<…Éu$#\TÄ÷¿x^›@ZäøÄøOáØ2`÷„(©vD—
êŽnשõ0Æü1žü3ÛdRD†é˜@\�ö>r•Ôp€ì]î¾xPÎÇ�óÊ�q*ꦙÝ[|‰)Ÿ*I@¨Œ0j~TYš%Û„6):�ø‚	Í‘
Fõôè?;*­·••07Øeü÷“~I|ºcbîSsá1“W“³E²˜�ÏŠW3q($LLRêÿ6;˜¶>³³Á3(Ù–º)Óú40©\‘1Ç9BI0–<-×èò5DVç…9mZP[¸¦<ð-ñƒžm.f²*ÆQ­C¥$ÇG3‚fvMl
ÓJÑ"¥œ> ä+D͹sºo]'BIº® é¨l��¦ïŒâÒ9†–·Ì„¤þ(9Ú=:Õ¼ÐåaX´*/‹Ú¬·p¥™ó]²^)5ÊtU«×»ºïQ5Rƒa™®4’ï¹…ÝR^Á$Ö~꽞²�r_×±ñâi¤
9‹BVõ«øƒ¶Æ;Ã
‡8ǯ„Rz�‡Ø£>¦F¤YÈ^"	çÈ`n¡±YžÑáÔV¦)ù4²Ëb¤ÿíG=–å§êF�V$§†~±2ZÁcÍî8‰­ îl?—Ù
o¡™YÛ– "%5Âô!F&‡ó¨˜T\2rnÙ&(g’FÍ`Êó¦,ó�V°ª¥ÑÞ&I[ZÕ
ò]:$So£dä&ÿ4FùJÔKOªÔ¿
Ù2Ãu!2Ž
ÊŠ—Ei�×i(SÑ33ãÍXU^’#£ç!|¢Ö‹àI”VÐøØ¥.Ô�»u%êôÄðf“h¥©,Z\çCÆ3ÞqŠf@¯§xF¯O[úZF=ÎHŽ‡×
ëœG…öîZj¦�Ó4£Ê`E�…£â$>û(îÞv2to#vÀLµ#熸-ÿÓG’]È;\�§ü©xÇ�¬­µyY¦œ—T®Èõ3*~¦>ƒï`…×ü�oõ.¸Âí‚S�®*À¾ÉÈÂÁµ%>Í%¹¹sêœë¡à_ìóJˆ�iŸÙ je¹³Ã€•CÃ
fHG!QFøbÓ9
QF#
—áêe€�ôø§oÿ¨ðÚøÏë$ƒQ0Uð.2ÐóŠ
ugt”JqÙÔd²®î¯ùþï
Ï�Ñ
kÏ
ƒÐ°ƒM‚Q¬Pט!
apÿ¾ígLðš
Ò
òXC˜C”
 ‘¦ÕZç%ë‘-©Sš
�C
›A ÇˆvX}�i9–(;•(‡ùš¡S™á\åa^s.
×d
ÃÒOò	i¶u
Ïô¤–Þ�ÆÍ £ÛòB×ânP™ÁÚs-”£‹¶ø�ÃÈÎ\�ƺèu
RTÂÉÝÄ­ß
*]!l*.Þ,hh–h@צlœ�Æœy
—�5†æ,áÜS1ŠÎcF=ð8-â‹Áñ°#×ÿÀqƒ†|¡G/ÁMÍôR
Qã¥Y=Y0ݽŽ)›åö7hj:†$ÔÆl|`�(ðÎkY[!*uhBÒˆ"EÚ
Äí ¤ážh”¨5σ·öÔ�,¡$uMçRÎXÁlå¿Š0b0l@æbŸXØ�ÞÆs­TëeÜâzƒ!t­ˆ!å±ÔLÍšÁ9�åxtF“žYC9HRU�Aä`ÀµNëòÌOj²m¼¢•(t�†¡ÂmüØ�ˆ^Rð…Ö€�Â×]Ÿá‚±±Cæ·­:ˆ"hFf:æ!Ñ*’d~Uj:öoÜ6·îæ�=9ZŸÝñu UŸ�]×hì�ÿÏv}-RB�¬&Kòdž(Ø
ffÌá§;f;�
ëWŒµóoê«~:ÚÜ‹>îšâˆhJžg¬
IÓzäcœ
gKçãvt®l9ZÍÿšAÖÊ\° ˜
Ó%вbÅ�1s¶°aÌš
cVŒ3d-:ÓÅ
Y³fÅ€9{Ç
ۃ
slWVÀ
/êÊ8péX‚W›!sÕ§²ˆ%^U–�¬E˜k™µšÿ(‘òZ
F�OÏèòŒ3§¼ÅJ3ÿæ2“
S‹.ŸN§Ú3ÉU"Fü	ëßAÿY˜ÌFÏ°¢Œ3®ˆQTȼŒ+Tº`ˆkyD,NTÖêPž‡=¦T‹ÉfWÍn—j)Ó
2¬àĦ3¸ˆ˜§”8µVšlδb�@·1ŠL‡ìíǯj˜N”[¼ë=*�£öé§Í*N•̾y΢Ì,Ó53º¿yëß¾¼æÉÿ¥wê{r�>ë_-:™ÌšÂÈ, 3ÿÙ¼hOÿ�¦ð­¼­V€Œw2‰ÎÝø!0ï°ºã^ÁI$Ñ;’}ä¥ÊT¦ïX2LïÊ®¼£Ä—ŒÌØ•¼Ó3+§ÌWÌàRq�‚¸ÖÇñ�ö«R©%•6NñIDFû²çá/¬YDlåI‹æ̵‹›Llo͵N�f8ÑQF‰´Å?í—oÄ.œ”
3Šþié $
kÑ1
5ÿ¡”Žæ&¢£ÅEIý¢I@íÄN7>/T2"™Ï*”³ÁÈL
ÿJüs—½Ñ„0³êN”µ¬“í¤nâ:ˆ3úu:g
›È0¼Õ£‹$…j‘Ožx¸¬ì%#$¶*áYH¥šlå)&%³P3v³.¥ýÆW	;][8È�ìm\Ë(F2ˆ•'’ññW?4UæôÓŸV kg̾äã[Må"•Áˆ¥Z“ž+.h<cùcýó
WȆ ÿ™9úÿÓ{ñdcc1Þ`€Ö“Ò°iKRb'¾
-áR‡¦rŒš°ãXK}!_¸c.ïðª`ÇCuE¥@“ÉF¢�Þ‚lIÉ-|š�DèyÕÜFš¡£ØéÊ¥TÒ<†1Áxñn%
×xÄŒc°âºÈ…3Ž‘-„ÔUï�É‘¶Tw¨‚5)F+°¨¬µÌE¨2)ß&rÔ1¾`º Fš1�’yK1–ºQ�V“kQÖ k"	0À*àÿ¢¥·8ˆ+ˆRKøÎx…†ÖàRšÿÍ'VÁET†ÁŽ\hŽ¹¨Vª¨«Šò²C5™G.†±^›âäÏ0Zl¸Œ_´•�{GƒÚ‘*ÖØJ!@9pN4¬f�DýšÊšØ
ÖêÊ-˜LÉ
5×$]Ô‚L�³œãüPé9ÊF�BM¹ªÒ¼çQªücÚNšŒ<Åó¡ûƒÔ
‡ñ“#±tâ‰õœWÞ>µ˜Y‰¥Bc
~ùàH´m^GßÑ<!E…øK°&~àvð‚¬ó¸…M9JŽC—¸€.|a’'^I

½Au©˜»ˆµ©sÆ>¾v$邬A8Òm½–X„Ù‡’ÀH¢ž’Žp´©
ÇRAl[‚iñàHÛ!å6éà
¢ElR!7Ìã
a^™…*åÀ¸p
ÅÀjVkRuåvŒÉÇȇFâÆ
s!Ç`ƒÛ…ªºp�ÁÓU�6!xÃ�øóY6Õqw$ƒêiå\;ٯŖ°ƒ8ó
Ä¼ÐÓ6�é—&±]

©

ð}šé'{xSÄUl]™PgAòzÿ’—ö (~ZoÿÆ
!ZnÑ�Þ0g8>B"
ûéYõWuëÅQà	˜n˜bW„îðZð 	›aq¸v˜Õ(�FVßiѧ%å&W®@uˆ»l®ˆqË
FdŠ¹ nd&E×Ë
Ÿe=™Ã„’o{Qxg:ÿjÆù· ‹ùƒ,òt˜am<µK«&|›q¬ðÑ(™BCû—&ç~~[�Ö|Åv(ºÐkyçÈæ~iqög�g�j'ä3è1P÷‡¼4½
´–0—(Hc(�*"&94eÐ[«8q:·pØFå%™!X2QW±$Va‘¿¹^¬0S	Š]ÖŠ…ø&¨U%8µ¦
ÞR»UWÅUα[Ñ
2 Ù;Äœ@yñ_c/gºLˆ!„yU-ÜV^
‡Î1ªÕòñæïP~jX~¢
Ï�¯åU*÷Öj{¯Eþâ!J}øå-ûrÿ+€qî@5A$!à!_1<Í@BÈ%üa.itWΠ^5±xàò&Ì #CB!…jd>u7z1
5µÏ�+Å…Yñ§„uf·¿!X¤QeìÑ![R±…q.�ó–€,I1¹²a
‰5Á54ö1<Ï
_<ƒœ®P}¡
¨à
 ¦©"`ä]>¢aA[êUoÎ
´Ì*”*
qEÁ쇨 òPÐË?Ú³•úwá3(ÿ
LÄQ W4Rö7gØ3aKçz¦Ñ}PÂò�Q„Âä*ÌRëñ šî\,µZ¶RÅt<$	ñf,‘þ¬‡Qa¥!Šq+ªíÃ
(¹‘íOÙ?R²Âñ”Ý3w’½
€ásP¹ô<5MÕ;âuÆGmÓ#)bz&ÁY×Ö´<&ç}BÛaàŒÿ¨r˳1&§Û¡ÍäUŒ�ç]®Pj³‘Ü2}×"¥+ì"ò5B%þ“›BŽäU!Í~*~*„µ’X„Q+m=vµ'aõ
•µa4vÞ¶…&D™_¡Òë¥ÃT|e®¢,(FjÊ�à‹Ø¢J�c8Q-F³O't¶Rå�-:ö'L±¿FAju쥩ˆW]LÂrn1¡b¡«u¥C³§§ëLÞ²ãD76ƒB(Ä*à}-‹ËU¼ŽÄÎQG‘-®@MþµcÇ°'»a)²Ñ
]’c!H1ÙùbI@^"Úqr!V”ÆR´Á쯠i¥Ö*¡ì šÐ=ÿË„Ý"Ú’˜¦×ïÐÝ	¢‡I±µ°Ru:‹í?šä*¶Ç,ãâC{Ã!QÐ`òj;OëC
²Á¸Î¥®„î“ó<)(a9='n¨~fÈÀ»è‘ÊS‚Y‰‚"½Ë’,�(qGÝ”ñGGý1¸
 
RkXpëµk¨ ŸR>].2DÙÙRl$Y(œ{Ža1Ƽ^QÈ°í2Áë?©¿\CC¡³Âg_Ñš¨E
BE}ÄÒ ‘-;‘-8QW\ݹ A«Uä:Ì&€X/„Ø:™*ATäNHÆ6•uaÆÞØoψê–	!MläUŠ$�ivÓÞ'
{AÝ7$q]”±†·îe·±
:΢©�i…ÕØñ%¡·Æ{ˆUª³ËÉb¯)ñœ²è™wNiç>eF¤Ì1^€Cf¾ìbE
²¯¦I:Wä†J_˜à\,êׇ
çŸ~X—
@?’äŒÍÚáaÙM¸{ä°æ}ìsŒÏ6ÞlF0˜aß
‹lX­ÉpbÓÆŽt*\¯Dtanù�vXѽxô‰/CšûèŒ[8�Ýc–eÃŒwIi}�ëÍhì“^
ÄÔ{DÚ@r
Io`Ì1Ëa̲Tú^í�édšÕŸUÁ]ùdªJe+Ù|"U§BP©œöK,�éŸ\Ä®Ûì4¯HB\
++Qb–U=,¤vE[T�VKb“j}¤2ïhÿ.PŒ¢¾~dFŠ[fÐX¡%‡m¦`™A..ØÃ2KŒ‹�^6Ì-!ûeNY`ºItzÊ7ÀPÙÚÖ×½Wú1׌˜k€úô°b
[°„Ò¸VÃ~
§ã6ܳ/A‚k^¿VÅ
;œ-��ÎùŽ¡Þ[h«BÝ›VÍó°õq ñyet!gXÂ÷cÜa*p†oa¤…‚ÂÕž"hbOÊ…¶™ÿ!‘gôF¥ÄÖ
Ë–Ý¡�¯s›±™z¹É£…¥`²9—yr–.ûã¥xs,‰þ8@šÉš¤û™/yv>û|,£þ©ê¥µòéY¿Ô®Âª®WòURUøÏ' NXØÖTcWYu«KvÅj¬|pYm¹5©³O+
¶pŠ»’¤^èLÑf3S‰"Qq9 ‰¯ã˜�Ó‚
^ÒÏAöÐŒG»A‘A¿¡V�ˆ¼˜‡1ûŠv8
!�©Vh™‡ùˆbÐ@ðÿp¦«‹@‘þ*ã0�0%¶À²‡
«1‹
•Ï°«Bjˆ¡”û(¼†p¿âù
Rª@\ˆÔàŒøàS™°¼xÜPYÜ`é¯-˜ Z‹
™¬K{ÞxJ˜a�Š‚˜8ôˆ[{K˜‡	s’ÊГìðˆæÑÃœ1ƒ7ñCW at AwPÓ¸…yx˜Å
=<™)²Ž|‹xBšx†@|ò�Ó:ªaûx!d‹Óz=Ĉ¨VpÉÓ‹wx“yñ©^ò¬øˆMÿªÜ(ð@AðÑWø
_€Ÿv� 
qË™�“Àèy¾ ?쵑ÿ
õC‰Qk‰®Ð‰ñ/’è*Z‹>â³¾“ðÆàÓ•­àF¯ª•¼H†æX¥X“
烫‚ø˜Tk*½Ð´®ðÆ£0�$Ä»ˆÁcè�Á
¥¹�½¸š˜�Ú±q
ŒTd1Ó©ñhÆryWà<­¹%ШHç(ëè>] 	ÐQ�V°ŽUñ9’Üâ�Ú‘@ªÀí
g˜…@Ä��L9ÑSY†…$C�L
.Œ“ABA2KBK‚ Œ9Àxš¿\
NœLÙŒÐ4¥ÔCq†²¨…ø`‘$Ô©ÌŒ¼ÌDf2FÐœKÖ¬¿±ùŠ §ð=¸µt?ܽ@>Ü�‘©*Šl¤+¨lG绉é«íÛNu<	g©¾^YG®P>mœ ™Ϙ Ï�`5ø‰ô!ål*qǤ²µ-rOuŒ‰¬ÚG“xOO#PâÆ�4UÐUЕÀN«jЕÐ	½Çÿ Ð5P…P�È£
5vŠu¬�J‹‰rLÇáËÎqÄÏ«*>ÿ� ì“‘ȾU?	‰oᦵ’Q‘xP­(¿a0¬èƧª>tl HCÇwl>=P­Ð�˜Ã%ÕÐ)eÒY1 uR*•ÐÊEQ–
¯’µÍR·êÎ
5¾üìµJK¡MR*ú¬§W¿˜ÈGLÄŠ0S–ÓVYÐX‘Rè«Ò5TcƒÓn$TŠIÍÎ,ÝP(mÔMåÎ	µTÂTGÕsÕ'u>%Oì+QåóR¶ò•ñ£S
•>I5gyOZ…–pÔ´P­	å»ÓÕ‰øÔFš€µ¹T U¾ý¬(¡<eÑæsS"uÕBuïTÒRÿ-ÒNE¾Vm	PûÔ7ÅT6%Õµ	qEÒ-Å4sÍU-õTjWDeGbªEÍTFýÒOzÍW]ÙµÿìÑï4Çr–þ„>‚�OnU·JÕôÌÐ�	¥!{ÌV™øÑžP
`Ñ&XQ×Y5€$Ó�ÔQ…Gs¤¾œØmÐ-ØFÝŠ‘ðЦ2Ñ~\T
ÙÅUgUѨrš’ÕnÔ4“`SKsG�µ¾xdÏiO÷lÕI+EY¨$ë¤ÇˆuŠC…W
ÔyPp´>ì«+á3ÚVŠX%QãûV—USç[‰˜eÇœ¥T¶åQSuP|]WwušŽÿ}:µ4q�ÛUXm=\^% ü”Ù¿Í[©uÚ
S�ÝW=åQ¢eÔm$Y|e£'ÍÚo«-ÜÕѭU‰ÐÍÓZ�*÷ô¾z:T<�
e
†åØpÏs•ŠœeÜ
ÍFUe]“ÍÝž= ^»ÏÿtZd­YákÚ�MGô4ØÆ] ¬Š—5Ò›]Rì=>®˜ÜnmÜ•]j­T}%ÐTýÏó­ÐÊ>nôFrÚ\ÁOÙ]ÕøU?'mÞf%Wm¬�uOdy‰°x	­Oð„J.­Ø¤ÀÝMÓg!+�\­UÚ¤%Þ�EPäÝ*¨mÇ0ÅÜK;5}ìÕ®²«íR#Rvœ×�5í
–~ÿ=Ø¡]àµU ê�YuÜÕ°%aÉ¥áó¬`Z³]æõOrÕUê=YV	=Sº½aöÄà"ÞÑ&.âôûà¹ÕßP[â¬Ð^Ç-¾õE†øä5š@«ˆ5Ö†[øcˆdh…eh…dpô
£:T¨�W[öeHf–d8
ÿ=ŠM*×dX`˜š˜…g f›hc
tàÿfW“pQš
5ïÔb'vâJ“àEO£ÊŠeÓpD_h±ÛM¾°°W¡ugIÕÖ*P•¥ÑÎ}[f‰¼ø¾§ Úx¤ÝåbV¿àK`0Fš¦„Vè…fè†v臆èˆnè—
媱éã™–i™Îµ725­ÔÊ™†ã"ËŸöé"Ai–~é—¶ `ùÌ¡p˜K¡†éjY:…TÈS³Õ—ð»
¹�¾(b¦…4Ögë´¦5µ
îEÓ´nÏ]âñôa´¦a”Ý•÷„UYÿ1_º6["&OÂ�ÖY‹ß
Èà{[ÀõÓ`5köS
êQÎ$ýW—øÑûPŠ¼¨Œñ0z
÷qzèq wí
ÿñÕÎñ"òñ#q#¯‡p
¿tVÿ�öPmXmlèô�c÷ôОSŸöm'õÑžô\çpR§u!ÏõÏp‡wOuzÀ†Ißðs§w!÷ôZ'÷t×ðJ/õJ÷M¯N§j€t
·
¿M
r7]s¬AÛwêY—*2ÿ!+xÿy‡€ãÙ¶k°¹Ù7Ú±õ{ª‚ï)Û,¯Óõk²ë«r
¦'}¿YûÜuÿç­‡\3¦
ÈÌ0Fû-u
ƒ¡°øé pYÌу©†ìãù=œ7"¸P"¡Œúô1±lzl!H;ö1O
2O‘Âa‚D”–Ä(QÈJ”^R¬UÅ1”aJöú×�€õ
^Ì‘Írœ³,Ýd+@¸*™(­Êu«V Ó€vu¬þ‹Uì2�àŠs¹ñ@Žr“Ór¾3FdEtÿ±‚ͳàȹ'zkŽ¯ã§b�†�lÌ;$WaKŠÅiЃХ”MH5äA8þrÂ|h/
KK®bMV²1w1ËL•N¾�/Ó»Y\8ôôõ¬ $kH
ËÊ"Ñ�@Ì ÇÊ
R³Œ\�b#s%5Ä—§�…},ÒÓ>²‡¯¶Ø	1#�’]°ÄÌ‘…r ™Ñ
2�é¨Qô@
R"r¢µADQ
ƒQ
sD(Âòc+"J–²1
ïI*ƒu[Ì£$Â$iˆ(gØóXI<d�GÕ(EÞðÅjŠ¡b±Ê4ä�Ï·œCœ‡ÎÑ9k¬�¶'Çé°kUy´c…õ92Þ
WãúÿãlÈSÈ`	g‰¨r£GYÓRè´§‰oD)Nïƒ ü8«Xµ8
ºÔ¥ÙýæAïúc1DsŒ
­Ã+"Œ&A’™¾ø%‚•¥,鑬ʫZÅY¶Úl †œc—c3Ë™Ä/~4©‡Mp¢šØ0ceRK§,ÑD¨·†lqÊQˆ$I¤dFhŒqšæ°ª2f”N½PUŸ::�ŠcEÑÊ^ýÒÖÆ*Miƒ9¥]ƒ”¬lM0�ÁáÑÂgo	I½éèìh鬱Vª
á47ŸÙº§‰äA~Ø%,Šzk§´¹míR…Å*éŽÝZpeµQ™2¶´:Ïy\ÇÄ•V
�¢çÿî(Ÿ�¾Gp?¤ �
RèøΖ­Jj1œáŒ\l¤êÐF`÷ªß¿Ìm¿ü…+S"I’u4EÀ{ͯõ¾µŠ$à¨Çœ,¸
vä=±p1|

÷�_ÎÖD—Ã=¯Ë»a¸å$ªÑÐ1´‰ÆÅVv
NHÀiœâ€–sN¡sÄŒÞYàÅζ&Þ8eH(¨XF"ž•ã.x™f4ºpôÉ’a*…ò°…«ô*=è
ªs’žª÷4²\L
-zráÿ'ƒêÁ»0Ð_ƒõ#�ÙÁòŒz‹ñSFÎ.^'«k/ÂÑ‹]4Ó¢æ9|‘i¹·½îtOõ¦3­÷_ûâÒÆ`íß9øÀ§šî›þûß}w_ÜÝð¢¾û0â¾w¹“ƒ·¤»9rÁZrh~Ö¯¦;èç.úºï½ô˜>}¦�áénän<¯ñ®êM{ºöŸv;/†½x¤CT½x…3X±dèâˆn¢˜!w¹Ù.·Þz8ïlUòTYä5—\u’ÒßjZ‡âË	· ‹J<AGOÇYg2_6²Á#GKþý¢âÙ¢ì	�²	H0O¼½Ái|†+œÌ,HR1ClØÆß8Ñÿê>àß4`£M E`Ö\bàõI F �ƒid`&`m<Ã6ÃÉÌÎÏÕ-èÜ;Ć3¸BtðD´ˆíÜ †Y™×my°\ƒ”½h‡ŸaG
‡yäÜnéÂ…9ÚzqI
!KΡÒ=áœ)�a~à–2ÔÂ3,C+ÔF�ôêpQÆ¡Žú×Ó±Ù¯œ!a×mwq\¹FŸ™À­_®ð–it×´ÌŠè@!A ’éPŸuÇi
þ
s0b.^¡/"Ë/>a«ˆ"1â"×ã1a""Ýp9aJ1]Ò%ÎyHÐm]sc^!i`]6b¢qˆâ(:RÔ‚"
öaÒA#(>Ç}ã5ÎÙ"#Õ¢qt8š£j!à”K4þc7Fã´Æ0Ú#3ú¢m`ã;Ê£éУ:‹@&$/Ž"m$qñc7®c
jã?îãA†D$'$‘c«¤7Š#=$&*Ýqa¤J"]"þb9ÞVGr¤>’¢9Ú£ô=d—ýœx
aYže-¶¥SZd-ºe8J%[ÊK^V¡�Cbå8
á]Nå]¾%IA¡bj£aºáBreJ–%eÂ¥7b\£;Jåfb!3fá<V¦djacŠ¦c*æà�¤ežåSÖ¤G®fiZä¾fh²&G¾%.®¥m�|0Ç0<ˆ%þYx‡k°ËAˆ8j]5FNQÚÑÔeÝs6¡t2gÖqNs¦5švVçr.gOðßz}§rî
5f'¬\§y¢ÆuF‹xN§{®§{Ƨ|z×oÀçÑÍgxâ§~î§rògäÈÆz¶3ìjçɆ¼$Òÿ0°\-å„üÜB¨-MèƒFh#Ù’
NhA¨
v(†~(„Ò¼¬ÆˆJ(‰vh‰V¨‰f(…j(ˆªè…†è‡z¨
ÒÕ…f�º×‹z¨�nhŒ¶(�¶(‹öè�N‘Ö¨Ž®h…âèŽÎ(ŒR(¼üf’Z¨�rh�R(‹ú¨‹Z©‹"i�æG•:é•þ¨�ª ”Žè™æGšÂhÕŠi“*©—Z(2¤hŽré˜B)*Ö)ž‚)†Úé„Žè�’)œji�
*œn©‘N©œê’æ)‹æi“*K¡b,—Ñ_K1¬Æ¨èÂz�'˜1Ö�§Ê	§¥Þ(Žú§vºê©.]•êÿáØ‘ã¸'‚XŸ–ÙÔ¬¶ÙíJ#i°ª*xÙj~lݯÆ\¨«°2)~šjQÙçª2+÷õÖ%rß±NÑ„Ð*¯në
RNäÄkC �ê}*+=È0ðÂjèŽFð�¿™½àhÔ«¼ƒ
î‡hØà
Æ+¼ö«¼ºÀú›½Þ+ÁÂëhÌëi
ÑBlÆÚ`Ç-˦¬ÑVíÓv-Ï–-¾ÖÀú«Ñ~-Æ"[ÈâàÛ"l² ÜÚ­íôìÀr­ß,ÖF­¿6íÒ6šÃŠ­ÊV,Т,É^ìËê+ÂrìÌnlت­ÔZ.Â:ìÙÞ`ÚÒËgà1\ð-›�$í²z9
¯íJ/úªo/ùn0êpñ¦/ü0ã/úŽïúš0ñZïön0ô:ð³/K0ÿ&0¯¯ónpôºo
70_ðúîïõÎ0ý–¯ý–0wp°ò0“pó~ïÿRoø.ÕÏ°§oü*ðëïkñù*1ÿþ.ö¢0Ó°
Wø©²®ú²s]ó6C‹­JÁ£!eêCñŸ©~Kvì‡(ß9;3Äa_o`Îô冘­T8ªÙù™s ¢£¨J‘ajœ8w™0ckA+q�Ë4ójýdªúµY蔑-ª3d¾ª0W4vðê<ÓgDÃÊIùset?ó È=45ëó7“Qzps˜%—±Æß®ÊsNWû5ô0º2ë$–õé3³È!M33C¥*>–ÙJ_ôæÜô1ëQ­ê‘Êg®
絶™-Ÿ+<ÇÖdÒóÿH�ªQVÔw1uçÈŽõ%´DÇ4G7M‡4P—ó¯xtûg°´·DŽö•Ñ²TUßòãœQÿõh°u°Œ‘ôQKÌá¡=ÓJÀmóGÅY<cëpžµ{ÂGQ6àt‘JïõtvT0Cël%â°2È­gör¦Ö”[ôFa³u,×U3ô
Èê¼*?ǧó‰8CöD�WRÓ6ãÔó%öu± Î2.ß]TO‡3ÝvÈuöV7÷]R5wè¼dpÈŽN‚‡JÁ´®®
H¢+‚\Ôû-r1ó.ÏvK“YáÀ1qÿÇò}"®X‘Å;ç6øÆzŽ$~÷µ†@óÊn=â9ßC‹ÿ766tˆrjÛ”ÆÝáN§öt5ûIø/oÂá¡FQY¶3K³«¤÷syXëp®ÑB¿Žª¼JÊÙ·MŸ«Oœ.;ÇJQ"9‡–)5a·žñáƒw_v›QhÏ‘`ÃÇUåé¸oWõJº5UæY°^w]ƒTú9ιr£>1ÜgÒ|”×m�7r!ËJÌ¥tàà³p¿ÑR*5WËöz7cm£ã„Ó´){ø©À7pS+é 9sѹÀyÔBƒ4L�Nt55¹4_íDyÇ}ŸDÁ±f?ø�Ǥcxž›6ýÍöâ
}¯È{�kþW—õŠSýÀg¹œÁÇ´£
[Ô}ŒÑÒkþ¡+{d\æ³ýzu¹~‡öèS"w»³‹Ï=yÏ´‰ÙÑÃ<H‘¸–Oþ*–×䃸²Rö’cNU9oŽê$<€÷ý˜c«æ�{iÜu„ëgÁ-½³×`ª÷Ô%^;N³Žâ8 Á}~Vg6Ÿ�õf_ú÷ï*—G@
--- NEW FILE ---
GIF89ax
ð

<!423<@&;C!8d

Jt§Q G‡&-Š´©R§LŸJ�Ju©U¨W§f­Šµ«V¯\¿Š
Kv«Y°gǦ-‹¶­Z·lßÊ�Kw­]¸wçæ­‹·¯^¿|ÿ
Lx¯aÀ‡'.Œ¸±b°¾|‹,ÌWeËÀ(c¶¬YXæÊ“#‹Æ\Ù3èÑ”��>ÍY´iÉœC_N½vkÚ°YÏ&�Ûöîדu�[³kÕ½eGÜ÷òÚÊ�C7Ž»yôêÅoó¶N}{ößÌ¿?ÿOÞ�¸péäµ›wŽž»úðç±Ç÷>ýuúìåçÇß~yøûù÷Þt¦�8ž{	2¸ xíA¨_
묥Öúª­sÒzë®CîÙ0ÃÜË0«”Ög™ýbÙlÂ4ûKi¼•6g¬M+̳Öj—í²Ï"7-eÂXû¬eÏŽkÚµ“MÜ/Ü].¹¦™«º¾¨Kn»Ø«š¼Î¦›»Å¹+n¼¥Í°½ô®–¯»ûÜo½äúòKfÓ³K½ï2ì.iô"°Âw»ñ¹ÿ‹oÈsül³×þâò0¿XLÌ.[z¤²H*ë²Æå:ܱÉ
/,2¿³™ÙÑ›
£¬·°}K²¿ëž¬´fÉ"Ùìd
7LôÄ#Ù/½|Í,/¬›òÓG4Ê
«õ½kÜ6ÚŸ,÷È¿�ð¿lãÿýpÝqëë÷ÏjƒÚÄÍË-dóÙ+½#ŒãÊîÂò•†v-äÒ¢á$ç‘y$蚎y食.:j¤¯>ZëC¾¹ê±Ó>{’®wn»é¸×ÞûíººïÁó^|ê¿?¼ð¨³¾;òÇ;Ÿ<ôË_æ+jd÷"L6‰°1GO€qÅTˆ±Åù觯þúì·ïþûðÇ/ÿüô×oÿýøçŸ>çó~X°° ¿p~XàŸ¬ 1˜ï|\ج À
faÄ ­ Á-øï€ùÃHA+
T¸Â· †Âð‡)¢ÿ‡HÄ"±|Ÿ¬A~Ü£´`V˜e©'YÉŠWU³xE,
ª‹Zôâ–ÀØÅÓ}‘‹dL#×xÆ6Ž‘�otcíPã«Qen‚œ°-pA~¤ IÈBò�ˆL¤"ÉÈF:ò‘�Œ¤$Y…?2�\˜‚‰e4CÔ¨F4¦1
jP#Í@‚µP@V’•le+ýøJXÎò•±¬ùGMrá�³„å/_	È_þјÀ´å/ýØËaÒ2	Íå)Ç †*T¡U(D3šQˆBLð˜ÌœÂ–ÉLVjaœ™´$+q)Ìa
“•Ã¬¤!Á¹Lkn!Í%5¦�ÿ…*X
„(¥2 AY.ó—<&1[ùKtžW˜F4öY/˜˜æÔ‚&¸QAV!€îüg4§Q�idA“¯´Â$WÊÒ–ºô¥0�)$«°&X£ýp9À–$^
µ¥†5R9>פE¥f©ÑŒ+d! Ö�<¦ÑBø�1¤H¹Ùi€Á–ZèB)9…"‚ð 5¼`…) Á¶Ô(DÁ�ÍJ£Q¸B¦
�îÚ
	G D5¨
Êû*ÃcØ‚J/yQàÖ÷”aàß‚{[‹Ò²£Ã´Bì0ˆ?Bј‡t§ë….\¡¨­ªÉÌX&¡”¤l“€ZæB
–SH‚þOZ£¿ð@åÿ)Ñ}N	Æ´¦b!Ëä&;ùɈ\r!i
…jØ#§î€¤Äx¤&]&Ia¤£qf³(¥ŽkËA
Ýõ6·æϵyÿtof]œ_7çÎÕYÍB½³Äô|f+õÙIVR cÇçBçùÐW´•æ\™^Ðm Cò«*¼ʘδ¦¡,L&!=Öfu	q4Œ!»Zè!±MBèá	Ûì¦u͇…1¬Z›…¦]k(ã»ÖLª¹ÙŒ@ì¡õpÆpWË*ä0~„¨¹)ˆ@Ü
ƒw¸Ã ºÉÍBøÁ � ¢�ëfâX «¹Iê"á
w D7»?dA€S°ÂÖ]Ro!Þ±ö7'!Q+údðä9e*€áÒ®îüÀêyC0–®`´ÍmP+ƒºÝÄ‚+uH†;Ì»›×ÿ
Q�n‹oå-ïæ(˜€·šâ /`iBˆóûc ƒ7Mô¢]‘°L$®°DzäŽWe|úÓ=¥Ùzhæòò>Chã(뀣Q9Å&²·ªìžB»“Ô®$¶÷êìp?”Û…4÷ ÕHw§cÜÍ.÷SÉ)Î`WØØш5°aÒ°G=^[kÌcõx|äyÊO¾ò’·¼æ3ÏyÌ{þò ßüçEúΗ~ô¦'½êSÏzÔ»þô°_ýëeOùÚW>ò—¯}îmÿxÇÛ~òŽ¿¼ïyïøàß¾ó¼·}ñç1|Ê7_ùÌç}îwzz@?ù’Ç=䧯ýß[cùØÿ}ÿøÇOþç“_ôåO¾ù3?ùöË>ö­‡ÿìãÿþúÓÿþóÏ¿ü÷oÌwŸø�Gö°MäåÀÄð· 3¡£TMf­Qg¾Ò-b/‘QT‰¦gG•VqÔ�_¢Frt& è�"Gh‚%‚S„‚+¸E‚V�)È2—C)Ë"ƒ6xƒ8˜ƒ:¸ƒ<؃>øƒ@„B8„DX„Dè:躠;Áq9²q5àRT—q1<è·�1 =—S,£…ÖÃ…;H-]Hdƒƒ�1ƒH(„êQƒjÈ…ËÂKÈ2q˜„0Ø56(†f(#uF؇~ø‡€ˆÂ 7H-|(ˆChE7X†…¸2—ÿC6l胑¸ƒÖò.³,•Èƒ™˜ƒ“(ƒ•¸‰�Ø,5Š>˜‰¤ø‰C…Xx‡š8Š”èŠ:hŠ±ˆ‰©H‹yøŠ[8‹¹˜ƒ²¨‹¢È‰³(~Ew©cwňwu¸Ez:e—9¢A·ð
Åp·€�‘uW„�i¶�ÜØ�ÃáÃë „VxA¢�Þ˜ŽêxŽ×$Úˆ�︎mG-·0ÐX�å8$è(ŽÓ�¾à�íui%ù�
y�Ø3É�û¨�é�i�)$ð(‘)�Ä@°0�DBWØ‘WXáx…(x	ÙŽò˜’*¹’£qIµ8Ä ’ƒŽ
9‘'éŽÿ™�(i‘;i“©Ž5¹„q3s™“üè�]�JÉŽI‰”6Ù“L‰w)W,Õh�Oy“>ù”?Ù“;9•Ii•¥q•Ô˜‘úè”Ré•[•)–aÙ”‘A”hi…ev%¹’�§)ÍxŽŸ1
ˆ©€«Pª
1s›¼)˜¾à
¿ eõÿX�¹˜’3,ʲ
À
¾P«@˜¯ó˜�©ŽÑ	�Êù5ØéÒ89¼P©Ðš¾°
¼�
’! Ð,°@–K™Äé˜Ðْù€·
ª›Å›Q‡™VY›Àð
íùSòi—Kš2Zš3Z£›Yù�“ÓZ¦e•9
Ž¹€@RŸ-yBš�ý8ˆ	Ê8¼™Xº€Ãà
ÉŸÛYʲ€Qz-²é˜ª€Öi¡ª°®`”Áò2µi¦¿â§ŸÂ
.S›ʦ…Z¦Óx¨5³õ8ÃR¡½¹
ÐX/î9,V8,	¼ e�*
PZFŽšÑ�‚™
¹€¡êªC,X¹™ãi¥V	„è �
©0®ä:®=P®èš®êj®£°®çj®ë
¯äú®©@¯ñz¯ãÊåj¯úZ®®à
à
[°òz°õš°© ¯çÚ
­
 
{	³à±@®§ð®öj°.[°-›®
/ÿ{³8[¯¯0®±
¯à±€
«p
‹
¨
¯p
Hk±¨
é³ó:°9{¯›
4›
¯
`K ð³+‘ °ãJµÿš
z[¶g‹°û¸8Ë°€
Xk	³ð¶§°³ Û¸—�±n
Q+´©€¸#{	T+
›
›¶k¶«0®B
Cµ©@µ0	½
 Ð
$[´Oû±¯P¾¨Ð
—P±ë[±Ùp
K;²
¯°¿A‹µä±p±¯ ²œ›±!‹
Ü
©µ 0µ¢+·X
¯0	KÁåë´ì;²p	!û¹
´P

ºP	0´¢»¾\û¾ßÛ
´€¸
²P
a輏
í¯âšÇl»Ç4+®«Ç€¼ÇzÛÇ|L®�È…œÈmÿ«È…üÇ{üÈ4û¼·0
`,wüÈèzÈ…ŒÈš¬ÇãªÉ˜Ì½ŸL°‹œ®žlÊ‚<ʄܶz<È�üÊžìÉŽ\®4®“@Ä­`¸ªœÈ›<ʽÜÉ©ÌËèJ
¡ü˘\Ê~KÈûLj˽ìÊ~ÍœìÈÎÜÇíû
£p
¯Ë¶ÓÍäêÁ;
ш»ÆȳÜÈçœÊ­ŒÄãšÎÈì·ÏüÌ„œÉ½ìË«ÌÈÆ|Ï»¼® <
<
Y{Ï ìÌ|ŒÌˆüÉ‹ÏÅìÐó,Ìôlл,ËýüÉ—
לЮ�
 
ÓÜÌyÜШ<®G‹½—Ð
FœÈ ݶ³|Ê麳¡,	“LFmÄõlÈ]³“@Ô¤°³ÖÌËU�
Äü·ÊÏÒüÐøú°„(�Èq�€µf×íG•Æ^t=ÚÚ+t÷}æSÍ
/ +ÿ &°Œž%°(€è‹nˆÎè‹Îè˜n陞é$°éšî阮%Pé+°è(�é—^ꘞê‹^駮é©êªê“^é¤^ê&Ðêžžë* /`³f;èÚ»äê!ðê™^é�¾ë¥.é‰Îì·.ëŸþé) 힎즎êÏ.ëÑNë«îìÏëÖ¾-pì(@¯qN®®
—ð	ý%Ð
¯°½™­Í"­oØ<~VE}掟‚›MÛzç‚¿a—㜯wœæ£
˹N¹²0´E­“à°	´à°±Pú§oµO˼«ï´*{
¼0	O›ºâŠ¹Ï{
N‡©0	*MNí·±ò,°ëõN&0'ÿÀ%À+ âïÜŸáÏý,`-p&€>p®Ö_ýlúþª½=@�îýå?þ±ÿ%áÿ
$L¨0�`
‡%`¼H‘BË14� ƒÄ
	4¸Øi3§Aœ4ýlñòå@-H¼Ã\®¹ÚyK|ÁT.p¸ü9Â�Ê£S�"§v|`À†/¿ª�€¬‰¯0P¤@Ñ•…ÿ‹Ùfó¦…
CÃ
†,ˆ&$Z0a̘¢x±n¸vµ@àjG¹V[à û[”ȪFŽ>?^üxòã9OYêû«¨ñæQ£&­
xô¨Í›÷L
<úÐà̓æ>iÞ�hæ�š
áa�	@?Ÿyï?íyjäP*Š8#%
6Øa�%È…ÓB`…`XYÅ_=Ñ—UVaÔÖ@µ¥ÒÅV}ITXZݶYT
Jä;+âô>bW,�#;ì!û¸G?üÝ‚ÜÛ_*v?ðY%ˆWì�)ÒAš¯„Þ³Ê+¨
†ÈÌ»b£×@{-¬a
Ï8Gª‘*FüãhG“ØÑ�wä+¬8Å$¦B
�•Z沑8\[+k9¿IŽd�Rt_ÙùF¥%jk×H+IXÄ‘\$Ùlà"«©Ç¹“²0
€v˜OêX@œ
^‡ˆ>Û1¤}^`±5”¿Æ~bP‡Qx)B‘Þÿ|=‰Ù	t`xÔ?‘±A­&iÚbÐ…u(†S [Eb¾ˆñòå‹°b¼xóŒ`±UÀ^Æ‹â-ZÃ,®»ÕK˜0]·†ñZG£0t©:¶J¢Cƒ¾R<èk#/�ë"„%l¬‰ÅŠ¥ŠXr•0b°"‚\Ř/…9®\ø° Àˆ“\xØÂa¾`TèTYbÀ|
|µX/�‰�œ	U¦Íº[÷â�Ùï]™�ûÿþ+³àL‡¿xý2xW_È…5žlø²cÌ¿
KNìÙàæ½’+ƒF,³sLÒ˜ûš\ìg¾ÿj\/ê¾�ëvÛ.`Ëu%Cå�xpqܲ/ûþ½Xµa°�YŸ™rn¨Ø¯æ{÷nkÏœ?o?íw¦uëºÕë²›/ÂÕ�Ã[>ŸÙ¾a½Ü»ÿî[Ûô{¢]g]{ ñ’žz«U|æÕׄü݇f·qv:°ÐKF·èBK°¨#
N
3“¹šÀ~¡‹p*džÚÍætŠÉéÎúï/¦Óa³&ï�­‡—“Ý{Þ#µüt-v…#]Å6ĪùpB­Ûß‚BÄ퇇[$¢
å“ÆÔQ‰l䜃X8²ñŒõéOØV3EÖq5a|aÖˆ£EÇ
®‰¯ÛÏsxÈEªŽmBü#ñ˜7ÎÏnm{^–˜HÐø¯AM|$A	»	Æ…ï)äegGK~.�ÿÚäy\ùD=Âñ…l[ái‡D¾Qæ‹ŒducFøÝæ‹ÑsÝuXGÏ!3�V&
®à²`– Æ Î 
Ö 
Þ æ î ö`r
	!!jA€ÿ`
žàê ú þàár�PÁPÁTÁ|àÚ`Òà&a¡áV
l�há&!Z
.አ֡rá	‚ Ž¡†aþ! ¢ â
¢¡!VÁ8�5ÐC?äCþe�EH‡µi
¡Ešì\”gíS^±�'vb8}"?e¢(’)†"(r¢*š"Ei¢Öl"+Š",ÆÒ)®"-¶b)ZÔ3Á•0Ì#¬
à
l�¢1#2&£2Ú Ò!Z
4C5H54Ãx
r
z 	V�45TC3Â`Á€c5LC!Œ�6�B4Äÿã4L8R5Ð#X
ê�2DC:Nƒ8ƒ5Xƒ8f
	Z
¼£4V5XC5*C \
1’Á ‚4Z@Îc!ØA4C3P#=ÀÃ=ŽcÁ9†c3LL
PdJJã=FC3‚t
‚�4Îã4!Lƒ=Vƒ2d�!ŽA (F¤G6!¤c‚  
!¤$AÒã<À<ÌÃ4\�nÁ!Ü�Mn
Núä=ΣL*%èã’AQz¤?Šc3(ƒˆALƒ5HƒO
Â<þ$9ZÁLÁÂ<VCRƒ4Ȥ ”#À#5 at CHÂÃ8®£ã2^&ff¦fÎÿ >åb
Tƒ=ôƒ;¸ƒUÀ‡$¾ÕB™SY	—fÝÅFÅ6}_¼MlÊ&%Ò¦gØælîæl
ýæÕðfnúfng%Þfm
'nÒ&r§nŠs.çqçt§sZgu6§rbgwJçvRçMŒ—5eƒóÅA@
l&{¶§{^¦!Æ tc!ŒAtÁT
\�Lƒ4Tƒ5Âôg4P£54
˜å=&�>:f5ê
 AGÚã=Š�\
!Øã<úÁ 
Ôã<:
XA X<Hƒ4(ƒ¬!öçh¡Ü
A"þÁ4`¥5(ÃPÁˆVƒ3ÀC4 ÿ
a€A4PƒV6C€AO2ä4Ü
`Á4C4Ì£ TáDVVc�^�ƒ6ìg ø�(Á$Á  å=reVA¦‡úA �Ôã=z
꣒A!å44� A3ä<v�PAOd4‚HÁLÁø�¢RÁŽzhœ¨OBC5B
ŒÁ¡f3Ø�„Á’6¤“f(CVjå\Á¤¢ag¾§­Þ*®Ê`­>å„&#æÀ4ÈwxÒ«ÉÍJab¼9p¥u]Ñn¨¦³
›rD+µB«µÞPµb뵶Q¶r붪Q·ÞV0½/èB6dàœAð)檻¾ÿ«»îáΠJ!Ö+
éî+’&�EÖ#F†c4
ZAczäYÆäLÞÁÂ`Ú+¾– Îç¾î¡VÁ!’† d!")ÇZ¬šá½rl€lò'¿Nl¾.*Ëê!î'ÅšàÊ¢ì¾ráSŠì¬®¡ÏfaJ¡€ì!
íS¢á´àrìÊj£Æò«e«ÔN­2’,’v#
&¢5ÔC#–ÃkxŽçè�tЇ-Ò¦/9G-í›C9V°M×]×y(–a¹æVÙPÝZâ£á-¤½-Ýæm-ÉmÜÂíÝþ­àú­Ö
;È-ÈÿÂÒH/,Iç&‹çš‰è.Éèr	éž®é¦né®.ê²®ê¶.ì¾®ìº.íÆníήíæ.îîîíönè‚n²l®ð^`9C\lnþ%¯ñCñöðŽ®™ C9”²t.¡�‹·ôBò~îð
/õ:¯0\`è:oç’¯ø’	ú†D²”C/L/ûêÂæ
¹ð‰ðšÉæ²/þ/ûv/ÿÞïô^`²<òª/¡ØoHÀ/üºõþo²pIúÒERxîð°u�Iû’¡X09°/™¤DøêÂÿrpp
²"—
ÙJ[™�^«ÕŒV#�#ñ_4ˆ%_òìL'{²(àº)ñjòW	SvMR:ÜBìÀ(À‚+Èò+Ð2,¤Â-ßr-§Â.ï².ç2.ó20ÃÂ+¨‚+ó13.#33ç23³/31C34;35'³4/35�B*¸Â(ŒB\Â(¸Â1“39G30¿33;÷ÿò/·ó;»3<ϳ<×s<ßs;¯ó;Oó1g³2ÿ³?g³/7s0«s9¿B9{3837ó5?s?£3/“sAÇó+ðòEÛ3F´>Ó3>K4 at kt/41ç³1»B7£´:CsEkó1wt=«4,LBŒB+L‚7OôA#tJ›39sM�s+ŒóC³ó0Ë´Q'µ/SsI´SôSG5TOµTW5U´Aw3Bs+t5P;4XCôE7õX{´Yk´EsôI#u4�4K4>G5E›3BÓ´MãtC‹õCïµC7õU+3Zÿµ`[u-Ï5Bou*ˆsP“3_wô>4H4`‡ô0öA£ÿô7Ûõ8»Bc¿uKSöUKtd‹6hçò
ÕlS` ºœ¶jß+ðcÄ<c¬‚ˆÕ|‹�Ø-à|¦èüˆÙü/
- @
8¸»Hþ
…Y§*’+,)z꧷rzSâ‰üõß‚
0íÛoÿ'îëÉ~"Ya%N8ÁúÀô�
4à
˜@.��
tà!Áþ•€&h�ÿRàƒ_H}·F. Œð
…BùƒA	VÀJ�…-táaC
u€ÈûÙo
x

ºPØö À3˜¡
[�§JP}\'Jô�K¾„ylŠ̨FnaD€mJžMÐJxÿ0¦ƒ†È|F‰ÒÇ‹ðé~°pztíu°-wÀ°Kd0w‡Ã~\"}´$BÐ�Š�á'}<4CDˆ	çBK<ˆM(ð¡B×r-%b¹äñ¯K‚‡ÖÀ$z.†±P
£d1äÃгð±d+&FÓ§|x�@ˆb3Q‚ЬC0Æ„ßO¹„m­ü¼„¥°L ¦LX
~Ñzº	
ËD}2Ñ
,©rcÄd¤ò,�+1D੧LƦ˜2C¾ÁƒÿLâLÀ/§š0,×Ò/
ó×$¦wPbzqw‘FØ„,Çòün-bŠR/s/QR2kj/]�#Ûr

ըᨡœ¡æaêa¢æa<áÁ<'J<ÉÎs¢ŠTM¢Ð3=©¡¡ès¡¤A�–!àA ¡
§R+ß²uCJ楄püìÒƒ^Š/?’9/ô8ƒÓC�ôD#IC3ü`Ç¥�0„b“-+SI
3E;:³P3}A9‚G*J2ü†ôH“Ôý2$'”K”×ؤ‹„A
J¡D

ꩇ:­¥WÍ>­� âa™ÿÑ×:R5užÕÙš:Ÿí¹*E3 ÉYžõ »›ñù¯Íù�»,ûúœ›ŸËY²ýz±Ý9,µ²ßYœ›¯—‘ÔL_ô8;´×t´HQIÑñ²µ±é´1� ž;,ÓÒ#£“³	•¶É„�ãÏfº¬;
ª	t¸y:Ñ
¨íA;Sz�Á:©áWyÕ:•ÏÒx5Óæ!»Ý:«©{ ¶«ùsV{5Ô�;ù–˜-- ú£p¤¸ú:Ê~5Ôbu¡˜Á¬á
©‘o©ÍâáUŠ°z¦u:¨|¨³ûÐÊšÖú âš Z�¨D…�×

 à•º^\A(èË1_¼R­ëÅ�CZ´ÿÀJ at p@¯aÂ`
kH0€
óuÞ×/_
h
vKJˆZ7êâúx€V_Zû\D&ñ¢VB"ÿ=Ôr¬uB£ñr/çõ"€0èCApDÌ0´
M
huž–¯¼Ã_iƒÞ-?>¤“–ë¬÷‹G¿œÄšN°¼RL© Ã]*ßÁgXRGYˆ[sI¡â;­¤‚ã
R7®âR
áé{Á“Ù˜
Zñ"UFÀÓ§[$À »…Wü÷¦dŽùÔt¼â"Ù–…Ú7³�i%±€…[
ÝÉF9Y
PX¤ÇaÈb
õ"Z+Á!<%TÕ”,H*£È+Vâ‹u¬¢ªXHKbCS`€äpµßMÖq
!½L#ÖšI�ˆ
²�À®š0\á’úÂM©ˆ×Gˆ±œ¹Ie�ªòÊ:/Lc¯
™Š<
˜­Žë¨RÝÔ•l'7‘HÀê#_ñi

Øp8Œ…ðEŸb”DÒ+Ç¡0�\HF³(Š�)Á|x1%éQ¯”9 ØB¦Š[0f^L9J:˜ri¡G^Ê›—
Ñ·ØfñOjý&6¬tç|ÃR6©OˆMCÇ”fâí}öÄl
IŒBš4Y¾ÌD¦ê 	^‰˜ˆ&Ù™Ÿ‡h1
†DÄ#*‘�JöIý€'߈Ì-R1»Èh
H‡+´Â§
õ,Þ‹¹Ç”�ûðAÏâ´�ðMªØ'¦æÉÿ}ÅŒŸñ±reÛYú:>=ñu¿}ª@>·`•zp/Xdyò�ï²á‹ìâö‹”:pr¾Vª/{´W~ÇT}õ[_ÿ|
ØŠ÷cá'wb–fÂòdfy¡‡|göy
8b[#zØ}®G@òÇx{(–xbè}€·GZædH~P–{.¦°'€É"xÈ"�0fzSö€¨d†�"è€eW�¥}݇‚Ræ�0H„Lv‚Eˆ„Øx?„,ƃ<¸�Fè€tw|øß'‚„·„-ø~=3¦aYX|kçvJ˜ekVxœ‡ƒûGS1ƒh†|Ø…”·~Ôç†p§„b˜|zÈ‚†ƒ‘ׄT‘yƒ(…ßç‡ÜG1øwI¨w¨G…N¨…X…Š¸†n¸/$�ë'aqx….(„O舭WˆeŠ'x,òÇÿ/K¶‚(xˆ–˜,%Ø�Åbe^–‰8¦ˆ¦ø€a&ˆ{8{_X€=x„4ƈ�‰Ârv®7†Ä¸Œ'&�%XŒˆ÷`m˜zÀŠLè~ü2f^†Œ¤×‡žˆï—?öŠ�ŽC8cpHbÁX‡/ØŽ¨�“Œÿw€Ž—‹›èŽß¸wòX‚¸(cë…}WbšG�v(�†§vug‹?a¥˜„·Ø5é±’‡‡Åâ‰)¸e渎†.ûøv¹h�#É~@H€œè�„ÈcÉŽCØ~yeg6ƒ«Hyòw7‰“9©“;É“=é“?	”A)”CI”Ei”G‰”I©”KÉ”Mé”O	•Q)•SIÿ•Ui•W‰•Y©•[É•]é•_	–a)–cI–EÉe‰–i©–kÉ–mé–o	—q)—sI—ui—w‰—y9—æÁ—}é—¸ñ—�‰/�é—ƒI˜|i˜‡	‰©˜Œy˜ŽI˜�)˜Š‰˜”i’ù—˜Y˜–¹˜œ	˜œ©™}š•	šž9š—iš©Yš«i™§Ù™¬I™®ù™­©š´	›�Y›±™›¸y›�¹›¾Ù›‘ù›Âœ“Yœ™9œÆi›Ë©›Ç¹™Î)šÉ‰œÐIšÌÉ›Ö	œØIœÌ)1�Eß	Iè”Gã)1ûÓ/ö�å™G%ƒžè$žPÁž+’žïyží1ó©WE5ŸøŸôÉÿŸúéžÿiŸê	Ÿ
¡Š¡
* J¡êŸê¡$
¢š¡:¢z¢*¡,º¢Z¢0ú¢2Ú¢&£š£"Z£:Ú£<Ê¡6º£z¡Bú£D¢HŠ¢3j¤Aê£N
¤Eú¤R¥Iš¢8z¤WJ£Pª¤.Ê¥ZÚ¤TÚ¥Xú¥L:¥Vj¦Uº¤7º¥b
¦gº¦Cú¦jê¥nš¦cÊ¢•�ˆ8�{ê§
¨�*¨ƒJ¨…j¨‡Š¨‰ª¨‹Ê¨�ê¨�
©‘*©“J©•j©�†î'€�ø‹vWŒ�ú‰$ù©˜ªg6ª»Xÿ‰¢š‡òhª«Z’ª:‡¬Zª³šª­«¯j«Rxª»êª&™«’È«·ê«´J…ºÚ« Z«Ä*«ÉʬÅ
¬ÇJªÍº¬Î
«Æ*¬ÈJ­¿Z­Ïz­Ñš­ÊŠ«à:¬Ò®ä:®ßj®Ø:­ëúªPha·øŽ&VŽ:x¬½è‹^ø�ø:…úJ‰è˜¯ÿº¯
�µ'³=‹ªK¸�=Øy©xþ‰Ck´ˆˆ´’ødKK’M[´L‹ÿ�Qû´S;ˆUK´Wë´[Kµ\«µ]¶_+¶Ç‡µI+}^K¶h+´a›¶l»¶cû¶m·Gë¶t;·J[·x{·g›·|»·Š§¶v+·ƒ·…+¸†«·„{¸šj,”Q®ð
¯@½0¹åй�Ù ¹››
åà¹�˹šKŸ»¹åºžkº º�‹º­›ºšKº°ëº³»¥Ë¹¯kº¨+»¹«»©‹»·k»ºËº¼û¹¾k»ÇºÂÛ»½[»Íë¼Ä»»Ã›»Î»¹ä�
Öºßp
Ùð
Ëk¼ª¾à½Ã+½ªû»È;¾Þ;½¨{›Û½½ðºÜËßн“Kå@£Û¹Ç‘ÿ¹ô˺Ò+¼Í¿¿«¼Å˼¨û
�Kl½¸‹¿“¼¾û½áKÀžËÀ¿½ ¹ÖK¹±¾´Ëº[—¹|¿–‹¿'ìºÿk¾È+¾äK¾­»ÂÔ[ÁL¼ÓÛÂèëÂêü¤«Ã<À=LÃåÄÀ[»>¬¼ÀÙ@¹”;¹³@³0΢hð×”ˆW;Šl‰[|°\̧xÆ"‚_lÆ;ÆØXÆh|Æ›Æf»ÆnÜÆ^ÌÆu,ÇËa—‹‰°™ A�epeP�œf€È‰¬È‹ÌÈ�ÜÈypÈ‘ÌÈ‘|ÈŽ\ɉ,É’ŒÉ™lœ<É�LÉŠÌÉ£lÉ lÿʘÜÉ©LÊ�lÊ�,ʪËšüÉ®ìÊŒLÈxPȇ\f@Èe€¿Œˆ,Ë–¬É´ìÈ­œÊ¨LÊÃüÊ´|ÉŠ€ÌËg€ÔÌ׌ÍÙüË…\ȳ|ÌÂŒÌ�ìÉ‹¼Í‹ÜËÝ|È€œË»ìÍËÌÈלËÛ|óÜËßl˾,ÈլϿœÀlÈ̼ÈÆÎâËÊË=Ë¡lÐîÌÊÎÜÌ
ÐàìÐ
Ñ¥<Ñ]ÑÏ|ʺLÈfÀÏx
’ÝÜ»Ã#å¨Nšié¢
$¤“&!0¦pï½f �‡9% hªi�‹.*o +œˆ†¼h¢âŠ#2¢.‚S&šiÄ[."B¨Pm¶ðJщ*À+ÄÀyÌÓ¢6ܬ°be@ªF?þP&»ˆòÂÆ�Ô¢¨)ª€):xäkÆ	*¬˜.¢ê²¸Â�&‹#Ä=¢A)"&”üÂFæž«"&/eóóO@T§+BòÈ-˜¨†ž~ò)§½žš­°@£t2°¬ò³Æ6&/­òú«P£õ®ÿ³Ô:TTWÕ´Õ²XU5ÖWg½Ì,[Q…ªTÍhý
Ö[yõÅÕ_s•ÕT_SE6X`uÅuYg…%VÙ^™5¶Vh'+ëTÄF´6âÀÃŽÛ5÷\tÓu
&+°Èâ¾f@’nšhN¤F™@îÐqAà™ç_æÄ{�šh °‚0†œg¹f¾�a,¼Lxºy¢Q¦™)©±¦F$`òB +ž÷ÆiŠ
¬Ú]ÇŒ[»xwË÷Ùs·
øKc'«ã»ž³å¡Ý½yÝ{‡~Ø链zmÙu³M)FZ²a¤�9Îøb>=W}ö{B»¢÷i*Š7*¨˜‚6/³FRµ*º±(*ª"c !ô ‡2œaʘS3üÐ'.‚eÈÞ %mÌ
]ÿ¨$%éH~¼ÙÂîçCÅÄ=í:Ø„Ž¤$,`�6E©
¶P¦=imÿk/AáÙ°p„Ìå7¬_OöäžÌ)é†[Ð�	�(¿CŠ][SRŸRh8*¶0s0‚É	϶5)¸ÇŠg·fCüÁ�…íraÛ÷F8²OŒ;‚	ÿc�z0¥¼øW¾÷)^PE�²ã©@S)Ítå*°[ÌðÌ’HER¯�œéÞì*I©K"/“]Ùäð:IIã}ÒT¢Ô)‡eÊ΄R•œJ%+QùJBÚÅ”Xá9Á8à

íc}ùK`š�&ôR1s¸'dæ~\J[o¶�$Œá
ø£!üº�…1da`èÂh#@˜±ŒVDf8“™¿	�îHÉÜ’0¹¨µuZ¡�©ÿ9§ÿª¹£srÁ„ßâMz¨“^jAGÿ›'nl"ÄböðP*¬æ2×9Ì=I(™4Lg?SãÂ`fT£±
Bá‡$TcüÈ:zÁG³x%Y„ÜÌô"i*Ìdj,�±ÔK!9¬ÖÉ®¦³ÓiO�çSVuwBíQgTžþT©–‰%ë)•§ðB³8D'¸Áôcô¸G?ºªÕ~ðcý +XÁ:V³Ž­kM+YÕêV¸²õ¬p�k[åúV»Ò¯l½k[ëÊW½úu¯q
l_
[XÄæµ­b
ë_í±�­B¶¬^µÇ=*[Ö¯vU¬ŒåGX÷ÑY²òC´fmi÷±”Ënö³�emÿkW«U±º6¶žõjY%;ÖÊ.E«�-­hY[߮յ“}ll]ËÛãŽÕ²_­­eûñØÏvVºž]mkûØçJ®_í­j»ZÆÖ•¹oåGf¡KVè¢5¬ªeot½;ÛÛ*°ò%,}ÿZßùæ¿û½oë_Áø°öýï`ÕÊXµÊv¬$ÕÇ;ÊábübžÑ
ì"#ªEÒîwvêU†a;æáTS›Ù)cF¼«[m%,\©ìXŒ§xW+–ñgPì,߸Å4ÆñŒucïødžr†‹|âG
9É@>òW‚ÓÃôUÈ+Ë/n
ZÀ‚¨Už"Œ÷J¥ÕòJ™qÿjf4ŸYÍifóšÝÜf8¿YÎq¦óœí\g<ßYÏp†WRá·Œ¥.©ôX~Ñå>ƒ½Ht—ûøè>ú¢'�J¤‡õ=¼@:Ò3§']f`@¨äTyêEªÂ�ÖÌËÌèRß…Ñ°Nô§@“ºQ±:Њ¾4·„1é-§îСfq‰¡òe_ð",}q�¥2iho¹ÒºþcV´òkœòê{½Àt®û8S±úØ‹N$¨Í½gtçYÝéf÷ºÝÝnx»ÛÑd9)¹éÍ‹§ü‚V¾ö©bÐLj.%66d9)D’Â5ý³…
Î)—F\v�Å!>qŒW<ã×xÇ9¾–ÿîUr[²s¸#£ò禦\å+Oùª#Íj˜Çšå3§y,K�Ò¬ð1Ô¥†¹¦óíož[û|ôŒZ(Lt³<šè0ÏùÐ7åt§£JЉ1úS+ŒóÊt�U‹:ÔQzu°?Å`¹Ô�ª
7ÝëiøØ­½ô¯[ÒH‡ùÎ]j”]�zçûÞýÞwÀÿ]ð�'üà
_xÀg†+šf{ÍW^ô³O}.PêÔcíô�ÚåÏ:ô´5Où«gå.¯0­\Nì´[èœ_}Ï)ü׿üÛ¥¢ýË…ŽúÖ'=êÖ†=Š
miݧýѸgúé]ŸôÛ_ø»ßô#kÿúâÏ^öÂOþô‘?|åÿŸø²OÖaŽ'ªÚ�?§Î†q«Tþï¶ÌEò�ñÕúÝyø¿_þñ§ÿü×ðôS½þû·?ÿýßÿûk¿»¸»¼ 
ÀTA<@tA”AÄ1�ûÀì1;
t*dŒôÁ[)�{ÁÌ?òûAlª½ B,Â$<B'4¸ÉX¶Û–F±‘Ã1*ÄBK8šì‘
]¸…axW¸2aC5ô]hC]HÃ7lC8tÃ8|CZ�CZ
ËV
­¬Xa½£ìÙ·Y²5Û�ÕY§[Ÿ�
´åYêdCD
b(P_xÎaaH_(2,ÐaHT€…tÏd£0µUÛ²­
˜uYÙÑبèYZ
�¥[_€6¼
r5Z]x\	}‡v@
 †aPª]ß.É

ÈØc‹X¤“›¤tîB›ê±«n©�ªæúLR{^KWh	5ËE½g±Nö”ÐR¸…k€
Žý×_:åå#êTY‘Í}^àý×ÿ}½å# .¯†
ôu+p]Ò

ÿ\ë¬T;­®�8تU7…M|Èk¢Z¶XI£†¸jXªUï`¦’«|aCš
Wc5<€0Ð�*t«6»W„=A‚Ÿ)>)Üñã‚*z/Â

<¨Bí¿õŽ¼ìÃ$›œJÉ(³œrÀ%ó`rÅ1+m
/Å
3À}°(ÑÕÃb½P~PimŸÛe'ÄI�Í8×Õ9Goeø_¯R$ÞAr7~�åEÉ�ÐÑ’é2
£±p6¬a(k?3Ðv«Úm2°*¤Ðx•H0šÅ¯¨VÈb†±U¤b[!SYÄÊu‹Qx«fÒÊWÅ2Ù¬S‚+_ª„Ö¶6­ø -0Á	LÀ‚à—+È%/{éË_3˜Â&1‹iÌcž`—¼d
-ÿgù‚Ä‹[sÖ$U惔෼%2»éÍo‚3œàdæ	TàLª¬”˒żœuŠjf«ÛÖ+M at K\š Ú'?ûéÏ
“!èA¦	-væëY¯x
T‚ˆ £*©F_ Ò‘J4£)EÁJ[šÑ¸T¥%�iDQ ¨@ïà‡>ôáðã§@êOñ�D´ÒJW´V1°
T ¥`)
`

`cΘÆ<à!
iÀƒÔ€Æ<æ!�y,óšÍlfGK
Òš–ž¥GeçqZÓ–µ¥­<àñ
v9KnæR™
ƒŽ¢š>P
/g™ËØÃ:Þñ1I�ÿ¤BÍòV„SÁÎú–wY�õ”
ìIl7
/Ú®&P‚+cøž¹¼'&p‚´
Þ1pàÏ°ÎÅ.j
\€ÃŽx„z_\wžâ]1±ßû//ë»î}/²�u²N®XÈÜ2Å$_
2yÅõÔ8†= á(€
�= A€ÚÖ¶²§%-ºÑ½îÒ>ÃpF»ßÝnv–ÿÜÌ
dÜØgWˆd®~šÖȇ³0WI›Õ®x1Œä⌰X…dèè§íC²€….h�§XÐb
`ÀŠ`$<wÀx£Ú{ÑC߆|ÀÿÕÅ
Þx:bà¬P…€O`ãmr^ïÿ=å;ïéà?žÀ$x
+X�ž�f!$W»0ÇŸ»YÈÂWÆ¥‚ Q{ž 
)¸rà
4
¬@LUº
 ÀH
´T¾
´€÷É€YnZIÚ¥§áe.½-‰>½€«Ù‚ÿaæ­�Ã.ØÂ.€C-äZ#4ÂBa’A�‚
�îèŒé�êh¤àè
.ÏòÌ0 ÝõÄ°Ø
×EÑ°èßC/”: CÉÙª¼ª¸®0°®ÁîìzÿíÚnëÊ.ë®.í¾Qïâ®î
C7ˆÑ7”×u./°Ü,p×ñÌ{ ƒ0/óÍbøÂ7¨ÝhpÜ@Ã:œBu¨é‚ðfOeÈnóÊní¾nì¢ïùænûöîì¢ÊòÒ‚.d-,/9F :Ì/:ôôò¯þ‚ëö:0, „XØÍ°Ë
Ã%Ë0¸Ãÿ
PWuÉSs2´)W—)=ôCKôDËSU^tEc´<™R"›’[tF‹tH“´Ÿ‚<ÅB%DÀ%8tH¿I“tK·tRÕâC£L'N·ÂLWO?ôLótK£BMËÓP3´O[4RëôE'u)8
ó
±ù—Ûp*œ¯ÄÎàóœyõ9‘æô‘Àñy˜K€Wy?‹��‚p�í¢§¢­
ÏP|8_¯Ï;A(¯/»ÍâzÁc<®,
K û
F¬ŠËÇÌ3:òëûç'ý®
¤HQ
ø?ëñOcQMCäAí/{ϲË
ш±¢ÿÐgD*hjãÒⶅ.‘åq|«]B¨Ö‹ÿ”‚è …2iQZÌâ{ÆÔ….ÐÑ‹iVsš×´&5·‰MmJ“šÓüÆ5ÇIMZŒºøÆ.Ðñ�qºƒ±`-tq‹[è‚´0¦>ãÖÏ}þSü?]¥OXÌÙˆEJAPc“ú”h@úP�þS¢qÃgÜ(šQŠVÔ˜ýèCýYR’ž¥)=iG÷IÑ�ê“¥þ(=ó™O|Ò4n4(G!ŠÒr¸Í'IÚҋʤ;­)NazÔ¢¾Ô¢FEªG	*Ð¥ÚT§øܨRû)Ð6ÿõŸ­iN5ŠÕ®Bu¤/�EPÑ‹YÌ‚³X©«Tš�V0 ßpÇ+
Õ®æt¢Ei`¯ŠUÖt¤ }hb�ZÑÂîÔ¤!õjc¡*ØÁb´£M EõWrô"(Ç_V°Š©#­*f©*Y•Jô¦±•¨aµJÛŒ–°‡-j/²!¶ŽöDÝlXéŠT“—¸DUneM‹Ü¨ºÖ¢õkZwÛ‹bÉ4)auJS|J·ª
ÅêwKX¿Z½EåçuÙê]¨º©Íè{ù™XŒv·¦7e)l—zS®Êt0S{0<tt�îS±{ZÚ>4Ú]ÂÖ[‡*VQŒÍ’#ÿçT'-²Ñ‹Ï~¶Ã±ˆ?Lâ–·¼ÍÆŠYÜbgÆ0Nq†U¬OsØÆ8¦q‡Q|b˜äà°‹y[âçøÆ7N1J;Üä%þ!vò“?+Wrx/ÅØE° %žº8«A`.˜ßÔËy�¹ÁŒTsˆæ#f^¾Íª™›ç47ŠÎ
Æ3/Ýtç8ÛYΈ+3 	½giå9Á¡23›¿|'Dsër¸BWŽ¦–BõÌÅ€E1¼"€mÈãb¡–X—¦òRƒä#SÙHV-êP»ÚÕ§~5«§êTÛZÕ#£õ­u½ëZ÷úÖ¼þõ­»DìY»Õ¿Vö²s-ëdSe ‘ÿ‡ñÐÑ2
Ú—^3œü`íÍžÎ͈3‘rÏÂá\d D`¯½;uà&wêä3ouã.^ânÎcÎÍïx¿¬ß•w¿tïÅèûß	woØ�ntá÷·¼!î`‹|âû^¸Â…YïÚ�ûÜd(oâÞ%—PvRÞòv›{ä'›Ã9în‘—\â0ß8Î÷M/“cEN1O{sûˆ�r*Ê�A¦	#]wD(#QÀ<æ
�£tiõ�†4@�„]�[oÊJL’‹Í#Õh'5ÂTÝ%{H£ØYª)wº{ÌÔl×XÆ(f�y@îШGJ¨aT=$ÐàÿéAj‹¹ÕJ�Ç2:Bù�ù}ò�÷H?*�€Í#j§ܹ
{8C
Ø2<¶Œ�ñzÔó0
ab Á{„KB�ðaÂG¾æ¡
±ÎM÷*MÌD®ûq˜Ê/T¼£ÐÍ3®1ù"ÄÌÖÏTüŠOw*¤Ò@Cˆáð%&Ï#:%dÄ& A
f„|"	`ª$øÁU)z
)øe$†Ñ‹ð_°Hªäf„*€òxÄ»Î÷Á&Ž	`�1%úÿ¡HŒÐI¤±êLÐù�\b)ŠÐ$¶Á¡

†Þç?nñÔ§©å§‰fÛûÒ!“[!Ë+;g‡Ý¿@<�¨Fƒ{< Ÿ†áZaؽ
à×pSøZäfš¢—ëÑaûÀcù0ºèë	ßãÂËÓ�zÀÿVÚ=Œizw¨g/[™Òþ!÷t�»¹Ã­å½¼¦æ=¬"æóIÅ¿wœú{àž`�b¡¼øº-7¤¤{w§IfÛ
M|¿‡’W
ùQ[½ÛwS(Ìt2ý¶/	˜‹,ïóŠcòÌI
³¦B¬y€C2:vR›
ãK+	,ÄË;_‚
“‘O-5—IÄ „Œ#½·Ù@À2ŒuØ+ltg£‹,ÿ�4eÆ(ñ2 at P´¼*-ü­Ã–/“°•‹ÅÜZ´�`_¡#l:bZ7 at xÊêr_I?ñ’JU'«À7´g¢gé`%ߤ£KY“s“lž;ÀÔ´,ta\©�Ôd\׊¦žXvV%ÈÐÒr€H¾¬¢é-ŠÜg¯(¼VXû	ËŸ.ÀfjÃh:Š0íÈrg¤!WJå0“O½ñ¨^Ij½’%/}õÌ«X3	+z’˜_:йÔY;<®”ð-£�4 A(Óã0ºü¶OÿçÁâ§�|~T<½ÃŸ¼ŸôŠ´ƒC“!0ë¤òÎ*(-Ä 1|¾"˜:„]‚3ä/A"WŒ*Ý‚Ð/«4”Ž¨•è1o¢¯ÚF«fÈà-Õ+KX"ŒbF©XKØ"¼ÄESð[üˆq‹_HOTjF+\&"­¢m·ˆ�©„AŒTPЀmÈÑàâ"ð~TPFA°Õ¼g
ó�nâ—V¼bÕ›ß`¤‘0²/‚AùÏ€F“„q’z
ïR3"ÞZCŒS<ïw»AI1€ÑÝ	ç-÷[Å;Rq¿-¨%¯p‡�²’
âð"„h…>F3€Þïÿ~81Ÿ¸0È@Mã€N‚`$�G!a�
Ï`‹¹Å�â‹ï|é¡vƒO	ñç'ô±óR¿˜TPrÙÈ<9šRü.rIˆ†ø;ÐC¸ #Ò2,8¬Ô�Þá‹T0Ñ€
Æ*‚¢¸‚«À0Rš½¢É¤@†éë¢:ãBMÅ’…‰ó�ÐÁ’a0=ê
V­œæïÉJfÞ
€Dp
rrOď

Æ„YøpEH‚`˜q؃^p1h<UÉohi�e¨„5øp9¨ÿW†	v<oi†UynhÆ`X�lÙ�	'—Cpw•Ø`Mx„¦n<Hoõv—
F•eI�¸†gx•ƃ^Ù…éV—ˆ9–ìÆ¡sØ×(·
BN�Ár—.ZÆ=7
´ àX¬‚rØóóç#wá�

 g#å

€M¿€cÃ�hr
Z’!E¡›¯Ðq47
MBAR
¯Ð
�¥W¬`*&2
}ÁŸÐ
îà×3rpžÄÑ~6(€åq�Ø
}„/
 eC›ïq›ãK(w2ÞrÕ“RÅP;lôЗûg¢²¸@{]“>1¥¨RA¤4gtK¹KØQ‡Á˜\(ƒ[ˆ˜pÒ•s™<TI¨§…èæ§i˜<žé˜ëV<˜)„�ù�zY¨b˜˜8™’
˜_؃û£†”*—�Š>ƒ	†EØ—KÈ™…Ê—mI¨®š©T8‚�
'}iE
'˜ö‚ºŠ©¨
ªúfª¶º©ÿš:™5¨–µÊª°j¬¾j˜ÌÚ¬Vy«”ª©ÊÊc4$H–fc„™‰•Þº…Ö„M÷#_ß:«W<7X®ç*„Û”<Œ:—ÃÀÑe…mñÃ'Õê©Ýº™ëæ>¨FQñ¤®\ø¬Åª¯WpUÉ«ÒZ™„ê—¿Ú¨‘Êý„<ÕZ«cØ™¯j±[‰Óš±
$‡znïú°Îj—ûpÂj°Àª?4¨±ÅZ²–9°SI<F©‚qÂ:°‰Ê<woªZ²²Ú±2û²6;´èv–ë¨+•²ôX¦²
¡EÔ­Wx©ê…ü¦°é† ®e*U+³¼j®Ž™°?´¯
‚	û²jˆµV«˜ÿ{—ðF!u)×ZAgý³·°;<†!U
º_˹ƒÚ»'KqÓ´j…m³”»»ùFª¨|»…ah„h¹½šÉ»¢¾�F¹Ó[¶*K°Ý»½µ¼woK¨»Ì
©aX—€Š»ÑËMüƒWë€=˜¾b	«±‹º‰K¿ÙëÀBØ«Fk•Œ+°ÿÕ;¼È¼ókq{¹´ÅË•²z‚S�ÒÂ̾\p'™›o§š»—y•8[Âí‚ý4©¡«¾À{´ÌÃf+Á¾šµ ¼¾G—¢Ê¼7Ä@,™øë½�ù«‡Ùn#»•J+¤{Áï«Â”¹…JøÅì¸Ô«½™©ÃWÜÁ’:<˜Y<Ã;¼	½C¼º
†¸±ªÆÈc¸®koWl¹6ìÃ{†p¹ÃYIp#Ëo‹‰ÀÅ[³ü»Àj³çc±-,Èë+¨“iÆ‹œÈ“lǘ¼?i¼Ä|>'ȘŠÊÄë¹(,ÃÁ
·ÃãÆI¼<¬ìÁ«Äøö–£Û©Æ
ÇXi¸ŸJµ«�YüÄ{ë‚ÿ[¼Ãxì°à¨¿,¶åëp¥{½¼¯ºüG(LÈ»²†ë˜UìÇìv•éªƒ©aËoçª�§¬¬9ü¶Žš¯Ô\½ÃJ±îzq]\…àŒËÔ›ÃÛ<ÇÉ+¾[†AhÏo\¹ðªŒ9q‘«…ÑüÃ~º»×l¬2øÁ!˜Íû¼Ç$«Ã�<ÇbŒÈ@è¼ÂÌØ;ËTHÄ
VÑ
ì¸7™*¼³"ø¿aüÌA{ÐÁìÄ”\oÝÜ·#�© +$!kÁ]Ï3Îb)iE¬Í?,Éœ¬îºÐ•¹ÌÆÈ3¹€<ÔËCϲjÉÛK˜`Ôü€a¹Ë1ª¬Œ¶\
­ßÜÕÞz»zÊzÐ^L²ÿ,ÔVlÀȪf­±4¨…ˆËUR�·ôKš»‚w\Ô6�©̺4K…X-²|¼úo'ÐØŽýØ�Ù’=Ù”]Ù–}Ù˜�Ùš½ÙœÝÙžýÙ Ú¢=Ú¤]Ú¦}Ú¨�Úª½Ú¬ÝÚ®ýÚ°Û²=Û´]Û¶}Û¸�Ûº½Û¼ÝÛ¾ýÛÀÜÂ=ÜÄ]ÜÆ}ÜÈ�ÜʽÜÌÝÜÎ]Ù,pÑýÜÔ]ÝÖ}ÝØ�ÝÚ½ÝÜÝÝÞýÝàÞ˜Ý)€å­(°æ­)ÀÞîÝÞðýÞòßô=ßö]ßø}ßú�ßü½ßþÝß
žà¾àÞàþàá>áÿ^á~ážá¾áÞá þá"â$>â&^â(~â*žâ,¾ßæ�TÃÝ Ý 3^ãÝð
¹@9Nã6þ
6îã9¾ã=Žã@~ã?NäaäAnäJ.äGåOÎäH>ä<¾ä?ÞäI~åP®åV^äY^å:ÎåT.ådæfæ9îåc®æQîäg¾æb>åhçnÎæt.çiŽåznç|þæ[~çsç€þåŽç„Žè‚¾ç]>è‹îç�Îèeé“è‡îè—.éuné‘Né›nè�Îé•ê£Þæ™îé}.êŸnê¡Nê«žç…Îê¥ëŠ~ꪞꮎë²þꉎ魾ëÿºNë¾>ë½®éÁ^ì¨ëÂnìÊŽì·Þì�þìµþëËžìÓNìÑžëÐnë®äóÒ€«Áâ.îS0äNîå>îé^nç~î›Úîë¾îߎîî>ïïnîñ^ïõÎîøîîò¾ïÿžïéðú.ððîï�ðoðý^î
¯ðïð	/ññ
OïOñ�ñïênñ¯ñïñà.ò!Ïñ#O„¯ò)Ïï'OòöÎò//ó%�ò3ïò5óŸñ6Ÿó4ó8ôoò>ô;¿òFÏð7?ô=/ôßôGßòL¯óJ_ôSÿóQ¿ôOOõ oõ[�õUïô<ÏõD/ö8x]›Æ
ÿÀ€ö›öj]¬Ðn/÷q÷r�öu?÷vÏö{¯÷~Ïöyøw�÷t_ø|ï÷‚ø‰ÿ÷„ß÷yø†ÏøŽù�?ùŠù�ßøˆ?ø–/ù›ß÷•ÿù|¿ø™ßù¥/ú§Oúœ�ú«¯ú—ßù¡¿ø±Oùš/ûµOû¦ßú˜¯û°û ïûžïú£¿û¯/ú³ÿû¹_ü¶ŸüÃßûÌüÁOüÍoüÀŸúÒýÖïü¬¯ü¸¿ýÓ¿üÞ�ý¼OýÏ_ýãþÂ/þÜ�üáoþëýÚŸþîÿýÝ/ÿå]îú¿ÿüßÿáÞ0
õiÉ©*£RÕ™•hU–Z�zU
Ö)A_eÍ3›ÖZµlÕ¾…Wî\ºuíÞÅ›Wï^¾}ýþXð`Â…
FœXñbÆ�?†YòdÊ•-_ÆìX˜]·u…užûù®h»¤=ƒ–kš®êШã²Ní.ìײßÒžm[-îÛºÓòÞíÛ,ðßÂËnÜòãÊ™/w}´ôÒÔOOÇ^=ûuíݹ_m=üöñÞ˃oM>½ùõèc«Ï>¾ûÚðëË¿ßôæ´ÿnA³eK4þf[k@¹t3
AÿÚSð,œ¯Á²$\Âü(ÄÐÂÜŒPÃÞ8¼ÐÃà@ÜpB‹#ñC;d1ÄK¬ðEct±F3”qÄmœGu¤ñÆ“KH…ÌÅ‘üQÉ {²¹"�<Ê$‰\ÒÊ&±|ÒÈÑ2�1þÂ|«33�,/åº<PM7ïZ3Î79›³.9ᬓ®;éijO>ÿ´3ϹöÔÏB
ÕSÐ6
M”ÑA�‹ÐF}ÔÑE)½ôPM'Ý´RL#….I=í4SNO%USS
�Ä1�ƒµH׌?b†K­ÀX	æÕ×t].×^w½
X2q6ÿØ_“=Vf…õ•×h‹}vÙiw3Zb±­VÚmËÖÚo‘½Ün©-—Üq�M—Ýuƒ=—Ûvá�w³xÍ­7\o•Ý·Yzßµ7ß{Õå]€õ5¸`yØ]…ñeX`‰#¦øa‚ý
¸bŒ^Øb‡7nø_�Eyâ‘3>™cˆSå’+žÑ¯ÿš™ÆýJÃËßbG˹gžÆhÏ|ºè¡…^�è£�NéV�Îê_¥&�ê�™~먵žšëª½¾zi±›[«Í.ܳÕN×µÝnûÝ°É;뺷¾»ëHuþð¹)ÓúeG¾ÛB›X×Oó-Ä	W\T¸ïïqÇO\ÿ-ȧ¼<˲2g“óÃ'·tÀE7ËsÉ+õÒIßœu_L§œñÐUo�ö×]‡}vÙSß}uÛsç=òØ…×�øà1Ç=ùß•ï½öæo_>úç�÷}zæ�¯{絇Þz鹧~{ä¿ß{óÁ¿¾|ôÉ×¼ûõÏÇ|pèè
œ­aVül3ýÞ¿ÿá~ÉŸ/î׺[Áj@Ä•ÿ¸+&‹_
Pƒ¥?J°Là1h@
J�ƒôà;7
íéN¿™Ñ�z”Ä�eEÝAXðâvà Ëëxaœ%ÉDdbMUÑT!¬þçaYýªW»J¸±F®¬©ŒWÓªU.]u­a%ë[ÏêV«ªµ®l½$^7©W°ÎÕ®[å«X¿f92¡åˆ$�Cb
†@Dd%;YÊVÖ²—Ålf5»YÎvÖ³ŸmhE;ZÆB¶±§E-#¡ZÆ’Öµ¯ÝìjYÙ¬á’5íiqÛØÒB¶¿�l"Vkˆ6è6‘E­o�+ÿÙ54׶“]ƒÖ€ˆãzÖÕm¬Ü Ûåv×»ßoxGëÛd÷±·E„mñˆÜ௠è/
a€¢ð’“
'GyÇU¾ò�£!CÌ?~ò$@�	7g‚˜`ó(0!ÿ
P°CÊYÎr”ŸœáE?ùž@ò¡G
?ÿùÓ_>u0x�éÿ¸@.ò¦wÝë_{ØÅþð',<äQ°ƒ%ð!ö Ç9ÊѨrnpvß‘nØ@½s¸ï¯ÎÞï÷Jñ½ðƒüß
¿¨Åƒ*ñ‡W<â?¹É'®òŒ»¼ð2ϡͯ¨óL”|èemÄ¡4å….²�7Ä
Q¸ÂªÀ-ÔÞö·Ç}îu¿ûÜW�÷µ÷ýïuüáßøZ ~ñ“üà7_øÆ_>ò™|áû>úΗ~ö«¯}ÜWÁû´§=ºÀðk�üÏ/~ö£ŸþÞOŸûÊßýì­@~.Ì>úäÿŸ?þ«0ÿÙ›ÿö´G¿øÀõ3?+è¿Ú«?ùÀîÛ>õ£>Û³ÿ[@-Ø- ‚	@¤½þû>ÿc¿ľl?|¿ö»>÷#@<ALÁÛ³¾ľ´½d@¾$¿æÛ‚$¨zØ~˜;� 0pã·ã€¶ºàœ¸HÂÓ±‹%úÁ',(¼)<ž¹°Âì¡Â&ŒÂ.¬B/äÂ/C¥‰‘vA=t Öƒƒ3`ÙÃÀ„Ã8”Ã9¤Ã:´Ã;ÄÃçó¾=¤û«¿<Ä@TAà›‚BÜCâëäÛ@ûsÁÄ´>ßÀ)Ø?F|C@´¾óó>Û«¿KܾC4ÀGÿÅQ$ÅR4Å9œ@,pj¨‡}ȇ¹ëb™ª§I;Þ¨*\$ÛÈE^ÜÅ6ù$³*%»ÒÅ`D«P:ÆbÆ^ÆeüEP1FºRFd”F_ŒFb´Fg<$ã0¹ (`�¥hƒ98(�=N¾NdD?dGE\GutGwTÇydGz´ÇzÄÇ{ÔÇ|äÇ}ôÇ~ÈÈ€$ÈNô¿)°‚„LHJœAâ»Çx,ÈwŒÈ�HN¬"˜‚-à‚DD¾)ƒ1p'¸ƒ„¬?�¬*཈”G€\I}D¾*Ø‚1È‚,Ø‚ù+Ä.è$H�4¿‰H-°‚-È$È‚1HÁvL at xœA+ ÿ‚-¿AÜÀ}ìIŠÌDŸ¤Ê«´Ê¬ÄÊ­ÔʉDÀ*ÀIä‚+`k¨‡{Èr˜¨ýá(Ô˜—¹©"S*”‘KGÚ˜º¤¤»Ì¼Ô$½<¾%¿¤Ë½$Ì¿,ÌÁ4ÌÄDÌÅ”Ÿ
Y“o¬(Ö›ƒ<ø1 at IF<ÅÌÔÌÍäÌÜóÄÜÂ/@ƒA „f0Íf „@ð2 ”ìÌüLHƒB(„f¨Bƒsœ‚ÙœÓ,£4ɨÄØ„Ä)¸ƒf°jèÍ$°‚)è‚Ò¬†f¸Ï´Hâô@´‚0(kh†Þ¼äItü½*È‚; „Ú¬MšìÄù{ÍötÏ÷ÄÄÄAU´{èÿ‡|pŠŠ`˜Å)áÐ�Â%\œÒKRíÅ-PSaÐ,yÐ'‰PИPµ¨Ð´¸P³ÈвØÐfs<
uÐýPQÒéÐ%ÈI—~Ë⊃<ˆ‚
„Ï¥Ñý½ì>þã*¸ƒ@ˆx †h8M夆j¨/øÃ�ÔH,0@ß-è‚šœEÜÑ>´‚.HH,Ø‚.ƒžô½BdÊÖä‚)àí¿TH„ô>J\Äž¼I*ˆ@ð³(¨j€‡yˆ†/˜ÒÙ#�»¹;8‚Ä¿ Ü‚BÌÁÙ£=+¸œì”ä‚-Kù$Ó„œ=+-Sx$¾MD¾,Ý‚+@ƒf ÿ†P��¤‚1 „i e0‚žÔ„4À„¼,8IÔ¾Ü?…lÒ*¸‚î,Òfp‚úËHúSÄùKH,Ý?HmÍïËÎf€ ­(¸R-Àƒ´ÑjµÖk-@(°z¸Ou˜¨þ˜*§Z“;*œ›q2´ºQ×teW¼YWwm×!”׋Wz…×{�W³×|}sËÕk½×“ÑÄÖ‚5ØGüCÜT]%„:åN= ‚>ä‚#(ÏA0I*8MÚì-m!¥Í1ÈA+èÑÒl†BðÚôÍ
¬‚)¸‚-e(„@„Ú,ÙA
…_"èÔ1„؃=ŽÎ(p4øÑüÅáñã#H0¸‚¶váh cª�SfåÛh€‚"`Ò6ÍæÂ>Ø£$?,ØÝNŽ¥þ,‹p½¯ÀļS6å_~×ÌÀìÌÖìÍæì¿h$i[=jQñŃò5ìÓ¦ÝóÃdéƒÉ$hkîX;=àh°Xò¬†y i}Ææ_+ð|R$¨¿]µ†f�†éÜU#~êÚ³–`( ü�izHÕÞ´nÓT†ÖÜN`vç*ÈÉØîÍH5¿+xèÞ„'èÎf]î“,b!½1ˆÿ‚uR/¸/h �%ÀIž­ ýk®µÙ	l>(°a!…ÚKnˆö‚ê|É) ÒìÍèüãö1øí"®†/èÃ=4¿±äíf`Î+Øcåt&ƒÎíÎèœx êñ°ü‚	¾a¬OÔÆñj�>¥=ú´´ÌO^ÈeÇþ»É‰Ð'ä‹01<rU›¸ôWR2'ß)�r(or+w*¿rÀ¤ìréò	+C0×ò,Çòý,ses3çrüó3ÿò=ä…s¬m×3ÇkÎñ<ÏLÕî¾Ù]\ÐuÜ�<T}î–µaCâi è¨…V,øoö&&­áↇiø‚-ehÿV8MëÿŽZ%À‚çdô ]ܺ�¿iÓ-@=øƒ®}äx€†yP†.…‚i°†ZŸ†0`H-
,•èä`pWX+È‚†}ÛšV;PÝõ§Æpe˜iƒ'¿.� DÕ~þÕwô+(à·•d(È‚0`Ö™n&À‚)øf
k08ÇCMX=ÇxÍÄL‹ô¿M®Ï~p‡ü„Çn‹½{�r
IÂh~¶zÕ×——0~Õ0™·Eš—›˜ßל‡ù™×yœßùšï™ï�•]:(ÿmJÆóŒWú;¼ø7ïB6ÙzƒÃMÎj˜?XÔ-P†y.R>ð?ø÷ž¿'VâÛôXwبMÄÞcBð4àƒ·a¯É;°ÓP5û,°j2B@‚1¨Y4p(Ð÷¥àqv㢅h eÍèþwôÆ‚“m{mW¦}[?Ø‚NeÖ|Æó¶ÓÞt‚û-Ù?ðƒ/p> é®ÆÝ܇V†…ké¾UNuß?ƒ$ƒcGUk؃3øƒØfàÜvQm†@
.ZªÕbô(Ò¤J—2mêô)Ô¨R§R­jõ*T¢VŽjV-Z4jÔ¦Q;-P˜-T´lAÓìØf„à6kÅŠ–"ƒ¼FûZvž3kÖšeáÂÅÊ ²Ôª1ž6ïY\(V¸¨Ù´°b¥�¥ÖÌ˘®d§‘žfm¡$S¸Lñƒylµºw�€Á\mZ!(X�Ü)Ô·ìhÔº'w©7É•+¤ãÿ“E4XÍÒ¢B²åèu£¬‘\.»8Z3Ïq³'=LÄO¡j‹3GË<oð‘ÉTÈR,MÚ¼öÍœP¹ÂwaV„GV3I`A„[œQsZ5
Ö•EU\áZ4ðèWÈGUVzø!ˆ!Š8"R*E^[0a�=÷äSN/5Ä04ZLJáHSJ;6ô£I
íXÐ�mÄ#’3ùR¤/
ɤ“AIÑ“E9ДUi$•RZÙ%–_jé%—c†YfB[tå’b¦Iæš`¶‰&‘pÊhæœqâ™å›gêÙgž5Ý”ä/Â0Y�0½C"nQÆblÁ¡aD‘x)¦™jº©UE
ÿu…`€1†¤v![&jaÅ­v±Er±ŽñªV±EPD¡DPüž4ÖrÅjZŒaÇQ8±ìÊHCV!I¨J¥^!Ƶتei«°‚AƬXXa©\l‘ÅPdqD¶N�vŒŠÅ[pá«Wt1«¹åVQk`d‘ÄZ°PŒQÅÔŽ1¨ØJz]PªeTl!ƾdQhclñê½%Ňa�ÅÆ	“QQ\tñêÈY´j|ĨV`qÄÏ`´{X­7¯†Iü-ךsÁ]¤\3§Yk½5×Yyj”½&Jø„5ôô“�;¼4ÿùË.¸ÍÜ6Ò„cCÃdt(M…&SGxCd·Ÿ9*Éã $í-8á‡~’â�ｸEŽ'	yH’#I9N–'ΣÞ)jgŸn'šM"lÌ
©TXÜ5ë­»þºv†]|‡ªFX.ÍÙÕ®ÅÍ…LS—fb-FÜb†™~a�H÷j‡ÔÍ_+%TƲ+U»õ±WÚ|yþ’;¥þÞ¡a7E»‰Ù¯>=î[ˆËû×4Ó>Tìc<¾ô–VZ²ó¸[Ÿ>õ–r?ŒáN{÷šÌa»2°�OÙP¹Ê5±

Õ0[>Ô¡¶µ¹Í4ú`‘€
¤Ã
NG&Ì\ "ÂÁUoq!âþÿÄ77Í�N%¼ÓKr¤â°†2¼a“*'‘.Žˆ1â…¨C%ÒˆH\"
¡˜C7
î 0Ì1:Ò‹^ ‚
pÀC® OíŽ~F±ÝüΘF3²�j|c×èÆ8ÂqŽv”#ë˜G:òñŽzü#ˈF±™1}lJ
„ „h~GAøÁŒÐQˆ®¯„ÂvFAÖ,€»³YöÐ÷<›Eo‘6›ÂüðÕ¼›�±(÷+åÉD©H>°vDiÞ׺@¿ë“-à×"ý'=ñ
0‚¶
Ö°æÌDÎîdÐõè<AîÑ�}ì&8
éÍq†ó›â,'9Ï©Nÿ6já|åÒ˜§4æ„ž
F5Ñ›�b4&­POBRÉç"gEÆmŽsªÈ?—Â#Ê…Yh!ªÐ�F”¢]œ$ú%�r‰£µèFAÚQ‘~£2òèIIšR“ñŠ'Œ¢Šñ‚‹l¨¡à„+°,Éñ¨¼ Ô¡µ¨F=*R“ªÔ¥2µ©N}*T£*Õ©2õ
Yð)’€„­&a``HXs5°±	W-‚Y³€„k­õ
NÃÀ
T­
w²`
 æ
*à/°³Á"
‚`Πü­BÞà
Š @Tà_CÄ"
&`
B`“À�ªMþb
ú`þ¹ß-#CÅ5ª`)6*zÐúÁ&
ö_Ü|£	r &V"A°ú%JMåŸj#®¢/ÐÂÂ#4¾ŸþÁ"à ó
 
FŠä
]$‘4„KŽF–dJj$¢DL""EÚ�I¦dJö¤ðU¤NVdæ¤J%N
åQ¥QÚ$OÞ$Hr$S*¥MndSbdQR%V&eåTvåQ^XEÌ[�@YŠ¥žÐ›ˆ¥å�Ȥ¶-Hf[¶!TÑåLØeŽà¥^òÍ^Þ%_þ¥_f^æ`
f_&b¦bÖ%a®dDPäæÝWÚä�ØÍSæHB&KÎäJIU"JGÞ¥c:¦H"Î^†æhŠ$Jvfi²æc–fŽ„lrä.€fmF¥ÞôbK„¤å%fcþ¦a§o'q§qҥ茤A†¢]neí!'èæÿ‚„Ý,Dmš¡@\çM	^þ¡u'c‚''ÒWWÄ.I/Ê%y
g‰g¡˜§G §zªaq¾§µgqžáá=â™A5^¢
áˆ�öÍ@ˆ`)hƒÎT‚ „Vh„^(…bè„n¨…f¨‡r¨†æÍ;*؃v(ˆ~¨‰¦¨†ª(Š®¨‹6¨‚mDÈfÞ³…šœ¨‚Êh’!�&èŸà„Î�)0é�0(‰
©�*è‘Zè‘bÉ�ÎÈŒº	D ©ƒ†–Šà“f(–ÂhŒâ„F)“ΉÎÔŽ&_üáÈR£�.h™.	—~hˆÑ¨�Ú(žÞ©žæ)Ÿÿî©Ÿö) þ© j BÉ�6(šÎÉŽ,ê™0ª¢6*¤>ªœ:(”©‡âè†Ê}^œÐW¾à1V£
„’vj5‘˜�!—üèáxªª"‰›êŸ¨Þã©âi'¾*ªN›¬îªlÒ*Žjª'âª
ÕèÞÀá°v[­âá¯þ¡µE¦¶¹Ð}
C¯nÄÞÐçÁT~^ëeë\ŠÐ¡ˆ'·Ž§µ²ç¸Š«}.çã\›!êWá)Isª”tæçjN?aDX²&H¤a¼ÝÍ $§k*+Àn+º,Áv¢¿Bæ�J[Áæ—À.lºb«ÃF¬'æë¼Jì&R¬Z,Á^‘Z¢!F�%I�l»zìIT‚ÿ.ë~EªÂjlA:ªK	(Ë$ÌVÉ�ÖlCX(Âìµ¹Ϫ
ÞT+œ$¬´©	ЪëÉÎM»êì&˜Ëö’Ðl›Ø¬ÔF-ÕN­ÕV-Ö^­Öf-×n­Í>­ÑJ”ØZÔØŽ,�4ž€­º~­Ñ­Ð¾mÐî,ÎÆ-ÛŽmÝ2ÞÜR”ÒÆ-™@-Þr­~Mmàþ­Ûê­—¨-à¦�à*.Ö®f†‰Ð?•Ðä­	¹!J°ë0° 0l®.lîÁvfrB¥è�îFšäé‚&P–îé¦îè¶îêº.ëšd/ƒ:p®.è‚èè.ï¬êήêšnì¯ð/ì/êúnw.ïÄ"er*Š¢ÿ,ŠÛ¨ƒ.À‚:4bïu�½>nò†®÷²®H~¯øzokÚ!Vú+éþîø¾n·�ïøÖ.ï."-èîÖ¯Ûônïá- Ã0¤CðÊ.ñ%T0¾–o
°
'0/°·&ýÞ¯Û ƒ0¤ƒïÝÂ\®ë9çú²¯û‚ïņ¯ýÒïçæîçJ°rò¦àðç
CìANhnð{&ʃ:ìoïÁ‚0 p÷«++Æâ'_Bpý–0¦ƒK°iÆP&ó2¦=±EúÂ+ôž/Ã:üÂ�²ª&Âp‘`¬„±ðD°kLƒî¦Â
À
!<÷Ÿ9ŸtJ¯ó?Ç*Dc4FŸtOCô-u“(µ=ôF§tHÏ3F£ô@{tIÿôQ5fµT‡*=ƒó0ä0:€#&$¢€7û¢?û´S_´T¯ô/–´JCõ\×5]ßµ]ç5^ïµ^÷5Ü,àÿµ`ñ‰Ž
,øÂBiŸvV»t=¯õk»6p7M+£¢ÜZûB²�vbÿ·©l»´t÷jO7[¯5/À)6	›Ú	ÏÞ
‚ŽØÜD5ˬ
C
“Ê�¨�.ÜB
@+å¯W]oÁZ×ë1§©K%°¥.X&QêT™s&ȉ
_Æ»™§Àÿ…�•º"(u,’°RSê+Õh_ߤÂ
Æ‹ØÇbžv­øÖ:a´‰eåK!LÜ>‘Õ˜|¹òž¼†ãŒ¬×¡Êµq5#_ŽœñŠ¿NL»ŠØ¬u´¢–jÔº†R×;\å«,/¯Ã¤~f[\så¸v1
ð¦[¼“ˆ%�VQê „<j�t)fòºra„�Å´¨Šy° À¾Úå�[[§X
Ưrh*bRDh¡WV
˜«X¹Í$+æXÀúe˜Û|Ydz‘v:	]öH‡fW€y�À[R¡¦¬zн¬ðÃÐHZÒ
‹&aº%ª ƒù娈ZåÁ.ÿ	Zí¢“nii£ErK(oSÓ�ƒ˜Ö”ÒÊ ÀŠ‰JHX*"‹(“NÊÈŇú”L§‰ÐåÉîºÃÐ;±ˆ*ÕÔS‰z’¨Q%5«Va�5UVKýEU¢bUÕ[Oå—pÅ•Tˆ-6•Œ%Ùb—]öØd¡�VÚi§u–Ùh­¥6ZWZ l¡ÍöÙd›½VYs©—Ø
8 
Ð
 _;XÚ
‰±1
�…œVÓÞ5

!
©"ªž´ #2q‰7âÕb±ˆX$BW¼ò† W$dA	™gZÐŽV´Ý¹Qi=K« 6´Ÿ]m©XKZÙ*¤³Ý!�h�©à*©5l�fÜÒ†6¶
2lƒR[«Téïú†0hAÑ}#¢sG6Ê�ÖÄ¢¯@GÑZµ¾†¯†[õ
—½¬mUh	$Œ
$ö"œmï}×[‡8†8‹Q
póÛ^è"TÝÙ*:øx
Y|CÃÿ‰ã�t£ ß)-l�üÙdµì%m0`ÑZ„.v)½E/BGZ¸Ct½€E,‰A¯Ó†¢³ÐG…0‹^H¸�ˆnÚ\�Ž�¸VµµJñ›GK …‘8�K„<Û"¿¹(P\È‚Š¢Ñ©MŽ³€è¬ìŽ,ïQ™Ùˆ…Pi!tX¹¼é%mžS\ØäJ±(ó5ÈI;•;S%m¢C
^á
:畯§LB–“ˆ¿¡…c„¡c9m±8p/ÜÿÑŠrˆ.ßèÚÐQ–“è¢^¯È°Õ,�ŽY€
°6ÝŒ>ÔåÌ<6
K¤Ý9KEw	é&

p.¡”�n’

n@'Þ�šI_8JC6I É`„"1ŒvçúVcF�V�~x ”¾e@Oz¬ªi urÀ]€n¡� ¥Þ�£`ùZI~
#w Åú’Åvqúîþ$‰Xƒh€È„0Æ�¶1Y at J‡M
bÔåÁègdꋬ¥ÿ“Ňþ&Ò	Àª&
@j¬F
+Àª„’=¦ÏX”®‹Ì’XÀ‡ˆnLÒ‚MmJeÓmB‡n®æy
"-"EqS5só</…(h6‡T6
…˲lPþâ#È£,¼BCŠ
Ôã1j¤FâËÿ4€
&î"Un�îL5Ã;ä,>�BDóó=E´4]âR„ô1@…It�ÎÖ"?‹"5WUâ“A~!J%Ë€äA‚c£6”²Ä®Rˆá¼N$CD¢QÛlTÐôI|4Dï#Úó"|!<-#8ë*ŽËÔLEå+R£M%d `„nnáFÔƒlLØâÃ`äL$5ÈEˆÞAC\aÌë¼|çAÒaIÅS„A†Á1#ÈÃæÐ4"ÒÂ,:Åc!æÃAääCvÁ7²ôjã¼näFNb´Í>€áBTƒnÐM+d£5U!V61D*ZËÓn¢6a+Te7Öãÿ‚a´mÚaIÀt”Â:×A5BlW£Q^á¼ÎÈ,"(¾ƒ7½!|®2+ë1³±`eÛ±UUX¥FšUë¼êéògf‡¥fk–fo6givgsVg	Égq–gƒVX€¶h…–�z`da«œllÇ
‡6¬ŽÖhmvjm¶j6k‰vk·6¬ˆvzhêj½–gvjÉ6jËVluv|fV|&
¡6m³Öp3—h7kO—tÕöjM—ÿ�jaêfÖýè�|6s×kG·s…¶ýVh¾öy†ÅoÑÖwmWp÷qgq[¡�
Æ„î6l§ödÈt„`cœG€fFgRwÃ
ls7xgvnaXRˆs
7x­pXʧd¢n„	õªv}O·f¡§um6ƒ°K°¶g¿åfQãgy
Rˆ©xŠ-'‹y¸a~Xˆ�xlàØ\œÅo–¥—ÀŠc8‹å8Š×ø�«¸§
Fè‹u¸�«˜X¶ð”°¬²Ï…½è‹!7ˆ¥Øh¼x–8ö�§Å”™ˆÑø’39Œ¤r9YrYRZÀê‰Å†1Ñ«çX„o.…Sx23óŠDö‰TÖƒyŽV8G=@¢C„áå0F„!80DW>Ö˜KT˘§ù„‰èV 9›y.›/äU¬Y¹\¥\EMƒIe]¥³`VÁš—Y,šÙšß„™/Dœß„šË™šñ™T’¹œ£ùIŒù„“¹ÿ�ƒFæÙŸad Ý¹�
º ëyžZƒEEš¥HœC¬š±Ó¡Ý„ŸýyU¤F@Eâk*XešEmU YžŸèŸz¥û¹¥¯™W¸žù9žwÙ™oe¤¯;•9œ_z¤óù¥ÿ¥ëYŸ1D¾¡S‡záEÄÂFšÚ©o¤:Óá
o¾våŸéš«™™Ÿ¡¥ÃŸiš¬Ë•¢—¹�º°/MôZUêÙŸ1û®ÝYÔœC¾a
õüÀœ[¸Áœd\ÁœÁ\ÂY
Â-œÂ%|Á3œÂfLA
_º\³àBV%öĉÓ&A…&wmHæJ^¬@ú
 ëaÌ¢y6ôybÖ…ƒýÑbÎ_ 5Z…)hH‰O£®ÿº¸Ê©¯_¿,Úõ¥‹eƺz}	̸—fà‹4³´K±EºÅ†ýö�®Ô˜4¡
̘0aÀæZœ+ch_£ûšîÛ™å0–£KŸ�ÚWlŒ¿8¿¾}[W
j¨¢z*j©¦žŠjªª®jj¢)ú(&�†–J*«¶ÞŠk®º²ã¡À
(è’>gd °Œ²
…».Ëì¨Í>‹ª¢É=)
MK³m´i¶éµ§iuÞ&§™¤
€Ë-°Ô•¦`°ÃË0ߤs1°sË0«
>L=�.Â€6`«„Æ+1¬`yç ï^¹î¦ÿ|ðÂß»ä'¬�+¬l-fx
 Ka4=—KC¿6À7ÂÀ¢Qj4±Òxÿæ¾Oþðã—�¾æ-´
 
Ú�€„àýA™q0‡
JpRLŽ%]�:ÿwѬªt¥*-)J5—R�žtœœ[çÖ‘ŽqˆãâÈi7ºñ�nôôâàG#(Am%	¡
ÖQŒ"»èó.r±‹nˆÃ‡@D+°{ŠW¼S�m4{²³ ½b©æ¨‡3æQ�<Ò£�õ€†háQ�Ñzö´¦Eíi3K
z@ã±È@µi9ûjÓJCö�
8«Éã‹ÀWp´)�)+`NÎ%|ãž\ðK–Âdñ
G‹úÍE 4qH*úwL;o
€Çª™ÙWr�©Æ£ø›þÇZþoõ¦÷që­mñ3“ôÛ¨‡IÂ6\§„J¸Á:§Ñ&±‘½…lœÙñZñ¾0
ýs	¶4
�


's
´p		
D“
ÿ‚#x	&3)¸‚
ЂÀzõ
;À?
d1;8
°4ñ
ý5Ù±"N=>Y9ý$9ö‰—CN–Š§Š£Š¤xˆèƒŠj¶9§‹¢‹ÅN%¥@ Èá!û

Ž†“‚‡¤°"¨
‰Kýs,JÕ-Ìu2±	ßÿà@²@-—@²Ð�×p	Pˆ2²`	8S™“€›I–0™ð™€™©0	H•h4
²0	
ô
¼`	¸é„
`&Óu.î± Œæ…(0g&p90F>Ì:ÎiyÑ™s¥3vÐtQvfM×”
¥
p“9ɧôôˆ–>|„idIGVéý0”Ð0–Р¨V©j
@ô 

«F–\ùF Gœšc	ôðXo”‹D²W¿±k™±zóœlž
ØIˆ€§d«²Š'Lãaãr}á®0m²°½ð
.Ôú
·@¥y
êÐ
ìàB€±
`¶�Þë
¦
®à@ÞÒ�èÒ
$@S‰…/“pƒ.Ôƒúj‰�8
'3‚(s	·ð
#“
<€T{uƒƒ^R‡Uº£³bŸˆ( ¦C¸žâ§î‘Kšâ‡áÔLådˆ¿ƒÉm¨Èc;<-ÐvŒ¨
‡",�xhhPàq#ú)-ÆÁeX׉Ÿ3ˆ�l>ïÊ/àå 7h$å$§ ¯
|Æd€Ö¶àgò(¾‡ e¿‘kçòþا)}-Ý	>ùXmT–Š•XYª\©ZBYÓNé”�•ÌÐWIÓž*•dÙ}3•8]ZÜZ«šÊГ†
—ºÅ€ŸD€Á—×Ã:¾&€B<«]m�á¹(—¢ÒeíhÇQPC(]ج@ÐŒ
��K×Í8×Ô´*€×ÔNÈã×}
Ø-ØàD؃Í׆ÿ}×…�×}}Ø‹½×Œí׎-Ù�}Ø…MØ�‹vÝŒ(
�ÙÃKb*ÐÛ×{�Ø•mØ‘}Ù�íØ–}Û�-Ø´}Û¼-ܶ}Ù¸Ü�Ý×(СP'>`Mëá#¶¨,Òqe�bO¶h(ª°
!PŒ®íÝs
ÞµÙãíÛÃ
ÜÀ=ܺ½Ûé]Û¼ÝÞç
ß»�<š@*¿¡
rÚ5² ÅA/
¦ý!EÂ?@b.å‰Íy,úÐþ;ÌYQì×ëðwçdMÿæz¸ÐÎÞPÞ ‡p>ÊRP
 p}qTZžuH¨¥YžåGT¾YZNZ\Nå$
Ð0Á àZ†ý7´šá6oI«o3—U}TÝ«s‚4E¾EBÓ‡]Ár
aÐ÷ѾèÄ—6¡{Ï×]qƒŽQ‚þŽžÁè]ñÜ£ôþWÃÅê€ÑFÓgêÓWê´Ð´ð
Ùú
½ ¬^ê¨~êµ>뵎ë±ë­nê·îëº^ëß
_ó¯`&›�î©ŽêÍžë½Þ뼾êÏÞîïí·ìõ®ïÒîîûîï~·®àâR鬜.æ{‚~\á‚'µ«
$zêU€‹
I)\º¢«¦©(¾zUAŽ%št)2¦A°-¿%;s'X³-Ïê$Éõ%Y¸0Åœ´uT««D¾ q¡ÙS”dˆ„#Ç!G8%bÌx±ãÆ‘7ž<òåD•)oÆ1c:eftHc‘#�¾ñÕІ­�‚|u)G9tàHäÈÑ"G½[V�™xgΙ“7âÍ»ø£G72#ª19µ
Ð5<Ò£�S-$±UÒµéկߵæS†¯P¡P@^¼yòàÑ“Çß?¼þ
ª ASy%ϾÆcèÌS`(ÏFC]TK¥h•ªÄ³)-5Mż†zo•IDµU¡:K5•N½Zõ© NÕt5•AŸ
ôVd�Bª*U–ä�—WN™o¾VP)¥”i_öÚV@Ñö5o[Áö[jÇ­öÛsÅíÿÝ׌z…‡%É#� 
6ä¥C^„	±Æ_pÄ‘Å[¬QÅ_„˜Å‚Þ‘Ç®1à†c±Äƒf€[^qDIì�AöEdVFdW)‘ä�[ùC‘_–™å™]Žùf›MFù•k®ya9àXTüXÅ[<î—DŽûýð‘Þê…«–ºc©–±i§K¤º_Ž=üzé§[„zc_JÜ8쎉Ùc``¹%�¢W9ø^_ð
1_ͶZë¿	îÐj_Æû߯NœpÆÓv\mÆC„8íÁ=¤E
_À"
DSÍLØ2·©og*ûÜ
Wf3úL‚XË›ó6'B¹5Ðs
“\Úú:•ýЇ K¡³WÄó�î|$"¢Èº—7Ï…Mº ‡T$ŒÎé°E/¢öbÇ¢�lk'JÑ%&£ÅNaÚ^‡P•„ÈC4iUXôÿrG:*$�Àâ#û˜¦>ÞQ&¸šãMF

r›Ch+jZ§
õ§5=ªÉÇ¿Øq�;I“Qß’«¤‚T¨5™ªJ…ÄÔ@Úqž©¨¢èôU>-.q„Kãe±ý«`h<£Â €K¸ÂNy¢Š¥¨òWÀþÕ¯¥º”`
Û×Ö*|-¬bKXÇ>±�­ŠbuÙŠX\
ç9̓Ýn”‡ûÝ#�xÉEþp}ýÝà†8ÄóÝô£wÜÜNGº»YÎl›/<áXÿù¬¹Më…[ì'{ÌÁnñ±×:á4w¸ÂÙ�sq£}ÙÙn¸³�
Ô?²W4È’DHM³ÊR<HŸ”Á£˜ÿ|€|ä‘}AI3@ýÙÇ�ü‡Ë„œÈßÛýáJ\KƉEJ`äJtÁûÑ~¡IBœ¶JEÜÉ3ò½äÊ´¢ÃUX¡‰Øh i�†y i€j ÇÒ<MÒLÍÒ,ÇÕÇÕlMsLMÕŒMÚ$Gn 
,DdÔÑ\#¸ä@é;ÔæÔ´¡¬ÏKΗd½	5šÄÈñËð‰Å‰Ï­TMÅ´]N
ÊVÍQ¹”оdJaxÊÿY=Oý,À
LÐ�‘ò…
”ŸVì=‚K©ìH@ÄQõ½ŒÉÙU¿Ë5
ÏúÔDßœ˜³™´|ÄÁlÎöKQ_�ÔÈáÑÊ9Tû4‘„ÖñÙEþ„Êã‘ÎÝUr
¬¡óE"­\[•Y_Å[û
Ÿ³ÊŸ|1Ü°λlHW¥Ûýô…ií¡˜ìËb_#Ý\Á¼[ƒäCÇíÑ‘HÍÁ"#ÄÝZÄßü5×™èÕW:}ÓÎì�€ezˆ�‡Î$
,80\½%	w4œ¸#IÄváúª‹rË·w.¬×pݘ�?Ó
�™¥â·ˆ	£Ž9x5¯¾Ð
ƒe:3å¸wÝÚ¼˜%èѪ/£þ«6ð_Ž-ï¾)7i—yukF�Üvó�ê
Ø`Ȭ÷B K˜ìÒ…£§ž—ôìÚÁÛS®ÿXù]½¸-·?~™zgÓÒÙ—XkÄð"[/½àVK MWÚ}ÆÙ6™c‘í'„‹�†¡fõÑW~û	(˜0ס#/«xžs¶
rý=6�m�QÙz¾I
òrŸH‡uŠè0Þl„å$t )˜g@òxáqN6d‘&Ò¦cÆUWnÊXÙ‘›!÷"^mÄÝG(ýÒŽ9•ÒC!Í©’D.�ÄO:‰´§m4Á4“I,c1Eêò,í°#;´Ä‚-ÙLJK¥”^š)¥›j:i6Ÿ‚ª¨ Î’Í5–R:‹;”¦2Ì:­Båy²JÇš/«
d±Öj\zd*9뱩Å
,¬p	û«aÓÎZmjΆhëwÃúúÝ+¼
++'öÊ‹
<´Ñ.íq•Ä&ìÃ-Cm°Ê!ý¼­y&3û®nļ5ÊUó
,ôò­ÏÙ=ð[??­¯Ôݱ- z`¯òÊ_f�L²ºk«¸2Ü_#ëvÒ:þ
oGhšÈÝ�ÿÙ”ç/~ÆçŽ-=®gL9My|õr‹
ò‰O4Ÿɸ¿n/0Œ”Å;ŒHÈ
€�ñ$'8�M
¥0€=»	Ò–¢T¢X-éPû9ЗbU¦6íªQ‰ºN›"TšË¼i9÷	V‹v¦býêCåªÕ¬†5©iõf5‘éуF LÕ+a¿JѼÆT§ÉôkG¡zWÂ’t¡g¥«;ÑéT‡jKÀÆHpÉË;AN&qT|rùÙÈÁ‰%ÄàÓa^ŒUãa«¢EÉ‹î
£¶%Ð(‰HI…XÑŒ}ÿñ….€ËÇ�¤rŠJlPfôÒ»Ö@Ow­�.t“¨ÜÛE7»Ø½�뤫ºé²n»Ú�n*ˆ�EŽ¬C�-H˜zéÞ›ê½ò�/}ëkß_Þ÷½6‰ï|S›_êøW¿ÿµo€\à
#8Áò=°‚ìàCؽ†o„+láO8'§u	œH²’:…Ö¾!vI*VñWÑ‚‹Ú\1‹[ìâÃ8Æ2ž1�klãã8Ç86€
¦à¼}Þ2.Î…uÙ·Õ5¢àG€ÛáežØí Ýá	âÄ/#9\£ÖÙ`3’�6²imu¨�¾iØ3’ èYY»�Öúâ?öb@
á9
$@#“ÃMÞÚɺ]H<Lp
€X�<nZ²@GJ"<<FFEG*€¦‘¡4”$
ؤ=ƒ<Cö-@bdG:_íy$
¼ä«‘aG®äHzä%Jâ3„$<ÿ¥R<"ý‘äÎC<(À<Œ¡:Ã�¤îŸ¤€�!¤I"n%4`%
0ÃV΃G†eñ�e
À0=hÃ#v$=0ÃWÊÃÂSvd
̃=„e<ÐdÇÕ%
Êlƨ0ˆ¨d–(ĵ]iÆÅÄùWæ©;ªY-…–Èj˜‘Ò«Ä…–浩j6œ›i‰Ú¿fi·²Ä0<Î-ø¦óqⱡåq&«€€ÿå©æçO2*«Y@©YÚ>(
©Û}ãœ!,æ˜ ´9)Ëš`Œì¿ãäVÅZÎÂmYœ‚®Å‚V.…+jú™aŽ7îœÌl¼JÂ
S–Ö£¾òÙÈjnVœ0íÀ6Î$ñ>,>þ›i%/‘Ù™éŠnþ뛆&å(&›>ìi.ãǾõR‡éÖ¦ÆR)/²k呩ɦÿïm^ïûVÄ-ôBEÂûuZÑ
ßöq¢¯}œ3HÿÁùAÿ‘ß®9ƒ=¸á° H[΃­
[4@ƒ=L4XC=¼¤Ê±Ú
·žü	Ÿ°ºÞê¡\?à®ÕÃúážJpÇÕC2DÛ“ð#Û{ÚaFÎÃÓúaîž4DCTÈŠ"«=Ãì	›JÃ
šöM¼ño©œÕqµužÁq±¼BOl¯9v¶o/	®i´µàg‰¬á)/´Y.º-\co%+ÿd‡Ù†‡*dbrÉr�"òﲦ¯,â)Ù³)/݉#šRnû—[�
cB7ô�±ÂÞ®’oæ	fB¤÷j£”ʨAã‰'l�Ì	
¬�%#À²˜¦  ˜tâyq– éú. at .t·®.DÿfIw«&»ïåfï—Îëåå.ÆŽtMÛä„›¦&³kÌî«’ák}ñ�I at uRÓhœF/lÑ2•EY8…X u]BEV¤õ¥i…EªõY˵ªªuZÃ5NÅ]ãµX°5Tðõ\×5]«ª]×u\6_#¶\›u[gU¬µ_«õSüuU¬jY—õ`[¶ó5(?œ^9Ô…âÚ1ö(&Ç1Lóžf4¿�lâY÷>7V,h’tk·ÉGS5ó¾ñ<ÂÒ—æ’“þ10‰o¾‘2Sµkê®b.ìø~õúR4DKîNŸ¨æl�ú‰œx›o‹ Ì¢£Ÿ+å‚è/Iµkv5N›æ¿á®X?ÿ!Qç&%c™Ÿ¸,eÞ±ìF.è}÷¼Ê)t¿ìŽÞ–™®ºâˆ¦–—$9Ð9Ì©|Ê,ÐQ©ÐÂ5dƒƒC¸ƒ/x…[ø§ÈB§p
õ‚mJ„[xŠ‘C¨L8¥”øƒƒ8Šsʇ{J‹¯8ˆÏˆ38¥Ð©˜xŠŸ8„ƒøŽ—
�{Ê, J„£
�{ʇ�
¨L
*”ƒª”M1ˆ–šHD/õ·ä"ZìxÀê±ašò–ï¦Sóc—‹[ItP«÷ø†qAsnÅ­«—Sá¡2x³]�,4ä°·èzzÃôâà.ÍŠ¦mH5W/効$�XæzÙp`mª4s¸XËÂæxWÿY ñ"÷tMoDo2 icB뮡¥V�â9»=tz«òã‰ø2XAÏ©Lün¹ývH¼‚/¬Ã.ü1Çø<DJè"19~ÉÈHt±û±û™¹)*ÓD ©nOèâ/@Ô{IØŽêà’´K�ï’õœ¯ƒ)æõÙK7Dy©ÄpNpÇ¡Ûf¦÷	!úr�¦˜•�§«;Rw>nuR7íJrÓwäõ¶iko˜#)Ab DÒ±Àeú™cù2òæd.%ú4öã74MƒùN˜q¸J,Ç�v‚M7Õ‰¨¹õqœa{c´Ä»º·|›å.7’li›9‘rÝM[Þ½ùÉŸ“9wkÿ4ÍNÎp¼‚ñxw¼Å^ˆW³ôLWwïC˜†â˜†”ÿBZë U?™EpÙBDALq™VD™PøÂkÏ›ä¢D$oEÌ›¯§ÖØ»½›Ó#7~Ö¸�[½Fù�h2ÁYîñ.„¸Ç;AÄ= /¼Æ˜‡‘:¢i» ÔÖÎ×›º/�ýlÊcÈó¸æp›ñvŸç÷½Nœy”ÃÄj…ôÄò‰àS¼ÊGãÙ¹=A Ò=“ñÒZü È~Á;:ÝWcݣĬ�~æÒ¶îÿÛn§®8Žý“YáäÏkà“é>ð¼ñaZqð7$#G©Çìò{¿N
 �ùÜ)Ä<:ÿaÊ*=¼í~x�~§Ëì’þñæé6kÕ=ºÑ?Ý�ÖÄMŽ¨¿ @
 K˜Ï^ºøʾ=¾âœÃ²c®<l6_£­*‰~é¡¢ux±	
¡b›‰°``¹í6
s�¡	K¾~�e
Û2�«»V‰õÜbTñ,QÂøãÝT¾ê’Äšüêi
ó,wJIG-ZÖ‰�Iß(ÄÚeƒ06Ó<j[„|!‹•ä‚>ˆÈj>£‹VÈDð†Ð!Œ^@e”�dPrax®É¡,ì’‚„ÿ#©JEbw”Š”°ØI0ä4$­'hSG
g´uô¢>y……ŠÑ£„#°°`gD›
ÈÂk¼PGËÄ&–ìh
*®Pb¥’C“ød't"+0"uuÀÂCÍÁ˜ÁHbaܤ-¾àÖ‚¡Þ¬Q$ÙHùn
D¹%;3	ãT at ROCRäˆ0ÐÑŠÐM*&B¡�hzÁ”µèbT {
B¦‚ÁÔÜDÃXÇ1r>‚!Ä|̹„û¾‘ŠžL‹UWIÒäj€ÃÜÂDJÔ«¢5”T…(ÚÒN¦BB¢æÜ
ÁNkV¤ ��5®|˜öÖQ(
!dQÊ:ÌW^RšUåd#%ÿF™’A&9è�¢³bi‘€tÐB'Jt…€&Àû™ºp%1æ	•ÙÝ"dÔEhñ
Y‰¡«à%¿ô­wÜRYû«VeOyÃ…ÈV‹wôf}“+Þ0À–WÔ&9%ÚLÑ�½Ýe¨á9u?Ÿ¬C÷ë”w¢Çá²7©,Ê ¢%™[¼£$‰ À|Ñ� e'®ÛˆÉЧ¾¡¢ëN¨á�%ytÓèMÕ I-Ô¡¾›™§"¬:ã]¶“Ù�;5y
-@ºøxˆî˜H´02	š0%2!‰�>gâ
±T†Sç�+T
+—£xX¡$9e3<‘:ÿ‚hž±|¥š,¢E/€¶W’…"Ä8Gͱb´b�ßÊ(ÜRS”�PÆ3<Bͪ†�Tu¼‚ÐAÐAÕ'ieF’�œúTS]3W]ë^÷$’;IkÖ84Ž•³xúÆ[‹3„6h4èSÐ�µW¶ü’m‹*\ŠæÁPÌO¬ä@:®%™¶J¡
ì�Ays‘«M¶„­VÐ�7+X{Ò€ÕV$6³Àg^1ŒXбÄa…ßS”
0åÈ
ÜZá~+Þp…säB

\¡ÇÀ%nÖÊäFÅŒÿ:ËÁ

i�†
ÖÿFåu@†`„
$2	šÊ£ÔÂœ "½L`,P'b1~„*4„$Rd>ê£68§»ð
¬-_ÇŒ¢‹±ËLQB	­$Öa
Û¤4œâ1\„YŽŠe¡:'.0æ‹rBG-XrŠö,£¾Ó8óPIG0¤îCô/ƒà†CliWœâŒ<�‡O8Q»ÐuFËÈüнˆ�s<Ê
»Cé:ÇAšÊV=ø	
,æ�’"1LQ@Q´†Gˆb
™H¢:d+"
\OWLŒ·ÀfØ‚Ÿÿ»MtÚiUx

š-Sh"p&‚*9tVÌÀ�` SžYIhLÊân¶ì0e$$oÆ%KA�©ˆáU#£ÏÞkâ"¹Wž �ÐÍÙ`$DŠÏ"- ¢’Ü-(b;Xá"ˆA9Ž9‚dÍÓ�Òô`µÎ!þm¤-Èsìg~)N£9�xŒã:£4Ä– Æç–—žãk‚X[)æ”虆BpñOÚjâåmË@cž”ÞáÂâì ßNTê%L³ÎŠÁSÃv
ÜŒÃ+ðix,ºðy©ðtSÊŠ„´̇Äu|•qÞë¤rFL¶Ó˜„ÌB„Ò€ÿK*$P7{!Êkd‚3|Ï``

}{µvfL&
¦¬4ê®V8EÙ´,ý®!‡¹S<

i
£"
b"~±(X±*ŠcI•¨bHˆLÛâ|”ê‹þÄ3ßa;‚‘À˜SvEÞ:¾ˆfÄr²ã¿ãƒ„�m6LÝ,D�v"5N!'<ؼP餧&*hÝaªJ´¢›õ”hIZ‚P|B.âã,dÂ"%H&Të)%Ýe3F¢$v*dVø^úV‘bÖ½(\É[ÌQJC†½ÂQjŸäM£úkScÌ”h*H…²c?w¥3TÕ*�¤7v at VåÈ|0F9¼ˆ&(îvè‡Êˆ²†ˆå$ÞFøZŸ-EÇ}u£�ÒRÿŠ‚÷Ø$8dm6�SN-…JdˆR„Eøb{JãðûÏ(bEV{ÉE¢EÒ§¨F0‚›ª/0ŶûÞ�á,쨯8Ç’NmÏÝúÅ¥4Pc,ÜF"6éChÁò• zÝZ'Ì•°bÃhÉB×ë]*Yn	v�¬w­Þ	P+Ý­aÂÖÝâER,^êÐÑ’(¬/b·t¥\µnÔ:’$a#F,1Xèv€ôEŒ¤¯u¾`M‰® /W0oÝÂømØG©J‡ÁÚ:1ݨa¯`ùš¨îV*a¾~
ûµê–/©&Õ–j¤Ua¯ÖÁFìÔ»^a½¢5€­W*�ÆBw
1n8RQżr0ÂsVTD7‰Òiåã^—¥óÜI°
fx×
cY‹À|ë\x[!§ñ/:˜Éë¬Â/QÖœliµ¥ÝX¸¹ÿÚ··…&ÑGÕþ2cZZ©÷‘¸u£Þ’V)õÑOz­ŒV·õUlhd¾˜IbR|IÌ¡zF:\P‚Ê‚Z‘‚·{[½$b‚ЉHÍûœUÐ…†OÞ©hÉ¿$¨KÜUs¨æ°©ì‡XZ¥z+Í¥
@
ä.u<Ã
Sh`å_8kÛÔ/œ¥“MÝ<EQ‡Ÿ„AC•±‚¦bK{š#•´ ñcÍaÖsÐD0ä€ie'‰‰³
HŒVà‡ŒßºŽ›H…_R*XÍñ	/˜C
�
øÌvhrŠÞ@+6«‰�ÀŒb¬?E�YšÚVž\fF8t^†Àƒ“”µKMHÌ—/yÊCáˆ%D‘ÍEÉÈ
ap/
^
š¼%–d‹jÖ�Ž
Gº˜D at vÕ…0Òq1†Ï¢fV¬2—=f"ÿ?m“0t
íÐlÇW'í
	`fb{ß
˜KEØz‘¦
y+¿Œ0r9¯
ï
ºðÁ
 =Úƒ€v²†×%·r'wY–HøE9�Ø(=Úi¦d*!~½ ‘©g)‡Œ'L:Ô-êhh\æ‹	 Õ1—
ê Hiø7"�=mBž¡—Á!Ñ£—‘]|¹—Ð~¥	¨Ù~?U¢À5cü‘*±° èà@I+Áêð
Ý�åX.ºiCaÁPî(H*n¹3² |Ô10*xÅ�"ó—

�_Bž2�÷(ÁÀ®ô€²ç0Ôá[zRsÂx�Çe‰Qz1·õ6P#a¡Èš+Æ›L—‹˜Hˆv®F®Ý¤ž ØŠVg_¯(ŸY'œ²˜ŠûOI×bð9Þ9qV¯ädÿ®Üéž÷Å?áʯÜTbn(žÔÉ›ýš?õD‡ƚ퉰‡˜�úCt­(±'6‰ëUu—¨°?GOTw�ÀÙ§ 	€M�}rÿ§g+‘
Ú6lÅÝá&©¦Ðø{†~:#
ïà,¯�+&ª²°‡!~¯ciK1åUž6
Œt
è€
ÛC?¥Ç0W3Œ�»=
@ÿcŒ7uç
ÉdG…MáŽ4FŒrS¦PºÐ=à"†æãq•ñ÷¹å¸a
�„6¶7š*ù¡©+–w÷Áà¤Â}e'ˆ‘jF(
�·×F˜QŒ(2³©‘6ih2
ip¼xè°[ͨg¯u8AT¨h¨A*(áÅ(Á¤+A<ó¡>€±R(á)ah�©0CR$4"�ÇXZ™1H¼
Ìc2æ)7Ji¤2cAÆãáÃ�ƒqC7ÝÒFÄ2uV´Õ7ªud¤c2†=¦&§
8¤
Ó9�œˆ?¼øš›®¸‡%Ö£ý$œ7LbòôÑVs‹b»Äß©ÂõÀÕ”Á{°fÒG<�ÀIĬÒkNoX‰}?ÃÔÒ-L�3훳I¿YtÆÂ
ü`J×NÆaÓûºM?Á
�
	p!®)r!�ÒM½?¼Ü
Ø?}ÙßI°NÝtlÿ�(vM‰=±ÍãsmX`ƒ­œ­ypƉÒm×À#ýMF<Ãœ�®=<ÔÆ)t@�§í­å:Û�ýˆ
ËNµÍu 
�	Òû¥&ëÐ7OñmT@rÛÌ�-2ü®”ÍÔÉ‘!̇tÅÝÜÿÚ®þ”_ýÖA=°ž-N8÷6Æ–,ÅCF#q‡BýÒ³é‰o¡HA×ËýÛê
Öè^µM_r-‹
öu¿�sý‰7=ÚÎI°>Mžã=×Þ]ápØ-åµá<ü‡‹(/Ž¨±º­Ø·XÁ±9%úúÑCÌb
ìÓ“]™íÔÇà=žaÇÂ…ˆÄãt­$]tS]�ÂÙs.ÍÙ×Ãà3$1k5ÉÿqݪÝdbÙÄ=ÛKáƱoQÑí0ëyÄ"N%^ã±Mã×t‹^¼œ{Š:—Üì훕ˆÙÔÉ‹oÃ>³C]ÓS6”YOÍu~˜æÌIÔcç°΋s=µÖÃ
nâ&ŒÔXž8‡Ý(½ÙX]^�¸uØÝÀæéÎMÞùéçÝ}å¿áàæ	Ü\gtF‡ãiÁ°ý:žND\æ=J×›qø#Â*|ánÎÝKíØMtð•‰ýãæÁÒÃÁ츩‹ì©ˆåÄ}Ά;åiˆJ\,>c$ãÞµÝ}ŸŸ.ãDaÑâ'°Îš9‹Fìâ8sÝyÿ‰!&ÞéêÓ¿Î`—,0
!÷ò6ëËÝØbŽ�Lê¹Á àîFÂ-¡.çÚ¤éoŽàŸN(<vAlá
îãP½æï	Ó4v*¾N©Þì:°Êù×ëd`ôñê*?¾Žì¢íÔ”žO›Í^õêˆÝ"ï m‰ûëÁÍM.¿ñ«Ž®UÂù£áióÊ>ïG'�BžO/.ÜÜmO+�Óàj°�hôTmÕ-êž.ì9®ñŸå°	‹ùö¿yóT7NŽþàR¿ÄäNäíM÷f½t%è4Œî².á¾â{ß÷4þë±ò�.òíEö´èêå
›?â‹Õ¸}÷rõ‚­�?]Ò·¸óÆ­ÿà1ÌÄVžÛÄn‹uØ°	¯úoPx¸‡ˆO驈nê§Þìn_òb±ùe%ÞÝÂ÷}ÕIíÛœ&÷ÅY‹ä-éºÞ±+Žß¤ŸÑo>ˆÄŸßg?ÜÃäÕŸÝhŸý»û­�bX�î!�ìŸ4'øñùäÝ_úWa3‡QýßIý#>qôá‹á
tøPâ@†+¤8Q£À‹=&ìÈ1cÄ?B´¨ÑaÅ_#t‰r`Ë‹_’Ä9±æDšW*œ9òdÎ’‡y¼¹1éÄ›Kþêt¨N�
¥>•§Ö¥!óX‘«LÿŒ	Çn%û1¢×‘…±ôÉP«Ò´U˲�Û°§K¹CºÝ‰ucEÂ>Õ9•©À£
ë}KTqJ•Fk¶®F¯IÝ*Æ;Ù®I¡’3ó}HZihÅW
‹ö¨ú5ËÈ	‡Ý2+A×'ek.«¸ë³¢…™ùÛ¬WáAƒï&Ú|qÙ›láR–¨¼öÆž‰S÷¦›};UÁ­ûš>Õ;óÄÈ%F?|´Qß3ã{/?õ*깡ç†_
!¨ZS=Ø+‹)¹ÎƒÍ²íÊ̱˜X›Lªÿ°;ͱÒƒOÓ^b«8Î^{�ÄëBÃ!ÜŒ7¿:﬑bp2°ÂK¼_«M:ã¼ÿ
é8q{P¹Í¤bÍ ‚\T±Â
‰LÐC}DìIÓ‹ÒÊõ¬¢°JÐ^\‘§µ–Ó’¬ónä1­‹„#Í&052	µå̯Å:tÏ@¿“‰ÊötDª»,¥|Í÷ ÓQÇÐjóÃõÒÎmÒÁ¼ddÔ¸�ÜñG2áóÏ*GaìtÉ.ÉóM4«+°¿;Å;TÏ‘’T¹<W<5AC…LÔ;/ÔÑXIL‘¹ûì£ÕW8g¤SDà‚Ì´2Yõûh¯aKªÌO%¥T1CºÍÍ(
•ñÊ©ŒÌÕR/ƒZ’4?så*O:µ�,E¡8¥lÀ^IZ’ÔãºÝŠ^:¡Äo:òè=iÕAÿ-S&Ö6]‚åû”[€�«;¼ºÊK]ØƬôXƒÓ”PÓIJ¸I%þòbH¹Üª3²të3Œ÷ŠZTƒ5cç°üÙȬ¢õÙ^e÷,˜;$ŒtÐÇ8øJ�±�”ºb�—(‡Ü=—UŸÃüMè¤%sM5¸X–ö»‡Ÿbë¶:_îŽvòM¤ßØXMmM‘‡Bxï±K|úAgÃ<õðÁ]n4cqú¶áÓ6^¼rõŸÖ·_µÛ¼?ËpÝáÐV»qsù„éèÍOouɼvc™1ºÊõn
.òzQœlˆ¸fðžÅä1F(³>í“"]´E½)c3^—kfK6â:ÿ»Ç-³Œ±ËcK»KðØD¶JåðÕ6o˜Œydè(ä;å9A*W/ƹÂ7±¹¬•²ßD-fON¤’î½ÎCð2Nü4$ŠýGQšŠÙטö3«qn6UÓ™¾RCÁ¤ˆ
3ÀªÛTPvš[QP([K ajæ!p;ñÒѻ¨oGüû
Ëâ‡%}/A¤› O<¸»]ftEL!™öA�ŽsW¡
ûDw·ÙÁm:^“ µABɦ]eÛa=vÅM=Ɇû) ‘ÄWÅm�fiCIßæÖF:ž0qGš•‚ì’¿Ø V„C	ÍøÃ
Iqd8óTD’A<:|áÌ™½qHR$z“J	Yèâ-/qêŽ{ÊÆÁÍ~;SdxœÈ:Ëù€¼¢�&™Å(¹‘/ñÑì2×:8îoYÊUÚT²¬,òw;
--- NEW FILE ---
GIF89aoP
ð
;A@>UV\bb\ii)VX0]a4a]8hjD/S;)ZE2hO:PXPYbYGuwqZExePisl€O}�c€…}!‰~O€l€~
—˜™ ¡œ
£¢(–•5ž¢*¢�2¨©W‡‰Mž¡M§žH¬«g•—o�¡k žu¬®s¸ÂI½nÁ½^ÎÑuÐÑtÝã}âß~çæ½j2„ZJ‡nX‹wc•{f®yG©}W¹mE½xE¾{P£|gÎUÊ[Ú[×[Ç]#ÉbÚcÚhÙrÊf&Èk5Îq.Êu9Úk$Õk2Úr)×u6è\ç^ö]ó_êd	èhéqûfôhúrøsåk$än0èt'èx4òl#öx(ô{6Æ}KÆ}RÕyCê|DˆŒ{›…mš‡r“•}¬„Y¹€K°…Y£„i¤Šu¨’}´�e²Œx³“|Ù€>÷€é€-ê„:é�>ù‚+ø…7ÿ’=Ç€KÊ‚TØ„JÖˆVÚ’ZÕ‘gé†FæŠTë’Kç”Zò‡FóŠSý•Jû—Wà‹bæ•eçœtø›fñžqÿ¢Eþ¤Yë¢mê¤xï°{ý¨hý«uÿ³jþ·xÿÃzÿÑw†Œƒ…•�Šš““Œ‚›˜‰“œ•�£š”£›‡³µ­šˆ¤¡Œ©¥˜º¢‹·¨–©«£ ±©¢¸´³­¢¸±¥Ž½ÁŠÀ¾¨Ä¹¸Ä»•ÌΉÛâ�ãÞ�çæ¡ÌÍ£ÎѤÓÎ¥ÙÚ»ÌűÏѼÒȳÜÜ©Þà³Ýá¨áÞ³ãݬæç¤ìñ©ñí¤òö³çé¹íð·ðíºòòÂœ‡Ç£ŒÅª•Ç±›Ò¬˜Ô³œÑ¹¥ü·ˆá¼¦ÀͼÚ«ÚÈ´þƉþʘÿÔŠÿÔšçĬè˵êÒ»þÍ¥õ̶ÿÕ§úÖ¸ÿâ�ÿâ±ÁÌÆÅÖËÇÛØÚ×ËÒÝØÈÝâÉãÝÓåÚÄééÄíñËñîÆö÷ÓååÐêñÛòåÔýþöÚÆëáÌíâÒýâËûèÖüóÌüóÛáûýýìãüíôýõäûõó
„(1Ň+^œ˜cC‚ÁŠ…ô$0‘"A,VÌ!Ë’0Uväø‘fD�7mjœi‘çF‚ÆV
LYìWQ™eî¬Ù“éϧ<+J5æÁ«H}juº5gS¯P¹Šõ*0hÖ³hÓª]˶­Û·pãÊ�wÝ+]¹¤é…%-/¬\âráÍE˜°´¿¹.Ü·p^Ç�KŽ<¹2eÂâÄ
Æ‹÷ofÍä2ëú;3àа`eVíYWfÀ®	#Vü·¯b÷7ÖÍ{ñåß�mCÎ;n—´]È“¿Ú•‹œà眡7þ›xïÈ»}[Æìúóè\ã�ÿ.�ú·ëØ…sgßröËìµË‡?ù=îâªnñ*Öë Ëb$4]hà�&h`J0‘ãÉt�Å„Vhá…f¨á†j¨G at R
8Ð\RM5–T‘ÅGÁSL˜ÅOÔ…\l!…ŠZTq‡!6vqD@\aEŒF‘ÅaÄè…„Sd
†‘FT±EXh#ˆGT¡Å…Ya‡*N¨eVaEXÄæSLÑ¢BxÑD1jqÅnZA…Ÿ`LAE"ÞXSØ`c‰Y\á…B\Á&…1Va…‘iNÆšUXée–UÙâxNhÄB´è…™kZqÄ_¶ÿYHT†Є
TH†zH‘E7
ÛfTlÊÅ›Fk‡ÐF+í´j±6ø¤£D 1è–·V¥Ò€ãŠÛ­¹áZ•.¸B©Û.»UÁ“¼äžën¼HÕ»n¾h‘óÉeXÑ&’>KíÁk˜G"™$Z
&�L¹Ç%Øx�7× rE"Öxƒ"{SÍ%ˆX!†7{q	8˜ØXá°ˆ\œ	Åàìq!à`Cˆ+[†TR�5× ˜G–m‚QI8Ö„±Gņ€ÑD"Õ\cM5‰ˆQE–`“‰%(S‚g�„N%yŒMu¢×dòH‰`cÍ!_TãÍ%MxAI5Ø\ÿs
&{hg"æŒ
%yq‡%~3%®^L¢7ß\bÇ„XΉLïQ…TwŒM5ˆSr�ÜÕ@rÅ1ƒ“ñ–€s‰z›Xt"~RB""f`r
$“š™ððÄkØ„7ø¸ƒÕ0¿4?Ì0É4LJÓ4Ì@Õs½@Ç$õu_–õا$¾öÔ›_¾õê³ï~0çgŸ}üés¿>úö¿?ÿýûëß>þ
Ï_V£c¥¡?=Ñe.w°Ó;èPM
X’6/ŸA…_p‡q‹èz¶®Çôè1ZÒÅ¢•$$Ihs„ÇÏ
‘˜›Í-JÀÉŸæ:0¡áÄ£@„XÏ›®’*ÏÛÞJza‹Û®�e�
Da[À“½.T°Q° …-F-zá‹V°àÂê°ð…{¡Ž
‹¢­PÁ‡o¡Ž¡ªã¢…EDQá|ãLjEQÔÁQ|”ø²�ƒŒQ·B§hŒmáOŽ’“>ñ]±
×bêˆb±Ÿ^X¸¶°DùŒXˆBî0Z1YÔ‚ÿpðšS xöؾ3KÞÌ&E$·¸3�q‘gãâñxp/€
O ¶Ø¢ÐñFUàŠZyžü‰²
c‘ÏY°äÌ2VHTá
HØ0v.Ö±`¤ …=ÆÅ©oÑ
·ØÁ¾¨Å‘ƒœÂ%CÂBæ(D�êS�žóÃâ4sЩeQ¨t£Æ´
j‘Ô3»‚¤g©\,¸¼P‡1TP“8ѬŗSxic at y͵¸ŽoÑZ·b�µ�@­q!A/‹¢º€gÝhŸÞ‚£­X�+øcaWÑÈ´…(\a‹bˆ¢Ö`Á9UÐ
Kã:×ãÜö:	Në#ÈFÿˆÄc�€ –ÚF±E�cqI\Ô⿨5Å·‰;Û°·ÀhŒuÜK7ÚZvð9]Aq†¦f�V/.
Q´cè:õ²
�ÐþØÓ³EX ëÔÞÂÌç{+€½Õøx£²<K÷XP	ƒ)0Æ:Rã¨C
0;6€
W,ˆ¾PlŒ/ЊèâïH at +J°Ž½§Bµø»¾c�#Ä¢(�©íÞWëBìq
J°ðv,@�õ':'"ÔµÂOèü)´…ÂQ×#3ÈP™gÉŠt­¢õ©Bl;Ô„üÒ"+ÅýDr[µx›Íû%>‘›ÙÁz£Ñ%ˆÿFzTÙöµytµ½d7Ê�îÉ´²Ѿ€ÿ:Π4õú É>ôÍÒQƒ?þÁçO†UOìwJ7åLàô=Ù%
�¶
h¶
í qÖŸHŠÆP)ÐùÖí@gÆðw„–BÐc)Ð
¾°
Ö
¼8yñ€¶à�¾èmȸP³×Q§X­`í 

�	`‰ð„
†ð¨•
憧ø‹*
p„8Š9CDzâ˜
ñ€Š%Õc7R‚b,@
ôOÀ€Y!K¦„ áŸ*! HÁÃ
¢(@Tx¿”@—DL÷L2a Š=Û4MÔ7Mj¡„rÙMsu¤ÿY¤ha[¶ç=Yq=Z
}h!¥z}j 1Á ÞÎGMÖ# Kú>bJ>ˆG¹tIªÙ£ØuNnJI³à~ÂÀ<B%`�µ/Þ.Õ4¨ö’.iÁP
©¨êª›Ú©³Š©­Zª˜Ú«¤j«°úª£Ú¨€«Äš«¬ª©»ª¬¬
©Äšª`
‚/]ê-ãj®çs®üò>¢ ð
LñZ;¤‡zøÊSË®VÛ)€ˆ-°
º²»ºdxH}}Š»Ç€»µ‹»K§AÕ¦Ø*>SëMD»µTñ´Q{@
ÜÀ3010220ÁLÁœÁLÁ¬ÁüÁÂÂ#,Â$|Â&œÂ%¼ÂÜÁ.ŒÂ,¬Â0<Ã2 Á1b¨àƒÜR½ˆš=…:¹ïR¾>´E²¤­ma®Ö.F»K†Jµ
½K+½äâʨŒ¯õRÊVkÊk1 ª¼Ìêr´

çó½òâÏAë¼þÃú„{ãdX4¤Iü�•æ´Qÿd‚åQ|ÅXíO§Œ %²`" $Ó$
1Iñ'XB $¡½Ü4º0ÁºŠÏøS= îáuâ“Ñ%þá¾>Ók¹"ÞâÜäáÔíâ$NЋ->¨¿qQqzϲíÃ¥<®ÓëÊ^š=æ­.}­ÝæÚÉÉ›^´Gü´)>Ä�MúLÉ
MwÔ%ˆÆ ‡•9žCdv‡G`þ�†xŒç¹
wê&
°e9n, ŠÉç,pæö$ÒÿlÛ¸-¢‹¾²%Ëè¹é�~£”>é–.é¹ýǘ^é™Îéž~霮韾é þè—.êšn£ª³ÌZ*¦DN½t
.ñLãÈݽÅË/
¥b
UkzXEÖ¼`º°y'Pæ`½àv²0D-ÐéóT|/OJ=1 ðú

¶q`F�?2I’âÊ”*O2¼ÈñãÄ….[¾Ä‰2XÌ‘=%~vÐWH…AWÊDJ3gN‘&7ŠìePXŒU«zè€U«U®]½~µŠ¬×c³ží*öìV¶\Û¶ýúv-Z³[ÓÒ½JW­Ú»{ÇòÕÖl^»�çÆ=lx°V±!‚+hqæMž/•âôèSs0¢:º\ú2a奙oÖd‰´s芫+žî)’ôÿNØGYßÎy¹híѵF•
£jÙµŒß–/ñÄ
×MŽ7útåÔ­ÿ­~ýºßäÜç=üsÂU[Œ¬[¢ïÏRSŠli26m¦¨yÎöÉ^4LöO9ëßH>ÏpËï¤þä)Âï6×ÚsP8·®*;«œÓ.Ãð4Ô�¼
£ÎC'4‹9/ÌëÄáPäÐ:™;®ƒó~™H=7ÃíÁ“:Ó±2ßîkÉ7U‚´õDòµ$t¨Á™|²'
qËlÀÏ:ÒHÏDŠ¬˜©2àî8½ÂŠ¹[ä°Ì›C39ÉO:ï´sÍÁTLMí̪±Ç
2*	¼/Á#ÿ‰D5â±ýB›Ò'ül¬(ÒÝ03)KGZí½Ðz;Aß`2·GO⩳ٌF¸¾3®Î±Þ4ó¬ZÛCïäó«[G“ÖY[„×ï®{3.?Ô AëS”§,Ajr#õH«òFk‹”BhOÅ�Òl[³&-éC—!¢Zr\ÛÒeÐ[Šf›�Ý�X�!ƒbç’•«_9L¶D_³¸»8ëôK×€�õN^fÑØû4/¨gw
˜™…ò£Ga×4ÐÆíTTK½ÓÑÕÍ¡�Ü2Êw•ÄQÞOk®f $ÔUÌcw�S:°jí7:±þuN¢WdzÄ4­l_>ÿ‘F®Eÿ�µâ�š�˜Ë¤Õ¶´sC+t?TyU!�­DíÇji–ùä·ã¾ÍÝ%3%MçÈ8ã<ŸÛ,b‡…ŽMª	.×:Îðð^.Ü®ó ”n¥Ö>å˜éN4g—íÞTÞÓÆU”µ)I™sÕÏö¼¤´JY!঒q8ÆĺúqªoÕ•pȹ_�N¼÷é‚ŽsØß›^±eªÜìÔX»W¿’×nÉ5Œ09g—Œ©Ûf•©Þò	õIlÏ¿=F¹Å©Õ†.«~6ÉB±Vý6xæÿïŠýî׿ûð²qÌD@毀	,˜
x at 65�‚à…ˆ‚ÿaÌ"cqT14¦¾›Ø+|3+�ø¾±
‰mióÑ	Í72#9„…ì›L
©·v�|)±T¡~´C‚D耾œ&Á¤1M�ÑÙŸÀü7A.�EŽkÞüæ÷D
>‘Š\¬ ÅèE2®‚Q,ãm'#aÃŒò…@F¸˜Qê(¤ÓRgnèžC�°cpCß¡E>œÉpuQÊØx©¼)ušá^h¢¢^¨b 
Yn‚²E'1ÙÊLŽò–¹¼d&iùK[Ž“ºüå-m¹ËXb2˜½4e0/Í_†ÿB¸<C3¯ÙÊeÎò’�¦/G¹Ê_ær–«\¥-QyK`
{<àXSµq
°Õ­pà¦aÕ	lC9˜†<ÐPS7ÀAÚp
)p™³ô7¡9Îo>ó�ï\æ+®ÍaÎ,AÙ8Aº0jN¤'¤æKúÓ{u�ÝçU—ú/´®t­#2]×:Cö¶·—Wýê<·:ÕÑõ¢‹ÝíÎm{Ðe7õœ¯ëw·{ÞϾw–ö"ŽhOÈûÞoÂÞð‡7ü8<±> ¡V¨‚ª0yÉK>—ÏB.¯yÌo¾óŸ}èC¯Ñ—>Z˜ê#¯y+X
ó¨ŸÂ°0ûÎ_
òœÇBì]ÿú)d!÷Z ½è9ÏùÏ[þòÆï<òMOzÓ¿
³‡¾HOúÞ7_ú½—>ꑯüæ[¿ûÇÏþ"_ýÍO!
TÈÀ@*H!ö²Ï=ô1OþÓ?ùö/=óñzæ÷ÿòV€oÀ‡ràcp£:¹=C¼dÀÌ/cÅ[&ˆ<è³ÀÙ¾ÔÀ
äÀôÀì@)ØJ¨kÀl¨Kx‚"„H€†hk „'H„pà†B l‡j˜„B`+ƒoðJxkè†jX‚#�‚(€¾.¨„oà(8l„&Po@è
khø‚Cðo°h0Ák°Ù¿&xBÿo BðpH0¸p¨†à
.¼„BCøoø†Kh‚A¨†.T‚Jð†B€‚Kàn°†KxÃK°ƒE°oø&Ch(ƒkðn¨.Hx¾øƒ†pðh„Hh"0Dkøƒ>ø†o�„D´Á2Phøhp‚A°ÁE ‚FxEBpkxÅE„B\Ä13H‚Zük ‚ÖsÄ(¤„\(à†p „&`!„>à†!ß›=4Ár4Çs<Ç,hoÐw
�•á9v&þa6î…üÝ	cXã‰PcŽã–
â¡$^Š&¾ˆK=à=¾ˆ 0‰uab_‹
Lµa:ßa¨¹^àÀÔ„Ð_Ö_V
ŽˆPº�ˆˆàtúˆ	,±äTÖà‚0ä�ÀŒé…1Ö`aÀš áˆ�aJ†_†ˆ
.	ð	aùÈã&†â� 
è††ËH\@^V‡YF†_¡Œ™…vÂ…øÝ°[˜e5Ž&ßK½TÒ�Ø^h…$mlÆCÅ\h¹–£Òg¾d¸z:†aÈå^ŽŠóå’¨xXGÁ…*\_ á‡
†Y6âŒÀT!.ÿdbn.�ð͇}#‡…Xð½c.‡5ºß(܇¾T h!6ßX
k&	ªþ�8ÂTu(Ù¨pØ7¢aªÎ–*\––¹êÊ‘:[(_š–á`Þéßðئb†žh�Õ ni¦×AöaÀ¶êŽX·Nä~a›[9•KäAžã.5g®†é´Vhˆ&hLÝézÕ`i�艎
sÞ° ˆÏuº5>.✃ع”^Pc©0ß<fèWŠ©vƒPcAŽgÿŒ™é�°e!áž.h;f!·Ž¹¨Pº–šëˆ˜eŒÛWˆ¹X
¥�;ÓÑàv�€˜ÓÓÍÖb¸h`½ZPuÀfÑNTžˆ@¡‰õ7¢ë/b��,òúí
 R¸Vì°+RˆbQB”^%´JQÂW/QŒùB¯X­ùF³Ø�@T
cëJ´u�ÅS\~£Â°Ð!C‡èÒ§?¯>Ýytè1„ýºk×;x»?_þ¼ùô�½«üÝüzôáå_]_Ÿ¾ü½áï“·ÿ>~1
6µ�®åÕ\6P[Åg`�z“àW^‰E z5„iõEXY÷u¸Ô‚n
3–R±”ÐN;È´Ë
” @>)àÒ

´ŒL’R’¨–“zE¹T\xí9"YfQø§ZF…VYs¨Š¶…–ƒà‰¡{$>ÊàW‘Vµ¨¦xòUÖ0ÈôL/ÂcL/¥Xª«•ê«³cÌ0¸(§Ÿ¤€åja¥K�jÔ01ÐBÃÅÒ0,
É*«ì°È.›¬³³KË4H[-²Ø&+-²ÒB»-±Ï^km¸ãŽûì±ÉÎ@m³ë¦ë.»ï6»,¼ÓB뮽Ն;,·ä2+¯½Ê®‹/½Çê«m¼íÎK­¿´ÈB2Å
)Ô²€*¨°B;%¨ ŠeºX¦B	ê¨SK1¢làJ	¨#»i± sÌÕw˜8â…JÙ\Ûng
IÁè©|�¤‰õäD@¡SÇ282qB
÷Ø=–õªpâYæ6w)Ë¥ìOü_T Ø8¿`Q‰zõÈ9­üg}lÁEiPr#c€Ž,°E1|!¤X´�¾ �?[ñ9[¨ ¶ ÍAê\²w*€d+2*
~Úbi…Z+6jˆB¡ïh–f¼^ ô¡±xh0Z1«XÀ!
t4P%œâ:ЩN>Ô¡
õ9B=*Q}ZT
t€©N�Î4€%©JõA®jÕlµ«Zý*W;V®jU¬^%+ÿZϪV°vÕ¬eM«[ÓÊÖ¹Êu¬k­ë]Ï*V
 àD»X0èd=mêÇAzŸŸØXFm�cækÔuÇ¢Ó@bL§ÝI?ɺÅ}Œ"  >¼±îŸÆ€Ô ‚|¤ÆuñXÀÒfµ×àBŒÑÅ:X £‚¢NE¹UA0|qÈ·cÚk�Y¼F*�€KÑ“ز*�èž©M�Þ&ô¹ö¨§»å�€^ðâÇ»æ�
yÃ;^ô¦·¼ôIOxÑûÝù¶>âuïxó+ÞýŠ7+
Ê
€å«Þýú>û³Ó½‚¹ýY|‘½£=©xÆÅæÑ›I”ßä8¶?%¶�ìãRlÿJ~Öb�þu…Ä&IÁžø¤'Æn8GE¾RM(•âÛŽÅ9¯	ãÐiPu‚š>µJGÕ@O…ŠS¦¹ÉC}rT«”±:«Ñ©ijŠåšJ¹J]ö²OÃüœ/�YÌ:ªO›*f0—¹Í^~Žºç0¿¹Îk¾3�Ѭç5�yÏ}þrží蜺yІ.4žÙŒä_˜ªsì;Õ×>¤„s?jÜÔƒ%7F½Œ‘}™%Ð\ÎGIcú±áßò‚ªƒ®ã¡ëð2\xÐXÿ¤j‚œáù¾SéÍpJa“—Úô\ê›nj“°Ù¤lç.ûØÎ^[³×Tlg'ûmÕnöµÇtíÿl“‰ÛÈÖ’—Bà”¡ ¸C^çö(ÏÃzXeçÎ#h9'Å¿­‡Ž¦&,ãS˜y»;Þ�ãqÂl³ÛØÓ~vÁ.mƒ‰m‡ö°#¦bLÚ&¸XQiĈk˜K�ž´ˆ½(uº@í¬ɹiÙ�•\qï~·¡"O–»çq¶$¶Ú0žs…CULÔÍÒϮ🣉èÚþv˜Œ®&¡wÛÕuú¯1TÊ|²5s•9g®9Ìíšy¢¶_ËE
8¦Ä-&Ã^ƒgZ±3nœcí¥÷"•Š%êWÂ�A’�6¦3;éÓµø³•Îó_ýï=ü–¢«xÃK—ñ~W¶à
/yhSÿgñfŠ|àÁq¥ÆGLu—Ãa3fìÓy\#gmvá{ÚcØ3{ɽsÇzÇPBå0|o¸oÏ–VZvÚ +y¡c󆟶å¹dt¾ÞÛH'¼ÜŒoìäŸ)ºÌ?<°7¯q .�æ›Å_�º.ï·Kqí4=ºtÙQ»%~çWÙ\Äÿ=~£?ŒóÙèµ>8»ƒm:?øµIö9Ô=ÜåMžò-›ØõöõÎ5Ý`Ó!`š, ã±I¸qOPÇQÖÆÌÞ÷•Ñí­ß<•ÚîécUÝÊMP`]ËY„
»1J¨±ž]ˆ úí_RCÀYÙ±íÝš` Ý Ÿÿ5ÿÞà%aVã%Ññ_´áÄQáã^ðM]ç˜WØ›êÅûñ	ÊÌJÍ�6Eɾ¹;yQÜÍ`î%˜	êž}^„OxDÉûƒ¯Q!Á]_™0óQ 6œÏY`&!"B ß9á!ºIâá…TP�‡(Ö_Øa’Æ 7Ážò$Ξ„!aVgÅ þ¥ íñÏ|,
×�"ÀT
œ
"
a#B`2!.bŸ &"™HŸ *]ä¡™Ô"±m`R�÷�Œ„x!º…œ©m…à4Y�(â YLbˆPÖÊX˜7P
’ù­Þw\c¡ŒÊ0LIsÅâØ,bÜ<—Úÿâ,B_!>�›RW/ú¢.–	æI�0¹Q"g¡ZÌ| ë5–š…ü
F§¥á%"9fÑõ¤¢EÖž™Ùcù�ˆTã	Š§Ý³õáÎíœÃ¥dö9J¶$Kª$LždÅͤKÖdÅ!NâdL¾¤ÅÝ$MúdNÒ¤NÚäPîdP®$QeMå±YÕæO�"÷©*曉PZeµ›¥lcVrcëñÅˈÚÚ Z€ÑúŒe6Æa}†F&J6
…‘Ê\“,TYT•Sa‰•$•P=•_6`þåSE‡`¦a&b&a¦a.fbþ¥c2æcJ&eN&aêe`FÕ]RÿÕf.`Zøegæ%i6ÕhVGiR•i¦&j¶¦R…¦iâT”i€_©ž
îà(BØYÞOåh
V¢ÑD¶áùš£pȈÀ :©Œ3r$¦D‰ºudøq@)̃<¼
8À4ƒ<ÈC=ÈC7t'xÚC=”gx~CxÖzÚzFƒ|Cy‚g7tÃw~Cwvƒ}nÃ=ÈÃ7°ç=ôg}nƒFC6(Cx’g6àC=Ì'Fƒ”ç7˜Â2ä€6ÔƒLƒ€Æ'nÃ7DC4ô§wfƒz.èzÚƒ24}–g4ÔÈ(|ægÔyšB4ÜÀ=܃6Ì�3$Cxòg=dC6䀂¢çtÿ'€Š(~|Ž§wF€gÌ`H^ŠÈÜ”z_6Ê)f©)vü ^á”HÒÛB'£N8nV}xV=Eé®%q
çÙýQØ©BPƒ>Ø=àƒ>ÐÃ>ì)=؃=èCŸî>Ø5ôƒ‚ö©>X'?ª Ò=äi F*¡ê©žöi?ÌáÒãz* â=Èè>è©Œê¤ê©¨Žj¥ê£ÚÃ< *=ȃ=ðênê<ä© fª­Ê>Äêžbê¡Îƒ âC9àá
h¤J*¬vª¥¢*£úiªî*§þê¯òª–C)l‚:œŒ•VdX.㛂+ºmˆfÍœ3j]Y¾¥*V"¾ÉÿSºî…Gz¥¦i%Ü5˜q¦_f9ç7yÈ¢ž§9'úpåéU¥!$J'£8H
øa£&®E¼>ã»^ä6¡àWÒÛM¬c¥�왢ÞÉñÞXâräk&Š£¾Yìެ똊äàt½’«UVìüAˆovœu"”R%ÈȞ˞k»Ö,aé ç)ÂLÊð«CjSJˆBò§¡›aÕE¥Ý_[´¢9É
ló„ì'r¡Ð~+à0­¹Aí…hÖCš¢Ã,o¢é®Ø«cÉåúäßšªÌ–Vʤàž8†]ÌŠ)�Ž-*ºåþ«§d¾µœÝŸ̪]ú`È©!nB¬á²ßfy“Ö$ÿ-ý˜l9ÍlÁÞ,íõ‰ú©‘YNÑV˜ŸüÇÜ}­»î&Æ–ßÌ5ä½aÅ•ŸÛ}VÀÈÆ´m4²ébåßùõÅìIˆã
ƒZV¹’ÅÊ•)z0UƒVÍ›µDR¶@ªf�£·J`¦`¡b…‹•(U²LÑ…a-!±d‰2%‹K—)ª4¢e‹,4_N±RÐàOŸE
†Tú3iQ˜L›F…ŠÿéS«N±R5X¥	7|æzýŒì0³ÀȦ-[Lm[·oáÆ•;—n]»wñæÕ»—/[¸¸TI³×Ÿ>|ýø%Ƈ/qcÇ�!G–<™råÅ‹õñ³§/óe{÷'¶g�1éË‹^<¸4¿~¯Q£víºß½ÄªûÙS\˜3¿Åýö¹æ¼™°iàû0#7�o߾Μï{ݸ9?ܽoãÓ�û7cÆŠ#F­o4lÌÐ}—FM˜±êðõM7ÿ5âôéïÝãMX³oĺùAκÌÀCÌ@Ʀs̾ÊlÐÁ™ë'u‚ù嶊ÁÐ/¸6Lk˜º:Æ/é2&.ƒé0QT‹EWÿÆÝ¢±-]”±Foä1ǵv²G²Tl±¯ÓòË/1LÉ'7„ÑÅ`Æ«É+‰D²I(³|ò®-ýò%E_„ñ¥C,�ÌP-ƒñÅD1Û„±Ê·6$L-=‘Ë=É"Î'ýì²C;˦NC½TO¾ðú.DU46µ‹M²Þ4M²æ„ëÒ$ËÌ4ÐISÔ�T¶ÜLsÍ6CmóÒT�ü´Ò´æ,Ë-“,fVHÛjµ-¶jõ“ÍM]´X\¹”Ò­Nû¼M5ç2Åcð4ÕÑ_«UËO_YÝöÏ^ó,KO¹¢ì’JIߺvÊsË-vEqýPݸývÊx9u’C¹æíÿõN}±]—O€éì“SeáR÷ÖH7œ×á·¼-ÔNqß­ØÊh÷%ø`*·vC‰Ë¬kWaiEÖâ~i�øã�í¥˜b”]6¶C^÷,NIÃtweµˆõ2à,M5™,“te
X¸
¯&Ûù±õ.æi«
†kÙ
íÅd¨¥¶\Vg¼Æ™^‡ñ‚‰e�x�3ëaÚ±=ø·o™Ú_¨î%c¨Æ¼�Zq¶Áehé»@ÕD±dè�Z¤r]èú':¬ CÇ@À÷NG–°DïmdûÜ®69¼cxÅ0�:ÞVµIÉ-nÇ
¶‰�Zð¢ÚÄÀ:Z¡Š¬¢p'/ŠQQhñêÈä-â¨>Q°€·0;n¡Ž
Üâ°g+0�P¬Cx‡: ŽuH@ð…:t!�|(@*PA>ØaÐÔ‚0/°ÏW°@�«…
H -]
PÐ4rnŠG+Ê)ÿ
£U-%(A-”HÑ<4£*¨€;A¡ƒ¾ã*
ˆ‡*ÊÐ
àíhE	r	ŒbÄu|á3Q/$P‚¨#‘$,�Ñx±¸ä#2-�=o±^ìs¤)u§.rYŒVH@¦kÅ¥(ìÉ‹8‚sn•
ŠŽ‚‚„HS™›€2Š¢|»Åj«&�¶ym°…*. ä·ª"

^‡8}^_äí6›ÊÐÆ4
¢m–mó,ô[Üín½øÐ1l·4Q†î¿˜œ}ø`ìtÀ†¤;iKŸ¸àê=)ÑR_½8d‡L}j
ÌÔÒËÐØÆÖŠ·¥eÿ|«–µR=¶Ð�kÏ*ìE,XÐ
[0m³±h­ÕŠ¸:a4�Cgke+C7¾ªÁ:[>dvª5¸ºC‚nˆÅ ­»š"?VˆcË¡Õ–†¶X8±—¯&ÓØÄJt�ïÕî&œLmJµhÛ×@$õŠ=´²˜H±Â¨š¡‡&Œ\¿‘-ùŽÅߘ8¶V[-|
7õi�¢ñ
1ÚÁÀE+øöD5aˆÞq!šÁw]ª´œíÝü[]\a�{rÕf2õÙ¨u7éiðnLzmÛ��¡Q¶¢fÃà_´uŽí>j»˜ÇpT/~Èa„e,¿Ðv‹ÄB*Ñ)<,¤z72\‘nR§ÙØŽeèÀ—¢ BýÔÜÿÎy¾¡N)³{Și‰…Œ‹ôµàüE
 Š_ ,H¤×V`¶ÉÓ£¸˜d)àp²
V0
Àù
	,`,(ÁÆçžuuÉËéT24µ„á(DYÈP¿0†Ñ³nŒ9½JM]1©Dû¡ÝíCG†0¬.¿²�½d›”Ÿ&"£ç‹Jª:ô
n¡q»¥‚
wõª
Eü¹³SUï~…ž¶ìÞ�å÷
Ÿ:Ü…·ö›:ê)×?¹ßùÍ/–mÕ˜ÍCt%O6„ÙDDøöÛp!êÄb^ôfx/ÐÆâÐ
Ð÷®åä¢MøÐ/FŽ�×pÍP˜-ÓBø.n꘥ˆDdi|¯
ïŽÿ†´lA™~)m^§œôm†ÈÑvNz ®á{0eê|o�ŠhI@çù•6‰7I-Ü(þ–Ç�¶S|†!¼§{˜æhy¸æt\'ÄsGc‡jŒ®Ÿïv<QH�\ŽA
`L÷®’ŽÁkJ Ñr,Îf	-Š

Dguà5ƒ¡ðÖa¢~§â
¬L€á>ã�8ÊL÷Éæ\kTÀh–¦ˆÌÖ!
šŒpAªjaØá¬
¶ÐÁ‚Z
`*
ÞAž”k
úŠl!±ÇM at U1—i¯t
¨(k^jÞ!
l
¦4•Æ <jÝi©è0
äÊ�T at 1A
x¶¦«ÿ<K<¯œò¡ö)?¯›X‡šT oJ@ïZ!|�´é5“^ê¢ZaïÜ)ÁlF�Ràj(KiþðD!
\Á–jám2œ~Ë£Þ¡hêt!rõ6«ñ°¶òÔ_k�l$`¹Ókö"U¿|áÊÈ 
½/ˆ!2 : ÜY«µZ|Ø<ÀܬÇúŸÉšž3À2 žÓ:­¬Å:®Çz®ÿ;@¬ëú�-

, €¸,ð;±lP‚+Àäõa_ÀUVÂøb"Šã!Å”~	�w2d
쫽úªë­Á‹l²ÇÎ*¬
¿â
,¯ÂÿBK@®ÔÊZm
Ùn‹­´´N;íµÚz›,¸ÌžÛë¸ÆÞš-º&àòK0#úRM©†‡QŸ‡’8Õvù¦Ô_›sZ•½í­”¢¨Z—ç~§J0W�ªŠw·È¯Q
ì1ÁŽ7<°zzRtßääUµâwŒ:L¹¿ÿ[¾9Æo†^'äû•ÚË…­H�(³Ž
)ø²À‚�^È‚
ëô²@>í$`‹
9‡a)éÄ>rÁ#
�@B‰�NÉî¼ÐƒÐ
Q´È(DÑ^ðÿb•Æ
�Š‚£Š…K·aÀÀ—çkŸúH£
a®$^YElªÎœ~$F8Ý©N7ÒSð
_s';¶MrÖŒ#ù‰ <óI”ýÕ‘�œ'E¦ZÁ–ê'ò”˜Nª3Š
F½Ø]1l‘žbÜâí
é_©•Æˆ…
lc´¢$ý›+Œa‹JöÂ+±dA,b
Q´À7FKD1ªô⢭Ž#�^ÐA+IÝz£gBaü"ËýÍYÑè�Y¼Õ"÷­T™Í¼3£DS!$a5•Ù°6[•Át¦3Œ&rgüd–$)Uý#‘yµqc/2ꂶNËñ„Ä1ÿt<SåÙª
cœ´¤K¤`ÓÙisA±§NO¢Üˆ¬ÃÐ`0ÖÑI"CyÁ�T;X�‚^89RЉG¬›¨wT’”0F-
T–@Ö£Â2Òc

h@^Q*$‹v¸¬*uZ/wÔ¤i{ÛÚî··Í™ncGO”ª„îs«ÛÜTšÒ–ÒÍnw³Þô^·½³t<ä-‚®×:Cçh¨.…ÑØ)ÜÿwÛŠQø¨þÑOS�â¦Ñ²?
£Îjqâè7Ý¥"¾EF§
ŒX—Çu+.0j_ØBïh‡ìJ`]QˆbÄ]H…ܼ¹^€/F�€|
2–ŒÂžFÉÔXJb†þóБ–÷=Àò"K¦u–#¢Áë°‡Õ–¶ªU­Æê~÷¼ï}®œ…ûà;Ö‹Ä/¾ñ��üä+¿‹ŒÝÀ]Òš°¾åMŠ‰ˆßC5un"x¼V--÷�¼¶Ooðœ+\ËGcÌïYµtNc ¨€@¡”@;â�	¨c»µhÇÊ%¥ÿ,‡2ù ;£JÐ
ïP¢� ;W-0BÞA�18›w�(ò"(’*%gwvÇ!¡}\…+q‚$’*ˆ‚+˜‚/è‚1Ø‚3È‚5ƒ³$ƒ6˜ƒ7¨ƒ4Xƒ?˜‚@¸‚6¨&ñH³/>Xgˆ�¸upç—}‚×F&¦*¶„�ÅxSH3"ñaÍq¯•a	·
5¸PÈкÐ
µ£k(

 Iê°
 Á;¶�Æ€sÆ` ±¶±PÉ;%�
‡q³uÿMp!‚ö$q(aèë”[79ïQiþ$qâgwî§~Ô‡+RŠ
ƒa“[±))´FRæVuqFö“m
K¡x@ËCNÌ$†8
ƒÁ®Ð/ð-@ŽåŽáÈã(Žá¨Žê˜Žë�â�ì(�ãhŽö8*$
úH¸�Ô6û�`¶�Þ‘Fƒrˆ‘�x�
é�
	‘/R"iD‘I/Ñ�ù�É‘é‘é‘)‰‘þX�#y‘¹�+é,©�-	“+i"ZF#év.1óM¤Šd(ô$iÞ—~C¹`C(Vø„§[,r"Æ‹÷0zÔ	°ÿ²&;íÐ
® 
kµ
·¦éõQÆP±ðj*`ñ@–{E9–S¨Y~Pö"0p—”Ø—…‰œÉ©œËÉœÍÉœâÄÀUOX§Õ›v@ªå1	S:´8hœI0Èh‹?UŠ÷1
Y£bBiFBÆ&)¶
¨ù>å“—}vxú§„Šœ
z¨Ù~¤'OáG;Yg *iW�`x©§Ù“Ô(²ž=!ŒÒ*žpDyqX1(ÄY#c2${J«uʧ’øuvú#Ÿaæz$/Úœèj=ìúŸðê=wŠ—h·Ÿ`Ç«K:™ö1O—Ù¨î·?73Tu(­%š€'¥
­�”ЪqÀ9¤TÊOX=^'˜÷êŸÈé®ÁQ«:ê—‚j«þ™®¨aת„º§+;˜àóJZ‚ѺOª¨ŽZ¡ÈÄi”i	{[Á™³ÍƒGF…¡
S³þŠŠg1`—憪°*®éÿ#­z²ÿ©ªXâ²~«yš±ºjvòz÷
¶á
µë% ¤.hg¬E›”kÙ`{Gñ¤´Vå/Kå¡Q´Èt©8CÄÊ“ÓÇ¥/#‰A#]n7*>îµõ:².Z>Y+§è#¯c룜X®eû=Y+¹A³‰šõA¥>É–!Á¤ˆv¢Ø™Š:ᶾ©¡ÙÚ¬>û³£­zK­LApo;�Ø­¥�m²
¼";«±
®Êi¹²a¹»±ªï£‹I˜ Û%0Ú¼—«¸V{˜T;¹«‘¯óuº•Õ@§ñ±·9%'+0|g»…'©H›U6š¢9è�±ˆ‹=¸
¹ñª²škÿ¼�{‰ü+¹d;¼Öû¿a{µZµ¿‹¶1�{°O¹™´ëTº»0êû«ÓYhÀøTXºRê¾ê†ä^ e™;†›˜çƒ¿óz®ʸÁ‹¹lÀ̪b‹²œ¨¼dëÎ{¹/œ½�ù¹$’„˜šŒºn"¬WQwð‘`ÃèÄ'Õ�‹Ám¾Z‹DIš�3¿NxÛ»ÃÀ´)|nĹÑKÆZ[ÆÌ>Ò»ŸS{Ã3œ²üûµþ;vnL½ˆ¹½ÒAÄ$_JUÿ¯x†¾^*ÈO¹ÅìQ}
C�«“œ*|´}±Íê�bœ£sLÇoÃ<ÀÁ±ÃÝÃKfœ²
|vôÊÿ=•‹¼-ÌÉ�š¯jë¨r"°y÷¡ëë™[C^©ŒüÀG̺€wú³¥ìÉì!¾Pœ)¶™yV¿NÛ{Êe‡«¤ìµ«¶vœÊ«Ü¸";½u<Çùêv|l±4›Á
1ˆœ?’*Ëß÷Çz¢¦¶˜�}DT‡© ±‹…\»º{S¶Ì¾ëm${Æë:Íš,ͺ›Œ¯fûÃÕ‹Æb²²:b®ù:³{ë�{b¬XˆÅã,Zç9¸l°Ž<¾W9‹ÔUœšž†R†”€¤¦ÙiŠ7ô©‘mÇY¼b÷Â}9Ð%[ÀÝ—¯‘µ9,µ[‹¹>|Í	
Ô8-îzÔ
¾ì¾Îé¿ÎëÅžêÃNëÇþëÀîìÎ>ì¯î
/òx!‚´¬á`ÎFÅüÈáÌáÛÙFx’ºÝ团ÁšŠuËß
¡`ö0ópó@ô°
øPõ Û`Ú`õ
ßï÷ ü¾ð	�óø@ïoïÛóõ 
9OðõÞïÔÀï-oÿð
oï
¿ð5�÷~ñUŸóünï÷ÀõÔàðø pípEée¿Y“®Å‹
UëKÕÊÈQ}Vg
7àoîÇí]‚žÝÄ/Ç ð	ô 7ðÌ0
óð9pÉ�þ~Ï0
7À9 ô€Ë@
0
Ûà
Ú€ð

0o@
8`i ðrðïÛ€8ð÷@p`
ÄŸË¿
§�€ÏðÛ�§ý€£0ø7�
¿
§ß
O
Û0ýÙÏõpúÛ
h 
h
–,P¢&—:zS*Óœ½>ªÓtJž¼lÍæ˜ÊM^´nö¢Õ«'oN2|ÚÜ4“w/™©oõüÊë¦Íž9ݲÝmÖ¬p²lݶ1›6¡Þ3f¶iSÇž<SÊì}ë[Ï™œlöœÙ¾koÙ²gÚä­¾»-Ù2¦˜=ÀÇÌÙ¶pÚ(8›³
Ÿ3ÿ¾õ¾}Û6'Zä9˾Ýuv/Ûf϶Oc6ÇÞ³áËkû6Mð�fölGl¯Y²üäYF™îq&šlSæ®»  Ç%�~F‘ Üj$­„‹§²j
Ê-’6ª­—2|ꧣŒ©ª+Y¬	D´rbë+³F\±CšT¤q+_ÄñÇaÔÉ'–fJ¦?21&¹zF˜uÎY‡�vŽ1F,Õ9Ë-Ù1fuz‰Ç*¿¼²�bÔIL6}YL_âQg�x|aG�;³T§�,ßÁÒOuâ”ó�uÞaç@³4æLcpÙsNv|ÉrÊwx‰ôO7ÅL9él‡Ì)ù4ÆDÓ,fQÿvÒTçJ^®üÒK,aÍ’Ê=Á˜c¶ÜsTatrÇ]ü5,¸€ÑHbvØaš‘ÄŸ|1'_…|éÙds²V¤%ÏzÉÅe��Ã�’
W$‰ÑW²°J_hê‘Yzëµ÷¬sѽGœfwÈpqú×_��Ò§£Ú�È•†+%w¿�1ÄrÝê×ƲÄR*ßy›åÊã•zºj©|CÖV'_#þX_cuZò*d=üñ_oƒ
ñª$Kä6Û�TÞ÷f�it‹f`]öJXƒ›U·B¢¢zØf¯¬*šå£J†ög‡)6™X’§¾ð­
É[Þ‰%Þ˜C³Ïxlž‹…éédášeÿ¶·
Æç•Ëæ·(a‰F{b»¡
¸fyÁݺ㩤¦Û¿'Üï¯×¾;f¸Œ<ò¨/|æ®Dìk¶
nûí /¬Zl�ÉZzò¹Ùæ‘àÄÏU¼Cco™ðÑe<6¦±Ž¬=õ¸I7»[Èõ>säIüü­œ9§[÷Ñ{Ï�j|…Þu¨¿þäWry«I/kÍK7ÑééÛ?ù²¤÷1ZêQÌÖðÛl·Í÷â�~§ÂålwnS	»˜v5à™ié‰
;'2Ò].o•S`Yºö>í…-xdk	’*öA{…o{|ÃßM‡»Ö¡­+MY¡Ä¦5@þ‘�uÖ3^àÊw¿~%ÿC,B˜ärøCÞŽ(kIZ‹h×ænCÏÚ!IªµA´­�w1;�—¿m†Ìr
åæ6£
/…4ÜI½˜1³¹e)Dáÿ7¢µˆFdŸÛÊ—Eh‰Ð,]Y
ÃƨG4bÐkúò™‰9C2ƒ'£ï•H%Åoˆ§c ÛðV½ºµ1‰j+Ù´|rÉ�°QiYiä«¸ÈÒÑäe�tcû(IÀ¶2s^¥	‡5:"‰`‡Äe/q„>–p}/ÄåÀÒ¶ÆÝR%D\&ÄpX£ûáf˜ô%*•ùK+ú‘šdäW´™;P–
�jcÔFhLn*«’öÊPè¶Æ7ÛÕqFžÿ“¦
±™Îìmè•{æO’¹ÎzYN“Ä"f5/ÔΔÔòW««c	#WPª.|q„b.7x.ŽY,þh‡ž%ÇìQ']háONe[¢|#Iþ™À½ïyÍó& ÉÓnŽíŽ
å)ù¨Ò4–2•*y)½†&ÇW–óWÝ’ÏŠ4Å›¦�£Û<b$�·8\µ§×lêM%¨Å‘0Óu?Õ±ö	<Œ°�Q
*ÝÎH/�æ‘wœW?—³1®{}_àÄÊ3PjÕ¦+Û%�©Î­vŸ¨SçH`€ä#!ùÅ0€ÉVö²“‰e1KYÏrV³Ÿíìf3Z�D¶$½0‰ÿ/à–_#¶±%]l‹ÁZÖÒŠª­i{KÚÑŠµ¿®oKÜÅ$²†j%›à÷¸Å�®qƒ›Ù`Dv¶aT®rÕâZ×Þ­\$©ny©{ÞÓZWº×%nz‘[Naè˹¤ïIÒzßúZH¿øµo~ù»_ÿ¸¿0�ÿ{`
XÁ6p‚ü9Êf÷#¹mî/x+[#)µæ°é:Ü/¥>7rù‰CÒ¯¶‚ÀØ°‡]âcåÃ5#±\{Ùa<Ö²œñg1k$Ç]3ò…æ‹.Ý6i–��'ûØo9,R.	•[c,Ëø#Ê
F¼*¨–
×õÂ~o}»›%¼r-®uÅlfã¯)ÇW÷qÿ�w\ä ÷xÈI>r“§¼ä+o°.8¡‰4ä
¯?¿ºàû'tá	Nà?õ{ï|ç£>ø@,@Üs‚1à~€]H5ðʼ¢$¤žiBšž´@Ü@
ìÀ
ü@
A¯ OÐ�%¨-À,ÐTALÁ|Á”ÁtA¼AÌAÜÁLÁ,È‚*˜ÔÁ)
Í{’‹{³lÿѦ�›DÌ&ED"�kÄübÄGœÄ‘ƒD“ÄJ¤ÄDÌ – Á5`1tÁ:ÌCR,EÌ‚+ÐD K€D#œCÔ‚,؃LÀ†<ƒ*°‚,PÁ/D„L¸†WÀEìÅc¼A$4Ã-œCtÆgÅ1,ÃQ¤E_,Æ, ,ÈD¨†k8;ðFKPÂ]”EiTÆ3”E34Ç”EÂ*ˆGr¼‚DÀ„Dƒ(J¸†KÈ^üAdÜÂHS,Hƒ4Æ#À†{€\xB+™š#ЛHŠ4³© Rˆ&@f<H�ÄÂ"ƒj‡IƒX‚GØ)°‚G¸„j€†Fÿ!Ôƒ—̃*ƒD¸KH„<˜‚0¸„KØ+ „K D¸„DxÇ%´h¨0Èh€†<ÀC J€H°„=Ø‚xŒ‚ªÄ­¼:|Á,HKJH0J:¤‚0ÈÉK€„- Ã= Ê0Ø |E—¼Ç"ÌÉ<ˆ‚.8K°£¤*p„íX%°o€çû‚JÐÉDø‚Ä+„Ç´„GˆË=€Kð1Ì=ˆG< J¢|Ë:˜‚-8J«„†K¨,¨/¨GL€„:Ã-x„À¼„G
O^*Ï:O¶š£¾™‰q …O¼‚Ž$E-¬Ïv¤N´Ï¼‚Kl¨�ă+¸/€„Bkøk8„&„n‡B(oðIèƒB.0ƒp‡Fphk(„DMD>hø†nx‚CØŽD ‚Eøo˜„E°l „&Ðkà†I at PlÀ„<@Æ-h‚ý†E¨„pð†Cè‚B ÑI�lÑ"€„
ý(ðÍJH‚HØP at pDh€‚D°†pø…„%X„#U%ð†n€' àTG°†àDÁ-ƒKøn„?(;à‚J°kèƒÿGh‚CPÌJPnPÐ'ø‚<å†"•n8„# n€†@n¨Q(PÌCø‚ånh38LðnX‚0õçÑDhI�‡p`„Þô†D ‚<GdFý¤Bü¼Ï_%ÖÌ‚&ÐÎtà…
kÖ»Q’úÅB9%¬²*ÚjÕÖlÅÖXºÖn×oµÖj�˜rÝVo%¥tÅVråÖq5לÀÈ6 +°N{MG+ø'(ƒDH„j
•yz�ú	´¨¯z¤°ú˜�úõl1¨±Ù��2'ò<’b(’ÛrD*ûrª .jÖa»‰+kÖ'º̃@µ!h}6º×.ó´R±2"@ü­àúÓ‘”Hµ’ÐûÂ×
®/)�à¼ë‰!o	û¥©ÃŠ	ÑðŠ¯)S‘Î}xÉ{vÙ0Ð7
Ñ×{Ícü.Ó<r}º÷|Ì|×Ï<Ñÿ.ÍcøbýÙo´H÷ýþ�‰/âoŠ‚}°Y«Ä(Â?�µÜ/—
/‹4±þê?‹Š£{Äo›k-Ï/ÌËý8³þ53‰Óß~äq‰ï¯+î‡}óǼŸý’€—a{Ô¯€ð%ÌW°‚‡,(,Â…BdáÃ…,LcÆŽ	>¤(Q!D�r4‰1âHa?hÌàL_3#¾¬ò¥Æ—39bä¹±"K�C�öì˜'D—Gƒ	sS ÁbT‘*ÊQèV£K»¾Äè4¢Ó©XsN48liѶ�
,séغa_^,økeQ‘:ÑêT—åØ„ýD	.T·,Á’:’¨N³O¡ú’ì7ïäă�j,\¸éç¡s‚ÿ^lgb’�»]Û–¯ÔªçÚv¬67ÖÕ£‹Zt}tªe·wÿ.ù;yòÖ
7oì|ºÂ_C“¬ºièîªËzÿ=4HàamF6ª»hÒöZy«wÉ6ØÍ÷!¥¿µïµíúl¹òFÑf8
–ßz“ýwÙ|d–•W‡AX•PLQØ|Ú÷†x†˜H]9xYg#WŒ‰ï˜–�²$`_+îç[R*™tS{¸¹7˜vÑán
YeYŒ÷©Hd‹0fˆ!…ð)¸AfX€è‰h.*¸Â‚/êÜbL/&3“—Å cb/ǃ‹F¢¸RL+¶c¦‰ÆÓ‹—¸sŒ-¿dÿË0¸óË1¿ óK/·ôÌ™ÇàÒΗ,H°€-Šöbg1“jUg¥r*ZÂFg†yi¢ÇØÙè0ƒ3è1"ù'žÁà²QœŒ¦:S¢‰*d2±îº‘-?õÄh1ñÄ‚¨šuîz©Èú‹u‚ª‰K¥Žƒœtöë1°ÚËž„
ƒŒ-áâòKšíH[æ«uâ²ÁŸ)(Zf/ÈÄBèZ_†‰ç¼¸àBjµ¡~L,¸¨SP©µs˯Æ"p1Ç sKAÛšª¢Á´3pF,„)ì™È<rŸÈg0»ò‹2©UÛºC|.»
ª(.± ç´mÚ9­µm²-…2ª­Ñcÿ̯Z}‰Œ:Òzù©œ¥~§-“b«Q¬^Ú‰5œuŽé¥/–Æ‚Pб¦ŠÌ
7?Ì-ÈœYi<¯­fš3Ñ}2¡¿ÔKo
Ã$;À,´®sÁO¾ Sž­ì:½È@nL
¢$--}
Û4¶˜“ª¹k/Âtm¦1¢´#ìFí½Q-±3°:=Û„·/¸¬Ãï˜l‰tZ0,¤O/,¨°N-	HÀ‚:)H°�+DªB+H�@+§—�
µÜR}®ørÁ`ÞÊ´¢N	È#àJ0|"“Âù·Ô²@òëÔYL,
¾Ô‹´#
½àÿ…ü6
¨ç
;£Õ[`áXW¸FÊN‘*A	ÖÁû]�zðE	. 
[à"
(�EV Šcø"±è hŒ¢¯`vZÁP‚X´£%°à1X 
_´£½ØÀ:Ô±
79/u’
é…©Q´Å-dˆ€V£�*
	 €€ÄE<jQ[Èp‰í0Æ-Š
=/Vk†íÀb+bQ=Ä#
@%&íäŠB&/ΓÀ-ÿ '�ë½1Pò ¨/. M%0Q-ÖV'[s
¥ìE%�[Øo�^b�ø. ÃþÅcz	P
ë°€àÂ|ç“–üÌÙÊ\ 
ª”á4qq>,��Ï#Õ—ÚQÉ4J@
¶èE at 7ÐG€¶b<Ÿ-T€'Qp,–®€[¢ì(®ó%`R~j
â¨
"@¸ÀFà¥öb‡­âŸ(R€LÌ1
Šàù.P‹ôL€?L^;ÂäCþÙ±‹¶hELKP‹,Ń
òáÆZ
]ðÂœéû¡*D¡€¼ê‚®(.ØñL49ÖŒ%�c-”€bÜb
ïPG+6€WvÔbï(Æx¡¾Z `¼ð…Ú±
@€eÙÁ^¤R%À@1ÔaŒ½²CÄ“€]�±
)€Z` Ç·ðE0ûj×·�…9SÀÂZ6 pÅ:¢xO
Äb$ì©i•<à|C
eQŠ§ —+7]YPñ§«@èü�<±o{hQð™Ø+X�Áuaïb´øxÿµz/Öóq¤\¦©E±
ÔRÅà…�ìÝG^(›x  %n/ÐtÍ{Õ°uºkp%pdñ"ÝsÅRðŽw¤àr´¨qŸKJ²ãKº
¬À¦ð‚+hZ
° €1
  Ç©
�°ƒ³üB<ÃꥎÅ8P˜ œçC¶…É/˜H;Jê¨Ã1Ä`1`ت(Ä´ƒ†mK#>LÒ|‰qá‹F ÄZ<Œ‰ IÔ}ˆIÁÔNªÉ	öüDÒhâ$‚
È„‰CèJÀéÊB$�/XÜ!õÂ%ÒW‘ЗÔ2D�ÈDÈÀ˜ÐI¨HŒÁ¤ŠF0‹²Lâ¶$ŠF´!}€L ¤Ê¶
ªJ¢ôIÝž"ßXG18K£üÂ"¦œuÜÂ-æõ‹ šÈÒPÊ^TŠ³¼Ï­T
Xvdªð¢™TÊÖT
0L¥®hNUÜD¥ÔÇÅà
MÐD¶hÍiV
éà
ÿbhŽij„<JKgˆoúæPÄŠi>fV
qRJGŒEJcA 
ËPŠ“\L¶ÄJ˜@¤iÞÊt>mŽNGjÎOÆŠld'BÔæÅ(cÅ|Šn‚b¶lžø£AÄOTf/ð	®Š2‚%I=¤|nʉ´yÞ
.,Äq*£i}žqV‹2â¤GÌæ�òcIœH¢xN¬¤‹­$
€
ÁõE èĘç¨Ê^°„1èûð…yZ¦0HaêKUª'q*çsƉsœl<Äe’}˜'=I[¬	Їâø[)m
°½™ruÑÀŽ€¶&Gæåûl£¢¨U€¦æÉ ÍÊè…Zíæ�’¨Á,„¡è(Ú”gÀ@
׌rv'Á­GmâJ4Þ
Ÿ`&ÎéB”ËqòiÀøæŽ
êɘ¨r"h�¨—ØæP§£ò(t&gt²TÐ玲èQš‹Ÿî(¥Ô*�†è‡r£­Â
4Îi‡šf¡ôŒ¢ŽNoŽÎFH¢|*Š¢¦eúç�^ævdç‡èt
CRª…¢Bè›Ú*®Š0�gÍD+{–&�–Õ8gtr«¦”&«Ê(m’'´
j‡º+®"§sÆÉnžçslEœä¦¢n¨rÖêy¾«n0#4Nôÿ2
Û¦èH¨•_F�B©°(½
GQt'®B„u¼�AÜ^�Šå’Îá6ˆã’ÈAøDÔ×ÖéZì(GTeu2ÄFÈiöím®D\æÿC²(©lÍiæÉQà
Gt¦ïÆ®uPí�¥Zì¦1\@x‰ÔY•~}UÌ!š= ªyJš•
ÿ¤—Èpjv†qÅ$
£¢¨ÁÈ‚ïþ$}«,^¦Qö®ÁÔ‡¦Ê#®lKoʧ²HŸ�×À¨¿îcÌLþàIOÊÉiX)#âÌÄÉ©,kç´B!}kuP—€–1ðÂ,iQ’L,J %Á×-äpz'Ö–Jzò"¶Ð‡$ÃL¨D2¤¶‡Öäɦ4³ÍìEOøçiåà�‰Z§k­Dâ
ßDšÐ‡uâK¿€ÍF®¦g>rr+ÜÐDCtfhÞĵâŠ=ͨ
´À:Ão.WK±˜"›"ž
†%æ0ÜBÌÃh8ŸÓíÙŠ�òIMôBF‰MžN˜`$h^prLJ/øÂ:”áÖØJz£Uxö%U‹-XÅI#
îR¥kÆ"Ö
ƒÿ§Ìï·z&˜ˆä¼(™/ª	Aøv†
ãxvòGçH¨€zfNcn{މˌ
H`Kßg˜œ‰í±&�ô¦À�IΉǶÂj”ÉLüŠÒ8%~L,*
EèÏ›¦¹ôðÊÀ(–ÌIZï!Iò"kãC‚Ô•ÜLíÄ‚jC¥iQJ�ŽÍ ƒ	¨¶î€¢ îL˜ìÐI,ƒíÙ‚MÜL+Lú¬ÞäwØ£ØI€ƒv+`,¼øBxÛ„0ª‰À€Êbç6C0w%æ®0n»D¶ „—ضy’LÒîóæF4¿1jŠpcë¬è³ÄOm˜%=Šõ'7ÈVÌK©
(Môƒ¿éÛœ‹ò°À:Z©€åœô‚
$€@ÅÎ=}Õ5ÝØ£m™Ë
”•/OÝ
�7,yQÒõ¸^Ym¬™K

ÀAhü´“+˜€‰d	2�…;'¤u°
lKÖÝûºów|‰Õs¶ƒ§TË
 Ã½ýÈÂ-\€=-
™.Ì�´)ÙíY£�úXÅ=¬CÙVæ�`ý(Ù-¬C,˜þ윎¦D»¢ÔaX°
äF{!mg1»v°SWK8ÔÙ«—v;I…ì
®Vzn…l9—_‚)&;ÚâlN\KHÀÄ0æ˜bzQ¡RÓ.pe$ñ8ÿšª[>|p¤V˜Q‚[DSÐU[ª¥ÖV8ƒU…ŒN­­6dÔd	­ZøË9ƒ¡•$îzÙ

–Ýè`Û®^j •€ke!áb‰¥ÆqæJ'wK …0EšPJ¸XbKÆ¥»bè¬�¹@#\8ã̤ §âŒë,EY–÷p¹¹•³¬_ŒÔùå\à,ÃZjΣôÜY�^š*¶FCkdIä^^
P€›XPe�
<?ë‚b>æ-䌙ªÖ¡èD@Ñpm§Á½€R×,ÕÁXOÝ
yHÂÒb ¤	gà
bŒp‡)”…Oq‰2b[ƒÈ"K¤¢W8Ež O”a²ÈÆ%‚ð†1ˆÁMXE#Îbx"I8Æ‚Sd£I(ŒÌÀ†F´a†1‹áO..x¡ÔÔb.¸¨Í•zQ'…@á{.Ô¾ÿ¹¬; ’$ø='É"wš”4©Iø;Fh¶çªÛ<éJáCRw–å$×)å«ää1H—³Ñ¦jH²�©„‘¿Úìå6áÃESœDnÞ7Þ &ÛA”v˜ªbx«X悱‚í]	ç¤Ø’0—Jšj¦/HiÍaª£)¨EÅhÓ‹n¥’“úÓfƒšò½ÒÝÆ~ÆF‘A¼‘Ò·8XwZu%u�#Iq‹î\gÐ`�rZV"ßJ£Ä‚UaËt“ß-Ž
`~ÝÆNëR—+MS“Ä8Ø“’„¿^nË
{ŠOcÈ¢“ÝtÝ´TÉ;
®/;´@2ð�®~ÿ@+W?0Öxµ¬]ë¼
±²u«n5+\=Ð
·‚@® ˆ«XëjW¾Úu«fõ@_Í*ÖÈ•«zu«¼Ú×¬µ{=ëX3@Ø·NV¬‹Í+`	‚V­jŬ_GËU¿V®Ÿ­«\ËYË–ö¬[-kB�
£IéåÁ0WQhÕTuÁßÙLÕ in’•CÁ0Lî)õÂèD+\MÚfZ˜£Ò8Ïi0‹…¯9
åt]‡Õdꮀ¤ØMÍï¨B½îoiSßຊ¹c’R×÷ܺ¸Ê`t�.€½õþ&˜â^Âg›…&°¼±8Æ^|Ù@ƒ’Ò¸ÿm¨0°‰?iÒÆJù„¨©ˆQ Y`“�¤<iÁÖ§$û�4mÄ¥Ò]X
Ì'Mk|.•1"¶
"¬™<êTטJ’ö7¥ÿ�jZ›ÚÒ¡Æn’SZkLƒšà+=µ¾¥¥‰¸Ov“ý}qSûB 9­¯¤RŒß˜Jãs]¥Lu¢v¬ R±�@Mó…&$󦞖àÉu.êß8m=×yÚnqƒE[´¢•÷Ò±<ïu3êQ—zÓùüô©Ë[Ûî¾ú¸«næÙÞ›#?u¨:>¡ÏºÓMxù2žö¡»ãoï)“l|ðµ×}¨¾4;Ü÷þs¿ÿÒx?9”¦Ùo`j|£æóEÐÿÑÞö·?¾Óæ|Ïc=­f_úÓ�¶µÉe}´Ýè'Å/^nšvÇã]ç¶F2ãÏŽøË×e/8Àìgo
­
·p¥�¿�
µ…Æ𧈅�
Á�—HŒÄ�„ÄH
y�†a~!LEòœ~ö0ý6ΕÌþDîþ*ÎEðI-C®
�$h:/
2EKK‹ÚÓ;¿<Ãsêf«¬\€ˆaâÑ‘’•0Q9Òÿ¢Ä—Š²ÑŠ2ðÐ&53ÙLî(+*ÿÒ*ÿ2(1n/oCwö‚”Š
•LJ‚”‚˜ää4•LÅ8Í•¬[¦µ2É„
 ÀöjÏDmE‰¯Dwïû˜Oû²Fc´øZÔEkÔFeGqùh4G›ÿ¯EM€K(ÒJ/ÉÜ“ãÒFï&±ýF°N?I�ñ°3Õñ@
Ž)áQ4õ+§2ó´rJ�ò+#m|ä"«ìëËtÈ”L‰ÃJÊ•�ä{:”|:‰N9tÅfpž(FN�d*)-L@N@PàFàH PE at QPQ`QµPO ò'#+5ò.õJ\¥T
ò:•ï8T35B…Fîâã4U¥ðK‚T•UÏU+US7ÕR‡Î|ZÕVWWoõ§l£“
Æ|6u{ºqí¦´k�§”íúNãFSÔ̱+‰®@ûQ@í±KãÕ U|²ÕZÑ3ýs
ÔI†M$€Œ.NÿârM.äBºàÚt]›C&ò¡´;*Ê:7æWò'\W

�}Qµ¨mϪl;ûL<¡n©Þ^‹¶Ir$!÷¶çÊê`Û¶e›Þ¯B at 2Oê¦(¶I.Îx«õX«V“ƒ7†E†	ïј·ÑñRQ?[sz	û@ûóJDa
ŽÓØ­�Ú³+†}ØqÙA ÙŸ½ØÛŠ¶ÚªµB€Ú�Û¡]Û³�Û§½Ù™=Ú¡ý<ÿkÜÏŠÜÏÝÜÓ½ÜË}Û¡§×ýع½ÝåÛßݳ¼½ØÓÙÁJ2±*þÔîyýC	ZàƒW»¡[ºÿPÒóóÄ}WÓO3×.kM�’O¯•ÔâüRõúºÆˆ‹6r©°éŽMç|,¦AèO[ØÆ.ž(]IwZÀ^ ^àb¾^ f¾v>nçi>æço>çeÞèg^çk~æ‡~éy¾æiç‘þ饞ê�Þêc~æƒÞé›~飞æ‹þç{êm¾é�>ì¿^ç³>é×è¿žæÓè«^éãÞë]¡ëÁí¡ÞëÓ>Z¡(gL^iœCxâKØr¯Ûƒù[×·R†ûÿ0Å­vºEø¯3>ËɇKŸÒçqZN>—”m
F×nÃó¥ÉUxâ(8óQ9ÒrȦ½
«K©�:ö…ú©K¨m?¬e¿ªiß´x÷o_öyŸ÷w_öqŸø…?ø“ÿ÷‹¨‹ºöMëø¡ù}?ù‘ßú«ŸùáHÈ|ÀK`okU’§•åY|×1žâ�÷ƒC|('ß�Ò)k,@•ùýÕ¼j?˜8FH@)X põ ]¬c½zÅÂ…k‹b¢VàBö«…ŠcÁ‚
Ë8¬XÆ�=‚æQdF“Á„¡9RX¯ŒÂ`t˜Is¦5sÒ´ SçÍœ?{öº§Ð£ByÿÖ$ŠÔ¦O£M£.5ªÔ&T©V±öÄi
…°_¿€+æ뤯’,Óª]›¶#[�+Ýj4¹ò£I¹,Ñž‰ñ£Ê½o³üû¶n^µGÒUœR¤aÁ€‰WpßÇ�—,ÖªD¼Æj]h×N…D	íK(¡U
dÁ.øBV¢,$¬–ñ®_rû²¬2óÚ˜9?|Ðʼi†æÐk^•ú<zÔê5±c·Î=*Oľ+k—¬_Çi1³UOØxàÄîã§þÖØGâ÷Ñg^¼mpµêUŸ|ö¹§\o
3àXg©°@-¾Ô‚A<¸¨ Š-³€/J ¾äË;t†L;ÿ	©ÓË0í#�{íåI4ª“Ëu§ãŽ<öèã�@rå-´€Å0òÙ• ~ÖØÛdN"¨$dâåQŒm‰„åz\(X“r5Yœ”“Ø$0afå’
ÊBÏeÂ!tP©¥Tª©¥œNºé§�†
) –*j¨€�jª¶Êjª«’zª©´ž
+¬Özk®³öZ믶ºªª¥¬J**¤(3Ì/5n$|q‰™´”�9¥—IŠ9 Fý�7ã¶Q’ù­HJ‰fµØÆfÒn™ž¢lá5Œ1ÿÌâ‚"o«­Œ-°áÂ[1½˜”P¡½ðÆ,·$|íHà¦U.}ᵎ
­´àŠÅ-ˆR1Æ-´P±(‡Œ1È¢”Š('£¬òÉ)¯¬2)³ì²Ì-‹Â‚Í%ç|sÎ8«ì3Í3»|3Ð<›l´ËEã4Ð0½ôÏGÇuÉ7WÝ3Ï)WÝJ;
Ê?}sÛÂðg?ÁÀJ¡S !Æw�eÿ¢PÁ;$p]Hà쀙^¡ŽÔÔ
(»@
$PU8H†ÅP‡Š�ÂÖ(@¢�
Ú±Q`ÄbÀ¨…+úrŒbTNQ‡(ôºOÉÍÉü‹)í”eRónñ( „�Œò"cåíkyÛ�Þ¼²ãyU/ÿ�Ô�‹/šñI­V#c’¿à7¿bÝf6õU¥íZiUkÁ¸Ðq¬y¼JXkU„Ó™Eµ#ƒëø_<B˜aÖµŠ
Nc¬C )Ð2pQ
€pȈ…Øa3v¸"„+øE	PO]

/[àŽ—*�„Ë‘”¾XGgZq
ˆ
*
C. at bQTˆœ8R@€v” ®ÐP0b!PÓ`ˆ$¢¸@ZÕ‡>¸”¦}­3J)2°bl§„ϳ¨­¤i
èËC�ùüû5g‘M€ŽÿLsjÇöZk²…É·…�±çF_Ü‚yydèGjBÀÂWÅlÙÛÚ~Kù’íi7[]AG�hô¿.%ê´p“àºp`ÿ #z[	,`·
¶QÞ(hÊÀùÈo�!ŒÊ‡GÄÈ|å-�ùðh¾óšýæŸåùÌ{¾ó˜O=çGŸzÓ»þõ°�½ìgOûÚÛþö¸Ï}èqúÝ^N>ÆWÄf¯Ç|‚ }ö6‡I׊„ÛÍw-†×-áàÇnÊg³WÃn9“QãÑgŒÞ&ƒÕX¬æo±8Ÿçlñ»büæ|œk©@l±‚:
Ê#úºZ¡þîÆæotÒ)`'-0xÄõvç~æ·x¿
ñ+âx)aDÀ«$<K3¡�ÿ°´�Ø� È�"È#‚ˆ%˜‚¸‚G1]
:ákJâg¥åh Z{´ge4Lu SUm|#g.ÈFgð"apƒ„t¢P€ò—,�
dL(ÑhÌ7·@†åu{FaMØuÆGÖGªt7	F7ÿ4&×6a\âOý‚	`Ô
¶qcÄeNÛeNtÒ
* 
)p3`'p%
Âé$
 A'�Yè�	à&è„Ž‚Øè4pôí`kFö&@y0pŽˆ�y�™�
I‘2$qaVeËB-ýAIh|ºD{¤ŒXÇ|YEMȧ„ȨnQ‡hUÕZ÷%}aW’’á- J�!¸Àp¢Ò�§Vi¾Ð�r35™Žc¾ 
sèAÆ�%
Æà”)�oºP&&
µ@1à
  9‚DYŽ¥j¹�ÿp—>’
"
&mW5@vP‡_
£>ƒ'xãÃJ< ç"¬äRqw(ç¡Œg'ºó'æ·RÿÂÂ@40
¢DB *¢´@eDR¢$º¢*:.J¢ Š¢Dò³ðE2T梕§ê¥W>ú£@¤B:¤DZ¤Fz¤Hš¤Jº¤D:Ç0³À·pòÒeÜYLó3‹ÛW#,GrÓ’ŒsuM¥T™})‰ŸÆô`úƒ„h¹%„ň0
ª!s(
Æ Á0k·±WH”vò†%àöÈ!R#Š;‚ÁE%T1±MAQÍqo™:ÒA Ä
ÆðŽg¡¡F”íÐ�åò â²<Ë#U0Жo)—Ò1K¡+’ªüÚ¯þ*m
£<¨Ô¦t&E¹zaÌšs÷ùEÛ«¼Z`j·Zÿª«’Ð'°J„HRiN¼À¡†
¾àOo‚­ëÀ5Æ€­²± 'HÚx
kÈ¥�‘vÒ•’xiÙõê–4±2°£½3H›´J»´L›A$1OÛ´R;µT[µV{µX‹µQ[µ[‹^û´êƒ´
cT›0HK©Q…rjêðiEÿè
g鋃&Fm¶_úsž]²F¹˜6¸�
³NV’´|È�©ryQ3!Y8�! •W0õ9±²;»³;a6‘av(®
Lr‹)v:ØÍF„
æh%[’ð™žÁ„—¾kU{ÌŠRè0
Ø\añ¶pu’Oq83(RA	rÀ“’—¼'¹¶(u(ÃÀЛ¾©›»)¿É‰›Ê	œ÷»›ù›¿øË¿ï+;ÊEª %'ìS
¥Û"|0W`–«Š9L½Z‡Zeǻǚ¦±Š’{T¬vËG�€õEJÄ&eÎÕ\ÅpÄ–�•§ä7{ñ æ[·b-³± b<Æ1 alÆh\ÆaÆe<kŒÆoÇ3pÆc<Æ2 4PƲÐ
b\Æ~,È€<È1 ȆÈ~œÈ„ŒÈ‹|ÈŽ,2ðÇ‘ÜÈ�È�lÉ„ŒÉŠ¼ÉŒÌÉ—LÉ…ÜÉ <ÊŸ|È3pÊ33ð„y	µ÷“«[„[J°ÔÇ|ÿ•¬»–$d-Ó†up;ZïâOÿ§Å@\|ÅzU9|E8�ç$¬rΣ%Ü·òÑRØ–:Á©>´3�D?›³âœ©‘¨:©s–©£:æü
 �:­Ó
ílQªóˆëŒ:æ<ñ̈EQf)QóìΰôÏÊAQììÏö|Ð
È…|8p¡
¸�+ )pÆÄ•:Å.�ÍeA‰Ñh¿ Èq½³öªÿÅ*Ûì�Wq�'8×™*×r-qý©wÍ{ýÖ(‚x­³[QØ~�–pyùQ¼ÀL8Vxû«ô£¼mÛa±Ìn‡i¬�6´¸Ëê{Ã"c樰�sØ
à
Æpc,à
,pá¬>¬ÅÇÚL‰�(ØöÚÛ¾ýÛÀýÛŽ´m6(’ª¾¿è°ÆÃÿ:uÖ4gâVÖ†[3üF¢@šrb�
Ål[W×%—aØ\:n
×»
ؼ}�ñý©Á}ßA‚ßA¢ˆp‘kK„é½Ü>½’Ö|Ëâ‚M?7·B¬_ªJ·X’ÔRšŽÃ/ûbJÿ¼!«Ñz„îIàWG–ï­ÛóÍסøͤ8Î~Ý#ý‚%nØ‚í‰týâR
ãò½â)~â›Úâ+N㞨ˆÄ­ÌâDãFËZeE6lÜð97oFVK…‘Φܻ4äËû—_F¾¬Ty¸0ªÜã°»ªg`ÊÕ~�Û=Q#Nã@kâBñ³vÍâ	9K6Šp>âƒçpMØúÝÛ²dý}—bŽ¬BœË[2ËnE¼”Ý·„
}[e
ž0WFåŒIÃÀŠEþä0Â(—ŠÑ󼈼ÝæÜ
Î$nq>çID‰©xç„=m^ß-Nç6ŽæòÍâ°ã:®ê“h)ÅÍ-1¬}ÿ(9½ÉÆËç±l;mÍ…ù‘kº‘_î»>8 at k;gm1»RþÃR7¯­Û-(ã(ÎínŽëöýí3Ž{}×v>ß³Îê)>ç¨Þêªnç«Óîx^çºÎ:|žÌ"�®±—
Ä5è¼”îZ‰Nä¿
ûèÑ}gÏ÷YÛåñïâGro{Ôu1R6î�DpîêQAêj.×õª©$Hî$´®�§¾êx¾íàŽ�¯>?~¥…þ¼’íå™Î’ßsØwÜžåmÄa³�°pûµh±sôÈN±[-%|¸Íç�ë'/Ü9>îÐ
ï..î©ÞòxîS?ãü½‘烌@?bú�ƒÿ¼–à?ŒÅÛ‘I’»”@Эô²Û?Ä«ì¹êÞÙ΂qòÑÁæinõ7~ø[Oçù}õƒýí_—�h?¾Q	Å‘ÿ
A¸üdÈéþͶå&uZªì¿,·3Ÿ �á.cMŒ>mZ<gŸÞìjA:ØþÍ‘ØÍ‘#'ò¶Ïø†ëóÞû¾?ïæ^ãyNü\�×aOl¬Ì&Eü�YTíÇÍs¸»ÓmíÒ.D|·cJÔ/
Ÿ.ƒ>àmº¤ƒÛo‰X�ûÞî;"òä\êMáñë/Î"ïþ)ÿ»îÈãxÎ]�þ
>ð?£³8êF1õïèö<ûˆé†.ú4€m¤Ò(ªtkNM1c–õÂÍ‚Ž\u®¹C›Ó}—Þá$È_nÅã¬ê`–%‹ÁƒÑ0K‡„OéCéÓzɧ
—èØÇD|ÿr¯GFÉ@±Á%;e]ÙÒW§VÞ5nÓežYnTÃZ®ô4ß�;‰g¯X%ÎÈ\Æ÷R{�¼ŽëCYÈ™Ôq`ýx‡¸ij‰­Ic™7Øo�%5Þ¡°�Ëpëu™æ\�#}nZÑ”æU¿Ÿe2ǽ紹ÿ�_Z¢ßE®'†Øvžcþ$‰
Ïàj$À‡an#Œ²¡äCÀ„ÅÆr”{•†qPaI{ZŸç¾'>çT(fnƒß×¥®‹,[!UÏhõ3�
3ÈÅ–¥¯Œ—T×Éø²Ÿugo€£^£Ô£«1L�ÁJâ`ŠøÀ@±Ž…qJ‡01qØB!2”*u ‚‰L™ÛìvÉ+ªÅ’˜t]ªÊöȳÓ‘-›Õ3×¥�ùã Ÿ„¡âœT½^�BäyP#½Éœ„i•ËTåî¨ú‘b˜kãÓF“Ô„í[ÔiÊëŒó22j‹ìãÛ¶Òyñl*<ÑØЦ¥NÒŽ>ÅëÓ‘ÿ„Ê÷ü‚7ª�.gG›
]ÓÛEáMEIÝYgØJ:fk²
á¡;Ü•*)?·S-MºŸŸ“"Ç•®Kl-«�t•`åh)¼=Ç•evÓâÍT‡A-ԽĬr˜[—Úê°�h¹M®°;Hó8/Á‹…,<û§ª¥`h^®œ…¬Y®öqˆ¢´Q?KE
ÿ_°Ëü$/{ME[¯ø§­âòzA¸×w¡WÅZ“ˆo;;½3z3Âÿ�Fãô´[þ1SéʳìÈÕr(ëT`@#×S;[P0ÓôÝ/çµvÕ׆m&Lõ®8ÌþÜg2�¹¡†È¡4ë�/öÛuB<ÑÍ“JÝ,¸ª=6¿Ê½l{�jÝ?w0@‘ð§È$®¹†é7¬Å«>ÃøW-›÷ÊV.64×»Ó¥x_x[Hýbéf¤Æ‹Lœ`‘üÚŠ\X¬g"屺IŽ!cÛXŒ[Ÿ8×:ý°l�-×·úÔ]Í·ÚÄäÁñòt˼ᣫ<_ =ÛæÈ55⎛fŠ‡ûÿ¢ã|xrý;1i�”�‘j¹‡$5Ÿó<y.Ñ\,"vo0¼½&_ÊGžI u¢“ëÉõÍu_ûL)q2ˆQ7{¿¥ö<ã_«qh‚‚çƒO0�í̸¥‡wˆøjÒ†³³	%öŒD­¬[v^•Ù^ ZÚ®µ
;ËÆx�Ò2Óë‹�JøP;ì~:…,”Õó&÷æඬ=}KÓ»dç�J¸²ºUpÂaŽï}Žuj˜'#Úp\êˆÕ$y×}cþå�FþâOõV߬ö^5yåç
ɶºXbª‡šÛ¡1À#цI—#z
Bl-� £Ú†€Âeyš¾y3Ôcª-”8?#TJ=ä³çâ-F, mƒ°¸K7±V@d+;jœ>VÄÆk,¼
a'Ü`˜“ô#F_”½¹$×µÝ2GÃb¿› Á"´DOT3'b%?ÂÄ>BAT*ð%áÄ
¹
ÁB¯ƒT…dÈ…¹€H‡TH‚l‹†ŒÈ‰ìžˆl@‹”ÈŽäÈ�ôH‡¤HãX«©(Éš9I·HÉXÉ•¤Š
bÀ¯Z=!û¶<û›Ô#¿I–©	
[*AS
2…EŽššd5n³ÿa°'@Š§È
¥Ð	•P
­ÐO
•PíPuÈPõPýÐ
O]ÑchUc8†a@†XÂ…3SË ËÂÅ	A„ÑÇY‚N	µ¦óBqƒÄâ¬8>š;P“Âg28=,D_
PeHƒ�90]}˜
xƒg À�Q8… †	˜‡z8…78˜€HØ7HƒS˜
 ‡8
Àf˜€Q0{x€gx€S@ƒ…7~ €…QÀ
 ˜‡	(~Àa
`
`U꽇	è`
p€7˜W¨‡gXàgàãÎ�á}†3˜‡Q`&v
`
X…	èc
Ðafx4pƒfXdy…
P
O.ÆL
ׇ`nûÙ÷ý•²’½Þ‚$û±SÞeø….<4Êer{êø�Úñ~Nùµ	ÍépìjˆcÈŒ]‘b ÑaÀa0N‰%ñE“xò`0dr,�ra@\Ør‡øac s*7ª!?¢ˆò^¨òÌrc7†c�ó`À…v¨ó_Ðò*ó!¯QñýŽ*/3¯ò1Ÿó�ò®óÌ0�cðò_�s\¨Q…ßaôÌàó1_ÿ‘^x*ñm‡„pt§lê¹”îT_®¦ò¶¬÷ÍGÿõ³»”Œë^ߪnJùh»#6’õ#òž³u#�ß®ÕÄ7öcGvgä-8£'¤	œªõ´¯žBOëD¥z°Áò‰Á´ö³ž_o6µ6kê¦ñµG mžYÆÀñ¶ÿ}­†j"Åǃ¨[Ê«Ö!®Ž=‘1]–½&Õq
%a”,*T°~Ï¥{_¸�ªœm=xî»»H¬ªé�¯25lq[d'.ì·åà"Õ&„ßÇ
‘öm2)åV°žÚkR':n‚(F4nŠÇÇãT%WGqáTµÉéõ
V¬àA‚*l˜�á†'*4H1Ø°†1BöPá±�/9p#É”;¦dYÑ¥Da##J´R%N‚6OÂT)seΊMFüI±§Ê™:;öDJóéÒ ™J­*uçÔ§0�*…ªÑéÕ¬([âLˆ«×—
ÁrÕ¹–¤Í±j1z´
6"Z«<^eiÖ¯@£A�Út÷n^‘8	C¤š– `Ÿ#GÓ,rRË{³Ö­‹™"Ú»�5�æÈ7sb…Ÿ}Kú"D¬y'ëµÙzbâ�¢7§~M»´iÎÁS÷ÞýUñQÒÆ�ëÅÿÜ5jÎÞѸº:M—]u�üõë³lU/¿X™¹pÈŸÇ„)w´vË6	ƒ—Ø”dãÍeA¯¿x§tàÝeØt±ôßwƒõGÐy*hÝn]}TžCž¤Z×e`~@ux`�íÆ�]éYhbUªÛ‰–X{,BWßc3J5‥›V5×Ö‚¬ÁEau}x!PúéEdC‘1IW�Vu†÷ÑÈa`	µfT’8×S:ƘfD~´¥w>ò—K
jhcIP}™�n%ˆ_ZÏ=ÈÜžEå�öe÷ØœIVæ�"F´Õ�è
Š¤¡¥ÈÒŽù¡é£³AšdiŸ=ÿye’‘H¡aŸ’U[�õ1j!…¶
¥ä’púG[Ÿ5"•KF½¹éAº†ÈÙmL¾—%±/BXž³‚)ds˵*³)¶\¯æ™&C¸ò[B
Å£tF^â®ÉVU^|°š»™¨GÊãi	ËYˆÆEˆ¨¶išûܳŽÊ­ ›Z%)s3•°U€â&0Ed^fàÖi“VBåX©Óû˜©ÉÕ*1t}¦†îÂYùª¯ºòÖ+kM.•{ཫ¦Ž›	ö+«ªr:-Š »qÍyÛ3^é®kbÇË«¡qqí…”RUš’‰"
²ŒÚ–¢¯Ñ'qÅwMQ#›SÕ–ÿ¼NavÝ¥­�2ŽS77GÏîKv”ÑbýjmZBïÑ·§Ö4˸øhVfô�
wT+R''
o{ç*˜ùÆ]#,›Å�˜‘á@Óø§ÕŽâFàŠÊèú±ãWvß�’w4Û©®xJ‰QÇ8¢»7Ìy”¯;¬Ô9;a�ÎUG”å–k¾æêãNø©ÝÙty2§™šÃÉš�º�Þkù\Ò—æ^òŠ?Ùn¬õ‰w-t˜_?›ÁóŽý̘~›4ù– øÙ­zžsœÌ75
6é70q^i¤'íÝ®_'bT¾œ‰Ì|}¡v4ÕÚU(q¦cYÈ�t¢,^Ÿ9ÎJçƒ<¥µpƒ6tMŒz‚ Ô]N(·"•ÄðFCòxç h–ð�jCtúaI$“ñí†GÆRXÄÞ
‘$c³£>c>
--- NEW FILE ---
GIF89a°
ð
tSiF%hK7jV)b[2vJ'wR#wU8{cfd5QWNHT{PyWFihGbG{fGzsXliWl}UzeQ{wm\HsZ`okRlsj|ƒ7R†+|…K\‡PjŒ\r£dp•dz¨ˆ{)„k(‰x'’|7„k5†y6’zS‚XFƒmh‡Wn‹r‰ˆ�’”Œ
<(paÁ�#JœH±¢Å‹3jÜȱ£Ç� CŠI²¤É“(Sª\Éò 8¾Œ£¢Â–8sêÜy0M0fáHÑL;’î$Ó¦;‚D$éÓ¤N«.…:UëÕ®V¹f
+ìÖ²cÏb¥Jv­W±lÕšýš–n\»oÑÞ…›×mÛ¹|ÿÖ
,w°Þ¾€Þ«¸0c¿Ž†Œw±älj)®Ù²çΠ9‹ÞLºñhÓ¥5£^UjÓ×A|ø 2ƒƒ…9ßÔM�·ßÀwï=üwñàÄ“WŽ|¹óæÐ�Kg>ýyõŽpØ�ùqéÒ2\ ÂÿáIþãˆtм„˜"š4íßÐ9Sg`5iêë~9þ¦4¹
à@i<ä_€ÁW¹Q.ø’	
h�‚ZTàD15H!pÐ4Þ†%ôЄýdAüõgÓ†ðÑñÆ„íˆM1éæF�+R$DŽ⥈zFx“@êIH|<2¨ÆKê!©F;ªÇŒøÉÇrô8ä’t`(¤A)’èREYÞš­†<ðÀ#mˆ´å‚¾ÝÉbž|âéçž>Ù' „
¨ž†Šè¢ƒ&ê(£‡6ºk�áCw?€×£—lvº`Mi|±Ï=õÔ£O\|¡�>þÔÃ�:zøÿdÇ:úÔºO�g¬ˆ"êè³�>èHÈgPˆÇ:¿þ3f\S«7…XÐFæ ÛÏ:_Lù†‡àSë"Ìq†»¢“Ï>ûˆÅÊqì¯À’È6èn3ȺÉa¼û¬3mð곎uªá¹ˆ¤ƒî>ß|#Æmø6Ðzjp�Ç ÒxÛÏ>ãH“Èn°1+¿kàá­¾î³|
éÜ«ÈÐ…0ôCŠûàÚ°�yp_ðÛvª¨…
­ê:ø >Öc…mpÃþÜÖ?ÎåÐ’ATG D÷ƶ©£_ÀC8A´atðÞÓ�èO7iCÂAxÌ×A”1§IÍŽ´!y—ÈTxÌd¦‹¯šØ�IAxd ¦…	D!ÒM{j¤'N¡Ç`CHÓv¦¦©ñK
aç“`rÿN‰§&ORÈ9²£u
dBQÄibH9
Q1k²"„”¢1¢h<ÂÑ9O E#DWäN€Ú„Fõ'<:1ˆR´?	é“8Z#ƒIT]¨8щ"ƒ¬aVýpÙøø@l#\
ÅÁ'´:ÍdG‡˜nIHg�ÃöS
÷¹O1‚†<”]èädD!JIÒ‰F´!u4D­ƒnh¢Ó%‘) ã™ßl÷W+�}!FrøQa{ÒQ†<&P}䙥ބ÷ž
Š	äª4#µéC®løMú3 �AÈ*ß:Ö€û,ÉŸ
�%bÓðÓž:ؼþQNé0Ùî®Ãƒ•OS|'Ýì§�"þ/ì
Ñâp¼P×ÈÕ*�è¦
n‹úèñç·yƒKøÆ?þ¬�B¬ÁMZ$Õ=¼°†0qÐUþD 
AÀîéƒsg Ä:üñÆh�
Šh›©¶Ñ….ÈùGCÇ!¼ „Zö,Ór4Ûô¡‡Fup"„>`)
2�!Då9ìð¤~Â'άr>±„%QÏtƒœAù�h(áà¬ò>¶ñ;AÄ
‚ÿt!Í
¤Bšº�Æà£Hš¤=jË`Êà¤É R*¥ÇpÈ VŠ¥Ì`¥ÈÀ¥Èð¥`¦aÚÈ@¦fZ¦ìp¦í°¦lÚî@
kk
sº¦owŠ§àP
î
µ@-j
"p´�¾

%P

¦fÊjJ²fz²ÍÀ¦î ²v
§xÚÚñÀ§}~ÿj³}*‚ƒ:¨†z¨ã€„*´ã€áð¨H´AK©’ª©˜z©˜š©QÛ©åp“ž“Rª·z«#1¡´ZUª˜q¡\› ÍM\ûµµ)¶cV¶ÓäqàG¸@'ЮÌʬíú
Äx«°Æð·¹P¸P”ð
¿*°{›¹¸¾J
ËÇ�°_Z¥OÚ¤k±k¥[ê±^ê¥eš» ›»íÀhZ¦jÚ)Û¦2»²rÈëxz¼Š¼ÜЧà`³Ï맃ê?{¨‰š¨E{´á€ˆJ´IÿK©ø ©Mµ™Ê©çk©3#ª	AA«n[¡¸zf$A ñk÷‹jÛ '‘�ù+«·º¿ó»‹Â!7d&'5-ÂQõ™Í‰œ.qCPi™âIR\SE’5—G¢ž!ñNQ‰Ÿü7ýQ™¥Q»µ™åeÁÌÂñÀ¢É|vò¿+¡µÁy�Îçµ�BÃ,ÃÊÁª8ÑÃ><Äf;Ãk€IÃk¢|â)<Ç) ©y ”©œ5ÁOœy'=…ahà BX˜©› œÁ¶#•Q| Œµ%Ã�›c»JŒÄÇïk
¥SœéP<vÃD|÷(Älo ]…Ã…œ|‡ÿü¾>ù Çc˜µ
ÀÁùs  \U#Y,n°yûô$³“O�s
qþqÆó1[æ<r[""0qãᾺ‘$
¾à>¯Ðàá>á^á~ážá¾à 
 .u@P=¹jRñOŸÉ΀]Èÿmß91«IÄÃÓâòL¡&QÏ5Ìv ×ýàÖ*ç@À3䬄ìÝ=#ƒsmäíMäÈÖ@Ô=lóFìýBvÝÞþ

—Èq§D7]u×}²É®œ<ÈxÙõ*ܤÄ:«\ž¸(£—Zl0ÅK³1Éh‰l1\Æ¥–ZÅ3–Ë +F—Z «e3Š/ÓÅ3b*6F—�KÓ¥4“�M7Ðdc9¸–“É�åß‚S&¹ä˜ƒî˜œqf5Tîª[•»í~&5<£�Ž�½öÜ)/>¦�ŽOžøÿÂq'œÿê°ê·æºkd|pœ%�²ED›CµÓF»C·Õ)gsÎ9猅¢\k^zåÒ»ª½å�Ë^Ÿ’ð{�êûoÅ—\Ü]!k—.…è°	F‡Êê¡‚⼦Ê	â¨qÑ£šH¢ÇGÇó™bZ=%×-¿ÊðµdOŠ/Ú•¼ý[vKßÜ}œ*q²POÒ®ß�<žøÝé�‚Þ˜¤Žj
=(æ‘úh¤éaéÅŸÔ�£ ðÁ{ñ±G?*�äp£z¤¾ß^$„¾—F:®g¤—8š
8
*]O’Ò7 !"0aH
™²#
"Årö‹ŠF`„†õN
\yƒ¬Â;ÿ¤Ääy4	\7"1
ÕûŸKVò†7Ô

G
¡@L(ÆTo%¥«ÈQ\xAÓM_;â^ð'C4¼a|t]é:òÃô1„+CôV
±7“ü}°!¼CGx-f0/êP9ä(m°šµF6v¡
6yHEèw¸¿åkptÜKòb§6„É:IçÔP‘œPŒg "§w�3ìð 	1#	‡Fª¡(t˜£M‰”9$RŒ°£ƒÃKRR$g˜‰"Ï 9œÐ „¤`(eID%‘!ùN,Â9å$
mØÇ>þ‘�~äc˜ù@f2±ñh â�8¡œA,ù¢É¹ÿáÌ›Ü#­9‡—¼Át€C+†
pN!n°¦5ÙÃA62"t¨Ã
X‡ÿ
Ä…
ç	ßP“>”z9Áß ‘kÂÏ UÃ?]ôTtʯrz
lðÖžº†ýÚÁ˜Ãž
»ÕT
i|Ý 1ÀÈ°ÂbÌÞöAw
CbÌœäâW$ÌóˆÎ;�ŽÀX¶n0/–ÝІ„Ðsh\;R�DS¶Và0‘
qò’båFGú3B>rh¢é1GúÈ‘~ó˜/ÝV7ºÈ­.ó‘ûœé\‡9ÐÅ>v²‹ýˆÈ-þX»úIQ%¬b³gKªÏ}Q”âu:=’öÝyÒƒQYåî”9æÝ)/a²9;Vþ¤%x^¼-íé-R6DJ|ç{�ÕÇCíežÔ”OàNjXy‹|–3¢ãyCšh±§eUȼÀ;¼Ùö–òÒ‹ÿ{Ü¿±[à„ÝOL¿®ÏãJá ‹r½™î2¢?ªJ½ý
–4úŸgžë×"|ðá]\Q=^˜Ç
–ÿnz¿	º†(È+Z?ò™|ú­ß•Š¯¥þ}×éàïï|í{veÙ?°ˆ¼ø=§˜<

ÀÏ»ˆ÷KŠÍ)ªã³8q	žâ“@Á� =ÿ3Äq
$A”	vBŠ�€Aù»Š^Š ÒÙ©‹ðB%�º@¼	º@Á!d=#DÂ$üÁ9Ú±@»à‚1ˆ…4Z ‡)�Y-”5YÌHʨŒ„©ΘÍX3üŒÿb8�5üÕPÝ †Ó 
Ý(†eH<œ�e�
eÀÃ<Œ�ÙЙç€è†e˜�Ky

¥¢ÓL€1º)D']²â¨ØJ�ং§Mr+„€2=¤›Útú;Í‚¥¼‚1©x!B‚�0 5pªúÓ´B=:h‰ÿy¡P:
è£>T⨈3ðð9¡èyTpb<2ŠU·‹ˆèI¿V* ‚ˆ#R%x2 :X	B‚ƒ1R‰Š0 ˜  ïYƒøÚ›-OEO'Z½™—
ÝPm�
6PÑl�RÕ¹‘
9C§ëªY
ãgúM-M‹²

\æÜÚ³tZƒÔJ­ˆ
›˜Vl²¦�(ÝÒRæ…µs"lÊ¢Ê>6½žŸÀ¦H:¿ÑqÀ¨à,—@�Š£ˆ\â@ôKŠû»»$ îÉ3 ²ˆ»3*º“_ü‹‘¸XÐóEßôUF4’ñ$œÙ]Ëm­ðLl]B†O­Ús©ôbÚmŠ^Ý´f+°‚¦ààö`º7Jˆ/¬‡›,8,~è^¬ÅZ8Ⱥ‡É*,È2á.¬‡[8Ê*¬¾a6¬‡Káf8!ÎáÅ‚‡ÃêᆇÉR,fâŽá!~a
kº5ˆ:à<p,6,8â'&
c&C at d5xÓ9ƒ0Á‡~ˆe!îåÇbafáÇŠåÞçX6hè^>¬fh…^è~^èÿÃJè‡ög‰Vè‹^a~hƒâÅÒg|
èDB‰!ABfVæ-^fùlÏmækN‹–†ém&Ë.ÎVm5Áàþ«>h¢¾|¢—”A塾’bÀîUé¤VŠ%ODPnÝ žâN¥¦êª¶ê«F—Í‘¦ò#ˆ“P	Ö9Õ¯~½¡ú”øjèkÖQë´NkÕI¢8ê©·&Á¥Xk³~kè©k„
ÕáëÕq뼶ëÀ–ë×S¯fk¸6ë¾FìÅöjÀîëÃþë×ÓUµFk¿ë׫ìǶìÁNlŠ£™8Šðù¦ÓÓ¨f•‰’(í‡ «Ó>mý�'qÖëΦë¿ÆëDìÃÆì¯Öìÿ¶öl±ÖíÆ–l”ÀëžîÅŽ	îëÚ&îÙžë²n¹¦k,îÇžîºæk¯Ækè©lÎ&lëvîÎæíÜfAà>íÌöîØ^ìúlóæîÀ.mä&nÂÆnÈ>‰Ìî
¤6<ýÍ¿�àˆ1cÞ5˜
‰‰cÓDÊ4QEª	€)HZª�øUb•§Z)†¸$‰"oƒ@2½4p’¨éM䃠¤2
¨lšƒjE¨ž˜ˆˆŠ-Eµ$B�?ðA«(2ÓKŠ&ññˆ1B'¶BÐDòSKZnJŸŠà˜2$=eTd<!G�ž7«“¼†¢¨›R¨2’>
$6õR�‚ª¹:¤[r!!�ªD
Rÿ¬ظéÑ)X|-‡
R= ýWºá©©’"J3/Ýc$Ó;7{3!“®ö�µ÷¯;`ƒNB%ƒ’¼'U­öˆìÞ¤4… F‰Z²¤¹*«û1-„Ð1 1ú¤ˆ"
F•?d<Š·&73²Í‘Ù‚ $%oT·:A¾c©:M¤Ï(Ásž‰àñÿ±ŸÊa«w¢Ó…¸·ñ&ÌAë|
X¥œI‰Y·ôFj%Á«ñ øúñÏ3
°šÍ.pG³<°›30yÙ²ƒö¡øbŸê:. at -syÚb.’·ƒÞ"y좂Næ-§6û%
Ÿ
®ìB¯ŸP$6À×
–«Z»Gµº­+gnߣhäÿð-[µ.R«h*Þ=ó·àÛ¬nܤ™£Æ+å?”gÎñùsŽ›‚iÖ¬aã3k›64³bÄ8
5)	ª©Œñbܳzc§Ôª»v�ßpÎ…ÃÕ
íãth«‘sÍ‹)__”®¦�9té¾éC×}œ>rêЩ[—wqÜæ‰k/nÞ<pòÞÏw¯~¹/r`'6Œ8luq]h
ˆ ^ÿÅá^-Ýv…"öTTjø!ˆ!¶›ˆ%šx�#¦¨ÆŠ'~H"R0¢ˆÔy€Ç\´TÔVÐki¤¶†}„áA
©ÙÆ? yÎ184•´ü†I'3OŠˆ@ŠG=è122[¬½-°šE 6�AšTEµ–! #\€§T•yÀ}êCƒ0)¾ K �d\ÀÃ6ÆñÆy,—–úPªQ@êêCåS 2õáÇP¦
zÀh?ÖáÊêdåÙ5 ~Uú}hVs$¯Å ËSêã>YC ¾áêöÕ(2ס‡»ž
Šà΂Oé�Ä÷y�CÔpÿÐup˜‚þÀÇ>б�>p¡6x@Ǩ�nè•À#Kƒ¤º@,´áZ~¬ÎÞ»Száº}PŒ—xâ*ñ|Ío0RV>HÃ;ɤn©$ì
Bp™œ‡@½K(b*%°í0t˜–‰‡Õ%‘ë«Ž!ïº}
áZî¢gfiQ¨ð6óèèI÷!.ŒLÙ•1‘é�}¨ãî›äüR¤[˜‰ºÔ¤>õµL�jT;EÕ­fµŒB)�ØŽ#=fÖÊ@�Û]7…·?ø-!Ä]ã–Ø1D‹”�Øê8 ˆ-lq±'í<žš0K�vÿD(eÿÕ†e‹W9KeÝ
b? ŽÅÓ¦Mg
Ó>X�Ø�>”Ò¦ÙAH\Ô^éÃñÁ©”?`É{¥Þ)]@âe”>tAAÂ5ªÔ>\ÿ@à")õÃØ¢(ÁT?�ŒtíU?x�D(�.Éà Œ”
Sƒ;¨p
»C<€ƒÓ°
Ï°<ÈG8¸C8èp8ü0‡Ã8Œÿƒ1>Œ:ñ'ñ'1:<1“Ç«KqS1¯Ã:”Ã9°EÜRð¶Ö³æ­	µÏÍ$…q]ðÌ˨1‚€šïâÜÎÍñÌé„´Áø‚û¾ïóÚ‚ñúñ-ÐBôJo,°¯û@.hoûîñò22/ÔB.0rùƒ!¿/;$2.,C-ȯ.,2
»+³
ƒ2¿p2»ƒ3Û°4ç°5ƒ8ìp8ÈC1/q84q81:„ƒ?1G±“_ÿ±:¤Ã:”Gyœ_|qäºñ'Å1³VÑä®Ü²Ü$Ñî?ÿ®Þ¶\±´nˆàs°œA
/Tï_¯DO4E_oöj/Fo÷~ïøžoøÖB-¤oùÚo1äoI'ƒ.į.�4ÿÆo
nÍeÛÔ
K¯ §•ÅoøGªìJ­¤Ú-Ù
‘°ùÌÆ	F¼ÔVÆÙs´%ôëFö¶$öµáLa6®-qËWRr6„سÿ\a8nã^­tKE`“¶ÔP‘²ù†Øæ6ÚÞÖnme†nn4i;vˆ
˜8�þÁüA
FÆa…F¦dÚ¡¸™v*ΘbŒ/¦xcŒÛ¡¦�x¨!9“ã9åjâqÇåj\œ™ežÙewÂÁœšwgœ�Ã	:œq†zœ£�FG饗Nu Vçét¢Ngu®.§œsÎa�SO+ÖM`IÖXW›ì²ËLQÖWk5{í±m-VmZÝ8‚—ggùÀ#�
ó
`A
yªQÿ™¦
/ÌG
w<$ðÅ4ðW¿g,á¨Æ4
S™Ît
mXÃMkŠÓ›â¡¦3õiNmšÿS7Ü”
y¹iPkš†6 KQUªR—ZQ.tˆªk¨hN�jS7t
l(*Ò0T¯¢a
nP*Ú`Ö´*j©aU”ZÍ
×·žÁ
tU¼æ4¸¡I|Uƒ^ÍúÔ¥V®ƒÍÓYÓ::4©/ƒrQ=áÙÇt3o[Ñ�²DYÄ
h 1cU(NÉ­ºßå‹l�—½È

y
y˜ƒŒ
ãgNb
j˜Ãü
@púÔ!¥ÂÜ�i®¢áÿÓg8ÃÎàÕ3
h6y©ÐR.@0ghÀŠ}†
ü�q^O}@

�ïÓ¤H`í/BŠÓöªÒZLåèŠ
è€ëªÖ&QGÊÎ�`�SÞðÔ„×T°ðLp¯ö
ü¨ŒÆæ õlíòLƨlPÒàÔ@åþªÕ«Ö¦lÄè
¦Îă

±±Ø
ë
Åê`1±/Î/Ò„‹ŽéÌFÊÌ|p¯î·¨ì
�J(ÍPX£ÅR€ŒÃŽL
Ò±¯�QL)¹KÂxŒÉ4…¹Bå*…,ÇŒK$ƒ,¹FÍƒ±Z˵ÌäDz0-C0ª²ÇB¬G´RRÖ�XäJ\¬Éÿ²ÊTì2&ì+#ƒÇ
çÎëtÁY§r!tºÅ>�appAb�‰‚aA‹Á]€á]ü“@×e^„AA—a\Â%`’á�Ôfgæ%^R5~ÕŽ��ð(^˜
´‡ÿ"”b‰ÞÁ�
¦Ü`†ª§ÒÀ¨føØƪ¬ŽÊ«œm(§¤U xOËV°º,eË»–¤
©í0JŠ²ŒÑxD4³Q ŶB„-Å
ý¢µüO/èXDZ„:ÿ22qċÆ5Kå(�…v¡8Ši‹swWn%dw9v'Y»v÷cí©w
ð'm…
Î!
ü`
&à
øÂùîàøXõì*Ÿ¬
¨@ä^îæ
ƒd±Î:Ÿñí
Ò@
 ÍCN
L£m/#U¯ÿZÑ ­
°ÎÈrÕÒ/£ñ
ÒŠŸ
šžEÎCôâüx¼
ìû®„:Ÿ·J š	å
LÆŽ

r�—
ÿðÇ=v
€f`�(
X½å”o÷l}þPÄÊó¯†mì=kOÓ(ön“í«c÷VY¿6o›]MgÙÅ…ó\Àü£ÙІñ4^T Ò €=�Ó¤�ì£lô¯Ù¯žüƒ±ÒІ"Ýv¨j¸Ã
î°¼_Á6â‚.Ї;�ÈAÿÚ’C
ëÿ´õÆ+,éTqAbX–0ˆ	4Ü:÷ÔÜ]YmTƒÈâÉZq¯éÐÙ[œ4Œ¬�ˆ%��Â7ñÇûŠ¥Hšuñm »&¼¶àØÝ×ì�ñq»@i6ž¡b°‚ñZ»û½o€_�g	Ÿ)©Ê6ĺ+ßë¦\¿¦Â¯±0à=T.D7bßÞOFºá
’×VÇu]ø™¢&Õ¦Q<¿om}²û³
aÔÅA†Íküýü,ÖÐõ¯ÿ@	Ù'?>‰†}Ü£õð>ô�ÿùûCÛX׫æðÿ^Ð|0vŒ}ºö3%£Ô'Ó¥kbH]x€ jAqÔjJE,mp&¥Í÷{¡†}µgP†e;{»W{†7Tµ‡j»ö{¹ö€4ø& öÖA_ õpü ^
glæg†Š¨Uw¨Šš¨ýÖbŽº¨�Ú¨~Ód êGgc~Z}ªÙœõðd … 
õÈÒðÿÜ·‹ô—�^3É‹ÝPdðOPŠÐ
†>XúÐWYŠ>ØžB%|€SȪè ô
\ƒÐ–T¨²
d@·Úmð`x‹þð« ëèžtÀ耉™XfP·H�Bøƒ0ÝØ�Ûp`0­‡ ‹àæ"9Õ�JifðGàó0�ög+v€Íéf€®óà–pYa^Ð�Ô¹qwv—	‹ê@¯‡0ÿ@…ó 
… Kð‡€æp£ëZƒ0³Y……0däpz—8�ü`J �·ÈŽ8Žó‡Ï@| 
xp¬ô·°£Jt¹éÿ
QÉþ𚃀 Õ`d
XIR{ØãzÖÇ}Fªd¸* 8~À“=y‚`•ñéQZOXg`ž™¦ypá)œ~�ƒJåM‹÷4Œù²û€ŠsàS˶·b:l{%“^Pá°�PÖ’xWnHÏ“—ØSä&¿·*×ÁF
„l°"•GÚ‡ƒ³-qt Žb¨¶tH{¼§Ê�G�b7StØÞ4Å•�‘Æjh`P¥Ox ByªÑ£áC¶v.y
¯Ó9„ã\ ]ùÿxmÉ�ìx4vàᮈ\ŠÎâUIb 
/Û“4‰áp+[2×­ƒà
&Ù“°J…ûà‘ÌÒR˜ŒÝ8èp{JÓ¥ÒÛp?êâ*K_‚@î=Zµý çƒ�ô±‚°¤5¹Šø§¨hMeû
Ã%
˜ž÷üáÓÓ&轃þ¼´
©tž£b’^ô‚GèA™\Ö„Ùg°^¿/&ñ諨oÉt÷Dú›§ï_J~þöéaC‡mú¨;ÈÖ4xæÉÕ;5M˜žõÎz9ùZÀ~ªIã¡,B}k–“Æo›KØò[¦"ŠþîQ£¨oŸ‡5�“Š¬j�_¸B¹r´MH³’ý­Ô†Î8o¾qH=�šÿ6aÄÕ£7®äfðáF_Þ|y8çÑSoH¾=ûšðÝÇ/ß~}üïóÓ×ߟÿÿùæSO<8Ö C†K.ù�.
ãç�;ñè§I}ÂÈ
2‹âã­|C‹MÿEdC¨›>Ühè“æ ©¦ô
ÉU¥}@ìF¶„9ƒ�B65è7ÖøFU~¤¹Ã´5YäNPå
­Mßü)D¬p;¬ó�ƒÊ;ðØÆ'}0]£ný‘f�6¶ávDÄ
D|Ìô¢¡µ$61ÜDHá@Öp�3äp’]Œ�6È	é|棟�;½Sušì‡�6Ù¡„ø„#ø®Kã�ÅD‘; Sƒ�âöùâÈ@Ú'4ÐpC}à!ÔuÂ`sFƒôéâµÈœÜ†<¸°b�uáÃ(ÿ5è¸ �‚œd©�Ñ8ƒ°!†LKƒŒq¸ó.Â
O>ÅÍ°qÈ#—|rÊÕƒpŒ.Ùa2Öp°ô6£ctÀÎXrÔÑGDAg¸×ÑðÕ6AduöÑ�m!D4¿†R�?ÎÉv“Ú ¤Â}ôQ¤�ãÕ9'­º‡Ï¬�sÖÑ}ÜWÿF‘@L½�ul[çœ9ÚøC�ò×A‡œ×÷a�ëFÏãœíÕasŽìu7''“x!©³�:¶1ˆ5œ�u ƒ°Š£~Ã(x0ž>Ö¡Ž?¤Áý;Ÿ«Lbº@ Ž}òSÇ"Aˆq�Û€9ñ„%Dlrƒ X¨�pÿ{ëà„@xˆoŒ‚.$\U7$6DI"”_ë^Ǿé
&
�Äí´;"b.ªIÝèð(BÜDGë¸Ð )îÁ†ùh:¤‘!ˆHñv„"¨�o BFáŸî¤À4x¡8Ús:qš|±xº; Ô
gXÄ®‡<üá38Ã(Æp<X,â�XÆ
îð‰ALá	sØÃ+ž1�3âÃ#Æ$61†�lã;XFq�çqá"'YÊ4>±�GŒ÷ÈIV1ˆ·¬cGÙÇ,.±†ÿìb¿É†ò—œão¸Áሰ›§læo™ÅrÎ2„»¼ã‹#_¶1’c<h7£ï G8– š
ÇxíìSçšÔ¤nïYÍêU³ú×y°»MÝjt“
Þèʹƒý0¤;`®ö©Û0ê5ØšÙÒ¾µ¨U}í0àZá{¸Ã¯i�ì]ÓšÙ@õ½Q]ji»à¢
¯[�ëÿU�ÊÙß–õÇÞê_»Z©v6¿á½†W�ûÔ]éw¬Ñ}îl‡»Õ«V¸Âñ`êY«Zæ2?u¬IÎs�;ÛÕV:Ï'¾kl=Õ¤žö¸!nl=Œª+¸¶<ñpë™Ç;ì¾®8´[¢Z£ýãgvÏÇ-+ôüÔÌvx½ìQ“ºå=ïù¯ý®w“sýæ?ÿ5Éó-†„\ïË^»€Â‡€=›T9Ïö¹•­÷W;›ÔxøÚ8J˜Ò½téM_4°Áº×ù¨^gZTï’Õqúy©{ˆºÇŭlè(Öf	)x-5iîóüß÷M¨ÊþaKÓ!îôüÝ}ð"šüégÿ_ûÛç~÷½ÑÐOŽô’þïø¿~ñB笻?(€¯|g’‡:ów,ýù‰|üŸ·ö±¥Ux“¸|Èá=
¤öp¦ÿû'ü/Z">4>‰2Í"óC?<=Ü£@Ì@ɹ@
ü¯ð¿Ò[¨ýAÿ A
=nœ[nH
Ìå‹Ü`0ôå/ÎßœÁ¤b)Ê2¯äAÁ‡h‘úé?éû(/ô½‡è½Æ¡%ýƒæ
<f”=ñ@œßü'â«À
	tnÀ</vVgs¾æ)ÜÈýå¶\ÁÕ=^?‰¤×|¾g.õ×~>½€.Üä#,Ã:Ɇø¨Ž²­	¯‚n�ø’ª!©-¥zçd®%ˆ>èÉ)çZ
.’½åëÁsfgU.éïûÁ´çÏk\ÿÞ×ý¢ÎXÆgy�N|¾i•öÅhôIü=ÊBÚ†@†Xé0ÎÂå=õPh“çºYxŽçæS)1tÃ1S€–e�¡®¬Yú @˜€>°ƒàx;9…K8Vó
„h �
¹�‹

÷¥à�!~Øp
g)Šêß³y ê”÷ìƒ>êƒ€@CG
A:s&¸!¨p¡Â4tè¤a¨f ÄŠåœ9£æLB9nÐÈaó†
6iÖœL¹æÌÊ6([¾T)3&Í™6k⼩3'Ï�;ϸôI³
P¢m„ž$êf$š51Ö‰£¨0
"
ŽBû*?€ºl°Ò2모>Þâ´!Àã‡ðð,
O‰ÈòC®ºZÂ<Ùžjê“ôöJê–
;¬`ŸŠVJ
^Äâ¼à1x\ÿó¢=ò�{ld çÈF�™l`<R0„Aå*[9U—�ap™ËÂ8—É<Œ3ãÌÂPó0Ò|æ3³ão5†1
:ã™uÖ3Ÿûìç?šÜÐs5¨Q�B:ÑÜ8t7ª
ŽjpCÕè8*MipPºšÖ´7:Ýéo€:Ô¡&Ç7È�RŸšÔæ
Gi…
<K
pa£äB¾d	d&>Ë”BÂ�‚b>KÅ�‚	 ¦`bBì%1(´|@.è‚ÿÇ
ADÀDÚaDÊÂÀå¡	è¦	¼‚ËMœNÏñ9á³Ìä+ô@¹œK
@Á4Üœ#ê3Ü\0dÞ0”NNC¸$
öE:—FyyQT‡²¥Š¥Xà­cX�¨Z<Dˆ�ôÂ�íÂ.
ˆ®d)—L)ÕP©Áy=DlÁ”lÀðPý”‚a+p!Xp)\-Ø·†«„-q
xœØ”‚U¹‚ëx•P!Øa±«m˜t••G·eG�ŽY‰#Ÿøj‡õê(…h¿bÀ+ÿ\¬ÀÖÁ¢èÀJ,�€ÇkØ—¹î†~YF¾æVq�E^éWD$„ÇRVf˜¬gøÈ‚ì¹6¬�4k
r؇ž;ÒåÄü+¯Z  «9+Ä",®Ž•ÌvØ0–hÃ4WKÑTsÌÉjǽfØB˜ÅÒ2¾ÆPoImÆj,ÆÇ&^9–€ì쯶l´ìZ‚mkY×[¢•á�­‡«Š– Á ÆdHÔËF`y퀵WÔÖ”Þö­_To1[B€ÊZ„f AB¨%ÊZÎÐ�TVs¤Ô(¡
»n„p†qär¡³•µ×½B-†éVLEƒáÅãV·öTe°®kØÿ_iÄt¨åå:hÄ…ÝKq-s�,q®]n³Ê—l…#bQ˜Zt‡^áms/u°Æm8’4nÔÁ
¯°°°ì¯Kðïô/°
Â>üCûð±! Q8DÈîÖêEzɃE؆MÄleXPñmð^˜çÞ—n¼,RÁ.L=—úvìÿçWAœÁ´‰@¸ÁÌÁàZDœˆ®hÜœqëmA@ñûUB4îÿ.À¸
â‚ñÅnF{y1îWe-…ñT¾B–D

 L2HþøC.¿(éò�
ЀrN¨ÎP‹HãÐè³J&ÏÔÐIýŽ{ÃÊ£öY'ŸtðÉ&lòÉ&›tÍçh±b
�Û°ÇsòŒ*«|ƒ¿Rz% Õ`’Ì“ªD¬ i
.$5$²ÌY7)¸;ì11K­ƒ‹3äÐ(רö¬éÆA›´1&ÇLÕ¸3îU¤=ÃD©¸Ä¸/¹
œµ¸iŸòU‘
-T�¤”Êâ¬-ÎV ¥Ê^Ù
ŽØ6·ÔðY3Ó˜5`p	}VÖA­„ÒÚ3š=	Ø´®=#89ö”ŠÝâàÿ0s€	ðš#USŸt5$8¶µÇ=£å^gÅd²O]é˜NÛQQ�*

%)£²u�lù!Ï„'<
�Ÿ$ã(Ó=ÿê‰2\d”V9™ÀUŠÈIßëÐûF‰ÀîÕ–Ê‘*Õ=8rè†SÕÄ\ùÁ	‰ÆTæ2™Ù̱~1C¦%eô?g^SlÓÄæ6ÅvI…Л2¢É•*¸!7º‘›ÚTž5Ii?Užò—b›#Œ©«zvÏPgŒç.×	­©
DÇè°HÀrsƒUèB[yLµ‘¡`gD)šÍ}jm¢ÛÌh×6ŠÍ}AcéŽPR“�¤'5)IEŠÒ–*�¤NƒNªšÂÔ¦9ÕiÈÀSŸ’�JªMƒ
T¡‚¡¨:êRÁ 04©H
ƒÂ U2„
¨X½êUÁPÕªŠÿáª`
VÇZV³v^(«ZàV´U­^è‚èZW»Þ¯uõ@^ïj/øµ®~ìþúWÁr_°ƒb¿°†ÈyEn¦\ìf‡8¸É-n°ÓAÑÑŽV��EaŒ>ÛÃJrô´ 5¢jY«Ì#~öˆ©m­ñd‹Ñ5Œa´¸…-lqßþ¸Á..nA\\·¸È=îr™ÛÜbàâ¹Ñ•n2ŠQŒdúÖ%u­«‹dèÂÉo2ÈÞe„×ç5†2ÖkŒõãƈ¯2„¡ŒcؾðEÆ2à+ŒcƒÈp;<`døÀ&ð‚
Ìàv<Âí †„ãÑŽxP£ÂÿàÀp5âÁaw¸ñ18H\âpœ8àH1ŠO<»ã@‡‹Ñ1ã�Câ¨1:ÔÁc«£Ç=æ1�ƒLd ¯ãçpƒ/½¦ÁÚ®è´e¥”×ò"+;¹ƒO 7E›ÉozTŸ­¼²‰^äeÚ’Í)úš™—ùZ-¯v¶Í|óI¾pWìÖ¸ø
Ðç£`èfÉ
P€£CAØñ€EÕ£nuj¸ÃÎv´?ÜŽi‹XÚ$v¶W,�{;Üá·¸ËÝw×XÝAþ±»×
är¬£çhCÿÇVÉ{3sß�è“×\[É{ÔÍaÞò$IËÁ„WùšŸO3üò-zÎó/
_(ƒ+x1r«g¼Ï‰öm->`u``ÜêÆ8.îi�‹çBšäÇE-Ä{ô•ãœÖáEEÓKÎ
b,£Ë(Æ2taߣã½×·/×e½u§ßÚû}¾u€ÙÑj¬�ëZ¯׉Ý®O8ý숇*˜ßgX´ÝÙg_;‡ùm¸g›Ä¸-Åì.°Åô
Ñ!ll
Ç!ÆÐmÇoÝÜÍÈÖA�ìyÚçò(Êô¬Fô:pó~ØŒ�@ H„€6pàôm=°›šÉ›ÎÀ	^€äÍ↯öúìhA Aårÿ°÷ˆ« îõ>àr�ë&-.
ö<Ž
¬@
&Â-¬@q¬`^".ü`¬@&ö%”ÃIæ 6‚C^gG!§c+V2¸`(˜Ò
ÀØà=æ@
Tv
ãm0&^r*¨ÀÌe†BjÏÀ.`
æâú@(Š‚ˆ‡”+¢¢<¸4
ÖV&ì@�Ý€9˜f3â�' &ä•~´éòN3VY‹wAK¶*‰4Q$4[55gÕ
ÎÁŽS—q™7syrù8�¹—w™—…Ù8kS˜ƒS˜9$v“bHä@<è´X4æ
ø([úö
²¹BD¦4	yS›ãäc�
ÿó�<89’¤TçNö¤Q]&
68”Iw˜c®“‘ò¤T€…Gý$*øã[2dOà@êà*U
:âe·ÖYB‚úˆ
Ò¹1ˆ¨ˆ^–)¡%8ïâ

Ò G3„ÒâOÀ9„%F
z£‚æD$Û’#;“:eY3‰÷šL³Ì<ÑWù;ÙEa²ÙB(…ê=÷C©»ÅUÜ`Äà
çš®ëÚ®ï¯óZ¯÷š® ÚHdiV›°�·-3%5jΛ™î#1ÿOxQs¶")EÖ@
d@øA¶ùáf»@·a[·d·{›·Û·w»A†[@ˆ[¶äµo›@’;·s;@úA
›º»ººSàÀÒƒÂI£~·2a0%7
<á‡
úìîD$†K‹‡CÒÀ±öA¾ÿ!ú!î¿ïR2ÅLÂIÖ
Ài|$Ø@^@
®  ¥R0ú[-<˜ê\¶ááôÿüõ„Á]ÜáÁé<Î=}Ïe{Ïû,Ñõ<Òk­@> @�†ÏëÝÕæ½\\Áÿ!ÁkMÄži½Ói-Ñá�ÖÞ]Ðå]Ü-üÑñ +U3$�×aÑ#7>«'�Ö%Ê»ÃãÿIÎÎÖË{Ç›üÆ)3lhd�ù%¾ä*ªã8ä`¦†‘ ÝRÔü¾wÞç)…¿kœLn"�‘Û@ì¼@\ÜÎCüÁä@0üµïaê•þÂ/¼ê¯þÂ	\ê/|@p›ê¿B„Ã
$¹9œëÄ‹[hÂ!
Áÿ�ñ£á"¿ñ¿ñÁ,ÿò)ÿ°
:ÿ¶½óC_ô¡á
ÁÒ€ˆ>¥-œãa¹€¾à˱rB34Ãë+'vŸöy
Vö/À÷‡?'n¿ögßr
nßø‘ùŸŸùqŸø§_ø_Ÿ¼Àú% �Ó@ˆ |ð™\™ØŒïÊò>�Çñ¾–=~;çŒ#ûþû´úD'Û‰x`F$„…Z´+¡%h¦V‚ à¨A#G�8pè 4Hç`Ä
Fl¨¦!‹)b|¨1bE�=V4Ñ¢@‰%bÉ’!”å �Çà‰8sê܉Râž@ƒ
Õ	ç'ТC‰ÿ&%jt©R�M�J�ºéΨU›ZuŠ•ªW”]¹RÝúµ¬S²fÓ

{t-S¡hÕÊÚQ¤ÁŸhÔt£†¯A¿€ÿ
î‹Ó/á‡7Eã7¯aÂç„,ñqåÉ—&,YsÞ‚š-ÿ¥zpàÍ|?oþyZµeÉy	j^<tj½«qƒm06nÃ?÷ú”èz¸ðÞ¿‰'�¼\Mð¹AÓh&™ïnÜØ�;ÿíØ·pØÍo7¾Í8fnò¶»7—ÝüùuÝæúýÎ99xÃÅïÚ—oxûúÚцrìÝöÜm
®Zy
éã ¦ºÔIjxZb­iä*�túæ[¯쯿ì°Çæ…¬¯Â*묰È.; ´Ì6lµÇâô,³Üj›m·Ên±ÔJ;í¸Ö‚«\ºå>+î»×²îºÿkŽh¬NÕª«n²Ñº;ï¶ëbï¾Ä–».»Ñò«\Áè~kl·Ðš1Á£[ð»?/´
Ò�9àH at tãdxƆ¼ì
Xî¾0€p
‰gÀ
r(Š� 7Þ‹ä&e%ä
}䂱Ãs²U‰h]bMKD«	…-~Š²Î0Ó6äJ‘1¢‚

hÑ԰†
–¤Ý
ð ‡Zá.¬Àg
Az®p‹l°IÝà‡"R�¶n¨€Væ�
ŒqÃŽ´Xq®�ÐUc6OØÄYÓn±™€Ø0;?L‹
ÄÜÐœS®iXƒv6’:,R!¹Ã
pÃ@…vRaÀ˜CB=�²{ô‰x€µ¶s¦‡¦Â¨g×Tœ
OšƒwµM³9äáˆm˜÷~{ÞôšRYó¦B¦÷·`,Òò�]î
¨”=!mÏF'REEø�Ùù‡Q»AÛþærÍ\Î#NÝ
Xz9×
Pà
ßÕ�[:­XJ¥ÔZC!¥×šùÚšßz¥ZzZQ®_�‹æ
÷‰®ra­Û±“èIu&g³&k
xF}ÁEGà`ÈŨaHV0xš¦v€“uŒoÄa‹øIr"aˆm)tð¥ôz+Ñrw�H¸¶C1ø…´Ã¦å4a3ÇØRNP
ÈÅNF¦…*gzð¯YtF°ø£
¾^ñ½NZ·iA¾KÚ½ú‰¾nq­ê{tû¾â;¿×:ŸeK¿Mú¾ì«¤û«‹ø{¾IÁ·pë½³‚¾¶€Õ¿í˶cû¤ß«ÀÿëWmÁõ)¿_¥ÿáK®Aw¥Œ·g¥z»¤aaÁŒŸ&Ü®'l/¼Â$\Ÿ·øÁ.¬Â(üÀ5œÁq‘Â=
¾lA·î*¥:\¶61¼)œÀÕZïÄÜ¿
ÌÄÓ¶PŒÁ<Á·Rl·SÁ¾ßJ+¬Áú™¶2œ™�:Ãf|ÆhœÆj¼Æóû¨�/ÁÆrüÅÔñ'qXHÊ+zü&yÌÇ{ÜÇ€üÇ‚ìÇ„È…<ȆœÈˆ¼È‡ÜÈŠìÈŒüÈ’É”É–<É—\ɘ¼ÉšÜÉ™üÉœÊžʤ<ʦ,ʨŒ¤d(E
¢süÊÜ»ñ/±°|˸œËº¼Ës#>ñ5ÉËÿÂ&š+^àa
}Ð-Ñ]ÑmнѽÐMÑÍÑÝÑ ]Ò"ÝÐ#�Ò(½Ò­Ò-ÎÌLÎåØüÒÑÅ8ÇÅ;œs9½Ó:ÝÓ@ÍÓBýÓCíÓFÔD�ÔG]ÔH½ÔS‘_ 3� @	¢`Õ–�Õ–ð	\ý	YÝÕZ
Ö_½Õ[íÕaMÖ\­Õh]ÖÿjíÕnmÖcýÖm�Öp½Öi}Ör�×l­×w×{í×}m×uíÖ-Øs�×€=Øt}Ø…MØ�íØŠ�؆ÍבÝØ‹MÙŒýØ—�Ø™]Ùš-Ù�ÝÙ¢�Ù¤ÍÙ¥=Ù¦�Ú¨½Ú¡}Ú­­Ú¯ÍÚ›-Û ýÕum	U}Õ(À
àïˆÓÃÜA²Gà—ð	“Ð	;p̽ËÝÜÎÝÒ=ÝÔ]ÝÖ}ÝØ�ÝÚ½ÝÜÝÝÞýÝàÞâ=Þä]Þæ}Þè�Þê½ÞìÝÞîÍÞA°A0A>àÜ—p
Ê@îÀ
,­ËZºJ@904 6­IA¥Á³ÌÓÀ¬FáÛ1áÿïJá~áná.á^ážáâ$.â!¾á'>â&^â(Îâ*Þâ+ã0>ã/^ã)~ã.Žã2nã9Þã;®ã4ä<þã>äE>äFNäJžäAþ
Ñ^@øPñ0K`X
žåD
l Pp	˜ðdðy&uáS!”æd¼æôÙæv¡ænŽælþæ&z#vA#ªâæ\i¿¤¡æ}çrç>çù7èv'‚öK$�îS-!+<qæt~èpŽèsné{~é—Þž>E+œÞ拾é‡Þè•.¥~ꢞèª>é¬Þè®®ØFàú
ñXƒ�Qñ¹‡)œ †[³·Á£
1ZŸ°3žñ‡.¾YðšdçÙ†
:Ö@d¥»	o�u2å'š)¦(^Ó�ϬõIã™gû!�”¼pÕàˆé�ž.}FKC ôñ�	Mc
cˆ†Á²
ÁM0iñ‚:FT>%�!ˆXÄÒp†0¼MRý¸@fÔ±6„1‡r¡>
ˆ0è�ÊI
D
DÌêÑ�|àáFõCþeÍ	õÃ)«CýBCýéÔß@]Ʊ°Šdê8�é€Â&2‘VMa2mj×´Z¦„�•ñ˜ÇzIKÚÖÖ¶H	ËXHG'¬P‰J·ERq.•,…x
-\ «¦ÿ/p
k[>ˆ«ÐSó‡A Ûùƒsp}8‡?˜¸	h«hñ}@‡oP„Aàñ3—¡¾ÚƒuXCuøƒÝ8³4Àƒsø™|0‡T#‰´x
D
š7 Bÿ}ø†BX ,‡>p9X«•9o˜C²±CBH‹À¸óàC¸£¡<|PAH«4 27©SrX¡Ücª”hîÓ‡Tl ‹(’”èƒíÓsÐ�9@ƒ;„Hä}чmPiÊ	�àà= i|ø™“È©£¼o0ƒoÀ}™ƒ	ü‚Aè†q ¼| ‡; ;(Æ9”†Bxo1>H‹?0‡Ÿá¬ÝP1±ówÜ—„ô€5ð�:(Èb܇q@mðŒyNÁª
:È}@Æ'ð…P§Ñ ; €'@tDì9<L9È¿ã­ø­¦ Øƒ-ë-·P-Ôbÿ­ÒjÊÓrJ¦”ʨ¤J¨Œ’5PÝBµŸDŠ&Ü D‰<dŽÄ³]:5�—3H
L	yñ‰¡9Ð%"
Ûá)jK‡X9í
Ê©'á´%ôœ&´Ï
й¥K¨ÂšR5
圕 ™€œ"™ÎÂLzKžŠŠX¹
¥ƒcBÌžŠ]²	½BÆ5H™7
ÕP.›˜yÁÌP‰ÙºE¼‹Ë�ÎëT5ãÑ—ðÌú�Q*mRšð)�¸B‘ˆëä�
Å>Ÿ¸ŸÂ�ÀƒPÁ|™˜Anƒ‰:x™8&ùã¥	í)™`På4ÝœœP¨HÂ)¡´(©O=
PÒz“)Ü­,=¡
I�‰B‰ÔðÍöÖœàT‹àPÂùõPŠÁ‘U˜0K^½ÔßR‹�P‹’PùS´ø¢éýB¶!¡·´TJí‘W=�[ý‰Ù"“¥XʪlW«|×F=BMSWGµWÛÊ-9)�šPÔÀT at uקŒ×4AŠ±d	(YÂQ­TPÕÕa	4ð¢X5N[QÎ,	È|Îœ€¡~ýP‰%‰ÜÜÕÀ„	*¥R	ÅN=‡­’0퉓yŠ¡OÕè×Á±ÍW%ÕÀŠ!-[ìUÖUK¼mÍÿXBÓá4uÅ;9 ÿR9°ÒÑW‡xÉ0Øì°MHÅ)qÆãÊ{ÝŠ¦�‡VBP¶
7
É)Ê?íŠ5ÛfÔ°85ŠMõ�þ¥U’
	~ÛP4ø‰¦37<@—Ú
ÙƒcNU¥HÀȃs˜Ãu˜æp1ø‡Gê‡Ì‘ [8pƒ	 �9•5˜ˆÉ mŒˆw±ˆâ(Q’�ËÇ»ÚÉH
ì‹
ö•˜Ìé^ˆM™w
�Iò+
i¥ˆ3H.x¦ôƒš²ÑÄ{S–Pf]õO4 ²E€EoAr@>؉:èƒ(Ò—uX=p	9 "ê‹IŠ¨ÆÜ�‰¤Ã;TŽ
UBPr°Ft؆m„>X©¤H‹É©z.²Å`Â;T}
Ûÿ(‰±Ü	8@â[LŽÁXP¨©TNÏm‡�ã“HâŽÐ~¸
í±¤Ò‹~øV0²ª– U	
îÔ#±`ÂØŸJxeð€mð+Ið¡ÀJ­$ƒ‡~UöŒláE›“	)´B,Œm&‡Ÿ‰«qLŽ@Á\“š:ZƒEx+k\‡o
8
�Àÿ%Áé%ºìÐÉà¸ùô“¨Ž«£•‘†Z"6t(„ÃudÌM”†â‡´âküò1¯vITƒ+
—³Ñã"˜iˆíA!gn<¬YI›—,}8#D�>貃6xoø˜‡ßƒA¿¦d™}Ð1X‚ñÉŒaC7ȃ%x®MùïѺ;H™4¨úß«Hᇿ
vÁ,sy.Èn,Èxoü‹Î×+e•	Ù”ªp‡Wƒ<púÒ,#0æèðþ›�PAÌÛÐSž—6À•�ªÐ£¾õû§G?³ŸE˜ö;ˆþ«w&}È
m¹ý0¾�m�#
ùˆ܆~a�Lÿ«@Ø°R¡<S=
òëw¨K –üÔ‰á’FÌÃz/Ÿ‘³f�¾ªú¾yÁ#F]Á‰úúƒçËš‹jèðM“†ïÑžÓ��Þ81z{2nìÎÇ#K®lù2æÌš7sîìy2OÈ;Û�!réÒ2\褱¬ñ˶’.yQ™¶Þ½}a$à‘6/¨<3]ºÂòà_¾jZûôÿ¢.èK7¬Ûtñ¢GL3âøÙ\çåïÞ�rÞ@ö¢ožØ~|ÖØ9„Ïä=rmÒx!)vŸ‡6_æE¼§OŒ]Â_UèØÁ…yýéS[iÁ÷lýp§O!_¤�VPýH“’@ýà6Ïw¬™WÒK�xHM¸ésn,ÒR=Á�ñ
†1
Šàã?ò”ÑAvÆ©u‡Œù•`Â}Ñ…1ÑÑF7<ÂÅN¸�~Û€¤!€ì
²HJ
º”dmdNX¡€Núÿ³Í*­ç=ý´¥�ƒVWHM/i“l-Í3O4zØñTD/uá·½D†ÒHÈ8ft �p¤Žhd‡gø¤‡°B!Ò5¹´ši4è�XøxÁ0VõEŒEFß@bés
RqÐ!­rp ±ÄH[‘QHZ‚3ÆCýèF¨^¬ƒž\ê<TEküÅE ßü&UÜÍó
"^)§†CËaãÐ#�8[F™d«ûÙÊ,»ü2Ì1ÇLÚ§ý xÌíÄcn8çÒKÒ�‡}/ÕöÅ>àNôÒCÊâ£Oó¶3+‘Ó{,$Ò>û¼Q=êÔкÑ`®ý¬ÿQ‡$}Ÿk€uœlØÁ�XëØ!]“Êþsà[$öƒWƒžV×®^%�Iü쳤Áà½ÓÙ0&ñÂcq!�Ò÷<­>\²tN �´`u´¡�XF‹¸O=ô”*XÐéc{Œ$‘?øt
•Àû0Ëy;/'Ay±—eBm›ÒüÌ£KýX/’‚)õ•ÐùãO?óà³MgôJÐKaHgõé^|–Aa�GÑÒñFƒ)Ά�.Æ_,å.;täH×ûÐ3–¿4	}ÁAôA¤9XÁ	Ñœ”›%àIž£Tª‚uô!]{aÎì
Q:%ÐÒE9ô‡\@”:€ÖÅð!ÉÓÇ!.p†ÿ£Ða\ {D¿p!-Ñ
Ü`‡°ø‡€`À�”„+¤ÃFó(ôšÕ&OyZŽ‘<Ô»0 á
DƒÏ>ôà†;¨C¢úÄ’”â92†\ÀCtô
;áÆêÈÃ>=”‚U.$øÈC%×�'°A#\øÃNŒÄÿ„!¦IX0_YM7´¡“I²ƒÐÁ£%œ¡
KV?ÐÁ†pGdHª=«â��ô
>êX%ô½B¨u¨_а“:@<nÈèÌL5\€$áÊ|V’°-é†L׳ÃDXŒ½¨FHÉHLS_
w„¾Óu
ËI�ŽaýÿC| Â¼ü°B¬!'s�C<P	¹ëÉYk¦Æ“¦ŠÃ�%[¥S¦Ç෸ƽL”`Ô�a>:Û!9ÆÔC,Ìß„Aª­„¡ªÃ”�À¶a"ëBçpÃ`vò,7ôÏ%.ñ‚Ö
}˜AhAßÀ€{G5 ¡©4q‰?È@œq0“�µ�Aòó>‚ø'`&ƒÑÉ•ä‹ èú–»¾À…ûÚäbÃG~£A€1�ñÇ Üà†3ˆ�Š.ÜWœ´4l¸%ð(9
U/BŽhC{$÷)ì‰é•V8‘Aˆ¡Йqî+—oô
V&Ä"á6äI#ÿümcád]ì>÷8«wù#ñŠÁx„4λæ
xØG9¤ˆá˜áM¥úÆIA’yôÃ�ðÀ8N¬¢´!+ɳŠ¼0ˆoì#&¯Œà„g{ân‚£åÎ>A…;œ’…g™˜?¼!6Âéi…øæ€^|]=˜Á\’–ÞS’ƒ|a¥>¼1+ìÁ„HD9òà—܆g
ˆxwf]#/(%PXH
Á‡Ùí :QOLº�ßØdˆ{ñ
屘%écÃQÚ`ˆaMŽœþƒ¨q£�aЃ‘X‚ŽA(QÒÝhˆ´±<²�‡1Mmc<ö·˜ãîQ4¿ÿ8Æ-C‡5(÷43 ƒB¿¤²-ˆP‡TS™Êù$Jiøƒ"¾¡VðÙD`Þ‘_>† ùªE_9¸z�ˆƒåQ{îrü†u@%•½ìÇ?ö±
²°æ}àëÇ:bbžA‡¯*L#GLhÜbëI/ˆbºZÆ•B�é!i
>Ìa‡3ø¥×£mˆK5l¦ïvJZUö!4:ð!æMÏ•öq>DÚðpê>±Y	·„@GÓ¿�…‰d\¬Óh©iðícëIÎ%¿€t0Ä!ÿ�Ç÷²�.üAJ…eæ¾'0uÌ'<sNCÖ1’ïQtŠ¨�û@Ž»‹òÇÓÿú ˆ»Ø!\ÁƒÁF"°.|3A‡HU 
@Løï
¡^L¸à}?;Ä?èØÆÎ@wÕ+|àƒ=Åþ¦b;$-xx�ÿíéÃÂð陞È\_Ø�"ŒCÀ8„�8„ßÓåYOßQÛ�PÁœ‘ͼ¤AyaÞ? Ïù…Ã7¨˜s@Å>‚ÐpZ„ õ ‰~ÔŸ
¬A—Å�Åü
ÀÈ` Áè�´Åð�x
æ€Î™ÔÄè[å%€¢Ä�°
ßôœÇCüÆ?ˆCÅÛH•
yg‰2‡³D(XþÞ^´Ï´ˆr¬ç`æVrœ�$&´ŒÜ†îLΠg˜ü^{šé	©L”–ÅQ@ËÒ™i‹
cÚ¢­GÒ¥'vDVÎ-ÝÖ­ÝÎ-„\€'zb*¦­ûà->έ'ZÁÞf%*Òe^xd*TíXáFZßf%ÚÈYBîáz¢†©-ÛþåE6nGì-ænåÞþÉ_~.ä
îÝÒeÚ"È_ætdãZ�ØJÛn®DnVV‡ÝÎäæÒ-æf¥àã²ÇãJ®Ýö-ßö­ÛïéJnGô.ôÿú. Ú->æíÛ.åfoãÚ
á²ñN/ðJ.¢4oøn¯I‘PN®ûtAïÖnûºÏ\€ä¾oåªníþ­ûȯG^/ý¦îö:næ.ïõ¶®úJïþþ%ûf®ý‚A¸ƒÍÃLq�ac\-ÌXðÖf°dÁÀ%”3¼Ã;Ѓ‹pƒpÓC	�0
£°	›p=¼<´ð	Ï°«0	Ÿ0Ç0«°›ð×°
ßðñ;C
Óƒ—pqó°	Æ7±71ã0û0¯ð1
Çp=èpï°
7±Óp/1_1‹q§°¯ð
·°ƒñÇ0³±K±ÿë±�±¯ñ;0±[qsñ_ñÛ1—ñ“ð?q?rCr
ëð 1ÓÏ1ƒð²‡ñ%C2'×ðsñ[ñ
ç1%¿1#_ñ�£-f°f`pÒ2.·ÌN¸%PÃiÊ0Ë<ÈC<ÀC132'30s2ó03a0Ç1Cs4/s2Ï3ÏC0;³2[373ó0ǃ4ws8‹31³0G33³6s;w³<`30�ó/ó4377³5§s03á:§s8s>³38Ãs8ÿs;ÿó>'3> ³1ó;Ÿ³13=Ç30ÇHŒsCÛ3=Ëó/ÿ3443CsDÿ/ôEó³HKsA´As4;7³4«ô1‹4K/sL›³?ó0ß4=;s<˜¦MO³B?s23¡Ló3Ao³;+56·³9ŸôNss=¸C:g4KôKÇóJ;ô</óJ—ó??tEÛ³Bó3R3K�ó8€]Y0†lÚrÕR!\ç2]ó„¥.Tïµ,„²gÃ5Fužèk¢,+¹!`oL¼Ö,½¬ï‰+Éͨ`,Û`Лv�J䘒c°¡ïéLÎ)‡Hqªï‘�›îë؆œ'aOžèÈNF²Z©Ëªö‚¶Å=‹—2[IÕlƒ>6gO
ÓÆgfc6`÷öfûfÍÊv!åvf at vt1GÇÿXöÇ ŒqfâÃ*÷…^*¸i¶[‡vÊ"÷º¤é«ú¦v“\eêjFtÉ)jD½Ê«_G¶q7‡â¶gèQÖ^ðqQ°~¡ò÷~‡!½âu†ÇÊ·q§Oác`wͶ§^ªÎ(hCøx#çhn·„s§²!c×¹V­z‹ªz'whŠÇ‚ow•ÊÌ…g°vkv‹ïQŒ×uÆÍ8�sø�»5ÊØ÷\w·pÝrŽcœÆ)Êܤ~ŒzË)’³æ‘o8q1‡Î|¨^Jx’;¹f”¸j/y‰ß,•³Ì’OymRmÍV¹ƒ[ùcô¸gØ8‹ËÌ�¹›¿¹›£9œÏ9¢ªu:y_ÿw*“{s£·ŸOy•—ø±6­�Öu :åúØ,:”vf«‘qµwË脜ӹ™[úÖ¶ykbzŽ«yÝ·g€:§ó‘¨»†r&V’£¹Ÿß6zwê^¶lt£8ÇȺ¤ëùlÒÑu¹ÊÚzeÔëC…xm;x°cø¸>xr{ze¨Œ²ïy̤—˜ïWkVú¨G{~O;›Óu©ç÷ f;´Çæ�ŸygH»µoà¬F|+¹F�‡r:¶l#ûoî,nAvo¶úª+ør—³ûæo(¿“{OtÀo“náQ…›w\w»z׫_뻿W†pOû¶¹¦G8µêˈûgðø·w;ÖºÌÄ×2f`<�ÿ|¨‹ü¸çO°
fKj¥¢¹»oF|Æ|gëPº¢zhB8~süŽo„ÈÂ|IQ­qú¡ßìÍ&Egßlœž8¢Ûö–3;c Á�#̓|Å߸ɇü]}Õûx.8Æký§Ë¹Ö8¡ž|pAFG�
Œ
t
/糇±^t{
yºÚjœp¾ÊPÃÓ"ë,µÜZË­¹HŒ«œuÊ9‡/5è-¶Ù(s­±£FÒ.“ñÆ×tÜÑÇijF…ôìÇLRIÌrTì‹1vñ
¡ZrÁ…àhù€€> Å8à¾n ‡n)¦L‡2衈4"¦–
ÁÑ*T
-Ä0t0Ô°,?ÄDWG„K.¸Ò¡K�Ïi£/:àX²2$9+²5a
6H_�Hd+­Hc3‹ÍXf'›¶2b™\¶Xl©e6�4žÜ…Zp�€8唓 b8—€\jÌ…ˆsHM† Â×96·;7Îé@ÂN`�Èã;ñÆûÎÏ’fïõ ~&õ\‚©PE뻯&�Ej§¢(Y©‘3�´š¦ªyJA	5TwDõêÂqð1•fññP-Ww~ë­ÿçªu®×9'�Ñ€íµÛ_¹…ÌFk—ŽZê©U#’jj§múêÃèàbŒ^<1wKNr9%-	Ê¥Ý8�q³–äÒ7"‹Ô,Fºêt™È¹Ž2ÊÎ
f:>?z`>�	æᎮø˜“/ÐÇ!F¦áš^š/QEoâiãÏù;ª?—²ô)t
œv|P*O#Œ}B¯l>CTɲ},ž{1ÖYãjëD×QÇè]›œ�Fb�Õv6¨]LX­_–úl-SVIè¯W²û­Á¬×5Ž(£
ªÅ\
jY§b³R](U7Ë]îÒÂ;µèD@:„V+MW,ÒöB™ï5‹yÜš"d ‡˜,ò(y†¹âÖ”EEOŠ­Œ‘Â7£4ÞÈd0ƒ¿
Ø‚èF7º€Ó¿d±¶wá¢%H—,‚‘Ç8}À"ÆÐc-(’cøñ\¨ÈÈ2j!cãoþ:† ÿ¥ed0N¾p‡/àظÊâ&Ç(OÃL©Œ†±‡b�c	}F¨“Ï�°c)ì5 at f©­nuòå¦VÖ©…Ãÿe¢"•Vf–L°€åTdÉ[@ô³Ÿ¹¥r©æ­P”«]­±zÜcÕ|µE0VÑ›å¤±ŠôÅæe��P\§;¯÷†5(¡XÛ&â·+ÝâMçú@.09'Z¸péB1¤ÇúáB†\[0&ÂÇ;)Ž|º ž.hPt
ãaz†åDò¸‘HN=¬tÉ2p‚ÒŽp?'D¡X2]2ÈRSIƒ¸áŽ–Ie˜0Ó!WfV»œ
Qggá—T¡Y“‰È#ã‘®xÅi‰S‹_Ä¢�¬úÔ¡æ�á|VVaS£mF4Ô3�9Ç
;Ü&'Ð#ºÚUÀ[¨Í]
ékºž´%»Ðó¾E)�¹Ê¯
7cøo
³±þÄ'Ãì·ÑH401еÈö p
™1Œfo5C4 at OSõ’cEš/}1FØ/ßQÿúÞð•Q
Ï(ÓñïnP�ï/Ô‘±
kÛF27¥m67£(ir¹�‘(S3]Re²üXä8‘Ó1œ1‹P¡3ýv¥û&ïøŒï11qs2ŠÒ›pñ2²Êªž&Üè0û2Ï
,
aBUÐ]ð
ZD/`òS?ù
>q4Gu4GíS
õÀÿõúbQ·IýveùêŽo/€
Pðö4tLÛu0,q‹ddYj–µijpS1
Ú`

þàÒ`º†ô
ðöB/üµJÿ`Ž†Ô U×À
ÒÀ[ÃÀ¸ nÅTýæH¹`zSûâñH�
ØàØ@/è
 ++w
ì7j÷â[÷Zïàî` 
ÞW
.  
aÀ�¿%
Їaõ@@¥öŒ8Îð 
¸ 
ÚÀ•Ï0
ú`
º–�õð0ÞÕŠµè#¥&/±xi0�ñЀ
¼xßfå¡Vƒü
fû
y_>c
À‚x
ò`R+7
úw
ê—
XÓõxå

0™
Pº
oœ„ÔG¸
Í ­úÒÍ51QõõþÒ‰€²çÖ/ý¢/“,{‘S�O!ë O=“
`/½ï×Íz1™ƒkøY¹†µ}Û{˜Û ‡»½Û·}ÜɽÜÍýÜÑ=ÜkXÜѽÝݽÜÕýÝ×]Þç½Ýã7býÕ‚ñáæáh¶ÿþ½?Ý“fû³
ôa
ûå¸Â·“EA–T?3‡”@»…X;üž¯÷Ï(;;ã1]2Ø¥]å	Óס}ò¢o;	#?ÔOñøBÛ(6î+öPžÿ”!ù{¿ñ»ñ¿¿oQòŸò-ßñ!?óa±ò2ò1“’÷ÜÑùNïú¬RölQÿ_ôv¥P•‘g	{ªûÿìò»ðïvåOIó8|”3HÖklú��¿d
¸é?x€Ø~Ø�¸d™_øƒù¸‹× d™žé›^ù˜øxø¿ß€›¿û±€Xœë\œ5;që¼Îíw�—ßTø8¨¸˜¯¿‹­€1ÙùÕß
Þsf*·™jØ�ö ?*gœjº-Ç ƒ˜-¨ ?ZÖaw&^xamªmŠ±…(¢…Vˆˆõܳ⊗]£p
Z¨`�8ªÏŒ"*øâÿh).×
Â3$�2âhdŽÀ¤Ž‚†xãŒ+z¸àej(Ž|
:d�z"×á�6ZJ¨j|F*£ �êøhf€’fÜe-£ŽÏ…øœ?#.
¤¥�î	ê �ù
¹zZ‘Ø¥è‘&ˆc¯§fÊh²šæ¨#>
禂Ú'?ðzšj¿ƒvÚ¯e
bŒ¤pÏu>;âˆò)cÿÁª¬³¢Ä’Âú࢚šcÀïi*moò³²eàkf¼y`nþÀëðÍ¿¦|á¬ÏJ0
9¼	fN*Œ#b‡s¼xë¬àõàããs³­á’2³ý&
pJίlÕ!
ÍØ·ºyh_Å"àk¼”™*ÇáÚˆw¡}Åï5­R\0[©¯Ô
 Ò„]
äA¼âQf‘|àŒf¹OÀÉ)O@””¨>à+
–PÈ9kì´ÁYz’c$8'�Á­“ÂÓSŽà
‚"ÑÈB7”“ðî6�Ñ�U5:Ü�æ;2§8þp,}×I8’ew£¬<ìIE’
A±œ_ˈô§\±
–@šá¸PžŸäD*GÓ’ŸK½ª:õ,Xͪt¹¹Îz_ì�˜Ä)¶þ`m�bK*˜ÜTG·%
I–­³*ù©O�ˆA¾r�2sf‰•ˆB{õD1^!«sÅ}/aYù£ ­jÁŽ2_èÿ׌�꽋•¥<º¹#áŠR
«Nt,(äȆ½ý$ë�Šå9@^ôtÖÅxÒ~à
s at OQ–fÕxzÓJ„Ñꎣۭ®…ÅÇÕzçaÞ"U¼ÈG»K~OS‰<61
«¿rM�¯|iWWŠ×¿îõ¶ð¼à÷úbX—«·z/hçúTÌŽ…'¥)
Ï¢Áí®Eóä}'jï;ÜáÞu°ßXÿîr?KÙÝ®vÁÏ}ðÊ5JÝÍù£¨Á,�·žØ«"&Ï».亵�Ù˜ÍO÷zäØDÿô`�“iU£š{,~csãØ-7yíçÒq–_¼äïý¾eŽàG�÷h¾á%ã÷åöj9¼\~_ræ'Ÿø&ï	å}’ï¶,÷ëéæ<”Šúù0uéàOòº×4u£{ÈM?­ÁÂêøÃë>GþÇù¦Ü¿Z{OÊý·^T±y­æ|»÷oywÔ¢„w|ø·}}—xõövxÁ€Dq4Gs}bzìçye2~®u�'t\dzŽácÝ'{P·zîw]ùVowñr×€I#bW6ÿa%;×z³g=f!`Ñ6Vp×€ÃW}K³}‘‡|õÇ}ÓÕcÜxa‘{ãóÇ„GÖ•x, â¥cØB~ª§&McF(È…ÞÇchk�ñ=IDó<8}RÈqÚ$p=‚A4Ò"€F±o‡§¨w汅ꑇm×uWèq°w&…„ÿ–ogèdaøMºv>”¸‚™¸~Q•zhh~U‚‰|�‚Wâ0pRRƒ~§çr
·\?ø‘ø|·M(Š€‡‹QhÙ$‡ˆ‡‹¹(ˆéáˆ<ñƒVˆuF¨|³·v*H]K5†Je†ŸHUèÇ=¡ˆnZÕMR#&Ûåkb¤^H%7ÿ�p!�Ö2�º¨„Èçx‚AŒÍ‡µ8nô÷‚ThƒÖçTgvå¶ÍExÄø(�l×
žÜ‰ÄPžäyžÚù§èYžèÉžøiðÙžË`žÇ€Ÿò©ŸùɨôiþéŸÿ	 *Ì ª Ê
:ú ª¡:J
íÀ
ñ@
ñ0ò±Úª¬î`«¶*îòÀ«¹º«*ê«òð«»Ú¢-Ê¢/Š0j£9:5Š£?Šù
ð
ð
µ�âÙžƒzží97�Žê¨†šÆp9À€“ÚŸ”j©Ê€û韜ÊŠ Ìà©:ª¢*ªŠñ ¡©ÚÔ�ªí°
½S
{
û�æy¨{7þ©±w#•»k
Á€²É6Ì°c´»
†5Víð*¡³Ûòì;­š³Ë¿p«RÀl¼Z
S`ÎÈf
FEI¦€œ´€L	Ä`�§ \¾ƒ	ÊF<͸ ÜlIJ�žãL

:
ɼÉö©Ã`ξ�ÇÕ0
™…°ÿÛ¶+¡ÉFÇí
ŠâgÜ¥7%i@œ½p°Éæ¹½ó
¦ÀÁæ\¸°œøZ�VÍÃË6±PµàÕÆ€ÍÈf]-ÔÊÀ	
}7› žæ̨éIë±Ñ\ÎÈV©h�ljß½£¡~Í «ÐÐÈ–
ê²¥ÊØÅ»ØÏf«�Ô³Ô
ÈñIjÎìª!Àxì°�Öº»ÊØ:Æó
ò0Õ~œéfàÚ+Ùð¢Ð`Îá€
ɦ½Éšl€¬Þ€
ø>Î
ì`º
N
É>j£â»¾ß µá»A*­�¬¾#íâçPsÛÒ`(·5Ž¿î$Ó1
íNßÜì#ケÒÓ=\€õ¹àÝ}k§´°Ý|¯µ@ÌÁbÏÁÄ`þá‰ÞÉDìÁÄ°Ã/üÂ
Ëÿ;Ã0ÄŒ8ÐàÀcÇŒ%–ðXC†;†™0‹3bdg‘²aÈÚ!ëHR$µv쨱K¹%Êaí^ʤ6³¦LšÕ¨UÓÉsgÿ5w<�ò×­š7pÕÀ%]º´[¸pÞÆy“JuÜU¬ßÐmåÚÕëVuåªSgŽì:uhÑž=»Îí9¸ŽÚ¤¡«Æî]¼xßäåÛW¯_Àwáì
\Ø/aÃ�'fܸñbÇ‚!ó�ÙòeÌ�gf¼¹¯gÎj@í¸thÆ•1«¾Ë:14v–<)3¦ö˜#¹�äÎ=fLßÁû&x2�º\ðò P%¤�Qò[IuèÒµk�ýH0×;�?^	á=\ßLû0dÞƒ!fþ{ûöÅÐCFÌ’0Â
?O]lSD,”ƺÿÆ7è°/e3%®€Æmêb¢¶ø0» ¡iÚ2$§Ž††1†jJSa
…"Ê+�êê`�Ö˜Êñ‰vác­Ð¸¶ÄéMrœêKÓÉ1Íh¬h[ŒÛôE~

|”¬ظmE)
	Fåh¤gNÙ—
:ÍRì³\ÕÀ§l¡á›t\i ÷87-0u0 ª çÆR9†R_û_ÖL©Âœº±~¬ÄPY‰Ç¯­M•²cÍV›H¹U9έ¤¼ ¢ô(&q

“œ1;æåQc®+_äð†/Ê!žû`s>ÜŒ�|à#ùÈœÿñ�BÂO:C¢¼á­¾J‘#âô³Ë&nõql«å�ú¤1êarƒ·Ä*`(=)¢
Õ\£ljÈæ@…ð	Ôÿ�Ìo˜í·áLïÔ}Ž)a2
ÀÝiX€nx§	-fÈ):Ál˜ÕâœØ?s*Ó›³y‘ö»˜b,�ÎãËp’q²z(faé¡L~Àãàö‰ëA€›Ä…u&
¨Ã:œ?�Ì€|(e¤‚?à‚9
€BA6н�aƒ ÜÎ3&DzM »A?è½3°
@©NÄ+`<»E
CL	€,È#.pƒÛìƒ6 N/€EAÁ~#8b´=°*hƒ¡ì³^̃<êÆ`¼ÿ5€=„
Ñí½ºœ1ä‚\<»:øH9 PŠt.°Æ%
µ+èƒ=Wñ
°ƒÖ£(ÇÊv}P0½KJ
h
hï]Œ€<z\?Ì;ÈT^4ÆÆ‘MX5ÿÚ›xêW„Ë

Ç	È5ûÑt!6háÿ°ï¼wò‘:¨vôLZ{§Ñ¼€;Àƒ>=©+�>0®Í¹Ä'ŵÅ­¿µ©€"¨=ˆRÊÔƒúç´7Q�²ú$iG"
{�"û	{¨#!Î;«|Ë¿ü,6:Áû“ñ4Ø=,ïõ7Ϻi+™r4sI}…É»¬b*Á…�vyôCb�t!tL¿‹Y¹ýwÌ8ƒûBG™Q_ƒQœJ S¤o?*¤Ã߬G˜"”EéȃG?¥âØ#„1fG°=G¾)ë5•âØd;ý9rmÜI˜NûüAûÂ?É÷8g¸�‰¤|ô¾R›¹
K$RiÙ™Cä>uY*€ £F 7iÎx¦Î@5rÿ
¤CçÌŸ/
©‰
ÉP•3îF¥g+ºæ\oÙ�Ö‚T¶§`{kBÙ^zdÒgnOª%A0V7Zi}—áo}V9œ›lÆßž9�”…¦Á¸'¤
¶ˆgoo~Øæy¨-ªésÂK¾!I�(†¦ª‚òÔ!«4u誄²‡á„v¾:«f"ZÖ$ŽSÿîÑf5.Êg‚Åú×)N˜ié)¥{"¢v	â	-o�JYå´>"Š)º:)­­šønä
ØàLâÄ®Npêö£LÓ
&Mîo¥•âûn˜þ±pNdZæ[ ÷1Zè¡4UšS¿eé´¹§»IZ ”…pã”F„ÊZèê¸Çjk…*SÜêxuδҙƒ.Wgêiz!K)1sÅ.=üÓ~'m7bL«mv]ͳéÖà7ºG3Ã3=Xi Å�lžyNÿYš±ž’ú®ÁÛœœ¿WT%K·)ó¥ÉÊäuÍ1­êß‹uWÝ2Ü
cŠ¶Þ2}Çö{OòÝÿ¾½¸»
S†F¨cÃ
÷ÀiOÚR�-Wx²O,¯Ì9P)V¡å�ƒ˜(Ûš¦œi2Ï®ìsÿÔ"à:mnè²bc·óéi/W´á}ß-Ø¢ÓŽ¼ò<‘¼¼ÂÎCßmôÓC;õ¯‚ÞSö×êy®œZ‰dìà¾1{k3ÞY>Ž²çh¯»/¡õÿvO¸‚«–Ô¼¿?�õk.€ØYS‹v'î!ð{	”ß9„<8Yªz
œ ó(ØïMtäÉ€
Q(:&KdF/zÑ$%*´ Õþ#¼¶©MyÂÙ�|^64Õ]®?²+MF¥ø±�pÛÓ]‹X»1‰JÌÐuÒÄ¥ÿ]ÐVO´ z"õ%yÇFùóIì°d¯ÖpjaÎQ	æü‰g;@T^ó„­2©sÜA£Ï•šFUJ]KÜcË
ÇGFMqz�ü#!�(Ä’yt,Û`}©<Y¡ª
\øB¸`‡/¬á“<ÃÖ€‡5Ø¡“¢lC'I)ÊS–•§ääXyRÂr
¦<%h¹†ZÊR•©Ìef©KWv’•¿&)_ÙËc"Ó
È<f.
Òƒ(“!™¦4¥™†6T›Ú„¦Èº	M�IÆ
kà¦3Ë)²3D$èLç:Õ)™• 

lHÃJÎ΃¼s@"iBf8?%’�
MAYåÇBÖ
ÿ¡
­Ì@êÀ…^�`(C/v±^ðÀØ…F;
YxÁi/€Ñ‹`œ”¤(]i0VzÒ^¦(ýL›âtÃøÅN{Êӟꔧ>Ýé/ŠjÔ£þ‚¿ˆÆR•
¥Rƒ©O�jT«JÕ©j#ÚÈêVµºÕ¯~µÚ�F7ºAV²vciMë6¼ÑÖm´õÛ�+]áZW¹nƒyÍ«^Éá×¾òõ¯‚%‡9kŽÃ"6±Š5Ç9ÊÑØÇ:Ö±ç˜,e+kYGÌArÈ;h
!ÚPÍH‘UŸí¬† jÚ…Ž6ˆ)ã	…ÉÁ.Œa¸¸mkK[[Ü·µÕ­m{{‹Ùâ"¸¿ÿnp�‹‹b ÷¸ÅP.r›[b#ÑEn2ˆ!Ýd\»ÚÅ®1¸»ŒdtwÆ0†2ŽA^cüÊ0†x…±^e ãÈ€ï|ã‹fÜúݯ~ÙÁ_ÿ"ÿíð€ÛÁŽv 8Á
¦F<Ü`38Â툇;*\ap¸#àØp<¸!ph8"–Ç8äŽqˆC㘊Ç1t¼8Æ0ž1:jlã«9V�y¬cu¬£Ç<^Ç:&ˆ‡­´¸r$C—¬½Gô8¡ÕÐg“År9LK¤“=Ĺ,¦Q�¤“­|+ê¹<…Ló†à°†Øη¼½­nçì[Û7Ï¿Ýsÿq‹»Üå7ÐÎ-†.¨;ÝìZ׺Û¯v»ëhö®W¼ÊH†x—qK[º¼ö½tzùû_OƒÖo�E-êf(¸Ãx°‚ìêOØÂŽG5>yx⇉Á!â_Ÿx¿>\ìbËøÅâPÇ‹oììëØÆBr‘ÏáO
Rl�5„YjaÈ4ç
ÌMæ\·—·í�”;t›å²!hf¼�ÜLÃŽ
Y9¬ƒc‰�ôl¢Ü!O 
TT¶]%öOâ!¥¹‘"1™)fˆA/l‚/r`@)Ж2`0ô#.¤å/Ãm`rCâEÿa+ƒ.ä0°C,èzµ(žF|À14×æ•£1ü¥Çùâ1”C€�áï!ƒaÆíÝ£`2`eN&"˜efó¹¶Ã4@�<þ]ƃôe˜¬MÒ¡èFnä÷±&ø…¤I¢älÎX³Ùn¶ßס#¾ŸŽÆ_¥P'•
§½[ôÔ�Ú�Úr’�’Ú$ÊÐ_‡¬Á¬ÆÂ)(c.°‚/Ö–Þ%
 B+ˆep� A.¼%1€á0"—.”.~€&ˆ+ÈàZ€h‚,C+hÄtס�×1°Â]€x²!²ÂzÃFLÃ0*
¤B02 ,´‚�¡��ÿ'
¢ÕQ±Ñ˜�éK.¢"¾$LÙ90È‘Jb«€"“ž–‘bÏr.´6i¸±Ìÿ-ë}t9«IÄÁ8�/âÀ¿ÙnÑ‚4r Ð.ÔÂð[	le>à-L&(žÞg@ú™1Ä°aš
ÃF at A
�~ƒ0Ø@~À�-(©­`!¿Á@*ÄÃ~5f†¶,
ƒ1ÃûÆ/üÊïÆÂoKƒ0äoKéoÿÆoþê”0C0èT
°N5LÃFü¢RÃ0<ð¢B°N=pOpW5PC5lðsp5|0‹°6t7hƒ	sC
sCY±p»0{Ã7xCÏ°7ŒC�ƒãÃ:Ä09 ƒñ1q�%19”C7±94ñoJ±oVÛdI–oN–#øÁƒ<¥µæßN^ˆØꤲöÑ'6�¼U-¯'ѸhâØJ«ræ$ÞÄA,‡>
�ñ\Çt PØP‡ÍüÍÜІæX	­�hpÁ@Ä
ÕˆJo4‡
LêÄɶðð¼ÿÇuüðTË
e²82
¥—1
s�pÇ5ƒL (Ž
.Œà ‚Ó­·B

àt3�¼FB£ 7ÜhãŒB¹ˆ)
‚ÚãJ2BíŽPT°‚!Ne{—£
˜@X&PBœ�
CÕ0
ñœd8À«(2¦ŒÉyYÃhÒ
@þ@|=_ïsü÷à¾øÉ_òŸßüå¿ú»Ïð»þá÷¾øÍ_õ¿?óˆ×þãOÿ×ßþ¾�þà�
±Çllm‡lLfB±Z�>e»ê@²$å
gÞ0â0ñ!²
ÿê0úáž¡2ªT>ÐÜÏûþ�à�
¡)DǾPÈNOÞ\ÆÇóãõ¢ÆŽ±	›±CØ D¬ èªíE­¡ž"ãàðä�ÓAñá ÁØ€²>°ó¼Ïü

P¹/q51;Ïý(ÑÑü†ðfðÿê�
�$‰†]†ß\o�.oh%]Ò
¤?fR
/p
‹È
w,aÒ?pÒˆ 
àRq p åÑò2ñ.û¡ßRÏòà

’
eÒN§p%g�Ö‚¬õB²A;¤Péƒ(×€4"<`ª"à˜è"beµ¤’³¡EµR+™Få!ht;½Ôû:o:ÏSÓóðN0³USJ	°óà¡ó`µ")Q.á�¹ÏVu°�29/_9O¿àsŠNˆüM{¬$éôôn&B9“'}Fߘ‘†D²OkOZ“ðZt\SÏ5›ð
>
G
07 ÆÃr˜b’v'
Úà^Ä‘³*9•S¹22¢
è''aŽ,<Ðkã:Ná
÷áRWuWwuÅQQn"ÖÀqV0k×vowsWww·vÀ
ø
a{�{�{
Á�|Ï×Á|
áž
ÞW|Ï×|
}Ëw¥Ô *®&rgPäƒTœ¢í¦Ñ ƒ^æc0êCx�­+�­Å¦��ë£í¸�o+Ù˜�M-w‚Ð$N÷^òqM²AuèO3Pz©ðM«÷g-W3ñMÆ&w=8ßJ˜h\X	_Ox"«¡å
X¸º„€%Ù
->à .>ò7>Æ-Lö¬á†Ê‰7reVÝbˆŠ÷É­˜Š³8Š±8Š;ò‰»Ø‰»Š‡f‹ƒæ@¶8@î­+Òx"´hj66%·Aÿ_¸4YSB=˜eóx…A³ƒkr„«UhjŽ‹×>ðDŠ·ëÁ$éÊíĸK¹T^ð{6ÍLŒ.rd0€˜00“ïÿätàl‘‰‘�K¹�UÖ”SY•W™•ŸW'™p�룓-x“X“íc–oÙ–kY–yù€uy—+D“‹Ž˜å£˜
B€ë㘳˜>–Ù™cò™‘YÈ¢y‚©Y€©™à¤XCPyÇz¹›Ñî>¬Ù˜ñ#™ÇYš-‰?–Y™�ÆœÛYœÏ¹™ãžÃÙ�Ûy�áù�'s[æšå¹šíÙŸ©™@ú�ÿ#Ÿ	š�ñ¹žš¡ÿ¹¡{Ê�
ú?b™>(ºœëƒ¢¹
?2:£ÿ7:AÚ "A:šž;D¤ïã¤5@e¦+R:?H¥¹§`ZhhšA\Bpš>tz>xZé|:¤�h�‡:¨íæñ¨û#©eºéNz©yJ@ºBª8O>ù>†Éy9«‡‰«µº–ù«+x–i¹“±z¬‘
¬ƒ™‡×ZØv٬íãú¬5Y‚çšÚp™"J…‡ƒ×:®7ù­û°ÿ«É:˜õú«ø��¸°W¯«»:«ÿºª#Û­);Ù;—/±×:“Û¯åZ²}™–½z±[´�.³½¹®·š´eʳ	[«ßzÑκ´oÙ^?Û«�m°!{´/¶;µmÙ³{¯E˜ÿóêýÕú‹Å
MrDÙ“�ûàn‘	m²ªQ”›ûºëL»áŒ‚¯
ºÃ»Õ²û®’¼»ÏÛáÊÔpËº¿û¹Í�¹ËÛèæ{íªÛ’¯»¾Ñ›¼ß½Õ{‡ï{²À;À©X²x:¢ÝX›Ü>âû¾·-»­û¶ÈŽÀ™Û»<¼ñ¼|¼ó;¿©ÛÂÏ[ÂÇ{½÷Û“é[¼	-Ãéû»üÃU<ÄÙ{½Gy»ß[½û[Ä)bÃwœºO\Â1<ÇùûÆ+ܼƒü¿3\ÇDºwm»ÅÎì¢üëVMÊ«œá¨<�­\Ë·Ë·âºÜË©̵|̹ÜËÏ|Ê«¼Ì¿\ÊÁ|ÍÏ\ÌÿÙÍÓ\ÎçÜÎïÜìn±èö£½¥Û¹ÉûÏn¨êKÍñüÊ
�ÎÛœÌ}ÎÝÜÎßüÍÃÜì =ѽÒ=Î]Î=Ë7]Ñ;=Ó#]ÓG}ѽœ&³ÕJ¥'VŠt#,^½Pb}ÕÝäÕ�¥ÖaýÖc}¼ÚcÖ{½PðB×G×�}Öe=Ø=,ˆ�Ö‰]ÙaØ5G2V½²�ý×—}Øq=
Ð
WjÒ¶u×ÒÝ{–ï^³Y7Ò93çÌ„
 ²fŽ4.“n„ÿCç�
Ói3 Íh.yŒþ<XÍçÒn¤ÔLGÎ4”5³„ò�Hð<åœAºãèÇäé Q_‡r5”A¦©ó^Ž€<mäf~Ö…öZÚ­Ç‘PÕáTd5UöÍ
6e„\P„e§G¡]‡†yæ‘Ç!ihÀĉöX‹Äu9
©SN
s¦6àÁ
àmþ€>«Áf?ZšÚ8‡1ÒÌ�MKK	ÝàU˜•©Á…·Òu´¶²¢ýL#ìIàUƒ3¢ä
¦Ù—m‚§5ºQ)pÐÌp
±ÁË<#ÉÎ @*,†
~ Ð6G‡‰`
yH¤Ä„‚BTøä4b+å!€ØÒŸ<"
 g`Ãöÿ
ÜÁ±)¹
SU|Y½
0
éÆg@\€Yl0‡òTr&BJ^ tržÓ
€I˜!
‘S¹³BbS8õ
˜I˜é™è€®³cƒè�6r}PhF!.‘¡*cW¡Bÿ'—ó}+”—§B#Aw ðW
º*2fó7€dNd£SåÚE¯2
hà‰´8j`8
KTKSöœ!Ys`"BFct1³êxª®
+VŠr\nð ‹Ãd3&J§Z6‚,…4²hÄN ãr€>øÁƒ3csIÔº8¹÷c°rÉ1

²=Hv4+b+ƒáàenɘó_î¦KÙ³0È}Ae³"Ÿ7«¡ôc)Á=¹D�Ë3@ŸHk!“ŒK+&ù´bu`±{ë=žZŠ€ ¯”•g71LhÛ0Äá¬+0Ú.YѤPºFK
ÿ¥%ˆÈ#AdûQ-]:´Ê‘Ъ
jDšb)¡A.Dø ‘�0�Fe‡Ñ‡<Ñ}!y¢æ�(æqïÒ5ð˜âs•‚Xú1…b+²B'E(·r�p0,±g¯ë”ø1 Ï
"#±½;a+*
‡Ø’…í�È+&Ò笼"9÷xø�øh{ùñ,ƒ¡²,5
,î1ç !ëðÀ<ÁHÂ$\ÁüÀ8â!cÚw/pÒ(;±}wÄBvªB/bAÚƒnnø*ÖA“„U”Ò
³¶[Óøwa’d«j÷_à4†LÈ„¢§Ä\€ÿ^€¬„DQu¼Q6/tVÅ!‘3uÀ§’svñœ!qo at B2
™Â9‘ÂR‘³Ç;\5Q(’\Ó�k€ÿÐÍÞüÍàÜÍ÷÷Ðñàô`ælôÐÎÍ`öêlâP�FIšÿÊú¼Ï"¶Êü¬/³ŒÊ¡üÏø2ÐMÊþ<´½Ïñ¸Ð�Ìb$,F’s¯¿¬5WLÉ á- qBªt§›ÀÆÙ«aŽš>|¢…ò—[h‰ü$ã[Ñá
!ó!âRÑ‘
/˜C»ëÎ@ýÍå\
žàñP`𯳜ÐÝÕ^ýÕù²îxº`-�]Öh�ÖŸÜÐj=+ø¢ãB¥‘0Ÿ-ô(ÔAK¤³ †Ã"Ñ8*”Â3*�(y‹FÐùDB¶—J´IOB�¡‹FVh‹ó9�¢K÷ñX<=5C
ôcÿ)ƒE�\ë0NòÄÑ0Ü|
×ð[ðÚ[€‚	ðÐÐÿPÿpEMÔ ÀÍð
öPÂ` ÔÂà	SÍöÐЀ#Ñm=Ý©ÌÖÔ]xg¢K�ÙB¡KÖ×ÞtaÝ`ÝÝß-Þ@ñŽªa‡@<Ì‹C14&Vt 

@
ù4Q
@=G#L	4*”+œ3†ü¦ ߦŒ‰aÖ0��OP%l
î�6­‘WNäN‹O›ÖbšÑ0§ä§Á)î”Bî4>.ch3R³wZ)VÀk êÐÍ°U�
”/Aû
ÁÅ@�0l¯®	ûR/Âî8»pÁ½þ›­C¾Ð£Ž1Gô�®ÿª;1E_„Ѹè”ÑÄÓZÔGÌtÎ=¾p­¬F!Uä‘¿ŠüqH%GóLCѲ;$K‹r>"�L°Jâ¦|ŒFûÛÐÇÌ´pÉθ°D3µ#ó¸ëîÛ¯74×$m8/,pÎ}ûO¿õ¼¨:äÚTS¯áü´’¿äHûÓ¶Åį6=$ñÁÝv“0Íð#ôÉÚ84P:³»«98õÊÑÞ›²ÓÅÈt°Èû…ÔÉHC¬ËÕ%òT7±ìÒBEÊL·ã1 
--- NEW FILE ---
GIF89asÄ
÷sæl#ào3çt'åw4ón"õv&ô{4Å{KÃ|UÖ|DÙ|S��}�Žoš‹z•�y·ƒM·€]§…h ‰{³‚b´Šqÿƒê‚9÷„8Í€HÖ„HÚ‰VÝ�\Ä”c×’f߯ê‡Gæ‹Vé”Vô‹Eû’Hù˜Väšhïžqúœeÿ¤Lÿ Yÿ²Wë¨yþ§gý«uÿ»kþ·wÿÂzÿÐ�Ž„ˆ’†‡––‘��‘�Ž�•–‡š¡“›¡‡·º�©®“»¼£†�®Ÿš‰¿Á“¿Â�ÇÇ™ÉÊ›ÍјÑÍ›ÖÕšÛäžàÛŠéé‹ôí�ìíœíñ•ðé•ðð¤ÊË¥ÎÒ¦Ò̧ÙÙ´ÊÉ»ÝÛ©ÞáµÝá§âÝ·áÔ²âݲèݼáÕ¼áÝ¥ââ£äë¤éã£êë¬ãä­æè«èå¬èé«éò¬ðì¬ðô²ãã±åé²éå³ëëºãä»åé»éæºëëºìñ¶ðíºóóÌ¡ŽØ´žÆ¿¯Ã¼²Ü·¡ë©†ö¯ƒþ¹†ü¼–ÎǼØÁ¯ÛÉ·ÿljþÊ—ÿÒŒÿÒ™éŬêË·êÒ¼þ̦öͶþÔ¨ýÖ¹ÿà¤þá·ÇÃÀÁÝØÕÍÊÚÙÓÂÝâÁàÖÀàÜÂéêÅíñÂðìÅö÷ÓäëÐïôÕüüìÍÀìÚÉëÝÒöÍÂûÚÄõÜÑáßàæáÎèâÔýâÊþìÖÿóÝéøïèøóÿíãôðæ
æ;øoáÀ„V<†ìÙEŠ Cöê5rÚË_)k¦ÜØlãÌ^;#ö
&óçϛnjI»Qi²’ +KvQlI—Óªn+ZmoÕ»Õž•´:-ñÕ‹!Z~VLYÙ‹£�ž~¸ºbê×­K׎}{öï‡ÆÔÿâµÊ+DcÌp±âDJ”)SšDy¿„þ”%÷óãÏÏ¿ÿ~ÿð
ßXà€&ˆà‚6x ƒ
BÈàƒFXá„fˆá†êçá~òáQÔW¢~'Ö·„‰S�ÈIˆ˜Ä|õÝ7ß{ڇߎ6Þèã�ñÝÈ¢‰ÿE¢~5&1…�ûñè$Š?ò(d”Îh_;Úç!<réå–M~Ùe˜a‚‰`™cž¹`šf¶Éæ›bƉ¦œkÒéåœsFQË-¶dµHz\ !ß�„j衈&ªè¢Œ6êè£�F*餓šä�S(�„6ÝÈ#7EYbPøáŒ5Ô"G§ÝpCÍ÷áÿç{LC
7Ü8ÃÇ1RÑÄÓØê
5Óñ!®²†R8qk§žvs«!O4A…5¸ºŠ„5ÞpsÏ=Ý´ZRh1
7Úh3î’KP±…§ºJHZ(ÑD}â5ÝpúL!t\q/„X£Í=òôû�7…<±D†h³�«OÌ—„P£�«‚à!E$Fñ„­è>Ã|$»–”¶ìòË0Ç,3¡µ”ÔK8d™ÑŃ.9óÏ@-ôÐDCšc}L(Qij¸BA…’GPó�<÷hSEñY®6Öüð„³ÛÄSµ><
Ÿµ1NAÅ؆ëjß
.5N,ÑÄÕpCµÕ$Æÿ÷5ÑVsÅÎR--Ü%fÑö7ÖÄ­ÛÜC
Jܘ„>
ÚÏ‚¬ /¸ÁæoÅpÅ/P
‰uìã„úH¡>öÑŽžð…0Œ¡gHÃÚð†8Ì¡wÈÃúð‡@¢ÿ‡HÄ"ñˆHL¢—ÈÄ&:q‡½èÅItQ’�ô¢"T„ˆ›g‹+F±¼øbÇxE2ŽQ$^4£@¼Å5$�nd£Û˜Æ2vñ*VÄ£-¨x*~q<¼¸…/jAÇ.Ò±�bdcÉÈE:’Œˆ„¤ëHH3Ö±‹„Œ¤
yÉDZ’Œ•L£y!]”ñ�q\#!C©ÊæÁÑ‹xÜb&ïHJ“tÒŠf%+¯ø‹Zèñ”˜œä'÷XËCÖ•†¦I)Ç^ÄÒ”ªÜ¢%c‰I.öÒ•²¼&-¢ÍBZ²ŽÔ”¦óŽiÈcšÓ•zìæ+!IÆp’sœØ<'9�YKužÑ‹«,H©˜ÿÅ*:OÄx^/kf
“¬R©Ð…)øi‹XCƈ…B‰¡‹XpâÄàD*Ô!Q*&ô¦ÈD9ÑÐ=rB¿H…DŠÐŠÖB¢5#F,Š‹X¼T¡í¥K%ºP›Æâœ0Æ1MaSl”Æ`i,L’
¢ƒ¿
ôšâ
‡â’¶-šU¾�Á'ÚÙ€†3à!�×Fœ¸þd-Ÿ;ÿq“çÙ žOshc»ú!_\óG8Å7Î[Ò‹ôg.L~ÏÍË·¼÷}1/àbrÔbð¥4{U1ãLú˜¼
ÀJŠÉ
sTœ#
UÀb
ÂÐa¦_¤Ð
­ Ãp	ÂÀ'zæK"Gd�ɦ
¨à0pI†d(�x‰eß‚!Pm)ˆ‚ ¸‚(ˆ‚'ƒ.8ƒ&¸‚*x‚7He8¨ƒJ–ƒ5 Xm1ø‚0ø	‚öqŽæOÃ\Ÿµp±§p+‡r·÷p±pÁ‡pGx$‡z¹…[Ø[{¦„ˆh_Xh¶‡r¼5z’öZM(Z)×z&A{÷l|ôsvøs�ľÀ̶wS´'wè
³P3‘&‡Á‡ã
lvX‡ˆˆZ	ÿ—t¶@“Æl€††nvy¾'{gÈZ-g
¾�Pš@³0Š¤¸
¤8ˆ¨øR5¥Š>U²PKµT/e¯H‹%Ñw¯8‹W·T¸èŠ¼X3³› ²�²€Y¦¨Àf[?W‡}ÔG5ÓŒšÕYÐØ\Ëx\ÑèKÐtwtϦ\HØhSh…–§Yºx©§{§whs–‰°÷Z‡rmhfc¨…¬×qC–„ê(pá˜�mv†Ë…yü¸„7…�#W�Ž˜bøŽG8Ž™Gg³Å{uæ�q6�]ø[mvéP
å
è�
¹`Sýèq'—‰„{7p¶pI{ðø�J¹”îˆ{n¸†Q•¤7�¢‡‘I�Ø[
Ù{Q‰�½—ŽK	|\Ui[MY�§‘
AÁåg1AfYY‰e9–³×z9�)x–È�Íözf·Àæ
{â
«àL…ùh U†·÷„¾z 7˜ùŽ{w—ø—�v�h™•ÙÉ[kV{˹{vÿyŽ�™{i�Ɇөq]y�œÅ–µÕfœ7žÝÙlZ‰q�‰oø�—x‘X‰žÞùhÍé–é„Xz¼À
°
²°õyŸˆv•àˆy„F‘dÉ•jÉyh6|QH�ß9Zø�Y¨‰m‰Ÿú©–U¨œ¥g‰sY�Äçpeø†%g¤@Z\T‰žŒ†�_9¤zY‘bV—K˜dyžê‰—øyŸp–úh læfÌÕ¢'
G‘U$‰´èwpÚgÙ©„!‰FZ�\W3¹`\·0rщPÙ†V¹�빕)Zrôˆ…‡ÿ–�ê[§·�1jr’æœùŽÙ¤f–ó©zty©Èù¥˜:•‡Yžo)˜…jž‘ÆŽ(
…
Ú•¼§£ØX©Z*¨…8«`iŽI±ŸíXqÖÙpBJ�h¸¥¨êyg™«–ŸîÈ¥d9£ý¬š:…–žÇù«Ï*¦â¨«f¨©[Ù«
Ù¥ô–`X¬ÊžŸ' ÃZ�À:ªõy–
¹­¤¦º‡•T(©ˆú­I«Ò*Ÿóøž¡šp¹:®Ji ‰†UY{kŽ©
¯Súª×Ê®sæ©s‰�Û…ü颣�‰OJzɱÚÊ”bù­y9«ö¯px²ý™�æ
«^Ù|I¯"7¦TH ÑÿJ®
¶§ê‡ÿ¹Ž½×³;zOi°ÿšµƒG£_+©R	žûʵWËphªœEjg¸¥�Q·‚û�gš®
·§®;jŸ\(«VY°ú¨¢#qªr™”€ g™†&çœó餞e±Ó¤‹ë´IZ¯*—Ž gZàé�O{£L*†µzŸ{†f©¹÷Ú…Èj²Ÿ»¬§h
‰´Ç–CZ�9z^	‘%ˤ®Ê�»[µáJ¤ä¸³†{¹Ry�{¸¶š¸¿ÿŠŽ^p‘JµÉ‰¼÷¸ýŠº Êº‡|«†4Û»ºë©w¶µþi¿"‹¶ðûf¡ë—Ãg˜>kŽò­Š:‘軼Xʻ㛵õÚ¾Ï:¯Üú·¦†;Ú·8Ú¸Ó‹²gËz#x
` f�ëqVPWPUàN
½<ÝÐýÐ3@óq/Z@ÞÐ-ÙB
Ô`„
¿ð`¨ÀŠ�8Ð^`B`D`EÀÛ½]xžç|îç~ŽçxÎÛƒþç„èˆÿ~èŠnèŒ^莞è�é�¾è“é”.é˜~éšnéœ^éžžé�êŸ~éEp½{Îç¦nêE`©þê°þꬾçzžê}^ê­ÞÛ³®ë…ë§.ëFpÁ>ì¸îë¾ÞçÈ^ìƾì{~ë¾Îê¾ìµëÁÎì´ÞÛ®þç¾í}®çÙŽçÜí€þí¥>ìâîí½
îæÞíØžîåÎí½�îÚ¾îñÞîóïãîîáÎî¹~ïÄžïþ~îö®îÛ®ç?7HÅ9FªÐ}'
¿ïðñoJñŸñ¯ñ|Çñ¿ñ ßñ!ÿñ"_ò$òoò)�ò?ò+ÿò-¯ò1ÿóAó0ïñ7ò3ooó;¯ó8ôCÏñ=ÿò
ôEïò?ßJÏôFïôK/óQŸôS�òL¿°ÇL|ÈõxFqS¤•E`ÿ°y	Æ{úolñ”([/ë¾½õs®à
×øs³ ˆ‚¸�ÛèŒz/�wÈ÷€ˆ~¿ˆ‚ß÷{¿'|Ä÷~Ÿøˆßø‡¿÷‹�ø‘oø„µ)ë«ÂU†ëª&ìªX|†ù›·Ì®>ºº¼Ú¤Û­™Âú‹¨ü©[òi¥	
 w¸ßVG˜ †Ô<šuMEEHUÕÐ_˜°ûµ@¼¯P@ÖE©�
½�üE™
¾ÿšP—0©°
í 	ÞUŸX^µ`s©0Ã�		€þÀþ8g
ê

 
UÆ`¤l®µê’ÿ1
äˆ]
Ðnò°T¼2ž#6@ò¹aªP	@‡
€*t¬È‘¦j+
T˜0Â@¸é&œLø`&¤gJ¦¦—aé§ÿ§Všê¨­†:k¬·®ºë¨¯îšk°CHÚk­‘v�Ægñ¬JƒÍ™/ªtœ[0œUçun²Õhã.–E»
ï'[ÿ@ÿ	°€`
¨@²!ðTàÿ¸@Rp�
ôßX‚ÿOÀïWŒ“[±î¢·²ˆˆXQBUWR”8^�¥…/:ÖÌ>È«”$Žrr[ÒÝlø¢AåJ‡1<ág9 ËnIúሊ¸£·ýªT’bWð†CåI†·œ´jU-(Vî.´ Å.raR�££0‡9€aT ‚á ,Ò8Ç4ÆÑq´ã+`¡ÇWÌñစÍÑGB²‚¤£9ÊñŠW”£ápd9ÚQ	]ÈB¹ÐDŠ‚´ÃXáêp‰		÷ÆÂ-–ÐV"LVªR™E¶-‘na",�Å;Ž}}ÓbÛBX9!žRWí£¢m©6f}eU£dŸW4%^ÖʘŽËe3ÿB%aöÿ2FTòƒøÔ¶ÍÐ$·XÅ+
{ q…ë[Ó*�|Е
L¼ØÔ©“*aRxEœzî]ä
ÄÀÔÀäÀ
ôÀÁÁ$Á¤‹_hXX„E�I838ƒ3xAIœÁ´Á¼ÁäÁôÁ Â!Â"$Â#4Â$DÂ%TÂ&dÂ'tÂ(„Â)”Â"œÁ0Hƒ”Á„A1ðB1ƒ0¸�3ƒÌA„AœÁÿ4ƒ3tÃ|C!$Ã-”A,C7<ƒ|A2¼
,¬Á=Ã3ìC3ÄÜBÌÁ¤AEƒ4<EP„4LÃF„Á:ÃK4ƒ4ØÂ4¬B*ÅOÅP$ÅQ4ÅRDÅ&”…‘p…W
³öêÏÆkåÖìæné®îËlÊÞíÌŽnX[²;»7³
.‘9ZÑ’^à:©“-¡o[˜o,Q¿ùÎ
ýV‰Uìo­ü‰^¸’‘X�”‹YÀc•ÀcWpp<¦·Qy
‘¢p ©pS¹ð	·ðj
		ª·ŠWÓp÷p'‰Qé(£Šæz5æò›V«=`4›i7:¹µi•$“½+ºlâ5Rzñ$C°w;¼Æ‹"‡ñÌúVªñ€{Ý›ï Á:ªÞ“#¹-¹ð7ñão
3¼Ùó9Ãëq¬Ðu°u †{1ñ‘“ð°c‰Ñ1Z0†VÏu‘Ð…æ	ã±bˆí0m[°udçMN N0â�¯V€LÐNPNˆõYØœYȤUPM(“Ë¡êU(‡€ˆ[ bÎaS€wO
¤¤Ê
:(¡{}lâQךmr¹öœ{±™wíõ¦Ûx“:Gš¤œvúÛz’êöœrí9Ú(vèéê£�:‡|êu‡ÛwÙ™ê^¦³rʨ½~*Z/¼ðÄSN9õbl±ý¢‹&dªcŠ);2¹Ê[<U—1Ä`rdX½Tk‹·àŠ×/·ÔÒ�¹é¡›Þ¹®òn-á‚:,\ÃÊ®½ÖŠÇ[L2Ù«j²æF&%ô§À� p
rÉÂÄP…‚Òá‹L¤ã
=ñãY×�V¸é!íS�[Õ"õ^ÁÏjÆã^ót&0[Í�;„$U­0Ù)Õ\'yãØ—‡>O­!ª`
X`Ì,9„qV@¬`;F±X B
PŠg•b
—xŠø¹?W¶‚Â

Ìæ,ŸyÌ_.3š»¬æ9—ÎoVs–çç:ÛyÍuÞ3˜×|æ=“ЄNsœÉÜ]Û¨¯¼™¬îhQÊÓê¹´¦Ês"Ì|ªÈõ5�½°h“9]ßD‰
’Hžé'�ÖµK6Q§.5õ!‰–ÉAn¯{PÓn#Ù;TKÿ-‘Øåéy¦6
ø6YÉŠ+²Ò†´M´¸-d"í³H05¶�Ūü¶ªÿh_+ÛŒóö¶ÑÅ‹_ð·(Æ&6±Pl¢Éf�¤3Ú?Ld�xoæëTKê¼ô¾î¥c
é>Ê·~A#x«IªHLNW“Ð;/|^)ó”ɘVxyµ“â,â¸ÖLJJUÜ5ÙµY{±¶Ó¥Yå‘;õùlqc\â<rþx¼£=Ç;æ!ôy}èC/zГNô¥+½éLºÓ›n
ªm×ù™úU
.È9N‘ŸN¹J~!�á½]¥ýàP9^Báýu
@Uͧ¹ÔQ˜
ÐlaþY'uÜÚáÊ3–ÿ£hÅ[Ì	cõÍ®_I¡	+¼B _7àÃ=˜>hà6ÈCâbúÞ5ÈC>l"6¬ÞbCíi <\¢E
$fä=¼C>dƒè
dAÆÃAÎ
ÀD9œ‚
ˆÃ<ðƒ;ÈÃ<
\¢ê‘uiNcc‚êxe!±èX¢ßYΗ•Þ(r¨ã„Jªta&£^^ÍÄOê!̽#ß�¥WÂÝ~²)Jaê¨~è”–)“+Æ©hn’&6Š&V—6bžÆÑê—r¥®zÝ•’eÉùT´Â_n+£&’Lz
ºZf§ÚšNžÿj¾õ(ªí�”–妎]°ºjx‘”�jß‚Âè&eŠ‚%þ«‚¦]¶ãÂi®ž_§ò)ú_°�+V^&ù꣞j¯ê'hbiožæ¨eeå9!ÍŒèy°š¾Na6¬o6ªø57Ú*�¶+S!êþ*$­OxØánîÔcÞêÁ~&ôÙ¨h©
iPqjW^¥æ]ôõì6²,ÊžÚ¬²æ˜Õ×ðfÑ̤SÆÍÌg9rO;NŸfjk÷‘RÉB¨˜~j›ò‘ÏÂJ©
!ÍÂ[y!@-Q4>%dª�Ø‚S²êÔ$láe%Ej±RèÙ)Q
)|e0þì•R,áå©!åm…ªjcÆÿ-ÆBåþµª�6ª€‚­hi­Rªi²fáæÊâ9¨³ÞóœmbŸâZèͲd¨}ì½Ò«…m É†k²F,NÖ,¸>Z­Nªá­ÈI(wqè™jš’&¨}
ÞØýîž,ݽ£fô�¬˜^_Ò`¯J‘æSb¡ÊnïÕ"i 
å½.¨=Þh~*�÷U-š¾¨×ÞÝÁq©M�ëo²é{ö)o–©„žîS‚(ÙB\ÖŽ(ù~áûú›ã
íÅ¥«djí±ÒÔj*¦ú
­�f%’F¯õˆÏñþèŸÖÏû.æ}­®²ö®²–á“Ê#ŸâmÆ
LöUJê_£YËÆ*�º£æÞ­Q=«ÿmÿ­Ë6RÁyé8±žqç:/ÛpûB±Žú-毵6UÅ.cßíšî�£ZÍÑFœñjª2Îî¶.­‹â©sˆpêÖ­æ,Ð4œK.°§b1¿U*ÿZ¯¶žG#ýd¹*Š‰ò,•¶¬ªf©Â�°Í|í²*dÞaø�,ñš°Æ6rˆú/�J)ó¦�«aF©n²
iâ]ªÁ¦š÷j׶¦öõŸãê'‹ï.,!®/_£qÆMO
û§¯^q�ãÔR-ûÑíËâì»Îè®=(ÍF!Q°0Ãäân_Þ5*oYþ"Î`-Ouï—±5S
8/mXz&
/oÿ>nÁJÿ)ôfmÆé'ŽÎéÂufQ Ú®]&C3ö–3ƒ&ÏËuñ2é
\®
ž"wì4{ïc¥Éë8.�Ê3øÅÌf×cÆï1ë0V°Ã†iýúñÀÆÛºvéÄ^o’®3†þqë2s+?íÄQe[òñn9ón‹Fsúîô§ö4Oÿ´O5PµP5QµQ'5R/µR75S?µSG5TOµTW5U_µU[õo5WwµW5X‡µX�5Y—µYŸ5Z§µZ¯õV�r
¿µ[Ç5\ϵ\×5]ßµ]ç5^ïµ^÷5_ÿµ_6`¶`6a¶a'6b/¶b˵2f5VG6dO¶dW6e_ÿ¶eg6fo¶fw6g¶g‡6Û²5i—¶iŸ6j§¶j¯6k·¶k›vc3¶lÇ6m϶m×6n߶nç6oï¶o÷6pÿ¶pûõc‹¶qƒ6r·r'7s/·s77t?·tG·â冂Ô0À‚vo7ww·w7x‡·x�7y—·yŸ7z§·z¯7{·7zg7|¿vÏw-Á|Û7~ß·~ã·vï·zg7xß÷v×wÏ>
¸}ÏR8
I¯�Ažh¸è(”-¸Í,äìBÛ4d‹CÜ<Ä0³A$qDÓ:4QDÚ.ŽÅQÿ.ŠÅV
•D$1£‹!ž
]y5Ê×]íØa…-6Øc‰EÖØd™]ÖYe¡m6Úg¥­vÙí¨Hb‹¼s›n¨q#ˆ+ÜJˆÍ@‹èæJm¬)bS šx‰ž¨Â‰¤ÆŠ"©@�¸ÿ7©'ÊZó"¨¹ôžmˆø¡MãŠX.‹*ª(Ân.ÕÆ‹’@HŠä~pâª]›à·_ÇÚ¹“ï%j
'°ÐæÒn¬‰6§8ˆ*ÚÜue”ñÍ—	~í5ùÞ&ò]ÂX£qM:Y¤™>:Wh›VúÖ¨‘–6j«Ÿ®zê¬�–úXª{½zÆ_lá%DÑñˆ/UmÛí·áŽ[nˈV¹‰#¬Ù†Lm~ø±	-¡ø›oºqùRn¦QX¨'òàæ›mïfm¦éCŠ$¨
Hø7ÌÔ¯-Ô©p€hæðÁAí	Õ“Ç<ÈÄ,d°bθ‚ªà…‚5�“ј�…1NB¨CîT8/¤)
íøŽ
CjXA	R at BÁÞÇ�A
…
Y°¦ìT„�‘ÐN›ÈG&k
	¥#5¶À„£PÁ8Y¬ÀA¢AߘÇù¬1«•Q£J0[®B§ÈáÉ	ÏhäònÈ#ÝpÆWœ°P@^A
àä¡6	J�ntH”4"Ä�É!�£%5éI�R6=*!R°Â±”'‚A˜<´B¨�7_RãRàÝïaÿ±Œç@Xè
’à„#Âp™ª 
v0jÌL
E@%ö´1È�\Ð}çÂxÇCnA+à7bjÎNUhÈVmrgt£¡Îpƒ¨1bZ
;Ó=®4V'$A(tjž*�P1<á´«”ËBú-,aá8ÔePšYŽzt€iÓ$I5ZÑ2p«­iÂ�ÐTjh3dU Dïºq‡™]Á{
µ†ê%ˆ3nƒ„XƒÂj¦%á
5Å’5Ä;½�«
@¹Bé܈›Å¢¾•ê<mügW´=œ5�
kñAì@jxC=Ôh† ò
zç{íõî}ÁÛžøÁ'üð‡/~÷
¥p
©°
­ð
±0µp¹°½ðÁ0ÅpÉ°Íð­pfá
ÏaÖ�È!Â
`¡`á_
èpaaõð
±ýP	Qq
1q±Ññ%1)-q/±1q5±3ñû0ùpE±IqQ#ÑYñ[ñ]‘CQm1oñg‘
±wÑÿ0ƒ‹q�q“Q‡‘ÿ—QŸÑñoanaj¡x�lAm¡lácDZ1Ì‘Ê‘Õ×1ÙñÝ1Ûqá‘å±ññõÑù1ûqý1 
r ÿ±ÙqrRòR!R 
òñ±Ò%2 5’ 3’#ÒÏ1$²#2#Gò"KÒ#×ñ$I²%)2"QÒ%W²ná{!'{ÁÈ&€l!€r!Ã1(m�(ƒ(‡2)‹R)�’)�r)¡²)£ò)¥²*©ò*§2+­R+±r+½²+Á’+Åò+ÇR)¡ò)ÏR(‰R-…Ò,—²)á-—Ò'×’(é²-ÿÙ2/R(}2-ÓR*÷Ò/ó/ñÒ.ù²0Û².Û²/ó0ÅR0×ò.¯Ò0
0Í2.³’+)ó2Ýò,1³2�r3=³3ó-ÑÒ*
3yaR�janAxA'µq¿±Ëæ6Áq7{!½‘¹Q5»s³7U3'gS‘s9•³9““w²-£S(§3«7¥³i“:µs;£s'§<©3³q6ͳŸS8�³8‰38}S'Ís½1'‡<³7{S<ó?ïÓ>õ³?ë“?ÿÓ?û³?g³>g³@ý³>
4?ß“<•“Aô=u’7ôÃq7Á‘yS:!'‰sCÿ¿ÑAÔB­³-É37wsD‡77ôCI”CñS(W´<Å3D3T7oS7‰3:M”<ã6ísDk!ESÔA�“8‰4I‘TC¿‘C‡H™DITI?tI�t7¡´E¥ÔD›tG±K“TKY=ÁQV/ù€”ô'ÙMá”8ãtNß´N3T9“OÑsOçó@ˆ~Rþ4PUÕ
Ýþš‚A
äÆŽ•*ÕÒ£Ô§J;Buz5£V�\9NÅõ#Ô«M�nìêÔêV³l±‚�ª•©Ô¬f馥VªZ± ÑVE‹×«V¶rëL®Ý¥_ÿ2vb¯
Æ«¯T‚Gª• 0^ª
©ÿø@*¿`bÌ/šl’JY^‰ôÖF¹€2(™ R‡!pèaˆ"ŽHb‰&žˆbŠ*¦4(oÙ5Hj±ãYmñ%WŽzÙÅ\Œ5¥ãŒúUSWi£\•%abqÍÕ–bk	f–„Aîx��é‘�Sʸ%cZZ©——Dö5XT\u—J0ÁT¦J/™CŠfošâŸ‚·¤ÂË9¤œs:ÔÂK0©¨2L*µØVËm
Pœm ƒä`/¬(\³¶D$œ.<ƒÜK-¾ {‹/ºXzô^ý¬s_¿„\Ó;G]ÈQÝlV?œ—�ͲK"� ‚*�@"¨0BÛ# 
wÜh�7ÝpÛ=·Üx“°wßzÿ]7àwËMxá†N¸Ðr‹�Tb¦ÁWHV½
\ùc§ß˜qå:.l˜_ÞñÀ�S%;”°C\:FÍZºóÏUg­j*«ür‹)ãUmŒ)±tñY
#’d;/
Ï^ÝÂý-ºpß‘÷Üg¼qD¾gýù×›_!/`ÙÞð�õS
1¹ä"‹,ÍSµý½ð�µ
p€, 
ˆÀ*p�‘£—ó¥JÎG÷Z½â·1‰il[ä�í6G¾|5Ê+yq åæ…£0Afr›ó`ê“yIîb¨K˜é¤ä$¥ÄbºÀÖó&¢‹M#=´-h
ZPÄÀD.*’­ªDé„’U½²n‚»KS½¾7ÿN° X
ÛFà�4¶í@£ÛÞG8Š Žr¤ãçhǶá1�{´céøÇ=
ÒmƒÔ#!áØ
xF‚£«¡�*‡¤ŽÑåu\ʘP¸#Òýeb�ËÝs豆É�`«Û")ÖµYÎ-ä»d,éJÆn_�j/xQËðê6·à„1fQ‘çÅâ³ÐÅ‹¡ ZÈb#J”ųL�Y Š¶È…R¬iÍjbÄRAšûröÍ^¤�0Ò&6£	’lj#çDÓ*+¹˜ÂÄ
PÁ·Î5®£˜`ŸüÜ'
ú.~þÓ
¨?JÐ~"´ Z(B
ºÐ†&t¢…¨B-:ÑŒVÿt£åg	\dAi¬_YäW§òNNQL«Ý˜F¿öèG‘Ìà(Oê%¾¤Î„‚	Ì'A¨-2¡E-©lä»ø9šÎ°®¸9_¬Bª°E(S4u¬b««PGòÈÁÓã2‰'bq4\©B×á�)‚…+bp"$"F* Ŀʈ*ÒÂÍ,pc
ÙðÕ剈x‹‘_xJ’±ëClVS8"+\$·¸˜^4Â#X‰†ÜÅ!™àå-ˆHk®}¦vC¨íPkC@ÚrµÖ´zmlWû¡×®¶´Ê­hoÛТ–¶´Í-("Ö¤•ÐqÃÝå¼vIŠ
Œvÿ%RY—EK¶Ò�!ýdR{ÊEîÅuœ,Òs'–Üâ0§¡ƒéÆ>Â=` 
R$
%Q¶žÒýJ+k´fæÒôä¶ðE*Xq€µVxè© eÿ@CŽÏ,§ÂŸiŽrD|­g
'ÒÌÆu@U

§ÁÞç¬Áv¾P
í°
¥ l«À¢Iö^(à dÐY(�OÿTQ*Á2q‚)è*È-hù„‚/(ƒ08./Xƒ78ƒ(è‚,˜‚,¨ƒâòƒ-È‚ïÂ]ï49fVYr&rz¶z:÷8d¢R·g02”B!gR—£f*Ç;ÕÅ0‡n*4%©TAr–fVÈSÔuI¦À
`œUPÅ*×ñs«1(¿¶0 Îc-z˜
¦j¤¡‰u(
Ö–
™�Va
Å´
Æ0U¦P”ˆ‘¤¦¤AX³¢ª"»p(ѧµ’ÅP4¦`�>§vµ 	)yš UÅ�	©	ùKº 	Æ
aä“ÃÔ]e&…ÌrP±	¾ÐœÅF%€6%!•%QÿUi•W‰•Y©•[É•]é•_	–a)–YI´pJwxfx|#ç0'•skQgGérT†E†”Ã^ô¨T�¦�/׊!åŽx¹…GXBgb„;×W%×R±@Á”-»À	<I=ÝÃ	A©®Ð”‚+ð
�V·ÁAIL® ,«`SÕ(ÞG}È?¡¦04i±`‘u<µP¾Ä	·BÆÀ	JT�Æ�““ÉC³AœÀIHhˆa”NHB ! ™°€
pa�
Æm¡NêÄf	2È»�›�» 	ߣ…3'%b‘\à¥[Ѥ]¥åæJ~áŠ`¨—~Ù@5¥E¹g:s‡v„hŠY˜Ì˜ºIÒ‰:yV—Üeftš…V§{iY¨?­”fW§Ž—„Ú5úHS~±¥Î+†È­à
SEaµdª§Šÿª§*b¦ºªªZK"«¸"ª­@«µš	Å ø«ð¢·|\t�•¨ü¸£ìµAÐi¬†Ú¨èȦfȦ„Šh舨jB¢�— ª¡ObJI8¢ñô~ª„Tâ¦Ó9¬Õ5¢Çªq/WTÔggxäj—é^™Ãrù¸]dŠíð'‚ǯýê¯ÿ
°
+°K°‚w
è è°	½ b%å#bØ^§SS¹3�ˆ]]A¯ëc®“�•h®—­ �Uè^e†¬Õê–0E&³%ÏJ­Êê^›¡}ZTãšCMhCŠV”ûqqj˜s* öHsˆ	¬'§¨éÈ¡ÛH1¥ù

š^m\Ë”:·94^×|AõÛËç•rŸs
sÁ=,…˾¬ ë»ÍdL†}›Æž]”ĬÓ)wÿÅÜ
¿¢£´ÃËJ9Q(´žT³÷ØE­íÌôMŽ§=¿Š˜ô(À�ñ½—ë¿Ü»Ò}Iº3¡Žs´Í1)ë­ð

LàÞ²
å
n^k~¿ó
¸Ñœårªåry—û…ãÔ¡gR¯QÀàKßÀ*ËY\Å0eÑ;ÔúÒ`ÞÓœ‹{ÞâŠëØ\~¸Óú¸v
0ˆ¾ÎÏûè�λ�^î�~éÁÂ{îÁïÇ»»8,¶ó
é@
ù#¢�Ž´#¤||êBÍÕòËÅÚP¹)Ý1ÐS»cIxlñKlgTLçáš®C-èÙß"T^tJ$?+´ë»�¥MÍ•»^Ï/¨>Ä]¾šû͉öz‹=VQ5ç£°§™¯ùšÿ
�ÿ
áðùŸ¿ù›/ú¥?ú Ÿù¦�ú«/ú™�
¯
¬
=‹T![*+ê¾DôLÒ^#mJö„4I1áTÏ­ÞÀ”
DLiuñÉ%‹öVeõ”²3XQÝÐÀ]éš±Ù'›
KÒ�U0<
=óËÚk§ý1P$g•Sλ{
:X×ê1?o³KôÖdAòÎ)emïJiGû±LðúUÑ9P§Ë³ÌÊeWíè\a»*ÑU}+Û®¼ÿzur[Ñáy	µ°²AqÜoXŽÍuÐÝ2yÄ�Cò(SÒQÌå•\ ³]^"›¶×r×døç›ï‹j½UUâLC#O=ùèE¡î­ÎŠ‰b÷é÷R>ÏV¡îØß0…4gû8µY]U±ZÿöÈ5L7]S$Zb×,ž5ëÙlOc¤lÕð9ƒŒ�èhûM¹±‹ÒNë~¥7re]}åž.l¶ïÄÓÓR3³_4+O®GW�quÑÌV°y¾ûM?7Üm5_�¬d‹Ç¼W1¼¦öY3/ö8âK‹N­F,Ó퇯6cî@u¼ôšnšx¥ÿÍÑDôȦӲËÇÝÏí«RÕ\S㙯�•÷®sMpÈÀ·Çiˆ­Uu|çÉè@
£Ø¤Æ£˜!©AžêŠç¶ž€É1ºK�½hš‘L4GËí–G#áaÏP™[OÆ)õ!0R*„¦ìä%el“Y“H7À*ÝPÿ5+œ ý÷Á˜)å?í•||Ä%¼�`r+¯¢G8í-Íz
)©êŸdÎÈ4Å­Çp‘3a͆çÆ·u«x\KÏéBµ¿ÄÁ‘êÌPä'Bº•*t�2['9Böí�~ijcõÂÁŒ��,.;˜?F>|•L�gÂÑŸ––ç4OLÛ'çd¸_‰[‹Ù™Å¬¨2©5Žà3eÚè¦AœÏMbô^©2d7þÌŽtŠßÿŽD&@‚Ðy/f-·È;Á-VsD“„°	Ch.Ž²ÿ¤VÒªÏ=Ù,JìQ¥VªÕËtZ	RŽ,Ž?òHtFó{1¼_ÒŒ6¾Dºï‹îä�ÿ¦R¢1µÉwÄÚAÖËLªÓ‚4¢Ð«¦˜²ÙµjpºטªØƆR4H_ûZ± Êö‰2�
–Pˆ;KÕÖ­Š¡¡kFÞƒK•vêb½ÙÔ
Ó.£BF:²¹^
²B±B½IVŠËuÄ�Œ»ÿLÛë)µ\×}îv[GâóK~Ç|¬`ÃeÄ£D™‘„£ágs»Ö¢1±g\•lÂTŠ+7²”€@«³èãW÷$ó©p�r­ŸwPÛí¡ËL)0š9´«²±@³óO@×Í`ìj(Ÿ-SB–´?³TÙ[f½ÖЗ®¾&·"çìS‡GþrB±8ÉøÕ9NáZ—våãÂXþ:TÔd¬‹,æ¢íœI½4�
LR#z£˜)ä^ºm–-ºÀ§”ô¨ý¹Íq»¯FÍb€ìœ:¶G�!'Õ²57ù4w£7CÚéRÙRUåÛ�zY¬£}¶zw$ªgì¤ß�sxSÒl�1jÿŒÆÛ¤
æ@Wò õT�ù&ê ¥üð|e³Øö®8ñòæÏc��ߣ…®FmWQVV¶(çkÔT¸;"û³8†3Ê8Í>ò–ú¸#$d±9bŠ]4àŸö µ¡®�“B-³©ú§mÊ»zML¶t*´F‘õàÓ¦lûlí¶»ßõ=¤Ó5mïgE5Õ3÷ÛZuHk˜+S„C÷…®kqÜXœ®°×ŠÞ÷ÇddÓwÍiçÏwð²=c1¾úã
¥Q²³q¶\.¦Ü­Hˆqæªwª~MšJ›êÚ_·íVìl¿-Ñöö‘V™¹�âùÓl’[Ò½ÇæìrEf7º�'fž—š¯Û¢cC-Sør•íWÜyOm¬¶÷±·-�'”q;TñÓ”“óNÑÇßj~‡#¯›¬³êå\Ú¶j1«cŽ%!³Ž@â/’=Tƒ×¶“­¿Ã¦öÚ-ç Û¢§Ã¸Þ#]jÄq)³¬•;$iÛ7D¢™ì[AT
`²=¨[4w
ª)«J®¸ó9ub¨‚¸Š�Á|{�€
--- NEW FILE ---
GIF89a 
d
	
9|îÜáC¸0¡Á÷	äfOâ?~ú@öóçOž<{96ÅyOfͦNí	š¡B¥N*DÕ©×�N•âÕêÕ)T¥ñ:„
7¯R³y	çÕk¸ð^¯\÷Õª—óWÎaù’N+¬\´²cÏŽ»÷\ºÂ‹ÿïN—»]åÝ©‡Ç®=;öðÞ±{×®¾ýûõëÕ;&¯ž<hþA�=H =Ñ ¨`46Ø 4ÑH#¡4àHN8Ò\¨¡†â\(· †øa9â|C9æh³M�d•JVÅ(ãŒ4Öhã�8æ(#O>�´I)@"


!vD	ÀVJ0ÛU~i%
¼Ø‘Š™C	À®ÐF`zie,ÓÅbf
i¦á+°d§¨¢¹ô‚�.¹Ô^x“Ž§Ë-¹ÜrË¥—jºË-»à‚<êÀcê©î±ÓŽ{õSŸ<üÉÿ#+¬ýýw�Ðü‡k‚&˜ „2á„»a8â€ó
² "묈â�Xδ夃â67¬ÔP:vëí·à†{cDÛšUCF­ FnXa¦Ÿ
g�ŒÅ¿õZ™Æ!³˜9Ë,v
-
Ñ„Zô¢ͨF7ºQ‡N4¢ å¨H5êÑ‘šô¤À$y ‘¤
€~胜æôa?¾Ô\kúLÕôG5±‹ÃMÞm.˜vØ1œV³Mx®skŠ^œ±‡:„/
ÂYÓàÝíÇ|ëë§j:w¾ÜõaŸ‚ØÍ6IØ…ï
ƒøÞ÷šw½nî7Ý»M2˜
9ko[ÝØÿövAnï“Ÿ’Ú)wÌOŽñ*cÜÞGÜH³›¹d¦÷ç5Ý.rƒ¼@ØÀÑ_°�¦g
R   •ß¼èS€‚ÍOžò£ß|R°zÑ«`ô«�ýŠp„áö¸?‚n {Ýï¾�F0‚¿ûâß`ø7ÈAŽ°|å#
78~ÛhÆÝÁŸ	�³wÎýîô"aÑ`ÿP vY€an’€q‘bƒ üÿ0
Ó¢’É’)S™?bÀq
„p
YB
«
¥`¿�
u€
°`&®€
¯€
¿¯0­
ãrÿ"2ª
X½Ñ
ã
®p‰¼ 
fB]õ¢
± vB
…�}@|Ð~ˆ~àzЈà„@øç¤ðüG¤±	¤0€¯a
¤À…À‚€
¨Q
¢À½Á¤ 
è‘ÇAÃH�©0‚Ä�1$8‚Ö±(.™²(‹³x‹º€‹áa3:ÿ£èq;	¿˜*õÐÇÀ®â*í0ŒÇ€”°bõ°„MÉ”P…TÓ b5Æ’�Ò!̲,\Y"ßð•_y"e8æpÖ€J¡dN–ŽlÙ–p󆻵}­Cdk	e8—r¹Baá;Æ4ByËôlnÙlKµTÞRŽv)89¢d�ƒ—õô6Žù—u)˜fqŽ}É;Ísd–I™"äL>7˜oéD2á9° µ…EV¨…Z^%
`
¬Ìj¬Äº¬ÊʬÅú«Hd«¶j::we¥CeH&
J ¿ÅÞŠÅ3®ÆV(¤ü³—²*«‘.A&!™z);A=ˆÓDmóN1mM©6ÂK 
¦µ
bÛ²ïåº
–³
ŽÉ« 
¡ɘœÉ¢°
©°
­PÉ«ð
¡Ü
­à‘¯pʯ 
¬ Ê$¨’°À
°˱0˳L³l±`º¼Ë¼¬)·`¿¬)À¬)  ·P·
Å ÊÌÌÅPÊüÌÏÌÆÐÅ�”ë`IÉÇ`Ì ÍÜÌÍI™”ÈÀÈpÎèŒЀÎë
ÍðÎðüÎÐàóÜÎ
Î�ÏÏ°Ïüì
áàÏþüÈâ
ß@Ð
–ý•æð
ŽdéЭ
è€Ý�
ò~”êƽ:”¯'
½Q
sP'0¿!
³q¨�Æq�X¼
…0­0sàÔ‹\­�
ª`Ì1‡ðÓ¨qÉ1ª�
N]©P1µà
©X©Wm2ã È’¬ ² ó0³ÿ`¹0¦¸2+¸,£+3·H“ä�Ö7¨¥ß;ø“D)4ø!+ü
 Hs+O³×O5„=5†-�‚�Z³ØÐò…`3-'26ã€زÅOŒÙ¾9A‡-Re 2v€$~ �~PcS/v�…€&U²šÐá
¾ðVÀÔc'²P£Í1
õr	—À	£H³P"£	C‚Îí^ýŠÎaå*ø2´Ð‚.h)7™“:³“mMß«”öAŒw-+x=+þ±„Jƒ4OèŒnú`…Wh•Ù[é5ÔÙáˆØ�c‘¶sqáˆÿ¾–ýyH%+
žm'Àq`0$¦MôR$v0…`
Q2†p/†P
¦Íˆvr¦Q­€ãU‚
¯ q`÷"(v‚‰3¼@H^$�®P³ 	ÀÛî 2C~Š$x2ª€2/ùê-“2)8êáÞëÁêÀí¿hsM”Fh„ò�ŒûÁ”Ì°LS¢+„­ ‚m….!Þ�!ˆ�•B"Þ@"	m"‘-†d‰
7p.Wœ™Ú›èèÈN¿”h#9m€ Ú€
n Út0
@‡p‚�}À$…`ÒˆÁ-o@†®0ÿ	†@ÊvÐ
¯`�1i@�¢ 
Ç}�xÊ® 
³
¡¨
óP#¨(³°(ØA2°øÕ,È0X“¶Àõ6£‹ rð°¥r*ìñííAŒEH4úÑæ²Âîâ„B ¼�И w
ú0,Ó¨5þü,ÎRϲà^ù•ßhÜ`hS¾äª~‰ð�ÏŸ!-ðw(À
sêÑšIÇJ
k”äÙ—6Ùò$º5n˪SÙº%+V)×½Nù.XfÕ²|kp=\£‡âÃ6;V+uìÛ’„gi¬æµ€Óvìshªp=SžÜ7åPÒ­[%˜£‰ÿƒ%),)’[w‘$»w§(’#��u´
<–³Êå¥U3w}™ds¦ž÷j¦lúoæÑÈW6Çî<úx?~ì8OãÁ
@‰Ät 8}@„Àq±¸�>º d‘ 
fxb„“<¥
Ê:…/'/³zB¸aî@óëáˆaÚP¤:
ÐGOûö¤çO@
Ň€üôI”
nVÉHÌà(ÁìiOƒY㥸](qPRÜëEƒ�O³H"ë¨HE*.q#H$%‰¡Í€�Ôã£ùGA>Mq8
HPÍ"
À>è€<õC Ç?@[×¼¾Õ¶ùAÔm5‹ÚõÞv­åÝ+]…ÙD½?uUï}»Ø@…ײn…ëiƒ»Y»x²äÅ=ò!;ú>Ö´Ž…ð\ÁëWÛ‘,½sÝï\»aÌ"Xc@liû'À.Š
S8?±å-}9ŒßÁ*vv
Ôž`[Àíà9ÒP@è(dƒ
›Ð"ƒŠÒÑ�� ÓaŒ‘(ÈÀÀª¨ŠÜ"�À‰ª8d®äŠ�8Âx•™‹T‰Æà!î`«-’"!*ÖPÀ£"¡˜ŠŠ„"Ò;À'4@4
´
(�¦ñ¥,4‚j
&0�¦É�`š/üÂ0ìBøB(
ÿ±©
±	Cq¹
+L
¦	Ã#@ÃC…À
<äCPÒ
?Ä
7Dˆ?üC±qxˆD<P
¥<DD„ð%FdD1|ăXPº�?Â�`‚àžG¢ˆ‚ $‚¨H:¥S<ÅØ ˆ�¨ˆ9¥ò‘$I:Ž ¥SÄØ
Å©£ŒÀV,ˆ_|EFzEŽ8

‚Âdܱ&Ü¢”I
@„GHIH„j|„G€„k¼FHÈFnôFo¼ÆHàFKÇH0Gsl„tl„s\GsÄ„Hè„xÄLˆÇNðO¨G{ôL¸GGðGôGHaøapƒ<H„,È_pHƒTÈ_
„<¨ƒØKƒr%
d©*‚2ÐÛ8Ì�Ñ<ðƒ@ˆ=,À‚w•
(€w�
È‚è¼a×Q…YˆÝÚÕSð&Y_¨¯o$VTE]Ô\ÀôNï[PsNëðÄYM]^,Æâòäsxæâ>/Z£c1ŽÿýüÏý$pXPY5ðÀVðôH�t…._y­MÖnÈ
®Â@ËFù«`�0ª�x¾LiíEi?¸ƒEi> íÑƃÂüƒ!�RÅØzýS¨ƒBPö,„%„¦/A(rR8…Ð-^(jجƒ:˜Mל͉ÍXÚ¤SÚ$Ó;YÜŒæã<ΑeÝ‘såëòŽN_Pb\€Y»7çêœóI�óu
^w"\ù%xchÚ§Üoƒu]ˆ F¦Þ€
J˜^�–}è!�Mçä‘&Yä�ºÈb…û
©%ÿ—�u)‡�MÉ_aÍQ9&”Fbèe•d*Ù䃲éšL¾	§…mæ…$‘uº Œz

è“ã1Æ sþ™)Ú˜~úÈetšå(�ƒZJ%¤R>úß”!Rz)¨“b㨥ºHꩦbÚÚ‡»áyrò÷i¡›Jkš¡þ訮¶î9kš�újeúEˆâ—[z¹,˜ÍÞeì{Âù0‚žé�ƒm×f‹m
Ør;Ck§ý
¥/V'
€€ ÐÎ|t
™iÌК9‘<
m«_ÖÿÎ=Ð
OÏGt ±±*/˜ÌõöBm*™ÉiqÑÝÓú‚™íE§ó„!¥=ß´ÚLÆjVŽNH#xµ`-Š‚᧠Â÷½W‹/üß+¿ùÈï=ô¡ÿûèS¿úÖ/¼š}净ùÇo¾ñ¯_ý$LßGؽW��‚_üî?üo
™Ÿ Ju´à’Ø™_´ ›´
ŸôÉÅJ4qfxÜA“I“².‡ÿáá–.U‰�Ž
@¡„̶=\ö��¼YI™ðˆ
Á¶e*…¡å„¡mp‹–a·�áÔ¡RÙ±á1•!¦!·€áÒá‚ávºa¶aâ’Ð
â)m"'Ú†1�K&j'ŽbnŽ+e¢%)Ž"Ô5
à
]&Š]–Ç›YÏÄÜ ° £^rÍ8é sÌÀ

ej6p6WŠhˆZfTMÏèC
^…\eèâìd•ú±¼V&‰ú)s¤f¾°Ó–QçæûHråÂö?ìXj(0`�Œ�tjbÐEHcs
´€k
	H8	h÷
`•…·nx‡�w4Aðñ·…ï^
˜ßùÝÀwö…wg›÷wÿ¶wï_ú�ÙAÈÑÊ
÷WÅ8T³7¹
vÄ×|å•H‡Ï¯PJªl‘ìˆ�IMeç™:‘{-p¨6³•3°–³qæ:¹tp�¾Iˆ�’ïY—¿—’sùÙDœ”;s™G\”hyß09»ŒI@
--- NEW FILE ---
GIF89a�9
ð
Lx°áˆ+NÌx±ãÆ�KŽLy²åʘ/kÎÌy³çΠ?‹Mz´iÀ–��²$‰Ô;sA‹bvaׯ¸OÎÞ*Ð%6qÌ`éÂ¥¸ñãÈ“+_μ¹óçУKŸN½øã׫kÇÎ%ûöïàÃGÿÏî�zyñÐÃ8?�^<{íïÛ7�¿œ¼uùøóëß¼Ë=~ýìCŒOµÕvUmsTX>)ˆ`n†äp}\Á\yïy—ázÎ×á…Ö"rçE6ÜÔÃ
5]¨Ç…Ô¤¸"qÅI
	5ÙlÃ�ŽÜtC�#R\·E7â¨cŽÔP#ÅYPÃ#7‘Dâä6ÛPvR<B�6(RIe6�Ù5ÝøH
4IRIQd¡¥—(f“ä[\±�=õp	
Š;nÍ÷}ш“FR™ä#R$'dqcDrdŽÛt³�ŠÔìQœIr³£¦Ü 
�5:*©Ÿ8fcj$clÆ^@²�©TJÿšä•Ý±7¦ŒÔ|qé#¦Bé¡^t'ì°]<
7÷pM¢ÆYúÅ#_,™d¤<V¹
¢C&)i²}æÚŘNjÚåŠkna©N&«$Qðá긯R‰‹Ý¡
MµÖjZ%�èêX¥aôK(¿h@²§¯ñBäôÝ×ð° z(qÄ‹8±Å/ç€ý£Œ@G)øЃ·ñ&Ð2‰,rD%§œ`ËZQ5PÌ4Ïl³Ë8ËœsÍ;߬óÏ<ísÐD]‚%£ó[odÁßÓPG-]:ª˜MW ¡£6Éþ©ªŽt#.4h0Ë®{l!Æ#Û¨û[H!†�5:)ö6R|»%žÜXÿ¸¶ŽÉB‚Fyh_'E¤;RS�\|᪾�hA\c<Òâ­yf£kd®H�a£¦�xÁx…k	²�ÙÅéîØ¢(jÓ©WÀÎ)74n‘�=öÌpŒ”j¡Þ#|T‘·ƒÞ‰¥Ë5É:‹DzÉ
$ŒK�vÚÌi
�¤;i¸c@²æN"é…ÒóÝ¢ª£×“Íf;©��l‚ã¨y×I¥ŠÛ¸B±d”
GD!
¼ê“å7©{ü(HöªGð¨!†âtaÚ ”¢ 5á�YŠÔ=¶
	@Y'QÜ“š
W(5ÿôã…ÄÆQ¸â”
äA?Á!A„C•
äc&;FËÿŒBÄ•¤d34oÈDÚ4ñhO\¢§E*J±ŠX¼¢£ÈE…”ƒm`Øt!=Œ…hL#w0f5Bl�gÌXãˆF:–1?ñ±£t質ï<Œ|Rê“—ª�oMG�nL¤"«#…nôãþ Æ1Ž!cXdRâ'ÒVÑ“:ÄÈmDÊU‰é F*‰ÁJU²r•æ †9`)ËTÆò–²Ì%.w©Ë^òò—¾&0‡)Ìbó˜ÁL¥2_Ir¬R•Ïle+c)Mf沚؜f+Ÿ9iÎòšÌ\¥-›ÉÊY£šÝÄæ7¿YMqZ“—Ñg:ÓùJwêr™æ 0âéÿÊ|¶S•É°å8µIM~J“žÿt¥=ûéJ…64›ÞLG*»‰ËZf3–ÏÄhF­ÉQ‹Ò¢Ìôg9—yM’"”šÞ´è9Ó±ÏW–e%=݉Ò�Æ“š8-§N¯™Sžî´§@ý©P}JÔ u¨FM*R—JÔV&ã•7¼ÍT~‚E"J$”CL†­Ú�­šì‰ÙäAÄzć�µ gÍÙBJ¹C‡tå­TY\¿
W¹Ú•®s­+^ïª×¾æõ¯GÓëÈbê„­!Xd’!–#…M+W
RØSæp¬JÜÊc{ÊÍ–$Rôì\"Ù³>V´¦t	[oƒXÉV„A=Ä,_²&ÿJÖA)+n‚ÚÞ"Ä«¹-H0
çÁŒ`„!á@šÐ44Í@ÚÑ�p4#dáŒJ;#—δ3¤±égtºÓž–…4D-‹i”Z²˜Eª§1‹V³¢Õ°Žµ7zAëYüâ¶þE/t}ë^ÿb¿Æ.†Áa£›Ä†0RÌ`CΆv2,Ã
C¸†1
ÒP�ØŠèvâ k­†k#8‚!¨wÀ‚'¸‹&m0x1V1Œ4XŒJ¨eFÄx®å»µVeŵÅV›¥CÕHU>�AÁµ‡
²À
.ù’09¯k4I‹³ ‚7ÿikˆk¼ÖÀ–¿Æw»0”¿vx*øl¼�xÃh¦õZ‘Œ?èÍÈY
Ñ2PùzÊðoaaƒW4à@
Ï°
/9
1é’2	k´ˆ“³H“À–k¶˜w½6”Â6”€÷ˆ§‚J¹”WÑYR©2V©YÑxƒÐè2¢¥U·EÀp–„>¨Œ@¤2 �Ê@µW`7ÿ`
"UCÇ`ÇPÌ0ê)·
£÷©”\�2GJ•ÅPXW	VMyU8êœhU�¶Aþ@Dlꄨµ“¥Å
°ÿŠ°k¯»¯+°û¯û°Û°±õÚ°±›°þº°{±‹°«±
² [±k¸@I”TŸ†Å 2ôoZ•�˜Ä¤ò¤?ÿ¥?Q`
 Þªþ¥Ê þ‰2�ZŸÃÈßY`Â

|¸
û$»À ÀÀÝêŸ ¬6<¼Ë QC¬»íIƒ^š•@¡´
¡Ÿc{Ó6ÊÁ€óúÌÐÍÒ<ÍÔ\ÍÖ|ÍØœÍÚ¼ÍÜÜÍÞüÍàÜÍ(;¯¤KC‡•u§›�˜*2]œ§amü6êVI§\I4xʵ0ʼ`Iø\¯¨ùL¥Ë A`íÉCñCe*Áp„1SI¼ ¡¥MÑÿyÐÀ
´}
jÃÿ)¢fËËZqÌp¡+»ºÆ0®û¼�¡+«ÂµÿàÌá|Ó8�Ó:ÍÍãŒ=�ì	¾]õV[ÅzwµŸÂLDƬ¸Õ2ŒGZEt¥j¬øžM*ÊZÅÂR`
XÔ¹[¥Xt[·)3¯

²ì
Rº[AâWm´ÞËÂ�7IÞŠ­óYÑ":Ÿ5.½5dÐf[aÁ¥EÁ 4X±aÏK}„_eC43¬53.ÉKMì3³²Õ 8Ó�òŒEn¸?ðZNððÿ·	¿ðßð +°�+çÒÌÇN´Ʃ=ÊG´ê°Æk/õRä0mh¬Þ î1»¨ãê¶ë9Ÿ±Wß?ÿteû¦Å>éPMãw½¹Ç<ï5þë2Uóð_ô?¸|lô„Kðn.¹iºX:JýöX0cy2ÞŒž´¢™¼^åÉþyÊ#nÕ¬êÐú.*ÆRÀÐÃÆ੡϶à	» »Î¦ÊË�^ ÝÄ 
ϯÛ¿µž¸%KÁ‚«¯—/ðš?ú�¿ù˜Ïà)Å�\çZÉ2)+<§¸Ê¬ò¬ÞJ»$Œ½ì
3ÙO›}˜sñÿF“‰—Ö4YôæìÝ2#ãꣲ©U»n{ü.]åË�?7¯×«
ÐJŒ÷öܳ‰ÆÔ©T&DñµÅõI‘'Î�åmºWï^xS–™@lá±[ÅXÇ4ˆr’áE
¦?d(I˜‹@䥘[8ªeß5yY�"eha
¤Žª·p!…jù©úň‡­3غŒ�曈ôoá™ði1&áÇ„‰È@ø)a¨D%Ƹ3"R
�l’ K€ÆÛ½07½ã±€‡ßí¤’…ƒ`l˜ÆÃýk)ŒH"P!Îâ�¤7‘ˆ\/

Ä@i(Áà
¼æ%oz›*%µ×H	}/BjPôš7I§Ú+¨°EÚX"ë3JüÃ!ePé mlíåÛ“„
¹›)i±H2(
S$Á®]®ƒüYÏŽwœ"OŠÜ“[´µºtå¨{Éߎ’@’Õ+.Øç¢ðhVa©…Œ$W^Èr·¾ß½îB•T+Ý]ªw³ãÿ¬%?éÉÜ4rEþ•ˆZô›c�µ	Q-áx�ÀeÐÂ-ÕñJúŽÂÛŽàÑ?—ñO,%sG�™8µ�JS(-uop
€°qÇ' ��R}#@©Õ6z5ŽV�jUÿ(Ö'¸u¬g�kÝÚG³~u¬ƒ]kV÷šØ´Fu
^í�}¸Ã䀶/ ý
j“ßp‡?&Q‰’�`˜Xî’¢Jð”›ÉÀ™�j®eÌÏj(†ÏZí|‚f¾”ÏK
é!Ù‰BÓP¤‡‰É£¿ÿüÀ-)JQÆàâj?b¡Ÿ'aês__C3·¨Ëßâð.ÒÛ}ïC5LøQ¨><1¥Ž	÷ˆõŽAq�Àd€ÏÜ
YÐjInÕ«Vv�Z�êV¯`øpÇ7òñŠvPûä8ú7^‘`sê
±ÖN7W×,“5¬ábqi0·+�e½^)¤�½ž(šÝ1Ähöq›õVÿåÉü¨¶E¶á
‰!
xQDü;»OJ¡g©­÷`-¯›ºF�ˆ�)<
ŠÁŒ0¢JYÚr"¤J%[.õØÇRôH~Ü—<òCŽ ‰H–Õ@"§ˆH*ÛˆûHÕŠ¤˜8›ƒ€&$̦½«œB¾5ÉŒ9	¢uXÈÌÒCëÇ�P«'ëºcÉ:ï8L�
±r9„€S›¾·ÊÌ6âÌÎ|—™/žÙ¾$5<?g3¿gƒwx?¤óMЄ­¼•j$NJ«WÔˆûà0
$ÅÙ`¡ÿkéˆ�¸–gbÂb�¬Š
	A=^²0ÔÀÇmÉÄ…à¢u ]Ø/é‹Ä<»Åäí”LÉ\Ì1“ª&äÊ$e3¡bœ9âÂ$ôê1#i>æ£(Û®(¯ý/»J1ëc¬©.(?Ô„¶g3?9üèhB69Ïq±T3¡/ĵ¢)�šq([¯)¹/¢‰Ï3L6««Y¬X
vPÔDPókMj{Mnƒ�ß°2l2zˆ•ŠµÓ�Îû3½ƒ“¿Û/41NÄ{*›­ùÈM¡ŸcR¸{Òo«Ûà	|�»+µRá �ßœ£ÜÒ²ò%íu€
M£91ÿúâÏ5íO6uÓ6…Ó7•Ó8¥Sþ„>%ñœêJ5lÍ>m¿÷{Q¸M †2©R3©RÞ‰+•RF=J&-«ªø’vk›;
H”N¼ñ„Ñ�‡	I‡Îû=fê¼S”êqªÃð¼\8�\`‡3!_€¼Q—ûÐþx–IrÔDåR0ýUéU/-E±Cya-× 	„(SI•ðB�"CèB€�2„Ï
à
˜÷#ïtåoFLÜT?ÄMlÆäc=箋åV$+g&s¡3“(ûå'
doÞ,{ö:œ8|–\~ät¦çÚÑ:GôåEFÄ�;PÞ?nVLÚÔ¿ÿ€Ö¤=´ä‡¦èWî
Ëp
[þ³r¡NºùË8á]Þ…�’6i¿ÈZ´9i!䣕Fé˜véÜ»º¹–ljßš“&i’��v¿êþê‘6‡£v!ÎY
c¨žèß„�£¶êþ-é‘vi¿ðé�æêܳi§}éÜë_­Æê“£>êp@¾]PTpþæ™æg~L*Mè�ÎfÅ1hÜ0£}Æèèœ
w.Ä¢$È�æw®ëNÒçÄ�kÌÊëñŒeÁ.»X\gF>`6ăŽd‰ÞçÊ6ìhm�–åz&h¼>7¹{‰Œð›œ‡zà†{à†z
InäĶh—ÿdoç�ŸÑ€»ýÛ?Ž'gþ2xÃ&Dãlt^²ƒ^gÃü0œ—”“Çø·³kcÕìñTlO¹èÎbgL©ù·Ÿw¦ë¬_Ä*÷ä‚Vø¿G|ÒÆ»×ñ¬ksÀoÊ
Ëz/oìÍçüÎ÷üÏýÐýÑ'ýÒ7ýÓGýÔWýÕgýÖwýׇýØ—ýÙ§ýÚ·ýÛÇýÿÜ×}Η®[vÄA‰�ÌÐŒÉ&P!þã7þä~å/þåwþæ‡~ä~é�~æ§þë·þìŸ~í¯þí÷þîìÿ~ñî'ÿó7ÿôõ/ÿõwÿö‡ôù�ö§ÿû·ÿüŸý¯ÿý÷ÿþˆdÄŠ%HÐ`Á�	*Dè°!D†–LFaÄ0v¬H�ÉB’,iò$Ê”*W²léò%̘2gÒ')Ž›&V¤táâ“‹ B{åRô¨Ñ¤H—*mÊô©Ó¨P§J­JõªÕ¬X·jíÊõ«×°`ÇŠ-Kö¬Ù´hתmËö­Û¸pçšES�?æx3F°.™É>ÿ–ôKÒpHÄ ÷-ìøðãÄ‘Onù²dÌ”5[ÎìyóçΠG‹þk:¤9Jlâ�Éæ'ìØ>·È¦=[6Û¸oïæÝ[÷nฅ×îí;øïá\¨mk®�[ólÙ¸q£öhp⿵ÿ¼B�›={ÙÂè¦Íyrã¹·°ßÒe[½zÛ¨}Q_ܾñ.Þ¹=ßÖ?lçx€a|ñ�6ó•~{ü–Å#ÔdÓ\=ÐuCM$�Ô`nÞm3á6W¼ÆálYlÓM7÷PsÅ€¶±Ç ‰Çñ& zªG#Ž7êh\Ž<î˜�½Iq?ýôCŽH4•4ÒaL¦4JN*9%•UZyå“„“ÿr�± ræÕ¨]�A*ç#šfXclç½G]=Òu³
uÒ¡AmRD²Í=ÜÄÙ5}BÉ]Pó]uwºø“Ôt£Í=þIq ŸÕ¥ç6Ø`ÃM6ÌÑY'5:J}ºu	òñ¡ÝÛôG�@ñY!}<E‚⦀Ž:!5Y´™[ÐpZݪ¯íIÝ6°u¡Ç#�@"!7óÌÝO†rÓg¨]x
©—¢§Ù@ò]ü·[£ÝT˜MaÜzOóMWO5–îæ…tñmfo_0ëì¡ðMKMµÌÅ3ßRè&h@
4ÙTØ­OÞI,Ÿ¹ÇvºªhL]¶Ð<Çi¹\ˆ1jÿu?í�è|DÑ9g¯&{Ϻ^lOu,Ê(¦˜i²y¦š¿úôÏk}›©Dò£1Ê$ùô”R–¤%AZR
“Ô i™5–]{íõÕ%…£ZoLq.z‹Â¨6Û?•7£ÛpûÖ¶Üo×÷Úxç
ãÞvëý“‘0‡¡ƒ>‰á¡òQ¸b4‰à‡BþȦŽñHäÔ@ÓȪ[y$bp±Ç³FRxn�ó
Iæ‘<B9{î&É#2ÚÍB#y#ØÑ–8᣷Ž:P^4²;ð®Ÿ÷a4ò0†äî>_$n1ë‡B‚F$¼Voøž’ï±Gà‰‡ž›ãÙkÿˆíÝ7Æðngñüÿàë�aŸ{c4‚8†�4"úl°‡<hpÏ|#Ú‚è'9H°§Ø;4ü‡<ÈN¬ƒÜ÷rã…Õ�Î=qî‰F âc-cî&Ø0Äot\ˆÂž—9Íý¯g;ßÔ–C¹õMotëáÜxøC»épˆxãŽm¾Ð
}ôƒiL	G„A®=fkŒ1ÉH¬§i-$„É¢“ÃE®%ÃN’’acF5.J–YãfàøF7FŽu¤cÙØ<îQ�vÌcݨ’aPÂIhŠ‰¢{¤ˆ‘Š|$$#)ÉIR²’–¼$&3©IG:R‘Ü�ä=BÊM¦’¢ìä(ÉÈU>²“‹ÿlä*¯õIWj2’§¤e+Y©ÈQâR•¯ôe/_IKN6²”¶<f0¹Èks—ºT¦3EéË\‚r˜Òä%+CÉLUò’šÈ,f6…™ËUJ3šÏlæ"±©ÍRr2•µ|'<ã)ÏyÒ’Ü0R‘â‘b(ÃÁ(FØN’5Ęq�&�ã›t5-ÆäŠõâ×"*щ”$TK(Ô0z�r4$ͨGC
Ò‘nT¤%…Ú_RÑ©Q±k-í"D[²R“f0EÉL§”Ó“ìTj‚¼š�áF�N
‹)Ù)NošR€®©J=êD[òR£B•©IUIN³ÚÔ­b•«UýêUW*%ª	5¤ˆÉ©ÿC©J�‚ª„­(e‰[[‚ЧŠ¤¢}ë]ñS“Þ¨EUR
kÒ�ž´°„=ì`KRÄfÔ­DU)Mœú$ºîõ4¥ÒL%;Y¾æSÌ«@Ck%&•µ�+!ãO«A.Õ²Q]­WOЭ½Djd}-nsQÍ’´I<uLi
W¨©q$Ãm­X/ÊYÑÊ„jÇ¥êcßêÚå²t%À
ãºKp
¬ÀË2+°€-çDTZ‘ßN)—Uñ!1]é’PZ“øSb€çfÒ©>CnŽ)Õ
œnê¢néÆjë¢.ìÆ.ËÊ.ì®îëήëæî¬â.éÖ.íÒî춮ðúîïoìúîð&/òªnîÞnó¯ó/ð"oï*¯íê®±
gg©U�‘kjf�.ɹ«Eôl‚.澦2C-lm0Dn§Fjjr¦0À0¬\„À.¬ƒþªÃøñB0
01ÀÁ�0„B”©VWçþÖFm¬1ØÂîÖ®êî0ëR¯ôò.Éb¯õÿï®±ñþðó:ïñ1­Âj
”€-T§×J8–lÍp›ÎÄs�„–‚†g=¦H=¬eu„ *-¼F!3üaƒšÝ;0­1,Ã-À±0Ђ00C-ìÖ2ƒŸ&ƒ.°ÞŽ_½Fêœö«×B04?-²Óü“2ðBjªÙ1œçÃÚ”½ú1;Ð?U®M%çÒ+Ã*<Щ²©jÑðhð¨wr-àp@Ï2-ײ-ß2.ç².ïr¯²l
´@Ô¬‰Bg”ÐéÃÚlUµë“Äø1†0ØÔ"wÖ"×ë&;l¤	Õn.r¤–2HH2%ÓqHìž20l0(Ùƒ7;M×Úÿk2¨#W--0ƒ¿*;ä¦#ã±ÁròG´r1tá7›³Ãž3/Ø-<ô÷¥ªBÛ¨*[”ŽvQùÞ.Œ./W´E_´Èr€/·ì	¸lÈfs‘Fb�UÍ”“\_€Š¯ZùVLœôÆÄ¢ê&Aà-�¦Y+-ÔÂ1î
qõjøónø…#±îF/†?ww8‰_8ó.ˆ£8‹?7ˆŸ8†Çø‰«xǪËâBGtí)R‹÷øÄC¿ÿ4I¤¯$Gj2�C0ä7;,2Fðïþ:¹0¤Ãþê/; fc»q?9MT@ÜšY.Àƒfb-1´ÃîåBÛª\ ?õ�’;
C.„0-ìƒ.à-;TÚ9#(_°°(Pry.¤€Ëº8‡¸‰oŒgøëšz‹Ëxˆ—¸t‹:ñöªË®
;~4öò".\+NäD‘“çNž=Ô§ÏFuMz¨R¦B�"uªTÿêÔ¡)rbÅ5ó¥G¯—µd¹rlÈd.¹®T	%K´k1Âmø–lÜŒg7ëŠKX²t
qeT,²^–%kHw|w°™%I³Lv€Ñe
Ù¹%ƒ.¼SÐ…æLRE˜ÚªR,,¡´O%uû•¥b�méÑHZÓyIMµÒKc-Uß}ù…ÿ5…H
=õÔ#¡ñÞ•ùãÓbÚ`,ñk^&nÓ=¾,Ž2F/ÿ™¶›�ý¥L+Ƹ5‘bð¢hÌ žÊ„A
L04ËX®:ÆcÌN"Å^1ƒ¡å†.ÙÜWRÔ¨Ù,Ê„+äÖÁuG…ÅYÓ³@2§˜-µP.°x`B,"…ˆÄ!‘‰DTâ¡hD(>1ŠS¬¢™˜E$Z±‰GÜ¢³(E*R±‹Z$ã£øE,†ñŠb#ËÇ.:Ñ�\db	JPD<º‡}tœ¯`r-„¬cm‰Ì~ÿvØ,ƒ-Ã=äÌ-�µøgvÇ°“´8“ÉbXP6aà-”q‹eÍ®haF-h¡"�#­ŒSbɧ,•ËbµLZÃXTµ†8ʇ@,c�ˆF6>QŽol#‘™L6²€ŽYÄcÕ¸ÄhƘM¤£‚¸<.kè¢eÓly.¥á'NN{_ rCü�3AS1øâ1À�0Y¥2„Q‹
]ˆÐ…. 3�ȨC-kÏf6#IÇU„ƒ)Œ²5™£Ak3}‘P2˜xPˆ‚ÌAØ¡¦dD¤MB¨0ÔQ�Ž¤££”ð”!€îÆeŽ*FBКjëyåTÔ73vÿŒÿe­_E…ΫŒšT¥.•©?yR§‚”4®"�ÛHÂèSŸC‰$X,ºÐLÒ€�êÂ@.úÂŽŠ
ƒœ©Ë˜Qvcå¡2PzÈ"
¸œnº@61P/ø,Ð2ÊŽXt&BŒ$^,ªÕ‹˜‰2²É¡–êGµ­¦s6'4†1ˆÚTMÎR¶êK[…aY|C”´(†_y�ŒÉ¶õ¡í¾þ…@u…,)A˜òƲÃCmõ7SÄÜ—¨„ §"’Y=oº(ƒ)C?׺*uÓ±\
0ê OÉZ1
dgÆnyŸY†	'S9±ŒÍc¬@uÒ%Šis%åÿ¨tû!Æ.h&Œ]¸§c6q*i{m#л*qܧh�è6ÿ7¼�åŸl¨(½œe¹v.=Í´WÿÉa¯¦­M˜™Üi&•ÛPÇÚÕ¼
öLÇà
^f²Yæ—,Jrð\³KŽv¨ƒæ(p0ÌŒscuìF7ºÙ]àx.Ýá F8‚ÑG|÷òn71̱:x÷»�æ`·½
~ð‚+<áÀÀ79þn{÷áòN÷Åã'CÜÉûf·Áþn�WœÞNx¾�œoz.ä Ç8Ìs™ËàæH‡94NŒ?»§#YmQG*",ÀZèD_ˆ°š[ô1cÆà…1ö´ëX–2‚E`
fDûÈ­ˈÞ9%q¾D.ˬإD1…éúDÃÿFšm2—Xû
#ßÖ³�Ç]îsc|ï!9Ç
ÌîšÏœð„ÏYjü£|âJ"œQg]ŒƒØ—J2D™ìH™zÞãDï0öyQæŽtŠý"ÂÉ_Ö�¢ä½úySËõ­Mòú» „PÂ^H<-èÚ§	‹2vAšíÚ=03<Ö!ådä¢4ÀPÇ.°›`P—1�ÑpÐ@I‹ì³ƒg‡É…eFŒ9Šº©t°%¢ØÉÅl—YPG)\3
ÃØ…CÔ¡Ò¡fÚ¯BþËøva|F¦Ï4ؤý&CB
d;DBä
Ø>Bºâ¢d"£4*j éf*1r!u(ÃIÀóíΉötˆyä¢Id»¢>Ë”ˆç:¼gpŠõX�5Y‘uYÿ•µY‘µ|\ðlF`H ØÁå^A.
w»BuW7z¡×v[7ÄšE�ÂÈÊ»<�/x—ERéÊr…zt&B)|(• 	WŇDWYX«Z B0Í0fÂ%[ÆCR)s‰„ ÇzëBuz©·~¬
…X¤€Û‚{׬L-{¸foÒ#»)}–x5X:=¦ÿBJy©’Ô
L8+á~Áƒ:oK•ã_ªVFN tl'R@nø|¶fRÈ69`kX`'8@¼Ã@e'H,+.ÒøVqj…GEX*]“y•±ò$LðsíF0j„4H[ðÄKbT#ÞI½jµW3Âr²no,¸÷œÞx!Ô¸WÃKƒÂ86�1òx²&k!ý�
�ûX�3‰�5é�9�ûx�¹�9‘9‘
9�ÿx�Ù8âé"ÀØró	ë8ƒÐ¼ÚÎ8öpm7.¢xþwA_Ô�昔óÂØ`¹,ì£!r¯
cfŒI$ŽGiZyÖŠÁ6b„øÂ06/Úîؘÿ'¢"â‰Býø‘/9š%Yšÿ8šù˜šyš©š¯¹"p¥�›Ùrõ‚h´„äØÐÀä‚ø£"ôœS+¼R«›?ožïøE¾ù’ù›ù›1ŸíéŽ/ù›ëÙ››Q!,è`„�-YIÁÉ!ÒÎ;çB�¹v§×u�Fz£4õž0A9º—kµØ¼Ñ£Ez¤½2…vCWMÚ•Ù)=SÚ¢Ô\ˆ£ØÒ¤O{͵¥«4£ÁSIxz�´§§7§Ù‰JÍibKz£a,)Ö§}E©+&\Ê‘£1c·1aÒ%¥/–¤£$aZ”ìÊ‚ÕºÒ©¿—¢úÈb
¬‰ÍEý¤J¢‘]A‚YX
¤Ïó¤ÿ—P«íúÐÆqshšE¡F­Gù¡Õ‚ꊚ7²¤­¹Íb@ìœ@zWïJïúD;¦
[AÚyÀ“cZd®C:¤-¶·<{³áU§!{¨Óú©G›²/–¨%[ÚJ�
úCÚ
…VQ³Uè]ÿÄñ^
‡„a
`Í

K´ä}ÞiÊù¥›fÄ»âP F~�ÐJdïÅÅSaLÏ@!÷J)â
©Ñ¤G›þD5ªÔ©T«Z½Š5«Ö­\»zý
6¬Ø±dËš=‹6­ÚµlÛº}7®Ü¹tëÚk,Y±¼{õòýë7pßÁ€	.Œø°bÃŒ7^ì82äÉ�+K¶Lù²æÌœ1{Þü¹3èÑ¢K‡>MµéÔ¬W»V
»uìײkÓ¾=;·mݸwû~
Õ 2fÆ 
+Œ`ñb·â:^ì9AéÑ¡S¿n=ûtíÕ·{ïûwñṓ?o>ýxõå×»oý{ùñÙÓ¿o?ÿ|ýõ÷ûï ~ÿ	 ÿh`‚*Xà‚6!‚>wË1ÐÝ"L†Æð¥—^yxWˆ"ŽØˆÅ¤óË.åÃb8æcN:Ĥ#£96ÞˆcŽ:îÈc�>þd�BId‘F‰d’J.Éd“N>	e”RNIe•V^‰¥Ž0šÎ/¿³Œ0Ç,W�^™U2£&Tm"ôæ‡kÆÉæœvºy'œyʉgŸzúÉ矂Jh�€:(¢…ÒI§TáHbÉn8A†f˜AF¥šfÊi§ž~
j¨¢ŽJj©¦žŠjªª®Êj«®¾
k¬²ÎJk­¶ÞŠk®ºîÊk¯Ÿ–q†ÍÐÃ�?À�T ¢YšÎ¦	­›ÑÿÂ9í‡Õ²yí³ÒnK-·Öz‹-¸ÚvKî·å†;•9�BAFRp
o¼òÎKo½öÞ‹o¾úîËo¿þþpÀLpÁŒpÂ
/ÌpÃ?qÄû+E=ýàƒ0Ëœ‰Ë·q®i.U;‘HrÉU�ì�9”¨!GW„1ðñÊL/Í÷Úl/Îõê\s¾<Ïû³¼AÏ|ó½b\ñÅ^d‘ÅLKѼAoÁ³Î6óÌG$ÛlM�S�/Ø\MoÔd³
5ЈA6½0†‘œMM$0·-´ÔD3Ü…�Px$^çsWtñE_DóÑYxÆÔcß;ÆÜ�´Ì8ã-tÕbÿï|ïÝœë¶Ï¦—ŽzÑ©ç|ºêøvq?§ƒ®AÂ0‹ÑWAŗɾÿÎìr*³ìrê?_
úêɻκò=;4ó6{±
7Üt“
Hó
Iõõp	ãñJAþâ_|ÁÇ»õvÑÅãL¾‡Ôts7ÙtER,þöúç+.>©=�](ŸÞFµ-�Oh
˜jli_ߘö)ˆ!jŒ³Y¾0…/į7ä`Þh–8¦ñðsë£7ê¡
j
çë‚¿¨‡ùÝ£ze@ƒiVÀ+`AZÐ!½®°µn\O}ðº!½à.<‘fc� ¯/|ÁW`›Ô¾P
Ž�fbÈÂÀàE�P2ìáH½¶‰²uÍcÞòJ‰ÊSªr}±›¶´uÜ¡+*d¢Š,
’\Ò²Q¹ü�/ÉÒ;©/}¸‚ê4·¼ã‘r•ÑƒÞ'Sù<Smsð2›õê‘
3ŒqÐ@â= 1˜E¡‘°^6 q)GP±nøk„ëÑ
h8
h g$ØW…ùÕcÜá=nDB}|˜ßÖ¡=8b‚öß	©ñ=nlhp—®àÎnpÿíXðB# a7fCöËF#
Ðúm#YøbA·¶
GhÁа^C»°F^hØF7H
�A
ÿ­Ôí@t&p‰Ì,µ”J0Ét¦`Je)äUŠy�²’�AEemˆŒÉ:²!¯¹ÌŒ®}¡]üÖW¿ö½í5³�ˆ¯Vok��‚æ²0àmd#Wx'½˜ÓÛÞèY蟼¾	=†5a
³²ÝÀbxD60s²‡1äì^ö’f³Û0#dð˜§-¬«60Äj?“+ø®½í
FÝ~ôCæH†_ŠAŒãH+âM“³›
mjGû—Ì8Úo—…|uó%5­?M(޹ȫþö½Ïýìc?¯Ú®e¨i’‹³W­õ³ZË̱3ë· ›iFõ½ø™×Úûï¯ÿ>ÿ·_û6óbµ¶[Àa0³\€WêC3F:8caÆU6_f¬³lzó6ïGgòÂ�5£€:ó.Dtfgö\ƒ$H�
ôà§{ú°{ºWl²ãŒý ;Ó(�ÕH�×h�Ùˆ�Û¨�ÝÈ�ßè�áŽã(ŽÖXl¡øŒÐ�Ì�Ñ(� ØðÈð�ºŠòØŽóŠïˆŽúèŒçø�Ï(�騎ûh�ýH�9�íŠò�ôèŽ
©�è8‘ÿ¸�ç�²‘I�õ¨�¹‘;©�êH�
.ú�_!¢
A¢ 
™¤©�k‚ž‰Â,ÿÉ—Ïf+
ª óùœ}Y.¥ém
*˜]‘ ÓR¤rÙÓy—–‹MJšv!^ìI.Rj£Uª—SŠ¥VJ¥WºŠKŠ�‡"(ËrŸƒù¤ÊW†ñ	¦ÝGÊ¡dZœõÉ¢J¸Sžlú¥Ô6¦q*K™›Z¦nØž;*¨jže:¤bÊ…'š£^—Çç�W¥¼	Œ]á‹›Y©_ñ
ƒƒ€ˆ~0ÌÚ¬ƒ�ˆ�‰@ͪÖº­×z­ŠÀájŒ0®ãÊŠ …ÀͮήíÊÎàÍà®Î�òŠ¯ùª¯ùúýê¯ÿ
°Ï0
+°¬À
Óp°Ó0¬0
ë°;½±½à
½@±[±{±½
¼ïzóêàÚ®Í@¯÷º®òJ¯ûº¯ÏàýêÒ`½Ï`½Òð«°‹°ß;
Óà
ë
±+±{±ÞÀ¾˾ê;¿#ÛÀà¿)[¿õ›ÿ²*ë¿þ*ë²Ò²r[·[‹³K›µN»µ£(¶R[µr‹´ZKµfûÀT+¶<«ÀÁX‹´¬µKë{l¶h[¶rÂg´&|ÁJ+Áà´œ³1̵4k¶/<Âm»µb[µ*l…
l…0‹Ãœ»@#
ë°ÞðË[­Õ«¾ÛÇ,Ö"KÑ|µ¿pÖf|ÕÌÖf‰!ÌanµØÎæ×´h×òÏàŒ×nY×ë¬×w]Îà6Ïy½Î�Ý]µ”!rµ&U
òßñ*
ï}¯¶¬Ê§ÐÿʯŒÔÓë¯Ó
ýª½«à½nÕ
‹Õ¹ü°Û°Z½Õë%³�Ì¿ á³à%a}ÌIJ®²h­²/;Í,·¤øšs�‹&~âضk9×Ö&Øáâ-nqØä×ðü†mãâæâî,ׄ}—É°·d«…¸#¸Z 3` 
åMÇ
xp¼áz¯ÎPy
›îÓ΀ʌpÿ
Œðé
ŽÒ�õ]½Ó 
þí‹½Ò+½Ò ß´¼½Û;°;Õ;
ëë	î°Ó ±
±ná.ÖËœ"~²'û¿BÌk½>îã(þÎ/®ãÖ®ís½&èÎ<Ž×ºÏ=nÎ×Þí4Ž‹×ží;΋ݬí土X8žÇ‘J\á
_
y0Ü
¿Î݈Pð†ðƒ€Ü‰ ÝŽ Œp+ÉE ÊŸê

q€¯vÚ
I/ß+¯ßL½Ôû
ËÒ°
Ò0
^O˺,Õ¿®àS�àd±Þ°Ä,ÖÉŽÌð̼0r/_ÍÌ|O{×vÊ™~OŸh1|¾
Óà²°þ´öëßõ½^Õc?ö
~öç»ÿÕÖ³
ãULX1ŒoÃÈ1ãG�!E~<6ÒäI”)U®di²dK˜Å^Æ$Y,Y2Œ/o8
ÀÙ)¨š1bäò)ÒP�µ†pêÔ4VJ;“vJoÞ¾¥ÉröLšñgÉŸM“%‹+Y³¤ÏšF}úõÿ^³²ÏúÅ�û/ðÝÃï
_>áAbÕFâÉ-»¨'Æû6ufL¶?dü2Z†?ÿlâïÀ
(Î2ã1Ì`‘
ÝÍ5¨šiÆdY%¹#v‹&¹â”{æQG‡s.:V¤ƒn–N§©n:o®æ;ÿïÀû<òè—aÀ;o¡_„IïVav±UW‡Ø+†‹*œi&erÚ�B�Cš6<æ‹Åo¿’ mIÄbŒQÄ	;ô0Ùc­EvÚŽî»—‹’I'Db
�æFà0š5§6ä7¡ÚiE é:�hZ›
PÖ
�í7µ…Mm¶“[šÿ㌣›îi¤uoQe©Žïë¤+Õ›^
×îÂWÜ<ð
"æ\"†=[y¡¼¾úTªV§Õð£cÁí\Ò»]ôd»ÕP@|–?ŽTý¤C¤ý#m‹)q+²ˆ"_„¹Ø#)ª¸"
�	Æ"0"�.ÂøQx>´
T.šDÈs«ÃÝÇõ9ukX
R�IGÅ+^(wÒ2F0J‚.›¬+Ë€¯!8Šãà¸F9ÎQŽr€ŽzÔ#Ï
pä�{ä ùH<–‚¤ Ñ!ŽG"Ò�…l$8Ð�Èrƒx¼d"3©HP¢á å09T’�½È$*]ùJW†ráF8ÊAJ\ÞÒ–æ�e,‡
Œp
W¯žÍ®kQ¼’ÓÙUž¯S/zåjV&Š$n5odÞûz+¾ñl«”ûÿª øªnBdewÜV©Q�­�,GÚ\åÊ]ˆM/ØAf$6ÏÅ Å2vì!3º—# •0ƒ1ZùØóvùé,¥1Bc(ãÇ ZõE“p�~‰2Œ‹� •¸,±³„çkÞU{ÚÕ5Q5Š[½Þ[Ï:×»Öu¯yýk_ãÖÂαíll_'{×ÆF6°�ÚÐâÂÈtw7�[Ô�ÈÔÅ@£„òj
…V¸`
	Npw¼ç]ï{ç{ßýîwü=ï�¼à
xÄ'^ñ‹g|ã�‚¤à) Ap±éMƒ×[˺ɺ­Ü	aÝB
œœOLÇËZ^X‡]
cÁô¤…ÃäS€ôT�d0”#>eôÊ’�v3†3B†,\Mš¬Ð LÊÔlJ
åP
•M¨üПÑÖ,ÑõP5Q%QMQ%ʵÐÕ„Q¡œQ_Œ<Üì. {§€Zбð´8C§Õã…lGaÈxЄŠ|ˆ5
,c,8'Tïò?˜3�õ3b„¢bÙ
‘ƒŒˆ]€dØ…¸eÀx¬1a–Á‹°@5'
X‡Ò8Ëìe†Ç´ÌxTc$ãÊÿ…eP`L;'ah?FqEßÞ®<[˜¯oÃéÎ=^ã¥9%’8n�²Óâc„Ã	iµŸ†b
äb|F�_]øSâ¯�eØ
õwmϪl€H@³XÇŠñb&,¯ƒ•%& ¯d
y±£ÅŒY°eÁŽy\V옰cÀÔ£µŒ—°‘µn13V¬X2š3oʼ©säΞ>gæt¨3çÏ™5‹îLfì¨Ñ¡3[>Å…kʼnªUQX½šõV«]·zÕ
vkW¬fņåŠv,Ùµjß~}›5Åظl³–•{wo]¾~ÿÞÍ»•„T’Ë„AÕYÓa²t
�l-eé+ãµ
¸�%�Î\>Í¥?%Ï—nôwrüÈ™úçR�ÙÇI�
€ 1½sK2Ê|$]c»
ˉÅ
À.£n.¯cã:
�0¼æ;ñBXdÇ@dÓ�?MK,œÕ«d|É9T`1"UwbIÕ­º~¬šaÖš¥˜#Ÿ¦y‚éúÕ¬¶Žy¥Êé}²Zta7l›Ç¥j”@6ÉXœqfXu€ÿg¼�	CË
¶$k*Ý>)·ªÈ�ñä¨öLçÃùÕ3ÞHïÝ‚
2¸_Æqò2’Þì3ébT:ž
ÃÌ-ÇðÎKEóàLÁXÊ/êœpÓ@ÝrKœûDôM¬çÕãdyõ?u“T,´¸Ì‚ÿ…rÍ&ƒ	˜Ë*›/¦Ì�ËÕ>̆‹ìþz'ß1ÄPÇ9Mä<&Y
ñM1œG=Ÿ0å Ú;aÏÜ&¹b='1ÇÀ¬ ¿Á©O|iY_ø°T8÷Áod¾Â
{¾â¸aE¦YH™žS$–Í%Gz?Á
x¬&b
¦ãÖ�Jâ<¥€k'±ÆÂjbF›ˆÄ!›I�±˜ÍDá磽;^ŽXUœq4% ¼i¬A+éQ1��© 2‘Š\$#éÈGB2’’œ$%+iÉKb2“”4†-¤bd4¯$à ÉÜà„ ½­sx*Nù¤±t$c!Ù‰P‚Ñ<Ý��Œã…1@¥¬…ñìXPL¥µŒ9ì]±‰u¼ÛNÿ>$BR“Òœ&5«™É[࢓Èøä‰tLh±Ð›IÙãæŠ>
)B½¡	
à­›
¤€.`–1hNg}.iÇIê9iâÐì)ÆbÏ©âsÞÊÐS�®‹ŒYX¦d©àED$�ÉL0fÿ0ŠP]‚Z‡0ÖA
è"”
Ài4‚�”´ð‰É‰gD[$¶’ª?Ó-~z)ª±L÷;Îî×Zº¤6µ7SK­jKÛõ¤¶µUéÛnµÒìÄö¶D”íýzûZ×v‡=Z�­qó+ݺֹ˥Ù^”k\±0÷º'hA'�y˜R
M ƒ©@8”fÎDlæhG0æE¢×$¨"[«Í£(C‹ÊPFy
j<c솎§Ú´–Óbÿ‘óŠl•èY"­»ö„³™Ù¢_3”:ƒ)+–Š  ä$Œ ö†[¬Y¡b”¡täKÀÅø+
z“/7�‡éP2r‘‘ÉK‰ÚÐ-:à[€¨6ÄÆB’1T�\�†‡  Â’¯uê0¾,gÃŽ|PÊe–Í(D¦Ýðó=ßòjfñ{t¦;?“Д¦tº
�nGŽ‡á†´vqV©4éÿ 
ë“G•XèÊYŸ(¢°˜ÜS+SUhWb}S2
÷“Qw4eÍÄyÆ0!/`ÂŽZ\V#¼€ÌKÈŽ#æbRI› Ý’ÃDn5‡¹þm.(™´ôÒOì‰1àÆ
& Q„N bØâ�j  ½ÉŠ`nà	:	ži‡pHI€
!HÁèOÐ�y)FIÇ!Æî�„ùÙB	§CB¨ƒè\o,LÐÂÿ¦ÄŸ§|Æù­S1èÎHÉçÙQU
I} Íÿ…Sõ«DÏêI/áÆ …v`f  •P²à!�Á¸Ú:ÉP÷ìÄž€.¤ Þì õ­` j" ²‘0P".ìLžEMŒÀñs�×1™¢ÀQ_f1‹öh%
-jQ°y¥Þ� Ÿã¥„¨ƒÖôHD,Ø�œ
bIbÀLì?ÃÖÔ1 _-,B`:ÏJhŽàŸ>Ñ›=ÛMˆD,À›¨ý©DÓàh(Ã3)CF�ÑH8OKd�1l^¨\`�ii•Wùãüüc@
ä@®Gk±]?„/ÕÄn�ÿÿÉYLa=ß®ƒÖ$<,Øj`Ìî<À¸Sk\LqŽ�Rî/iD;¶Fý„2ÜBBÈLÐcF\ÄRC˜;Ø‚	9OƒðŽû™ÄÄ�²™|0ÆräcO`F)Î@š��
(FÐ¥8Æ;Ìט¡Ö„Õ
D8Mkâ
F
-è;(C,Ã2ÄÂ;Bæ¢,
º
ÒÌS=ƒ:äd)¨Š\Y2@N%…<m�F+d(m$LÁ©¢~GË­€ˆZNœ–]„¥u…§xªØŒ‚[I©É›0ÅÄ™K:øBlOj¨.|ק<‰zäž×Y§_ÚZ¦-.”9Eϵ
ÜPÈPšRÀ!Ç5Ì�P±5Ù‚
ÿ*é„G�¦:™îHëPFã
ë¯+±¢«®Ç7¥¢\òˆ\I•VÏ’´ä)2Å‘%ÓBÙ—jMˆ—^}ÑÂüÆ1èÂ
L^÷ðÂ
ä‚¥æMí3ðFFºˆc4J
bìëÄÅ/¨…Ùÿ
J’`S	tX£äán‡s&¬wîÊ¡‰Ý©âÖ¥5Nì9îä.ìñEnæ¢êWHE³(«©
{QCt“bL‹ÌêcÑœQÊǾÁ⩬!k@÷ðbÒn÷gNU¯œq…ñ (ñ13ñ;ñW('±qWñGñÏéº.¦ÿfÎæñ¢À
ÿwqïrBWkƒqD?±DS´CÃq/3;ô(WtG?´Cgô&ÚæTIç”°ƒã…JK4¢OäIÙ4‰3±I<2U*E43äJŽ
ÅlÑ87ßO˜àÀ
¯dôO:Ï :Ë`&3 *Ù±p¶aƶt°ó¥Ãdà?Ç‘@ô«&/[407±I“uIc@;¤Ã2´£5&F,§ÊRaUÆÄ!#F]÷D,»µž,¢ÆŒ[ç5ÜÝ0CTyïÄøQ‰Ö¡*DÙ
À9äƒ;�ƒ;Ø79à7,з~ûC&T0€©ç¥l2I)ÀMp20k4[ŸQÈÔÑ\ÏLd0(V‡ÄHcÙˆ�ÌNö2DcÔ&hpœFDX&<LY½i.Ø„-Åddãe PF‚FDäNÂ
{siÕìñ±Ÿ'º�å!iÃy§¶!Ä­„;�.½TMyïbä%pûŽc„¦¼´—2T
Ù¨õ3C‚O:D&¤´ƒ@è‚:”w‹”YZ‹£ŒTFE°ˆṦCãõËl˜ø˜‰f~­Æ·®òò˜eˆ“‡º C;
Ô,@³o1hm”€Œ²O•DZ® É�£™{Söz(š•ì~»ƒ\@à79€@„
#Çÿ€ã3À!•œ�B>¤éJëHüFµ.Š†ˆæ½Æ‚h‚¤€w™a,CP…t2 <*„À¡†G²ºžË†ÂC¨¿F.D;¤ì£Òˉ0[ÓˆÈÈ…>ˆ@ÄïPIq;C
xC;8–;­Ã:øB†®€X©@TžÀÀ
°€
Ž¯àâœˤOúؼ'N�Ž|C}Ó¹;¸Â
@˜°«ÉÒ©L¶LØÂeKy=¶Ž˜²§Äà
Ø¥X;]xµE«ÿ0ªG—c¨@º\ì¦òª[Ö0¼\NÓ{º.ë1a`ýª¼kÝ®»ê

†¡§lˆ˜X®”Ȇ&;Ê6’cŽ¹ÜœkN¹D]ôÐEmÔÐHUîPH)UÔREÅtRG/åTÓP%å4Ӝۇ ‚²ÃN ìÈÉ'“JfbÈ!Âé<5ri½û`º>`Ë3É¥‘’ZiÁŠäÕ¥Àh]ïÈŠ„Q¦^”™––_�œì!¡,¼²Úc˜ñ²&5uä–B†>lèJÙÉVEvc“™lgœHÅzÙÁÅË7eJÊb†’ÈÉx©×uÃýÑÃiÑK‚½Éj—Ñ…§xJ�gÿ+™?RƱ
œŸHº“R¤/"éZHRŠµM Hó_*Â?�ÃB!`€“œ€¬Yoj¦Íã,§›…UËHа`8,P*qˆ3Õ¥^«Y½ª0OÀÕDõÿf0#
<öñs S�i}E;5qƒa¤ãOJ€ÀJ¨Þ|J«ËX‹J³a†•©Í+RaNw´£œãH«/ÐÚÜ dˆ€2yŒIN4BžDe²ˆUŒ•#/Uò‰R¨�O
粋��ë'e€0`Ä‹
Ä‚'
aØÑÕ0†ÿ R›K´J¦uø£#ùp}Ež‡ è‘tJ/i¶À˜ÞLŽ
eNT6�ÊÔ. ©¸Y*Êvl3‚ˆ—:™N:ýq	Y‰ç~kû'fѤÝ4EaÁË2Ê–±x(e™Õdb¨ÈF$ÏÚÏ|‘&b`5í%³Å'nw› ìy�ÃI;±N©ŒÜŸÖYQVýñ¬i]k[9T™úeXYÐÝ;ã
Šó¼ÀpøU­*d“¯yǃJùÊUÞòA½¼ÎÍU9¬e½Tæ°`à%ÈDp�;܉²xŽq‘~îr9&cYrZp‘“ 8-[
	Ð
Æ–"‘)…4\b/™ýá_½¤? —�Ô¦ýiRsú·"Úp’Ž~*}å(“}Ì‘Só[ß÷Óm.ÍsýË•Í~eÉa�è>^�}Q °(¯&RŸŸeG;õîÃ�<ß«4y�Ójùb2
Ø#îQÄLŸP
‹ÁŽVÀI}í:°â}"¥ñ‡e\RŒÔ+F2Ý}‘2t1þÇ+Cn|¤£@­ù:ïiØý¶$Üõ`b–„릎Fcäf�À9~êS€.pÀì©>p
;ŽÆÿ‹g¸ƒ*ab¢)
à©X€Gp
’CGp7¨N˜¤ð©H`ËðêYê|­É|Œ¡aá"Ù”Á‘t„oV-%2«J4dnÒ†WìDì‡ûP$&ÏZB†Z¬%.¦'ÂBCJª
ÈVÐ+ÒNäPä'Jdò(E¸NîÆOØá["Í~Šû˜AzâE$FPÄ/Ñ9MÓtEßg%CÐVñÃO~d#8±ù"
(M–a¬M½©1]Ü«áÄO\ð;졦µžëÅ]®«ÁºÉ›«³^ª¯^–¯ž¤Z¿ËÞ¾í»¸Ú¦Q¼¦ûA¬
Å
Á
\Ãñ›«í»ìß=í§Ù>Ô¯Þî?Ù¢Á½×Þ“:ÿñ!Ì¡Ú힦ÿ>§]Üêµ>§¡Ýì«Á:œêYœê]\ªß}ª§úüĹÁº%9ÀeZëÅ=Ô)ÅùÚÞù‹'—j„˜£�{q…X÷‰^l0úþ¼±ÿgè} �»‡
»†kI@\�¹Øwùáë´ÙÙös¾�¤@ö'=Ôü{›ŸûNˆWØô²?é«6xÃƃ¥7
5Éâ—…ø{‹„û¦¡Ýž›>êËVBŒ Œµb×KÀ½zöjãf¯7mÚîesXoÛ=mÕîq{xÏZÄ‹¹e¬qc=ˆ
ë�,i�›Ãˆn\x�ßB•ëuÜÈíÞE�4º¤8TÛÉ—wÿ6ôxÑèņïÍ£ œ°bX³6À»kôúáä¹ñ`Æ{$}jãí"GŽÕ’Æt™­)O¡<í9½	“¡Q¢ò4ZÓx휀r»x1[–ë±bÉKžL¹òäÇŽ/c�Üs2Ϙ-‹],4dcœ³¦N†ÚtãÔ�W#ýZõk×´'³ŽŒ:7eÞ«%ÏÆ<«²Ê½u+÷ÍüwVÜËsC=]têb­7CÇ}}såîX‹k}ž3xò͉.��²øó¶-ãÆÝ»þzÕÉugŸœ?¾äÐêý'Zu¥i|–ÝW›f™5X ƒ
rÙßÐH'­ôÒL7ít·ÝEýôÔ²böX-Tg­õÖ\wíµÎÂ$³Þ-·,vqbSÈÙ1k·í˜Û¥ÁÍöÛtÇ]÷Üvç�÷Þr÷}·ßzÎ÷ß„^øà†'Ž8tµÜ‚ÙÆDîàä_Wnùå˜gžù1ÇCŒcÇó˜2[�©ùé”	#1˳ºêŸSÌëÄ
Zð‚Ì 7ÈÁzðƒ ¡GHšð„(L¡
WÈBb‚˜¸�$@±ÎÑE¨ËfÆ!‰6X"q€ê@Ä:
s™Çl¦1Ÿ)Íd沚̔e6�©LlFS›ßäæ5ÁIMrvÓœãç0Ã9Ísªšå|§7ãÙÎtÖs�ô´&>ÝyOxòSŸþ´'@çùÏmö“ 5è@ѹτ²s¡òdh@JQ,œAþà‡?~‘Žóu¦1õ¡\™&žü˜C€n°Bö°.¸ô¥{x©LgJÓšÚô¦8ÿÍ©NwÊÓžúô§@
ªP‡JÔ¢õ¨HMªR—ÊÔ¦:õ©P�ªTqº…,ÔƒøðG8®Òˆç4æ‰O•ÖcžØ¼«¬["ëY×:/´º•­jm+\Í*׺Æõ®tÅkZóÊ×½¦UB�1‡$ä2taªˆM¬bËØÆ:ö±��¬d'KÙÊU
Ýè?öá:®6HjVúª€FÊ´“²á’W°¬j£ÚR›JA
.miº ØJu[؃F)†ÖrÁ·.
ÃM…KSàÚ´¥È=®„+™âv§¾M.t_†0xáÍ
ªt¹@\ç÷§[ú°ÜèÎÔ¸<�i¶pØ¡÷½>méÿk±‹^.Äô¥õ%ê}ñKÕçæwµ
¢'�	¯µê'eÌÇ»çxÝ�èeÄÇ]¤'{%—€ûõpž¦Û@]ÿ]{Ê—{�À÷†[a0Ó7e��|®G\•æz_ Næzcà[R
¹„éR{Qp†×½Gš”hró ff`™1‘xØØÐÐ
F�š)Q w¾u—ÿ¸
ä	�I
`yg
™×7eY€�“™
„Çïø‡ˆ@ÿS …H
î©’BØ”49“-•Ni¢#ê’VI`6vW©ab uùQ4Aa'–V¸“G£lœrRj cY�”M÷’L¹†%
„+y¢J:†í8g‘Œ&GœŠ€ov•e�€!·
‘0[ãæ‘­5jÐØ„i�*¡x¨Ÿþ¶|Qfn‘@s_ê¡øÕ‘pÙP{'™|H
X€�/ᡪHeþ¦f³eP	ÙµƒaБ‘€i[`�©‰‡ 7gRVS‘x¶õ†‚gss¶Ô¡yH
8áå6|Y6w.htvX&׈„Š‘Tö¦™†¥jp8U‰ÉH¨%‡
	ŽÜE–:^ÏX‹ÿæ&r1˜°¥[ɸŸ«8njFc­éim	¥Úà¡[R	¹‘�§fʆ‰r¿:„zŠ{Š¨ykxƤ!Š¤$ú®SÙ®FXSHX`_wvTÉvœ”Lű¯Z˜…C)(º�@*}0¤:¦Fš¢(š¤òÊ®K:¢9%™
‘
T`T–Ž‘`«5è¬ÿ©†´º
z`S_à•"'\X
ÇR¼GŒX˜iŒ^€ŽÐhdÁ¥I	hx©n›©­ÿ'×H—_-•‡%LJ�zá^¼˜²~˜
h�S hØÀ‡x8g‘
X0iÂI�Ô€­É‡U ‡ž¶Ÿ)—«¡ëÕ²1e»Å“¹™¬I
>¡‘¹©Ú�
Cª§Sö‚иŸ4{j¨º®Û¤î¯+±+nÝ�„ý@ÂV ;:£0ê¢2…í1£"µÎ!¼
”;°Ð;'\Øá@	l °S€t
¶½K%^“Ë
‘�r¡Šñ¸q�`¹v(�R È÷{€«F
¾ûøIŽ‡´öØ©³z�¸7¢jˆ�f¿�Pz’Æ‘%±
+5‹�à•ÍˆÒgzëupú©péeþ¹pÿ\
�%Ýp¯Åh½†ˆ¦m؆·Ê‘Ž‘yJl‘ÑÔ¥áY¿
þ…	âÈ+¸B°D©Õñ�!ÅP½AúßštïöwH•u»ð•Öÿe½ÖhMmj-†o�Öë\b0JW Qà_Ràf0ØÕŽ û‚ãåsp¹™·™«·ÆŸ4
·b‡}f\w=̯…t³µ™“VSÉù`p ¤rä¥`PoÑJz	€V¹Š»epäUÖ45ÌÃL^cà�ô|ª¨Š›9`
qÐ|`ÎEmç•Õä=…é—…TÇÊ�áŒ5‹“UéI_¤žé8¶h� ÏPÖ|whrné²¾TyÞ÷ t:Ç9¨aÁ °ÿÝ!°Y�øJV>)vÄËÉ›±²Ñìž�În4ÑN&5ÊìÐíÏ>b8J½’`	O *%ܪøõ�Ûæ~îèžîê¾îìÞîîþîðïò®ŠõmÙkLïå®îÕ•ïã.Ûã5^õ
—¹]Ø£´[z¹\/ˆ´	ŸîõÎÑm]Ö•Þ凹]îˆ�î³U]ª˜ÞãeݲmðU Ûè¾\ä]ñçžïñÁ¹ïŸòã¾òý.ò´ÅÞoîÏîOïç.Þ¯[³}ï³}î�Ûˆ}ó¹½Ý5¿Æþ>^‘ý齊è^[«8ôå­ó&��å>̺ÜŸõâ½qáÉšU ›ôZµÕò�ÞÿO?òA?îœõ9?ït_÷v÷xŸ÷ª˜fpUöл¡ƒÁ€¤þAWìQ£ü!R�¾“›Â¢Uã×�ø<鯔Ï`–ß„š
Õ‘à`j@
ó`ë>Q`\wú–úª¿ú¬ßú®ÿú°û²?û´_û¯ú¼‹ú¦ÏušÅ5Áû¨�û¸¯Ô®Ï»ú€ú¾úÉÏ»©Ïü¦ßû¬Ÿ„\§ÔÁ/ý»ÏûÍ/ýIHü¿oü­ÿáÉßûºßúÎ�û©OýÂOüJ¨úÃ/þ¹Ÿýæßûèïûšeëö¿ûîüµ?ÿÂ_þñÿ
fÍùàÝÐxùZ¶ìןhÛºýFýwâ`Ù™©›ö§ÛúiÊ”
g^¸>�‘÷YÆLÚàsÔ§
gGø|ü�§›‹¾ûšº}ÙÿžûÆç´
Ä¡Z3Ð@CtñO%ƒ„sJQ•TuÐVC]ÔTA=4ÍQ}êÕEì°K« ìدT´“ÿÊ:¹BUF“}ÖÙK•�¶Ù7«¥VZk—…VÚk§�öÛm±
—YT-�Ô´MtØ!Ÿ¤ÔO¶¦t7]"Ùµ7_}÷¥
M{yå7`�&¸`¨Ð58á~‡xÝ|é…×^>†X^…/VøÑŠ1NxcŽ˜ã�UÔŠ��
åK~÷d–ŸtùÝQe6ä‘CkÆu}\UF_E±­PÝÕÙÞ }F³h©pìÓ]¦…‹Æ¦—–Zª£“ª±««Û
ÙQž9;l�Uƙԛ{¦ѳe–ÔÈ�§…”ÐxÝÜÙÉ2ÓtR°¢–;`�qvdx<î»ÑøUÏ&;I&™Ô»«Æë½ûÿщI¥¼^Ë3ߪrÏ17²çÍCŸãCa,ºhˆ“ÙZ騲~õ«\ͳñ-;åw÷9]Q/G\p²‡¯¹åâa>žxã—GžyÃ�Ï=­Èù^UÎ}Ÿ™ëì¿þaÜÓ.}¨µ«[w�Ùú™rE“*ôÐÉ~yE»ƒŸ[ù›×�Ø}õqÍÞG•Så_ñ
!è¼�M�_�ëܪޖ7ú1lDãÛÄæ¸Å,zùâá‡pX±	¶�„{ÚØ1„½ë„¬zß×bH@NÑqûÿÝÌ §£
nÑŠ\Dàüt¸®
ÍŠR»YŸðõÀMT²Cß�\'»ÉÁ‘�'š]+G3Qsô‚˜òš7HA2y‡dž!Á÷9ú±+‰6ßµWÃtEîp•ËÊøDTF}‘w
Ó ÝHì‘®nÿ¢ɺ7HXQÒ�ôèzæ?P
ðŠD -iIÅå鲊¼lð$é@Y^ÏEs%Iy/ð¡®”À½ŽyÄ"-²š!ƒ�þÒFÄU¾èDßD‘À)ÎpÍœã<g9ѹNu¶“œ„DÕ•Éé.‚ðË"[ÐD1.RŒ.Ôf%ÑG8ñÙðž†3›Ñ®BÐ}Iñ�þl`,ÿUiÏ—‰¨}翸Ñ|ò²‹XÔhHAŠÅèÅr™Bë$>fK�­…v`¼×Ó8Ç¢ÙYltì#?5žö4æðiPy
Tž¢ƒ¨@EêPƒj¦ö”©L%ÆS£
U©V•ªW%FT§JU­R5S«9ÂJŒ¯jÕ¬_EkTËjŽ²¦•¬Y-ë[ÛšU¶ÂU®o%+0Ò
¼Æõ­É°+`¿š¾VC†=l2»Xb$Ö±�}lQ ;YÇC²”ÕÐe1»YÎvÖ³ŸmhE‹Ù®LÖP‰5eL‡’¢®EÇRŸ:ÔÖú´©µ=ªR¯b©SåíOÅZU­
w¬¿å*qÅjÿVµ6÷«Ã}ëpÓ
ؾÞ5­×½«]±;]²
V¯ŠïtÅ«¡Á’×¼à=/z§;Zö^¥½‡-meA«Ù÷Ö×¾÷Åo~K

ž´ðà!˜aÜ~ð‚#L¯;Á6Câ]y›!f8C ÊЇ>â$xò@´8Æ86ÄŠcœˆƒÏØÈq"
qCìØÇŠ¨ø‘“¼d%#Ùãwr3�åf0ÂB¶2#T.æSäÁy8EÌÁ|æ4ƒyÌΰ9Î�1ç9¿yÿ§xžƒ>ô;ûÙèþsž
èAzÓ(ô¢{Ñ‹a$ºê¿è…£1Ý‹LwÝëËÍjVƒ1k¢|•Ö«6»[çU\kwÖsµµ9p
wV¿ÕØ©¾{Zï~vZûí¶ÛÓ.øìºÖkÍ{ªCíëÃËU±Ï=5`5ý

°£
¤Å¬û…]
ÀÏã<×낃ô<Ôã‚/H-ÈÛ;ÈÖSH„4HÛ›=0؃1àƒ/0¾=8¾FpÃ7lC=�ÍŒœCéA84
¡¨Æ	Â…´¸IU¥hU¤XÕ´xÕX�ŠW-ZE
[½Õ ÁÕ\•Õ©èU`EZ
ÖWÝšbÀaHÖ¤¸eH†
ZÕÕpJÚ§õÕ¦
£%'©¥
¬EÖ¢�‘V�U[]UuÇ XËNY`
¨å
hèãÈ&ØæZ–€X„Ý„CÊ}„?
@)ž¦…{€èÄkÐD#0
œ~'•ÞéoîD®&™f§w:îÁdi?¾_á~î—nômd .n›FД’žŽiEæîN”«à�=N

~
ðñ9C€nñ\hOôÄA=mócÖY)wm÷dÅè�í‹ÆÞ¯¼m`Ø…®KËÜз´¶[}s€Áw}Á!$Á‘!âw™A™C%7'xG.d2ïã­
%Vm“�Õ
P„!X„9\a=C
«¬/ŒÅ6rܘ¬ØÇ� GŠy¬$È“$W&S‰²åK’.SƬÉò¦M˜Å–mä‰Ò'Hc1�~dér¦ÎœFmvÙ1Y:
€@–,f
xéR…
AˆÀä
H�{(\`ÁÅ
Qp—!	p.ðÁî¨À9XA`
ãºãÖ˜ÿ0t¡æbÖÅ/3$†Uh„àPÇ$`?hD ”°Ï$Z
ÏûRÀÂÊ(@!
ClfÛÚv…¶
UðmËLf³†¥Ö�«˜Ñ:«Þ@ȹBëAB–‰jxÃdP…›[؆0¶°\{Ø0È(°{؃c¿ðXtF�݃»J!]6`ŠQÀL·»€¡ÿ�wzà�aæY=} �^6ˆ?8âˆðƒ#JVšA<b&s„�§?܉¾$ˆûhÜ!’¯™Ók`]ؤ´ºÐ nuSúèDGhÒ±ÎÑî*î¤Ò•þ{ê4x*U�cªî•ê0z
ŽWÕ˜[u`Xó+ 
iKYÏœÜê*8BHnþð3X¡
òrª¼àqÕª6U­ª ·¤�U¢Alû™ ~{EÌf«XNA¦²Öªà
ƒƒ[ÿ;!G/˜ÀÍôȃþÛKëm†6¤¡
½å

JP>gi§XÅå—v)LI¼óD]ZçWqÑc|ã³Å,ã£úªfu®wý
µfÀÖ·¾"bÛîó³	†5@$áFH�é·Z8X’¶&Ï�2sá?ÚYÇÜyƒÿm.àiQºú¿š¡�|•
@"6´a¢µ•W�û¾
F:¾oŒ“$ƒ<Ù�
ybŒõ'ýè¯ôIò3A‘ÌÕÈÜ,ÃÚŒÕÚ0]DEh.¨M
^�©­Ä£
ˆ€\ö
ˆÌ)ˆÚ`Ë1L„
à>"1@"	ú
	~ŸH #R!&ª�#náf ´l‹iK~ )âG"õ
_Í%ÈÌ­„a‰Èb„Àâ¥	Ë&©¡Ð‚@˜+ÚÕÏUÚEüʦŸ·N¥‘aàÔ VÄ©-`1P ˆp„©0´ß¨á‚
…�rĶß‸_$nK†´Äû1Ë�”c�h.È4zÄ©Õ}D0Àˆ˜È-TàN?váFhá
V˜A
âP	%ƒ2àbðÈ1àBuÄÎ�\äH,Cƒ2(G$
bàÔaXñ¨
�ÚÿÀ
Pa†Ú/’Ð	¹UQpš±¢M*S.HC]µ$!9,!°äÐ0|ÄÃ	Ã-$%Hî—‚Ã]%#ˆ‹1âÃüÑ£nK2<ᯬZ%ý¹ŸT6ÅÚ$Ã-t!/pªár„mað9åFPà¨Ñ%G¨aBžåj!²X%F’H
Ë�X$­ß1¦_f‚¨á-d[>$‡$ _zÄ„¨"(:$4Eš/ÚUÎM/K	1SÏ	ŸóÍb°<ÒÁ¤µÜâ±Ü•Hü�øíUUZ-c4–6J戜å~I&[ý¡®TåfÈU‚$fÞà_rP:Ë>…
]$º£¯ÿèâ®ÍYÎãFüa¯ø^´ofgJ¦t–Èt¢â¯¬�¯¤§²ÐeB6¨•¦-Å
íœR$‡ðŸiÊÄ
µ�§!ÅLœd±ègˆœ£§)§!Ú¢}‚ÄyKBX2üä©1ü
À~¤_†ŒH¢dzà0!%…�ˆÕáˆ#ŠãLŠã¨'ѽ±Ý¢I„ïÑáAäD’ÚUbçî(
B#à$âæ‰çFè¥3:c	b£	"ˆ¢…ä\‚ä'.‹dö"Y9éƒB`óAKL_ƒnDCÒ'�>üáhJ-‰„yfW>“±\˜.‹GÌP<¦߀ rîdk6HBÿ¦!3l/0Cƒ0ÃF0ƒ.‹
]¥
Éå„ö\GÞ&ƒ¢D_îIŒ�bZäq/ì$3牤¦­
�Hý3òœš&HþbÎÙ¢Kž$Â*|B“ò�dQ¬ê“}Îê®bЮâêM²bšnÒfO| D¸#J_„yK�2
ä€Ô‚0N2ð‚¥µ•%Å„â'„:\_œbaƒÌŸG2-Ø^.æf®æv­-ÐhÓÖB§Þk°¶"¬æœEÞœÑþ,éΪ.fZ¥µ©‚Të@6ë�"‘¡êÂVvDG/¬¬¡²C1Ђ
í¼Îì²r¤-p
púÒ/	p
41ý"pÓz⃄2Üq¡Û6ÅEŸ2¨-
;T4†ô.ÿ°CDÌò1(Ã- at tóB>.C.-ðJF$3i$/°ƒ:ð‚ܪ°
wä4ǧ�Z�ïGLX&�š1à(¯³S71T?µTG5U³ó*O5VSõSCµUsu;§¯WkõU�5XKuV;5Z‡²Z—5;¯³Xgõ[Ÿ5Y¯µXkµY�uU»uWGµúÖ5Y»²'–­¬òÍ„ªß�V�5“š.@+¨Ã&çB·”Ÿ:$sZ‚OèU.¬0xË2Lð2è‚
�ðNHïCE:ä0¨Cz’úuŸ,ï‚O|63”ú2 neE0Ãgª
-°ß&mÓÿšó[G7\c5Z÷µ[_wUsõVOµ_w5vÏõwkw;×5uóõWÓo
Às‹è²®šÒä-Šîá¦æņšðµ
-Òn at wD>Ê%æ£
@ƒ9ÄøzRb1x0°CTT´.|89ð9DÅ:ä‚�‡ƒ5fE:Ü81hø¡EÅBä�û¹Þ,'“Æb¦	5-�€‘‹r•K¹’¯ºþy
q
t®`g)À’éñ]1³dƒ=Ÿ³´7¦Mî¯è)1µàÕ	�åG
NÑYh;nJ«œïÞJDæ‚0
ûS<ð˜Ë¥¥
À£_à¸ôÄ_DVÆ928¹ƒ;
C¸×~¤g:ŠoåÕë
lè.`ê†ò",¬ÃŒÿ>|x¬!Ã�~Z™PàŠ'P €,92åÉ–+C¾¬93eÿÉ“9c=ZtdОOŸFmš5æÖžW»~<û±é-NàB&¬âá‹�%<ü¢`„…�'GXÜ÷Å‘�+þ›9Éê%¯“$.�7“Ý,¨Qvƒ
HÀ�,fq~[Ôâ	JÀÅ0r
Í#óÆL‘Š
ÀÅG®3z!k8T⻘SÀx�qðÒÈGHÀæxÇ��CtÔŸ5¤rã3x¸ÿccGRF-Š†9†4DBI9HàC¼ŒèH–å1ƺœZ+aÔBxDš&oB¼aò‹yYÅ‚q‹Q±Ka‰cçY“xÖ„˜²!°KZ0j1LSN¤%Qó�®Ž¥²¼>$¯wÿ­_'ò×¾
v"AÑUõjרÑ5‡t­Ó~øZW¼F¶N�	aðjWÁf6²�m‰g3‹ÙÍŽ6¯¤Ž_XΦ¶%9dmÒÄbuP*Ä ÊñS¯d�=ËɨFXI•}É!¼A&ÀŒ
âc§‹P›zþ!´8i�ë–Î ›jLIb«Z±k%Æ8çÃ’g0õÐô‚.Ü -ÌK<ù2£ùsçáöGœâ†Ò/N¤;lAYÍîõ³f-j+Y·´�­�iùºÙ
Ÿ6´–Ul„ûº`‘ðË-˨TÒDTž¥Æº—H“øûþè¾xBq
Û‚ò¡�.Í)!S£"*!I-Mɤc
ÂÒÆã¾<DÓrI!’•4¢0¢ƒ#4¥¸Ô� (P	Êó,ê3ÒáA?Ó#±?è©bÊWTÑ&
·Ro»¼€K�c#fó·Ô'´bPbV[„d^Cé…”p¶H‹c]¨€b¥“Ê
h�äåXdâL­1
sSÒc'$‚+0¢Ê«ÒÁTf1ê&ºTVž&'ðO*y‰Vå·†Žë(Îãi%<d±KkD¢ÇÄ"˜p at N&1�\›â($Å#Åb6b')„&>¢­pb,–A*†ˆ+³SÿN¦cFvTva%‰Å5ïä¸�Ýò,ÉøŒ–.ï�ãGGÓ¤R™Ïì"H!¥ìúdîa«ƒ_ZŒ¤4Qj@ªL
ÂûFV2on€jò"ÒnË>mz”ìøEN:¥¢£7¸8þâ‘_³ák…p�8àý�MHy¢Lù\L¹”Qy•ó²•Gya™•e¹•YÙk¹_ù–Ky—S¹—sÙ•åç•y™—o¹˜�y–…9˜•Ù˜§h¢Òpáƪbú0,¢Ç!uö!̳•¹qêÊ8
LíúÅh½Œœñåje‘Ñï³0Ж9Ж‘)"ÿ£Èˉ F Z òÒ–�ù—Q™ÿ˜gã—
š–ÒŸz™ÿÙ—�— :—Cyp$š”«¨l¡G.Y\®¤³/¯×^N“asÆ,qYô%v"³`ExqIѪ$È6žH¤gÌ£ô+h=xÿšoÝåŽ_Ó~‹%vR�À=à�©•Z©»t©‘º©Ÿ:
?¢xîÄ#b")”¡.(òkgà_Z¿Ã<¿Ž$¢÷IÊÍIÿIÆøxŸ¶å‰9°x­Vc/göоì_¾89°÷‰×÷Yøcø�W~,z!ˆµÝg"lÕ˜æ�WýæžÜ]‹a˜!`KaF
\¸Šyü2dÈdÇ>–ôh,™Ç“!O¦Y,™±�/Eª„)ó&L˜,YîÙäK•Ê<Þò˜,€dé
m¤Ù�>øâO$%ˆ”c1“’16æ"t9î¤L0ǨÄX„\1ÀÿfB‰L;|¡GV2ÄÌ%¥0Ä“Þ.íðâ0À€À.êx™NSÌìâT|è
£^zä(L1

9�
È£dÊX#J:ù×çƒ@­4 aÅÜrRg÷ak%î6¢‰Nähn•z˜[¦!nˆ!†�6Ú›†ªI
›‰	T‚-ÈÉ%Va6Í@�Åt’¡:õTbÉìÇc|KIù•0Êð"À^p¦Çž/Ĩãœ0ép),xK£_ƒ–DË1ÊcL„‡ýTÝž�ýwƒáòô 4˜’µ0[‡šZ:ꦡ~H£¦fŠÛˆ�Ê–D)�€NбDÙº<þ¹.d7æ(KæéÿÅ;Õ$«fšÙT®íRS{íU,zhNi¥0xy©Ô:äY‰Ö.Sþ‚^zðL)%0ìÂ%9S)#ß¹0E–àMåÒ¨cÅŒMü0M+m6!œ~ú)¾º�Zª½ñ‚˜¡Õórz!½Y׋µ¿÷vmöÕ
|\r
"Æ`2äüº.RY)‰Tem%
K#a´«XYÑ‹ÑÁU`XÂ+
¡;èSÆ.²—ŒXÀCeºX†2¶Œ°–Þœ•(I™Uæé&¢4=òMrò�¡»cñ¾¸¼Š¹0˜³2ã×,H*Ns£bsÍ5=Zhì"�C‘'H	ÅèE~ZKOºP_þH-´œ€é”�´]‡²ßùþR‹e)-ÖQf%uø-ˈOã³ül%)CâÖ2ÿœ˜E‡á(—¥ÌKô?•-]ëRÒ„Và™´ž@­l]«[Û
×·Ê5®t�«]ëŠ×»ê5¯|Ý«_û
Ø¿
6°' A
JÐ\q±£#ÝŽª´˜¨�¢Áˆ
/A"„ñ”D¨g…8Z<¥ˆÇ@T2¢ªŠ©[ɬ-GÆ­ÞÒ¡x„hCkùÄsn†#,À+	»×ßv¸À%®qíºVÃ
7h
‹h[7†m1D#dJÇ([¡`Ñh·�n –ô1!Õt§�áXNC²Äp+ŸÆ°bNRb±æAQ‚�¬„j©.àu7P_íÜu£SŠsrÁ`FP+‰àdTv§m0ƒ|ÿÚK8ÂfpR&,Ô
SX¨îð†1áxÄæ°†KŒa
_Äv0‹QLâ‹Å–Oƒ/|cÇøÄ%N0‚u>^‰±2:dô+Yôœ3o6!’`ŽÑE"]øˆì°¢JÒT
R+Àý†Y¬zôïñÔµ£ÿÌ„bˆ"p0ØáÄçXÆ-†q�âëyÇ=Þ3�ùìaÛÂÚz´§=eÀ2)Ø5$söÖÚú’„¢Ûe­ë9²ÃË‚R¬yÉé<ɧ½ëEÉ8CR¿%Ñb‡ÚÏæ6ç ÜZ&¿¶Õ´D'“K¢9ºëR†:ŒQ´÷­R[A±�½ÖbÿÙií8;ÙÔ6vµ‹íh3;ÚÓ–öµ¿mípo›­ÂͶ·Å
nlõÜçf÷±Y@xûÙoew·…»‚Þ’`Î¥or
ˆ“Ê>V¡#™ì³+f'GdFQè»­Zô%@Ì8JGJÇ9VóI×�—ÅÛEù¾?ñ5°…m\{–Ù,O·ËÑ
ó–Ÿ[æÊ~9³ÑjØ� )à7ZAˆ›âV�︀ÔEkí>F× /Ó¡Ò^	Ñ×¼ÓCäe}
¸{Nì#HTÝ2>Á�©@·È\+Ø�ÔñZiùä�º¨PÔ==»B'§ÇHRh(PQÀRð÷¿÷=ÿ`~¿à�xÄð†W¼EÿøÅK>ò‰wüáøÂ3¾ò“_<ä7_ùÐÞð*ê»ßÍô£ÿ{êUDzʧžõ“7}æA¯yϯM -P•¿§*£¦<2Öè’ÎóîD± éÊ@‘²R”±–WE¢À$hÓ™‚CzxÕIºÿ…iµ»¨&DJŒ'ÔÛ�¸>𥷽æßÿøÁûó‰o¼èïoÿÕß¿þú½îùïx�'€+§æP¶Â]d†O§qØ…EL7w…ô}1ñt–%[QÑ Ç X1�SU§`kv+pbCÏÑ 
rP
²Ähr’OA+¤T++¸k—?B×t½ÿ4[Î71zw@4A™‚"²;²Ç;Aøƒ…‘w„K(MLh!stQÿ‚@
¡C&ƒ
‚R¡Ó…ÎHƒ
*HJ¤W*¥ºOI¥Sê¥Yº¤†§~1Uê©'ž}èi¨“®øæ!šq�é
l
2+ÂÀ&J¥é±Cr¡,J2Ù“$Û"ÕÂêÀD»Â¦Â ££¨‡:•.^Ì(!ÇP‡KBŸNú¥WÊL�š¤�)›LZ5”š I…¤Ú¤ŸI¥PY,¢$¶¡Š¹˜MS…T¡J¡x˜ìr:Cñ«ˆSJbZnúì`•Ô‹é±-È—N�%'Cв9ZK%N7±paæ*W~,ÿu_£fÍW'¼z1
¨}‚â£�YQž…jã)!âLʯ°óFW)´)•¥‰ÓÔ¯új¦¢QTˆ"Ávè£Á9•£x7üq5å9N!ë32l"éñ–œåé€=>'ÑÃìpÁÀDÕâ–0()ð•}ä·i=ÉpüU7$ä£Ù7Kš8!¸@‰dóFÎD´Møºˆ¥š”#¥3«ÚE�Áóž‘1µJçU Š_e�qS¥¡çE=¼¤`
ª±ë¹¦K)`š¤™Ëª°k»§»�‹¥¡»ê×6Þô…2"�fš_IQ»b€J¡¢#³‡†&ÅD@é@Þ!»€¬ù>ë€{¡¢u
JÕ¶{¡D¤´òQ yb¬Æð³nÚ^ðÕB2A'_i´j#5QY*‘-8l’ªŸë»Dú»P»ªœËÀ¥µ¤+yŸÊ
+Á¬«ª
Œº´¼C¨š…u
I³µ«Ù—?Y©‰ú]€ëtYÉtûãž�!+¬Å�cÿë›	ƒP‰ƒu
Æ ƨo&Ü‘$+Ì··@È
<âG®#¶HÒHQ¿›v�éUǸ­¶O&<
]ÂÒ¡ýÿU[é}h¸iˆ-ÅHkš‰…‚Ö Aßö­àCNàM·fAKäIn߶Àà¾âêqÌ}ƒJiÂìµ’ö€	ÈZ&JÃèÕDw`Ao¦¶1±€áðp�P†DÁЖ&¡GEqÂÂ-ÛbçÍx(©‚]vy"ŒŸ°lšÙÅpf‹%qD=ˆ»-\Ö-ŽÊª´èˆÂ÷Þ
šÞ0‘ZÁ€î:ŽL	0 Þ”¢Nê¥NêFɈ_É!ÄX‘}4˜Ì–ê>OѼžÛ£JHtDÝ"ŠŠVé›Sy7ËÆpOEì/nžMw"±^�å’ûôÑ.J…Ay
âI8Ntúÿ‘‰D“Θο+Ä“g%ꨔOûA <‚‘Œ÷sD"zGÀJyî¦Îx¹A0Ë¡˜–éXþ}L³Ü»Ù
�/%_éaÏ:ÕâFÄ±½ä«‘ñ¡Rd?
 ø
≓†2Ê�#¿‡ÒÄe÷‚S Î*·œ²Gô
g[2nq¹.é&‹«¬äÊ“0eê쪵:Ò¤(Nh§™blنŽ�]¬£n„Ê
L$»*F¯`,I
Ò5bÖQ•u ä…�&�„q¶å–Æ—"w“¶_‰Ê+/3˜R—`xtQϤ”ŠC@ᮿþÐ
—Aų'´ãÿŽ»ï
•-b€5€i“
n")‘H±%
S‰]à"?»à[8¬Ë˜p5G†Ø挓
„’€]ìQnT`«ŒtR!$}ìÐE:´¦²Þ°¥7èL7u
›'¥!ŽAÒ‡ ¤Z¨ÍVCœL.ÞÂa$MÌ …CŠ
ź„„(Ù–	Ób?èàÂ%he+³ÃAËY�qRù
	Æò©àˆE°‚Š€d—ÄhéiršN£ô´(Š¦t‚³$J·…ÿø¡Ð?3¥iÿ§5ˆ83L“Ma(C‚ìS5”ÐNIrż…9Â@ª�¦3`(ƒ«Qà1–Q!·(ã0Áh˜Ñ>Z0#7;S‡.ò{H
pL0 ¤›�¨j“�&¯ÚA™ó�¨lªyK‘¬e­—q33ZÍ’FÔ‘­��¡H6¶0ÿ T‘edCæ•Z®2*•å¬e=«Y¯8´uŠefi	Ëýé„ÌluøÀÔî„såËKŠÃ!ÒPˆK[¸¨,.
@Ù¢›ˆ(¯¸Þ³‹Å´FÙ
I¶g1Þ¢%.™GJtŒ¹Š
¥�b©I»c\œÅA
\dÄs²�ë'éR—ß^˹ÙÂ)!®ÉPÑè4¿ƒ¬�ð;̺¼”-2–áƼE¿Š-Õ#YIV—1ÑBÊAˆ.>²•Ü2C¼ª–V2D¢©ŒŸ¿ùç-25ÄOiµhç›Ò`Ä–dðÓÉë,"G0¤Ž¨,$Á(�÷àŒ|z¯º[ú�:Nï©™€
½mNKBÊøO¡½¬À%èÁu¥:¤uTR"É(¡�q¡Üäá0{Ú¡ÌчªÉwl{·‡…Æ—ÿ(N]¨É Ë\UÇÞ†yÆ©¤!2ëøQÑÂfZ¤&|^ÏÆ‚£!sä1¤Ñ’Bˆ¶­Î¨*㌓ᜎ솊ÅÐR-èWB>s*¨ÐjýphúLÓ©M\‡@[žûíR‡î€
qˆŒ°ª®œXÀ�,Ý—…œÀg'I’ÚÂù�ix1ƒÓ4¨Ř@i1㘺Åø!dCô²Ý�˜×^8ǸÍíÛ궱þÍO¦ö	šŸÆ�Ú‰ùErûRKm»Ï¢uoÙdj*Œ}OðJ@ ·À¢'(ÁºSPt™¬À;FOúÒ›žôuG]éO—:Ó«u¬_]ëTŸÿºÔ�~u§‡=ëc·:Ù±~tï� í@Wzч¾\]è+àÀÜ-jÑüîv·;ÜÛ~÷½ß�ï‚<áÕNw #.íö”͇,�ð·YóbFyl
ñL/ÆéÂáTyÌ»°Ýgú<
?¯Ÿ†q‹ Ê�ñ~Eg–Æ>ÌíSÐx
‰8Š“D	
”°<Õ8Ž
ñ�l€ìëÍ(
ȾàôMâ,Nã<NäLNå\NælNç|ÎÞ,�ì“Ná|�x
vØØNîäN}ØÎïÄNð„ð0ŽèË�i¡š7r-*8ù1Ǥ!Òy¡`:d=09š¦•P�ÎSDýLQ鈮ÅBÊó,	,ÃL6™Hm)GÿÛD™J	Ï4‰öQ.	
	f`Ÿ0$2µ¶bh„„Ÿ~
¤*�•�…رAH飌«Kñ„xhf†vˆ•¯ZÈBÒ1„½©“
"û�4UmUWmœÄ!
íà
w•¢~Âß`3L™N]6ÜÑ�O¡…SÁ�eȳ$ØØ©oIZØ•r=…á…´I@а•
ÙÕŠó0Äq]["
xàÕ]^rðUXðÕoð‡IÖð8ؼ¹›HJÁ¿ÒÔ-ȃJŠû­´ ÌbªV^ɧÊ8+I|U/Ž¢‡¹»å(ß¡šâ"ßdØŠ�—�Z×â¨,å5õ¸[ñš(bFÊ°§�R²ß€Ž:€V0ŒÙà(݈Ë­\ÿŽB*Ü`x·
H`éÉ#XQ\´…‡X`#Ž*ö¨`½	@�€
Ú �©‡à?„ò¥¢²Ì¸@‹rÕ„à!„ÈÁÈî9=ÊVË#`ZƒA^ˆ#Èhˆn]	 Ò*¼ #
..s¸ãñE¹ˆ	7þ`ˆ(
^˜éñ
(Ñ"¤9`Ð…up‡(écÊð…}¨ŒYŒXˆ°ø]¢äq
ðJ‘™‰ˆÅ˜�R€\h�¯¢>Õ…�ÿ‘½Ýÿy]JUÜ­a^1UåÝ—1dÖ]ÛU­dÖŽ€‡o¸ÙØá|8ÞàarÈSâð𱉃گ¤Ú/nGZ‹ÇkÚE4JëÇÖÉ…Y›áIƒˆ°i±•ÇP‘Û©êÒ¢óÙ…
W)Ò±–°&
€;Û­
_¶]`fæd®áÝ­ÝU�-Þæ_^fU’´c h.^rø€
X
í€fšý†¸€§�ø
n…ÞXÎ`–ÊìËþTôH 8™@ŒQžä²•í9÷
Ê�¹¤>·
h€«ðme á^­`æeÿØJî;)nã^îáÆurû“&^W

WèU_͇ ö”KtD-Åò¦Þ¶6Ò¶p+�É3ãš#‘`КV
µ!5EôDÚêå˜..küÑS„1‹qâ'wV€D¡³ˆR2žR�¤¡ÿØ
¡ˆÐ%
`3Â[&âŒb ß3Š&A‘¾`0Ê0ŒV¹…
 aô’Ä�Œ·ÚðÀ …Ä #
HŸ4ÉÊ€¢˜×ÂbîYof_wnåîõØ V%fVÝl&^eŸŸxï¶öžMô†zågþº°ž®ëû”>¶ø˜
&X�’oŽ,IÍ(l‘$¦:‹Ó苆·O‰X-Ù¨ð×€Ð5€—°‚ÂŽÝ:&L0
´ÿ
FÍ$”L(á	2XaQ>há„F˜!ƒJ¢†zøa…$‚˜!„(vH¢P)p
C
¥Ó
,�0“
$ÿ”°ÀP¢ !Q2í3£;L9LSNÁ2Õ&À€å—bf-iV`?昶s¤WBFV¹rÖ˜ºha{—»ÞÂKÙµÞ&‰—ºu½«VXÁôe f
)„mÑÖV¶"AÆœËHQºK­U9Žå„ü‘CØÉÈ«–ñKf6“@ÆD-bjz¡ª$Œ`,D?¬›èD²ÿ@��ðrNb2%‰È€;èDvƒ/ê@;#w€ƒ-–q9È�ÛÈF6’q�nT£ë8Æ7Ò�q„£'ʈÇ7Ö�ylãáxÇ.þñ��c÷8ÇôÑ�cãĈOäÀ¡¨Ä%2ÑÉK\‚ ô¤(IAŠ#TbÄÍÔJ¢]¤£SÌÀ…¹ì–[²«‰g‰K`8—ZFÐ�RZ`1È£±bø®QwêÊV!ƒh¼aG-ª„™c$æ"&üÖXJXC¼DQŠ•ÓÜÁu˜,
²JÒ¤#”�h,5ƒ™žNÉ¢ÅXåE­2¿�£G®âW7wêÂ�ùì7!µ0£�N†<=b-‚A´˜Z«g<˜ÅBžÑE- at S�Oth!DQ¬š‰)']ÙEËÍë‰áŒW\p¨—©¥$°‚,akØÃ"6±Š],cëØÇ>6"*™Î^—8×\~sI}	Æf:¯ÏqG/ºñ*Wr·šéF;#˯"M¬ŒŒPlÏ.ÁÒÂ6°®uÝ+9Ë©°‘#�ÿ.q‹kÜãV
HcLPß1W”°ÕÔþ
F+¿Í¡_PR›Ë¢Ð/‰âŽW$ó3aÜBµª%;nÄCkõ…ŸÕ¤tg§CùŒ@Å4«Â¤Û&澕Ýo
{«/ƒ	÷f�<À
0¸Á1ÿƒ�aëäÁÎó ù¼<ãYÉ1£íá3¸*Ö�gLãK·¸ÅøÈD'b¹©	·
%^�® íè	�úѧÞÉ‚	=ƒu`ºÅ.¦1¥)ýbLlâ¦Ê@F£0'`’†÷‡Å\—V
ê•
Ht¬
+Ýê^7»ÛíîwÃ;Þòž7½ë½nÑ„(ÃÂ_¹�’ï¡ì¤5îÈ9òáŽe1¥)ߘŠ
åfyQ0[˜­™›$ +yJO*r0�‘¥Øœu
p@¹©›
 

, at Rìà/20*ÅÂM%ÄÒU\‘­ûøDÙP!|àÕT$ÞY�û„
À�N¾M¶@�ÚL°
.ŸF"fb*æbRÝðÙ`…0d
”@•-Ë7€À|
LËDÔ¨h
§À/È%0„DZæÔf´˵Â*ù†òeéYâÐ1&ÉhR`Fì†(drÀ
TYÂqff¶aŽôhÍ¡E`ê‘eZ ã>FI	
Ì_Ä!o%Šu©9�ÿUl~E“ˆIÆ
™¨¨uÊ™x”2\©±
ˆhÀ§²¥Ã.°G
HÿaÜ$æ"1|ÒÄá¬!k/ŽÃ>TBUÌ3’oÔ½ì×ì$¯¤
£ÆuäÉ�PSΦ0 ÄZ
45âEÿõUа±�í…QÐäÕ,
ôuV´„µŸµ
d©´Ëd;ͽÌ$›p¢Ò4;
?õ„p¾b`³hŠ²ª0eêªH­Û’kɶ¥Óî+ꌣFŠjŒ.F㮮ƣÛî¥À4Co%ñ’º*'µ–‰1–e˜rr)²Xä
0
q[sÝlVÜ_ëUQUj;5÷Ïçì¥)à�û=8&mµ´×dâP|#ní-zMuVŒ_Õøbr9.õãÇBjdÞ<æÔàwÉË×]•5mYÎÝ,NvÊ É­ÙN€™÷V»®U6à•%F¸6Hõ…ܤ…éžžUO>ùzO5e"s¨™ñ5ègcZ°¯ÿœy.´7©¿Úè´
¤Úè‡/b[ܨId:¦²‰¾[Ѐ¡]îA5þøèiM®iæŠúê»ë–\Õ³ï�Aµzí«zò 'Ö­±?��ÛÕÅ«¥&z+®ürF!WôhÀ}¥5nxwN9Ø›•.š_´/'ýN¶a·˜UØ[?÷ìÞƒWõp’ºdøv³Å
4d½kÇú{'w^ðMõ%Ùóçñ>ۦƋ]¼xÅ.çx]µ[ØY´3´¸pB§ö=nÈUîÜû—?給Cn@åé&Ø|>c~D禖)Œ{í«÷J'Ä™¯~ks[²&(¹È]0f
Wõ€…µ6ljµaÞmVBšp€ÿ–SÙ`~V¨ìå
tÑà »÷–Î%f¬[ùZÁ£);,|Ýàl—Aíu¯=á³[ªŒØDÜé	ˆ4\�"©ßj‰»"™¢X;ïÅ+„‚ŸÓîd:áéj@¶2]§²H˜*‘�¹ëÞ­XGÛQ�v•Î`XBµ7ïŠ`¥§+¸±mû#1÷4½
F�œ’)G	ªð~þ‚!åô82Ùæ…©+ã	;¨Á<6’{´É	¨0ö±L€‘å,iYKZ–)–¶Ô¥,q¹K_þ˜²äK•ÀW*É™ÉTæ,s©Ëo5�„¤L¡4÷ˆÂBNs”d<cñ7æA
[¬äÿW(mè"kM–×ìߊþÔÆ;uñ�²ª]
w;—QWŸDÞ&›vÊX‘�{
fƒÀ
(hù]ëLºß÷fÈÁxÚ_1=…«ºª�OìYýˆ�0;5lr¢§ë$f1~-ÏÆÃš
#Ö��çwo)ð÷-áV²7©dzÐ[óæ¶Àtç<´H‡mQ,ØÀæÖ¹ÍunrIíXsÔ£V5aWÜ
Tç6·®îF=`�ÜUß×¹Æun¹1ëç’š×°2�
ô
îyYp®#ÛÒIEq~ÙÎ0¡ß¯æg¤U51Šû/Ÿ©4›ætE¯Ðî,7PÙ¿¢çÚÈm5@�jÀò¶³+æy¯­qsiWCçõ 
ÿ
§Šášä
dŠ¸êËôí/f'ôÜ+oæäpÐl’N�m¾Ô©&LÞvJeŒUÿä'Òâp¨0ÌžÈ0åüûGÐ��ŠÇŠú†ÍJÏpºEs*N΄%�~êÌúéôBPâ@Ï�bƹ4o­ÁëæA		
²üÏ&‚(âL<Qµ ðQ§«¸P§ë×XK‘
aÜkÜüå“ð+Þ¢ˆÍ6Ç
ç�
QOŠOøÿŠÁ¦,¬ùà�‹Ž¥¨Ðɇp'}Dn½DåÜ�Ý‚$Àðk7Ú$Txç–û¸CˆD¦äÖ‘äp#{#”øÐŽ
M?Gkç†ôpŽmâ–Jôè‘B¯ïk=5¬ßœÊ"õ
§’óÃ�“�^ÏMï‰%”�&bÚ

%L½ôl ÎÃôÐï�M?÷d-rû¥E–ªnâ&F?=߃8²KÚäàü†ZæT¬ÐôYþURq&pþ´ZôÅj¼)$)aýõ»p$TH&;-M%hÎÄF¨ÄD�
„ÁØæn4©ï�ÙîAº`
Ô�p´®�/ýŠ°újÔòÎ@P\»1ïâw5ÓÙÒ5s6±‘[q6ý×·Ž0±qëI7ì$Ê‘ÞL¢È
--- NEW FILE ---
GIF89aþ½ð
ñTø¯ɉ(+ª$˜ï¡Ç‘ Köó“¤L�3eêÌÙqàËŸ>ƒ
ÄÒ£Â|üp*Ý©ï&>£&
ÌIÕ¤Ï~MC‚|º´êή`¿ŠõJVé̳3ýíó—Ô_?úø	ôGt®I·1ûÅúÏ­_}oÕ²}û0Iº‡
ûܶpàµ�á>üwrdÅŠŸJ¦ë˜óbÈ�5+fL8.Ö¤¦S£^}ºµj׬_Çõ<[4?Ú·mãÞ­»wáÜ¿=ßn;ümq¶”�+OÎœxsãÏ‘;Ÿ�8¿ëسkßν»÷ïàËÿO¾¼ùóèÓ«_Ͼ}úxüðÕ#:_>ýûöóÏç·¿?>þÿùà€þÍW|ò‡à‚
6˜àƒBè`„NÈO<Ê|Æ£!‡¢‡"^â†&’ˆb‡¦Ø"‹%¸â‰#¾H£‹"渡ŽöÈã�;éc�õÔÃ7óàƒa‘ê3Ï<Æ3?NnèO:·¹�?[^è�:{E)¦@1Ä
œ•D 
y„`AõäÏPù
Æí[ùÜ«XÁü€VóË/Áß’;jdþ¢FX½{†qÃ&1¬ÙÇsÌ™iž60>žŒòmHµeÚS$[LrÁƵvÃmŒp[~wqd7÷ØÏ5Sæ–Ï”íWÑHߌ]?A'åtvÆMÍÚÍæÆ%õÕ”¡üßul¹'öØd—m6z+ÇÇevõÐå6‚(o)·Ûó±5÷–(×íåÜy¯ÿ|7Ý~s)xß\jhø…êwŸ‘ðá3¥—ö`ä”Kn‡ˆG® —‚È”k(øÜN)7Ÿ#n ‰{+h¤†kÃgºè$š._’'vŽøŠ"ˆ»Ü+bΡ’bhx=³›¨¡îÂï¡ñ!&/£†Ph}‡×g�ýöÚ_/f”ºã ‰ƒH"ìôS;Ã(²H#,ˆï<ªSO*Á$7?êð—J*LÂ<Òä(7¹ÊU
ÒAŸ¬åXÖ(€
�@ƒ Ä�œJCr’BW…
(tŠMš¢�Žô0Y
Ò–©mÿDrbšÐrô6xÃinvŠº�v4ua³g€Š™Q‹Òy:*ÒøXð�ˆ€ÄpÇKïñR»É§ïHÇ4P‘Šgp#nJ
«‡ÎRÄ‚`j!r¡‰©b«‚@�¬?�+È&µ¾Õ‘8Œë#{Ò¹ôåX˜rË@Ù’&¿:j"R!ÊLÞzµÄI*w툵J¨«©´I!ï€aN
¶–Öe�'

_+ÙpÍK²&\àa_‚ÚV°µ><U>zhÚpÿ]EZ‰$nùÄ…-Œ\E„+%9â–µ7)û@îs{à.ëˆ=1U¸Èúž%×5#kXÂ>“K’­ú@VDÔ”w3‚�‹zÓ+¬lf-l�Ù%õBfk§‰´N“°âlr-*ËŒÀ$˜Œi
¼D�Qâ“àÁЊ0„'¬à
7ø–0‚)¼áknXÁDÙ‡‡'Œa‘|ØÃТ‚¯ãa/; ^°8±™b	k˜ÅÙ)'2õñ¶uâ˜�?ffvR,Nì€ó:ðqqãf<âiŽØÅׄ26›,eÇ}óÅGN‹ç!/¹ÉI"J˜ÿÓå.cÓCJn±“ÃJ3·ÙÿËjfó’©Ôe-ë£ÌJb°›Í¼çk>qw¶¦”ò%Çy¨ÐˆF3”>wèCú?ˆ~t’Pôº�¢®H
¥ïm¬øàƆ*Ú8ÔaîröÉ\}öÓ¸ù¼ºtJšʬA}(øÔÀε’ž÷<[›xš>^ðz·;ãÉhD"Ú^”†Ml1•ú{Þƒ’¶M-%"ð¥ð€G<xÃ’èãú¸E¦p‹mLàæ0µ¶B—¿†·&|Q¬›ÒY£Dø°†1N±rä*U&�sÕ4”_Qi åØG+r�‹8Ä¡
qpƒêP7Ü¡wØÅ.rqƒ^䩈‹ÿ
˜\¨ac@ÃÏè*4žaŒgÄÜæ3ïj™Û1¶Ðc�
S¼À©ø‡¡�U—Qåã
È9’’f�/^ÿºAÄN‘¯Ó*ëm;DHö’]­_·IÛÉdÁ¹Ûýîb�!ÞÝnw½gî{ÏúÚ¿øÀÏ=íY'‰ÜÁnx´·ÝL„o¼ä
�øÇOþò˜Ï¼æ7ÏùÎ{þó ½èGOúÒ›þôv'H9òQŽk¸¾½pý5Z�cìCŸƒG=ÄÍ¥T£KÕà-hq‹dxƒªºWu<Ľ{„[tðp>L+*�—©Ô¤�HJ!4PA
Tp‚ÿ$¤
[...1391 lines suppressed...]
ÿF±ô
,*±J–»
–­‰Õk`ë:Ò¬nµ¯p½êWÍJÕÇæuª~
k]ÕºKÊÞU—ºÌ%
W£ùØ5žñŒT¸âÆ€«©‘
aC©¨E*ŒQ‹ZàzÕ©NE*Xë`ϺÖÆ@Å3lmëcç:×´¨5²›�ìZKÛ׶–v®§íl;[Ûܶ¶³§íëp#{Ùß®2¼}mn?»ÖÍF·´Ï�îrË;Þã®v´áíîlÇ×ÞÆÿ7´›�r§»ÛÝæ÷¸Ë
íu3›Ýùž÷¶ã�ïkC»Üúv¸¹Ñ}ñƒ|ÜðÖ8Å­íq�ÜÚ'y¾ÕýñŒ§\ã,_¹Ënñ“·åôn¸À1^¼Þ8‡9Ë5^rž×œÛÍN¸´'^¤o»Ö:¯¸Óíýí �|êçy‹¾tŸ‡¼çTy*Žn¤'=´X6ÀNí•ÛìC÷úÆïv¯Ýæ8‡6¼‘n÷°g�ì|OwÂ9¾ó±—üë)§¸Èm~m�—ÝÜ�øÖµNw‚ÏÜí”G62°¾pz7=âAwüä�óÇþñM�¶×1/íXäÚ·žµ®e}k]Çžõƨ½0ÿdOûÚÏšö­w=ïq�ûÝßzøº÷=¿u{Þ»öľ0žÿ|Ö»Bܾ®½®«QwX#øh%>ðÑ
~àÃú˜‡>¾ñŽxÄãøx‡ûûÁuücýñPÇúíïþwøcï¨?üQõ
È€"‚Õ
˜˜þðÿÐ}û€ÿÀÿ
Ÿð‰  Š›Úœš ºy¢ª¡ïi›j¢*¢ìé ë9 "
£ê¥ù¢Ê �>º£=Ê >ÊÂyšÓÙšêן"ª Š¢?¤@
¡ý¡0ê›Ú™Ÿá9¡ú¡%¤]š¡`ê ÿIzœ[ª¤±éš<€VÚ£Gª›â©¥À¹¤Öùš«Iœè™œ˜iœøI§¾‰œ`J£W¤ó™¢¯¹›Â™ž…ڣϘÉó
¥²¹¦³Y�ÿÙ¢†¥SÊ¡"¤µù¤D:£¡ªš¼‰ŸÄ£dª¡2ꢣz›œúŸ9*¨mj¤
›ý÷žÛYô@�¼é›Šj�û)¬äù§¿é§Ù)¬¿9¬g:¬™‰¨tzªx:œ´‰™ø@¬¼Ió0š¥)�y˜ø°ÏP
K³›ù°k³Úê�Þ‰¨ê˜?+~óJ³Þ	³EÛ›"ëœâ·£!«´ò
±ëœ+ªQ´ËŸQ¯A›´T+ªpê´G
µ´pʤËŸbµZ[µXËŸ^‹µj˵G±R«µVûµµ	¶g+¯ß7¯UK¶N›´hÛ´gÛ°]k¸G:µtû´‡û¶üJ¶�»·pÛ¶]+ h«·m»·b˸uÛ·‘{°2û¢8«°6ë·{{¥‚Ë·_›ºpëµ�«¹yëœßW³P«¡»±¬kµÿû´Û¹W»k»Ÿ;º2¯òÚ¶W;» «¼‘;±;k±ÇJ°Ý'»ÂÛ¼K´É;½"Ëž§‰µ2»·Ÿ«½±;³àû}zë½ÃË»òZ·¸ÞK°Å›½Žë¹ß[¸Kµ\+ 8+·9{¶M¶G;º7+»Ž	±
«·¿Ûº€¹¯
¶Ù+~‹;¿»¹ê˶ÌÛ½‹›ý°£'+�ÓÛ›»³!¬³×ۼΊÖÂ{Â!Œ¤J:©#\�§™õ®Ž	ð'™

­ÏõLÑ
ÍÏLMÕ=É…¬±N�Ó&íÏMÊqýÅX�ÑaÌÖñð‚	´AKÌòjÄ­ìÄ?
¯ñ+ïòÊþï Î /âÞŽç2ÏæK]ñ;¿î=oñðOôú>ôñ'¿ì6ŸÈïÂ"ÖÆpãÕ`
ToõU�õW¯õYÏõTŸ&X
&XõaOöHög�öi¯ökÏömïöo÷q/÷sO÷uo÷w�÷y¯÷{Ï÷}ï÷ø�/øƒOø…oø‡�ø‰¯ø‹Ïø�ïø�ù‘/ù“Oùi_õ
--- NEW FILE ---
GIF89aõ4ð


ƒm„y†{'„y7…{<–}@†|{�|‰‡
Œ”•‹
2A²²äË"^‰Q Ë›8sêÜÉsáÊ–(	žìIô#Í�¡Ô\Z´©Ó§
mJµ¸$Ô«X³jÝʵëÕ”kR!hÄI‘"(�<yråZ$mS®•4¥Z·k�Ä…›¯^¶mõ%(å$“)HŠar…‰‘ÂÁ²$¨v¯Ü·—Ùö�«9®]Ïyù¾Ì9°Û R#™ÒÄ#c-žm·ïÝË–ƒÞ~{ÐÈʳR‰­ŠÜ¿	;Ó­¬™®ÝÌ€uožKZ4èèµ›Sß÷zõîx±[ÿÿ}z^îæŃ/�^ûùº˜›oâÄ¢‘&±�ïøýe¸Þ‰öyH gêµR[¡U„jMœtÅMá„^x_Al97Úf§u_ˆ·…xœ‡$¢ˆY‰˜�8âŠ*ºøŒ/†kM¨æÕŽ<öè#O®dAC’ÕÛ‘B"I¤’F&éä’O6Ù�qñ 
j;ýŒÙ¯—n†ê©�+ÿÃi™î,Œ5·.w]f§¢rÜ´ ùz­°ÆÐò
§u²¨Õ�’Zèã.;g¨k’9kœwœ¹Ô«óÎ7
€F;“ŸôÄŽ	È‹òk
(`?7å¯NókG<þG§øq+NúëϤ0’)~
TüÔÁ�p€Zš+T<ÿð&p
K
‹ß
Eh¦ÐIë‡îPF?€Á>uØã€öà¥Î@˜}N
µ
´#êp¹x&f¨#~³:ášÚ1�N)c�ë”;V(?éïríhØ
¿ÕÇN1cc"”»t&ÎOZÐø_»ÔA€=� ì⛜ѿ.�V/S¡�ð…
Ð¥N
 ÿÂPq²æ%iI9rÌëô ;ì�ÁWMn�ìPþ…?ö¥OqbS/�¦?R‹áTÅ)Çö‰0M)á:GJ?UÀ©ÄàJýÈÄ@ÎÑLî�`õ42=àUO|Ü#Ÿ}„º½¡Žï¨AEªQ“ÊÔ¥:µ¨PêS¥U¢Rõª‘Œ}:¢=ª´f"÷¡Xź¡±zµ¬[=+Yתֶšu&)+WYR„¡yC…š(—¸2má4`f2•™dê'D
vg©:l'hl
‘»¢ä%ÿ'¹ÊW>ò–§œå%_ÅÊQÎr•§üå7·ùÌM¾sžëÜ2ºÈe^󖧂ä®H+Rñ	¥+}ä¬h¹Ô§Nõª«"êV—úÉ«õ£SýåP·:Ö³Nö¬�}ì"G{ر¾õ´£âæ/W»ÚËîò´“�æ'o»*>!òTøÝëV?ºÜ¥>wª~î`·{Ëoø°+þêt�üà#ÿøÊS¾êy7yæùÎÓ�èe'zá#rÏ‹ü£§;ãËžzÓw>õhwEë#/ôÄû¼çu÷¹íwŽw“ç«è=Ï{÷‘ã\çH7¾òižüÛ_ïÇg>ô—?óã¿úÊ¿~ñ��üé£ü÷"�Ìÿ>>òTÄ�ìsûîµ^v볢䓟:ÛçouЛÝó³ÏúúåOû»�ü�çz„w{h€�GrgÇzþ·€ÙsÙ{÷'€œw€ø~Vv£—	Xtû§v²Gyë÷�H�ª7u)‡uÁW‚H‚
˜~ÈuŽgügyýGƒ_§€8�û—ƒ7èxÖÇrxyê'vÈ€‰'‚ ¨|ñ7‚†·ƒ+|­—rP¨C‡„=8…E¨
XˆyU…]hzXWã§
§"7
£ð
ç
�ÿ8‡š×‡؇ÉGsu(‰xW‡ƒø~‰ø‡u؈
qˆ‰HrÁss8‹@·
ˆŠP·y?÷w'(s¤X‹�¸t° t¨§…yu«0v‚׆™w�S÷	ĸŠÖhs�X‰Áˆ©¨…¼…‚XŽHç‰�(ˆïÇ‹îH‰íxŠ˜xr¸u)øs­s¶ˆwêhsXˆøh�»xŽ©s¿¸Š	ˆ­ÈŽ�ØŠó˜yïØ�H—‰ŠH‰º8|“è
[...1009 lines suppressed...]
:£¼‹@©ˆb›‚Ùé(©�'
,ä�’J*§0Jiä˜RšN©ð‰Š9— 
98u‚N'aŠéÊfÌ~Ëd¨üæ	FÊ©e¢¤JZ÷¢[8A”ä¤\ŠÝ9‰�´^EÝ¡˜[iÉËV¶UâŽ
Ù�„E¢‚f‘X_¾ð1©nÁ{Y¨p“üj˜$Š6öÅ¢‹ó#�C8)”F”.LJlÿñ¾ç[a½<ò^ O¬ätd|¥pƒúUðÊ#ö[J*]é-As¹¢%,Ÿ ºÜ¸¯Ý@(«|ÙI
®ªÄâÉߪzÂ
*ƒ‰¦AæÍi'âãØ”,a¢'A¤šŠN*ˆ@Ž'£Ärö~ƒ«Bì`B©«
[ÑŠÎí';¯è\êœ÷	KÎRÉñ¦3?
O_Æ{ºÒ)ÏHk¨(Œè
rl¦0˜XÅœ"Š+¹'Z”ŒÅÉh)UŒé
Xì9aK*6ƒŽ4IËdB…(H¸_‘bP¨ƒžÐ±&f©ÔW˜`(`ñŠSeô¦ ›
NS^Eq
­|{0�r0G@Ä@¦Í@$@zBzVNp\*K8üݽ•C%DÀUZShÔØ‘‚l°`P(\OX#9„‚Ä•BÖŠ+ÄÝá]‚Ä…F&ôXh¤Â†C&´DRÐ	þiØØíXÀ�])”ÃP
žLŽ:QÕxå­°B'|DZÂàÿhÐ1UzZ+Øè’mÅŸÍ„¼a��ŠÉäDé¡a爂ZÐÊçÔ¤˜ÈU*@Â|¥,¸§ˆY*ÈÕxu^QŽâ	Þá“ÃyF­8Y ÖŠ8œ‚y1Æ9	Ý�žMÖ
ŸœÂ|�¹mE&”ß””qŠ8,Q+t�…"¤ƒv
…bè¤jèAÎrèTg-�P�¿HÉ/úb‹^c‘V¶äælù¦pS1Œªæ^ô)窞¢øÔft%_ög,ÙÌ#2Û+U¯ã2Y[‘ôuíÏ’ôâuiD°µÍÁh“sV›¨r§wú
[$
T¢Ãk¸Â¹¡gÒIcø™NtC�¾]h4 z†ÿCÐõÙy´,tƒ“Å)Šv܇橗9¤„(­ÈÄ’åé$IË\°Wb¸Á¶{ÉEbÀŬÁìÀþ?òch˜i8„©{:\|îã¼Êk8t¬“qÇá�ëR††¿ÖÙR¦!^9diÜ+­ ]cÈéRŠÊʬLà†)äDǶ,,°F7ì�‰B7|(NìÄ:Ù9,¥9~ìÐú«“½é¿¦a¿¢èÄ+°+,pìËjØ)<…áuÚð‰©-?òŠŽ¦ÓKT*¬Â¡H‹9Àè½¢4,ÝJK¦É$A¬Á^Þ
¬Þö-NØ-\DÄÊa@k.W­ç)ª–,>Ÿ…¸RmŽßêõÿ�+Bn'ëì…ªÆ!ÐlÙރ蚶-È|Sã*.­)kïu.ûShjܯŽ’¶�RÈ(Û÷Ù&êþ¦h)“äZ÷�žµvÆ@(Ø@Üý•Ä
€
¸$Š?^˼`ô»H¦BXËr¨á�B¬�K¯´­Í
}BM·ÇZì4ýN&ï4
5,£4,g2J¤Q?Ù
�ô¼Œ´A\4BltG„tO_KPuQ§´F§4CÂò@°1DSëz|µ!ER|È´ZÇô¸ÌôÚàŽKǵMO¦�¼4‡üÎéF9ûªç	ìíó=XG<t-Õš®nî+îîdfùÖâªsènŸq�ÿ_�Äî«"ã7ç÷µZ`Ó�s2¦OXo[Aç…î:Œ%JDD«vhǵ„upÍŽå"§øµ�í`62N2©s%·ö7ëö;G²þtËoØö¸
k;“÷°«þ¶n:óýn¨�7-�¤_DåRåÚ·�'.x'v19›ãJ¶h{ÓÊ
]®¬ù±¦ÌžQÌ©²fL‹
�Ê<J3åO•ÿ9þ\ySâͤ%©*Õ*0iÒ�¥âœº0«A‰F‰ÚÔÚóéO¡:͆œ¶¤Qº
yž•–kS¥lMÂÜ»U"Ò²UYNÉW’&G–@•ðàÁ»LIÖ¼x™paˆ
YYþœ90渄cæÜ™ð+Æ¡É‚­5µF¼¶=³Î­·I§ºic½\{¦b…v…3ÙWhÏÕ8?ú„5jI©‡óBW{š£Ì¡¤©og¼T<s¿,k?Uèš{ñîÆÅŽíòëÔ ÕÞ½¿5æ[òj¹´^Œ4ïÈ®ªúƃí6›Âºî¥„�@2É\ùÄ¢„.óϽ	KAŸ{(µ«2*ñCëfÿ“
±]|¯³åXN½æàÂïµWÔ±½Ó¾3k¿ÄT…½òzäq®�PTðAø²ú-ÇÅ
Ln£á€kòIÃS�@'ãûo7ø	E«ëRF¥´L’±ðºìHª«ˆËJMUTêÎñ€L&×ÄÊGÛ«ð&04ˆÐÅèrÑ@ü<L-ºA�Ì0¥ÃTP¸*r«4ât¼hQGÉ#ÒéüèHÂý3SOs[´JWƒ³¬°Ð¼ÉÅônƒ*5ª°3×<ƒ-GËJ6¦ÍøT“*·@�’¶ŸZbp¦›ÐÜTÛã’´ÔMMךµK)c²¶�¼mp+WšÄ§e]ÍiH¹àt°Gÿ¬ð‰È´ÁiOŸ¥ò[�ù$1\„æ-¸¨hi�ˆ.†±H]ÕeQ͉óT1R‰G4òS?¡ÒŒà'm5-(IëÒ*á¿”t¨Mˆ�j5†©KSe-Oå4&Ø�‰,³f”¢,8¿Yµ3ЊV=Ԟ؃MEl5J–Õ2“ζap[¶-H}ùÕŒ@âb¤TkÝ\<²lÜ~eH=¹&Ù,©¤F[<SëvxÆÓ=Ð9¸·Î
WZÝE�Û¸“²úE¯ÆjSSêîìTÕL”¼c£+2JË:Å»,Kßî:î�íëlÙÁ#Æu'Ï
,OÇûjÚ¼£urOÎÖ¶1g¬9‚}÷„šü7u…

--- NEW FILE ---
GIF89a—Î
ð
	
<%=AB>GIu\ljnr|nxveaum{w3GF(jh'tm&{u1kg3tn<|{J

G(G4V%[-^0U5L6)e
µ³¦¨²ª¹º"ˆˆ#‹‘&“Œ&–•3‡…4�“7’Š4——%ž¡4�¡)¢›:¢›&§§(§³(±ª6¤£?ª´7±¤»ÈG†ƒA�‘C�†C—™X‰…{¯°‰1¥7�I�T,™d6§MªW$µm5€\BŽkN“yg³yLÐX
×hÒu1î\
�ŠpÊÀ�	»0!©w ß‹€ÿ
%H÷`H¼[®ÌìhsŠ–½z½à…8x¨Â¤9	j©Âä¥]&E�ÐÄK$J”‰-«^M0§Ý&¦Û†”³÷%Ç�KPwÝ*80`ƒ…
Ú­“êE�/«
I
5+n¢‚ÔPH�Œ×Ĩ¡5ÔL³ •T6ˆb†õ`a€ºC€€ºC¤;CšÉb„1^sM8�!EHSÏ.H
(!›
.	cŒfH�‰f‘–iO™1
˜«…GJH*Œ
ZØ ‚>¨N´ÄÔã#µ0Rù ³îðƒfŠÃ*(ä;<êb«Ê.X¢”ïFiM‡¶ÀQ€@;@A�+i…^£ …vê©’ózZ¡•À’øn§!Jª#†ïZˆf„ðÔC>\’Êe=ó`„Hl:¢�†Ž!4øìêNƒ-BÊ,‹ÓÊâ‹ÃÖ£ ›B‹æ±k¶øäˆV&Œá‚
˜âÁÅû¢Ž^ÌâÎÔœ‹¦¶ð4rÅ0º²šD
¸á®Ó|;ö‚Å„ÿ£=aWøs�gëØ1“gJ;âŠÚ#
ÁõHsÏ’ÒðsïoÄM¦ßæœwîùç [7Ð^€F\è¨'ÚL at A†
ˆÏžEö¹¶^‚†5%�gXH€)J˜…(õŽx
]
ë�îmLVÓ�ïÿt
˜M Dó’ã®á¾±¯~¢W58ä¥ÈíVvº`°$ä%uÀ9ÛÝG4½
}QCQ¢5¾�(¦ð‹K”•×7 at tðEŒÍì
�.õëÏãÕ€¬Ö°)Ñ}긆;è%£I
,Ãq÷@ß3H¤ÊúÝÃ�ÐTÐ3æùÿ)w¥ïB Æ3ìÑIw¥R�!J£)‘4ÈOIc–.Z™»ºõ©µo^§üà‹RIÏ^ÉÈK†t4$P?hÀ�DžLUã
@ñCýE”
Šp…!°¡
T¤âò©8EåU‘
U¨âž½çGOzU¼Âó§G½é_ÁúÕÇâôŽžr,ºñhO§ÚÌávuî£ÌåÝûþ÷À¾ðñ=üâÿøÈO~·™­üæ;ÿùÐ�¾ôuýð(¦	M±±ŒF¢(
tƒ™jü’H"‘ˆDм€ˆyûÛ/	@H
Oh¨@…Çp…Wˆ‘y“‡
È€˜‡yœ×y¥§z¦§
ßp†­÷
¬{± 
gæ
z{Ž¶l¤¶mч‡]6}|؇~ø‡€ˆ‚ˆÌ7ˆ†xˆˆ˜ˆÄ6{`}ÿÑÐ
`–f²ð
Ì@öG(°q‡`çW ég7@(ÀN·0~y
^Fg¤ö
QF ®ð
õ¹h¬7i²°
Q¶
¬P:k¯°
m­€ ‡&­  ®@®Ð
ä�¡Qöfj ¯@¢* à¢«P$:k*¡XÆ¡&JŠk"Ú¡YÆ¢}f¢‡v¡:i	l:¢
:¢¯€£Iº‡‰h¡0Úe±Àeê ¯À
*lZ¡½'kJ£¼ö¢º
YÆ
T†¤dê£}f¥Tˆ¯¥KÊ¡0ú¡X&¢*e*¤¥ö¢)º¦åЧR†¥P–£Ä–¥R}ª¤ð	lVÿŠ§¾'!še#Ú£ Z“f©¸F¨z¥‡J¨·V¡zJl¡9jâ°
¡F â0žJ @úfb6i®*eê
åh‰ž´†¢=Zjʪk¢o«Æ©©P–§yÊmKze�ª¨W¶¤cZ¦'ɈP »‰ ¹
ãp²Ð

€
©
〠b¶
of¡ã`ª“¶
j6¡
@q�
°jh±
+f° ¦ÅšjéÊ¡ä0©R–
§Zãºg䦊¤)ªgµzµ:€±²Ú
ûd™§+K E›š�¦§[J®;²½¦³ž–±RƤ–f §údðf]z¨—±¯ 
x›ª�–¬a¶«š¹^Ke÷®¦úzµÊž²@q¶ZqÏÆi£ö¸¶Êµ?«·Vº²"‘e
° 
�6
Ëz¡)e1ûzRë®IËl†Š �JjÞh`6¼ñ+­p³¦€¤‡z³8‹±­`³
à
Ôy¡Ú¡Q:¢tf¨öÚ»¼Kg«ë™»À]æ‘Ÿyµ\«dj°^Û™
’è‘{¶µëh§Ê
Öë­ºGe;¶#\¤k:wº©“†±»›®rËÄ»ÿÔ©®§Ä다†¶n«ÇOF±QöÅïÆžE›°*¤ø¢Ä»
­@¼
NK¥�7œ
Kèj²¸;
瀳ôlT[“±�¯Ð¶Øl½�{ϧJ϶j¹
»ÑØœ°�K®s(%ëÏ躣
åà™±�
º
YLÁ¥‹Î¹+¼]µÛ™ØeYÖep¡ jRM{[¾#J“°ÀѨÌX¿Ê<·âp]Ôâ }¡éЖFgÝÛÔ¶º‡hKg¾»ÂÄ;¬0×�°`²Wû§0Íå«}M�®ä�
M-
°¤"Êzڌߓ8ÓâÍ­3-‰Ö;ÍÃkÓ«ì
§+ë´Ú±B|à«àõìÄÞ[¥å@¾ÙmhVÆ
�³ºM¡PØ�&h\¤°
.¿ô\qèÚ
Yæµ€·+ÚHÀJ+¡v&°Öÿ½=Œ.ÑØz ýÎãàã’]Á£Æ
m]¼ŒºÅ«Õ’�º¥Š
Ù€®«ð¸g³~6¶l.
gR¿h\Kž‹½hãYý9ÿ_mÚ/ñà�òRžÛve0¯ûÆÆý»·üÓÇþÌÿþ¶VhÙÿô_ÿöÿ�ÚQ@­Á›ÊÖÈ
ŒÕm@&WœøŒ2 AV°ÆÉ:ÊJ¬r«Æ¹rUî•ÀUåZ¹"×J «V]³j•kj¬r²ºZkÐÕVƒY§Š‹«,®²Ä½zµÖìÞ®±´Æ‚;¶U¹µäX)•Å*ë^Y«ÌN¬ëWë«ÅZÉ]Öj™+¹ÇvÇ>|蘱YÊzožF�ZõjÖ­]¿†[öÿlÚµm³Î)à	“)?�Hjq Ê�
Hk at bXâÊÁ
Ð>¬8
4Yº	€œXŒCNí
��+W¤Î"±˜¨?
š
Z¶¡YïRŒ*‚žã쯩¦*óÖg-¤ª\�ÖÕ1^y祷^{ïÅ—£œvòÍ'ྃ‹V#û¦
ÒË/´bÑ«QÀ@ôLÒdáТ¢ºª âc%J£Ö²ÝÄ3Ó 
¦¯›»t¢ŒåF³°NÑÈq¥¿VüŠK,	ûðæ!³¥•WöXJª
¬b¥
ÿ»b+3ÓüÊy=†'âŒM¶baš¸¤	¢¬«£ð”-W[)’Kì9×`°«†æL¸F)¹÷H0A� ~EÀæ‹¥*KÅ29q´’–Yƒ&*T¤š�é©
ÛÅç°HÀ]F%X¤#„A;ߨ(³²Mð ŒNN¾Q¼oL¨@KyNè,5…T	# £ rˆE
)Èh‡“hL#IhYò†ŒLäV8±íj“7<$"—>maò‘
éÖ+ÿxIOf²#ÒŠÜ,¢ÊJFŽ$±4e-²H^òò•�ìe1“™Ì�TR-ÏÄä*5†J•
w®ÛËj÷ÔJT’R–ªHT  Ï*³˜žéj²àTJ"Ó’1”.åâ™×ÔÚ3Y%ZQ+Gœ�e“ äˆÏQpÄUœã@ÿÔª)R,ÓR�†	
¸R´tS�qÌUQæÂÔ+µŽ§g
Äj:¶‚5%�@ÉÂgºæ"E4(¡–ô’‹¢´â)‡¹'³æòVŠ™g/y-‡²òŠÆ²Ŷ,%Ùª¢Õ«@e ~µ[_ÖG¢1¥ªjJJˆY
ÄŸ“a›œÓv©Å§SaÔž:”sQK ‘+b¬RÐŽu�¡\InQÞÆT‰k+œ±k×äI˜Ñ•%A`á­í|¥•ÈÒŠž#LX›BOl
‡9Æ�T|åÞŽC
Záƒä˜hÉ5¥vÈXZ2ëªUqâ5ï`
Þ„œ²ûM|j7šéŒJ(œ3\£áÔŸó‰¥Æ‘\Ü€)! B`öÔé© 4,Tª`¨è¼‚¼˜Ý*uð+ÉÂMÑ(È	`áâ74
·Š¶§>C„ñ”—GÇœIhà¸C„ðE=‹)
\ªGó7!„>‡+\°9M¥B-V:Œ`âGÓ�HŽîê3Žø±EB�SKVU¤TÏ°¸óN£8µAÿ Éì™*G)Ü'3
½¨!7[“®“_ù¶r@’jÀú*‡£›ˆêr¸©pŸ‰Ð•-11¦ñ³TÚ•\â&jZˆÜ€Þð
àˆº—ú,Ð`¼ÿ1°�®ø¨�'nÉŠSr›½`¥áØ'¨Ø+3ɘ~J‰1ðÑ®Z
Ç0D‘dÉŠ9Dvé2®�CëúµŒ’–ª!
‹©¸?ÿB2_	4IÄjã$ã¢ŒÒ À¨8s›¿²+àZ¨Ãˆ³ëR•	󋯨�	+!ëăbžé-–š±Bš�(0óDJ�q¸DòÀ1ŠBŒij/¿:œ–Ù“ùð’²øˆ.zb°µ°+ªÊ¨Ñ°�œ©Ÿdá°b¡”21/•JŒrP)¹B•–12sá½(Š¢À-Äȃ *™m‰<J)fs$£²ª.„D‚ "Â�²ÿÉR'¯¸Æ/™‹ÂèÅYA®³HF±�¹€0Û‘Å…ê™tø‹L,ˆ«ÈaÑÃsI�¨@–[ã³/Ä-°=´Š=ëÇ/œZô±§%À.'K¢¡˜×:G#R`IÑ+#³.£zW¸»ƒ@ô¢G]QŒ›”¤þj©ÇI¯”ª*òCO\´­8—”B
#ÇŸ©¢¿�‹”¡œª
ÿºBD0‰}y‚r2Ã�q–â É9k#
Šçä�TŒ’úŠÀ+ѹ\
²ÅÜs,i”ÿ9‡sè¢7b*²Ð
"ú:A‰ž!BŽÉÁì yŽšGË
Ê7éÌY’â»cÀõ´EŒ�s(O3Š±˜ÿ�µO±‹“ñ™Ï[©¡¥Ÿ™
,rœ
BŽùÉŽì(�²885ù˜Nmƒ@O(šŽUH:XصS Ÿ‰A¦ù.¹Q�Ë‘�žYØÈ+⻜€¼™Q=0\:±åȆ6›8
LÕbÒ·JMÑ´^C«»0â�ù	ù�ð$íØœ¢»’6ÕÁR@Èk#
±�Q1:Ç¡�6Zºö°T£€÷àäXŽ#J‘û€ qXAu£­êáã-Ê�nXçô»nø†Å‹…8¦8¹e¿nP…-ž°8¨
2Ž]�Eý¾)ëÿ1-�#Ò	©·R€:~:±ðè툎ÑŽðhÁymÔìмɸ´&„7ROueŠÃù5r “¼i™žéÓã¨"`Ë:G]Ù�ý”`å‹ó}-•býµ œ¢
õT[‘¢¦3 Šð
!nݪíĸÆ‹¦
‹ÅQíñÔ%ëˆC+CEá“ʉVq§¸H«Œ)ªˆ‚FÉ•q¡EàÂ-qÉ
¼É´2“jÑÃY4�Ó
ÿŒ„•½�$Ú¯à=¦]ZâÈŠ€ª+Ä_š¦QFˆ;âB at 28ÎX�€‹Qb“QÂ%�°BˆàÞ‹YKˆ‘_ç-ÞNÃlq�ëe”ù!£/ê
Å]ßà5^RÚˆ:£0›¦ìM¥û$µ�HjJšëí$ñ$�@	9¹š}sÞ
ö%ꦮ`Aßã­^†À¸êªžˆ‰À•“³ùàÂ…lß]¡`ê•ÄÍ–Ö¼ˆÂ¤B‚^üE¥b—¢Šnß®]ê(^Z!•>‰—¼¢ù+á8&
¾àkjÏý(8‹8%O=#Þ!ŸMiQqx	QÃQ§ªcŠ3m…ÿee\ÜCë[`S¼`[¨eŽé„Tú 
•T;ù�àYž»ð2
s5At	�jÍn^׉	
ž—ñýá‘�$®
¬FÖ'FdqBáÔx¥¸t	Jî*•ðäóÍK¾äqâ;(0Î I".àç�ÞîM9Cbå¾!—C¥µ°%éue�œ=Í*e(¦%�æb6f‘àä'>æ��%pŒRf	n
hæˆcª�dŽ	IfæJæb¦æ½
½	f‰keƒ¶ç…fhžlh{®çÿ^	v~hÙ hÖág…~�ÜØ�qv‚�&©éUàŠ&é’6éŽÐhÔˆèv¾èÿíäÚHiÙAö=i�hâzáùhG­�Y>‰˜¾�•öæš¾‰Pê…>êHê�Hj¢ŽdÖXj§å„ð\röéËI{,±5

¨RXgA›ª
©Q
Dô1‰y¨2ʲ3E#C–ˆgùŠãzüàgé
Od©Ñ|IÂ
OÁ•ö²°
–|Ú¬ùCŒä¥ˆvA/j›0jl—Í10Ò˳õ0
£¼zÓÐëÄßä´F°²¹(¦<Ýîá±(¨¼ÆÆÜlŠC§
Ú„HDÉ£pÊf¾‘¨n�¦–ê�héÚ¨j'€Ú9kÊá�äð�*¼¢
PP¡¸ðË Y…»¬øÄÌÖ‰;Þ!Ð*ÍAá¶}{±9>W‹KÚEU"&1?·k÷˜ŽK+�6ÃÑäp»LcœU
¿UXžú:À—‘
sxÂ7_U¢ˆ3îãÖ3ïLrHRM;÷8¢
`ð½­B/ª)L[S¿™ í€S÷¡UGB…Í
õà“Ÿy—îð»)mÓXÈaÍ™±ø�ÆRÚ¤�Å Ü5f6» åð K_Ô�ú¾/§¸Tu¿ú¨”þ¨)Á¶Äòèc;‚Óîiå­ÄêÇšJÑèpF‰3œU¸><K$Á@ÿ¦‰Ñ�£t™�Ž¦pŸ³ãóT=áYYMÕÇ
¡8ì
I$u´�Ó6 Â'õŠÃDâ­X€]ulÇäwègjN¦'í¾l+V˜âZÈÞDꕲ*ŠÃ­
ïUâêVÿUšˆ¼H™¬çùLÒeÝùdhzýü×ÿgÞ|îÿÿY,hð „
2ØM@&Sœ\qe
ž®Å†L2|Òf[n¸
—Û¡Á·Ü+ȵR\,‘F
`|•Zz)¦™jº©|ÿqú)¨•Î*©¥š
,ž‚—‘}LTtÅu£Ñ¨ª8ÈM:í´à‚,%¢Ó!5‰‡8Ù4lI&ùtÓJK•ä$(¥H´Ò•bUŽÌhíR(j+Õ%cMâ£�˜\"—�nMòÈ#ŽXâ&ñö8-³Xbï,¸<ÒW`õšIËb‰
&0b‰YB¦˜j>&™-»@F™fnNÆÅ£Yl§j«i(¶ª
6„þp¯`32ÿpÙ$÷ÊÊDZüM,�6:iy±¤:ê©9ë¼3Ï=«‡3C©ú<twB}4ÒI‡ú9Å‚�ªÚ‰#Cä4Ð�ªFñU
Ðc3ôßs]ËòÛµ-Ps8›�ªqd·ÜÏyú6ßÑ
„sÙn¾öà…®4â‰ïl´B¬(þxÐ�K>¹Òj]_NW$E
+åÄ
,_¿2Nܯ„À8Ž_
÷AiÝÜÕÏ9.K9åUïŠ+¾Ž}õ­ .9®€.8è|O^ö½Oÿ¶Û®ÄRÎ*ÿ…O)ÿøåy?ø±/Ð*ä´"~õÊa¼
Dt³#æ,°
qˆ#
‚×í
`	í]‚{®ð…3¼á8Ä#.ñ‰S¼áS˜˜@÷¢�

¦:L€-^#.ÚâK"&;
"!V	Hö<ÒY@\
 àÈ¡£CB+ºÝ6º'’4XƒÄÞË­g=ƒ!â�:8¤2h¤$.ÃYöã*"!N"
Ä^1Ð\1$žÕ	"UæäE:¤:Ü!§5ОìõÃ/¸":BCC¢ã-ªbU²Ã<gGòÃaÎ"â$’å5bå"€2tcvž^H\B¡ÎèÖ(ŽÒ¨ŽÞèŽÚ¨�æ(�é�ö(�ÿ©�)’©’é’©Â5Á4Aµ—V©•Jœ”º„�

€ˆ0°_0ë¯'0
?p,
“@up[pã/0Ýï	ïo�0·°¿0°
Ïðý:°4
@Ÿ0KpþÚïÇ0Ó/Cÿ°p±
¯p—pcð
±§°
K01ý¦pgñ[±Çpp
Ï
k1—±Ÿ1§±+p@éh
4�@jí•s¬Nͬ
öHÊKÊéŒÊôðí� ÍL¤ˆ�÷´Âÿ¨Ny8Îú<ŠûN9NÕ|W ÎØàñ~åš}]á82›±Y,<Šê@²PÚ¤L�*Sʤ°òÀÑ�B�óœ¥ÄY‚)Ú§Ò‡iÕ.ãòtô²/3uxÎ
²ÂM¨„¯ø
MÔ„"\‚!¬ˆO,BH@´
2ÜFJãF2Šn‡qì†*xâ¤ÀŽ¤PŽ-3O·03ÄODP÷ô�ñ™=
@2G²,xC3!œ…U8‚TE
L¯‚̸L£ÀŒ¤2ý<7t÷¸�ÿ8Qÿ™{]—2Äò¸�ŸJ’{�7¹“?y�Sš5˜‘V‹-ùä`9”o9—wy”­—•¹5‘„§ì´—§¹š«˜r›XÜØÍ`Úšs‡‚¹Ê�)3Ð(Í'„Ö �¤
óÚhÏ@´F-Ÿ[Uw�+tÑ×èÎ2µ2�èÄ�>•GL¡Îüúx€+O›Ý�+d�™ûrµy„ºÿÀÉÔ*z�ñ:±‘ÏøOPÍï˜ywPšŸ/ĬÓ:u´BU…r(Ïzãì‘ñð9¨ˆÃ¨”Ý\ÍðQ£‡+€P�­�¡ßMÓ
ÍUõlǵïNð´B¨¯𨊢gÿÇ„ûzèÎóÔÔOÉ9BX9°B
í
§SG¢ƒÇÕ”Ãó`T=Çþ Ó8:ð´óTU´¹x­{£s™ª8;tûUÙ;¾¯+xʧËÔw$P#w•Um|"'ÎtYYY]ÚìÓ!±NþDÐë$€Ì
é·Ò8øÎ*(ÑÑãÌÍJ7˜ƒ3uC+

–,
ÿÁ*Y¯ÒIl9ñ%¬š«Z1í66èÔ–
Æ
àp+Û˜²ˆc™
k1ØŒ‚¨ÈHrê­Í<t-ª„œÏ9WZ"©ƒR`“-Ø(ìf"Ûí¢V"r…œVç¢sÆyO§Œëæ•Ÿc¥¡rX)'€qÄ	� n‚Cò±
HYŠ²ìÊi¨È6™UTçd 
'®pBU)@’¢<[y¥•¶R£¬Ì.ZHÂWx%oÁ†z¥¦]sHϬ.Z… rLqåIeuˆ2rÆ‹¥&¹b"%«”¥W›S½„{ñGr`)2¬ULÐ.	Ÿ$·•ÔBÄS:cŸÄsÏ”\„ÿL¸‹ðâ×9é‘`ŒÊ—­ñÆI§°Rbp!½4�^/zLÏ"*gOoSóÔ[/jiÜd­Úá¬M
Ïr:mh^¼š9µš~äuŬ$TØX$tÈ.SÞj˜[ÏÁI¢µ]E´…Þrì^ãr:¡»¨µj=òîr¢Õ^“hæ^ßZ׋�òê\}N餰€”…•­ÐìÏÄFc*¶–ŠýQn—£k¸S¡•­Œß­k2Å/œ ÃS&h¡n9èˆ&öv׉Ÿš¼°JRD7I‰{¢”®
V8
k²–ôšBuÎ/uŽiOeÍ–*gj÷ÅånÄéÉ�Sê�拚ȋÒ	ÿÙ[Í&̉…×Ûl¿YwN?çsÊõÅËcW\YhZ¼‹(!­:§Ø/vÛN¨�ã3<åÖ
aV•n«q®œ|Ï­4>Õ/D‘–^:¦¬™�3!‹Ì>’"ñè	c	
¦î¢½¹m.YŒÑËR¬¾È±äbÕZHŠ¼µ7ò/OÈÃS[Ú²šá�NûÐiÆ¿UèEX‡)Ê!'˜
,"«€k`¦jOnD|Õ]Hä
ú	í"Â’ÓɆ5!œXÅ/{²‹5C-YáIBé�NCZd¦†Igü+Ùyðç-pU*m„Å] 4W°°d5rKý¤ó-‰dÐ*P„ͬÿÚ‚¼ñ´Äh@úÔ¨ 	I™àT©JZ?iÑŒ;DO„5€©‡R
(D
O­'%?�ŸÚ¤Œ<Jn
@Êz¾‘+Ö0HbÒ£‰NJÒ
Y
 
¼JHj€K¡¼‰1
Îð•
�Û^Ð�ÛšE„øƒE”|¥šÓ<’o³}KºûÇm‚¨ŠýŠ!£C³)–˜€L*QÍÌ4lM~ª!q,õ+ÐÝ-,G’àÕ£C`d¦–€H-ù·Ü@ìDmL3æsõÇAr‘�ä°^Õ•%Â
á ±<L9‡c*ƒéÿ	M”=AËR²*€n”bðIÎQª–+J�ƒ
pšŸ`aÎîdï×8¬!Ä�£‘[ó´]‰Š²`R’tf=á‹
NÐÚ¾W¼üªHÇJ²!™‘¬ÂG’ÿ†c²‘Î J³uù.šÒä¦XD
»ŸÆb˜  ÑZã"Ì¿
gz ßñamþ!¾ýå"-×qO «‘ܱÁ
0ЕڲáÓª3åûNÎ!éÈ i!�ILÞÔ–¼d*�&ùõ±Ÿ}íoÿÕ3�B•YµnñÔD@ÁóºDcŠ£´dZ!² Ù¥PNSÃHt^4ž„@Ⴒ"¿ä×,GhäãjH!…„EW Ž�Nè La_à'¶�ø‡zc1,mƒÆe
b[bb
,ÖôÆX$äbÐ"1¤( |d[zd–zi=Šb
Gòi´‚g3#NA*˜±C,-TlÂNæEóþÂP…(¬O³8Â#®‚P¢ÊC(ÃËÀ”Új 6(–̱2à‚ÕÑ+ø¦!¨#i°3tG"Ù£•p	–€­Ì‰gFó6 V£­ü©ƒÂu'VZ�
Žf"2©'¼e Râqé‹ Âi²Ñø‡;Â6ì
—*Ì_<ÒC®&|Ï"’ž6ãbb"

ñ«k&Âi ‚‘´b%#kzi¶L%¿QXÒ-(C'2‰‚­È
0J!.*RÖ:㧼cóXs–¤2
ñ4ÿ2b�	&Њ2®äPžJLüÉ0Øâ« >W†$ ÂŸ@Nˆ"<NéŸt„£!}ÄK¼Â)ÛÊ;Öâ;£	&Zâ–˜SXø‡;i&BL˜àä'VO
.4DEdsõ*ÚŠ
œBA
+;­¥/W
,� Ú*
ðL.X«";âèåËcb†fä'è&A âÜ$Ž1ªÂ&=DÇp	{B—¦®¬\5û³§°â<€ê”8
Y|Èa:ãÜjуÕ+üBª]Z!¥bn-2Ðç/~Š#ÇeH>¢+c©§Ì‰ì.ÔŒ­ +ØN>Üæ–d‰ó®"éÊÑ蜉` (;Ôªàÿ–§XË‘óH¢”
$„I¦æ´fÉ/sÊGfpaA"ª†¤ek"™y.9|TI#à$
k÷!Ùî<7(JüÈO#T\£ÜÌU°àƒüC}ªJ–(l$w
ñ ’N{‘o&<eÁïo\ÖŒW"€0oÈYWáH
•œI"
~è�hc"�–hOÔAjÙX!˜œ*›ž$Xj©kÜÄ.?L¤9.?˜IYÿ;V#±Ð­ÜîèŒB#€)GŒ
ÉmÊì€"o†,žDýdBÁ	š	¨"¢m^uz)š#¬ØJm"|–.€†�ÙøGòbkÔ¹2ŽãU}¹ÆreZòâíðÂ_·ööfÚ–Õ9:'+hùbÀ\/³Dzqó¦eÃäfÃ/ü•ŠJ‚%ÆÇÖcf,¢QÒä£ð�JÄL ˆOP̃øtð¦�ðwÃÇqHºuAË6t‚�Æ*j%b|h £<p"'Á/dFi—
±Bk*ƒ7¶ÄEæåéØ%Rjdn玊Âm®íÝf÷«J–øIý¤Aàƒ1tºÏÔHQÄÍaÿÒÅ�°XsðIh4+ëgÞÊ.äÆ⦢cv×Fì‚'%¤È_€DBÒjEvÃUÛ"àW4\̇ŠÅ…!Ž80"tXá…Ø¢ˆCù æ†>Bä@0BD‰ˆÂ@Þ…IæEI�¨  |£$±¨M:¬/s3RÙ±+ç„�ª|¢çI¤´!`bH¬/�>’[\a-èÌ44'Õ*°ßÙ!âytŠ‰<Âe_Ž¢+,Ð
aã[ò"…HÇ_¾¡UÌÊ‹d~¬£~þ­ÜÈÇ*$¤6DX¨eÛ°ibÄq=œF
÷=Ò!éèç"ƒò(E+ëÒ?L‚ј‘M2ÔÒ�ó�5=¨"b•ü#(TX©–Â2<‡!ÄÄ5>'Šö„$nCnÈÌwŌœœÆK�¤GÂ0q¢BøLÖ"ƒt¶{M…C!É�ó°Å)"l2ÙEžÅÕ*J¦—ü‚"`%DPø
8Pž#ÔJ)QP“(þg úÉÒjb
ö�BfD³0&±ââ*®jX�È:§F3|$A†£†^±@pƒv-*ãy XHovÑ*L·e
äB'°CKÿ¤ŠípæÌLë=üâ0.æ´\–®Å'dO3¾*鎅QÃM´§(
o}…ÇÅœÊ!
ùÖIFK3ŠçL
}èøG.pØW$-1Ò¤ÄBì^¨cŠæåÎLœÏ>o'êyùÞ$Z¬=\ò,d/7#.,#¬úy@ˆÒm–=ª�EdÇ®W È„Æaøö*9b)’.¹1SÔ=¢`Í�£):€ÅYv¢A`rÂ#kR©¤Ó,šÆœÜ
•øv!9ˆo]‰sn¬n¢8¹r؉”
¦¨qÚä¨.±JêU_ö‡ª§°òW+�”Z
ç©tÆ
l°Â¦Wë°kÍjžªg•ÊR±ÉVel´ÌÿJ;èzº"æ„PPÖ«,bÁ²À+˜¤Œö
)㔦Ù+ä”fJÝYN,«ÈÒMsã´ÂJ+>µòJ9U–Ns¦D@9¯¼
p¦¤ÓM_*\šZ«äÝ[ö–#În¯‰³Ê9ÝtCZr²€eän䬒\eÞùK9,ÓËòÉÅ­RŽuß	Ôœ,8”ðÉ6ç¶Y)2DN+oir9¤¸f¤,™ÉrÎ+,k¶riâÌ‹AÐ6´ŠZ³¢Ö@¬òÊjͽ’@:,£]/ÌÉõ_Éu¬ôÉ`%]rlîž\ŽÂÞºÝÊÁ'À1,ù¶r¯féPì]Ì{ÝësrËy«´À±�R0ÈëÿÎôÝ8
T\ÇDÛ¼29™¹•Smni¬`”4
pmFj§‘�dT™2Ž£¬
ëÆHñŠnü.
IÚáêÇ»B:0—Í‘™!�s¤p
O`ÙYþÄ-Da0‹Yd*F!ŠQ€blfóšGqŠS¨"r¦³*WàùÎzγ*V‘g='gaßX˜¡m$ûÉ�>Äÿ.z
i±$‘Ϥ+�é
]DìR¥(£©}£„ D@
!	ÿBb“¨ï%|	CÄÚ¿žµ¯%¡ûF‚‹˜u&Fœ‰_‚Ö˜8„$ž½ìI4‚‹X&01‰EtX• @,	0‰c›³pÄ$VÜaHh¢�x%4qcwûØ”F0à�7¸Ð%Q	\à"´pD»;a‹GìÈ0¶…%l�[HÜ´˜¸Äo¡‹[ÜbLÖ¸Ç�q�Cä#y/P�
c \åÈh92Pñrd¨©¨y*dŽçQdCç£Àó+FÑçlä9z†ÑÿõLhÅÇ8Fêa¦Ÿõ¨ƒW½"Ù´Ô¯ŽŸ/FaMJõBÜ¢
i4b €
$@@b¬Þ¯"üPvT Õ{е$l€jì
>(„Þð
Ù`„Ù0„D¨
Ø 
Jè
M(Éð„Jø
Dø
WREø
Fx…I˜„±à…Vˆ…±�
d¸…gè
`†ˆRóâ†j˜…™$‡RRtØ~éÔFw$[¨8|Xeø†t<Qó~�1GRû§ˆ‹HŒèˆ�è$VÇ�–‹¡ ÃÔ!¤ÝÒ-NR#J1‰x]�Šå«Ñ ™Bÿ*�2BÓŠp¢,’‰X—ˆ³h‹·h!‚•Dˆ!€˜”
q
ër20
s<î"
Ä
�3ÿ/%.AH‡”Ø
¿#4°p—1¢cHj¡ØqFÅ

ÅñŽùÒ‡è85¸H˜…)&\Ò†ùt¤ZÇžf‰ú!3}é
[Qœ”� é�€
g
§?B‰ÔÕt
á¥ÒÒ¦«r"˜& y"‹zò§q*�*¨«e¥…J-h"]m[Ý’¦æ‘§žˆ¥S±+‘‡J¨ˆÊ©�ª˜ê©Î%)°5A`šÿ‡j& zªÚ �ª)âÁª¡J«pº©µšZרoÒ¨*·’ˆÜ«¸®ú·J¬Éª¬Ë:ºš-¼²wš³z´È¬×Š­Ùª­nª¨¤ê«´:¬Ûz!á*®åj®çh²uÓõi¼êh#�®nJ®ñJ¯õj¯È$�¹«h]W1¯ñ¯Áe¬÷J°k°[hòRÚ®¨ú­P‚¬;°Û(K±‹±¸¨®‰ñ¬�ª¤øBŠ¸J­°Z‘±'‹²åª«SZª¡Š‚1k[² ³4;³O�³Ã”³Ð²³5r#5´3´6K´Ck´B‹´E›´.Ò³:ë´<û´!qÿ´JKµSkµK‹µU›µW«µ]kMµa¶^±µeëµo*¶Q«¶i˶c»¶nÛ¶o+·qK·pk·s{·u‹·{«·}›·Ë·€ë·�K¸ƒk¸‚‹¸…›¸‡«¸�˸�»¸‘ë¸`»²W°
iRÐŽp
.
Ð@
þé
næø°ëÐÝÐË°ä:
�ÕÕ
O9uTR;5TÿS?=uUU[MõUTceÖYeuÕVZo­uW]{ÍõW\ƒåØa…õÕXb�-vYeKuÂ
Q™àôŠQ=µÖÔk³Åv[m»åö[oÃw\qGíÂ	& 
 ’µÈõHqE’“”d%)yIKf“›Ôd'9ùIO†r’ŽlµI*S¢Ò	M(e ÕÊ+¸r•¯¤å,m)K\Ö2—·Ôe/yùË]S—¦¤Ö† €pÈÃJÖ¨ÆK&F�û8£*ϸÆ}Às$.f1¹ëQcì1”ÿ°Fœ1‘Ó3Ç\ƒØp`B0
x„q�jT©¤öÐÆ)ð@# ùÙó"Š�bXÔ8ÝK
êO#í„)ñOUøCÐÊa´*}ªçK0úzæ)…0=‹„¨2A½¥õœFW`2�kãšý&j¨AP|ÃLÓèÓbÓÖ4ƪ¬yDɪ’a¸Ë¢f!Fž¸X	@c(ÐÌ[ŠáÕ¡dÔ©\M*@áôx°ó
P�
	eaW9ÿ
zþ|Ž²TR1êŽÌb<ԧѨiMÈTÓIƒ†ÛîáŽ�¾õ1^ùŽ<¼‘
MÞ*Í->$'üôÃÞ­lW’[?ÉIBñ?Õ+WøzužVÂà'�…!
§ÊVpÛ0¤Qƒ3¸ë=(ëšô-½Ç.†„Ê„ òÜhu¾É×—ÜU0•e�=+4O⣭p�HѶêÛX%wõ*d0ja€µ+|5Z>ÿÊš�° \D¢=ùZ�y¨B
L+]ÉJZ"ɳ\ò‘“üd&CÙÉQ¦ò”­l…\fYÊXÞ²–«Ìå/{ùÊbó˜»ÿ|æ0£ÙÌifóšÝ\f8“YÎj†ÖPÅ©&¬ò
K˜–‘ýœgtZZœ’V¡MèC:Z‰64¢­hG/úÑ�†t¥)�h@;á”KÂÀP†0„¡Ó`
O(Š€b#ûØÉ&6ª�ýì „�ÖOP¶±­]ll»ÚÕÈžµ§©ýOg[Ü׶vÄ †¸Á
L�Ö¨P…(ˆ¡%àvµ¿ýíb»ÓE¾û­ï}AàG„�zÁÎL˜µY‚"ˆÁH(‚*Nìf#ÁÔÇ=îoÿ�ëàÍwÉÉ]ì�w|ã²Þ6¸[îíj›|Ü)Pu
HMóŽƒ
ç'ç9¶ŸÐ鷺ߥÞwÏ�.np«Á"0>€…EjZÓMp9«ÁmS£|å*çºÌy®jUC»ÖØVvÙ™-p‹ûØFPƒ@:…%0

cø€Â
LÃôBLCtD[|Ä?4ÃLLD
DCRdB^ô¿OLEbLÁý{@3|@rx…p\VÐÁWxqpÃtÄ^äÅüÃGÜA44@`@5À?´@34AÌCôÂH�äÅS,Á0ÂLH@<Å&lBqø†p$X Ç
„B¼HŒÌH�ÜHŽìH�üH�I‘I�Ô¿n
Ø	ȃ$=„ͨ
h�C Ó1¥X5½Ø5mÓ8�Ó4½„7�„K
È×Ε
Öѹ­`Î`uוº(€YÌËzmBøW at X(
Ë}\CH„C`*Í€)U]
�aµ\X„Šm„ʵÜFp–
^-;@)²lª�Då䆓€�vÕ*¬”ÊŽG"ôÛu»º£DÙéV�ÝÀRo®0’DüÂ6ìnÅ2Nº<bX˜`âýIàˆ×¥÷_i¹èhi°å“,¯¤SŽJ�•V¦L7eÄçl䊭+©‰À»2iPnOˆì‘¬H„ÄãÕ5uQÈJ7
Þ<ÿv>ë˜'t»~³ÔO=Ùd^+^a±Ö[;ËÑP8qEØNH‘¡	)ÞCãˆÇuÁB¡…µR¦\�zÄNìñºi‹:}¦—9{5çua2ahš,LÒd–^6ä‘g/Ã¥Tõvo´¥¥Ww�f~d†+vSTPädZâˆ÷Ù™G½ô1È=;‰Žò{ÔÑÓ©,ãÀ8Ž�»Au9v‘uPÝ
)éRÀsÒ¤ëžÙµ¸tνu”¡¸Õ¯Nm:“×òUFom:žg/Y÷~è<݉€Gçxº¿&
”Èpƒ¬0ÊÍ“„·‘ƒË3qDtƒšÌ$^¯hÿM)
å¤t4œuæ(™¥
°B¦"¯
•ÄB®«HºñŠ£e;KZ\�Œ4 X|f2çXÅ94Ö6ž”C'ÄH
RÆÔdéð¤ŒR
¼e‘Ô™¤Kܸ“·ÑeQ¥ƒœM4“ ò¨Q"cÏ$v '!†O2`aÒñ±’ýEd¹ã”tŽ"ϼÎDA<
k®å”(9%~�1Ñ�¸£›ñï#)`Ãÿ‚ÒŠot)
ÈJ=%5>òåDhÓ–ìÅ(qT[€="ÔÁCêƒt§Œh«U]V%w™ê^èAæ9昄pM›
À˜ µ+Ýk:9šNŽâ5é°3bôú%¹r,|bd’Ž\>Ó³Ñd-*¬ÎŸ¬ÓàI*ür †
ÅÎ޹³UA7 ˜ð�°hèFXÁ³tl))Mikü;–ÀM‡¦âW·öÑ(ŒMlRHÚD^rD©0¹HP@¶+פg
¤À³Ìã™
1f$芉HÔ™WD at A|éŸ iÿëLè9µËP’QvÕ‹
óÙÑ�¤Ÿôg )®^
�a½Â
Ã"G‹V4¤ÒQ+
#¯h€ô¬´Š°�÷ÕL7=²YÞ°R’- ‘ÌÂà8)‘-MH›ì§:F)�û)ß
¨OÊ …]ZO]¤àÓÝZ0¤,Ž±¢Eãðˆubñ_ëX+µ.

ţ�$_R
™¸Sà.R"„]E
q,’zÜÐRäc:Ѫy´gÈhª…üw¤`€˜
ª€I–P9KºÓƒ�Ò�v
 &H8±›êH¸D%o”á- ÄoQ´�fò_ž=´«bçÑW�0…±•�_eM¶+‚ž»@¬u¤••3I[¨Òû¬âIÏJ~v�¶«®.鉮vh_£dD<4úkz¢äv„,DGâ ,קx¼ØÅ£3z‹u8�¶ãÔÍ-6ëAÜ’ƒ°l<0©Ø£ì¢ìñÈŒ!ÿ¯K½TgGwí½ç0ã‹š"EûíŽ'E®¿‹gZRs­œ¾bÙiëÔTñ(¾.¤•¾¶~vzÈ°Œ—	=ÄÈ‘d|Å-Kk	®l£¯´½CÇy©X¤Ze«u™9Zyùv[±äj^Ù1ïžÐ
i�Ýu`^vøG^¼ÓÇxÆéˆmH„"�ZE	V}T¥Hþ‰�ÔMPÚZ¸‘ÐyÇŽø’u<Ÿ:^þ‹SìÆ»�Ýa-
ZÕ
yÉ’V�ÌÝJ´iµDgÀxäË\ÍAˆG®KF­ öP[
(c†”Ö %€NZ;
è‚®ee2èƒBh„Rh…ZèØ
$ڙ̀TBlJŒˆRiòEƒH錂� ±áÕn�‰JÉ„ƒ0ZŒRé˜Fùd„nP�|Æ
œCŠK Ç™Äå
R‡Nd—­B6p‹µ�ÏxE:Ò[a¬Þà™ÄW�‘VtÝÁüPþ!Ä–‘]ÐÔr$o2¤´B fG�“ŽìˆB¬D
Ÿï(àR_TÑt~b7–é\�.™)�¢ì^÷AŒµø_£N(»ºë»òçŸÂ«¢&ê¼Úë½âk¾êG=
œ�ØD
sôÔ€äâYB¦c¨ƒêkÿZÖëÂ:ìÃBlÄJìÄRlÅZìÅZ&¿ffÀz
ƺë�zlÈŠìÈ’lÉšìÉ¢lÊêçWùëØpìÀª¡Ê²ŸÌÒlÍÚìÍâlÎêìΖ,¿¶,À®ÂìÈú’¼òìÑ"mÒ*íÒ2mÓ:m;íD0�¤¦]ÎŒÏL=BÞ¡9ášJá
áP7PH‰†ßû莭rÄ‘©j,Ô�±däboöjïöro÷~,fRífÎìµaô”ítO:ˆØUÈb4PP2Ú·—Vq ÚÌÝŸ,À²LIQ€èÄ
‰]Ü2Z‡›½BW¥ä
¼+äÛN5dJŠdÈJŒt…d G,”º‘Kô"%DD…zï“p	›ð	£p^f¨Xm(NÄ=•rKø‘ÆŒBÕªFxŠLADVD…Sq ´$�,J’¼K
ËñÓqÛ1ã–Ý¿Nê“8•8´L°d’KINö‰à�I!J�”-CÍl¶—ñjýT©'
ÍÙòZFaGÞš‘TÈˈIý4f2å…<ÍȽ(H)žÍÄ”»ôÆJZ#'É3ŒÐõ¦v ËÚ‰0Y׸Ÿ+‘ã®ñ2pi
ZµŒÑbÎ/Ù˵S\rÜc¡v<‰>>Ô
,à�=ÆÄš¬ÒdP*¼üÒÕLº‰uû÷oï
ï±€0„3¹‚)´QmºÑKð…t�xWR7|C mS Û"UQé)¯ˆHÚIÀÂÒÐP9`íh΀9ÈÓ7À

ºØ½ëàl«Ë,Ê%ƒ<ÉŸ>à ¦å—7eIýS$,�|WùÒÁó²P§!Ψë'u¦ÿóõI=WMœR
×kýõ!¦Ð‡½Ë„=P�½ÙO½ØI}Û—½Û$Ú··ïxýÛ‹ýaÂýÖSýÕÛ¥ÜG½Ý«}Þæ._‹IÇìÝÏå¡3¨ÏêñX!‡²Ì,—ßÂÌ+B%Tf‡)À^°Íu<¯ò¢ýX¼ÔSŽ;^ë´Žü	ÏŒYý˜ï°
ÿ(v†ô…_INaŸd4T¥Ç_!S9LEi舕Äòï»ÆѹQTSáÕ\Œ1Ç2o°Ns/c1.'Kô†V�ã½PÏÈK’ôñˆR+¸RK]xˆ§g4ößLX6ÿñ(Òä™E,{Ç�,ŸðÊtŒü+fOú½Þ0ÿÀÐÖ
0 at V,q±^•L�@ó+r«®"×Êä*¯Æ±2IQVº…HQ.dc«Ò¯Z‘‹%`U,ãåbu±dºV7ÉùÎXý°«‚¬þv6
/^zU9
Ê‹‹þ-kÕ8µW¥@j rªK'
µã7ñÒï$WLie
YJ㯳Î
*?W\)NÄÞþ®”ÌÈ“å¾átz%3–Â+)?Xˆc,N<y4ÒÚÄG ƒ
«•Vj"YÂ+‡E%m2R'#‰^1–nV™¯¹âV+»ŽÊ	àÏ¥Z"O8IàLjX
 CXƒÚ(Çø(*ˆ¡�dYí$k	¥ø"<T7߀+O@�¼s[([)>–Ä!ö!A{“ΠêÖ+i¢“e…>qÈàœUº1ÉÙˆ^aLFn™+iÞ›üÄ«4q at K2=Ia9G`Ú:ÿ”¨q.ÄèOøÊan5”^A¨<Œ`	ÔŸJ£ÎÛ;u\7C[Q<“}³NdÜÖ!n“U3Ù‡^‹
4Q{"

&¦°3¼>$'�_Ï
h�ŒÀ	@,Ò�#Ò€ñVšG	@šÚÁâeìÀ
3³Ç5`A<üPh¾ÿQ*J̪ÔòF8ƽ¬<ã ¤$e,	*h'™�ûXҤ末ˆó‚_+”ã>Úð�-ü¤¿ðÐd ýå&#²
A)%ŠKpT>s¬ßP€)F˜€Sè+”29È}Œ²á�…9‚Xžõ
 zcJÍÁÀÍœ“
Z…n–p(�2ì‡H	‹ tc¤)¢¥d±…é24(DÍ�¦4ŽX”ò+ŽAŠ(£©¥±ã˜Rë>©xÚnaã€éùg0
?–ŒŒ¶ú!E`¾U@¥H‡:uHDK5rž‘KæwYÛ±oê£R$ɶA`Tç
‘L,QÑÉ~ŒbÈ {*£2ºg(hå0ôD3^ãMð…HL
h’„²l",:"I&d)…B (^LèI¢„;²kEþ„+j£O´!D"z¬	H‚¢%ˆ†´ZB:ƒ4\hkBT˜ccª„ØÅáVÿã£Å¤ä„)ô†�pL~ÄÂÄ,Bd©u|T~ÄAŽG5„ƒ9fhh£äf%@$‡Q2â$L°6L%1H¦o O †rØ…?";r›h©t|‚qÅ
¯a�hˆæ®±‡E–ü"C~ã>Ì� x"wÈj5$±ƃxÌT\HggðÃI(E4T£©N
Î
"LR‚p³Ï3%Z�'ôÒL £3B(âC\ÜgÈ0zPâTfâ1%Pâc#rb»|ÄO'B[ã5è\Þ#ˆ¬Mä0�Ó:úOH
?¨M#R"H§C;Â
O‚X
Ôç0øÓ‹s¹²!Ü‚4\³C‰$TäÆw¨”.:t7ꔘ–T5)Ç#üJ–õE˜D&Ö´6­¬:sF�U?Ò
DUbk8`MlsFÕ<#2 À20<6C$”#Ih§!r4¯þH
dgS¬:BJ8\Jt0°((6é‡"Ã×*¨2qj
D‡€¦Êk
·g džË†e˜9�±ØgâÌ`ÆŒJ¡¼‚ÖžèËu Ѐw^Ζ
Úf=Á¦CZaÖ“*ˆ‚hƒŽŠ5s¥M,¤ÅnF†Š(h)XþH±$‚6kè6î‚6
žëÊá`9Ç$Õî7mËÄ«.Ë|=J-fp­Î‚1Rt¦5³¸_d^–6
7kjcˆÅ%VA6$wl-¨?
t%®¤oÞ¤Whvšna–îlÏVAl'�öV{ù	}¹9˜ÃÛhÙ÷>jÙ¸ündŠ�Roå-MLa‰5Ï5Cë
^ö22c3¥4´c‘D£ŽÐKl:ΡZÑÇLÄ~Ü«¾ÌžQRF•pÆ­„ˆ�™+ at j$•”sGÅ÷z	“Œªäç6M+Å�k'©YÕsà`ªùÊ­ËqÄ¡`Ú,WjyB*å×dÁ©á$,þȃÚnÐè-3Ðç|âÿk—àÌ!ä×7Ö$ÐJŒå‚È°/«ÔàæAæ†)
#hžfã*kgˆL5&iaV¦:̧¥Üm°2(„„Xª?Ö£¨ÛPX§ÚqÍt’èã‘ïv
¤9ºArm®³IB‹Ðä‚-Ø5ªW3ŠÈ;c’6FØDQJ;T9ú§Y	õªoF4(Î�¥‰'l±Än¤Ÿdè¦
íÅö(±.´‹éJV
4OFâª4ÞçAt#ˆ|í‡+Yn
äA‚©€Ö	ö`Ž„²CJ�
)ˆ62±ÄŒ­¦ˆ(Ó¡n[V/Wtʃ+rôE4l¥6nLe¡my¢åkaHó í}ô„ýzÉѽ›Ÿ<I D;ÏÒÇV­®P(>~íX—ADŽ<n¢ˆ
$
ûã�8$¸míÙçÎ5è�[ô]Š£%`5BãÚì´“ÅŠ¶re¼Ja¦ÿé›ãu‡£CˆÅ¢Vˆ90{ñj}…ò‘~Ö”#Æ#Yþ{ˆ28dLªFWžÉÛ‰—,%U¨GÿŽ"2~Ú3ƒú/îñ$úvùèAwUÛa#eh©�ŃÆ
äD,)¤®‘ã¥%¬¤hÖ&èÅÜ,ò¸ªä<Râd‘"Z^n~#$Î
@|åhˆÆã©Æ5¦¡MÌ(e™æ²<*'$ØnG³†WËEÑÖæO
r¢G?<KBDXOD$K•â\p¾C(Ë…h#*µ®â©A¨<¤GéÑù2MPL'Bd£Y‘Rl<È`&G!©¢!Œ<;N"AHï p¼QrR…8¸ÿ³lìÆXXåR«ãŽplAÎY…ÐAS‘í÷Sâ¶÷äc„Bï¤än[¬o¡pÞ‡F<~¥Yü¥<ÖI>7Ë5V
ãÞ¾:�D)5ÿ^õM&_®…ãEÆ@JvÚeß$ß¡	(ˆ÷ðŒ£$‚'x ­ \Ce€d"H&Lòe<hoI§C† Ô…¡‚<f/(d¾Ô�ìy†F·jÆHÂ6l¢ßÆAh"B‡C>9D,Î `�ƒUÖ+‚­b$'KV«†­ÄÉK ,Xé\½j¸QÖFq«XI„%«\CX±6’¼(+V×/7n<‹Õ¸‹¯^4XPÖ8—%I‘3IÎU,…ãVÿ•[Å‘bK’	¾ÚXNf9N­Lž|yó ¸n¯Ê
PÚð(ÄXK«W.V·£±Ò­:×M+Œ­2ÔXÎßV:“6ôû’TÒq"—Be*kÀE¦äÈ)…+‹œËX–K’ëX²\+ª¦Êõ­¬4áfXâ^‘ÒʪlɃ]û,(±›€¶«^u“õͤ8�#É^tu²C<*Ú”¥ÔCY®H¦+¦Ëœˆ/z®X0zEÔ7{GÛÝÃÂr²c\¦GQ—T(±•åoz_M°êòCr¦‘3NN¬¤µTV®|Ö—8
y4Î@à¶ÕD0Ó…º5@N\Ñ¡RPÑK	>DUÿqR”e
øPKf1ö�G‘­’ŽY/¾Ô—+LgÓ*/úÕJBFATG	’’­éÐC@ÕJ‚
J¾BSNm¶[Ä-®à*ûHÛª@"P'qÊ:)&º/‰Ä
g4/šóΕž‹®§sÆÌsž0ËŒ!µ[
´¶âùÜ“©¥úê…š"}éÐXßZ]ÑF«Ù¦µY‡=˜ØdésΞ54—.:¤rÙ/
ú
+Ë�ÚÜ�òx3C9žY4ÌgW‹wžw
8¥+¢•‹Dæzè!¼e%j°
ˆi.5&!EC
€@¡
@
Œ–!¥í!Cb…RZ˜¹Á‚1¯pScBz1‡söAœL’#ˆekƒ¡_Q–s’¢˜�KÄÚKC¢6Ä `
 !\‘
½¤Á@™rF<2r‰çƒ®HG+Õ
¦x†(1	†�¢,Çëi±àÄÿbœ¢|ð"²—û#™¦=Ø•IÐe|xc(Å…`|n­O¢C“HjY¯‡Ë˜ãŠÖ(
Âb7ö®
	WCg‡0*ìÂÒ Â‘„»
9Ë8<ºetÇ'aj2§<%Â"
¥
ܧtöx)±
ç¤~�BS±8$Tœãÿª€
Ö#
"ƒ_ñ
ÿp[‚œQIA$B@$r4G8°6=Sq;
‹ƒØVBCÁAÿátaa
öQ:F©fABR±rA+Ý@‚7!,63c±TØHv³…õÃZ-ÕDÎåWWtJ_XKÙE†"«‘+#�Sqg2wc	!&ó-ãÇTA7²aÀ¡Lqo‰Bj%a9ÑhQ tóA4ò°Ö
Ëçð÷µ™´–˜üÑòÆù·Ž]öx¹w#$Ã	!3 9Ä*y@ž3Ïá,ãÀòa>u‚‡aç²­¡šïa˜!%–Ñr@çÙ¡1$q-
ãçŠYñb‡r±b2ñŸ%&ñŸaaœJè’ÁfÇg
—ÿçà=É "xÆ;ñ›òáä©´Hg¸™kó6`ñ¡7‘¤0ŸÜ‰<xð•Qr¢›‚økaÁ}Ñ #ò åPn¢¹sŽæe ‘6e!>$!BJ/¤Ó
­‡i¦Š
8Z&á›Ó“sב�µòhy

 ìÈá"Yå° A:WfdGq#ŒÑ`S¤âÒb at Zš1A uR7�p!�‰XÓ¥X›ª˜Q5™¿=*VK�Æ+¿Â}§&»’b•a)»²Hº‚X�9Ù ¢Þô,žšRñÔ©¿:¬ÿÄ
JZ84êªê$ª—Ò-d3MÂÊ‹„Œ±j)äÐ$kX0Ñ
ÔêƒêíŪWŒÁH‚%­zIçÖl3V¬Ç:®›•©ð
¯ÑjV/1@�²ŸÏŠ)œô®05¯;°«WK'òz°
›Z÷º!ù*-õŠP”„& …-kI5°»±›¥±k>û±m²Ÿr_˜NE{0’+/a½ð½
ßð
�¹‹«¸Œ¹�Ø€¹ß�
@ȹ‘ß𡄤{Ùàpñ(
„ ‹ºpawóºñ¡ï ²+²ºËO	ë®ýº»V˜»eÔçôâN�]–c&ßP
‡�нҋÒ[½Ö[½Š�‘�ŠÐ½Ù›½�à½ßÛ½’à½å+	蛾ꋾ�
ÇpÃ8|ÃÈ°Ã;|È�
È�©�
Bœ
ª 
B|ÄJŒ
ŽÛį 
O¬¸�ë¸�[Å�kÅ)
„*1î¼^ü«$ûÅ�$ÆdìQÄë°ÕQÀC‚
ÒЀP
0Çt<ÇP
ðk½Û½Ù+½‘нÏ˽ݫ½äk† 	‘p’p	ˆœ¾ð{¾‹Œ¿ðû¾è{‘PÀ
Ë<��˸ÐÁl–@¶Ìÿ¶
?<ÄC¬
ålÄJœ
£ðÄP¬Ä¯�
OœÅS¡
 ;Þð
ÞÐ
Z¸+5eüÏ#«IŒù«½ИÆu|ètUîâ*ñ
ÍЄ Ç 
„
5<ÍÇÐ9ìÃÈàÆ
Î@ÄÈpÄ�ÝØJìÎíœ
GüÄ”
ÅSqŨGÁÙ”ñ.Úw•J¼-Úw•»«²Ðb&#ªÑmÇmŠlÐK½Š
îÌÒŒ
„�ÃÿÜìÃÜΨ0ÄNÎNΑ]Ù"ÞÎ"ÅóœXÜÙo
v„Ú.Ž\ýâ2þÅ«
†iü•&wÄÌ
L¬¸ðüÄ™]ÅœM1œ½]]<ã®þêkë"û®¸«¬W0S at GPa!Ùà‹`ÈÿÓ›Ô{½×ûÇܽâÛÇ,¾å+¾�̾훾ÖýÝ”í�|íûËÈûK¿œÌÉ÷À \ÀÿkÀ˜€	lÀ¼ÀlËš°îìÁ´`	� ïoÌÄÌèÌÇœïÉÌà|Ã2Ü¢€
ÍŸØ<
èlÄ©p
!®Äë¬
ÙP
˜-ñPê�ªð²K,Û1.ë"?ò_…Ð$O\�Rãùª•ƒH,OS”!&#¢2`ÚÚŨ„a` Ë5
¢>vê*06ó|ä)þó¥*ôþS(®Ââïò½rGT¿`g’ô^Â5Úzò^™__MTö`üÙà°9Õÿ•ŒupmÏp9ó6Z?>soQJo+4±ªb+SÅFdÿ÷¦(!øütX*ŸSîò2Ö1#¼aÆ EE¥ø×rÚã´3�…|¿'`SôÜB[Û2›˜~DWICø¡õW&�ú¬ÏUtbëÉq¤òŧŠ6By%³“,Çfy™m±
SxL!¸£‡‘$÷FF#:¢ýßâyÁ�¥-ïü$A.!Ñ †•
xEN–«V¯dÉ‚åð!C�–ƒØ
ÿ–EYåZÉÐñÕª
°Ê½bµ€T¹�
ÆÁê&k€¸‡°È"¥�Ü*²È±ªùãªäX •îá8â4büXòUSY«¦;àÕ¸q@îƒUj&+¥
¬vdÕÖOX&¬:Ëå¸UÝνj+�¸X
¼ŠÅ×TƒU¯Ä½rëU
àœn`¤q¤/
£

«LJ‹»ˆ"Úñ¤R å•rc/Ño Ç&
ÄQô•
&€N8â”ue$ˆ†‹¨œ“bY5ݼí毾L œX@¢)0
.š©¾vL`œËŒè¥û,Š…þ+åœs2,²¡Ž;©ÂˆÞb©®
ˆ[€¸=t#– í©ËkÕ ”=»ÙX (u%Nd‰ë®……/Årg€š®„T.ºº™i•ëJ ¸þr÷ºUº°T
òú0
+³¯ªl
¯KI-j«.¥'�¿×`iÅÊG7rÈe‰ªô°�Xù¨!™¶rS¢
ô<#¢˜à'ƒCßçd7‰�¥8WB�”¬‚´=ˆ/q9z©¼ud2õ™ßkR­�£�üÑüèR–÷yä5N!Ñú€r’²"êSÿ Aê7DíÙN{=d]Å8ÆÐ$‹Œg¬�Oƒ:4¶Ñ�ªóV³zó'Ì.{–Aé>8B\±7~$
M~Až5¼ ߸HF†Q‘�„¤kIJVÒ6q|e·°IÚ¯3¦Q¤”D9‘Ô<²2á±H!'cÊÈtR3¦ô£"yuHÉ€Ò8¬|edPY;иÒi�q¥%9“"²	Ó˜ÇDf2sL‹øJ™Ï„&fâ;:FaH’af4S—ÍZáR›ßg8Ÿ©Fq–Óœç<#&çkzí˜Î<–7]ÏÕÈ�¥
=ï¹O~ö�öôg at Wç­×=«š×ŒÚg
�ŽŽ›%åhJUºR–¶Ô¥/}c¡ I'´“8©Ì&9ššˆÖ¦§¼Ja:T¢Õ¨¦›¤N�ºTiÒ,
4µédbrnæò3?-�j`	M¬2Õ«_kXÅ:ÖÈLÓ	±«iH…Ю«ª˜Q*YW¹ÖÕ®wÅk±Ì
­´zk’S–P9ÒÖض&ZÍ+%ßšXÆ6Ö±�ÍŒL¡ªVË°¸Qêb+CØÆÒ•’œ…lhE;Úºîõ Þ¦,
WÿÐ3¶ä%¢=cKFßÒÑ�†ô£%éIW:Ò—¶t¦1½éGcZÓŸæt¨A=jQ—šÔ§65§QMêT¯Ò¯žˆ(ekZ/dÖ¶®5¡s}k]ãÚ×½6¯…½kbÿzØÆ.v°“}le#ÛÙ͆6³¥½lj?{ÚÖ®v´³}mmcÛÛÝ7·Å½mr{Üæ.w¸Ó}nu£ÛÝí†7»åMÊ�‘c
O€Bž
Z¸˜0÷%Œ¡F0ÒÁ`„½O|ë*7yàx—ã|äF�° …%l�
g� ž‚"ˆáäxǻ˓nóÁ�ýìe|¬¾y¯Üô#÷|ÇÃP‚'Œ!ç]gýàeõ¬¾é Þ ‚‘��ö"�ç7¾qÔ>êÅG>ç?OvÁãüê´ù¤ßGAßAï
º°„" �dàMà«.uòGÝ^?<úOîu–·ðP·=Óå_øù{�`ÿ@‚õ¯0 lÁ	[X‚&x‚žë8®<ú›½ÁÓ:æ;½�»D>çS:¯‹‚(À8è¿%:à‚&½¤s>¦›À4A¥ƒ¾ß#Aæã¼D?õKÀ櫹œƒ¾ÂsAÕ;AT>lÁ”=#ƒ(‚8‚+À·)
UMÜ|‡jÐMÞ´‡zØÎwHM•ÎïQ-QðOè,†kÈNà¬ã€7HÎÈ|pQR´MÕ”M•Mþ¼Ï&}MÓLÒ$¥Ñ}ÐÔ„P�l$Pƒ"XNiÎÛìNÞtMûQ­QÖ¼Ñ)mMRDk€Ç{hHçPƒ& 

€†]„	�€wt~XWœ…Ü"ÕÍ#
V}}‡ì,V{àÞb�W`ǵ‡Ù$€ÙTPœu`œ
DÒÖæ‡PôÐk]ÏŒl†zÀ‡_`ài˜‡4d‡y˜v˜
0DD-M°Ø?®^.¶×êÝÿÅ^%Å�% †µÍ-¶Cv[]tQ?DM•}Qx
jÒªW³vÂDõkÒ±]î-Û6íÛºsóží÷ïÝÁ{/.Ü8ñãÊ“3ÿîùóåÑ›C¯.Ý:oÕW®´6]ú{ëðâÇ“/oþ<úñÜ]“
0ïÞ4ÐGÏ…¹廢ï‚úEéêO'íePGIƒ™<(¸ ‚×Ä•ƒ2=q…Mòäç_~ž5�5Ô¤u”Q<Iƒ�:×H SK€öÓ5Icâ3×èPQ.�4Eáh0-(

H ÎE0éôN;
�!Å
@PJeP·Àwدj.ÑIEÐÄîgR/¹
4K at D”5‚V®9I hëREˆ˜BÿÐ oD at iV&ùâ4¶èÄPJ$a¨y-D‚JOÂyJ~�\SÜ�º§‘Ê„Œ]{Ôaàh
iØO—Á”:B�z¬
²—PB5�¥\Sõšß²¬Q�kÈäK@‚
Ö2"1¦9ƒ1J‚B

;tVi at 0YŠ_ò¦
"ƒÁ&O~Á·ìdAbr�É„|
jØc:!ÊšP÷À#‡õXÆAêÄ“¾„ŒtmVŽJr’IãŽr‹›R”†™þPrOÚÂ*V-äЩ>¤ÁåÎèÏ‹]ˆJ +ÕIcÍX´‚�ò:»%±/`†ÄV2:í*Ëƈ†5â*h5�	¨éßö¦ìÓ,<ÎN6³£ýìfC{ÚÒ®6¶©­íkoÛÚÞÎ6·Ãýínƒ{Üâ.7ºÉ­îs«[oMØÎKij¹š:A¦öŽ)¾ë�ï{ë»ßüþ÷¾îo�|àý~éL™P
äPYž_èÜ´z‚¦0ìÌÿ	®Ö2E�õ%#l|‡3
³—�zQy"ß—ƒðâ+ø–,$Ê3ÐIöQÆýÅÈxñú1p/=‰ÇòóŒ�*åC@¹Æœ¯1�H½¯d{q‰Í訵z^OÈñÇ
PËW0ÆFÒŽˆd_|ÎòEA«0Yóy˜Ñ
ʩ�
¡�`É0K~ÈC8@`

TtX�ä‡S†Q,R)fÜ3¤žÀeëXã¥Ev‰<­E]v"<`ƒx
X
Ká[K5b#>"½!§rârB¢qgs"âsÿ&'sV§s2"u^gtB§uJ'v2Îvf§w†'xv'wjç"º¼iAlL­Mm‡|ÊçÝÌç|Ö'}Ú'~›~öç}úg~þ§€h~N�}^Á±U�œÁ	,
Á	4
|P�`�¨@‡vh•–é“"…®€Ý ‚†é(é
ìDA”Àœ�Á4AÂ2�Á‚A¬µv,Â.l¿&lÈBAµj]Âÿê«´¦,¶’¬ÀB�ÉN+ÉŠ¬ÊÎ칪lA¨Ao‰ÀH�6º«ôìµz+Áj«É‚+Ò’kÊZlÉF�<
Ø+¿VAhA¿VÁ„
Ávl·v«ÉÆl¶†-»ž+µºìÉn«´¾ì×êëÚ²¬,̶­´öëÚv-·²¬Ú
l
Æ-ܦ ßžmÌÚ­¹ÚmÂÖíËÎìÆzlÁ´.
Ĩã2
8N”lÑbÁJ¥­Ìš­Ö™mÍ~®æŽ+È,µ¦¬â*®b�êA”}ÔÐ+D™ôEÙŒ
0É»º«Ê’­Ø®¬ážlàÂìèúkîvnå6�HÁ@Á
/Ü^/Ú‚®„@ЖA
—p«0§ðoð
Ïð³0›p¶¦�¬F‘
�¼B7ñ8ÀBw1'±/17±?1GqÃÂ7xÃ71,ÀB,ÄÂ+dCÃÂ+€q,hq�±“1§q7¨1¯q7˜1“ñ1Â9tC6
;Vì­^f{¥U{ÌW/ToáÆ}›**ºÈR©Ê«Šï)¾
óý¦êào…¿ŠEøðáX�!Ç’%ËÕdÊ–1gÖ¼™ófÿÉ�;êštiÓ§Q§V½šukׯaÇ–=›vmÛ·q¯þœ›woß¿�>œxænž0™âäŠ)`avUÙ›³C!Zx0QÇíØJD¸PQyI‰Ä{<´ˆ=GŒæ=zìhòãJ•,]Ö¿„fÿ›—*±é’žvÂd’Ÿ|JP“)IÊ(£–:ª)¦œ²ÄŸ²
»âê[>q[Œ¹…cŒ9ѵVôå˜^På˜åB/dpÄ1¼v¤k¯½Œ/ľI¬°XSIž‰l²VŠ‹RÊ)©¬ÒÊ+±ÌRK×vÛÒË/ÁSÌÞº 
å˜s"

ºg²o˜!ä�ÿ*�@‚ôˆˆÎ
Z`ˆ»†úè@ÚCO’E$¨³‚E.)/¾‘ mI¤üús©¦˜h
'
n؃%I ùC‡×%ˆáBhnÉRš*½¹æœ–ßéÓô¹(M„N5©Y•Ð©V/ì~«¥�¾åÖ­Œ
±j«K<X­Ùßj/SAF/º¢M[mµ…ô–ZÅØ.$µ¢Is³›Ý̵8ÿ.��
t o7›>�‚Ü’¾ÐÔ¯5
L3¯ˆÆÁÆ°�%Š
üá#è
Ñ(H jb#ëƒf
AP6¨@#(! ÀŽÃ ƒEdâ#-aÉ¥^ Kiêf8ñY%ä“Q…zÔKÊ•r=ìQE{QÁÊUºò4éÂWæ;°n±¢¬ÁhFX3Æ1ÞH¯1‹Y>ºËýζ¿´!FÙP…·äoÅ­€�Õ¥.ËŒÆ]š´à'AJQŽ’”¥´W™ �A5	 wÛÍ7šAˆ�)¬/”˜
LȺC(☣˜"
±…@ÿ�BÔ		aB“
ƒëm��̨£#Oï›ßýö÷¿G\¦}¹¶›œ­*˜ÑœJÄD$>†ÕC§¼›8$0Žq^#y?8Åø"0±Ã�M"º3‰îÉÉ™òÛ‚õ¬��I–¿J	GL•h„Íežó¢8‚(<÷¹%|þˆGXBè³x-1ZéM?ú#<¡4¥Ó¢JûŠX®Oüsë\ïÕYÔ"Š^d�ì¢0{±Ìþ	Tˆ¢F¨
«dùXÿ¡ðÓ>PEp6¸�]’0Jž°Û¯Ñ	5ciÏ
×p6X*Mœ@
¤P•OàÉ
Çt`BA*U`'UÒOcM_a[
~hÅŠ@›
€
ÔC}%wŠk:î<‹M8€ÐaÜS}µe

�`€WqÈ�Æ*“
e6”RÁIÕ�
U±<4&F²Th“,	D¦P,ߨVe‘�ÓJs¯2ü
+ç•õÑP<•ìÝ^�‹
U«Œ#)Û�óZÏvõÊ[¹¢")[5&ÏÀ"øÓKiTÓ„W§ŒwÞ~öS8q…R0}·+aÅ4JÅ!{S9«4‹˜8Š!ö‰WѨÐQ%ãÉUG^®€N7¡$),B	¤9r噢Wç…GQLa¤–r“%E±ˆìj˜Á™•‚îÂÒg_PúrÁÆWn@
ÏWCâÈô³J’
•r�z†Õw%�•ÿZ¹s¤æ�]}”ÑYJ•§à

“Jô¸õ!¦Y¡�{|’½‰&Cê+ˆT%Ìø„mCáÜRš‡8)Ù«\1±Š9B…’Ç)ÈSåPÖý‚·’éqåÉûIWµ
ŸñNÒÿÈôç9 4¯…Ίa‘²!�U1;Û;‹§|â(‘Õ„gŸ
–l
Ó¤L�*d™´‰²¢x�”ida÷ÂZ\@¨¦q”B,f‘Ù+ÛÇ¡Øä?xÚï"S•p
¥€Ö‹NÂI¢
$3xH\ø
¦]'\‘ùJqŠÄßõL€«ØG§2‚:´ðGƒäK=%¶�
Šk…Z at FŸxe#wüKұą©Pï0™oÅgz³DÐ6ö„'JiAŸ^öøåÑÄ'éÙR>R e±§wE
�ÃhS;.Vå<vÃÛ£Ä�Ç�Ud}ÙNd”’è@§Vµ2Ž+²òŠq±â"
s…
W$†aÁ	 ,L±¤©õ„ƒiE|ÊÁ	®ð¤0¦âJÍÜÚ$
émºCr�ÀIdŽÓ8PRr&æ´‚‡Å�•VN¤VY�’*Õj˜cÄœÔ$ÿD>‘2Ro8YµpõŭĬdüʸÿp¢É£{£˜-±,ÁãÚXjžsQ$j�S×* 
xNQE¸ÊQÛ“CVtm#\¹#EÔVôWÙ“`lü–öØua­$™g]O^üŠ�ê"¥p§F€5‹`V‰ìÚG“äÇN&p¯ßV¤¤°¬�#^VÎsMøªßš#•ÑPC±2'ÿÔm*ÏÚ�n
SŸô•£-
}:L1avW8Šá’u.°Ã«p'%öŠáWÈ…iÂ%YŽE7¡zœ>f1oæ"TQ/ÖU_ÁU=‘ ±Pè÷Bî‘5˜GYÓ“y…AΆ:±Óÿ„~Ï÷<7
,³å ezc?¡&Ñ�â�\5g”¦¸#$6!nÓ…ñ‰ñ|r¡vÅ¡?,Œ…$qé£voE�!ÃUcNûÇÉW7¶uJÁ[ãhRÓcä0yŠÓ”Àr•.(xìD-ÅWœBi?ãhjõ[Â	²5èS)(w¨²"ófG15	)'ØcÊ•H•XëwJ
-†65\Qz8F
€G“�!â85#†3ʼnGxfˆÇzÂ…G(¦Ðo1“qE’n1$¸f{bxP•4)k7!P–M�)Ñ;¦
§Ç
Îb6(8\z§;X‘1”ˆPL¸ux#V_WVMàF©;!•yç²%ÿÑ;d<ºga>zä0Ž†cP�!ULŒ¢m�$q.	r,rDøNû7C$�SEl£Ceâ æ7MFtDHò*1ùm¨$P3Ž6á-S?„Q&>…V8F±×L�/£—°`c¡§Wym¨;€÷ &1!@%†Ã“4i8Dò0‰,Ô20×0zùQWÙ„Ódaüw‰»ÿ#zwø¸°æSì¡�52:^BÏ—À";Ñ2ŒÂt)Ó«Q*»#C
„‚{XyØ×
é`c¦c9kÄ„}—üCB!†³DÒo±c8p"•Ša.᣷1G!%$Φ“"E™çò±cD•'C®:ž¢0$QSSrñ6Æ á—ãÑS;g!giamù`6†’ç2=h80y‡’q1è›2”>¯×v݆•¼ƒšLé™m¸› ¹­ž)Ã!¾šÓ;ç‚P«A|Fh­ •áAœŠ;_©;4µž7i!Q!k9!|¡'Ñ“®ÀX�ÓÃ@
°Ù¡²3ŽãI—Áš«°C�æR¢2Ä#ɘ¿Ú2C²VƒhO•5EÓYi˜z*RãÉ¥ ƒGù¶••6�F5ƒq£[ò%ª¡æã¥U’y®ð
‹ ý—y9iS'
¨ã™®+"±.;£oÊx¦†¹¯)®
s‰Q?¿
šr€/I¡ï:²5¦Œ�GF›­Ë™aˆc7ä­F³56Šj%.;¯wJEË­ew´ú˜¦y¦}Ê1|zŸä¹³zILâš³¼³›•‡—ÎÚ{”ÚxÂD›ƒiNjš£;4ù¬cê™0gSK�&¯)ÿÓˆ	
;³Ö(�/
mÇ_ã*"….A�Ô	¬S&1–SÕm«ÚEù¥¥Yª|ä�DÒv.˯¡I¼9z�é *ŠV@ÕQ‹º�Y7º1Ì[v4fºä™šê8Ò¸äSPŠCs/”Ö483wa8ã
!WÓŒ	ê/ß6¾hšsɆsóm³8÷Â¥¡
ÀU!
PB q-%•Î“yÒô§mÁ„Û™�~x’á™Õ;±�­ERójÒtÚH®!
ú\ÖÔ­ÝyŒÝݼÝ|Œ7Ý
ÏnmÖÞLÞß½Ïç�ÞÛÍ7¤j×TR¾S+*‘q‡×¡=ÖMP(ŸæH A?�SÔ
áÀñÊ-ßð-|±ÑÓ;;¦ ƒÛÞ"9cd«Öu:^¡C¸£G…qšü;Ä
”‡¤f�BÛc‘\Å4B ¢;Gÿt€¨Idò"Q%ƒçB'B?ãé#1âÙpÙð{É�
Ó¯GÖë­ÛNžGP.å~¼¨S¾Îâ,Þå¬Þ_½åVžÞ^æÊñ^WÀw}À¹9ßÅ)õñ&™W’•³ç"2ÕŽ
'½B2Ò¢`1Ò
Ñ'Öc©aá�éØ
“=qd/+è
¡Ê{fæc©Uí)¯òÈ~ì+ÏÆÎîò‚ó1Oó4Ÿ
ðe8O@˜r›vÇ ŒªM(Â
¦¡¡è¢`2%$; ¡ò3{Ú¼8!T
$²vs�;ÇÁQ¼8{ÈR69!…뇶s¼"zÙeÂÛÿú)Oi8?ÁwüJ�-ñ€µt·¸fŒRÍ0æNQæ3_óƒ¯Ç-ÿOøy,ø‡¯ø‹Ïø~üP óN—r7WÓäÛ�ø…ßø›Ïù�¿u(ïù¡/ú£OúX=æ‘?ù¤Ò»R~ùqœùÙ]ú±/ûSÞú³oû·�û¹ïUYשâÜs·Bí×-ǺoüÇïòÄÙÈÏüÍïüžßÏeåû ZùÏ�¦Ö�ýÙ?ݵ¯ýÝïýßoúŒú4¢Á¯òí¬üà¯þë/׆Ïþïÿñ?×eå’Asüû4Ÿþòïÿÿ²$XÐàA„	ÂRØÐáCˆ%N¤XÑâEŒ5näØÑãG�!EŽ$YRV·
Qœ\Yé$Ê€Xß
Š3YÓæMœ9uîäÙÓçÿO A…%ZÔèQ¤I•.�ˆR%K–/cÅbˆ°jBW³ÆÈU ×šYŠ•ÅukW‚bÉ:äÚ¶ì[·qá¾eZ×î]¼yõîåÛ×ï_À�#tÚ’¥”
LÜ:IWÄ%B\Í4ùûF7ÚŤW, Wï¢Ð¸šf'�ŒÃIóM"­2ÂÁ‚{’‰œv?‚-Œe1X“~Ó
«ámÒ+˪Z!=ɼ¢{McL9>ÕŠähr¤˜
/ƒ/RdHù×8º'Žq”BFù
t˜7(ªF;9´e2Çic²é^Æô)W̉A«°‘n4&«ÿ¦ñJF×ù�ðbƒ6’.=ÀÉJOEé}ô G+H�x8pz@ž‘HV.
Æb¥h”Ï$]P•J=ó2L:Ho´…ÔÛ0æ;I­JVBÍõ0d9Ú²YXqsP%':ÛѪ͢+sæU¯{å«Oì˜AÙuР—)b[((Þh‡Ò¤dH§VôRbqÍcŸéŠ¯*dŠÝQˆ+̇3É&›d¹Êb	#Ù0ˆ1,ý—P1»ž�L”m¸ü
iV
žÚ5-�!HPcCפ>¤µ©lÝÄz槙�- at Ic™‹æÖ7˜îA*Ë›¬\åšÞÌŠ]«P�@¸�-ÛXá
ðÿj=–‰Ž2�SWÝöU¾ó¥o}›rA<ö*b@¯6¡© †|�(z¥ûÜé „�®<m|#)˄Ȇk	”ÔÃœæ9ÏH5…udaŠç@G-
DCRÂÙŒ&ä<‚ÐÇ9žQ„�5#Ñ@‰m¾
ôƱc|¥‡l5öMf¢()ÙWÎs¦³|-»<¶G¹§ivxШ—©2×y°sâóLGV{¼1feÖªU™¥=’.Á#KMO4ÓùWHhŽ
 ÿ[ñ´j
5¥Ñ
³ã´—CqŒ"ìôÕÅ°˜xÌÓPe[o€åLÍ\ÊÚÀ¯`!½¨mÔ1ãˆÍVdµ-~ŒBe©ÿ‘à+.=!ÛQ‹X„	Ñ=žÆ2„sLÔ`�Ã�DÌ@&VûpÛ+®lj1Ÿ­�Ð�R§†¯t"Û>‰DÁ©OËØ)ÐF–.mŒÖž
L4Ö¾�bºX)ÜþyЇþ���˜¾G‚ÀJ
X$
MÂ5ßh�!Eˆoyò`€~ŠÀÒhš-z¹<�’ë
SP€òC2‘ü
0Y
øs\9’»NK >†¦uQ “1$LY¸˜ˆ$¤
4KmÆü­²Šc¼¦'g:«Ó\.ÔoÒ®³¬MÓü®‘Ȧ«È¦Ö\‹ÉÄ	ߤ!nsˆÝÔÚªÝÎgIÎ÷X.hRÎoZ
,,=)v’
Q¢%uùŒYI!(¹Za:…߀•Ëѱ˜K—Ùø;RXÀÄ(³Á™ú
›È”Ÿ6«öP¤IS¨taÃÇx…ÿÑaÑ
(5íX8cÉÒ(S at GŠ„:áÉÿ€i;¶ãoLŒ	©Ÿ=Á%Rh
LÍÎ
±¦ø:š@µMGµˆâ\Íhꩈ€NEµMÕ²œ -D½ˆGݲ»8š?	LʼnPÝTÝJU½°TOåÔh™–þ¨ÎÓ#�1
1Gñ˜'³ÿ3�ê賩y)Î+3C3œ‡z‘
þ2ºÊ™“}`-×0•@±
Ai8(±Ž23ÙlÝ8Åá(¢rHqÖ¬`�y"=…0òq¹Gyr(…ÓÈ2&QMâw
R°VÈÊSÝ‘I¨j2è(‹ÐY¨p¥Ô
@µ‰¹eŠßtÛiêVFØTô�»‰ý˜UñÙ¶…ø¤"b"
’¡�Õb±ÁƒÒS
4¨*Û1�Aß ö¨Ò©e(d…0wr'±dHÑ‘Ž†#Ž`óŒQ#™µª—‚Ê&a)ÂIRÁ¶Œ
cä
àƒ¬˜‰‘•é 
Ü«»£ÊÝ®ÕT–
�Ä°MÃ
0¹ël6Øz”
’±U€J°
Üää@»
`#µr5©•¢üŠÙ*ŲŒ
²Vp©¤º;Éy¼ßÒªü]��v895èY
ó/é
MŠï½v�±*«Qш±°æÛz¦õÀ™õßY–EÊŒ{õ¡�:éŽÙH²ÿÔº?k-�U•“EˆES•´ûª\¢Y؇’Um[›6³_S¶Kc)oc>y:µÂ�ÛbçÚd³Ô1ò?mq¿¾4é5ÖøìcQi±¡ÿ‰�Ìj…vãp‚ªŠ˜Ñ�zÁ¡—
Ô­1�nYÙŒ¢\læíÈ�ŸÊ
1Þ0$r1÷6‚q
¦Ì|y¾çàE‚Ù
�¡òß%ï×`£q‘N؇çï9&iiÑR¡·˜Å\Õ•r“Uÿýéaª '€×J–¬r®Z,'¬
°VÿTHŽà¸
r9RXŸ3• Ö7Ìf_	ˆ©óûªt°
†1avN)ŒÇ„ð(ß+®ôõJ
�WG™Ê¢W\Á'÷^~–2@:eÿa¶
LZ8öR‚òx7ä”b·hîÕ#¿ÆàCÝ`��f"ùV)`1$ßSRµ2�ê»y8Ô‘8Ârr
G2l+I‘“”HñºÇ
F8ž$äO‹¼×>;„S™‹Õâ+ª\X|è�yÄm)R[Ê+QÔkl§£Þ\Š0
\ 
…Å8�1Ž‘I_¢2@øjB
�®ú·­&ßÎhªz¤>~É8pÒ�@nL.”ßpº“�\E…}�Lˆ2²­tÃTÝè‘窳"ªEYj
Ž�V¥.œÿ¤¬#=”¢þ¯nH®Ë䔫c¥¤"VÙÈ
ÏÄ�gýF-Eó�¼T�,%qéˆÂÜø”�pä�³jILÀAø”E,‚‚	+Zè¡.D(ÁB_�«x12"…–ù²W��#”K´ †¶ÇT‡+aÙQX,5+†)é$	—ä“D²ápdñbHChÉ&áˆ�~TòÒ9RÿôhˆØL-1U§È*_{¬›UÔ5%²Ì*,1éŸh¸e’²”c8¥äkº

}Vé�f¿Þ”ÅgE“HÀ"JO}‰#®ÿÝ*wä¾aQnìÒcz¤Å¤h1|]âF!ùàlta9`_‚6ò¨+ÙèÆ72úÍ~’•s2ÙSth)·\Ì„…lS_6p
E�ú”ó"°˜‹
GvVÎR-‘M»J3–|’ƒ=ÝP
	ÛèœÆT‰cXJÄá

dL¬EV`1
FP(‰S'«T
|ƒ¼\´•�´)‰6s´-äß@�ù©g,HoÄÚTàBkmƒÙã‹šP­˜¤ãÙƒ‰K1”îEmÃγ
’j}T¤y–dÖV7T‘€¾
CLÿŒ#™È’"¬iÔŠ).cd�YaÁàÏȦ½lË­�Ž9à“c—ºÔR¾ÙY „*q“TiÉRKyKq!s¼ìÿù†8Tq¢Šü1ƒ"4F·â†Ä©@F˜4À0º%N�¬ I½–¢m¥>ÕåÓɱ*­i©!
[*ª	«U„Å0\�ÒR�Ö�‰#BÜ!	몒¾Ì¬*gì_T£¸"H´¤åîÒóYö”CDMÏ{¤%˜`jBâŽõ8F³½Û*)	Yò°"‘Cf6€C$Ž6†êo8&«P¨	B&U	UZp„rD딬:Þ3
8˜û¿ÑÕ~ã_ÿ_g$ÕðiII�óM¡Î#GfW!ÎXÄÎ\D„,ì†u€+ؘ�)4
Ó+ @} ET\ŒUŽ,HuÈØRdG
ND(×[ÐKPÆá†B*‹ƒ@c�…>¶Å¿9¦P|¡Ù×ù†ª
Ÿðî\Ô\'¾D:�”ôåN8WŠ”’+”'¨[àHIÁXvÆ�Ô„&J�Ââ$èSPP9à�¸ôÆ4D‹F»¼„øØÃÄM´%J98DÈY}��Ddd3Ê„)øDH<Äâ„H÷19y)iGoÄlÆÂÍ£GpÇ�Äl`Jd™á˜Rg¡õÐ)øLHDÒF„ ^ÄòÅŒþLNˆ„¡D[ÈDøŒ'0ÿ
"mIoŒCñªƒÖGb˜ËûÀ‘FÈ�ÞL´Ðè 	p¬Îh‚RPìí’EÐÝèiëÂXÝùPˆädˆÕ%
j2ìPUNÓc­Ê^p…zdGñÐf�ÈÎ*
óܵ©­Å@ÈoøÙFpı”ˆ§'ôXø¤IðµlÝc6I,'‡¼hº¢÷Pdg]„7Ÿ¢µ:
¶ù¬Ø
«,µIeÅ‚5€T:¨§N¥‹ò¹“✞Œår§]…meÑÜÉ°U¬sÆm5Xб\Xóê\©pèCS²N:~ÊŠâÃV¯º
GnÃWâlÒÇêYÈ«˜NfzŽe9X+a! M›µ^�ÿâÒù�úRj,sN’3Èf+¡nûÊÍT÷V„åd]Exp!OÒ`�[•VíäÉâ(’(

–³’šl¼ÿÓjˆ0‰º’…”�ØÈ«Æî;'�Ršê4–Ðê	¢­’"…;Ýb…;N™*È'µ†Zm&+ŒÉ‘⬿žÊ�?¬,£èr0g5üš
¬®«€ÆÚ\m*iQe5=ç²G îG¦^ûÕQVXs*®×«-GYÒ:‡RöÐeÒ݇HQ(½ô(r¥õ¼q ”05EYLé Ë‘R¬“¡o
yÆaº³Œ-ãiJ,ZÖ�ó°‡9Vyf';ûì¨4ÞƒÐ7Ú‡™œg@ÿ`Ñ*|ÅvVy:²
dÉ‚À€(è<<@€EÁ�, XüÅP²£’øb¡
Y
Z©
¦(Ç)Ä÷
�ÄN'%iR7
Ñ©W`
&ÑIžHáì\›„À#W!ÎOM7¦éÏKÔ–~d0‰IHóô‹kò¥¥ªJ6è—ŽhâDÇ7Vq=íÃ&¸Òù
]`:Y)úÉâ&/ÒI:Þ¤Z/À‹^œD at 3Ù›•7!+	
�Æ°T‹«4õÂœªDª�¯IR�‰xhRÎ i‘/Z†l:LjYp‰P„ŠÛRaâ˜,±CU´LÔ­%¦ÈP’«xħím%SC‹´ye"kY òÚ}@
V¨6¸læÓ>Ä<”È´r-@3QÒÚ#’‡j	ÈñnŒ›Åðð&Ó‰�ìöv§¸)ESóÙQxgg-c2¹E4IU?çtS¦¦»1>B¿Ë½³w
 Mš&b_ÒT7Ö×
Uîé{^!kY_¯¥hIÀJz2•@wñ>O¡ò.¹hµ€f2-Sà"â�‡l:�æZ”2]�^ÿå)
 A˜ó–j•#ÉâDsz”‡.¯¼î$i$iFá+“ô•°û{öìµ›Åô>=éÌ6'‹,®m7˜4ö��˜k�DÈ"“9ˆ½ÏC¿ä”cÂ;Ê•i¡|Lt�Å€5dû$š£ö™– õôZÉ7@Ñ`n at Y¶ó�Iq¹ð�åFàYE�v·›ªV&Íሀ«)ˆ@æS…€�j
ŒoÞ¤ùyê
’fÆtì¦ËbÀ�ª«
Å”åAË›´Iouq5-ݹ¯Ô‚�UD‰&äIÇ…C0&‡…3ã¸q�1]ÐU´â)ªUËÕ(q\®'}âtÚ‡h)æÊm©n°qS§¿ìÈÿŒdñ\�í¼å„”«1o“n`¥!k“ w¹+?Œh„#-ëh�AåoÁäšö¹OLâ¦cµÅ¾xí†"s©/¤\²I*ÜÊ®bá€SºoU0ÃQ^¡…ÔC"šÄ+D¬Ã¢'”'R2N�JË:u6d4ì…Oâ$šÇQˆÈ¬
7~ZÚä´®FãXCŽ¶O"¢«`z«JÞÏ#þ…¼Âˆž
ŽL˜ƒEN,wÄN|B
8¯Ç
ð úve&®©Á€hÿìÏÒ'
#àÓÎc²j£7ìŒPl,ÇêÂ0¨Í b2
cÂ~4(Æ:Ò§^ ѬÆ�?)ÅB 
0	*–Q!«ÓtCDÅ®IÒá§dJ‡ä¢?Ê-
ƒ"Àü,ˆt²�Ä¢C–1ñ”fi‚˜ZªšÌÊLãïZJ*°‡–®ç%\å-Ä5Ò�ó`„z¢C>'.ßâÒŠˆ5ÀËÐð-(5:
cFDcí¶t >8)qFêÄ~ñ4Á(‚ 6’Ï2C…O£Á¢%
$£‹¥_‚è/nf-D˜"èf+úC]Wy5Êp*f&G†OÐ&)®´qt2%0K”¡ÔBaøSÒÇ-	¬ŽcF’$wö°†e!ª‚—0"p
ÕÍ/¢N<…•YÃÿ"ÉB–¿U¬ÆF|‹Æh&ç îwZá*Do¦I´¹I@€×"�(%‹äˆì>ÿ2µNäi„¹Y NÈáú%Bî|¥Q4®40‡bK_£hŽõ„ØSÞ¦?B!†iW™EÄ… ‚È‹‡Åè6ÐhÂ\—	ö`¤;†%J
š�3ùS"švk—ûr3#«7í¦OfäˆurK–z€�qÏ´W™öÈP”Bz¹æV긿ƒ¡úZ]�Çu7ø…¼îdè.%JvYˆ0zsæ6¹ÏvhDc8
»aó°{°µ«±Cƒ…»wpØE™'bˆ"["Ø#„Û�‚F³=²½W´K[´[±‘Ù^ðuq‡-fâO÷Ò´QÛ´q†ûº´C»¶µë²wÛ·s[p{ü~»[·ÿ?</˶™¸[Åou£¸)â/bJ›¶%{R>e78�\"6|›»¶�U»ÈÁdd[mÀ{p®[´{û6#[„ÙãvÊâÂO>{`Ò›´“‚½w[~Gwy3¹®CüÈC²´xñ$î<P5tH‡FÃq~¶�"‚‡H’»m†Ac•™+öì*,OæcÓì»UV‰è¸±;µ7["Η©UZÆCƒ³Ñ;°Ñ‘Å•ûdò›¸#{Åm¼¹U›—fÈwÛ
–8
ÿ0NòAY«ÊÅ*×
r««º%ðª\äXDW�Eðœ€V±V‰ûÆ:�À�âTŠ+ëU¬
›a•(ÀéÜ�Å‘$×*æË�²*Ö�5n[³Ô³kßžûT Ö¹û|©w¡áÅ#M/“½TXîcžWÿ}=w¶ñãÓßÏ¿®~ŸÙàÅ×€P`M®„õZ2ÄÊ8('!,�EÙ*1AÀ
Fä`(€
p‰
0@Œ¯È²d¥�Ã
‰«Œ^L��à|RÍ×ß”T^õ”û]Yå–AÍG^[Z"}RFeR˜9=Éÿ%ÿ釦,jÒeÓ›jÑÙ”�Vá©“žƒ5uöõW7YÙ©&ƒqÎ$ÙL¢1J“8_F†Ö¢BÆ©¢pf8ç±)7)kNŸ¡‚YêL¤6u^ª§êtéXJýWæ\¬î©uîÕj^«¼ÒZ¥®5
ûT~½ÒtW�úUâœ2½Z¥1=™›Oh%J~¨.ùh´è™“+ìͪ°{Û_|âVg.¹¢‚ÕlRcÚU¼b±ê^¤Î:E¯ªæ»Ô¾gõË»£:W¢=…^þu`°A!¼¤·w”šäèhdvéì1wû„ëÇG…<]¾õÞÄ¥Élš+qÊ$GÕqNq±Üÿ«ÍL}	:#ƒ[áÜ´NÅÅ
J
Âõvëk×¾þ
vÁâmÐc/ËüúR?ceªhú!wÈŸòð=|‹¡væ¦Ãšøpw4ã!	¯²Ä~	1bZ
P^öBCëµåˆ
ûaÜŠ¨EÆ�‹Ñc—:±ˆÑ{gã©ŽÅ3ú
GwjLÓM§Á8’zXôèX–Ç®¬+í›#ȸtÄ4Úñ|	ÃêHÁš\o&yìãøIÉJ~P�–ÌdS%IIö¯‰ž+&5Y,…-²z±°ŸLªEÊøiÒ�­”[Ì$I&úØ–òŠ%áhÿy²�òT£ÜOtÖFF>’ZÄ¥.{Ìe:qŒÊôϸn‡Èº.š�l¦3ubJêÕБ«´Ò6÷8ÎÃiI›­ä¥Ê8ÈEu�,'ˆIET>R%Ç4¢øܹx®	›Ûä§%*O·”;¿à:ýWP*•®›nL¥¢`9€6�ê9èE›¦Ñèù³rˆÓ›E7ª“ß%”¤ÜÀÝ‹Wå“'«©TL›ó¥šQ&qÊÕîbÊS™ú´§@ý©PáÉLÁ'GU‰JHrTn)©8!ŠTeB”¦ŽKð2"HKò¤xy(J5jTáU¬N«V}*”´WV²Fë+cÍ	R�zÃÿµŽ5©b}«^Ý
§s¥¯€å«U™ê
¥‚U°‡5ì^É—x1µ­jåëU'Ë-ª
ö®‡�I,δ T…¦C•M=Ú˜1%’5K\åˆÒŽ²OjEiñ¤'€�QO
3bË‘FB’‚I$*qÒDŽ:�èH&™)n�ZQŽŒÉ"H™Y…s/לVl¬2¬H‡
i8š”™[]Y8ÔÈí0s 
å[›†q�sc>÷86~¬Wa”Ä.
1ÿTÖªlÇéZj‘Ñ€±Í	=ÝøÈ”0—>:jG<Â`áÚÌ1I‡)8\
c33Ú¶kôC€Ó¢æh<&¯oŠ¼Û›tŒY´©T>Bã˜^z!IÿLbÒAŠE
™ÃT߉“]Æt$
ç‹#3¯h�–Jú§îµY¨aC§t#V
¹&qÃ-�a h‡5À3R–U7ˆLë&Mƒq+UE-µ-
O¶`p
\WÀ�†	Ð\¨±
¥
Où×… $õÅ!ºg«0ºh…Ý$"ñ#à
Åè
.¡
 ±�(œŒ!�!dß
Ùßàk+çgñˆ¹q´ØRÖÿb°t–Æ(Àmˆ	…1ø£©&ŸpØRS�q¥
ÒgG7‰0'
Gƒ!#rÎxƒ‚˜J*Hi	"Qñu„›1caéš‚jzÆH¡Yr�i̇!x°)çÐ
lƒñN¢kñ†—eG£*
²3õ„[O2dà—ÿÇ�ÿ—¡
¦{QrŸ'IÙ!–
ã
l¾A¹a#?Òƒù'‚
æ ¯NØ�²áåEY-’piå9…æ@!­vp1Xs�ƒÕ(
$”úºÏ•é€Ï™œ÷בÙ�
‡ž'aÉ„Ñ�g)›¥�žùÚ¤|yb؃F8pïÈaÖ
×"|ÉìÕ„„2#ªá¤õu€Xkºy©çà¢
+†X	sÕ÷ie
šµƒªDS˨uÆ"+ÙRígŒv°â#cû8ˆû 'd"æµaH†Qø„€
Ѧ'\±¾,q]†˜GFœ	¥ð¥¤Fÿ¸‘œ‘�‚ÇÕ8Æa¨ê÷·�×Àÿj\_§*¨p1£
wÑ#‘v綟1l¾A¨áy… ù8š
Šh‘èÅ51¼

ДTë]µ¨"Ÿv†zè©äE
é�2
7xƒ7g°À…N8c§§
ÀyDI�\_q‘N)d*
à„V
Oi‘Ö4Œæg6?õÉsôTÿN¡2âO0AÚ™®.SñôîX�:áÛ2ñôUcö™ÇA.ßh¿fòƒ{GJÏ{õts÷x¿÷Ô2Cöd—ƒ0þþ-«#aËõÇG1d‹ñO1hEßC2;*rŽ$�^TÆfM~ÇÌ÷œOIzßù”ÿ×Q÷Ô' ¿&‘úUªªßúÛôD8oOÔ$‚y2Dèáú¸_õ©ï<¹RÓûõR¤ÏÖ)/uE¿ûÀ¿üx©ü¾ÃüÐ1 ±õÞ”—rü·_T ïÞéaZ—c4eù£B½ò*ºRbtýì�>5O—ÒÛþíbû21CM`_{º%á
ÉÝ
ñ�

ÔÐK&�„Ñ?/9”ÐA/©d’J'™$“L'Á¤SJ>¥¤QEͤ’R5	ÕU-©dUW_Å%ÖX-‘[n¥…–[mÑu×[nýµ–[r¹åcŒEÖXc–eÖ˜cŽéåÙc|‰VÚc�ÁöCEüpE½õöUÄ•±[Ï�©c’«Ç(ß…7^y祷^{e™4Xò½·_—ä×´*£`âµ×¤à2&r¦ÿó2yxÍ3ÍT3b‰ãœSN=ï̸Ï9ù”$’DEtdII¦ô¼IN^ôL6-µ’Ogù”UQ)-“OE¥ÄÕV[ÕÄ’ ]Å%è¢WÕÅ]lÅ…[uÙU—[tÑe[¬ÞEê]Œ±åØe•e•^–=ÆYk¥EæÚc(ÄpÃß.ñ[³Q‘\c¬{ƨ¢b¦¿ð
ø_Á'¼ðÇ’4<qÆW¼qÇo,ßlx¶×ž˜
ß»Äñ¦âZ� 	F=ô™xÍ6UOóN9%qócCBvÓP�
ETPHp4ÑA'!€
õÊY®	QÈ\^ZÑ
q¨BÊiÞð&à<Ó�É‘@Äê F'7�Id�ºÓ™Þ4'HdBd‡8Ä$ 8(HDŠc‡Z™Ëª(©?

äPÜÌåÀ‚”\QJRi”V4D•	a,ÿ¦9ÖÒ–·Äe.u¹K^&p˜ÉW7Xc9'Àð%zq9Zi‚Í#@
	E˜©šˆÐC@W�CHâ6¨€6ó°'HøáÚ¬€
ò
»lÓŠÚ¬Üô§ÏL¦
£zÔ·Þõ#¤	å°äš&„!auù]	qxŽîÃ8]üé‚n.¢Ú¡'‹
±_}�õž 	íIL:Óߢ´
 ƒŠ>´e\4µ>hö±�²#,¡Q	L™âšÎê˜Fä ËÁË@A‹GÔ?¥
Ù<q%u‹W¸{½ÿ„ÁüÖ“Á’sÁÅ&Ö˜½+˜‚-
‹ÍY‡jp˜‰A„#4“#,ŠA“5±˜"R5"Z��é$ÚHárŠ²âá"“aBqNé—!C�©žÙ™3\™¡ž)sCJXù¢¡ó
Ÿ]±•DÚ¬Ášž:<¯ÙšfÙ…²I*¤ê¤Cü¤‚¸%ý¢ªA%‰oø¯§˜¹”«ÁLt½Ä³ÒDÇàÄOEÒP«‚q�+€‚Ì©‹ ÔŠfP(‚"E˜µTƒÅX4„n‚Åc#ŽEð&oª¢(Ú�c‹Ž•Á”é€èØŽë ŽF8€/€ï Jø¾O1#ñí‘£óÿ`K`ñxnŸG¸�oäFïyqä?Op�ñaÇ\É•þÐ[
ÕÔÉÝ4�¤Í»X˜¸ŒK»ÎÃ1ÌÛlÁº4Ë�dÉ»ØäÌè$ƒLé\W Nê¤ÈtLJãÎúÎîÏñlÎ’=ÊŒ�ÙøMîÏÎ(ÎÓÀ
ù®²ÊÃhÊÖ’ï$0æìŒ×<°“$ì$Ï
%PÂiÌ=½R4˜ô,ÍÁtÐÃÏ|
PØ\ÅHÊ	•Œ�ó%ÇØÏÑHNÄPÑÈ8É}ÌÅêlI
˜LØÿ��² PâôMÓüMÁÍö,L#ÁÑ
ûRYH‹ÛLY¸Ï®hÊ]ü
~ù¥ðœ5•4MŒöô’¬˜%Æ¡Ï&­P®øO3uK0ýA}ù‹/íк
Ò{VX‡nÈÚ›e…B³bÁJÿT°ˆ¹­Úq8]á
ˆ‘¼l	þV
X….ýVW€nánH‡~X¼•4)Eâ%NPÉ$&ÙhÐiqX…XX
XÐäíí†ØàWX€�MÙPM

xÕrˆLÝYqU\Hå©ÿÈVÜ®X&Uv^¦]J-a˜0ã¦Ú‡�ˬÝUö8ÙE
%fâ°¢[ÅÜÑ—ž´l�Gå»ø‘™
(….‰
dn‰ø†Š
⸠X
¢Uã¨Pc°˜�*~…s


A+Y²`±'«a9V°V¥cµ�`¹X²^-Œ•Ž¬Xå6Ê÷ªÜ*…±R¦s•�œ+…2gÒÿ¬ió&Îœ:wòìéó'РB‡-jgLœ�2mêô)Ô¨R§R­jõ*Ö¬4»	ˆâäÊW'P„„5“£B“¯Ä­:‡­Y™K¾"—paÜX°\‰ke÷¡B³®ônŒKœE¿ƒ]‘³«‘£É…­ÒÕmUwã8
7/d5®Õ8Ó
Æ…EÐ!,Á0í*Nˆ:ðBÀÍŽËýj5¬¾©ÊB©�ã*r
írŒùWÅ’­ÄÁ À€W®AÓœû¢éŸ‡›F+Zòš�[¢D™åLÉr3&zXå‚kd=uIÝ•[}™4ŽCK¥e‘E½2ÜBå¸ò Aÿ†öPjv�CNJ
¹b‡¡eÙqÆÉ"RB1
¨‹-ºø"Œ1Ê8#�M%Õ“‚5ê¸#�=>ÕÍ
eè±0»% çÎêk¸N¥;¹¾Ö;-¾ù
kè½úúû/ÀÑžXQ W“ÊÜ.�ó.ü0ÄKŒU¿·9oÅkÜfµa9á„Á±DTŽ›¬#´'«¼òÃ%³üfÆ/ËÜ㞃¼í7[Õ¤ÑËWµWÌ£úüiÊP¹<3ÒI+MTÑr-ýôŽ5còÈ’þÊcÉG+;´ÆAû«5Ôa‹=6ÙeÓ¤Í!&&�»âÛô¤RqͲ×
×m6Þyë½÷Ó@B‘öÁUÏ4N¿sûöáo~ÞâG5NÕÝ–ò7ß•[>v¬”_¾yMR‡¥ö”6Ú�éã¸rþ"⧫¾:žÿ‘³Nv6<‘êç�Û$¸ãO¥¾Óî f¼xé¯?<ñË6ízñ'ïymíêuŽgﶋ<½†Ïü›Ñ'¿=÷Ý{_6�³«Z°íñrªý£Ø¥¾êšKÿ=üñg…¾ü/ŸJ;ù†Q#ýFÕê¾™˜Ò¿ú°€lØ
óV-æåwæâ^Ý
þn&²JîR(Äš­ "%¶îk.ü!ƒÈA
 ÊƒÎ«¡Nnè%Ê+'#ÔÊyÂD!R±ŠV¼"§¸"¾æ	.LHÜ'Æ^‹f<#—¶@#®m&ÿ¸sÓçE¦±[Pcó¨Ç=.p|2|£,ªv«9:+ŽfÂã©ÈE2’(á‹!è¾8'CZ…�6)£Þ,Lª‘žü$(—gD@Ò«kr%*S©ÊUúä‘~Œ$
íDI8NE“dD¤nX©Ë]¶0vO
OÊ�2�•)S�‘X%¹ÍÀÚµ°4u%?ŸJÂo®
W¸‚¾‚…ôàJ˜Ã
zа@âIèA”À‚‹_œâ§8ÈC.ò‘o|âOÂÆSŽò•«¼å,¹ËKÎqŒÓœã)o9ÎYžó›ë¼ç<ÿ9ÊwtŸÝâF—yÍ1s˜3}éHŸ9Ñ)u¡ÉKèUºÕ©®õ©s=ë]/ºÌÃÞô±;êI‡zÙÓ>öhüâmo;ÛYÐv·Ë}ã+�ûÜñn÷’k<ï}ß;Ýý^÷$Üýï„×;áù>øÀñŒOüã#¯xÁÏ}òvw¼åoøÂ/ó‘÷¼ãA¿yÑw~ó™—üçMŸúÅŸžô”oüèUzÙÇžõ«¯üía_zÛÏž÷µÇ}ï�ÿ{Ý¿òÁ'þåi¿{á/ùš÷}ó�?|éGŸóÅ·~ò¡ýÖ+ÿõo/ù:à†�!< 
--- NEW FILE ---
GIF89a‹
ð
K\±¿¥ BA*|çè“Zêï—È Ó›ð%½
˜cf{ÅxÙ2õÒ[ï—;÷ÌóÏ?ŸŒr+è%“Ìɸ”銚ÅübNÌ—sN
ÓêÎÃÁ^.ªH/„
€d´çhÅpìŽ
¿ù�)—ìÛ¨É@ªÊ‹Yj`gˆAº©Œ‡Ryb�|^8Jö�ÐÓÒµpÚyÔCqPD°|†Ýgõ
íÀ
¥C;ÂcBÀ vÂ`ñ’:Àà´£LÈ„F¤:†6\cAÈ`I¾àBÊ@:7ˆ3£D«�µ`ƒÀ@;k´3&dž´óÊ;½†É$¸ÀiÉ
‘Ê rºpx›ÿ¤
½J±;¯×…· l¿Ã%{„$”DZo‹øD¾ŠØŠ¦å¬NH;l
“Ì
È G™{&§–Å�·P­¿#­ë2 C´PÆæ/ÊÚž™5p3¦™2•†¦˜¬3h¯o—iŸ·–°¦H)…½–ië
4/¿Çêÿ¡…�¦vŸ‚�[¨ˆèÀ Ùë
j§I$)™›T>§ZmçÑP&Åm„’—ñÓ/qâfqÂ�­ /g¾[¸•sz:
ªK^’…§d4~¤D&”½éAh©&F¾Ð
éð›.„›É�µ3Exz¡­�Ž*'9º…½Ö„²éy¼4S„¢(êBv»vÃp‡E“‡SÄ&›øúe·ÀÊ€
	…3‰™‰ép
”÷‹‰c„¬`{K3|J]83ÔciÊàl—¦Di·…45{FÛÀÀð¯ÆIE
Ê
¤8Àׄw„�B»3þ™8&tIq$Á3,<5�¬h„dj„E£
ÊÀf‚›©ƒ‘‰DpúGÿG0ùÿ&GuK�I„jhj:|ìCÔÆG¬Ð5‘Ǿ§Óuw¤Üñ(*¥‹%`
nÛõ
Ý~ÝNã2.Úº µÔâ�LîàÜ}àÛ=C>ÚãPêÉ'0
 ‰€!Quk@èVÿ…*²â^àó`ô�O€!ý@Šðõ€M\`^�"K�7Ra�áÐ*öÀV‚ "órpMõÀŽ,\À+bpÜ°í%ëzÕë¾þëÀìZ’D€L0Ò[}dÞr®8ͳ´ÍUd~¼H0Îþì‹·¼•Ç‹
Ñ?O—
ô˜šD@í§IrOHWW%W¸R-°+O+éÎ!«+­Â!é~Tºb+¨+-‚O±â+jÅ Y²Ge$2Wå~*¯²è	oðû¤-/,	/WTòðÂ^ñì’åp‡¨$w©ˆŠ”úŠ¶d?¬ä>ð;šÖ|’„ÂìsJºëK #ð
9ÿài^Mó5ó^M»ðvIÄ3:ã6EHÏB#4>#7eX4GÓvZ±�ô£ƒ3©ðŒr4JIo·¾PŸ­0“Ì
5Õ›€œ4Œ
š$/
pŒC˜TÇ@
„¢Ã 
;¡ç{
À
í€
&¤9S(
ɽiÂö6§À0§ï9LôDß3ó25b�l°³)Ø9zÔ|twTyÀ¸9Á¬ '–OŸê
l¸Ó©g/)ôÚsûÙ“ûÛ³û¸Ïû¹¯x|Rsɤv°É6²DŠÒl©(ß0²,K_—sªx©ššt¯,KxÖ1ÁíÜÿ×'ùú«”¥àA!EsÍSªí¨<ªÐ;�D(šBîá’¤†–°÷f¤:qývì†9&Kj�
8
©S© )ÙSµÅÒF�:îh·såž.MZµ[�ç¾Fízõÿ츦S×&
;¶lܽ	jL+–öpâ´‰µ�ü·\åÍ	Â-~<.tè—«½µò·Ö§WmÛ-	ò)D�ABE
ò'\X½Y€
*&€þtÃ…Éþ”)´sÄ:¦—a~Qf®V�é>�ê:æPb~€T#�ºðœ^~ɈÅa5¬a�ñ…TUíõB\¤ke/‚D†Ô]CÌ�;
’ŒU�IG¸p…

–dÔ(QA@„!ÿ²¤ˆ ÷ÁN1P‘e¸:qT¸ä§lÈF9òÒt„Ä‚œ‚Je�Q1\Q£áIÁ9
´‚C?!£F„`:XÑ ��頉ʨDŒPðE£"†�Æv¦Ñ|†,Øùb 8tÀ‚¤ph1Ñ
2–TåD…qJV2ïÕQLe‚Ø„3G=æìZ™ËÛ"0ð5J'§BÞ
¶Q+zcƒäøžå<rõÏ8Ù³dóhCGIÆE[”$΄4YšÖ OîR�zâÕ$K¬€]‰Zäᬊ?ˆœãu™K^ê2b´êÔË®¤d„Ž !‡.L’CÊD&¨»EWDf½
ÿ…q(k–T
wôÒPK�A¾ò•7•§ti�¨ä�‡EìaÅÒ–³�Zÿ[
!˜þÊXEÚ†²ÄСX

�ÔHØðÅÓ˜‹^ÆaüÅ_Æb$Æd<ÆdDFØXÆfdF‚Æi”Æh„ƨ˜‹¸»õØ1Vb–BÑ(¬˜�Céšq ‡r‡q@Çr@ÇtLGrpÇx”Çx„Gw\ÇyÄGuÔÇvtÇ\ÐG{äÇrP‡]‡]XGüÇtÜ…�\ÈRàÇ|äÇz”Èw¤Hÿs¬È‰´ÈŒÄÈ�¼ÈŽÔH�äÈ�É�$I�ÄÇ]†”ÌÇ‚dÇtdGƒTGvlG‚ŒÉ`(ƒÄI~DÈx¼GtÜšœIuP‡R H˜TŸlI„ìÉ‚4È›lÊ„lÇr(É‘4Iª´Ê©ÄÊŠÔGƒ”’Ü"‡O¡婤£Jžìf*³$K;2Ëî0¥ãF²sÕ�Â"× †
 Ý€–‘™#é ^ÑÞâÁ´¥e‹—ؾuPˆŽ		‘à™b›

°L”0‡Zˆ™Ò	sÐ…ÍH†qÊ	

?ù8ú"œ"Ô>%TE%©r:ÖrJVdE¯g]Sf…V9¥VHˆ‡:ך,¦b
è`ž˜<úÐ(dµ,Kr¡¤ѱ×H2;ôˆ0ôQ��0
-m„///Éj­
†3B4ú×Ä ‡>x‚Dð
9H‚(ð?�{¨‡zð�=
†Y¢9]®¸CL~-†`Èá
 yŠÿÒªÒ·@[æê`pùàâ
aÒH¡9‹Ã2ÎÏL	§ùO^AŠÏP²P†

`àc
Š¸§–ât

sp&aàO…€ToeðÒ8Q¹
ü)
`¸§r˜
UFè_È—t ’boBùˆ‡ï›‰›HŠß\®”®áÃ!‡Z@«@‡7�
ÿ‚Š …vè�3
ƒ^0lãa`\€ò¢ð#‰—ºÆ5†$¤•©"I
J•Ð�pjŠ‰�‘�NØQ�¨ñ“‹ïÕŸ–NahïZµ§ï¬Š†Ð‘’�À'�P
‰H‡ZØ�u„>Ì°üÁ(Ññ
ëí”tÈ,ÌbÑ‘ÈQ™b¶�d8�ôÔ‘²è˜ÿv¸…>™¥á…tøÌZÐýî|“@AåÝ}_¥×Qúȉq2
^ ŠÇ$ftð"e�Rš‘ïs°n2‡Q|IÃXˆ7©©×	ÍLˆcªŠÃ§§)p
H®¬ä.?atL/éÓŠx;2¥Ð9L=5ŒZTe¥K;±B"0*yxPG®vŒ9N¶[2+9È
ÿHè£KDM¥smÊ1ÖLÊ,Rš7©x!›¥Ã
š+5¹a2š	ÓZv6æ8c1ö)ƒ‹0ëØÂT2�	4ZSÂà‰Ë¡¢ä‘2D³™97RyŒÇDv0ÃØWÌ�0ÇTV+5uŒü™èJ¡!ýX¢a®þ‡[+Ž2ŵÂX°?y(S–X®b 0jÃì�MvdÕ
“ŽBR1öâ¹’"³WÏzKÿ
cŽWé¬Ò026xA
ÉW[}Ä´RÞvÁalqæ)çÛz'g›sÓ�0‚ÿ
ÎEGÂ1T0
Gæü¢f22Òº’9ÔáNYޒΞ0µS˽¾0áM
&cЋYž¸¬©®ÃK‘¸�’é’ñyŒœvÁå½±ÇF«§\Þ}ë­±à~놑FíTW2	úÒÎE·à’e1HÛÀµÿ1Û¬ŒL©‰.¼f…LX~­»5
ªQ.&†b2KvĘ9¤¤s°

ÂŒl•‡1
ƒÞÑçL`]d¤¤UÛVDr‘èuD®8@‰ÞÑC¯4‡*´%
Ú°Ç>Û�ztC‰°‡?ô!�}ô#{8­"‚Ž~„¶±�íkkp$B°u,lû¡}8–Ix=èˆ(�v³óÈm>vËXå2ö¶‹ÅGk«X×R·ºÖ½.v³«Ýír·»Þý.b§;]ð’·¼æ=/z¹«¦£h+™$$ã»ø
ç“õe#~�Ó·LÊׯ›œ³#ÊøV²6w½"sH@�+ŽÀ:ØÙX©�‘Œ¢¸g3@t¯Û{ÌcI°lÇÿ»ì#a¨Gléñ„' Xü°GÒ@�Å:—ıõÇ<ž°ˆp̃´=í<º`{äƒÄõˆCæ
Ž8¨–ôÃ@ìب¡õ°‡=¬[ß6¡ôè?ö¡†3ìcn8<;Þô²¹Ín~3œã,ç9Ó¹ºëõÅÞ `ûf’xÃï·Ãßþ
G�N(=)໺ÑSDʬȲÄÀ
J�ljª"‘¦`”âmhç	Vo²~­k=XWšÏCŒ@¦®c<À.ÖQ;­O ¬

¥JFF±®p‡<EYUòíFž«Ç_ùó·ü­>ýÓÿþòÏýýßþ ÿáß
î,Ë*XÕy¤C mŠ�„ݦ´B°€a£ƒ*hR‚RZ„ÒËÉP–ÈH–xÊù†ÚØ
ÀPa³ˆD:¨ù™2ü¡í†Íß
þÆ¡�‡x$
&,â`ÌÅb$q¦G€‰’
Gxä`ŸùÕÍ¡Ç å/êÜ	c~™à3*#�9£qØ 	¶ŸàÀWÒ$X
ˆ@‚¡9XË�¡ÓÔ„Î ‡w€‡Ï-š|
cn�ÿƒ§!@

F¹Æúè䪀¨Åwø#Öcf0NÅM
Ž-–¦ÇØà.ÖF¢�o4¢µ£�Ý8²`É�£r”xÈeô¨Ê:ºGm Í] oØ\V`$ØÇÔÝG/ À³À„0°B¬ÏïTå
lÍ-° F–�‚HÞ0Ô‚B%`)D:dÆ
PUä¨pÅ*P¥
Ä ƒ€Úã/ìÿDKta+üBôÐÔÆ•Œ‚¬h6ÅÔ¹FC®Gœ=½Q‰~ @Z8˜VCré^Œžäd"+(À0ÜÂcþ+,@©üSÀ(üH`
òÕͺ(l¨.Ô¢ÙÜéÑ(XgùŒ0\K>¡Pg`�,ÀÐéƒ
C'�Ìüa2²¦}q /6g¢zè¥jà-.šJ�hÐCÊV¬$æbÐ$¥%-ªÇº£Ræ&ljü±&Ϻf�e£Èöì6^’Z#Ìæ†c6ØuÀ0à&Ž’"g/Â\1r¥z(ÖmÝÖf…Å/4¦!Æ«N	Ã-°aB°TD¸!WšC:(äÎ}
/œC-„DºLŽ2¸FæQÉú:ù‡¨d¨(C	AžF…Ϙƒì=ËNpÏDè^;ÜWdøÿ‚î­WQ	„,”ä,�

]á^ç°ï0«Œ7ê•ó°ÿ±ßð
‹@¤
¦1�q·qŸ1ËqñÛ1ûðÛ0§ŽðÉôÕ‡nˆ�ðÐmHŠ
Ü•ãqÓ1#wñ9rKò#W²%_2&g²&o2's2%w2(‡r'£Òb_aG}=ÈFp“æáŽE €Ä
?ò'1G²‹2/çñ.÷20³0»ñ‹ñ0ßñ1'ó(ó7ær· 	�#ƈ‡¶F�¡Qà,Ïò
‚±ï28Oq$ñ.73oÞ2süò¯3›ÿó/«3ïðÇóϳ<ç0<›ós|q9÷3?ËñÃ3<§ó
4>´8¯³ô$«³
Ó3;C4As“³spª>S43ô$CôC1G˳?Ÿ3Iïó9sªôB·óH›ô@£39—²¢²pìÄ{Vh‘æÆ
°
H€
¢7(SÆ”9“fM›7qæÔ¹“gOŸ?�:”hQ£õ;6lر_K™2ý•ÿjU«T¡^Õj5ëV¯M¿†íöêX²UÍž-K‚D
¶oI¨p;…‹
h›¶:‡,

œ)½£Ê
pÁœñÇÏJñÂ!w¼qÂñRW>¶è{Ëعô»ë*®5æÆh÷%Ç)¸'T
u³Ý;&0sxIë
~ñEÈa¬Ýó˜idÐO5…Áe
ÀîX¨
À:~AMi �½P†1†¡Œ-¶"a¤\ØV¼5ªo•r å#è†zPƒ.X	-ß2öµ1âM	ãVsh«êÐmCTž•Ñ¦—¹ú(SB:Ò�Ân‡—›bGÀ9·¨`+��"™ÈHît�äê)
’«Â9¸ÐT.l	^Šq£Ãm¬ÿÄ¿Ó	?μ=€¤ lµ#‚Ðe‚ĉ
„"¸A�&oábN‰²i²�0¤áÀgþÂ\�ˆt91M€‚=R²z at B…Vö>„º_G¯›ÝíJvÝo¢èCš£Š§«BC÷ŒšÆdéJŠÿÝD®.B‚
nGíâÌqrï4®+a½´Õǵ1*½”~ižX@Ʀ䔨ÛS%¸"TC?› ž*?pí`‚�\&.ê�b
Û¡|ÁÂ
oˆ†²†¦.=@2v¼â¥˜�-*:À
7øP¨‘С ¸~øtD…÷gRzó‰uaEdx¡®¦fDqGöØSJ,¸Ò³”#îáNYÆ06hÍ{1V£`’{Ê“,\ùTIR•eë(V+TmXÈn.Ìw
uai2%yªStÁRÖ*Ô´ÇØ)Þùd
+y
yZ¼TU–Xµ’‡B¦Gró„
uS1§ý
ã’hÂl÷—
À¢ÂøXKo¹y’Î
Å TLpœšŒp*

9Ãé
0ʸrV¶0zÌ
cž0¬°‰gñ’§*ǤƒKl¹>vÌ
š³Ñe�9
ÆÇÔXÓ
é‹Ì#gZËl'·#€AÀa*̯Èpx
¨ÂšzÇø’)/¿ü¢¢=ÌÊ!€HlÎá|øuN¿·¶’�I©�Ðêº�bˆÂ(FN;º )ȤµIˆƒ¤¸.À`¼k9•ª˜œÀ»F"Ã!€þù"€ê…‰Ž1
e  P†ºšÒQ‹R‘

¾êbn�K.G9—U¸¢•ª�à
0ä=Žô=Ýd4:F%&g1I1Z�‹‚ýÿ®$ÀÀÅi8¨Æh
qYç:áœíýî"Hë"2¾†
e¤£h
R;œNÂSóâ“U°J¸¢­ù"hcu	£áB!Û"V²2‚µR¥+'0€)çLG@–)¾°…xÎñ‹ÃD1/…Åÿ‹b¿%”´Ü	—ÇèæÊnAÍý×ÈicTf©“Ž`•f|Âh\|…¡ŠMG8ˆ1Ú*€º,[ñkÔ�
Y›/Ûžµ'q
$ ãÅÜzKØ<LŠ°÷•JÓp‡¶!Ò1ÊÑ2aȦ]ºkiŽ–�§e
´­HUÎɹ�ZSš»9[¹§Mñ&V¼‰8ssJ\Ä‚ëÓÖ)PT¶òŸ�ÖbÝ¢4çaæç×ÑÜX1ÍO™ÉRHSð�c=Ê(œkœMpñÊ
Û„Ò[à]Å€Ldt$!6eEVT„‚ñw6…c;–ž lrU%!Tu„húÅépA¯�}ÁF¥wˆ“{2Ñ*(˜Ö±:Ûqÿ8¤�“Ýté
[J Š ËæCByŽÈ{™VCÑ
Êp
qgšÇIœöÀ€@û@ô°
qÀô0™ömö0™áÀrö`õÀ
Xp	0ê¡ç¹ö áP6Ú™œIö@¢óà‰0õ0¤óÀ¢[âPôð˜ý0¢#Š¤�É#Z¤ó ¢þ`Ü ›6›=Š¦iª¦kʦmê¦o
§qꦮ)§uj§wŠ§�™§nª¼°‹‡4‰µ�öZÉGHE3tz}IŒ<·lÎרËf[‰êF�ꉶç¢g’çˆSqÀ—N±I
€
h`¾Êï°âz¦{
°
+°K°k°‹°iª¿ƒ|Û±2’Š©‘Ú‰„ªkñ’ŠDªm¾¨±	Z¨Æ§m¹6šºˆ�êVï2¨JÑ
7±:q 0§¦®É¢aPÝPj¦“Ià°i°
ó0™ÚÀ…
„�Þ:à�}ЯÜ0„ ¤Ü 	V@6šYP¯ÓY¤�Û´ƒ+¬„Ë™†+¸…«¸‡»¸‰Ë¸�븑‹¸“Û¸”¹–+¹•«¹—»¹™Ë¹Ÿë¹¡‹¹£Û¹¤º‹Yjýôǵ¨·%z»F© Ël»hC±}¶{©x€D±jÕˆ‘—)T% ‰Bq
zÇuåP€¤fZ¢Ó¥Nj½×‹½Ù«½Û˽Mê¤Þ[Tʽ㫽â˽Tj¾ä‹½æ˾NŠ¾×+¤â+¤×û¾ñ›½é›½M
¾ßÿ¾Þ;¿êÛ¾ê+Àì¾lÀåk½
ü¾Œ¿ìÀÁ,Á<¤²Ùì`Áp„5‰;±”¸k¾¶h²Õº¿„¨„*H$¼|Š¡»[
 
@‚Ý×ÂTÆÅØÁÆÙáÆ`Ì
æAƒäQ)at é TÔ¿ó4°´Ç¨ ¬Ði¸3Z”DÆ�z“èÈF�º(½ÂD
fɆ¿`>€
MQÉN챫ÌÊ­l;'­ ¼ÂŸ´K©¶+Œ.\‰´ëÁ›ÆÅøÈžÈ�Àø»œÆÂh 3!Ó·©nµpe¿9R$Õ|óñîzŽÊC‘ü‹ñ‡~åWºlÚ!bhè 02z’
"ÆmêƬB5³

ºàÁÃ�eä4uÃ9¥;™r±h\’tŸ2¢íWžã"U4 ³:��)ƒ"¿Pwò!§1$!@3$.1à�gQj�…wÔ
$
 »”A„bçà¾"
n¾àÞà>.˯;»CaV˜r
Â,ÌÕº› ÍÌNñh·<.>ÔˆmÅ.•÷.hUC
(÷‡¦ÒëæW,ͨ±=
Ó©âIç•<–*µÐ£¡ä¥Î1-b¤
p
Ò}#7’
`Y¿ø;’a
6r+«ÂwALŒ¼ØÇPë~Lãƒ5X‰êÈàòÃ~£Wëõ‚×´UëË®¾îÈ».ë´e×nâë-ÔnÞú2Âza±Î|ÁÈ�ÈÎhÒˆé +>D 
iõÂ(-:d×3N/¾€Q†nL"Z|#Ü¢hs¶:†¬h	ñG½E]GÃ
†rÚ’E­ßPÓNU‚¾P‘S†±>§ÜKœWZ�1g&áÖ�ÄïÁùÜ1;NÑ„`ÀµúdLddsF’ÔU5YÄsX³ÌÕÄÖ‰,ÕIE]NÈ%ó
Êít9Q—u~áEVI‡—£t‚ð˜:¥„’dÕsH^ K€vpÑn¤(¡&]p
6¸nMÈUÛÂÕ1³`3Ì-‡vXUsÅu2*»L³H¡³ÏhD™à”I† ø†QÔôšÑ5½p-Œ0Òz9FÝt\	j _2À%§pA†9\°è–›ªäE˜
„†•dCaÊ$,"ŠD#ç—ðˆËArt	Ïaì[å¾Ä€yÉ™z	¯@aØÅ`�ÙMÁTÖ

%J
ˆÿ„9@a|aThêÞ%H;tÐ]’y9sRÑ	,
XÇ
{½èr
N2̱‘_œã4ÃXÓSR‚‚
C§P~Ô"–û´"%¢II/Rw›ã°H Ç�Š}º@ÔÝCˆÊnnƒ¡DÿZIÅwz'ŸU½ˆVÍX
‘Šs£F\¨"ÅÉ0Tb…°¢,²—M%‚ø¢©¨Ô0¶uÆý|e,L Uº'•ú€ÄcÇÑ£¬äÓ"¡¨b8€4‡
DèFÚ9Æ/JkŒ«Ê…b‘UË;G9õÅæ/Å£%¬ør4…Ä—gáÝ[¨giiæ2Ô’
¸lÓŽV@™	èÅ|¼U&¹0YÀ›^ð’
CÈL@*è—�d´¢i¹� €!€)£œÐ)’ÁAeÜU¸ÿ(†U€KVˆ,i…2P
FV|o¦P€+\
…øB«€%‹¶Â­¨$(Z)Æ)ÒbzbH|(† èŠ
ƒXEÆ€ñÄÞGÊ`E:X‚-ÕS!ˆ–0˜Žª¸"ñ‘äAç#–
hŽ0z{Û
t׺8bmsnq”UPñ7j-Ff²eÚ¨‚ÜHcß‚‹[´Ã©8Îs|6sîjÄÑ渚Ž9º�9BS±â‘0ÄX ª«×·ë–˜KZ||¾hò˜Æ<ŽK‘‰q˜#;ä0H¶+lSîADÈY`‘�7ƸFËÍb–s;cY9­ˆíeYÿ‹XÈ¢y­æƒÞ‹»;UI6˜Íš1ÏRŒ3…¤Q¨èIÊÇ=(ߪ!„
]	ýÁ».Œ®ªÉâP2bG<P!/“cP€q;Àè
�È?§“ßÙ‰/4�”¤8g¥?ÊX†´éç4G&QÅ9š(DEÑ÷–øÿ>Hï*zâ'´Æ=>ñÿŠg|âôÉ#ΰŒGã§8Ç›H’G$憦!8ñšã›æ‰F”½
Íñ›½Þ†žyÈYŽó–w|ig:È	½r�+ZΘ&g²w䈆~_™ˆkY“ó]ù–·jrÙéÒÔ	@I Eˆ@ a”H
`Cá}è-$!_¨b
Ï
Š”ô–mºÿËò´>€‡¦TU܈CÀx”.Ú!ŒZ
¬–ˆ
]Ì}PÝQíÑýÌEK
õÏ»œÑƒ”Qµ�Q·üL$…Î	åÑ!ÕË&ÅP„¼Ñ}Ï+UÈ'�ÏúÌQû4Ì"-ËeK#íHþ<Ó¼´ÒñdLÇì@bB%w’Vp‰ÙAe0€Ì<ÏhIÒ/ÅÒ½\H÷ìRÃÿôI5u΄4ReS1eT½TÓCePØlO`RR*TJ­ËBÔ“<Ó%R¿,ÓN%SRMÈ�ÔñüÏuÊEMÌ*uUŽ$T„lPùôOQ5ÕI�Ò¥ÑÉŠJÚ|‘´°‰s
�8
®ä€y¤Œ.l×yMWœ…Ò¤E×--WI�ZuÛ¥ýY“R¦�Z–-O¡}ZƒåÙœm[¹¥³-Í}µW›uÚ–eS½åØž
\¾�V lÜ”UÔ¼uÜ…„V¾,O5ÍÜg•Z¦-Ë°\E|�Ï
—ƒ&�ÿ™y’ðŸï}Pÿ<�€x3Ï?ýöÙ›ÇmÞ-†êÍÂEž?}þæÍóÄž=@ôúõ«·�QŽK>öó§r%Ë–._ÂŒ)s&Íš6oâÌ©s'Ïž>ªo˜¯aĆ!V˜QbG�BUz´˜Ò¤H©R•ZëÖªV¹jå*ÖkR°Å¦vûÕëÙ´n×fm;VmY¶hç’½Zõé°$þŽP1âo
$Fœx1€/ÕcVó2 àÌyŽ¼lÛçÏÞ69zè©ÔlïË—yûúñÿÛ÷H5{çí¸dÏ H•ü(ï³h°^� â@ªv‚1¤¸.sžq3/%½}�÷‹²¼_¼~á5ŠÆhyÐîÞ¿ƒ/~<ùòáõýö”˜ã¤N‹ûx>S½HëÃ?ÿ~]þþ÷ÿ—U~Ié·~âW }ý
ø€!€
š( ‡úY(¢ŒBÚ¨¤Fª¨¥‘>:©£uF‚_‡¦‚_#p8ßž¸ ðK/æs@*Âì
®¸kk°ÇöãZ²Àå:›±Í"ˬ®Ò>;m°ÀF›­¶ÛrÛ­·ß‚n¶Êz»ÏiÍ‹ÐAÍ>Kk°ò€/»³"Tí¸Ñb,JÈž–¯¸ÿp·åÜ_TÈ@jU{‹~Øðc+ü°ÃqR[L1űÆóuj¡aŸn8€‡ÿ‚°
¶ ã/
"ü5²†¥>|LQç€L+¿ø’>R0›Œ0ÀÜIÌ/Žñ¥¼ÃvòÏÿøà	æHÆ0nq^ ƒ)æ32xa¤¸ÇHÿ†
	Š
"ãÿ�_òÔ²O1Á^°‚Ìà;8žð‘‚0¤”ö´Ä
GŒ]u×Ɔ«UßÈ1
5�Å-6Ì&É7Ÿ'eÆM1¥Põ´§”5¸N7ƒ¥Ø2)º¬Â\·¡C4¿b$#DÅÝ!/¸\HFÿ
å˜YùQüÕýŒž Œ/–õ’z(Òý	Ùþ¡_þáàÚßûõ üÕgALg݇SITAÌ[Å´I’ù¡±5�\Z�=á¡D¡TM!ƒ˜ÞfU‹µØ§ˆ@ÿ	¼€
(L¥!ýІ©ð
ƒf
›�­�S¤G�XÓ0àÞÆ%^Î!ÞS€Y;
”Àb´~	QÏ5ÈUpØ0
ÄÀ
h`
L�PømàR˜-
„€§Œ@	p1PÅ)¸B2[gâÖD�\ëf„C"ð�=Ô˜Á@¨DFÄ�8„ƒŠ°?ЃhA—´Ä¬H‰Alƒ´Á6pÄ<¤�Ìgˆ�lƒ8̃8pÁ"Hƒ%
=;u&{ñSÃ	ózò¯
Z|rXoˆ‘ç­ÖêõV!ÜRÕÂ|$?sµ±}'¶UÒÈ~¨ärÉ`u{
C;¼J‰ÈL G@=€	G4K=Ô=(	=Äê¶ÿÒñéÚF»R«EäCHïîG$„?ÈBäì<ø5aoF±$‰_#ºüŠAœ.
Kõi£vjãD0x2¤4ñ(GŒAtÿ{dƒluÝnž÷Žn3¬u®m›IÛù²Þ
¯„AK�¬ó:ÓFÖ’6³H÷±`˾Éf,K®vi˵�vowv×F{s+{¿·{Ã÷|Ëw}Ç÷}Ó7~Ûw~ó÷~Û·ÀxKë÷€8m‹8‚¸‚3x‚;ø‚“ö›6]âAÂ’Gšõz~ïn›òoGÕ«fçVC¬Ýty"´c4Æ«^'ÄH[ø�ŒµÙQÐÂ
€»C)
J`€y)
<	›­¶WÅ}y‡W¬úE/È
CY½«n
dö‰”aã¥le÷ þhÖ
ÿ3¾–]^ì@–<0ÎŽÂìWÙÊògb+8A|tôNžƺ×=¶–�ã�ä˜Ð�ôZ"
dŒó$´$Íuut…¬ºÓr2ÊM’"èEÈòûÑÁÆ.vÄ–={¦=r�¥~7}¿¯d�Ý×Ù¦oa’fèÇæcg©Ìx›!À˜€Bà(’XCRüâÿs4rYg<ó¥
¨B¹fµñOz¤-^ c¯»àlÙWŸ{©Zi\	+@ÒŠÆYþÐ\0Œ1Ö+Íõ®ø�*�
“ç=îÁïسC¢Olí/Cœ|5‘­íž¡£uqùTÏ<•ó$§�/
ßÃP¦°%èâ…ŠælE%€]È'|B¯0ÆðoÆfIÛò-—‚	å<mÛxÉ{èî°
,ÿe`¤íÿ Òë±dî
ªl<¨.ˆiö"Ž Ž@Ò!‹x

ôâ¡œ£„Á§Ža§ªdf.èJ‚¦'”�û¥áDJPò+„²â¡ˆ¤l
0ì¼Òû‚
=XÑ
#ð> 0m}X¦-q_nÔ|*’Z²(¦Àî4òÉ:²©%.i›
r o݈²RT‡DuA)×­BÚDHbN�Áø‹DÐD7UaT![4’’!‡º¦BÌáBªÌÿ!·‘$‘ „hAH!0ÔëB²,l<
fzAO>bÞºÒìâcØøê+õÏó…行˜d	Ûrï²íä¦-Ïrî†Ì鲞,QÒóƒ³	yî+ãCÌ"f~ã13ïüÇ4O IdE�€G.tÍ
.ŽÒZ�H(e©Þă†Vç¡�³/öˆM ÿóYók	g2Z�<³±frcNòÄoëb®H‡˜gm{$ÐÄÐ!´…Mˆ¤GªÂCà-Z·üÖ! �ˆbB.wû{—¡Í0Ïr.
V…ÆŽt`‹wH#�uKg5ou”ÿz,b³ƒIùÒ/Ÿ¬úç¯Z-rÚá7LBÃÔó_ zoŒû¼/ºÅ
³ :¬UÉôKó©H*#3*c%tb¹¬ÿl¹$¹ßÒa©Šæ5‚´@qŠANÎ!ç¢�0ä‚©l¡%:Íu>"‘Kc©~‚yòd·VOz­œ§ãf~&L¡ÅŽ
Õ’­T�ÏH!þÂ%ø+Ž4Bš.ŠÖæ$.C͘⢷¤„1ê&üÉN´Xʘ0L†Aˆ�<—B¹læc]b=LâÙi·\Ágtí ™Ç0R!}C?}Nkãm7P™éM
ý8,[SzÃvé�ûrŒaÝ::€LVA8>íG\!€V‚AŒÿá*ºŽ¿œ¢ö^¢F¿z¹$d1†Á鞣ß&Nž%Ó$”ÁÒA2_¢4&¤ÒÁa×ÇV�'†(Ÿúù9‰kkNC‰
]…5"õ'´DVèbEJBÌÿT×fš¨Bƒ¿Š¢/Ìá[P68 ¯/.‚Aœ}q†ˆ¿ »Wm‡Ÿ¦FA®láml×Î
:9‹:>&z&%oBê]�YXÅl�µ—k(@êÊ£(SòÐÞë'Ì
ż9
TáÚA_ç¤ß:§,lo1¤´$Oª*¢Â¤p´Å7ðØ&„7*£È	ãcÞ&ý+&ZaªÓ1ϧH
ËôV‘Þ�ÉIïš³ž_k“ѽpÃ
7Ø
ä\ÂôUu´¯å”—öä í€Þ¿Ž!ó•3´¯»á5‡Ð.•ò¶€™»e@—2V
”á:Æ*Ù
Ñ ‚ªèW¶øT/á™c@*ãOÔÒ1iQg¦™i
 Œ9hÙ‡‹.à‚Ž|`Ó

/\hœÐõ¥#̯õmË˹³—yºèBÔë	 }­*ÿÉ8
X]pèÅ$B®…UÌ#Õ»à8/º/]‚ÃUPÑ/LÆ-ú/}LAÜ$ê¬ä
¢`b8
À[⢌V´Â€¿¨JN¨ÿã‹a¼h$¹Y#ÛeÜBE8@�z˜¥ K%Í陽3`È 
•G´éa¬8À…Ô™
$+)Ké›ÄP2Kë.1)Ú’	™ -ñ\XÑ”qÉ-�
)oz½ï-šßtL…#¹0ÄšŠ-áilå¥(²] Æc	’*\‡‹(ÈÙˆfÅ
€€U £aƒK†
=ÆIm'CE
­/ЋÝê@éPŘV1=“ÌhHçH²Ð�ÐHS6K®E&2sä�q
!H©A<ïfwÚ‚9#WpÌóÜç+ÉHųx
$ƒGbµ\s”ÁD[ò‹ELC8r‹ÊAˆrÁÓxX!›�`	$¬ç	s£î
\ôË0ãU/‚÷òŽ%ÅZä N:D”§^㤹ð08òK¨×ˆr®XÞž¼ÃÔZ5ïK�xZ­(âýÕOÅÉEœþ(£Ó¾_"Y±o@î§@§ÇXÊ Q{X8NÄFÀ
Ñ#ÿBlX2«@.ƒƒ!HÍA
õâ6G8®DEÄa ugôRÁã!çÐ)‡<_Ñ
V’òÁ
ãá{!¢‚Q”’ƒ%	Ñ"f%1 ÁÁ>^Ô0Ño�ÁÇ

sÁ/9öRôÂ�ÁÄã(í
äÒ^Œ®tXB�*è^­Dƒøu	¡Œ	LëX’ßV.C1æxB6v†
‹~b‰Q¾P at C!òá0Ù^æX"øCYâb§ÈŒQÀ0­ƒò!!ʸ0Eá^>i+Û§dŒ«‹E
ŠO™y¦÷C+ÉXXÒ
){±��MÒ"bh‰ÿ…‰)hÅ�š¨(uIS‡‰v9?¨!xá?”Âw$ÀŽ2|gÀ%æ-ïâ&ç’[Ü"'~—ø¿°xˆ¢™AwëWuŸ§×CkìåJ‰Ñ¤P2ýqpü—´æ{’“3#�fq<Q牼yG½ù›ÀÙ›ÄP°é}ƒ
¤‘r8d0µ¶—w-ÛX�M¹gݘ®dRn\v2Ö™«
2
‹%
xØáS·
›ÛøÜ2�Dcá]äI¸@cB
}‘™Å¬w\æ
�V�É@THz ¾ [ãgHu¤±4E¥­žPW2ú$!ýÑW¥ébí¥q<AšTVR“B"��R)2 
s„yJÝA¢Ò@é—™|©x†w(<£³¿�bY.Iq
îç/NÂŒÅqxuç°©�£`ÃFžBª¤
!ä1!ôBR(bƒÚÁN¢OÉÐ@ò±Ž*”ÊC 
=…& £*Z¾Ç^"_ô9`Z.èЀAVj7bQ³²DÛÕ¼gŸ‚	§ˆHR 
•ãE†«¢e(m‹(±zSô3f4¥ªz	œ€)oBJ’¡´¸
RYnbD}£q€$H'PT«í TÃt¸5>ô"QÑ3½a%½P“'8±V=q$Ñ7ÃbN/g—ò]9ƒ·O)5]"¸Ô:+§V³’¨-£ã-!“TÿТ,Û‘ŸsÂ3œ± ß„²±Cõ±2CD¤$<“v¾ç]õU]¥C1Z12m€¤èæ¯É]tÆ�7QÂa›#*Ñg \ra‚©U)�r10
vñÂ!-Ÿ±D
êSñ›¼±-›Q•$,@"&ËÑ;¯C51_£Dàj²$2¶�A�²|t<žÌGŠtH¼7IRÑeUTë 0Z48„ÃŽ¾�Ócõõ2ÙÆØ$B5C9Ç]

Šäß¡aŒÑ)fóÂâÝ#£ð:£³·`œqÂE/­
Uí`3ÿÞò±PØáCë=4¾ðàð©¢áF³µLÜ(*§(Ð
�~:{GçhÚ’mSè'Àb׋œÝÌ‚L×ÆåÛÌý9é’Eé‚.8ã1ÐÆ[2Ÿ3
´V?�L"=?�d÷às�®qO>˜IJ[OqDÄ2¿`¸ƒh…×Q¾Àf]Q‡µ·&mÚR›6ƒÑ”8:Ë!3±å¢$µ0£.!1T4£5î4FíWçÑ$¥fÊß¡ÊáóÛmå貤,lä1Ñèòˆ2ÿó2¤.nRÐŽmf<s鼑£Ê•$ãh8¿Ñ[œ�^âaƸ�¢³’‘Ò­ƒÎNH<Ã9b¥‚¾�f¨q1\}܃h0DÌòᵋ"‘”€„PÈG¼`¥Ð"iä2:‚�! !Vf 'E)qš“2&À⑉øsŽÄ2ãbS7®eW?¾°

à0ÂÑgÏKr c
K±t3�LºKM!A·�
YDúFËg¸Þ§W÷E2L9(à¢rLú�XŠ

üY—tÁ ²#
…GÁ%Ã3cÊ
ß(&p)_^’¡ûCÔt6x‘ÿ
uE’½ÿ<Æ
$‡LÄ©^SñV0^ƒiK6ö¡/aÉŽÝ*vWLaÃN¢›kSØ“Éh¦õjâCšŒqš¬‰R¢¹‹§7WåõN×É
É«P<ÇÖ"O nL�GP�r<Á…
ô臗ö
ẼM`=Þ1ˆ#
[#ýW-æ-\wë›
Vð„…$žBØ�zìAáp;ôÑ�0|A`Q‡špL}ì£eè\›´„FÚýPb F¾òE
y5†ƒ­X`†Šn�å<g:×Ù�&Q$›õÑÏR˜ÁôfE+ÙMÿ
ºÐüÃ߃§õÑÈ*kÃÔ0
f`
y�B‹¥�ŽwÜãyÈ=Î)0áâQ`ÉS^r(\7Bús‘×Üæïƒ�ÀšßÜÿç67ŠÀ‡<ÂFDø0„=Ä<ç_Bv~óœçœ	_T‚ ˜p„ŽïaKXÂÓ?þ„Ÿ—=ä4�º£Nv)‚|	SWúÛ�О÷üç{�:Ïó~³÷Ýï|à/ò>à��(Å-„!�®Ax[…¶7‘²V¤Ès¥Ÿl7'‡±I·U²qc$
žÜ"1‰1‰ulR  
Ë9F‘bÌ4`»Î‰Œ´n �ã.ÿ¹EA€
¯É|(<=I>¾°‰�¸šé;‘Ì#ˆÉàeà…�	Þ�?Ä�Œ_ˆ%¬¸…�êCåÛ@ã3^À¾v��¼š¡è½DÁD4r‡¶¸dÉšŸ�°Ç=¼–	CÀȈÊk4˳¶y7»(=8=�#�
ð
s
­"¹¿
BÇ
bDFf,Cft­¬¡
Ö`)†…;
�Ë
9‰ÙàGÖÐÀ
^À	+´%Ð[È�Ã9]X‡
ÏÜ–nôŸ^G|Íó<rDO
T?óÓk)TE“–p1½)¥(
@8eøIe`…ÆÍ�ô…˜ÿ1Á+\ÿ U²UÏôL_ˆATUˆ„ÈL~€~ü@é+†*¼
âHÄØ
]
ÝŒÊ�¾‹èÝkÀ+5*½ÉÈä\�ÀÝ{]öä…
ž`G8—BÎ#„©t…sÍÕ°ý[lñÌÜ,aSlY_AUpE
¡ÞD¼B4T’TØÔɸBÐE^¸òUŽ=
Ë ~G¸!I
i
Ê&QÞƒ–çÉqú¨ú8JëØŠVÈš0§¬.¼=Kºæ
añ×þ‰ØŒf/Fd—`ÊîßÁ5ˆ"G´
_ ‡
xIˆˆÿÊUèÏíø^

‹�˜)]´ >’üËšé
óe.
c¶€4–º·Æs)…”¼CêB49q=ˆ3Vè:[•øV³µæݵûnIeµÿ’žjd3®iÆOËš·/gÒ:DîØÊÿ~®p¿©@Âö$œpAr+Mµ1V¥ÓX1euà)½hàÉFïRÇxe02�‘wL1+ÅW(205žc°‚R—ÀÎâÃ7›¼ˆoâßT0Œ0Jjå`ÙÉx±št¨aȇør–“¡·ÈZÛ†Ö©ÝÉÐÅspÿ1!J™cGh¡ˆ	Q¤ª•Ê
:^È~�™ct©)"cˆØºš”¡ƒ«ðÓ0
…
|h)+0
Ÿ$ƒ™NI4s‘SzàRK¬3
bôšÏyŒ’@Pñ4Uhü%­H1XÑŠ“|Þ‹iE†)’Ü
ÉC;­¨æA0¤b¬b×@Q)ämà�	FÈî6H
`¤cí˜"}=”Œ°lDß
HhB»o'ÙßåÖÔ‹îhh‡fÓÝúó•<h-|3bÓ?ù¼ü“©e
”¤�V©-1EÔé’·$ ð`ÖATq¤@»�[èÓ Š.(ƒ®­}�Ú. 
rF+¼ž*�Ù¡XÆ̵B®yWB‰J(Iîy•°‚€¬G9
…AÜ…ñ¹—2Ãßņ”U;€2°í”Õœ}1(Fe†-…ryQ:ŒW,$ÃxÃé
@Íhõý•

N¼:Èä‹à2(C7FÌ#•ÅV�G�™¡
]D
™/´ƒ'èÑähâFàQÀPR
z´ƒå‘/@/„ûh‡6½ÝÕ",^ýb†_FgQ‡Í1ß±ÿã1„:Ï]úR->ÏñX‡
/2§#Or´¼/(“¥Ëñ$kñœò"¥ü„òÔ™òûVV#D‘^ÙýÎK<}úYxžÎÛUGë„ŒË�*o˜1³/¨1ÑŽšÂ’ˆ…=Ù—0ìïÕHg�¨ÑU�<åêÒôV¼U
H˜á*°Ü{ÝZçl®M°È7
ÿ&Nôg	NÀdLØ„LÔ�ÆÜÐ%ö¯J„Í�ˆ�±^µÍD\�^]
],4‹Ô[Õ¸…Õ`ÝPãuWiXË*³5
Z”:ŒƒÇð‚:HD9ÿxÌÕÜÚ­Åã‚}ÆÂØO1s1Që%óL#³©r5Ît,"sëítMuOõ1µ[ªò23ERË¢Ëê´N+s"Ë´ÁsMÛ´TWc2ÿ´O«rMctQ'3TßtNsFõ†¹lW“õW_5N�}Ñ4[õW§uQÓµTǵM�u1{Øq�øærµ¤•„A×ƵÅ8ƒ,ÈB,¼‚,ÌB,8¶cÇBbKvbWv,\6fgöeO¶b[öeCöcÏ‚h�¶h_61h¶bgve[öj·¶k'6,È-ÌÂlÏÂkßveÏÂ+Ì‚1Ì*,
,y
¬Kp at 9ºL9‘W9º ¹•S9’‡o‘3Söpy��
¬À“79µ7¹¨×9¶g»¶·ú¶o;–wû	ǹœ@
�û·s;¶�9�‹@™:­z·_{¼gzö”{ø†{p໽—{q�»¿_Z®w»À¼¡üÀ<Â'¼Â/<½3¼Ã?<ÄG|«Ë»Ä¿;ÅGüÅW<Ä»øbÞFe�ÎLÿ‰ @À»9ʧ¼Ê«¼

=÷Ü|÷½Ê+=Í7}l¹yØõü�ã|»Ä|ÕS=Õë|Ë;=ׯ|¸Ã|̃}×�=Ù—½Ù“}3�½Ú¯=Û·=°»ý̧=ÜÏ=Ý»ù�kÏ‹Hü¡˜dô×G„Ä
9�ϽÜ×=â'¾â/~â>ã?>ÊÛzä³½ã;ä;}åc>§«½äϺáoþåƒ>å3¾�¹4Ž]É3ÂŇ"êëGÀ„»™3ýæw¾æ‡~Êg>îï>ïO~ãý퓾èç>ïë¾ñ÷>òyòÇ}Óÿë>äz¢ùø^
ƒ1p(ú�sÙºÀàyá¿ò/¿å‹?ø“¿è˽ó›¿ú¯?û·¿û¯ÿÝûµqdZ#»õõÇZúyijw?ØÑþûÿ?@�8�`Aƒ&T¸�aC‡!F”8‘bE‹1fÔ¸‘cG�S„‘‚„Š’$O¸0Ù0—È
+¶*]:`ÀŽ%[•ìXº
5J´¨b„É�ILz”iS§O¡F•:•jU«W±†\*0iÊ
1cÂt	,Y2
û�?¡,’¢#”oD’³�ĪÐÉ£:ÏH)ÅëÒ/òÊäÐ ã¼LrM=q˦ÿ€<ó %Ô(Ì0¹R±$Ǽré‹
¦˜B[AfP`†±q€P`Œ¡ð(MmÁ
P¡üöL²Í9Aý¯S.ßô/Ë/?z0¹;u³sÕWBµ?7G•�TPëÃÔH�Ü<¨¶Ýt­ÍPá$QW4Cµ½òXíµKôÚós¼å:Xi˜Aer)™apié\\²—
6ˆT¤8="®ÖI‘ŒU¢Ye³o¤+KµÕ^boýðNtaõtß7�/Éß”}V}åT“Á_Ÿ,ò¶M]ÐYˆ#Z·ÖøànBƒÔ-¶`
¥U�¤½ö¥b²…N_~ñe˜dÀ †Z�6Ífv­Ý„ÄY¸SÿcÓò!�_Mvâ¢ÕÓyƒö5¶V9†¶^�bàaNS؉öXªÏ³ðãŸ#>˜âŽÖ=Ž8“LZ®ElO—_Îqù¥GM	0 µžšÏ¨[+8©€A=:_¬A4úÖ¿óðŒšDqñ ‰«ÒiÀ	ß:ÖÀ=îÜq��œÙÑ9Ž°K‹Í¹q\yÝyS×ã¬<ieÑfW‚û%eZñe€_z1Çî_†`;Û€„º¡±4\ó<™÷yÌ›©ü!¡Å6uòíoFUÖVycxjþþ}]{¤ª—ýúž×'ÉÉõòœ´ìÒ
¿¹c¿=¿7ëîÌsVè¿ö®áø‰m)p[îPæ"dÿ°âÈÀ
ˆÂœ
 ŒQ‚ú–/Ò¡‹_�Ãë¸/ÀÈ�
þQ=„‹"ÓH9=Ò�ŒgÜØÃæJV.ÒA+£²–ÖC2%‘ÿ`O{Ø#MºyEEyÖ«eˆ4•AæEO’)lâ€éÈ]’ЖÁ
X˜šè¾ãd9FIAÛJ·ctíŒN2Å(ã�ÀX�9c‘ˆOZžOt‡lØ~ô‰BÃ%r|é±ÒFŒÐÏ=ï`
äå‰t9Ë@ñ—7œãÿªù¸û)h1
èBí˜AgK‡Ç$Écä)0€‹à–Œ…ŠÉMŠ!
Bð•dø¬À<•a`(j¸8ÀNåRì.Î/·¤î=QÛÆÆ•w�p,¨z)꡵ò
q
¢Q+[|I®2–׆|àë.ïx¶}ŸÔö·YÒXÃᡪGYן¢Üµ1#XA €[°Cæ(Ç1Èqerl™[®Ž.àÄ’(¥ñ{?Ûã¡b*’òTa^\¨VJÝFW‡Æ}¶PV2fÞdù‹Ð"Y€™5£}ƒæC§ºxº«[±hÉø)='´‡L@
--- NEW FILE ---
GIF89aŸg
ð
²¦
±µ¥¥ª±²«µ±&‰Š%‹”%”Œ%–—4†ˆ5Š”7–‹5–˜)™¢%¢›&¦¦.«± ±§'¶´5¥§3¬´7¶´M‰‹Mœ£E¥©rŽ�}›¡w �z©ª|ÊÍ~ØØxàßyéê€
Y¼e•hP-Ûµj×¾_ÿ–
Ø5`ÚÆW¾}xöí�/Þ¼}÷øÅ_;†­=xlÈô·ž5ëùWà|ó	ÓÝzÙ¬çàƒ
#á1Õ³_5ó™G!}àYžyç…ç!|×ôן{$¾'^Šùµˆ¢‹ù1¨`ƒzç^Ùx§#Œ ÂØ^ó…¤�Dˆ`‘H&©ä’L6¹ß~Géd’ó!ó¤•À`#e~Ó´çŒ7z“�3K®'6vg�5K¹Þ} öH¤�6¶G#„x®è^�Ø }æYh^‡zÆž¡àuX#yvç^ƒ�Ö(i�%†·ã”þéY ~ðacb¥KvY䧘–j*‘Q>¹å©¬™¨xjÿä†ø!(̪á}9Í6äeóK«À+ì°Ä[ê6× «,6ÓLƒ
5(QÑBLlWM7á!ëLwñPp$–TRI¸â–[É"– kɺ춻®$îzb‰'“Ðë‰'�xÒI'¢ˆòH*“`bo*�¤"J*˜Œ‰Á_R°(£@œÊ(O\Ê(«RŠÆ¦¨2Š*ª˜bÊÇŸòɨ¨‚Š))£âòË0ƒŠÌ߀ã²8ßàŒsÎœØ<NÏàôLNÐà]´,C#
9á,MÎÓLCN8LO]õÔá”SÎ-áܲõ×^{½5:å<ƒÎÙf?óL:kG£N4éDãöÜи
�:Ò¨�4îHÿ
5Ëô-�4ÔP3�áÛP“ì6Œ7î¸ãóPãŒ4Ûpc
5ÒÌ3�5ÛL3å�‡.ú褗nú騧¾Mä�k®97ÔÀ®úì«ocÍ4”ÏÃ
7„w.
7ó$KMâÃSÃì5‡ÃŽ€âHz{;4‰¸”œ»n%Ó‹»%é^ïî÷íÚ[ï½ã×+ðù˜¤ïIúS<
Åü~Å‘lŒÉû˜”’J)cÌ¿ÿ¦Ø˜ÇLqŠ�u쀬0+Vö2–Áìe4›*ÀQ³œM6Ë Ñ6xÁ¢5MNkÚРö4ªE
kTCáÔ´6­Ýb·ˆa£qÞâ5Äa4Ô7¹É-zs›4ÿä6ĽEÃo“\Þ–H¸ËŽrã�§hºá±®pÓ G=÷¸lQñ‹³»F7xáŒyl#wÎ03ºa�itcWÓ€�먹ÈÑ1ŠxL\ä–7<cùñ�€¤ “„-e•¨K¶
P€‚[Å!`
Pˆ# Å(�Ù‰U”Âßø†&ÄQLS`Sš`Ù&\¶	›Íœ/+Nq³	‚cá4*8aÿŽM
P BœàÇı‰ž‰L¢p™&‚†NTˆÃeá¬84~Âƒ33'š‹ƒcjKšÓ"Š4‚ž�ÕèÔdÁYÌ‚}¡5ŠŽY¤£]EÇ3f!呖äïÈrIß�f¼£·°…<‚û/§jp­ÑŒj4ÿËh‡;ÔáÃú"l"P3¢º:g +¶ˆ¥Oë|Ô‡ªmÞ¬��EÃÕ`³béÚ�lt£«»\Q½q
ï\õ(ê<þF¸7r£¹AEÀ߸á©uzqR…‡4î
�Ì6«�Ÿ£Æ.ôÁ:6?Èšg—¡½áƒw~£x豿Öâ¯Ï%먩AkiX£t­GWQËŒÕfË;ÈÊO6Š‡€Î
òÜèN·º§î)YÌbœ5ÉH(<ÁÖòôo·�hP
V„@'@,d‘ôX|è
•
ft r\M~-"'�Ø�ö·‡z»'

T÷L› r02.—
VHa¡@
šd
›°sBe
'fb.±puYT Du
PgQGöBäðB°ˆ¯@6]åwè
€C/ÅeÑð T°Ðê€
ó
°`w
l.Â
Âàú ¾À
0‚VÞ
­g:’áÁ<ÌS­×ÚiHÞê#ã
®Öº«ª*®’­åz®èz®íÚ›Úz¦òº$Õêš"‰<†´+ëJ¯ÍÊ«ù꯬¯»Š¯þê­Ýš®Ñüj­ë®"ɬ�S<ø@
 ;»5ª>âjû#k�k¢²$+²!;²&[²(»²'Û²*ë²)³,û²4+³0ÿ‹²�Æ8ï–,Ç“H‹T“ÕÂØBWî
-}´° I8
€¤ö 9
0
#¼‰«s°ã
nºI°Ði¦›,$Ú"µ‰)Ñå­¹««ÒÊ»
«™LÈšZɇ¼©²©Éžlœ¡ìÆœŒÊ›lÊ�l«­¬Ê‘¼$©œÊ¬|É¥ìÊyœ$áf¦‰\¯¾Ü»�üËÁ¼Â\ÌÄ|ÌÃœÌƬÌȼÌÅ�d,I;{HɾŒ¤ðÛ€D’]° ¹
K±ãz‰ÄÝÐÛ0
»¿<ÖáA»)
*ø'g´´¸n[
Ê€Ô€o,°NÍÌÁŒÉSÒÌVÍ*Ñ[Ë ‰ÖsŒ�<úÕ€M¾¶ü½�Ê£|Ë~”’¾;ØÊ<×[×µ*£!K¤D¢Ù¿êÙûÙ¤=Ú¦�˧=*ƃ¤ÇC¥íÛïk-Ck’Û:
MV`9{»V~åÓ(¢×p±„ã:Ë=P-Z²-½À‡<×"
–UÐö°FcÕŒÃÑÍ°ÑÜ`Òq´Ü¼°À•#UÒ°
�8™³ŽÂÍG»°
âÓ€µXÖÀú�Y­%Ò7N&~æ
 ¬¸]"Б†šsµ‹u-ŽÚ"Ó@Ôlzcôc¨fú'ÁJÙ•C8€•ÒŒêiâa¶×€Vö�#€j&ŒzX
½Ü’,h%¨ÖîS5
õ°F½]Ö® {UFœƒmª™À%‚
{u
Ú0ë9ÂÀ�
¾ð~*�µ.[øqVðÎçœvº©«ë–òVáqÅô¬[W<
€§fÕ~jæ£ÎGÉÓ§~Êi²c8žùl›€N­=ÞËŠ½œ"¨ºß–Ø=^äÿØŠ.É»9ØzÜœ
èÈ.ªÿ½…ìÍ–<½Ä‰æ‚Ä›~Îä5;³NþÉA/ËNÊØÔj¨¼iæ"Ÿ$#KæM²ñ=ï«kí«yª‚|Ø‚¾æ>>äB_ô¾ìñÖ
öõ*öÕJöªjö�ŽÌhŸ¾³£s"®R:“¯]ðû#é\óª#ð^
nÂhÒ#nµwÛmôð÷S:
{K
²5Ý4}-½ÏÉ¥ªà¶
|4¹Î:Ö
¹æª©Ç™m”ë¥;è¾ë&ä²Éå{ ³ðgœáf÷|“­›i˜ÃΗy|Yîšn„éæ9ål.§ä�Cˆ@…†Eíüóí¥‡8�EôPËê±¼°ú²±X›Ë¨¡Ö:Š°%%C�µmë
+Ñ(ûˆK‹’â¨&‘
+©£ÒˆÂQ&šœ,®Ê»Šk²¯²û+ΠN[2MËØ"íÉ>³šlMŒÿÜB24¡0+Œ›>Asm¤‹¬j
(=U”²5k²NÓÐҩЫ6S³/À
¥8/“R#,éÞ®HëÆ(Öe²LLSáÖ3×^²f
jÚrî/g¥5ËÎ¥KØEçŽ3.ÏøâéLÆýÄ+4?÷[Ø0¬É×SöÔ/M´±±î‹oÑcµoC¯JöÌdå½ö¯>Û*IÎk–ô=©¿ž5]oí¬ÖAÊIvä—"s»—Ô¤IO…
Zi©µö¶#²@Õm†Ãœ±åºáňz3*¢1G5åC)ˆ>~¡
ÇíX³è�€yL<d
×4lÈ�
‚Ê$3ã÷ú)PÛ
OHÂ3{ƒ‘iF?Ù@Nr¼Q9˜:ƒA
YÌEβ‰Nä¢llÇ0ªçƒð#uC€ÚQš?é!ÀŽÓ|g§
« zj`-4h~)L®ñÕy~vÏÄôUÞØ
æ�±N:&f¹½T¥,Þ‹`7Íg.¯&o…–jJʧJ7‹Ñ{÷%'×8KJCþ(—e)}mFTæJJÙûPç\”¼;–˜«É3ÝŒj»¾ƒš1¹­Þ;wÿc_I†¡DQæ´Tk­#0�7Yé)Y¶ìk0 ¸ÍÚ>@j
û>¤�ò²´g#-Z=¾6�]øK“<¤Á2uÀl
‰h‰‘;k ¤²ˆGT¥*
H©”=«4´£QÓ½-Ó#G’#OŠ<Êë•:!•W£38ž¡8Íã7«ÅJlH‰Œ_9<Ò+<$
½ÁŠ¤Ôó<c
Rj¤Y<½Ø««Ñ«Å›³cŒ$;³½W_t$ÙñF]D¥ ŠZ³µ'0¾Þ¸¥ûâ褼À†þ‘y
2{°¨�°<PQ	�ܽÞQTD$)\¤IHÃ�ø¤¬ì+Ôy<#ª?“—¤�b�ÁB¤üÄKE>QVcºÅ̹IAcªË“EÅÊ@Š«H<ÆqÔÊ?JO¹4¼Á¾h–àSÇ$€‚$@‚v@™&¬¨‰þ€}ÐLØà~ØФ€s €~؇sàÔÔÌÐDM~àL~XØìÌs8ÍìÔTÍÕ¤MÖÜÍÓôMÿÍlÍÚÔMݬÍÝÄMЬÍÔdM~~0‡Õ\ÍÏäMÍ
M›,û)•Ö“ÊNû»ø<иL”2JÆT´<N¼£LF�,M	¼e¬Àl4µlÏ8<º"5¡j�ÄL.ʦZsk‘L¶¬LgY
ÌÍÎ\RàôMÎMÎ\Í\
ˆÍu€Ò&­€q
 SÍDNÿ~‡‡ÛìLÀÍÓÓs¨
d©IÚ)�Ãì«Ãt;™ä%¼¤E¯tÝœ<ÐJÄUðd¶$V³rƳcÔK•Ëä�#33R‚VR4V¾Ef$P5ŠÐ»ô=ƒ¢xÕRÜhÇ„˜LšETmúQYc3i¨¿}ÕWkxùƒx°~åW}Ux Øú3X}eØ…­¿�…™…
Xÿ��X�=Ø�EØŒU‡‹•?6#ØøûX„µk�?…-ØŠb˜
’�!	x�—]ŒÉ¹$JÕšM�™ÅÙ,K³“³ƒÙÅøY†Ú6šˆü
žUiù²¡Í2ÞAÚ–õ#ŸÕ¦ÚŸ
X�ÏÒI´0‚DL�UYìÖe},a�
œèËê�,¿ê
#bLvÍ
$8¾—BÜß1]ÔÀZ’"+
�ŒÖ-ŠÔmÝÙ¥©Ý©pÝ"Ã!ÿ�|ÝÓ½]Ý•;ÛÍÖ•ÝÝÍ]ÔÅÝã=Þ<¹IäÞ×ýÝ$Þç�^éÕÞÚMÞõ]äíÞ�À^ðåä5ÝðMÞÚý
;ºÞï…Þ÷mÞ©ˆßèå^¾Aߤ¼¯µ¤å1µå²–x³Td•¢T$¼S…3Ë�’šÌÑFí£ð©ÕRnTŒÇ¿½QÏj¬ì=e¼ݼ¶õ
Òr
И\4šÆÞÓ«j5ËýŒ¾ÂJêÈItáh^»  Ý[Ó
Þp­›=×Iú»…¥Ü%fbµTb$nâ(–â)¦â*Έ}ÕRä�Ñá×pž¾Y–rÄP½­O?4ÿOQVQ-Õýe£j­=½Í[iÝ;¬¤DSªFÎ�ϵ}ÑKe½H<ª4&Å¥Vê
GÁ¹Åq¥J`¢+ãQ=EvÔÅóHæÎϱ¼^žœh¡pŸeª–vM‚'0!Ö_Á´ãÄÕ6ÞÈöÞ�b%`o•Û¨êÔu
Ä5Ug=ܾ=ÁåÁ4[䉓»À;IñÛHÖãTb!¼ùžG¦²”áeýek,¬µDÝ›ÊW¦<L2GÃY½,îNb¬48†%9ÛOÒ‰ÅV
³/^ä\\=ÐzÜ.~,dµÛ.[íf½ÔgÆàJÔžöœåbjæ­”aÅš4‘„–Y[×j9PÖµ×5ÿdUg¢õã]]ã_¢T«Œaå9¤`dà
†feùUõDK¿|Ü8vIÃ.Re5Öhžà®Íʱ}3:rŒ€H]EþVÍ�VÐÓÏ5Þg=N–¦Ëc]`PühI¼a|~ÅžÖÔ’°Ü6ѼÒ,µhTÁ*6JaY~KWå»®ôéSBgZ%ëŽ.</³fG^	jZÌ…–Ÿ!}‚ùù�ú	Š[­ÏÀ8éc.½_NÑ)yê2ÞÈH±]Ögæ±³±×ËEåé·eÑL
E+–d—î´t&iÖ¬³\²ÝEs½Ñæ©“dQÖ‰~ȳáÍqµ�à^ZjmEi²5Ç�Nà‘îi®ªzÞÉÿÊ^Æ’\ŒLb«p<åÈò¼Xfe^†êÌ;dŒèÅ›î•ÍÎìRÛéIºÉ½\=(ñŠ†â&ShOŽëPÎ5!v‰làYÌ9éÒiEqæ®L«ÇI«¦
�œ+­Ú%JñfWœí㆒Y5з\E±Ë¶J$»*æP¥¤ó¾@¶eí¾ã]lRÍe2¾óGy.ÐrfÛµ=eºubC‘ÐjÆ´§a
/šoÂ$4e<Ã6l	ö\¸NPŽÌÑÍÙÍEêÆƼ$Oï/ÁÜ.io»Êo"ß“Ò^jGÚëÿfí¿ñÆ·àãIU‰Â–é§6“o<¶FÅç[dNæ¬6ë’6¼µ.pä�îü¦d½€ï hÉoÐîG«êÓ°q¥6W!7ÖK=@VØ{ãÃ+´¶;¯ìà¬Àn`Ví¬ÆÄWë¨.”r•«yÜ	´îKµ†Ü_�J�.E4·žÉ˜uHGîÈjulHè‹x!Í�Qî
QÉwôyfVÓ×·lS^fDªàdq×[ýõo¼«*Ï4ôdê�iDžsõV樜%LgæuŽugî£úFwi§á®ÉiFqFdp]FG£rxç£MðöÌuw¶ÔÂrpwþóaŒÔpW<[´Ȇóÿh^pƒ‡[oÕæxïk?eëÖu8S¼Óq5@à�ìçîlçþˆtõî'Ï�ÝpÇ{ÚÝfœ‚�33ÃkjÖaã!•ËJ*˜”½‰÷êf'¬S¥!ârþ�d{×J¥¼ËÀÍrZguBB,GDÆV­w0Çø#^qªŸFÁK®„ê2'äÆx·‹LäiN·%.–<B�OÂÌxj•Vgç¾=¾nêÅr¼ÊƳUw�&{sì¿ÇIm¶¿FÇjœJVnUÉIÚ~ª"�÷µ“pØèaáûd܈òbÇóÇ2jΨ…û
ÕñZú¿²öQ«4zÇø¿%¦³f”-¯l=§´ŠÏK§ÆÿWr}ËJK&÷püÞ2Ç3ʼ%|Šk�×#×oñBö¬da‹wã
oþýÌH£þãžÆ;?gÊUB*uvžñé'–YEûÒ·þÕWróÉþb¤c‘âòï\g_G"ÔR·ËwLQ–ò™6âÉž4;ˆk¼¶MàAƒlx
›Ã‚	
„qbD‡rÜè±`¶�!n™ñäE†;.̶Ò$ʘ''†Üf¦L‡®Ø3§Á�}„ˆ$Pž:‘Ƥxí¨J¥,…JD(tcR†Ý*64	õéR�_³¤Jt¨Y²@±jÌs"ÄmccŽü	”ª\–1ov-Hu'¶„�Çÿ:åªpƆնe1°ÊšQ;J6XìCÌ>5Öœ{òrΣ^2ÎËô4Ô´‰¥2†lrÄ×WT¬¹©ÒƒØ¦]£fm
äw”†5^ŸŽuÚ�x»¢Dël±êQu6—ë«ár&n¢ª›myÖ¾Và”#IV‚ܲ…«¾BE¨b¤¢£•OB*nˆ�ØÞA
¯ùæ6q
W'�O(¡…
P& 
‘°�
| (ÁÐ!¼`	RÁ
:0‚áà1ABPƒÌ cBÂv„Y™`ÕÂBº0†lˆ9H¢Ð�0,aoøA!Ö„ü
¸Ã¤ü°†=ô O’à ú0ƒ$â
�h@1'K"y˜BÊЊ6#7¨B^‘‹P\ãaXD3ª1Š%táQ"Ç*¾��]Lb÷ÈÅ%â‘ŠB¼#јÈCv‘‘ƒ4£ɨG6N2"ÇU5šQ�nÀî›qæ$œPŠR”P(%*S©ÊU²R•§ÿl%,c)ËYÒ²–¶¼%.s‰ÊWê²—sâ¥/)LW&á”P ˜1…“ÌdS™ÍlåŽðLgS8MåŽI§mn³NÄ�‚6AùMe’’š«S�ª9̉ÑIšìŒfq¢©Mtv³žkÂûF9âÀ/”¼|@
ºÍj¢óÇ<š€Olró »&ÅŠùJpî’¢¬„?KiÌt3¢…ÂÞ—Ïy²ó�Üœ&J�™Ò•6s™¦œæ+£IJuÊR�Õ,gqœ Ó�v”¥£$2�P$(“—µ'R5ºJ£.õœ'¥'T‘ÕRö³œ
&V³ªÕ­rµ—4�%M¿
Kœæ§]=+ÿZÓªÖµ²µ­ne+8�`„%4Ác0‚Ê`ƒ!®Å”Q�€Q( �8FpÂaáw)VšH˜Ba‘ð¾ªNv±DÍÂa›€$œ’
BH‚�`…#ˆv›†íç^Á¹YÉR�°T ê`«S$H�°H�+üNù+ìU
î›H‹9[Ãbô¶F¸Â_[…ÉZ
~Åô$l¥)Øf†ÔN}ìa£€Ñ#\¡¯P0BpM¢Za³QPB …¤wÒ|¥A›�^24a
ÐlÌÐ×¾ô˜Ä‰‚f�Ð0@³ Ũ¢ ù)´	m즠O;%A
Rx‚ˆjÊ÷Já½ÃŽ4­ÿ°„.ÃØð7œÀlØÃþ 7®áoôâÂàF6xƒ
ˆ`#Ç!ñ†‹±á�j£Â
a®8lpÇ°€/h
Û…ýn}ÀÞ%á˜H`¼ðƒ,€
ôf@ „-0€	Lx‚
„àï³3Aå^À²þ!ÿ@
vCó	À<ÔîÝ^5 ß<¼ 
˜ül–2¶�(ÿc;&£1¦£3
£ø›,†Ò»GF½[+N˜ÏáU>ÚÜ»-
821^cƒi£<‚£<¾#=&£AÒ•4Rä1ŠcÇac<˜c;~äD$7£Î‰ã,¤;íÔ±­¡K¾ä–!LÎ$MÖ¤MÚä!‚˜³-b)ñä'±’OÖ’sy¡@ºbq´ä*å*ÁÓQÒ)!¥Rµ’X¡ ý¤Nr“HåT*!eDݤ,Aå,)eN�%+U%U5%&%MeW®YÖQZ%Z¢ÒNz¥]Þ¥Z…'â%_ö¥_þ%`¦`&a¦a&bÒRKBeVÎIB!�p€™6<–ñf^™ffÿ&gn¦gv&h~¦h†&iŽ¦i–&jž¦j¦&k®¦k¶&l¾¦lÆ&mΦmÖ&nÞ¦næ&oî¦oö&pþ¦p'q§q'r§r&'s.§s6't>§tF'uN§u§U7
*Ñ}î§m’*ÑA¬	Š¾~æ�Žh	ÙÄš´NþÕŒþÕèŒêß&MßÉHM£øç0	– Žöx§lÿJ¶©‘&©¿(i‘.©“¾HÙ KÙ é“Riþ%aëd©Xä�Od©ŠeC7l™Æ$…6x0°É	~ZÙÎLƒ5d&©˜‚ª˜ˆ:Q›`CŒþG~h~^Ú�Úç}6{ºÉCTY•áioLÃ¥]š…R(…fh6 _¤FêáϤ֧Eé@¤ègþiòîÉÎø

ž§5dƒþè
ªjþœ*úùE7ÔÇSä—‚N@®iƒxŠ©˜JëĆiô	•6)±«±VH–ê_ëtƒ–Bi–F¦ø£m7Œª:¶f«¶n+·v«³tʉ
„rHŒc&ÁqäÉ€¦HB%´k%,ÿ‚$H‚%LÂ$H$X‚»R‚»V¾î+¾ö«¿ò«%¬'¬$ø�\À¸€(x‚$xĦÄz‚(HlÄ’Â)ØÀT
ÞN¬ÃŽÁ.ºÔj›t_N\D´B$DB"T%è«»NB#@Â"äkÀ&oÀþëÀ6¯ó>oÁ,&LìÄJl'Œ¬'|¬ÈÂP€€Â*”ìË’¬*¤Ê–‚Ë®¬Ì®ìÌ¢ïÌêìÎÆïÐî,Ð
íЭÑmЂCÑ&mÖfmÒ°
@

L³ÌC/èƒ/<À5à^ç*
ÀÿB>ôÏH4¨x¬GþxŸíJƒDÌ©Ê
\$ì�€ŒÂ¬6xB%DB¬vDB*ä
s4‚$<B€(\r*cB(Kr

î2<ƒâæCÑÃ:XÃÑߎ7ƒí1ôNK3lšYêSdC§mƒ=¼´4ì�í9µ:C26870Ã<¸3ÐœQÃSOƒ>x_7P™­O™|±JÈHLš54>à3PYŠuC=pYï!h£mšyCá[½éî7èÿ/H50ƒ=pƒéƘ38CîI3xõ�zCŠáÃÿ­à<tŽÑé<´`7øŸ×û‚Ü/Ý÷FÍð50Z¾)ß÷z|¸ú}þ<ø�uK~„gOøµKE`C5¼
‚¿ë$`#$ÀÆ1Á2±7{»Z»$Ðk'`‚(<Â!\Bõ’ �Âõ‚2Ä,õvÂ*4‚(�»*�Â#€Â)¤{Ŧ@Œ*•Š©R«@™B¥ÉT(SšX¥Zåé”*S7…BÅŠÔªR¡BqBŽ'p#Å¡WR–,p²¾�ûf¥È“/

ðz"á
éÇ¿ì-°�ì 5‚£1_8*l×:Þwç© QˆE$⇘D#*‰Ktb¡ÈD)>1uÕ
Q–‚¶¡0�É	I0ÓŒ�¦ï4ÍU
‘ˆòu�jWÖ F
_ù¢ª�sï}ñ›*±ÿ=j¾Ê£o~
Œ¼Þ6Ÿóðm9Ö»ÔQ÷�µcQvœ*þFWÂÕ�pëea
t¿Þ…ÿÉ©m\Ñ:UÉ„4¥±é«—‹œ±�y 
°1@É�¥5c
@=vLUþM
Õ(*°Û(¯ÚŒíF¸Kòxd�¸#û~ï·è­öª½Þ-Ø2Lú’Ïq/Â^e£Œ±Vbq÷ÿê‹Q‚„ûž/Š<Eó®­ßb¦oæm¡Ä%eÄÁZ
¼~à:ÑùîíÍ1—QaGZ@á毋žÀá nM:‹â\La¨Y„�Í.	q
qQ�8nðw!
-dé¤
›
ƒÇFètßT¡ÊË
Oѱ»€‡ôr2݉ó†§L�s©vçgä4ž
‹`O9—3±
6½­Qy�¹‹Î/ÂØôò<qdŒ
?õX¼s¢lTÅ3U9OPRŠVŽ³DÀTwt“MñV3
½^ýþ%Q‡ŠU“3TãtŸˆ•N}­S'³žh	Dÿ²hΓL’
ô¢‘W1ußJ3¼¨M¦¢ïý†œ˜k8&£‹­åg$c ¬
ãmߥxˆ“ž¾ÖSOª8-u:ÿÙ‘¥
k¶Cˆ�.ñ;æõ¶Dn|‘óqÏiÁR'lUõo‰u:õ–÷”½ÿ
/qpxA¼æo€Áx
“»¤ê}ŒãnRcê‘aê½�³´
XƒèßÑCÜJ20i°ÈH·àÃæ¹ïÿ|Žïvá³>Ë”4Æpºéoom~#{€>Ev£êOãÅýU€¸ã~GcžÌ�I„8bž8¤#~Gqx�“sÃ_ϵLgxþrók9DÒ˜©‘è¡´X4|A<rc0×\9´ƒ8R×°Ãñ5fxï€zƒ“7'~´o;®z;äɈ»‹MºÓM5㶌e±m‹x»[Ï]ÑßVs‚+÷‚›¡	þ�¾¤¥¸üMO»;Ï͆�è›
¢_—¾Õo6Ÿ8}
›?¦
“áNj
b›v�Ú¶
L’X½úD‰–
Õ&ž¤6@êQƒð
õh†%xÒŒö©fÐ…îFÚz� ruDa|¾y¶©AžÂªRCÂdcMt5–:©p¿¹X Œýqw†¶	ÜŒÝGZL¹ÑÇì®=ÿ	쉼˜ÓK§žD²í]zÒX¡¬¨9 ¬’j-¸GUznŠì’hbŒcÍgilã2Ønwƺ+l½Å™(nP¡ÆÊ*I¼†¦S³Q´c�Uý˜ÄFü0
ÜàÝw@†�~| ×WAöo~ ìà=8Àªo…)D!ü¸A
nÐcóp†÷6Ô�ZeG>�[Ø‹¾V;ø´Í;®£Õ¤ÄÓ
H>‰ÐKþõ:‚õ.\ÁÛÐ帶ÿ²çq+1–WN×,Ø™�9h<V÷6�¡fYÖÒ�èì˜D‹ð‹w8ñ‰£�›I%owÛñ† æª_5NU at q_Exä#Š%¡z͹�Mbˆ|§Tšäd-™�NŠ’4�<Ø(OéÉ@ò攚%JP©)Tº2l¤ä£'YyËÕ�*”µ”e+{ùË?–ò•¹ää.�iÊ\SC²T&¨˜iËW“˜Í„wNgnɱm‹,�‡Ž‚Èh²¨4RP‚¸6#øì±xœ£W&³6È-f�#´K—!W"ºý®›€”›ç|÷;öÈtýd›-«sN%Þ±rJDWÁf’Ï	1no®«Q:G'*7ÿN�UÔ§hÙ<…DOzHÀX%·™Ä‡¢&£
bjZ:PIÎ`öj©~�· ˜ÂˆlþÊE‹%Ï2ÆT§˜j(AUÅ¢à¬3 :
ÛFYÑDjÔFoTŽò®™œ8«DgT›æ:§ÇÌ©ô"ÖJc÷I¡®”(R×Nq“`SChPµˆÄ^¡(yý”'!‹ˆÔÖ�®¢“c<�uÏ묓sCâ[	»O±ë=eågñn7Ï¢|ä#N�
5Fš'X	”$N5‡�¹«�»;Œ<º®�¸Ö6mt›‚¬™PÇÝÕmX4êu@ÕÑÝR›`\rÒ©·Ç²s¡ÁW²0k¢okÿUÌ,A¤;âzñ`£sªi\º´‰SaàïaÁ˜7)6QRé-^õ©/Ⱦ”¡Uµî¬¸;EÛÕ6^VËÍEwú–µ½¸›-fáà©ØŸWÓÎ~'×ßRG¹3aMg£ZÑ>!	HBÆrZãøq¨Ôšh<ÅÈßê®XjkÞ¦†XþŽ÷c¯Y'rÓX¦bVCâêbךYñÔ 7‰‰{2Å9cµ¨»Ê'cè
e�ÖL›}ß•6¾ÎÓCÒýiZOó`Ü¥v¢£‘•å«ZßZTvº1oG`¬¥–rÆë­8ƒ‹S„èîÉÐm.Jï©ßÞر
IJ×cDZnm¯V­ÿ	TeCä:Ó.b‘íU(Y/t¥ù§Zî��™|©´•µ›fF³,ÜrIX`ˆ—�!Šj°…“­«Ùí_›È®tªä¦cÖ3뀼ÔyþQ•hŽ½ÀJlž¶ÄîÕ9Éxë�F;ÇS]µÕÔU}js¬¹ÕÖt{ý^cZ•n¦öeÕhYòZÒuÿio¹ãû[‘͆ûVµ¦ýÆr#ûË1.j³»e”guäÆÃ{ø0\i«@�zB2m¨*jËu:�¯vã©Žêï¾kr69ì‘œ�”YÛ5¬bV•­[ä»÷×_Ý88Yîãjoµ°M�liªVë«F6ÊXîš¡9ÃhÅ–ùt÷®é„ÿ]Ç��fœ¶érr¸×í[™£®¾@=Ñ°Á]uô
%ó¦Ë©r£Üî3�ªi0ÇìÖ¡]·WÍsk‹=÷Ð3Ý\».òØÜky�¾4]°±ÜÜ*?¿qW³whUë*_‚ÄC‘^qq÷³àÚú|£™Ï¦O7åqt«¸w(ªH—å+ç:ÓEŒ©/Ç^›TÈ�œä«–ôÆ—y7‡®ñÝ¿ù»“îÌEñ˜#)=1…'á˜>¼µ×ˆÿwê•;‰äP7¶l‚õtž¦6¹Å8èU¶Iã6Á¶|ó¤iä’M©÷y@VUø†uSq‡r§£oÑFG:ö-±76ÇW*.•TüÁ€,âvGV/˜hC<x4yE*lwƒŸÄv9q�G”}Ê'€}tT–rD&‚\úö´×�òWo·;m4‚÷bQpc}×%YÌ%wsÄ`4¥yÍÒ­
xR!xc[¡1µñOz>uE1EkY4wa¶EE�‡d²Åyû6’gnÌGw0„ät×…uWHx(†�˜gÈ€žç{CVy1<Šµm?6_Ÿ#`Qèe{XjH•:æÞ&ÿa×'ŠÆÅ;·U7…};§sJ…WÃEuZ“‚…^üÖ� Â6Êæ‹á’P”‚û†zOrRgqt]”|?ö0¬‘†S‘@Òp/Å6Ù6p˜8b6("Þ5†…HDšx‰t†ŒÇø�?gnß÷
á"£ç+@ˆ°õ`Âwm¤§Sï×8ü¢U†¸k¥j3H_âÇrCè~°Uƒ†(fWƒdAÅ~w(Wv9fjdE»è�hÔUs7^¯W	GLsžè‚‹÷rb5*ÙŠ)Y‘µÓj͘ryå�Ÿ8YZ#ŒGK–g7®Xˆ+yaóP
kHZBâ5xlÛåŽ,ç�"i�­èfu¨ÿ}UY-éV“¤¶F#w“õx.tHs—(Š&ŽVÖ;çQ[ÙVwªøZ4v^aøªG‘?ÙV
ªTW‰¡Jª¿Wª§Šÿª©ªª«Êª­êª¯
«±*�â1¹MP1Gð#O& BÀLÐZÁ\P¬JÐÆZ¬Ë¬Æê¬Ëú¬ÏÚ¬ÁʬÕ­ÐJ­×:­Û$Ùj­ßÊȪê¬Øª­ß:­Òj®ÞÊ­êZ®çú®Jð®ìª¬×j¯Þê¬ò
­JÐúz¯ñÚã
®øz¬Æªëú¯®]€°
¯û°í¬üª¯éÚ°+±{¬ÛJ±Üz°Íªû±óz°;¯	¯ÈZ¯K ¬ë°k­«°Ù²LЯ‹­‹³8;¯±õ:±Û³èJ´áʬ(›³/«­@´Ë´Gë³/Ûÿ­E±ìº®û´B«´3‹´îª²:;³<›´CK¶W{¬
µÑ°ä
¶eÛ¶Vë²?û¶÷
²k‹®O²ýj¬»´oë±T›·þ:¶9›µV+­x˵[+¶&+¸åÚ]ÐBPB¹V𨒄¹™«¹›Ë¹�빟º¡+º£Kº¥kº§‹º©«º«Ëºƒ'=³"
W!ZG𨗋»V�»¶k»?r»Žê»WÑ»°K¼f¼®+º—{¼–6xMл³K1¢%½’”»Ì½
½"ºa’”½Ü«»¡%Z³;»º:½–¶½Ç»½Ö»«ÄK1ºú#§½W
½—û¼Àû¨Ù;»OpP ÿ«#
ð‹¾úK¼î‹¹ÆP`H ú'¾½â+¢Á<ÁL1Pàÿ»¿ZŒ«²+¿™Û½PðÁ!,¿%LÁLÁCx
œ¾¶ë¨¶«¿—;xäû#S ÃB at x¶ÛáÛÃò‹üKÂ
‡«OðÁ),ÁÌÀ¬ÂœÄìÁ¬雿ƒçÂO
œÅ¢¼dÐBÐÍ°l¼Ú«©¼Ëœœ
!´ðA'¼PÃ+ìpC91DA4ñCG<QÅKlqEY”1Fa´ñEg¼QÇkìqGyÔQ="‰ì‡ó¶ðáí˜Ho
¸÷~|òË7ÿ|ôÏÀ|
T˜‚Ÿ¨`*zPƒ‚à`(CM!Tˆƒæh('8!…f´¡%GÁ!r€”á
šÎçµk(

uÅRÜþ6
iP
´ ](BÁ!Žo4—¡Òeè76zÝ“~ô¤á
ᆚ¦õ@�‹
U4ÕUè78Q
î=÷³®@û‹Žvt£¨Ðµ®KÒ“‚T¤)%ÇJOzÒ[¬w½0Í){�ÍÞw@ûÑžvOï{m§6UÛNÍv4  ÁHÃâž5¦!ã wiSÒØ 
¼ÀäDç;ÝI
 û¶§
QˆÿϹ'
„ŒÊ¿ñ3€o1’…�Ú�)"
‡X¸@
–C4˜ñy�
$
Øp¨Œ²®o°Àþ‹?ë‰s8)ëá?ø1

à?‹„NX.$‡æâ„ûá®÷™…ðB1b)„—#�$€MD£Lh©šª©õz‡"`>
pÐøy�M0o5È0ª
KY€}9N©�xKH„XÈïq�€„Jˆá£"pt�K¸?Ÿ
¤€àO¦Ð’&sÜQX…OPOÛ
VX'LÿPï1R0§<0Wõ¬€<
šŠ)åN‡•à
ªt€nö2ÙhØIkª†^ÂZHª%äÁ:
0kà…e
@„R8à„Vè_†rØ¡‡RØ_
$ÀÌ4†%ÅžK'‰w‘uȵ¸â‹,Šô�9Ù8£Ž9Õt#Œ5ºÈãeÛ`£5Z]CMW_�O ñÃ
@¯Ý¨ºÿË�΀4BÍÜ34«Þ
¿º Ñ‹U5ï]ß|L)l<ÁÓS_½õ×cŸ½öÛc“µ	]·Ñþmðê•Þùæ»Îþø飿>uòßþüö×ÿ>ýÜáÏuFeÃ*r™ÈšÔ¤“MI UºàÒ�,ÏÖ`ÿ•P¶±‹
xÍÓ FãìÁ'Ã=Šî�Và×\ƒ¼À<œa'<̓Û˜†ã\%�
H㻨†åvãªú€F¨a9ZÕ£½˜Ç
ó˜àS&1ÿƒ‰Ìg.³˜ÌL¦4³â¬`.YÙ
Ö¼22'=Á([Ï®¡Æ«¼En|ÑÌrF�
ò¬6ö ã-3�Ïñ¢ÞØŠ/¼Q
.eƒ2Ó�—¼t_à%Q½h##·nDÎ
¼Ë]£Èd.ΨÆVꔤD²çS»ØÍc²aÇâ& ’ê7êdgäÞ˜á4ªa�µH4
µLÛX�=nÔŸ!óÅ\d-bù‚.œÖAZú²k\T¢�A7PÃÌòH%z£<j0sÇ-ÜUEšÎÁª/;FVò)ïã˜XÝV
�9ë-ëú,­þ¯vM_¿¥×¬îµ—P©%ÁZ‡ÿÖò„Kc
,cëz“
æ1·õÃQÁrJÖJV¥0&qqSÀ#ay�Õ]rc*Ñíá�«gY^¾Ìþîqü;PÆJËÕ¾/äšô¤‚[îqúÑX•÷’ŠP4¾šç±9ÈwžrëéÕÊÈ˹ôÅp«Ï~¯¤þ,Ùñ§;=êMŸ:È¡.âãiØ�C™,“x„Ë’Ó-Xž–B–J¬LÃpÎX
‚Ò¿™œÄPV`&R XS’P“<‰8M	9UÇfù[^ Ú±�æýÐOØC
Ì1�„¿ [ãŽTË~#øhIyèÒ¿Ñ–©{”�œ¡’ãÜHz°°ù%di"äij’;ºÏÒõÏ®ãZÑϤ,iœ4éÎÿ2Ò#;>؉µ&¼`#›P•‰þ½£u”NF$\ˆE[Ec3ñ³Øc7–ãF<c6=’eUØÉYwRäؽÏ8 at ha/èêh‘9øB/xÃñ�
F
Çs ß<ð‚d¼3”%ÊÙƒ}SªSÚ™|ŒMªXNJÖQ™%Pæ…�ªØƒ?ý�kÉ�
�¬�7К>×ZèY—Øâxƒ0\N¤éÃ.Dš™¨…伇]¤mdŽkù‚>$Õ=ÇZtÉzJÊ<ôWn†DÕ—3øƺô›³Ì”ÿ.2ƒkiƒ”"=<Ê.4@€vbææp.g1†`²€ 6ÎË�í鈙¨ý]Õœä�šÕ$M“-ý¦À9ç=M(ÌÕê	g0dëÐËɦ¢"c–p#>^Gqfjt†�ê�™)©B&ÀÅé›úX¥ºÈ饦àa:Œ½äH�íH­âj�ä*^ç^4¤
=‰›±]�¶Ç[УA•>0ƒ RÃиFWhJÙÃÝâ4CÌ©yÛ;ÑI™üHâ�•öÛÿ8MÜ
T
ÄËäIÎÌ“'bЫØCÖ˜§ãè‰|(W|4Î<<MqCñMN¬Ð‰QµEžÊ@0C@C—ÌPr¿º�áÃØ	Ì°€JÃÀÚ¬9C=t	Þ˜—
5ÔJ¥l�õS6dŽ¥ž§Ð‘/ÔC¬ÜMÚ]›
•ž4Ìo—8bòΓ>°­iŠYΙâ`¶G— À<„&0Ç]$
*&h
Vb-f@Úqæ¦Ù¾fižqJgá’K6É6]C7u]@
Yðà)eV’ÀG=Ǹ¼Œ¢!�ÖªŠòüSÈHÍ(ÑiUCR	Céy‰Bb�<
uÇÿh�>˜ä>]×Gz‰/ðÂn
3ôÄ�e5ØQ=¸'{=%‡>Û´yP)‘=|Ž™qñ–ë�Í�֮˧¼âLУ´K�šV/ôÅòP×ô)Ûx©EéµQß©`´E7üYÿÖ|‘Ìú² Ýda”NÎoÔ\nèÓS
†IA—¢¬…™äSEÝŠF-A1»d
j=Ô‰ÿÕh
0ƒ;àÃØ`—GKµÔs3ÀQƒR�
¦TG†
†



#­Ã5°K]›à‹3õ¹‹¿#Tw>Ú²æ¶GòäwîÊQê¯;�x²éؽ\8ÿ­ÿý¡¸][Ïj÷ÀÒPIŽs�ë®ð.AL¤±.ÜA¸–Öbš·9ÑÝ
+›?|«znò™›eÉK
èñj{Äæ&¬›²A”MÀÏ÷_zù¢�Tfç¢øÝÒ	¾O^L}ÕOµF�­÷Ô[åä�ÒßÔ\}+k¨yl¯ØÜu]:áÅeKSg/5½ßÑ•O6y¶d[Þk=“–·¼B‡ÌµØ¬Ç–ö×Pu‹î骗3hYÿ7öP/ß>qÏnvkËU×Ûb³uŸû×�õÕ}¾™ÖñÆÀ¹fzó£_¨xõ½Ü™Æ+ÛPÚÂ„ %è	Jxû,†�’1ƒiô Ò�Tr¤¯!€%T‹=~�!n$@ ó˜…î!

luáÖ¶ÈÍöDaTÆ*è0ˆ%ÁA*ß•,ò—¿Ø¥d$ÆhÑ€�)m͘º`äŒ#V¨i�42™TÑW|Ñ
ÙP´ •ÄÿImšF5|R
DJI
Nê±€Îcó¨ÅæQj@×hk‡ÆÇŒmuë,L«ã=Å’4=÷4§^³ËT>fú"Õþ¢WÍæÍÒ+[ÙŠcdU<a”–ùéìA!ÐxšÓ~Í/ƒwMaÏ=öÄ_—5P¶„R˜ß2àóŽ'j®8ÓT ¹„Ëp¦–õæ1Õ'»Õª'�°éÞ¹îWÌçIS[¥Š­6cÛºà^ÔY’¥d5;ÊÏ0@mè“ð„ˆVƒ0€³ˆ¨Wš^8C‡Ò°Ç2˜Ñ
fTƒC±‡Žx±
od÷;ŠÒG6æ&#º‰QGÿ[±G—*ÄMÎÃ5{ÚŸê¢kÊÈßf

¡#ñb
#™Vz‡›Þtÿ®ÛûÛ·D{Îîó­möì9ˇ“Á†p¶S-m÷ÎV¸ôB©1߇aÐœß6’šÛ±#JLy)[gBÖÂÞi!\iÕ¤ð
$_LIO
âF„ºÑ‹ÂU¨¿gR8“V.ˆ7QHMs±¢£äB"ÕX™Lzá
ðÅ:‚£Î� ÚÍg‚
ðwf¨  d
‘„®¨°c¢­8Б’0	+‚‘Èr.‚˜
g 
øH•ë|R¯8p‹ŸÎÍ;²�zR±¶†m÷‚ïœãùj»î#÷0c5^q9bgƒ‰N^�©ÏV€« N#Ñê¥]<�8bGô�ö@ñpÅ9x+ö’ÿ‡a-~ÂåÏž’i^®CÝÜ"û"iûÞ-A˜`j¢0ô«B–MQlPoF�àd
i�²"�DÀJr
ÈÄb¦(ÄÆÆð

Ŭ|0)úÍ,0

®tD
‰d
@ÆÆtÄnâ„
§ˆ¨M¡K]ôX�¨±ˆÅÐ"ˆn¢#Z¢
mJ¶$f"îâ¥Kª×-¦„^bƒÐÔ-¾"z-ú. úú£5z÷Ö¸’ÝK_£C·
¹t å–HË_;í›®Ë<’ñجE{ùµª]…š’
VØS^A‰<B‰8Ûò”ÓÜhyÚÐxYÔ±:i€”W*cܸc$™ ÏiAï%‰¯£“�è8³¼3ôØÕ§eÉ_ÊQ—�ÎÀùõóøx20CM…Ÿ ÞXXB(¤fÿÑ
\”�	µ²±ƒñ¼`s帊Kσ+•½åÔ—�ÚœE{íeb[�¾ÙüÎiOù|0
ú¯-…÷±ÅÅ™)Ä>B¤4
+-pï]ó�™\ºùPÙ#}ÝÓö#t6ÙÎí
}®»�C;µë?©Û«þT6|åJ|·ZàÇ•AßzõK®=«•
Fõìsf•Šv’'¬GE§]ǾãB®éW_>‹áÉQ.Pvª‰ëb%뙚u®ËÃV»–��S«öà¡ëŽ;ØL|Âi:¯;¿ã¢/&ûZÖ‚ †Cù‘°ñKŠ ¨ó®
ÏjÁ
	¥‘RòX£’?åŽLb‰c‘3¢¸Y6›	s^yã�—iÉ
7Xš„í�o{9g™†Ù™·žtøáÆg~ç�—Yt�=‡ÚkiÈ× …1Ú§ Ë©é—£�ò'—��Ò¦'uw¹Gè¢ûáæ]u¢ê¶ghöMj¥¥.
XhœþÉjnˆ^–ª©„Éêª\ܶš~‡�§&¥é½y
5–
x¬�&謃C %jñIª)œ¤F†­µÜvë-}ßZ‡í¶á–kî¹èªù«·ä¦ë.z¹¢¶í­ÿÈÕkì]Š{ߪ¯‚¦Ø¡{êÙ]xÄ™[­x†Žš¹òÁ·ÞœÝÕúžµÌ­kirÁ†(p¯Zª§À¦a¾×
«f¬›FÖÚ¥ûjÚj¤ïº|±Å˜úWò~{µìt´&\o®«á…
€HÍ6&¸`‚H ñC„j×6S[Võ{öe¶½Üòv+×
z)\Â
'™ñam„uñŒß.è®<1X6U
!8Ãð�‰g,âÀ.85ë
{KÓ„V$6¬U¬}
TÛÍ&®Å°­=›£ 
Ÿs0G=‰´”oµAñe«�7\Éx˜<@q‡SˆÊ£¤Dh?3ÂÉÿ‹,N'&Ç
‘Ž:lYqF°Åüæw�ª\à Y°Ùu-;ЗµÌV?-&Ñv“_¯RI—¡lo kÜ÷Ä(˜¯iÊ=˜Â™ñ×@:ÑðnXÄ¡"shGÞKohê 
…FJx�ÑŽ{ (
Ê"+@ÊÚ³²—„#<j‹ëd-	³+ö‹/¨ã%w)*Ì¥Žg¢+[œì±q.~„;ç_”Çúñr3<¥™ÃBü<ò“å‚ã2õÉvõk2Û\幂	¼\fÌ›‹‹g´#9›y‹‹‘J•g™¬Ç5qá9澈e9OJ&wˆ
"2i™’²Ô\äÝ:1'PÛ¥.¤/ÿ•7u™>N
Ró¹—†8Š”ˆ'»U»8Y©gÊ…@ÒÄž³ ð#LqB³±a;¦ÐP1ó§>…(.ûùÃZŽ”Zìg\Rˆ:Óqm©"&W%QvêK“
5bü´Y2áØÒ�]í&)·Ó±Òx”r^5+.ƒ1çùìŸÿ*ëROcQ“R,a,eÀ
u°ÊŒFß8Z–›÷l!Êòø§¸Åðs‹íý™MÎê´’þ4�aÅY§³ž
…Y
ϟ
[ÜÖG1 œà~ºA]M.r‹˜žìD¼oIôd¦qŽ3“e4¤5ëYÖ„Ðg(Ä8Wª«[òk<÷ºÕ²¢U�¶ýœÿÄ*K´Q�OŸ*jt8ÏA¶ì«ªô­fÏzE‡RÖP»u—FQ9šBé×qöc½î<úúT=t¬­š8
8»M8“²ãÓÆBc¼Sf±
MpN?–PÀj²…«:êš™M0ÂÓ½#½åä|¨Ù8ŠÇzEëÞôÉÛ�½�®iÌ"�
ᵦ
À„Yb¦–<¨N“š×”Ї,„P2 ñ4¡OÏ»ÜÄJw?IÎ1míd 
¶ÌfFœ�-§Tɘ_ºUrè\³GÓ¨t�s™qñºSVöŽs"ßN;[³³_¾­_ˆX—ÞÂÈùf™GLÄqþ^ãô`+VÓ˜¬^–ŽK!ÿSS!óbðeSûÄÚF3lÐê%órœ3_z³]µ¨˜%ý¼ü±r¯z¡Õ0ce©2è	Û“®JNHK¸žoî�¯í;ÕZ6èu†ëƒl›FÓudlXý{³O#qU™´k·/CݼÄr°0ÞJ­k"Óv¿#=•¸¸ôâ¶Õç!Û�¹Hüpº±è.&”-àM.¶¾ü¶dçô¼bvñÒa¦Œ·
àóÍ�£6~mƒ©Íò
س“–öh;7|Bèe¥5+‰9†2CzˆIf�©a9™…!x9™IÕ…�ši2Áø?Tè2ô‰ƒO˜s0Ç…lx�3·�V˜xž³qŠ"4‘µIX,ÿí§M€ˆh¶ˆ—Æ›ss¡c&ZŸèµŽMi„r3.4Z

l¾©x0vé"c$Êxûd“¥YNžtADÓ–Pô,Y†Uw¢E6×Fé4–ÒÉ™Gšœ>ù6µ£ŽØ_�ù€_Ø^fÙq"ŠzÃÒe�¡ »…É¢{ÖSØù9^Énë‡Zd}ÙgjW>òŽi:›Eè£OŠ`GØõ—”ê–-÷¦M‚ŠS:P'Çx5ê c™Ségï}g}qZf|Ò¥WG˜Ê�›%zÙ_šq5Є!Ô°{ÎÒ‰[6
uædò÷rWê—ëU«Óæ^‰*§f(›&E¥š'CT *Æ�ÿ”#[)t]<ôŸ�Ø„t…tl”I¦}ˆ¡ø+›§ ³
Nà‚aÁy~€Y¨ÆEOÌä\�æ…Hu|öd(†Ø†_<&:ß7›�ú§Hì8D¹§�t‘æ-àq�µ˜«¬‹×auö¡,úRÀy�š;K“S‘©K–øTË2¤TUUâ5“}±8‡¤·šìºƒìI–KJåx¯Ù·bKš§`¦O˜ÊZp‡¡ô?ð¨m§Ù¦Éôoª9uIhóªf˜w™øJ«Â�YdN„˜-Y[…†’t”\¸¹r·ÁP´ªŸôZµyè+-' é"ªcD�ŠE5E/¦5Txµ-HWÿZ^õó¨ùFš‡Y_†…
7¥s÷G£‚{Üù‚LsMë˜.ö}áéùš?i4“�J˜µgŠ…†­úš'øuˆuâÙSMë«á(…D[¥�b1ˆ’˜ç‘‡ƒ©å9¹Ê¯æ)§›ªSpµ««9
×hæªF�Û<­Ì	«›²®
›’¦ë™§Vl¥Êµß:;·[©<Gµ{ª¶ßYåF®Ã‹†ûSSpäc«µS
�Bš‰0øà=š¶ŒÈû_næ„8u®lgŸâ6s(…OËdK{³œš&%Q¾iN8Iò¶0Êô³6zµ=f‹ÙŠ¥ÉzVXئ¡F²¼im;dî˜^˜£;=º§ÿ:;cÃ*´RùNQk2ù¢¶†‘�&{m!D�â!¶ëa<Ç
¼ü˜Á9¹/"Ì—Z
I„´nZ~îYa)‹¦)dX›?Ìxè³q3Š‘ú•’+ËV=ß›=pY¤€’f7kb%G¿˜˜Ç‰¶ham…�t“g¼{¾bãNÔh¬Êšzš¹GÂ~!xø¬¡©´K‰¤ æÛ¥©D¼Àø©µh�èò8}|�&©Å‹Õ˜…Ìn©(†£e�ŒÌŽ�¸Qbã‰*Æ„æ¿ÅŦn¤À*·û<l»¢¹rh—ÁI% +øÄ
â,¾!žáªXQv»¼èbFw:¿›™ÉÐG„ÿ¡‘~k%Ž(Z«wÆfQɤ‹ûk†œ¢'š|2á&�i‘›¬*˜›©hG[À<”Œ«²QhÀ£y‡ÌšƒÁ(´sf¾A«»ò¹€Ã…·è’Õ×£krTƒ²Z¹KH³i¥Îü—
j¾Ò§œ?'È‹„È
΀<y1Å�­áT—è‚Îò–‚k¤8ËŒzÒ^jãËdfi
<}¬,~öVKÅiÎì:èR¡ <AŸ'ÉÞ(?h+7�ʼžQzy-%¼èw7i¹u€%l²
fs4Æ
íÁ狃»¢Š††è	– Uu%l(ûäkv•Íή‰hôHª“X²±¢�Ô|¹ƒ|T{Àˆ¹Íÿ¢òmÐlj;;kΤlÌF5Wvo¹t´<—&ÛÏ;=Îö…šWüµ¿’Ú/ÐxcP‰l9·­ö¹D�žÜ”5øËR^ÈË}é›	ªD¨'$\II8º\%=KImd˜Œ“H׳],”)­¦ÚCœU7ÛÔÇl}Á´œ û¬5-oº””)̱×[ƒJÆ3§R‰}‹Ìõ§‹ýÎ&P«t’�+LÄ]û]m�²
¶üÌ·»Ø™Ã “{1$¥Ü—¡Y?,�£ãÉY\–Y·©‘:)7©íiÇEÛ�Mºµß²‡Š¤u3|ŸŒö0·*eÆ…vÛXÜWðyÓÞq¶>¯”iNÿôiÙnI­ØÙ·4Ì­DwÕ¿ûW¾fÖ8FQf#˜…=»éë„û“ÍÄÇßG
3íá>UÄÊ÷ÏpªÞ†á½Ýu Gp0ÈJ0
�HÄqÿâÁ‹1R<XñáH� 7žüØQ¤É�#YTéR¦B–/[zDY’äMž6Eâä©hÄŒ3Cíx2fNŽFk
Lj”èJ¢A¥îüy•êÐŒK­
]õ)X“1/f¥y”¬Ó�kQŽ�קگlužmKèÜ·tÑêµú7ëV‰	Çõ»3)a¾‰÷Ú�ÉXkÄÅv‹Êµ·ïã´SÕtrÄI¨¡Ÿ ‰âĈ‘#I.Š†ZUölÚµmßÆ�[÷nÞ½}ÿ\øðÝP¶¦ù$$ì†	›´†rÄ Èçg;:¹8Z è&Ï!ByRQ¼À'ÐËwT^Þ!ø‰è·cWˆy’ù™oŸH:‰úúÿä÷·N¯?×`Ší5‚:BN½ý rO½'”;)=…\9ï

@Ò(¬Š9$ôS‰JψÒ��Î	(ÎZqE„¬k»W”;)fÄ.GuÔ‘F'RãѸqtBŠyTÑ8%ƒrGi42É%u¤Ï¿
�P/ª$¤¨	W+’É)…TrFÏ´É0�<RÈ$³{3N7Ét�Ì)U;	EÔ’8?ÿ4PA´OBE4QEe´QGeão 	jm´ûBÃ4Ã5åè>˜*%ÈA
#°ðQ±Ç&»lÝ5;mµ×f»m³¡ó:�Œc‰%ä^Â
#Œ3E*„Pîˆ'¾Ž"Ï$„@‰ĽLm?$ à“Æ)V›"ÿ:,Z³	#ØbïÇ£À¢	#’ø	)nĺ®÷¯ïîºÓ\Š#DƒÜŠ.H7Á8ºÜÄÓüGÍ—¢	–øÚ0�¤`ÍŠ$7Â¨H<ãÂsûÇo,HO.·{B	P¡;Ñ�	˜èB‰ö¡0b
r¡3ö„€…'¨¤EÉ“â —¢Ð,áÀàÆ2¤
îc ´à…8`)X
Mà@T !„Á=�@(Ø„ü aàÂ|Ð……ô"§á$¸w„) Ä0‚FÓƒ`	ìf´š€lÚø{À˜W$רNos%âP/<	(�˜
# Z§u">úâ`
Ä̹$�¤à�‚|‚�ÿ€ˆxL¿œ�ŸðŽdŽþ€Y±’q
ÄìXéZé㈈êM±À	Õ›¨€›“Ž9TÉK¼\‰–ƒ›ÚpËݘ–D‘5Ú€“”Aõ"�Ø,e)Iõ!›ßŒˆÎÌ�þ ê´ËíܵàäÎïÏðÌ	¡Ì� ŒñÜøˆ‘V±•´ˆy�æ¨Îkñ�ŠÿÌìÈ|j×\�°ð
ÐÊDÀüL
Py¦�¶¨A´Y•‡€œùK�ˆŠú˜åPI™
8¹iÌÖ´
´‘•SiŠ
ý”o)QÆ\Ì^
Í[Ð÷HÛ<PÙÁÍÉÌüÑíLÑR=PÜÒ[™EÑTN_ÑNñdR[kÒ'…Ò(}ï\õP)ÅRœN¡ŒÜ@›áú¼Î?É-
Ó_™Ñ,UÓ´¡Ò5uÓ7…Ó8•Ó9-”3½A;¥Ó<ÝÎíMg¹ÏýÓ@ÔAÔB%ÔC5ÔDEÔEUÔFeÔGuÔH…ÔI•ÔJ¥ÔKµÔLÅÔMÕÔNåÔOõÿÔPÕQÕR%ÕS5ÕTEÕUUÕVeÕWuÕX…ÕY•ÕZ¥Õ[µUImOd1ò¼L-ÓüÖ`%Öa5ÖbEÖcUÖdeÖeuÖf…Ög•Öh¥ÖiµÖjÅÖkÕÖlåÖmõÖn×o×p%×q5×rE×sU×te×uu×v…×w•×x¥×yµ×zÅ×{Õ×|%ÖÉ‹òÔÓ€Ø�%Ø‚5؃EØ„õ×2µˆIò ­#mÏŠ¥Ø‹�ØŒµX�ÅØ�õØŽYŽÙ�Ù�%Ù“5Ù”-Ù•EY–UÙ–…Ù—•Y—¥Ù˜­Ù™µÙœÅÙ�½ÙžÕYŸåÙŸÚ %Z 5Ú¡=Ú¢EÿÚ¥UÚ¦MÚ§eZ¨uÚ¨¥Ú©µÚ›Ý�ôÐK„p3ý#˜/™+[ÚÛ³5Û´-Ûµ%Û¶E[¶}[·U[¹…Û¹�Û»µÛ¼­Û½¥Û¾Å[¾ý[¿Õ[ÁÜÁ
ÜÃ5ÜÄ-ÜÅ%ÜÆE\Æ}\ÇU\É…ÜÉ�Ü˵ÜÌ­ÜÍ¥ÜÎÅ\Îý\ÏÕ\ÑÝÑ
ÝÓ5ÝÔ-ÝÕ%ÝÖE]Ö}]×U]Ù…ÝÙ�ÝÛµÛ<ì=a‚‡Ûî`#ˆ‚ø²ƒk€¿Ó- ­åeÞæuÞç…Þè•Þé¥ÞêµÞëÅÞìÕÞíåÞîõÞïßðßñ%ßò5ßóEßôUßõeßöuß÷…ßø•ßù¥ÿßúµßû-ß¿£-Øj€J€"tL#à¨%#ra ½ÚSàfàvà†à–à	¦à
¶àÆàÖà
æàöàáá&á6áFáVáfává†á–á¦á¶a¦†ajJjØÊ4bP‚Ø&ø¬>4=ã°/Jâ%fâ&vâ'†bbŠâ0¤)¶â+Æâ,Öâ-æâ.öâ/ã0ã1&ã26c,®â+£3>c<Jc6†ã8–ã9¦ã:¶ã;Æã<Öã=æã9vc#£k�4Ú©ƒø²ÏÒ&)æ@Im
£cøc'FH#Bâe¾JU.åX"3=«eÞ¥Œ´âdZã0åIždOÖæN^ã^Îâ@Næ¦Ç>fç'^e;^ãx6çnfJÎæNnæ)vA?ò¥h°†‚ÈÚƒJ at V`p匴e‹Ìenþä'FÈI^çU†em^bz¶†Ùˆ»elè]öhiâåŽnbmBàc6ii¶æ”Nibzã«Ìç0ziUfigži•NisVâ,F0Ë=0bhm6èpnç¡fg@’è?Bÿê–nâ�´d‚À²&mØ0¢¦êª¶j-.H/šj1¢†
â‰Dþ¥DÞ³?:¤må?²†/çu!èQηnh?ç$î#¨L¦n°†[£>ºë\Þd„æe¼êÂ>èšçiH£4ªÉ£Œæ%^ç3óft„hëezNæQ~#ÂÈŠfkÌöæœjšžìÁžéfþãýrãgÎl©L#Ae@ÂflæeîlÛ–bŒTædÀHŒ4jšNíšîà&îá6îâFîãVî?¦mb.eà^îèn–¶i•&&ß~l#zd³Ìâ�¶"�´H·Vìƒvæ©>hrVbÐVb†gÃì\–d÷¦ÿg¦¾e‘þæ VìüN£üžb„Ä#dnbl˜î)–k#ïÖînÁvek¦£Ô~f“Æ£ÿÊü^—X²ð]Z—Š—5^æßþí™–â‡î'q÷pè†æGqéfñävqopkþ£gðæ¾i(ñÓ$ä#Ò†Î휮ën&ò r#/r!Oò#Wr$wò&‡r&—ò%§ò'Ÿr+¯ò(Ïò+ob­ö¢×ν
`‚+%bOó"@Ú£êwx†{hx€yh‡9wup‡;Wxh‡tˆ‡tx‡?ÿsuxA'ô</tu at t@ÿsxPôFx°j¸sipJW‡h¸ôK‡‡L�ÿxètL—†h°ti�D7ôMGtRWR¯ô:�†G‡u8—õY‡sk¨õ	£H§uYw]·u[‡t`öyÐõ[¯tkp‡	«õ`G´H�týkv\ÇõàË=hgveG´ê‹ö=köj¾1÷Üûçqg´r�àn`j_à[àã»áwÏ={VànhwvöhÇ÷	S`øª<z
öÑ¥GaŲ½$Jì§Kq?Ñ­[W(¼£ô‚êë×o¨¿ 6…2µ	”áÄ…7™jŠñ¦o‘›úfŠÓåM¨¾qîÌ™§o¡9¡

Ü·Ó©O³nÍZ8Ø°Ã�¦
Ž¶,ÜárË".ܬ޳€>¼Üð[á”,ÿ'pÖs�Ò¡K¯žÐ`Âì:dhQ�:hê¤e”6~#ú�‘º4ª¥û‘ðç·¤_>µy'wÞ|�¿ÿü	è_I>HA8S}
&wúù§Ÿ£ÜYJ)©ŒR¨*¥$ºè)ª¨bÊ£ŽšÂ
¤�¢¢
*™jŠ
+›zÿ*8âl¶8ã°–)¨­‘sÚª½Ñö8¾ýFŽ¬²þvk8åäZ¯¼ÞÂ+:¿ûL9›v
ÞC9�Fê4óÓ6Î|4�4Xi{!·Ün3
7Ò83Ï4
eÍSNu».»íºû.¼ñ²;�CÝ4Ô4Ô\3Ï6Øè+/ÀÎT3QÎ8óí6Ü8E
6Q©"M
<Ì­†PùÛ£`¹%—]vüå—fž	æ™%—\'Ênb²2Ë|öÙç�˜”ò²'€úYè(ªêhΊ6êè)¦4ús¤–bªi§›v*Î7›2Ít§à "j¨®±Ún¶Æ:+­¸ÞÊ+9³�óëØÎݯé˜ÿM±åDƒÎÛ
A$÷BÕDcM4ð,�5}Wƒ÷ß�÷mÍß×0â‰ÇK°¾sÃ05Ü€k¡â•[Î!.ÝØÓ�3Ó�;3›W3:I¥÷û¯¾�ÛÛ”ã"!po·_>;íµÛ~;î¹·ëï=bµM�C
?$J:¹�“×hÓð;@‚%È^fùqôbš\&Élº%Ê$©ÀY&œuZÂf*:ƒ¢¨(ž�¨(©àì~ùð#J袊
}
þùç�
þüû
§<UTHMjß`šjVcppbU©j�lÈÑ›ÞH°‚»ù9Ê16ZÝblËq5�æ°M:ïÈ;B·h4c!-l¡Ýìÿf�fζhÆ<êQCä9)yã–}(ŒjÔcZÒèE7š‘Äỷ¾
¿¬¢}ê#E)H!ËBѲ~ö³ŸþrÉ¿þ
€ô”Ô4L°€Å, kVŪ	vm7¾qp¶þjÔ¹E<dñœVçÑðæ7ÃÉ�>o±†Þ²ÿxÌp5ázÈFÝÑóŒÜò†ä®�Ïk<Ñ�rü!@á(Ð?ú± 5è}Aºmì‚
�
R쩤Р֊O6»™*à—Öµ–¯~Žzk¤$E)_°SŽ
`ÒNcÓœfÊ«XeQU]MU´¢ Øf•X
ŠíÐi,¯fÂn
ä›Ö
§8Y8NÍÖ-Âðì;>+Œw4ÿ£¶°F=vá7‘Vqƒ
ó…=œ¡°µ«aǽò�\40k8`
?˜—àSÍrM¾öÑÉ¥05
#(˜êP¢%¡L¡¨—Bh”
 ¥&…
SdJÚü›°03Å@pˆ
óßöÇ^'_)5|,ô9y�¦2�¨¡]uÉŽCêjX/ÞQ�?˜:SªÒ"b VôÁZZõÈ*¹¦“½)¾ó%(;ù¦—qO[]ßžRa
þ¾ £ ¶ÝKRœ¢AEþ3íJÍ—Ôv𦚦íÅ£Š˜È´Z‡	ùXõÆÃÎŒw®Â&ÙÍk°9ÈI‡l
 ãgë›Ü'À#ÒŒw,ÄÇÑíßÞðÂõ°I)gùÇGîDæ¾^-_)Ê­óÒÝ‹$ó¸-n™��Ç
øù)ÊÊÿQ^|ÜCÚ^#a\ôMG0�
,tóðˆ¸¨Ñ
‚%ü¶î 5òå{Þ5�ø¸É…*Öô%Ó¿þö¿ÿú#
¤IIxÅ[R9Å4hÃ5H€B
€·Å@",Â"T$ø
òT
h€
ð!
ð
@´@í9ÃyÒg-à
ç-4Cq'üæ
ÔÂ+\\
'«d ¹Å+
”["&b9”[8´!
Àƒ0ƒ™4P',ã<4C?ÆÈÖÖŹ5X5ÀC\ãœp‰ÜÄNèmÙ–
’Ïö¶®z3*ÜIûØú,˜¾@`Š•¥xkgrÂx›
ä/*kp¦Ds‚&P
´Š•¤FÓ0�…õ³&b¹±a¼ÆJ9Ä‚ l€�+,†C,”Ã’z[
lÀ„Ã+ØÛ‰!G8ð,‹Dß:Ì‚Ér´Ð
À3ÈC4¼7ÙØÄ’Ù¶Øxì‚P×BÆBu›RCƒ>Àƒ3ÜèÁHC\€4¸ƒP…/dC„¶4ÀCƒïãÅ
À¸Di‹)€RÛQ_‹ÝƒßÖ­4؃0È8“Wƒ3T2¤‹5Dvsu¢Ï2ÄøX/95 ˆ-]`«ÃÞÀ’6\̶X4ÿÙ¸ôã„"€Öíû�Ž�©ÃMLWu¹Ù!EÅG¼_	Cû­”,Gº¤Oº»LWãÔ�ÜòðüŸMAEßlƒ<€&0¡XÅ€"%$D‚h`TÅÖ&¤…XB$`‚%`‚"È@s/
Ä@#Ð:öŒ�(´¡qOB°“«)/n@)„srƒ)€z[¨b‚°*à(Ûu‹U(ÈßU†ª.ô7¯·ÉBA»´±¾@‹B&`$
9°ºÅŠK/´,T4DplU€løØpk9 pÌ”uli
;ˆP9¼<l‹i
º@Ü4”}lÙ53dC/(r6<åÈÑ”&ÏÀ�®¼$�§íÔ"ð�ªf
à€Ax½œZËðÙ=xÑÚ©cV¯Zµ”�Y;{íZ³�—nÛFm
˜:íq±Oñ<1\4u!ÆžC 
r"8>ð¨Ï¯,S(%j¬q¥.
\8‘
PN“!�¤A4
KRq!†<ÿ4Ùä�
)�¡OÒó$õR	C
PÙ$9åL%•TH¹š”RBO9C™*ÄRFÅ”À†oNiq�
”Ë �q¾ä8Ça0„rF§EqPaS2
T`1¯Nÿå£n°ß6\
ŒkMQzF:žñŒ[ÌB"—™¬!�f<£‡©Å3.biäC]çêÀ
Ü
L,"’êñD'>QÉ€BÚ-…!—¦µ­m¢Óœ�x0pQ\
—pƒÛ4qŠS„ââ"h

žaQ at gk
@âd¯ý˜»ùÿH‰�½;=–`÷kiI”�‡�‘<Ò�ÞN at BiñQÏ0±^ë*íjཚ(.ÑðU¨B¢ÈZ*VQŠ­™¢ª Å„X1
U”¨¹*LAqV¨˜›GÉYQ_›Âå%oQ(Z„
Ánp:Üá¾áÌÃ
D
äÌ
¸pŒ¸E_z�ÊQ¤+EýJ·pç–ÂÁŽÒ]‰-®::nÑŽhÜ‚ìïˆF:v'�±ÃãË‹F3laöhHÃ3ÁŠ5šÑ•‡…&ÔèFaœR
¥#a‘™3¸Á�œØƒÓXÍVæq
{8#2/ÉI6|Ñ�¿OƒΰG7¦Á�¥ˆžÖÛ ÌW¿ŠnÿÑnÃ…~Š3¶›­\ÃÕ =7è�±¥£Š÷3°ÑxÊ;SôpÆ[_óÉfô 7œ
_ƒò:é
í§ñ‹…e¾Ÿ/|/4__xô¢¿Fãýnz‘t#õŒÉ6"ãŒz8cµ.36àÿ6ê?b!‘ÅtïÑÐb1ðïÔÁµæ­ßl˶ޭ�†ºÚMß 	=R�àvƨË$
–=¬+iΔ«®&a½–æâRa¾+kH¡V!@
DaâPaHAi¶†kp)BBAã(„åXApZ„MAZäDDçœÉ¾
Ç™˜ðÀœäFÈ)
06ã e(�ö|A'°Aùœ…õzO2Î"ô
¨£|Á¶!ñ€
þÖï_
Hôò¯1΢�óàjÎê5$�&˜A¯þÒ.c$‚èÁñt‚aÌrOóJqp!ñï_êÁHûh¯ÖìÁ‘ÿtoÙ$­‡:ƒ‹²hå±µèéí1ùqý‘‰˜â‹�Í2Àmÿ6Æ­6tƒ7|-�ðA$òh*A,aá"A"/RÁ:ÁRÁä£AFR°ëBá;¡Ê&âãR�%?�>!!>BABÁ>@Ál@!ˆ²>ABaB¡j˜²Qa)iΤòÀ˜¾�æ”�E¢†¬pÀ
cᙾò+¹RP
El-=pˆD¢.²Fà’jdèÒgAÚpð’ì
0s0o‡ìZL Äävì�N¢Á~j�wž¡~ïàÎzA¢�2›Á2ÑöòN$ ¢öþ®0†¬–BhïÞÊ…¼
ÿ|á<+¦A–‘6eS)Hñ,„!†‚öÎB2Ô"-��+J«)~ã,
0´¨ï1„Ára8kOÿøO5ÍQôþ/8DO�E¦ï8q-$6ào1„
üÎï5T³Ö@¢€A¸¡7Ó‚s5‰sȧ´|ãaòOç¡ðÎï?w-øc$
ÇB¦+9¡HiNç8A	Åážô,©T-¹’H<dÿèÎòp°P¬Hda
IÂ/ù2Lÿæ-‰„^átðr/»n ¼.0	0Ÿ¡Å
þ†S5CWCV‘3Q
�Ôâ?±¡1„áXA"ÍZãø°!kÑ>Ÿùô52F"£`4m÷¬“VæøDÏSñVÁY×3‚
5…ÁBUÿãa€ˆ‡,#Ú:cÔðÕ‡˜"_P_uè_¡q_ý5ÿ`
–_¶_ö`¶`Ö`6ava	vb‘È‹b#ÜÊè6ÎH�ò7&r¢,žÂ47#V~Ó)"æ, at j(X¶AÛ1cV#
áXœU˜‰é¹žíùžS£Ûf¶ Ï7ž 	Êmÿ!/c„O–Ó—~Õù’�™ˆyÙz9˜YgÙ3Š÷�
Ò˜yvŸ9¿7�eבÑ—
ZaÏÓ�'š¡_y�§¤‰hi}x€ñØ•�9^Y8lCÙ€[#„Iz%-Ù|:m-Û‚m'—¨Ö�µvv“z‰QŸZ’í¸¨íù¤š©#Ú}#ÙÀ9'Þ‘}E£y�:¬Åz¬˜Y6$à Í7˜` ¡	Z™ÃÜ•Äìˆr¨ÚõVAC…}!Í”"3&B<]ˆÖ®¡¦9Ú1æ“ó¼Á3„ArA&S¹¡õxá±mÈš¢{8qh“)¼
5«…÷ÞÓ”"ÿóì
›³=/ì¡]—vŽcx‰®y©kùbÛ34æ·™gWšk�{¤§ÙŠÞ“!‘;Úªm»w�w5÷mAËÛÀ™!©a€OÒ¸Ú�}:¼Å{¼É;'Èû¼Ñ›ÙÐ;'Öb5¾Û2Ì;Ù¸º5¾›”ß;½}z¾I¿ù»¿Í;¾û;À\¼ß»½
\½ÝùÀå;ÁÕ¾Ÿ­¾<¼
\ÁÃ{¾Ùû¾¼Á™­½%|Á½;Á“‘`¯,¢»W{U<ÅYÜ{WÜÅ[܉¦÷5ö96̘|kã	”€�8#®eY<‡Q?c9fí
Ê�ò”"�/ÃìÁ‚o)2/ó†QòxAÿ<¯5•›3¸¡µ�ükyaËM±YÝ•ªÜñ\•@Ïìáx¡Zh
Í�¯÷*¼QNq5Ï]YóûË!HÉ69)¹·%v·)v1lƒàw�ù•¥�ø‚’[jýù¹úÒY¦KųÜ_©Óyõ¶“!½3bcô�ø,¯Â[ª¥&cÕ¹ÚÕ[_]Öc½¥h]ÖY×g=×a]×k}×�ý×—êÖa½Ø‰ýØ��Õ{ÝÕy=ÙsbÕc]Ø‘½Ù©=Ø}}Ù�=Ú%ÍÖ«]Ú±½Û}}ÛÅ]Ø¿}ÖeýÜÁ½Ü³=ÜË�Ü×ÝØ•ÝÙ³½Ý}ݧ[Š¨�ô¡Ô/©
ýÿß�õX©¾�	¾Ðáž4bÖ5ÄèÆ2	Ž  g9É·!
µ©ÓlQ�2­Š5kÔ«©jý*•)×®d±Šµö©W­k×–ÿ…zÛµµÝ*ÖÝŠ6lÞmnÍæM[Qî5¹rVËvx›´
HãL/ö¸sb5Î4cä<Òès
ì»ðFeo¾l훕¾ýòK,ÀUù‹Õ²]R¥yâN„ÈÄ8“
ÿ¶qdP¯Ød“bÖP³dSÌÔÍ6s°M=@ã5Ë@ƒ
`ê6ÝxÚM.¾¨½ØÜDd7Øܵ‹3öXÃË
ã`

&`%ÉE7ìá�kTCL!œÇÖ²¨nd#‚lsF5¨¡
 °ÕhÔW¼²º®¨nV“+k÷½ªèUš÷ ‚¹¨O�ð]ºÄG¨ì|pä‚Ð"˜k1¥QÛ–]bõ<:6o’O�Ýé>gIìh²`¿ºÿ$%Ïå•Pn2“|$)OéIu¡ò+¤ää(S	®Û1K{Ó:Ð`$º

@G£FªRå7zÌ#
Q¤.�*ã6¬áH¢2©•!k[xŠVh�U­eõÖ±ÈzÆuáj­¨£«]ÓZW¼ÞU©îú$ñèš¼ž®+™‡<&·‰:€5«zØäÇÚX¤B––’�ìd5I„QJC_�fú"vͪp¤Oܺ£ôQ¥–ݤ!õà…5bµºdƒO
µàqa^xcÞ°Iê‰�œêÖžö`L8ê‚8Ðzó¨¦1}0p°XÉ5g&}LÃ'±-ù*‚Û2·4m”=|q]†V°O
	/ìv
_øBžÔ�CU
{˜)h‡úÛuý×
VÉ¥n)ÖZ4Ä
`L½�ý\Wx‹ÿ
ô
Ãrap.–iÙÒN®BýbìÐ�wÒ+7¾zµµ�—D¬`µú9Ø–!`�—IºÂVÖ¯<î±��%زˆ2±‘ã+å˜7W¼~°VåzdÅ«ÃUÉTf+e
¼b&[ùŽXæ«–ózåm^·`­;H¥:û¡$8,	O8ÂúN4¿§`,�NqUª¦�Ày¼ˆ„ÕhRັ»ëNr¾ˆ¢0˜»[`¡÷!Š¢7¢È“Ád@cˆ/W‘ÃpÔ‚<ô5‚A•ì^&±ZEœ
Œlx…Q€bÓ\…02Å!Üà†ª-r³ø
cwÙ \Å^ôU†üY§£ò¢3ȸâ§ÿPFC“2¾êé
9Œ”ÁÃe<¦Šy/¤«çÊ5¼·SżÒqY†é–éíq-æƪ傹³$23é*ï@¶ádk.zÆ‚²�‹¬¹!à8ÁNä&‹«àCÖ7ÃþpƒK<âGøe�œT5|âÿ7Ç?¾qŒW|/xYÑ3 x[$—ú¾j){…nÙÒ@4OPÍ!dÕ›Ë\ç9·¹Ïq>óŸï\è`)³37Ô¡4‡hDonèæ\Úº$Të†5záÒü:ãѸ¥aÅÛ×QÜÆHQÃÑ÷½�‚Ά77(
‘—Ñ®2{6÷¾y#©ÇâB±JžÚÿ2Úp»«Â^÷yDÏ!Ô({fÚ×(2¶ê0€ÖÛ¨"_F2^¤Iö°ïr‘8c5Ó
¥Pÿ45öœ
.vù~mydÍ“nHª¥~	XÀ„9]V‡˜X¦fš¦ij¦;–‹Ó7‹È䢟s9»K7Û;+¦š6	Ó™ž•ÔdMXqš"FiŽlÐ0�+ä;@³¬A„¡ÙêE[£&èè8ó�$�çÐç5f2
Õ#T'Ô`*
*0%�а'Ðt«
¹´Á

°fú;?å¤�<z•)Q‡‘£$ŠR¶aÓÃ"ÚÿËr²‹-x;ãÌßòÕÊÌ.ö›Ê!:ËK}]úáîÛ+yâÆȳÉ=×gåÑŠøk¤ëkåUþ³.F>ÐÈÀéãÀ'2/|6jZŸW&ù�Ù
od�¢Ê‡ñ[Ñäe¶YuÚÀxúÀ°Â§áì^wÎQ#
oÄ›¬Ä5³$ÐE�ÜÑë.l°2ŒÀFðDíÄ„¨Â1
<*µ
»–×
„ðñŠlø11ËŽìà;ãЬ¨†^H’0ª¨†`Ð�âÀo
·¢À¬¡@®È®hÜà ÅˆÆÐÞÀ;k±B“HŒˆ£ŽÄ ú0Ù	EyÄØXÁiè/혶lë¬nk¾±á?
Y¾ãë¾bÓ­Ê€�è�l8 ÛË:±6D®ÒÂ\R5é-HÒ­vã>ßê¯cÛZ&ÿb’û ¾Õ­ÜcžÙú]ì¦ÙKúó7
̆^Њ¬ñžl �2ô9£ Cm˜1>³‡Ì؋ƨ»É Ãc†iÀˆÈ¨°Á(ŒÄ§š*^ȆØpŒÊòˆfxˆ2<I{è4ኪ‡­ðaà3�8˜ñ
Mñ
ßÈÊ:
oØÇqñ娊¯Ø¨0³ˆã�—¤@Ü
­ð“4Š¹ð‹Ì(™ñÈmèmð<{ؼ°ÀÆÐCžf|>ÞF³Ù½ÿf35é>²ÄŶ콱qOr½^Áº9&W‹ËåÊKçã­E\¥î‹µgFCš“¿ô‘lšµð²·,±FZ/ûk.¾ÔßË“ÓFE"GúKpT¥ÉÔƾ‘RC¶Þú�i’¥b¢Ç´¾ô=}þÎÄ7Òƒ?`ëµôK¶ÛœÍØÄ6Öœ½v„éA@êQ@åÀ9Ë°G‰PÄ¡É‹é”™Ù
Ã0	
þ™‡�¬‡e
º‘
€‰Š¨Æ‚Î�ñ¨qlP‰è°‡¢£‡
—Ü�IŒzй
þ¡!f„6�åL+eÙOŒ^cüÒHzÚkk?v³¶ê¢&I
ERÄ»Ä54AÚ)ZhR¦Þó¬õ.‰hä¾Ú›¿Q5)?œ•Ó7MÙ–m_ËP=óu>ˆ%1&øÂÒ¾D5uK(15ZDFÿAK—ÝMþåõ]Òo#¿÷õQ:¹Ù 1M>…SæÛ^Æ$·�m<!@¨Y”
38»ÛæZºÐ«
š
@"³ˆ§z
lx�iè£sY�øÀ‚ʵB·ÂŒ˜ñ¨Œèµk`ðˆ!`hšqi!rá…V»ü¹`¨ŠÔ%ŠÝˆ
…Ù‰Osñ´šl•†Xi8¼*lŵ¦²‡žˆ2C+¡¹hñŒÄåO ¿¸ ñIŠ4Ë�x"R™†ª¹‹Ä
�Ø;�”™œ(Á ˜°Rü¡0…±†‹�	š€�†QÁ+ÿ,Wj-•¯ài§€oÍ}€¯ø1
#X³­lTgäÙ¯òmËÎ
¸÷Jµþt_ï²6ê
EÃ$K3	MX
_¥8Òbþša‹-]·U´“Ĭ^jDÙy�	žfi&/ÙÑìÆjŒÓê“솋¥Sƒe0ÍÞxÛ岩%|þ‘…ULöúDWàË�„MSðãf†½ì
)ZÎ?{”³‰¿oöæ7­CA”Cm”D}§x’”±0ÎH…@ù
¢ébzðô
NÿŸðŠ¾³Qû!’
^¤v�¶i­
`’d)Ó$H†YÍf
g™0‚¾wp–•çRÆU¬bzÒXÑœú[rÀ*F<ðz'spÊ
Ñ[£Ê6+,R¿Â(³MÇŒ%}.ÿ;4ú…|ó•J­ãnò™¤^M'òL0ÌZÖ[ÝÂUÖd`†.ģù¡D6ʹ[Å@…yTRK�	Åi®éf5
§¹UJL
¬‹R×
OÍô‘c¿ß˜ iÏ�5Þ3”ÙÄó0S˜3ø *Ú4

CŠ"·25ån?€Þ¨ò·
È5„ñì‹Vü×NZ毧UMjIìØûw¶Ù�ˆÚÑåƒÂ¤uÇ�(™ÊËeÄ)òPÿfQÁä©5)î¢ô±—ýãÐìH§@-ëçzÆ¥(&ô'5Á2vÑšU-„ ÍJÊh3�æl¥K	ล¨a8ƒFÑÈ$„H0Ÿö‘‰F­ž4NѨšgCÊR$~meSQP"²1‘©)LQ%8UåD	ßL¼%<zìI¬éš/Ì•.B¢G²!˯$'�ÉAÌ@X^c�n@)ËŒQºñÇOq#Zô Å4˜
-ç
&ÔÐÝ>«×¶ÌŒ.
œAvÉÇ>éƒ`F¸
Œv9O]ï³7ÙZi8c
ÕýÁÿöä÷pNÌþÏ»¸…üK~y[Œ`þcP»±Pwy-È]DfÄÍ�ÁQ@A
WÉ\BÔœœX‡¥€Æ·¤Žs0ÓûðÂq°Õ_š/( A”…7Ì]èØC/xj<Ç5èC/8C5Tƒ31¢,Ó2-Ch…–õP ]Õ]l5àॎQpÎå0Ê_\Æ{PîÉ¡ü	×ÁR±Ìƒ/Ôð8CßdZ8€e¬r0ŠôèÃi˜…@8“ô|‹= 
cÐidC«üB7؃ªÑ4¼’3eƒ3 †Ÿ,,ÅÅÛ‘ÝS}F¢f¸Ñ4h^bÌÅaYé½ÇV0˜–®ÅHfDÿD!hl¢IÀ6b#nG6

 Êà¾lT€™#ɼc}T˜¯
›¾ÑK؈ß=‰Ï]¼‘V-ÅSD…W‘eÉXA´`§EŽ=DA�E«XÔKÀ†jlE阺LLXÐàÞø�«<Þ5I3 68£!‹YäÂ4DV7ô¡ô|dôB~Ü fÀe ZC4ŽVLsÐ gTƒÔ}¤m9Î/ôÿ]Lƒ0NŸtÆ¡8CÂÎæð7 Ù]ÊÌ}ŲIž\h…ePÆY%9l˜‡Ñ�bÌX’´ IYàEh¤”ˆ˜ÃƒÐ|bä0Ú]ŠÛÍe\ö‹bÄk`Jb

¹#Áá_3"MfžÇ;Ž�=-�4
£ÀyŸ”$_‚ÍÇdN�UxV­œŽ)A�½IÙ
™”„ÓeõejÌKµ¼Ïý|EðaDS
ÿ„Xlƒ0¨Ä—™E¥YK5TÚ̹Ê~¢NÁ¡ä ÐàAô
ªÄx’FLÎ dÀ
¾§®8Ã¥Ègo\Ê—e^sǹ̠xø†3À‹k<aMÃ/TÃ1à§hœË‚êBæEAàçÓµ‰3À(BNÙ5�/°ÅàÒ!6¨çC ƒ@Ìå5é�s°ŠušÄ.¤JrÀèãtgH€	B)ˆ`Ä\)èyÇXÅLè-œ@
«3ì6ø]ô4^¦&yú�Ydl›`‹}øÂ
6îžræ#å¥M„b7j©s‚ÑwTLØd•VíØšHßøMóáÆÓù�5xCá9C=TC=LÌfýÅqÈ’·ÐNŸtšh¬ CNC=F=ð!Amƒ-l‰‹q°®*í1!Š>Ô¤,Cl9Káù	¥XZ/PÊ$W5<GVdƒÅPCâM�Pø†7tš4YZ¨IÃlÃ.,ÿÓ{ML≆´ö—õE‚Ò
ŽÉ1
×¹´«ßåîÄ<G»ðáã5J­�pµ/p°d5,Ã60ƒß
ð4¨«
kLFe„Ja8ð4
«4ù‚5Ð`Ÿ(é¡°ae|ËXÊg4G7àyRȳ-°ö$V ñQrä‚JkESôÌÄ.-ù$@ÒŽ=ÐÎ{f¥J¦†f¼-‘ÉL‡œçœB�íÙ#t²cjV	
sF¸èÃ.Hƒ>èßÁ¨5XNÒ@#
À,ì6,ÃT†4Ä+5ÜU

«p3 ´ÅàC-ˆw

7Ç5è.
/@ÿ7p0à �©áûKÏ
;ŒÅ £¬n¤Ji×`Ö5pa,ßôæ:ºâ™7v¨¦ëô¦ŠÜð†=zs¬Þ¨°i³ºF.”…
³`.{ͦW�žqƒ5Qš7È2,ú&UÙð†
¯!ŒìiïÝà5´ÁŒd
’<ÜØ^ol¨�V_;B0ìÑ>_x1}ä0„!?ôM#Y€í«}°1Ö_(­�d½Æžöè›r#=õË0
ºÃaµÏ«€ÝÓb‰ª›Üì…7¹OW“%Œc}ǵ•½+ú„¡�®Ntüì°¤†¾ËZè;Ù–6f‹�ñe‘­ÀQääyËȵҙ¤\Ñ.ç# Ç…R?À¬*1Y7j:Ó›©3æåp¹H¹SuÃ+eßÖyL}7G…ë®zÇù\çæ(œTÚÒá8„¹Kžè¹’„oì°³–zS0Ýì›É"ͳEØDR€
<Þ3m<âi'0¥‹áb
N¼Áí0�±d<
·)yršS�P�ôLï@;ÉW)§òŒð£üØ?ÖÁóø<Þñ>ˆLd!yÈ:îq�}¬ã&;ÙÇ;Žr“¥¼ÿŽŸãRÖ2”�Üã sYÊ`¦ò˜å

£°
eo öœì(@ù8®á„Ï
‰lÀõ6.¯ŒÉ�
ÏÁ
л"mí€)W‰�y ýþ¦oHÑÓ.uÐÿXMG6p™8,räküÔ)ÓgÖÎ)}MHz0›`‰ŸŽ™âæJI+$ñ"ðÕf‘ljL$mk¶iîÆM#�«í’ìt¸Kê¨/uÑÅ­œèÎéãÜp'M)>†PÅâmîÄó¸C êæÅž°ÈÔ�
€`(n0
Ò
ì
cI’QÉczêGä&Œ2á³Ô$õ01ÐT4)½t€dÒxÄvnN*«Î	×Cé(‰@*HøŒ—Ê»<
“ôS‡Ö•Ü‘[7³úˆrD•õí|š^„/�U˜”Ôn$Ô)ð¹pVׄqTÏ�Tñk×hGì°SmÀOIM®›V�fgõGiíÜ*WÑöß“C­õÀ¦6•@1DgD>LL>.OÅœç¦é­m˜P“¶á	­,7×�÷ÎAN5) 
c�â
wI‰5\
´Kæ÷AÜ®©Õözs'ü‚å†ç5'	—ä7òõgÍðAÒÁ
‹Þ8úó0„‘QMN;­'µÓš´ѵûеW›ý°µ;1µM;
·c›·m;¶ñ·e;·]Û?‡‘ÿD»¸…»¶‘»5±†'I·q´…û¹�£µ1G+¯Aÿ
좾Q- Ö&¨cœlÝ8Ù\?¶èerîúmã¢ûš…¹�ÛÖY
2ùÖ’tåH$–ê•îv0®;ä¸$Ö¥˜�l	ésÛ€K/cáRKgûŽØ.·(vI§’òv£qDn¶ñ¿ŸM©s¼šví&É°»úÒq•Œá»Õ6`ö5ÿf™ê¥ÅL¸—Qoª5Ì_\׈›‡E1Ò³­î}N§%3ÔK3-`ÔI'�uÓ/Zý—f2Gø[ËÝrÜ/ÅômÙã˯ÌòØÓM­´¸(?\«âŠ%wÁO;ðÜF8Ò*—m 2“<°¹ÅÖHöÉêȶ~?ò8uáËÖ{°Õ4žMÂn¸xÞÃõömr–Çr‰7–p¦_Ý|^zG ™^ÏïŵÍ4c%Ë·s?£À¯œñÆÇ)ßñx!Ï|òÏGï<ôÂ+/ýõÓc¯}öͯ=ßÙ;Oñòáoo~ùÕ£½ù篟~ûÖWϾtê×?¼øŠöç'Zç´ƒ
kœÿßø¦·Yiº»L݃¤Ñ¥†^ñyW^&h´e.t¿‘ ÅfÁÍ
._yƒ?WäˆG€ÏÙѻĥmµMp„“WÌVƒ0–†/¹	`…†$"vÅ&“\kö¸ÛT
†O쾄³œ%aM>Kà
³–´)RñŠXÌ¢·ÈÅ.ú‡�š‹’(È.m›±×VnxD¯™¬l?*—º„öBoŒđ˘v4‘P†GÌß|Æ ön6‰äÈ2„·þp��$WrÌeEÒ‘nk”“»Ü–ÉØìPÜd'#™%8>vÌá]“€¦'$
w?ÔßÈxFÃmP8{[jZÿ¶KLƬ’Ü¢#OCÀ®Ì9ò›Áè·9oIÍCËDR/méÃ`ºÑ_1Ì%KvÇnÎðbˆdéDD¢�a
1¼‘�„—}F‡œ,%kØè6ǀ˒ÆÉßäbäÀE‘ŒJ_,]ÿÕÍ\Æk	«Ø¶œÙ·åÌrq‹£2¿©'Gqt¼�'ChH‘�Gžã·J"ÞE‘Åt‘DS3¹ÈÎL9c�Ï~õI&Uª¡¸¼�1‰	Íž’rrÑ,¨PISS@âqxG*(0ñ¸µ¥–pˆkAœ‡êKþˆ­^\�nª›�fôšÞ¡¥»LˆCŽñR`0«�Úìµ›�2dþÁÒ ãzÖÿ¿©¨€D䆴†Ö£á”§ÚlÝ-ëÕB
ÌAZQ^5UHv®”
üåŠt§XqêÑ…4ǤÙþÕ²³É¡„'N�§<³{b+_9„
lj’e¨-YvLÂÍ°aYÂîòš‹
nÞ„¨-×LI¶Ü’Üg*ËÏúȆ¸uá·«ÏG^L´	-'
«´Ò#ÆK’LEbÓ,¦ †!‡›NÊccQè×plQÜ´Û;1ÙH¦7’EZró5˜É S¬û©®A÷SU§ŽÑr¢tjZÇÛboßT[`ut—ê¶:ôL«kúµÞâ6ôqþëZórO/iê´ÔØFju–&Ü‘ÿ¥øü¬Q„R‡õ§ÿÉ/)‹6ů:­d”ÄàÛ0#a>†ïÒ*<{öÉG¥ „G|G•‘ö½Cì‘¡iÅÇÆͽê(íø®mÖªãu0•óºèªY¼ýùnX&J$·±�¹$éÓzR‡N™ªšüÝ€{ç”nÒÀÛ1(“ìXàÆWÃãÂËÂ׉<Z¡Æ*uö6½G+áÝš‡üUn7Êh†2X�;¢5ö¶õ›Ç:8ºU×›g°-¯eêz³”£/rsÚYóoÁ�9]ƒªWá0N—ÔÒ³¯ñâ­'•¸qI®?Å|5Ø’9¶�*NÉzØ"7YJÿNî*äÞÛ°éÂú7jÔõÿ»Î�–:ó%#œò¢YPNÖqàÖ-„ª
m¥ñÙ³ËVmnµG=ö�TëõR'ÞÎg¤îªcåw7²„¤5�È»$1š ŒuõU‡}×`ó�
?7w!¨r�#z®ø–na§}j
ŽÏ¤Û]ìÃ
yæ0;4·{ÃùÇe,²çÎøF!.ó~{~Ъ×1lk‰·ÊVÊ[�<ÃY¾ê¶¡DyÌ…nÜyêkYã—͈æ˜Öë,n�byŸ¨4E!ZËàDûž¬¦Ðwæ¦Ó’)µ¶K`‰Dk¬k²¹Ž#¤ ç}¶BÏÚ]ÈúäÍòÏ“·ÿ­’¿½îo[¼ey\™vJW\ûÛ5±›ÞðCºY?ä4õèÍZn¸yt¶Ü¼\ŽåYÜú‚µ×û6è�¹Æ›ÇßÞ¸ž›ÑœÈÂ9·„VŽ¾n
ç�‘ìÛµWË{j1|y9ôÅÿãlë)¦kÌ£‰hÚÙŒà³ÔòÙ¡»î7Þfù×›t#رBøÄkê§{3ai´~¦71è´•CF<ZÌGldÑ[På#×æToZÇnÓ�põ1mhsö–z(s(‡rLvw4GXb~gWlH„I#‚Bv~Ló�?ÕqÝ'Ï’e¬&iÖ1÷•H(@î&g÷ÑnÖT¿µQÖÄÿm>We£öaÆæMÿ3li‡FÎá|ƒå%JäR¨S9K$§V´–Xã}…w–‚"Fknøη7f�õáTAÂU¤Ô%øþw[ð‚y1æp¸W$‘1ˆè‚%'ÂjóæHÓ'/d…‡ÿÑ_V6pp¨R
e%m
z]‚QôV6¦‰q§
È4³™žsHz¹{øI`p†›Ênû&‹�Öa+™~­†zþ1eà©wÅx™�	–ĵ1™÷Òô‰ß–Qœ·¡?g‚©Qb'Zj¥$G×wíy�O³7iéœÿs*z†3v	wY£&3ï)–ò‚¬Ã‰´ô�æ5Ú6.E¥X:“†³\?i_Y%?
oÔ‚K“QVtQ˜Ö~‡g†iòJQ´
Jù—½§jë·Š€“]TY�7饊Ñtö÷¥ÊÙI	P'4y‘¹Ÿr©tæH¸ rE�+ø‡(YpDºS ÷•ÚvŠ@šUœ3¨“ùFVy™—õÄpþõ¦DÅ˹’§Zzù�ºzŸË0gbÐ&Qö—’NE–5úY>x#fY…á¥%P&7™y„Bº¡™xXôöo˜ ÍɃM–“4cx<©HÐZ~'díb~åõtšˆÀ–¢˜Lru¢ðuÿDØgâb¤ú( -¢¤Z«IE°À—/%z6è63‘j‘yD:ôˆ¦Rçf�X[Æ2iû!m¶”ªòumvyýÃuœr h„ºEt|'±Pª?m—Ò‰M¯fv¡JŽëµ6é‘3¯jÚœ™Ÿ)ztkFYÙ™®7œR3zš®iâ“È–	â9&ûWÓfzVVq"ìÉ…9:c{	°1hG%}̹�=7¶4›r
6…#WªDv†´± ëtC« 2¦y{(·8ú6s�QöŸEã|¡H£çXhJë¬É
{ê—”â™l胇‰BlZƒÂ
´UÙŠÉùP͵€Ä¸T Ù•CTÿ�”«@w˜°î®‹)·Ý‘£–ö ehqkÒ&(:°À©�æy¯Qó”
ü69Âý±µEdŸôv~‹jI§'/ÉÙ†²n¨µLY5Ó·U=¼»ˆͶÿýZ”¢8a”°÷»Sßû’ub—%Õäm‡U·`,0ŠµH÷Z‡
†î8€»H§kt�ØkhüN{—y¹Í+Àt6±#Ķš²Û•3üí7Õ�Zµ£®mb¡érÆ{«IÂõ›ÕÇ
(‡0\v£jÿ—ÀhTIRdLË¡ig™Ø4`
ü6û/ÆÙTÛdˆMëô›�avµß«A¨£Á´•¥æÐh³’˜ÄI¶p„Œ3Ÿâ'>ûµœò¦lÝò”@ï>Ë€ïª*Låð~Å
Ní)Ü›Ù.Ò判D\$–ïÀBÓÚÿ®òbœÝiŠK{…ØœŽ·¸öU�åa3<Å-ÃìÌOL
¨a© oFìx.[·–3üQ®fºv½B^\Õ,bÄ,=¯>MR¦b¢igk<wmA¦2)#�œ›ëLœgyb6½XmÉã4u�óñ^¸Ó}ûþaM˜‘�R¿š9;WnÒIgçLÛ†·EœH1	”'I˜P-qr½¿mc¯­³ÌÔ
ï-Ç0®9¾t3‰­ìÆ;¶¿XóO@å®òË´ÆzëŠ9 ¼ã¯Bê$Äk8¤J,ͧ©ÀBé³®Š
-ÅžD<ñ¹¦Ðƒí7‰›Ë5¯ÒÿJ°é¼0¥‡´�ÆïbŽG!�,Ê%§œrEkS2'¶8Ä°²+
Ûf¶"ñC³¼2MAŠ®ÈýbS6Ý~›9ÎÀšñ.ã
º	,䘌‹84�cò¯mÚƒH"ù.J	&6ª¦EÝòò‘¶¹øD�H5ßd:/5íÎ,)Çz+­ô^²UþDmÒ571Æà.ƒ5¸­le­;’¤À@?ýÐ7wRq37‘2ê, %ÔMÜ^
Ø5Ž2\ÍKqªA
ôU×+Ÿ”q»i
]öÌN5­Pµ�U5V/{}ö$ñ´+
9¿Ö…1El=#-Wþ®;,' iíp^)ËÓBvéÿ•´ÝÜ„»BPû
«¨õxBô=Eå›/#HQÒo1Ø~m×FÝ"Ó–[½„Lo¥€–�Ú…_³‹¬ù�xL1éOÔZâµZœÓDòÜèêR¸GÔâ•xSV	o¯rÞ´RYe®Õ°¦ù¥;¡mRÚÛ¢ó<9•þ6Ɔ+TÒÏ—yìˆ`ºŽÜùm°áÞªm»y“á�O
PkN±c›ä-“½{f’o„5iƒ
�’4Zhu˜N¤•ò©\éS:-Ù̯
î[õ¬j>Ÿ6§ß�NaÏcèn‡Ö2Ž‹z,sUd3kÑ¡ò°;ì1ˆç6º'Ìðc×™"ÇjYÏ¢2=êúkA½&@ÙF±³õ¢*7åS1¨*cÅQYÐܽ®É“õL¢A˜ÖÐ�2�ýä×áúv·UÒ°ÏuëS‹×»Wy—¨
L_^†ÙÕ¨o{æ…*‘KTi¦*§´“$5“]Ý&¦·6Z
¥®K?”B,’èõªÏÒûÎÊÉWQÿ«dìÊe>ꔉ&áÕåTe$&JúS¾´ëx1æÊ�ɇ>4ŒjÍjÏIŽ¸’H‚Mó|J­q»luíFYÆì í(T
Ã%›I/ÇOeɺø»8*91ƒÂQŒYMe©ÜbðX)™„²÷
é·€äNDuºÚÛî¯kSøÑÿ.V“H¬m¹òÙ[%YÏ nVÓol&`î“¢°Y€«[YÞ/±Iks¥Øܤ*ËpM¦[¶‡Vª)¡Æ6:̨Fá§t�ašŒ‘õÜÁèù»Ìe£Ù
�ÉcÞ‹_áö2“…®XÿXý³ÏÆ9öºîŠ uFN{kwédäÌ®ÌÍ]çK`µ¥í[팖5íAr¾ñ:YÝHÞîÓM&ç€QÍÍe·ö�ð²ö›vŒ`ÆÑù<aE䲤|mª¹¾Žvô©ñJŽ=A	�JÈ
5ëlZÆÄ’õ’PÑmU¯)¯Š­q@©ÉË=ïr<x…ñÉâ˜LeG“ßÊñY–Ôn0ÛW£¹¬#ÔB¤Y‰å™8V@O~a-¥ÆŠ:Oeñ°6ìaA8AúuòÃyçNYt‹Ñ*ùíRa™cÔ4*®¯â ëg§[§(õ+UFŒïwÝ(Ð?%Ä}S´%;XFá½å£õJÒ6ê´
oùŠùÿ™a&×¹¶ñU�ÏëñyóúX¢›Ï:è!£ƒ”ÄB7.WZÔÁ¼gw/4’Ò[nyœ#æÛN¦µnÑS¥…KèñΗæ5„ÇŸ¯ˆ6⪺­’Éÿ�8â,e1ukm2,4nú�ˆÊÆZãsº^¯f掘Q
ñ¹Pl³�mJÞs%ö‰a¦RKžÑ¼GhúØ`á£aÈ1(4
ÄÁ{Õc;úƒ:ÔÝgÖá
ïQߊsljïºwªÖêe£;æ³0{›>üÁ±œ#²½é(ß+—ËæaÀ¹–±B<a=¢!°àŒq<±‹¤�»”{³¬ᢅ;3‘"2òBu§"ÿó5¹«Û)¦OÁ®r.mÛ9Ü˜¬û$b몾ڡì2µ¹¥‚­˜Â�¨%uƒ–A#
žê4qs¦ä•ãy!<0Ó°’Âz·v«/
‹µá?jé3+œ¦ÔÉ¥rïà™58£ ô�³¯c5ø
Á¥«±0‰ÒA­ª"é
£Ð¢ü Âr·Sã6B¹¦'ÿ¬¼
Œ9–4�‰Ívt<ª·¨K®,’ÅÍÙ·ÿè<†SDï»%ZBŽËÌ?Dô'ÍIÍ’ÍC7MÙ£×Ò™›”•"ÁÌtÏÁkKÃÛF13&jÌcÇGÒÍ¢˜Nܬ/¹LºTJµã>‰”¾¢´.k¼<<Œª•,™ùb:Œdº ÿ“Ää‘yÛÌNj­ûQ‰æüOŸRÌl,K ܽ´„�ìxË?¬¤ûÁ¼^C5:McÊ!Ú‹$©v¤¼<<+ú‹8Ê� ‘œÏ‚›!K;¼‹»01ÝŠ0}ž0	S
3,¤Ó5åœ4½¥g‰»2«SáÓ
<e×xS?Ó@'—˜SÎ
Ÿ¾c¡ºyÓ>ýS>©S	¿E•�’ Tê*T3ÍÓFå„dÔÓ@SõpÔ‰šÓEµ8•Ÿ8õT‘¼¥HU¡â0ˆòX™~YÕ’@‰¸»5C	¤	�B�S:õÕA]ÉL�D�Õ\íUBEÕŒb2@­T9¥ÓÑÔð3V;UÍhÖMÿ8\EœOÍS³£ÖTýVLSiíÓ2�(q
Wm=Ó¨¨Ô½Vã"W]Ž‰Žmen}ÖÆè;s¥THêVpMÖjÕo%ØdÝÔi-AíÔÚ,”]5T
#ÓE­	R :•XoýA€…SÇ»XðèØT½Øk=›…8ˆy ¸“Tü¨†y0�CQ52µÃ
1U…EÖ?}íñÓÑŒ|uׄ�›vU×kí•v­Ôåâ™ïj‘‡QÁ‚YçÑSUL²ÓHZá,
‹åXÈêÙ��W—ÕÈ)Ía¥ˆ—©Å½wEÖ]9[^­ÖKM+³Í$«·½q­>i!Z�].Ú°ØõÊSZ{5Ô¿ÿ­ZÖšÙŽ¼šÀ•—„�Z‚ÕÛ@­Wž)‡}» 	×]U›Ä:«MÛrU®côÔÐÐ=¸-܈ÞÌT-óªÓ�5}EXÑÍŒ©]ڤ͞¯i…ʲíÛ±­WðÚ\a…ÚÁ�«›èM}‰Zö$Øí"�@Ôšj
¢cXYÉÿ¼ˆ®$؈K³Ž¦*®a
EŒ¡à)­œ,MÐZ´œì":Mt6F>¶5+­tâ
¹™„BR£L¤a)6 MbÆC2Q+6¾¾_vüÖbXTâ0ÞH�«Ð?Kãi;à	Lã"¾Š7Öâ%•ã÷u+<A§Rc1ö%NAåbAV¦mà’m%‡h¡y�é5I�€dÀÞÔ
½B#˜�DA´$ŠÏ\à€ùdº<RåKFA^b9ðE—	ªß
†äè-¸‘çwo7?Šh$p—oz¦Wu(Èù‘gzz/xŽiáÐ�Jú˜§ÏLw)ðz¡ÿ÷û´/õ ¿úN|vwú··÷«jÀçô»oü¡§ÌE1IÉd—¡è…äöÒb¿—z©—y{?ÉÂÏú›÷|Ã?ý¨Çˆ«ovU§^�7IgùÙ§ýÚ·}’�üÛ×ýÝçýÞ÷ýß7užõÅ—¡³§|¹·ˆ¥�^p§4HùJ?´_x{˜—û·/?H¾æGúÜ—üÈÏ}FùöN¿õÐÿúEIþ\×~ù
”#ƒrä¸Ñ"Öž3wªüÈ3eÇŠW;†½:ÖcÙª‘(Ü8’Š“ˆ'�Ò­k÷.Þ¼z÷òíë÷/àÀ‚Þ»´0âÄŠ3nìø1äÈ’4˜´ æ¹E�kwóÐΛ•}x¢À Iš¨nñõMÌI=šàÒѺK»®»”áåÞa£&NÚõm£A+g]}ü �l[?8›`å“ÀN�áÄ&>’•-{ùÑ¥G„DiÂÄý{&HäÓŸo¿>þûúó3éï¿¿
*Qß}LH`ó%¸`�Èàò·Ÿ‚ÿ
!EFøÀ@[x‘@>¼
bGN,�
(°køQ<œ#½îÈÃnШF.ª
@	αkƯ1�_ Ã>‹	ÏB)ÊQêÅf¤<%*S©Ê!!ÁèÁÎÀ¼%4àB{›šÀ¶¦	Á
Qè�–`„(X!	Xè¥�– „(°	YHˆ	Æð»²�zo{B”�€/,óm¶D[.—pbž.*l³Ú‚¡Á	
	FØQ7“0…‹X�	(HÀ”f3´¨vF`B„€¾�œÂd
�áØ>V’ÛЇ3²±FÆÚ£óà2òE›Õha
Ì“bI¯"&
c
ÚðƒàsB(œ¶ 4@@J`€’¬„tÁ	 ±•ŒÀ
1ô 	&xeíâ?… =àª@4h3
JCŠ½¼A	'È•{€…4
^÷ƒ
¯þ uŠ‹ñ´
8­>ô7�ЀºÝ†æS;�
L`€îðÙ„§^?z.AØ#=*¨bç~µ•@LQ	d2	à#,Äj#!Ñ€|°€1\Y—,óŒDSD�
,ÀSCOÿ4à0À
0ÓT½ÚÁ	��«
ÀÈÇÔ`4

¢#b#
ã]À¡Vƒ@ÊjAÙ±ÅR At	Dö
2@)æQ58âÉ!¢
ÆE´MXŠ,A(ßË(E”€hÁÍIXM,À|ANDBhPÀ¨
4
ŒmÁ–lZDÕŒ$Àö¼
�‰Õö”¨€Ô’C!
Œq“8€§™Î˨ŽD4ÀR™N¥�ÀÐÇ,À¥9ÛQúÀ.AœÄ<%�pA
Їœ»½ÚWÀ6�Ÿ�”£p‘V
[ôÀ
‘–;àƒ4è\Èù\
�%€ A¼RLr€L¥$‡-1ÀÐ’G°E”	X%Tªˆ1€§UÏHSõ˜@àSD½Í•¡�
ÿ¤yÌ -)Ah

(
X¥ñ€
¨�«%@69Ù«IåM•Ù€€|Ž˜tÁ<R9Ã*NÄÐvU=ðÕ@é4øœ=NCè�—3l×ìÂÜ	À°0Ãþ0€5\ÃÿÉ9‰

ÓøHAI„-µ™0Á äFËD�°GèŒ�;‰�ÿMAÏJ½k„ÉÐ`	ü„REG]ÚEô€·nYV© Y¾tpŒ€xP
A‘„HL[J>ý€üA�¼Ó;…
\"
l
•-ÁcZM˜ 
‰�
2!1–ÕV.Oƒ;ÄAK5LC.ˇ;�D÷64Îh¯CG´DCÉ”¼ÄKD…[
f£ö1t60H¶2pjkCn‹¶.üq2`ƒdWöhÃk#Ãnc'1·dgöcÿÂes'E6fkÃ0ØkÃU@Ä‘m„×@
-sŸÃ1Ã50öd붮œwdƒ=¨¶f§6vgö/@vg£v~_62è72àŠ®lö}ó÷m#wÿj¯¶dw¶7 6mçJgïw~ïvj÷e'ƒrç
1ˆ¯hL4‡7	Dw8ˆ‡xdHŠ_ÈIV�„iìhnÇaDwЊiÀxKO0Ÿ€Æip6~û‡‡˜ÇeXÆCÄ	fÜFXøI6F�k8F,�™„A|Í—´¸G¨F—XÇ\
Q0‡�ÒøRˆJŽ¿ÊFÎö©ÆØõ86Îœc‡Z`…�ã…‡„
]ä9�[GŸDw‰ŸºO4SœhI`—„¢WI¤SEBd	™�6
zEüùuP:¡ÇùrPŸ[9£;EPkÄ•àF”‹¸ªOƇ¯º«¿zÿa ù]yŸ¬É1Ó†Š¯dIh9]´t•‡–ÆŠó†¨ã…˜pF]ltŒ'	s8Ç–}UŽ×úa„šÜ„M|MÈtk4ºsÌ
à¬xnû	›É�Õ¬|	épI°gG°ûDW§¹‰kùh4²»aØ;¾ïɇÔÆi¬x—xÇl {¯cGz`#zЫWhop{Nìºrj¿ëzŒ—Ɔð»QÄôËt¾Ã:ÇÿE«w<ȇ|]O]\Æá»·ï»ndû·ïèBüIp8üž˜’‘_ü²çEÀ›y±ûáŸÄ†OðôØaÅ´G§¤:D$EL_9¯{Ç´û¬XÉߎƒG»ü�o¸‡œ
ÿ…=N¶kƆ/×n¬|h€ÆÄ«»›�½Æ{I¸—ÉkÆ·ƒMÄï{i,Š¥«{³[»g0‡�cãÙãz†Å=Ø·I¶oø±Ó«×Ï|²{z|¼È7~Ù;>äG~¡Eµïºf



From shedges at users.sourceforge.net  Thu Jun 23 13:28:29 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 23 Jun 2005 04:28:29 -0700
Subject: [Koha-cvs] CVS: koha-doc/es/sysadmin/templates/imágenes image1.gif,NONE,1.1 image2.gif,NONE,1.1 image3.gif,NONE,1.1
Message-ID: <E1DlPsj-0002Io-6Z@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/es/sysadmin/templates/imágenes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8780/sysadmin/templates/imágenes

Added Files:
	image1.gif image2.gif image3.gif 
Log Message:
Graphics for traduccion.xml

--- NEW FILE ---
GIF87a€Ú
çÿ
…qèР>{
U¨´hΧ u
•"`‹¤`€�³hϪMËVm„µp%¤}köm³ÞJP+7ïY¹vý¦+a°ßÂ+ÖË8qc	Š!'†Y/åÊ—#gÞ̹³çϘA‹Mº´„
2dV}™µÖ®aC–­ºöëÛ¶sã~�:ƒïßÀƒNü5ñ¾‘®|¹óßÈ;x.z†éدkÏŽ�{÷ëºþ‡/}¼ùóèÓ«_Ͼ}yö*Ú·O>~|öñëÏŸ>ýüþy@ŸLxUa¥�TTáDCQ
~… „Xå"ltÈ 5Á�hb‰œxÁ)¦Èb‹(®Ø¢‰|P"‹%jPãŒ5âÈb�iã�:ê¸"�?Ê裋Cyd�Pö¨£”#ì8äUÙ£’Qvéå—=Ž f•d’‰%–bžÙšiŽ)f
¬9fbÒYç�#Щgž|î‰B€*è „šB¡�ÂЂ‰Ê( Œ¢PÃ5 Z)¡•*
æ-lª) ž†*ꨤ–Jª0 jꪬnzC
þ©¾zÃ
2Àê©²ÒzCª2à«®0̺밾ά±ÁÖ@+®ÊÂJ«²¸öZë¬Í.;k´¸
«í¶ÙjÛ­®2!ì³’{¹áÊð¹ä
ñƒ¸7¸Ë®°BÔko½ïæëî¾ù®»î¹çÎÛo¾
ûËïÁìf€H‹ 
†¦PD
v`q
5t0‰l áN¤Ð

$þè5ÏkNÙ‚[öØi”€Zéä‹IZÙå“_–™f�UBéæÜtßp&þœ¤Ýå
œªÞié‹¢Ú{¯Ãкªªòº)ªÅ/*ñÇ'ŸêñÃÆ*-¸ÚòÚ+¸ÑFßëóÁn¿+¶¨î¬«Øo¬±èš,ú®�~·äRà‡qT`€`@
ȃXD„�V©¾R°d,
E¼�È „0iE^Xa½ú`†)@élàR€Ø¥)¹�K`‚Òê7º…É‘�ŒÓ™æ&·IÒMn‹Ã$åÜä�ÈYîr Üäè$—&Ì}r�Ó“ PÙ‚Tþ©OƒÂ¢
A,è¬ŠÐƒ
!XuaÈ0¶"Úëep¼€D%ºC3Œ  MD¨
ÇæÂx‰7¨¨2áE!ôSÃDÍðP"NŽ0€é�ˆ_ØkS½€¦à‡"~À¥~„cJ‹°ÓzU
‰�œp*Ìʧƒ,BnP
>c/”ÙØv(„TàaC=(*ºÖxá}ðiÎ>à­
ASä™üpPšú
fIƒN…�!ðx$€8‚²Rûâ‰$«4Å‘.2¤!áæµÎ>	n Ó<�ÈÒš¶‘Œs䘇¥Æ™INnšþäå'IÊ¡À“nŠnM¹IUÒrr¯LåãnÛJV¶ò•{B%+oË'xw©äÜ-;]ÜÖ¹ØÅ® n‡Ý\>ªvÎÕŸ˜w+ëbÓ—ªúeó~™LçO'YX2ƒ"tà+E :@
68(þħ0€v"¨Ê
kô�èÔ	*X-ó‘ \ÍaÑ’&5¥EÖfAÊÑ9mĨy:Ô0úb§Ûx%/e–�ˆ,ÛÛ¤ÔêÓ&’³�lä™ÇHÂ]òײ•mlïV[Åá–r¼Å“�~Ë'äZ.¸£Ìr[IíQªr¹³#T³©›Ëé7™ÏÕ.t»+KîjªÛXb‰¬�Â&Ô
°áAñ¼'
HDÄË-…iBÉ€P2@"N>ùòÐh�Ý�ð(*Ø<ˆALùS¾«®téF¯b*:áá@n°£ð¸Ö°¡|œÂÆö�Ô´°Lá*ƒ<
5T,Q%€â_æBWDP(¨T¦
NP
2(ER.Å
�cx�WÈ
ê
j û	Ÿº ø	xj¡šúž ÷yŸ
ÚŸ ê ú ûY¡
xˆ`¡ü¹¢j¢ùÉ¢ó© ,ê¡ó™ 6
¡:º£4Š¢óI "êÊ¡A:¤3Š )ú¢+ꢈФÊŸBJŸ9*Ÿ8J¢j¤Mê FÊ¡BZ£YŠŸ��¤*ê£$Ú.j¦hú¢5*£j _¦Š¡)*¦ú¥tš¦
ê¤fÚ¤Uª¢+Š£.Z¦‚Ú£þuº¦gŠ§{*£`Ÿ[šŸAJŸYJ
* ”Š–j˜š©šŠ©ä`䀚ک›:ªžJª¤
ªœÚ©¨Zª¢ºªœúªä ª¦š©±:« Ú©ß€©¨ºª®:«§:ª»¬æЫ·J«ºê«Ãj¬šz©®Šáp©Æªªê�© Šªz«µ:¬–êªä ±*«Ÿz©µÚ©ßê©Ÿ:®¡ê©âº©²z¬ÉÊ©”:­Èê«ÌZ­í
«ºÚ®ÙZªéª«Åº­Új­¥*°Ÿj®äú«³Ú­ÕJ«úªª¤z°Ûj­Û©ê±µÊ«æà­Êz©‹±»°ÛZ±©ª®K­”Z«ð°!˪[þ­ÿš¬×ʯÔ*±2˱%²Çº®ï*³<+«–Ú®Öú³èP©?«°
¶o;­jÛµC[®;°ÖJ·ä$«²«w®í±[°.ë¶
k_«©ÞZ®»ªÙ´ÚÚ³çJ³,ûª¡ÚäJ¶ðš±—Ë·j;­B«±¥Kðð­ß:´©«±ë©®;±êZµ0«¸w‹ª®…«¸—ë¯<k¼«¬²+»õz·[¬™J·¡²ò
¶|þ»©‘k®Ñû¸äݪª+°•«|û½¬*¯Õë¶%ë°øZ¼¦K±îª¢z®äZ¶ÐŠ©�;¸è»¼¾‹»qû·Ò[·Ö[¿Vk°tªd;¸¢šº¡û³ºú
¶‹ºH{¹ß:¶°+ÁcK©±K·f;Á�Û¬±ï`#l¶�;Â{»ðÐÂl»'ÜÂ#»'ì­3,Á&|°ûµ¶ËÁ¨+¶®+Â×+¯)+½EÜÃ&¬±™š².lÃ.ü'ËÄ<´Ü­ÓÊÄ%ÅVl»VœÂ´kÃåÛ­.<•¯%\Ád«Á´kÂ9,µ¦‹ºKŒ´ÖÚÂ?¼ÁIlÇ ºÁ zÄ”jÇE\¹þbÛÂíPÂElglÈä
4,Ãêàï¹ÌÅ=fš	 ê�\±
ÍÐ=¯1lËê@
Ï�ÃÃñúþ]*Æ/ãÐÈ-L±õÀÆ8LÒIÃ,Ñê°›Ã9©�
-ëì}0	ÏàÊ	m
©€ÍÁÌ\²ðP=,ÁAM©£°Â-¬ÐÝZ=�Á"ŒÅñìÐLÇaMÔEìЪªÅU-Ó*ÄdlËvÍÄ0쩶|Ó‚LÄcLÑ=ü3-Ŷ«Ê/|Ö!½×(íÐ"LÓ\\ØCmÌcÓ�Ó?�ÓcÖ?mÖ3ŒÄM¬ÖWŒÓ�}×x=Æp=Á4<Ö’=ÙcœÁ ½×‰­ÎüÈf\Õ³ìÐ"=ÛÉŒÓ-­Ö¬ýÖf­ºb¬×?
»m�ÛnjۨMÔ«�²òÐÓ(lÖ–þlÖ̌ߠŒcü1ûœ
¾ �
³€-,lNП¾Ð¾à5`
aZß ÖÏ +êê�
a÷ܤÛÂT°u~�	Ù0	÷�	ü<|TøíðÐÑâí�`
K�	¾àÔ� Â�ÒªÜ	10?<íàÕvð0ýìÔ×àÔ°û
ˆ@?™ðæ
¶Ôà^Ð
Ï0s*
Ãj
ä`vfàò`æVn�
In*-C ÔSìîÂþn­"žfà¾`�0+Ÿ	wnæã­æÝ,ï@Þõ Âv~ï«ãq�ì«Þéq¯æ|÷tnèíÎìVNÞ�>ÕÏnøo÷m}÷onío�ÖŒó7í£~ï"Ö|Ü7/÷¾=è®þøïê{?éo>Õ²>ù†_øŒnæ—Oçrßéœoø¹NÔto÷høh-Î~êh]ø¢ï÷-<è³/Øq/Ûj-㨿ë´�ûjo÷Âþô�ô"ÜÖ}üÖ~ùv~ûµô“oå‚�ønmåioÏ)`öPøàcæ�“ ™0Ü.v~þí@1ø4	™ äPÿž

WRç3žÉÀ'²ñ°g¨˜Å	yØh)›>Bĉgìȉe*♨˜‚NÅìÄxv‚GŸÛ,´‡:ßz’‡®=ëÒçW>÷t±×^[ä‰9\É«‡D={¥ŽÏa‹Ý“.ž¬õõØž®mîØ=�ýÕÚùT´Xdér¶[ÃÝÉ7íãÉêŒÝ©×\Õ§^kŸÖ]Üpå—\�‰åµ'Ïøü°Y„-ô·]iÕ�í¶Õ¥÷ÚçjµøViùµ±ÜÝn$VžrÅmÑÞ‰Ö^‰‰õÌ×zIÌ[t)Þ¸ÚÏbFØV>õqÍBÜ þu™T�5Þ¶Önñ©vÛoTPÁß¼˜ÅWÅ%3̘¥Ý}àYÊ¨ŸqBŒ®ñ"•®	–D|²ñZl�ܬ^*„ð§l¦¸[Œ©ðC ávšAÁÃ	D ô*S31'�,Ûíu”Äè�/ô¾¦J¨§ð‘NÎ>«*
Ïá�³2AË)Ðñ¸žv<ï’Éõ¦âRb&¡BÖ笩’otÂÃ'ØPÁL/ëÉ£“<¼BÞEÍwD|Låskظܚäs Â²�Ô~ù{ËÕGÑmåÉWçvaÆ[ÍWZn,[÷wŠÞž`-t6X}tÖ‡?Ð÷?þÝ&~åÓýþÄÇ“ø‰L´�ÿÊG,˜ùFQÜ“­‚5¿ž¼¯'ð[Wü¾ÿ9ËósÑå@‘}ˆ€|×yU¾‘EOm$Ñm�æ¢Û8ma»4è0E]ðŒ™r?iÅo7îÛ®¶UÂ¥PGŒó¥®¢ìŠã‰ûœ–Àòjcꪇ
};!†”�‹v\#ÏP:àá‹Y¥¯ß F&DisøB'â«Ç,á‡Q\#ß�G^²
kXãõ01ž¡k¼£NÉÆ,²þ‘�kÀæ�Ç3pa\úaþø_V
‰l˜ã¾0‡=¨2ªb"òƄǨ²á‹g˜C'߀e5Ÿñ
€½cœ¾(æ2f‘MYr¤5Ïx>ú?t¤b™ †;M	�a>Ã’êÈG™
¢Ø#Ö ÙgR±kdcè@Ç,¾IJ—<Ã3ŠšßˆòÈ]QÐìG¹ô7¢~¤4��L>¨(˜¢¯\�<¡ûDŠ«øAs�
Dá
õÈ4Fñ‚
ü_ôö	ÈôA3~cmj ™ØRþísŸi\júÈxþ#}ž4�nMŸx¿"¶�QÝàY¯ˆW�JkŽCåiIɺ“ªFµÄ_N™ÊÄ ºU©•$NáŠ+ìSŸdtãý˜Ê'Vg0lìÒþx#tÎ	NðÂ;vÂÔÕÊ鶷UÇn•*Y at fƒ
¿uBYXºÛ~„¹ÉµÇ>¢ËTéLºtUj «Ýëækµ’º­¾��}l»¢]àvñ§Ý}”4�¸@îNª«Þ¦n·“p†Š0*œªT´Ò-	F1?ÞöÃà½mYp*ÝÜ⪼Òn?×ê–V®�ÍnvuÝ—ªv†+][JSéê³¥/í‡?Ú‹b¸´N±]5ÌÜþ—†Å/êŠAZŸ6¥&>q…qa at Nx¸äå­…Ê{ݵ—¥Ò2_ý[ã'™ÆâÛñnõib€ý÷¦4ñüÙ“T¾Ó­¢\·|^3Ÿ˜ªJ
­™U:dïû@Vj{‹|£_7»è-oKõŒBážØ¥xÞóƒ}ç#ÙïPAMRÑÞ˜Ç#†i ©lèsúÄqæñRéZÝOsÚÏ—¾t�[üéTÓø¿ŒŽñK5]c@–öÒ
ätªU|c	‡ÖÂÓ-퇵<bÔÃÓÂŒ÷ìPc³ÚÓ•.õy
M`·:×­~ñ¥m=TOÿẔæ5¬S=íIߘڛ7[…{ÂÏþ>ûÄ0.u†§
ïr‹øÝ1ö½Sœïr�ÛÝlm鯵
î»[ß?¶¯ŸÍã]GÅ×÷¹+�퀇šà¿w´þnŒg<àç4_j�oü#Æÿ0y?R®rN›Üä%/­Ë÷�o”ÇúNyÍS|s–ß\ç,oyÉWÎrÇå<?qÍ_¬ò”ç[é9�uÉ�¾s¦¿¸é§:§cpŸé'ßyÎuna¡½¥2gúÏÓs’+½í89¿™¾s¶·}ßNç¹Ý«>훓Þ[9Ýós¢¾ç\?»ÊåÞw˜£œßmïúÜ}þî¥#=æVo|Ùït¿+Þéw§¹âg>o©÷þýîüþ:ã+ß÷«Ÿ>ô¬wýÒgþâ·ûïHW}é=ÏuÈÓžð
·½çoãš�=ïû6ýñ›.uÙ“}æOÇ÷Ù›?ûÖ÷ã)ˆ�Ë»~tîwÿèB÷þÑÓþï“ßüçGú¹/õ°«ßýÅ¿ø·ï}ð;þü¢×~øÇþçßþ÷ç?£?«¿ý#¿²Àÿã?É3@
äÀL@úÛ?ä@ä¾³3AžÀä¾rˆ´þÓÁT¿ÜÁþóÁÂ!üÁ $Â#ô>#DÂ%4¿Ô'&„Â(”Â)¤ÂTþÂ*„–º¾ÀÂ.ôÂ/Ã0Ã1$C”[~(Ã4TÃ5dÃ6<:Ùr·8”Ã9¤Ãx¨Ã<ÔÃ:²g“¤Áª:”‡w Ä>¤C|€r`&C3&C44céA„DGôÃ?<DH™=4±Lü1wÄ^Ù²Iä4|ø†e ‘Akø†:܇Vä=\‡k`:/:ä‰YÉÃ[ô·9„—\¬‹]ÜÃ`Æa$Æb4Æc<1Õ
D�k6àHŽ<HkPÈwû0¸¸
昂á‚!¸†e0æáˆ.tÈ�Pà
"ð*(/À‚¹u„!@6‚opÀYø…Qð�DPßèNqPÜ!µç}þRd�ម…:ðç@YYD(^…�(•Î}%|ˆdÝásÐ8�rÀbIPƒ°üV}P‡j¨†2mÍêÒç+}Vïâ	rèÊîÎz�ËÕýi8Xa¶_˜Hè–xq„K¸ap&".#ˆƒK¨‚"(‚l‚ è*È^Ά�¥I…‡A¸…K¸\€^¦aX¸…[HXðqHHÈ„T…QЉVT‡Lðƒµ^kqk®Æ…!Þ	t@ƒ4ˆ4 øɇœ‚îñ,ÞëNPëE¸7†»îê!î	xë[†z†gøÙƾ\héY¶þrPƒ3>±áqÐ…Úu—î”ÖÕÅèî<uHáî,1ëÒš>J
}¸†uøMª‡cxäj0rP1{ WI�„ÒN�zÈE¼Ùm$‡ôõj@{€bu�)“ÓXaoüR©EíSÐE×ò8�q�-ÓbõÊÑ×ýpc2ëyœùí‡nEDq
u„ð�*˜�¢ø™–�Qø�T˜wnþf!¸­<PU؆Ò@�(6ˆ
'ˆ�5¨
'è…¸�ˆƒÀ3€„d€dv`0
À
…÷
ÍŒ«ÌÖ¨áÄLT©A…†3»É�›;¼7½$ŒØT�ÄJzö¬h7‹FJœ(P’ZÕüù«v,VØԄª“w.ç8¿öìÕwêÔ9sBORo]‡õ®½Ãö�&­WÑ=?%I‘�KhHš.X6tè¦Q£l¬/Àh5wì?íLsŒ0Œ3Í4]ÀÒ<4ÕS
LQH¸DLãHDÎ8ÑH�sÉésŽ10Q¸Dz§XØØ7µ�²"+� 
ˆ�É£�ýì³�8þðøÓ<ÓÀ2q¢3$)»¸³c?õø¸ƒ‰£Ë+ÈpO>ù´“Ê4�1È``~äÁ0‘]e¸|ƒE*Bâ
³¡ˆãtíÔ‘Äcì
Y4N?úè³ã?/ÍKN¬±ª“þ&òö�?öТſÄé¢ÕØ
¾´ã/»ðöÎ&¢]sÇÄøq
,Lá‚'qÀT‘Æ	Y™‹l3/Ä‘“
ÎñI¨/LÁ‚Ž¤r‰Ó‰0i\‚F8èàl�|#M”�58‡%N&�<ƒÆ%?7V�8y™™dãÙËÄ×XÐ
^sM. ÝqM'“X3ÈŸa1øLSi•4nóƒâàFË»ùÚƒ�?´Ä¤Kc
��röècÏ9æU³å–õý�
*àsè5ßµ^$&v3ÞÓ
¸�ðHÀPóúëÔ #À
9ÒI'J#»SJ)Á4ÒŒ2ïì®=mÌáX�»JLƒ4Š²"ÿóøÓ<Ä!;€íŽ6Ô`Ä+¦D¥üð´¡Í†“ŠP�
5P”d°ñ1¤	`æ`ƒ
P™Œé
¼ð‡#èPeÃ,™@Ä Ò¦
ÏÈÄLFò'ðp,Vtð
HÑHy
‚;¶�…1lC�xU‘
PIGè¨
'¨�ä`C…7þ!�!˜Ceô‚€€CÈH7~a
ˆàN
‡4š%�Ù¨YÎ*bcÔAŽgˆ
( ! 

@
` `’2‡R °À	ÙXÄ
ÐÀ7ø∾`:ÍÀ†> ƒòh‡/2ñP‰*~ð�r@�bðƒ:¸B6
h£¾Ñ�5db$æ F
�‰g@âºXyÀ(þ1‰<¤–è’OIcاL\c¯<ìt]C
«\%+þØ€^—WÆv˜ãYȧ ¸…V˜§”Í}p&¨`*ƒ2,„"š10<ÁFL`"…X
V€‹26§XÆÚ‡=¤ÑZq0k©ìaÍØ0X
V
¼ÃW…CE‚;äC7•$Dœ
hÁ1pÝ댃¿ÉŽ�¬~ÔUÒ¥‹)ô•*8Ñ‚Ãñ¸EÒey×Pi
ô,�õh[ò^e
Õ´uÃjußëHÃèAs})ˆÂ7”ÝÑH§é!<øŽÈЂ (ƒ�˜D�hÛÉ	×
UBÌNº`ƒ(ì‚Õa eM\.à4øÁðÃŽˆ�òiºÐN±áAÜ?üƒ%øÁÉåÕÜéS 
þÈSßeàÞ`À<@`C
€œ€ñ’ÅCã=Þ8Ã4>×ëXƒHõLA
ôÁ.0$A”ÀÔA%˜Á�•‚ üAV–8ñHñä&lBòÜ-Rƒt.xAÔ@ XÂ(Œ”@˜]ƒ=Ð|ƒwœ_EÌÁ˜*Í
¨Á(mÔNHÎ�"H-HBIšä/`ƒ=	HÊÛúEäÇ(‰ 9Œ1àO(ô$Ýi�/8ÈYQ2 ÖÝ7±

†ÏVlB.\-ÂW
"ÞL’Ã7ÀB.`å³L\F>CƒÕº|ÜîÞÌ¥:Üл¹cÅÑ5tþŒlć Iáùéáùí_h Á3(£Ö)"9àHæÄH¥-L–/òNdÇ4¼å,ò%ÈeÃCzUwì%h�bÕÃ9�v�ö™‘PîÜ,´&#Àè‡Ö©Â=A_uJÏ4äÕ5تíåMuC5ØB5ÌN§=�w)ÏÌ™bÁN•`|Ã'|*èA-XCþD×

<ìƒIìƒ-V: Bè�¬Ü<tgFôpU‘P�%t�ØÂ*x9¸b-4Â|ƒ¹•ï¬P,!¬�zÁ�[§‰�:x	�®ôA“¤TeUÞÒ<C*àL×
hƒ™�˜‚,ä�þP@ªLÑo‚J;<‘m’cŒlˆ¾N*˜AĨ e5õ&10Á À8Áü@	
(Á”
Ä@&
ìlÅ"˜ßH@Фô’ø¤–4ð
ƒŒ™ƒÄŠ­PàB
dÔ‘.Ï2t0Aä
s”q �ðòràƒ3±9�ZaTp	¿Ã3¤
-
��ÜICI¨±ù.GÂD}ç8Ü°=ȃ[±þ=,O¾†U0•„{°‹ƒ¾’37²r s}„Ó±Îe²óð§73_ò»Ü01)G%ûp	ŸðÁN/sÿ°Os׳=»ó£°7³;£0#Žq7±ð;Én}ìfä´_`„ðª³%ñGp
äœ�èƒ�ØÃÿü¼äKl%o$ŒättKä\á¼F˾ì‹F‹4Fã¼ðâÀؾ€t NM—tLã4o´4�éKK`tJ—4LÇ¿> ŽIïÃPÃË>è4âŒtK¨ðÃ4G÷CRûÃS§´Î11K‹´?àÃç\R'µFôPët˜ôTOõÿ”þsQÃôYµEËFŸt;\?è"]¿õÿìKK at X',‡]ct9뜾”sO“õ[·tQ;µ\ëNôRß5\[Ãä�<ðFKHÎ�|ö�6`ËtXGŸtÎ]5V÷ZtUïC¬t]³ñä�µ]ûpg×6V«¶aÇ6P[tTstc—3`cõ»¼õ?çœ><6]¶p§6gŸ°V?µhµ?¤ôh�tm7]5F?µk·µFëôHKÎrßõF¶N—ô%çŒY4K#µR—ñ[Û¶xÛ5{[ô[35mÛHggtGƒµIöáÔuGvÂìÃ7¤@
|Ã5`ÃÚp䃇ÎÚTø5X…þ¯M8|†W8†;x„[øƒ[„ƒ¸ƒ;8„WxŠsøÚ¤¸7tøÚÀxŒ_x‹[¸%M8†w¸Œ×x¹XC‡o8‹Ÿx†CøŠÛ¸wy…£x�'¹�³x‰9Gž¸5„ƒ�+yèt8ˆcƒw€¸‡G¸�GxŠ_ø‡·ø—[¹ˆ/¹‰9„cøš—Kèdù„S¸w€ùŒ'y„ûx˜Zƒ•Ÿx‰‡N˜W¸7¸ù›_¸›;8‰w¹„÷¹7lù’W¸™|»™–7¹ƒo¸žC9˜óy“Ÿ9Œ£8—Kø™¯Í¢9�‡øœ›K†S8‰Ÿ8œ§:…s¸–óy£c¹ŠÓ9—Ó¸�gø¦Çy’‡)‹wx˜úþ™Gù›ÿù §z8¬¸ž[xŸ_ƒ7Ä8±º›3º§ûy°›x¡ƒº±k»ƒ/C
8
Ã…
*R¸n:xI�Šœ@DJ*pA„
'jèÄ,/¨è
sm�F
CZDjX	½SŒ!F)"!Ñ¢¥Î‹
‰E Â(<c íy
˜›þ|@…k€�‹D¤2y÷»æ©eCá¡—�¸F5¥]-EÔ'9æÑÌD
�&
Œ<ï¹5eÞñ]·»Öð£MÒñÉtîaë®2Æé��™bìˆõdñ<æ\ƒ+1›1%b¬�®SSÅ4Ƀ@®kꢎS³ð$®ªÝ²Óal³±¾£«»ìª!™ãŽòÜ�Oá’«	¸BRj´¢×;xØÍ來uÍÚƒJ§EŠ‚ðñš	Ë*íÈ3m�	œa"ןʮ<
`üâ½õ­/�wÌ^bÈ"ÈKf2“q,åÇùÃNo”7œd;ÀþÍ3/ŠþLe*ïÅþ%ô›á<gE+ùÈnž±�GLå=c¸ÈHv1•	Lc-OZÇCq
NtbÔˆXC¨MkY‹zÔµ¦5©M1Š\�:8t`ƒ#xœPÛZÖœ ƒçfÁkNð–˜5©“mêTG›ÑÎõ®ƒ
í`çúÔÉ6ªy}íjc»ÖÕ7ªOmn]‹z×¢Nµ¶k}îqŸÚÔÜFw´gqíuãºÛì5¶sýn[Ç›×7…)ÔÝnn³{ÝWµ¾>êiÿ;ÖÞ&7Ã	~ðiwÛÛñføº-.koÃ[Ú¼æ…,
!ÄÔÒáÖÒNõÂéýìŠÏzÔ²x6±A®þkrw¼ã-ïøÆ#Žïvw›ÛE/µ®'r}Óšâ
Ÿ¹¶¥-îo‹ÛÞ Ov*.žo«#]ÙL¯õÎi½ñd›bì
'û·U�nNT»Ô=Ç7´÷mo�G[ÕÉ{pˆ’SÐã÷à‡ßÿÞ÷~ðcð€Ç?Ÿø¿+¾ï�÷{ãý>øÂ/~ðøhüâøÄñ}÷»?ôÁÎ3Þóˆ/<à/ùÀ“¾ô„ï¼ç5�~
¯üâ¯_ïK/
Í/öf/
µÏï*°ñÚ�]/ü"PöüOaϧOðÏõú!÷^ïÿd�iÐÕ¯ô8ÏâÏþî!û‚ðñø
<m
pÁþAÿa»�¿0
»°º°ÍpÁPÛÏÏ°
ÅpÉ0
Ép¿Ë0
×0³O
¹0Ï°ýøðQ
Q
Ëp
ÍÐ	ÑгïÙð½0#

ÑÓðÑ°
ÿ0íþ�q3±Óð‡°
íðqýñ=1I‘qÙpÿ�dq+±±á´úƒ
Ö
€QTr!ËÐ&¡
�’#ÿ�
²�²'×ÁL�$»�,•Ò'Ë2&U±(kR(O±'Q./r;Ò)�‘…q;²ò)U/±Ò$÷Ð%_r ÷’1å,QÒ#ó*Í�¾á
q�5A!4! ë¡Îaö¼Aœ£
�F,×á¿
ñJs:“3íáÄA4ÏèÁÁ }àÖÁVÓ-i²-…³8�ó8‘s)“s9“Ó)—Ó9™s8£3:‰ó8¹°UŽ*Ù
�
¾aB-}d�L
AÆ!F¼€ÞafÄ€Á
Ä ÒT¢°`
@FFMþ¡$•/&ÁÀÀ+«4TEuT3Ô2=æÓd�õá8Ó!ÿAEÏ¡
Ö¡ðA8¡Ÿ¬²L!hÃz�ˆ¡ü�UÛàŽÁG5
6÷�Ö¡¼
˜¡˜�èÁ,HõZ±5[µu[¥;÷
¨@ò
ò€daÖ
˜!¼!
¿
¾¡ÊÁ	°a
Ö`œ ñá||€˜ ¡h5Èõn•j ¨µ Ž` Laè
–Á^×`°
HƘÀz!–�	Êt˜ Ò‡[a6fCõ2=t‹ê°3;3V5!Vgñ!À‹þ°

<±<3iu´	<³gc ð
G¼
ÔÄgu�÷y¡Wu±óÙ€\éAR£p³u£±
a
¾áô
á–†ÀŽÀþÁ@F¡éA˜a°Aø¡ö@|{
&
–
á@�a™AÖ °�	ø!×!H&
a½a0ÀUHÊ�ö§
¹3z9XkiöCg
ýÁÎÁúÑ<sžÖëôÂÁ°¡Þa‚Éáô¡c·É�™
�Õ¼¡°¡ƒ�øˆ‘8Jûák'—
è

µ´slá#{Ò12¹q0q9—?R11r Oy/‹R ÿaŒYù˜Ÿ´>x‹6øÏ¡ªó$}Òž9š‘ùš±¹’¯A€}%KÙ@ö.²–‹3•?R&ɹ8‰™)³y�-ô’Ù “•ÓBòœÙ¹ží™k{ÑŸüB\–&Ï÷sƒ›yZ8[r¯,Ÿ³2úÚ¡�óŸïf•Ùjv&:£5z£iR/äKÁ€dy˜�IÍÐLý6˜+è€5sà‡ýÎ*ï�{ÊalùLï�Zótšoþqa–
ksZ sº‡:B;o?{ú
uo‘ïžZ™‹( �q‘	�	üîqñ>›™v	T9úZݞú¬Í›—ø•©—\=IKúùx—
ŽÀHÿ�°@þáÀ
vüÇ�<Èkü
z¬éyº‘<ÉaÖ£ûƒŸÿa
À
: ‹1cÇd5qa
°w
�ðÈÐ,Õ	fa\uéA:ÁKÓuäœ ä
r@Pé2v3BMŽ€\ý
:Á|à�S –�W×€|ÀÂ=<ÄM¼Ñþ�ÑMüÑ#	€
Á2† ^‰á|bàÖ`|`Æ?ÝÑ1üÃM½Ã
~Ã
Äõ
A]þóø“dÖÁ¶‹—�xÌ”úÁG~ƒ
DCÒŸäÁèÀW‰¡ö€‹,{ˆA‹‰!!ùb:†¼ÏøáÃA}àÏ>í'ÝÓ-ü€Õ;üp€Õý"=Öñ>Ô=~>!ï=|áIà
ü~ð	?Ôg}™1Zåñ½öÊšX¤·PþY¢Ð ûÁ ��;ïŠ]ò�qðtÚÊp‘^
wðÖ¡#ÇvðFñÚA§ÿYè
	Ïýáq³šöa¾ï)�Æ	~àgœ÷;œ÷ÃÀ
òB
„Ì&†àª-·*
ÀŒ˜Š
À­ þbk©J¡a’�m �$è¡Ç¹ÂÅ«°j%‰DbãØ˵­ ¸*�²
öo²B9iàX~åÑà¢ë¥FÝGoãŽ?yä.­)Ï5N¬ñÓ?¦ø@A
ò|äMk`&žœŒ‚Í)Œ²N
lˆ�Õ2™C'Nü#3NôÔÉ2nz!Ƚ¬ã„¸L’×äAÇk˜‚È,n²a1Cäñ²Ël|“‚T€AG¤Jš©\Yªõw¹ ¤/
¼
C”~³œ÷A--<B�ý¬¬Íæ
Q…õH‘à7fcß!æ§6Aˆ
ž	ÀÛ~·)!fifÃÛo’uª$
•~A$"�¦—µóUü!$%’Ä�‰q.l¦3Ÿ	Í—à¤1ô	P˜¡þ&XN±ÀØ	NLb"ç‰ÁF1„kŒ^±â7A…<ðƒ		cÃ(¨°N”1È
1œð�å³8B9A‡Q€³GÀ‡P1Š~Ô€yð#1j`EbX
}ä:f0ÏG _¥E
¸1Œ\<Ã$ÀC|ÁÚ©�`¡åH!DŽä_ß0?à�Q‰™UÙ³+Ð\&0’¯ˆ¬Î�nK;

f#
  op
k~¤
ÙuVkzÓœO?–áÖu,¬=4Ü!~F2‹aaÂ1þ>
Á§¼Œ+õ!ËVºbk“Ðz"š”&m4ÝÎ…-ùD’¨ÚËé!I¥ÉÛ˜ff•†ªTU6U­¶ìgO›Ú–I’ä—$	DÛIb˳‘}¬cÏ�lêWÑ&íÕ(÷'@ß
ð—×é|ë{ß3�!O¬)–VŸþÕÿøSîÓ~ȃ(þ X~N}¥x…™ ‰�W˜ï&ÏEØ^}H¼9:B-eêWŽk[ž­†5å÷¨á@^%BêÖ�Š„)¼usÂ…ã!=WHN¸®Yð{èD/:Iî%ê¸fÚ"&[:I˜±Žv”xgáÇÍRÂÙŒlcQŸ:=è!’}¤²ÀÍöóòGJŠØ dûýKò”å™[W�E%•û‡hàZŽ”{=÷¸[ã-Ç/ÓÞÂöo¹ƒ:ì’€—iôÈK~ß f|Dô"$ßpO‘uìleÔ†w6Wƒ1^lXÍ–‡½••ƒb¢‡0Í(Æ�IÌþtH6©ð—a/ö]ò†ËÊ�E1ŠŒbK#4NóòaI\#Œ€â~r�šÏ\b�Ë#ÛÒdHSp¯rÎËi.Ìÿz|¿àbþ÷é°†kxãö@7ëäï�ßËë!u?zÁ0µp`
×pyÉ£€T`
ýàF{�ëpßã
_Çlðˆà4	»ó
LЈ tÐT0(<ö
b°½@ô
ë0FG0[t`	œ
ô Þ0Ø	Šˆbà€“`	“PX@½@MbàOÖD{À{Ðýp
bÀz³ðT ÿ€þC€
CïÀªdµYšÓƒ>€Tàå ƒ%¶%JÂDBsa0ˆf4oËÈ®±
Äå(úõhú…$Èῲ…L(xⳄã¢/€¬áU‚0
0‹„÷vjRnÁË`	`0k°Ä0†FŽcI–hB9ÿö&x’ÛÓ³÷áð2í�€²�œ
s"üÐFŽ €•ëD£€(kà>PF¤Cë
N0üÐ2�Ð	¦à`°ŒJb)O• µ¨rjÁq+§H6âšíSs”Ö(i×dÆþ%+TødɨsAh%õc)&uè§
—&teÉ�ÝI
jø‚úRjœÀôP·ÇÃøP×@ 5ËÐÄ€
ß@ÐcdYq
ßð³Ð¦À	÷€
˜Ë0	ç´N£@þ€
ïpDŸ…0
Ó
uñ�…ÐbUÇ…`	ßÀÊ0>pa?�äaèW~á2~
‚}‡°)«‘…/j8Kr¥ldƒ+³BB1ç£LcLÅÆUyC6Šq*z'$Að¯¢㇄%WlQÊ zŽ`žë N÷&–ÞÉ¥]JçÁ&—“9VÁIQþ¹æ
—¦?g¦Wb|c\¡¦bAk;TktúûÀN($N
°
. 
à,Í&öS;
+Š¡Aa�-ı¨«wñA¥r)BÂ,ó3Upq-¹ÚË#Ì
$T)
¶­Á¶€ ‡PK)W¿¦Û!
S‚*÷£R5žq§²
7D5
^9
:`S[ß…ntýp­l�–4È:üp
Y±t½Z®Æ.ƒØÀ	ï„Äà
{�¦0×à³°Ä€‡t€ß`
^P—í0
lÀ¯Î–°c³àŸ™:k°ýý“ÀëlÌã+þ ¯®‚û`
^Õ^9‰¬pa\‹ºHÃAÁAËƶæÕ”ñ²\$8@9ÉA6K¯€JÔÛž·”J³ñµ8P팲” 
 ¤/€=;íq�©11òÂ
ÇcP´»H†'ïP3ãó+óVÑï€W4_uêÁjqHö'¼Æ¦¡¨¥a€Á­�
1Ä f ~ÖˆÁ/Øãš!¼@¤*Ä`ÛIØ BœP±Ã�LSmÉÈ
áΘႥb6Ù‚Uye–[æ8á°`c
|ü¡'D¼ùgf†êg’52%x:°	z
lèXÇG¨øffè Œ5

ƒž
�uÙ7­·®
×	wõzl²Ë6›ªa‹eKŒ<Žëg™rðég–IàúŽf*¤§¬‘…|ÂáGžìèyGž~p¹æ›o–±ûì°º¦SrÈOvNÈ3×|ó^‡Õ™Ã¦œ© &ê)„Rç|uÖ¯[WÊ[—}vڿ³áœúq¨ð5ýô¨ª°Þvk7žlËe3ïxæ›gÞsá¨(î8„�·þz%„{î»×OµØ:–wïË—=ùþ7ÍW}`ZÆ‘à®ik�åÙ·ì×)¼þ5L{->½¥tú0G@&�,
ÎZ˜03ê)P‚uÊŸØ&xA^eX!Z÷A~£á a	MxB¦P…+da]øBÆP†3¤a
ÃñŽväP‡;äa}øC þ0!$b—�²7Õ/ƒKÄ`Úb&¤IøBŠS”".ð�ŠUüâY䢳èE-†QŒbüâÇhÆ3ž±Œid£Û¸
Hà¡r¤c&*ÑF4â1Œ]ãõÈG=öq�yTc* á‹e$R‘‹dd#ùHH:r¸ b%-)Eb¨+l±cb'è9‰Áþ�¨G)á
�RÖ£f°….ŒWÆ2ÆÐÅ,a\æR—¹¬%.]¹Ë^îR˜Áf1�IL`Vâ«ÀÃ/–‰[àá•Ç4f1e	Ìj“–Ù¤¦/·yLf’ã$g9ÍyNtˆ³œêDg;Ï™	s¤•©¤ç)Ki�v°
‰³ðd?1ø6Dàî £B'ü¡�pt‚oüðG;Èð‹nD4Õ h7*:Q‹RT£­hF«Ñ
ŒjÔ£ÝhDEúQ”¦”¤'õ¨E]Z�hèbŽÌ\fZ‰–¢Ô¤#]éE]ºÓ—ö´¤Ñø©JyZR‘õ£AE©.VÑtœRªS¥jUá!ªbÕª[þµj; 
�xàñ’ßâe
K胬lÈ•þüùÖO"Z á�{�X ƒ5þ±JjDT°ƒ%la»TÃ&Ö°ˆýic›XÄ.Õ¶øB4“QYhât±�åìK;ûYІ¶•ÈâúuZ~ùë´Ù×»Z«ÚÔº–_¨=H*øÆŒ¨ jô°†#þaŠ5Á
{=ü°O%ÂU¹æÃSüÚ2J}Pa
SŒr¤ 
/FAúQ¢Nô»ä/wÑ^ö¦÷»0mïyÕ‹ÞøZ4Ƙc4‘]<$ö/yç[_ñÞ×»íu/ELÞ÷‚×½åÕþ¨x+¬Tõv¦ï5é**aV‚©Nµû—¾JÖ1xÅ_GXAFÑk¨
™À-
|½TðKK=<Ÿ°Ófȃ)A3
áø X$!2Ekü†`ÄÆSTÆoXÅP$!oþ˜ÅpÇEM|NTGm¤E]lÇbÄFu4ERÌDQ¤ÅuäDnÄFUÄÄLLÅ~\BG�ô/Xƒ”D…„œ°“ž5hyˆÈu�‡ÃY‡}8œw˜ÈˆÌH‰HÂ9‰I�œHŽôH�üÈŽìHŽÉŒlÉu˜È“ôHÂyI™|É} É™dÉŽ|ÉŠäH�ÜI�ÌÈ—I¢I’\Ÿ„I‹J™4É�É™ŒJ©TÉŸ,I¹ȫ$ÉwØÊ­|J™ÄÈ¥DIŠäÊ°Ë�äJ±ôÈŸlÊ®ŒÉ®œE/ð‚Ó[HºJ4–IÈ“< ƒ´Ľì˾DDàK¿ÌƒÁÌ¿4LÄTÌþA$ÌÄTLÇL‹À”LÅÌÀ,LʤƒÇ„LÊDLÊœLÆŒÌÄìLÎÄLÑ4LÇDLÍôKÂäKÍìLÀôËÉLMՔʹMÆÌ×¼MÞ$MÜŒMÆÜËà¼Í´hÍÅL‹ƒìºº\έñw»u°„QP—N¨Îêô”N˜N霄ìäÎéôÎëä„ì¤NêÌNNØNu!ÏN°„ëôOíÏöÌNûÔÎêLOîôNñ$OïôÏëDOÿLêtëô”î´OåO
�N
H4Ö‚xŠb%ˆau–}@ˆf=Š‚xÖ�(VNBÔ1“QªpÖ
þéš`…
jíƒ@Ö©ˆÖhMÖdMʱVa}u-™e%×xÍÖ‚a-x=Šo(´¢†gL¹Ü]Ø:
cùß*™ÁA~Àª¸iíÖ«�‡{X­ùÖru–cÍ
ìxŠë ” ‡�
zˆ dżYèX~àoÀB
Ù¸@œ�
—¥ÙuÀ†o(ˆˆ,.¹xÉ�¸¬aX¬ù†kÀ…Ù’!WN’ÙªxY¼ˆ6ñ…zˆ—w¸Puè:¸Uå!X°•“üÕuˆu˜0(„1pÚ‚ÁDÈ®¸ØèjYHÜØ«è|À‚ÓY†á(˜Q0…mí‡Nèþ©�*¨�Áfˆw˜Žkp*؃wè&è�r(„wÀ‡<°X\8SèJ;/xÜ�è…N8DÈ›oð¿MN(6P[ *ðèxb¸4«è'¸´~‚ÜõÛª‡Y°‡~°˜…¬U?èZ!
[ê½�æ:Ø„ý‡w0ØYX=‚YÀ‚´ýØï`‚H
f(K(â(z�ÂýŽ¡(„=à«#p_IÉ0°bø†àBÝà0Àl ‡B8NX©af¸«!�–å‡{°,à:Xzp¼X‚X‡ñ*
~À~(08uUþà¼`†lá#€–B0zÈ0X†¨ø6XšBÀ‡^àËNøfXƒu`4„Øah1šŒ\Yp‚�ár0àx
D0ˆæo�œ–Ùu .0
Už*ȃSvÃ<…oÈ“NÈ´`«_6LDHa¢x‡<Xb0,pÄN`«5è–eâ"yþÀ·à]&PEzPEè ›ëhT'f'à„k¨
/(„QX†2Ž
oo`l�J±~ ‚!@0ø“~A'X†Qà„èSp‚¹)*È$¾z‡# ‚B˜
½ìÞŽì8?”ï`“éðyæIðf¸åI(ÌNæ_~â�·í�pð…lˆ
'€ð…­³ÕédžÆ
{s 6(‡ìý‡s–oà„~Ž
M¡ƒ‘•‡[¦K fÈ�^ :P

YPÛ@„N ‡=è¥ÎGÀ,€a$Æ& �ˆfY†�á=]y
b NØÙY¸†}”Bæ':8z@-_íu°†QàDð�!À¿"ˆŽO{ígY'x\S8‚“–ÆÁ‚ÆÆv&
Oˆ�‡zØï©éoUoz°èÕá [¨p—o H:Àø�é`S@„rh‡¢ÉV�ˆ|‰X„è{Aƒy˜²û‡¹×Ö:�¢PwYàkŒ•Öw�‘^˜{œ÷Š¬7
0fþ½Ž¶'û	˜ê!{Œ�™Šy‰Xá	׬7׬‡T°åÝ}¨?Ði�uzÐ÷Šk�+cñ†ì�üuèí‰)ˆr˜„/N}ŸáV‰Õ
ÊÑÛ¨À¿\Ó‘}‚€[¿Ô™ˆíVº]©ÐÜDY_ý¥-�ªð{åçû©ÏØå7‹u€H�ÀØÃ~þN™Ðï~®¸�èñ uùV|%ˆ{�‹–-ûrÛ/‹`µýöŸ[mÕ‹Ò‰ÿÛ°ÿßõy�isС—l€ðEÇK
lzõû§p!ÆBŒ(q"ÅŠ/b̨q#ÇŽ?‚¢<ø®1aãÍQCoôîýó§ðݤQ÷þøûö/¡Bž"J”	Ò'PˆD‹"MJ±�¯oòüÉ„ú×@gñSªu+×®^¿‚
+r¢Bò¾QaómC\l&­[HoO!6ïLqŠ{T,_±ýöö
¬q�/tO
$h¡àÆŽCŽ,Ù"É=gÓ®TH
1töD4D–)Dï
GÜ$ý@•ÝlV:™¥xý¬CŒ9õ`) ŠŒiY¦™’5#Z66ôÝ™oVW˜<GƒäUJ™§ž«a“Gpk®Å�…åhVž•]HëУdŽòè£ÿ¬WDŒ>Ä�,›ö²N¢¹DO/½x£Ð¤ñch…YÑÃL\ü`#Ë…UªÐ§O:Zk¡ÿ0#«,ѳΡ�*Ѥ©Âô�u`6$æbnî­´a‘„Þš™)ôMIj-3Äß”ãþ�¥7.ãÄ$ôDZ¡¸ÿ܃�¢´®ƒÍ:®þë;yŒ2
>Þ0"=å`“Õ¼ÂVz�°”zƒg¼
yC¨°‘¶×7C$Œ.×Qá:ˆŒ‘<yà²W†58‘Ç5btÌ.5\CL�l\ó�ËÙõŽïÐ#[ïxáÅ[7ŽÂ>ü°±ŒÊ^Qï$þSÎÁÕ�y ú
1Т¡�–ºŽ8C¼N©
­3Ä;
åáD~ÀúbÎœùSç€WM[·Ý~A9܃r•Så0�ÄÔ05£ÌôÃ1Ô�"ßn—[…Ô‹c?lø,5ß̲X8bÊ5R[²S?ˆ¤eÊ;ˆ°þñ8b°ÁÆ(÷²0ŽüдF/ßä±yËŒRàBË´î
5ŽêH!£¸ïjæˆ#ôxF²•³F©½€AE?ØÁÄ:t˜’=3XŒÝÓ?Þ¬Q'ŽôÓ]¥sO�%¥s¹Gï0³Ç;Ù÷‚	\êž7¾A¼£Ž°œåèáˆbÉÅ
ëÉ;ÀÐ*à#htXF!81‰e|c
¼«ÝíøÑ¿�AS> Ã¡þB�¶1«-ÖîfÃrÄ<jÂÌzü�*Œ"ýE
:�`Ny?ü1	D¬Aœàı�…=0ÁfËÃœPˆXÂ}²ð‚#èÐŽŒ"Ö@6þfF)&0£bð'¸Gò1Á`8B!Ö0
—
AœØÃ7F
º<ÈÂo– O.û0Ã�`B™
†²ÍÂ'ë:Ay¸l®bF¿"É~܃£€#œ°bt`^°Æ,òp|C×ðÂ7èáN€aü¨
Él©Y Èì˜#Ä0‰™9bXÀE!(é
Æ9
¾ÂÜ"�zaƒÞà—7,&D8ÊN�DU0°�—\ƒ4ýöÇ.ªDCC˜Å$¾…šwÃ0D‰›�p3,"4¡‰ƒ¾á â4�ÊYG/è
ÓŸ¥ÐçB—2%¡‘�†h.\ô©ÉŒAY®ñþ�œŽ
üX
aŠ(O�œxœÕfÁ‰~Ž`0'ƒYtb`°"&�…0Á£˜÷šéˆ(F°tpÄ(ô
ÛY`cœä&Á	)r!úpD,qoC�&í&‘ƒÀ2ÄGĈg8®Ö&…¬Ãß4Å$ŒÛ“ÒíÈòP>¸…ãxò`zþ1	Kàˉ�H?œN°!ÇáøG8¨Ð¿{¬ó½ãóB'f!œYìîkFáDi½ÑH"ÇçY"p
ºL‚�’”Ç+‰±ŽIàâ>�/%P�ÂMnIŠ.¡ÝàDioOÚƒ#°’0ÔÉ5F˜B˜a
þàTˆ�ä5þñ�BÌŠ\è’…#ˆq
otBÞÀF;äºq†š…#¬Af´ÃíXÆ‹+›¿ÔÖ)4~‡5Þñå$„K£èD9–A�o„£ô¸F¥ºœ¾†Üd]:j“¨v‚�p܃ªì1Løz”fÒ‘'·0Oó+.ôJÜ,t´k6!ô Æ;:ýÉcÇO�–ЋBL¡,í„÷ Š<&ñ�~˜§WòZDžÑAÔ‚VœíÅ?.åžh!ÎZ‘¡K]²˜åZ=\ˆ?èáolîà;Yˆ
Ïžüü%;2Ù‘P’ýb‡
šn&ß»B
(¶ô¤ê©2·Ùÿ!�^̉ß
Â+RÙÏü;<)ú¶¯1‹|1ÃJÛ~±Ê‚çåÂoä;üXÆågÑi [d/q‡üÖ=2y‹½ê!Ìr›Õ\’ó=÷w‹‘eTtŸëbdg}Cøñ’d¡«'ÔƒêÙµp±Ååÿ5>ÂÆcpßJüø&­r¶�Ëå 7RºÔõ
K­ƒûÔWob)¢$ß!èB×Qâ˜øC„ú/Á¿óß>öâ»ÜBÜó…ñሢþPß?˜ÞTnèÞNKš$Z 0©@OÃ]ÀžÖ¥Ø;ÈÇ�ÎجÎj1Ð�B/\ˆ��U?,|¨ JPˆ�Y5Dv´3ÌƇ4¬ƒ#|S²õƒ¦Y_›\KôC',Ã;
x
"xPN?<ì|Ã;tÂ;PA›ŒVîÄ�‚¦Ø$@�Ó]›v>x1Œ.üŠã­Î[ƒÇ=ÄvÂ7áNÄ!¥Àsu™@` æIe¤¶œÛøÎ,„ü‚ ?XBñ´ƒ@âÀ„sÐ
?Y‘Œ‚ñ16ÍPâ:0�p‚š‚¸ì�<‰Ë7xþ"tÂ=¬
6Ä8Û;,÷
.¼A©ŒB!tBY4
`¢,OÀ˜B)IfEÊ%í
'´ÃK¼›±ÁúH=t�ü,˜,„Ë´“5Z?˜ÂXB…ØT0-Ãø4cõ8A=zÔ%)D*u
Ô€)ì�)XÚxYBoÉOŽ]Ã1‚%\ü ±\Þ” ⤙$p¸ƒCíM?¼ƒP€0Á7¬Çê
8½äÙŒB7ÅS›•Å:¼ƒ<XB-¦…h†TŒ‚+ÁL4úæ¤f
X‚˜‚dBíÉÐ>^NÂgˆðua3ä€
ÄÀ2lÈ‚IýC!8U«X^þô&ÄÀ™Â߬Aä�)f^­A!¼C×­œ%@G
�š7`APÆ…?(GY€Á5”ÃÂõB½…˜Ù?Ì‚
0Ád£ÑA!à¤U”)ˆâ;Ø<‘)|Jõ�0n&øÃYödÕI`̨Dþƒ#äѵˆA уMôB6"ÑÈ©%TÔR…Õ:Ä
)Ø™YõàÂ$¬
’CX‘äûÄÀ­aäûTvþÃý°�A«8¬
' ãÄÀì�%½CÐ(ª„5–CÔåÀMm6£AëÌMœM
O|šê’ø�”ì.äÀþ¸ËðDY!˜ÞÔLÂÇÕŠ�¦HåR~ÙL™˜(2ÃZŸ`Š
IÕÄ7¥€`ú?
ÍB_‘ÖhšÔm¨7´Ã
÷A8àzp’YQÖ,0¡)8‚,3°A9ø˜Œ€å,Ȉ%0.˜˜Â=xC8Xƒ|SX}ŒÑø?€ÚJ°A8lV…��¦áÂ(LHF•¼êk�¦`âVŸÔ@;¤àZ®CHM~åÕ7|C‚fHQÏ$t
õf?HÐ7HÐ�®Ú”¤�)ø@T)ŠS®ƒ—2䌂X­�=pÂ2øÏØÃ`j�n*æ…AÊø*�.34cÔ9B9Pªóì
?¨&¼^éP�¦ä€öÔÛÔdŠŸÓò¯~ø]ZþP`Õ%›æ•ÖÜëÝê1áEQÎm¦XÑ¥˜Ï�ÛY0•øÖ¡�ÐaðGÅê•ZªüžÏ1ëHT!ÏÉœì]	Ïe,¯ÝHb�]Ï¡ðÔaݶ½žéì•ðƒ…Ú™ÎÎ�œÒPÿ"1‚@-AÞæ½ðÁõ\ä�ÐÝà•Èœ0m Ö!‰hÑ%EÕ!œÛqqFPE¼ƒ´Á�û_ê9Þî †Î)`‘(	AÍÍM&ñ�ÇNÊÈžFìïEP0‰¨Ý~¼çWÌreD![„Ä�ÈÝ âq$OÄ=]!®ÇB$ʯC'”aþá÷I2F(rH¤0FüYlZþ†ò*K‡ß=TÿÃaÂ… @Ð�(�¤�©,:Ê‚<|Ñ+�S|v,íó2§%÷^�`Ë•v€gÄÇ:œSn(ÖäÖ(\Öh'Éd“7È"y�\Ã(g?°Â:³s;»ó;Ãs<Ëó<Ós=Ûó=ãs>ëó>Ãó°ÈCa
ô ©7C4?x�ø�#x‚#x:d‡++Z…L™^I„°?�R/@õð6­è`°H„‡;Dúýx“x‰›ø‰�´ Ì·ŠÂ< œryöT€v€Cñ.ä÷�ãxŽëøW§C at -4¯kRgœÍ
À,+MÌ~rÓ
"ˆAHQ•Âa
C¸ëÁ̆Eaõ|£x˜‹ù˜Ç´xgµ”kÆý2 \ÓøÁí™ÃyœËyJ÷øÌ¥êƒ$÷P#þ åÖË:<¦eÕŽ7ã¹åÀMŒŸ)œ6D"QÔ­6]¬ÐÃ�Œ0ȹa8'ÈÒ"a¸	-Î2è÷Ž‹ú¨“:þY‡÷HówOq2;W›ûƒ�—z¬Ëú¬¯58øxi3±áõ‚žß?Ð�—:�7ÀT'xÃh¬—¶àÆ�öÌ;l²tÂø�””åÔL�â=òC
Bçµú8G[iË(”�#`
[Ò´C‚¦Šà´6`>˜ÂRéˆa™Õ¨TÇ•Ì:ð=øÀ°™oybÿC嘡
:dSPΛ9q
jthçΟAsÕYèQ Rp	„ù´³§Ñ¬Iqj„C�M¬B¹’½	´Q�0c‘õY¶íÑ·nµšÕihÞ³‡æ9løΗ9yâ¢ã%…6½8úuürdÉ“)W¶|sfÍw]Ý›W,h½Ÿ“Ž]ZïiÒ«U·6ý:5lѱi϶�ú6kÙ¸Ï^=
Îá5D{>RaãÍ‘Ã~�ÿ2…Òñò~„ÿùãþH}cÃÆÖ%÷ãÇŒ=ë�9J¯îXé!Ï@×ëmŸ÷=ûÑžm~
Ó 
ÒL;UªX¶”M–Yd�%öÙc¡�VÚj�½vÙh±m–Ú
®!áˆûƉ㒋ìDÓ¥Œ<Ë–Kˆ·ÔºÊ-^¸:݉R
hŸ p0
	wÀq
RM½VñÔî}=É�ChÕ³Ÿ�Elp‘úhXC´þ)M4ý}<;îЇAÄʉ(DžqˆFìa™xD%±‰Ktb¡8Å·Ìk4^ãظd0%„ô¸GÇFƨ'cqÕmÄ‚ÞÔS/
Ð[NXЃ
à?EBÀa×
$M}+8ÃArÆc”LGµ¬õ
£:4ÂWõ½rª`'«G™@w@>ù¸A(Ld #*¡Šõ€¨0(
µÂûò¨méÚ™mx®y	‚¨‘`ŽbaS
ÍŠqrŸ	\X=ñ…¨%ybPè©<�3	Ör³ÐDe-AzïŠ}3g
ÜZÙGÚ.ƒ4umrÓ	køƹHmRÆKžu[ã«h½a$l
%@B5ƱÆNàÍtFl&	 /‚	‚‚axà I
­„%-uQÛeSùdÄgqŽ‹íi£^�gÝ6 s;).
œ«
øÄ@&~Qo`þ(¡pøQ1½›šà]›;€
9ÏçvàŽ'x AnÀÅõ¾îJ‚	 ++îr{0L"nt
6Ú»[nð†K¼ÈåKÎ…d¡è�2ø¡@Î!øAþ�zÁ1¼A^b
±�ÖÁ¼A2ÎÊ1ø
^¢£Üˆ».dA6Ë”PCÐ0ieJe?EfðÀdõâÝÅQ
“l‚7Å_…?8Eï^kÜ�E¾ˆE܈
DCV
\JhdårÏ
kDizkÅôϽRPøìè
€ŽØú	,òá¢â
ô P
æ(ÿ<ïÙò,±þ®Ž¤ è¤`£ÚР
z�SÑÞa"P9T¤$Ê!:Þ!�
�$°z
7bÖ Ìd#úAŽ€Jå5D*•ð(¶P�jæ»|P,ö÷^ÅQêg³œv:kv¬i4¶ªGº"ÓîïŽjÓÜÄÓ|ç´l¯–®PkÄÔâKÓêÂ}€bæòÎàÂ@èÍ\�6
éêi€Âp
��
�	°`Ö¡–aØ
Ad!ÂièÀ$ø�b`F*®Èì3¶Ê÷°§f’J8Nc‹—‹	»P.NÉÑ5¤ÑëeÖæÅ
ÏDä|&mLN†æQ3i䦶p11kŽ†/©èìP0©‘&¤Ñ*(&æÖðìÕ�à±KŸêI$+ªžôãpHçÝð
Ö+«ŽFò7“
qP’d¤o£öÆì*þ›Èl0™g^ºê«Ææ‹–ãd�
F�.-¡Ž`Ä€
¾A˜
®aÖ€¼àpQ>}¦ôáò`°(Ë!Ga<˜’
ÞáØÀF
°€¬PÞª4†ÂmŽI	KH„z"®¬ó·8«Å˜QYÊ‚ÙêÇ3§IãrÃ�´
¾l#öþAäܱ!€'µ6ÓG7#yX�=BÔXDô)
�
Ä€¼à
aa
6p¼`°À˜�VaF
®ŠB0ñ3OèõÜ
6FEO¨†z³7äꚌ	_ÎOó„S at To:[é1@Ì2Ï3cêGǵ2R,¾l¢Cd0ûFø…Î&«�b÷­‘‚@®‚I_Ó ’“ëêì4gÊÞ`=¬
‰I�/)Ðt”þ‡
Á|
iÐ")§ž»ðX®-
Ö`.Y`6Àa’kDe°dyôh“
”YM\
Ç’’¥@„Q\¹`^9T™ÁN£}„F“|µ›Ò';ÃÞ!Œ¡;ÜäíÄ�ßd}ëäM—ÃީܪÄ[â´„Ê3Ûjúò=ÅBô—�¥õ»`ËY1ïЙ¤´g‰o´2¥¦ÙŸ9Ãn!%E7”÷qøs‚Ñ) Nâú“ž
0mª0$/(:
­£¡'®“5fbþ¤€¢Õ¡Ú
IÚ&$.�m}‚?¶í lÜ¡K x�ÚÅšÕ¤!hæ5Vo/úòšDv€Ç‘5,säœó‚÷¨=‹¨Y”„0¡%p?¬´
·GÿÙŸ9�PÃq…¸XÏn|\E.ÎrßV©gÍ^xâr
ò~.©U춥‡ëB¶ŠnòD5<C+€w\Êå›hª<`d�¬	/–f­“åšN#œ1DYáVÒÈzw%F/l§ì¦Oº«åø¨&ó/VÊD.“ĨP«ý‡Œ
Í–H7èX•Þ˜{Üv®µ�€ýfJ¡�
d³«¥)š^…».q|b”~¹5äV*�Qd´Åõ¼É•åºÐŽñzXáÛ½}»XוMª:û´[6n�•y=¼Û¹[Ϻ;¥—H6lLv\ý!’\É—œÉ›ÜÉŸÊ£\ÉÁAÊ«ÜʯüÊÁAË�œÊ™|˱Ì—2YG‚GÍ;ÅÇu÷ZN&©q„Âz&]®­•þ‡nÕ±²™%Ø4¬Íuê3ÜÆéÖ~Ĺݦ'6‘›„÷ÈáDÑËN.Ê];}Ñ­cÒ•C;&½ÒýM]ÓQÓǤÒ?ÓɸÑ9Ô)ÝŠÏ„ÒÅ8ÔãÄŠ¥½®š¹Ãšû�f]H´§pÒ<qØ·š$¯“µ6
˜CYiSŠTz2»€yZ0GT¬§oMHñœ›ç:Ý.lŒ›×·]«ie�ßÑp¹‘Ä5Nµkãòq¤¸[¸Âš	Ó=ÆßfŽ_Ù—mÙÜÙå[»¢|²6x�YÜ~\ÛáÄ¡ÄGL×XàUNXðÙÂÓH�
<zþÛÉ>Š>Öø5v¼¬�=~þW�¾¥z�>öÜ�ô,ˆ;lºì¸!ãöàŽ
lzõcȱ£Ç� CŠIòß¼tàÒ©L©²¥Ë—0[‚cÓ%M”8kâ¼	s&O�6eö*èÌœE�¾LÉ’'ͧé漆h�¼oTØxs$�™

mØ.DïÖó¶Æ‘l¯�)—g6&1b`)$ï_¯<£ò :‚mlßØ|ÛØ‹=Nœ|”£çþ
½u¦ƒéåÃÒ&{T
³f3È’éêÀÌ·’°cËžM[v;_èì�è�X/*0ΪM¼¸ñã"%’Ü
²ŸrÞþ˜s”ø<¡¿ê	û9Ï^ýú¿ëØ	nGX]úAíwoĆÑ:¬Š'	¼cÔ:~—aáÇ�Øy³äa	"ñƒÈ(ÞÐñÍ,Nx11ëüÓ'ŽTxà;ßt²‡,kô"Ä´“‡œÈ#�!bõ
"“\ãÅ;lÈ‚ÄÓÉ$"’hâ£ØÅr@)$r·™ÓvY„‘FC6éä“PF)唳Qe|[	$ò½‡ß?`´ãœ7yìQÈ:bð³þ‘7`0ƒË(ÿQŽ#f.F".†C?�Ñ1ÊÄlt'tÐÁŒotP˜²B‡¦ì�
6…ôóW!f–³L!ˆZ2‰£Ä\³•¤–ŠÜ;ÄäÆ\o¿ÇÆ,_š*무Öj«”ëµ÷ñi'�7ïôCÏ;júóÚwÿ\ƒ±Çö£Ï2嬳N?Øô³.ÞHÈ�7ô|ÃO°þ0Ã?Ìd«>ÄŒš,1}¥ÛO;Ë|ó>ø”ó?ËzŸ<^a?Ä0Cφ·l°A·¡ÑD]”‘yG,ñÄËjåUYeÉ›@í¦ÜsK(rÇ©7PÈ
©‡^zþ\ƒrÅ0)OªºþÄ*pÂÅóÎ<÷ì3Hì¹÷
ñ
ôqz‘ŒlÇÒu§ÝXÔÙlóÓ"ýóÕCY�tI:Ì$Ö`‡-¶Äã„V\-Ä'\ÿD{/·ÚI›?p½ÜÝ”•ô2¹ÝÃvHÌÜÍíØNö3³ÂÝù†ó«„7îøã…ÿô®EÄϽØ˱ol¼‡H9³1\�ÔP?÷ÐS�±LÜs/üЃ_ìÑsOê²ß{Õ‹ËÄ®ºå¶DOî÷À.¼ÎÇ÷óÎüÉÞÏ5Xｿ¿þ�ë±»Ž?âw»AŽy�	׃dÃKÚ=þúì·ŸPÙ§Mn
N8Ñ—ð`ÐáÈ7’
[Èýþ°†˜ †IÁ	p1T�‚!|“@Dýì#ÁÞÝŽ?5ƒ&¸DPáÂÆ(œ@…käb ‚Ê��ú…ªl˜Ä
™áDÈî‚ÞÈŠ)TPƒÀ
ŽèÀÄ€yäá�p.BDðÃ	ôèÄÙ„<¡°bðÂ}.øÕ€
î#Ž?P¥°U)ÎU°
£×ÈÆÉÁçòéÇ7ŽÐ
Ð!Bzާ؀ ~àCpYÞƒ5Üåy$6Ú´Ò	X
1(±ðƒ‡9�%dQ!,8``˜À	/\C†|\þƒ)¾±îaƒ²Èƒ)Ž°C5
•ÞPW0M‘‡u
í
³\	�Wp¼—,¹ŽË|É“0EþBéàG˜¢–
á8¢ôhGQË�f¬ãƒØä€dáÉ<ÈÃ_ÄàijKxayÈC
–A…^x²½›Ö�¢¿:b
k°„#,‹‹ÔN¢¨J×F'á0l
œ ‚#°ð�¿b!ÞX¥47‹äá’,¨iŽÀ‰àS7’G¾ˆ��~ ‚d‰ÖΧ¤‡e÷»àµÕ:³$ÇQ˜ð𼓼ងHBC8¢ (�~|ôò˜Ä2ÖÁ£5õý˜…Vò
—½#‚̇)LÑ‹uÈÂËhéÓ
ýl605bÂ:Q­Y¼c+–Ð74â|D¸Dœ é7äa
|tè'ÃG›‚ì<×™œèónÃçÎìgtPAÀ RÞtB@{~–A6v€½8‚dá÷Š”1°
c‰‡š‚
¦(D(·¢þQYt@µ›�#‘Ï6ªMH/˜0úQCŸr°À«¿Ê–�­#8a
f¤ Ì�…,¥áºÔ(.Ãlh‘Á$ö3è\
MÌ(h™Á†¤/û»‡5oH=º›Ïgµ@pÑ

t
ô€ìáC0
ü‡SNP)à…�!‚A!L
©µ…0	†a
¸`
Yâb
X€SÈ÷†qR?çëÀÎwhÿ0>Ð}tà)`W>ÀG0…
•Òl\UFE¶8iT…Ädnäd­¶``
ü°×�ƒiH,³°¸
Ì�íÐZ
B58ËÀRkÐT55�y°’Z÷£½Ð“PMŽ`¡D“²jÁ'•-ÄöBÜ¥lÅØ’ßÕgìäkòÀ×QT¼¡:þÀíÀò倣P½°ô@d^ÖŒ÷Ð{°È7v±?Éo`ÔŒëP<ôC“1´3“÷ðm%;Ís/`fÑb-®³á@•øQ•`tá0kýpbÒEïpòPTT©ï°“6£“6é‹©²5ÁˆFmç’ˆé>éW4J#5›æWký‘4i
¦ðSr�¶4�þIh¢išù˜”¶i¦)è¡fâñeªùØᘧ™jò0d+iN‰™›àt…´™e¦™³9“FP³k”	h”)ig™³Ùšsç^5jF†Ø0<Öy�Ø™�Ú¹�ÜÙ�Þù�àžâ9žäYžæyžè™žê¹žìÙžôpRB“OÆk
–™äqô “"!2ŒZÎY“»UX˜-Þ8…àJ®S œ€¢	J8X–@ÄР–Ózå8Š�X°÷â²Ð#ê©cXðÇo½à„Q.Ùæcx„
¦¥H.Þàa±ŸA:šï	•
¤®óþ¸�lp§$7¢AP¥R:¥TZ¥Vz¥Xš¥Zº¥\Ú¥^ú¥`¦b:¦dZ¦fz¦^@WW?–ã
¬WeQ�#T�Í(mÿ`Oòð“ͧ¸pöq`Ð	‚
“àÙfOtcXÙR•2M�Ô	ýp#žrK“ù3ç/;‡
©ÃB÷Q•Cǔ͸ÞP�(éË°½CÙÖmT€ªÃ”š33çk-µ^P`\8	Yq/|t
€Q�Äà÷ÁªU†°Š’Ø`/üÀ7Å�ÛR�÷C"å7pú6´ö4mÙvUdD£0t¥JlPOLYªöbOÞP<Þ°®£@DzlÐþ9öäVêÚmgèsLaè…
©R—Ò‰3k jò4{°›°
»°Û°û°±;±[±{±›±»±Ë“­qVŒiv)@?òp¢÷Ryå^ _làbp
9
v*MCi){B ¦P!9ATáiËk+m¯J)1@³³�E1{b° ‚›™~*вgI×@
)þ„
†2”…0I
2# Y*”E]+UTð ²Ô*‹Â	 ú§BGÛ
­ºå°…
U·œ�E©€øp›|ô
Æ{¼È›¼Ê»¼ÌÛ¼Îû¼Ð½Ò;½Ô[½Ö{½Ø›½Ú»½ÜÛ½Ý{
EPmÃN’uäÝ"ŽJ§aÙFøMtp9Àøh	7•wdQØ ��C¹fB7…€
5€|ì…«£²Ax øa
H(µdpþp}EöëŠÒ	œè
JµuXP¨·*0Þ@!ª�
.Ë&°…I�b0
>Ðâ’³¹:þ4že´³À"Ðô@Ëâ'¶9ðˆ`	m%�a
E†4(–@Š’…RÇåm½@•yS�@»²0Y9pS×TÀ}Ì`
^`
58yË€aì
�
(WðÛÈG^Ð1‚{lð€�L’‹+�Ä
LÀÁÄ`lã…è3
û
eQbXåíqIÞÐ(x„‚MÓȯ¤ÅÿºæœÐDÞöJ°�)…wSq–�WŽ  b½PÀk0Í—*– t T�¨yå@Ñár¸ðC"sô
3¥}tÃßÈ7Í
]™åÒÝtÐ.×ÄT
9k�Àw&Ulâ1°;7Ö€†[�Bé³€øÆ”ó
ž�Ž !{Ð	1 .î…S,MnÊ…T×à@þ@Å&`�ï€)8E3‹‚MÚ¤Í`àE0ÇN^åVþäháä5{åïÀghå¼àN>	\nå+òQe^ælp
¤�¼�æpçr>çW^^@xžçD N¾"ÝGç\Îxzžç(çGèUåaÎå¹
ç„<èDÀ¼ÐÕm~\\Ža¾,€¾éœ¾éX²p7ñ",®ÝÕ݆Pé½0‚Å-Ö
®W²í‘ë¦@]³° z¦Ð	ÇâÁ¾‚_h£Ðtr$¨`©<«­Nkø‡©À÷Ï£<Bu’ƒíð
þ€
�ÀBÃ/Ú1ëøÐþ£Þ¬JÑÌ(-ÛXÆ‹mÝÆ“Þ
ßîú0ÆáúË •wúÕÒÀâak‰/�
þ'qÄ„DäpB—N܈ +ì‡~J4© …¬(FïùñCŽrTÉyjü:¼HÁ
^nC�'Ÿ”ûf/Š â)bÄX†
1pñr1îâ…‰QR ¢\¬âÅDZj’<¼|'b¨ø&¯Qz)b§kÀZ¦ˆ¶ˆòr’oT[°ND¾ña¾e…±áÌË’S=Ý4KÇDÅRTņ+‚ˆßz³àšáx
—"ö‰á›¯¾YGÏo:	ì›ò^eƒ7ö:д¸!ªb-¿æ
”Š`å%¬:épM*b¬&†`ãª}T{Ì6yNMíŽU!
×`‚é‘C8Z‘‹?ê"ˆ1‰-ÂÐ�‘¬$[h|ˆ�‡CüQý8	yH’‹4?&Á	/ž1”c„!2|tÂ>úÑ+s¸D”ƒ·\ƒXæ'AIJT²’¦ÒCœQ¼cŽêDœ€'\ ®Y²ØË�àý„%“’×}†S\œF7ï Â5¨…ºP
…Ú	:q
©Ðå�NÈC8FQ„="BL°ß¥øņƒÝD¡2(B÷qЀ-T¡Ð;äqÐÿE¦ëa§pqH1P!Ö«�®RŸŒ‚
f0CºZ0AãÊ6‡ZפÁL</szÓ7é4¨?ÍeÜ
B„;¾�
þäL˜	Þ!ƒêy–ÈŠvÊÁ†=€¡L°D
èPˆNÐ!“PÁf½àlhb ƒ)Ö_0P­½ˆAC°±¹<Ì¢mžõ­EtsÂŒ!b„ü(ÄdÁ0ø ×΃%1ZoŒ¢ŠØà6Ž`
¾¤À.¢žÄàfPÁœ`FLá
oÈÃ
A�yÁ”[‡%š½ŒITEŽ
ÁðrpbóµDè�0Ä à¸
vŽð<¬
¦°˜à/ôb
½X‡7æŠÿþUï€,ØéœQ8£˜N!°ÐF›£ÆœR•„òÌhA…�Ø]6-Âw¢ï›»àxÂûÝñ£ÈDãoxn× là…%ž‰ÏÃC%ð`H
Iø!°Sv¼ø;ã'‘úůžòƒw½êYïwÊŸ~s€ï{ç7ŠT¤b³˜]^xÃ×þö£Xb?|ý>ð³è»ñ=¯xâ7ÅùŽ§>äYÿúÙóÝóƒß"L±¹à_¿)�¿þõCXûØ·¾û§>üeÿÕ;¿ø¹þàÕÎV'4ìaÿèè
”’uX&
'€sYÀbP�˜:`f(‡rÀ�òz ã)„#@/¼BºkøíÀ‚~(S�10�: ‡ ƒ–cƒ~ðC:X†ÀA*‚ à&!›…žÐN¨
kÀ…<d at SÀèq‚~؃NXb˜0®5Á‚=á‰� B œåò‚=˜ë‰0bX“«ClÈ�^؆»‚æP"t8­�È›™þhbÀbÀ¦d”\HFdüÀYÀ…Y at FlúÀkLÆrú@gDFjÌFY€ÆlÆetFj¼Fl2Gq|Fb(nü@=ÜÆi¼FhÌF\Gm¬F{ÄG}lÆÂÉÇ~ÜÆ{dF}¬F´G^8ÈmœÇ…GŒÇfDFƒüGwÄÆ…LGj”ÆgÔÆu\Èl„F‡ŒGŽüÆÂ)klGeäH¤aH}lÇuôH„Èodɘȉ4È{¼É™,HvüG„Ç¡Fµû Š‹¸
;±™~�…ÉÚ”a�ë…yûº‹PDS(/(‡#˜„à„<@¯*¼†B°0È�f›6~è€=X9C<�þI0…Ë:‚BÀÅéK0…EÒuû%­û®Ñ¢‡ôZƒe
~0…¸Ø¢}ébX’kà¡()‡0/N˜ˆÆj60
°3A*í…~p„rè…{è…]iUbÀ6XYLíb�k`Ž£ƒp�N…ð†<X‡Q‡YhG Ì=Q%zè…w¸KÈ:~(K‡•Æ
)Fx¬ÐÁš£‹0Š…ÕYX]؈}Ñ…u´‘X…�Ø‹…ÁXÿ<PõØŒ�X’5Y“uQlX�y�ùX‘i›
5P!„à/ Í
鋽
�ØžuÑ	’¶©YõÐý¼Ï‘Ù5X¢ÝY„pÑüìÙ"9‰~ȬoØY‹ðPeX¡£	Ðå	¨mX"YøÄ;dR7þ‹¨M†s†}°Ð‚K°¸‡Q8ˆ¶Õ„zx[ý‡Qà¯Ë:ѪíZ	ÙáØÅ\QÜ’Æ¥Y
©YÅ}\á‘
5\}еÍ]Ñ’µÜ ]Ê%]°m‘„Ò…!Òÿk‘™Y=Ùº¢‘Ó[=	�]ýY
�݆}ØÝÍÜ9Э-Ñ…Xfè˜ ±ÑÑ]£
ÝŒ`¢‘Xyxa´1½y,ŽHMH„6Ð{ø¸
ß\á%…r(„{8�chðmñ=‡cЄs�Uo`,H™°S‘øÝÿà
ÎØ
>[»K[ú¬¤sxß68†�hƒ&ð^b耓AAÕ"�Ò#‡÷m‚s�ˆD`áD@‡ð¢0°rÈ=™…6â#Fâ$Vâ%fâ“]ݶrݢ附%¡r Yè„]ˆ¡G@¡&ã0c$þQ‰õ‡wÐ×ì5Æ㈶íÞaè‡DxÛ6ð|è–©:oÈ
":‘ahƒarЄúmƒz0,`¸¬
l
p€[B@Ù0Ø#/ø#y˜±ƒÎ˜1ØtúE\¨¹“&ê¢à&i	ùÌ;]Vü¬}¨‡}ð9Nj¡‘‡%ýZ„°Ї­ähæy«µc£6ëþ³Fëß}âÖ5l`,ëkVkðy ÁP]8-"çãt„hÏzÁæ´&l~@aÔÐ~•ÀÛ�MHáÝ] )	@Y¿-ìËÆl´ˆ”nÙIØOÃ)#W£w¡N ‡‰…l¢Y‡BXÀ]ñ*h=‘@,
ßñ!'òþf掋0¬¶"ò‚8Rž!,°
E‚¡¬ù‡„k¢:å"ž	³)¢˜!´æöò!HR|è˜Âò"Gn•È'zЇvˆÄgó;Çs&®of°º*6øE\ýÃUŠ¢æ0*H6¦píxïê~¸Ó<
Ìbn‡»4fS¸ºö‡e°y ¤ün¶wcØ÷nØûžGƒ[úÜ'~67z
G µ�õÛá`„P»ÈíЄ0ÑÔðâŸä›·…hðý½ï{2 èÅÆþñßñ”Ædy7‰wp.	¶ìÉ%‰&ïÚùXòçg{¯î�ï·ƒ)þ¹§ÿÿˆ,hð „
¼†h�þ¼oNØxs„°ß?ŒjdhÐFG’,iò$Ê”*W²,n•®nݪ‹É™<^T8`3‹_Ë B‡-jô(Ò¤J‹bĆѺoLØ|›´ô*Ö¬Z·bí÷2f·hÑbQÂIÇKŠž½:rmëö-ܸrµ:„ø�
E‹s÷òíë—¡¹UÆ¢�«6ö&™³<}ýëø1äÈ’K:…z—ªÕôèñÛÌï½{“G“.­ð¥­h3Ç–%³­Z¶¦gÓ®m[e݈x+þÃçÄÉ(*N&‰q‚HÞíäÊ߆ûeL¦X›_rîì9k9öìÚ'7}ujU�¡5ßûÌy;úô,ý½õÙ´þlÖª¯oÿ>ÒÜ—ygìçÿ? á7 �}“j†Ùd‡ŠY×X�J8aw–a�Ù„àKÕTk8½&}šx"zúMÄŠ-j÷•L
R2`,ö“‹9êXZeßa¸#�´}¥Ú{v|¡‰²¹$“mé·›^ôÐa	=²xs6²dÊ•ÿáIÞ`ÁÌ:²ÐS�)ØäÈ:¦¬ƒÐ:œÄL/MÞ׎`1†8E|ÖÙ)?é:(¡…z(¢‰*º(£�:ú(¤‘Jz¨HU^Uù7JÃå
Ô5ÄȲN?w‰ÁL?bàrÍ5)à‚
?ßôâM?Þ¬#.Ëà²6·ªþÙ[£‘.½éÚ>lÔ€êï,CÏ7£0s®²¼s
߼ㅽÜóÎ7ZzSN?¡.3ê;ØôƒÍ™FÆ!L™Iºû8‡è»/¿ýúû/À
<0Á|0Â	+ìï'
=™—@Þì±êö³Æyäñ�%Žp‚È?`€a	3ÂÆ;œ8‘G9yˆÊÄkÌçÅ2Øx��@½Ð±䮃yp'^Ðs6`,F!b,ÓËÉ…`SC!Ì0�Åß0CÇÞ 2
6køÀDˆÈÂ=l,£ä½}u˜àafÁÆXÛ¥#Þyë½7ß}ûý7à�>8á…~8âzþëqHÃ]*†þ½ƒˆÐœø“‡%ëÑCøàç*¼93k¼F/T`³Ç2Cã…7“X¢´%–ðR­l8²G/Û2Cbô2
'5„1)0C'í€QƒÌP0J?£’m'œ³F!£t2‰œ`#ÆÙÞ¬ñfÝ�¡Fdˆ‰Í]bú{å»0ýõÛ?þùÛß8B³È8!šÑ
ØpB/ö€�oÐA`"葃É9bý( öpóµÃ“¼`�ŽôÃOqBÒvµ†5£e13| «rÐ�xJ£6>öŽÐaå"DæÀe\ø�Y*?¿¼äþ9Бun¦%Âån‚øÄ!¡‡+fq‹XÔ"ÁøE/v1ŒdcÇhÆ5ª±�i|#ãxÆ9²Žtt£ë˜G<Þ1‹‚`œBzô�…'#ß@ÄÖÖŽ5¡†ÄÅí:A©�BGèÅ5°`
‘0¡…°F8ñSŒ;CŸ@¬Qˆ^¬!á`òÀŒB\ã×ð�×¾±;:ÈŠy ƒÎ9´{äÁt#Æ:Äà©…ƒþèبø—&²/´°ŸÞÇ6ine~úû&8Ã)ÎqòëÛ´åC"²"½hæMáð?òàˆe´#ë Ç:ðÁ�k½S8«Õ?Þ!~¬ƒþòàŒËØ’Ï~XcëXƒ,°á�wÜ#ßÀG9JŒoüÃË`†­¾Áo¼Ã¦¼ÎDéá�r”3íà1òpNn¶Å¿ÐŇ„�܈¦q™ÞöT}
Õ�Bý#Q‘jÔ¤µ©L}êR£ZÔ©*•ªN•jU³zU«B•«XÝjVƒÊ¿‚<<™ùOþ1‰µ°Å"éH;¤&Ù(‘²˜â@DÒD„!J$!Fü3�µ6F‰™+6
�JŸÊ%0Æ�Wûú4Ÿ™26)VL*Ró†ÙÍú1³CÕlg9ÚÑ~¶´ž=­hM›ZÔ†¶µ¤eíkW+ÛÖîk¬ñ;GÁÎõ°sþ[xk)Ê2DI�
	q+{•R­"5«‘NƒªC7åv3ªŒêu³˜Ý?bQ»Ýå.Q·+ÞïŽ7¼ä=¯yÓë]õ‚w½îm/|Ëû^ùƽï
«Xé�˲·Å%HrýK] ù£CòªIY¾ Yø
ø*éàWQµ‹Ý	‡—®0†/¬a¥n¶0‡Cüá‹Ä#î°‰ML^›3!¸U�a™wnŠ®eŒ•»uרííªV�Ö!¹È_5²W“ä#3YÉþB꡼AšUÇV^H�›K±#Áð•SÔ—˜Äd>sŠÍœf«¹Íl~s™á|fÍVÕ¼Kþç~ræ=ĦN-n‚c?ñù(Vüc�­¯/.ZÂŒ¾.”-éHSºÑ•†´¥3�éM?ºÓ“Ö´§/jPÒ‰f*w§¼_Bf¦Ð|nÏ–Û7¢Ø¸º(ÞdtP=ëTÍJA
Hèu¯-…0€¶ÉKæªfßàk`/»×[<6´‰|ä¼é!Ï–¶WŸüÙ,¶¸x^g­÷Ì\'Êh:y¨×ƒÂ=”ËFXÑ)D0€L`
@
"Z#Œ ·‚�ôXÎyØÝu[CèÄÄ=
Ê?¬�# 'pB?ôÂøÀ;¼Ãòx
3X¼‰àa˜=x30ƒ)ÐÁ•$P÷	D!Äa! â?ô‚#ìŽþ)|Ã7¸aä­ƒ$rÂßÑÁx=8¬˜Bgì
3?8)Z‚(V‚�š”'Òƒ)Ž"šBÁ$ =H¢ÎÊ]ý?ô 2C(®�­°�)ü'bCÄ:Ð�bñ'ìñD¢7˜"ÿÝÇ�|ÈsÍì�t]G:ài‰Xõ•„…Áê
EœL
¨
`ƒ	#FlM9Ôå˜ø@-Ð
.Œ‚
ÂèÞÇ9äÇ™žÀ£ê‰g
ÝÛáÀ¥ç@ßt‚!Éé—…D.ä@ôÂbùCb9…#ˆ
6l? Â$LÅUžÎ:TJnƒ<ˆ
Ø¥|ä
,ìƒ#€ÁŒ¼Ã,L.L„§:�É6�<Ãœrþ%\Ã,°�÷t°,^N
¯„!rÂq!ÃE¨(¯ƒ¾1�ò³ëÝþ³tF_ÉÄ‹	Ö_	„€—FôøØ\}Ì›d‰€r%¥€¹U^}„±MHD(ÇXG‘•p%µ«jµ€—OëV`ù'Ϙ)G?F4äkLÇš<“ÄÝD/œu]¿˜ÞóâçÁ!À³=›Lݸ

Ý!¼€¼¹
Ì>­ƒ7ãúj/A06¤ª™¬/1<êï”	34Æ=â)þÃmr3”=¨É0"e²«
Ï?`CŽK»0öKõ"=\ƒØX‚)dT9$&6p{—ŒA”!nƨ¯šhbä±ámT±§j9°T/(¬‹‚Ôº<K³——¼C!Ô
O9PÙLÂ7”MúÕ
ð O2¨ �
<0!
$Ð!=Òc C$T°ÀC:(¡	ÔðB
AÃ	�p …JQăLô�E/<�¡"EA„ùd¾í®Ady¾q‚
o‰È:ðb™ÿiÇ‘^z‰‰ŽB"’/ÄXÃ|¨x‡"~‘å1ÀÅy²¬A/Þé$D–éÒš<Ĩ��<<“e’=Ö¸æ/*Â'þb¾a‚™<¨b–#–Éc,† Â‹^®ÉƒŽÀ:ÁÇ›BFù&6&ÁGŒ»¾YŒwp£;©`†Ž<ò�G-µÞaµØO/è@¤R*j æÎ<¬aƒ
XBÕÒQòXfLYNe£QD˜AÄ‹89ŸN,™„Žw&ƒKبa
D8ùD&‘ÇØA7b²¿yé{gcªé¦šô"±ƒŒ<¼€��Yè-ØàƒN¸»tr¨‘ƒNPRBñCQœÑÃj@ôpÁ;&QA	9öxÀ�W&H¡Œg,E14hf+¾¢î.ʨЎ&駟Q†XãžuL‰ŸAñÙþDj8b�ez9BD†�š6fÖéÇ&L¡ç'¼™j�Nz
GJc†Sè�Ç&ÀX£1Ä‚*®�´ˆ†¢‡Še,Á¢îá,ádÒBÔöf�e˜YÆŽ¼õF·êî¤l0ðä*,Q›ŽQè0¥nG¼±lÔBª^'"z†`›¹×ÀÂ’5Lg‹u÷«ª™Ù£îF9Y§î–9�LU×Ásl
�ìQ0TÍA–Q
	}
Gv¢‡l…ï›_ð=/½õÈX#àøz‘ü÷á�üÿ ^Ñþ•®¹a
tæ…86!1¨b+ºX€Hô1™uDùc`CF@
Z°€á¤¦Œ¬#"h¨8Šæþ˜ÊT"Udüs‘ý6„#Eô’‰ÔÑìØsG]=Â#V‹XãuZ´(HšOyÁ<o�+w𹣉J¤zí])ÚW¾¢t¬ Å'>zþA~\Ô¯½(`+ŠSý|ƒ<Ýп~9SaÌ ’õìgéµÌeèa<M™
Nð‚[ÿ¡®¥,#ÌÍÕ.?ZæIT×ue‚§´Ø\åÂDŠe¡‡z%BŒ<D„JÁØèÀ¥°!"y¨
øö
_
a¿ÒÓ5´ûí
Ä|rŸULz°÷uJÚnSòÝe BV¸èÄ;˜¼]v%wÕåÍï“…¸/•eˆxõ~ë8è<|ãVÍõÔ;è�Ž{™ç<½Ì,6K°o›ÛÜ¡8SÜSÖ>P©9âÈ
ÂÓ��VÄåþÌþÇ hÆvª Qk?þu7SgÞ!.GŒÛ�8Õ€lØ�H[è060CVbà„ÙE-yxK‹X˜Å¥Fa�#ë¸F”pñ©<ÀÄ	�
VŸD'8Á%DäÁm¹–Ñ	ÈþX‚çªD$t‘{[¬ç_
>¿cÏ·*õ94ýŠÝ̨øŽ~¼ý@sÕ«Ar–Áƒüˆ¤YF<XLÁ†BÈ‚`
Ã23·L¢³Èƒ#R
Áö`ÖE¼`:ao˜áôÄ ÐþXðÂ¥þÞ¦Ø庸 År`ò`
T :„EÓlÖ&mp�	zAö 
-%2Î<‡¼`ÞᬖÁï�	Ö€
ö àÆL–áM�f¡&a
faÈ Dq+á¦`¦ÆÔ†o9Œa¬j xJªlDX¬z‹‚ºß–Ï·X+š¤oÜ€+µpLœrKúHLšDäÇNŠ¸˜
ˆ�ç
¾¨ô°�
Þ!†@°Ç%
¯Rzš£ö`pÁ	|
Ç	LaŽTÀ,šÅYÞ�*b@è
4úáPŽ YÂçœåʘÀF²œ ˆÂhìÄL¥Ø€ïH&Äàr í†  ­áéa,¡b ˆá)ìòÀ€œÀÐÅXz�
ð!%}€
ò ÚÁÒd�˜
è
k"±S’9ÜcÂ�8£öà†Ätr Ž ð`1+a1í 2‹¦4Œ)Ó³Ò�033Yá6“35Ó3=S33óHs47S4M³3C5Y³5?ó3A³3E36KÓþ5g³617Is5a“7G“7k“6ss7YAƒ‚¬ƒÎ�(ó‘“*bß
zÁç
¡…Ö ÖÀ:9!®¡ÆL]Ê�:b +¾
Z–
ö@q6CèÀü!
áâ4Ž`£Îâ)ˆÂ"¥¥ð�¨,L¡"±sû)"0‡.p¼À˜ÁqÀ þa¦†
èÏ+Øà.¡d™ÁFÁ±!zaTÞR¬aöÀØ –Aö@XØ‘9¡耽fÁëqá¼
š0"¬
Êa,á)ÄÀr
;¡ÑÒ¦: Œe|
HqÉ€4k˜:«2
õ˜j	ŸèŠ?¯ÞjQߧQ³RíÃ(µ`.õ¯+S‰kž>"'-ËL¢z�ŽFÁ*pAVú$f¡:a–aî†-ÊA8¡áVè²\ãêúÆZ°Á	Ä #À`„$Ó¹;ÝèÀá@Ê]À`¸Pf�–ÄÄà¼a&Ž(ˆÁOÖÀóLá>ý�¬á.8a	]N¾uzÁRûáãNÂî‹
ðæ-á$ÂÁ%¨
òË
øÁ%8áÂA´µª,dÁàÝULa¢=‰B"Š¥MX5-ˆ�sÄbèALô!+×`e·'þPÓç=Ø'øuj©¶j­Ö`ʬ@¨ªk¢*BR/j±""�
µ"Òhl-‰kÍ–Íö$¸–ÇÖ
Ê°ÄökË"¯¬˜N´k>ÜÖmÃCoÕ–oÂlÕ6£*o)ê'—l%Á”ænÍViðÖ¢&w±Ü6qå¶<Åà,ÕRÑV»²k¯0Št1Wnl¿ªk,d¡pÁËo«ëþsõÁ“ñ 2Sñjuwwy·w—Ë"0B#šÑ¸Š£J÷x7êx!õŠä²ìª¢¼ÀVz·cS)B°ë¸"+{Q*<’×’ÂîQ_7|;JhH$àªQ™ä±Ìk KŸHWjÅ×}@÷­6vؘä|#š¶ á—~/j}w€	¸€
5kÏï>ŒÀò7¥$µ®Ž«�¡W~ß)¢(‚ñ#zm‰‚õê‚�7Àæ%'ê¾
ž‚w#œq"ѸCÓB£>nèT«†؃æ�½ãkßamÁvU2…ˆ�ø‰¡˜;ÊOHÂêà@eØ"¢@Ùþës€	:Ñ»˜Á)ŠiR";oR#£8�…/¾ 1Eñ„ow‰³­PÕ¸Ží8Š™±†éÁ(€àB"®
TZ·'Á	Î%%‰ÁNœ`†À	
Ške¡~BnÏVz{B„Ft͟䡺|£iZ¢"L,‹Âú
¸¦jú§�º>ò9Ÿ.­¦ë¨ÉnQ÷—ƒš”Ç£|x	}
£$•©¯Z�o:§1úé9¬Ñš¦§øü$íðÁ»¶ã2ôI¸èq¡h‡S¢Dï!“Ö‹-øú>¤+®G‰ŽÓzøžz—øÅ_¦š™»±í¤‹ë#Î˜ÀH³ÌFUTÄ Ï°al²â&pAæ˳Í4”ëbÅ\ØàþNL^¨D_¨zᅬŒpáµ]ç\BToÕÜ&Ë�†Õ´*:ÆA§íÀ¬�¯¸�û™‡úòÂ…¦�åÈÑ:¡pa˘ÀSþá5¦¤éB�nÌè¼À˜£OâF¿�Ýă`VÞ�
ÜîmpAX
\`…˜@w˜
Vzaœ Úå¹?+ÈDzx©_þE£UQÁ)¼’;µ†³ˆ†ÀæøA.¾†¦Õsø¡ò%/úa¬�–!Ü6‹FA(\¡ý�YäVK½!x¬i˜
.@ò›¢)Ž³g£Øv²1–
AgëºÂmÊ�˦äù¬�¼ÊÓþx¨çÃUrN&áþL°@Rê’´p@i3†$àê$ÃÊ�
paC#­«–ÍpΟ‡D%ÉûÍL¡éÖŽL.’
R
Œ=¦×
2ŽkÛ§<!nþ–!C¿9¾áp-\Cbˆ�ã|Œza²HÔܺÛå‡Á�
±­-³�â9~w![«=J"�J}Ãî„:u1* áV¥
{¼b±(*²Ðöx‹)S;ž^ÚYÂ’£³�Ês>èø8©„¶ƒ�È÷¤$˜~j’âwægÁ]'"}[~|#ˤ„>a\
ã!œÒ	5ëÁžó˜xùJ
Æìë*yÕŠ‡Ã>|þḥÜ_´]”Û¾î9ìÛµ>pÞî=«ž:_¢úÚ*�ï	ߦ ÛSߣ\ª¡ç±½§'3ñ%ÿ˜¢Ì�ƒÉ{òIÙ�Ñ#î�iã5?ôß'ÓEZTà\N›þ

‡E¿Ž¥M—=˜›î[¿ö&º¯kÕ¼l¸Ëöë¸Ì¡ÁsZÒ?ÿë}ÿøùã߀FQ½Ö|‘¿Ž¡Ü<(}P‘öŸÿú¿c­«ø®°Š9÷�#½ëƒÉø»¿ülì7Ýüëø¦¥ÿ|p×úÕßü¿]uõr¬¿;»Tªþó¿½ê£ÿ
âŸÀ�<ˆ0¡Â…:|1¢Áp«¢UëV-Z¬HvÈäñ’Â
›YKš<‰2¥Ê•,[º|	3&Blˆ­ûF…Í·IÿúÉë4J±uû}Ë“‘·‡F‰}#v�žÁ~Ľ#¶´`¿QI³:ì׋a¿eReš=‹V&E]ݺþEÓHÉÎ: Eöê—6¯Þ½|ûúý{ö¢=òp²ñæH ¬5LL­Á÷Ï[/NüLa‘e
Ñ7~œ8Ñ£×=G¦èñëÕët¯rÌL½ë­œ@o`&a¡óíß:o–°ý3娗,¥Ø°yÃfŠÙ:zœ,ñóÆ{ižwœ
1û×ËÑÒu…šú&¯9?ÀäË»l·ÊV4Œp;~T!rÖxóôëÛ¿�ß>^š6¿1ÑÉS?ÖPá…ØôÓC ’Ç,ˆàUÈ(“Ô„È2)ŒÂF'yŒr�l\óÍ;ýøƒÍ;Lô3‰)=ɳÇ^8‚O?³Ô0Ø75ÄøÏ$�x11l ’1“‰È$4þ²Žòà’Ä Ò	nbpuͽt2dbùm™‚USÍ8oÅt…ÄÆ]\®Éf›n¾Y�`„†Ø@§��={p²Î²ìÁO?ˆ8Ö3``ƒ?>ÐcJ!ج!Ë=²\'Ï$Ø8QËÔO9ktÂç({ГG/1Ô�#Žà‰
÷€ÁL9œ¬�…ªë|XÃ?†öC�,…ÑËãñ#Æ2ÞpB‡xÁɬ^èé²^FuD|#Í×l¶ÚnËíIûÕt
äO?NìHÅ2H…3.ˆðCª�Ë\ãÅ2^ô3„<£ òN'T€˜?ˬƒÈ``û�5>äQÈ£P±NËþ`á[?yàR¬5^´Óã$y°á”ëÐ�Mò°q “…8AŒþ´³Ž“Ó�E·6¯ÔÏ—ë�IÉfÖ•æ²7MtÑÌÊY˜‡i¬L0áÍ>0Á‰)1á„g²q'ˆþÃÉLôBÈu‡ˆ%í”CÅ(BÿCG'{d½µkÜ$†G˜òªrŒÅ0׫½†�ØäPƒ×XAµÔ`x#FàCˆq�Ñ–7´V[Òrô³µ$]zè¢óÅßMÿ턪?üøƒOŒPÊã�?ë¬#‚ý´S{?÷ô„ûˆúìÞ>üÏÏ7kxÕ=þÜSû(…´S>ïÀþ�ðø,ó
Ëø#�<þøÈè=ü€OOî÷´c?ï_¬?Ÿñƒðè û³V4b¶GÆ@«)ÿþÿ_¤Ñ‰i=!'Â2 ASˆd	k¼�SéÅ(µÀu8‚ˆ�‡Vz¢Àr)¤Ž�
‚DÀË…ãÆÐ\|F0 I>)¬¡
kø­þäuŒ÷èÁ@r¥ t`AøA­àe‰åk §Ö+!&D�Q <’xÃËù뀖[4B‹Ž°A†v™`ψF¢	0'uJˆBžqˆoÚã¨�·-1�–£HÙ3-�
�ˆß::Q–ö«øcFh‰/˜Á”#ѨIÑØÌÓÁóô…ò T1c
ÌðÆ7zÑ�ÓÈÂ9ÆS�,¨@f Q;yb€…k`¦j®
C
®ó�{8þÂå8Mi˜“š^Ì®¦ÀÙÃdªÆ�IQÕªŸ9`=Oj–iîL#±°Ãn4´Êµ†
ÈÉTÐ
&¼ÃN^ .äÁDŒbJC 1ú±ŽX"G˜pÁ�íÕNÃd‘6x¡&ÌpöJ(iIY‘:ô�N0¨y €ÄP“Ixa³“ m…†$†ÜÌU/~t!%GzÌtîv¸¢k¦+áÉŒt œx¢
èPˆìg
Ž8ÂRúÁ6”#5eBr
ñCGi˃S®á1K/s
]:ñŽoxÁ)ºFm–Áy¬áItÀ…ŽFñ�ù0–àY-Œ’ÞbÄÓšË ¯Œå0·‰•*­ š»ŽeŒ§bh‡@Öa0>­
xëð3ˆ1Š wUHâ•£Ú[~Ìt
¸`‚,’g
0ä
ƒ6…c¬ä6ÚQßpÄ=–!`KXâ×°Ž€G1+š.#,bvIæjI­	—zÕͪë?äQ}ðC@|sê‚¾ÿã9ŸQž›åŽÚ½‰þ>Q`86"Táãåˆd8btì~ðúv«?Úq ŽïÇϱY„V³d…ƈþHú9q«{KÍ|'‡øAN�pŽ¶ƒ7)¸@ŽU<H{ÂàuKd‹]l˘8‚¸bRàçä`
ÃF�*äÞ\"ÅG„ï<öd‚vä7ª„Fñ~7\"³\Ï8ªAÉÎ	wä,÷KJ¹GƒTfx‰Í®E3ä‘Ô*9
= Ê”Œ·dÅ	ø@�sl$‘èDt‚�=
ÒëºÓ'AþFlFùaw©Àkî„=
J�÷	~<Ÿ‰*=ˆ?–~æ&×`ÃÏÐ!Ì=D�Ý�»¾±™åD|€—<ü&qA–Âïîo§Â,¨°×Ñõÿh‹í»A�J˜	ÈܺïóÂÊã¢
5ÀZy:Lb{h6?tü�kA\l¨�a 2£gO-"²£8¡ô(‡7ÖñŽˆ¡@N˜ÄQ˜�ƒ^à©NpÂuúq
*8Á×XFýGA5ðR^`
¸ 4³ï°úg$ú²|"dCÐ
ý²øP C�àÕ
Nð0Ã)XÀ€Ì€œàJÓ*ÌÀâçîõyð
¤…þí'‚Îc�¦u}HøÀ	ˆP¶Qx@d`AH„‚ÔO¿‡„2�amT2à
Õ‰V8òÀë€ ‚…C .ˆ`X5l°C0‘Õ1 C°!(Ò	9à.û7	¸°Â"‘>P Ä@WØ6ÆZŽ
GhW43&'S
uœ€5 ”XÙ	ˆ†‡â�PÃ5�Øk`
bð=ò )ˆÀ ^
Sh
là×Ps`ðPþ£*„'ˆ SŽÐ>
/ª"_ü0}¸'�è1r`01ð(ØbâH``^‡%÷àL *@�1°AØ ÄÀ]�83>Àx	%ü15œ ·x¸
Æázë8
géÄ°LJXßàCr
ï0ɱÛy
Ü…*ú°=½ =Pb
°á@üð‹�ðqê3!1³€ :ò‡Fçs
þ°Òƒ
áÐ	´³¦0Òv
Nåð“ð?Gtþï™D� ú 4W)–ÒáÀÄ� ß u©#Âéþ³KY„Q�IuroÔ)ý°ƒG¥á›×At€0foN:EþÖKÔ�€gêPòoô&GèX¥DTœCÓÄ�œ÷›ÎIHJª§nä…àâL¯D.qÔqRÔoM´oB„XÞ0òÐå‚qzs!¨‡*r!·!‡Etoïp
×ðt•ºo�ZDN„–jCí@¤÷v¤Y·§­z®ÖHH„D|*sÓ“;ë€-L7q†gDZ�÷F±^Eו�7I„BU…«Ѭ�G¼‚‡W<Ø`þ,³‘DôPÎgDqoÏZe¨
®Q®awðr劬ñ®ízð?I$«ÿðÏ�œoã¢xêªý:DÁ÷La
JÇ)øÐŽ‚YªS‘)¦ýà(oö}ùµ[
lÀtp
£pÄà5»h¨r;uZñ
AŠ ¸°¥°7	Õúð¢ñ†Ë�e:C°Šˆ^P=1	9�±ï0	3©p(B«ˆ¤þ–:W×Ð	•²Ä�Q2‚tb
´Ç‡*²@@Ëi3û‹R1¤æPªŠ¤þŠ¶K¨%H¤?bpEGWt@fÃóEáõ'UU` ^À_þÂúGøÀh
	`�_G�«6JGòç
{Ç�ð*‚¡Þ{z&œš˜ÞÀ…У‘)Ô�^½àRãò¥cvÙLÀ·Wiœ�•ØÒX�ë€^pyE°F]lÇZÔ0¨w>p7²P‚jF‚�5�;	~ãÆ
C`iÞÀbhxk°�–
)!‰“›ùâdE‚Ž…Ð	¸°=ñ1‘;;¤µ,�`y9Q?›£@\Ò¦õ
>ЂËP9@ê²tÀ¹H;ÑŸ°ˆ«¸Ð
j(¦p
5°ˆÀeºÜ[¦“€X‚•–€T¸à#¿èb`%¾¨õÒ	�°*À/�õ
CÐ	ãùX·…$ï@k�ˆPb€`€�…c—�5dI%€8ÖŸˆ@[ˆ@Ž¯)š³#´ø
R?Ò
ª5X¸ð–B)PÇ­›	dk¶¬ÚÀ­êjÉÕ
1°)ËÂÌà ¶|‹¾` Í
X€TGÜbÕS,bpÆþ	íð‰¸{h¤A5
1C‹– Å2|ˆd7bþ€vI±)À]iâÝ/d�tZĦÀ'åPgÌ€ˆnXÄy€£Ð�Öà$£°‘�P”PÂsLhø˜Z– X®é#¸à":;>D¢g1F;AU`(C€ä܆ò² 4Ö0
‹5
ÞðX–ç|¼L¢.-/kðS%mH;‰¼Ü²bÐ	€
“Ðg†£àyÐ	ßà—X“�à Ö
‰–gôð‡H!{]‘@%Œ9ÅS¢Øà·µ•	©0

à³`	gÛÕ{ʤÙnû	SÌÚpv¾ÑZEŸ-J÷ 2F×a
Œ³hX°£7{Ðþ{ƒkP�Tp%ô¶ËˆÂ„*ë0·…PÁ��ºb6Ø0
ô
TÄ²€œ"^ 8Þð Ñg
Ë�®»½@µPv
ÿŒšú€$ËP4SæUJÇ	�u<ØÀ kV?�QjÔ{€åÀ‰r+å…sA[Ž$­±€ßÀ'òÐ䜢ò€¸l
"t
bX¼12Ù�¸¥/å '…àaEz>í@ê¤Ù�
~€N%Uà^ݧýQfB礱“©¶“©#G÷;”JEÚSo­ô¨·@¸>"Çþëz´œä¨A´þœ÷ì”*oÿF©‘ê£RT.Ù¾,"´íÐNëè¸ëä"ìí°h·Žë‡Jo(Të#榶ž©þéz¥Û©`Ò¶±æ€ÞêIÚu£zî÷ÆqOJ¨n:“Ð¥AÄnDù–°þvG¤Zoz¡oo& ²ŽoÚdªÖºuñÐ:¾
1ÅÆfÌÀ>~?wžyjŽE£�|«žk@ñƒ$²�Q¥Yg�t¡Agê_ð²'Šþq¦HÜ!sžq!Nk@uo’qØÀö¡õ±‹/ž©½²H·o_ïÏ�
PE‘߀æÞÀöPv/¾$D)Ð|}†U*HÄ°cA–€«È!TœÒÑÕ£�{
0ÄoǯfyGÁ!"†�w@øwäÿâÉ
ÿ>Â'ÛëÞ‰Ùƒ�=S½èýûÇ�X
GØzyûVŽ_BfýFMzÇfÔ2o½d­[æd
3l²˜™þbƯ—Dzü˜1“—g¶ý®QÁ"[9ƒ½˜õÂw-Ï;Dœ°á•Ǜ,b©Ì�2
LÞ�bÈo�#0^ò "6™Í²!b³!†(ϨuGz1Y3«PŽ<bÖÝëE§�¥<N¨ ‚¨=6טÑ1¦ñ?G£°�¹çm
'zbÿyc¯!ß<“k8ÉóML/0Ë!šåH–QDbî�d‚Ñ·íb8ía’‡Í»Iѯ�õ¦‚X/NkÖåà4ñ_kYØøo~î)Ä”BÉ
‘þI´O:Ú{oD¼ø¦—B8‰
‘kF™Ì‹ÑRë6:a¨Ÿ=¤Â'À ¬ƒ<¨À†Ž”Ö806÷QÁ6ê,ÃÅ	6ÄÅC*˜É�‰oÄêeG6d“Œ¯;�9íèˆÁ
�€¤žoª
ÀuÈA„/Tøj½ÒTsM6ÛtóM8ã”S-l¶[06¾™¤!fbèÀ
KøY'§Q:…o8)lŒÃK\;"\Dd™<`”‡‰B°CÏ<–!f
zã›=¼©a·or£âüÉ©�QØÀ¥Ÿ~¾…È&qbú¡'†°`oE-™d
S8A’6Êé0ĘÅþ’k:8ÂK¡çCoLAt
0ÀÈo�kÀ8‚
6T�Ç’ÌÀꇊ!|ðŸ<ˆÉ5ºIFñ!†Reùv*ÂÝ£œr±hê›øãÇ~d#NÖa´,°˜dÑ�YÃ/º­af„´5�kÀ¢Yòè¶-·\Gâ&¨XFl8qq”T±ÀŽ2·ÍwLQíÅš!˜ˆ�
'R©g*ŽÂxÌÙª«¯Âšók°Ã{l²ËÞ«¯¿ì0K¡—wpýg&Öá„#/Ø@DžI&9y'*$fYY§4&˜ùuN¼Á›R‡L�˜e¼ˆ{G‘èøgÛSóø,Huþ„™{˜Ayl˜ð†Ÿrœ¨
—Q®Yc1 ½c™o–m�ÊýÅÝ
q�u„Žb­r1AŒ!D��Å;jBGD2ªyä7Ö@‡5àâ^ˆ`Æ7Q`Ã…Àä:"µGÜ#'>K%3aDø€q‚5&Á·^¬¡Ö”ÅãòXŽ_BÓp²àÄ,ö@\¼p,ÌÀÂá˜QÇ-Ãk8�b®i:Ô`ŽÈÃfáx

WßøNÚ±´vHí¸è1žÑPš‰
³øáþE­{]ìfˆH´Ó7°ÐÄ´ÈJ9'"ËxsB^¹•w,ý�ÕXê©^»žH9biïyÍ"7üš×¼ö•oxíº_µ(G¼í••xÕ`¶‰E¿ý½oZ¼Þ›ÌÁã�/CdÅ
;8'?ÄG!2r¢úZ8¾á@hMÃÑ}¨Ckd‚¨×´ûbÇXÆxÉè_jG˜²„8Ác10y-Üc\¥·ÇñeoYLäó"x¿Žï��¬cóö¸ÀKN¯’<_Ÿ…Àí=ò yü_“%X±:Ëx§,b§7Ç
Þ±˜½á‹zXÃ
V±Æ8êÑ:€AºhšqŸýüg@'q‰MT3Zt1Aº¥1ò›þ²ìcøÀ�v¥ÙÜKÙËsyt¦3­eÛ^<ü�®EЫfu«)Zã�âx,kð�Z"ø�·Èc
¸vu¯ûŽ_ø¢@
Ú»ySü@?ÌÒ© †/¦Pƒ>ü"Ø}€D*„ „T¤‚¿0C&ð�Š)ü¢0˜¦�|jü"úÓ—~õ©O
_T_úÙ¿¾õ½?ýìc¿HùÍ_þè[Ÿû¿
è
èH…O|LÈ\Oõ\O÷|Oø„Ïj`ÏÈŒOû„ÌùtÏö„þLcˆIa”I[ÀÏûÐ÷ÌO�O5Ð�†ÅÜÉøb3³ˆÐ�лø_€Îñ
‡DÌa~‡¯âæa¹r�N
NáVaVŸ&á
Žb÷`á&áàná&áfa%a'Æb Qa1c2.c2^/ ‚_r�Hb:¨¤vcõ™ãJzc6žc6¶c7†cŽ¤>þc+~c=î`?v0XƒÒ‹`E¦:o%
6HÁÐÇÐC‡Ðth(“EJ¾dJVJždþ3K6Ys@‡æA-\Áöª!±ÀUvåÁ2êÄ~èDZæÈWf/Uf¯Yæ‡}®"b¸äH~MåH.ee.eR.GS±M6‡o e3PæO&ffî7iÖdO.eI.åPÎ?¸ä†j(m.grnÙ~“gFWtþ<\ðƒÆNz®g{þa{[ì”kµÖwðçk˜„{àE.èV»†B�¶ÀXƒ�e9–k(‡~èˆf¹zx‡~‡z‡®‡‰Ö!¢‚ªÆèM*K0J¯âÈ*K²{(®a†‡Œnu è˜¦èvèh{‡vÈ莞hŽ&Ù”åè�®é“Ûi—Öè¢F‡>˜iþ¢VjxÈ!¢v)™Ö¼I .k=Ñ„ôgDìçzæ[«¾g¯ög˜åSD¼N Km5h´~¶	Ɔ¦†� vhrÐ!uàè†âèšfê‰VÊᵜÀ¡*�Ö*‹‘&üÊ	¹Á0Äö±“^/”Z†Q@Š®ˆvh£jq؇¹v鈞i½æl6hêÍvèÏîlžþéz at j¬!j‰fíÖf9�ΆT�ç¬6Ä~†K¬îS­6Q¯îí­.QÛ†Ëk°„�Nkã–7l(„<HNÁ˜&qðþƒègŽé™žkq“Ïë7è¶î¹î7t8¡kPŠÛƒNØ«‚"†êrËèðk³À…D{o÷þ‹ÜI“MÙ0y†TpkŠÎî”ýïv¦k–ûî˜vGt5ƒÿ&tð…>tîç^gˆVðÊf¹rD?Ènt‡Tð“}úïì–ì˜ÖhëNpÙž½…aˆÃê]ñ¾…8íêÌÆήŽK«®ñ?ÑMÑkè³>n §¹~¨“Bà56çšasÈ1°`_ðæfq¸ä~Ó!tx†<pksPðoOf	ÔÊ	éäé…Wêb:K°f0ßÿ ™`§u‚zZzÀ†˜X7,8‹”*Dg~‡LHc1
ïfnn¨
—ð‡n	o(3ðdOö1‚Ÿau˜r“þ-gèfæÿ¼>Ðd“%kȃ)ðeu‚NÇ’-toærE7kH…ó8Äß[CLQÞæm^nµ‚ñ†Y¬¶Ö\Ÿg7Ñ?DÞžqpf7Ä€.î ¯vV㋽y6`hTð)Èé¦Xª�ƒy/ƒT ]'�
Ï3YΛæÏo¹Q�v µ~Á°Y@„ «� ëL™1¸†Kg�ö¸£Qð‚�¡Úø ó¿IxRg?˜Ûœ­�!Øp/ / tuwH@�®QRßft˜æO!ut ?E•í! Hð'€ùpPpret0Šxÿ†‘]ٹ͆þ�+øY‚x†ø(¾!ˆl‘eæ–·ubÇuÇj\·j–q jD¤ÖD¬VàÖj„äz>µêî²fQkoû?K"yÐö58Ã?,*@tH¨�ÙN…!€„Xa˜gƒTH
Ë…yÏËjP|Åg¡ñÆ*ˆ�"� D…Z¾£]ø ó| bp‚o°�¨b'�'P
ù¹ˆ×‰eÈ„Å_AÛ›H àôLxVà|?ð‚gèƒTàû!XÙnDt0ƒ×_Á> ru\'è߃>°àgPAkPÁק†,gYÅŸ‚N8~
¸ýÙÎ?3x'8á@´ýæ�®ºê±'þöo誮BH„´Öù�ö®ÂzÆíhÿg±6Q€øöîÝ>�×,¥pÀ¦W¿BŒ(q"ÅŠ/b̨q#ÇŽ?‚)r$É’$û-C´çÝ7*lÌø¢f-[6H¿R	�4¥Æ”)¿ÌLIáGÈ/?T¨QK5ØKšÔ²Y{šíY¦^ÖðÉ“çVy“
D4)+>&Ää½Ã5Š�<'£˜ ëÄFL§5T&‰…H¬\Yÿî“÷�Ø$_Pe¦ò•‰Jž©tBÊ‘­F¦"©üx¡öŒZ‡)9R9µ6ó)µ)4³=}æÇŒ5_fœ¨H•‚š˜S¼
2~1Äè⽘Š9N>õYZˆØ«8æê<JŒѨ¾.–ñ&¸ð1zñ.®ñ‹lcbf1@º‘…|ü#ݘÈ0rq0�$Ñ8IE‚r‘_„€äž]Õçâ8ÓV5Ç_é
•ùq•ªˆÀuìƒiŒÓ#2,)3˜Â&I´‡y¹¤£˜3›ÉLH8ó+Ñl¦XÄÂLkN�ˆÕ[™G;úŠi« <º£þ—i:#£æ$ ÉÎk>ó�è”æ<ë)w¶žÎ„æ=ÓÙÎjÒsš�¸ÆÖh)¸
c˜Â¾ð†3Ìá{8Ä1ˆI,â£øÄ*61‹SÜâ»8Æv„�qÁ	›ÒÁA{Ù1�
Ü㯘Æ=2‘‹,ä"WÉJ2�
Üd¯�É;~r!š¼¶(þïËQ>²ƒ®¬ã'/y/BÆò—£¼¶#ƒ™ÇO–&�™©Ô7'uÈmÞ1—÷ÂfkÂ9©Ž²%
b zü%ÑŠ^4£íèGC:Ò’ž4¥+méKc:ÓšÞ4§;íéO+ú¸ÀÅ5Ö
iS/Õ©Ftª³ÂjEïÃw‰Þ‡;ÊYërª:+^
Ap¹èXÓz×¹ö’<rÍhD«:Ùø0vWmìC?úÙ�–6YŠíè\Sû/ôhÇ¡M�K_&ÖºÆ5`ómbûzÛdA+ASNtïƒÖãvw¢	"�Äà˜Uläö�XZéÛßIÓ£À1{~D±,xd«p†Cþ|ßØ0ìÄ+~
‹¿x`'~ñ�wüã„õ8u§«\鮹ŸïtIr�ƒœã"w¹Ì9óŒ‡\æ7wùÍmŽsœ“Üâ=z΋.òŸÖ]®UùrUëôÂbw»?‡®Ë’‚ƒ
:Ý:×»îu¯'�1_;ٻ΋uäa
e_ûM±\¨�írŸû×÷5
0�}ï¸û×Ù
àB'ä”(N`½Ãx�|�"`à5¤à;¬A¸à7˜1ìÝ^€�—àH
°Ay¥ zuÀ2:

.(ŒíŒB¬+Ö€|>¼CP
ŽIh¥Å5èEy1“zÅJnÇ]ˆ�%ì/ð‡ÕÌ(�Z
üÍz!Í)ª…@Œàô¢ÿ-NÄT!â/0�1¦…µ¤… ÈÂ>¼EðÇxyÁ(x�3"
B:�[ 1øÀ>ÔÀ7L<!"Èb’þÚ+¦Å$
¨E
H ª#/²�
ðc£ä@&/ã7

Ê$G¾Cò5äÞy
NBtBÚ™�?F+áÅv°
0Õ(�%¼C'x
­È"HHx½Ã^¼CF²&C
"8Á2á^Ù‡,•"AÄ
°
þ
.mÖ€qâ qò¬…5ŽÂ8Aâø.'ÖeÇvä)®
/€á)fç$œä54d'¸E©­1'/ä24d
¨ä÷åAÜL‚ðâx²
lføaA¾ŠP° a^
1�Úv,C
l/¬ÁÂ-Q%{,ewlh†r¨,uhˆ‚èˆ*‘ˆ–(‰þ!†ª‡C-"NTjÇŠ^�ÒåîÐ¥
LBXƒ¬ä¦}Œt‡dvÚ!ÍV¤@"ÂL‚
òå7`Njpgÿ}E
ÈLÚ”C3ƒGæ˜m‚
tRA�Ž—x„§F
”è¤(¤X‚uªˆ
�ÌÂLAôŸmÒA
T	?¤D\CAø�ß]C
XBäA_\¯¼C ÚÊdvÇ`6K
à@Ž„¾Ã2PHùi_Oì>�Zé
ZªòðO®0l^1¬%.Ï+åÒ@È•ïÈk�:ì­¸þÒòÌŠ@h‡8”“YÏZv	“¶
’îÒZ¦¥É”O%~Sb%ûÑᬄéÆé[Îé
m
Ì'�còÔ2Ø)|�¦
í­^vÂ,PAÄÌÂ`2AŒ‚4æÔ:t0N*dð!B
ÀzPê¼:

haÁЈ¨ñ+lL%Îà;ÄjÎ P4h©™"¯€–	Äqé×OÛ¢•—8ltÒ	Bs_ê[¼Ä+JÉô�ôÀ9Ü> „#oJÇŠ@$4©²½ÈŠ`Ì4KL!6„CÆþë@8(à¼Ý6-bÿŠï[»u\i[ÏuÓ(\+
üÆo\"ÕD%SÚKý/özóŒo[_³’ž?(]ã¨Ë>s{¼•øÒa\)³•"ðñ(%ª/õ"zDT66ø¾ÊVïC±èýhÿv³©ýO€
àvh¹V„[¼•Ó‘¹‘+y’ï‘Ç?pŸ®Ýb;¡ÊØÙ5©™�‰E&¨“:¡L4MAP‰…
¸T�qºy¼yžëùžóyŸ{
ž; qŠ
 ¿9ä@ú9œAqþyŸÇ"¢'úžÛ¹›Oºžºž:Ÿ‹

\£žÛ9žº��:¥'©Ÿº©; ª£úªº«—ú«·:©ƒº“ˆ�ªßyŸOz¥':¶Þ9ˆ:bòz\:¨çú5ò:¥ûæyª7º±z¦{
°+{®Ãú¤S{³Kz¤k»µÃ¹´w;
´×ĵWÄKüÄ�þ3„—Å3ñRü2ôÂ{é¦È
„üÈ£@ÉË@„¼È«üÊ›|É»ü˯üÉŸ|˧|ͯ<´€d€ð|Ïï|Ï{@
¨€
¤
\
ýÓ“}Ô¿=ßÿýÓÿ=,½ÛX
|ÀÓ«€Ü~Ô7>ßË=t@–Ô
%L´hbF�3àÈÑ#Ä
)„hˆ
@	@JQ& ® ¤˜@¸ (ˆpm5°°#]ÌÀÒ¦XŽ«Î\ú�¦–Áɱ«¸’áà°2®…d	ßšû�§&yBN¹¦`˜†ëÞÊjÉ+QÈ@‚ i"þ„0©9Bœt«QK˜ê¢&šWNQdIÈÏI3mr‰
È ã‹>krH•tT¬ðè“Å°»)Ðâ®3*´Õ¬¥–3œ@Se� %<
4¸‘ÿLêc6Hd€–\èsÝ	Àá�7þð"D±¢ xã!
‹!þ¡¥@þÃG˜~°I Æjtá+·Ó§V[H�$~ cFkV•I.QP!“X˜B|èX_a’��|!çdÑB�.ÖRø:°GEÁ°l©d•J»à¼¦À>î>øÁŽ_*±%±2X)œáÞ©2ÕþØ¥™fþÀbµ’2EÑ‘MS2#Pƒïï£g¢‰r—J$×*ó¦™3j­•Äk… }×Aw2ŠºNkój8§¦³G—ªK	å£b
--- NEW FILE ---
GIF87a€nçþ


„„ïP
U3‹´*áéÂDÈŠ A®(â°¤Ãr|X•šF
˜K`¬b²ÚDsS�R™4Ù	Ì“%®Ê<Ñ1GݸiãÊ�;7ŽÚ4—›Ü™†n§Õ’Ï:2ÙÊDÉ
<Ìʵ+'Ñ㊰WÓ¶{ÖEˆ®[…@éBMìÕtl2‰2Ö9\Ò¤µ
œ,.[᪪‹Î¾Çóäɇîß?üðMǘN«Öªà«´i[ÓôYƬ™3çTÂïœÆ‡2vìèéFÆljžTœØì�gN¶ñvS
4@È}&¡£Œ,@ùØ�Dâ$�ÊðhÜ4”€âHd“M/H“�.
<’
/Dq!SL1
†%5ÓM;
§²šN¶˜¦o,Óðc?íʃŽ©ÀÔU/­ÅÚ5¥ð±I)ÈDü‹)¦è±‰ˆ0ÂH0àÈS«¸_¨iÂèœRÃœ 2yâ�eéTG«¢à
°†Çåt£Çt°ò	`�tk¨™ðÈ3_ˆÍ&‰¼×4&òÝ�O=wÈy¬±ô^ØÎâñ×\Pâ%(:k½Š¶£�#f(b†#¯
ëNüz²G|ãeAyÂv‘ªw,Å~Qq¨�¬âÄooñ+ÇÞÊq½PèÊ-n�B Ìâ•.„å‚úž¿‡³d-„Î:‡Þà¿v¤Ã‘ØC.¬ŒXà¢þ¢ˆ…·
cp\ïPÄiH�â×L)«yÌ;âáj
ÃÅBEQÔØDmø >À¦¿P#la‡KäÂB{[#�YÁ±2Qa¨€"©HDÇ2ÔVŽìXÀÅêÆÉHó §q„D¡)IºièáiN«%ðaûˆR�m<RÖŸ„-@#Ð`
Íñ½pÍ)\渆&Ê€ 	-!Bz ¢‘A^þ2\ÀlF at M€š(�)ÚjR
„Ð…gtãz*Y^
µA:)„"¬D]БVC"ªy±ÃDÁˆ.Š"¶HF, ±�b$£Á¨Êœªj(aL곓b0Üq}°22f”WZ=†t„&¤€þmlIAÛi¼Ì1šq—kîGØZaÑlæ`FøÐ
nƒo‰2ÆŠá
[Xbµè†¡Â…Wé¥~iMÇ,À]uWlþðGÌžÇADÑÉ@§È”‚^îÀ
Œç?ü ~Í»Þh]¼8‚Ü!¡,SQ}åà-8.sþBVM

»`‘‹0Ç
mP‚?øb$ˆ«M)ʘ…’«áVÊ£J&†;êÁJ%Ï"Iä\/[cu¨n”bõ0G32
l#ÂhÆþ/NñQ)ˆÀ¤H02p›¡”45DÚ³÷¬!½-à¡xÒ7zj¾?uaˆFt	Š�b¶µˆrBmîç™TJŽQ½@NÌ{40
CÔâP^,ÆJs‹d¨«u¢ÐÑ�nœ£Üw=Gcs®Ü¾CÓ`…£/äÚ*d‚¶øÆ÷8ì1ÆÇÌŒ.©à̈�3>—c­×õº1‰=x£¹ŠE…°‘f^b»Ùåž
ðÀ³1a'Þ
m¬@Â/¸Á�ùÂdË‚”’1dNHRÖúì'1”Aet ÊˆG;ü®äTLœÞÍTº¦�‚{à1£¸A3Ž¡‹iœø· Ä
Þ  £Ø‰¢ž@ÄÓx\c4=a‘±Á>†Êøx‡8ÄñŽw<C.©CTŠP‰qÛ©tš£h_¨Ê‘šÎ‰¦Èí±sød¯pD?¾áŠo
Î
÷–	#(‚ÓPý–[eDn÷cUm%u­ÅVÜà}Ü`pAàršÒ
ªàp·œ�({ck	V;}Ól½5

 eþûg
0
—4á²"P
£ À
=†¦0@R’
Ò	,Pd0ö}ç�dW¦¬¸w­èŠªH;üGË7~‰r7€z¿
�à
0@@	»p¿Ð·p¨@7vb‚ƒ½õ‰"S‘qQÅQ‡FÒÑoïöç@
ÔðÀ@Ž[°vå…6e6’fGžõY¬�
­b1µ‘|ó¢t�†òà)uóß`e �G¯ÂTÇ‚,×3a"v,À„(Ü@
|Â'idÓZG'
‘VÙ¸Ac
‘uA^è1}!uh
Ø€
,5n—@
~d¹`­ þ
F´t1è”dT9Ó¦õ’!úp©0bí€AÖ°v@‚H‰”ýbZíön
¬ 
È€bÈB]å
 ]ñc�x\ÓPr$æye
(@bp��8 à
è
;ð£Q~ð)0c’ï—OQÆŠÕÀŠØþÉŠJv
Ö0´)¡ù—¬Ua
Íp
„`
w`
§€‹Ì8œp
§À‹(pÌHgÍt!f‚ "Ùƒg¨·s’¡6E`B/#C’}�BŽ¢Å
E°âMˆâ?5àZêz"ªi56EHëÐ	ò6þ!O
;xo¹PX„á£{3¦æ€¥µÓo>{fdEуAC9 Xl`§U°D°K‰í¢e4÷“DþFòà¤×AA°	É
£D–¢àÎ`hÐäd¤dM}Qi+‡Z§„"2^Ýñ©åà©Ðc¨Ä1ZÓéq…õ•�eú¨H*¥IDaÐ
C’ÖÐëÙÓ
=r`òf«j(ÝЉÞDM@€b¾=¾äªbA p� ž84p§@1¦€@@)�I à
pœÞJ„¥¤Ãy·ŠÊ��Ü©dÊ€
w…¨JDIXÚ¦°Á9kà
w`
t¢;”°a þŸb@	„#ÀŒ÷¡å°ò`&ò ó1Uz–Ó0F*‡ög¡ðS?õgxдç¸ZC€‚G´9w¨‘síoñè©`
© 1áµò(G(v¨V›µóp
üh@Ã`7: n°Tã�ÆÚªñ�sz»·h;a¦·Hšsî ·y«¶{{¸D«¶‘µ‹»·Y¸‡K}«µŠKƒZË€‘�	G™Cèpµ‘ÛªˆK´Õ¹å§=	o©¹æPî’Æ�²[²›©aZí0¼‰÷ƒ¶�k¤Š
A0¼n€ÃK
‰ë¸í€
¨ 
Ð 
ƒ@{C´ñ
¼{[k
ð	¬j¶ÀúÖ`µÖ«·�‹¤�À
L´¾«¸ëðÊÄáð·ç+º�«µ¼t¾áb¡0Kz@	zp
Ž›ÂçûapžÀ
Ô`z+`9ÇÇþDKe~kñ`í"¹ñ�ÈöÐvP~ìÄ€ÛÑ0×–·›À
çÐÄœÜÉ=ëÉ}ÌÉ~œ·oÊ¡<º�|¸©¼·ö`µp	vË—À«\Ê*œ·�A
 ãÀË.�?ø£{®’¨ û÷VÊLi’‚¼œÈæ
è ÏÐãƒÛ<àÀ`ÏLܳ›aÚ©�H‘µúŒÊ–K´¦pR¼Ý`À�QÓp
”œ(ð²Lø°Rõ õ`Z~œÕWÛÈ«0÷ ÷`b�ÈîÒ¦¼éÄ\-Ò~ûO~¬9§:
C{®E×r½·ýÈvMeY}®N|Zh¬Ö©üO¬¤Öx½·’m׶üzzËJƒÊ"=Ø‚Œ¹ 
¢Æ`‚mËkÍÕªý“‘r?ÀLiÂpØŠ=Ù’íº®Ë̱½ËÀÜ
æÖlÝÈ~ëÇVÉnÀ­Üz{®u=ÆÀ	œà(
0õýî™ÎètþíÞNÝï~ç~<í\Þí€ ‚áÕæN^üàT¦ðoðmÎ.Žqæú@ïhžç�ñ¸åýæñì¦î¬�þ‚˜qòoÞñ!ñ'¯ì~ÎðERç˜qæ�‚gŽñ8ñòc”ñÏò~ñÏÿ�[u.ó7¿“>O$GßÕhþñúÐóS_õ
�ýÑïq¨_÷Ïà/þ—þþ’þÐ/þd¯þîæÿ ñ¯þâ�þêÿÛïþýÿ
ÉZ]¸•#Ò–^ýY‹ç
ÖàB ÿó@Ú¸pv�Ã

ðË
pž,ó–µlØ(3šJŒZr£™¼èE=¹ÑŽŠT¤®Äèñ8êÈ�’ôgé(â>Hʙִ£%µ)NOiÓ–¢T§Õ©IyúQL>í¤E)Mo:Ò µ©Lí©Fs
U§*•¥?­*R“šÕ§Fuª?+aº„g´} ²a¹TéÏZèKˆn˜é@ÂÒÁ=dÂ`
ñ „Dgþ
NÄS›«
šÑŽ\íi’ûŸ5Ö±ÐiŒ“S»E¸¸†§ùp_3üÞJw4&Ã
êÙÏÿ@‰Ø˜Af�.²õ{mü*¸ÆÐ¥Þ#âÓʪ¶²Q¥½5kÃvÛµá
7·P+®;’KÖà6­eK.p¨H³J÷hÑm.s¡{\ä"»Û-"Ö¾Û]íWx¿Í.w‘¶ÜŸ±·¼Æ}¯r½«ÞöÎ7kô•¯oÉ[_¯
÷¹ë‡=\V
Ç—nã…/ë«+—’7ÞÐç°Læ2ƒj¥„=ú—Ap
ShØ4À@É郴ñ�‡Ú–zÀ
sz_’lt¤¹i¨µ9Îøý´§ÇÜf¶9¼ŽÌ4¤-ýèTÓZÔnötsIhÂ	ÿÏÕ®¨+yéK3¦³JN�¼LÒ6LÅBF%(A€ºcÆÿkØ-(†u.´
M�1"
¤>¤1FþEjÁ®	Í¢º<Kê9{Ll«:
ƒ)dÔ÷c¥ØD´||¿j,3ç“À(ÔÍõƒB’œÂfìB³9À‹tÂ04*ô;ë)Áhô¤ì3ôÀëë/¨9?FŠµðº"¼8…£®†‡‹ãü{¾ëÉ&¤$'dB’\ÍÑD 2QYª5@Á“͹£3”ùcü¹Ý4†ÆJ¶ÚZœÌš�™™›ÒL`l÷›P‹1š[›5Ø,GÊjÊO`ÄÇéa—×P•"~˜xP©
fáþàÓÝažßÍ�þàúåÜnà	ÎaØuâù�‚æáü]]8êOʪœp¸pãkÔBcl8c5Nã4‡5nc7~cÔú«Û²ã5þ+8~ã:>¤Û‚c<¦c46ã¿äp°4&ã3¾†t‡:ä@~clBäIvcDÎc;Žã1>ã9>$2æd1Vd5¾Ôã=¾­>fãSnäFžãQ^cÛZelå@vãR6dY¦c[VeT>¤Möe?>åSÎcSîdÔZcV¦c=ædBþä:Fä_cMVe3–å9^åKÆæF.å1®f@þ+bþdLNfc¶äMæc5îåí�ä9öcGsä^Æep°yîc{þNe:~d®æjNdTÖä>ŽåO~RþævÞck¶f]¶æ3Ff_îdcpè`Þf1~ã	狖拶c[þ+F¶ã{fgjvhvÆemiV>hz¶çh.iOæヾ†uˆ02�1…؇¨Ø‡�Îi�è鞌ž&Ž~
êð‡©Þ‹±6j¦î‹©Nj¶v
¢ÞjÇxk¦Þ
�ë}xï ˆ~pk¿Æ	±îˆž–k½æéÂkÂpêçjï ê½�Ꜷk¼®‹•HjÀ¶ìÉf‰£®§Fì¤þ	þ´6곦ë�^ëÆ>ëÂ^	´Þµ¦ŽÍÆjŸÞjÙ.jªXí¢NìÍpëíØëèàë¬@íܾˆ©m¶–Ž³¾Œ«Ö�ÛPÑ
¬ê¶8ìæŒÂ®m°.ç¾í§^‡s�T2
gï׆oÜ�	/Ò自.�ø>ðçíä
_ñiŸvPuB¯rnÇvRÇr?ó¿öoçq"×ö\çõCïôåH÷Ts÷ó:þ¹qfÿ|€
ôΟ$%þ§ûHæfDîZ‡�Òˆ÷0üwíš?k
,&Nc‹5ÅS
FØ?¹ù“
¢X
¦„ þl$+K£U6W¡Ÿÿ€’œBÍ\¦ï5ØS©ú\3þ%@ôewõ€ò¯­
;ü0ÄK|ž˜
c(Ä!1†̘Xà7?/±°,A,"£(Å)Ò&>óÁË®z%Å'R±‹^üâ;¨—‚±Œf<#ãæ?2Ý'�n|#ãÈÁºÐ§Ld”#ó¨Ç=še�
m(D*Q‡R4¢�¨E3ŠÑ�^´£õ(G?*Ò�’¤
æ",ÁO�Fl†d©—È‘	OXbž€ÄLkzӜڧ4í)OwúS¡êÔþ§E
ªQ�:Ô¤U©G]*R£
Õ©>µªN½jS³ÊÔ­JÕªZí*V¹JU¥ÚÔ¦¤X)L¶É¼Ø0­Xú&$šRKÄ•s­ë]åJ¼îU¯tõ+_ÿj×¾V°y-l`ØÅ"–±‡},a!kØÈRv²–Ulc3+YÌnÖ±}]DaÑêÖ»Y±Žmm–ÈaWІÒ‹`­>_{P×–¶³•mkqÛÚêÖ¶¹å-poÜß
·¸Ä=în�›\äúv¹Îm.t{+Ýá>wºÊ…®\IáZÑ¢vVGlkwÕÓ`†2¥°5ïAÑ[Þš¦—½ë=¯{k_õʾömï}ß‹ßýê·¿þõåïýKß
Ï·Àù
0‚	|`ؼ4¥+h!ÁÝð¾j—¼¢ðzGÐrØ®î0ˆ?,â“xÄ&.1ŠO¬â³xÅ.n1Œ_,ãÓxƃ�©kiúà	cøKß}g�o%Pºv°�(rJ�Ìaº"™ÉKV²‘›å$K¹ÊO¶r”¯¬å,s™Ê[ör—�æ)‹Ìf.3šÉ¬f,ŸyÍKÖç^9œcšò8È[²p/í<žñºÖ–òmíŸá<WAûyÐ?-4¢
mè@Zщ&´£#
éI7šÒŒ¾ô¢3ýèJsÓ›ö´¤;mhHØ”½ ¶i�õœ¥mYÕmÑ“jŬã"Ï´µþÖ®>i�k[ï×(õµ®}ëa÷šØÂ.6²�­ì`3›×Ëvv³�
íiK»ÚÆŽöµ©ÝgRÄΞlª]Ýžv‚WÜr
¥œM]j¯{µ?u·ºßýZy·{Þñ¾7»é­o|Ã;ßü¶·¿Þï�œàõ>ø¾^ð…#üß붭Oi
	»ÒÖÖá6÷zþPŒÇ¥1ªe·‡sLñ‘›µäß69ÉO®ò”³å._ùË[ó™Ë¼æ1¿9Íqnóœó|ç>­‘Iýà"·÷â?�K³xôŽóœGævy+Û¹N½¼o®zM¯®u©o�ê]·:×Ãîu±ƒ}ìf/;Ú³NvµŸ�íiÇþ:Ü¿îö¹O½§£<µ]¡¼Ï¥oi­cä{\È;×"Ç×…:¯Ÿ[ÃëZñŽo<äyÆK¾ò”¿<â1¿øÌs~óž¼å;zÍ�~èÿ­«Þ»á”ðâñ£}¸èz°4Ç«-(nA®nÜß~÷¾×=ð{üÜ¿øÄ?>k‡Ÿ|ã/ù¼wþï™ÿüæSúÖ�¾l#nÖošêÙeïÞgïž‹¿-ä µ>oS›z°ìÿ‡Û�Þ%ßþñ¯¿ûï¯ûó?ÿýŸ¿ÿ 
ä@È€RÊ
<
¸€-¥@8€ˆÒ"'JÆhwn¥km¤Œ)’z%ÖõÕRÜ‘þ!l‰’“&i‡YÓƒYìhÀåHæÝLè`)¡¾¤IJ\&l'ÚdŠ†	‘‰u–h¬™Zƒúý®Ý)”Öhx
 ™ÀŽ
l�ôAMÝé¡&*
ePÁ¢"ê£**¤Nª¤êX”Ò_Æ–¡Ráþ¦_Qj¤á¼eª]É€–†j3rŽ©r‚§ÉõT˜rh¡æšš=f­6‘%ÙˆA¤«f�§Z‚!B¦À
HÀ”þ°2¨mý*”š´n'nJ@@+°>ëµZ+¶nk2–Zî¡2B)wf_¸j«¶>#Ôµ#)È€8À–f+N=柱ã;ÚÚ6ÙUº*·…œšæêH@¡¿ödâ¥ëFÝÔ‘‚‡MéI±–±"+Zú(ÂöÁLl¤ß"äÁ ÁÄÞ&tlØUü€@|A$ìÅjìɶ(²¬‡õA|AB—¾Ì^ì0èÅz
\ehìÄfßMõ�|ÁÔÁ,ƒ‚Êj(»
­ÌÞºji.]\‰Ü’îèk#^VæQ!ú	b¿ú+žlO|m©›Ášž®ŸÔYj|�'�.þ”ÆÁà€ô@”lZ¢
`@à€@â@¸
H1nê¦ÿ€
+d€_;
å¶M]r.©lÝñ
€Á¶ÅLz`î‘»ÀBî¸p«`
Büˆó4¢%4F\HÀÀ
‰‹Œ|øà¥`(�k)O
LP)È׈	FŒüÈcСƅ�˜H�øCß–�ÁHƒ™CPøÐÙlˆ
’‚æ2
ó8ÒA*¾0ñFã�Ëx,è‹L!…°rñ;Šº›H)K2Qh@ê<9(Bﺳˆ¼üàŒSÎ9A’‰&ÈÀ‰>:ùìÓO’È!q#]4©†:!¯ºŠ¡kH;Š¼LP¼¥J4”¢¬¼‹t©î2‚j!H
j(R‚<M•ª7>à

¡
)¨þÖuÎ ©[l–ßf-úo»y#WT*À°:­5â;îˆÂW¼~CÝXê¸õ}´ó¬Á!4$�@4±
a1:tÕΚ`2/â¼ÍGßr^Ç´j~Ô‹â-s#Ë­;”»ºÝtÜûïIrYñ˜Á/_Ú¢*N”¡ªŠ×:|«“HQMÉ>Ó(þ6éE�Yc³6?ý
U�iÔ¢’Â?Ae"nÒyŽ‘¼@	RÁG`ÊÞÒÄ�5+	 Á@çOs!”’r4dýluQKÔûg>qðÑ·f˜Ã9‘#"‘+‹©Êr�¸M¬}KáÞÑò®G}J_‰Š˜$B�Qe…gO<þÖ±¦ØºŒ%k»ˆül‡âÙ
Y
:VþØ„³�IÇi‘Ü–ª&¦PXM<ëø�û½å:)Óá½%¾›��…L�?%GŽ™j;Ê3SóšÇ·öYesyô`§�’:*^Í�‘bã츸¬fM…’Àò„S2ùÈ��ñTÎqžòÖ¦Q¥²E§Ì$µœ…Ìxú&ß')†
A~4ä1éTC›h‹ÈtfPö@¼‰Î�8ë¢ÄòF®ÐY²,TT¡ñó�ëîW™`úFi²E~2r—ÐH©¬D‘;ñÓU=ÏTDP¨‡W)Ó¯Ô…OñŒî1ú3a#—È1‚vï™
�“þ õäP‰¶r�ÂÝ
)…|s„z”¢Û"U–%3hJáY
Û¦Ï!ÔL-uåÞæ5À_Í�{БŽ¥œÞÔ›E´æ˜VzËbIˆ}ì$[ÖÂé'’ˆ�¿<j±Œ9Q©E™ñ!äT±* RñhߎõÑ1ù�k><ЯZšÎëŒÕmŒˆôŠ:?F¹p”`¨L—BìÝ�K×c”°Òȹea
oôœŽ¡Ò¤.LYå\ƒÚ›4¨íp+Ô{,õšUÍöD|yÊÉfAëD–ndŒ$¿¼H–Ô%4TÔ•SŒ;¢«já|«$ÙÔ«¾%¶sEàÔ–¨Œ¡Rn@×'þå(¦'*•žšS¡¢:¦\["¨¸‚ZQ馽eųžÛ±DTCÞ’Ô[7oVm&(0>`\cÑŽ_T™‘n[*ëÞ2ùN�QoEfìi;ý* ¤hÊ‹}Cš/3"9Ê-±åTƒ±¦•_F¶MýhYuÉ:a‰Œ“@sêR[´3ðž—ÄqYy¯Zâgn•(20²êCÛš4_TCëu-蔟”1PaàÏœ—ÆsΑl.|ð7µ»9íæR–¥›œÑ ;²ÓÁj!Ëía—È·ú™L·N'*æʧÆPÅeþGUgf‰ò#š$c�í¦_JŠxíÛðC払çp­¬J}«9ßþ¥Më
7Ÿ&ãGÓè^¸½ø;`$²0AìJr‘k”Z¹N²L§ÖõÕµY$ÔæÒ\4E‚1yÄj-DSlj at 2Žµ„NvŒ°ãòX3Vº£’¨Xò‚HEÀº¢ÏY¶jôœ[…3¦^]¤©ì˯EŸŒ?x	s}§¼T§¬<&7„ùs
¬¬¦jì*µªÑÛžÄek[è>æPØ\ÎKC÷¯¢ª£}ÿ‘øºø�°Ö6KµÔÉVì®Je¡6)I¼K.ksô¬¬…:âqÎÛ„µ³ót¹¹�b™vVR²Vi¼áÙd”Ä\fÝ-^Tï)å«.JT(ËqWšlÞ2¾›þh‘ÕMgÇ­%ÿ‚¨.0ªiÁ\j+áq
˜Ð-Ô
²%åg×�o?êtüÖÏ-œFìS»éÝs·\¢Ue&Ù
ÙêúþPÆÅUž�¨9tµ•–i5‡Ù�òºv¯®ÏÑt²K6RØü’È»¼®U~OÔbdM©XJÃÎÀsì âÙ(»úAv¤"F{x!úÙÏçp«èc‘$3"²®]’8í`òLxT	ÙôhÓŽg7w‹&f¡Ö¸º¬›I±fÓ¦ÿ¾‘Õ¶¯f]*)†¹ïEÎo‹ÈRWbŽ1ëƒZn?Ó9ÔïŽ~³U•˹o¾VW›oM_%£ËD�‘©ÈTTÓ¿Í9þWbź$3Ὼ#7I9±›Éåsu¥�>¥¥Š‡ððÌŒZ‹Ž²íg4̽F€öIT8Ìèö*·öE_
d#¢nìÂï˜:+¢:P†x¦XÈ‹,(sÔJ¹T×6èç´ãmzeSn-ž¦#ÂÊ­Ê,k\ˆùˆ´@¥Š|å"¬‹£Fi“Ä…©%Š�­øìƒrpN/ÀIdš*…&gûBPªÈ‹Ýp(Á‡m˜ ,ÿZG›6Êðþ)Š¸
AŒ×öŽlæ‰KÔÐÃÐÄ
—§µúz¦¨iv¯h¦I)Òð@Dåù%©�;øgŽÐJö6.ä¨ËÅ l`æ‰àÖ'_8Â¥êÄ`ü0þÑpöãÈ
�”<ˆS«xp̃$L×,JQŠ²&lyL	ävæ°ƒðJsŽ§;š­SLÏj«"Ff%äô;˜£†J?	È~Í?
ªi°°WLÝà#ͬÑqZ
oF&ÈÐZëÓäñx®›,%ºøO·mÊtnQðþŒÈuÀ+þ)käg
Ðþ®�ƒÐÉP¤OFrDª€NƒI'Ë ñ(—XÊK¾Ñó¶ñ™Vn"
‘Ž�’ÁÌå‰Y²ËùœEƒ:ÆæB	ÃHi â„ìÏøíºð븎íK._æŽ
%f°4'‰L…r*‰ª¨_&	õhèþ|Ð¥´�-ò{̮ݖ’fج¤r*©²*­ò*±2+µr+¹²+½ò+Á2,År,ɲ,©’žÒg"S--½e«ü�àr.õa.í’.ãò.í².óR/ýò/ÿR.íR0
³0
30ñò0ã’0
“1ýÒ1³/S2á2
Ó-©)›	3G´ÎÌ.?b(‡ÅHS4Ïì4õò3µJ´L³5Yó4?4M$H34U³5YÌ3as4=s6Q“qVS4á2$js4‡S7u³4U34q36Q36ys.Ÿ³9i“3)ô8Ñ:58y‚;W?¼Ó6¿ó5‘Ó$Â=Îó<µó¼¼¯-×sþ¢ÔS(€3>ó#=«³'è?í#?ß³p>Pôú½ø3@õ“¢Ô|¶Ð¼tªrsAÏc@T‡4Ü3B-ôB1ZÐŒ 4C=ôCA4(*2DI´DM?±q™œòDY´E]t$FôEetFIT3iôFqC±3Gy´Gß³=³ÓG…tH1ñ?ƒ”H‘4I[.AWTI�ôIÑmB+J©´JÓÍZ‡C­tK¹T³b´KÁ4L
©)»PLÍôLÍçKÑtMÙtfl´Má4N¿eGå´Ní”O€ôNõtOñÃHùôO
u=°±¼š4P
õPWBJ�QµQ7´C5R÷TM%µR
•L-þ5S•R5µSëôM=5Tí”NEµTÛ4OM5U×ÔOUµUÔIËÔUeµJuVm•JõVuÕI9uW}õF1õW…•G{uX�ÕDAõX••EIuY�5DQõY¥õCYuZ­ÕBaõZµ5Bku[½µ?sõ[ÅU;‹u\̓õ\Õu"Ëu]Ýí’õ]å•ûšu^íuISÔªõ^ùUŪµ_
Ö̲5`	¶Ìºµ`6¼Â5av³Úµa!vLóUA#¶bêa-6cË'^5¶cs¨^=6dÁ'ZE¶d¿ç_M6e	g`U¶eiæ`]6f¿eae¶f§cm6gï#]u¶gég}6hþKÙm3…öhïd‘vi‡vݾ�i¡ö<P6j©&X¶j±ö%`6k¹6%h¶kÁÖ$€6l±–gÉölëd-Çg_Ñ6k9¶mÉViá¶kIvnãVm=‹míj¯voÁvkýÖmóU÷oÕv�ô¶p…Öl·jǶqsöm!—iåvr�¶n-—rñ3—o•;—j
7tƒökIWh÷tM–qU·gS·uCVra·f+wv]sm—v7@s×fû¶wevt�WeMwx[öu�·aY7yMy™ae÷y=¶v¥7cq·z§ww{öw¹·c…÷{+¶xÅ×b�·|çuyÑþbÏw}Ý5zÝa©7~özéW~µ÷~Ç÷s)V6|ý·_É7€
¶}	x[Õ÷€ïÕ€ØZá·�ßu~!X]íw‚#8-X€ù·P3x^
¸ƒÍu€Aø\x„‡5�MX\K8…}õ�YX[%ø…§µ‚e†1¸†Cxƒc‡¿õƒyøYEø‡¥u……XUQ¸ˆ—•ˆ‘¸T]x‰‡5†�¸…óõi£øZ§¶Š•Õ{±øX}x‹u5ˆ½xW•8Œ%õˆÉØVÇøŒµ‰Õ¸U¡¸�M•†áØU¯xŽgU‹íXV»8�EŒù¸TÓø�õÔŒÙS¹�?ubyÀh™Ž—sÙˆ§xJ#þ¹S븒;�1YS÷x“×xpµÔ“Mõ�EÙL	¹”•”QLÙx•
õ�]yOå8–õ’iùRuø–3µ“uÙNý¸—õT•�ÙIOy˜åT˜�I[9™Û–™Mgù™áÔ–¥9N5¹šã”—±YLy›Ï™½Xy‡Ã9›™’ËÙ”™‘ÓÙœïä&x·�Ou’·Wž·”ší¹K¯9Ÿ»T›ù™˜ARÿùIÁy ktœ
zUϹžZ™×¹¡¿ù‘㢷4š)Iñù¢ÚZ•œ5Jýù£q´›EºGº¤´˜QGOz¥t™]zF�9¦]Ô¢iZ¦oø¦‰tŸušFþCº§K”¤�šYz¨‡T¥�ºD[:©—¦™Dgú©3Ô¦¥ªsºªe”§±:Dz«T¨½úB—:¬C©ÉÚAÇú¬¹Ï©Õš@£º­”žáš¨ï$oçYsù®•z-QŒ¡õz=Áú¯Éµ¨ûCͺ°13­[ͪê®ÁÖ!²%{²)»²-û²1;³5{³9»³=û³A;´E{´I»´Mû´Q;µU{µY»µ]ûµa;¶e;²×À!¸ ·u{·y»·}û·�;¸…{¸‰»¸�û¸‘;¹•{¹™»¹�û¹¡;º¥{º©»º­ûº±;»µ›¬�£×`a~a¼É»¼Íûþ¼Ñ;½Õ{½Ù»½Ýû½á;¾å{¾é»¾íû¾ñ;¿õ{¿ù»¿ýû¿
<À|À|(�xà�!y±SÚša
`à=U'øA,üÂ1<Ã5|Ã9¼Ã=üÃA<ÄE|ÄI¼ÄMüÄQ<ÅU|ÅY¼Å]üÅa<Æe|Æi¼ÆmœÆíá€
Ná@aÍÝüÍá<Îå|Îé¼ÎíüÎñ<Ïõ|Ïù¼ÏýüÏ
=Ð}Ð	½Ð
ýÐ=Ñ}ѽÑ�nþà�mx Ò-ýÒ1=Ó5}Ó9½Ó=ýÓA=ÔE}ÔI½ÔMýÔQ=ÕU}ÕY½Õ]ýÕa=Öe}Öi½ÖkýxÀ—Ü¡×gû×�=Ø…}؉½Ø�ýØ‘=Ù•}Ùa²×�Ö�=z}Ú©½Ú­ýÚ±=Ûµ}Û¹½Û½ýÛÁ=ÜÅ}ÜɽÜÍýÜÝ
"`ÝÙ½ÝÝ=°
Ýå½×oáÝí�Ý‘`Þõ}ßÉýîýÞ�€ß~à	ÞÜÓÁÚ¡>¤]Û�`<àáÞ¬Aß<Û¹€¼ŒaÛÁáxÀÚ)�Ðýâ>4žÚ

~åY^Û=`
Ä»b~æAæk®þPÀn¡å©ýÀæ…žæm~âÍ	NaßCþÚÓAŒAå»�D^ÜÁ
ü!¬x€Áì[èýA
D?ög
 ñ5?û	^÷%|
~züÝAþü§}
PÀôÁô	áØÜŒ��
¦@üÇᦀÄß’~
nàÖþxkfÈs7º#Æ_0
tG¨ãBȹðh+öí-ý0g¶+`Jç·)y°°²¤pwòŒ‘é
”
k@
¾ !3¤#Q:ð€(Ót„‘ñæ
@hhŒ>·x8!öÈc
'ñŒ˜!k€CHô„…d4S.pŠ‚0fÈÅ-§ À
&ê
'àŒèN:ñ(ôìH1ð‹;gN„€â%áÙú‘¾™F˜“<ê

*f¤þSÊ£\ ¼KæÒG™xpÁšÍ€'œ¤´þÕK=éè`WPX`b(…©I=ÛÙÏŠ6´¤U)hM;ZÔ–ö£�™OŸ 71÷5,Añ¸Gü¶ Ö½…c4"8b�Eª-cÏŒ
0ƒ¼à;xÁö@,e\HS¼Ð
wqT3fð”…\k%wbù–th;ƒ„lû0
KälÔ0º¸ðáÔÌ€/y§;~¡Uw˜Î–iKk:"¶ŽAfþI2"Lj€idLŸk4¢L1Žý‰Ñ{šdi¿j“<šŽS7ìFû‰Ó¤Xâ!kÐ
ZØ8“�
B¸PBkM·ÒµG®›ëÀ®ý,û5œ2ÛëS…‡íÉåu;dˆôçÁ‘eOÈØ#÷:þ‘Ñ
üâȬÚgT»�Àp’kág´N`TÃ…2OS¾?P¨Ý;¨I,u+ßkÏÞQHŸŒ±À œRn<à5ö2à€5"6õ±†7)3ì”�•‚lÏËÛë¾öþ»Ï=ïïûàK÷ÃcÅLiPìÍ.	Çöña¡ìt"Hð@‰4ÕÞ„th"
à
’Â÷÷E°<ðâ‡S
u?W……Σ ì5+3€&àÐÞ�qa
R`È'SÀÔh�ÒQà0JÂà‚§°ÀA	Oˆ
·Ð~D;ã
@ócU±mLÖð„”°§p
·@	
_èA­ó„þä‚
”€r^ˆ2œ°Mä„þRIbÄ	”€

‰cщžá‰£(Š¥Š§È�˜3ö`L
˸'”1Žeh
iåjûòëp†|(v˜1o¸Œ~Äy”�edX†M&‰å(&XÊ
¹X�ÖH‹`—XwDéð…Ö�‡gh1ßH…òðþ„[ñjŸŠ©¨‘É‘Ÿè‘¤ˆŠ	’‰‘ö7×I
â>”1µ•3¢‘câçŒúcD.¶ ³—0²�F”1<™b´(ñÀT6Ù“X( 'YOÓ'=µ³G( €2:3_î¤ œU447À¡½4½t{Ç•�–2–e	Xc‰–f¹Kiy–»D?TÙ6qñ�@—ui—tI	òö“8%“
[ª¥_š¥´@YJ¦ej¦þgŠ¦d*¦cº¦aʦnš¦fÚ¦d


	 ¿°^Ê¥·@!q
¦YÊ
ª�*­Øê¬Ó:© ZªÖzªàÓ0à 5O‚&a¢®ëÊ®íê®ïÚ®¯ïš®a"óŠ¯ù
¯a ®õº®÷ª¯
+°a’®SP°ì
°hb°O°
‹®{þ°«°
[¯;±k±Û¯[±ôJ°ë®ü&"ë®þ
¯&Û®
³9°3«¯Sp
;´{±˱ k´+±«´±KµPû±ë°ëµëj
bàuk<àaëÿ0¶þÀe{¶g+¶k˶më¶k{¶ûð¶sk¶t›¶t¶r‹·e+¶d¶~[¶€;·‚+¶zë†ë¶jû¶€«¸„ë·„Ë·ƒ‹·�˶”»¶–Û·m«¶i»¹û·ÿ
ŒÁ,º|+Â0<¾èë7
L¼/<Âü»¼H¼¿‘kÀžK¾FÜ·¸WlÅýËÁJ<ÂþŒÀ_|ÄEÜÃlÅeÃkܾ<¼ÁbÅýÛÂ=|ÆlÂJ¬Çr¾8|Á¼¾|ÂUÜÅ\¼Å;\Ȉ|È„¼ÈZœÅO¬Â‹Èd{½Áô"7 tìÂ�œÆ›ÜÇNÄp|¿q콟‡<Mü¾[»“Ènœ¿DìÉBŒ¿³LÅ¥ʱ\À­ËÉrÂv\Ä	ìÁ~¬É
œÂ»\ÇiüË,ÜÆO,ÉI<Æ«ÅBÌÇõ+Ë×ÂØ\ËÚlÊ®\¾2ܵ_˽:ìÊ¢ŒÇžÌ̼Ìì›Ê üǃ|ËÞÈ«¼ÀæÍÐüÉô¬ÏF\Ëè¼ÎÃüÇŠœÌë,ÍËlÐ>LÎüþÌ
�ÐC|ÏmÏýÆ
<ÏMÉØ[®Û+»ÏÐm¼Ÿ°º�p
öb
PyÒé 
÷þ°àÀ×Pص
º×
×à½ÐcË ‚Pº½ðË
d«ë®ýû*�¿kêýCA‰`:J7@Ùó÷OÌ‚î
*P�¤”ëóÈ8×»Úµ®t] _ñº×¼úU¯}%#$Þ@
ìÓ¥$,`KØ´^m‹†À�\�Î6V³Ýì`9ûYφV°£eã
@
,"8�@
Œ UÆ‚–´‘µzÀ�¸€w�%íceXà¦Õàì�	
ìZÓú×Ò†ö´ç,l.Pƒ#ìb“~çÐV2í•71ZîY’ûÜëž(ºÝ�Ñ¡±¶
­·FõÐá¥{ïa¦:ñ��Æãù‹W~ó‹¿ü·qå8ÀÂà‚<üx�†°B÷­€Îyö�
T°XIÑï£!ƒt5†©8í[âãÿÂâ�\”.süX0òßè4ž"?,¤>ø+ ?¢šµ3ú,¿yz£8§<à¿TC+@µ
¬-,è¾<ð¿ù#B,,RP-¦7+ª
L»)lÁf² úz+¦<ð‚|çó?4d¾ç;C5LCâ“ÂÄ¡/N³²û2%3Û§>W"#„Ò¯>D)\:)]D?Ä?$D@ÄC¤¨ë¢ˆ*P
@*RHºåéÖr
#�

P¿< 	p
P€ã2Ä€ƒÌ ùË
è
»*DE4D­ÌJ®ÄJ¯Ä«Ñ 6±Í£¯„R¯Þ
p[³ˆ²„�³²èk£·,J8šËY\#»ŒK3ÊË©a„"…éK.* 
2„°E4xG4RGhPʼnLÂt
Æù
¨J� 
Æ¡‚	Í/À€¸¬Õ£‚˜.]2„eÃþ>ÌEì[¦0

�
(
J€&È
¨aÞ.øÄÓô^õPÃ˸Z

H
×
Ú©5ÞGÞ�20
-Ìh΃ýÄ�®¥¼!ƒ„á•
r;Þ¦AÆ?0kœz�Z
š-‚.ì͠Э±XæØÝ<;I&5RBîãXÆå^®åŠºe^nj_æó*½Ó¶ó2gF½·´Z:&i«WfË7L£¤C+Z.¶åù;„ëA+kµFëTàźß<@Åñ£‚•0QÛ*Þ‘®À‚7{fâä�AÝÇþ­5á¡ITnTÕ[„z,Ö˜ÕR
_£	Gï
Ÿð5Š³*í
ÆmçešAØXK0®À
=í�ødþgO˜æ66ÔWE¨l~ÆnMî&|ÇÓ¡¡1Ð)V¿8å"îOg«­ÿD'p”�

ø§i>LÞç¿´«žnäx¢€
Ø.R²mMj‰[ŒvØ5ξdÃ
\å�…MÀÜÏYå 8À€
o
ˆƒKAmtÝ÷<[–ãµ<~€Æo¨úJ4Ô€µ€0´ÈH*� ¥8P€ƒ‘E–¨4d)�	
H/
DçÂF
„p]^–BÅ

SØõ¤©c4ÅÄÔMÐÐUj©þ¸Æ.g­
ú˜«¬³Òº?¶Ð´¨TLåÄ—®Šò˜§�ò*쯌=åÉA¾&;ÓDF˜€&‹dR�?¤`ZX@Ø¢	¦¹€þ…”x±Th$€ëE”&G_äpZXÄô˜N^
¡)÷ðÙ-ÑD§L£!¸À²'q<­¤¾8¤@ŽõÀ�×hH,lB‚Fš!€7Æ– !ƒlú’çÉ];XHoü ÅTŒ‰!=7ˆ·=§é‚~[µS±Ì,åRÕ;Õ²š•p¢1E…ÓP×a\è‘]U«ê^‘þeVb„Ã[«Ó^»íwaQ†é§;k¼¤Óî7ß¹~D±Éè‰2eˆh Á6çÎÓø|uQ½Q½%2�¸šN†C/çN¹éø¼h¼qL™(ZøÑK=wq 1óSØ!¥<F†Ð�á܆¼áyÑ›Ûøâ ®™
¦mЃ^~X´@bŒçƒß_Š2¿ÏÌí'7á_øò
¤èJ—;Àp(5,ÊÜørRîpS81e(õÓ“Wp*¨$ 		È«V”¥+^+¿—KÍ
(•Ä$è@bº^uN’¢J-gY”D�2”úS¦2F˧à2aÙÌ%-C©€)Ót¢:¤	IÎDÂd‘¦Öç’WHÆ+2§CJ¥t‚•<Ϊu¬ŠÝìðéÏre�8ÑK&¢2“¾
æJI:LÅò1GA^îxÒʃ<´/2Ý&bž9Ë–r
`Ì\¥5«i¼R*EQ½L$ç¼¹"ELµJ¨…PO(Ô¬Uc3.©PQëP6§—Bbä�
gýXÆ*¶&Œ�l¦”’Ñt÷�E£1/OGñ%uƒ•‹>_—Ùí7À·»KOƒ+ªƒIWS>^UlÖt~ª®‹Ì_£ÊhÚ�´¨qidP.û¢ÕR‚dfOyç”·Þõ›’ÍYó¢Åû}ê­J}¦Pýˆ”‚jP¶ÉÕiB7EÝP�ž°M©³˜ËQ´êÇY<mT�5È †}…dåèúËÇìl¾I5LV—JÛD”‡Q^—‘ö=ʽ&dJƒMøàF=3sœÃ_•)*azÎ5Ä;Õ«€ÅÒ×}ڱςž•@UTÓGe¹¬4$N“À‚23xHé	+)—)þÉ-÷¡T	hœçÁ£ È-NToƒÅQ•šsu¾”9'\©öÇ�šÛ¢²[ÉN1#™È¬¬3ºÜγ½S
	ŽEªE¥
’{ú}+ýmUÀóïÿ€âNb¬’C|�¬Œþ˜Hà
OÈ€àODA×®ÁDˆ‹	 Á\­ÈuÞ° 
æ웚’uP›íÙÿÕEªøUZš!2â]\—P‘‚n˜ÀãÄAd
¬läÿí)
…	8@‘(“
À‰@„ ÄÙb‹þéÜAžTy^
:†[¾Ç›PÀo2[~a„>€{Pb	"°ÙK|M
`fÖoÎ×Ôáßÿí?•¦iâÎAõI|@0ÒØd€|„Àè¡qxA#ýÙâ@È
$²}LEU¥àKžÒoÚp
Çe«�¬Fjþ�DG¼�	IèPјé²XAô@ F�^‡�€B‰÷Hð$~\'—„Ì‘¸	}ÜèP‰•!¤@tPAØÉ�L�s�
E˜�\
ä@œ�ÄÉ þA@riXèu
‰
†€˜€I,Å6• ‰Ï8@ŠôŽþÇ(@ü£A�s4GlÌ�@ú�®òÜìc`�	Ë
œ‚£–KR�lìr¸À
è4‡H€ü
ÀÝMA¤@éÉ€Œ¤±
ð&aow~{ASó¸ÙBÏ�…£¸�
@Œ�@
4
¨ ¬øã�,-ÙôâÂA�
!Dó¡`Ù§y¾à Cž˜2
„ÀÒGíL„eaʤÈõ¢ÌŠÎþuöüthÑ£I—½NÌ-
Éát4–°�!Ü!pàÐÞ•;€UUÎÄÈÕ¨*jÃÀà%£2Êh‰.
žzÀ…72ªì)÷ Â’

 A¥§*tàK‘
€ƒÐ H@Þˆ
¡
A­ÿš‰"ì2òMÆ7Ôú
ðÒ’7>p`
¡Ô£‚ÏŒŒÈªÍDqÁ”Ë@­³þdÄŽ§O]`®>ÂÉ.-Éë>Rø’±F+ó0‚z ñ)*>HÀ
4ƒ|ó°
î2$a
ãpÒ¼­úxªù,ÆÊ ‰1!‡+ìX S)P	’Ó9èAÉß>È»Å%°bE„h=h‘ºÄÏbC\`¨§“¬ôÉÐCÆ’Lºz�Ò3¡(#ÎÆÝ>4ÔTÓÖ5o¹Ÿ|òuÛѦ¾â�^G�ðfWæ02¤•ã@áÞ3î§d�	
tȤ�Líl=æJRJLP
‡ÛQ’l˜%HôÁ	ø
„à
Pž_fR
à°¹‰ïKS(÷�wY"P2Á*¢(	Ôhyyç" 9ÀÛ%
üÀU|T“„&³ÚÛUv,B,gÂ&Ê]
BRð
)–0B ;ˆ†6*2
?è‰Â9
Ä
E"��{°´† /IopR
À
u$ø�uŸ’¢
ÇÂŒð(Cð	
‹þÃ¥�¬Ì¤XÁTXUˆŠ²A
ˆöÂœ?`ë¸à	R bV÷vLT-ÀhÔ‡nd>eùŠ��Ù	O
.ØŽ~$@�d`Pó2°‡Õx?I�é•p¨A�[-¼z€(Àsf"<EÊaúP”Cõ@ ×Â^_v{
L 
¬[Â¥‘.°ÂxRà·º5ÐÉ$pAóâ²+µ
s�<À+™\€¢“¤Û7õÂÐ1pv[•x
;IIbðˆò ˜,?0ã:0DŽP~éFäCÈZ¦ÿfëèÅ:
Æ#R`ü
pÀVÅ
2bO2çSB@ëÞàW@
â€ÏMð+0Á
ðþz ½ˆ*ÝzMOf]’)ùf£ÖžÉ5¦ékQ\tCd(%(€vx*ò }	*¼ÆV$‚ù.¦�Jè@xÂÇ<sšÑCò –0G}¬Àòf&øD®ò ~cæ-z¢'ºÑUþ(–Ò¤'|Œ]ÊÂGb—€±Ô„h"d…Æ„±w�ãQˆÖ¢­ƒ¨‚*V„­Q-†'€QKšèLœ"ÊBˆ"ž%ÃV’íBc‚�s²7~qÃ0G-©¼*2M&Rõ¯þKm‰ò1Y)ož±ÔÑ?Òñ©ÑCЮÔJ-RàÄÙgV¦ÂÊK�ÃGàQK¸ñåàmQ	)QÅC|,=Æ"ãPYÉ!ê*z¢kÐŽ%}ɘÞC‰PåƒzË´ÇK#¸"
nC=a=“ÅóƒNfBç+·¬„&lI�e÷\²}ÐÎ*¼dþÅ­ÖÑk.*A‡N
ëà€ö2á�j
þu¹õr§K«Õø¼[—¯p¹Â;eeQ×xðmQ·YSQeˆq`û2TÙQ3.#qn¶hµ÷SOVÝ*cG]VG©v_
3
kq.XÈ_ó¬tVî¾dµw'æ—2Ô�wCUF¡6A\M2—i<#Õlç²J]6N÷(eà³÷òf"²W?ÖaݵJ+ikõP½E�u˜ú]ÑÄ_ÏömM¤0�¥wŸ"l0 âGyw¾Ä“·>Xye¥–°6[µ”K­wzÏ'ù2S.C
oÕ%×¥;÷c÷uj‡£nÇ5JY‰{EÕRþÓ)�s_óŠ%sŠÉ÷>TÏ„•Oõ·%þ84ã÷‘Pñ/]22óton�œóL_ÓP¿uRKnpÁøˆ«T†©¸]ÛãP�izj	YÃt’Ù5 ŸÅDkÐU³ñ8‘øMPeϦÖhj4íx2��'©Ë2Tä{UÆ>ç±Bùæ0B‚ß–Š#TzÙ“zyàZ�˜ÏçG÷ÒdM•{Á˜•ë×R±8xkõ@$¸p÷„YMpP³·]{�‡o×=ˆvOÖþ¢Gr¸Sw�ðv<Ñy݃\ùóA	‡O%Ùc�¢‡Ï6L%s"�öæü8_[VÝÈùàÖ( ½ÓRyDVYé‚ù„œŸë›){‡¸w
‹±kò 
—a—®&Í43u\ÝØHƒ3Jþdj{¢

ü ©M?zâE2!C&|a ?Èà„ð…ŠäaÚƒ¸@á(”GF˜@Aß�òäITô`„Ô2 ‘UF=¤ÐƒÔ!„j	=„€
	Qa„
kRžCxQz|0ÒXoqô…z½EÅT`>îDTd`y
pÇ‘FI��G˜05TJ—nB†`�	`±|ÓïZ±tóFÒ–
þêÁÒ0Ð<,ŒÊ ¤3‚Bà”AYâ#1±o”öƒÆ™@mG›[zຉ',£€”cÜ)V`Öq0c„ã9­¤
Û`¡(
À�Øâ‚´ë6£s
ë2`„¼}@
øÁ@ �…R

T0AL(žÅá&°BŒð

Œˆy
aX†0ÖøšÄ�i.ÀB€CÜ4’)À›
�ƒ`zÁ€	*W¢ˆò!4j‘²

 çÓñ‚K"�ØÍ.(
à‚~@²Ìâ/V¨þr`wÄBü$`ªg"Ïo°~YœH\ï
c³�@VäIèƒ*
á®#ªÕ1JLaã¤/›Š’¡Œmˆã1Ž¥$nÉD‹`
xtTH1L_’4—#ªö�þ"•Þ$r
“�¬1ëgY[¸`ƒA&
å�äÁ
r)Áû(~:߀ض
žì
ŸeQ4qå€DñƒX\À^À¼`·`‡šçÀq$ôä!&høBQ>
`H8ñþ©õX
@1Be#æ!á
�KoA

ð>Ã5~þ¼\¶Axx)jl×=�
ã$0˜—K<¤kàA
øÆ\Ó}Ps~ò@.à
[	
4•YVd:²`:m¶W6­3ÖW2a1äá¡,$¯©g—…$u
€¢
CîõuÙ? 
õ‡¥gi-&¬%X�ˆ
%F¡ýƒ–•?”‰þJoÀ^>¥�ˆõ
÷
q¤$6I´‡v“ì	Yj”e[¢a1uÚe*!¤(z5tsÎÅb¢Ò°‡üá	)�€k
3i
„r)uºqWñ¥`š�czV(›²”ñHs4Ïè….Í5^ÑsåáJ=ø
�bq@•ù
	^�cqÐ5&ä½bwôKã!cz72M�i+ñ`	•´!’
'++^€€F08=À�Õ–GñdO£iXBI¦Ter90Í‘bK‰sš²&L7¬@F0þ´ƒ8 at Uj2ÐTà�ƒ?ƒTF‰�ø@Ët:Os‡ZÓ4.p7:zÔ7^ÐŒèeÎV:…C�…Êh��
ꜗ+EÍÕL„ñC–38gè1jw^£@9`8þó!�
N“&|31>E:zdG�tÙ¿=P&yðꃂZó>r¨ë¨@±“—Ñœ89ÀARK¥Ô܉\)@–ƒ§ÉVÔ%\Œ=–�–2€(دá\°GYc8‘J0hPZóV¿8O×W)Ò2.3(‹½à€�´Ì½ÎèÑk}‚±‡y›?àXá»s–ð�/qÅiq�ý)àþT1àLhò)ö6g�òX-ÒËðò)PÙ¡­›¨]qüQaiÂ,A¤�òÖÔê•}ž�Úžý@�ýÖÒºâSœ7ÙhPƒa-î/‘	�íÙ8§Ú‘ÍÃ¥+´=\ÖÙ-¬˜Q1,¹Ú[¢Ûh
âé
Œ-—þ¢z/£Ä’Ë ŽÂÛЭ°”jÏ“LV{p(ó0Z¨!MÄè!ëœÑ‘ÆK2BíJšh5
Ì;š¨´å¾üÒwÂØ¥·5Àá�0×d³M7—cŽ£ÃªB辌¶KlF«‚(*“®l*Iœ$²Š.�µ‘@…›qQ´2¢/C*õÄ/!™DŒñ¨¬\¯£ÀDQ¼ÀtªŸf¯»ôL«2O�üJô.½Ê>�x
4'ù¤Q&¤èËÒGÛӈʣ®ên/\y¤sѶãŒ!½ŠT½dsuqBO³RÒº"wœ/†ˆjtCRµ›µ¢b“Ö¼ÖÞ„—6Ýx‹@Œt‚‹7_þ}÷õ'NŸ4ì¥<	%5-Št×à);DPÃ�<k(õÖz�T,ß
wªQ,Mb£„ª3,ïZ*ŒØ &òìGu-‚�:ĈœÊÄ«4ŠðÄ–\Üñ;�ås¥ÎLrùEoŒ±)¼Æ+ÏZ†ŽìŒ<’ÕUÒ±ì,×¾Ò°²Q¤ÏÄ;Œ<éŒÝDo6/Ð
å›)&

«ÔìîdÄÒÛHÕrð¥»Ü7^1É43œ„Ë;pÁ•cŽP®ý‹[†nÒÐ.ÒîTŠ©¼RŒIĈGBTZ´Lv�¯ÎÖ]+Ю¿N/F§…"ˆÔˆ2±&»s’º¼_YS¨ºÞ:	’e'gj?µ£eyÈJ7%)þAšù”ë&Â^üù©ú;Ï&±lW²rre"ªÎ̪†ÔÒýP:›šò.¯ñæRÁÉÃÊÖ©Ä­¨äbC†Z,©´v™4�\¼ÍyÍDàú7@ʦ_¶˜Ý649¹xF*>‚ˆžÂ+(‘%G6Ú‹ú²v;dÙíq¦‘]XÆ’4ñ(¤?R	Õ(Æv-j~ªÖǾ¾„ÉçfŽ)~è³ÁšÀG at M£Žä|t�«ÌiÒYÚ]Ä(Ô™­BóÊH£ðÔÈ'_£èÞÃuo�)²¡$BžS!%W"4�aî†PÕíA�	Ï·>÷½ÖèS\òR
	7¦2ù8jÒc þ'Ù-í`ÂRDÃÄ„|*.÷q‹^hr–˜ñ…4±E•´EŠ“qA	]j¢ÃºÌ„rô’O¨ä:ENÅ4g|W”B ¹Ve‘¡öš¥5N–GJrJ
W3GM¡§3;*�¢ú¢«ºY¤YEK’zþ‚Ø­Êb‡4Ý¢R§8B¤H¨c·D')¢$M&€‘fÚ8äÚýE/០�ó¿œ	_òÄ'¿ø!‘�-ÞÃZ…æC7°«`©ÙI¬—(þsHÈt[‘^¶Ná(;ª!RiP·LB©E?Ûˆó>Jƺ¨Å�Ô!ÑF¹"‡$…k…A™‡³šAŠ5q&ùteŸþ'
Š "bÖsÜe’9‘ç>›ÉU„ž$Ë¢I´A&{†¸ã´ÒÊAi,쨭¸„‡>
rÔS™Š–�h‹ETÊc>‡³·>þæoj…«›—gº.U¬ËÌ_JÅT�‹�¡áÓGÌ!]¥h U\PãÔƒÆ(nÇH$=Ö:é²Yêl�£v©DÁŽ¥Ž [Zñ¬ç,š)/&s4â¹|v¨Y®®kº3dªàCKY–NËfæh‡&*Ož[‘j»X»ÆTmæZ³R—0ßN/U?û:ãnÌI0ÐԪǚxÆÕ6ÿóã=½;^äÌ5G"¼QÍxÔ§ªæPŒ:ÍR‡ˆ.�þ©�¬ç팖ˆª.(Aj…ÿòÚÂJʇÖO,ä[^þúûCIUŽ¡.�ô#.EIJâ˜ÀyÚúhæ¸RK«È_‹	LN{õÈ£ÎeTenÔYIKÈ¢ÊPPQ|�BmÄïühÇì“Ø1IêÙNR�‰
Ó„v–un i%¯
ù@è#ÊW.s´èœ�U·„5ú\ ×Ê]I
È`±ÁngEUù%dÔ=­Óîr³߶›ËK|ó„;E.>4“]WdÉ.’Ôuº$˪Êb˜îå•œ-~I�ð\\qPyÝÊl‰õSªÑ"àÂŒjÝ<2Žs‡ºZÛc––æþ×$¸*4cJ(/*-Îë�íP$Kd…†)ï|–s³
>áþŽlqèÄ
­Á½L·Ú˜G¼ža®D	æÓC¨Ðí	h®3³ÂìÖ<ê=èBâ4ˆì<ÓólUj^“�ÛýÀÑ0„ãc[Í?uE…Ü™…F]w£ä"�*âI
îŒWm¨U®@YØl¥2²•½s-«×êBϪ	Û§ãÒº¦8ÍÐÍ~kS�«b=l4?f4:eÕD
IÒimÓ¼ã]<±ÃÇÕHÎ)hþ⦪÷]�7›Ž¨k
ñ£<£9°Ð¢˜‹šÖ†s£¢ñ^M¤RÖ)(1B×
©ªÓ8šPaßÖø´pœŽå@ÞqUà‹Ú_ñˆúY;¹»ó×€÷7â%}²ç
Ó•c¨B&TÕQyõʯ»«ªAáSÑ»c‰�¹¡ë6©	§¶ðbùÉ|EðªSÇF§º"å¢Ì
T¶8ÉлÌy1¤+¥Žs6ÞGy%N9¸Ï�?Ur/Ì#™u
@˜é¨i›%œÒù0– ,	qž´4`‚¤Ú)˜‚(®Ñµ˜i‘�²Dá%±Q®={ÄYÁq3$õà8Çš�Ôþ‰£×qÃépº:1j£˜¨�;�j6”ÈCÂó¡<
•™0íŠ3÷5A+œ²ðò@Äæ #’�¡ü ¸Lc-*é&ŸŠž`)‹r:•ƒ1Š°±<¬Ñ	Ïò¬!Ù4ÁpŸEä¸:
T;ºçP*Yl¬§‹±Å
Œ_aDÈI±‰À˜’“þS¤Îº0‹)ŒïHðX7¢ ‹ÕÙ2ä9¥åBKñŽž(¥©°Ò®¾ûÄ‚ÉZ)?åÃD][<YŒ¯5„�?që«ýI=Óó�CGòŠ“2!«#¨±Îr¨ã¼!Hñ Eª" 3±¨"ú�ùªLK
Áº¤µ<£“TT�•�‘)9ÀRoû¾#Z³

c=Ü�¾ÄŠŽ”[jäE4ò"¾j´�ŠË¾Ø&gq»	¸Ýz3@³¾®`Ÿ'#G¾‘À*‹Ê›C â0û!´q
¸XÇ}döH:ÓÒ+²4²[—Gê(è(ŸlÕ´¡8BŨË!¬@˜#ÂÌ��3w1<x”´¬ð4ÌYaI–™<ø¡•ç Ÿ‹+–
-V
�’TJÌ“£Ùº
íÚ ’Ù¦=á�ê'Í‘-ìÁÈé&ˆ³ˆ¥ôü,)˜¡z+5Þô	þ&t¸ÜCa£'18¶ÛIJ8� )®ãÉJ£À‘­"9ד0E5#ÅØü‰Â8&ðEåjN
¢ƒ“ŽøJšÔNbÀÂË»«=¼JŒã/Hò‚똟º¼D
	�§kMJ̻뙖�»¢‰³kÄiSË}›¢ˆØ90ö�ª›¦²Ì›	<Ò,–"½)¢�Bf´¹-Ç5H‡?Q©´…Ó‘5;%ÈÉ‘±°-\¨Áœ¹ô-Mr2c©‰®3#”šK¶3´É3õ1.¾êa‹JÃ$Õ¢ÆÞ!<IÍ	Ø	Ï-9,˜|3Ö¼Nôžfl6Sþc!í`Š@±Ñ«Ò1è ;Á»ÐÊiȟɨŸ1- ¸·*¡´)Ÿlê¸ÜÁ½Æqe¥ºÌ¤/Cr°­ÏëP,sJÔ;T¸š«Hº¤L­‰Ž*‘é8R Îñ΃ÈXCÁEA0^yÆüÒ
1|›�€¡
k›$Á0­%2£Ê£iš`‰Ð 
\Æ›�‹`
û„¯=ù¸XAɹÈZÊSvijDZR`Õþ2’W‹TÆý&Ì­ÉúÈÐó-l©›ÓXL©H×+ûÐ{�Ê©•'ó
Ÿ‡=
WÙƒÄýkv”?²ª,ü¨~Šï„›ð1ÀКSÊ©;$
"çÝ�š’Ÿ0ª|¥AÃ)%µ¤Òx¤ðE9±PXȲ¯Ë4˜$ܽ3"±:äpc#—,•	²�¡^ç‘ýP(£!Ù½È$¥8D}CÍèp¨Êå¡hK£±{>à)¾ŒÄKû
Ýþ3Ùä¹A}JÛõ.-²(2_ÕñŠ}s#ŒÔ&åiÇ�7TáÚÔ€Š#ùW­<Æ]±—#’¢­/)±›ÜÁ¼»à¥ä=Ù=û´ô	á’j7Ðb¡ÇèNÛ‘ÓÒ}¦è^~Ú�
œšÔ
˜«Š•P£‰J꼦;–üèW˜a˜•@?‘�"Œr™¼>™	Û)”Ù&q2¥9MHj)ÙÜRN°Aצ$¶Ú¬]
$æؽã™, at 1fv̪†,$–(â¢Q%«
Öãâ‰äIcÑB¹'4ã[ÍNÑ,I¢òDŽáò �´QidÂðd¡]¾Ä=ŽÀÇ�I�ø(žUÀýr/vþ439¬ËdEF_^GÌíå�‘åVæ]]†;2Zå¡RÌETëï8䲑EÒd-
ÌdoYšò
Fv3æC'ŽidépÚ(ƒÚ?òcªí‡~Øz¦ç}Àg{ÆçzÎçyæç|þg€þg}®ç{h�6h�Þç…&è}ög‡fè….hˆNhˆè†&hƒ¾ç�Nè‡ÎhŠæçŠ.hŽžè�îèˆ~h‰öç�–h…¦h}Öèˆé–h‘ÖhŒh„îg™®h–é‹Vi—f膦é˜Vè›6i¡žç•.Ᶎ閆i–¶è‘î=¦{êãx. ~ù‡~áê®>Çs|
®öj°ëþ®†“±k²þjØ ¯k´në°>ë¸Vëe빆뺎k²Vk¿þëº6뼶k¶l¹öë¶ìÁ¦ë¼kÃæëe{lĦ�¾nìƦlº–k¼Fë³Þl¸ì½îìÐÖlÀ^ŽÅ>íÍmÏž
Ó^l˾ëΞlÇvl¾&í¿†mÌ6 Ç®mÖî~°kÕÃ`CÕjAêmÏÖí¾ÞmäNmÙmÍìæŽíè–íÔîå.mÖ>íëÖnÉ^íê†ní¾îã^ëêNkóömðÞîÕ¦mëFoÕNnÕ–ìñFïãvnÈ^ïÐflø®oõnmškï.oõVìåÞíÜβÛ\׬.îÁ±oþo7Ž¿�ÂÞîïòúoænmÂæðìÆn	Ç�ðqîþo/oïî_qú¶ðÊŽðéOpåæî—o
ÏpĦpéQ¨�À7îývîÉ.r/ëÌp¶íçqÂÆpÝælïFð¯öðÇðùÎqÊl—q½^ïÙNë$ïò*‡ñ»^ë+Gòn(·ï&_óÚžsÆNòöfs
wmçíÄ.íÂÆòÊ®s8)p@§qu%6ccW!ï,oÚÆo³ŽíövoöÞò4ïðæ~ôÏrß6íCÿó)mßsÃFñK—r·ì²¶ñgqI'ôU×qÞžò27ïÄVóWþÏpP·
3ÿî2�òK?ó>ñCÚA
 Fßê÷ï[OŽÿuÂÙqi¯
:§öBók§qc×vL_ñ
÷qwnïõ0!ñŸvjWöXðvoôqϧtgw=2wxÇwâ¸w6Ù÷ZŸð|çd·M€'ø‚7øƒGø„“>$n…wø‡‡øˆ—øÛ|gè÷‰ÇøŒ×ø�çxäpʆïø�ù‘'y�ò�/ù”Wù•gyeÿÐmù˜—ù™§yA¥MBùš×ù�çùžw“w÷ù ú¡'úex©-ú¤Wú¥WùÙ]t¦‡ú¨—ú„真ú«Çú¬×ê>|z­÷ú¯û@Äàþ4	û²7û³÷.zÂj´gû¶wû¼©zû¹§ûº——=>=¹·û½ç{´?y
ìûÀ|¶W{˜üÃGü¬?y½OüÆw|žúÇ—üÉçù¿§üËÇ|™gxÆÏüÎ÷|‡¯ø‹ÿüÑ'}—Çû.ýÔWý‚·üÕwý×gô—ïzاýÚ¯@¨-TηýÝç}¸ŠüÞþà§Ú£þâ7~yrzÝ?þågþgnåoþè—þïÂûdŸþëÇþ,{¤Ïþî÷~ØP{ëÿþñÏþ¸'ÿóÇþßGÿõ7þÖgÿ÷/þŸ}ø§×_üúÇÿÝWÿüçÿÒwÿþˆ,hð „
2lèð!þĈ'R¬hñ"ÆŒ7j\'æ
 ‚˜Ÿ&ÙÒ­k÷.Þ¼zÿ}å)2ÝÔ½‚.lø0G·QyÌEìø1äÈ’Õö
˃ßäÌš7sî,Ó-ÜtŒ=“.mú4ê�•£Níú5ìØw�-û6îܺ•®öyy7ðà‡§]»1ñäÊ—3Ø[*òæÒ§SwM[nõìÚ·Oî-–,÷ðâÇã5Ž�<úôê³z·½þ=üøTC¯»—oÿ>þ“íÁçïïÿÿC´‘€èßs@¸ ƒø]×ZƒJ(Þ~Zxav ÅU†z\o€ø!‰%Z÷QO癸"‹¤µ‡Y‹1Ê8ÙS


--- NEW FILE ---
GIF87a€çÿ


]ö^UCb]YWZ~Vd]*Wd+Š][^5uEã
usw
	Î,¦ë8ëazL91"(AxñàQ
aðB±Ñ(:dí ¶^
E@ãÔ†/\WŽspÅÑàƒ"„`¼WÌc„`ÉÊ’¸s‚0 Ò£€
ZˆT
€ÀFäé5ðÕ ›@¡&c¤/þÐÇ9z1…:
 Õ%=б§`˜µÁðˆÍ<É!t0Q©h:²i�ñwG Tö*5Át`ãé¸`#qˆD˜ê¢»²k;†aB�¸´²ðGBÀ‘
‚ÀÃ¥‘2”ʼnÎrâ,gqÐr1<Ê`npÇÁ\*2_Œ£`¬þ	L|ÑÚŽ‰MŒ	¹ê±®ƒùåÀÍ»P�ŠsQ£ŠÓ€É5h�Š(ä²äêŠKCª9]<¡O¸.ñ؃5ö ziM9stI‹·	Ì^ éR‹p¢_l„£<û‰º¤Ä¥ô/WŽ¡‰Nä"ÉÈ…(~AŠ[ô!
£8Gf «ÀŸ…9ûDZj¹EÓ”ò“Ò°%*4ÇàüºÃP ÑDLjì£Xµ<Ê(|±®®1X—ðhG<,ñ	[ðßØ1õ
'Éú¤·¼‚®[\ꎔ¸øiu8ÁRúQÍkâ§	¨CSþ
p*� ç ‡�Ìs
lÀÉøé�=Êv/
å²ÒÚþâü!(ODŽ¢“8] †6 .uøÉ•¡+ˆ]äCPù8ê(ÚO�þÓÏj²HáQä¯d™ç0†"ª ˆh°ìh~ÙÑ‹WÌ”¦VˆF=8ÝËÒƒ¦`J,p‚F© gpÂ
ú—‘îuEZ0›Ó	êP€ò�"ªP›®ê&qðš
®K~·€°ã
B0ik4ÍOç@ð7)òY›{—”#>û`î°
\FPPbP
–_ä
ÖRIgj}äŽ�]p„×Âçpr-Å	=@H�ˆf¦sö•iY¡X€]ñÕŠqtÓpY·Ç‰š“t‰Ð	† 	Þ
Ü8Ü(
·Ñ1�ÔÀ
�>‡i'׉¯5È0LXsç`	iоÀ‰ÈxYìÐR-•{œävš&
!
Cær05•À	Ñ�ñ`s1aufh†,Àè°‘§i*‡qw6q8q	*ãµ8ŠöÕÑð÷7iB�|
¶Q3ÈRˆ¸bžØm‡}²’}�Ç¡cËÑ–ðq�à�¢C&^h¦iU™e­³R: 
)gü4}ˆÃÖÇ’8dØ"§qj	#²’þá¢fÝ6yÆu‘žÑP~à€ð¯ $VPT•BP
Ð@¥(dЩ9à	î�
Ù`
�
fS
Ôp
4Šñy
Ç•?@—€rüȘkþ­+;Žð]Ùu]2ÐC€XðݵðiBVÉaùå¤S!”ð0k1³4‹ºÐ‰KwžüHo@‰ çð¿@¡¢à

çÙ‰ý™ž-E
äÐŒ~Dö2ÂE}—`û™ž æ¢ÜXv® 
ÚPj;žèðq¨Àb‹†°-˲çðZ¨Àœ*c	}`	”1
u
CBP	•BÀÐ0šë¨†�8Ð
ïôNÝT
pÕ‚6Sùð'6Ó?ÚÐÀÅ@r’‡»é)‹-5
Z ¦àÎàA3@Í
§Pv¢
ÊqךȔû°*GæèƒÉwïÂEÔ L׉UÁØ	eË� 
àØì\„-³Ç¤É´yˆ—`ÒÐ,Ã
ÄÜê*p 	³Ð	�›
?‹°}j°l°žê	/�
-ÑðÇ©L+‰B{{´ú‚85@
�7êÊ
�Sg
"ðÙoƒ<zÐ\`
ƒÀ…ÀJ
�Kµ×
ÇŒ©ÄÍß|œ	^0N 
•cNÐ�Ðþj	 
VÕ\@t@¡s
š~mÎI-Í�ŒÞ¡YÖäSPö`
²ðÁ3ÀÐ ± Öw0h
š¦ÚÖ8å ºš	‘
ÒÐÒ�ˆ'1^8`HCº�'!¢…ZdžÀJ¬`,ƒ(µ¢�¢ì2yp`ÎéÄLÌÄ_ ØPîû
¥ž-/%sµŸTÝ‘øéo½²áÎÄFGÝ%Û6ËÃ:<È�Àò®`ÓÞøþ	OÀy1
líöJ
qÀÜ�{
Ç€q¢Ð	¿ðåp‹�‰€{üÖfÏoþH�t,YôèªlâÆÝÞ„
GÊX&îÛ
ô‰}-òùÖ÷qS
šÖe–õõNïˆ-ò	+mp÷xßi ñPÖwÜÒ>çˆÍ
u–÷m@aÐí fwÜãKáý(ò½`_îPÙÙ¯`
Òîó~õ9~£à"p
=‡N":‡åÆ¡»•H“&RÃŽ[ÔéÔ1rÇâä"%ÍèQ®Y½j¥†ÎŸ¿|áòу¯µKµÕ%/¡Nœ=‡þ«çŸãrôÂAFw±èå¤)Ë!ƒí«Wž('Ïv%÷ׯY‹â$ÆZbÚˆH¯^f}N
?áþµ±µ­ƒΠ-¢œåŒ&:¥�Üz2³Î,G>àºþ/�ø\ð„4É)aD“�M­Âd] F¦ƒ‡%m¬0Ù’WObÛì‹|Y¤õ-†ÿå'9LÛô8¡`
•¦èc­–ƒ+`êÂcSài
Töþ”% Dq›Œa.ÀË
ªQÔ»Þö®·%¨ŸûÑ6ÛbûØûÈsÈ·Ùù°5<È‘	$ !}˜²¶7n^Ç粘vø¬¥!�a¬œåÒx†4ÐÛjq?»¹—Ë©ñj´|C²l¹/‹Þ”ëZ^üBI6NÌcadÖ׆zÉÿÚ¬“dã…Ï0§9ç
u†Ë:ÙŒ*…J
�ÈòÛÖÌ•¶²‹\sêÊø`4‡7¿µ
Ä]L¡ÑÏèÀ‰h�¿×ÒñiV³È‘ö†ÏºqáІ6ŠQ�ćcZ5/¹»#åGð”�†µ¯-6÷Ù�F¸ƒ'ÎñmjþCóÀÓÁâð|€mn‹A»êÛªzîâ�õñ	w>nO{ÕßlݦýÜt¯zz�cÐ@>4zÑd¿õ¼‡þóÃv0°EßùÔ�Oõyïü¹]ú¯÷ö÷£¯{ïëë8Æ1ª�Ž5ßû‹
¾ê³‹íÒ_èÌ”T_þí·øºåÀ?ü@T{¼ñ{¾|ø†ØH&WÛ½ƒI­gh¹UÛ¿ì3@ìã½È+¹Ýc=~ˆ¿çÃôʽë{=LË>?r>€«>ÈB.†‡¬‡}ð½zè¾
äÀðãLówPº[‡~°À
ì½|
µÐ†ÕÐ
åÐõPÍPýÐ

ÑQÍÐ5ÑýP]Q¥Ð-QÑ%'eÑ•Q
µP6ÌÑÒ	õÑ ÕQRUÑ­PÕÐR&}ÑEþQ¥R6LQ(•R!-ÒuR¥Ñ!]RýRÍYX
~_Žà	þß
ö_¾à
àùußóEZü¥àö_«•`>`Fàþµ[áa®àþua–áö`fÝnaâ á–à¦ß^á
‡!Fþá
v`>a"¾aFb'.â
žß(ÞbÜ#6a,Fà%®á)bâæãnß
֡�
�é£-p{¾Z[–l®=æ©Æëþ5ìGp×p'.mFîp�gRÎðTÎæϵåÁÍkgà«MçÈNñWqÀbjV^¹mN&rnþæ¨vgÏp´nq!ÿ\?ð«}å>†ÜàÅe¼åäÌ¥ç¾qx¦g-@è3`ßæ•é—ÆÛඖÛHï3 €3˜w`€Ý^…§YSTZ‡¨w„„6‚ÚŽÇ<ôÚΆu¨�:w^tph#˜‚Lx(€†8
-¨ƒX8
Ð¥ù\lõx† €A¸ï0z39o
`?#ˆ€AÀ^×ÁA[y
@etxúeXyJgÎðã&÷b®fnr®Mg//ww7|d7ÚUl
ëÉÖ\xh çðþ.ßdÃvëËjAvpˆçq½^åÅ'çpžß·Z
"Ptì|-Z$;‡C�2}è”&Hƒ4
*MþI5âR®>·º[§�*ºzS‹vMú”kصLå¢]ÚmÄzë´òu*µ§R¬A·’Eêõë\¼G尿û"M‡MóJ�t¯AÌCÛ>$‹oë_±y5›˜'O²Ž
ê¥Ë¶oVŸZb
ˆpæŸhÔH×µà2¸Ã …- FX…ÏEwŸi¬ƒÎ#k
™Ü‰«�


“…B`„@9	cïV9Â	›§ä8¡}V)r=‘{ænŸëv¼®[�>bZ&‹›Ç~Î%º‹ƒé!å¢Í…Oç€á3(_Mm{TÍ­×ùmP±�"À–í…™äbÙ¸ùžú¦9þYŽƒL”ô_‰û›„ZVû¼ë¨VQ‘.²	úV‡ÂŒ[ʳ?£EíwàIjöA4>ëwPÃ#5‡AQ@‰;žq†ö‰À'ˆ…ªþ²Y¡F˜IN(€À«©ë� àÓ
š¬¢ЂjÐî8á3ýù�§š%‹tàÊF&ÚCj½Ä«`áj ƒuNxOðÒ×—Ë=H9ËÈ�Ò9B¥H‹Hí˜H—ê)Ìs Ú
˜±•FtFü¢õn¤DˆTŒŠ÷Ò²'Î,ŒcXcVÆ~]%->úŒϘ’vmñ.±ÑŠSBý\SÚ#É(ÄYþ%_Îc
ÊÊR/Ù	Ë+/S”?†ššyhàÄ#B)Žã
#h3â™÷dA	OTèB«ØN)#‚VîꡤÄ,³Yˆå3ëXÅ#ŒC�L<"«FD`XVÎèž�¥'1-´€E”ΕGŒr³rff¢‰ÌŠd#”ÙÀà:„‘žó²àå3ð'Žz³��"ÍÅ@Ô<?qN¬»
÷Èø¨�å�;JÊŒZÈŠ•©5È#¨aðÈ.‰&2‡Ü¢»**ËJzñG&:]fæQ •ÅL߃âo•>y¤\ùμ`zq1ñbÏ“ØkLv®$TŸôB’ìD÷8.	jþI\ÚK=´ ˜1Ê0CØ®•‰¡á< Y(?éŠxÏ{\¼*:,V$2Å«A]VÀôG²háBø •ZŸV*¾Ä«
ËŠ±´`Çií*¢v]Å
2³P'Uå+f±)¸›«€…� -—RôäŽÙk^L,Ýc~‚²‹Þ*¥a•Oæ9:1šf,„ß"Ñ#E3˜=âk=×Kô<–zpú#d3j6F, ÅK\}+Ûƪ‹®3
;RR91·`tXã¾4Ò9ïe¶‘œ4	‘uDŵ	r‚M¸¤GhAgÐÂ2RW&fÎ óè®{�Õ²ˆ%a\²ÔM!Âóž78þ€Ù‹'¦
ˆ
EËùwŽ@ú\‡0ºÏ–æ³).íçEkz™îs¥;-êQ'šÔo5©S
jK£ZÕ®¾t«_ÝçO˚ϱþ®5®kýfpp�6ŠGo¸°ßò
»Øû6±µ€ìc+ÛØ^6³�½ß)p�ÚÊNö°‹Ýì)\»ÙȾ6µ¿ýmpW»ÛÒ&ö°Ë‹nô
›Ûénv²Í­lk�;ÚÎv¶·��ï{·ÛÛûöv¸¥�î€ó[ß/x¶
Žoq›ÞðF8±	mq_;Ú×v¹�ípŒ<ߧ8ÂC¾ìŠ|ÜûÆ7Éù
ð{á-�wÉÍÍq†süá
Ï7Î1~òƒçüÞèÝvÍgò”C秷ÏÝmí‡\ÝÇ^¢lŽÔÃÿø‡?²®u«gýê\÷G?¸Žõ­}ìaǺÙÑ.vµ{½ë]GþûØßnõ¸·ìaïÜçv¹ÏÝëco»ß¯v»ƒ=ïl×úß¿Nö­Ç�ñ‹_|Ý!�øÉ»=ò�§üåOöÁo}ð–ÇúÙÝ~y¼+óz�ûÝKïøºƒžõ™o|ã¯öÌÓ^ñ‰'û?Rÿú«Ç¾ó¦}í�øÙÇ>ïZç¼Þ5Ÿx³#÷ÇW}Ö‘ßøæ¿ýö{·}ð÷Þ{ÈÃö×ǽß	_öás7½®
Ö¡Ò÷�÷Ƈ{øÝ/ù·¿þ�‡?þózÞ·þÄçÿþ­�ý
ßß±�ÿÑ_þÍ_ÿÝß
6 ÿù_ß­�>à2`. ûa `ýI`& ^àîßþn`à- *`
– 6`
öß:¤™ÐÊ>Ü Î ¡.¡ê º`>¡NaR¡b`Z¡J¡n¡:`N`VaBàÖ †á
Ž
mH�¨áÆ¡Î!Ö¡Þ!æ¡î!ö¡~aFÝL]þ¡!""&¢"."#6¢#>"$²!̈ÃÝ¡)˜B
à Pá2Ü
#òÞA¢(Ž")–¢)ž"*þC Â8¬_f�p
>Â	L¡?xB,¢?<Ã
b*þ"0£0#16 $ºaûY%`â?˜Bþ:YÃ?€C,¸Ÿ0P%LãÕ9c,PÂ2¸Ÿ)P8T•ÕÙƒ5‚ã?XƒP
Nr
4¦GˆÀ ôÆ?Ôƒ'ä$QŠ%PÀ
¬ß0Ô@Nå.@
ƒÈbUîƒ?
ƒÕÝA
ø8
¨˜f¦ÿA
#­¶b‚Þª,ôƒé*ðC3N
rpÁh�?0€…ú±Úà €×ˆÀ‡¶„MÄ$x%0@ÌP‚Mdå4Vþ+×	Ãp�cΟ)€,fÖfåÔ�ØÚÄ€|(8rÜ�G¶Ü
�'/¤ojì?ÌÃ
(›œ
䎦;Ü£²�äÒ†®èŽ."þk
Þ
4zZ4zâÉš‚°Q‚8xâÐi5vÝÖ>C¦¹c±eƒ'ÄÂ2hÁdÝ ›™ªâ¢¸_Q¢à3dÞ
/¬Â3H'ljÁ2T*Ö�Šo` ób#¥X%<ƒnRB&
€5<B¯a]¦ß :Aõ‘®û¾/üÊaÓª$R 	Š]&Ÿ�Z`ûV«'š¡Ü¹_Ab,¢aø
p
¾]=
’©l"Š
æ!	n1—1¿f°cq¯1w©?mDZϱdB1ß1ç10v±÷±ÿñ"¢1 2!2¾±!'²"/2Ÿ222$G²$ËO²%_r!2&o2'ß1"w2(‡rÛ±(—²)ãp%Ÿ²*¯òûj2+¿2,÷ë'Ç2-ײ«’²-ç².h*ï²/ÿòHº2031§âþ,32's$:2f‚±2?34Ÿ¤ b4W³5ï¡0_³6oó37387r6s8—³9·`/Ÿ³:¯s	3s+j0;dz:{³<×37ã²=çó5§³>÷ó3g³?41Ó³@´/ã³A't.ó³B74,´CGô)´DWt(#´Eg4'3´Fwô$C´G‡ô"S´H—t&»óš´J�4JRóJ¿4!ƒ4LÏ´“4Mßôc´B¿ƒ:ô´Oÿ4PµP5QµQ5R'µR/5S7µ:xqAs´AûÃ/@‚U_5VgµVo5WwµW5X‡µX�5Y—µYCB78´L4.œµ[¿þ5\ǵ\ϵY§uCÛ´@ûC[w‚!е_ÿ5`6`ÛµBëtBWµ!t‚`/6c7vc'öUvBKµA·u_C_gvbo¶fw6g¶g‡6h�¶h—6iŸ¶i§6j¯¶j·öio6Z;38¯µ@ÿ‚fdã¶bë6$ð¶oç6pïvp÷öpÿ¶p7q#·q'7s/·s7t+wt7÷t/wo+¶d4^×voc6lóõg{wxƒ·f‹wy“÷wëvz�·zóµy¯÷y·w_£·{Ó÷|Ë÷{×7~Ûw~ß7{6lÇvCveo¶z8z÷�'øq/ø‚'·ƒ#8„#øƒG8ƒO8ƒþ·…k8…Kø†{¸„[uvGuKÓ¯E·µUgx‡ß¶Š·ø†»øŠ8‹Ë8�8Œß¸|Çxz¿·€6JóDょï6‘¸Žãø‘_·’ù’¹�y�·x“_·oy“9’_8Z;ôvû³^gù}{·˜gø˜‡9˜C9|£¹~«y”·y™—yŒ‹¹ˆËö7xAÿ‚šSy’çö™÷¹…c¸Œë¹Ÿ³9¡ã¸boù]—8T74Šz›;:¤»ø›¯9zOºz¥ƒ9œƒ7nÏù€ÿxFÛö£cú¨—z¤›:©Ÿ:lsö¡�¸@w¹?[6yÛÁl
Ø:®ßº®Ûºôµª§:™Bþ­ïz¯·¹lÁô:’Û
$;ªG¸! A±ßv§÷xBÛ¹@ùª£A
pÀ˜@
¤@p@„»¸sÀ¼
ŸW¸•óù”»;¼·»•[µHA
Œ@
Ä€¸§ÀÔ8nÛ@Ä€²:$4A¹o� —zoÛA½‡@¿7«‹8—+ºE¹¯óµHÀd@
Ø@H

)%90!ˆ¼B� ÉD
!"^3„-·8|€ÇŽ� ¦ŠR@àS‚ÞÐ�Š éðLý, Ô�@‚ L
ìdºu¥—RÙ“Qv2Éå°Ò*å—a&rJ{Ϫh­YoÃNRð!"Œ­& ûÀ„,ru’=Ì ‹�âíw�”â]`Ìœ¨–7ƒÓLB+#
˜@
ƒˆ˜‰#‡bå ¡�“€ˆŠÐ°°‡û@¤7ÈCúRÝ>®(7©’1^cnÜñ±„e¹¹Çþ)¯,fIj¶ 72˜÷3†
`�	-=ϲ²¡€|à¶#HÊ=× ¢û½ˆhp5_:?„¤,|À†�� ‹³9Ô‚!	Ù‡ƒ倡†ív(âÂöŽZzíR#"ƒ·hÇÉdËÑOÉ©$oRý÷áª:’±»²-Ñ”¤€ʦrW¯‚
U„iç*ˆ£0ÆtÂQ©RZö@3Mì;XËÂ
€"Ø
ŒMKcË"5£Œ¡ÉL3Ï–êÖ£UéÍf)À»e m
Tü†7ø`¸^ò�áBf·J�ì~±¼ÊN.Ë]öÊüGXm�ÌžI,�€«2 ®�PóJÇ왲
!\ʼ·0/.q&sRëþ¥¢2o!W2ôQøØ™?++6è5o!jD Mè¥qõ
¹r³wÜ<èN3òÎ9õò©—‚_ÐÕ­>Ê/
¢ÿ/-µ¦uw…µ[çú�»ôåd4Y¿ÿe'Ö".ë­Ñ�4¡Ö†ðAª
ĘRêRÚǦu´§¨þ’“kâ¨Þr;{¾ð$vb侓çwŠ>ó@a§‚2b:N–Øô‘•\Fò$õuPBô„d!8öTr	ð²{žŽ…(÷œu� ±:èXV5ÛÛ~jfA]ç/ö[+èMö&'¾,ªÇ¡u¢_Û^H7|Õ_5%/¾Ó7©W‘^øŒò‘GÏãŽeo1ó®Fâ�œ5rlOë]h7}ߧ~n‰žO¥g}àë(›ßÜ7?Ú·ëËyô‘Þ‘pïüeþûmK\¾ªwÉî[O÷Ô_[à4»‰ßÓxSÅ{ïÎïø­ý›sÇ¿%Ÿ¸îµn>áwùçãouu:®úÒ7FúXnÞ/kþÐË×Ý�bÉíu¤±çQi"·’ÿ#s”ùðÎÔÌO¿Þî
ëMKü�
sçï°‡Pï21á|/�è	�1¨$.؈°µPúæ&?
Ÿï
yèðÆ®kH��ÎuñÃÌÃÏþ'Ñé
ÝÑ�xBº¡íññ1õqù±ýñ
2 r 	² »áš1Õ'Rÿ�'üÁð!"#²'("!r"²"/’#3ò!R#?R#ñÁ9D’"7’"'62%=2"W²#/²$%&9ò$/²P’"Mò%#R'ÿ
'1r(UÒþtr"e2!}`q)2(€ªIÜg*�"}Â*A$Ùn+‡B)‚Õ¨’,„B§¢ò+ÍÒ(¼Ò)Ÿ‘}(ÉáÔR!Ó2fâò-1éò.ñ2/Ç‚!õ²/ýò/“¢)
s0	s0¡±031éÒ.³1Óùò1%s2[P0)ó213ó339³3Á�1=34EÓíØò§Fó4Q³¾,35Y³5-i3]36eó}@s6mó6c&2qs7yS�’ƒe¾­7…s8£6‰ó8‘ó9j39™³9ï«4™Ä9¥s:½b5©ó:±s}”„9Ü2;½ó;}b9Ás<¥S7Éó<›Ó:Ñs=‰Ó8Ùóþ=yS<ás>eÓ<éó>]S=ñs?OÓ=ùó?=S>
t@)Ó>	ô@%S?tAÓ?ôAS@!tBóÒ@)ôBïRA1tC—ÒA9ôCÝQBAtDÑBIôDÛPCQtEÐCYôE…ODatFƒÎDiôF!NEqtG¹ÍEyôG}î7)	耴HÁÍF�4IíKG•´I#ËG�4JwJF¥´J/	I­4K!‰Iµ´KãJ½4LÓ‡JÅ´LKÍ4Mc†KÕ´MOLÝ4N�…Lå´N‹:WÍNõôeØtOýtHàôO:ètP
u8ÐôPõ8„ô*‚sQ!5:5R)*
µR1þ5Õðt.3µS‘¢O=5T‰bREµTâRMÕT5UYTYµTIõUCUeµSWµVgµQ+‹ópµW}"V}•Ri5X!õV‰UXuõQ�UV�uYuX�uP�5ZŸ5Yy•ZUO»[EZ¹UO§õ[ýÔUÅÕO›µ\ëÔ[ÑÕMÃu]å”\ÝUNÏ5^ÕT]éµLÛõ^Ó^õ5Mçµ_ÃÔ^
VKóu`½”_
ÖKÿ5a­T`6Jöa«a%¶J¶b›Ôa1ÖH#vc•”b=VI/6d�TcIvG;öddUöGG¶eoÔdaFSvfi”em–F_6gYTfyöDkögþWg…vEw¶hGÔg‘–CƒviA”h�D�6j1Ti©vB›öj/jµöB§¶kÔjÁA³vl”kÍ–A¿6m	TlÙö?Ëömmåv@׶n÷Ómñ–>ãvoñ“ný?ï6páSo	w=ûöpßp÷=·qÏÓp!<wrÉ“q-—<7s½Sr9÷:+÷s³sE7;7·t§ÓsQ·9Cwu¥“t]·<µ5v·VW¹Œv!´uq9aww‘ót}w8U7xySw‰·7{÷x{x•7‡·ygÓx¡×6“wzm“y­76Ÿ7{YSz¹·5«÷{[{Å5··|EÓ{Ñwþ4Ãw}G“|Ý7 at m—HãWs7µ~׳}ñ—3áw/ó|ýw2Õ7€)S	X€g÷€;w~Ø;¸�Ó€!X1ûw‚€-˜08ƒ	S‚9Ø0øƒ™ƒE¸/7¸„ûÒƒQX/+x…ó’„]˜.O8†ÓZix8[ø†Õ†u¸!g¸‡R…�؇Cxˆg“‡�2ï7‰�؆™¸>‹ø‰Y‰¥¸ŠQˆ±¸D£x‹E“Š½X¯8Œ+Ó‰É8}»øŒ3ŒÕXøƸ�ÇO‹áØürxŽÍ��í¸íÞ8�ãNŽùX3Óø��yáö¸�Î�âêx‘{n�Öáê¡(þ¹’-ù’19“5y“9¹“=ù“A9”Ey”I¹”Mù”Q9•Uy•Y¹•]ù•a9–ey–i¹–ûÁ§úa–áx¹—}ù—�9˜…y˜‰¹˜�ù˜‘9™•y™™¹™�ù™¡9š¥yš©¹š­ùš±9›µy›¹¹›Ÿ
Õ²Aj œÍùœÑ9�Õy�Ù¹�Ýù�á9žåyžé¹žíùžñ9ŸõyŸù¹ŸýùŸ
: z 	º 
ºž
:�`ì¡¡ú¡!:¢%z¢)º¢-ú¢1:£5z£9º£=ú£A:¤Ez¤Iº¤Mú¤Q:¥Uz¥Yº¥]ZŒ †…�Y1ûaÈy;ÅAìÁþêá§�:¨…z¨‰º¨�ú¨‘:©•z©™º©�ú©¡:ª¥zª©ºª­úª±:«µz«¹º«½ú«½„ÁZ`¦±â²Á›Õz­Ùº­Ýú­á:®åz®éº®íš›‡�¬·Ó¡üú¯
;°{°	»°
û°;±{±»±û±!;²%{²)»²-û²1;³5{³9»³=û³ëàÁ†…ða@;µU{µY»µ]ûµa;¶e{¶i»¶S;´`;ƒx»·}û·�;¸…{¸‰»¸�û¸‘;¹•{¹™»¹�û¹¡;ºcÁ¨»º­ûº=
¢{»{{Ð
»Á»ºe�»É»¼¡Ûþ»Ã;¼cÁ¼Ù»½Ýû½ñ¡Qùa蛾ÁÁ¾í[da¿ù[î{þ;ÀñÀ\À
\²¡Àí›—œÀ\ÜÁ
²A
œÁ'¼Á3œÁ%\Ã=¼Ã×
Âñ»ÂA<ÃKüÃM<ÅQ|ÅO¼ÅUœ¾ÑÁ:€
( ÆmüÆq<Â
|¿uœÅ_<Ãc|”ljüÆ�ÀÇÁ‘ÜÅ×
ÃœÄÜəܻÝAÈ
 È±üÈA<bÁÂ| Ü¿—ü˧œÌÍ|ÌÑÖAê;¾ubÎñAÎåüàÎï<
Üal|^Þþ( Ä
V!÷Õ_(ÀÜA 
5ªþé\uÂÀ‚îV�0x#…)ø.ŠÍÔ�¤A«„&Eˆõß…¨tŸàÒ�g²îÄuænJ�G¾â;
€Áà‡ñÕÀ¨ÅàÇg�É|†Q–Á3-dvÀh9„²áÓ�qÊÍ°”¦è Z“Ò£ëd1�[—.�þ)ûfÔr @�¾Ÿ)<:èU¦Jø꜖u•àƒ%
½{¨vìÛ³sw;]øðõ´ÈáŒ?„ìÛ·GWÏ9:vI?s¶ªF¦Lžj´=s€ždòœ;{eRÇpîP@‰;ƒ±�ÏxUƒ,²´ÀŸ'º“‰™P‚˜'îe#Â#™ñÈ3SD°Š;tpÆ3œ¹ó’‚xâCòWÃ
µ'ŽuhT5<rÂBNX–ß~-hV‡ž"
:žxÆ�î­Éf›n¾	gœrÎÉæ:K5•TSA°^{ë #
 …=lr¡ :ÈâXR
Ò‚8«tàÄ0EÖ b
u¨…jÙ
Jêí�ÿ{ôUþ•;ct<CN˜
Â…è�
šÉ–ä¿)O¹rB
P¥ƒÈxâ
ŠcëpÍA^B¹GLÁ	CŠÇØæ„m1°`Ñ›ówÅfq‹X좽ÈÅ/Š1ŒYÔ_R"–‰5(
ˆÀ?ð�
gRIG„ïyЛÝ!	d"ž•#Ñ¡õLèp*G	":„‰þ[ÛÙs€¶¼o©L�“Þ0u�ðøí)Æt at U­:¸5ÍÑwv<”KïÇÚ•Ò «@Q6
0wº'Ž±pc§®
p
tíiæè.x|ékxðr$qJtà+»zFR¾VpôÓ�¿C8¶¤ƒÇþD1iE)LEÏ€SÅ‚�Ò{“QRERÕªuù\Lá‡Rõ²¨‘–»Â³@ºƒ
Hë'WÑ2|`ª©¼í-{ i“‚A³~éáÇ|àL›´çý3HÅŽ�e)�@‡]‘’²a¤•²øX(©ì„ˆâôŽ˜š0MÓÉLŒp`ìy>Z òlØ,>¾»U„èÀ	èXãÜaŠ^d#E:î@تLì˜P=ÖÁ"wø´/�¸™,4"]ú~ÌaõXÃ#“ãŠ8˜#F®‰KŒb«øÄ+N1‹_ìb·‰ohü›§Úè�ÝV±…k]âè2Slho*$ÓH™·þÉ¿ÄÔU×è
Æu7m©”…lR&‹Æû£OãòÅ€oÍʤm¤èZÏz�
“tL³%É
KŠ›» bG[&½ñyÓ1n±§9ýéNƒÔf϶–°ØI&§ýs¼¶…1Å� ±�E¡¬1£zÄ­ 'Œ’ˆsœ-YèUžÈF?'4kYÄâHëxD…VA

P‡VËty"hGxÏÇ…ç�ÀB"(è&¦^+õô£	’

Ž£ú[þ3Ï°Æš¾ã�„wgáßNLÝY�£ø­ª„†²à]°a°îÍg�E €¨îÖÁB†•E
Heߪ`ì…#›&NÚ©Èߘnô
|†‘ú©M¡
žàr{“˘2¡—�\ÀŒ79J� »9$Øþ(tg�h1Iz#áÔ
"pž`7‘’îq!VØxÜVÕ	s×i�Ù‰�Û©�ÝÉ�ßé�z×5aE²�
õ0gé‰)öqïÙjÁ(–ÛRZ¸R&…„C»… «ðž—žö@ ‡êEíÑxPµ&êA¥‰O
zEˆt“„Aˆtê¦�Z«àžzHj îÉxšsêšch'X"õô'à	£á£3*£5J£or‘Ã…\°wP?
¤uà£Aš&A*¤FJ¤?Z¤Hʤu°¤NÚ¤Hú¤JJ¥@zC:¤Fš¥Pz¥Bº1
¤xz§vz¤uê§yʧzÚ§€ú§{Z§€š¤{¥Mê£mj¥UʦNÚ¨Pê¤NГʧŽº¨›*¥bj¦žz¦¡Š¨f:¦œ:ªZš©Ÿ
ªšš¤i²¥‡Z¥˜Ê¤‹B¨µj¨¶:¨·ª«¹Ê«‚ê«�
¬…Ú«œZ¤ÙÀ†â ɬ̺š™°š¦
¯íš!Ô
¯ì*®üz¯ì
°ÿ*°í:°çZ°êz°âj°»­»¯÷ºþ­üŠ°ñÊ°žà­¦ð¬Úª±Îj±úš­«°»°›±Ûº±É’®"[­‹²,K±
k®ô:±ó:²3±Ð
±õš³
Û²û²4û².ë³3K´!k´
[±E‹´5{´	믋³Ú
�—Šµÿ€µYûþÐ[ëµ\‹µþ µaûµcK¶f;¶þ ¶aÛµbë¶]‹¶a»¶e›¶[;·t«µwk·pëµhë¶vÛ·qk¶`{¶Y«¶ý ¶iË·[»¸„˶yÛ¸‘¹“k¸’[¹”û¸—+¸+¸q»¸—«·k;·‰ëµˆ[¸œk¸rË·zë·ý
ÚŒÐ	­ÐÍþФìÊž¬·ËPQëðƒ€w�
‡†µƒ°Â`ÏN`
Xk
ÅŒµFÐOì,'
Xk
ý´\ðËÿ •Ïƒ
�¢jµXwpöPtbýtÓY+d;ýNP¿|ÕYÒVÝON µ”ÐOöŒµ½¡�†
Ñü×0{�Y«{=k{×[‹cЀIÍz½×ø`¶§ÓOKýGÍÒ
mÙ—�Ù™mÍÝË5
»i
ÂÀ
(0Ê .àÍâÀÝJýÖ=ÜV©Ù'Žâ)®â�üÐÞ|·ƒpp»Îþð@Lhÿ ?¯�µPÎÿp5ðîlâõü²Pþp!ýºéöp
ÅM	ˆ;tôF€ÌÙ�Þÿð@å<-�µæ׋¸âðÎÿp©X›
Z°¶
ž�=·cpÐ×pÐ[‹µàˆ0Œ«àÿáX{
( Äít�µ( ÿPÑxñý`+þ@	¼ÜÞ½â¿ìÁ.ì�Í�ßëÙZ+R›4ì¬Fàø×µ"`
bkæÿ
V©·Ç"¶ž
Fðj›
;bžëc«0눠õ
‹p4ç¿P(Pê_-•$Q(Cÿò>áþÑ|¯¾Þ?“ö	eŒ·ækÊ1ƒZ¨ÃŸL,ÛG·²"”pB
+´ðB3ÔPÃu´XE-¶jØç £(�àDaúQ
Öq§† 0ÂËÖ!‚Aìþyj�!¨Á¡"ðĈœXÇw¸èµ}b�`)Éú±ÇÄ"Xæ„XŒ8@"ÇN¤ÄâŒû‡‚Xþ±g�6)°F„XΊ ŽžòGTD¨ž;Îì
*kºµæ­eìAË~êúÇp•¥Ü<Aˆ�‰S|fpþú%	_a²]à‚–ù¯wb&_“ÿA7^E/+—Dqº-W)Á™W3˜ÂQæ™üáÕŸpÚye~¦ç|þiççk~ò9œz”AÈg™ª¾†×‚ùã �ëɼuVžhZ´ÓV{m¶Û~¶Ã¯ÕAY§ÞÊŽD»Ší'Eï®{(¨è†ª:˜
,«JŸÂû§õ¼{õÇ÷ÿ
WÙK`óƒ°f1�ÉÀZS™ËŸ.™99u˜CšÓ¤f5­yMlfS›Ûäf7½ùMp†Sœã$g9ÍyNt¦S�ëd'8ßÑ”_>sr¸€D=íyO|æSŸûäg?ýùO€T %hA
zP„&T¡ehCúP�vM!¦<¡2ˆfT£åhG=úQ�†T¤#Õ§!fQ�dZ´n%iK]úR˜ÆT¦3¥é@'jgª´),­iO}úS U¨15D' 1xzÈvbÔ©¢XÚ‰¢FªS•jU©zU«f«[þÕjW¹úU¯†¬ckYÉzV³¦­kUk[ÙúV·Æ®s•k\

‰›¤¢M-È,QTHüÕ¨‚
,`	{XÃ&v°Š-ìbÛXÈ"ö±’�,c){YËfv²š­ìf=ÛYÐbö³¢
-gI{ZÓ¦v´ª-íj]ÛZØ¢öµ§Å'R
’R¾þ£‚�*$ ZUßòªÁîo©JÜã··Ê.sïê\ä.W¸Ï�nt›[]èf»Û-.w“ë]évW¼ßoxÉ{^ó¦÷ºå]/zÛ«^ê²7¾î�/|­[ß÷æ¿û
®oë™×M¢e©ZÌ­?f1XåÖv@Â
a‡¨Fر¼•þ°dÿúà+·Â�u°„Ka
O¸Âq‰kbã~xÄ)F1ˆU¬á;8Ä…5ÄVlá
'¾1�CŒãûÅ�…D‡Eä#¹Å$î1‹›d%?ÙÇõ¼ëQ“·úQ§~]±¶àÄÀA°ƒv,e$GuÁ[ˆ��俾¡	183šKœf;WÏ{¾ó’Ó\;!D¸kŽ½Lg?›øÁl>3žóìÜG/ÃM ó_£ûd>G:Ó›Ž´�ü_Š
Xnj<¦�ßÌ[HìA
!È@
R`‚V‡ 	>,‚ß|ê_xD
š�á;Ú˜5®9mX[“8Ù´Îõþ±7}kd×ÚÃ…Ä2
AA
¶`ìDb×&ðu¢Y¼lp‡›Ï·.³
20
)8[ÚÑFö´ÓÝég×[ÙöÎq‚
kåÛ*õZRÌ­AxzÝ<`„¾k0�_ãû¹P
ÄRð
„9‹�˜½´Ëª³¸ ð�ø€(7¨Ú‚ ³à€þxBH(@_³
HÇø¶â{ÆpÇ»{0"˜¹°�,Ø¿=xF�Fük
�‚hLǸ°Û6h‚@»{ƒ hh^
û;µ"CPF…$³ƒ9Kǽ³ƒ,ØÇ B‡
q„=CðGð
H
AìF1k‚ˆÈ1d³1«Éà@K«1" 4È/”»ƒe´
ø¾“H"€F2ã0��‚}$Häc¬„7ÃBò3Je¬²";;ò3
´ƒ°ÃÈøÈq,4Ÿ�Ÿʽ+,ã³l´�½[É& KòGXÇ¿²¸™sË›ËuDÇx¨$¿HKþ³¬H�oŒ
(HØ‹Á+[*-S)¿ò/j{ƒ�€h=àÈ*Ã&�€´l‚�€(Á#.�ä€��´€€;�û€‡´�	p½'¤»XÌÕD
�Ñ-�‚`ÍÒË`ÔºÛA½ƒøº³§=ð�	ˆN
=åÎ=N8R!,Ï|
‚”ì½±�Yš›ªäµ»»²¶Ú]IúƒàzŠ>šCµ= úëÂoË‚™ó�=¬ëãI)àÎø°q•ØMì„
¬kþcW"ðL0Hp<H�‚@&¬&HÔ_× gb°Ux3¼ØYpNÃ×¬ÆM�ýYv¾§ËÝäLÕÜ.^½ríçzBb4­ßðò
<ÿºã3õâ»RD_³'Ú
Wñ�N;.²ÿ¤2·û€qÅ\H

�hú¬1ÿ,
\Kf3*4Ž�d¬=`ãšçØ­29΀¿ZúëVcL×;&‚ò„CMþ¶-dCgì[‚˜Cd¹;d‰®¡†dÿ*´N@˜üæÞ²dTÍä.,m¬aÄ›ª	ÔXu5ehþ7<žÆ,ˆ�k“Ñ&˜PVþ«
Mʪ•Qu…ÈV]a£Bƒ0i›Ã'C;_†½`®§%Ðá<f£úVlcå¾eÔzú2Û€…3¬{¢fÓ‚+0ÝBµµ
/>®Õ;��Y<â°
;þìßµ§s.·Ó|€u.¬L�ÙÍ>Þ�€`[�£ßCtj"+´Æ�_i�cØü¼ ÓX�¶1Öß>]°ƒž¹Ph
CTOM1;¨ÛÙ~]»}»à›]aÍ€ðFSçCA<Ø	`£âÂá%é÷-
$H[&
){þI	aÒÊ4·Ø	Ôäƒ
‚1HðÑ	Á–D
6™IÄPH>
"�½A
Å@ž	Ð4ÒMXàRþu�P¸
høø�xKJ1B1u$³øµŽ«à¥W
û8Ö«¯¿¬°Ãæ�?³´U'6X‚	âñÁ!
ª‹|�¬
rÛ‰P1X þ�å™ S�è–ÜIžëÖ|ÒfšAž¦‰1HÛ,L
ÄcZ�I0‚¦�ìáâÙ2äcHL{ w°eTÉ™*E ½áÃÅ&H1�Éò4ÔÅIî뚴⦰„
žÅ°GÇÒ~€%AD¬ù€lå	SHpð>0lB‚2Ë2~ŠÆÌ\¹Dq`–iÙÐ|¬»aËñ[0QDAD¡±pÃ0×™¢ÿäV 9MÀ�ÕB’m©�vÐ6|À
Ô´Ùë[™pqÍCŒNcMPZÊÆÀ�¸#15gŒ»…Ff×Tjã)dñF)ˆÃiu²›Døþva�å†�‚¶ZºI\sÕuW^{ÕC¬ï¿¼ð�;gío,i¤MH!Å…BbGRhn·=2—…æ{”\ZvlæSñdGóÌk^ïœ[4±¤Gn
¸”F¡cZˆ2µGˆYh¯óÍ;¯m8ÑÞr‚)L�S³Ž¬ÐƒÀ‘Ô/-eà_–³ 
üc^š	jÎH;
„³p43�FV[ ` Ê€ªzñdÍ»	S
´!˜˜+ô<,Ü‚y¼À%,<³{ä-usÇrJpJÇ׎|j»=BÏ”2jA/zŸê-±`wÊš(Ÿ¤z~z™ìáS³8-þG„w—Ô:C;ÚÃÂðYŒìW
¨Ãr�±µ­Ö´Z{I±{EÔ¬*wdï�¤náJj$�º°IâÂ�ct¶¬×mTwÝm`ë» U8_›jÕæSßOK—¸ŒÖGë;ÛÕ^«ˆoèéHoÛªA¾±¿³ŠRÛ½Ùµ€Œ­´KnrÆ KÆ64(°;îP2Û“�·^n¿Ú		
L¸…
ÄÁ¦`o¥ß�mŸÓù›y©¡©…ZÓÅ-[³é
¯�_êµùÙ®
�Û™–ñ`ÝÄÛà¦|Ê"HAÐh…ŽAÄ JIø@
A0L[ôKH€ßÄÀ�¨ÆeñH
X at tÄÀdÀÚí�l
DAlÁd@
JKŒ
dÀK @
PŠüÀGjxÅ
WžÅ0K7¶`'øÀ$—ø#{B A
HÀüŒ+²F TˆA
D¨ÇHüŒKÔN¶‡hf€}<À4G4vÑpTÎ˵YûÉšñä¡ýŒQ‹ÙPj¥š²Ù�„™dtÖY"!YǽŸw¿]$ѵR&Š„G¼Fp¨¡ãå\uìÁU¤x†VâB0Å@$õ½Á€
,Gb^¢ÈØIÇ9š€ëd
ÜÄ;N€ÔƒJ¨£¡X„—ôBòDßdS”��ÄâIX at GT‰´`£éÚµ±¡ú­ÝEþÛÏÜY
NHŠ\øIç�Z˜dà!§¤�š
…l™®êªz˜@Ý @rщíT€’#ÇPÏâœãÈJ¢ÅÜFÜèj<R™‘œÈ˜Ä’`œÄÁP­$îÐÅÜÚUgªÉJ•³Ñ!žb,S=•©•ÝF’Ýqjž5ÒZ¦�І?yÖ#
VÔ)-
�Q–W4Ž©´EÆ�£‚†’
©–(mƒj×è$W!0eAK|£[H
Åä[¼§º¾|
i

ŠHÄ‚|€‚p¥¸¥eI
6[�öÄ•¶o¬�°Å‘=VE@ðÛΤôeâ(¨ŒU•0‘Ç#S
D(h¼F
˜
D{Éôh£€tù¦ªn\
;ª<ÀØýLQÊO—XYcÍ4L#3f¡œ¦VÈ–WÝõQÅâ�Swš#T5ûåp˜žMƒùàdÁ6ÆÉ•ñˆùœ£tõgJâdŠìpÍ™,@Ðàƒ\ãÀÕµzì6„À"¸[À
zDá¼q´ÊCÍVþ�ô5ÑFHY9Pj4á…ü¯T²8OIiDÔÄ@èÔÓf †P‘�HÁtHU/Aƒ„è«ÉDZ»}‚xÊSüÙKOÔx¼^¯ŸQòû–÷pórŸC|Ħ>§Åüâ+ÆÆÎnC�®½ãp0¯Zuòä̪�”ÌhÆpÍö.
íÓy°8‹#V?�ŠqìHý Çy4Q‘ç-OÈÌöžÇ)qþç�~PPTëcOçÉL}þöjÆg}&âu¾d5Òu°¸ë“ž³ZÖÍp¥y€×\Yð¯RhìAé-SìËŒx~h,ïc ׾JH`êCú†¡ø<�GÂÜsã[Ÿjœá!óþ2XÁÅ÷½I2þÿÄ?�	Î2d¨BH&dèÐЄV|‘b'‰7NŒaãÍă*„t’F”
#¢tùr#C…$U®äÓ¥J“5]š<é³g”8[þäùò!N‰8uŠifQ”5#Z‚
ÍÑPÕ&ˆ”LùThÏ©UÅjùú5E®5cçî1¶TàQ‰ýýZjh–¸g7ªïÊßss–þZ7‘Y�w,ú|ø÷êG»ç¼>»÷T߸©+¯Û9-g§�×*w­V>ýü¤ãCD‰‹ w¸ˆE0Âtðç²\�Á|P²YÖòÎ>üú«Î5ЬMÃ-,�À‚¶˜#óØêj)“\ÛŒ´¡ÒK±¥½–BÊ´£hÚÈ­qäL.µbBnE® šQCÿdlEÛRê� 
l0pjØÂ>ýüÐ@1ËL?þŠ´hÃÓÞ\‹#‡ì Â>ÑÂè6KT&q³�GÑ6­:-["¯Qöþ´<ŽÄNoº
¿ßê«CüÀ‰Q¹v£.È›)#ˆ&ð!)Ûï¶å,bï¹Û¼ŽÍàJŽ=à*Ü/ÍióKi>ú¦u(Öþ¼½	
,ì°v}þhvýÉ,ÎB­ÃH—eµQ!Y³ÒFqu–¶Ø8loÃb9=×ãÒ¸ÚL;®WY¬3*™Qb—ŽV
U%û;þf]ýx>n‹-´UÓ�Æ1ÎSgº�eEõÃö4YßÜ)ä¯Ûm¡ÄˆÜ�šòÊ-oðÝ‹ä:êÂņÏLNá½kG“áøãÑÒŽëaj×4Y¯ECu3fš9Mª4‡Æëá³7¼k.ãÜݦ“Ñ¢Ðᔟm´†Sþ»³˜�‚ÓåÀ=#Óâo•—=Q—êèÎ�÷¼œüòÍ_Œè°W¦_Ðߢ+ÛøÍÆ4jbÝY�»¥¾ÞÍÙ^µdòbï²0fµíu•‘ì·¿êyÍj3±Òê¼0õOoøÙ
í÷¾CMçcqÚÚê”c+3
ï[©‹Íãþ9s¡ë|1”¡åÞ5!þžw�ãPìlƺµE`tÙ¾Vv¯µÙŠ%z©ðê³Æ]$cS2 çš·­Î)ZÏãµî'8�)�ˆjB¡ïè>°T�fºC£Ñ´&§7õK#ßûGøÌÕ³Þ�é"›¸FíÕíS[šâðõ©~+ml•[¸ÈŸY+ux‹$ç’À�ïj@ÜqÖ×»ñŒŠ�9,à[æ†?fýÏ^É:å='0øRuDd\#3õ½±Ð…BPyÙKIz‰Cœ]ÔÈ8ùeχÃCݼ<cË+	‘~_‘—ÿÜ8½¦)‰Ù¤Ûî|HÈ×ecѧ¹	Mßy�›ÉËÇh@%þNœì#§9³r®Ñ{9ÃaÆçKþ“2CëÆ,ZP\t%èAšP„.Ô¡
e¨AJQ‰Nô¡ÕhC1ÊÑŠbÔ¢�¨HJÑŠj¥-©DOJRˆ2”¥1…)K]S•"´¤&õèCsŠš&¤+µhG[šR£•§8­éFuúQ¡FÔ£¥)Q�šS£ú´
�ä`P¯~•1ýèÇÐÈ:V²þ£¬"ëZÏê�±¢µ­k5ëÐÐ
W±º•­yÕ+^‡öVº¶Õ®j•+_Í:ÖÂö5¯�Ý«?øÁV¸®õ±‚5¬cõúÖÀÎÕ­–…ëc»Y¾6­y=,bÙŠÙ]þ•þ®“EíjUkÖº.¶±]ldG«ZÊ¢¶µ˜=ìaÚ:ÙÚV¶¦•m]Á§³:‚¹ÉU+bv)�æ:72Ï}.q	2ÝËL÷´Y®vc]ÇdW2Ö•.f6ËÝÄœ•ºã¥®ÐÀ‹¾êr¼Û]—z᫘æf·½Ð}í}_û^ó®+—…ñnr	ìË
û·ºè�®`ÉëØÿXA¦kw±Û_æBX¾ä}ltÏë\ÈB–1‚=m~Ãàî®÷A
†î„í+aÿ—¹(vo|eLawXŸâãS�yÜcÿÈA2Ð|®!ÉIVò’™ìU:ÈŽM–ò”©\e+_ù1E†0–¹Üe/Ì3¼S@



From shedges at users.sourceforge.net  Thu Jun 23 13:31:18 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 23 Jun 2005 04:31:18 -0700
Subject: [Koha-cvs] CVS: koha-doc/en/sysadmin/templates/imagesfolder image1.gif,NONE,1.1 image2.gif,NONE,1.1 image3.gif,NONE,1.1
Message-ID: <E1DlPvS-0002is-SV@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/en/sysadmin/templates/imagesfolder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10446/templates/imagesfolder

Added Files:
	image1.gif image2.gif image3.gif 
Log Message:
Graphics for translation.xml

--- NEW FILE ---
GIF87a€ò
çþ
ROH?Ve at VnSQV‹,ˆ:Zo”7;TTQJY`SRnjE{oMJZ`Uc_E]^[FezJetWakc`YRfnŽV/^fgz[W~T�egd†`3;hÖhr:‚bIA…@Žc*“dmio_rzWt†jqsrqouqiZwžŠf�D~ôe‚˜|}|j„‘©w/É…‚z:µ7`‡Ý††„o–p°}G©�H‘‘4sŠÐŒ�‹—‘X›Œjº‡:z”£x”«§|±‡“Ž’�‡œ‡œ{�Æh¯^³ƒ~¥‘\Är»¥Š‘••”É—K�¢²žŸ�¢Ÿ–®˜ž“¥¢¥«S—¨¡‹ª·…£ðhÏf‘©ÃΊÇÄ™’‹ªÚ¨§ž¦§¥× G˜¦Ü–µ’º §Ý£AË¥iº­pÀ¡¹Ú§Y«ªÍ­¯­²­®Ý››½¯�¬²À¶³ªÿ¦)ÿ¥6Ϊ£ÿª*ñ­Bø«=ó®;ú¬3ë¯Lþª4ò¬Jø¯*ü­*ºµ¶ö¯3ô²)µ¸µÂ¶�†Ú�ë³?è³^˜ÖŒ˜ÊÑþ£ä¼TؽvÀ¾µ·Ã½Æ»¿Ã¾¿¿Á¾¨ÄöλÂÏÃœµÃä®×¥Ð¾ÒÖÈ�ºÉÖå¹·ÆÈÆÊÉÀçÈxÌÇÇ¥ÖíÇÅñÁÔ½µÚÕ¬ÜäÍÑÎíΊ¶æ¥ÕÐÐÇÔâñΕÝÍÒÅÕõÙÕÌÛÒäçÒÉóÍÉ×Ù׬øªÝØØùߌõá—÷ݪèâÇßâàçâÍòä§òà½ÕìÎÃîûäáçåäØÃñòðßØèâáøÜÖëâÛÝäùôàççéæþì òéâíêððêèþåáùèáúíÆìîëïîåÑûýïòîóòèìöñúñêñóø÷òðýðôõ÷óÿúÔÿ÷ðîþþÿöýÿüßùûøýýæÿýíýýóÿûùøþÿüþûÿüÿþÿü,
J´¨Q†-&<zNÓ…NÙDmóTêÁ0U™jÝÊ4*Q˜*yŠ»TaA²:žüóK!¶1Ù"œk°.S²`í|áÊ×bп,Kfz¶ïÁ/4	îýÂØ	“ÇLJ`À�¡r†
–3|ج¹ó‡$6“�áåÌ&c �Á‚êÉ©c³~=™uè%pg(¡yôíÍÀƒ—ø-œóçã•?„&¸fã�Ÿ¶Üü
ã¹�ß½»¹oÓÊ�þSV®zEéÕèI¯vݺµë÷í]gp]ÁB‰	´[ϯ�?í× ÕÆh¶­&Ýf%”PA‚›¥÷’AˆÞkðMm³
·	èÛj£¡p�u"¢àÛ$˜·Â‡úæ¢z¶Íö¢‹˜Wã�7ʸn&èã�@úˆ		–ˆ‚2”$�Êå¶d	,<)å�D.Id•>^Y%–S7ãŠ+š@‚˜3ŽfŠazéb	""‰ä3¸)çœtáJ‡1ödŒ4Fcc8AÄEPáÅ^PáÄDŒ1Ä£4Lä…NAD4Aæ4‘AL
«¬­Ž
««X at .¨×F‹_¡ªfAÙ¾{mjï^«± ¦V¬¾Ö†0f´VV«±
ü›Ä™ñÆn>î–s‚:çLdrܽ<³(³æòÑF
ˆ3…ÇD8
`ø#œélKþ	º�
½CµÁ)IH<Ò‘ä´Ä8Å©mL˜d·8o/Š�…ea-*¢4XÅ)ŒAL&ð¤,E"ÌÀpJQw+\Uî`¥ª£©’ÅGe-Y,$Ã`÷0Øy.f§";v:`�.A‹Y	ì`®y¬’,³w’€$FÖsÑÌÇ°Íüês{–ùz7¾ƒMoeÀÛX…R3¾ÔЀzíS�¿63‡é fN˜AÆL“"%é6]£˜ÍÚV ÉDЙ¢
Šîóó¸fMÚ�Ü’³&x¡g«
ŠÌ$]G3	bÂh¤3Z'4&¦<•#ÏÒoDÖþ!�ýpƒÞtÌGIàdPÀI€îPƒ;Ñ@—˜„"4TIà`‰’à…|¾34ØS—žÔ�çt‡G=R=¨6’„}Rh¼”›"æЃ#¥ÁI—ȸ6Ñé¦sZ¢Üì𘹹I¦+(ÜA¾)¨A9A
`Á¤˜ …!È`SN �	0`'LJPsæV°"8éqV®¤¾ŒçHsytgM�¾2‰‰q
5™I"%ùH¥!‹®
¢àÖvó…"Ø
IÓ9’Í–HÐ$q¢(¨À8™`¤€	w%l@„ÉÀñ�–…pâ˜rb
×I6ÛúÊž&iO(-QÛŠ°à"<„1^¨|já¹­W¸$pÌF{èÒ¦íG;t©�$¼CÉÅ.¡œØ”Ä"Ž´Hl
‘‰`<‹P„4pq;‡ŒÓ
ß´Šr¢púJEÙ®`8Þ´ÁH8/Õ	šZð£¢Ê§Uõ›YUÄŠ@âÒ ]ØêOþû0™I·Zo`Àó]ÀHùÖÌp®xö%ž9W—%mk1[�Ðfö+™ñ&±(ààd€o2–Â{j›žÔȘ#}Á‹î“̘Ï
Žp˜
ª0)Ê’Úþ%5‚I5joŸ¶A{�°
æ€Úñ›H‚8N V%ŠÐnì…köpN 

mtU´fUn„8¢`Øp"¨F«flÞÓ8s°jp
‡v[‡$œÔ£ei–cI¤Y•“³&€z·ÎÇpb¬Q8ö
]&U„C]æ*ÀäF6°Z6â46r  X™�Ù˜#‚O¤è[Ž	\jZ\µH"2`™•¹6°øq™y§°˜¦ÙGòPÆæ8ù5€þv2¢rc‹>å?èzËÉŒ3ªrê8‰³~`�Íi¢¿æzV¨^p$t(£µ'‡·G€ÖGNkä~‰~äoT4NsÓƒÞ´h6ˆ~Ïfž×ˆir³�Y)¤:|·ÊŒZ%‘ŽãnLVqŽ:kšZmsã6‰�ÞøŒ¨UµGTè•n®žX‰ªÔzŽZÉmî%7ƒˆq?¨…?\Î7­297z‚z—Æ`'7¢=ê†<zS+Ê¢s]ú@
–6*–
õ¯l¸uI@¥a	Q]¤
'U�‚뵨Tü¿Œpùv‡'p4ÂFIÂ)•<—å_ ü¿;JÀH¦tÍêFv‡$lÃ*̬t—5‘Íj–ŽãFç'Äç'j!,Ä"LYJzÂ'|‡BLYù–Ã,<ÂQŒpÕë_ýå_4 at Y6`N ½Ü+vtÃ)¬_,]NèF›bœÂtøz¶ƒku‚úTc]�ãTf8,`f(,€)þtŒ°‡nx£b¹¸“K°‚ùtÃȃR|ÌFkǃ[)•µ²Pãób
\…Oƒ.P#w0Ê£,
¾ßÍ�ÜìíÚNYŽßø}ß�21 áÎà¾á¾à�"â.âžánâ#žáò=ß(þâ0ãîß÷ÍßÕýÞy�j¶�ÖßÝÅý-ß1€AäZ]ß%›)&@A¾1`C`PþäŽäN´p
½påµP§p
ºÐå_®»Ðå^þå§ 
a¾_>æaÎåºÐ\^½Àæb^æj~
jÎå]¾þ\~çcNæ^.
d.耾çb.æwæu¾æ^Þè�®æ�~è�¾è�.çdæ“îå[>é�^èr€æ_.ºpè»Pêrp
œpé^þç©~
§Þ対ê»0çsîå½€çšÞåWNµpåp¾åÀ.ç·çºP£nì½0êÅ^ì|Žå¹^ì¸þ槰åpÎëpþëqN_çÀ¾íÝÞëËìrÎë½^·`å[N¦`å¼NY^îâ~íµ0ël^ê³Næ\NëXnéÉísžïÿ^r>ð½Pðû¾é·NíüìäžîÀÞ_î·P¦pîOŸñ·0ñâÎñ½^íÁÞðè®ð[®þñŸ
ç~
VŽíïnîoî.o
¿ñ4(Ÿñó· óµ�
Ç ñ<¿ó©`
D_ò2ô/óoåªpñ[~ô(�
· õ?ñHÏñoîîNíÎnæ€îõxþæ	_òV/îé>ò.�îçnåÅ`ò½nåœp
Üp
v_÷wo÷tÏ
u_×à÷~ÿ÷~_÷xŸ÷v�zÏ
ÚP†ïø{¯÷{Ï÷|o÷~¯÷ŽùÑ ù’øƒùÅpùt?ú‡ø¡/ø‚¿ø‚_÷ËÀùá`øœøxÏ
¡ú�úµú��ù—Ÿœ¯ùŽ°ûÐÀ
Р
‰?úˆÏùÌoø‡þ
ÈÏüË?ýÒ/ú’_ù±�÷Š?û‘¿øÃ?ù”ïü•þu
ÙþÂ÷²ÿüv�ü”¯üê/ýÔ/ÿz¯
”Ÿ
ä¿þÜ�
øOþŽOþ
„ˆ�Ûµ‰×,^ƒFÑ FƒÅ8.<öqáÂ�׎C(Ñ`Ä‚G.¼æ0áÀ„"j{è²âE‹¹yô˜ìšPŠyrIrÙF�Ùp¤ÈñXÍ�kÁ|iô"ÕŠ§úœMdWª&_‚åšÕ¢ØklyFi¶ê[ºo†S¨QäX¸s«25�©XŸ|wÎ�Ú÷oá±57Œ
wëNÉ=)lŒÖña¬›9ŽþU©RĬgÊ<kp™ÊÔ¨Ž¦93¶BÔ#k“|X[ïÞÅ3o¿lYZ Ìá´}:4›
µî³ÈS¿Lîú´é„_;¬Mü!·ÑÛY+Ôöñwìé²	]9ÑèTë™7†C‡0Yº	cÖx3tËvõ—�K³»›(Ëž‹ëÀÈëo¾ÞòÒŒ¢ûü+¿ýZŒ"¼|Úðš

Ä«ÃÆû�DÉÂêÀÔÜC°Eê\tñ;·{1FóêéÀÚdœQ¢Ð¼c¨&¡b,źæ;SKiF'Ó›ÉFŸ‚Ò¢Z>Êæ3nÂÁ+>·4ˆË
·¼1¹›O¥r¢ò Óhâr¤·äþò»5ŠÓCïÚL4�”mHÒF¢©I?$ˆJnH,›¶Ì†Ë;ñ„´Í‚44(¾„àsLL?ÌÓR(Ó@Býüº'We•Õ1[…BDc¥õ¹%kW]wuR¤‹	QÒ8ñÂÔLø‚¥sÓRõ'œfK¶Q:ãÄóÕiûä²LõÔhÎCã23Yø4õÔqpŠsRe然Ú3ƒÍÖØkÍ56X=³¥–ËhØ¥sßrÁ|5œrâë0[L·43á2ÅŒjYi)xÙwÁôÐÝ3g¤ÖÉŒS³–c9
¦µc�Ò2®�Evõ.•/žAŽ&\´0YÞôIdy
ù¹�7
·–3›þ��qÚ·K=
~¶Y¡CD§Þsµ�…¹<‡áøš7\h³ævhx
4vœoêExk­	攬nGmn†Ç"øô4ö›…=¼zl‰V˜à¦Ý—ly¹4S›øžxÚqÔ–ø]aÁŽD®ã�<j©;]6á´�];᪗˶åÞzëL»D¼t‡U7ýbÖ}ØvÙ}}^Û£ýºñiË“÷­ïÔ=vØgþP–[ï=ùrxg^`áÇD^Üy%Ƽñ篷~úÐÛ-»TŠšVÌ¡‹¹å˜oÞ�:œsÆçmÞ1óÞ›eßY¢£æ•LLA%ÙZ–qˆCб>.-N|à»Æ7þfÇ
S4ð*Ú
G8D6Ô0CHN’Ë@Å2„þ	Ér,e^\
2�™	-³’ËðZ;Ö1`$@ã@E
´€�,’Ù€$<¬qŒÕ$òbÈ„6€
Ísýò’Ô\Æ;¾øŽp´á
ïHl(Ì·
ð'qH;—ÂH=@ãŸë¸0™Œ7ìá™Ù8×1åùÅlP¡·|Ã3¹1Œ_ÖàÅ&û„ùÌIV2•$Æ"´R‘Bã爥±Êqˆ
¼
‘‹Ã	Ð�R1p‚¤alÖ‚š° BKˆÆ*á£E³íP�OÝSÇ8¢ÑªRŪê¦
ÕØYõ~{,*WwØ´¯ru«|ƒO,u(Ö­åQ¨š#ßÔªCµ"L-ÝVeþU­–J©W5+UõZª¹
±„èä8àQ$ä@
Ùx'Å€5$#T ¬7�pˆ7Ã
mˆe�Ñ,u´�&È+þç$4¶nPCÜð†# !‡ˆÂ¸ñŽvÄ#‘ÔÃ!6;HÞ#
Ç(G-Ž��!,#´n8'Ü`ŠCb²b¸E&¨…#�ï=†Ä5¤‚»jXF*Z;ÚfmPÃ1Q1 "
C0BÚp‚·<Âm‘0é²6
ª0/'‘@ßrè
	bÈ=ÃñŽr¨�
µx†!\ü¶ƒ“n¨A2Ú(ÔB
­m‚h£p‹&ì 	#¬A¨ÀÚþ(âGPC1&«ÛrÀcè{ƒX!1˜‚²“Åå!F`á‹ÂxÆ­=„)ÞЄ#,bÄH@* ŒY,yÅáP+ÑÊÚ#,£ºÖˆ‚y¿a
5·±¦XŽ m¬ƒhJ³ß8JÛ,Þªc~Vc;x«Fyòö«Oœ° 
Í7ø=ñ‰fjÇ8béA~Õk…v4¥
-KDZžžp4=´J­ÐíÍt +Íi"ÚÕ«~ÖüÄu¼cÑ�–ª«	èi’ÚÑôÌ´�S�éT«‘}êš�Áˆìd·C¼š­íì×_Ûz�쓵<]MOkš¸Ð&ömm?A“›Ð¨þqT¿�ixþH“h¥Ý6áXØi«á´h¨Ðmè�5@9FpÚc �G°§6ÄІw”vëÈÆ�-d	ܘ/+¨pˆòºÁÆÖÕB1&úÄl¸Áäb ´¡—‘_ÅÖ`#h¥6Þ
v*v
´5ûë6‹´5‡“&x›À?«¶_“H~4IZ£¾Ž$¶ì#¶>#6;¶—œÉ•4È‹,HqCHEÛÈ‚ä-�I™¬H€\?‡J œÀ‘|"™ô6xøÇb¶wø»c€‡Lhƒ¢c¼P„†( £#‡((‹«…q„-Þó3;ãJ܃=
.©3…²¡ë:1 …¿+Ëêò¸™«»¤C‡xЇÀá´<8£Ã­\„;\1¸Í«HΙó¸[X„c˜Ì“N7¸CëòDÇÜK¾,‡Ê,‡Â[†B:‡rhëj%1ÀƒãâM1€¾„äÇ¥SI‚œÁHÒ7ÞªÐwàKA«5aÌÑLÊ}°µv³µ
=Dx Ñvh·
JåPåÐÀ|‡åËU´=Ñ„„I
=QõQ4ÁôB
$Èv QÝQ=Ä%Ã…¼È
ôþB¾DÑu ÒpãKk{H2Ì]xxÈ,ÍRC›R�‡�Ñ}È´)…¥$Ñ
¥Ñ
�x S ”QÞJRmR·$õÐmÑćDí<„[Ø­^à¢v
-æ#ŸrSˆ”a¨…H¡ˆKd!ƒ˜!ƒ¸…Z¨Žú`@…ch–³<‡y@Õ{hŸ6Û<7X„bð»3D‰p¸Äl`Îá;†lH.’ÔcåmhS §}ðV`P‡{@Ò}OiÂi�½Ýò™p9æL…ZèÖJþ
x8†u@®Ï¹p
ÓEÑ3US¡�R/ÌÚ­mÒ
Ì
UÓÀÛ°EÑ<åZ²Z¤US¤mW¤Ò2½R8EQ0…S¸µÛw°Û´ÝP¸¥[­¥Û°mQ«
ÚÂÅÚwÀT²}¢UÜÅ}ÓC<S}0Z¶]ZÀ½ZfåP0Ý»eZ±µµ¶¥[¥ÅSÍÓþ¥5ÛµÛ½õÜÂ}SÊýÛ9½[±ÝZ¸í­u(†|`ÖrÈÚ5ð·xØK+�+�ÈxPÌeV¢íÒv¥ óÝ*í3u
å}Xfl†âQnä.Z�Æ^ÕUcWÆÚ¨µböåc—žd¬…Û™†é6ö[¤}å˜f_¿åcÅÞ‹æhÃ…ã™Vã}°å5ÎåžniLMä”æfŸþéD~Z6æéCžd¢ŽiÖ½éªÎb¶•i8þê­e¦Îb8Ö[FÑ�~Zøgƒ¦ãÈ­æíyNdì]æp>ã©–é}¨ƒfè¢vi£Æ^¸ÅÔðäXF壮ÑaæÂ>ì,~c†Vi¬½ÚŸ®c…Öìk~ZígÌÆ\þÜõkwÎe£^zž‡º¶æS~Z‡æe�vivÖvÐ`ÉÝ\ÂöÙÓfm£^fÁ$ëê�mµngþYφl¬
[ªÞÜYNé„>c &íw0è�®b®î\Òe�fcEæl6jÃ&dBþiÌ~ç¤[©~ç¾nêòf[£¦dŠj:vä³Íf¡†e÷.ì«ÆÚÒ>Û8fĶë£Õh:®i›ðy
.¼sÎïÁ8a
4!»{T*M ±ÿjŒÓ²·ö�™ �jÂjð$
zŽzð#Z·H4<ˆG}TïzÏhE'n1ŽæÝb­0‡=Àw�îC§zÇè\�‹¡¶Ïþ}w´†,‚A­X�'�nP4¢Z-,DmÎ:(ƒ¢[¨á€&ØA
LÑŽRD�‚g;€13mŒ×0Å5:xÇJ¦l¦ˆBT¡a
mP!·JœË¼U<®#eAŒB-¨ð†&ìan at B&ÆÊ1u¬ƒHЃºj‚
 Á¯ðƒ.^°8ò}C
mð"R ÚA ƒQXD9tòÓ”µƒȘÅ0�aŒYðÖ†»UÚŽOxX¨Hg*qˆ=dŒy|®Þµ„Æc8¸Nu
öÑ–!´#±WË–«F
lpÕÍnuç‘]‚qWp‚XžnõSõçg‚îu[†ßxüì¼þž».uá`ó®Ì¼´kT<Ô»¨ñšW
¾ï¤”s+ÇÅê¼ÚMUÀd·^ý’7„ßůweç¿7¿Õdo~³Þ¿¦M'ê(FpŠq�plÕr(=ªkcä‚tê+ñ.y¾³aütÇ>Ü�Š/¤Bk㓼Œ[
W}îð`a=™�n	tÚ(g¥´‘Œ[ñ÷V¾R�8È<Œjj& Š‹Æ4b‹NcÀF'ZÑŠgD#l^ãÄÔQhÌA¨ÕÀÆ©«±‹æ
"	…‡?
7Ú=Âñþà‡7Æ°Œu ²ç8àq‹4!Á0FX�ÇÕ ãŽå
/ðA^A�üÏ[ËPƒ#‘Ú<ÀiF¨p<x¨ƒ	þ"9zë
xx£ä·=âN6XÃéãª8„"±‡=èÁ·¸Å0†aŠ= £šü½(Ðet¡½èF—uâîxô_/Ýè‰c:Ç~)ôŸ7½èñPú‎õªý£²þ1Ô‡^ô§Wýé·Ë:×·Îõµ=¤GþgÓ8ôuرîx‡Œ¯¡�jÃt¶CvÜ�zt#ÖøÆ9ân8xãØŠP„;ø!y~cŠðUÊ&&cÈÂÝ€‡eê©Ocl4?ÞœßÑPW��«�–;Ô�ŽÍ½¹ÐðG7V‘‡<ƒ¹'C.è�{àÃ^n¶¬Žwä“Æ Å7´±86WóÐÔÇ0d1qh㟖U9ÌÑ
p4C‚H„ÜpŒhãáÀ#:d-+c¸¨F:°¡Tw~,`‚󼟯Î8´A­�Žœ
p”¬,P
9LÜ °‚˜@
9B6ØQÜ•Ã6”QÉ�9�ƒÝ©×¬C8ÄŒÌaTÁ(èL¹�̓ÂyyP>ßÑ©ÛØ‰Ý ¢Ñ©!¢Eµ"²!6"A¢"6%.â%nbÚU]̼?$4|C2ž+¸Bï­B.á¡� �8È:H[ãuƒ5DK+*d™E•ƒ6Ñy†exC>,ˆÝ©ÃÝÝÊ; �þîÑ�îå�´¤Ñ8üX8„<ðCîeA´Þ*|ã*��+œC;DÚ!¶C8äC9,,°
,(4�#­Ù¡m„•ùŠ•Ý‚1ÀÃ8¤‘9Ä308ä4xCG-ƒ5(¤:æ:„ý
Õ©aC:Tdútƒÿ‚óüƒ:vZaµAÔ, Á	œ
Zª¬•Ã4$é4Ã(BéC½ß,�“õ“54O¼ÔC0Äcîä3”3�Â@’‚4HuC* RŽU8„‘8È‚ýáEVd:l)ú Ë8 ¥ò-­Õ„
1HpF¡È­\¹p*¹]»thP“@‘¦º”iÑ H‡:uªR(Õ¤@M}Z4êS¢U½BµŠU©×©e­ž-«6l×µQ—†½:•íÖ¶J¥^Ó
ìU²w¹eÛ[µ4vÅ®=‹­[ž<«ªU[µŠÎ’%=z´è‘«›¶lѸ-+4Æ•«\Š
¥Ãb‚k(Wñ¤Œš²:eNu3¦Z‘5nǶeÓ¦­©¸US.cÆ<¥1htñ^¶êò”UÁ®
ç†î²@]Ù"5ž³ñÓTBK¹,*TÆPy«W¯›;oÝ=_–íXþ R›4‰aÚñÇqà1&`†[†›h„ÒfXØPD‘d¬±æ˜N&�@¦ÙF»hHÄKo¬yC	8PbŒzâ	Ôª¶ÑCŒb²ñæ�1XtQ’9”~ûÊd1ãŽ;\$Ç�²¾yP1m†ã€°|
)<y…¦Ð↕&�H¥nŠiC5’9ÉAnz9EŽ9ª(B”/òÃR,±B¢§B	™i�™™Fg))°è®éå=jZE—Q¢€
‰(ê
,«£öâ‹+¿<S©Õ±fLV•æôëVVceU0V¯ÒjÖ”²"V¬¯tþ½tXa/5ÖÖ_‹MV.]£mÖÖ“®M*[i�å6¨c¬'™çÆ•$ˆ¡§›tˆ!&—Uú #‹$r1Æ3¡’)$	Sí‹Õ"ãµlŠÑ%”2f³­Š]P{CcV,” ¼š`‚É#‹)’àØk¢ŒÆ$6»Æb4΃˜(‰Lé˜V>Æf@ñÅB™æ˜¢PÒ&CŸÃ��>o¼�%Á¦¹‚@˜^Cqêq§x¼1¦UÄК`R³ƒ�^†ä/IÄÒ¾¬‚f™a†B¾zØã”9—ÑN¨!‡YfVà©H$ÔƒíÁ§†ÙqŒ4þø£7vVo(ÐJfþx€L‰B¶*šg„zÅ3¥(ƒtŠ�N®LI	G€Yf $nL	¶dŠ‘#"l¨Â‹9Âð
‹ñžàâ˜d"	#d"Õ£Yfæ¨cÊ*F58Ù£T.üpC�EÜ
TW/™Û\½åvç[¯B_[—‡Z?ýù�rÿü¸è¯ß$ûóO	Gÿûwþµ/YsBŸýˆ”\]£âpòС‹o4†®èF}Úõ®<ô!	…0†8Æ¡�ŸhCcø Ø`B²€½ÑÆ7Ð

?”
až¨ä`!cxã°•PÐ�Ž­ ŽÁà.pÑ.ç|Ã3ŸQ�^@ó“o¸£]ÝPþOŽ¼�’g<ãϘÆ4žA¶@¬!ΨÊÝP2hdjõ�O7¼¡ˆ»	&kèB¬ˆNÀƒB3†,�'BŠ�Ä&´P/„’�mcl�¸B'*ÃD>q%Dc
*‚‘ŒZ aFÚ(Gw�oxc™¸0z±‡&„£g&	G$—ÁŠ?Àb±[D2òt
tD£Ñ@Ç(‡ÁŠ!âj Âvp*¼0LAŒ>¨
)LÓkB]‰„ò“¢£‹PCÜІ6}?	Ê"^�N!axÁ°€8àG@Õ5¼Aå9zÐCÒ,¶á“”q)À ‚2‘à†Zt‚6yIþ
F¢ÅœD!·RQúaÔ-I�E—rQn¨Çq¶cåHÓcѸœñMi“]:Ê°d3YRIOLÇÒR³4E”ŠJ8 3—i}…¦.]Ês*"Ó™n¥/EÑf^¨¢M:¡ƒÐø˜ÐáWT°4®˜L!úP2�
õÇ8ÞŽpÃ=îa…"`
VâÖG9‚ÈŽWÐÐe
]pÚ4Ê�XÃ1ie"†¬¡cÀçë8Ç8€ÚŠV at O³ÈÐnþw{‹d cð
o`ÃÙÆ6"ÕÏY	ƒõ‰a9¼5˜Àj(Æ9~ÙM7ˆ
5pƒ‚¬K¶ƒÌšÕ¯™AKØ4›Y¿5¬‚kÚ5§YÁáˆólǬ`,ÿR³ÀU±™ÿþœY;kV¾o3›Õšf7Íl¦mf]ç:«™Ñ‚f´añÌèÂΙÒrnl¡5›é8WÚÍkl™k\æS[úÑ«N0:Š‘�v¼£P^Ç7r«ÝC×õ‡:Þñx�yÖ퇃Ý`xÀÃåxG×±½úáÔÞÅ9YÏzëÀ>Ö1ëz�cØŽ6:Ô
a·£¹ïðv¸ƒÝŽ|¬#á&v9òQ|¼£˶™×‘ï|±C°ÅÀ£­ŽhÇãçÀ.“±cCÛöGOì¡ÏrckŸx0 �Ž´¶cµö‡1,$‹o|#ù(y>¢1�Nt¢¾Ì‡‚ÕýþyÜá0ŠÁÍktdä•U÷<
v÷ÞMogL+\ç:§¼ï}_l´:ýõÅn}å{_ìx;ÞÄ~½½]ïnwó>ëÎ_=ôQoùÔ“Øð>=±
ž|éÃüËï½ÖÁogwûà¸ûu¯|þàã�îÒg~Ö»ÿl¼£CðF¿é{oý ¯ØŠÁítnòm¤-�ü¡ßü¡oêaH®åÖaoöaêMè­ß�nòÁíZØ!¨!Ø�üÁ(oæAF°@„fØpÞtÎáaÖAâÁ‘.ÛáôA
å­Öæ¡çæ
d�[ŽÌПÐåæ!P|°Þò
õá
‡mà�¿
á�áø
çƒõ�1pÞÁ
Ý!jøAçæMÙp`ÐÛ
á
çÍÛØA¥M×áÞa{PÖ0°Ëa	9ð	Û!ܧ�Ìôað<P(HpÖÔþ�±pˆ0ãæja
…�ùîA
G{Ðíé1ïáƒÍ
)�Õ°S±É0jÄàNÁ00Ø0pÈmÙú0{�Øü°q{0�Q}q=ði«±ƒÐ«Ñ
c0Š=0Iî‘äîÁÛ¡q7í‘ðïhq¹Q�ñÑq[O	²
I®
é� ×q¿‹�ä´qû±Pg3ðÐ
M¯éí÷á�‘ä2«ð9�ɱßAÅq‡ð!Gò#}�ä±ßÁP1òêÍ×!ÖôáþüÿaþA÷¡ï¡åZP©°å|‘‘r)íз°å¶�ø�ïÁp
��+Áð
�ðì©’}°('0—’ŒÒ10àŠ°åR¾m+Ûðó²�r‹r)ç-ðR‘GpÛ�7p—òë�ÿáüÁ+0$c�ë1ï¡)qSq'3=P²‘r07ÐDPóR1C3$wRõA.yÎ3]s2iÙAäRû�’+ws†³Cr7=S‹Ò9	²Éòë1$ï!)­Sˆ’,ý
+mÒ*¹ó’r
ýp)—2;“ò6×0þ4±P
«Òe;9sÄsÍs?õ³:×�,ÿ“×=±²@ó°>×rRÑ5m??6�?Ï3�+­)‰� ”;I“;«1’0í‘@óp@/ôCÏ“ÒDÕ³3ñ“3Ís;Ñó930+T:�r
#sô7ó°(ó¹Ó7�ó=ÿ�(Cr?·Ó<Aô˜´ŸS>u4·�S6?s1‘²ý�óAFoó:?16ÃS1ÿ
‘D'�Bï�.�SAÃ3>S‘èÁJgЮR?s?ATKAÔ
�SÝÎ{1šòP³)³SE�8‰�¶2Á;óOŸþ”?q:=�C±qAåSMAô3ëÑOƒÓ<I3ÙÁ=¹M“Q‡DÑ2<	H‰p0“,9TA³.­³5!•4[°V÷S=q;³ó9/U=•2YT=7Õ3×T)¡õ?ó9ÉÒ:5pPô9­óG/TY׳YñS:ÛP?•’HS´VÉ[›5Y/”Cm´Huô]õ“^´5ÿ³Q´[µUZgH•ò\]±DcUZ'ôW'ó9�Ó59õBó5>´8�QÃ>±qünÜÁ
ãaA±•IW0j¸Ô=9Öâ¡=-ô
D3eó)SSTõ¡�ø!²¼Re“’—s>ÒU:õq2þÿARÔcÛT',/“4	6HÏ8çôD‡US¯Dw:]³I“gñ0$±1)q´0.Õ° CÓJ­tÎ�j7pÙ¨Ô�µDÝ“6oS·S3éÁoúÆ*sºt
�2>gKÔ&tT'µ(osW“´òkë¶Vå’TÑlUÔ嬒GCó/…b²1ò/7\·`¯6_t-’3ƒT`³6Y÷sÏ•s?Ók´>«Ó52$ö[µvCWuVT:	;ý³VW×^§õ=gô@A´:W—>s×m·3U7Y›VCïávP'�c1QjŒÁ`!êÃo0þ'{ðMùႺʺ
K/ñ{Õ�ñð
�!J}ovRC²Ù!Ô%dÁŒ�Üáâ°ôAÜüæ/1‘$SQ)�Q…flûfð\nrëÑoÓ‚qQçÔ1vp>àAeq�4d9¶Eò(…�W=ñ³ÓÔ3esÙ<09P…­Õ¡ß’cá�1³IngÛq'ëñfá÷€y­ßr3z}�Š­ ![1Ö21R„?q4­Pd-u}Ð0¿ÍCó7ð{Ð
ë1'éqs_3/ÒW�Õ!ßÍS�Y1¹1tm÷ueWÍl¹õ1·qs‹þW{í¶\#y�·±.-;á34tùÓlƒ·”Ct;%ôFA”/™‘#yu	Ù(õñiYY“u÷�	².#Ù5_9huY–û±.9ù:™“iñ‘íÓ‹
µaÙd,Ø¤\ÁÈ ¨¹\A�ÝA•q»�ĪÂ*ì@î´ˆ
éL©(ª¹ò€òÀ‚nV�ióf]!ží ª¹‚¡)ÉéÆáFoôŠ�á�üÁÝâ¡ÊA{o÷!à	j 
fmðÞALa2Á£—
�‘#õqî�î}°a¥3¡Ú¡w’XúRA÷–
‹émðšðL¯åþ¤l€zR¡÷2P×
Vz¥‡AØrn8ÑáO±ˆ™�µ!’:´a–_ÚmÝð@ºÁÀÚÈ›ç·Þøí~Ùáºá|
Xd!\2ú‚CPr3šMZé1ØxÞXQöôqɬûpضšÁQc‘
¿üÜ0ÞF²$í;÷p„™O§±«q§w:±ÁqIXËoK²®;{»Ñ´‹ñ Ÿ6²º®mwÖ,5®IR�IR²Q;±q»¶S;²I[-—O¶C¶Õù³U»·Ò÷6»‘CÒ‹!—á5®¡~¥&žW!‰ªa:ä¹>.ЇýA¶ª¸‚�þìàd!²z0Ü:3¦šWá1à…
¡êAçbëõ¤¹‚xí‚r!¬dA(�ÌÊÁÜàÞàÚk‡˜6¥¶Ü
µá�†RÜàF Ãk
€AÁjÍg
Æ€nááTàjÀj`já¤U¼ÄIœô†
!®XaþR¯àÁh‰†á2azüNXA(ðòH|ÚÀ %'pÃaœ`aa`á
Ø+
¨Ìßä÷ÞájáÜÀ:�ŸŠfnn�ÿp‚)˜l¼´lfÁ! NqÔýA7ªY‰.è›W�xMj�ÙÄ!Êê‚"‹>ˆA>È° zÖjMÔ�
Ë/ß!õûþx~Øò]ÎÃmÔi=ßïÑ™oØtÞZ?K?£‰mòˆmÔƒ/ó³Ïý|oî2ºõoÿÑ�ÿ÷�ïýÐý<üLŸÌ†ÿþèOøËï÷Yo÷=_öœ�ò\}þj_öUŸõTßø¸_úSo
Ó˜,‡âÜÕ«'ÎØDWÖæ�ûh<ý;xNk?]·.\íâNåFFgž~xíÊÁ#×ÞFê´Wש3 |bµã­·{‘-¸ÑSéÉ {NøÞ†.H¡‡îÁ×ad%zØ‚:"‡"¾8"Œ'Ö&Ö;׉u�‡-ÊÈ£Œ	ÖæTŽOá×cŒ‚X$�0’¸N1쬓Œ6èN8â2’,ßøãŽJ«¬BÇ}tsÐ81YÔP0Átó1`fa<©ƒ>ëˆÓ�EÍS�?õÓY¬"|xºÂ\.Šº�þ›a’�Qd×ÜâH¥³ã�7H!u—6ýñgÍ AjüaÆf˜�L9á ƒŸ6©8r‹:ç¼SŽ¦°<‹7ïtÔŽTwp:È0ÀdRË5è˜	Oiëp“I*˸s:ð°ò–]ÃhÃß5×ÀÒÂ	¤j6ŒQèq
°¸:õNµì³*³ ‚ˆ°Åf7øÁı¬dcŠ#öÚ›©Sò™&R
Ù˜‚ÊÒÑmð#K0ÖXÓ�1}¢äŠt߬£N•"W‰Î«çœ3Î8Uº7®¶…ܲm¶‰Ür8ï¨Ü~N¡üaÎº':×�³l8ו\eÌ6—¬¡|U®SmXu4µX-¿cþóÈNÛüQÕ¿x:ç¡߯•|HôáÖ7oÊñQm\ÚUW+¬Õž÷«qOˆ·ØPKíTË%c�õÌXÛJµØËÂ7öÉ%çí¸àƒw„9|Oó­6~g=²q¶µõÜ'w®7¬7G\ú¯%gÎ÷é�O½2‚®ÿœ³qëŒã$;ÉX#N6¯BÓÇ Õ¸ãOHŽ>Ì77[ãÊ ÎuC�;ÞѳÊS¸"Î7°†M;1õ±Ðvõðƒ~7afAF0ewS<_:$‘+a.±<àÇ7ªfàáˆ~mj)X«Ò;¼
†„à'Ä1ÌÐ�@UÛˆFÉ–ñ‡6¼á3ßÇ0þ°þ©A°‚®2ˆ7Ø2,NeÂ
,\7´Ñ2Oã
jƒjáŸÆ„Ð0ÞȬÄ
2P	Ž8ÂL0‚(,#ãðÏ«:r�Z¸Á5õBÄ,v3 at VXãÜ(‡8€Ø0üáÁ©×,2•·ptÄȈÁ(w£c¹Óì@vœÃÐ[“MPâv¨#$… ;’3Ž
…neL´M�æ´™1±d83 Ó(Žæl’*Ù²
ÈÈMzrf¥ÑÒÚQ-Ò4’‰Iëä*³v3ã-9Z«eÒliKIÚÌ•«¼™|:È4§¥Œ‘¬Y%‰¹5W¦Ì•’,eÍ·Ë­1q˜¥Ì¥4¯iþ•¹ò:Ä\f
GPŠMkº\Y'‡™ÍrÖŒ™µì¤.‹†IR¶ãÅø˜·Èòª`äa
«¨?üÁ�ÐC Y˜B‚�e]Ãa¸x£¾S
\´Þ˜e8ÊÁ
käÂ�yXEõNò\d!ùÆ7"�UàÂk‚GÅÒ¡28ÄU冣áˆ48â
wAʈ¢Æph—AC8ðš¤`^)¸
íõ“ÕÃp5²GÒ8Qzó£1¬Á(@õ!¹µàt¥;ÞÉXºÆM¨tå]Ê8ÅìÝ-`j]]}�W¸ÌUÖn¥{
#+‹ÀÃ
¯»ƒ_oÁjÜN±vß�ïÞ.8ÅàM.¼ÏMnq¿Ûþ»Þ~î¿ßMm'<¾õÖ/»ýVàl×[Üíöï¹�Ëmr÷6ÁãîÂÞíhO™»·w`£‘�d at cJÞ
Æ*–0ÓV¤ Ú›Bû¬¡¯o¬¶æ6'F†µ—òXƒ(¨ÎÆ8dòá…T#¸�_˜ìÐ’vÃ-^õx]
;²DÊјê1fÑ	<t"ÞˆŠ7€ê­Â¶u'”R4¦±ÙÅzv¨>ÆÝÐ	=èÁme³7–áªhxK�šeó6Láš°/âü&3ÞÝ�=C…f³ђдdƒÍÚ8j
[y×SŒ~fªØ×>êÑ’ýîo_ûäçwøÍ_~ó‡ü€A=ùÏŸ~ìþåýãß~ï—ßýû×?þßÿù€è€ý‡÷7~Ø~ì
h€¸¨
@å[ɲ&e×
Ð=1w0…|«`È
РOS
3cX’ˆ‘„H‹µh‹·ˆ‹¹¨‹»È‹½è‹¿ŒÁ苈¦}DQ>ÔìEÞ
€Bz²<‚ÂÖ�)Cƒy@ÙHÔ!(1tÈV=ä-¼ÀcÔA=$F±ÚPEa<Æ6á&6F²ð‡/ô}ÇÀ
�p›ø€AySˆ„høq¨�Ûð?ÇPU×PÈðu—r}´ˆvþVUÕuüg‰¬ñÙw
®W¢VUíXîwŠí˜‘8‰È
·PÐà-™`’µÖŽ¨GFx`o¸�Ü÷mg‘„±W�­±*^Á}Uå’ˆ(Y@>9‘�6ç
¥wŠ€a
²Ð|®@Ý WYHÆpŠx‹&)Œ_	–¾è•aI–Á8–eg‰–H~í%ì@
‚…1Qy '`b—y 
C—)†¥O�‚�ؘŽd`k˜„×ðlµ
€

²`—tÐ!hB‹±V;–¸@3Gvà
Qƒ|HF‹PÑ „Ù§å ‡´ö“HY”7?€‚‡‰Ù‘•R)_ñmrˆhgþ˜’”è-Ñ@F¹)jÉ
µ �8
™~÷drˆ‰„Ù°³z X‹±yˆ
;¥{
™’»¹hU5‘Á‰®�w³{.¹i*d@>«Ð�’ŽPǃHh
Ép•Ê® ²�
Í#€¾È•kI dÙVŠ ·8 	Ê åwˆ€1ï�&…]M4ßv�ä³y0¸°r±Ç[Þ0Gj¢ä!Ñ@
ö@
9XÜÀÝ�¡*yP-!j…ôÆ@u¹¡ñYý	
|SQÞÃ7Ë€
®çI€�j™F°²„&å
ð€
fàS+Ù†˜è³P—4ÈZþk+Jdt®¢V„“*ÓoÖemSö¦ ,å
Wi�J~ðFkkeo)fd¬êmü\
WïU«—«ÿ·«Ú׫îv«¶Zr¸x\7¬»º\Ó¥¬¼Œ¹ú«¼:«·ø¬án÷¬Âø«H¨¬\„nÅðÖ
çê
¼€å0u‚þ¡ìÐ%Ä ñÚÆàëv²ßñ­Ø…`�OR2WŠþùð$#ã£ãDUc(ÿA
qQUb¯ÑPù@÷ÑÑ0?ãDA£ ba¯1+jsâ"²,.òãP³ý¡Oѳ9£v£ ßsQ>+5H¢ i£þA‘Q$;$ýñõ@4íªñ‡°®°R‡ä*D3ªÆ€v+&Ò33«3¹c!í�BÃø� 5’#5›#Uƒ;;Û.6cb
2bá9ìbuk·*r§q#‘8Â I+¶
R‘Qí¡6bk"
⸺Ã&R6È1!Us0Ÿ›8/Sºïa¹‘ñ+”1 ¿¢$Â$˜Ë$˜3!a âºfþc#‹N
â)ò»ï@$/{€·‰“]slÃ.H$¿âºr65¢¶¿rª»€{ãH¶Qvòü
ù°ñï�<ßáê�¾ü±²ù ¿í°ô
¦�
ÑÂ	ª`áá© 
.�
¾§p
œ-ª`
§pâ© žá¨€
©€
œ0
þáŽâ'Žáªàá/îâ^áÎ	(nâ"Î	ná&Žán
¨�	Ižä,N㦠
(ž	¨€áµ äHîä[žãž	þåžäZnâÞá[®
M®áI-ÞäR.á¦0�F>æEîäe¾æw®åR~áf~
GNçjžçwþç7Þá@^æmîä_Îá\Žä&®åQáµá�~á\Žé™¾çtîè™îéŸNç›ê£Nê¥nêz>ê¢~êpŽé›®ê N椾篞ê«ë]îä†PMÀ’µàëµ@Àþë¾ÞÁîë§pÁ~‡}QìÉþë½P·�ì½p
µÐ©©PºPíÆîìº0ì´ }áë©@îÑÎ’Éì´ÐëÀ~îÇ.ìÑNíÃþëÆîëö^�PXÞí}ñî÷¾î´
þžîoí÷^ïö.íêîî#OîÈ^òоñáîì"?ì+ð¾î/íÆîëŽðñ^ìm`ÕnG°
ü™C9³;'¡o‚”À
êÞ‰S·Ž:|èÖ½{7Ná:ƒ¶{‡.»uêÔ¡C¸îÅwçÎaÔh0ã:tÏ\§G̵{µ^ÐzÇRݹ‡
1*|ˆ‘Ë“!ªûÉQ!Nˆ>‡ê|ˆR(Ê�fTHTèÁ”?§bL
Õ):¥§v}*4§Ó²ÁšìÊ"Ø�IÏ~ͨÖ,Zvþ‘:õÉդΨF7B5:hЈ(›òD›RèÞª~ýÚD,׫ÁÿåKõ®[²‡�λnQ/-îò²û®ÇqãXŸSŒïÛ·›´a‡S+UqJÇn_óĪÐ5ºpF•Kå˜�]¸pÏ1D÷�ãÊ”8™®Ìk´øG©ì®ý�nåôšFßµÛ¸±ør�ÙÕ9ÉüàÔœnÕYkÞ<wë®YN¼uÆq,ÝvCŽ9åVÚˆ£èpJ�'•¼©7�Þûï�pÆ9i9Í;h¤
s¸fœnŠ:\óÔÝUÃ_îymæ´²VGŸ–S¹ø¢¥ö:qüêb-
\�=ÒChâ!˜úêR^ØúåMBusýo?•nDîf¨7ýtÔSçd¹ýk�ã•Q}cÒU÷ݯ:ž½çÌpZÄP—½kLÑ‚Š[àTš£bLÙº¡ÿ’KN¤Êq».SòL¶–Zò„h¥vÆyç=ªûšþb®¹
¥Þ«ÃJ�d8QµUŠ)ÆY¼1ÖÐ[œ†ðëüqK9Fƒ™éXÀ
Š+cþyX£®S»«Õ+[#úVÜÞeéŒãbHÆ;hQƒZø*ÅÐCÜP®åfkU{›ujq¿½­åS‘c€–§Šè�#¤óYÈ1�áÏ:Ú•{¶/#¢.ˆ!;àŒvÁ n‰pükì.xÄ)íP‹M¼bØ Z	©!ÉQ'z!†x¼+9¦Ã"!†Zhƒ{ËPG/T±1h£´HÆ7®A>~cµèE2pr�9~Ã~´¨Å5ŠQ`,£é[-zÁ
h
M EŽ€„ˆá¦hƒ¨°CD�
HØC\
q-Ô@Hh‚v Š&P!
ª0E-b¢‚2+­-h4RÁdñr»Sæ1j9Ù¦W1‡�JSº.íèZM$\fÙfZISoü­`go'2–®:¦þ™ŽåC0ïµ8D[AˆŽ6 a#V�ZÛ�	8ê5n€†:F€¾&pª©ˆ+áé†VBu5�¤!Ä0Z 
7µhC-Ð
Uº®2
zrñ�`Š(¨A
×pÃKÄ`
õ±&X”Ué÷L»ÁMc†;fé°ÂšÝ)[ÒaÇ5MËÙ—˜B’[œ™)µô®í„;tÂg­ƒ�°ºFŒ¯ÑF7¨AT(FR%0‚
 Ab¸ª!´À	`XsÖ¨Á-Š±b=üK
·Á�§i;T§ZšÞáU‡·V—yc¦V-}¿È`/÷ì E‡dy2´žŠŒ|nèE/š`
$(µ‹*þ�ðÂSкÌ5»‡ñì6QXD81X)'ƒ
mPƒ5õp�ˆ;
†
™Ø@1ÒÝ‹´¡
× ·Íã?U'=ÂJgº¬›žº
#ÐC
^€„0,b;�ç¾í(;û_Ä×ÛÊS´1
;
Ž»�a$£ºH¨A`þ�TSèAñ‹¸FOøU~«\ÄÞ_†C¹ Õ³»*FÁƒ#‘™	 m
.-Bëm“[Ä÷vŸ»a­fû*p]FïFÚX‡*@¨q¤xGAÊ9�„ø{z0„Šqe1ì`¹‰?´^M¸Ô³¾O>nèÇ	öÑ«ö§Å[Äg4Î
ÇÍéE|W}êÅMœÍm(MíßÑ�‘zé6eà{ÙßÀX³ñ›’0Z�Ÿ’Š�*š¸‰}¹
èȇØ
-þð�Z‡¢¡2=¡ZX„U*‘Ù/
©ŽEðÀþp·€ÆB¶ù
A3„^x™0¢!Ñ°!-ˆ™›’*þ¨&q™ß8³-YJ¯!\˽Ô;-
* 1›
¨õ£AùR¯—Š-½Ù’‰�½Œj3'š¢—ê!˜©ÃŠs—eÄ1¡©·(¢e�“dRžƒ(')“úÃP©, at T˜÷ cá�#SÑ}€c�m¸†p at 3뀆k‡k�ZD‡>#8õ1
ÑE‚3:EâÂS€(Û�(À2á³E‹ñ#eÜ°S¸Y„h`Fh@¹ЃiœFm8ŸòšÆÛ¸
thEpþ„•ÛèEf\ÆoLGõÙE?JÇóYÆ[\GxÔ™óQÇóYÇv„FYÌÆe„†_$¸lÌGõùÆ�tÇtÄÅ�¬ŽìGw$Ç
æÝ»M\ý­_ñ-cøM\¸e`¶aŽá –a7æã
¾áñ%[@&dA.ä6d">dDäFfd at 6ã²�`G^ä@ŽäD®d²UdέdO¦bL–aâ½[w°¦eà‡ÉÑÈÜúå`
þ]ˆåXþ]dÿÞ4–]#ÛK¾aB6äVäA¶äK–äEÞäadÅådÚ5fM~d>æEvæ
ff`–flîeGþ–fhþ`OÎdp®æL6f
&fH¦Ýqà'î¥Å}Ø�o؃ªe¥s˜e»åZYVcîáfŽ[î]Û~–eÃ�câígø]ã¹}\ÿ¥_®_FfèKŽåoŽh‰Žac¦æ‰¾hC¶h‹~f‰Æ]G¶hn6ç‹þd’ÖfKÞ‡qPÈQ‡TçÅ•\:æÞ†ã¶Üh~Ü:ÎeøEÝ‘îémöéöh næ‘Þh“öi£j¥^j¦nêJ®£e¨m0.Uàm€.``%u at a±Õ´�å³mf°Näç�Û°ÕZ°F\8ß°5_½•dëMf*Îe‡–\¶½]Xvj‰f½®dræc¡Žh�ìþžFk¤öiÂ&j¿äþ
j°U²‚zhi4®[°…h…®ß4Nc^fÛþµcNc¶.àÿe`ÁelYNlÃ=hÂNê¾þæ�îf>ví×®mÛ¾í¥ö‡s¸…a°5�
-U½qêµÇ�CjâPaÂÈ»
´2QÉÖ!-&TìHõo$É’&O¢L©r%Ë–._ÂŒ)s&Íš+þù�«ulݵ^´’©nÏZTÚ¸óW¯[®¦tî¬êÓ§c#ýRãï’T¨-«ÕFM¯J�Þ¡C'Woy`ñ§H-5;vì·¬É7~6ÿ,x0á†_îûçn�–dñhŨ¥åŸºEUÜâÇÏŸ?�âܵÙãN\Œq1âq˜	i›jhqRåN³	w8¬
¹gmì¡C{ö%S³Ì�‘6Hi¥¢".Y¯CÛ(j³lO¦CTT¥2ä.†»e&¨Xû–õ-CË8N¯~=ûö¿«Õ‰[´kº®»vL�!Z^Þˆ£T=Må’Ź€‘dXÃÏ=üÒ†?ê´A…þŠXcJM
ñÄðÍü$CÅQ
�8Œyy‹—MC……·(rDTT׋"	©á¥*÷¨ð4CÒ„¡Q¡ÅШ
z9RZ©¥9ºcŠ\pÚ)nˆq0c´ ?ûÔ�7¹ÓM…ÓM=~�hÍHãcŒ5îh³Ì®ú Z�°Æä¹xÃY=£ý3N1ß|“L2âøu©µ×b‹­f‹iñ#-/Тþ…>ÿ¼“´üðÊ4çìã�;Ì
£N<eíÃÏrÖhã4ßX#ílš
ãO2hþ³\2£íÊÏ7Ë
ë²´Ö+”›Ì(«™=¾IŽ3|û[³i4¦Ý2”[$ÃyÉ+±”É‹›"³g=cÂóZVbG+PÀf`±¥ÓC¸~F·_Ímú˜Ýï9Áä­qilôáÒú¿ü‰2žåÖ¸´ŒÇÔ@NVB_“×.×iÏhèœ\÷¼þ>·��rzãfôòwI3ºr$Ñæ;\÷QÖ‹š-‰è{þ2ÆcN
&ŸôÝL'Ê¢šDe‚\Çÿ
)T’è
oœÄàU2Ù=MÞˆãË©QËz<AöH
ÞRÁ—¦Ž×ÅÍïøÆlf»Ù´K´ø—äfóÍn}#�Y}I=w¸ã~Ü<	ÜvùBÈ­‘êxÙ¶ëÈ2Þo%îäLáªÉ©
Ë|´ºª-{)Úê
¦"D*O]â½czÕ/ù¨g*ÁÑ–Î
Å8ÊduÈX™ tƒˆÔiR}Ë5³"WÜ‚Æ=z™ÞC	˜ƒÔ‘Šž�£ÔRXÂTþ-¨ÀÚˆ]&wä0ÑÐ]Ù¼d“VW~Ôt3SE¿ÄáPËræ~ñZ×ú†$ÂN~ Ñæ?
GÈð¥BRHƒéhRÑ ìIˆÜÌ7RqÚiÖJc´"Ó9’1²«Çm¤#¯j¼ßaµµ5¡äŒLiÏ{2£€gXÄ+űS<æ0¹:†§•Ô±<Ç@æb×8Ú°>¡ÑÀTQnñÖbã؇wpÀ	iÑ‚ÖÇ8fS?ƒ·€-zqhÑâë%–hñ�4Óbɸ…uzÑ°^„Z†Ê2-Ô!ŽT”Y·Èò ·lf` qr&Èä7€A‹áXã²°FRáŽþw
(½Ý\&¨‚6ÐÙDŠ¸-Á!�»­ŸŒ…¨‚¨B½TG<4A2$JÔ@*hÁZÃò„†* -…"œƒ
¤B*ØœZ!¶
AéeB< 	à[&ǶA&ì\”¨AôÂ7$¡høÃjHq•D×äƒ=Lƒ3€Ž0Hƒ3Xâ%Râ%^b%Jƒ0hb'Zb'V¢%z¢&šâ)¢b*ªâ*®b)J"è`¢þ)6(²¢*Râ,:Ã4äCß°Ãÿ¨>éÓ
¡�¬u`1&—•¤U24×µ©
ø©ˆ´èË28È>Xƒâe‚"Ü‚Ö»hƒ˜
©@-4#‘è…çeÕÞA5ž×ôBJ2�*èyÑæy˜ÏWÁÄàpF£õKoá¨Â©žVI‡H¹ÍÝ”Ë2§„I½ƒs|ÃPy_òäƒqnièÍF§}’.%A @ðÀœAtÀÜ$uzéP*/»BWz¥Yâ°OvgZzeN.0[4*§¥CÓðDw¥–B'Ï‚‚
¯PâduíïN‚œj§%ø‚<@�ñ+q"h/Ü.1/5Ë<ñÀx¨døE<˜ŒÈ=hF2ŒÅ‹ªB_¸þëe0Ä@ÈÜë$…ßœÊ9P�6ðÍl`&Kz�aâЕÈË=¨ƒ:„‰höÂæíJ<œÍ�Z³uß0æìŒ&bÎZÓ‘ùØF\±u=\	bñƒÈ(ÓNR`¦;XÃ!ÈèöŽ¼x*gp¢üÝȦÄ>äÔ†mŸú®vZ+&@Â
-À€)¨
áCHÀ,&×,ƒÁB ŸÙèQð™À|ƒ8¨
4�!$'ô…!l@”ðCÈ‚
dÜ-$‡ªiƒ$Q‡ÃÈxó‰œ@Ÿ!dboF&lH@C*ìÀžlÜù‚œ|œ6ÈŽ?ÐCŒ„:¨t4`D(‚kŒxô-ÁÄŠÊ?z\· i¾‘DØÿ2ÖË’‚ÌZ缂î^·
»g‚f°žëMLVÄÀ’Ù îiÁ¼¨‚\õClF»9Ù!B¢(‚84�Œúba2ØÜÐÂÍåœÍÕÀ¨À°^˜

ð
4"ëP„*°vÀ™@k®txb)É”‘Jb¢YJ^>~úF�´åóç-[¸è©Ee�:Œ;¶vývlÙ³i׶}wnÝ»y÷öý{5Fw{ÔXSWK--üöA£BK¿^´þÝ»þ׫4„74i¢j™‘
jR©ÁAEQ2Zßö½;r‹“kкkQÅÉûhªÚ„ÖDœeŽPc*Ôð®‰T1D‹&´èe ª‡
hiB�#i#•=’ÉdC¨h¢
kTÙ£�=ÜQ�
Ô8±
hðkB–þÄñç�!Úð'�hC‘TÚhˆ6iQ
hhéoqh1‚Š[îñ‡fÃÇRF*i’”H*J’H*éÒ.¤øÄK”&ÁDJD 
`­@éÂ+
XP¦J
NÚ`
På+Rì›™<¸Ðu®…
pÀ¡(¿‚#¤„ß(a‰C}å|]VLW‰~‚O‚
ý'%R…ˆbq
 ÄÔh©+ðÁ�„@e&ÊOPXÁ‰�AVv‰w¢m?@ŒÝ"Ã%]±©W0]Ç3f*�š6ƒ¥ÈÔ"N“H�¼áïx}ó®Iª
\Ô#×US	Á[3ª TëV±ê‘ÆOšì¥X»*-¸:ó¯³,YǺ4YXªÝ[*÷€ùÕ¯’r”ÁŒš?¸=ý=fJ“&�©TJ+}Ø؉×T”4×2–xBP°€ ¼øxBQ
³
~RÓ¼îWEöÁæ±�^Ò®,Ó%6I]
ø$ùJl ÁÌáøØ
Ð
°Ë
þ­¤Ï»
Ñqj6f´Àü¡^à昦ŠánAJ
ýxd4ÈnAᘎh¦äz¡ª„ÂPMRaî¡F`(¨„8�G’¡þ!FðnáìN‘i‚âáÆ�læn�PÆ„Ñ€ÔeÔ ¬áˆFTáö¡cüÁ8A`Ôá䪘%â
¸�€&°Õ!šÑ²qÔ
«´ÀRÁÁFìíjG2Rb›úØä1¡ßœ(ƒ%¸fîrB!±…L¨Ä6Áv¸éÀi�&A"yðV¶plÒl.
W"#%LH¥*� Ò
þ½¤�¾©�ü…¸F%ÞNL2_êøÐ�º|Á¦˜�䞯4haúŽ‡’(¯ïÖÄÁÔ Þ¡æjÁ"þ¡¢À†`’a•ÐîÔá²#Øq¢„na
ÂdTá2¡?€¡J a@øC
""E¬áRãha´A!/©@2A
€A Ú`za,‹C,⌀&°
¨à!EÚ@
Äá6DÄ¡	Ô
1ïr@>D8
†@
z�I¼Åd$P£	zá>a2á2!6¤9BEP$s8ANd6à¨Àj ¬¦vØ$k¶�k¡&
Kþ!»†2 at 2k*rrob:»Ä„üq%–­ÁS¥XÂl¼i2À© Ó;ÍS¥J%xÐVn¥›R(Ùh°„ºi"¹¦lºÅV¤‹ºhꦲk»€r›©(”A-
‰â¡)qŽ¸A†Àæ~Ž�”ñ­�ºã AÚ 0„’ �8† ÉÃ@"S´`Cðc¨ CÒä/j hT
‚”
zA0‡`ŽäIT
p@†@šÀ/9A
´À2D† äBÆ:D
2�
Ä 
j L 13!‚ÔÎÁÎ
¾ƒFÅ ›`b`zAÔ€Tþ 2
(¤?$s�
’òRaVD�S/2<U‚&L2ÏrMòv¶P�ºD"ß3MZr$QbLÚ%ØWÒÄ:gÇ<%á"A÷hL¾Ó:¿Igç¹”�$nÇ<GRÙnÅ"+ÃU"ã\êWâA—oäJNxš…§¨¯AŸZƒJZÄ�8–¡&´=¡T .Ñ]J	`TáÕŠÊÕ
þ€A0UaÆáÜáMõE0o¡GÔ`dÃ@öÁ´2´@ háDÜAÞ@
–ab`EÞ
	’MÖk.’$^•›€o†.ã!2–vTò›ö¨ýÙ¸¤WÁVÙ6
$G'¸s>áW¹D#ãVOG%
kl¼³k°kTJ i¢$A ÁøüìãB®{r»ºkå1ZWq�z 4hÁæ´@ja‚t–
Œ‡ á€Á_z!Ôc¾
(oaD
“
d!g¤AšÀèÁÚ@ê•“ ¤	S
ÞA¨ EÏa,ÑHø’
Ž€J¡,ÿ´
!þKSáSg›—3¦	€
¾á=TAúÜà¨@Ä uf.¤
6àOµàTA
TÁY“JÛàô”L`dA]ù£L!.ó=‚ô|ÇAÊ!
CUc2kÂÄ"M2MÈ"qUMèðgG&…!ŸMD<÷ñV¶	!O‡kdP=¹	l÷V…P( ¡:xM̆‚mÕiKWT"Kbã`ŠrRp›á¡O˜µx„rq‡˜ˆ±…50s_ÖaBãçzAc¾A¢_ ágÄÁ’!`€Á–�ñ—–ái’áqk¡»³˜fV³"�°Ø–!
¹¸üACƒþ¡�i!’
êÁ‰Õƒ!ÞÁ�Íz!ÆA>æ(DT
_za>Ä
`VŒ+9
ÜÎÆ¡à¶2^UcÒlÝÖ­°šÉænÛh�ÖùâÄTï3jQØK"� ±9 3[x2J8Kì�4ãÏ„Áœa'K·¥¯Y…˜Ÿ›°gCû¾¥ûÚ"Àïe n¿Ìå¦ÍÅ‚®j
h)dÔ*­8biðO¬üa¨‘-m%#>-�

 

@dG:ís%´ÛvîÖ&8LÄÄUËYœÁpm=Õl–p±Öz„ž-LÒ:'¡6%¾“¥J,ã(Ãœ(á¥:n at E®žK
ú:
AWAÁœ‚F†8¬
 •#³#f­Ì]îKí¦I¾<Z×hJ0�à*‚ú'ÃìGjD­—0¢¦cz�
‹nizÍÕ३Pѽdz·]ü˜~
‚ìÚŽ®]ò¶ðn
”øÊ©¤	·a¬Žé“z
ªb2íþòëªxîÀ–©´q]Ä_˜òG

J¡s†™� :!(Ak 'ÌÆ„W쉚»y5=	j©™¨©‡%î¦0–:ÛmÐê!Ê�Üi$Î-DÂV4.©í	"Ja…[…0%¢ø(W´�W¡Ï¢�ºœÁºÀÁºœ¡¸€»‚²àŸ×ª¨"ô€¦Ä¶ù¡ÃæG©³'ÌÕVã‚4ß]Œ™¦Ž•rmÖŽÎá}.ˆ
¬âjؾU×fÑóo\É.€˜ª€&ù¦ŽòƒIÈØâpâ`k/’^nfb�>
þ&§

á	  
€
Ú“ß¿}îö¨YF�V
ZjXêÓ÷.ž?~.ïý3úïÞ>^ïñÛï×}û¼ºC{Ö¨Ñ{þöuå'v,Ö«qýÅãç¿háºÅŠõë>¬[¿Þóúvëܯ`Yò=lþíK~w1Õúéâ´rÞêÏÝØ—^c–{/Þ¿wþòÉ%	â$ImGšR 

q†*° $"\A\ ?P‡@–T‰Ô

ç³Ö"‰¶ÚZ‰%¿Q'€0Ð
 €–þ ˆ¿ă5¢Zα(®P/�BÜ€¸p.0l
Ôq„w$ƒ
œÐBŽ 
ÒaGXþ%Õ~Ðñ‹¢4äÓ¸x5hAø†
–1‚+Ц[µÒÄCFt<_5L%®#	Jh@=
HXì‚A…eÐâ‡Ø
�ØfxÒÔú,Ap" 
”Drn
‡~-g@Ñp@Ѐz5p
>Lâ�‘Єú Ñ>ꀠ¥x�
Ô*bÀØlÜqˆOÖÖPƒ$'»4�MH… Çš«H¶ni®ìqw
™Ør�R²SBsËØC›ÉOŽ¾…Êhaq„�îP�58a
-¨¢
½xm�kt3A›à&ðñÁ‡Ü†W£˜­ 

}5€�À•J�¥ž
>tA<ˆ „/♇bÓ?Ö
Œb "õRÃ1–�Z”ôÔ/9¹ÈG.r—ìgI�A-Ô�–oì
½¸ÒçþA‹±ÁÜq‚Æ-8
»LXµ“MÅn—aEmع
[Q‡"Fý6²Ýu’m°ÆÛÁhˆíF´°ë!2quV
{H]R’ÛQ[c§‡¹ÅÑ%TŸêO>D0¶fºÒ©}­»…-ÖJ…^˜îÅÉàD2æ
¸Ã‰íŸS×Ü!øNõ‚§­Û2RQ·&¼ƒ
ðpC"@!þ_iæJñÕÄ;me‹f#
ÍÖ
ýF
ßp
z°64cáèŒx™—zInq$…óc· /‚3±ôÈ�€A˜€¢ØhŽVÂrÑ'àh�–a2Ñ']q��yoB	I3wþr'–a%i˜¡Ñ�’1*R$«ÁªÁ&\±&…ñø`´1<“àkÂÅAðÜ6’¹h	OÀ)’€œÀùnljœÁ©œÁ†+ÁF•A…¨=7��|À BÐ|€Š<ðÁ>¨Ù	Bp�ÈmØœ ×�âÙý„>|ðÑ™œâA1hˆ»ræ ã@ë(Wa
z¸Báö qêPÅ`ñ€ú 
è°z08ûw—ºª¬r\!=v´ �9˜ØXŽAº­ù'ob éU¤ãÈ� §«…�xq�Nz™Q&+º�.Á˜-Q£%*¤+3›Wu�™á&™#ÑÊ™WQ™w9¤IZ!•‘Ï%]©BA¨±¥»±þ-‡H1»A"¶H¨ïÔ‡¨>•jíº›¡'_úZ¦¶Ò¨¡·RÖ‰öm 	bj�¹øpæñNå1"{+z	ê“¥‡(–jøkäq<¶`(”T‡²Z at I¦PáðbȨ2­:³4[cŠ3IdQQ¢‰aåH�°IlÂI
>Ú™š2£ÌJ´Œ‰Œ‰¢‰Á˜bÁ¬Q«ÑJ¢ŠbŽ"Z$¹%*™«r�ßEn!@꣬Iœùö€›ñ²+ÁÆ°·!]{¯•p¥Åómh_æBîM|º++±ih<e
_�:z› z~Ê·žg>lx¯+…“rksMºY<{RVþZ¨å
	h©–ž:6´`
¦
™e{d;£}âÄ©ò0”
¤@	¤°ÔÛ¤,P­MÊÒOPÝR¯g	U=ÕT­,€°MýÄY

ý„ÕÊ
Ú$ÖPýzUmÖ-ÅÖL­Mýd!i=Öa�ÕK-ÕK-×UÍg�ÕáG
R-Ög­MyÝR„ ­êp½ï‘
Üà-<¡/ÜËcÒÐP€Õ(ÿȔҙ`4·Öà8âð
©Æ$ÿÐ�¦T5Y‡°·­g™ W&Ð&¤yá9‘,1ð ¬þ×õ0Üÿ@ô0®õ°',Á[1*æë_QäW‘äÂM�R
‹±ýõ0%þèð��ðPäó ù€B�ªRðÀi	Eþåð(æþ™ÃMÜ^‚s^äûÀ	´æŠŠÓjÀ0pÜp
³æÊÖÌã�þº}2€ÖЮûÀ
M`œ@s©ðÆØ�F3;ðJT°i‰Ä”g2ÿ€Vj@Z°LÈ*�é5æáø�`άü°äµ	2{'¿N%AÊ„±�‘)¤AÜh.å>
F
_µéI<­½:i­ð¸ä*�Â
î¬ò£y!íP½
�5Q›0Áþhù0ßåÀèbËæ-îݨCmÅ$å1á�ZAÙl4>ª½�îñ „e±ÜPg‰ÔºÿôªG
9[L[eq%À@3>¾PE­ANkŽbA)[N[žöj¿ölßönÿöp÷r?÷oï¡e_½P$ö™éÃ8J%÷`®Y¬«)ö~ÏIŽiŸ[^™i
[žÜê™üàäŠþaÜõÐ>¤‹ñbgO%æê&»Ž�FCE]!iÑ©™PKª�:¦Pº‹0á
õ´ïŒ‡
«K±1 at Fh'[Ã5\S6[#ü¿_6‡27Àoüs#üËßüÎÿüÐýÒ?ýÔ_ýÖýØÏüÌŸüÈüÄÿûÿü¿ïû¾?7qÒýæïüÀþÍ?üëßþëÏý¶üßüÅÏýö_üâïþÍïûëïÿ
qd%dÉû@‘61%ä£`	g÷»óAqxI”`G¼øÂd¨âíàD
Ä �p@"* ÇBçD:ÖÑŽF2™h¥9÷¤Â‹cÞ¹þ;~ð‰0
$¯x�k¨â†Ø
wü°Ü]ö‰YÜ¢¨O-&ô¸¡‡L<$ª¸ª*¡¹xÚRŠPkäöÁ@”ÑÂñQ…¿V¶Ñ·àF;ö1×ÜcÚ¸7ÙV¾Š,z降5R¶Î�d­}Eì!µqhŒÃ®÷XU2^*O&Ö²K�yhÅϘ^Ö³äÈ7L1Žw̃®Y0v(Ô‹~ÖµÔH(k%Ÿ×ÖÖqûÇ-ôiW%þ#ݤì-m;Ü&ñ£—ZìKi‘
�–¸Ï�6hñ�q(‘®ÉÈ+k¡»]µ�ЇÐÂM¤d3Ô‘n#_%]zýçr×½»ãF-´QÝÆþí#µ”c{ß»_	žcVþ åBêº:Êxw�k-ß»�·¢'„†,ÚCW8%š�vnñM
Nî´/œë>ìª>—¸#oµÆ;X‡–e\Ǥ•5qŒyih
ÉÈ ?j¢…&ÐâÖ�©šm+dQúÁ�&…maîi–Ý\®øzYƒ&¨ÁÜG¨ †‹ÐâŸû²JÔ«ß¹ŒÚÔé­#©½ƒê�˜þ×°¬vÕ¨I¢
ù:ÖyÉ
Z$C
{ÈÄ`:7íž%L¶µÛ¢=’xÎèæ–`¹™ôð’ŒùÝž¬CS¾_ÐñÉ.¿E*êÁ˜o¼cþ0‚±·yÇ'„Ã9Çž[4^ÏV¼yo¡Üé H9¢·Ú€É5h1ò[çúÅ(ßúv'§Í×BÅ�…EÇ;´@¶·[üK¿ù!eÊÏUÕ)¡º=é×ÛÏGQÇt:6
(õ‘ŒC¾W÷•å=ÔÄ?—®ßÝf<
ÁŽÜÕÜ10éN›»j—ž­+–v¨WbpBOé#1þã 7f[ŸÅä‡�~íùÊÿæÓ-�,4¢�k�…¯Þ|ÎO+åì?uLL�\tÌ|£DùŸtýM|l�¬+ZûÜ%ŒY‰’à=’¼ëÙÈ28Ð�»� 9”€¬ì=„À	\‰‰Ä@óþ<辜Á
Ú@¬«ó±�Áéi-Xã}ØWµÒ!1§“‰£L/ðù@�ÀA�¸Z#<�¸¾àj¿ÿ+^R„mrð;�±ƒó½Qƒö«+Òa?)Òa/ÜÂèi.᱄Aç»»x`ßc¯S›#W“0ÜÂ{˜ÂÐYCßkC9ü=P‹@~ˆm›Ÿ³P¿ë­)ÔžÊÛCó‚Âèx?Ïë·Ž‰¸èQÞª+}`?ùŸ¹*0Lô°Õ	Ÿ3Ñ™;TSÀð‹z
Œ@´Ç>¤<
âDÎëÀ£2»Àè­¼+°ˆŒø1¿@„»ñ©8 ¤<²GL”CÊ©I³[�{P‡w8
èQ‡hìAÊ#8«8qc·oø†s8·ãq 8þqøt‡xP1¦ŸsȨK¼\�q@Ëo 0¾ó}@‡³Svx�—d·O#Œo¨wø˼ówpKwÀ-wP‡*AL|;º¢ž“ÊòQÈÚ<܉À=¥¿ô‹ñ‘"Ž¨EØ›#þ›½û3ɧ*»X†ïFYHŽ¸‡qà5
-hÍ„ô:M`@*0„exÃQN8‡Lp6(q‡xpËàŒNë…e¨	l!k6N 0활o
*¸uÈ*€ÐLPƒgû¹­Õ[¨‡Ó¨‡ºx6mð9-þˆTžS<[qà„gK†!¨Õ^�ÉThƒ^Ð4WõD)ã2mø†@=«ò›10v0…PwhP„SH`HV²`KÜ18„5Mqhƒ!(UhV`žÄw€‡
†\-xäT
NKdö‚=0„=1à»%u#Z:Z%.s�”ÓÞ{[Bh`‡–»V`®ÐâôæX5œC8E8EæÌŽ€Ö?5‚ehažä=Ð_kÐ4-à‰œµ‹Ã¥U»Pƒö]™�©£Ê‰°W`hž X5)ž3„�þÙÃ}6*p[Õm‚,S…[ÛLÐ[ø9C0-¸öPƒ`(èJý¹7Ý<mÛ[È‹h#0ò)¡[PƒŒh‚UYâC°(3ógN˜ãÉ»‡[¨�=HbN7¾˜{àgìE!€†6€†o ÌmƒLøÚ«½³;«Už‹0Y]iþϹª·C|3*™ÉVäDІM³†dUÞƒž
5‡Ž>„Øu65À•Þ<­	ÞÀ
¶¸ÏrʺÚ<@<µÈ–ìɦìʶìËÆìÌÖlÌö<Êñ5•$@`0a}htèzp‡`Ø´[h¸(Uq0Ïd�{€†[ð¹?£¶õRv¾4<K†LøØÚ朂†�æ-Sh©ì…K8Y0†X,EKkø‡ÀÊ©‡z¨bÀ
S-û†d€†•Í 
o™²·ëq¸…qaЕ‰H¶üZPb¡÷Q/ÚNÏQwPkІ`oËÄ-
î	]É•oØw¨d
Úì\þ×õ]çõ^×õŠT‡ÀI†oÞóŒçKü‹£úœÎ,¸¹ÚÎ(	ò‡û6ÉLÆBEÒì0†¤G{\Ÿ>Ô¾½µCŒŸ-tV×ò1G/Gûñ̵ÃT­žBÈ´öΰ,ÌtÏŒÂòiÅŽ±ÃM¬¼Sw $¡¾ÓtO|�èañœ+3„Èó20²T‰$�M\¤=ÏMËëì¶�ù�ù‘'ù’7ù“Gù”Wù•gy•'g�×nÈ`›�íDLL¯TuÎ#7&®Ay7Ê”íA(4w…¶`‡W"üwpDÄrŸòÉãV1ç«DªGp¾üyN¤+Ž,Md,Aø¡ÁþªwxÔ
wäBŒŒB¦Ë^	­B
6µô™±—6¥¬žT…;*bÀ|ô01ÄÈ/‹u"œunò@L|°{�yH|Å_üLJüÈ—üɧüÊ·üËÇüÌ×üÍçüËW|Çg|sH.˜†i¨è…
ãyýŽú¼�MÜÎUçDÇ–w3ì@â“LUuö¤sFÉtlIÃÉiFQ¯ÁŽáz®÷0j´®Î™zëêùê8eçS„J§ôýYŸÇnEü”Ðz¼;²Lú¾_J’ÓÄ÷;Ä[ßÄƃB†¼{ãž{ÔÄ �ó“°x£ÅxÚ,ª}Ð|˜a
úèp!þĈ
F¬Èð¡E‹3VÜH‘ãÅ� C2,8q` @
G© ÕëÖ=~2ýí»÷oß?~ûøåÜGsßÎ�2wþª“'Í4iΔéÔ)РCoÎÄ(?=ymÊèOœ2oúãwÏ_Ù®:{õ¹“*Ðœ]™Nûï.Þ»DÙÞ=‹gY±9“*-kÓgÙ›ŠñŽå©©Î«[±fåSîMÄh+oΛWëæÈsA¶Z,Ô´›ÑŠÕêùu^h´´�³™7°´¨´‡×5ìà‡/nü8òäÆõá“WŠ%J–¤G�ª:öìÚ·sïîý;øðâÇ“/o	%P�F½è…J•\šþ÷„2•j–gÐúNçÕÊÕiRˆE—QXi—\BU_}pù„€€õ”‚
õOLøõt—c¢­õ‚ÂeEŸLµ [H¥•‹H=V˜bKfUzuEÕ�H
æYoM[e‹­EUVw©–ÙˆNeÆ"‰^
Wœ6·h£‚ZYC‹nT졇Êyù%˜aŠiÜ>ÌÉã‹%‘H2‰&‘L‰›’H¢	�uÖ)'žv깧&yòù'�~ʧ ƒÞ‰çœ†Ú‰h¢Š*ç¢�Î)‰škÂ	J+5Ü2L*ÞsÏ<>9¶cd¶)¸¡¨z%¨e\±Ø¥Xþ§jd[Y#‘<~Øa�”1þ†Ù‹]þ&¡†¯ñÜ[xÅê£}u
‰Ó†_AØâWÐzvT^Ö{챸©í«6n&~<j-VŠ­Õ-q²Ñf^¸eÙÛocÚ{/¾ùzæÏ<ÎQ"	&—L‚	Á˜¼É¦�O20Ã
ïɦÂ
Ó	ñÚDl°Ã'lñÄs¬q�{òÆ3ŒñÄŠñÂ-/Œr$–3Â0¨Ü‚W>À´‘Š;®"É�6Z4qÈ;™$`½Êv¦*¸y{œµì"+œ`ÄI-¬®ù6Mõk[{†îb_²û¤¾v‡Öµë†©M-SVùÏ•Yn)¬¾uÛ}·ÕûØ#Œ%s^br%•`B©Ë&2Ä.þS¼0Ǭøã�žxá‰KÎ8å-O~yæ•/Ž¸ÉŠ[®1ã�/ñß2�p‹ÍúèƒÎ"1˜0„5ìâDÅ!{à Š"$Ùx?<ñÅ{yµñŒ¯6³Õ晼»ÑkdòÕ[oœNøb‰à�.\‰Ën|0ø�‹/þÂèŸ?Iàã»ïþúí«~Ëñƒ??üé³Ïþýõëÿ¿›Ê×?
S8&´Œ°nls´¬„¥ÝÌ-\*¼!ñt²·4U¢O„�	Là¯aú¢›�X@!,þ‰|[ÆÄ#FQ‰„b•ˆ¾)b±‹ÿSœáņ¡�€Nœ%QZÜ‚ÿЇ)j0„!(‚Õ>Þ¡�Lh�
MhBíC¶™,‡†<$"s˜•BŽ©yï‚^n¤çê%²’÷Ò‡<@a‰GÜO|
ÛÄÄ&06ýÍql„&P)ÊIŒRc*Y)ËSrÌ`¥„e-S)ËU’u²´X,uù·[Ò’”Âœ¥+A·Ë‰Ó–Ž+e�bù7T¢R
¬�,z¡
}¬£T¬qv˜*[Åpƒ"šŒ6

ÄÈF:^w‰o&‰U¨’6˜DÃ"a1€±R TÜ#áV:qò¨”Ä
%q	&““jr%'5ñ‰6pbpRë%J9'7ìor:¬]†±ï­©O‹Dàæ
M�º2±‹ké
öˆ7Á‰•{eÓ&û&Á)vQjE¬j'J0JdÊ%ðy£^~‚6mñˆ5xþ,Òo”TVá9õ�Å©gÖèöàÞëI‰Ñ‡‘¶ZÖ{J×3ú|[ÜhPä
w g¥Ä‰8ÑW†Œ˜reŸ€Ø'8éõ�@l#J׶ZqMl ÚÄ°T–qa…X%5¸Ñ¶�NÐÄ„z]i0¾¬e�T+Á@–RüÊt˜ú}™�5‡	Ú¶§Œ™Éc\³<Ç mH$œ*Œº»B¤×jS–êFõ.Ð}ntU$Ç‘Ï»M$Ú4““¶°0OGZŠù	¡�(�$!å„ÉUNŸÐëF10�"Á{Zl`5šXüfµš°+ 90”íõ°o‚Ä'®Ì¨”–6™«Uþ`$QZúzr¯�ÓóD'U'ðY¢8Èf§.4ñÄ&Œ$äŽ3ÈT"'g‘-tb`ÃÂQ‰81©Z
w•s¬¤@7Xï¤.¥‰s]~f÷ŸÊMµ@ó!�#'™Rók#Þ̇5¬¡¼^( ѧ�6¢‡£¢&zíë9m"Ï;mèÞć.P›½¯d™iZ£Ôî ¢M§oSÛ
k¸B¯ÏÝ>
è‡æêl¿£¤±6êTûØ«ÿ
@ˆHÈõN![”�лWTnB0@§ÖIX¢
8O5!5^¶ˆ
‰Iœ˜$—²¼ZçGÇAÒ¼ˆ•
¢ “ÉÉ$pR^	Öc!”BEÂ8ÖYÊDiÂJ‚zd
!…Þ(	ªÙæa•æm—Æè5XÆÐ	h€ó)@þü‹$ð
h_DÂ'ðA|"¯=�ð
$\
p
P›Ì�ÁÂð@\A‚Âü
(Â=ÜB¨
-DAM´A2Їø„ŠÞBÑ´ÁO
�ˆƒ;P
oA&ˆØ`èC1Ô€¸Ã"ì
;pCà@P!Á$˜@04�´Á!˜çŒ¥RµA0x�¼ƒ×xJMÇ|\d=ˆÃ7œC/Ðg/0|ƒþ?Xƒ;¼Ã2ÐçXñÃ2ˆ§8@ÃP�o0Ò!Ê�Ü(b["Ò>ÈšQaÍ	Ê|‚ÕÅ\Ö%ÄÌd_
x@
¨�"(Â;ˆCÖÆg0 ‚¸n0XCPÆÃ9¨Ã;Œƒ�ª4ÄÓ4ìA2dB*ÜÂhA&‚"‚*|Ã�ªÂÛº¢~ƒ;¤�þ'˜€ãrWZÆK�…\–*ñ̃9La’‰Î%ð"ÙÅ*(é%!|�
Àö€€ó%@�B@@Ì	À/VfÙ­
)ð�À&
¤ÑÄ\çßÉBùÄ9ôä�îã�,hAQ
�–j¨k
­ÜÂ!ÐPþXƒÈB�ºPÜB
ôn2h®ÝBpS7|CMˆ
Z|ƒ˜Â-�Ü‚()Ú¶�
íV¶ÒöŒ8pÂÐ@8÷L*(‚6
d/,C2ðg2ŒüÕúC=oºôíÉÿ'4D*0\¨8XCñªÃˆÆçíóC<8Å7C2ÔÎ…zå9\mwjA�þÞ-…njÏ@ƒ;@æúƒŒ¢äÓjÁ²Õ:€¿5h¨éÓGaȾ'ïk)4è£;Ô„;L¸,ð‘ök
@@ãW/Y<â¬
üöMœ;~î¬Ýû÷oß?ÕA»ÇO›5mãüù7® µeþ’ù[Ö+0kõø
é�qæüóß=qÐÜUôW1æÅ}þ¬}ãw.Y°dЀBKö”Ÿ8ZÉêÝóWÔÂ…ß.nÕ™S­�s&ƒ•6âp^;—n]»wñæÕ»—oÝyæ|QŠ„iÒ$M†	ŽÈC€
¡@
:;°´i“�×< MbT¸Ò£Kš$

$ €
,Œ’i\�ETDËC!ƒÌ0P
#ŒÒH¥Ê´¨ÇKu”Â}ÄœÈÓŸ…ª“KDµ"j,¢Ä
éþA
ÑÚéÑ
rP¡wÂIL3ùi1Ê;•ù¨±c‰ÏSù,Jhž²ÆIF�dþ³kÿÜi(šßt:§?_ÌyŸËœ™ÇBã²I9ã’+k +êB£þþ[ñ±4=K'µF}+®V9ïÜóÏÇzÕYa¤’H®»µVHø}b
îp@�
 @>
œ·3
n06 at Kô
@Xò–"øôÆ·	HdÏ–AˆN%þðeÊGükè
4ÀºY®A
(À- ‚'<2"(€
Ÿÿ)P%$¸	R
8�ƒŠpN ‡)íB1Eaš�U6§¼4Ήƒ¸êUkÜ"sp«¹áolûcòÆ}cþ|NótødëaNGHŸ‘è7$'Q7ëy
ß$@¹Ê5
JgÛé�0ü7S9(;›iÞ&ô¸Côò>Šû¨¨{$£8p± clzÙþËØiöÆwêTg µªîžDg«£u<ÁÄ`âÖÙ%º å1 
â”3>#A\i1ì)ÙÂ�«KLÓÍ:¾À	À~BuŒØx¾¢? GHŸ:
?.š	®ïM`b:×'™'ò‘M2ß–˜ENaJô¡P¡	ÁVŠŒvä&Fïb'ÎA
¨ D�ÔAïÞ�
Ð"Þ!(¾íTáâáâAÖ¡OâÁºbnA2A
’�>�z!Â&XKâ¡·î„Tá(âzÁJpÅäÔaS
iáJÞá8ÁÕaôÚ€
¾�ÍäÔáö Úþ Ü!®Ä&ú„7naë
­ŽI¢Iïhá–azp/¢¢—¡
2�wP°�p"’A
´áì�°SBìÍ.1ÐH8
+êP‡öaA2Pºâ(��#�ºB
†`L@¨À†`doÒM'–�ÝÂÊÝìdöxѬ†¢Þ@�‘¼¬Èþ�­:N@ð%ãôÉßØê˜Ã”–šœQ,!a*ë¯òïžnáÞ*ø†ndtn_„nýp/_ö‰­i­Mß&_ðÉËjåßô¥èv�_ÎÍékå
ë@,¨záÒþa¸`L`TŽ¦qþt¦À’�§Ô@¯"Ô@
 ¡†à"Å!ö@!(ÎAš`>rÜ@
ÆáÚ@
8
´À$ÁÅP
RAŒÀڀġ
´ TAÔ@Ä
¨à�@
Ð!zabp¨ 3a.²
¾ÁáTAZr”DÔ€Taf,Ù�Þ��~R
AÔ@naö %�AR¡
|².ÛÀ$’
ÐRZR'iÁŒ@
A€á"iÁ.Ò"eÐ3Á«².¥Â
´€îA0S
n�j
záz¡
a"!n¡
nÁ&_ÔhÁnóE�àNó&mTRáµ.�`†€®TJo“n,/RàtaE­A”tNIôõ¨À
Ú 	’Á¬�¨0
8¡8'ò"/Ò¢@RÑ3$
µ
�
Ç�Ú€%© v at 7±TNÕ€H“aDÜ�
Gd,R)âígjqmV¢Ýdh:±tnÌÈ�ø¶3ȼïVfÎÇŽûpe2ú’®cçÜÓþúÃ=DdtLüx.ãˆ@½Ó>óÍë³V¶“­îs]�?‹uŠ1ÿþ¨#4’ëç&	Ak…Ìtd°ÃÍ"Aœ‹Xfj
	hÀhÁÃêF‚Ä�„¾HVRK4HSáv²Ió¥t(Ë”
Ûàõ
H•
ÔÁ™–
ntîp~ÕhÝÁ¬¢	Ô ¾á#©0šRAj�€$'Ó&‰”kÇp'cÔ$ähÀJRRÅÁFiAj¶
R¡VÏöA'“A�6,±D™Öh3Áô²kSAo{v8ÛR
¢àÄ
 {¡oÝ!¾Á$zs–áp�dWrtø"ÎA‘ÉP¤µ
|²f™ !â…cxSD±.9!¡A>!vµ! a"r3ÄahA>Ó-pX-|ùÄö-ÔáÜ 
EXr'ù\Ö%<²BoÁzá¬AÈ–Á/ÝÁ%ÔAi�P1#Ý

axÒzö®U
"&ÒGß
¨ #™B*¬á.ù°:¾�”!ðu_Ò¸Ò§‰9c÷HÞaV‚7S"ŽO¢²{�öa*ÞAVþ…{´{aÝÆaSäRÛÌ
yS/-š÷Åž÷™�û."çìMc<‰~QÊø,²¢,²>!Ê$C3Ö°údf2ŽµÊŒÍÖl·¤{´$AºÓ»¥L¼¥[3ª[3èw=Þµ_²[»±;¹‘»ÌðCÐ
ö¶Â;»Õ°ö{¼óû¼×Û“(�Z!€A‚÷KDjÖ|êqâ¦ož¦²ŽF´ÂI”HC yÁ
eÁ%glˆÊGöëÛ~Ã’!æN¿¬fr|hFŽ¨¿~¤('Âå¢çDïKvDf¬!DjÜFê¨o¾®Æ�¢ó.Œ'æn&lBÀ&ª�ARìMb
ÞŽÙrâþ"#­õÝ‚{ËëâoÖ
œAÄ\Ì}�|ÁÆ\|aÍÙ¼ÍÕœÍßÜÌ}aÌ×\ÎÛüÎïüÍáÏÝ|ÏÕ\ÎÉ<Ïõ|Ïá|Ðñ|ÐßÜÐùÜЛaÍ�ÍýÑÛÜ8„¡FájáRá"<äQ2mCR¤¥`(ð.EgÜ&¤,Oh¶Bí"i®mpzf‰6­C8
ÇKÊ :Ø îÈIp(¢x�‡¼HØB-q˜fnBüA>jŠ|ntMh@ÄBH¨ÂcˆðfM£$¼¾g£("R
,fjÐBB6œÄ´+pŽ÷C’WÛnÑ9};ö¸üÝÏ­'ô!è=­ðÁðaì=ðáßþéž
"„v+†**{Ôäç0¤È‘$Kš<‰’dÅ�)C‚DÒŸ?’/ÖLh±¥A…3?æüÉòdÏ�C+ŽôWðÝ!5ËâÑŠA‹Vª}÷‚|y©¿ªû^"Ýç�_×°beÎ,*ö£×®sþâìšµ Q‹ldyW`Z»ÿÉ]I×nÏ v÷^õ«ö¦[£2�ö²kA¤;mŒ©Ö W±y‚­‹çÀšHùÉ„yp¨Ø²CVdëV§ìÈÚhiW¡¿d½†ll#N·ìáÄ‹GÛøËäÇ›[
iÔ¹N�îö¨�¶îé­íTsóËÍó´ÌÕ1“Ÿ9zrî±m3wˆu¡Ûåò…7¼ùœ¯ÍÊ
ßïw
_[
òÇÐOûå„~zù§__÷I'[AÚÔ2Qt%“-yD „~â‡�…èe$7“8‡haM<ÝB‹,óüÃÕUø……žd°™öWd+µuUÿÌÄà‰¨þ‰d’J.iÒKµÝÞ�¼AEpö1‰e– ©åƒ]ž$–:Ö%ãÏS½HE£>÷ôrˆ,ÁYeUpýs'S™ÙY¯±R<Ö$ÃRk_Jh¡†Ž$!…¹…!•9xh¤’NJi„¹³b2î¼X‹*úüƒN&G¨Ð VṌ!œŒÃO<™ aˆ*{ÜR-†
[;a…n-ó”†�þv¸pÅ_L”?˜j¡�;fÖbŠ_½ ÊԳ�YTÜâŽ5†¨Á	'Gì
4mÜÜK*m,E1{ìLo41°©+	ŠqÒJùd³	%­†m¸såÒV_]íwbª‘ŒSPÁøÏ:µ4A¶5î¸sSX÷ÑË7mhzÍ!bˆ‘L&m쎪CÅ9ZÜrÄ-Š4‘Šî̇4ÖŠ/ŽRË&dMħv”Œ_Ž9’f
©ñRÚ¸•TúèÌ©hªH*Uõ?Ëq-î<{È8{4Á'Ëð³4ÉpòŽõhÑÄZ¤B…5ùeÎ|ó	5m9ÔÒzÄšóÖ_¯ì@è©Ó†þ]G¶¸iœŒ5Y
¹Úœ5íŽyÞC•Æ»SÏxØßß¼ãþ9•jî³p€, 
ˆÀ*p�l ÁJp‚¬ SL©a"’
‘îq<µ'5Z©È=âÑ•ª€0„÷P›eF3�âo†—ƒžB¤w¯6ŒÃ/-„¡Ä 
qˆD,¢�ˆÄ$*q‰Ll¢ŸÅ%Ú.ÛRÃ5âQ‹l‡[	a†4$°Œg<1žà2®€1N4l#ÖôWFþEff‡;Æ1Žwèq�|ì£ÿÈ@
r�„,¤!‰ÈD*r‘Œl¤#)HqØñlzǶ´p
vþ<E¨¸…i¶’¬�…F}©
�>¹šÆü#
¡_y5>-jÉ3„-UuË\êr—¼ì¥/	Ì`
s˜Ä,¦1�‰Ìd*s™Ì&'q]Ö‹kêxÊ0d‘
²Ä”7âWÉ94^FŒT›Œ\ŠËt.ŽÔêß½‘Œdcñ¬§=ï‰Ï|êsŸüì§?ÿ	ЀƓž-h?ÿ”ŒeÔ í§Bï黄>´|ö\¨ï"ÚPƒb4žÀhƒ°®QM-zP}ýá\Ã2¾¹Œ ZI
H,¦/*M€<I秨¤Ä%I–Áa•°£Žx¨CëªQ�JÔu(u¨EEªSŸšT¢JþU©T¥êQ«U¨ju«AåªW×Ñu¼ãlW]jW½ŠV«Šzê;ÔÁŽ¸¢Õ¨E­ê:â�Žº6Õ¨{+_ý:Ô¸*5®ì8ÛÙì8I²V°ì
nð­{^븼øÕ/}�Ýôª7fâ½o€Û`
K7º‹8EvM,^N˜ÀÌeï‰Kœ]U„ø¾¯zí[ãüJ÷¹ïõèu<f‚ΪBJ·øÆ>¾�6š‚²"€ÂÓµ‘Š¨˜-Œÿp‡8¸¸ݬî+ïè¬8âñ
b�fs-{ÓYLs&ªXãâÐ4ʈ0s‘XgÖ-ˆN3:S†öz›îx at 2Ü=+‰§ŠZ¾aˆ=èa‹Ðâ­‡F/âg�Ž4¤ý³Lkz‰Þ´¢!méPWÚÑ™µ£'­hOwÚÓ?ëôª9ÍêX{ú‡ˆ´ô ‡DâÑœ^´®5ýëVë¡ÖþĶ±kÝè]ûzÑ‹¸µýjY—zÔ u¤S
éC`ºÖŸŽ¦”�ëL¿ËØÆfô·q}ë^/ºÕ¶Ìt¢G
ëx»›Õ–†v§õP‹=°è¼Å?¾¡…*­ùÍî€F/ á¾*®W¥õÇŒ ½µO{¿‹�BMTŽ&T ‚*¬¡
wè1žé³6´ðq´q%o&8GÞŒ@‹»¹+h³F*L
Ð@G +½Ãê€!Còg/Úpø4rS7tŸQÄ‚-¸@0”þ3ôðôÀtÅÅ,Ñ5Zp—å{‘§uY‡[Gufzß@uì�uÅ—ußÀHè„qåyY×xEˆw['WßPuZ8„’7„NW瀄LH…Tèxe8Tb˜†eȆm(†÷nàŽ&‡n°Å „ž…OWHH…—å…Z(ˆ�8u~è„Ð u¨sèqXn؆Hvs—{OXvy4ZhYÆW|߀„ãåPá
ßpâ°
ËÀ	M€h‡�	Ë`Fbäi¡õ@ƒü`ƒù ’ú�$)’'‰’)©’+É’-é’/	“1Ù’ñ‘_âtrb at T~8wµhˆVz]ø„NhYê0¼g”á0è°”�WuEÈ…V(y“e|§uŸÈvEèTNIu™˜Wç°”l÷{]§TÅ0fà9 –i™ðÒ”è€z×@•sGT¡·UU)VKYb –9ð}éi@‹þE˜‹åxFø{ÃXYŽ‡u¨—vJ¨GJ™‰µHЗ9À–Qp
Ü
¡*¡J¡j¡Š¡êÒ°¡¾à¡êø€F:…$„ö8¼w¡Wþè€r·y¶ç…JU‹ˆ™Wßp
Z¸yVgu”'„EHuR’—Ã8wÐ�•;Zv«×xÔX‡·ÑQ
Šž—˜eWC�À
¦Ð¥€×p×°…€:u‚Ú…f÷wšÈxZù
Å0†‡9u¾cY¦H
¹WuO½ð[Ú¥\Ê¥Q`vºˆ>º�w†UWL¹†AI{_Çvpù£T焈zÀ5›:C+Â	
£\3~Ï$ÂŽÐ�
è÷
ÑEk3†`G8`·�*ª�þâ°'¡ñüø
UÂ	À`7“Ð@ËÁ*žÉ ª
K	 `óP(¥%7éNZšKjªz07z�‘*–ñiY{È“LhTåêxqWuÎEŒ[ø
ÀPUWn ¨`I…œÐ6�Ø„f¸„LÈ”µ ~™È	É0íP˜„5«J¸Å€^j
Z¨rP‰gYÁùˆ‰w”ßðVNû
L
QW³:Œ”ú”Åg«Wô"· 
f!rü`
msŠÐdüàžâÀéWphÃâ°CjññT·€€Åk>š1'Fñ
‘²ÓF f#÷
É ½pY»3ß0â°â€d{â»r8À@}ñp»B^ä!!ËA‘¾
ss‡b1ì¸b
b`/.<Ã/à¦P×Ð}«Bë´°0|µÐ›b@S´½àmn€/ˆ¦{Ð*wh«¦@H°j`‡B»€êÆxÇ…³‡™‘k
\|ÊUbàeªfWTµð. É‘‹ú zê
™
Áœ¹z¸‰s—·T—Ššb&¤J“q¢à;‚/)ãcî3f,
?
•;°H°²¬ñ)H ~ÚHÀ	5p]bÐ8-œ€Íì·E-‹É{€Æn€h{Óm0uÌœH°;`‡5p
1ümZÀ	ÂrQ ¦àT >¼;€À0–r§µ\+·
 í0Y±œ]#P/þ
H`
D¼—{¼Q°ˆ°âA+ÿ¨ª�¯A˵h¥Ž¹��óð”´ ØI핉;PjŒ½M2gÝh-¼4¼)ŒÂÅP¸š(|r'†Ö!»é>¦„6±‘1B8e«µ>úîBN¶<ò’! êÌ«µ%øà}Á|Á÷�ßù­ßûÍßýíßÿ
à,Á˜Pߘð	<À¥%ä
%7$Âð+wçmü
øÖÌz€#Pì€á/@j¦0€ÌÌ	ô93þ¥©(‡Á¬7B«Ša`èpÜb
7ým[LÝKæ™ x†§_72ià;¿–;°[ÅH®×/z0nÐJ�s“ÚhÃ
§o=þxeW�™i¹ó.@õC
pÃaZ�ïµÐiËZ»)~
Mÿ0Èh|ÃǬQ�	rþhQ`”ï éVY™•õ[ïo w-l
i°ñ1¬T°]·ÅQ 
Mß“VTÕ|
V½‰›ÇÐÝa0x”MÃÝ­T‚LRèAúVCñ)ò-Á+	åNû“Pû·oû¹�û»¯û½Ïû¿ïûÁüµ¯í|	›pî¹O	ò`
ž%Â…&Û„”šãÙeò�kÖW¿ãE�F[ë”~ÉÀ\{pÍã�{ ÂßÆÙ5^ÏT}›]Åà´œ
¶Îygn¾�íš�JTç�Øйæ›oÔQ§†’AQÑù†-×ÐyÉÅkVû&m¸ÇDYCÒ�^œÒF�q®QFtL‰B$Ü@R�uØ�ñ=La'Gu,S�—¼díuÎyñ�vœbk$ë$ÓE¿9'O…üfu`ûf¤oÆY'6aôvŽHJvÜ<gÌ×E¦:“Ôñhør«kÆa
H;ô(œqâñòœqD}gCâÉ#nR\­53¿dÔËo@„‘É‘
	É2ÑÙCŒ—h1
Yn	Ž»â‚»g¸i!´Vþ¹Þ´ã':é®õö[êöÙ�z´ËÇ—FÂ#P“KÖu÷]wÛ%P^vëm÷Þzß•_~í]—Þ~Öw<M0/
QV¡Iæ›Wÿl³(Bí%=c\
¦d
òæ¾Tç®ÙÔ1FŸÙtgÄÕ‘Qƒåu$˜WÖ1hCùÚUqè{R‘
m“#ÝS$�r’T7I…&®=j‡TÖøjUFmþ~M$Vá92RvÔq§Pm,7‰ÇU·Fþn=G<ç�ØáÊF÷ô[TظdsœE¸&ž[<¾%n‘{öYŠ)†N;ƒ7Þx‰…ó‡_ž×]ò”DH¨Ÿ^u	ÆúwÜ~Ý
½_W’ﻧW|ð
Ĥ’J�b‰»=»qnÑæ�â1Ô0Š= Â1ˆ�
Z B
	¨ÿЀ	Ã

(†(ˆ��Ô•´àÀ
fЀt`3xA
rP� TàK¸A
š°ƒ D 
7xAŽ°„$á
	8¾�„64á]øÁÒð†A¤ 
A(ÀúP…0day8Dzð†a`b
‰ˆÂC´A
Ë°�ÇhA‹âhìÎþÙVvª•<ÍO9¼ÙqÔøF‰ËÎÎ?ÎU‰ðM‚|bŸ$>ñ	[€‚ 
Jˆgaã©T/�Ê�ç<2�(½	J
pà'°Ë’�`TÙµ¾±Jï•P�Ä#.	B 
Æ`=fo<ä9ßô"ÁàUR
È*

‰0¨f’aÑÓ„bo[ß:âäíÈå.=F…6ÀòÐBh5K�iúc™�½&wú�e:èŒ}íwƒ{œÞR·:½Î�«;¿ßÖ¹ÙÉro³\Ôæ¾;%õ²µºå'‹c[äÇm€AUüã©P'öÐ>sBmL£o‰‹cDÏ—�ÒáMSþ	T؆I 
ýl”ÏòŸÊo)éš O\AØà%FMjòµëÓ|Xñ@|auµÄ~þŠOôè„íÂ
k°Ä€
wp‡z ob‡kRm ¹6ªo[,ì°2ÙBêH©¹+#*!<ŽxJ¸"lB%\¬B;ÂäH#)„�%¬Â’š#9Sƒ'É�/Ò
zsz²C[>3T£æc4¦²…RŠ*ïáxºàI@�
™ž¨
°ùk
Ü¡zH6Ÿò{4K¸ÉøK
^DÓ,n…iˆsˆ…Xp†VàSˆ
Yƒ6c($ãÀ|=%ŽüÉ–8FFoʬr`Wdä°@“Niêð¦Ê\d/Ê3h LÎ`Ëè÷š#÷2NègÚ)~¯Ý�oM^NP�TP…þe¼­ÝºäCH†TÐŽsPUXâÐŽ˜Þƒ[p‡’ówP°uPƒP*Ql—dà N�=E«­Ý8
±Þ­Ã‰
XÊ
[
)}4é»S'Ï"3
f'ä*yŽ2y”'y˜Jy–_y•oyO~y™7ù™¯yî‚ùš·ù™'çˆQ_†v¸†óÒ‡þ|Ї\L>Eï•…Oï#Èô#à‡dP*ˆuCЀl‚6°†;£Xk5Xd Ktnò)ž²C¸Ïä!¨Ú=ȯ·h0‚ª5„En-è…6€ƒ7ðúÇ&uPû{Yà‡
€ê&¨3-(uÝ*Cäѽߘ‡ï
~S•)™–&Z’Ñ"Y0U*EZ†)ú¦òÞºo#ÕˆãgD
•dÉö$s÷Îâ¿}ûV‚
+vìX~þüýÓ§r>_š4mš©Ò¤ºt'Ý­«w¯ÞJ~ñòµ+xoÞ¼�ó5Œ÷oßÄ“4Mº´	òÞOæþÕCKv3çÎdõE‹%­8p̘•tfTZTÚlU©Ù3íÚ¶oãÎ-öëÙ”æJ�"eñâÆ�#O®|þ9óæΟC�.}:uBÄ%ªQ«—ª{ûêä§î›?NŠ²òÛçŽ_GŒë÷©Cyöë¿{ÿ
ºSyÎݹ‹ëùyוEöyõxûôÒ„8ñýã�ø�´Þ=÷¬÷NTÞˆV<áý£Nx¡$ E³éFÖYþÐwÏIóø"É&q5²e�IR—&‘Ô%ÉŒo½õØc=òhc$oáH#‘“èXc�:飑?BÆc“5Ù#”>V‚É#”Hƒ™?ô”fXë<ÓJ3¤•f‹-¥l1Ê®µ¡ŽJ)‰Y§�wêfZúäã)In"I#ŒÝå��*I$‘(Z(¢†BŠä¢�ꨥC2:)¦‘þ^z£¢™rZi¢š6ú¨©Ž~Ji¨‘¦ºé©¢Þˆ#Žz1*	(ÂÔ`
w'š%ß9иƒ–Y�äUƒ(ªxZû¤D_„+UtÒJ^1ûÕWÞã�:ÉLè ³Þ98gE*ηV}
ÆÃì°à®dXÃâ¹Ro_©ÕU;Â@&t)Šä�B>VcŽrɈ©\ÿÉ%E:*×%T"9°¬»J0Ž×%k”[|p¿‘aB‰9úÔ³=ôÐomú”98¤ùâK m¶FÅâÈ«²Î;ÇË+?ú˜CÉÚè8­߈´Â‡^&›.�4¦×Øô$OµÖ_™ÓP+6Ó_K]vÔþ‘í…õÖS�}5Øl—íµÛY‹-5&?Nü–$”d·-þÔ“Y´²¡X‘ºh9ØëˆÔ»O²šñOz`Í–^~ð:ˆ8³ÄÎYŸãž7¸V±“󖞺\é	`²]¥Ì3áøC‰Ó1ÞÅج‚á˜×Ä€á¾awÝN×Ý•äîï·Ûµ;­ó¥0eLnò‰4ùìnë®�ÅŽ.± iššª�RÃ-6ËÉöç£ïÙ|öé#
%˜H¹¨•ˆql#ýˆÍ*ÉÝ÷ïu»þü7o`
R�¬¶±(
)ŽQêš&àç$9BIn´#û¸F:ò�m|c ý8HÙ��xÜãi¥®]Í~K„	zÑZ+„9'çÓɆ°Zœ«œl†¥B‚ÐXšY%¯L¨'^��NôY!±PôÂÎ!ŽD:ëMçò!yØÃøæ0‹Ìc"S˜Â”>˜©Ìa&™Ælæ4£)Íg.Ó˜Ö,&3�©M|@Ó™ÄÔGêÂ(þÐpM͈™ Úô&ò±ÐœòÔ™YfIFJ<‚.z«ãþ(ƒHDF	~v”$"é¤�þÓŸz!¤?ZƒÖÑ¡�ÑA%šÐD6
¡¥h at 7ºÐ>énl
.X‹®1u(éUâ^yÊëífN;œVYÌ—iq²žòÑ“¹X¨ËÎD¦*;KXêCÚN„ñôŒ=Å’²Á‰Ñ+…Co乧h´Â¥9�/l13SÔ
Æ¢íŸ2º$ÜdÉS¨YDªPÃh-þ;mÖ¬Ñú)êÌjÚ¢•p!*agÏ÷³Ð¸ìe¨)ÅjÄOó™6·x2‡%
X—Ō冭9`w|ð�ž¦Ý b©Ðe½–ì:e‘Vž£¥ª’
=Ô(Ö4·ètW½J³û’Õц-Є6™I"Ôµ’K¨F+§MB�¨Fµ�‚ÁÉÞ
Ž•
õ¿X‰Xs,¢�äªoÍ\;âI¥(©‰&lYõ‹QÄ®®÷…WÅ2Qýœ%bñ‚[ â)�¯¦{6FÑÎòƒ­ƒt·½ã™-ìÀªVKÓŒÙÖv|H^j¹ó«B´vZ27‚%H

JX¢8–8%dw‰KäóÊtÙ]ßrcóþè/È[ÌÂrTpJ­/•€”ÿ?"MŒP‘)’$ I¿O�ð7%$Á¯ñûß2ÿ÷Åžñ-*Õþôe<®·…ºœwÕŸ WzÊ)"u,ÂâL¢]»ã²*ZRWÓë]'!Ê«7�ŽqZÊÔ=fÔ—5˜¦¥ÕՋŠ”Qo�èÂ
xÀƒð í?h{Ûƒð¢»eœx˜ 3Ç#sðÅÌJ��©DŒj�‰ÃËåÓ]pû
Ö0—KÜmP’y‘Ñšö‰O at bHWÎØcÅ$Hº
G�‚Ûy ?’Cb
7¸
Üé÷ÒßÀ‘^_GÂo\á�Øû'(‘ùYžQš˜ ød�I©kþ3)så
·Éͦǽ4…/âVXõžŠ«]è†Vh5Tž’ˆ¨×ïLSßµ–ª–]ŠË*Yf¦ {Of«yç¼_œþüîc¼Õ$„P


Hª
"À~®.e

ÆAÂÐ%°H6
€d-s:*%¤gHeÿ�À\
H+¨†- \�RR"ÞZ�Â8£
îŠp%rnþ$X‚|ê

¬XCÊRA0œÃÍjÄ0/4ì�!ðCXõ'
 Ápë;CÂܺjæ-'à3
�%äþd` ç$CÀR
!X4;{
�•à¢4‚ç"·ZB˜(€§¶*`^#ðÁ
¬t%B
MȈàÔ|
™flDK±Ž³4ȱ‹|üTäU{âhö&u…˜Î	—‹á$Î9<i™~yº�Å>¬["BjÀû”›v v«û�ø†k‰­¬s
B
¾s
€ÐE¤ ‡ƒPêÒ`@
|�+•&Ä/«M<űÊ(AŒJD).¸X$Z¨hCœýTܑǪT2Ç’G4©„8L0©„P€
>ު�P
GQ¿ýÄ	õ‘‡’Gˆ¼$,M"¹ØêàƒÇ˜dª‰/>y±0QËIŒÄ8Tà«Öd±Ž~zí±|~m«E�>ù§·§éã€×ËæC%5,LŽg>,µŸþ‹ää’'ëþì¯>T«jÅnqTpåùX‡;,¤­ÏQäßІ;öá’p„�üxÇ2€¡
ÌaÈ zCÈ?’û„päBJÄ„œ#î(�Iò†€ˆ!Ù�‡”%¢E„#êàOGÞ±g9ä#	
[h’Š–SGÄ1Äüà‹übG-Z´…8t‘£¨QT¦®,ž(a‡9*v쉯,eËðÞ'–á'TxÂãÇŒC½�á¥dx‘#žÈGUr, :¤"•Cª=*/€�d$‘7È<²�ï•&6‰±áñ1y™dûèINâïc|,hQ@~èCþù¨…!R!Ž]ûÐÆÔpu¤ÂüP0T1AZ¨�
jøºâ­j…$É�¡G-• D…5dW<’Á	m
‡ˆB'Z£Etb/ AC”ÄcZ6,\E¼¡d¨Âq,è	ù
�=$ão›CãBM¤�k$‚`-XÄh£Ú)Ž¡Å	,²;J�ï�Ñ+$qŠC‹ÁexDª#RZ–#Ý1c)UéL‰	ßÕ´�#)LM:ÒŒýô,GÒ)I
Ô˜
õ,Gµ˜J]ZÓž.•8‘8RT§T¨ÖRÅ©V¡ÚÒHðXɺ‡:F#h!˜þܪÛ?Ô …=!œ  5�Mdrbª -2Ák
æÎwÛÇ;Þq#€3$/Vt!ˆXÄ!¢HÙÂìÈH·ñ¾÷±ÔG|¥A	�cgÑï~Ïb–¯öÀþ­i#hàÿþ7À	ð‚õËà¯Á_•pƒ÷+aÿ^¸Àvª…7Üß{øÀþŽ�
lš~•±€Agiá�s¸¡F`CZ1*^"™ŠXF=Üq5¸mÀ�誅6Ä  p“J–Ñ„¶fâ‡Ø
/›Ð#�DÎ'n‘Œ64�œÐÂÁË6˜ ZPEÔÐVw HoîB’ùdî
ÊBúX‡)r0„1È¢¹×=h±Ea�ò-Ü‘	#Sá8h/¡a]þxËúÐøs/¼«uE´‡°F¦Û
+é}êêèz®Py¨¦IE³ðbÂÇÁ0©
Åðöl¯jˆ¿ðjÒ0§¾pyš§Wba†ÁàŒÁ¬Á‚�è€è@þ
’a2AJKf‹hÁÉ°	ÞÜ�ú$Æ>jkÚlà@
¤ë¬á�Ü!€á–á€!aëz�Óá2îd.²J(#JâæøA®Ð
“!Ô!‚Ánaý�Î
€AzAºAp!³RábKTAR¡Á¿O"Ö¯´Ê‚¡ã!
(¾æAŠr)uH�!ZüïÄa#Z@’!Ρ€èòdHGBH]È…!¦%@NâsX"?‚*\b²‚…&d+²r2ó#njsè…‰ Â!è
sx°‡à3=cS£O�ÒÒ !Aw"–ò
–Š-¾b”FkT¾lGi4`ôEk4æ!GƒþTHc4ÚaH�ôFcH�tG‘ÔI“4G÷AxiÊáLÀàdáEaÔ½bÂ^~(pÔAÄ?ôó†Ô¡Äi…bB?D‰T^´eAy?$s@°…B"”0	äƒ0^´%îÆY/rRBq@‚btꆉº”Eê_„pÿQ Ká’0Ø>ôQµˆ$pªÅ�$FT7@FÕTGdTQHCN•U[õs†ÈUcUVgUS5Uë£T—Œ ºK
–
n
<³qZ8ê&”NsUCÌI­6¤Zì‰$”åÿH»5U÷£>Â+Qwh"ê”@ß„Ju]ŠþtœVuY=ÄO!(@þ”%sÕ7U¼€P`HÔD}­5mDEC^÷…£P,)bBŽt|&x°G4µ'¶X–t„&îÆÄ�—’áPÁ
èˆXgBùD<¤#ÖT­ØÔ#ôCâ“nNVÖX‚(‚D>çNÙ”^Fnrõ[,4s(ô'b%n/Ûå&tv_C4Á˜�^OôR]Óv†V_&ÓØ
q>‡£Õi¯΄ÉÇ �zá)d
nÔIS‹NŠô&nÄT\¦åca"$4¢%ìeœêT?þÔAÉ	/£åPc^N×%nÄ%@0ä? `Åin¿4C×M�È&ÈkÏÈ¡Fôòþ2òõqKÄ�G%b´\3kbJÀki¡jahADp‹&H¤oìE$4È\–¥gÈgÝVœ4P7Bóƒ^زrZ6vÕJspˆG^¨p$>ïň¬IMÈŒôuÉôt†+DT&5}Á×0õ5özbCÙt[Çk+„ûôÁ)R>ÇA¤)45"Ó–Á¬AÅ
Ê
+‘.ïÖ‡nh¾aÏu@&4D$³‚T¡¸¤€
A¦Ån
b%¶B@¬%qÔ!GÞEl	BŠ—‚©¢p†h°z
]¤h"‡AŸ+‹DuS‚4cÁHlAiGáðUòÐþE¢Õ‡}X Üa´`µh¡Ft[æ�©@˜[áÅÌŒÀËÜ᢯°háܪ	–‹�¨èlC¢ú2ÁÿúR¦Â Þ!�X$,(†–e¬â�à`¸0Èu	]ü!†°å¸.ïc3ß!ðés+„�ÖÌBÔòhi/1äÆI\àƒöa�-Ä3!&3>g#Ô®
šNgV!Å5†ã+'•R}¡¶ÀjÀ¢Â7ˆSD¡Ä7–E“Îakß
‰kájáæa¨@6Àza[I$™R�ÈâA€áµ¤QŽÀºäïpÀzA/‡#€aÍ÷
«þŸw L@�¡
8áµbÎìԯϪïc‰ª¯—á¹!
C�
z
¨@[àêv êÚ ‚9DùŒdSù
[¡†ÿñy	wX	›v¨�¹9– ¦´Wu¹FhAâ6`L€Œß`Þ€
š€ªSðœò¤+*šà�ÀŠOh#,(Úà´`–®â4Ή1ë±!¯ð[šš
 Z·ªéŽ ãÜû3lj¿aÓ¨@
Ì�ŽÿnÁÏ�¾Áý�ªñ�Ϊ٬û,.l©@šInM
°¹°œ˜
–á‚줩@ã1Ê°
ná“Å
gþ
·At†ýñU™ ú ­7¹‹<¨Dr9©¡û#–á
8A²²>$(|Q–Á‰‹øÐö
J­
ΊÈL°°ª/ú8Aù¡ÓÞ 	ÖîîŒX
Äáîh[m
×”q
þã·ÏŸÁLˆðàÀ}ýIÔ˜pß>~ ?z„ˆ‘ãŠ\ùïņúReɇ+
zä=�?:y0¢Æþ‡%Mjü‡‘a§	J]è$Ȩ"d¸ÕêK§N)½zuªÙ³hÓª]»–]´V͘�ÇÌ–-AgFÕ¸Ee�:‹lL¸°áÈ+^̸±á•îö¨YöŽVY´h!…hõ¡Ô™~L¹°´@ŒL¯&­ø1­G­8Ž>éù,ÆŸ³!š.¸&Sß­Žm}éXƒ3KÊ<ÚäI™£{ÖFësgE•©ƒ£þ8“ëoÕ\«6uLþ0Æg­¤É�ëË— -£^¨¢ÒFÜÄòøóëßÏ¿¿ÿý	©#4ñôb0´¤ÂTAHM÷Ü‚Îq¦•@ÉQxYÝÓšZ+5äÙUEHÝMUþ9Èào:’l݉$ÑHÛévO%îD?:5˜‡+ª…ZG8q‡Ðh"áHVÿñ·N4±43—\v•’W|ùX’Xf©å–\vIr⢅5ïÔB¥,·T�:Ú|ãŽwR¡–á8Í2îÐT2:QÅ?ï¨ãÏOSu$Î8þœcMž¾#¡»]y�:êŒ6ÎhµÉ¶Ï8çìóÎ;.�#NC©}“ÌL?‰ø�:߀êŽ:©rµ•;îø&)A
¹C§;ö
öÎ8ß´zV¢Fm–°Y“J*´hÃ�5â t�‰^&–Ð=Ñ$ÒŒ“t5ãÞ�¼@}½ÊXí¹è¦«îº
J–L<þ–õr‹*¿½“Jœ¨SÓ‘HmÚË8…yˆ6ísÏ=k¶
ð�G1%o§ƒzZ<û|ÃI2îÜrË7Ó:´Œ*oªáÁ#·dð=·
ù”uÇT-šàZÁzá£!ñÕñeb©ˆÂ:þñŽE´á^À¸›kÝ`Šáí�
ÑÚ‡8¨€§=˜@1PEL^ª–k,B£¸Æ3tþQ]D£f_}²HÞúÚ÷¾l1HÙÔ 
xÁRcL©E÷Ú`
Y¨Œ9©úšûT§1`ü1Š@+Ù:hD!½Ð‚*Œ †&¸ÁfÉ Ï	÷ 
U Nµ;î%¡‘	]‚³ª@B&š
Ìa-ã¦(Æ3�!-haôƒ8åÖ†ðvXs£-ȇgNìÀË]� ¦#´Îp0ÄĬ÷í᪰[úR!‹6$Ï
Gв¢ÙHUVÖI­�¬�dþ_~@ãmʇ>桃%c40FJo…ßZÛº¾%�´±Zà 3ª0È:’ñ�Nµ±,óÆÚè¦oXãËÇÛÄAmk èûP™;¬1ZðõˆAMF©í&hLïû4¬�oˆƒÛîІ8zaíWÑâuÀÐF¯±í`\Íjâ˜É�0&Ïõâ­½–¼ie
ù�ã)+ÆÛ¶-‹eø»½è´ßÝhøcfÀÀD¡M&wX¼‡Ð¨EçºMy8ãâ€F±N³ygæ­“E2 a;`@ãÁZ”6Ð-mtªM5þù»·ý>S$ÜÙ÷G´»b
—AèÖ±#7>µ þ†$C&�-„õ²›�‹	‘éc�™[Ä%VñˆKZ2�ƒ½©9„âQÈRU�«ÄCS¹òŠG؈°ŽueH8OãøA±ÔLëo’ªàÞ’iA¹NIýNRb³ÓhÈñ0ÙQÆ‘ÎxJN8}=’}- †Œ^ñG<”ª“ ð#,VÅfÿ�È[$ô˜òÇ›âQ¹Z5§5¡×ÍMH�ßkÐ瀙Ô�1ñŽZgϾö½ô�êÍ®¦TÊÌ?âA2˜�E"ñ@Ò„r¢¬˜ìü£ù	ð™³�¿Ûh9NÛ
ã‡*¢æ¤(UÁx :8‚FÒ' ó³¤§ɧ6R‘¡þA+ò'Ñj¸"|�±2É¡"^‘*+“*GáÓb0]ºq~CRv×P×€ú@��a1p
cg.Û·ƒ<¨%3!SËÐke” K¤ÂqæB(dAæçò4fñ½AtW0ñ\3-§A…¢!?â„!b$R,¿qHX‚`*
úЂ_2~Yq¦�#¸ˆ„â}ç:1£|u7HA1!$˜C�u/x
í°\‘r;pE×׃˜˜‰ýá2Ån6U9´€+ÊÁÛ
ÒˆCˆ§‘VQ…‚áqIã£È1!F¸¯‘F²þ`ñ%\Ñ$q!ò9r0óP�V¡k¸4Èþ�‡#'°1³�)œa8 b±Â²Â"Šˆuèp?'1:l—ƒÌ§‰îøŽ‡
(�C5µ0„↧â1^´Ñ#Órx/R0ŠW€ã"�L(�¼¸¸w'c#[A!M‘T,Aˆµá…¤q€œáw‘-!�è!˘!&#2z•gÄh!AE$}¤¤»ÈOh2?QX+q·6tÚ€(€È6H8*…}ð˜”J9,! ü¥6Eh²5[A69^¸�Ö!$rø�Má…k¸‹"^Aâþ±Õˆ"6q†6ò#¢a•P
­a‘¹"#©©‚¡‡€ó‘Ò¢€hs!±ŒSñ�㑈ü—‚‰‡zÒø#E1(aQ!ÈuwÐ"�É°ÄŽKÙ™ži:¡vðB%óÒ—ã÷˜÷�Ûq[�†ÿPïp@óµB¶É:ù ÄèïT½Éów«ˆ�²8‡¼÷ww|21~•ò„ûPo!´‡+'H+Çu’–ã—!ã“Á#B+‘|rgÙ ñ&6ƒ½Iw²—‘)´Ùw;#ÁB+Á2Pxkü0¨›<2}ëx‰ŸY Ÿâ Ë@|l'~-¡þ,Ô6þÐw ‚¹m¾'9l4÷0íÀ	&(#¹V“'‰ø«x’³Ùf@ƒB1óV'égæË 
(ª·p)É�EÑp1G&÷Ð*Ã0´à3¸x–yÑBl\ó�Éòsªx-[(›"rnDt×#S1½�DA~´›=y}I¤}÷I¾#?ÓÓ§¥µvÚPF‡�‘À°ŽóEvú§ðˆûE ¾F9
ò½F†VuÙÙ—t:“Ó³B&×µP5G€¼Â9,:~Ö³BÞvpï�qèf
3
j
Zõ
’
ôvòªupТ§ùæþ‡€¢èpò²©€aËð
µ@¤çPO•Df5Öq!V”£
27lêðLz$™ §æ¸TÅ
-œÃ9Á × /U‡©Å
qV-
Ú°² Á 
ÄE@[Å:ΤA©ÓÑDÊR´žëGþo`
?7·`ñpÒú䪶s²ð<Ú�
MÐ5ÐawgÖKþS‹�:Çûjà
D×`¤%©�	|&DÚ Z´”B@ôc™ XÏãLÉ 
<t5æ<j0@öUÅU´G°[ã ¢HÜfïd=n 
ß0>zÉrB{kcŽ—r¼½@Ur”ÍûÆÛ·Ž³kÒkFü ¦^+UrÉ0`š	аnÐà©Ç£™P>4W|¾ÅÃoÀ+%ÔKÀÀUW›	Sö8~Û²T–
ÑóW‹Ô`
@EAßð<½£V¬³ ñ
‡T&={pÁ oÐ=þ£
�C»¥P¾ó´lƒÃjзM°È—4¤$;T@ÍAD\üÔV7ÌZÖ 
Ó3\Ÿ”’A$D´Ayr)¤…ùWkqjA飑QÉ™p|ÐXÞ÷.fÂf¡Èè
/€S‡:†2¹¥�‰È¨·Š%Òa	Yx"œ:ãob~=©ó!pçA6	,}©‡ç…ƒ�¦w-­q‚¸�Â1–Õî€1ÒQ’èi‡aÑA…TJ.w¤ç£ÈÑ�?qŸW‡…T~(è~?i§i<
Ú´¦â‚ÞEÂ7 £yhÂ�&aÙž‡‚FÒˆª±“sh˜’)á[äÓŠñ—ˆÎé¨sç–<²/ˆ‰–ü7‘­˜xø¨"©HØ‚2‰çC1þw*d©…²ˆAn0¨Èèxˆ€gx”Îãcq’YvÚ€Ó—RÈ;.}ªƒƒþìIä‘ÑIñ€ÚÃ�
EÈ‘AB*¡á!L¡4ŽZñÂÈšƒò)-(ò‡eI󄱡)*Ø"Q�9¢º¸…SÞŠ'“ÖØ�J¨„ÝÑ‹)Ò�r0BÒ79‘Rx|_>“°Q€M!mkuÊ
•Òuÿ
Áöõ.ýWgƯx""P_ú�N^ÙÚP)ʾ§Ì®¼¹ŸÿÕ’vî–‘2
'–JqK§Æ�[÷n޽׊TwHMÆZ5hÝ¢õOß5*&‘•TbI*FŒ¤âÏ�
7MvhIFeˆ¡GbþP‰aè›x#†bh!J²aÑÓ]Šö=³s~þýÛj»E›­jÉ+ÙÆ*Ë?d°A'âÇ�º q§¸[nI¥¡u8Qã�aì£�Ÿ{ÚPã�ð¨ÈÄ”#ô¸EÁ´¸E5–9â–CÚ°ŽCšP¤�è|ÂÏ-ÐZâ(Èü(ºíA%”IZZƒ(%Ød£Í¶%¯Ä2K-—’IÂã)®–ÿYg	6°@wbs¥}vÐæœ^ÆšCʱ—6´P¯�L’iB-dá±
*8Ñbœ}D"ª°ÑŒŒŠ>¡ˆ¢´*É Ý2S·$‚&«wšïÃB0'MOE5Uß(ú‡®á*ë8‚Šiþã�TÎI%˜šXU©�&ÔдiãCµPÅGf¦�xš€Æ5¼àZ61m+ɳxêZm•ªTUqÙ@mƉҡ)ê2Ôqß…7Þª$rG8hâùê8U6Úgœ5ÝéeŽ\RÇšdÜi(E¿�æwÜy‡‡þG̬ÑÆu ¡‰@y?ùÈŠ³rÍãQÅ"ËÔ�WfYÜ�½Ìè°0”¬R“ÜAê'�Tê(¾Ã:ct¢xzƶe£�6«É
›,]Pêìlž/��$ûî†\í&ŸdZÊØØ…Z¥È7眪…Ô¹ú½
8PA*â=ÐŒ#j0D&8Á‰e£	†¢…31Uþ4¡’j BÑ!Z(‚
��´b0´ÁQÉ\!á&*ÝÑ¢Õ’D0#œŒ<s_ÿ0Q>�uYƒ
šÙ@6PY¸ƒ½8i,÷dˆ& ¨
À`d ¡dÐB8Z ©‚ÑEhRÁÒ-Ó†# òÉê;�¡5
 {H…´@vaÈU…d/š0¡6ÁFZ Q2¸R¶’x%oM ›PÐ=pÈÈ2D(� ª*"Z؃–qˆ

#I Ü“ÄLÇ΢‡±D®aŠ[`
ã`yÎÐþWí~sØ_ÀÅÎtkV½òëó–(EþJ‚ƒýÍ�kÜ]
	D‹
¶%Dž³áÁO)�(£�
ËÒ‚©¢%ºª{â1
z-‹OKO(b˜…€†að%ÔA²£�Áwx
9¬ó¢ ‡±kxq:h€†^þx˜d`˜DuNh¸…S¬3Š	R/ªúÄÔLÕÔM�c=ø¬?Z8‚Û€
X„pXS˜5
žœ™#8‡­
Œ‹…—
ñ©…Oܦ€Ìžq0C ìL¸†w(NÐáoÈìqf7çìþk÷�• P¡=Ž3GHU8„¾Ücà2.…œ×ùRˆ[ØùŸú ú¡'ú¢ÏyAØ‚ò?ˆ…Dpæà¶q£—ú©§ú¢'ãèî„|@œF™¼
rDTÉd0TÖ áDtƒ¾Õ†bX„Rg
×ajßR•ïVÁ¡á`Ñ)ž&:`¸Úúc0.à‚3ØÂ'üÂ?ƒ3üÄgüÆwüLJ|È¿‚ȧüÈß.¸|ÁÏ|Ì_üʯüÉüÅï|Ï'}Çß‚Â?}Åç=
2LäÐáˆ'F4EÐ"ÅD£4Žj5ª“©bÉzõVØ2`(U¦\é²%L–2_ÊL™,%Îœ+cÒìÉóçÌeÉL&+jô(Ò¢½Š+f*Õ­[PU¥Reõ–U«O©šª…Ý·¯èÎ}…–l-*mÄýkë¯-ܸrçÒ­k÷.Þ¼z÷òíë÷/àÀ‚þËoŸºCj Å£ãV*’%k‰Er“0–ÅDáì™sš(Z´Pþ!mz²eÔT:o¶lyѲlܸ]ã–M6íÛºwßžÍíØìb¾¯i´qßÇxgÓÖœyoß¾…_Óóù3kΗŔ¦ÂÙûeÓ¬W·ÃIg1aº›cú}iø£ãÓŸo_¾éÈ”»ó?}¿>~
øŸh¥¡…{*8Z£�¦†ƒZ¨Á�gÞ)h¡y
º†¶gÞ„jìp{¨Ó?…©¸"‹-ºø"Œ1ÊX×>ÿøãÎj$£Î-�Õ0Ç3ä2è”L1ÑÔrŒJMÕR0LÓTqųL1Ã`yÌ”Sªä%NM-ÃÍ8ï¼#Ž8ãŒ#Ž;hºóM›n¶9Ž;q¾£Îšþlªc¦:íàyg8á´ÓN8gº³§;ïÔyN™†ºÏ¡ê¨Ó&4ËhÓ0µ�TR1·…R—V~ùe•MN¹L‘œÖR‹ª
|<òÉ+¿|Œ)V�ã2êÐRC*Qãð8åŒOËjrCh8ðÀƒæ7dúN8}
*è7áŒ>øè^æ8ç¸h-·hóÎÎ6â¼3Òjä3©õÌF6³‘Ïöq¤ý#EþmQÚÏ£3žð0äÙÿñi™f„jÇûÔ´ŽwœÃO„:Ü;Ê´¾@JPeB‡ûÖ¤¦lèaÚSÓüPˆÃª	Ûó¡ø¶§¦î�*ÃqCxbáÓ¡�Øí•cŠGT}H?"–ɈY¢S(ÆÖ¡ƒ8©pC8l§Æ4Öw´K;°|…vaÁ:Ôñ9Òñwêà¾Øâæ²�†<$!u†£Å¼£G$ªÅ2v¨¢ï‰Þða'‰Ä†°ß@áQôm2„ã8F-†ñÖÅym¹]Xi¼Á…•ü‡Ò2Zê,.°ÔÇ;ž”
t€/„„þ%—I<½„÷Sb�XŽrd#Ç
´ðÖ}¿–åâŠÌk›�Ú@8³­­¸fë[6‡
Tc•:»Ç8¬!

SÌÅ=©ß\²kDr]þƤì9Z—;ÜÀ–DûÏÒÞXw«}ݳGëº!Ãñ�Ev­¾š¬íms›EF]äŽhñSDáIZæg*B2¦¦è�¨ÒƘþXínÐi˜8´ÐrBf)_ûRÙ@g$�:Ž6¨¡
·ØÇ;ê�4þÅã¦XÂÕq]~´)ïˆw™ŠpŠëá“ñx‡Íøñ
5�|“Α¡

vw*у†ÇT‹§DWß][:âæµJ�”7�·çÂïa¸á¾æ0R‘ŠL<\%·
m,%œ°Åû&n�ܘÀ†o?ø¨àr1j‘‰T¼Û­#£M¥²Œ*Þ>øÁ³y·s,õ`,¹»™ØÃhõ¨ã9ÔþŠƒçwÓ¥´¹[DZ&*Ën3¾ñŽ�¥ms¤
Å Ê´éH÷0$A—߃nñª†u**^ªR1Tþ
«eÜ¢5pººéžïbDŽéËxÇ=ÌTðepB
ß a­‘¨<½	{HúÓÅ‘ŠqDeDXÑß¡—Q‹TÔàÞT¹½?–±ƒL‚
jpÜ€¡†=Xã¨å5S§ÚpŒd¸{jÁ¢Ða,5,*OïEþh‘
1"S

ªà·
—Ђ)\�èÁ1DJÜBWhCQàH!‰„DÝÅZ 
¸ÁHq ¬pɪ\Ϫ4ŨTLIëµÞ“,þÍûy`•ô³­–´=Ô†…àÁÑjÑŽ:\[¾Òã=!:Þ9(F24Få5Á¬,Ãþ1¸A
´ÁeèÁ!¤‚ ‚)pÆÝuˆÎS¤ÜLÈ"wl€)dÂe¨ÁH¡Ê©¤Ä1,B*X;Ì<Ô
º�6¥ÌŒa6�xe$’Ð2Ô
5E¤Ä0”˜@Œá,Â" Á
Ô@*
#¦AÔ
2æ!þ°¥HF
CPŠÁ•`ÉŠŠdB–tÉÜ—,B-¬
ŠAŠAh4¦ü�¨ÂL&eNFAr^(6ALV	G¶<ÛêL›êìß}…F~…³9”íß)!¾Ö¾ˆ¤{¾§!e×jÁŽÔÂBÉH½A6r†&fèA5"Á"Èa*䀣~AP
¤a-Œ€)¤Á„l
Çõ¤�I1 Á!¼ÁŒ@PÁ¼Aþ5¢Bzä
0\�©¼Á"¬d�8f-`i]ŠA 
glaWš@âèÁ04§	PéBAä@$RÁPAd<©LÉFäµB[ßñØ�]äß!G&’-|¾*¬L�P\ŽXCcÔ@-`a¨´A¼&W>gORA´ÁjP�
tŸe j„Æ!Ô!„ž ¨

WùÎzf[¬†­ØΈÎL¡Ž¸C˜#®* b*¤&@BEÜ56¨¬�h‡­ë1¸«'Òa
(h
¡ÞÆzš)$ÃÝDLmÌ+xß÷Õˆ=˜llØ8xCšeÃ6ÄÆÃd7Çm„�Ö¸X¹ÏÙ8Ç_¹˜•¨à—þ,ƒÒÙf&´�Ÿ�¾Šnš‚)¼á�†Þ©`Þ2éÓu‰)\ã‚èô‚#èëø�8%@êæ!,‚è
’q1dðqþ‘T¯:\Ã1d1“qk!	àH•+‚ä1— ¾q1NGîbžmn±õ^¯§ùÓi
žE>�é/Ž‰E쨧‘5!l)°!r_ôìƒ}'í}±W/èDñ±¡DQHrò’,‰oR1q Ç2@ƒ¤B×ÀŒüŒ.n¤Õ8¤�aý×ôO„9WZµL8hK©	èâF½Ô°wO¥Øå:Z�QTŠ·„ ¼=r#É%Ÿ\�Á‰ÄæÂ[ܨ#C’· 	q Jâ!¯¹Û溕§Á†mFÉ-,ßD6Gq@ƒHh³;óœ8ßæ:öB83æA­)¨þÎJí´�Ã’'î±éàQ
³êG"²B/ô\8�8äH2 måQ�)
þ¦Q¿Ï"¢7z›¶Ò7}"ÂwÓ£÷!DýÔC=zBÔg½Ö[ýÔ?ýÓ¯ö`ýT}×�½Ù—=ÚŸ½Ùƒ½Ú/=Ó{}"¦½Ü«ýÜo½Ò�¶×Ó½Þ£=Ü—½Ò“ý!ôâØÇ}BàþÞ#þÔ¿6Û#¾ÓŸ}ÜçýÜç½ãÇ}â×½Ô#ÈRœB¯†=�ƒ=DþŽ¶è›¶!0½è÷i¿6è5~é/½Ø‡~Øã£~›Á
d~ÜÉé>îÛ>É#@†pðŸ±'¦bí÷~‡
uÒ8hÕÉNúê¡Éšg*uU,`Å
Q:Ö¬DªŽw„AÿÉ‘®êE¤�zÊHUå™bd¡UA	VEºUGz¨j EÅA}ºþKg
u—˜z‘…ðä"jÊ*¨ªÔ$š2 íãjðéœ
ÆÒ]6È[4u“>Ð…uÐjNP½©º¥#]¨¢/JÓ6oY‹§ñ‹¯š“š¢É¦ÀÞŠ˜ì¼*uÅÑWõ*šºêÖ+m«¾ÚŠ­Æ
Ó’P¤�b´á@JjP4«tthÁ±"5P11ã¥o)‰¨Å*”_M‡+’Š4ª''4ü	Ò[¹ÊLË2ÝOa¹R^u6Y7Ò§»xÙÚQ¾ôí,Áþ³Ø›^ˆ¨¶2)¢NŠ,yŠ”M\ú)Xó”Ø mʦ5’®<‰jºêªRS³J¬ŒÖ:JurF­—X‘[Úœévž
iLAiÚ‰±½´é•ùÃ^H(¤P%r@<'}­¹D´loS·ë./qw”
lHÉì+ôò¦­­Gñ¬Û�“l"˜ŠBdÍÙÞT”\±é†uS]ñmºEmôai›,,7UÑû¥óœ¯gO)8ÄIÅ0�ûŽTŽcªæª®1Žu°z¾
¶£xîô­ìUî½äÂ�{œ®v@
Äd4TÁŸ˜/l’C
0ÕŠÁ
ô€Eö@šàö	Â
´#ZÎÁÄG®a*ƒh�
$,ÜÀ›¦daH
Xolg$¨€=´ƒMž‚Õ’cb®¡ðÄÇÄLA¨ 	d�3 ä:¾¡
N
q8âY4‚`�ùHF;Ô¡
Lq „TÁ
TÁYô@õÚáza’¡œH4KÁÔ 
P¬
La‡î¡ÉÔ€F¤®P$,8ÁÍîŠAÚƒlT"B8Cpjj
	ë¨
��=¾A.bÃjA
�ôa‘O©ài欪¨Fìš
•l¨@êæfE”¬äºèJþÞ««ZtÑË8²J¹ô‹ýþ¾/ç<*áb.«
(bÜ€‘@üéö.Ð
Ü ¢ j�òBÑ
Â!L��À
á"BQçAôÀŽ
ÚàzAþÔ@ær !
8Á|hÁNÁB¨ 
L!Bh!9Á+ãÁ!
ÆLja’!
AzÁ"’á0²‚"×.qŒ†´€=’râ›à,_å�`$üIü$+ªà…_ªOWb,ý\e•ˆ±¹‘»kÝ’ÿšÕ@Mâê^nq¤ºÍÿäïš¬¼º‘–¶QÒR®´’±Íd®ªæJãتú«þbîß.ⲋÙÐïXàEÔ®ìÂîa{à1�@š 'Û`8
€ä@.ðÄhh�/¢b Ñn
	в”Ôá!gPÈ°
Ô@TÁ|jÀ� NoÜ>(
BþR÷@
�
Ô@
’¡Û HXrv G8�
±{ägaÃÀÜ€@w€/y’ÂÀŸþ©p GttòÈS
0Ы’+k¡�^À
Q.r,­ÒTo®A
!U*ärfŒ)‹a~tr	·jS³Ä€'Û 28A3Éð"	îNh�,O~Â`ìí)“Mh�b€Å
§fJSꫵrÕÏØíWþ€nÑH8…•špŠÊƯßÂÓã,éÊ¿ØìÏRIÕ"LT 
v þóÀ-C¤ÌUÀãÐñÖÁÑÁðz�
!@¢à’üñ6Ð}tjàŽ ÃÄô<´´àJIÐnáâðD¯ÁO	&F´`ÞM&•ë�à
òô¢à‡¾PÔ­Ú!
!Ž’
6P.k€PS
b`T`QZ­`.°dÑ!z„Ä`U ¡
Ä€’!0R bèAÊj¡	^1­¢ Ùá´ övå)©@¯Ø�þHC©`¨@Eoa‘@õ"ĹÂaŠq at Ifä- û®n00ÞpùbdÜ2�Jû”s±ðLs…ûØ1BÆÁšŒ…ÕdI–bɳz…Æ2/uݤtKdt5nt‹-¬œ«W�*Ö„Âî‹y¬�K7]éüšSä^ÅÜŠ¥æ~—ÎMžê…ÜD/U°n:ݓ΀éßVË8ÙÑX”Kûtå>¹Ê{¨ÀÚ`R±Èjt¢ v
`(eÀJR}àôà’Á´
ïÆgS½ÇÞ0C{!¡
´�ÉB6HTá!›€›þ²‰01
šÀ$©À‚æ�Æ¡`ЂDÊvà@¾�T”KÃ2F“4
*cÄGðåGJÅ`ð0„!Ñá–á2AóR¡
–Aná9!0-ÈÀ¶cÿs’¡
^€Á|l”?¥lˆ1sBõ`ÀG2Ãਠk9hE9áÌh…2áôP¥`E$Ãg@½‡3)sì�H"Þ`¨(¬‘QEóFÖÀ
Ï~	Ï>N¼¦ê¾.™
˜ÑÁ¹œ+’YófMóD/’3$•7oÆfŒs…ŒtiäN<d—¿e`¤‹™+*ø.Bf,vc©žvW”#Ä–îS
2
R¦Æö’Ajáö �
áRnÙD(Ñ¡¤,×ÖÁÉÐâÜ�
µaL¡:ølâ0C®¡ý§Ÿ¾0&±Pdn!Oô@*a¡†ÆDu”
ZGÅ$Ø©8ÁÚ¾a$ºKaX	‚
BêP¢Uá<Ðä ÝN¢M:§r2AzÁ¨o¡¤Ñ¡dýU˜"úŸÔA0VåT!×ÎÒ+ïá‹I“5îµìJúþleÄàZòz�ä@Gsíĸ%§N!¢“ÁËna;zÙà¥-Ê

‚ípÇìOFrJp3
„v?wÖKµ¤“U¤³òåBˆODιԌV‘Lûˆ–Ôå_„+ómÆÆm…—dóf­uc—`*®Áx±¨6ê_0	›gMäPdÖX÷™)Lê¢{— ÷W(¬åò‰[ý.–¡ÁÞAêjK«.dðʹäDní^©»S¹¦œ;ËÜmNÚ
·Ïá–UìÛ”ƒCËÌ„ÑF:+v%�µ\¤T
EL×DdìÞaßW—ãí¸ÖÊ:É\*ÄÒ¤åÐþäNÒ„AÔ!
|DZó« ©CZ$`|ä´=I at lìÄÜ�ðšê�žf‰�DÖ ·î!ÙPŒ–.°Èí÷ZÌKÔ
yo%LJ„¿ãÉ”y”k²îwâ‹ÃË“ÉÄ á„•Ø© ^×—d¾å¼kÃ,Ó
~9¤4j»mܾA½
-¬*.B�Í°ŠµXzäÄÍmÏËÙr_CÁë¤ÖyËWèå÷°Bö¼—o÷XÚ�ð²yЛyù.äRÏ¡~—Ù{­µ0dBsC¤Û•4lÑjÆ&Mæý;ùop¯¾bñù^¬Á$ÏÛ<]ò^LôÂ]@(̵	wÏ9®¼1=ã5>ÿŽÉ¢ýÓá³Ó‡í¾ÅŠBðÌýÒ��LÍo9}E“^J»S©ºYªæ9~þp1åï�þ‚íVëäV÷Ö蹑;þ–7}ãk=F®DÐj1ãaòáëóAÜÁöaò
Ùà„ò�˜Ö¡Ç1DþüÚáÈ)È©-ßaÞ!lNŒÝØá„œîa<ôžîí>ò~ï¥N�ƉÚ‰•Ò~­øãíÛ~øþñyoœø~ïù¾âAÑ{3Ð^�2íYÉÆø�l,èáÜÁõã�J2ÿîô×aÌm„óYÙö^ì~I̾íùž†Øíí~J„ŸïÏ�*N˜nÈé"Ž\ÌY‚ô­_¥¸_О÷Û^îŸóã¡ÇÕß¾Ë~öù^ö�÷"ºòÕ^êà$ómŒ÷ìÙ2Ÿ•È	C
l²©©¦Mzºf¡M*j›¡nj*¤©Žºé¦w–Ùg+ˆúi•�®9+©–z
ª
¹Zjk°4h*±­žjj§»bêëþ“¼6Zg£În)-—\ª )¶Õ2i-´Òª€¶1Ð
•~k¶+¬kí
/t¯¬�¶û-¼á^Ë®¯¦;,»ýúÛï¿ëöë+»ë\°Á
ó«pÃëÊj­º,0Å
·ÙpÂç;°Ãëλ®
Øb»Á=‰r�@ZÀÉDPB‰A%” Ã6AFásÏ?÷Lƒ<÷Œ4ÒGíDÒ¡ACG+�eÒH7ÝsVÇ)4E
i«8ì«ù¾\¯Iô©¢Ï~éá¢+Þfâs¾úî­¯Ù¶æŠ_Yª
1ØŠl°¼‹j«©3'£‹r%õ‡žÚ¼­€‚¹í’ïRygžžB:
å³n>ë¹¢Ï>ë–¶�þùð<C®ëÖ�1ëå;oåç—_ºÔ‘nT¥+`
pV&T€­óû<@Ë9Îk=óß¾dÐ&ÿi-i/èY
‘vìiMUçóœ÷ÕC¯5©ZÛá
º	N]¢
^ˆªE¥*NϺӳþ§X¥ªQ‡ÚÓžò=¥«PãŠ×¡òô®@U„_
×™*ÂN`ƒ[ÙÀEÈ‚
3P+EÖ	F-«MëØËâBsPœà…9V¯•-­iO[Y·šV«¢`­VµjSQ>³�j�
ŸSG’Eom: Þ
7·²€-lc[YWÈB¹REenQaaSè>·¨Æh.Q¥KÔêÕ¹Ó•v—kTì~ײ¦õ	0ð�š©÷¼3«ÙyI�Þôά½ó­`	*p_"Ýׂx�n6K‚Á 
F@
--- NEW FILE ---
GIF87a€3çþ
oÔ«™¬Œ÷¾M
Ov0ÄÙ×ä7B§ýÊf1#\ÞÂ6´¹e,Uþ­‚Ú9œçC§9�lØ3šø|³ºYjˆM\ùÜ»Û��gÆ»üœV+§ÉOv¶²ÙöÔ'¿ŸµC\ÝK£÷ÔÈ»5º±�p´žÙ8Ç7Ö1ŽtÌ£õˆÇ=ú±�€¼£ ù8È?2�„L¤!‰ÈE:²‘�<¤$9ÉGÞ‹Ô‚‡5HW�Óµ‡ÖHIªa*·¥“÷º”×þæÅ3^
p£Ð9næ·°a‘m`‹ÚÜBG?#V±‰'¬Ÿ*Ñ÷*»ùl–ÊCfùv¶F,j+fÊì]ù¦8ͼMkfFü¢÷ŠØÌ�½²‰Æ뢴 6ÍršóœèL§:×ÉÎvºó�ðŒ§<çIÏzÚóžøþÌg=�ǯr�î(âø¤ê
R
c…�—Ô¤ZÎ~µÍ3"OU°Ú«ÖqŠbÏoiS!ûä§5§¥Òˆôz_ÌVé31‚s¤'¼Y)ºÒ˜õ°v\&,1J>pÆWkþÜ1KÚét{á„f8¥åE[.ÑnàKª—zT¥6•©H…ªS£úÔªRõªSͪT·jU­v•«X«WÃúÕ²’õ¬cM«X×jVµ¶•­heª¦,å�B…ƒúP‡êFy¬÷ÝŽ‹ƒShÐÔ—¾{­qpñ
ÁVEŸ¹òŒ²k^_¹XQ`2�_lÓâ9úöqé‡3mÛ±Æ÷>fòôfº"F�ÊB+®óŠÊ¬f5œM›rx‰9e&NeGF˜ò®¿úŒ±ŒgLãÛøÆ8αŽkl`�e
¬‡:E’hˆðµM›¶Ð…Sðáy->ÛÜÊbj­ðRÀÊ©Ú†™±Ž–Æ}EÞÐ>ÝÅ´&§þßèfË&‡®oÈÜ”Š)üEó½–‡>ÚÕ~%3ù
›^Ü[øä§Ì¢‘Y‰;N´¢ÍèF;úÑ�nçÐà1:RÜõ“ôMB�gÎã­Ð”^”Ù¼®A
G˜:Øøôù�ÉÌš�1¤8‡¸®)3`ÆÎVV-3…Zf´-©Žè÷ØvCl@Â�o+,4ÝY倛ñ¼a
oÔmÉ¥BŸÑx)n­§Rk)Šª«•Þ`G7®Q¢-ÒðŽ·¼çMïzCZ[£{ï‚J’ECõ“-ù´|,Ykù¿ÖpP0�	Р
ÖÇ„yu,ùXŠ^Çr
ÌáŽûZ܆–‚ß™þy¨6¾¹Z\å(°´€öŽhë(
Øwi°�
Z�xìB·Ây±Oãí¾š…¹öµ[ÎoZ¿—Íê`‹§ÑüzG5ºñJZ[
àÝÀ†8f6a£�#>aƒG9TuÐDh
að¡`ÍPŠJPU€2àuŽ uP hÀ©6(�l
hð³¨nàã‰�
§Žáâð‰0
˜?Õ
IPŽÐpé
ç w	å�ƒ(“‹¡›„?—ì
þà~ÑðZ°tí
	
 úŸ: ª 	Z 
º Ê ¡
¡ú :¡ª¡ZŸËä3C
rP™òˆ×–gLWF!féMêà4pB0ÃѦ1Ë�
Mˆà¤0
Áv5Þ€¯Èà
®(
#àá(’h
ÀR(p›ê€
©@
!ø#`�ó
þ¯b)© 
Ž=4
uFB*ð0Ž
h{ÒPëФl 3(‚€
ðú>õ@Z°3y,ï`ŽÍ 1†°‚PÑ
r ×Ðþq)‡›²?`0 â@€Î’³R u06«@´B;´ùtREÃ
î
ûÖË*$Q~UuEÈC-As‰hd5í`OÀW4A*Ñð–2Ž
0	Âv_{U°%»åà
¡0
ñ
Ë€móx±?ÚȒPð>J
†�©:7·¡)g@ {ï—†›’‘X4Jˆ‡½�(½Ð;½Öþ[½Økˆ×«½ÙK½Üû½Þ»fÜs«rÇA
Jð’Ð`“�›ã0| 
ÚPQÞà
€
±k¥*ŒÉãˆ
7§
-ë¸h0-¡z_Õà`
ëpº}Õ*¤
P
åË´ô¥×P44làÓ`eu3ã=gTËÀZ°�Â
^@ÂÈÐÄ€
â
# ·»�ñ˯)Á@<�-[M*#Q›è¤å:
�Y<
2À¦;³¨òẙD»Ñ WY@ŒEÖ

GP@‘à¹â©¬?ÀU0Æe̶PpZÃ#5]ÔÑýÑÒ`4Ò-Ò%MÒ �þÒ&�Ò'ÝÒ,ýÒ+Ó*=Ó.-Ó5MÓ0�Ó6�Ó7ÝÓ<ýÓ;Ô:=Ô>-ÔE=ÔžõbiÓ7p'
s÷•™¶¾dcK`cKØÔm%w<¯µÒp€aP‹© 3Ö�€

l�…ðð—§éuJ艠„6èl ŠÍV¿€€Åîà!ɨÍ3o͸w»XÊ£Ý
Ö†SÞ
¢ˆƒ¹Yµ©´øPQíà¼ËÚےʾD[äF~äH~N¨’1ädýÐõ½�Õ0<U„KâZÞbWÎÑ.ä5¸";l;ÈÂsõƒ22#8›œ35Še"4²mO�
ëÀ
l@gàW²¢Æ4ïs×ðŽ�?¾Û뽬¾ê®Þ½¯®ê°>ë²^ë­NëWTF^d)倡pÞðBdJ
PnÆ´Ô[V>Wí[s3|¿Sy±òéó^FCsËþX¤>À²6²Ò<,Ä>/zì°¨Ý„>ØÊÐÐŒêK§·d^a€�S¼Â4Ý.g´6¡
¸õØIã£$I5y I^¨.äNnÞzzóΧϞܸY3ô'7¡@�bjôRpF�‚ÃV+¸©Y£"ņժOlÝ vã–•Z å|ZËjíš7s>Íb3×�(R¤ã¬U
Ú­êO§G±a‡ÍZâªP½a»–¶lÏnfᵦ÷ðå³’»™þwÜ`¡p£rõêíÚ5¡iËIª6lRÙƒ�]wc¢iy[µ
Õwp²ƒ�‡½<6pÚ»›×=\¸óéÇ‹‡~|¹ò仓çþn»vRåi{Ï®Ž=·ùìÜÕz?v|ÏùçSï­Þ¸ðõîµw÷-¼çÀ«¯¼êÐË·ël¾ÿ˜›í1ÁãFl¼HEš'¸ùçyª‰I	iØj²¥ìâ
/TÔ¢E-T„
-V”F_ô¢E/¼ØŠ-¼¨Š0j|
ƒ¬È«Ð¢Ç·¨"J_„RI*gÔ"Ê+·xÂÇ&“ä’Š$cÜ¢E(Ðh‘
-¤Ð‚
7ŸøRÆ2›ŒþqG7盧LƒÌ±I«@#JÕ¤âwü1H(ºtóŒ4Ïð‘I3}RÇ!ÕÔâ‰-Œ„‘Æ,m|ñÓÍ|ñÈgT1ÈPWô´ÇQGuUÆQC•TÖ#IUFQu5uÖM]5ÕSYU5VTé|UÎ[ƒÍ×[id5Æ]Iå“×R?
ÖJ[[µÖn­­õØpsm±ZjAýÛmU]WÙd‘µ•Îf™÷Ù:aì\t¯eUmý•ÖXoߥÕÙy•…²S/ýc‹DÀ¡"C(¼©Gžu®á#‰™–ɱÏ™,³ŠeF&¹di–IIšfN^¦™‘›q¹ähLYåeRY†å–��™ç™[þ–yæ˜]Žùd—�q¦ä‘“^šè–anFè”Rq†êe˜V9ižQÆùg¡aÎùh Mn籑Ž9éf˜þ:ê”nNg°ÕŽ™ä¹Õ&™î§yæêµÿö»ïžý&Zp°¡~Ùo»üðÂ	zp¢ÿ6pÉûÞò¿zqÄÇüðÊ3gœrÂù>½qÆGÿòÄW½sË—|ïÙgï;tÖ·–½n×mŸœtØY7½ñÊ
ß]s°#_žùÉkýó¦Wšèj¸ÁPÃrú‘‡k
‹¹¾õÅ°ŠD ûHÂõ
‘Š
ô‡
	˜M;Êñƒ-é¤ ›ùD%þ²™?Äà³9Mp–S@œ`[òÍNöQžÝ4f>õ¹O~~òž
üg0û9P‚Ÿ
Yö÷Çþõ/ñÍb#bŽ÷�=›¼zk?e‡’xq('ðÛ†.(‚"¨„o` tø„O at 4K{®ê‡|À9Ð
8%²gH€'Œ&¢Ÿ­**GK>`Höil"*[2m
¸ÞãÂb4Æct½l’‡y­0Īµû¸”@:ö	ÂP‡$0lp@˜»o(‚|†؃x ‡=`†â‹'¨ÀgØ„Oxr˜:At(@�hƒi�‡Èo Gp„PþAk8ƒH„´HëkèÃE¤
uh†P€I�„qˆ‡¬Ò{H‡.è‚m؆o$Ç<T´¨c†M`Ç
„G}°†�„}PHà‰t7²>‰”Èf˜ÄxHšÄu‡Pð€$HŸPhw g
ÂiðDnšôD3ÕCÆ©¤ÊªÔ9n»�¨qF‹ù�‰3ôªæ‹9ð
€	€ìK‡MЃ(=ø†i؃qH‡�,¢w¸KÝ„:
äHe}ÐQÔA¸Ám ‡¸,�stÅPøq˜
8ƒªÂŸR¥þð“Ë
­„m
ü„£ƒ½„Ã.` ÖLÝm¨„@UkPÛ~µu¢3p[pàvI
ÄéÝq!̦!ò-F+%<g°ó#
¢òEçõ^'·ú1?*
õZ't¥Ç{¥gI]y÷„F�¹`E\m$»ÓÍr¦ý¢¬B9<ås?!o2£_¯[Œ¡Ñ!üÉ< BxûqþA#üO²&»?úﺼ7}_ ¦·½–€zAÍ÷c×¼Q�|EÊ! ÿú¹çñ»/1Që-¿¢v
9¤Xþ¸åEN[t£ÝOŸåÕÌF•Ï9è�2C�P 	‘]zù%˜aþ6HJC8ƒÉ”Ñ„Rã>	õC%)ZHÒ͈¹'Ÿ}ú¹ž<ãà4aOM
eÍ^JÙ#�7�È!EmPÈŸ•Zz)¦�íó7TH¸Y=2p&T�
ã?ïX³.QÖB˜xIu9ê©Ëj‘=eJ¨$“Ü)!�Ûu-žR§«¾;ï}fnî™i
훡•9`¹ÇÙ;ó͇©þðÏŸâ·&h´GYP×¥æ<÷Ýÿ¨�VÖ
£ÆˆfÁÞþã£ØÂ�(0�AR²’ñ�ÊÌ*ÏÐZéÇ9H‘‡3$BK�°$*-	Agȹ¢à"§˜‡$ 
·Z’	gTZƒaÖ¸ã~7k´b›08]¼ùœ£˜¹Û»ߪ¡ïìl¡X�¤?Å­¿n#é�Ùý¨Ð¨P8poDáOf<%?odàd|ÛeLƒÑ‹“œ,4Ó[‹	Øá„N"=,9ÌÁòÅAáðÅÏ(ø–ó�ÇdŽ»Þ¶z/Éep¦<?zJŒ”™ëp\å/½úJçíå!½ê(aø¦ÑD»¬ÜF*t˜f­.v“è£æÖ¶ì,x@¨„}ìnÿþHmè#=¬ó|©É0)¢Ñ�nëí~gÈÍ%?µ9›¬×[ß;¶`l¤Â½ü%lŸ¾YÕZ|Ö/8hàm¸
�ÿ|¸%4—ª}NêòÀ
’0[E)>W4ü
ßÈÖÓeH׈ÜRDáÑ}Q}Ð_b	�TtÂq!ÉAP=ÕéáAÝ`T“òܘýÜ/Ñž9©PÑåCj!Wö›²áù_éE…ÃôöaÉÁžhÕŸÄ¡Oȹ\"Ñ5!â{dÜ‹8WÝÜÈÜÎ_ð!
™†ŒbÄ•S!f‘ÍÕ›xÁU¸…ßRè $Š"fi„ÍÈ"M5”R�
^QÁ2HCË4FIæ$ÈLb
FaPN5ePþÊG)
AahˆU cØ	8ø–nTšS×(*ÒPÊUM„E€DX„-Rĵ¸œË-O;Æ#I¹£<º#=ÂcÊÔ£>¾£Bìc?*Æòü£?â#;ò#@¤@"dAæã@Ú#CÞc?>¤CâcBBd)$E–OÅ"éŒbÂÔÍw…Óu” K	Ù`
q):!E˜”OeJíaøù“U!Ô€‹à0ª¡41ØŒ‰‡<ä]9ˆC(tÑmy›¼—UÆ9>åV™Ž[Ƈ3R]Øh¶RVþžpŒÌ¦H78ÉmG–BH£
�!Z¡UWlE¸áa.fS)&b^cB&öL¦e:fe.fdj&f2fgnæf&æeR&i6¦gv…_e>�%阦*ž�
šàÑ,M?´Ã
#0+°Cð'°
«fc5±X0KËoþÄC5PÁtøPA€øTA(Á.É	=PC,�°nÏvmãï1|±$ï‚Rï÷üš1<µ1Ã_³Oõ9ßBŒ°r׶o?6^ow5˯
³sp#C,To„#E%B•v,è�‰ƒo@�w˜ƒ‘Ô4í×þÐ5“VôCŠÇ‚$_y¿výÚº7p#ƒ÷¾×¯oÓò{Þx’#÷ý6¼r›¹$¯ñ
GµUq2¿–çN¦
Öiã¥dAÿJ†lpÓѦ™f6‹µYߦW<y8,ƒ	‹N|(”ysçÏ5úÛ§�›—Tͪ¤¬÷®e’$ج%ÏPyóåÉCW¿ž}{èú¦÷£G-Vkº[ëÞ²ºß,þk§ˆCk—·î³­«¸ˆ)k–Ã̵Êê"Î2üðÂK)ÀjÃ*,©"ŒË1éJ,®a’f Ëò«,c„!�©^@‹ê—óÏ/°šÊë¬õ¢,±¯¤z/Ù\»FÉr“KCÓ–êí/ddlª˜pJ("„ºÒ½-¹ìR:’š‘¥êY§—”�¦žqÜ8ãŒ0Ø€SN6Ð`£Ë;ñÌs½¢Š:*©oóë-¦h,«ßL²¦†°I®f³o)bØšŒµá8Dkµ¸¦ÂKF¨pd0«f“-­
ï
‹S-}m)™ü
¬«˜dô)ÞBÓª0ªhÃÅ*¥Ú*ØO;¬µþþ›
VÚfËÏ0¼1ÇÓˆµX¹§¡’“h9=Á
—'ä
Ç‹fšA©ŸzØé¦}äÙ^yäy§Þ{íWß}ù¥H:}䣦•Ä‘WãÚ¬ÜjÅ0­dI¤íDbjœ%Ò1^x8ßR´Ë
)^0kmQ(oA˜¯Õ4ü™˜ÀžŒô*ÆB[Êâ֠ұöL³ïS¨þxS•6Zi¥ÊDÕp¤p2ˆ¬TÙjÁ*Ò´.óëðÖ®2xż�y2h[†6Õ_¬Ú¬P§†1ÌUÍ…œKÒž)£j¿Œ£ºÛm¿�Ûy.!‚·:tÃn—ï¢ùgœ'Ü�$H Ï{H$�äùóÑ÷é߀ëƒ}µáà‹ÒcÊÚ5²°*™?µ,£´dJW\

d1Ù\Es%rˆ0¶£Ÿ%L4¿(ÏL6#ßÍ&f]ùÏ擬bý­)Äóœ¤lS˜ÒOu¿Vd€³©B0fj
¶´Å0K£œâ){"¯ê„â$àX;Îä�jèCTh¢C&Ò-Tî2}ëCJûøòÛ1-*GÒ²Œ$´ cV4c1¡Ò,þôHqf�XˆT2c䯑%{‹ZxÑÅc@&Zu‰–
÷—aè®6ZMŒÌy•_
f4ˊŧ²jb2Q�¡ß #ZÐFÛ…£zÖ3Ä°jH”ñÏþÔ$bµò’¢�O<À”®n�‰%.ùÎ>Ä¡…f<Ñ!P¬èIûU7?á
@?’‹qãOuT-F\Œ7Ï|ñÄà/tqÐ2l�ª‰‡ÑŠVÎ6O
Þ6{ZM¡ªBrñËpTÂõ”IëŒO
3 5*0¼H�‡&T+=N5F:Ò@*¥1·ÆF3!K�ÉX5Ù5ÎÉCŽ)™gJ”KU«ŽIÔÅ.kx´ Õ‚4zˆË…˜”°•Å“/é Ôህ!
1bU°"´fÌŠ6)´9…ÁðE1T¡‹âf1˜ÚUv¡XÀ"ÅØF™³n
…D’þ5¡Xƒ¹£5k‚h¤c­ˆ….HË\æÆ‚´Õ
F0Zq
Ú±^”ÐXsˆ—Èi°!ì¥>Ýí,´Ò'ˆì
ZXøb¾ð°/X¡”­h
AlÙ‹Œx7Œb¬¨p…/D,²mL.Ye…+^qŠUÀ‚‡Û
¥04?	¤€ªjË¢ò‹W¸ÂÅÅggFeŒéž¯èð+^Ñâ/y9>…-rwZ³C7ÙŒ€
F iF»0¤]jÆF%�¨{QZ2@¹­å•2Â'…uÎþµuõƒÖ
Dð´¢@‡EpBÌï#ËQkÅ+dÄâBÐÁŽIWzX-u•.@áix°RªYh?UIpÄ¢m^ˆ1†%,
ÖbXê1@“fcB‚§‰°l,aÛÙ&‚¬-„;ðX)dÎÂ>tÍ[ÕT�@UÅhcQÆË0¦†Ås•bøgˆZ‰¿”mtå%àVþCE°‚ŸÐŒmý›áíQéÝZjUh å¢0À
è:„pÝÙÑ0?©á
N%ÃPà
pÀC@A"côBUÓË%ta(ñÕ¯¢$¥CÛð(þù°­ì‡<`yh˜øÃT€¬â1/ÄøÌGÒ“L�Á_¤A8
bÜs›ÇHË
 
!Öa±ÈÖ„Á.pƒâá’Âv¼âú*Žè@ û.`Þ`æ€8€
°àÇ
¾`¹ ×Ø‚ra:ŒtA·q—j¦°‹ÌQ­±Äì-ˆ§n@
Zï

�ð€
¡xn.ý

â`�–ªQvA
:<áB,Cúê
ÓP
l²
H U

t¡Œ|!ÚP
¡Xa¦àë°´2 ÷¨®ûà
T]Õ!ªèOüã~j£Ò@
TÀ
 
 V`
�-`A
ZàJÃîãD@@A0–"Àô&S€è�éšräÆŽ LSà`�RX¡¢ 8€ã¸•

ThôÑ"�¨pcâŒ!¢`
h
4ÁÅ`¡å6kYà»�|¯dW �
â DAF!Nà&‡—G©"f˜f€VA02$‹^·^Av�øa/ð o»ï°`á
v 
,ÁLáj’fi6's¬'óG�ª
Žòbð�'}÷ñô×Ñþ!ˆ(LÔe`éz’þÀöa˜v‘÷7>î¦1IØú*ƒi–òŽiˆAÉWRk·`�p�f
a´ñZÎ!à
šA,CzM0Æ’f¬
Ž
Àè@Òn¡LÁT`
@6 
ºz”AHhNwmàBÔ¶ûÄ }ðÂf¸
Y þ…Å€©
àAÌä®a³v8ÑX8uŸyŽÁàû!�ÓV¡"–sÒ.!
n@.`
œæfw\�L£¶��qÀvAZŽ/Ž¡¬… 
�Ü,-ˆ¡Sà÷€¦`Z!á»
 ŠaS’Áà»ûHÀÃ8—

æ—]ªAò“›Û1/A	¦1²©)zÙp
,Á´[$ª—Z�
BÞôT€@l0
r
à
X€€
,!¼2Çor
ìàáˆ{Ü
‚Š³<ˆ0¡Â…:|1¢Ä‰+Nô·O_?z¯ˆÝ2flV²dÆ~�œ’W'<"
.È {ùÓÏ=Ôðb’t$ýòIñJ-pÀGB"S€@”
€U®tÖ^É	0[¹
—Xt­âÇL@*™¸à@Qì
–3²@
,±°rÈ
:	°Àþb<‚"j4Dºð¢+ÅrC
 C)�è@@
cœr
*ÀG \Œ%HÀm¦dpG.ÒE‡Ý-}ZxJ�Ÿ”Ì,"Nxä‘gž¹ënÎ9{úȃ
ËHCE7õÈÃ6Ûö÷_3è�·�±ÉvN{í¶GôàF.¶Ø/Éø.ÝeõV½ˆD¨ÀÁ
®µâ	Dˆ`À
8€N
/ð
,°2è`Jè
D¸Ápp„!p²–TSÄŽðÌÜÁª¢t
_$Ì2#áH~çÅzÝ¢ÁMX±‹{ÙX%†¦ËUºPïÃàÌýPV›ÛØf²heEmJhVÀeÁÈ,ly8©^§:&!	o�!�ËrÈ:–�ÕÔð2è@8•OÁÑ�ŸU�1ÏyÜH¼ô­ïB)¡x-Î$À«çiAÂÍ`Ôê^(-mjik/^¤2;–ÙLkË‹ØÃMPƒ 8

W/€¢
òž¤³N>Y‡O‹ÆÐH¼ez�¸øÝ,¼8‹Z«gÎQ/z1`ÊDíª0n=ï…Ý�øj¿â•JÅšèEXÙMÅXFï*KЄ®·C2‚
�b£§ÿÈÖz¿ÕŒ	Üþ<õ˜�½NÓÌéN¿Ó	7±›]c<ú#tS‹Þi誘¹ö¬��#`xQÓ­X„B €†æ
™ì>ÎQPâô;’Ôê6#
†Œ?¿n!#G’c°†Plfdüj„-µÐ³áNæ,Ž|»rïAžø»\Zó¡‚}ö±@µÝò-y;l4î…ùǀ炀Œ§Œ–8ÀÖpøx‹D‡!Ë7UÁ¢iº2BòÄà5�À‚)‘r–ÀÅ0MÒá�C†؆~@VZXóÔ`“Ç_¼ck#d"rÙÑtº²yš–RáF/¼c„‹á8ÔÖ;!7kb%ƒ^„+ºƒ¼ÂegF„ò7�#÷A¾ónQ
h†
:T°SþZ`¨“gx´gÍ;|T„g pv†y˜ è.Ô –tbKøÂ+™‘RŒÄH醈&A„¾3dÇfRÖñÎÑ5ÜÔ
Ï
J©•Zé‚�·+Šqž(/»gOr!�'t‡¸hŠSËLj؉х8Ù
„¿ð„EƒÍy‚Bwkl·yŒ„c˜ÉÒóSzXoç!ààÍp^säo¨G
7‡ä!;ʨ�UŒ†!:2�²Åºƒ�HŽoGŽœ§n‡(�(nØ!Âv÷…é†+ó‚„‘xªè‰wkK§‹ò‰êH‹¤XŽøx�‡ˆ+g„º§…ÜA	©�·Vþ]:Gn"1¸‘
÷Ð]àU‡m¶�ƒV.¡C-=%~§gæ ²ƒú`,g’1iûÀxÄ°�8’#U÷�#1nÛy³U/þe4A‰/E©th·Ž–‡kÚQ³e at i/ëF´e�G`J·lÛ6[Nɲ<øBnUÉ|R)BQ#y[¶hJw–ÚÖ'õT•TI[$An_i–Áóm>I’‡õTh‰/Ui–U…––!¸Ðløò9o1U†2gû Ò²û±SÚB�â
‚[š8gl^ê�B§„Ž8U¨™¦ƒêpye{z§Ž
§"X–Ù‘žÉŸOZHû€S[�
ÕÐSØ"€I âÀgmƇÁ©­:¥ï{–g||‚m‡#VÕ��(¢l÷4ˆ�Qvlºr+ŽÃš]Ji xZ™Ñ«ÁŠ„
™uÂ_©©§$ššÁø�ÆæˆOslÉ« 7¨pú¬©YZ=H©¨UZ
	®ŠÃ¨z‰
díú¬
×qØv—š£œ©©=Úª´™^
¢z-îPªÕà
Ú…ŒYä®j�ózÙ„¨8r~j¬…Š£ý`s¸©	‹FŸи¦ã†ëõñg¯£¯J«�/©;¬ y·yUÉúµ±¸R¾¡Ýá³[8¢ÃÉ„+岧˜”º�JUÝ!‹ÕõcêÈyËÙ§Ú·IxŽ2‹·¤¸‰üqJ˜„Ĺ8,+��‰y?ëRô�sD¹ÊÒ¤Xk;ú
牀Qj´óÖŸBü,y‡
Zà
§“:€×ã
¤
«°
þ®€W\%æÅ`Vnåå^îgnV\¥æi¾
f•¾çj^t^çvžæyþæw>ç¹Ðçqçg®çr~æ…^fµçuN舎è†þæ�^è�îç^Žèn^èiÞè‰Þç�nçk¾éhÎè”.ê‹è{ŽésNç–Nçkþåxµ
tC7a4¹ª:ÙVÎ,±:ÐØSDjŸ¬£Î@ÔN€Ú 
Ø`ëvg´å±ç€Ïþìó0è0íÒô
ù6ïvÇFöÐþí�
Ÿ
�ù€ßðýÐð_ñ_ñ�ñÏñ?¹ÿñ òÏñ$¯ñÿñïñ#/òò%Ïò$óñ./ò&Oó“[òs”ó6¿ò>oñ)¿ó5ÿó7Ÿò/ñ:Ÿçððmö‘šºñ� i˜
ûÆw¤*µ+9GF­
[@4�¨-õ„Fx¨»�ªú‘äk¿Î‚Ù‚´i¿�m�.axÝU,vO΂÷æ»<
!ùPöÇ8.M*ïc¯å™jH™ÿ
nðõO€ø„F..i¹”�A|.¢¿ùÅr´’¿zß,ÍëYú�ÙÜþ
qúa¬B}.„‘£² ¢HG&›tòÉÎüþù©i$4È8ÇZÔ¢™%+"M6(ÃsL2µšHpN® ðªq#®"!*sN:ë´3&%§TL¿k
E8æÑN²ñ‡aغêQ�tšˆ=FÑån�‹¬S}ÈÆýÉpa£ÁK%�ÄHLŠ¨„‡D!øhô�/Y2“þ£´‘䨧>�i¨’xá)]© #Í1-—¨â‘zÜò•»TšŒ¦4nê1²YGŠ|§K^&3>ÈK“@ôõ=Er䘾Sf5ßC5æ‹—cŠS6ò”cÊÃ@Ö$'uð’2ZÆe)rÊe.}÷Ó”SžÑáÖ)×FþÔ#2�éGÝÊRxò�
ó$¨nYÁNÆÅ5ÿ1H>Úâ6x`(hEmc5�ZÿPÎ2Ò�|äë <p‹¦ô3DÍâø•*iÔ£ð)>ðq
G„Á*åéfh6«ÊE²?@©¤<ú��s
˜
ÍB[(G=àQ´‡¼(\íþØG7ª€
Œ
¦~"­üìƒ× ¾	Î�‰µ»Å‰Dîµ<b‡¶]ó¦—ê•òV¹7‘‡5¢•V¢¬ÃzJÁË7+Y£åf&£Y`Zû!Û»ÍH*2µˆvÍ+“ŸfgëàFhµx¤�\„6祯JhÄ®a}×ýcŒ<"ÙúØ$¢*›
˜„„ä%38Iö¤X[$¬ÎQ%EÒ$q–Ü·`©LÒm1 tyL3kùPÿiÆ·¾»Ž"çnFΩ›< çK.Ð-Š”[TžÑ؃’
Òs8"	 «Í«‘Ô]SkMÊ?˜2�Ò¤Þ˜þ°ákíBÅsô†�Ëšuz´¡ø©#² 
m@[»ñÝ„ªO È¤î0G`P
Ð@ÜÙEž� [œ
›
ÈN¶9¶@ƒlÁ®óV.¹=H´•CÊûȪ˜ÃRÈ
å(,Áy«W5
©Ÿ_fÃ�âß°#	�(2 ,ÎÛgMI-µ*´côý˜p.ƒáòÉY{¨ŒOˆã­™ËSFÜc›ïö0ÁÙSËùã�¦€ò¿Aß-%Q¼&/Kƒ5��ˆ†ZÉôÕú¦™Ò8[”C-
Ýb=»žXp9Nç-]쇕Çk¤U£�G9F”2×^Ö}¨1o—´‘
Xæ»ßZÂb¬¡þ‰WÞÀ¶|ö\‹—«gÉR¤’‰7ìM´º¥½:Ës8r[Ê÷F
üÔ…>‰èò.a½J%r5*Èícî("5‘9ßÖóçè#ÖšSe˳V×­¹w½v^;�üÇðÿ™ÑD2‚쟠7ümj�wmâNdCx±+¥ŸR`¹ìø”¡RbCn…âûm!pÞ®�“ë9òm‡ŒÒ!…õ³¿ƒTêúš¡ÖÍ�2ˆŠÐ§D„ü+(Ù0¤œû®'r�ª«ˆ‡*‡DH«$(}À(`"¿)‹¬‘©vp˜€$¸Ày‚•GJ§$¨ª›uk‹|(G`‚k0A‚Ò°Ï
þ@P%`A*û‡ª)|p3 …´AkŠ%D‘½äCˆìÁ~x�©|€‡r�ƒ�
&`$´¦%YÏ¢‚qè[ˆ„,”‡zÈoP‚��$ ¨.$§Îr†e ˆ‹˜­L‚hˆBŒ!�xh†@„t0‚9LBuÐ*°±ƒ�?éAcÛ
¡,)„iÄCôBDq†�à†ë«?áC?t

‰‡´‡i˜†L¬¦X9
R­zX‡>áAd¾²ÈEòU|¥íq.¾’=¬†“Dùê‡gÉ¥]T&ä	ÛaÄ2T‚Tº ¯ºAÖKÆL*Y‘˜ïÀ1%XA}sÁ‡þú&ÐÃÆQ‚½;8XD…èÁ䘡�ÀˆK2ÇQÂÈ’–![³>Yˆj0šÔ3í›Ç$Hz,£ YcŒYTl8´*+/
¡Šw˜HŠœÈxP‡x¨H�ÜHŽìH�üH�I‘I’,I“<I”LI•\I–lI—|I˜ŒI™œIš¬I›¼IŽŒvxxð‘;„;äGò€¹Ù°ˆJ¤LÊjXJk°†¤|J¨ŒJ©œJª¬J«¼J¬ÌJ­ÜJ®ìJ¯üJ°K±K²,K³<K´LKµ\K¶l˧”†¥ä†±�g;Ú¢ÅatŠyœÇ'è˾¤*ðKÁLÂ,LÃ<LÄLLÅ\LþÆlLÇ|LÈŒLÉœLʬL˼LÌÌLÍÜLÎìLÏüLÐ4Ì-€‚'
P\Mäã
¥Š€G˜^êuH�ÞêÍÞìÅÞí¥^é½^ïÕ^ë
_ðßð�Þïå^õ=ßñEßí]_íå^ô•_ñ¥ßòmßîußû¥_óußüÅßôeßê]ßý­_òåßùu„Dèßø]à
`ë…_
þaýý_.aHX`&`	ÞáæaÖ_ at P`6x‚;väÁhð¸Á­
Óg¨( ÍÁ”â'ˆb+&L+ÎbÒÔâ+®â.öK+†â*€â(ã,öb.Nc)Vc6îË3Æb->L6^ã9®c6L#Ø‚-pã/¶c5Fc?.ã9L=Î@Îâ<Í+Öã=Ö6ã@þc-cÁäâ'c2Žã2®â¾¬‚JÖ‚Cžb-
7ðâæm
/sõÞî0·sBço$Gö]õUcwíB—Wb-òs
6TçN¡ÁƒtHa;w-܈±áÄ’
Ý�+é#E•+ÂŒYP¢Æ†þÙ‰ó’Jšpÿä­³Æ'‰lûÄiiV¯_¾¦ùî�#•ÄšÅ˜ë*V5éÞV®ð¾ä
²¤D¬+Ž¬hðãÂ�®”R¬[¹Ïâ…¨¶*Cx	'i‘ëÍ�w'^½Zð a´g+Âe¨»¯ð¶‹Ç®ÝÍuçέ{8äáË_»r•£×Ö”·Ž�¨®�:¿ï⽫Fo0PÈè-ü·Œâ©äyì8›sIÂv#g
	nH‚«“ü7+uÆ€	–3xF8pÞ4‚——ñ›7Ÿw"Õ¹'<z«BцÆë2¶ãî+ÿ¯VÕb �d‘‡
èRd”…
zèõœ„äÉ°þaå,D—f
�Ö–{Wy¤’gð´s]Y±£ŽDm‘¢tØ
˜i
y5Ø`5Ö¦H9¥ÒÌ>
u
 I$QÍ>æH!M?L9“tWïÀŸ{)žÆAWÂäŽ{_¾|XY6‘{$Íæe^­S¥b3&˜ôÅV§�7Öh–XY^VŒmFç! Õ¹%;W^taQV†^–��ù•I—™2yyè¡aVV¥_!½³LF¸áF¥–ʨ–*rÈqÍU*–¥ækõ©h'u–Ô¦_ižVX_ŸÎåRX„²“
©ªúª«¯®jªª†¢bXynUbBï¬S[mUèþ%­[VöNBÁÞi§Y�=:–¥éŠ•îAï´ã^*
@ñ,ªÍòË*×XÄeˆìÄã«ejaÔ‘H�[YGtuº§DTfY'VžöÚe—^Éiœ”Ù÷%aÜ ±Ýì#;Õð¡„Õüƒ”RKöÓŽ9†ð
‘¶œ‘(t}íÊ[,Ô\}knG¢që+m·î9Qê)BþêWTØ£Íâ²K.¹ìΰ£Ï†kaî)Å^vË J¿g˜ñ±ªï7i¸Uš±Å�ｸݛŠ8µ;.»ö�[óÏ™k“8QÁ(
OX”	íÝï–}4eA§½ùðVaj¹f†æ¦Ö—£5òY¦Ÿ9.ê2ÜЉ4~ô“•
¥HG¢‚4ö±�%ÁÃIð€P0
`ÁÄ9BÛ༸Ô%CÁK‘ªÊ—’·¦—¨D.‰Éir¤.k™Í\9ÐZªT(M}$LñŠ�h¬¥’¶õÉ|aÝ¡„føÐÇ2ÅÃÜ™
Â+
TJe®Díh†
4 Œ²,$hP�Š†+ŠÒN¤~§�ÅkoÞ
ÉØ’ƒD¥}R%”ƒTóš€Aï5 â8Â
lœìýÊP”à}Œƒ
ÍЇ—ÔRÈ
ëP`‚5 ]ÎÈPò|_Ø0éÅ̪!ò;TÙÒfCy^‰V›ä“a€	£Ž¤o+‰ù�Xš"éEÌ.î,}Ö¨Lù±¤-%JÉ£%C	¯KÈú ¦.þò•ÓµE�Ä$IÈ—²�@
Züb�ëPÒ’…™aH¬–ãE2Ž²	&H”£–òÑ;á‘�þh‚/¾”�ˆ
Ç°£‰�È	íþ¾�|ɤ£ÁoŒ0Nv±ˆ8®q
oHÆl~¹Xßà+z†’¡y(;Hq�Ë eåˆF4œÉ�bJq.ªÄï:¢1
Go#ñ" HÑ‘Ïl¿Ÿ$Œ7HÑ�ëTä¬Þ \A„6(¹<1?’2	�
h”þ[^#�0‡8õ¡�ÑzOÒXG*ª¾L­8™ZVÂnPð6,£>¡ëMèg7  ¸]æ…™�1!	ñ È’¢LB
¥Ws‡F`Žô¡“ÏÜ’—¼ ‡S×æŽHÀ2$U"�YDËŽð¹âµ ÑÖK>ÔiTšBÁF´â5±e
ëӹ銡~"�	L"¯H3ÁsŒ‚väc!Ìqm´Eƒ3È/S—ò‹Ðf#4(lÈ™ßfþÖÇ|F‡ÏæAÎq1uÌØ/%øT	Ù
Ÿº¥’Bu‹¶,ÓUDÃl—»lPÃiŽ¯°z�ÅØàÒ»,v­)@3œ×ñšI
°�8
D\ƒTA£l
<Ü! hJ*@
7°ƒ4°A0¢
 ŒÀt„#H# �#lþ6D£PB8°C7Ä¢(¤žAF_S‰ü€SÙ$…ádŽ�`?NuË°
h
@‚7HÄDNã–5ßÈA"(Á„#üÀxÁI>
$¸£9hÙ4B
Dʃ:DLã¸Aµƒ7x
)t$ÈA‰4䥤‚B¤ÂXƒ:4ƒˆ¦p�‹dG­%%
\RÁÁÀ€?¨È©q…‘‘‚„‚@LB*®¢³µ,B�,º
6¸ƒ5 £
)x
êIc„8€ãTÁd

xÀ9h¢A„
à8 €@†
 õh
ê�Aü
�åwþÀ2ª ìL("¥s¢ÁŸVA
xá8 
lAF Æ<^ƒ{8B
àN(
M¸Œº†XojÞ$ˆßêÒ4 at B©œAý^œåd�¼™Ÿ©J'ËÁžÓ
Ìé$A7˜ÜU<\‰(ÁÌKm7Bö/%Ñ÷

$Tzt‘‚Þ’‚•vŸ:\C´bd�Þ±Ã8Xƒ$àÎ8x€(5;$nx
ùd»vÍ434€&N›j" ñïÝÖ“™Û9šàl]ª†¢�¼VEF7·NÙ™ƒ&	¡8n MàƒÍ±5g¡ÆyyÒ¬�:i|Ʊþ€”œ¡À¹3Íc<wëy0ÊÉÔ.S®vŸÐ$üñîW¯‡&•4*àôÉ[W��$”¨æŸq¨hFŸÔÇ÷Qp5uØ�ïœÇÚ�G3o
LÛ�&1S™Ê%Âx’/Öyç�u–!Sq–‰ôS–à›ÙÉèk‰Qvä�l™&‘$
À`
kÔ™d„f¢�„‚T ©¢
R¸qæ‚ß
iã’"[­�õ`J
¬5¹Ûn@ Ü	RñÉ¥­Ò{ÇhHHž€Â6 ¸qÕ0’�äp<Ò�O/„GŽ¢Q'¬¹°ä¸f�zÍt#‰0¬á&•'0¤od#p¡A)7”pƒ›þjØ ¡šÃ&¨&žÅš
iÂÕøŽï1Ê’f/
’À‡shÈ…2€Â ‰vÐè�3�‚ëÄáB4°ƒaè‰R�GØçfbÇ…ž2’X’>îÁæš%�	„ÂÚ‡6D9JRžØS?0„½˜ac?øáР�0\È)ô‚îVHÈ2…ÿBƒÑàÃ`ZcúhFd™+k˜Ã´YÁ�îmŒ{IÓ†âuŒàÔF7RéRªÒYìÙ
¯à1hþ
‚hXÆC
L<�9>ò
ãPÐ:@$ lüCZpýþá�÷)¨ý Lß4©ÇŠãŽH ø€–’Ø'€
ÌÑ+†Å5ÎѯD,W´}TÇ9¶ÚPl÷·‰ ;¤Û±k
‡xcÿå$BÒï©ä'.én=ö¡÷ÃÄþò�‡:â!æwˆy̘ûTIàQ3|ò�©x’;¬!Y$sgBë°qI¢wT€¸F4ñ¤”Hij�õ,8®
‰åJ÷Mã‘È�1	—4C²•­;œÁ‡M
#Å°÷æ“‘Ä×#s?Z�›ºZÌ�¹©ý™)òaëP‡rs	G˜£‘Õ,i±1!q$¢(Ñ-�5�uHãÈŽÐàQpë;#YaãÈÂ
nåÔê)pŠï8Jr®ëÇ)ƒå Ds8¬�¸0àv¥€¤oeýÆä Ïþ0P±gY"åì¯àØð~|ÏòTb­Ìõ”þå	#P$B"=x=*)ýòOýÒM	aS²‰¹§j�ëЮ÷üŽÏv%$®ËšOïH
Ð
ÇBYÄ
(‘e{XÎÔ4ì#A2>V�÷~’))ã$Õ++?²×Aºª
$ΓñSˆÑ$|+î¤�Y|N›*2ðôŽÂ*Eâ¬r�"“F%*R)'Âû´�¯üg@ØGšAßäGßÞíAþ¡!»N§ÔoY’Q}°Q¥YÞ²!‰pôúæÛòíÂÝ‚P$ÓÊÏ�Q/Ñþ°Lñr-½°ÃÚ/­Xbýæ.>HÄ®aQŽE2*ƒz”±ö6Ø€
ø@©Ê¥·R‚-‘¥ò¼á"%
áCþ×.“c¸Ñ2Õo%ÚÈü*�)�¥'£“à$£X@/	£XšRNû.#±P*YÊ2{ZôÎõ'­’ñ2�e›q/ÉÓ|웬3	{3YŒecèŽcÄÒ%�2"³ò"2,…$$R)Yò;ãscªRB,´=“›%$d¦ãVŽ?$ê®Ã4	µq'åO+àÒ;éì++@â$Ä�Ѽa{˜2â~37”eì.l±¼!B
°
D	èͤ þa1	‹~¤
K£AK·”K»´K¥!ÀL›
Lµ´LÃ4K«ÁaÐ4LÕTL±NµtMôKmK³ÔKß”_ÈþTª!š
Qšá
Òfß(}žôeaöIÁdfÁD	t¶eQ6fŸÔfgV_¬
˜`hD_’ÖŠ$fgVf‘¶i£h™Vhƒ–j£öj­vj›VgÓGbö	Pöf{h“vkwV
Œ
S¶
R¡î7–x�4	þ*dÝùÕ¡
܇-T(vLå6µÛÖ­o�öœ:Tê´žS¯_ÞW”«qæ]ç¦ÝèÛ7óµ�ûÞuú”¯ì²ÐñyqpÙ󜄜¾½û÷ðãËŸO!8*ÍF—–wzgO}æµÜ_aÓnàq‡ÖZDõÏU/5%w·”>òœU`Y…õOnÜ-µ”<ãõö›?ö&Þ‡ñă–\5µ�‹+aÔ]VÖx™c�éXß�@)ä�DV6g„Z7ÌåˆjÎü„Ÿ>öæ�‹ÁŃ•Sñ(¸ ].(&…V÷aŽ.Qøþ‰7•—Ø_¹	Ô�UEu‰b—�U8!_
Í5PlÉuQQÆ©§Yl.!Z䢌6êè£Dêƒ�©4#…8�õÇkâLyepWNH”WögžúÐèT†ÆU¦„Ç…ÈTB/™÷Ø‚³J7[�LѵŽa$rj:¥Ú©�žxiÅVS=òHQZ9^g€±W-x�f«í¶Üv‹QªÜ¥ß_ý©†Í>âhå\òLÈQxÅCÎ7Ì<óM<§Æ“9 æå*S´…ÒÌ8`-'"³úŒƒM<û˜Š:ÇÎzfY(†¸

Ð`O:Û|ÂÌ7é ¥p²Íæ6Ö8¡Œ#±A€nõ¡t’Ž³T3Ü`þèa	çíÎ<÷ìs�^�¶L3O€³ÕøçPÍW-wÁ%äT:Ï€
ul“*9Ìòª«îž‘
rò

 ±y,ƒ
$ñsÐ`ÓÐGÎ0 at yˆÃ.‚ë÷Æ�v�b
Ë`G3(àÒ\´,Ýð­„öQªðŽW˜ÛØA÷ µxì¡ÛHÕ*{¤@B³àÃ8þJ‹†´Ããp†3R!‰0`’@�-S%�ô±|xÌåÚ¡Žý²(gH
Ú@0}°®;¦`ΘKå*[y3Oñi3–QW&Í\RÊî«´B¡R™Ùäpc:ÂWÞ.<ƒ!clæ?ÜÛÕh(aIàƒ<0ƒ@èceuפ@‚
E
‚›ãØC˜öè‚ÆWPRƒXÄŸX¡>š!¿V/Ï%^PB?ü‘ˆÛ¦B�Øu¯§¨�wP¶n¨ôlÛ2	7œ�šØPr šüd
4ã¨KÙ¶Ô§NuŠdEË@‡[Ü�s�pÇÌ“ˆöá
“C±ÂøÈaF†¡• �ÓÁ
LQêÐÒ!…-@ï|@
7ô
	
XÃm‹F?Ü¡
P 	õ…�Ò�wÂm ‘tLÕþ†O”ª—Û8{R†zÃ{$Ö«7›Âl!oú`
Ö‘0HÈ/3à7äÁ
¼vØý0¶SÄ!‡,/”ó;Cœ1Üâ¶ìOU�¾ô©>Ú„&£àÆFuýᚧ‡ýEJéG;Üâ�tô“ÞD¨Ã÷f}t!²Ê4h9J°›ìƒ3�D(`©M*,]¡€I`EuEE†gÐ%ã�
Z
.²ìàrpnßpßQlÍð
¦B�¶çEzXUiè"ãpÕl
Í!	²Ü@
r
“Ð÷ž�£Súþ—qIµ''_Ù£2—©yšá!Ñ:°J’‚£�
Ó%ªÙ•.Íp„AvÚxí©¢[b(uquñ.öú“Ïs©Ç"­±y®o1<¶‰¯oñ21¯e
‘ñPù¥`Z°4[³]Á{¯�}7ÁuÛÇ4k1£BB7)³kélÑ!²vq-¸Zžz™²hr6]¨õ‰“Ì"’#+œ±š5۵˓²JýY£^çB!d0)˜PÙ@›	°K+µÂ¥‰:”O31—:’ò±^Û·~KÍø˜O€•ÙÊ…¹«É9ᮺj©“Ñ2Ýù²Õ†šMÛ—Óù·˜›¹"÷þ1O€)ýðþ@K[21‹)á•ó‘@hùŽ«¹°»$qñp¦‘ɳæâ‡ûš‘¨qºòQ#Öf±²[¼Æ
Á{[ ¶à`{]Z 
³³–¾;¯KÎâ¥À{¼ÜÛ½³Q»”™ÞÐ…f»+5Ôé½ê»¾R§ŠT
4±:ý³•P !d¹é˾ú»¿U˜[Z¶OP3ý£­úpQBžü›À
|Jz
)¦A¿£Ú}Q½|Á¼3Õ•ÒJðp‡†k™<Â$\:1Ú¬Tˆd;Áäæ2%üÂ0¼()0]æŸ!,½¹½1¼Ã<¼#.žÛ¼òà¢KÁþö÷®:ÜÃJ¼Ä&
á²Y×BU™ÙůyµLœÅZLà›AO0¾Y)ÁÙEÁJa6X¼ÅhœÆ€k
Z�
 a’
7\±�“Äj|ÇwlÏ•œüQÄ7*‰êÀ‚5x\Ȇ#�q¦i:]Ì4Þúë°[ÐQêpÈ–lɃQ•Ì«œ¡j£ÔÖÒ
¯¹¼Ì˜ë«
¾ðÛeõ€»
"y­"õˆ¢{�×z
Ø|}×�MØ]Ø~]�ü\8ˆØŒ=؉�,‘=ÙŠýØ‚MÙ�þí؇½Ù‚ÝÙ��Ù|mÙ¢
Úž½×˜}ÙŸ�Ú¤=Ú¥]Ù«ÍÙ¬mØ­-Û±�Ù§ýØ·mÚ©ÍÚµ­Ù¾š'Z±�c
T°ÖJ¾Úª»øáÐWÒŒg °[R8
�K¼ë.¡½Ø×íØؽØÛ-ÖiÝÜÍØý¢Ý¾-ÖãÚ‰}ÞÛ�ÞaÞìmÞàMÞÙýÞÝ
Øê­ÞßÝÞ÷=ßî½ÞõíÛô-ßÿÍß¾ßý�ßÞù
ßú�à
n×îßßÎànáÞÞá>-£ä.b]ƶWI+lK´$f/³µ1OÓ›·µÏcÞá�–ñÎ÷�ãnãNã~ãÿBàþ:®ßCîã<näÚäGþßØhá5¾ã5®'^äQäDÎJžäW¾ääÝä~åBnå9Žå[®åH.æUîåãÍåÙ­æÁ}&.	¯fŠG�)ÿ@ÍçÒ‘»�ØÀ<½êµÚ�ß±@“
}ÒZ葃è‡Y莹"ùè�Žî’®è”né•é—nè‰Îé‹nè�Îè–>é“^¹¥þéšžé ´é©žš˜îê Žêèqê TéžÎ2‘.·¯Žë·®ê×[ëºë›nÏ÷Ü©+)?¥Í�‹.ÖX—M�'hIºA{ØYìùœíÄò:¥-éÈî¹ã;ÐÚfur!f+gYþÏôYš,ªíðN‘c79ä»ÜÁ Ëb<nBAíC
¹jûëñ~ðYtrT .àkÜc+
†ûM³¨„"'U�÷Ðñ÷®ø� ïñ$_ò&ò(Ÿò*¿ò,ßò.ÿò0ó2?ó4_ó6ó8Ÿó:¿ó<ßó>ÿó@ô/O÷@áZiì
6|áÀ4!]ü!ƤjK±‚¶Òùpá á�
\ßõÔðõ]öb?öd_öföhŸöj¿ölßönÿöp÷r?÷t_÷v÷xŸ÷z¿÷|ß÷~ÿöápÍA�/sµGÓ
I¢³k:T¤Ú4(º¬9rõèP
§þ�° ˜¯¼À
¬Ä±PÅ
±À
º�¶�	è�zÆú�ËÇ \¿	7r
ùpáp
¾°Ã0ÈpþÉ�þÃ�ë?°þÆ�ñ?ÿò_ÿôÿöŸÿø¿ÿúßÿüÿÿ
¤”ºÆ¶$ªñgœ©x»ÊŸ}ºú*–a˜3ë–cz¹¥—_Ì™d’¹DC$qDÓJkD‡+±Eþ]lqEÑbñEa¼qÆI”GoìñDsüÆ ß²H"u¬É—TÒÇ#�„’È)“¬²È+ŸŒÒJ,�l2K1ÁdrL/¹¤²K#¿LÓLÙüòÅáqa„AÆ›ðIí¾žôAíªx¬ñÂiŽ’mlÄæq´p†AŸ„¬´\Â0C÷>t.OO�ù4TP×ZÔQÝšPTUM]ÕCTY%5UVgm•V[]-ÕÓXoåµÕ]u}µVaa
öÔ\{EØcq•uXgiýÕØf“í5Zf©uÖZk±½UÛbŸWZb—åVUoÉ
7Ôs§MwÜf·
u·˜;ñÎZn	F4þ
	¹ÅUlq§rX¡
µ‡ŽvtOõ(<î‘�xäc]
S©Ò�Y�Óݲ–N6ˆ¼îÄÔLÁgBíÉéYTÖ]cþ¼»Ë��1MÕžöU9¦eͺ١…n¨=Ǹ˜þÂÛœaðÂ�²´Ð-äå=´ƒ¼qÕiÉ|«)âìϨÃl+.φ&·‰Ì³No†âÛ±ŽÅ¾sqyHFÊÑel°>´‚š€ÙÓq«ñBÁZë÷á)úpX{‚û].R¥Pt¾Ë¼:G„Q¾!”uÈÂè\ù˜~û.t,Yå
Ãö˜� ²©¸ÂC‰FJœÃ8äC?7@äNiBl®<|“j\Cn3ìÃkµhbÃ;|’1#!oLÇj,™Ñ8KTBËÃ"w³ŠýðõAy 2Òƒ-Ó“Þè“J
8Œ9h·“ˆ’âµ
Òˆl¦Iˆ´©ˆÿ1!ãJŒH†Z:�û�Z(ÆQ"¯ä¸Il9¥²£
É4V†�Ø��a¤•Ã&Dš+¢²¡¡Ú¿=³ ]Á
9:ø
«f4:Aº[`Äš*³Må`¨LŽÜk
œ@þ;¿¤t)DÁÁ‚3èP5íZÀ©t°DœšyFÀª¨q¡Œ\ þ�$›Ž´ˆ—¹(œËÆú¼ÚH·ä%Z‘›ù8c»G&ü	Çé	Èigh-v¸·§È7*hÑ�Þ ˜Vh½×C‰Œ1ƒ¸Õ‰¼ãÁ½-Û›‡.˜‰6ÐäȈ 9”ñ?¹IJª™x®».£â/
1CœI¼b&štÄ“:fÚ$`ŠÊTJJM1œD[(CÚŸ²øÈþ+ˆ	¡¯N*/R!›’ ÿcµÉ™Ì®Ú©g!;°Ä)Ô$h”—�*°4•¨ü³‘Ãÿ!MÔ1Mêx jˆ
3çù¸ÿP…ƒOåÊQ¤J=À³��S9KµTàªG¥’Ñ*ÛQÛs"’)ÑÊ#ÌËÛ@yn€ÌyëÆd”|C#Õ«X£%çà«P´T„Ïþä8 KBóQø¬6a•;aÒ2\TÂUK�ÖŠK�«¶ø*³!ôÕ¹ê.±0�‹O�B¼ÅçP¿µ
TÖÅ´VŽ–ÔJ^½©á€Ê朋QÑÚÑÙ@™Xµâ¬
¬¯¹‹–[¨„ݘ¹2K/²C†_b‰†³¿ùÐîÕ9øË�O„àö
Y¢ŒÜ IµHâ
š¥9¬‚¨»¢�˜ã¾æRT:Í°Ã\°³ôd)ª?SqF(ÖzÉ:6k=®S ì¸�µ½Ê0ïº(A;\‹;Y¨d›º¥b+ã ÁWùçÞ«a^àcVtâGK«’qFd°³:•5þÒ5,\wºÅeå¯
ÑN96Y%LЪɠÁá›ýÔ‘Í$:fI-Íji‹úfbÕµÑ!ZÒRUý�‡xƒÕ~P2â_}›Ì@yP-ÑËÄ:1›gíYðúQ
ž‡PªæTè°m‡œmê¨2D<ÃëQU†PV&
y
}¨ °«Í
UȺí½a>°”*t”A6#&±,¼•ÝQÆ+Bmû¸¡:¾½CÖ?ÖE”=VK¿:<”¥»O?±Ôu«	9ë�’Vˆ…X(X€…`þÐõ\È…[gÒmÅ£ÃSéíÛ83Rþb9Õº²:jz:snV˜‚°ö;��£‚¿Wº`O+V(U`]à3}JÌî‹+«©TºX¸°v.¬A½ºR�…\ð]Ø·x‰ã¨á£ì¹Ó²ìž5_4ÏW…p×…9#mÇ•©¯4÷Ýò¿õŽû®å›ô¡Bu¼³øŽ7×IG%*]>c]¼HOCR
/²E9œ­xM¯Ña¥tÃ9åí¹éâ>Z�Øi/�·Å¬åØr˜UÕ¼òé1„¼Ì‹zºrÝ"‡AäK[‰K¸ŒAïm>§AñÞá{¦v¶½Xb.rÛܵþ 
­³ V«Þ„í/$´å0¿èœ3SPƒ °"8"¨{"Ð{"@.O†Á�Ò麅.ÀÞš*bC@ímö�Ô[™lÁc…U°
(€
ƒbˆ¸X2;—¸ã0½15@¼×„?S[ö˜‰�l¨ÐÍ…;@
>Ãá;skþ,'ñt©�2Ç¿ÒJÇÞ»epÏà—,A6S¥±µÛ¨÷`æ;æ£Mi+D,eÁÕ™F%UÆsÔ}õ�£Ò¬Ù“nõö¹Ãæ&IþlþÌiiöOß>òöqôOÒ¿ùè…{‹—±_·Œ%3fl˜Ëd-o­tÉòV2œ-åÜé’§1œ)o¶ÌÉ2hÑ›8u¦ì9´iP—+kJ�y4§Ð¨+“mºµ&X£2i¥z‹çJ´Dµ–-:«¦J•A�Îb9ìnJœ<‡µd�

×
ȼsÞ.ºÜ‹.Ä|‡ÉºìöáJƒ#ªGÌ,¡&( zRi “Z©¡ŒJÊ'§>-è¡™"Ýs¥LkJ)Ô’6�©U[¹ä[Ó.U¦gK¾4ùäEOêSeš_r³E3ÒPÑÍ?õ°s͘I43‘δÝÞxÿ#N �ÈIÒ+uêlL2á|µ¥Dþ/ý£Ï</íôã‹ò© ;6z¨ÓAJy¥9+-hÎ,>él0ñ§Õ/¡ÖËŠtàA‡×¶Ã}Ð1"«œâ‹/ŨRŒ·¾²K1¹¬r|.É㛯f¦ùÚ{'â®'Áœ4²°ºÀ’K0ÇŸ²J­±Ü¥Ë+¹íÆJ~¬èþ=òN,¯”‚

|ñBX÷q^÷`
_¼‚ Ì‚1,„ð½h…/”q-v™!ÜkÅ1ŒQ²!/Z­¨N,¼µ
[ˆO#Lžòº‡ŠHh`0	ø¼¢(b”
q>$TVr6)¢ingˆóœÔ*‡9Æ}.þP‘ÚTä~"5Ç=NqH³Š¥¤ò–´ÉB3щל$¥²Mé"UÚ‡<¸¡…T¨
xcG5âf
3QÁnmªÞÊÁxÀ+I,N“§˜d%rBÄÚ-"•³Ã-M‘?ì\TŽ„Ħ	‘*u¡Jm²HJz
Q�bÜ&!9µ¬ª,½áÍdº¬½Ä…ªØ+^A„�
SÃ^qˆ;$swÊ2Æ
FB
c˜‚2½)J¸0–9 €n¢‹dƒ‚Xf:Ó`VÜ%—wà4€�2áþ\˜Â"^NâŸéTƒ :ÁŠ[9oܼf�‰7
J0‚bƒ2Õp‡Eœ$…‚è¦81<XX�Þ<E¸€…Ôï
ìÀ&6/T½s¥VÀC$Ѐ‚­BA
\:WU4?"­ˆLÛEÔ†Uµ†Þ*lóêÄâî%³Éã“¢%(U)$ñÀaÛø�~”#Ž™ã™ì(�~äƒÕ×p+ÀÁbL!œÎ$¤¡´,Et_¡É[bìDbeØ‘äuN|ý“šl
.¢
ͱÇ!šÄD9RëVTBÅ›
»ØA9Ò¤Œ=:>a¨2྅—ƒ^*Šq—]¨"8@
à
ÑŒ‚ЮÅ,Ç
©@8Úô‡@„±u>’�|8ÂÞ…e%È5("W*®-Ò�ö4“!eÅj8RJŽ~›©=Z=䇑…þ€›¸$qˆ®›¿‰å/4g¬
EHéÇbâc_“ÜfÑü+©Lt°‚sõœB­UF½µ
¬€ÌA ‚/Ã�pÁ¼�,Á°Ëà�õøÆJ‰À��àÀè†øÁ+hB8À@ñÀ|A|
ä@‚É$Ø
Šh¼•Y!A:�´
ÍtŠÕHº	
´

U8d,�
ÀJi¦DÂ#`‚+ì¨É˜Ê€äµ€&¬h$üA#d�nÀÄjC&(!»üÁ)D‹)Œ�j€äA#´i›Ê
W‡‘ƒhŽùaÎMlÑ¢¸Y¨„Ȓܧ�Í?
`B.\/À‚ \A
ˆÀT
„@ü…xÆ
äÀÄ,d	Äh|Ð)Œ�
èFG)
u¬
�€“€€‰À
¤
(ØKÐê
��ÁØ
ˆ
„€€Ä@!ØþÜp”zÂ\€bH4üôEë\»/¬ÂO€° õ¬‚, at NîÀè€T/
ì@EÏÁ¨f
Ä,Ì%]bÁÖá€/Œ* œ
°Ë
®�>RNs>cÑ(Îæñšè"^’ðLŠxÊÊ
 
ÆXë^ƒÅèE
¾
ÀD*ÐJ&¨Á&À	˜A‘'ü˜Á
D�¸\BxÀA$€Â!Á%L]·¼B4öÅòÎÆLî.TÆ6c·³’x˽µóãÑdûÓÄ}Þ+³»ê³ûc)壂«<³«j]òàeÈok§p�MÛdÉqoH¼MÜ8ÝX
û¨i~	{0ðB»NR (+u2¤è+}Ÿz¬úV«Ê½«þoÀRRÜ—RÖ\h¯zU¤ˆÎÍ@àç÷4êÈ 
tXré+ljä‚ÐÂ
Ìqhƒ*DÁø`¤€Tß
ð
ÂÃ/
ÉJ<(ø@Ïc
©*ÃÁ)tDä±ÆQ@ºá€À‚;@® A`à‹U¼Œ
»µr¥±dÆŠMy@òƒA!x@	ªÁ¡cA&;˜ð`qB‘`žÆ¸ @€W	‘ÆS«VÁ4Õ`  @B„âÅkØ.dÈ~¥½el[c.ßÆ}ÛÖm]ckß¾Œ«—îݽvé–+—®^¸„çÊ5Ü·¯±_n_ÎZÛ8±á¿‰1¿Åk÷îK½·>;^«÷—çY/o
Cv4ÌpøþþÅÞçOvlúbÇãæ%•´'àb³«Æ'IgúÆQq»_¿Ø±ë=ÿ—�^¸W±ˆ½}¬8ÙãÈqßj»�pëÁƒÛ
Î,¹³fÑu·§�»™=cñuÛooãîœÙêï¼
ûå>ÆòÚk­Íàò/P¦@€
¬pE—aRòņ0`ŒbTC&Uèða@ �Ž¸á€�rð–\â0 €
\èDµaXÉ�Ã
æ8Å– @àÀ‚°Q
TH£]XYņ
@ŒbŠ¡£†
 
(€
ˆÈÁÆt(¥ÒZC^Òðá�HrŒ`Š±‰"` `€¬XE!À�(4)FÎPÀ…AZ!&O®P
Å$@
P Šbv1‹G"°f`X\:K—§�è 
\¢2²FÀÌ`‚‰£
X
–Y
;Ø9VYe‘5�PÁèÀ$èðåÂ]|oÆøSA†è ÅÝ&£�Ï…hå˜Òva$�,Ⱥ‚è(KÓ?Í@EDhá
A:ɸ;†�ÚFdŽT´!˜ìZ[kÕRÚ½ðþ|ŒVb�…‘;†PAsSE°aŠ;2
¥×¬c€óO;|° 
š „^báäŠ*P‘�ðÐ…d<ŽW;ñ�5—�¨gmù™Ôäb2o�çiõ¡™Êü"@	Jf2-©™þÍZ´v	-[(ÓX†A
&ÀyŒeòãžËÌe5-IF1ì%ÚLÌ6þØG¿°q†T4ã7ÿ€‡;†Sœ…%g9ÿ Ílö¥¯^ìdsÉËÞ‚!J
4UDMÔăšc­Ì;Üâ³\bÅä%ˆh"£µãžc�5£‰×ä3~¬ŠöÉ"²ZfÂ/úe?û™kPc@ÿ%^2/81B ‚:Ë0t±D "�K¼f�(�‚’ƒ(|
ŠC,ò¢†-1ÉK\è%¼¸„ü@PCW�`D!&éD➈EY†ŒKLR–¿Ü%:±KD‚ ÈÈ.þ«š—À☠!`‰O Dª`Å"2‘ÊGø!– %ÆÂ(1âºDÄ%N‘	e^‚=ÃËŽŒAVtB’°„e4‰¡ÏN¤r’Ë,Ä"<á	Xtb”„8(t!d삈Ðe&Zñ^°š°¦.Á
]$HŠ]¤4¡öF8¾ÌŒêzxÇšá…]mPw
_ä‚n¹J‰.ôW[X#pÅÐ1ŽЫÀbÒ….isK<è%;B†uyÛúæ¼ù¤ÞlkK½\ƒ¸¬À’HÙ`X˜"¥ÅÐ!Õ‰¥\øâ¶ÃÐïJ3ŒH±cl¤â³ÍHS]?•ãëbËh±AC¬äX¿øU3€Ík^ëþ2ð53‚Ùi0´3zÅpb3¼¡óµ›ÞP
8õ
„A¢@ÍX¶CNC/€íú®ÜòB%X"-KÕ õÖbÚˆf
ë0«��EDâ†*®_¤c_fHv£x8æ°Œa&ü‘úÈckà`fþf†„†ïþn
€ê"AqIhc®èc<k‹
1@ñ3�4Jˆ‚Æpƒðˆ‚
DŽ6Ñ]þèƒt*ƒf7±<FÃZn.±rLiˆyH¡o†²j_(Æ°o`‘Qˆ�C9ô¥›Û¾pè’§dˆ
„ h¦þŒ¨2¨„£ò‹«fÄ2ŒæŵÜO4ŒæÙãgTÑ/�Æ\4r.ŽiZc[Ü£„æMj¶¥ÑDä �Ý&- ºCÕ.ˆÍRo­…@ìÝ-ÛNMÚTcÎBDÔzAÆñÝÚ±X"ì-øǯ�UêëØ«·/-ÞÅ¿vaÝÞN¥Ðo¨¼Ëþ©&ÛRâÑÞaq�x°05Ulg8¯„Ä-1•Šèìr-ë(ªê¯²®�¦¨ëè4-ƒ°&£+«²Ç:+C+qQ©ºrÇ\è[â.uéK^<ãù²ê'Ýj_°�7|£êAfäÐ*ŸÃ†¸Œ«¦£:V
;ÐO.àmâ^r?¶ÇæÃÅ¢:ÿ-
ÏŠNñàج+ÈêÊAî„�„æ.™®�ÐCÉÒ¿òÝvA¢‚³%D�ð4oóRbqJ
äëÞ‚Á¼íÂ4¯gŽAÄì
z3G°Ü$ê[‚§®Ýä¢êB°¡ˆ £»V£8Qï~�;Ò‚ÝF�E+þ0Šh§¤©ªô‹fÔ,¬Ô0´Vc7ÿêN=ã�ð,:Oà&‹ô~Ì<èÊ¥<”¯^ì‰Î,OÃEÇ8(‡¦ !#©¨.!õ�„¬ñŽÎŒÀƒ1]‚'e¨6�(6¬Ï‘
Ä¡9„ãÁO:0nüÔ:‚
ȾE%®ôöö¬éöâÂò-ýDl,Š�èêÑÒƒóX3ê,\௧¨ŠõüC/efõh²íàmxá}ZfðB]\†d¤ÈßÍÎVCºq¨¾2ÞVc23‰Û“í²�eò‰íîñXÔâ‚`«ÔŒ”Eã‚mMñ%ð¨s/8Ñ\´ÜâÅ@þLo¯ Eð‰ne𬥶ãü’qÁô.6í0à+k�‰K�”;:†çBMÄüȺrÓ®zÎhR6h)M™çd&´3ôÇ60Û®MÓ�ÙígÔ„ú,àÐc²’&]²e¿0RϪÊ=-._’ˆËô
`zC¼áäaDÎûæa
Qú,¦:\A®”êån��îì\b!ö0 éOŠa½ô«lÞ¨\ã\
T2ÄØB!c³/"ð¡ñ´f
îÈãþ@mn%RÔn¡`¡l‹Óâ44ëÖáÍ<@Sñîñ
(hW&e.Œû'N-ÒH­
Ñ’ÐX¤NPWƒþcnô×N)º`aEŸQõ¦}ÃJ·;ä.ç¢åÔBõ„á`-;„	w!p!-€
òòP3"™æ?bFÖztN[×ý¼Ÿ8ÆÛø~Š!2FÚ:†õkôRí8-4ðrs%¨Nx3é¿RBÞŒaI2Ó˜/Â4ËZ@Õ
pb÷n>¶MsT¾ŽÇÝvôÂXÏ	§·.,/Uèft,?èȳJp�6úÂlQT¥�Êúa¸Ï¬’r9þÓ¥6œò—
Ô0†Á@Ø=q鈆Zð)8QlÖþÄ®)šX°~y–-Ä-“T6ÂníÔô7‰w+Õ2ÍÇQ!牣+R<&þjyx¾¢¨krta™fÉÖl†L#
“~�yœ0wóÔˆAD$寔¬0íáÞ1Úc·h!.¦®40¤»DŒ°vtwÅ.`+áAˆ…ŠQ
C¨�ò‰ÁVôï‚êBPƒ‘'-DÌ,B/"ób‹…á/ï/Ym×’L4�·"Y°Ð17RŒï.¬?€ñ`Á1”ya”áÈÖ"ձܸ8`ÅcW}M5E�„æ7õˆÁŠOÃNc
Õˆ˜®-;’Ñ©L¨p{�’4iTvÊn3rí‘P" <áá.A5p
^â}€uv¯5/%(�èŒjžæ&ÓCâƒSŸVüþú%º
ûq@î(f?›a“Èâa¤À)˜c|‘†!®ÏÈã#_lâæ*yˆ¡›à€~@@
ÎD<j
¢Í3××2þÒÖÚMDȹÓD»"�ˆÅQ|%z­—¿Tt`Ë*l /¬„ÀN,àCD'ÕöƒõX¢»žð�á­
1ä*ì+ŽeÓÛä®nQŽ7ƒë×vËôXÂ1õ«,\v+Y-:ƒ`!2 at v@
w`ã´
ùgØ“�ecï‰%¹¡
VÇ(AŽ'j,¤È€“�Ý8Ï~K†¿;ƒÈP at f8€–¬â¢¯?mhBx<î1aª!…£¶É¾/øà…7ð:Ÿ�R·¿ŠRÖ�Û1´váu¢`ÀîàÔ¦™LÅ1óä9=¶€Îµ¿bÁj
_[¥f×@íÑù„ôºqV3ˆ!\ÀMð ´¤sþú¶8ï¢.Ar`Äm¡ăÔÑW~CË6
³`åˆÕŽá{–f"Ã*ïõxë"fíT
ÏøÀ”ŠÁZå
?Ë*	ºk¡£„û¡�f
Ûâ™6aaL¾
 Ábá±VóXˆ!NAld
¦òAýÙý 	
"ß[¼véZÈ°ãØd[¹†åK1ç±X6?RœUÙ®]ª0…¨€�…¥Ä6uAü…ú,¬�ÆÆÞÅÛŠØ_À»"òÊEèi€
‘Pku«ì¬Å@m�Ò1@@�/§‚u4]•ãƃ±ãÚd¸Xåa½ŽõúuŒX¬bVË3ŒÅ’-`·6Wmõ;lGcÇŒµ2€
,
ŸfWDk¶â	&�D‚ÉjÁN;2š¿‹±Å¨rÓ0ÄØÂô¹®üK}Áœ‰ûjЈ2¨¬\knß)£è°–
寨½‡±œ¢L#˜äí¹°è2XÌÂ\¬²ÍRK-öb[Ñ«‹18ËKµÄ”ë
M4®(Ó´Ó¦\ßÇ°ä’xv¾
j8D.œ1à€xÊx %fb)­XÄÔpC"á
v DG|r �„‚‚>°/
.è ‰‹h‰1x�‡@
ÚÑ…'1%â0
i(„"¢ÔŠ1è€ØW
a#!Y!¡þ<×\H‰0Kx"ž˜Â
­
³ôh’#ÀáX€
l
è°Y^Áh€
Ñ
[â
*Ø
Ö3
.`
ðj–â
1À8,à.�¡°$X+(a‡ € :f7b0H«D¦KZb§«¦äZÉTKgeQŘȔE´÷ë_iùG'}`ÃÍhFÕw QÎЇ8¨àŒìcýèíP€‚$L€¸ÄI©‹>UIÄK_þÒ{Ñ-â“ŒµdM©ÁW!Tð”ø� ‡Æ°–äÀ®®^
.ÐñÜqâ
 
Bø€à¨
€¤�4òDæ­
 @� b at o¨a«÷'ÿ~�¿}P�
2Mè%
i	v~¶·
–PTV|`Æ
Ã@!ãÃŒ0p
™ào`
ǃ
sPX8À
hR3kÔ
«à0d`	¬��ð
Cf
® ”éÆ_ð.IG jp—p“à yð�€QrBÂ`±`	;™„€	„ð
¯€
Kh�qЈ
…`
0
ˆ@þ
0ˆ;@Gi@~€3V% 
 €0T*@ˆpI�p*P
}¶ppð~ 	œ`+ð°sÐop0”n$`	Å��	
\ð9
°
Sp¶�	qp
{d
4i	>À
XXp þ	 €
pðÊQ0,¯ð.z˜à€±
ið{$f 
í:
3ši> ™âòw±7§@¦öRá9°|)0�@5_@
ÊЮy€
ž‡@}SC©&
x ŸGQ`	–à
˜`KH
«ð.z
°PºðC¡»©ÔpC&
݉‚+Á`‘àbP
�°5Qò*fÑ!¶“¥À˧CËÃ7¥à£&þÑ¥—Cx!„ð¥ ¥ 
ÀÖ#c°QÄOp}€
˜ðÍÚ-…P—'Gf	¥p¹„@tPäÅ™	`¡¶#q	d+
�P–À
ià ùDX
� ´¦0+PëÚ®¢ð®p~>P¥I«
áU´
o�ˆOú¤KР0T/ 	«€À
k©¹3¦–°béÖ½31B
Ö°Ñp
©
¢w6óX²Y“Åw²ŠLñ3àÑfqHh‚¹ú릹m–ð‚
Pä‘áj`	7±¾�¹¿fðo<3ºp¹
¢ÙN
›
—€	7é’y ±C¦
~�Œr”›YhqÀ"Ck$9à‡„rá±�²PË6¥Ð¬W»�µVðG!þºGð
¯€eC¦pã�
³i=b ‰¬°¼€–Pi:ýœyûb\°
Bâ…Ut²Oã
�p€UD …P²ƒ˜oÜ…p­HÃ/…ƒú7ˆÀÏþ\–
?æ
l»/�	4BÁ
¬+½
!É-f0HŠ
 ¤yðBu
¹ Ú-Xðqà‡¦Ñ~A<]”wµzt³êªž?šþ%Rgü¨ù³?ü“'
xQ3Qxq
qP¬5çÌD³
k/0RÀp8Åp@
„pg_©	ª ¸ 
 ðF’Y]Ì
ðÀ	Šj°@ú»/ `F–`
¦ËÀ!*êA½
V€…в4Ũ@6ž'Ãr€À
tÆ‚C`º¿á­�	
 ðŸòrHì
xá
ë¬qàõ±ÒYʇpPÎl¾@Q bhãÄGÍ‘^œ¨À	­ÀŘ´/3…‰ j›(7PN¾Ó
§ Û2å)Á

ß4{U„ ÐC�¸Aí÷Ò5]ãx6£þYã?síYk¢¯â¨çˆÁyrÂû°ÁÎ(ÿ ª³5�úÀ(i—u‘}ÁtÑA}-Ã`Ò\Ù8¨DgÙXҵ´Å,dÝ{ÆÁ7¬-
KËàÖ³¾p÷‰
8 ›cP pmû¡Åãñ
^œn¾ÌÀ6¢´#á¢pâ\¬é w7þÁ °Çú±(Ø	t-wƒÎ»
HàÄÞq„P
Pm
æiP“( €
vrñB–ÌØ-�ÆfÝšeÌdÉ[&UþKöëãJ‘*]Ž¹r²�)“‡ïßÏ}þ€þôWTŸ<ngšI{n_?vÕø$I‚Mß8*Îôõ·õçV}?óÑ÷*1–,Cšüå±$K’&CÎM¹rîÇ_m‘
KvìÖ-b¹èˆ8
f¥/+
Ž`ÂdÉàD¾,±rˆ/c†
;ÖÜ++™,¡–«UsS70ø²ŠX¬U}Þ ÉŸ1ðX‚“Â
ZȤ/…ì
eiA�YhϽ:à‹WPõ¥�¼Ô
àg‰�%
KaŒ0WÉD0
Šâ
2(L
¬PŒåðB!Õ#^‘‹gñ¢SÓ-‚q

;â‘i#VàcBB¼�˜)ÌÈp	X|O	9
2aShB�#
N¡<�ÈñH,A6É�oÁ0"ˆ0€„�€6¹à¼Jñ&Ï
á‹aìb/8‰ª0J‡tù�Ë… h…UL¯FÚ³Ò%L1í
àfHdvŸ
/%Å8BNð‡Ômäi=Æ´ŒÁ¹‚d=Rú 	XÄ‚z>°×^0‡Eþ�ö2
PÜàFûÁ«P
q^¬b8€
L
 PQ°„4í
 Ù)"4�‡,€
Øö	̽
0@
YØú7cU¤�0XÀ	R ƒ1Døª/T<¼ÖJ�3³¿ÌÍ„߈CƒhEJX�c„,
Aü°D\Ë Àƒ
P‘¤
“Í	(¾äI2ÎôX^L‹ZXâ8�¸‚�
þP�°à9àÀˆðÜ
¡
)§øʳW
8×
| ˆ8ó‚ƒq@
‚‰@ÜŽ%(8º°2`u
(Ai€,€Á
†m%P°B

è=üþmùè€) ¾
µ�€‰Mx
-]
ìÓ8,Ë4¥Õ
gp�ÝÙ¥ñ§³€¨ˆŠÆt&AÛšUAã9U<»Ðy¦þæ|¤°A .(„ÿø«N@K
Ÿ¡Š ¹Íf8'ìL~§~`%‰` µéþr¦åH]ˆ:»Qn¨ˆb]µ¸	¹P“”q¦²Í1�eJƒ«ý«PÚ:´˜Õ�ÆÑÁ²XÈåÕJbh!
Ù™žÕ*“¿
æX(èlüRþÁKL ƒ^û¸²£ª¸�æb(#ÈM¬?”ï
‘bPÿˆ`®ˆæ(Xˆæ`(†‹™WNÝ´�‡>‘Õšæ›6i&†9`ø^0éb0jAç_þÜuœÄªæ¨Ò#ù3Ù…¶Â%“¾
äû8‘ŒSèjè8«�ÙCû°¦…>‘“ö+bXUÃ1…Æ©`Y—è«æ�+shBiÅ%Õ‹þhÇyF/
éÒHç·õ´À²+«Â2úê*Z°Á²`EkVð`¸ßþYTŸFTˆ	<‰Ì�(1ÎX¿ôdÈÞc
Š �—ñ‡xhÍP`ŠG.© §«È

ÜŠ}¨ßÖÙ~À*®¿pe´	?å_ꈒ‘½ÈšRÖã£ç��nµ0	V at S"@AÈ?Ql骜�‰àU“ZŽ+æŒ#†·€·–Ç—þe¿Döþ‘cîcc jq¿ç)o¼œ˜
7‰ÌîJÀp^´˜…¶ÈØ4é…2Qoã›±‘ÈcðAà‚#8
/¹
BøÕUÝU4>+;mhLÝvûÃK¾Ç5“ô>í‹ó<8‚‘@‚N�ªë­p¿|‰•ŽªÔæc
Õ0½“ÖV»Ô
y8oÓúØ"Ôn—šåÕªúVó@…ä§ö/ÔˆÒ¥Tá0áÒœ¹¦Æø¢`û‡x¸�xpƒ
©¨Æ(öwȇ>öÁO3¦�zˆŒaò�FÉNŽSÄ)¸¸ŠõJ´‹e6
Fü"þ噾ÀyÙƒJ™2W¼�ë†:äLËh£îQeC$¹‰Ó”d“5�4�
IÚö™œlfJ�˜».sœ±-¨ikáߢ4CÿÝ¥T©LE¨d3bÄ"­h…F´B$F	�	rÚ6½‹­i´K‘1ÄèÁ䊭`ŽÙ~Q‹ ‘lEš”fäR/±Ñ’�´B´]鈹±¤FzR´ÐDäHµ
/(“$9¶ð“F)ÊoV“/Bç(´²�MZ¡=êôŒ'?yp®2šÑì
$7Òʆä¢+‹Üâ“—qH2ÄÈ�–Yé!CJŽöª%©Úq­Z]‰
XÌõ°�&(7‰‘ÒJòþH%æ_µ2^¤NbI©vÉá.©3Ñ«*Ë{1ˆ�
‚G”GzBÁ@ŠÉÃ×pƒ9æ±÷˜gdëHBïŽWÀ+Ø$ä]ð¸*!žXŽy¨´ò)]êB¬ÐÕD†t¶ê
G#iƒÊeº²ª¸ˆž‘^M6´$Ò”0–e£ÍVð"KêÔÂ�-rd°âHΔR£¡qasÈÁx&VÍt0’Ðx(“£ICà›VŽ7QQ"^†c=®Á9æ$'IXÂø¹Ê$ÚL(™é“ºp†0tÙª¦–[¬‘,óòˆÓÒÊ03[0ÒgB'§<å–R’«±x–þÄu§E•Eò×jU+¼|
ï’æ=nï/Á’Š\®vØ"’U^9KH›FÛ±jJuEŠ©h›˜†p3'Å	Ý.J™–¶R'M	rŠmp¼Ðì\™5F,xÁ7æÔd�ر.UŒ¡�‚gaûèÂü�
�5£�ïa‡52¶1ü,ã?ÿ�Gx4HðÁdù(Ð*‚ñ-aQŠyÀ�_Dê˜Ù�2¼(†/|1Ö[¨¦/QÁN.`�76çfÑÙ0RtDâ©ê,QûܶBÙ»²EV¯žV±¨y¼‰|ŽPÅyû,´)Å&;e׿ô’”G킬 °/b¬ý=ÄÅ]©Íg‚ÇOÉþ#Ýí>7ç×ÏPךÑTÍ©	^Î8OÄÆB	#;™“·zæ'­Ð[1tÁá$__Öç’ªô¯»cºe’€£“u¡dMäFÍgœ2
‹ÆÑÁ�p}gH�†¹iÍá�.r¨È¶qòÌU§s‡ E\†;pîÌ*䥗^�à`¶aâtzNÉH©*TQg]Ý)l)áJu%2Ó¤~µwá­°/ìL6ÚÂZ.e“’‹íì#ÛÙ.Ïzý#y€cËÀ†|åA_û:ÔïñŽ¹¡Ðà‚Ά+bñÄl¥g¦ÑwdA«©¶+έ@ \t—Rè2/‡‡ÛþÂlÄ·òxè½¼m/K•H¤¥Ô8§J)V·¶Sd
3ì·|AùJñ\¸$“'£„jhXÖªaBF»P)!ð`ðN¬jR
å‚“Â’¶%ˆxx8Á
^¾xI�óq¡¿#
)CÖ;óZ¥\Žôf"h�ˆ
Š8À
‡P…«‘éÕÐQ®©$e«dV—+ø2Ì„ÜÆ¥¦Cv¾ók�
i7Þ¢x:ÏJI®]PGj7<Bf\ræF–
çÏ|„_[
2(¡IIÙX`EDï,˜�Œ�ÁZʼn‹Æ€
€Â …E“¦Š[,“^x•qXO2E…cÝIþWÁ^ÝØ„wùZ1¤Q,¤Ú0Ä(tµ‘„v1!E€–ùJ)åÌø¤ˆ§eOZÜbxÍQ�DWUDQ (¬‚'ÀÂM,H2„Q
Ñé±ÊÿP
-$�Ì¡M„QNÌÞ
@

þË1´B'Ð�¬À
ÄÀ,ð‚±ƒ �Á8’qÄš|-Ü�GŒÅä9G�$‹÷ÔÈíì¹4Ç\1^N¨2¨„ÀjrÁ*è£‡ŽÄ¢H8 XEØEml¢TX†ÉK^ ‘/ä
’€‹1((C¨‹*¸
7©d0Ü�
@Ü�'\É^ˆ•ÉB’YêÏ8HãE)ñ‚Ö~ oˆ‡ÐvXÓ²ÂÝ؇¤Fà¹ÂL©

˜€Ø
¤@xÂ`´(Œ
¤€¨�-Å'ØÁ�¼wsÂJu ØlÏ�ã
ä@°
ä@Ø
Þƒ-PC
´+dÂÁ…×€,,ȃ*„7¼·ä
Á Yµ”ãÁä·•7%¬‘-¼î…ò3"Œ�Ÿ÷8H£uГRˆ»ÀŸ7–/c-y‚\Á‚óø•§� PMôÂÖ„'p
Àt1'¸À
ü9h(7 3ùBôÌÍ\+\ÂŽ§€òBlºŒ�Pó耀[
*Ð�¡Ë·�ÿZ'Ø
ÌvB 21,Yx×
L)‚“¯
y¢§•‡ÂÔ7lÁµG=ìÃ{ŠŸ?ˆC~0
ùƒ=PA 8C"ðAÔç:À_+, €*€Kp€ 
Øs\0ÀÁ¬
à�%Àí%\Ap€
hÀ
È,"4›S‰°ÏC\(G0+¸yˆ@ À
Ø
ÆA�7¯r­ÂI"“¥4$
ÜÀ³ªh2dÆnѲeC€
‘SÁ!]„銒Ú
° .–ð
güѧê‰G’iØ	Å{ì釞pN�eÈ?Ô„
 Àoò;
oxá08ÀÂ)&KÄàà9>0!„T T
}€R®
ñÄ“UX°Ð
À!å*PM�ae˜_€
æ–µŒ!¦•;N4vP
ðˆCˆ‰e
–ŃîÕXXZ!ɤalZEŒ ‘LYA�Áã†.ã’VR%î–clyuò
N — ~àL|‰Å˜d†I¦y^‚ÉÄ‚‡ DâT9ÎBVa¥1
Þ¨‡<ØÑ�3%
ú0‡©4¦}ìKþ8ã>ú�Žl,¯±Â"1ŠH¼!ƒ lB1„„eYlVèCÈ°�Éq@¾`4G€àà‘ðƒ8@)
V
7À	ò	qÂa
-˜BQz±Ýì"…ð�
Ä’‰&„€bèxu„>€ 1|§ƒ«à;ˆ«,
PÀb x
@&òЈFüá€`
�‰1|
°›.Rå$|\‰JPÌR–šè{t)XôF?êÁŽj¸
Mad“3öQ(þÃÈ4¶Ò>òA�l¬"ü"&©QD¢¹
`@þÄ
D”Ì
V Ä+Pчln
¾¸íkpƒ8d"†ˆ8Â"ª
‰‡¨À²%
FpÊ‘g)0�ˆùƒ¾ø
û"%{A.rÁÈ$ŒušÈ…/(±F¨K«–¼€˜1Ñ0 Cà†ZX»&Ň0x)¬ÌÊ«8€w�Âsðp*£™ÐÄ!¡Æ”n7Èà…'á¸À.�É$Ip�rB°�¢`U°¢¶ÈÁs°8`ÂÜ„ˆ"BŒpµ¦ë]0R  ‚¬Õ…vH„S´â»Êþ¢ ‰S`â
±t1ŒVœ‚W
ŠAjÇBNky`�ð@rÀÎl!ÏЊ]ØÂnÀ¤¾
9~àP`Åx¡$€¡ƒÐâ0dÆà,AIƒaé ß0!2
`rvàDçL�r)+€î�ãæ@A¬î°€à árá¬~aµÎ
paA”e
àäp€L�Äþð�In�nÖ�a\¡ÎŒ
ÍàÔ0Nï
6@@F
à 
TÀt@ìn 
!LaÜÀ
0
©ˆ¡áÞ€!µf�µÌBH0!¶`ˆ�µX
·Äƒð,Æ€
€
ŠÉ(-
„Š�ÒÀ�`ØP	±`&çþ
Èà
HĘĶš²�Ô¬ù\ëIªä‰ªdƤDº¤šá	À¡
b`@(ð²!€¼ó,ÉÁ6b
rm­€`^
a*N¢ý€
"ôgJ"4á
^ÀGÀ
8 †
ü jçè
°¢
`
  5$Ì°Œ!±±?Îþ‹jDÞ€K *O!Äàb¢@ˆ
<lòjâZ7ÑBú µZ+zŠ
:¡ó
„ÙÚ	Ê`�]µ‡ ïRà·èµUî•ŒÈøÕB±
l‰‚öú�ÿ¢hJ$P¬áB
LÄ¡ÐL‚¬7© ˆ¶
©äMŠ³OPa;+i¯–À¦™	R5÷X�Á_–X
Žà·¬@‘n€�þ²›þÛ¯NN
€²“Ίµ'üt
òæ
¿€	¸êto1‚áT`×v`ã
cá:

P‚áf‘R‚wNáyÅæVÁá

Þà
°€”e(¡ÄÎ*qät†Á4�â Ÿ¿
–'q†! m[j†pÈ€£H&Jáôð@@^°ŠŠc‰)Xáü€Í~’³qÁtØ"¿\![ä(щŽ
 4A!&…Û>kS-Á:™¢F,ʘC/Z�&SÃ/¡Òâ
øKØ£g�îÞâ
"fÕÀê8j!tÁb[ëÀ
æ“Õòà
A 
ÀAkËä‹„¬MÔèŒÞäƱ¤(”!×Úü›Ì
z’‡|B›Å£
©ž´a-„‚–ÚXã«¢€×SÃÎl£$Ðü��;·?Ôr ^`è¨"
¦–@^à–`
"øÿ€Dà*ž]yp5 3U£*‘H¬<
 ì¸( `–<‘"õùóÆŠ!¾T
K†²aªš´˜2çO¤Ff` `J.bÉŒíZE¤ÂH
©
ÀðåÏ£Gx�4)ƪXœ‘Lœ‚*k˜°‹·nõ²™£
+ª Â�
,…XñÀ
GvnÁþ$ˆ
wä"*{)¹gÌ1ÄÔ<
�,±©`¨
¸‚&áƒä€­àÅ
Hä#Ü‹uf³Àè*cŒ_ô‚ ¤E+lf¾
 &0�Bp>
,
EªHnpð
UèB®ÈTðÀ
£é‚«×8 V4LãÂ
˜ˆH!¢€8
F¤�-Øœ
€€t`5˜B&‘<`
h€¦…ЋtJÏ/nÑ	<<(�iP+ŽAÑc´âjÈ�
8À
À€
ä 
Œ(kz:Èb诋X_‚€‰¦.»-p�
lЂ¤ÁË|
v–þ@†p`­‰D‚�vÑÁ…V”¢ÁÄD�ÜÞ¶ 8 V
N”¢48Ó�¾h+\Áç
lp‡XŒ±„š„�è@M`u'ˆìN$ä ’¦´^�"ø+=³0F+Aè ´ÛE{aŒbtB؈²Á¥‘p…5Ø¡ºØ©¬ËžXxvØ°®ö


VÄ;`¼
.,œ×4C©*
Áù•W^
Š „*p¡‹1Xú�0'F°Õ]ù`ô‚ºàu:§r8€7 và	¶p.O—Qã5k`	„ þ»¶uì¤
ˆ
b5p³Ö=ÉpI÷`hrö*ž´I³â©€
O ÿ §”JÕ°ã@ÁÂI‡¦úÐð�ó¯0GÓs
«À±p§€
§à	Ápü㯰
«PÉñTÅà
¾Çp‘"P¸
¦Ð
µÑ…«ô)1
_˜…ë¡laÊp
t¸'´
0EÁÅpVå
PÈY8l¦ „É„#ãÆà{˜tx
¹
VÈY(µ¬—‰®@`EG@'¡…¼P…hEqU8„™‡T« „Ãd¹À‰¾�þ2
«�)6ijÐäÄ
NøˆOx‚5ZX¾à
RN„ÈuCª€#·�twSÔˆŒkH‡ÑH4fh_q�?h
PX…(Ùfd¦
œŒ¾
=á	Ö€°Pˆ»1É`[$sE!†xu8ÄW’h	Á%A0C—Îyïq¶ð.“X¿€SøQ‡´Ñ?° $r
®��«À	qSNHC‘)J�sÔ
½�C¨¥«ð
ÛA*E	Åð“ÒˆëÁN à�h¶
Q²Qn§à‰0W]›x
N‰!IɈœø„zÈeŒ· =·Ø– @fE)„°P4ÂÐ	j�
I†þbSÛXn¨g‡6g8¸*vf+ZÐ
ºÂ+©Ôú`T 
pfƒq¦ûÐ<èƒà¤&FqO7è1NæD±™ë�:6¤ŠÀÖ
çRk†
NÃd]ùƒ#Ô5|¬0L7õ‘Ûè›7±el
seu.¢òTeUd
skÃPdÃ6In‚QN¨lè‚.£’‹„%n|É?Öµx½
•
œ» °)š@KÐ#+�ÂGwÃNòt¼ 
/"Wì1Lè‚!ú"þ¬0*#�ekÀ
ñ–e*=e·£uSy»PòÉþ
Ñ	0ÛèŒe�­ðc›"ªd‹Ð
H`	Wƒ†–™’¹I$˜,öJ¡ÐT�+ýP¨ô+Ø ­ä8Xä
+ËbûPK>ˆE*¥c›¨Ãf-Š›��#¯§F3�‰•Ç@3|	yüsúºžù³P¼ oò¨É }	lY¯Æ
·’+ÿð‚ÞÊ¿ž	À•YJÖ°Iý`K°`†€z4„K0A‘ŠH‘"ÌÈG£¯º„ÕÈõ¥¯®W0‹œ…åD_Š<Xá³Â°¯‚eŒ>,NÖÅ»é<ÑGóÇLø¨3ž±¦ÆÛ=­¯Ï¬Æø³œ++N»pÄÃ
²ä©•<ÌhxÁ„Û·%l:iË–l¯³°L6[c6Ûh[ÆX¯Çq‘l6ÊÛHž »�¢]Ã@\_z]ÇÂüËŽlª¯,�¼\¨0i¼¼ìÚR‹:ÑŒÁ[üÐË
Bµf›á{4Ùl4ÄL½óŠ2Žœ9\¯Ê÷ÐÉPQ8LQ;[¯œnV,î¬Iîü´Òyfÿ
.Á»,NÁxàƒ` 
Ús�ÅYßõŠ?ŠÓŒ¼ÔúÃ3Û·b¾·Ú¸¨n¨¯ †:<ÎÇÁÍÑ\ßëyÙŽ¶-{»}i‚+àä4¼ÆÛ¼RNX¬G²6Ž½·œ–a
õ¨È8"¥ïI0`-¸1^Ð ¯„n:îǬg4L½´ã™mÙÆÁ oñï.ÆDÎÍ÷¸ñc¬¾ÌIÅýÈÞΧÞN�
«sÃ`«?±ÚápÍÁ~¼éNæH£··
òI NŒÑ<á*+NÂþa£µ–Ã5�¹ÙÁ%Ç
tøk Å_#"Y2dÈvU<Ö‹VAcÃN:¼“eÅ’‰íÚ³×΄AÓ+ÖÁ‰‡!3¶Pc²…½€õJV«$2\SC"4vìâÈd
³:Dê°!I°+V$:±ëZ…1#.tSá/`À~…<Ê5©L‚½´›%°$ÚVÇŽEL&L±âŠ[’ìŠâÄZ¸ª†�©–dI¯™6$Fo²a;æ
‡ïŸ?Öÿ\»f­Ïß¿xܼ„jöÜ¿~ìªñI’Û>qTœý«¯_½~åäx
-ÂÈ»ÅJf––Zº*,'R±+÷”2È¥¼r+£Ž&š2±D
««	»j¬»ô„AI—^š,’jÙì»´Æ’¨&Ò~Z±½zO¾ónq‘ÄÅ+J¡Œä¬Â“ Ú© ÍB’© Ì¸Z蘫j“§*ñ
ð³+K㯭�hùe*µ´ˆLµ3Ë"³ôê¨ÈB󨧎ÆÓ­�€I¨®ó)!˜~¡Å0°0ºÏ”ÀJR±œäsËÏd`=þ¬>¦ê”¨¿È—ZÌ

¤†:º5Õ^CöÙZ“‡*š‘f‹nþ‘‡l€KÂÆÑBšò駟|òÁ§RfhÆŸ}¨³»[â4<9Z¦Ì¬(G¬nù«*	Âp<ÃBK©—_ dÊQ¶@Üé;‹¢²ÞH1Ȫ·&¢*ª¥ÆÊLW‹¼Ê•"¼@
Õ`òÚ,´Ïˆn‰ð>·.…ÌP±2Šl$i„kE†~)H¥•îM¨G„Òâ1.»‚7"Ñ�Êk$“yŠÓ–HN8Ñ̈rÑ´ïæb¹%¸àÒ•~¬ì{í=›Ç¹®
o!©~‚i¾˜@Uqêµä"¨¼sÝÙ¨{þš¯—’:Ì;�Nøl¯¶[ü£‘ ¼¹ ­‰{Þ—E²¦¸ø-Õi
5«¨)7[é!ÃxÊ9«Ìv†«/Ô%ê	¦Í˜†¨�v46Ù×öYV]{lsf*À	·œß‚«fŸq¨X†·qÇÅg9&ÑFÝ|æ	g•X4c*®¶z"ÒÞŽ8½>:öð"⥨ðÄïñVÄB噧¼"ÊÃÓâ¿Ïì.‚ÁTh*“ˆ™’°�xJ¥;
Ÿ¾Ç¯�¬ê|‹ÃÔw"â]q¥|NéX`n1¼]
Á›S€AZ0D �šA "žLÝK~W›!Æ8ÓSÙ!­Úa´òþ­)Š A’1z™�¥hl33`ùÀw‹xIê_�R§¤B 
ºN+ÙH2¬òm/ab\>hÁŸ£‹ûÙø´±."MŠK±LIZÇ` 	IÂøWÚ†u—”Ĉyû’è%©òÅo-]|�ズïù…<âÑ×›>v cäNw°‰Í?ÞÁ�-¤¢OðrØÑ
laãæxrÄuŽrL"?Ø‚öÁœêhORK‰ÉF"³Œ
ë^;œFxL†åÌ3MñÉ
Q²ù2ô´O6#ŒZ
U“%°‰mñÎ#�6bÍme!zò¥^eq¹Ê͘H25dEZRL¶:ï\(@q(Ɣɟ�&J3ìL†¯îÖ³ž±ÌF€LƼ8’°ÚM
îIà½@uÌ*Ä`QÂä5õuOMIt zZÜñU“‰%"žü$k˜EJSo9츶š¡�â‡9ý8G7~ 
ÑuW¤á¦B«¼�Õ+S"~ÒNÝå ¤y’1)%¤¹¨K¼p-�¾Ã#ùyþe0ôªZc Ck^sKë²¾Žä¥nníâ1ŸFÍ•ÁleB”ÓàÂ"Qª@	-_ÌcVÆ!×b…ih\‘Dô†¢½ˆ÷+¡Lƒ
¢˜,-Ó(1kú¸‡&¸‰
Hâ³"1Žqe(º‘–º ÆÌ0Sù¨xPÅ–�:
#oßl‰@„€Ì+IO’l¶¿·Îd*õŠ�ZÊD¥jŠ›£RHIN‚Œ¹h„¾€ºÇXU¤„-�D\9¢Zhˆ#–|øsh›ˆ‚<˜îÒhøU£îã‹pÜCwý
ï«$µàZ…q«3Œ©T†)•à’t·¹ýˆÁý¬Ûƒñf’°8ú`¼gã.ªªHÑ'ȈSGÆ™R&þ8Öúò`flL¬
‰�Á^w3Q ,/[Æ2q'&‰\*½Îz½“ÛA6r¶—#z=µLÉ{Lúè#uþô‘$¤cƒªT
bFTÃbIŸl–`œ•žŸ
fxQTçªÅ¤¼7À˜Í³¼|wQ0#ဳž|‰2vvH&ŒvŸ­n,ý˜@˜|,}Ôäûþù”ksl<AÈqG7ÜmÁÌú˜2møàŒu„¢yߪŽ/ÜEÍž#C*ˆg¤ì؈­¹ÛåCšòŠ$»™ù(Ó ¾™a»æºËÁ”¡«¡ñ0)b"*âó/3
=«&¾»›-ér•‹)2â'ÔJ'L!Š™=°Ñ1¼i@ÙI‘pJ –ÊÀÀcªîiÀÏÐÀÒ 'Ê Èðƹk®¤¸	.¤‰$ÔÁ}šŸÞë)oª1’±ÿúAL¢:Û"‹ÏШ
ƒiJ§pÚ‘a*"•âŽTÂ��¾ÔþH=Ú:@-´#Ù#
:[ëkˆ
C-•IA»þê’]àc™²pY(¹ÖØÛH…+£v°–+,øSe�¿Qt
|À_€ˆÖ�ˆÃ ½ Â¢¯#±äå±3�™•ùšwâEfãÅ�a�¶�˜þ©E¸#F¦âÃt±Ô·\4¡}iB:ªÅ½h°ú!�ñ:�ÂiDzjÆKy½ ‰•ÿ*’¦<¯\,¶Õi§ ÓÃn$Õ˽	ôÁ¯3ÀÛÁ:4å{‹ ±¯c�nê¼Ì:�’£”ÒEâ³£lB7ŒºÄ‰Â=|= ª”nŒ£zC‚EÖáŽ1J©ì='4FÆ›#(¼(o:þ¹½þîáÈîq#½€…Ôè>×€²Õ%ø“lxiÐ,,lÑqø²Õø‡}x�)“JüWÐÚâ—w’͘-‘„##wúFo”ûÊv´+òÁw2F£F	¬<
L4ò2Á�Ú»[„ÀM’•ïK	Ô®lË9#±tË�âKñˆˆY)N›Ë³lª$L´¸ì½:̬Bˤk´°žR“™Îc"xò=Ѥ̠«LżÌiTBÑŒL¹ôG;4>·lK°ä˜z±�¹ÔÌÏtÐRL²K	T§ #¦�NwÚ)Á|CҼŨGÑ\òA�|ˆ?�ëu
?’ó‚fÐÄÞ8žlÙþãЫe
EØà�^Š^螎HŸKØá;ctÍÌdOGéG½l¶ùdKnDHðš6GiÏ|CÙñülOR»÷TÿÜ$\äK
‚ÀalÏÁì4b�õψ�ϹüK
•NÜ„OÓdÍ
ÝM×4NÌ„	
Ý	ëM<ãdÐU”7<1¾ûË�ÐÖlPû¼PõaM
=NÍQªC‘ã,ÒÉÒM"Qμ©ëkH¨¸SéE䨽B–x JS’–z�wÐ2áÐ/,Ø€?Þ	¹òT
Wœ¡:Q¼ÄÍTPö@Œ¦ÿ’G
¤E4ÅGAU'�SwþjÒMÑ›ÚÓádA;ÝPçlÐ
ÕÅ°šK›ÏϲO>íÁÄÃÅÏTM÷ÑMxÚ1ÎìÇ*ÄÓ½O�QÂtMÓ$TM
P…ÕîøËYeMa
ÄÞ4Mrl6„²:!eÔ
ã˜á”Í?½™U¥¡PS˜£ºSuÏ<¼XÓƬT“BMi[Š…°…pè)O-EìLi qè‡0íNlh¹ga�}
¦©%;ª~õÏ;YX$Ò²xØY“Ø„=X7“³°�;1X„
ý×£úWšØŠ†í×�ýزØØðbX•Ý–…X„­Øþ—…ÙSÁØƸ؂}XñØ™åÙ�]‘–ñÙuY ½ÍX�ÕÙ¢]1*Š�Ø=‰�•
ÚrÚ€ÍY¤Ø©ÑY«5�ƒÙ¢-�Ѳƒ=Ùaù¦
êÖ|Wei
d¥¢Ô
UÓöÓ‚—Ó�Q„¬{hSX¨,Æã´È;“
ËÌòj)÷ÙWï ÑÔYHÝ~+Tè“=²ýTŸ	ÕÅ"JÕÅP“ìÁ{±U$L]TŸÜKQ ™Vt4¢Ã0ïø/2ÉSÓÌS ›ÝÓERÔU7bñÕALò@2¼Ï�Ü—€Ê½
å·–RGLÊEfZ^ÃÜstÃ3a�Ï”&i“�è}ÆeÅþ¦åÀ´ä)l´Ü�Ñ’Ã
Ö_åÐýi¶ÍÑÍi-N…üÈ@â]®ãÇ›:±øÉŠnýÖw}Jð›
PºÄ/;9â	ÓkX?2u¹»Õ|¨ŽW(†¾)À×õ=÷i�\ìÌ_¦ÃdQ´dÏLMËÐ\ÕÀÕl½Å-U„$LjAÉÍœÞã£ËIÅOÊTÔæK*™Aù4©›Ttbœ×ãˆÖå@nV%$¡–DQ	/dõ´–BÂdB
ÄPÓÀ¾k@åÅLl•KÊ$Õ†ôÔþÏ"M_®lIeÔ±N=ÔÇ¥Ð&þËjÐvŒb8¾ÏiÒNb†QË´š8†SH�ؘ
¨”�dþáR/Èĸí�Nd¿.kJäø$}—{ÀWh`
!¼´ìª2DÀÅb¾,UvŒÜ=#5‚G»úšÖm°ÍNb¸Ö\;ùÝŸ´Çl•ÅÈM_}[An
B]̯Ušl®�X âå°Da	åaÍí^7$e<mœ�äåÖQÅlª+*Ç\†ë¼<äbÎÓ4:œÅåAfžÀ¯3©pš]ØÕVë
ß±TT–
H®ÓÑÁµ@\ˆñC¶ò@­	ÝÖ�•k¤ÏpžHþS<]A˜|³
Ñ…Vðã|€Wdá�þuJ}À†3H…òÛ�j	¬à`W—Ïd�Jr‘ä6õ…bˆ]Pi]Pþ]à…—æ…Xh^�V¨i›6œ®imÚ霶é™n…ŸÎim
jbÀi›¦é¢Þi�6jb i£þi^˜é¦†ê ê§&ê¡Vj¦>ê®VêžÎj©æê¢þé£ë¯nê«Ö겆jžÆi±&ë²~ë­ëžÖi«–k¼nk¤æê¥j³&j¾vë©ê›þjÀ®ê®æiÖêœÆê³¾k·¦j³FëÅêÀÞë¿æê§fjÉ&kŸ¦ê¶^ì´ëÁÞkÑ�ÆökÏ>lmRíª^mÞë¢~lÖ¾k¼fëËmÑVjšf–VVX?ƇŸDŠ~�Ú ‚r}‚ié1UJFn¨Ô+x�þèo!—êPTx_ðnïv…ïö…\X…ò^…ïÎòoòVï\ðóöîU ïófoúönöVï÷ïýoüVïóoúpúNïò~o÷öo÷~o
7rû6r—o7ð·qŸð§òoðñr§r.÷ò
7ðp	ÿð
—r)?pò_òúFsôæð3¯ñü¾ð(òÿŽp�o
þ—søîo4‡o?ïð:OóðÿnWp…WPt8ãþ$§ü�RÒèM\×v=ŽQœÎ§tž|¸‡sePjÈTOõT§†VguTwõWwuXoõZ·õW_uZ‡õl`õ^§u^Wu\ÿõY�uY_õlP^—õZ_öVOvjxv_öXv]·õ]§vU¯vc¿vmŸõ\Ovdov\WöavfGwköoÿu_—öoÏõfO÷nös/ölwvW_÷Yß÷mïv]/wlxb·vy·vh?vmwzgwbÏu�·÷kvw§özWø[göˆÇöqÇx`'xe÷x‹7øx¿õ€÷kïwþ€§we7õs
G^ŒèäÃ’-aÒ¤‰òeÍ�7!®D(§Ëž@?‚$y�R…ýêýû§oŸ?}M§6•Ç�J³j[ºýƒÇîŸ$I°é3§Å™S}jýík«/ª¿¸líõ³Çti?¼yóñÍ—÷/àÀ‚.lø0âÄŠ3nìø1äÈ’'S®lù2æÌš7sî¸Ý¾½~ûýþ«÷ômT§Tÿíãæ%”4*àþõcg-ìX}ã¨8[·-ð¨k÷Ù+ÞVõ[¨þ˜®nîü9ôèÒ§S—Jý:öìÚ·OUËý;øðâ³[ß¼¼ùôê׳o?•¹ûñÄýÙc;_Ÿi먽SUwµ™4OÌ&;ÝàæŒ?âlÑÌ[¦Ù§Ü8ùÍ¥rj¡Wž\oY—\Zøa\¨…Èa†k‰(܉û�8¢o(º¸"ˆÊØb‡jxb�ú¶£Œpµâ�
©#�Údˆ;Yd’K#‰9>‰c�T¢Èd‰URÉc”Iz)¥�F
wå–"šI¢‰`F©$šXvÙãšR2™â›8Ye‰þi¶)Õ˜,ʹ!�)Úä•}vHTÞ%¹OS:6êTk^
Û®¡6…ž­¡Æõ,µÍAUk­S•¶lÅúí¬9öªlµ¼Öúí´Éë-·é®&%¯Ú†K,±Ý5WctÄ–·²¶zë¿·«µÑ‹Ü£õ®«®»Ýj+ì¿Ü:ë\ÀýNû/¹ï>G¯j—Ç·ÐRõí½ïvX2³¿½…ì°n±õp½ÝN[¯§ã¶›2º3+¬\}ÂõLo“Õƃ
þ©4#à?ò¬ƒÍ�þŒ£E3ûÔƒmÿŒJ¦9Ed?Þ•ç5­5Î{h¬¸þ–ã¼×J9ëØުɶØg缶Ûá²
·Ûâ†-7Ùy›
wp¿™Jkàj†=8݉òM¶ÚcûÊçâ‘Þvßo~yßÊQ¦Ú{‹Ma»†oŽ9Ý‘÷åvç}¸å£OŽ¸çöù}²àŒ¯
éêœÇÞyäɹ­aTð©ká°U¹–
6”îãÎ¥bU³ÏnhÑ6u?ïH–{¸Ú¼«~Ø��ß󹲉ėºVZiy�Vj^Ùñ÷Õ†¯«øî'ä�‰²_þû±šÿ~ý6”>÷}m~óÕúè=ð!ÌYþ\Õ¯¼G¼dÝÏ€d’ úæ‡"^è�Ïúÿ¤÷¥�QƒR 
S£Âð}€ê£VˆA>Ѓ€
!Š*t¥Ú0|>ò`TB$‚%K}?ôaH¼\Mp‚´PÍJS�ü<…6¤Ñ’üº�•
‘jf¥×4£²ÉK9š—›èIñ/ðð d@Š”
ŽxÌ
S|¶£0–�§aâ‰YB#ú°‰±¢ýD¹“Q‰b”:�ÙÀP6��rô¢%iIãÃ1é”g)�2YÆT34-¤¢H«;¾˜‰±)~É>òAŠ<
R��¶·¾ý-pƒ+\ßr³ZXmÍ‚¸˜´œ6ÍO`ÏÔц@H‚m0ép³«Ýír·»ÞµkTâÁ
¨Ù³µ¶�-o:d�xÜ–�`Æwã+ßùÒ·¾ö­N[ŽçÕ¤¹C§<…ڳ䆪û¸À>0‚ù«¡y¡¦”’dÑÛ©ÑqŠ	¾0†3¬á
«‡-àÀÊÑÌë_ˆ‘Âo„Oq9¬â³¸Åóµ•xÌZÚX
½cÌ‹þð\¬ãó¸Ç¾]‹<ˆ6©..­¹gaçô¦xZ3¹ÉN~2SÛ7Þzʆ5aYøɬOÚÊ^þ2˜Ã¼F¹ÁûE¬‘Lj>q‰¹Ín~³—ãRæPì·6Òpƒbu“^ŒáÎ~þ3 9¼ªÂ†x¹·ÁrY
ilÁõ Pb‘ÝS˜bõÛî~7¬þå
IŦ4¾µž³{°Cì�¼.pXkHÜÔNZ‘›ì¨Ñ‘© 
°¢Ž�S¼âŒ.Û<é- ¶äóؽ)샒çI°!	Ö°8ÊSÞæ·¹hGëÆRÞ
D›Å¡
M(4ÐŒqH"
’†ûÑ�DÐàJàÃW±®öµ#8Tóv°yo­)*€8êè†$ø 	kd›í~ÿ»|Ã
bSŸ;áÈ9¢PÅu$ðŽüvÕ²Z*ˆ£ËÓçó65~ÉEÓ�äC/úPï£å“sÁþø�MÙ¼ŽqÁ†~>úÙÓ>¯r)ú¸)Õ�|â¦	ÂJ[,?Åz\-â¨=ò“_W­“÷¦©Ëê·`sÒü¥ÑHÅ8ì¡üísß©¡â*ò�V}ŽqSÒp$k¦–ãýìaã‡sÏ4‹åäK¯Z¯Ü¯ÿý›G*âq•Õ†Ü±7qÿ BG=€ß~yÑ�¬VŒKŸ% V`¯h]W!ÍîÝÚïe˜† ¾Ca͘yÜê)Û–­ ¶àþÅ…¤MÔÚ?¬Ãµ9M®¹ V`§ŒZVh`×íT¢ÉÞ!ÿÅŠÐT¡¾i™>¡ûiȇeÅ`ÃÔ<ß!þn¡ò½EŒÁ†ßJ–¡ò‘ÙU8ÃÁáÔˆ­›¾áèñѨå6�Æ•eZßÁ¡ž´IJòý©ÔÎbÐ!áU
Ä�„ñ�
æ_f}…ŠkÀ屆
’!bF¦�ùƒéˆ¹¡[ª™
Ã8”dvfp}"½Q�7Ø%�y&jWËÍþŸÒp¤šµÍf¥&mzVˆpÄ8 äQò§-KmçgIÅjÆÌՃ̉•
'söVPJÊ2Ð$,b[sVg¨9Ñ„B¥©eOM u~g^Íeƒœ
¡Vì¡Jž]¡N‘Årzlž²E˜6À"œ4ê+Êz).:˜báZÆ졺�Ñm„]ñQ'ÎêÐpEm¬ëÍm›ò)%î&�ðbÇ*­—Û¢j`9ØäÉJí�F…UäæÁýƒ¥ô&Ìjm‹fåÔÔ"œ5$Í&ÙúhVŠì"ZÙÌ%A5ŒÕ2¼í—:ß­ÕÃê퓶E™
ÈÜÖÆ5
®�çΨ>�Ÿ8„�Bî†R¦k�B5Ìí+bšå>W¯jnjêÑþ £ÒÜÆâfJ»Úœé¶¨à-C5h
Q>¦(ÁÝ^©šÄ.xâ^¡áÔÌ=�ï9‚<дúî^Ê…VÎ-�\ƒ,®4”Å,Ã3ý¦òÖf¿b…3¶�êî+66¼ù–oùƃ¥fom
Ç´Í-Nýé8,C(Ì/ýÖ/)¤B(¨opòQÕÎF=¬Câ&�4)$ÁðTACÁ(°@�þ®/hÒ®óÚÃên3�Z3 at C*DÃ{zð{H§žÿÖXëª4Dƒ5`6˜C9€Ã8À°9˜ÃÓæ[�3Ì-<¬Ã¥,n5„Ô¸07˜Ã×ðÛð
§æjÎØ?$§
w4ðñAîñG¦¢z�3Z
Þ
ŒE3„�4˜qóq÷q$&"
èÁ]ÞGC(,H4tƒ6äñ‡ò(#&ü½6€±�´îG64C7d;$¯ñ,Çe kc3"
òAîb)lA4Tñ;r
‹r1óekð!ÓØ(Š…*£�ø6Ã5\qWóñ]3\JÛÙvoW|…âŽE"7C4hÃ5Ô°8ˆƒ¿‰C0£þ3\6ÈÁÞò	r{
/ó²8°C
—C
w;ðóX:�6¦Â{¯5(îô24‹/6ü²9€ƒAŠC
;ôCÿÃÿ�ÞrÕ­*{Á
·2Hs´=÷¨Hÿ$;‚¢2[ðâ^Ÿ¤”16pHƒ8pôÄôXúƒ¸
ti„qï²4,C7¼08¼ð845
uS²¯ôMt?òGCû²/ot7ür7üôTSõO>EŒ
¥Ô¸CÝ:3AËs5457ìôScCY›õK¶Ê¬IC˱\ô—q7Xƒ7tƒ7l´7Ìõ]ã5L®fð†±ôÚ±<ƒõ\�5X/6c‹$ŸŽŸWîJC"»p3Xƒaþ¶5€74fg¶E­ø:_[“‡µ“vSwÃj³6CÎSÑLô½Í±ƒ³_C7÷5XÃ5TC4ä¶nï#ÕÚrMƒ…ÙIC3´cÃ8·0mks7÷5²ïrÒ)�*o
4t/‡µ7XC\¶x·E–^ÿ5X´nuwòpß66´07@|3ämRÁ2ðµyÕ7yï2e¶X75Lÿw:º%WUrM³î
--- NEW FILE ---
GIF87a€Kçþ

6èàtò‰ó–7v4ÁE4àܲÅ�<rÚ#¯5TÝ3¯IÃÍ5×t3¼`áÛo4ñ˜3Õ�W#4N‡£S×uããBàl#ŠÕôÇ‘q\vF%ÕHc‡d�‡n�É4vw"Šâx3Í–ƒÈ˜ˆôñ„%An¶’IžAF5nãXS¾¤àK	…ZUtÑXþü£�>ü
B³£„%—ü
 [�1�5½|øft2Í4ÞÔâ6ä ¸H]ââ‹16Æ]‚
†Tå¸^24Õ|sàµ
}#dèTS’—‘Ý7dlqˆîÁ¼­#¬#�\Î4Ó
9ÌH(Í.}à"fˆ˜�‡Ã2Ô‹eGZƈ"â4#™4ìhù’|´½å6´\å!¶ ƒ üèRH†ÂÈHu`¸…)j0pAZ
\œÒ¸Xƒ{ò¸€q‘Š0ñaek¬CAR	ǤXÕÀ@šãæ0‡;òR®xtã/ùbU«rñŒlÈÇ¥vµ—^áÉ×ȼs¯€
¬`õê×zm¿Ø‡Ï¡‹ê
m[Ê€Hˆ.%‚€KT£ÁÖbÀÕ‘Óøâd¿åAÚSéè!`
¶.¶dC’iþmÔ—
±M__”²Pwü…Ž †NŒˆ¸ƒ€lñÙæÓŒg0ƒ.3)IM¨
˜t„#
#‘N‘9„†h¤ÎÐ]€ž�†
–²”#r1ŒuÖT:*d]¸Ç­cÜãÊ0&˜!l>#²i@˦«ÝŒã´¶ …#NKE±cž(	•Ù/xlÞá¾P­¬še«&IÄ4–<Þî„-±ÂôC®2Ù+$±0õ³Fþ*uC`D‘	Š†2N¶fº«‰E
3ŸŠÙ\èè‡jlÐ%oˆA“³q:‰Xˆra¨‚S=Ìð\¹@V1Gi)Ö Hé€ÂÀ*SÚ*aH#‰Yzɧ•ã…•ƒcJ…iz¦kº¦y•Ð�ƒõ`/´<H#SIñVa¾50†!™_hþŽpŠ3†‡š§´àB*]I] 7¨…ÄÇ€˜ê�ˆŠŽßÀ
ŽYhE[õ—‡hQ4ZjñŽàB‡§JWLOF	˜p7dšÈàQˆl¡0æ™w>érÔÑ$ãÓ´ù‘øŸ¹™wæW†³õ™úér—ú™±ÒŽÆô
±øC€v–v›ÓtÔ:IŒ°š
€ö4®²F9®Ñèr‘˜®‚³tËú®6I0s2æwlÆ–®Hæº
“¶Ï ¹0	dE”—ÂA
_k¸Ð�¼°¹ <ˆ©—�%Ü�gœÆf\Âl¬}nœ¨mÇhlÆÚ×	Æ€*ç
˜p§fIŒÖPþ`¹Se‰²¸¹‹r‰0Æ�ýŠ§Äкùo‚œñT‰@YqÈÂPl ꬺ Ð°hóårÊ0ýFûÂ/£]€Aº¸K“ËÜΰhy'³Î09u«Y±Àб�#¹¨ÚÉÃ0
Å„w.×ȬZxd0ip» :»t¸<Ê8†
 ÕL€<<•ŠiM§ E/×KÝl·V30óÎð<i:zË‹f»¶$ÎU© Ý=
ªÎ
Ï+#ÊúÜ*
Õ`¿*Á¬2«>öœÏ
ª8
Êâ|¹R—Ì©§Î:Û$Rç ˜ƒZ	ºP†Ðà¿Æðþ¤]ÍóVh–qŠ ý

ö¬W6í ºÜö¼h5ã¿­Ù¿c=êÜ/½&1�òŒz¨ÀÌ�bRxÒÌÀ°ÍÅhzúBLÉ)‘*‰�ɱ<Ë*g©¸9pŸÀl–r)¶P1[ÍÔ@'8	©ëÕ¼±Ü Þ9Ê·¼×ë�ºü×öط؄=؃ݠ¼×#µ¿ðà»pc¼ ’ýua¥KÉ7Ño¸›ÙL ‡¶�Òv=<¨8M"
ÃÀ!U
§[�É™�“‹]%­ ¾Ê¡ˆÍR[‰€ÙZq¢›¥°�kŒŠ?Ö0_xGŒóÕ¯ÇðCÈ'àþâAÀ�A
¶œí¨ÆɽhX6Ÿý
ÑôØÁ™‘�¼h
lÍæYÏØ骳@}ÐXæ K& Z$3
ß·1ÊΗ2÷ç20ãÑòi/ìvÓ£¬Ÿ'½ *Ÿ2{eŸé
jÓÛŒ½.ƒj
®Ë'=2Šj–a}Hp¨'uòù<hb½9tí‡4§�5¤psÀpÉ°�Œº‡Š,Ö:
>)Ÿ>ùþS<	¸€ok�‚.ÅH”–�aáze㌨­³z) %>éòIé¸}é–žéJ¢ÊWâ£Ü	qIaÇê;•“ÓAi`H„?p�ɹö†Æ`J�ɳ2[3Ï5Ž�ê¬ÍÊÈ/»ë{HEuu–·½'lÍUûæ°Þë­ŒU$çZØʼÜ–qêS,ÂP?²‹Åe,ñ[Aa±nÛÎWLM�¨Mz7+Í`Ƴ¿»àgÙªö)â晽gi/‡*
êiç¬݉½ M§.-Ð.
›¡øsþ ÷îr‡ƒêŽ©
1übör]@c/+›¶>™w’Ѳy79¶Ëú®)a˜ì„–R=gÒ.o;XSÐþ�{(mZêíZJ÷(ÆÎçšM·gzMN×^Ž„eÞà®æ‹ÆS¹üy•Ò
ƒ2†©Œ®h
Ð
¸‹tá„–�¡À�c.ÌÉí'T½nûˆ4f5Lg¢DQÄhÑäE�$Jt6TZ5Î=þ½|lš5k‰ÒxùâÏjB„hJÔÚËìD¶„)ËÆ9&·kκæͦì5a¹&ÙBŽX.`Ëmá²5i.aÏ”iš�mÑŒP½ÿ\
r`µñåÅŸ'�Þ«Y¯ä›
þyk»iÏØí’y�³pÞÀŽ¦[ù¢À4`k�<Pû"�ÚªÃ-›o¦IKœ†8û†n˜1ÇjlI£@ÕðHP¶Ù¾pÄ–a,Bè ¡¦ùÆ
“RÊfœiÈ#‹Ü0ÄÙHL„[hI#Äk#meÄa±o¾iH)­Б4¨ ¢ÈDLKÃ+±ìÒ6‹ ±0ÊmˆâæIŠü;†3ΰãŠ6:þÈÌœ ÄS † Ì	šŠ.òÆ›mCŠÆmÄáÇm´Ñ†‘^H!Šj¤	”Ìp¶
Tœn܃‘3
•2úP$˜œò†IgäÑ…œ!ÊI5ýŒqOˆ¾
çɆ֑®>>õŒÈJ­fÐ(¹ÙËOLÈÏ¡mÄê¤!‹ü;ÌÙf,ÌÓ@¿©æ™¢=1=!nä˜á=³=f;N…S?/jhÆkšQ„}õ5ƒŒ1È
d¢À,ÉEj¨É•�mŸ¼T�37CgCeÐåÙòþË,�Æš�½)G?r¼�;×j>”Ék¸!gÝÄ‘[GÁûnÉ'Ï…ÜÂ!§›nòOWrÈaXCoÒù;G°dâõ%¨pÄèa¨IÇ·AÇJ
yÇTð«Yg�oWlutà@µmÈð3áÞÖð'YETÞ9×&š^‚:SWÒ“r&gºA‡[ÎFšg(r(3©Ã`
‡:þg¡mŠìÀùê·Ž´lƒRÇ7¾â‘`üd`+_ùh>u�ÃB8òO¥Ìô$A­c|a¼P%#Þ�I7L
7·
td‹„{¢ˆ
ÙöÂñ=IW[
²Hž$¬€2á±8¨&1Œ€ÚªUÅq�{I#ÏÈFæd–�êHœ�(#h”%óÆßlaš»é-rGBŽåöT
oh�ÝÐ�3Ò¤­p
ô÷2ú=ɯ£œ{à7(øBq C”ÜÛÝ<͹%Ç9°™¦ìa/CÂe9xg8“3„åø^ƒ/A±£
4ܱi;{:©ùäžíU*ª=“7à
¾�’²¢&ý^>�ª@¥Ô}ú¹F=±™@Þ±ò¡¡;ãI#ø
£²Ã…ÙÛ^5ú×þR#jOªH½j>¡šQÞÌ‚¤¤ Ÿô@Á
jtgÔžHc¨ò.›ÛË$]ÙáË>v²¬åø'qæhšåÒÀ°ÆßFÁ~ft•A
ªó~çŽÔCÅ
œ�Ä�µ²ðhE¨t˜CnÈ o}ýF
s„è߉ü‡bÔyð¨,9Ð�Mþo•£•EêFÉ�v«®d¯Q[\©Æc2žÞ=E:Ö¶5¦çØGYºRzWð
®„„êX1×x,ø׿Fg‡!*iA“ÆFÕqš[¼mOãØžßî6¸áÑÍ…;›:UG”)|þ§÷°G<6ëKý–ÃéÀ7¾©ì`oµt
~ K­­Žx(�˜ðé:|�‚ëƒß�çŽrÖ3ÎG‚Álmv0›Çå,ø>Ú±�(Ó³œê8G9ÒÁ�#«<ç³7ãx¶«SÍlôÛí8»õáwt¸Cæ
>ö�¼ê븶ØO½Qv¼žû¸Ç=öAá•®ƒÎ{ µãžÍH£Ñ¤5ß]ÖMjcƒsT«úÀõŸA�è­¢—àõÌæ‘Ó½cX¿í°‡��æ(‡9ÁíhÇÖÉ‘yëÆþÛÚxfhÍ)ÏpuèãÏ·v¢÷Kpwß|ºµN·èy(f#>Ýdî²Ç‘Ju£þY�Æ»hÚÿyõåØ:˜·Np#g<Ã<Þ];þêáKõ¸^3Œ·
�­§šäúeø9òq�vDú䰻Ƶšys<œ¶Á¦:=.(5Üýý<>tà19ë'vx8|3‡þb7³ë2†8±;´³¶	Ä°ÊS�Ã@±ËÀxØ@f»@Ä[¾t³<k½l°u»¹{0¾u(9’“7£"¹#=| A| ¢³‹£;
Ô‡�“·uP=th6ò;;ý3Á™»¨Óv€‡u ;
Óº‘C<{H·ÄËþ}
#9´Jwp½k¬Ê´‡Ð3xø‡¹ëJ”´D—4ÿäÂR$¹³”Å&äÀ†$¹Š‹ÁÌó‡Æ¹Â4K“¬HnÜB«Ü>{�Ãê[=—T<ÁÄkü‡vÀJÅ3²x[Ê­»Cþ¬d¶¤ÄE#32qìÆGܾnŒÁ|ÀL¯\J×ÌËÑtA’34ÌÁ¯tHòûB‘˺lLo¼D†ûK9DÎp\½åäÆÕCÍR,ÆbÜç;ÜlFƒŒ‡¨tÁÈKl4M¬cËÞ¬F­ÃH׋7Â,Ãî¤Æj4Ã\üÎñd½x;Iú¬¾k4HKdÎa´‡spNl¬Æ¼Œ‡PËVÌÍ;$H׬Fí›C—Í•ìÅë\É\¼¹lôG#õ—<PUÐ
ÎiœÇUÔUñ¼Í&ÝR9P
Ê'ÍËklSSÕºx«M^•Æî¤EëÌK>,ÎjeQi4²Ð³|
£m†¥MZþŒPZ¤Å�§�Ü—X]²ÍŸ×mÝÉÍ×õ\Á5\Ô�]¬° õܺuÝ‚€ÆÝ\Êm]¬ÈÇ�ݱ•Û˸Z�Y\Ö%[¶Ý\ eZâ=ZßµŽ�ð]©M\àП¢õÜà \áõÝ«ÍÞm]ÁeÞ²Õ‹„˜]ð=ß‚@Zä-^æÝÞf¸üu_Ü͆à_™ð
ÞýZ¦í�ó[Â%Û�_„(Ú¬0Úä-ßäuÜüià‡ì„‡Ôu†p@<ýù^­UÝëÝ¢Õgð
Ná@a‚vá~á–á>á¾a>á$Há®áV‚¦a$°á$P‚Îa¾áâVþ‚èaHÖaâÖá*ŽbVa®b.náVb.¶á$c)bèâ3Ná).â0Nâ-.ãæáŽbÞá1Fâ¦â0Fbã®ãžc@îâ/Öc*&ä)>d)–c¾c^c7ŽdB>c&cL¶a†äInc%‚:æcGöãGÞäCædLFã5ÖcB®ä@†aJâ>ä&æd$¶d¦ä1žeRÆâ9îä-†cMäTæd)(‡rÀ–‚c°@ÎâF†åî„jÆ„j¾…jî„kÖæNØL
³Ì{S3Üm€ÔíÛ–ÃŒd¶Ð›D8ÅNf»í޻˜×Û®KéÆ°H]Wé¦YrUÖvØÓ;œF9$î¤F/}WcœCÌkRi¤Á=|Ó ¬ËruÇ�ÄLŒäneÌo­´mî^×ü^R¯ÄLÌóÊgÌH‘ÓÎùäî#Q‘›C¯CPÌäCÌûÖi=iäE
?ÙÛ†»uÖJüKwÕÈf4FWYì,Î
Ÿ× ”9iÅo]ÆHÔÊâÄË“õJA­ÄŠü‡ÑSï=-mÌ»m/uÖä.þF—FÌ3rÓœY8�pûÎÕ/•Rx³ÅbÌUtÕp’óleMq‘üyÍͯ“C>TÃ×ÊÉôÊ´,FlFfÃ'�á‡3̆Jð
@ƒÒ¦KëËî4òí´æI•?J‡p‡ƒØ3Eï
Qtkb’n‡E7ˆJÐ*Ú1!LWt&éAù#÷ÁôÚtk­CÙôþ8sØ'Ôa’StoptspŸBZôíê�*õJRuZw³k
wPßG/ú|—ô|ßy‚'x7Ë÷�Ç÷J‡ú›�ôº‡ø
;ˆp8„$ð4¨ƒ3´‡l8!àócüûñÙYÚu§?wK¢&ROtjx)$Hj•þsHtxö„—õ®çûþnp¹E×Eß�÷uM1¡®/±T9‡ ŸwˆŸõpˆ{�waÏ|ªÇû¯x�’ù¦¿ù¯¯û“_úLŸvOGyÛø×ÿôjêsO•ÉvˆGyMivJ÷þ´Ÿü{×÷vOùUGuï¿xS}7ëz——yÜgþdæùJ·}O¿ûûw«·wzwûô¿xæˆp⺉WNÜÁpÃu린a9†Š3Wn"Aq:ìñb¹‹
~Ñ\A�!%šS®¥K…)nd¨òàÆ‘5J,“â C‚$Ø­åÌŒ
*Œ¸ô)Ó¥‡&üh&I—}zÜþªS`K¢1rŒh´¦Æ®›47Ñ FŽ(Áî$»síË…Þĵ;äÄÛ9úþµSVÉ�1öˆ"$Ò›·‹{½¥“¹
!ã—é<…Y9…Û�‚wŽÜ9nŽw¶$º\äkäÄA.Gn5¡2g#Üso¸sÝÎm»,³Fá·Sš“ýrçÝ�Ðuß�M‘ÛtžÑ=®ÝYœ©ô… Ë�óYzälÎçpž^�ܶªAI:tJ27Ô[£Ú\:P¡EY‘dVCcEÓ˜A„ÓsSù$�Qâñum…Óa}×]!é„SB@…dÞDRÕH&dMGžn(!—QZ
}(^þ™çÒƒ6m5PF¥b�˜18RSœéhÒ�5rÆ�@?Ò$]E2ÖÅ„L)y„F‰ÐBNÕtœNr¤”Šøm$æ|a¸f;á,’D9hÈña†!vgSQ†ä˜AäìµSd°Eæ–@{	WÞ6ê¨sAæGjܤ†Ît’ä
oÞDÎ5°ÁÖሠy3Zo•·œi#Ò:²¹vN¨/îäÚtnj„†å]7u#›vëAçáPäpSj8¼™´�¢
59ìˆ"åv«³TŠ'åtÒÞêaF¯BçØ›·š›Ð‚ÚëäŠoÊd›¸ÂòTn·æÕå_t)å‹ì’@µ¢¾ÝN¥éþ½ùb¹Ðm®•›¦^Én¦³iú•D?B8d¶×ŽÙn]ŒåV¦ÆXj÷c©¶¥¥î’¶ñ–_‚¯:øet¼Ù&“­8udY66	scá
Eî À¹•n
ƒÎ`vhšzv¶JLÎê¡—ZØܦµp�¯.¼çu9»þ<ÃÐåo®ý¸.B4zÛ/NÙ,“·-^ü«Ær,ÝAÀƒþüš êèm®�:íÙûèK•8!Ž�ÿðƒÏ0*!£µc‚¢†K)ÐPºùSÕàã
u &rªà9Ð�ŽÓ¨Fb‘ùàmˆ¥5slP�„¢`iÊ£¡Óü)5·ñÈifCÔhpƒ1ŒÛÌà†·Ût0qÊú¡O3¼¸I.‚¤“œ:ÆóÃÍ�fqBÜ!|ªfŽ(V�VF,"rJ£ÅÈUMeËÁ[c†GºÕHìOE䢕¸Ã->[¬câ’õ¸/1uWJj®Æî�‘Œt¬Ëªú蘆Q�¨ËnòxEr%þç�8ì£ä"9ÆÑa¨{O¤äLÖ½FJì�LŒäé
9™½qU«Šd²ÂšÖ$xÓ$ñ6GïA±ZX„"Ç#Ä"rJÙ8DÌÑ?}æ0F³Çn™ZÑ6�I_nxCAuŒÈlz‰m2س•‡(r¦m0õ™n,+2OÐA<¥²Ïä±kyÔ¥µÇ!©cP�įÈH8M‰)ŒÌ""»Ç
tLñ‡ÑÜgç–�òÊ‹µ
Q©¨âÍÆ€9mÒ½ z:Æ´ë#	,™&a&3Þu.‹÷)—Ÿ6z-gbôžÛOÇB¶RªôN•Ð|OQw;–boH
¬µã¡Ä,Â�Ú--š2¡/'p²
'Ô%`©"(�ìek�"ÉršÅ›®x4náÍ1GøÉt©]=ªÇjË°ƒXïZgÉéE…jQ#½4”¦ó)�NÇ™�ZÕ¸UjÇlù¦å÷X\U‘Q}‹!qõV·.ã]%‘zÕˆõºÑ¯eϧ[[JõŽ-×s}Ú$܉·!s�OÈ3§r�•˜þ†àÑ8FÍr$‘fa%šzv¯—âÀN£&èKc(Ã~ÑŠ²Zo´Ã3䀆3Ô�n\f+g›ìL©	NáÄlfÈ=Õè8È,<œe83÷ÙaÍVVe(!Ù`˜7œ‘
N
*Œ3ƒÍ’g#µ„S$Ž›2Ž‘Úrl;Æ0ˆ3[É‚ŽyS%©™Ï|æ4£¹ÍjÖj™ßg9ÓÙ͹«3�ÙŒç=×kªz~óŸçÌçA¯п*G;öÛ?Â0ƒhFûipu`‡š<Ü1…ë)1³ç”$VÇ1
\| „;„#N=æ(—Áºã
p
讚BNŬPÆGPIäF52ÅtVå€Ç�퀉$çTÛØT%îp5ëxŠÙ¥íÍù2èx°9L%”
›ø”62W×þZeâSø¨ÃV–I'ìÐcf'g�Ã6:�„CdCk¶i²J£z;Œ¾¹º‹_j(+I\ôÊW·íÜUï{\Æ×Îä%qé¥ø;bÔñÙÝí¡7�ùÜ’4ó×-ãÉwzÔŸ·º¸}½yc/zпÉ1Š¦x:˜�	!¤•0C
�•—utC:à¾!e©
®ÄAÇ:�„t‚æ8Ë­e`Ü~¨Ä.²‘�cTâ€X&xŽ�]TܘÐE8Ò‘Ž]â˜ðÃ!ìB‘UØ"  tÂ1Ô¥‘Ø/,‚û-Bú½„1ØÁ.`&dýüUB%˜ƒ7t%YþCýB'(ÃŒ� øA#  ¹Í€8Ê9ÃÒÀ/”Ã/ø
&´_'X`%

:C�Á.l§`B'�
AZÄAvØ6rA'ts.ÂsF§ÔU
$
dè€R
Dœ´Ã8A%09Ø� 
&p�H�.?Â
 A%Ü‚ÔÁ?
�ìÂ.¼cþ0`T
fC%
ì3
9lj£¤Ç`¡¦ƒþ…D;X 2tCÚ
 

�ªÈ[—q1|
‹}µi½˜Y¿¼J¸
’dœÁ¬N™T)Ïj¼í?Œ¢£¡AÅAUW<M£1XD=Š8ŒÝ܆:¬èÀ0ƒú…Ã5,10Ì
wÔ§‘�ÈÍ•¬}A—Õ&UR«~*eŒ£»FiK‹‡ô³î¡séÉŒE@œtâYt'
õkÔpOÃb+UëÑ®^£]Û6k]¥h‘.�ËV+X½HñÆ­:öïÒ¦|û*Ý»×íÛ¸sÝ6ËÔjÚÇZ×Þ*7¬ÝÄy7ÿ…Z®Ü¡$áÆØù÷¯³E:tÈiW.9�Å9+¸m·nŒÎÔ
(Î9™åÄ…¨®[qŽæÊ7NZ]¹�Ù¨’nn¡:Þä@.Üfý£8rÁÃy<Rì†Is›F.>t!e þ·]RœXDeä A‡lÒI§œŽê&º‚ÌóÆ™rÚ!'�ôÒ©p o*Ç?fØ¥88ãÂÙóê‡'œðC™l
¤A™sÐI¯¸k,Z°xv‚AFõÊijª#·*¬3®˜ÔË1©¨êlI(»¬²Ï$3’Êźúʲ/›ÜLÌ-™m¯Í4ãê,¸º)+Ê2'“rÍ.å
­ÁµÎš³Î1ùš‹0мj³/Ñø\³ªäJ³JÄl´­»¸4ŠÏ¼¦òÆCsqâ4äØgs”éDˆÐÀ‡œvÚÁÍRK"­ü`ý /ÒÌÈœçÈÑÈuÎyp:;â®�âœê"qnþ
g6K§¢5Ø…Ò3¯ �êÐ6ã�z�Vo‘Â[)ìøH�cB'„Ð!	?¸3')™¦²m¹â,E
¡t¼Ép=�Öã)0qæ]î¸C®TÕS‡âbFÔMBÝ;bBžkš-�˜ù·’…ƒ+IqtÔ!ÇšÍsÒ­h�,²£Jn³eÑœÊH‚Ak–œ£†‹ê°(äP*�C«jí"òf¦òÌ.Û¸ˆ8+¢§9)Žls–­f“<ò©"
íÆD¥ˆ–ª¬�KÞȼ´ZFîMî
ߊ2œ±™08cc Tz–•mèèh¢oV¾3AEK©¡
áF�f¥ˆaAˆ‰pÆ¡	2ð†–!þJ½ä‚-;Iq‰J1Ú
¡2Á	ÚmŒ;¤[82A(+´ªVrH8¦b�8.¤ ò:ÒÓ�crX�9ŒQ	|"Ⱥ iþ²ª„LGy$ëtÊ
Éõt:*]±"™
uH(/Ì(ØzÌa¯kÕë]¤Éøu¸¾!R/Ê£–òžá�aA<iÇA*… |]ÈRƒ i,…›™¤ƒ!ùŠå�lÌD#ðÈ�yì¡õäæ#Ù9àq>¥#&â˜ñJ&�lP²UYSˆB€©�l�UŒ¦éàS­p�xÄ#:•…ÎÖ]0}ˆl•>�É‘Ö	
ZèÑI-’­
œ¯dUþ<[­s.”`í<gDYU¯‡F‡‘¬Š�sX!cò¡«Zà»ÔÓ¬zm²U"5)ƒÇ,.Ä#Æ1¦BèyHˆg<	IÞxøùJéÒ!:ͨ>iºÀcF4kV:wê‘ð-dXehø¦ó¬zúˆ¡—T課³nš¦œÚÇ?üÁŒJ�h
•5¬a›ºÈöU	–},2{ؼþ5´—5íiQ›ZÕ®–µ­uíka[ÙΖ¶µµ­kU׉=rêö

Tƒ5:fTÐ œ`	—¯÷Й
™
ÿHî›�ìÆ¯Ó mÉŽÿJp½Žó�-õ(qì˜qì<-}1Ñ$°Ù\eÏ�1µ‘³q½±S°µQ�ï×PÍ1™OÒ„��0�XÑ^1=¯ô�
5°åp3ðñÊ
#R5òr#½±#o$=r$S#Iò$¯ñLQ	0Ç�T�
¼A	`öøPün1Ѳ1'Q$Ë1NüÆ/î®Ñ$þ1uR°#�Ò÷�"¡ŽïPr*©²*­ò*±2+µ²ô¸E	¼A\�0�³
üq#×lò	“�-Oè¨Q$‰o×~±è¾ñ»Ð-gNõr+ýò/
30s0Õѱ�î”A�Ú*Ì2!-ÓÆÏ!×Ò'Ÿ%
ïìŽÿºÑïp/›’MM¯Ð©‘0Mó4Q35Uó/õ¡+‹Ð�>EƲ­f²&îñ±/mÇq1Ã0#M2·‘73òGn5™³9�ó9¡³-UrÓ
WƒÔªûÓ6©{M'‘-<{í3C�<Ó±ý¼�gpÕ4‘þ4Iq£s>é³>í30W-†°¬ÂÒ`’TjÓ3Ås@óÑÑž¡Ðàà�üôñ(3ýPRŒ
AAñ|³

Êà†í>=ôCA4DEt÷VÍ®Ï2‡5à‘ä`;IÓÔÃ�:

Ì*


ŒÀ†!íì eý ~áVínaèaU³¡*À0ABÅ^¶†aàŽ�ìÀg;A”áàa(ìnáMŽtëÁa¶Í*áv�À¼ÖeGvÛ†¡ná¼
ÀܤQ2
îhà¤
(�ü~Á Æ@Áº÷h üÁì`w‘×ÀiŸ¡}? ” \ëŽh�€°§ä \ýÁ*À
øG	Ø”!d
À„@?ðl” "
Jù¨¡”TÛ<Ø>€Ú
­ ô¹pÕö*@	ü!h@
nÁ
RÕÓð

°Øì Ž
Ñža™o¡z z�ìyv¾ëꀂÿáŽ
ÏnA
bø¡2ÙHy™°úÌ
Î!výÁþLÀ
â
|À´í 	ü€¤™­é»¾kØ0³™Ï:	U}Mˆ‘À@Æ z@”ñaUYnª�]n” °•`ªý�¢ëy‹�Àv¡^º5_àœ`ØᎽ!L¡¡õa�7AÚ
Èn?n᥽ÁÑÚa`‚û"Í*K	®;„EÑ*
À
ý
ü¸Óv!	ÊÜPœ¼
Pë×Óà¡:{Óá”
¸ÀÌéWÿì
UDj·,h6–õ芤þ3.=žF]®æDç½WÙQXQMjQBöÀ#Ý•úÄ“O<L¥óT^ÒNLqÅ_ÛŸ‡øÜ?ÂgrÊ!Õ\�7¢ºí.´)vŸ:Õ˜¢�{itQ
syZå|<(øÀÔ�G,À¡U‡qÒJ/Í´Ò(%QNÇí(ã"Œ2ªJþ짬!Û‚QV#»×Yé/§BÄ©×IiÞVåA<�RB�Ä!ƒöà0WS
dÏgnq—kÓ‚Nxá¶ñ¶q *žCõ¡"c�µ‚
ý\°W౬¶®dº,©�Ù
%Ö��‹®0kGIç¾åBš·�Se½höL°á¶ßŽ{îQ›¢B,Æ4ÓÕ3ç»RíŽ>‘NÖÅLÖ£›^.6¦<*‰)_íÌ�9™R*«·Äü\/pÆÎk)±r	›ºîê¯Ï¾îÞ¤ô۠ƀŒèÈ
íC¼£HÅNyEâÕÜì+ÙMô¾b#ƒéCX”2ÝŽÖR'¥”E|^s‹;‚?%­¬}ì 'VþŽ�õîö Ú‹bÔ­š
%vúÃ	òÄÀ=†kcÝZƦªˆ<%+»é
V4•£®5�; ÓÛÀ>ˆÄ$*QOˆãØ ²D¹Ì/Ø»ñT»¦k/“SÝפ„saê…!AŠy´¶Ä4ªq�zÚ_<n)'ŒËÚÃ2·.‹]üTFø2À }Ž6GbUÿ؈ÈD*2#MT\p†ã¸ä�æ9Ò‰Êùv3;…äQD|,Ij×ÉEŠr”¤Ô?Ü(µ�ðjáŠ
`DW£M–r–´¬¥-=ÔÈŽ	§‘ÙÍ.ž]å•·,¦1�‰Ì� RE¿Û–ðØ2*gÃÙ BHÌþdjs›ÜÜf.åG?‘¥e(²nq+XA>£2Y7ß	Ïx&’w+aÕP¨Ÿé#ù CØ1‰:4‚ÎJ(å‰Ð„*”pó� ÉË(VˆâÐ>P
%È Kø…9ø1˜…Št¤$e=UGgvË)öà†.`P�”à
| È€è±�tþxÃ_­¬eË
Ô‡z’Qìdâ�v �Ĩ„rAЄLd¼¬k_ÏÀ®È„0*‡(¡{<ƒdÐ…î zŒJ>˜l�‹ÜxµcŒ‹èq’àÙUévø…31œ&¤u lr¿ÞcZuE0‘	ÒáÜîevu´‡SsÈðÊw¾kT«Çæç¸n¡'r>"
°ÐFß
I2™?"D³
KxÂÌìé_ÁäŠVÒË="Lá‹w²}I%Ü-²¢WG�0TGãCk¹òã%Œ×ßóô¥:a’±�\±ñb',G
Õ¥6"þ	ÈLnrŸìK(CÝ8Q~à¾òb'kyË´‘­=Q¬œ+…pâ‰/—ÏŒæ‘X880i«
%·c+§yÎt~M‰�qâà¥�``´\�ÿèŽÐX!øÀ¯D!Ò�zÑŒ¦Èx§vOáMÄxRi´¥/ý@1Šõó#è¦è-L‹šÑÔ
*yã(陑�4󹟄F
ë?kL	ðÐ¥¡;m£cÔüE²âXûÌB¦->¥¢”| CN¸E.Ê`�«µÃ®6…ùá
?8¢mþò'oÜ¡”˜Ï@ˆiítÿXãM©žoR—"
£=(Az€—CŒÁ‹êî·„ùŽÄé’þ³�6�¼;�
8àȢǤ KK\ÂïSI*#}äÄãÁ CÌ!±Ò#ÏÈÔÄO.`@i6ʽd�ÆåaÑó†u\ø¸Êo>`/öÝV±1Š�‚Œ@2k„ø�ó¤_VÓî¥ÀŽ�„˜`#È@X\Žr¸Sé\wí£�-éQ}	b Æ"–€Z‚cìºÛÑjß溹-Þ€
i‘0‰àt40ùÛÿŽVÙ6“çd‰;AŒktbéÀ‡Rvqj~ò]ó}‡:GJfyÕ1å?V/ƒ=…cd™éA�ú¨z³Î}\Ý•úØKµÝå%üÚd�{žB™àþ®Ï½ïË*x¬û÷ÄW½ÊŸØz)ù;
>ªIÏüè+tõ„¼ô¯¯Ðbc<óØï¾7™ÎíC3{œ#¡÷Ï¿È×^ŽÒ3Þ†Ü/3£þº³üÇÚÚ·ä„A;2ýÿ¯DÁ·}]Ä7<Ãé
¡¾h›ÃW¡Í�T)Û |ê‹´Gd'Ù– J„±Qc@ž&º‰ŠÙ�^Ç¢y¸—6&Þ`%:£((zDf¬´£š¸z¾rb3 ¢J0 Aº‰\‰mönêòQ*¥Qª¤
­Ñz¬‘!c_W57š(yt|!.'ažBVBÒ�‡êä¥çŠ®éª®ëÊ®íê®ï
¯ñ*¯óz®))ñbö…�ƒ�I
¡£¯Å6bc0RêrÒŠ°	«°Ë°
ë°Èêþ­
„—®UjCó“§Ù`ìEäÐû±Ûû ²÷Á«V$® 
3Yù°-ë²/³1‹°÷:&!6kµ¶8…â!“‡`‡Ê Î
Q‘«¸ãK¾ã›ä+ªÃ:±ê6!MqA¹›½‰óPúP}Þ«uÀƒª¿@¨…:as“0NÑ/Y©+ZkÀŒÀ	¬ÀﺔÊ2ª¡2bÚ‡¥ßûr°oôè`6³WÒAa™´j¹kr1æ#LÂ%lÂ'ŒÂ)¬Â+ÌÂ-ìÂ/Ã.<9»[¬"9_
Wºr#
Õ°¤P¯P
 
µ@
M
¯ð
µ@ÑmÑ�Ñ­ÑÍÑíÑ
Ò!-Ò#MÒ%mÒ=Ñ�Ð-Ñ 0Ñí…ðô,
[x(W!ü$+áçÐæÙPé Y÷\‘Q�¾Pœ
— 	š€
ž€
Y­Õ[ÍÕ]íÕ_
Öa-ÖcMÖemÖg�Öi­Ök�Õ›àÖ› 	› 
sí	P

ýЙŒû@!VqAµg)¹ß«ü<ñ
©à
²`
³à
®à	žÀÙ² ��Ú§­Ú¨Ú­½Ú¯�Ú±­Ú¦
Û§þÝÚ²�Ú´�Û°}Û¦½Û¿]Û¶Û®
ÜÅMܾ]ÛÇÝÙÈ­ÜÉíܹ½ÚÍÚѽܦm
²�
ž
±pݲ§½
¬ þm
¬Ð
Î
×NÛ¬ à
þß
îàáîàÖíÙîÙ´ýß«°

îßþmÚû�ßÞ
¾ßÈýßàÿ­â¾â-îÙømÚ
à.ã>àá9>àžß×=ã9Nãù]á	Þâ,näENãÖmá1þà.ä'¾ãî
›
¤0ï�
LaS!¡xf^þå½o1*ë
Æ]›WfžË£»c‘¾ 	
žßÓ]à7.âÞÙ©�
ý}
{ÎàþàE¾â>¦Ð
3®Û« 
�mä>èÞç#>à¦�çx.
«à
�~䙎ä/nè®á§ðèèC¾à ¾à²0øíá›þß­àêÎ
–®é³èîê…ëýÝç¨ýÙª`
>â×ÍàØ�
µ0ò€¡sm¤+�š$™hp¿„’M¶”‘Ù›PëŽê¿.à§éž
¦­áº>â³@Û>^á¥îä¦=ƒ釮áËíê'Î
í®ß)Þí„~Ý®ÀÙxné~ãŽî/ð*žê² þá
™àíþ�ê
^èôãžMè;Nã2ãïáÿë	Žñòþã2þë×½á®àNñŸ=ñþí
î
Å~ì4³ª›ÃË\;GÁuP¼r˜6Ûæ¨àÙï⦰߭àí|îá%.
Ë=ìîマî Nôûòoöâãîí_èFâž
îß¿à#Îã§~êÿôô>ì|öOïýÝñÂè¦`é®°áÂ^ãˆ?ì®°ÝãPÏ]Yþ`­æí˜S”§c×Îââ>äF?
²p
ŸŽñ±0yÿÙæþôƒ^ò.ÿòþûM_ñ®Þñ°NñN÷>ø^á#¾÷Áü¾
™ øê¿žêoï
±°Ü%®ï%ßôJžò¬¯â­
+´ðB
ãÇ›C’ðFÏôiÇÑh@ƒê(c2}2tñEcdLŸ||A…<õ~ºˆ,½*’‹©‰N‰,¯z˦�̈®O*ɨè2þa©8²®:ê9þPRŠétp>0ÁÜθ¥ÂoG»r:¥£·®ªr>Ÿp“E!ƒª2‰H�.šh©0û¼Š»9"&ä˜â(»ª’"¾H�00}“qRJ+µLŸp4ã̳ÚQ¦ÄOKÍRRK5u¶Ú6Ñs»»zÒîÀí$’%:!ëÂHOœJrNY‘(K�Úé×7•P= ¶Ä	>®šu®ŸÊ¼¯Gý¸ì’©Š†´iQhé‹I@ª¦ó¢W�u69 Ò{ò$­�+� ˜È2h¸�¶sðQ~&<u_~cäÐÃÎþÙ‡œOG+#RûUxa…i´
Y ÚÓj8a¹Â‰7¯FñM¯þŸ‹Hä‚-ÙÜÀŠÊ¦¿’e”XXŽŠ(dí³³J9kŽKÎ÷¸„�Çõ>ñ¹^ž°²Ö�`ÂÞ�2aH¤Olr7VbI’Ý›«¶YÌ�ʪ÷G�CÞmL‰,	•#ü'R†ÓVÛ²Ì6¸SgJ<QÔµë¶;ÃÚ<á	.sZVÈíÀŽK–Tzô’@¹ÊìLSRqü¾ˆâÅÈ·ŒM)Ô§õÄ�êλþƒY½‰ˆãó×ã%n;�h]:Iõ–å’¸L>‰𠀜Å%£8ö\¨š8rè?n	fxù³ÈXÊÞ'ß»›w^°½y{ÄEFCáŸ×~ûÇVP›pC+'®Œ‹¥½þûCÓ,ž¢s:,û¬tEö¼u!ªŒƒë®ýâ5)–À­%]Z¡C²%ñg+H‚I°
«�¤¤-ZÚ»„»?Ñ'=á`zƳ‘òüNAõyMh¯ ¤¢/�:›¤¸÷Â}eÊmœ"Ç3äƺÁP‡0L•[v´–1%äeäҕ҃܉,SÒÕ*,wŸá4IŽK“¼:2$þÌh²JTlf³‚¬J:²IL.–#´`g E*ÔÅ$x+ }$7úטüô§ä¼E-�N¬"Ìme.ÊÁI£–!æíP‘”ÒGô@T˜{(ÖÞ`Z4{äk0úÌ"=Y)‡y¢(þŒš‰žn–f¤YG\I�¨Hìl-*
¹"ýhV·ìñ(´
઀¶ù,Ð\ad–[h©5ܵR …Ê�T"–”(ë-÷i—)T:W|‚ ®�È1‡YLDˆóªÈ–Æ”Êw¶RϽ̆¶OÆC2ÜTaÚqŒÒÍgÓä&QDðÃ.”gA-T#UŠo´È,F1
‡ÞÇ#YINnå›CA	;Ô¬�„�„ìQOªPE(¤cN>�os¢Óïè‘‹$„s'aI(BQ¯€L*P¹
ú±©JwÚˆHø+Oxâ¡
n1ȧßjŒ@:›ß& ‘‡=¼A„$
‹M`´%&) ¹bOèAjxÃ8q¾žðª'ÒÑo!±7è�ƒ@þ…Uv—£fqä>¬5,K\q	7¨AoàDŠœ²ˆB vþà†XÆ�ˆ°„÷€Š*¡Y|ä­‘µ�Tp‚¥€ŽÁ’«©¨ZÜÖ]ÊRÕå]U¼S>Œ?¢7½¸…5aLûéŽJ™Êc¾Bµ(6¦’µM2 qW¡	
PÀ
F
nr-xB•Fq‹q³FÎDmsŽz'¼íîÖqsª6<wc�OÉá·Š¼1Œ[tòücî¡B[>§¾k³Xð„=°
	º

SèA-(€¢€ƒû²RÐ	(€WK
Q´µKЄiL,*2	ÚÒM
Tˆ³8�¨Iøƒ ÊàQÈ4 H�0�(GÂqƒ�`�¢Ô#¸
«<7X:@Ó¤J`�Ã;‚*ˆ„à*´Q
¨Hè¬@;4-Ð


"àƒZtœ)h
ë#€
xÎÛ5¨Ú¸‘SË>Jµ#ŠT°
`¥ÙRà›¼ÇZ
‹c4èY(˜=
€‚0 0
”`@
—+ÕªV™VmÚc#‚ÃD¤8!AÁC
6ô ’U“”£Šj9K–'=,(pD¨¡#ˆ�"Dˆ(¿º�
'¯„ÀÓ
*†L±¸j€
²F
³)àÁnòãvÝjŒ
tœw
`xœ”¢Bã@@*£ŒR£ëþ+¡¬Nz²|³q`Ãá8Zª)Š
«7ND*t·¦\.¹ÒÞí±‡
‹©¥æ1E D
’B�øÃøàWÈ$…ž�Ä
ÁÃ}Åd°Ða šX5
¸@€p"	=\QB*ôÀæ­y‘„ÈÈ·Tx‚ƒˆ„þô0Ox"Eä¡Tà$Qð�‡Mä„+j£²ÍÅ&ý:ך¨HxâxÇiÞ ò 	><’,E*Ìä—s]¢‡c‘YÊø‡=.»$ˆøÅZ”iË™)Þ×3…
ˆdûÑâa´
â2—™áŒg@#DYM5¨a)()]"3™™ÛÎÚ¤š”í.3:a+Ú&'Ôq"›¥Øf6c!¬˜<§m®P",Rfª‚ùE…¨€Å&"—ª6á
… S
a
OµæþÄc&¸èå„�<Ó\P‡:Ä
1h«ÈDÚn“4­B.uqSFÑĸŽÓ°AŠ †(¸ ÜR
+³Ä™ërR8#‡:ÔLʱ	`Ó³—0
K=ï£d*&wNú/â�‰›>Á7ŸÂ¥š1ÚK?ùêZ˜¸MXi›œLÛ„>ôU2£¦š¨ä—½¤)£°}&¨dä¶M�0†9+w5èþ´^Fmj¼kEG‰•‚ì.{qé›�…Ðl⩉%™§Á©ªh›}ã{P»˜¢mq¥	ÙJˆ°@'N8¹
ð*nm¬Á+ÐB-Xb£¶öEÀ¢m››^;ך´Âú³£jU
W¸°U�þÔô–Q<׆sªL2ñ8�P„3¹q¨Ì”«O5õM.‘Ñ+áDWN“º{±ãœ¤ºÞöBYiÔ äÀ@BpQ�ZŒaÒ[Ì(ƒÙk[ŽåD¶û¢	–
nS^Ÿù’jŠS´i:á™reÃ\ÍB~Ì•7ñh„x
 €$à�TA¥€ñ™Œ<ËV/¢HÑÏâ4Rþ"ïÊŠdÓj½I#¯X9¢®©ã¤?ÇV9ë)©žû©
iág/K–±œ„å&âØÎ19žh_�Zè–ï;aLXáÍq¢
U8 p-°¡
ƒŠ"u{Âå¾$Å�ü+sýßv·D®|“ŒãÚ’éÝúÍñ%˜ÿ‚Ãn·u»%p‰E€I­œ·YÅl_ˆãoà–
Ρø·›ØÔ&mû%ª|²´kž›)+°P‡Ê²·ŒZИж9Ñ{“àÀäµAø’Sþyåº�Þ™x­×gæl¾Õœñ9'ÝžnAAÜMŒCêâ´[Fvi´ÛÞëÉh&S®Ï¬ù𼆴ê.ot¬×RSŸÛL®D'Hç\^Cs„3
ðÃÝ”ájò¬Ý(ÿöþ€]§Âм蚧/‘-5ª%Š¼Švj.¸ùÓSæÙ¾IÜM8Û€×é?F¹Äý’«5ž.wF»›×\·ÀÑ“n¹Ï$>Ý?.•à´aŒråf˜¤¸ºÆo_h/uëçÕ÷Õ¡ó·éç»™ù²Þmnj뺕Á.=êÛÿ˜«Ry�
|`¢´ì²¦0dÝ®ûûŸ˜{8
?àÃ<$Cß`œlþEžÞíÝ�) Þ) õœ’QÜÉHf¡”ŽU]Þ±Êï)YH�H=ߊP¨ôL4m_	¢à2 Ž~M u9Ê�“Ä
åé…
Û°ù_›V�†²a
d@ÊTõ ÿYÐ?̃/ŒÄ
îOÄ•Í99•	RÝÃ�Š~
ÔYáÊÉÄ]¡¾Òšà+	Y~ÊÚˆa,…Ênaqd ¶©¡¾Ü¦!^!ÕùÂa©„!î‰àöÌôYMÔ›išú	F<hÍúÎUÙWq•ý!#R"zùÃ
J¤´ur•è…%%â_—YÐŽÂà}Š��äÍ?º!
Þ^*bÝPFSMÍá%pÕ ï}¡4•\š¡]æ$ò­
JJí–ä�TP—J‡�ÅãSÊeI:åᡉ ¶d
Î]\ÄB]øÕ*h) £"áY†üå$òœW¹&#®¤Àƒ?ìÃ;àÙ¢‘‘ÊÒ	¦pºã^J
†`6šÞ` ø™ã&�øí¥tâ$ó‰_
f
6 Š¡gõ¹ãb'ó¤£|éJ†äÐÔI1-cmF™3þÃç	ayÁ'%ZÐnúÂuÀÝäýbîb+þ¾Zt¾!ÁðÏF\âcòÌ­è)Bh.®à„‚T‚¾cáY(+ö"�†!rþ£/öL÷!™p,'ÐÉ<äC³½ç}v—#Ê•ÑßiH¢‹ºß“=ʦÈC2 Ò6•;µY¬'¤è *E‘鑦Ò:	H91©“&©€)'8)è$©•)•Z)èt©‘niP€i*iiO
é‘‚NO™i9ii“ZiÊi“:)›f’¦)‘Z锚)™Â)œn©–©šrSž:©�Æi¡"*žn©€E”jé—*“vi)¤LEõé& B[dK-ÐI>F³Ùh˜Éç|–å²…jÿ
�kìæ2°jþ«ºê«Âj¬Êê¬Òj­Òj2Øj®êê®òê8ðª®âê¯Öª¯þj°²ª±+«^ƒŠâß©‚YCê\$F¤³ž^ªº§=ìC>ȃ<äC·æC=xk¸Šë¸’k¹šë¹¢k¸ÆCº²k»ºë»Âk¼Ê뼞+·zk<à뺢B‚%µ²×X>c}"F1ÙCºFÐùëYIÊW~Y¤ †>ðßÏÉÆýAlÅ^J³2Æ^lÅr¬”EÇ‚¬Æ&
ÒÇzÙW�Wšlf••Íßl–
‹úC:
-˜�j†ž0¥ÄڃϦFl at léõëÑ"þSʦYÙ>Xí}ªå³Q
þqM×–ŒF+Ìʆ?؃Ô6-S‹’­FÊ:›z	 ÈÆíкCn²¨b�Õ¤lÞ"“|ÒçÒ®þ,Äb^jä¨Ã
..‰¬{ÞæèyYåZîåbnæjîærnçzîç‚nèŠîèÚìaLìÏ
í�Tíã~
´Ê(Ì>ÛÀ–m¤-ënÐ2ºà‹¦múîW:[ðÞ¬ðo¯ï/ï/ðþnóoò:¯ò/ô>oó.oôboï"/ö^o÷Bïõj¯ô–®Ý
 =X«1�.ÜÚn×
mXÐ2p5[3±õ+Es(w³”a•KëS¶Öƒ.ÁЀ<@˜A.ˆó8WJ=?ÞÚs{½'Ϧò>{Mûn4¢�?ì­¡ÔÃ<0³ø
%dÀ-PÍÚ2 at StÂê³+cE/M»ìCÒhÏÙl¶ÊÃ:ÃÀ"%È
7�Á|@;gþÀÜ�0¤ÃUuVkuV24¢Æ²åç=`ÈA0��\#?¤%ÃV»õ[S´ë¾ìRGÊÓþ �2˜�<‚zÝÂø\ö`krû’*M¯Flð²=ŒÆ/ì4@ƒ7PÐUWÂ0öec¶ír´R4£ð=x2bàc÷mlprf£vj[mWá`/öl€-1«vmÛvX–ò\wö,ãÃi÷®8¯îm÷páL‡ž?ØÁÀ†'³ô—Í'XwtK7#B+g³HOo$3PÊNww{·æ	t!ŸÉÁø<ð-Ñòƒ:s÷w»÷{GG›òi´:ïmz‹ö=t+
'ãÃ"ØA:4%DtpÃù /xuÿƒ”ÃìWq-c¯­1Œ�xƒÔ�5à3¡[ú‚×øŒ~5ÖÈ×’ƒ8ƒp�ÃþX
Í
ú¥«zw99Üø)ƒ3bˆÃ"T€Øz@	Ô
7¯z¯÷¨¶Ã1Ô§ÍÆÆ>Ô1 Áø€8
¶æÃ5HAÀ3?
+ÿ=؃ù¦Ã?àÃzÁ¶×»}LzÉŸ¹>ØCÔÃÆÚÊvF§úÛóý(‡·Î/Ý·C’ïÖ(xß#~Ë·ÓÛß�«í£<-ïþxâS~Þ
ø¦³E2ua0l;[僾&‹¹ÜÛ_éò­hÐíá‡þê¯6ج�ËÆ5j
¾¶ŽöÞ³~îûkŠï{Ï-,cg^ZB·îܶÒtkÜ	c?l—�/ôí�“~Dj
É'†-}%¶¶·ô{¿³r8A×-<h¬0o×äúS÷ƒwtÚ*.ÛÉg3ú«ÿýþ÷ßå“—ÖÂ0üŸýÖ
]|Æedè®Þ®ÊIðl*ãC}D$F‘Ðð£Œ&¡Izf\’É&�Ìn»Í°ÒŠ«2ÂóP }й	ôÐ;à
m4~�<Í›vhmÇžjéIGIbµÝ–[kÌ� vø›©´ÿþÁ¡‚²ç\tña±Ånå�—^ÜåìœEÁûjŒvÑR×ø‚â©Þ‚
>ø±5ûGŸU…¬Œš†rð\²zBãŒ5vêÞp•Ý¬Â¤ëôܲ¤Ûå”UæhÍ«öQT¸¯*^‚³çâ•uޙ燌½Ñœc–ÕGŽñ
òGb¬:«°ž�~ºçoSeŸk"N¶ŸÃÇ Ò(†ì°1îø*÷-z †þð\¦ÿM[ìþ¸åîVa|Ç…ÕÜ‚xÒ'ž£ÉªyîÀ•ì‡–#âxO3iðÆ´eଆ”GuÕE­ �ßœób5ëÎì®øuöÙ´HL¬±:_�u
¥ÖËÍ»ËÅ	p¤‘Ö[õÖuß}¾Âs$­èƒJ3ío›y?yêêviò›JmŸxöLx¼ñ'�t<ùî½—¬cï7Z@éuŠÇž2¬H§Œ;”ùúûøå�+òýà$®4�òA‡ÿÕÊð¦exÏüX@·X¨72xˆ–çÄ
‘Ò±°‘¥›Û¤(L¨kfùPO�2@É~–[�t¤ÐøPuÕ$þ`öPÆûžñŒí�¶Âbè¹&gT–²‹'Vð
<¬P
Þ5¶ÁMÙ´²É·¦_ÁÇ>î½}P¢u †ê€-á^×PkªƒÝüÂ0ª*W@$CdЃ-d@	· ‡1°Û^AEiuŒ¸Zõ*‚Ø!q.ÉÇ;Q
< 
"˜©n¦Æ§\B!Æ�!¢2
Å‚!j¬
=ê!Ö°•Îð
#bé�
"ãÐçþ0ÛPÓPíùÐÑ!1!q!üp0Ñ Ñ1Ñ
ù
ûðÕ�á°‘5q/±?Qoúæ~A
h *x+øÃ×à
Î
öa_åÕðõ^ïUb`éU_

bA_v^?v4ö`ÿµ^þ÷µcc;Vc#–dKÖd9v_EdY¶cv^¡Áa¡ð5^EV_Ivd
a‡¶e‰¶b
Vb÷5ia6^Yv
aãõb£6b
¡c+Öeý
4ØUƒEëNƒ=[”Áæ1ÔMI•Ä!dÝX9'_
|Béþé—FA]Ó%²öÜH焳`BB'4t]ö懰4<…	&¼ðBÔTO=µ	#3°3ê¨	©¼âðkhO�THÝ6ÔIé!¬ì±#ÊMdsä
L³…	)T-u
VCm‚üdëcsÙEfÌ5ô¡s¢­Qd3t19Ç{„CÝ»¡ÏV}xªê¬#æ!
tbG
€Gý·ÕW›À…=l·s2A÷"”Ž8žéÙž¼˜#eža˜ÛUU£
ÞBŠ5. æ–ìO{z7]ÐCm´ôé‘gÎ"©¡ÁÚ?¯aâ
rÔv›>üس:ù £~ÜBI	Ƽ9îEÓIvûžâþÌ_æš°XåsJÙFÈ
戄DIV¡Ï{“¥®<…(†qœE²ã:ñD4>	Y‘úu+½t,‚Pù�œ´ò‚¬<0Êx<šºq®XðŠ}b0Ð9„‘£KâdÕ°´1m&`€Ð
ð žÙþý3¬
©ª x‹†­Ê×&êñc![åŠ8–õ° B!Ç1ŽáŒcU„¢—±h7øu�†@¹—�æºgTBŸÏBG>×ÂЖNÀÄ(™Øת 	–J’8�a#tQŠg#¬�Q ÆÀÄ"fŠ¤°ùÅ!cÊ9œ±‹cq~‰©ÖD,ø,õ*'c¦¨¹}øƒ°‘
mü!‡2\Kñ؇4öö€Tà
%XÂ.Òá�Ý&�a›NÑÁ�_�aðì O.îÔ_áhGª¼¡Œ
pa–üCØ¥("WrÌÔ_\ŒdĸÀ…lädŸ‰	Û9r’ÁK
ËH
âþº´¥�¤¬l»p
é^\
Ð9JÆ—x7ïq*‡2>`èÂ:cN˜i¥e{Ý­(Bž‹÷�§ñ‚lk›
´þeÇÒ	\ Ù(U(ÍHâÀ‹p‹d€»`8Þp§èrÐ	"¡eTȇ@\¤Ñy™•uà
H 
�	
䯘ñFÆÀ-»ÐL¶dpÈcLSýv”ðÙ0Jèé ~à
ÀË#àËHiæû
�©‡Í]
àe0�`“ÊÐs™·Jù
Ãe§G=ÍÐ`‚™K10~q1ΤI0í%ß“ë‚á5ÉÿP^þ
ÖJµÈÙð“c`’Ú›½MãOÇð
[
¡ÒÊ1öÉ/#�.ã¶A¨[Ð…âj£¡maÁ°½7~ä]X·°º©Ä`ºýr€ 
PͯX	}2K•Švz&Ü é�)‡Ð «&@Ty#G¤ÔW>=
S*’·…ÉΨæ7¦pšé

 `{ˆË%Î4à¹úc02Ö
dU
fÀSˆŒ™Ž
œC)˜!§$
ÆG™¬:§D;ÉÆ™N 9
ñú¢‡+lGqÔ!g¥–rê˜
 –
$¡ÛØ901Eã/Ž
‡9F …–¨£kÎð†õf°@)4C€  � Tmƒqc”�(
�cÐŒΘ•`jˆ
`˜ø€ÅøRþŽ&!�%
BVbŠòÏ ¥):€G'*1IJNR’•èD'0щmØŠÊòÆ:Ž¡ˆ4²©> ‡:È0ƒ1ί¿(X)!ÀÍx
Y9†[\G¬�¬�Ž]¬rKÕ¡„2˜B&Æ/Û¨ÈwÐ�‘_TÒš•Np*¡ŒvT*iÉ‘>Œ 	‡ØÆ.Ð KVúÀÔÚO¢bq£,B€Æ“ÐòG?±®k&�C%|Àʽpk3Üa’
IøÚ/êÀN6à€,$ 
¸`±þlt
ÅÔeD)A�a T–>°Í.^H@8e0€AlsŽkÈ!Ûi’—¸£ŽÛ¨Ï�ì!dúRÈ™ã=Þ¨ƒ²·.ëÑ
‡•&RŽ]
c {2pA
ý’B%Ô!
@Xö±¼J‡{ÐÐ$oüB
¿8Ç3:AÖBL]±Á…
Ú
;òÆ1fË9
IHupã!Œ9J9€‡ÈCv�"ˆ!äwP}ÈÄ8'2K
3žk .q1»†D,²’ltã~qÈJ<sÔ¼çêð³grµ</ÕíÖw+Œ9ÀvNqÄl<(
ùQzrpãÛàÆØxu�f(â
w FîÊ‘Žtd±þYÛ`L³3Ç.BGí~�EüÌî&‘Z1<ñh`º±’á}F° aÏ I®´$íä@ÇÂ
#·ª£Ã!ˆáË9£ŽãXÜ<Eë†Åoce#f‘ÞhªqëqCN\0…9DLߤ¿|F<‚Aûës–a±N8U‹æ¥,6|=^GQXÚ ¹%^æ\E‹Âgí ‡_4@ïj_¼Ôsൄ3»;†½ª˜õÏ%‚�ÛW3¼p°»’´‡¤¦KÞâµþNEšÎféý/ÀËF6èù~…r\W$ô ¤np¬®Ð8ÅX&¯š;?Ó>²R�Äh³Joˆ· žE¸¸êðYþ|ð@¸ï¸(?–p1£™=$㑸âñ(ô1´ø‡#<¿ É뾉PCû¨
Ø…ba¼ŽÁ¹ŽQˆ¾X9�c‰ä«5g*$Ä@¾$–¾8½‰ˆ@î<BRˆ�ñà†y !P‚a¸E‚hoØtÈ?ös<ˆð†8.Ü›¿À0¾°?´;¾`)¿`³¾0Ä䓼àC–b
+âAA0Ä›k0´c
Ä°"–pÊ•„Ûą˽˜áA/D‹ó8–” +<–† ÄÙ[¹±RŒ-ê†õ™Åk1âYÂÀ¾I$†h8éÅó{@Ôc‰,þŠ<ã9¤åé—0–cᾉ ŒE<ž�kFñk’s`½¹)ž#„øgxE¤»EÆs¦¼AÁÀp…;$½S9-¬Â¿p'PˆE4JdF¹Y<ÀHÀâ‘ÁdQ’JH‚r�y£·�Â|Ó7à7|¸+€ƒ«îÉ«G¼> ³>tŒ=$ùŽ–ðz:
Àìë+ñˆ?hÚ§ŒT‰µc?– '#­êY„Cˆ‘ÂÈ8JÜ0ϸ
zJ¥Í#—a�&=Z‰¨`ñØHŽ
:À&¾³¾”¬à@Øa$9*“ÄŒ¬üz(šñ�;�‹•àÊSuø&eø?ðÔŒR–•:õy�þ�Ê}º�Ø{ˆr{¤ë*Š8¤Á@¾f|–Cb–Ž›?´s–‰ˆ&ÂC; ¼ï zÒHÂ\³di¦p §¶\–Â�áIK¤+Œ†èŽÙ§Î¨f¡'ö«ÄØã*Í„�ÎhB뻲ãhÊ#ÉÈ<Ša	§Ë\–p’AÊì £+MíÓ¯z™£
Úùþq
0!!˜ò�è
¬e%¬UŠÑ€Z‚R
Zþ¥uÚ¶uÛ·…Û¸•[¦EZþ¹ ¹ÅÛ¼Õ[£õ�«ýY¿íÙ±ZŸõ�²õ“½…[¶-Û¡õ�·ÜÓpžt¨@rP†E¨{ë�(Ÿ
¡Ùïñ7|°‡�ã‡] ÝÒ5ÝÓEÝÔ-]]@]ÖUÝ×…ÝØ•ÝÙ¥ÝÚµÝVµ]-]ÜÝ…[ ]}-]ß½…[0Ø`ØãUÝVå]ßí„ÓÅÞM]×ÍÝÙu]é•^ؽ^ÚÍÞém]î]ÝÛÝ…ç�ÞíõÞî%Ýê-ß]¸^òßÓ…^Ö…ÞŽMßù}]L@]ûUßóýÝüå_ö%ßVU†Cð
o�9H�ž»Ï·Â7Í͇{ð·š]|xpþ~؇xÀà¾`æàîàVã`ò‰‡qõ2.áá>áÞàFaþF/Ó‡ná~áÞàa×î`œÅ`³a¾Ðí7{è7Íýá�W|ØÙ#¦‡)†â{˜â»ò‡ýAÐòÑ+úx5ˆ¤1æ·}¸‡3þá
ÕÜ3vb Öàæá–c.áÆa^a¾aÎcfá
Nãîc&äbCÎáœP| Ÿ*Fcòaã6>dBÎaâ.SaC>�x8�AÆä7î`6äâKváQ¦aDbHæ·3ö@�ÕY6ÖÙq­dKáöã¾cqý‡Hþ×^öÀ'fãñ9–ÙLbºbb{ça/ÖÜ’ÒÖÈ\3×ïáš½…J°‡áM‡Ë«ì	gq&ç/þsFçtVçtΞr^gq^çNŽç/†gt®ge¦g½ªç¼‚Hw~µyŸ
è…†+;�pžguÞ牎h‹–芾hvžè}®h|æè|éÿ¸ç/þgq]ygŒ^i}¶heng‰–i–>g}Öè�¾é‡žéîé�¾érÎišãzVis†g fiò	©	ŒÁ©y’{“ÿàe
�«làÐQ‚2P††ê¯kšnç ë²kþ•æâÙht]ñ¡�Áæ}ÃY€3·&h†c«³æë¾öë¿öë€#éµìÂ6ìæè¢&i²>ì[ì˜Fìúhæ$H‡�ür¸�i®ƒ1 f€ë²v8„2ðƒop«)Žl¾.jÅÖ«ÔÎ+
1±‘ìÓÎk•¶ëuNȼRi	�
Ñ+3~kñ¸»~k
A^_øghoçóbö†ÇhevqJ÷™§ùš·ù_j´Òñú€jüŒ+˜Á}h2€
Ø’X€%Ø_õW·VH„—u]?èd‡õàˆ—øÖö7b§zmwô«uþxh‡�wp×x
�gÞfhž¾sâþžýÜíüNtlÞú1Þo)n¿nÿ¼ù¿üÀ|¿NwÊ–�~÷ƒ”ƒ1ˆû†·qbï
X‚: »o×nÇFð„œzñ
aOxY‡+
Wë‚–ùnŸ«±x0suxÿ”kJß·)?há¦h'æ¸ëܸ¯ÙÞ¯úDOHlÿV²Ÿ{»¿{ÿs¯gúÁwþç‡~çuï:ÈlÝô—]�»…:0ƒ_ÐCz0x†\øv•ÈÐ%xÓÿâ?wí©k‘¿õn‡î�'yó}Ю¿}¸8~

)¤
åh•ZÓD1™iö¦˜V¤�¨rá@·|T�­ºú*¬±ÂxoJx£Ô\í(ƒ‰qÈýþ£`ì‘WІ'éB-×JÇÚŬ FÆ$è¨tý㬰åóÌ›ý�…dB��¥?w8ðËnôw¡T¤‘*DÆé¸ôh’uèM}F~ušaùcÎ0ê~•�=+ùO<ø®šp²=ò.Å ’Ã…ušVfØdf‘;KDÚÇ%{:^žýƒ>JÚ]IÞ(£LL­%+Ï=ûü3Ð)ñ“Î�éŒQAç8å
ré+A,$X„Û�Ï!\(¡Ä‘ésÌ!NH‘D·xÃÏ-N
±ó£àHG1‡1žr‚
ØÅ>tá
FRB*ÑŽg(¡áÂÔAd¦ãÆàB	(ÑIÐÀ‚ô%4~y†a¢­‘9„*¡ŒN@&z/]àr”Òc#àÂ-À
�(áB@&Ü
2NÄÅ:á€
k\H9èƒ?ˆ^°O8 y!ÚCaˆþø
?$‚àÂd˜-Á>^"p˜ˆ7À1�4áÑ«„d™JàʸEŒ�,‚’·¼æ=á˜xÓB©œcWLóU
	õ.‚àãïzˆ¿r‹ôáŒ÷`†3öá�iƒo£Aœ¡¹œÉ�LÇ?”Q
¤M#ÀÓG9’ |Œ@
Ù@ˆA
Љxìâ�¤
~€‚Uw¡´ð†	Êð�$™KêÊÅzPJ(Nçý5°ƒ-#…„ã(I‘J;bøÞ1É

%Ê>FÕlí·-ÞG7ÂÑ
Ö!„p¬€2ì‘ã^;ØIÊFÊ Ó2ÔÕ6Çe·=´\
2•C6…ˆH%˜
�&fš
ºƒýÈ
¢dT‚t‚Ü�õÇ0ÔA8øÃ…zÃ3tÂ%XKÄ 
œ°È?Õ…ZÔ¦àÅ}´¡µ¶gt†E¨…gLÊÓ~LF$IuN”gP„>ôAŒÌ³æKÂKZ¬Ùžm¬øÃB&T²EgC0,{(„v¬Å˜,„wH+«Äg�ÏÖÉ]ÔÖ4œ´É×klªÈ>GHKv^˱�J”T!<d%a~€_6'akÔÌ»È˳…
œÈ-‰Dák8nÙîLÆ2ËEî«GX¡ÊR„Ö~HÒ†©²ªÎŠ·Âƒ7\ˆ\ðžvêÁøÚ¯ðâÁ6gB‘4(¬>D”Aü‹ßJ
 èmÝÄÞªœHFÀdƒ¿QïÞ’¬ÑbäŸH�þ@ï}pÔÁ!àÌbœ�˜®«Ä}ôêEú­EÝW†I~Ô-z ‰ktˆë’„ô*m‹TMôrHI°·ZëêV¡g”G<¼ý¯O°m؈*”34ÔqDêC1LÃäCÃh*%œ_#ÜBâøZ‰àKv~nøF�..¾´l¾�„b�KÉroAä×HL¯˜¬ˆþ9LëLæ¾oã
Ê�À(Æ÷jnÓŽì›Eï¬Æ	>F‰X”ÔÆD]mbÜHüo¯î‡±×FñìÍß{-¬D
„¿ä: ܤÃãì‘œT”Go¶îŒAÌ*F$�
£F²È{|FÉr®²ÄcŒÏŽIþÃä—um¥îlËFÞ°µÂïÎÎoG<lÖâ1´ÂŒAPIýÆ(ïìVŠÎ$FFZð0²èÐDz,Û„ÚÞˆ74ªC>êûpÈmœÑ:�C¾u�°[­�×
¯ÅãéæZq+ð÷zDÿ0‡
ôæC>˜U”‡_°®¥6.µDÍýöm&ðŸ8îDÑD©‹øÆÉ®^‹¸"0ÇÊs#?Ô3XXÍæÖ-’å±
—mÝ~/çï,ôA‡CÁ²m¦ñ• GIü+9(ÂdÀ<À8Àœ&üÓUà‰ÅnÄè¢Ùîðçê�ÿíµÖqƒ„³sÉ7¿ì“ó8ÿþ­J¸ó
gDÏÒp<ˆ[Æþ¾Lø1Û… ˆÄÁ9‹ßFãs%K†�´Ë¶®4BWõA;•-³­.	/?µäƒ.8A¬Ñ éÂâêm
Gséöl TJÆÆ	5®*§µÐb*ÙÖ´˜¬D;P‰(«DÙ²‰íZÆiŠ¯=JxIßÊ>çí|
Êy°±;SFµ<Ä�„wàóU¶Uwv,—ññ&Þ7›5ßC>\Cã¤gdÙ‹;¨ Ïô ól47sZìδ04KJW²h at 5ã†ÊYø3'•,‡5ïq\¸5õñ5,û‰AS¶¾0öfñdÈM8ö%W¶4Óívþ$õ Š%{6yo-_ð>ˆ¶D>ÔfÐ\=Ôƒ.À€"x•ø¤K·_ìñ5ÛõW8áBžè..é’È\'±?—´€Ol<ð…`€Ä_»ì}D·÷´%£E
?ö3§Js/ 3_°Lƒt¸[÷ã².T˘Uˆ«QßG$—·‹¯B/²¡±â]ɱÂC<ÈÃ5�AFW@dÀ,A.¬5r?öN6†W6©Üq?­ôÞ0b#9J9ž8€¯EÃïOß´hÔ„3g7ã0bëô¨„ëîDe°@ïmZïÇFù‹Ç¹ðb5£.Å>´—Û2ѱI>4ÀÀôå4
HÃyMLõ¦rhìL*Ë9«‹qŒ›1+o
	µ2�˜’X«iMBM„Æx³06;6©›EQÓ¯„Kx	7&G°9ËÆF,7<·º´K0�3$S¨·�cÄöþÃ
>P&XÞ=ö@”º¹Ã/ÒûŒxz¦'ê–-¦ÓƦO;½K0h,�¯qD±o·0Ã0àƒ2ž’�Ã0C¤²a4Cûl$|½?¼Àž·µÿžCêò–Á '„¿ÂCR±ˆvä°C|ÈC<Éì«?§h«ñD‘‚*DÇÏ{ÉÇþ¼ÌÏ|¬T{£^‹zw5ÔBõJÜ];ôu_Ó¼Ð=ÑÓÈÉ/…åå»BDTP1Ë@o¦fyÑO=ÕW½Y¬­ðÜùVÉC±Æ’,_ˆªÕ�=Ù—ýMÜ;s¤üCËEa¤µ&•ÙǽÜǽÄ'Tzç¹røw1Åνßÿ}Ñ=X¬•ò6g9©
s¾éŸ>BW»Ýç|
�Æ^Dõ§£¾ìϾð¢}Ò+ìt>\—D´µSÓ>ð?¢Ö}äoýÅ·ÇÌøÃ7¸ð7¿ó#§çC§C7Š7ÈDøíYì�Ãþ??÷w@A¾¥²¾WËzX�Ò±÷§¿ú”àß~Oç‘Ê­Cœå6B¯mÿúç¿þÓˆê¿Ûþ
@”ù7ðŸ=ƒûÚý²b\�:Ùø”8‘bE‹1fÔ¸‘cG�A†9’dI“'Q¦T¹’eK—/an,×(I:4rÚ3VÉ
4üôÉA3¾{ùòq3fÆJ�[%¸P£W.fU«W±fÕº•kW¯_Á†%éÏÛ¡$ÞnÜ·³çOuÊð‹øo_>yŠ
<8°à
€eè);˜paÇ'V¼˜1Æp4mâ´×îOŸÿ‚¢ñÇ�¾}õæé"ó¡Ç’K(
£G¬qkׯþaÇ–=›vJ}eÏÊ‘³oß9e–Ëè{[Æß?~uÑÍ»¦H
¥\%rÑ댮vuë×±g×¾ÝäãšiÿµsV©‡O Bÿß—|93�Ò@OGo.wû÷ñç׿ëm³hq
ÏLÚ.~üÑ'ž|šAÂ� `�–˜¤8þ0ÌPÃ
9Ìp¦ï$Ë~ÊÌŸäh0ƒ†¿rQ!j:¬ÑÆqÌ1,²þ¯�ß
ÎxPŒ§3üÀ„.䲇LÑQÊ)©¬ÒÊ�¼‹l sœY¤­óÆ8}þÁ§%ر£ŽNø±g-)z¸RÎ9é¬s?ÿrÃIŸI4P Íܼ§þˆ¼
ÇÜ�žl”±ÓÑG!�”±,Á+g¼/ÿ�k }ö)ó|6“ëDìÙLÒSQMUÕ—ðp ñúJ ãð)³(ãDôD2WíÕ×_�½èC-Ã;†D êÐ,"~jí´LãFÝ4Øi©­öQÏJk|ØòI}àÚìD‚ì)ÓQºÇÚuÙm7GJlgÄ/3KoÔo—ÅìÂ{îqÖÝ
X»Vu{Ho‡ÃuÔq	b¶¨ZŽXâ‰]ƒw sºýéôî¸8}ê£Xä‘IþªÕ´8ÍØO{u½Am•«ä™i®™¥a}¬Œ^ŽOD°\}‹ËUf›‰.Úh�°uµ·ƒÑXÙþ¸‚.¨gQ£>Úê«�¶¸ ŒÏÊ"†Å4õß]±.ÛÝŽQ"8Àµú®>ú¤NOêQC¶vêú†n¸n³ù¦2Z\çþ%‹'ÓÙ<õ)äe£–+_v©N°áÎn3£üí[s7ÕñÈ6éäÝ–nû@¡Åõ‡·Ÿå¦§Ý…C^Öuˇ$jóÛk¤=T\-w§g”pP§cM¤Ûß„g~Úq<`Éq•kqÚ}Üãë±Ï^ûí¹ïÞûïÁ_üñÉ/ßüóÑO_ýõÙß~#ˆ‹£›¾½=J<¶ƒÔôsú†„Ç)Þr‡gäí_¼H›¾ex/AdÊî ÈÞÔ)ù˜ þ+hÁÄá
n$!eŽ•©¡´i.í€G:Ž±+X£	uÌ(F¦| )ûP‡:�Rî�‡=ôá�D!‘ˆE4⑘D%.‘‰Mtâ¡E)NqŠùØ¡<äQ,bQ‡ò˜ÇåQÃÒ¯#jã�ob¥¿gýƒã‘B¶P‡,�üxFÀt'C»Ìc[|Ç
HA’�…4ä!™HE.’‘�tä#!IIN’’•´ä%1™ÉAŽc“'ÿHÃN‘Ñ#Z¦Ðc+Ï,G
P\‚¦4(8Á‰RÀ⤠Å8ò�•$x
áÎ~R.7éðd(C%(QÕÐ#êØïö!�w,C9õ„(R1
±‚Õd5k*ÊŠÖ³¦•­ku«ZáÚÖ¸¾U®u¥ë]çšW»ê¯{õk_
ËWÁþu°�%ìa
þ›ØÂ.±ŒUlc!{ײº"­¢Å'4‘ÙOlb¢pÅW7q	R¼C›˜n
Y´B¹Ì]ns¡û\é:—ºÑ­ît­›]ìn÷ºÝÕ®w¹û]ñ†—¼à5ïxÏ[^ô®W½íMï{Ù_÷Æ—¾óµ¯|Í»\YìW¬XÅ'2ñßO¬‚ûe…+B[‹e„ñ$¦äZ½´ `a
WÈBÚÔžvµ«MÙW¯bÛÝÆöµÁýêi»‚Ûäöv¸¿mmu››ÝÜNwºµÝîs«ûÝá–·¹ë½îþq—›ßôF÷¿»-ï|g{ß
w7À	¾î~ãáã.¸À.n…Üß�÷Â^ñ„ß;ãw8Å®ñ�s\ä¿6µý›eäºNô‰Q‹TÀâ§òØGÕ¼‰Ú›¨¶Í›ùÖ>ôa‡1è£w¸Å‰Øñ+,!bòœ¡?!‹Styê]î/·ý{u­û—ÀV·:¾¯~ò¬s�ëÔî7ÖѾu´_ÛÝg;µÕÞõ¶{[íu÷/ÛÍN÷»Ã}ì].û×Ýýö´÷ýêsûÞïw¯»ñqï»áßøÇÿ�ñØv<ÚçîuÁ_ò|·üäŸ÷Ä‹ó”×ûçKzÍ÷�ô…Ïz¹%Îr,þ+wÚÈݲ)RQ
3×cy&)êÖr=´C]e¢O;t—(wLì[ùx:(¦}Š
gƶ0Æþ¯Å°ÐÀ´ðŪpü®ìc,
l½�¿LlW,
§m
åËèÐÅøkñ0÷�ÕPë
±áî	1
‘ü
LMÌ
9a//
Y±Lñ±n»,ÅœkÑZAåöË\
ÌÌæÌÖ$ã¨GâÂgr¢(Î…|çeº©Zþ]êâù�¹NA¹°lÑÂì
­µ°­QkLMlÑX¬ì¯PÆ­ÇñaÌÅ�ÑÜñÍ0£0£°á±×1¯ñéPñÑc̵ð³Ñm0þ§°
ÇÑÄtÌ i‘Ùññ	ÒÀ$òÄ(R!Ïñk GÒ9R'r
É‘#CòÊF2Kr#ñÑ
¬m!—ëIJ�¹
,8¡æ(çþC7x.H„qqJebYà�>è�u˜qa&¢.D¬<
¹fñÔN-Ì’K¹�KQÌ [-¹Nì+±ÒQLå®+oq,Ó2-×R,¹²Ãòá2¹ºñÙr+ϲ,¯ð+ùq.Ë2—-ó2.éÒÙ²»2å+Ó.
S-ÝÒ/çÒ™./R0ëRűõ’,QÌ-1“¹¬q¿^2,“0Ó²ÅS4/Áñ4sþ5!s4qó3g1-³/ù‘6m²0asºt“Ípö<Åx’Ñjñxª�‚2$Œx’Å´@&uÞ,q8ã\ ç^l‡œD<
c
"˱
írSÛÒ×ò/òQS-ßóOsåô‹¿lÐ"ùsåÞs>ÝíSñS>·²?áó/õ3YÌ+QÑÖÓ@÷3>)”BT&׳&³&/´?Íñ&ÿó@-TÅ4s?;”[íC¿’=ETAå2O-C·Ò&×REõ²C-ôEÉ2FåЕë/Q5µ’üÞq
£Ðtoæ!:?â›èBeÀ…8ÊE\òFqìA:HÉW¤’ šeÙ
þ-!·?åð&ÇTÜ,¬Ît²îÐÔÊô5²-e”Ñ“@½QW!NÇ”0½1Åp’	4Õ1
´Mõ´N·/\
­üpER)+¾ÊʳM
ÑD_Œ1ù°Gë1ûÊóCÛs-•¿ÒÊ<
ûQL#qLuTR?
•µMYRP)‹¬^ÍPiSFë4BÙ1eô3÷‹S+qGóÀÈnD¡ÌÎì$Š
×0%Y>l3ø''è‚›ˆZ¨F"Ê…*“áƳüÜt‡5ÞÐ
P
ø@Ø•]ù
­‘ÀöUÅT7s5W.D
]QAdaËMR]a8ö¹�¸†u¿Dadõ€AÛòµNMÍA”¿
$Sˆão°T"¾åwÖÅÃpn œ�Ðl6Ÿ°»l†ële!d®"Á
b
ø`À¤mì­€"sæ^ioÏÄF’þÀ͸Ê3,c�ë¾°¹VLæÊsË8tRUM9×óq¯Œ¸@¯‘g’¹B!$vrKáj¡^A¢nËR·ì\!ÅPÁ
"À
àŒ;7
"
ÛŽ¹Ø
érVÕTAbµ¸Ë¸ÍÍ�÷x‡ûëå˜×v}BÀBàÀ |±×D6Já 
v�-‘OÓÖïnö<sµöZM¹áRàxydARVR;ø¸¤îë°öÀ$A@
`™	
nå0Q9Á07
 
ÁlOËSFïp$Ÿ�ÜV
ÅT!uS
Ú„y>—-QÛFÓÀüµ¿0U)w’3a9Ø_.ÅÙ�Ÿ�ÕLáS	¬�!Ò.A 
rz‘!wåZXîL-€%€™ 
Ôà"AÞ 
b€
øÚþœvvi·¸¶ZÀܸËì¸
åÕ:\NÓ—ÜÌþÀ­
 
À•
Úù[6!,¼ØaáØ+öØy¬À|áJÝ��TM5§r
]¡¾³¬ü³F¡bË=عýì�ݳÌÍ4�y=[ó8?‘Y!�$~VÊÃ-„." XL|Gø¥(ö
*(hþ!q_a·ÃNaÅlѦîºH\l «ÐÊÜÁêfSÌ'«Àx™—UàŒ`þ
ô€Ÿ"7<Ax™N H¡
ˆÀT€ÊŠµÝ`ôoÀ¥oঠ\½§±2,·QQA~ÿVàÂàÀàT`ŽÀ
$á$¡
€`VÀ´€@¡³>ëV€dÊ
À ¥�ÿ6Kô 
Œ€ô�߀@Þ@.
t™È
@€
\°8¡‚ˆ¦O²ZÉ2%KÖªO þ  £˜BZbØX
¤ÊT©b�Å)Ò(7n ´qä�¤MY±2…³!«U¨ˆœè
.È`ƒ‚Ç�wûÔóN2 ˆu«°âJ‡™¢J+§\åŠ&G\€‘
\
àX€œ`DŸ|"Ý,‰æ
,~
 ”@¤!j'œT
BŽ8 
›'aÇ"/½Uâ�¾n@Òo*¥¨‘c¨°r ©›+h!‰(átª—7%6ÝC:5[ËvÝ=(^8�$‘ŽzÞ‘M%ð¡á?uŒñÏ>j—í_þ

(Aç	(j!è‘Š,³Ä"¤P\­@AçŠf|”€TÚ›@`$ÉKu¡(ëÊ&Eð矀`{ŠˆpC¶s@UH‰'¥œ�b
H€¾í	@ Sb èG
}$üS’S˜Oð!

QøL
¤H
(rø'
Ø
Uh�ø
0:Å'$
�a¤Ђˆ$
PIÀœ¤D�‘;ºá5]Š…¡[±
³¢B
wõ–k.å
z¨E-°ˆd$
lZ
@x…;eQàEÒ³³ù¶Á`4õ'�h€¯xp!J
 §Ýɤþ€Bÿ$�“¾
« ø0C\
	}ïƒÅ6…¡£†Sˆ¢"…ý$QŠR@ûPTA!ˆ`&Oë@oUÉjíRÁ¨xôÙž¢ˆ„ŸÁðs¬ß[¡7@ÅCR
	‹
E@5ÞPŠW¼![A
@©¡@1
`À1)È'	!
{ ½:8âGž’
°�Mц°
ήO
ž0X׶}V,0;¡’µ@ðÄ_©re6p\
PÒGE02õx\bÕtäò,
À¤P
Kæ=B¡
Ç(86úQ øpò €ö
âl0fž(
5oCqY¥
¡ H]"
›P&ÅSU~X
�8!
W\ÅC
žPz7|àöc²#G“¢
‰O¦€z\žéeDp&
Ähª
³�
‘0
³ižR
à
¤yã{#„~s	¯±�„ãow¨`71
'²iLô¡Ù\3ò"—P€mb',€uà-0
ˆ6
1yD`S�
Œ©@pÛF<ÔNJḗJG–°ð3œ‚š¯ ˆ-d¥àezxUV
Z1
«‰œP0°ˆ�G =wP §m�	§Pf¦"½é
@#
ýâ¨	-
IÅ
8 {á)'P
ï$
µ þZr(
©€9+0

%�l©P7pmÀ
…�	=À[ï­dY;±	F`Q 
b �¥€
š`˜†TýÆ;[þ»µ!u\
áˆÓ
~"Õrkeˆ‘¯ ·šÀlPF€[ôZ àÇr	§V<P°˜žP:¡9ë&œ å£NP@=œp	±H$0¶@ žFnã$…Y˜Ö‹§—q¹
m�2¡Nç	› 	z0
uF
µP
°
�`ÄiWbð; 
po¹¨(įÚçS~¨	Z MÉ P²#\Z	¥àŸ—P
‘pw¨ð	†˜þÔW
&a6
²KDü”S Pˆ¨EÔtCÀ
ô›kBwq	(Ã-Ü늺ù0Æ;° ·³Ù*™U
,ç¢
:A97—Ï�‡R9’W¢0›p^£æ ï8[þ
n@»Ôwy¯g—@½”2iòŒ-ŒX
.â	ß='UYrt
ߦ}•�Oë»se=žàx±°®Ñ2
6¿£ð3šc/Ýr8`,HUP=¥p´5C€+
k
C¤–ZPd 
±:l:
+ ¯é˜
†<7“÷Å:mÀ87“
ö_¼³!Ÿ0¬ù)
°"î›nD(0 €ŠA©R¹uI�m”ò$ʈ
(È3j§71.HP�‘@‚&xþ˜ÂÉ#'50
ORAå†!˜h”£NY³’åMÀ€/�ÚLeW¦H/
	b4W\Ñ$Ëßn¸„>0ÔK@C<ú’*PSÍC¬œC†DÙD�I=üc“O6Q!
H€ˆONêËP+cê)VšCJTH©êþªÄ¶ÒÇ›C’ðF²þ9G´h@ã}ä(ãŸ}ÚýÇ~èᇱ«ì™×ƲÕw_~ûõw+ÇØÍç�d@é’Äh£m%ᣒZ¸HñõÄ�HôÐã�?øÈcWNÉDQWF1$�@,¤´?
Á˜\Mi
’@ù#�Hº<j–Yš¢O>,þC�?ôÈ£U�ŽZtY—‹EO=dÖãTY\c•ùø$dNöð™M®.
Hš¶P$iºä=\òh­1þã
¡2
âOaÛçŒ5AE3§ŒŠ64ž›þÃ
I.á£ç@ö0¤¢„-Ô“�Áÿh£
>ìv5gSb�´£€üh™1.þ"Y¥âŸ÷¸ÄpÑ3LÄUŽD<Q<‰„7Ä“�ÙÃm=—û2ÀÏN…6é9h="Ũò>Ž6Tïè3<�7%YHN¥¯g±/éåBdÞÃWÊ«=É‹Õ(9�9	�ÈOtµ¸d=ÌÜdI¤,f—�…²æîE+i
KXy¤B«üë+aVÚáŒr­¥-çÒ
¼Þe�¬Ü_ÿ"a	MhÂÅ4æ1‘™Le¨°¤)¦X”xÆO ¨à¡™ðt™¢„Ì#¨Ð„&j'ŠÒ¼âÈ+‘(`

XÀ«xʈºw!X”B‹Pä„Kf‘ÀÙ`¦ªþÈYkÇ	Tp‚}E* ¡‰MÔÈU]DEˆ¨ˆ@Ot�hüß&ôÆ»XxÄÀ2_»˜ŠD)
3¡Ò£˜¿…•§oF£O°r(Š¥AJ��zJSˆô¿"‘>�ÎÈh
!•®9�IÅ(<ñDPü1	4Ï 5Q?‚âQäÏSbÑÈR ‚} q…'4Ë`u‡OT�Kšu™¨åQ�Ë
R*6ADYú­HH‰
÷Bƒ“2HWÔ„Ã7
D扇:DE%Ks	PÔ‘2cä+×ɾPQ‘†ýÑã(p•?Œ²*c¢8Zk
µ|q-m«[Þ¨à?ÚaŒJÁ\èrþV°/Ç€]"Ì×	MzR”
&`û¨Á^!
Aea™©Œeº-hE�!©ÀÕë…” q¯’C
ÍB^7=†„§Š#"J�¨—ŠŠTD!Ï߆b
U<…ŠíAäM£¦S"…*H¥ü"¨ B”†*d!y"¥Gbá�ÐÔH

R
g“‰UÄ4Oô!¨Pg4º9µoWã]…Ú=W„g›SRPqæ2›žÕ)ùg>gÙ0¨è”¯ù3SN¿ÚÊçQbx
•/»gžžú�s«¤«fH 1O5ê^'¡5=Y`²°Uô¤NòºPר£¡&»ZÛ΀Š!ù‰RÙZ�©€E
.þqjS}¥D–!æT ê¯r€E,á"42È9 Á1ø—>ƒ­w±·¤)¥o}O˜BÇ@Æ—Å
¹kSœVa
žaRèWÐàjD­˜
¥[§ræ¦�ûRr•2SÚ"Ð(Dê^S”‚&m4²ÈYê™ÿ’g%®‘—uG§ˆ3\h$�:NåYÍ¡îSBáWñ$rQó0R¹ë2TzssÚm,Sª0Ó8*.TØlÐzÚ Çð¬AiE 73šæäø¶7æ.4“;‹íi†{škØ<¿ª™'C‹Š[eàP„r”àb¶´3ŒiTîø%#¡’�Di d»¤šx3~Vfþ¹éí¹9Ô‚ |÷åny«¢,×¹üáxÉ7+íÂGcDm_T§º_+Ø2&£egÕ­
¶m™eº¬¢ÐöŠÔˆÌÌ&ZD2‰^§™H׶q	{òæpú¥e…QEqžk3h‰HÚíÛ6aøU!Í‚sÉ
Ò¸�$CãŒÄ–�1SîLàñ ±S”Œ!6äS WÛ1Lhf;Ãî0ŽØ3�]6·“B$#}‰(Óv6Èág)
¯Õ¦î†—J¡Ô›ÙH‘ñQ2¾¬ûa‘œ)Âa8Ó
/*Œ3ÑßLëšrïÊÑöÒ*¡5XX+‚þšàx±bŽcœ7]h�oÀþÆ.¬œZÕKgú`ðû˜wø⥘eÃg«çô3¸Ö)¤…2ä0ƒ)å
±
xÕ’KØÎ~Åó²}WÅŽ}¦Îx½#×"ýwÜ^Ê”ªcbV‘¶�¥%½œäs¯Œƒæ;ÇGŽ]„×ðÞw§.Äö}Ýä¾ÎÛ`þ*º]–ã™
ûßP9Ò‡�Í͘fÖºÒþ^kžsÏKHf°Çòîî¹C;ôä2Â8Óø¿å]ÞAñ$½
JäEˆsæ[g–
c~Gí¯ÔÒ¹¥õ%Qo�]øÀ¨F=
j{°å]GÿG©ã;¯¦§_ý\YiK&ž
cþº5¥?­£bçÓÎŒ*ss”þe.Ó±…Q>ߢû¸¢˜*‹Ù>¼
>«*gY9»«$"�¬¼È²{Cš¨Y=Ës…º:
¢«²êA²º’9…é;Ò«5v“<•k=×Û³º*¥è›·Ú¼„q*ÏÈÌiÓkœÅb
!	¸;z†¢0Þc0•›;¬¢×Q;[2¥x²™Â2.Seé?ÀÓ1èC2Ë1z–Y"´Ox@{‹˜¨Éœ/ÊÀ✫z4¯«ïÚ¹~é¹M{†EH
’ƒ1à}¡¡zá‡y!¿õ[DU{:ýz5r»â&ùC›š§F’¿‚¾Ùc¨¦8ÁÏ�1a3ŠŠˆÂ8Îþ
’U˜¥è£ÖS¤xÃF¹ÚcÃÊ0�ð𼼫"
�,‹š«ùŽJ*’Ï[Bû­ßKA—‘½¤6eqk8hü"vëÁ4¤�³ŒÚK˜·ªÊœjz+²4GsŠz㮼Á�u+2¿BÅi,±æ!¡¡Þ…ÿ£¢Ä*í"‘ßÂi[£G�k°»ã­b#ŠkÄC•¦°;»£6#™!œ©«Ò²®dBÓA…‡ÂÃ}Á>Š
—qé´w
5AD—Å€—{@:�BDF|É¥k?—"¨¥R 
Š¦ Ç+1 ÄœId|L£¨GkÈPÁ'èù±
KÁ„ñ˜L¸®Ìñ0yËáÓ2tÜœEq=уCM„¸"‹³z ïê—ð¢ pá4?Ä;8—ADÒ‡�Â
ôƒIç¤/Gd¡ö¹-ª+ÇÔS4Ï*°1Šô53[³´¤'£òº¬ü¯ü›«“EÁê=T
°ã;+ÇT®ð;h»…‹µ*þ
ź£›;6\½0Ò®/š›gó«VÈÙƒ?¬RÐÚ
2ÛLŠÇªIEš©5³.TB3 )6<C,ä’®Õ³­²®ÙÃ8/À•‹¤Î¸œº’»ªÂµHSÇ×¢1¨PÌ�ŠÂÏ»#¢ðÌÊ©¹³IsóB#Yª=M"h#ÁLT¶i©–Þ¼´LI"ï+Éu9:DtÉçÜÒ˜ô(÷ƒD
*£Y„,£,(bËŲ�"u¬L~üºÓÃ=Ô›5mt ;´>}ÑÃp)òÃy
Ä,•Dd/‘ò(táRx-¡è”º!eŽÓ»´5J¤0‹…
TÛŒU\Ô¡¢Tè¢W0'ö´Š-�CSH½·@²VV]šoD#™HM²éâÁ"£û8¸tÌ¥Æj…�ñ5mÛ8œªXZ�H a¶†%½¢øˆ~Š.hL”ïP¹Ìø7Ǻ­�Y`éJA»Å*›;
¥ÙÓ‚ÅþäÒ©ÕÂÄšC0eSG°Š0æ˜;ÎÊ#·¢%¢”Pu“®D¢À’M¥ˆ‘L:³ºT…ÆÄ°ü™T¶›=/l(Ž|Òë‹Rí³(ŒJ4X·ˆÀmIñ5p�WÃÍ™,˜Š?úÃÎÈê·ÛJÒÎaªÈúSÌcKîa”Op¸€à€Ѓ®òS£1Ë«²åAWÈPEËTuÊ`m²Ðû«?­I#\1˽8ÒÌBÚS´Ñè±á9WØà
ÇÆêA�SË
#½[^û·3`œÊP¶¥Ä{c¬à�*=0€
Æ
TpÀ¨	TØ&þ
¾©ˆ„P�d-	e[�“ÙRR´ã3³;òœ&k at fÃ:†‘Šêû—ßô9q�†>4—y)NÂm—x�‹geH-}f»Œy}µúó/›»Ü_üŒ«!V «-ÜÍ3û@uì˜E7HdH^òT$›¼æµ±l<’Š;Mf97MÒÑ8»¡hQÔ¬)ˆq½ÆQÐWu!�K0£½Ì˜(g
91’Bóçá£35óŒ5ÛVÎ⛣>»ÍL›¨
Ò‡v ¾µRˆ‹xȇxØo+Ð
~P‚2†º¾k/�IX;6úËÌG«¿P᣷
Í>ºŸÐD£Ò¡(ê¢aŠšH(1øq0†(¢kzŸ:‚8*Eƒ®¥(‚£kÊ£�
K‚S¾¢à©ÿ¡£A–†Ë¡R¸	`
¨(‚¾JÂU”&>–/Ï°j”&ÿ_NèJÒðñƒH°£ÜÂq^zŸÙJnïá
‡ÊvÄ
è
€¸ÅïØ¿‚"L¨p!ÆBŒ(Q"¿‚ûê½KJ+S²>²
éñ£©�C~”ÅJåÊ�¢ô(`
ˆ

( áŠ#nP¹òäfÀLܤòôJ
ªXÂqA
ÙZ at yJ•ŠSž#!"@p
HðLñê“,SW­:)J“‘  
XÙÃiTVPj€€�pt@‚'ˆü¹ô)°,NœÞ
1�ìâ1¦húô©M™3mFe£þóLÌ
˜‚á#<Ó'N’$Ü0 ˆlÀ¦fù�%+ª¦H¸WŒ-@ Á³¶KŠ ø.1,&ô”`ã
§X³DñaVQ5€ˆ@DžÄË(œ€B
‰ �6`€
ÀÂÂlX$;PÐÕ|80�¨x¢â(�|hRH%­A!8vu0
8�  …*Ä -¸‰iþuœMàŽË’À
 
$&ƒ8€V 
P
Â`w	@Zˆ*Þ# 6€BV 

ØÀˆv”‰ÃF1
OÌA�F
`pƒ$Ž(“
èdžZ0B<0OœM§ÐçëÔ¿’Œ$$fZ…+ð¤»î•P‚"Ô?ÈqŒJô@QŒr?Ü�ª}ä£Äp‚nшƒ̓øJjÒ“NäT©Z•/Ì7+\4}ë³HX’Š@@Ž
�†
 5HbG @µx/QØMqámC“¡µ(ÅRç`„-‚¢«Æ¡€˜$á8ÅtS
|ØALh‚ƒ0�"jøÖÁBp–M°!Ë™e%QŠþRbm ('ô`™ƒ©Œ©pÚ0‡H¼¢(Äͺu ñôFWåŽpRâ—zyb1 €ÅDðWXpÂLOõ
ª\Ʋ汪Wl0Oð¡©mˆD)œTp)À¤+"$·žh†•žðÄ Ø0…9ð�ðÃ	iâ
0 â…6`N@ Ïr¢½lxÐ+Â@\ãˆ�g³A$´Ð
¼ a�D-Ôp‚Ià�ø„($ñÜùpà|h¥&~¸+žhf¯’Pî{E‘
’Ì饲˜…oÕg+‘ؾ8h©üá;à	ïø0&„0äùCyüð‡>ÐQJ9¡:ð�2�†aþ`¥ZÞ2—">òiD#‘•IèÐ1¿ï$Ÿ0­áj¢‰M¼Â;Áâ	HAŠÄ/(DR=ë‰Ùì1óÑÎ4Ñ$	&e
°Á+ at 1KPÐ'ð)‹5}“¦õ*
!†̧
PLí..(Ä$
‰Rà
Ÿ>k‰x^8©ä·îKÉ™jÐ=uïO�
r9 �( a¢hð‡?àè9Á
°ÔJ°„\4Ï]Þ;ßy‡ªŠ°ô¢8Súd«š¶¯/­ø„N‹Eü¹`ÃRf-Ìö܃)À8(¢ îºMLËáP_A]ÇzP€n
í°I@âL]�@¥Lx
°‘Vè„Ãý„Pàà@h€ÐPà“+ PÛ
휴‚'áÔ]\†¯xÂXQ@…ÜüR¤@-ÄË%H‚M^¼Gðß«ø+À‚ìÄ]ä",¼
¬Œ‡&T’q
D:Í&	Q5!Æ|ˆ�/xß%¼Â%€,¶Á‡
@$ôÇÕè@›qH$t¿…�/Â/½ÓO`Ki¡Ûbè{òŸ™¨Ä&Ás1äÀƒ”©+X©&ðÁ‡ÑwˆÂ%ì—q¸@±ÁŠ2þ¤)ˆ
p€Q®(8Zvh
.ß5¦ª°Ê#Êú¼�GÈØúH"+¸L€K
phøFÂèl`¯÷Õ‚ÌÓ+
Çì@ˆ
<Ì1?ÐÃÝ2YÛq[›Tá²Ô^¨)üøLE*Ž¹ÄÌ]!Ot
О(ÀÂ…3A¤À"
,e
p@’*)ˆÀ­•‹¾� LW\€
p£
˜Q¥2j
'@‚	±(¸À_¯ïäu_³¡‚$@	ÿ
¬l,˜½¬í=C@XI”t
<G\ý�è €ü�Ó*‰›¸Á
E2­¦CÀRƒˆBàú€Ñz@@@*X‡
P
„@³	W°`\ˆÀþðD
Hôª9ø¾çâ&`]*´E‘”s`
7öˆD�*£"‹`ËNé¢kãÉUXi…•Xä2Hä1p•/ÑpÁäØ0„Ê´¶¸K6¹HÀQ1d6ô5ØðÒ•‹ºúj­‹†ZE7Myë6Ø(Å–Zè’¬4½Êi$‰t»ËcSì´:Ѐ,2É*«L~ÂýGŸfÍ=ÝtÕÝKþ9-Ÿy’ñï6wK+X|
ŒMßØ(¥IM.Ñ„àKO¨¼ÈNP
EàK`á$•¡¾:哃]åayÅൖR@
…IášþB�@H!¥˜q� ¿
@Ðb“³`;i–VÄÚ*NNX4Yn¬U@™°Â
.¢ �E(÷	æ)ìC†
I·\¥‚þ9’š‹,ŸòU©”ÿYNê0IþqQ’¢ÛLJøÁHŽ0ü¢š,fŠ¯Ï™¹ÉàL\
R,k]ဖ´c�v<ãZh—Ðà.ÆØãö^øq™É,žñ”çgÚõ®Ä+‚«È�lªT›ÝÀf,¯y
¯‚GÝ
Ë@³`‹ÏΗÌbí«ÛƒãÓùé*˜“E+*·‡	(
kg�”åÕ©
+a¥¾ÀæS€6òxa«ÍÕRá!²Àn@‹ÛÞFb5”ÈrRoüÙÕºÂGÊ9E@þÎ4£0Å’TUò©ÃRSUäÌ8Òíb-‹S´¶±@è,^qf0yÈ{RX	ãr8‘“½NM!Êó5ò-*]…Ï«¯ªm4¬ÿÂ�@žú¯¸\³~éò`¼!9DÆ0ἌcüQ.j½Ó•A§=(ã®yþ¸òl`jÞ‘ŒÖìËŸüœ
@q£¯™tÑoUY«OVðL@Ú1Ÿ®žk¬è‚Ñ—Æ;žïœâ¯N5`+
A@:Ä€@GpPźRB«m0Ï|O]±Ÿ‰B
/1‹d§ Ìî#ó
Ó²–¸Ì%µèZmþ³¿k•¡]´½Œ;,£{àã¶ìÜóÌi.šá>0 (Þû:^åA[°—¤l£	>ÝH…†ÿ<ÉÎf¡Š¥Ÿ²¹üª4ÐÐå¯Ð:æ&–Š=Mµ|`틵ãD'Æ"}�æD)^Q‹W ¢xæ‹\Ì_©Ô¥¤•T�µ/sƒøjŒ;»U3ˆG`ñûéDõ%wÃÊm_!ÚjâÖpþ®Æ‚e§`¹’µÅѺèâ†Æd™êtÿµUÚ¼q6vß°â]ŒÏ†Éùµ
ÙT!¥N‰²ã¯I£ê…ÕAÊ+sJýíâ~
ú:º­…XÌ}M5Ѽ®g±¹›ípF%z€­Èaíìíet‹tRK\5ÿøõÒç{®æT"#)/Èó€êÔ¼Ø(ïMÌú&tÙRröÅMùTAò¾Ú¦6 „dHnGqlcƒ$å®DéŒÎH´ÖoÌd
*‚æŽkE¸ëßlã„i£>ωz¤_þï6råw§îj7Ô¤È>ǼÚÂ"ʢɸ͟ނg˜«Ò~ËÈKýMXŒR K«D©ÒnþãîçÂ`ˆŒ˜©|z…(Ší²<kÖ¾‚_š*±@Ì#M±žŒÇ6,ÞâئÊ6TA¾¬–p®ê*É<hÙ�èø
�Þfâ´°)]#2¤ú'åÊà2zKûj+3Â%ÈÏ
q¸ò¡¸@as€N7ÆÌçp06ËѸm©š¬¯Æ
¨6éôf�Úدã|J66+ÇÌ‘hOÊŸ0ÐðTÉ‘4h)ÐáFAؼ_­é€j/ê,¢©_Okƒ
�bn8ÈgΨ�ŽJ±|0lÒg(†mݼ­Rܹmò~¥ÒÚbÜvã±’‰W
ÃŽLP7þl%Ñ©‡„ˆåëÞ1Ø‹w¦‹:k²–Iý@­ï¨I¥â
ùJ‹£˜�ÓeÍÊaZô¡Ž!œÚÉÄIûq\(#ü‘#iÎüð	Ðöé^Ä�ý$Ñ|‡»Œ6Æ_쑼ŽGûe‚�íÑmR8f7rÇm_´ãÿÒ§ÉnïŒBÑÉbXØ‚ßÔ¤mÐ'³&lX*
	³Ç‚N-ÐgQl°˜°Û¬_î+¹f	Á~�Xþ)ɤ.­Ò©T
+-¨Ã¼ŒÐŠË–í©Ž°ŸöBÈ�ÚÊT&e§˼þ…ã¤Îõ~Ѭ«Œ,¿L¥m†Ô0ë¡t‘¹ø)ãTfÐî%?nþ!Ïeµ” µJøG1&ƒ¶¾Åîì2~áàá†!*£#_3¸nn›¢ÝȲÙàð‚Úâx4J7Æm}¨ÌÚÀ'
£í(ù©_cWš‡Oþ¸M»È§¤«¾¯ÈK²‚’Æ:E°¢¬‰øE°¢êÿœkƒ8ëÓZ$u´Œ´¬n£^ÑSq
u…Ðx…¹¾ÈéŽSÃØf pLÃ2讼BlÞ'™(¨çF±(1î)�Q²è
ÒzDìž‹&Á0˜¦l7°”¦H²l8™I…Œ§‘F‘“ú
vÆÑDÙ¦©ÙV/ùV’Á’%3Ïe͸é.¾I¶üAÊà4J“ZÔ)¬@	àA	Êþ`è
6‹TžlË� HçÄ°“ÞÆÑn-ÆêeêkOl¬W:L»TÌ™tø4O¼îÿÊ«z¸�w�í»ÞªïpñÒ°çªK–0FRšîÊ:äÑ0Ÿkºœë™8‹â¶'N¡f©¢ìÑC¶Ì'EëÑÔ‚ßæñ$Ø_Ž§Ñ©ÞŽÂüE,ÌŽ	/N0g¡„.§ ‰/eÃÉM*ŠoÜÚƬ6ËÁ†E˜Ìh/C:«Î©6.÷*«-¬P »¢Ç£nÿnm‰2~*ˬ	›ð¬YðG0Jîœaúg2nIïaò!ôáÌà¬Aê ·Œ”\áÉ]òA1gþ¬†A«¬%¿ÒŸúîÐxò]2gp§fÃ^�
~šÑ"°zô”$9ì¼>¯_�]pšvõ¹Ì-@Ì¥ú¨òtÇòj§pïÈ|p9Çq%ac”V�/p÷*Úîk¼¸ê¨Ð‚ãŽóÖ¨rô*Ïÿz2§ÞÌ‚p·1ýíÆžÊâˆE
•f¡³Ç8ÈÙ͉Î$÷Ž,†ñÖ‚Ðþfbàlö6XÒ';V•Uò
IÏåùdôh41p´1¶å.ð![ÑA„ 2 zà
h€èAÊ•n×Ų5]Y£„¢ªúÓ7ÑÊ/éBÔ�¼�hÜ6Bª�'ý2¹^	ãÝ(èŽÞmþ,øëpËK£öëÂ0./Æ”s—­,øÎ77é,tfQ@ôÝ(Èp#‹ï8MÅxrQ4Š±ÐMðäµEW.o—±ðm0‡Á°qMùßxêØd�LýòoÍ‚L/®ªP	9õâøΧp—y7˜^—tIÈy}%ª—„V—SìòR‰¨©¼V�JÇzcê"þã¨gªÀ@.Ò¬YøÁYõ'¶ø°1p”Hh
*€m ¬ nç¶n¸4Z]ßaHáP&a¾'.,§v Äƒ98.HG„J'.ö¦tLXoD¸v¾JL¸„IÇj‡’6xo–£…c8†÷¦†EHotþ؃Æ„;øƒu8‡98…kX‡f…wøˆ…Ørš8‰sXoBØ„¥¸ƒ{ø‰…x‰{x‹c¸ƒCx9|øƒ¯ø†ã"„ehodÈ‹e˜‰mø‰¥X‰i‡…‰á8…-gŽ¸�)éŠÁ¸„�îP†[�fƒUx†
ù†ù˜’ž…§x…[øŠQØr8Ø‹{“e˜Š+ù‹3Y�))�áæ¤h®Ø{,^æ²ö€ø¬kõG«OlÉé[î)^ÞA” r!r�è�¸
‚‡ÙæNãnÑub¦já–Ù™ÝNëÜNš£Yë¨Ùš«›³9š§ùšÛ›—Ù›Ûnš¹¹šÉ¹œþ»ùœ¡9œÕù›ËYš¡™�³9žå¹�ëY›ÃYžçžëœÛ9žßy�Óùžá™›Ùyœ½YŸñÙŸ
Ú�ù™ ­yŸ÷y›z¢Õyœ	zž!š¢Z¢ïùœ©Ù¢ú£
ú™¡¢ùe‚á¸!ëÐY]kF�
„`ÃF2еt
	ê &A„�NC‰Ù¨÷Â5ï"СÞ¡–a–Aª§šª«Úª¯ª±Z«·š«£š«¿¬»:¬Çš¬ËÚ¬¥:ª½zªÓÚªÇÁ«ß:«©Z­Éš­åú¬ãú®í¯ç¯óºªçš¯óÚ­³®Ýz°»¯Õ:’
®«z±¥šþ–
òá]F·IÈ
œúgœÊÉ]²µ
|0B,±ËÃÞ×oÿýÝ?¦È:… ÃêøFLP” V¸Ã0
B
ü9ð�Dœê¼�,긮81Ÿ~à¡J˜Á·°B®gv#L¡
WH3ý¥J=`J¬dÂÄÃJ FÌЩ¸cM�
‡HÄ"rk‚¬ó³2ˆÁÎ8d¿ø…?Œ1oøÃîðF.paÄ.zñ‹š:ÞtÊ¡L$j†hhMxPô0´àŒpŒ£Å¾‚‘QLaâþ`óˆ,lŽ€¤ YâÂC‘ÏLM�•=ª‘E>ǽSÑ 'IÉJêèE$‡3ƔǠd‘èáG

bÏÐÏ’¨LåI�‘NÙÑjvRÃÎlF•¸Ìe‘8sà
z¬ÒWhY²¸F—ÈL&Ųu¥‘`¡×1RCŠ)óšØÔ^“øK&ꨖ̉¥8·“Íršót¬$ÇÁdK9ñaWêÌ9çIÏ·M°‚ûX'0ƒ¶"„ØCK'³‡¼êIЂB�•íp%;13"¶f”;QŽA'JQ‹ñ²02J”D"F�åùhEGJRo1“:ÎD#XÒ
)x�Ê! ]NIþgJS]mS|úܨ(UÃ�îLEŸ‘iM‡JÔK¥S¡ÏÄjJi�ôøT�÷OQ§JÕ	Ý3FÝ䧊J	+w4¢ðhD%²!Õªšõ¬]a¥=ô‰Æ=Q,Ã0ÃÜáƒ2(BhÍ«^crÑÂ䔟ühã?ò�hÔÁ
}†Ê�ŽSîõ±�=	3í‘ÐCž)Nûà†"*à€< 
 Üõ"KÚÒZä¦"Éh'•}–Hø@”ð
ë�¡u�ˆ­úÖ`l°o/‹šc
×À-­Ñ ÝËͱ²J°—MDQ?¸BN)WU²ÇìjoOÉ®f²vúÙœc“ÓÚඣŠ�ËRŒ
·º¹—fé
­ .¥Òv¼ƒèuÛuuu«¾v4øÀ�UÒA‰FÐëÞ? �Á¦Æ¶‚zДå¢ÃâJ¸Æ7î¤b�¿ùàÆÆðk” î †á¦müåöÄätÔ\lÌ(#PB'n‘�2Pc¹ÆT`Nt·9»ÑΊ‡HÔa'˜€J Ä0” ù2·èX¿Y«Žéþ(ÝëÏðƒ¤Ð‰NT¿ Dêàᬻ½iº>ä@¤M}ÄCŠ
ãNi²ÿþµÚ=4�„˜ÔÈÿ
™þ�«úrªƒ.cÄRJ˜‘�~¸™»úr­šá0±úddˆ:€auP–<q¬E>äÐ3c–(M…\0¦ØjoÉê«!³,3
¿á|ØSk¸ž}µ�LµS;¿Pµ¢}d”m0ÇLÀˆ�µˆÉX‹ÎZ;Û5é0â£‹Ò‡MÖUÛέ=µË=
SÜ4Vw ¬eP܆Èìàº(�µn‹µTÛÑ-Ý6Ì‹u¿NТYë¶ïͶSÛ±òMÞæéàÇ×-Áè¸h v@·Sëcó]àqû¶þö­`úP±lÁd�2c • ʇPá~ᾇ�à
ö1e�Þÿp›”°DìÐ	càH�(âI�â.žBÀáÎö€·‹,¦áL.ò
w¼Ùxä(­'D^äF~äHžäJ¾äGŽ™¹°Ìz•E#d°êP6,²å
¿ðßðÿððNhh0ñÒ¡‹èÂ�ìÙ‹pˆB`ÒAñ2ò/;ñ$_ò&ò(Ÿò*¯òcÐòh0ó._ò-ïò3¿ò8Ÿó:¿ó9oó0ÿò2ÿó<?ôDÏó5?ó7_ôJ¿ôLßôNóGô\àóG_õVõ?õ=þ_õ@ÿô^ÿõL_ó/ód?ö@�ôBöE_AŸõvЋ
=”®À…8ê̸‹ÈÃOADB_|E x«¶3ÂË'ÝÌy&¯ü~l1ÈOëË0Øb{/¯I“¨?'
|2°l²a†Ê*»©’q˜¹2K,»ÌK,­“™1¹,sK2«t†e$2Ë6�§›çTSgÊ<³Ë>ÓÌÌ@ˤrKA¿$TL0%SQoœù-¯:ÛÔ“JKÑ<ÓPBÍÄÔÏAíTÍN/]Tfè,”N½ÚTOÕòÓ,a-þtTNå4Ñ\;ýóLZe¥ÑVs¶×]§ÌfOf
ꦛ6-ÍæÍh“�RÚ7÷œVZfBêæ6gÂióÏS·'YrɱÓA5=SØWy•UTAe×ËQ-VV_§t†Ng”Ñ“K:™ì·àr§l÷Þ]ßíRÞMiÍæ*Ÿ5õÔ~•Áö_q ySe0ž6Û�­å×	“¥H‰$¤0yå”Wn™e•eFùä”�¨ç—s®™å›Múd'iç´N€öé›y^zç¦gVê™wŽ™j�c¶9k—ƒ¶cØv¹9e™¯†yj©Ë.›é¬ÉV»l¶ƒV¹e“ñ:@ÖV›í§Ý®í¾eþÞ:í°iÞ»í±ÿŽÚo«s\kž�NÙ{ŠÞE
–ÇúçÌá6™‹öÄ1†±“xå—ãf¯Å9älÄ]Çûi½Oð×'ë«gÇ™sÈW–
’Œá	Ø¥ÎÛðÂk‡[s¸
?Ûwé›wë¯Ç>ûìýÀž{@é^{ñ³ÿ{@¸÷£|ºcD;¼??~ó¯÷¾üñïÇÿúß_|?üÀÄ丱Ø!ø+üäg?ùÐ�€X­·­ÓŒÁ	û£ß5è@Z¯ƒaû·@
ªŽ4˜˜
B(>L�ã  ˆÀúáö�ÉݨÀ~p…ì¡õ$x¿þ!ZÿÉ/Rø=ôa¯|âǾò-"‚‡Xý"èÁ*¢ïÿ;ßÅÆC”ã….1ÈEb“´QCn‰’Ôh’4æÅ$âx!³LR›n˜#/^놄°­s4+Cp¼#íHG3.��D#$×X—ØIRq<�"]¢s'$÷`Õ.fð‹näQ’Œœ#/)©C^2‘§|d*ëXIÄ£”i„�8ìa�
¢a•qÔ‹,a9ËI
³�"±ä1ߨÊMÓ™Ætd2í¸ÌT³Næp¡'½FŽ_À`},e'ÏÑIs„³ â4gÿèBfí7Ö,ÉršR’ã~±ƒbéH6þ®²•Ê””0ÊOgÓ$ÒÄd@iMp–“Žï<ä>öÑ�nvÂ…è3[ùÏiÊ‘ ­ä-EâÂÓœ£JÂé†NÔ¡™è%æ€i!ÿ¢˜Df’H±Ù#Iü’Ó�ì6wÄb”T‘)—<‘i‰�C¢!Y„œñž8
U1§êL{*)£îT«GýªO�D¬º1¨wìêHI²MLÀàJ
�N¹*WÛ



From hdl at users.sourceforge.net  Wed Jun  1 12:18:36 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 01 Jun 2005 03:18:36 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marctagstructure.tmpl,1.27.2.2,1.27.2.3
Message-ID: <E1DdQJ2-0006c7-Tq@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	marctagstructure.tmpl 
Log Message:
Including Automatical change of display


Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.27.2.2
retrieving revision 1.27.2.3
diff -C2 -r1.27.2.2 -r1.27.2.3
*** marctagstructure.tmpl	31 May 2005 21:06:18 -0000	1.27.2.2
--- marctagstructure.tmpl	1 Jun 2005 10:18:24 -0000	1.27.2.3
***************
*** 116,120 ****
  <div id="bloc25">
  <h2 class="parameters">Select a framework</h2>
! <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<select name="frameworkcode">
  		<option value="">Default</option>
--- 116,120 ----
  <div id="bloc25">
  <h2 class="parameters">Select a framework</h2>
! <form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<select name="frameworkcode">
  		<option value="">Default</option>
***************
*** 126,130 ****
  	<input type="submit" value="OK" class="button">
  	<p>
! 	<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True" checked>
  	</p>
  </form>
--- 126,130 ----
  	<input type="submit" value="OK" class="button">
  	<p>
! 	<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True"  OnChange="javascript:document.f.submit()">
  	</p>
  </form>
***************
*** 143,146 ****
--- 143,147 ----
  		<th>Edit</th>
  		<th>Delete</th>
+ 	<tr>
  	<!-- TMPL_LOOP NAME="loop" -->
  	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
***************
*** 155,160 ****
  	</tr>
  	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td colspan=8>
! 			<table colspan=8>
  			<!-- TMPL_LOOP NAME="subfields" -->
  				<tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
--- 156,164 ----
  	</tr>
  	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td>
! 			&nbsp;
! 		</td>
! 		<td colspan=7 border=0>
! 			<table colspan=8 border=0>
  			<!-- TMPL_LOOP NAME="subfields" -->
  				<tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
***************
*** 164,175 ****
  					</td>
  					<td>
! 						Tab :<!-- TMPL_VAR NAME="tab" -->,
! 						<!-- TMPL_IF NAME="kohafield" -->Koha field : <!-- TMPL_VAR NAME="kohafield" -->, <!--/TMPL_IF -->
! 						<!-- TMPL_IF NAME="repeatable" -->Repeatable, <!-- TMPL_ELSE -->Not repeatable,<!-- /TMPL_IF -->
! 						<!-- TMPL_IF NAME="mandatory" -->Mandatory, <!-- TMPL_ELSE -->Not mandatory,<!-- /TMPL_IF -->
! 						<!-- TMPL_IF NAME="seealso" -->see also : <!-- TMPL_VAR NAME="seealso" -->,<!-- /TMPL_IF -->
! 						<!-- TMPL_IF NAME="authorised_value" --> Auth value :<!-- TMPL_VAR NAME="authorised_value" -->,<!-- /TMPL_IF -->
! 						<!-- TMPL_IF NAME="authtypecode" --> Authority :<!-- TMPL_VAR NAME="authtypecode" -->,<!-- /TMPL_IF -->
! 						<!-- TMPL_IF NAME="value_builder" -->Plugin :<!-- TMPL_VAR NAME="value_builder" -->,<!-- /TMPL_IF -->
  					</td>
  					<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
--- 168,193 ----
  					</td>
  					<td>
! 						<!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="repeatable" -->repeatable<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="mandatory" -->Mandatory<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="seealso" -->See<!-- TMPL_ELSE -->&nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="authorised_value" --><!-- TMPL_VAR NAME="authorised_value" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="value_builder" --><!-- TMPL_VAR NAME="value_builder" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						Tab:<!-- TMPL_VAR NAME="tab" -->
  					</td>
  					<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
***************
*** 192,195 ****
--- 210,214 ----
  		<th>Edit</th>
  		<th>Delete</th>
+ 	</tr>
  	<!-- TMPL_LOOP NAME="loop" -->
  	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
***************
*** 223,226 ****
--- 242,250 ----
  <!--/TMPL_IF -->
  	</form>
+ <script language="javascript" type="text/javascript">
+ 	function ChangeDisplay(checkbox) {
+ 		window.
+ 	}
+ </script>
  </div>
  <!-- /TMPL_IF -->




From btoumi at users.sourceforge.net  Wed Jun  1 14:11:40 2005
From: btoumi at users.sourceforge.net (btoumi)
Date: Wed, 01 Jun 2005 05:11:40 -0700
Subject: [Koha-cvs] CVS: koha - Imported sources
Message-ID: <E1DdS4S-0005Yt-53@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21365

Log Message:
import de derniere version cvs

Status:

Vendor Tag:	INITIAL_IMPORT_VENDOR_TAG
Release Tags:	INITIAL_IMPORT_RELEASE_TAG
		

No conflicts created by this import


***** Bogus filespec: -
***** Bogus filespec: Imported
***** Bogus filespec: sources



From btoumi at users.sourceforge.net  Wed Jun  1 14:18:16 2005
From: btoumi at users.sourceforge.net (btoumi)
Date: Wed, 01 Jun 2005 05:18:16 -0700
Subject: [Koha-cvs] CVS: koha - Imported sources
Message-ID: <E1DdSAq-0007BJ-Nd@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27573

Log Message:
test

Status:

Vendor Tag:	INITIAL_IMPORT_VENDOR_TAG
Release Tags:	INITIAL_IMPORT_RELEASE_TAG
		

No conflicts created by this import


***** Bogus filespec: -
***** Bogus filespec: Imported
***** Bogus filespec: sources



From btoumi at users.sourceforge.net  Wed Jun  1 14:37:07 2005
From: btoumi at users.sourceforge.net (btoumi)
Date: Wed, 01 Jun 2005 05:37:07 -0700
Subject: [Koha-cvs] CVS: koha - Imported sources
Message-ID: <E1DdST5-0001ki-7k@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6692

Log Message:
test

Status:

Vendor Tag:	INITIAL_IMPORT_VENDOR_TAG
Release Tags:	INITIAL_IMPORT_RELEASE_TAG
		

No conflicts created by this import


***** Bogus filespec: -
***** Bogus filespec: Imported
***** Bogus filespec: sources



From tipaul at users.sourceforge.net  Wed Jun  1 14:51:04 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 01 Jun 2005 05:51:04 -0700
Subject: [Koha-cvs] CVS: koha/C4 AuthoritiesMarc.pm,1.16,1.17
Message-ID: <E1DdSga-0003XG-FJ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13572/C4

Modified Files:
	AuthoritiesMarc.pm 
Log Message:
some fixes & improvements for dictionnary search in librarian interface

Index: AuthoritiesMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/AuthoritiesMarc.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** AuthoritiesMarc.pm	4 May 2005 15:43:43 -0000	1.16
--- AuthoritiesMarc.pm	1 Jun 2005 12:51:02 -0000	1.17
***************
*** 65,73 ****
  	# the marclist may contain "mainentry". In this case, search the tag_to_report, that depends on
  	# the authtypecode. Then, search on $a of this tag_to_report
  	for (my $i=0;$i<$#{$tags};$i++) {
  		if (@$tags[$i] eq "mainentry") {
- 			my $sth = $dbh->prepare("select auth_tag_to_report from auth_types where authtypecode=?");
- 			$sth->execute($authtypecode);
- 			my ($tag_to_report) = $sth->fetchrow;
  			@$tags[$i] = $tag_to_report."a";
  		}
--- 65,76 ----
[...1010 lines suppressed...]
- #
- # Revision 1.6  2004/08/18 16:00:24  tipaul
- # fixes for authorities management
- #
- # Revision 1.5  2004/07/05 13:37:22  doxulting
- # First step for working authorities
- #
- # Revision 1.4  2004/06/22 11:35:37  tipaul
- # removing % at the beginning of a string to avoid loooonnnngggg searchs
- #
- # Revision 1.3  2004/06/17 08:02:13  tipaul
- # merging tag & subfield in auth_word for better perfs
- #
- # Revision 1.2  2004/06/10 08:29:01  tipaul
- # MARC authority management (continued)
- #
- # Revision 1.1  2004/06/07 07:35:01  tipaul
- # MARC authority management package
- #
--- 968,969 ----




From tipaul at users.sourceforge.net  Wed Jun  1 14:51:04 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 01 Jun 2005 05:51:04 -0700
Subject: [Koha-cvs] CVS: koha/search.marc dictionary.pl,1.5,1.6
Message-ID: <E1DdSga-0003XT-L0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13572/search.marc

Modified Files:
	dictionary.pl 
Log Message:
some fixes & improvements for dictionnary search in librarian interface

Index: dictionary.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.marc/dictionary.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** dictionary.pl	4 May 2005 12:46:27 -0000	1.5
--- dictionary.pl	1 Jun 2005 12:51:02 -0000	1.6
***************
*** 31,34 ****
--- 31,52 ----
  use HTML::Template;
  
+ =head1 NAME
+ 
+ dictionnary.pl : script to search in biblio & authority an existing value
+ 
+ =head1 SYNOPSIS
+ 
+ useful when the user want to search a term before running a query. For example, to see if "computer" is used in the database
+ 
+ The parameter "marclist" tells which field is searched (title, author, subject, but could be anything else)
+ 
+ This script searches in both biblios & authority
+ * in biblio, the script search in all marc fields related to what the user is looking for (for example, if the dictionnary is used on "author", the script searches in biblio.author, but also in additional authors & any MARC field related to author (through the "seealso" MARC constraint)
+ * in authority, the script search everywhere. Thus, the accepted & rejected forms are found.
+ 
+ The script shows all results & the user can choose what he want, that is copied into search form.
+ 
+ =cut
+ 
  my $input = new CGI;
  my $field =$input->param('marclist');
***************
*** 39,45 ****
  #my $kohafield = $input->param('kohafield');
  my @search = $input->param('search');
! warn " ".$search[0];
  my $index = $input->param('index');
! warn " index: ".$index;
  my $op=$input->param('op');
  if (($search[0]) and not ($op eq 'do_search')){
--- 57,63 ----
  #my $kohafield = $input->param('kohafield');
  my @search = $input->param('search');
! # warn " ".$search[0];
  my $index = $input->param('index');
! # warn " index: ".$index;
  my $op=$input->param('op');
  if (($search[0]) and not ($op eq 'do_search')){
***************
*** 64,75 ****
  
  if ($op eq "do_search") {
! 	($template, $loggedinuser, $cookie)
! 			= get_template_and_user({template_name => "search.marc/dictionary.tmpl",
! 					query => $input,
! 					type => $type,
! 					authnotrequired => 0,
! 					flagsrequired => {catalogue => 1},
! 					debug => 1,
! 					});
  	my $sth=$dbh->prepare("Select distinct tagfield,tagsubfield from marc_subfield_structure where kohafield = ?");
  	$sth->execute("$field");
--- 82,88 ----
  
  if ($op eq "do_search") {
! 	#
! 	# searching in biblio
! 	#
  	my $sth=$dbh->prepare("Select distinct tagfield,tagsubfield from marc_subfield_structure where kohafield = ?");
  	$sth->execute("$field");
***************
*** 85,96 ****
  
  	findseealso($dbh,\@tags);
- #	select distinct m1.bibid from biblio,biblioitems,marc_biblio,marc_word as m1 where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and (m1.word  like 'Paul' and m1.tagsubfield in ('200f','710a','711a','712a','701a','702a','700a')) order by biblio.title
- 
  
  	my @results, my $total;
! # 	my ($results,$total) = catalogsearch($dbh,\@tags ,\@and_or,
! # 										\@excluding, \@operator,  \@value,
! # 										$startfrom*$resultsperpage, $resultsperpage,$orderby);
! 	my $strsth="select distinct subfieldvalue, count(marc_subfield_table.bibid) from marc_subfield_table,marc_word where marc_word.word like ? and marc_subfield_table.bibid=marc_word.bibid and marc_word.tagsubfield in ";
  	my $listtags="(";
  	foreach my $tag (@tags){
--- 98,104 ----
  
  	findseealso($dbh,\@tags);
  
  	my @results, my $total;
! 	my $strsth="select distinct subfieldvalue, count(marc_subfield_table.bibid) from marc_subfield_table,marc_word where marc_word.word like ? and marc_subfield_table.bibid=marc_word.bibid and marc_subfield_table.tagorder=marc_word.tagorder and marc_word.tagsubfield in ";
  	my $listtags="(";
  	foreach my $tag (@tags){
***************
*** 99,107 ****
  	$listtags =~s/,$/)/;
  	$strsth .= $listtags." and marc_word.tagsubfield=marc_subfield_table.tag+marc_subfield_table.subfieldcode group by subfieldvalue ";
! 	warn "".$strsth;
  	my $value = uc($search[0]);
  	$value=~s/\*/%/g;
  	$value.= "%" if not($value=~m/%/);
! 	warn " texte : ".$value;
  
  	$sth=$dbh->prepare($strsth);
--- 107,115 ----
  	$listtags =~s/,$/)/;
  	$strsth .= $listtags." and marc_word.tagsubfield=marc_subfield_table.tag+marc_subfield_table.subfieldcode group by subfieldvalue ";
! # 	warn "search in biblio : ".$strsth;
  	my $value = uc($search[0]);
  	$value=~s/\*/%/g;
  	$value.= "%" if not($value=~m/%/);
! # 	warn " texte : ".$value;
  
  	$sth=$dbh->prepare($strsth);
***************
*** 110,114 ****
  	my @catresults;
  	while (my ($value,$ctresults)=$sth->fetchrow) {
! 		warn "countresults : ".$ctresults;
  		push @catresults,{value=> $value, 
  						  even=>($total-$startfrom*$resultsperpage)%2,
--- 118,122 ----
  	my @catresults;
  	while (my ($value,$ctresults)=$sth->fetchrow) {
! # 		warn "countresults : ".$ctresults;
  		push @catresults,{value=> $value, 
  						  even=>($total-$startfrom*$resultsperpage)%2,
***************
*** 129,136 ****
  	$strsth=~s/ OR$/)/;
  	my $strsth = $strsth." and authtypecode is not NULL";
! 	warn $strsth;
  	my $sth=$dbh->prepare($strsth);
  	$sth->execute;
  	
  	my @authresults;
  	my $authnbresults;
--- 137,147 ----
  	$strsth=~s/ OR$/)/;
  	my $strsth = $strsth." and authtypecode is not NULL";
! # 	warn $strsth;
  	my $sth=$dbh->prepare($strsth);
  	$sth->execute;
  	
+ 	#
+ 	# searching in authorities
+ 	#
  	my @authresults;
  	my $authnbresults;
***************
*** 142,146 ****
  #		warn "auth : $authtypecode nbauthresults : $nbresults";
  	}
!  	
  	($template, $loggedinuser, $cookie)
  		= get_template_and_user({template_name => "search.marc/dictionary.tmpl",
--- 153,160 ----
  #		warn "auth : $authtypecode nbauthresults : $nbresults";
  	}
! 	
! 	# 
! 	# OK, filling the template with authorities & biblio entries found.
! 	#
  	($template, $loggedinuser, $cookie)
  		= get_template_and_user({template_name => "search.marc/dictionary.tmpl",
***************
*** 148,152 ****
  				type => $type,
  				authnotrequired => 0,
- 				flagsrequired => {borrowers => 1},
  				flagsrequired => {catalogue => 1},
  				debug => 1,
--- 162,165 ----




From tipaul at users.sourceforge.net  Wed Jun  1 14:51:04 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 01 Jun 2005 05:51:04 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/search.marc dictionary.tmpl,1.4,1.5 search.tmpl,1.24,1.25
Message-ID: <E1DdSga-0003XR-Jy@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	dictionary.tmpl search.tmpl 
Log Message:
some fixes & improvements for dictionnary search in librarian interface

Index: dictionary.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/dictionary.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** dictionary.tmpl	4 May 2005 12:46:28 -0000	1.4
--- dictionary.tmpl	1 Jun 2005 12:51:02 -0000	1.5
***************
*** 53,59 ****
  
  <!-- TMPL_IF Name=search -->
! 	<div class="bloc100">
! 		<h2 class="catalogue">Dictionary Search results</h2>
! 		<!-- TMPL_IF NAME="authresult" -->
  		<div id="resultnumber">
  			<p><!-- TMPL_IF NAME="displayprev" --> 
--- 53,59 ----
  
  <!-- TMPL_IF Name=search -->
! 	<div class="bloc25">
! 	<h2 class="catalogue">Dictionary Search results</h2>
! 	<!-- TMPL_IF NAME="authresult" -->
  		<div id="resultnumber">
  			<p><!-- TMPL_IF NAME="displayprev" --> 
***************
*** 84,97 ****
  				<tr>
  					<th class="catalogue">Summary</th>
! 					<th class="catalogue">Used</th>
  					<th class="catalogue">Select</th>
  				</tr>
  				<!-- TMPL_LOOP NAME="authresult" -->
  					<tr>
! 						<td><!-- TMPL_VAR NAME="summary" --></td>
! 						<td>
! 							<a href="../search.marc/search.pl?type=intranet&amp;op=do_search&amp;marclist=<!-- TMPL_VAR NAME="biblio_fields" -->&amp;operator==&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;and_or=and&amp;excluding=" class="button catalogue"><!-- TMPL_VAR NAME="used" --> biblio(s)
! 						<td><img src="/images/arrow.gif" width="32" hspace="0" vspace="0" border="0">
  						</td>
  						</td>
  					</tr>
--- 84,113 ----
  				<tr>
  					<th class="catalogue">Summary</th>
! 					<th class="catalogue">Used in</th>
  					<th class="catalogue">Select</th>
  				</tr>
  				<!-- TMPL_LOOP NAME="authresult" -->
  					<tr>
! 						<!-- TMPL_IF NAME="even" -->
! 							<td class="hilighted">
! 						<!-- TMPL_ELSE -->
! 							<td>
! 						<!-- /TMPL_IF -->
! 							<!-- TMPL_VAR NAME="summary" -->
  						</td>
+ 						<!-- TMPL_IF NAME="even" -->
+ 							<td class="hilighted">
+ 						<!-- TMPL_ELSE -->
+ 							<td>
+ 						<!-- /TMPL_IF -->
+ 							<!-- TMPL_VAR NAME="used" --> biblio(s)
+ 						</td>
+ 						<!-- TMPL_IF NAME="even" -->
+ 							<td class="hilighted">
+ 						<!-- TMPL_ELSE -->
+ 							<td>
+ 						<!-- /TMPL_IF -->
+ 							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)" class="button catalogue">select</a>
+ 							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)" class="button catalogue">sel&amp;close</a>
  						</td>
  					</tr>
***************
*** 101,106 ****
  		<!-- TMPL_ELSE -->
  			<h3 class="catalogue">No results in Authorities</h3>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF Name=catresult -->	
  		<div id="resultnumber">
  			<p class="resultcount">
--- 117,124 ----
  		<!-- TMPL_ELSE -->
  			<h3 class="catalogue">No results in Authorities</h3>
! 	<!-- /TMPL_IF -->
! 		
! 		
! 	<!-- TMPL_IF Name=catresult -->	
  		<div id="resultnumber">
  			<p class="resultcount">
***************
*** 114,133 ****
  				<tr>
  					<th class="catalogue">Summary</th>
! 					<th class="catalogue">Biblio Count</th>
  					<th class="catalogue">Select</th>
  				</tr>
  				<!-- TMPL_LOOP NAME="catresult" -->
  				<tr>
! 					<td<!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
  								<!-- TMPL_IF name="MARC_ON" -->
! 									<a class="transparent resultlist" href="search.pl?type=<!-- TMPL_VAR NAME="type" ESCAPE="URL" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE="URL" -->&amp;operator=contains&amp;op=do_search&amp;and_or=and&amp;value='<!-- TMPL_VAR Name=value ESCAPE="URL" -->'&amp;excluding="><!-- TMPL_VAR NAME="value" --></a>
  								<!-- TMPL_ELSE -->
! 									<a class="transparent resultlist" href="search.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="value" --></a>				<!-- /TMPL_IF -->
  					</td>
  					<td align="center" <!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
! 						<!-- TMPL_VAR NAME="count" -->
  					</td>
  					<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
! 							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->)" class="button catalogue">Select</a>
  					</td>
  				</tr>
--- 132,157 ----
  				<tr>
  					<th class="catalogue">Summary</th>
! 					<th class="catalogue">Used in</th>
  					<th class="catalogue">Select</th>
  				</tr>
  				<!-- TMPL_LOOP NAME="catresult" -->
  				<tr>
! 					<!-- TMPL_IF NAME="even" -->
! 					<td class="hilighted">
! 					<!-- TMPL_ELSE -->
! 					<td>
! 					<!-- /TMPL_IF -->
  								<!-- TMPL_IF name="MARC_ON" -->
! 									<!-- TMPL_VAR NAME="value" -->
  								<!-- TMPL_ELSE -->
! 									<!-- TMPL_VAR NAME="value" -->
! 								<!-- /TMPL_IF -->
  					</td>
  					<td align="center" <!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
! 						<!-- TMPL_VAR NAME="count" --> biblio(s)
  					</td>
  					<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
! 							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)" class="button catalogue">Select</a>
! 							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)" class="button catalogue">Sel&amp;close</a>
  					</td>
  				</tr>
***************
*** 156,171 ****
  			</p>
  		</div>
! <script language="JavaScript" type="text/javascript">
! function SelectEntry(myentry, myindex){
! 	if (opener.document.f.value[myindex].value!=""){ 
! 		opener.document.f.value[myindex].value=opener.document.f.value[myindex].value+" "+myentry
! 	} else {
! 		opener.document.f.value[myindex].value=myentry
  	}
! }
! </script>
  	</div>
  <!-- /TMPL_IF -->
- <!-- /TMPL_IF -->
  </div>
  </body>
--- 180,199 ----
  			</p>
  		</div>
! 	<!-- /TMPL_IF -->
! 	<script language="JavaScript" type="text/javascript">
! 	function SelectEntry(myentry, myindex, wclose){
! 		if (opener.document.f.value[myindex].value!=""){ 
! 			opener.document.f.value[myindex].value=opener.document.f.value[myindex].value+" "+myentry
! 		} else {
! 			opener.document.f.value[myindex].value=myentry
! 		}
! 		if (wclose == 1) {
! 	// 	alert("closing")
! 			self.close();
! 		}
  	}
! 	</script>
  	</div>
  <!-- /TMPL_IF -->
  </div>
  </body>

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** search.tmpl	4 May 2005 12:52:34 -0000	1.24
--- search.tmpl	1 Jun 2005 12:51:02 -0000	1.25
***************
*** 17,21 ****
  			<input type="hidden" name="op" value="do_search">
  			<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
! 			<label class="label100" for="keyword">Any word</label>
  			<input type="hidden" name="marclist" value="">
  			<input type="hidden" name="and_or" value="and">
--- 17,21 ----
  			<input type="hidden" name="op" value="do_search">
  			<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
! 			<label for="keyword">Any word</label>
  			<input type="hidden" name="marclist" value="">
  			<input type="hidden" name="and_or" value="and">
***************
*** 25,29 ****
  		</p>
  		<p>
! 			<label class="label100" for="title">Title</label>
  			<input type="hidden" name="marclist" value="biblio.title">
  			<input type="hidden" name="and_or" value="and">
--- 25,29 ----
  		</p>
  		<p>
! 			<label for="title">Title</label>
  			<input type="hidden" name="marclist" value="biblio.title">
  			<input type="hidden" name="and_or" value="and">
***************
*** 31,50 ****
  			<input type="hidden" name="operator" value="contains">
  			<input type="text" name="value" id="title" onchange="sql_update()" size="35">
! 			<a href="javascript:Dopop('dictionary.pl?marclist=biblio.title&amp;type=intranet&amp;index=1',1)">
! 				<img src="/intranet-tmpl/default/en/includes/addressbook_section.png" width=12 height=12 alt="dict">
  			</a>
  		</p>
  		<p>
! 			<label class="label100" for="author">Author</label> <input type="hidden" name="marclist" value="biblio.author">
  			<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" id="author" onchange="sql_update()" size="35">
! 			<a href="javascript:Dopop('dictionary.pl?marclist=biblio.author&amp;type=intranet&amp;index=2',2)">
! 				<img src="/intranet-tmpl/default/en/includes/addressbook_section.png" width=12 height=12 alt="dict">
  			</a>
  		</p>
  		<p>
! 			<label class="label100" for="subject">Subject</label>
  			<input type="hidden" name="marclist" value="bibliosubject.subject">
  			<input type="hidden" name="and_or" value="and">
--- 31,50 ----
  			<input type="hidden" name="operator" value="contains">
  			<input type="text" name="value" id="title" onchange="sql_update()" size="35">
! 			<a href="javascript:Dopop('dictionary.pl?marclist=biblio.title&amp;type=intranet&amp;index=1',1)" class="button catalogue">
! 				...
  			</a>
  		</p>
  		<p>
! 			<label for="author">Author</label> <input type="hidden" name="marclist" value="biblio.author">
  			<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" id="author" onchange="sql_update()" size="35">
! 			<a href="javascript:Dopop('dictionary.pl?marclist=biblio.author&amp;type=intranet&amp;index=2',2)" class="button catalogue">
! 				...
  			</a>
  		</p>
  		<p>
! 			<label for="subject">Subject</label>
  			<input type="hidden" name="marclist" value="bibliosubject.subject">
  			<input type="hidden" name="and_or" value="and">
***************
*** 52,61 ****
  			<input type="hidden" name="operator" value="contains">  
  			<input type="text" name="value" id="subject" onchange="sql_update()" size="35">
! 			<a href="javascript:Dopop('dictionary.pl?marclist=bibliosubject.subject&amp;type=intranet&amp;index=3',3)">
! 				<img src="/intranet-tmpl/default/en/includes/addressbook_section.png" width=12 height=12 alt="dict">
  			</a>
  		</p>
  		<p>
! 			<label class="label100" for="itemtype">Item Type</label>
  			<input type="hidden" name="marclist" value="biblioitems.itemtype">
  			<input type="hidden" name="and_or" value="and">
--- 52,61 ----
  			<input type="hidden" name="operator" value="contains">  
  			<input type="text" name="value" id="subject" onchange="sql_update()" size="35">
! 			<a href="javascript:Dopop('dictionary.pl?marclist=bibliosubject.subject&amp;type=intranet&amp;index=3',3)" class="button catalogue">
! 				...
  			</a>
  		</p>
  		<p>
! 			<label for="itemtype">Item Type</label>
  			<input type="hidden" name="marclist" value="biblioitems.itemtype">
  			<input type="hidden" name="and_or" value="and">
***************
*** 65,69 ****
  		</p>
  		<p>
! 				<label class="label100" for="branch">Branch</label>
  				<input type="hidden" name="marclist" value="items.holdingbranch">
  				<input type="hidden" name="and_or" value="and">
--- 65,69 ----
  		</p>
  		<p>
! 				<label for="branch">Branch</label>
  				<input type="hidden" name="marclist" value="items.holdingbranch">
  				<input type="hidden" name="and_or" value="and">
***************
*** 76,80 ****
  		<h2 class="catalogue">Other options</h2>
  		<p>
! 				<label class="label100" for="barcode">Item barcode</label>
  				<input type="hidden" name="marclist" value="items.barcode">
  				<input type="hidden" name="and_or" value="and">
--- 76,80 ----
  		<h2 class="catalogue">Other options</h2>
  		<p>
! 				<label for="barcode">Item barcode</label>
  				<input type="hidden" name="marclist" value="items.barcode">
  				<input type="hidden" name="and_or" value="and">
***************
*** 84,88 ****
  		</p>
  		<p>
! 			<label class="label100" for="callno">Call Number</label>
  			<input type="hidden" name="marclist" value="items.itemcallnumber">
  			<input type="hidden" name="and_or" value="and">
--- 84,88 ----
  		</p>
  		<p>
! 			<label for="callno">Call Number</label>
  			<input type="hidden" name="marclist" value="items.itemcallnumber">
  			<input type="hidden" name="and_or" value="and">
***************
*** 92,96 ****
  		</p>
  		<p>
! 			<label class="label100" for="isbn">ISBN</label>
  			<input type="hidden" name="marclist" value="biblioitems.isbn">
  			<input type="hidden" name="and_or" value="and">
--- 92,96 ----
  		</p>
  		<p>
! 			<label for="isbn">ISBN</label>
  			<input type="hidden" name="marclist" value="biblioitems.isbn">
  			<input type="hidden" name="and_or" value="and">
***************
*** 100,104 ****
  		</p>
  		<p>
! 			<label class="label100" for="publisher">Publisher</label>
  			<input type="hidden" name="marclist" value="biblioitems.publishercode">
  			<input type="hidden" name="and_or" value="and">
--- 100,104 ----
  		</p>
  		<p>
! 			<label for="publisher">Publisher</label>
  			<input type="hidden" name="marclist" value="biblioitems.publishercode">
  			<input type="hidden" name="and_or" value="and">
***************
*** 160,164 ****
  		<p>
  			<input type="submit" value="Start search" class="button catalogue">
! 			<a href="/cgi-bin/koha/search.marc/suggest.pl" onclick="PopupSuggestion(); return false;" class="button catalogue">Suggestions</a>
  		</p>
  	</div>
--- 160,164 ----
  		<p>
  			<input type="submit" value="Start search" class="button catalogue">
! 			<a href="/cgi-bin/koha/search.marc/suggest.pl" onclick="PopupSuggestion(); return false;" class="button catalogue">Spelling suggestion</a>
  		</p>
  	</div>
***************
*** 188,192 ****
  function Dopop(link,i) {
  	var searchstring=document.forms[0].value[i].value;
! 	newin=window.open(link+'&amp;search='+searchstring,"popup",'width=550,height=550,toolbar=false,scrollbars=yes');
  }
  
--- 188,192 ----
  function Dopop(link,i) {
  	var searchstring=document.forms[0].value[i].value;
! 	newin=window.open(link+'&amp;search='+searchstring,"popup",'width=700,height=550,toolbar=false,scrollbars=yes');
  }
  




From btoumi at users.sourceforge.net  Wed Jun  1 15:16:01 2005
From: btoumi at users.sourceforge.net (btoumi)
Date: Wed, 01 Jun 2005 06:16:01 -0700
Subject: [Koha-cvs] CVS: koha - Imported sources
Message-ID: <E1DdT4j-0006kH-AH@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25891

Log Message:
koha cvs

Status:

Vendor Tag:	INITIAL_IMPORT_VENDOR_TAG
Release Tags:	INITIAL_IMPORT_RELEASE_TAG
		

No conflicts created by this import


***** Bogus filespec: -
***** Bogus filespec: Imported
***** Bogus filespec: sources



From hdl at users.sourceforge.net  Wed Jun  1 15:22:09 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 01 Jun 2005 06:22:09 -0700
Subject: [Koha-cvs] CVS: koha/admin marctagstructure.pl,1.25.2.2,1.25.2.3
Message-ID: <E1DdTAf-0007hG-Jt@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29405/admin

Modified Files:
      Tag: rel_2_2
	marctagstructure.pl 
Log Message:
Bug Fixing : Ugly display 
Non Working Arrows at the bottom of page.

Index: marctagstructure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marctagstructure.pl,v
retrieving revision 1.25.2.2
retrieving revision 1.25.2.3
diff -C2 -r1.25.2.2 -r1.25.2.3
*** marctagstructure.pl	31 May 2005 21:06:18 -0000	1.25.2.2
--- marctagstructure.pl	1 Jun 2005 13:22:07 -0000	1.25.2.3
***************
*** 219,222 ****
--- 219,223 ----
  		 $template->param(searchfield => $searchfield);
  	}
+ 	my $cnt=0;
  	if ($dspchoice) {
  		#here, user only wants used tags/subfields displayed
***************
*** 224,228 ****
  		$searchfield=~ s/\'/\\\'/g;
  		my @data=split(' ',$searchfield);
- 		my $count=@data;
  		my $sth=$dbh->prepare("Select marc_tag_structure.tagfield as mts_tagfield,marc_tag_structure.liblibrarian as mts_liblibrarian,marc_tag_structure.libopac as mts_libopac,marc_tag_structure.repeatable as mts_repeatable,marc_tag_structure.mandatory as mts_mandatory,marc_tag_structure.authorised_value as mts_authorized_value,marc_subfield_structure.* from marc_tag_structure LEFT JOIN marc_subfield_structure ON (marc_tag_structure.tagfield=marc_subfield_structure.tagfield AND marc_tag_structure.frameworkcode=marc_subfield_structure.frameworkcode) where (marc_tag_structure.tagfield >= ? and marc_tag_structure.frameworkcode=?) AND marc_subfield_structure.tab>=0 order by marc_tag_structure.tagfield,marc_subfield_structure.tagsubfield");
  		#could be ordoned by tab
--- 225,228 ----
***************
*** 231,234 ****
--- 231,235 ----
  		while (my $data=$sth->fetchrow_hashref){
  			push(@results,$data);
+ 			$cnt++;
  		}
  		$sth->finish;
***************
*** 238,242 ****
  		my $j=1;
  		my $i=$offset;
! 		while ($i < ($offset+$pagesize<scalar(@results)?$offset+$pagesize:scalar(@results))) {
  			if ($toggle eq 0){
  				$toggle=1;
--- 239,243 ----
  		my $j=1;
  		my $i=$offset;
! 		while ($i < ($offset+$pagesize<$cnt?$offset+$pagesize:$cnt)) {
  			if ($toggle eq 0){
  				$toggle=1;
***************
*** 256,260 ****
  			$j=$i;
  			my @internal_loop = ();
! 			while (($results[$i]->{'tagfield'}==$results[$j]->{'tagfield'}) and ($j< ($offset+$pagesize<scalar(@results)?$offset+$pagesize:scalar(@results)))) {
  				if ($toggle eq 0) {
  					$toggle=1;
--- 257,261 ----
  			$j=$i;
  			my @internal_loop = ();
! 			while (($results[$i]->{'tagfield'}==$results[$j]->{'tagfield'}) and ($j< ($offset+$pagesize<$cnt?$offset+$pagesize:$cnt))) {
  				if ($toggle eq 0) {
  					$toggle=1;
***************
*** 274,278 ****
  				$subfield_data{value_builder}= $results[$j]->{'value_builder'};
  				$subfield_data{toggle}	= $toggle;
! 				warn "tagfield :  ".$results[$j]->{'tagfield'}." tagsubfield :".$results[$j]->{'tagsubfield'};
  				push @internal_loop,\%subfield_data;
  				$j++;
--- 275,279 ----
  				$subfield_data{value_builder}= $results[$j]->{'value_builder'};
  				$subfield_data{toggle}	= $toggle;
! # 				warn "tagfield :  ".$results[$j]->{'tagfield'}." tagsubfield :".$results[$j]->{'tagsubfield'};
  				push @internal_loop,\%subfield_data;
  				$j++;
***************
*** 285,306 ****
  		$template->param(select_display => "True",
  						loop => \@loop_data);
- 		if ($offset>0) {
- 			my $prevpage = $offset-$pagesize;
- 			$template->param(isprevpage => $offset,
- 							prevpage=> $prevpage,
- 							searchfield => $searchfield,
- 							script_name => $script_name,
- 							frameworkcode => $frameworkcode,
- 			);
- 		}
- 		if ($offset+$pagesize<$count) {
- 			my $nextpage =$offset+$pagesize;
- 			$template->param(nextpage =>$nextpage,
- 							searchfield => $searchfield,
- 							script_name => $script_name,
- 							frameworkcode => $frameworkcode,
- 			);
- 		}
- 		
  		#  $sth->execute;
  		$sth->finish;
--- 286,289 ----
***************
*** 309,312 ****
--- 292,296 ----
  		my $env;
  		my ($count,$results)=StringSearch($env,$searchfield,$frameworkcode);
+ 		$cnt = $count;
  		my $toggle=0;
  		my @loop_data = ();
***************
*** 330,350 ****
  		}
  		$template->param(loop => \@loop_data);
! 		if ($offset>0) {
! 			my $prevpage = $offset-$pagesize;
! 			$template->param(isprevpage => $offset,
! 							prevpage=> $prevpage,
! 							searchfield => $searchfield,
! 							script_name => $script_name,
! 							frameworkcode => $frameworkcode,
! 			);
! 		}
! 		if ($offset+$pagesize<$count) {
! 			my $nextpage =$offset+$pagesize;
! 			$template->param(nextpage =>$nextpage,
! 							searchfield => $searchfield,
! 							script_name => $script_name,
! 							frameworkcode => $frameworkcode,
! 			);
! 		}
  	}
  } #---- END $OP eq DEFAULT
--- 314,334 ----
  		}
  		$template->param(loop => \@loop_data);
! 	}
! 	if ($offset>0) {
! 		my $prevpage = $offset-$pagesize;
! 		$template->param(isprevpage => $offset,
! 						prevpage=> $prevpage,
! 						searchfield => $searchfield,
! 						script_name => $script_name,
! 						frameworkcode => $frameworkcode,
! 		);
! 	}
! 	if ($offset+$pagesize<$cnt) {
! 		my $nextpage =$offset+$pagesize;
! 		$template->param(nextpage =>$nextpage,
! 						searchfield => $searchfield,
! 						script_name => $script_name,
! 						frameworkcode => $frameworkcode,
! 		);
  	}
  } #---- END $OP eq DEFAULT




From hdl at users.sourceforge.net  Wed Jun  1 15:22:09 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 01 Jun 2005 06:22:09 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marctagstructure.tmpl,1.27.2.3,1.27.2.4
Message-ID: <E1DdTAf-0007hF-K1@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	marctagstructure.tmpl 
Log Message:
Bug Fixing : Ugly display 
Non Working Arrows at the bottom of page.

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.27.2.3
retrieving revision 1.27.2.4
diff -C2 -r1.27.2.3 -r1.27.2.4
*** marctagstructure.tmpl	1 Jun 2005 10:18:24 -0000	1.27.2.3
--- marctagstructure.tmpl	1 Jun 2005 13:22:07 -0000	1.27.2.4
***************
*** 114,226 ****
  <!-- ------------------------------------------------------------------------ -->
  <!-- TMPL_IF NAME="else" -->
! <div id="bloc25">
! <h2 class="parameters">Select a framework</h2>
! <form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 	<select name="frameworkcode">
! 		<option value="">Default</option>
! 	<!-- TMPL_LOOP NAME="frameworkloop" -->
! 		<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="frameworktext" --></option>
! 	<!-- /TMPL_LOOP -->
! 	</select>
! 	<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 	<input type="submit" value="OK" class="button">
! 	<p>
! 	<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True"  OnChange="javascript:document.f.submit()">
! 	</p>
! </form>
! <b>NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script.</b>
! </div>
! <!-- TMPL_IF NAME="select_display" -->
! <div id="bloc100">
! 	<table>
! 	<tr>
! 		<th>Tag</th>
! 		<th>Lib</th>
! 		<th>Repeatable</th>
! 		<th>Mandatory</th>
! 		<th>Authorised<br />value</th>
! 		<th>Subfields</th>
! 		<th>Edit</th>
! 		<th>Delete</th>
! 	<tr>
! 	<!-- TMPL_LOOP NAME="loop" -->
! 	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
! 		<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
! 		<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 		<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 		<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 		<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 	</tr>
! 	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td>
! 			&nbsp;
! 		</td>
! 		<td colspan=7 border=0>
! 			<table colspan=8 border=0>
! 			<!-- TMPL_LOOP NAME="subfields" -->
! 				<tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
! 					<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
! 					<td>
! 						<!-- TMPL_VAR NAME="liblibrarian" -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="repeatable" -->repeatable<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="mandatory" -->Mandatory<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="seealso" -->See<!-- TMPL_ELSE -->&nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="authorised_value" --><!-- TMPL_VAR NAME="authorised_value" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="value_builder" --><!-- TMPL_VAR NAME="value_builder" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						Tab:<!-- TMPL_VAR NAME="tab" -->
! 					</td>
! 					<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 				</tr>
! 			<!-- /TMPL_LOOP -->
! 			</table>
! 		</td>
! 	</tr>
! 	<!-- /TMPL_LOOP -->
! <!-- TMPL_ELSE -->
! <div id="bloc100">
  	<table>
! 	<tr>
! 		<th>Tag</th>
! 		<th>Lib</th>
! 		<th>Repeatable</th>
! 		<th>Mandatory</th>
! 		<th>Authorised<br />value</th>
! 		<th>Subfields</th>
! 		<th>Edit</th>
! 		<th>Delete</th>
! 	</tr>
! 	<!-- TMPL_LOOP NAME="loop" -->
! 	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
! 		<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
! 		<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 		<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 		<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 		<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 	</tr>
! 	<!-- /TMPL_LOOP -->
  	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<input type="hidden" name="op" value="add_form">
--- 114,215 ----
  <!-- ------------------------------------------------------------------------ -->
  <!-- TMPL_IF NAME="else" -->
! 	<div id="bloc25">
! 	<h2 class="parameters">Select a framework</h2>
! 	<form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 		<select name="frameworkcode">
! 			<option value="">Default</option>
! 		<!-- TMPL_LOOP NAME="frameworkloop" -->
! 			<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="frameworktext" --></option>
! 		<!-- /TMPL_LOOP -->
! 		</select>
! 		<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 		<input type="submit" value="OK" class="button">
! 		<p>
! 		<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True" <!-- TMPL_IF Name="select_display"-->checked<!--/TMPL_IF -->  OnChange="javascript:document.f.submit()">
! 		</p>
! 	</form>
! 	<b>NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script.</b>
! 	</div>
! 	<div id="bloc100">
  	<table>
! 		<tr>
! 			<th>Tag</th>
! 			<th>Lib</th>
! 			<th>Repeatable</th>
! 			<th>Mandatory</th>
! 			<th>Authorised<br />value</th>
! 			<th>Subfields</th>
! 			<th>Edit</th>
! 			<th>Delete</th>
! 		<tr>
! 	<!-- TMPL_IF NAME="select_display" -->
! 		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
! 			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
! 			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
! 			<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 			<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 		</tr>
! 		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 			<td>
! 				&nbsp;
! 			</td>
! 			<td colspan=7 border=0>
! 				<table colspan=8 border=0>
! 				<!-- TMPL_LOOP NAME="subfields" -->
! 					<tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
! 						<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
! 						<td>
! 							<!-- TMPL_VAR NAME="liblibrarian" -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="repeatable" -->repeatable<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="mandatory" -->Mandatory<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="seealso" -->See<!-- TMPL_ELSE -->&nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="authorised_value" --><!-- TMPL_VAR NAME="authorised_value" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="value_builder" --><!-- TMPL_VAR NAME="value_builder" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							Tab:<!-- TMPL_VAR NAME="tab" -->
! 						</td>
! 						<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 					</tr>
! 				<!-- /TMPL_LOOP -->
! 				</table>
! 			</td>
! 		</tr>
! 		<!-- /TMPL_LOOP -->
! 	<!-- TMPL_ELSE -->
! 		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
! 			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
! 			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
! 			<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 			<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 		</tr>
! 		<!-- /TMPL_LOOP -->
! 	<!--/TMPL_IF -->
  	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<input type="hidden" name="op" value="add_form">
***************
*** 231,245 ****
  		<input type="submit" class="button" value="Add Tag" title="Add Tag" alt="Add Tag" >
  		<!-- TMPL_IF NAME="isprevpage" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">
  			<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0">
  			</a>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="nextpage" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">
  				<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0">
  			</a>
  		<!-- /TMPL_IF -->
! <!--/TMPL_IF -->
! 	</form>
  <script language="javascript" type="text/javascript">
  	function ChangeDisplay(checkbox) {
--- 220,233 ----
  		<input type="submit" class="button" value="Add Tag" title="Add Tag" alt="Add Tag" >
  		<!-- TMPL_IF NAME="isprevpage" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">
  			<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0">
  			</a>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="nextpage" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">
  				<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0">
  			</a>
  		<!-- /TMPL_IF -->
! </form>
  <script language="javascript" type="text/javascript">
  	function ChangeDisplay(checkbox) {




From tipaul at users.sourceforge.net  Wed Jun  1 15:52:08 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 01 Jun 2005 06:52:08 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marctagstructure.tmpl,1.27.2.4,1.27.2.5
Message-ID: <E1DdTdg-0003dR-3Z@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	marctagstructure.tmpl 
Log Message:
some graphic improvements

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.27.2.4
retrieving revision 1.27.2.5
diff -C2 -r1.27.2.4 -r1.27.2.5
*** marctagstructure.tmpl	1 Jun 2005 13:22:07 -0000	1.27.2.4
--- marctagstructure.tmpl	1 Jun 2005 13:52:05 -0000	1.27.2.5
***************
*** 145,149 ****
  	<!-- TMPL_IF NAME="select_display" -->
  		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
  			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
  			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
--- 145,149 ----
  	<!-- TMPL_IF NAME="select_display" -->
  		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr class="hilighted">
  			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
  			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
***************
*** 160,198 ****
  			</td>
  			<td colspan=7 border=0>
- 				<table colspan=8 border=0>
  				<!-- TMPL_LOOP NAME="subfields" -->
! 					<tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
! 						<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
! 						<td>
  							<!-- TMPL_VAR NAME="liblibrarian" -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="repeatable" -->repeatable<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="mandatory" -->Mandatory<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="seealso" -->See<!-- TMPL_ELSE -->&nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="authorised_value" --><!-- TMPL_VAR NAME="authorised_value" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="value_builder" --><!-- TMPL_VAR NAME="value_builder" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							Tab:<!-- TMPL_VAR NAME="tab" -->
! 						</td>
! 						<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 					</tr>
  				<!-- /TMPL_LOOP -->
- 				</table>
  			</td>
  		</tr>
--- 160,176 ----
  			</td>
  			<td colspan=7 border=0>
  				<!-- TMPL_LOOP NAME="subfields" -->
! 					<p><label>&nbsp;</label>
! 							Tab:<!-- TMPL_VAR NAME="tab" --> | $<!-- TMPL_VAR NAME="tagsubfield" -->
  							<!-- TMPL_VAR NAME="liblibrarian" -->
! 							<!-- TMPL_IF NAME="kohafield" -->,<!-- TMPL_VAR NAME="kohafield" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 							<!-- TMPL_IF NAME="repeatable" -->, repeatable<!-- /TMPL_IF -->
! 							<!-- TMPL_IF NAME="mandatory" -->, Mandatory<!-- /TMPL_IF -->
! 							<!-- TMPL_IF NAME="seealso" -->, See <!-- TMPL_VAR name="seealso" --><!--/TMPL_IF -->
! 							<!-- TMPL_IF NAME="authorised_value" -->, <!-- TMPL_VAR NAME="authorised_value" --><!--/TMPL_IF -->
! 							<!-- TMPL_IF NAME="authtypecode" -->, <!-- TMPL_VAR NAME="authtypecode" --><!--/TMPL_IF -->
! 							<!-- TMPL_IF NAME="value_builder" -->, <!-- TMPL_VAR NAME="value_builder" --><!--/TMPL_IF -->
! 					</p>
  				<!-- /TMPL_LOOP -->
  			</td>
  		</tr>




From hdl at users.sourceforge.net  Wed Jun  1 16:12:14 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 01 Jun 2005 07:12:14 -0700
Subject: [Koha-cvs] CVS: koha/misc overduenotices.pl,1.1.4.2,1.1.4.3
Message-ID: <E1DdTx8-00065l-0W@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23396/misc

Modified Files:
      Tag: rel_2_2
	overduenotices.pl 
Log Message:
Adding Date to messages.
Adding lists of books borrowed with barcode.

One Bug To Fix : use of uninitialized value.


Index: overduenotices.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/overduenotices.pl,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -C2 -r1.1.4.2 -r1.1.4.3
*** overduenotices.pl	28 Apr 2005 10:07:33 -0000	1.1.4.2
--- overduenotices.pl	1 Jun 2005 14:12:10 -0000	1.1.4.3
***************
*** 74,78 ****
  # The following fields are available :
  # <date> <itemcount> <firstname> <lastname> <address1> <address2> <address3> <city> <postcode>
! my $mailtext = "\n\n\nDear library borrower\n\n\n       <date>\n\n       According to our records, you have <itemcount> items that are at\n       least a week overdue for return to the library or renewal.\n       If you have registered a password with the library, you may use it\n       and your library card to login at http://XXX.org\n       to check the status of your account, or you may call any of our branch\n       Please be advised that all library services will be blocked\n       if items are allowed to go more than 30 days overdue.\n\n       Thank you for using your public libraries.\n\n\n                                             <firstname> <lastname>\n                                             <address1>\n                                             <address2>\n                                             <city>  <postcode>\n\n\n\n\n\n";
  #
  # END OF PARAMETERS
--- 74,79 ----
  # The following fields are available :
  # <date> <itemcount> <firstname> <lastname> <address1> <address2> <address3> <city> <postcode>
! my $mailtext = "\n\n\nDear library borrower\n\n\n       <date>\n\n       According to our records, you have <itemcount> items, the description of which follows, that are at\n       least a week overdue for return to the library or renewal:\n		title		author		barcode\n<titles>\n
!        If you have registered a password with the library, you may use it\n       and your library card to login at http://XXX.org\n       to check the status of your account, or you may call any of our branch\n       Please be advised that all library services will be blocked\n       if items are allowed to go more than 30 days overdue.\n\n       Thank you for using your public libraries.\n\n\n                                             <firstname> <lastname>\n                                             <address1>\n                                             <address2>\n                                             <city>  <postcode>\n\n\n\n\n\n";
  #
  # END OF PARAMETERS
***************
*** 85,89 ****
  
  my $dbh = C4::Context->dbh;
! my $sth = $dbh->prepare ("SELECT count(*), issues.borrowernumber,firstname,surname,streetaddress,physstreet,city,zipcode,emailaddress FROM issues,borrowers,categories WHERE returndate IS NULL AND TO_DAYS(NOW())-TO_DAYS(date_due) BETWEEN 0 and 500 AND issues.borrowernumber=borrowers.borrowernumber and borrowers.categorycode=categories.categorycode and categories.overduenoticerequired=1 group by issues.borrowernumber");
  $sth->execute;
  # 
--- 86,92 ----
  
  my $dbh = C4::Context->dbh;
! my $sth = $dbh->prepare ("SELECT COUNT(*), issues.borrowernumber,firstname,surname,streetaddress,physstreet,city,zipcode,emailaddress FROM issues,borrowers,categories WHERE returndate IS NULL AND TO_DAYS(NOW())-TO_DAYS(date_due) BETWEEN 0 and 500 AND issues.borrowernumber=borrowers.borrowernumber and borrowers.categorycode=categories.categorycode and categories.overduenoticerequired=1 group by issues.borrowernumber");
! my $sth2 = $dbh->prepare("SELECT biblio.title,biblio.author,items.barcode FROM issues,items,biblio WHERE items.itemnumber=issues.itemnumber and biblio.biblionumber=items.biblionumber AND issues.borrowernumber=? AND returndate IS NULL AND TO_DAYS(NOW())-TO_DAYS(date_due) BETWEEN 0 and 500");
! 
  $sth->execute;
  # 
***************
*** 92,95 ****
--- 95,99 ----
  my $count = 0;   # to keep track of how many notices are printed
  my $e_count = 0;   # and e-mailed
+ my $date=localtime;
  my ($itemcount,$borrnum,$firstname,$lastname,$address1,$address2,$city,$postcode,$email);
  
***************
*** 103,107 ****
  		$notice =~ s/\<city\>/$city/g;
  		$notice =~ s/\<postcode\>/$postcode/g;
! 	
  	# if not using e-mail notices, comment out the following lines
  		if ($email) {   # or you might check for borrowers.preferredcont 
--- 107,120 ----
  		$notice =~ s/\<city\>/$city/g;
  		$notice =~ s/\<postcode\>/$postcode/g;
! 		$notice =~ s/\<date\>/$date/g;
! 
! 		$sth2->execute($borrnum);
! 		my $titles;
! 		my ($title, $author, $barcode);
! 		while (($title, $author, $barcode) = $sth2->fetchrow){
! 			$titles .= "		$title	$author	$barcode\n";
! 		}
! 		$notice =~ s/\<titles\>/$titles/g;
! 		$sth2->finish;
  	# if not using e-mail notices, comment out the following lines
  		if ($email) {   # or you might check for borrowers.preferredcont 




From hdl at users.sourceforge.net  Wed Jun  1 16:29:38 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 01 Jun 2005 07:29:38 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marctagstructure.tmpl,1.27.2.5,1.27.2.6
Message-ID: <E1DdUDy-0008Rb-OW@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	marctagstructure.tmpl 
Log Message:
Minor display changes

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.27.2.5
retrieving revision 1.27.2.6
diff -C2 -r1.27.2.5 -r1.27.2.6
*** marctagstructure.tmpl	1 Jun 2005 13:52:05 -0000	1.27.2.5
--- marctagstructure.tmpl	1 Jun 2005 14:29:21 -0000	1.27.2.6
***************
*** 163,174 ****
  					<p><label>&nbsp;</label>
  							Tab:<!-- TMPL_VAR NAME="tab" --> | $<!-- TMPL_VAR NAME="tagsubfield" -->
! 							<!-- TMPL_VAR NAME="liblibrarian" -->
! 							<!-- TMPL_IF NAME="kohafield" -->,<!-- TMPL_VAR NAME="kohafield" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 							<!-- TMPL_IF NAME="repeatable" -->, repeatable<!-- /TMPL_IF -->
! 							<!-- TMPL_IF NAME="mandatory" -->, Mandatory<!-- /TMPL_IF -->
! 							<!-- TMPL_IF NAME="seealso" -->, See <!-- TMPL_VAR name="seealso" --><!--/TMPL_IF -->
! 							<!-- TMPL_IF NAME="authorised_value" -->, <!-- TMPL_VAR NAME="authorised_value" --><!--/TMPL_IF -->
! 							<!-- TMPL_IF NAME="authtypecode" -->, <!-- TMPL_VAR NAME="authtypecode" --><!--/TMPL_IF -->
! 							<!-- TMPL_IF NAME="value_builder" -->, <!-- TMPL_VAR NAME="value_builder" --><!--/TMPL_IF -->
  					</p>
  				<!-- /TMPL_LOOP -->
--- 163,167 ----
  					<p><label>&nbsp;</label>
  							Tab:<!-- TMPL_VAR NAME="tab" --> | $<!-- TMPL_VAR NAME="tagsubfield" -->
! 							<!-- TMPL_VAR NAME="liblibrarian" --> <!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!--/TMPL_IF --><!-- TMPL_IF NAME="repeatable" -->, repeatable<!-- /TMPL_IF --><!-- TMPL_IF NAME="mandatory" -->, Mandatory<!-- /TMPL_IF --><!-- TMPL_IF NAME="seealso" -->, See <!-- TMPL_VAR name="seealso" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authorised_value" -->, <!-- TMPL_VAR NAME="authorised_value" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authtypecode" -->, <!-- TMPL_VAR NAME="authtypecode" --><!--/TMPL_IF --><!-- TMPL_IF NAME="value_builder" -->, <!-- TMPL_VAR NAME="value_builder" --><!--/TMPL_IF -->
  					</p>
  				<!-- /TMPL_LOOP -->




From tipaul at users.sourceforge.net  Wed Jun  1 17:54:44 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 01 Jun 2005 08:54:44 -0700
Subject: [Koha-cvs] CVS: koha/misc overduenotices.pl,1.1.4.3,1.1.4.4
Message-ID: <E1DdVYK-0002g1-Dm@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10232/misc

Modified Files:
      Tag: rel_2_2
	overduenotices.pl 
Log Message:
fixing "warning use of uninitialized value in concatenation..."

Index: overduenotices.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/overduenotices.pl,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -C2 -r1.1.4.3 -r1.1.4.4
*** overduenotices.pl	1 Jun 2005 14:12:10 -0000	1.1.4.3
--- overduenotices.pl	1 Jun 2005 15:54:42 -0000	1.1.4.4
***************
*** 110,117 ****
  
  		$sth2->execute($borrnum);
! 		my $titles;
  		my ($title, $author, $barcode);
  		while (($title, $author, $barcode) = $sth2->fetchrow){
! 			$titles .= "		$title	$author	$barcode\n";
  		}
  		$notice =~ s/\<titles\>/$titles/g;
--- 110,117 ----
  
  		$sth2->execute($borrnum);
! 		my $titles="";
  		my ($title, $author, $barcode);
  		while (($title, $author, $barcode) = $sth2->fetchrow){
! 			$titles .= "		".($title?$title:"")."	".($author?$author:"")."	".($barcode?$barcode:"")."\n";
  		}
  		$notice =~ s/\<titles\>/$titles/g;
***************
*** 149,153 ****
  		$notice .= <ODUES>;
  		if ($nomail) {
! 			print "TO => $email\n";
  			print "FROM => $from\n";
  			print "SUBJECT => Koha overdue\n";
--- 149,153 ----
  		$notice .= <ODUES>;
  		if ($nomail) {
! 			print "TO => $email\n" if $email;
  			print "FROM => $from\n";
  			print "SUBJECT => Koha overdue\n";




From tipaul at users.sourceforge.net  Wed Jun  1 20:47:41 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 01 Jun 2005 11:47:41 -0700
Subject: [Koha-cvs] CVS: koha/misc build_marc_Tword.pl,1.1,1.2
Message-ID: <E1DdYFh-0003CN-QO@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12257/misc

Modified Files:
	build_marc_Tword.pl 
Log Message:
new version, doing tag by tag. Should be slower, but requires a lot less memory

Index: build_marc_Tword.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/build_marc_Tword.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** build_marc_Tword.pl	27 May 2005 09:30:24 -0000	1.1
--- build_marc_Tword.pl	1 Jun 2005 18:47:38 -0000	1.2
***************
*** 55,124 ****
  
  # parse every line
! my $query="SELECT biblio.biblionumber,tag,subfieldcode,subfieldvalue,biblio.title FROM marc_subfield_table left join marc_biblio on marc_biblio.bibid=marc_subfield_table.bibid left join biblio on marc_biblio.biblionumber=biblio.biblionumber";
  my $sth=$dbh->prepare($query);
  
! print "******** SELECTING \n";
! $sth->execute;
! print "******** DONE \n";
! $|=1; # flushes output
! 
! my $sthT=$dbh->prepare("select usedin from marc_Tword where tagsubfield=? and word=?");
! my $updateT=$dbh->prepare("update marc_Tword set usedin=? where tagsubfield=? and word=?");
! my $insertT=$dbh->prepare("insert into marc_Tword (tagsubfield,word,usedin) values (?,?,?)");
! my $i=0;
! my $timeneeded;
! # 1st version, slower, but less RAM consumming
! # while (my ($biblionumber, $tag, $subfieldcode, $subfieldvalue, $title) = $sth->fetchrow) {
! # 	next if $ignore_list{"$tag.$subfieldcode"};
! #     $subfieldvalue =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g;
! # 	# remove useless chars in the title.
! #     $title =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g;
! #     my @words = split / /, $subfieldvalue;
! # 	# and retrieve the reversed entry
! # 	foreach my $word (@words) {
! # 		$sthT->execute($tag.$subfieldcode,$word);
! # 		if (my ($usedin) = $sthT->fetchrow) {
! # 			# add the field & save it once again.
! # 			$usedin.=",$biblionumber-$title";
! # 			$updateT->execute($usedin,$tag.$subfieldcode,$word);
! # 		} else {
! # 			$insertT->execute($tag.$subfieldcode,$word,",$title-$biblionumber");
! # 		}
! # 	}
! # 	$timeneeded = gettimeofday - $starttime unless ($i % 100);
! # 	print "$i in $timeneeded s\n" unless ($i % 100);
! # 	print ".";
! # 	$i++;
! # }
! 
! # 2nd version : faster (about 100 times !), bug maybe too much RAM consumming...
! my %largehash;
! print "READING\n";
! while (my ($biblionumber, $tag, $subfieldcode, $subfieldvalue, $title) = $sth->fetchrow) {
! 	next unless $subfieldvalue;
! 	next if $ignore_list{$tag.$subfieldcode};
!     $subfieldvalue =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g;
! 	# remove useless chars in the title.
!     $title =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g;
!     my @words = split / /, $subfieldvalue;
! 	# and retrieve the reversed entry
! 	foreach my $word (@words) {
! 		my $localkey = $tag.$subfieldcode.'|'.uc($word);
! 		$largehash{$localkey}.=",$title-$biblionumber";
  	}
- 	$timeneeded = gettimeofday - $starttime unless ($i % 30000);
- 	print "$i in $timeneeded s\n" unless ($i % 30000);
- 	print "." unless ($i % 500);
- 	$i++;
- }
- $i=0;
- print "WRITING\n";
- foreach my $k (keys %largehash) {
- 	$k =~ /(.*)\|(.*)/;
- 	$insertT->execute($1,$2,$largehash{$k});
- 	$timeneeded = gettimeofday - $starttime unless ($i % 30000);
- 	print "$i in $timeneeded s\n" unless ($i % 30000);
- 	print "." unless ($i % 500);
- 	$i++;
  }
  
--- 55,126 ----
  
  # parse every line
! my $query="SELECT biblio.biblionumber,tag,subfieldcode,subfieldvalue,biblio.title FROM marc_subfield_table left join marc_biblio on marc_biblio.bibid=marc_subfield_table.bibid left join biblio on marc_biblio.biblionumber=biblio.biblionumber and tag=?";
  my $sth=$dbh->prepare($query);
  
! for (my $looptag=0;$looptag<=999;$looptag++) {
! 	print "******** SELECTING ".(sprintf "%03s",$looptag)."\n";
! 	$sth->execute(sprintf "%03s",$looptag);
! 	print "******** DONE \n";
! 	$|=1; # flushes output
! 	
! 	my $sthT=$dbh->prepare("select usedin from marc_Tword where tagsubfield=? and word=?");
! 	my $updateT=$dbh->prepare("update marc_Tword set usedin=? where tagsubfield=? and word=?");
! 	my $insertT=$dbh->prepare("insert into marc_Tword (tagsubfield,word,usedin) values (?,?,?)");
! 	my $i=0;
! 	my $timeneeded;
! 	# 1st version, slower, but less RAM consumming
! 	# while (my ($biblionumber, $tag, $subfieldcode, $subfieldvalue, $title) = $sth->fetchrow) {
! 	# 	next if $ignore_list{"$tag.$subfieldcode"};
! 	#     $subfieldvalue =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g;
! 	# 	# remove useless chars in the title.
! 	#     $title =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g;
! 	#     my @words = split / /, $subfieldvalue;
! 	# 	# and retrieve the reversed entry
! 	# 	foreach my $word (@words) {
! 	# 		$sthT->execute($tag.$subfieldcode,$word);
! 	# 		if (my ($usedin) = $sthT->fetchrow) {
! 	# 			# add the field & save it once again.
! 	# 			$usedin.=",$biblionumber-$title";
! 	# 			$updateT->execute($usedin,$tag.$subfieldcode,$word);
! 	# 		} else {
! 	# 			$insertT->execute($tag.$subfieldcode,$word,",$title-$biblionumber");
! 	# 		}
! 	# 	}
! 	# 	$timeneeded = gettimeofday - $starttime unless ($i % 100);
! 	# 	print "$i in $timeneeded s\n" unless ($i % 100);
! 	# 	print ".";
! 	# 	$i++;
! 	# }
! 	
! 	# 2nd version : faster (about 100 times !), bug maybe too much RAM consumming...
! 	my %largehash;
! 	print "READING\n";
! 	while (my ($biblionumber, $tag, $subfieldcode, $subfieldvalue, $title) = $sth->fetchrow) {
! 		next unless $subfieldvalue;
! 		next if $ignore_list{$tag.$subfieldcode};
! 		$subfieldvalue =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g if $subfieldvalue;
! 		# remove useless chars in the title.
! 		$title =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g if $title;
! 		my @words = split / /, $subfieldvalue;
! 		# and retrieve the reversed entry
! 		foreach my $word (@words) {
! 			my $localkey = $tag.$subfieldcode.'|'.uc($word);
! 			$largehash{$localkey}.=",".substr($title,0,15)."-$biblionumber";
! 		}
! 		$timeneeded = gettimeofday - $starttime unless ($i % 30000);
! 		print "$i in $timeneeded s\n" unless ($i % 30000);
! 		print "." unless ($i % 500);
! 		$i++;
! 	}
! 	$i=0;
! 	print "WRITING\n";
! 	foreach my $k (keys %largehash) {
! 		$k =~ /(.*)\|(.*)/;
! 		$insertT->execute($1,$2,$largehash{$k});
! 		$timeneeded = gettimeofday - $starttime unless ($i % 30000);
! 		print "$i in $timeneeded s\n" unless ($i % 30000);
! 		print "." unless ($i % 500);
! 		$i++;
  	}
  }
  




From tipaul at users.sourceforge.net  Wed Jun  1 20:55:10 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 01 Jun 2005 11:55:10 -0700
Subject: [Koha-cvs] CVS: koha/misc build_marc_Tword.pl,1.2,1.3
Message-ID: <E1DdYMw-0004C7-TL@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16069/misc

Modified Files:
	build_marc_Tword.pl 
Log Message:
new version, doing tag by tag. Should be slower, but requires a lot less memory

Index: build_marc_Tword.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/build_marc_Tword.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** build_marc_Tword.pl	1 Jun 2005 18:47:38 -0000	1.2
--- build_marc_Tword.pl	1 Jun 2005 18:55:08 -0000	1.3
***************
*** 55,59 ****
  
  # parse every line
! my $query="SELECT biblio.biblionumber,tag,subfieldcode,subfieldvalue,biblio.title FROM marc_subfield_table left join marc_biblio on marc_biblio.bibid=marc_subfield_table.bibid left join biblio on marc_biblio.biblionumber=biblio.biblionumber and tag=?";
  my $sth=$dbh->prepare($query);
  
--- 55,59 ----
  
  # parse every line
! my $query="SELECT biblio.biblionumber,tag,subfieldcode,subfieldvalue,biblio.title FROM marc_subfield_table left join marc_biblio on marc_biblio.bibid=marc_subfield_table.bibid left join biblio on marc_biblio.biblionumber=biblio.biblionumber where tag=?";
  my $sth=$dbh->prepare($query);
  
***************
*** 95,99 ****
  	# 2nd version : faster (about 100 times !), bug maybe too much RAM consumming...
  	my %largehash;
! 	print "READING\n";
  	while (my ($biblionumber, $tag, $subfieldcode, $subfieldvalue, $title) = $sth->fetchrow) {
  		next unless $subfieldvalue;
--- 95,101 ----
  	# 2nd version : faster (about 100 times !), bug maybe too much RAM consumming...
  	my %largehash;
! # 	print "READING\n";
! 	$timeneeded = gettimeofday - $starttime unless ($i % 30000);
! 	print "READING $timeneeded s\n";
  	while (my ($biblionumber, $tag, $subfieldcode, $subfieldvalue, $title) = $sth->fetchrow) {
  		next unless $subfieldvalue;




From hdl at users.sourceforge.net  Wed Jun  1 21:55:56 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 01 Jun 2005 12:55:56 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-sendbasket.pl,1.4.2.1,1.4.2.2
Message-ID: <E1DdZJk-0004HK-0I@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16396/opac

Modified Files:
      Tag: rel_2_2
	opac-sendbasket.pl 
Log Message:
Sending basket in OPAC with joined iso2709 biblios 

Index: opac-sendbasket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-sendbasket.pl,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** opac-sendbasket.pl	25 Mar 2005 17:04:28 -0000	1.4.2.1
--- opac-sendbasket.pl	1 Jun 2005 19:55:53 -0000	1.4.2.2
***************
*** 8,11 ****
--- 8,12 ----
  
  use C4::Search;
+ use C4::Biblio;
  use C4::Auth;
  use C4::Interface::CGI::Output;
***************
*** 25,28 ****
--- 26,33 ----
  my $email_add=$query->param('email_add');
  my $email_sender=$query->param('email_sender');
+ my $dbh=C4::Context->dbh;
+ my $sth;
+ $sth=$dbh->prepare("select bibid from marc_biblio where biblionumber=? order by bibid");
+ 
  
  if ($email_add) {
***************
*** 57,60 ****
--- 62,67 ----
  		$dat->{'biblionumber'} = $biblionumber;
  		$dat->{ITEM_RESULTS} = \@items;
+ 		$sth->execute($biblionumber);
+ 		my ($bibid) = $sth->fetchrow;
  		my $record = MARCgetbiblio($dbh,$bibid);
  		$iso2709 .= $record->as_usmarc();




From hdl at users.sourceforge.net  Wed Jun  1 22:05:43 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 01 Jun 2005 13:05:43 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-serial-issues.pl,1.1.2.3,1.1.2.4
Message-ID: <E1DdZTD-0005WW-FV@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21196/opac

Modified Files:
      Tag: rel_2_2
	opac-serial-issues.pl 
Log Message:
FIXING : Bug line 37 missing comma

Index: opac-serial-issues.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-serial-issues.pl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** opac-serial-issues.pl	25 Mar 2005 17:04:28 -0000	1.1.2.3
--- opac-serial-issues.pl	1 Jun 2005 20:05:41 -0000	1.1.2.4
***************
*** 34,38 ****
  $template->param(
  	biblionumber => $query->param('biblionumber'),
! 	subscription_LOOP => $subscriptions
  	suggestion => C4::Context->preference("suggestion"),
  	virtualshelves => C4::Context->preference("virtualshelves"),
--- 34,38 ----
  $template->param(
  	biblionumber => $query->param('biblionumber'),
! 	subscription_LOOP => $subscriptions,
  	suggestion => C4::Context->preference("suggestion"),
  	virtualshelves => C4::Context->preference("virtualshelves"),




From genjimoto at users.sourceforge.net  Wed Jun  1 22:44:07 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 13:44:07 -0700
Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.118,1.119
Message-ID: <E1Dda4N-0002ZF-J3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9798

Modified Files:
	Biblio.pm 
Log Message:
patch from Genji (Waylon R.) to update subjects in MARC tables when systempref has MARC=OFF

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -r1.118 -r1.119
*** Biblio.pm	4 May 2005 15:40:01 -0000	1.118
--- Biblio.pm	1 Jun 2005 20:43:58 -0000	1.119
***************
*** 2057,2060 ****
--- 2057,2072 ----
      my $dbh = C4::Context->dbh;
      my $error = &OLDmodsubject( $dbh, $bibnum, $force, @subject );
+         if ($error eq ''){
+     # When MARC is off, ensures that the MARC biblio table gets updated with new
+     # subjects, of course, it deletes the biblio in marc, and then recreates.
+     # This check is to ensure that no MARC data exists to lose.
+ 
+         if (C4::Context->preference("MARC") eq '0'){
+             my $MARCRecord = &MARCkoha2marcBiblio($dbh,$bibnum);
+             my $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$bibnum);
+             &MARCmodbiblio($dbh,$bibid, $MARCRecord);
+         }
+ 
+     }
      return ($error);
  }    # sub modsubject
***************
*** 2624,2627 ****
--- 2636,2642 ----
  # $Id$
  # $Log$
+ # Revision 1.119  2005/06/01 20:43:58  genjimoto
+ # patch from Genji (Waylon R.) to update subjects in MARC tables when systempref has MARC=OFF
+ #
  # Revision 1.118  2005/05/04 15:40:01  tipaul
  # synch'ing 2.2 and head




From genjimoto at users.sourceforge.net  Wed Jun  1 23:18:43 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 14:18:43 -0700
Subject: [Koha-cvs] CVS: koha/C4 SearchMarc.pm,1.42,1.43
Message-ID: <E1Ddabr-00077c-Dq@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27333

Modified Files:
	SearchMarc.pm 
Log Message:
New Feature: catalogsearch() has a new parameter, $sqlstring. A developer puts into it whatever they want to tack onto the end of the where statement. See usage in opac-search.pl

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** SearchMarc.pm	4 May 2005 15:40:01 -0000	1.42
--- SearchMarc.pm	1 Jun 2005 21:18:39 -0000	1.43
***************
*** 100,104 ****
  }
  
! =head1  my ($count, @results) = catalogsearch($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby);
  
  =head2 $dbh is a link to the DB handler.
--- 100,104 ----
  }
  
! =head1  my ($count, @results) = catalogsearch($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby,$sqlstring);
  
  =head2 $dbh is a link to the DB handler.
***************
*** 147,150 ****
--- 147,154 ----
  (for example title, title DESC,...)
  
+ =head2 $sqlstring
+ 
+ optional argument containing an sql string to be used in the 'where' statement. see usage in opac-search.pl.
+ 
  =head2 RETURNS
  
***************
*** 166,170 ****
  
  sub catalogsearch {
! 	my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby,$desc_or_asc) = @_;
  	# build the sql request. She will look like :
  	# select m1.bibid
--- 170,174 ----
  
  sub catalogsearch {
! 	my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby,$desc_or_asc,$sqlstring) = @_;
  	# build the sql request. She will look like :
  	# select m1.bibid
***************
*** 273,285 ****
  	# Finds the basic results without the NOT requests
  	my ($sql_tables, $sql_where1, $sql_where2) = create_request($dbh,\@normal_tags, \@normal_and_or, \@normal_operator, \@normal_value);
! 
  	$sql_where1 .= "and TO_DAYS( NOW( ) ) - TO_DAYS( biblio.timestamp ) <30" if $orderby =~ "biblio.timestamp";
  	my $sth;
  	if ($sql_where2) {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc");
! 		warn "Q2 : select distinct m1.bibid from biblio,biblioitems,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc term is  @$value";
  	} else {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc");
! 		warn "Q : select distinct m1.bibid from biblio,biblioitems,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc";
  	}
  	$sth->execute();
--- 277,289 ----
  	# Finds the basic results without the NOT requests
  	my ($sql_tables, $sql_where1, $sql_where2) = create_request($dbh,\@normal_tags, \@normal_and_or, \@normal_operator, \@normal_value);
!   $sql_where1 .=" ". $sqlstring;
  	$sql_where1 .= "and TO_DAYS( NOW( ) ) - TO_DAYS( biblio.timestamp ) <30" if $orderby =~ "biblio.timestamp";
  	my $sth;
  	if ($sql_where2) {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc");
! 		warn "Q2 : select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc term is  @$value";
  	} else {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc");
! 		warn "Q : select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc";
  	}
  	$sth->execute();




From genjimoto at users.sourceforge.net  Wed Jun  1 23:35:08 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 14:35:08 -0700
Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.103,1.104
Message-ID: <E1Ddark-0000xv-7W@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/updater
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3674

Modified Files:
	updatedatabase 
Log Message:
New Feature: catalogsearch() has a new parameter, $sqlstring. A developer puts into it whatever they want to tack onto the end of the where statement. See usage in opac-search.pl

Index: updatedatabase
===================================================================
RCS file: /cvsroot/koha/koha/updater/updatedatabase,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -r1.103 -r1.104
*** updatedatabase	4 May 2005 09:04:52 -0000	1.103
--- updatedatabase	1 Jun 2005 21:35:05 -0000	1.104
***************
*** 13,17 ****
  
  # NOTE:  If you do something more than once in here, make it table driven.
! 
  use strict;
  
--- 13,17 ----
  
  # NOTE:  If you do something more than once in here, make it table driven.
! use lib "/usr/koha200pre2/modules";
  use strict;
  
***************
*** 369,372 ****
--- 369,387 ----
  							KEY biblionumber (biblionumber)
  						)",
+     categorytable       => "(categorycode char(5) NOT NULL default '',
+                              description text default '',
+                              itemtypecodes text default '',
+                              PRIMARY KEY (categorycode)
+                             )",
+     subcategorytable       => "(subcategorycode char(5) NOT NULL default '',
+                              description text default '',
+                              itemtypecodes text default '',
+                              PRIMARY KEY (subcategorycode)
+                             )",
+     mediatypetable       => "(mediatypecode char(5) NOT NULL default '',
+                              description text default '',
+                              itemtypecodes text default '',
+                              PRIMARY KEY (mediatypecode)
+                             )",
  );
  
***************
*** 1433,1436 ****
--- 1448,1454 ----
  
  # $Log$
+ # Revision 1.104  2005/06/01 21:35:05  genjimoto
+ # New Feature: catalogsearch() has a new parameter, $sqlstring. A developer puts into it whatever they want to tack onto the end of the where statement. See usage in opac-search.pl
+ #
  # Revision 1.103  2005/05/04 09:04:52  tipaul
  # synch'ing 2.2 and head




From genjimoto at users.sourceforge.net  Wed Jun  1 23:41:05 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 14:41:05 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters admin-home.tmpl,1.35,1.36
Message-ID: <E1DdaxV-0001dZ-MS@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	admin-home.tmpl 
Log Message:
New links to three new table editors: Categorytable, subcategorytable and mediatypetable.

Index: admin-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** admin-home.tmpl	23 Mar 2005 09:26:48 -0000	1.35
--- admin-home.tmpl	1 Jun 2005 21:41:03 -0000	1.36
***************
*** 36,39 ****
--- 36,54 ----
  		</tr>
  
+     <tr>
+       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/itemtypecategory.pl"> Item categories</a></td>
+       <td>Define item categories. (Non-Fiction, Fiction, Non-Fiction and Fiction...)</td>
+     </tr>
+ 
+     <tr>
+       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/itemtypesubcategory.pl"> Item subcategories</a></td>
+       <td>Define item Subcategories. (Junior Fiction, Junior Non fiction.... Adult Fiction.)</td>
+     </tr>
+ 
+     <tr>
+       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/mediatype.pl"> Item mediatypes</a></td>
+       <td>Define item mediatypes. (CD, Video, Book, Game...)</td>
+     </tr>
+ 
  		<tr>
  			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/categorie.pl">Borrower categories</a></td>




From genjimoto at users.sourceforge.net  Thu Jun  2 00:20:19 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 15:20:19 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-searchresults.tmpl,1.22,1.23
Message-ID: <E1DdbZT-0006jl-6p@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac-searchresults.tmpl 
Log Message:
New Feature: Search options sidebar. Feature request of Rachel at katipo.

Index: opac-searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** opac-searchresults.tmpl	4 May 2005 08:58:32 -0000	1.22
--- opac-searchresults.tmpl	1 Jun 2005 22:20:16 -0000	1.23
***************
*** 10,14 ****
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
! 
  <!-- <p class="center"><!-- TMPL_VAR NAME="total" --> results found</p> -->
  	<div id="resultnumber">
--- 10,16 ----
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
! <table width="100%">
! <tr>
! <td width="70%">
  <!-- <p class="center"><!-- TMPL_VAR NAME="total" --> results found</p> -->
  	<div id="resultnumber">
***************
*** 125,128 ****
--- 127,189 ----
  	</table>
  </form>
+ </td>
+ <td width="30%">
+ <!-- fancy writing --> Search options<br>
+ 
+ <!-- TMPL_VAR NAME="searchdesc" -->
+ <br>
+ <!-- TMPL_VAR NAME="total" --> results found.
+ <br>
+ <form name="searchoptions" action="searchoptions.pl" method="get">
+ <input type="hidden" name="nbstatementsori" value="<!-- TMPL_VAR NAME="nbstatements" ESCAPE=HTML-->">
+ <input type="hidden" name="itemtypessearched" value="<!-- TMPL_VAR NAME="itemtypesstring" -->">
+ <input type="hidden" name="orderbyori" value="<!-- TMPL_VAR NAME="orderby" -->">
+ <!-- TMPL_LOOP NAME="searchdata" -->
+ <input type="hidden" name="<!-- TMPL_VAR NAME="term" -->" value="<!-- TMPL_VAR NAME="val" ESCAPE=HTML -->">
+ <!-- /TMPL_LOOP -->
+ <input type="radio" name="searchtype" value="NewSearch"> New Search<br>
+ <input type="radio" name="searchtype" value="SearchWithin" checked> Search Within Results<br>
+ <br>
+ Select a category<br>
+ <input type="checkbox" name="allcategories"> All Categories <br>
+ <!-- TMPL_VAR NAME="categorylist" -->
+ <input type="text" name="keyword"><br>
+ Search using keywords or subject.
+ <input type="submit" value="Quick Search">
+ <br>
+ 
+ Filter by Subcategory<br>
+ <input type="checkbox" name="allsubcategories"> All Subcategories <br>
+ 
+ <select name="subcategorieswanted" size="4" multiple>
+ 
+ <!-- TMPL_VAR NAME="subcategorylist" -->
+ </select><br>
+ 
+ Filter by Media type<br>
+ <input type="checkbox" name="allmediatypes">All Media types<br>
+ <select name="mediatypeswanted" size="4" multiple>
+ <!-- TMPL_VAR NAME="mediatypelist" -->
+ </select><br>
+ 
+ Filter by Item type<br>
+ <input type="checkbox" name="allitemtypes"> All Itemtypes <br>
+ 
+ <select name="itemtypeswanted" size="6" multiple>
+ 
+ <!-- TMPL_VAR NAME="itemtypelist" -->
+ </select><br>
+ 
+ Filter by Branch<br>
+ <input type="checkbox" name="allbranches"> All Branches<br>
+ <select name="brancheswanted" size="6" multiple>
+ <!-- TMPL_VAR NAME="brancheslist" -->
+ </select><br>
+ <input type="checkbox" name="avail"> Only show titles available (Not on loan)<br>
+ <input type="submit" value="Search">
+ </form>
+ </td>
+ </table>
+ 
  	<p class="center">
  		Results <b><i><!-- TMPL_VAR NAME="from" --></i> through <i><!-- TMPL_VAR NAME="to" --></i> of <i><!-- TMPL_VAR NAME="total" --></i></b>




From genjimoto at users.sourceforge.net  Thu Jun  2 01:07:19 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 16:07:19 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-search.pl,1.24,1.25
Message-ID: <E1DdcIx-0004GI-U9@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16344

Modified Files:
	opac-search.pl 
Log Message:
Addition of new table lists: Categorylist, Subcategorylist and Mediatypelist. Renamed classlist to itemtypelist.

Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** opac-search.pl	4 May 2005 09:02:38 -0000	1.24
--- opac-search.pl	1 Jun 2005 23:07:17 -0000	1.25
***************
*** 17,34 ****
  # use C4::Search;
  
- my $classlist='';
  
  my $dbh=C4::Context->dbh;
  my $sth=$dbh->prepare("select description,itemtype from itemtypes order by description");
  $sth->execute;
  while (my ($description,$itemtype) = $sth->fetchrow) {
!     $classlist.="<option value=\"$itemtype\">$description</option>\n";
  }
  
! 
  my $query = new CGI;
  my $op = $query->param("op");
  my $type=$query->param('type');
  
  my $startfrom=$query->param('startfrom');
  $startfrom=0 if(!defined $startfrom);
--- 17,64 ----
  # use C4::Search;
  
  
+ my $itemtypelist;
+ my $brancheslist;
+ my $categorylist;
+ my $subcategorylist;
+ my $mediatypelist;
  my $dbh=C4::Context->dbh;
  my $sth=$dbh->prepare("select description,itemtype from itemtypes order by description");
  $sth->execute;
  while (my ($description,$itemtype) = $sth->fetchrow) {
!     $itemtypelist.="<option value=\"$itemtype\">$description</option>\n";
  }
+ my $sth=$dbh->prepare("select description,subcategorycode from subcategorytable order by description");
+ $sth->execute;
+ while (my ($description,$subcategorycode) = $sth->fetchrow) {
+     $subcategorylist.="<option value=\"$subcategorycode\">$description</option>\n";
+ }
+ my $sth=$dbh->prepare("select description,mediatypecode from mediatypetable order by description");
+ $sth->execute;
+ while (my ($description,$mediatypecode) = $sth->fetchrow) {
+     $mediatypelist.="<option value=\"$mediatypecode\">$description</option>\n";
+ }
+ my $sth=$dbh->prepare("select description,categorycode from categorytable order by description");
+ $sth->execute;
+ while (my ($description,$categorycode) = $sth->fetchrow) {
+     $categorylist .= '<input type="radio" name="categorylist" value="'.$categorycode.'">'.$description.'<br>';
+ }
+ my $sth=$dbh->prepare("select branchname,branchcode from branches order by branchname");
+ $sth->execute;
  
! while (my ($branchname,$branchcode) = $sth->fetchrow) {
!     $brancheslist.="<option value=\"$branchcode\">$branchname</option>\n";
! }
  my $query = new CGI;
  my $op = $query->param("op");
  my $type=$query->param('type');
  
+ my $itemtypesstring=$query->param("itemtypesstring");
+ $itemtypesstring =~s/"//g;
+ my @itemtypes = split ( /\|/, $itemtypesstring);
+ my $branchesstring=$query->param("branchesstring");
+ $branchesstring =~s/"//g;
+ my @branches = split (/\|/, $branchesstring);
+ 
  my $startfrom=$query->param('startfrom');
  $startfrom=0 if(!defined $startfrom);
***************
*** 51,54 ****
--- 81,92 ----
  		}
  	}
+   if ($itemtypesstring ne ''){
+     $searchdesc .= 'filtered by itemtypes ';
+     $searchdesc .= join(" ", at itemtypes)
+   }
+   if ($branchesstring ne ''){
+     $searchdesc .= ' in branches ';
+     $searchdesc .= join(" ", at branches)
+   }
  	$resultsperpage= $query->param('resultsperpage');
  	$resultsperpage = 19 if(!defined $resultsperpage);
***************
*** 71,77 ****
  	}
  	findseealso($dbh,\@tags);
  	my ($results,$total) = catalogsearch($dbh, \@tags,\@and_or,
  										\@excluding, \@operator, \@value,
! 										$startfrom*$resultsperpage, $resultsperpage,$orderby,$desc_or_asc);
  	if ($total ==1) {
  	if (C4::Context->preference("BiblioDefaultView") eq "normal") {
--- 109,145 ----
  	}
  	findseealso($dbh,\@tags);
+     my $sqlstring;
+     if ($itemtypesstring ne ''){
+         $sqlstring = 'and (biblioitems.itemtype IN (';
+         my $itemtypeloop=0;
+         foreach my $itemtype (@itemtypes){
+             if ($itemtype ne ''){
+                 if ($itemtypeloop != 0){
+                     $sqlstring .=','
+                 }
+                 $sqlstring .= '"'.$itemtype.'"';
+                 $itemtypeloop++;
+             }
+         }
+         $sqlstring .= '))'
+     }
+     if ($branchesstring ne ''){
+         $sqlstring .= 'and biblio.biblionumber=items.biblionumber and (items.holdingbranch IN (';
+         my $branchesloop=0;
+         foreach my $branch (@branches){
+             if ($branch ne ''){
+                 if ($branchesloop != 0){
+                     $sqlstring .=','
+                 }
+                 $sqlstring .= '"'.$branch.'"';
+                 $branchesloop++;
+             }
+         }
+         $sqlstring .= '))'
+     }
+ 
  	my ($results,$total) = catalogsearch($dbh, \@tags,\@and_or,
  										\@excluding, \@operator, \@value,
! 										$startfrom*$resultsperpage, $resultsperpage,$orderby,$desc_or_asc,$sqlstring);
  	if ($total ==1) {
  	if (C4::Context->preference("BiblioDefaultView") eq "normal") {
***************
*** 273,276 ****
--- 341,350 ----
  							suggestion => C4::Context->preference("suggestion"),
  							virtualshelves => C4::Context->preference("virtualshelves"),
+                 itemtypelist => $itemtypelist,
+               subcategorylist => $subcategorylist,
+               brancheslist => $brancheslist,
+               categorylist => $categorylist,
+               mediatypelist => $mediatypelist,
+               itemtypesstring => $itemtypesstring,
  							);
  
***************
*** 319,323 ****
  	$sth->finish;
      
! 	$template->param(classlist => $classlist,
  					CGIitemtype => $CGIitemtype,
  					CGIbranch => $CGIbranch,
--- 393,397 ----
  	$sth->finish;
      
! 	$template->param(itemtypelist => $itemtypelist,
  					CGIitemtype => $CGIitemtype,
  					CGIbranch => $CGIbranch,




From genjimoto at users.sourceforge.net  Thu Jun  2 02:48:00 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 17:48:00 -0700
Subject: [Koha-cvs] CVS: koha/opac searchoptions.pl,NONE,1.1
Message-ID: <E1DddsO-0002NV-HI@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9118

Added Files:
	searchoptions.pl 
Log Message:
Processes the Search options sidebar input, and places it into terms and values for opac-search.pl. Also passes along itemtypes to search on, branches to search on, and availablity bool.

--- NEW FILE ---
#!/usr/bin/perl
use strict;
require Exporter;
# Searching within results is done by simply adding on parameters onto the query, being careful to have the requried marclist etc fields.
use C4::Database;
use C4::Interface::CGI::Output;
use C4::Context;
use CGI;
my $query = new CGI;
my $newquery='';
my $allitemtypesbool = $query->param("allitemtypes");
my $allbranchesbool = $query->param("allbranches");
my $allcategoriesbool = $query->param("allcategories");
my $allsubcategoriesbool = $query->param("allsubcategories");
my $allmediatypesbool = $query->param("allmediatypes");
my $nbstatements = $query->param("nbstatementsori");
my $orderby = $query->param("orderbyori");
my @keywords = $query->param("keyword");
my @marclist = $query->param('marclist');
my @and_or = $query->param('and_or');
my @excluding = $query->param('excluding');
my @operator = $query->param('operator');
my @value = $query->param('value');
my $searchtype = $query->param('searchtype');
my $category = $query->param('categorylist');
my @itemtypeswanted = $query->param("itemtypeswanted");
my $itemtypessearched = $query->param("itemtypessearched");
my @mediatypeswanted = $query->param("mediatypeswanted");
my @subcategorieswanted = $query->param("subcategorieswanted");
my @brancheswanted = $query->param("brancheswanted");
my $avail = $query->param("avail");

my $brancheslist;
my $count=0;
my $newquery='';
my $subfoundbool=0;
my $itemtypefoundbool=0;
my $branchfoundbool=0;
my $itemtypeslist;
my $itemtypescatlist;
my $itemtypessubcatlist;
my $mediatypeslist;
$count=0;
my $dbh=C4::Context->dbh;
$newquery='op=do_search&nbstatements='.$nbstatements;
if ($allcategoriesbool eq '' && $category ne ''){

    my $sth=$dbh->prepare("select itemtypecodes from categorytable where categorycode=?");
    $sth->execute($category);
    $itemtypescatlist = $sth->fetchrow .'|';
    $sth->finish;
}
if ($allmediatypesbool eq '' && @mediatypeswanted ne ''){
    foreach my $mediatype (@mediatypeswanted){
        my $sth=$dbh->prepare("select itemtypecodes from mediatypetable where mediatypecode=?");
        $sth->execute($mediatype);
        $mediatypeslist .= $sth->fetchrow.'|';
        $sth->finish;

    }
}
if ($allsubcategoriesbool eq '' && @subcategorieswanted ne ''){
    foreach my $subcategory (@subcategorieswanted){
        my $sth=$dbh->prepare("select itemtypecodes from subcategorytable where subcategorycode=?");
        $sth->execute($subcategory);
        $itemtypessubcatlist .= $sth->fetchrow.'|';
        $sth->finish;

    }
}
if ($allitemtypesbool ne ''){
#warn @itemtypeswanted;
$itemtypeslist .=$itemtypescatlist.$itemtypessubcatlist.$mediatypeslist.$itemtypessearched.join ("|", @itemtypeswanted)
} else {
$itemtypeslist .=$itemtypescatlist.$itemtypessubcatlist.$mediatypeslist.$itemtypessearched
}
#warn $itemtypeslist;
if ($allbranchesbool == 0){
   $brancheslist = join("|", at brancheswanted)
}

if ($searchtype eq 'NewSearch'){

     $newquery .= '&marclist=';
     $newquery .= '&and_or=and';
     $newquery .= '&excluding=';
     $newquery .= '&operator=contains';
     $newquery .= '&value=';
     $newquery .=join(" ", at keywords)
} elsif ($searchtype eq 'SearchWithin'){
    foreach my $marclistitem (@marclist) {
         $newquery .= '&marclist='.$marclist[$count];
         $newquery .= '&and_or='.$and_or[$count];
         $newquery .= '&excluding='.$excluding[$count];
         $newquery .= '&operator=';
         $newquery .= $operator[$count];
         $newquery .= '&value='.$value[$count];
         if ($marclist[$count] eq ''){
             if ($subfoundbool=0){
                $subfoundbool=1;
                $newquery .=" ".join(" ", at keywords)
             }
         }
        $count++;

    }
    if ($subfoundbool == 0 && $query->param('keysub') ne ''){
        $newquery .= '&marclist=&and_or=and&excluding=&operator=contains&value=';
        $newquery .=join(" ", at keywords)
    }
}
$newquery .= '&orderby='.$orderby;
if ($itemtypeslist ne ''){
    $newquery .= '&itemtypesstring="'.$itemtypeslist.'"'
}
if ($brancheslist ne ''){
    $newquery .= '&branchesstring="'.$brancheslist.'"';
}
if ($avail ne ''){
    $newquery .= '&avail=1'
}
print $query->redirect("/cgi-bin/koha/opac-search.pl?$newquery");




From genjimoto at users.sourceforge.net  Thu Jun  2 04:37:34 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 19:37:34 -0700
Subject: [Koha-cvs] CVS: koha/admin mediatype.pl,NONE,1.1
Message-ID: <E1DdfaQ-0000s4-K1@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3308

Added Files:
	mediatype.pl 
Log Message:
script to edit the media type table.

--- NEW FILE ---
#!/usr/bin/perl
# NOTE: 4-character tabs

#script to administer the mediatype table
#modified from the itemtype script written 20/02/2002 by paul.poulain at free.fr
#This script written by waylon at robertson.net.nz at 2nd June, 2005

# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)

# ALGO :
# this script use an $op to know what to do.
# if $op is empty or none of the above values,
#	- the default screen is build (with all records, or filtered datas).
#	- the   user can clic on add, modify or delete record.
# if $op=add_form
#	- if primkey exists, this is a modification,so we read the $primkey record
#	- builds the add/modify form
# if $op=add_validate
#	- the user has just send datas, so we create/modify the record
# if $op=delete_form
#	- we show the record having primkey=$primkey and ask for deletion validation form
# if $op=delete_confirm
#	- we delete the record having primkey=$primkey


# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use CGI;
use C4::Context;
use C4::Output;
use C4::Search;
use C4::Auth;
use C4::Interface::CGI::Output;
use HTML::Template;

sub StringSearch  {
	my ($env,$searchstring,$type)=@_;
	my $dbh = C4::Context->dbh;
	$searchstring=~ s/\'/\\\'/g;
	my @data=split(' ',$searchstring);
	my $count=@data;
	my $sth=$dbh->prepare("Select * from mediatypetable where (description like ?) order by mediatypecode");
	$sth->execute("$data[0]%");
	my @results;
	while (my $data=$sth->fetchrow_hashref){
	push(@results,$data);
	}
	#  $sth->execute;
	$sth->finish;
	return (scalar(@results),\@results);
}

my $input = new CGI;
my $searchfield=$input->param('description');
my $offset=$input->param('offset');
my $script_name="/cgi-bin/koha/admin/mediatype.pl";
my $mediatypecode=$input->param('mediatypecode');
my $pagesize=20;
my $op = $input->param('op');
$searchfield=~ s/\,//g;
my ($template, $borrowernumber, $cookie)
    = get_template_and_user({template_name => "parameters/mediatype.tmpl",
			     query => $input,
			     type => "intranet",
			     authnotrequired => 0,
			     flagsrequired => {parameters => 1, management => 1},
			     debug => 1,
			     });

if ($op) {
$template->param(script_name => $script_name,
						$op              => 1); # we show only the TMPL_VAR names $op
} else {
$template->param(script_name => $script_name,
						else              => 1); # we show only the TMPL_VAR names $op
}
################## ADD_FORM ##################################
# called by default. Used to create form to add or  modify a record
if ($op eq 'add_form') {
	#start the page and read in includes
	#---- if primkey exists, it's a modify action, so read values to modify...
	my $data;
    my $itemtypes;
    my $dbh = C4::Context->dbh;
    my @itemtypesselected;
	if ($mediatypecode) {
    	my $sth=$dbh->prepare("select mediatypecode,description,itemtypecodes from mediatypetable where mediatypecode=?");
		$sth->execute($mediatypecode);
		$data=$sth->fetchrow_hashref;
		$sth->finish;
        @itemtypesselected = split ( /\|/, $data->{'itemtypecodes'} );
	}

    my $sth=$dbh->prepare("select description,itemtype from itemtypes order by description");
    $sth->execute;
    while (my ($description,$itemtype) = $sth->fetchrow) {
        $itemtypes .='<td><input type="checkbox" name="itemtypecodes" value="'.$itemtype.'"';
        if(grep /$itemtype/, at itemtypesselected){
            $itemtypes .=' checked';
        }
        $itemtypes .='>'.$description.'</td>';
    }

	$template->param(mediatypecode => $mediatypecode,
							description => $data->{'description'},
                            itemtypes => $itemtypes
							);
;
													# END $OP eq ADD_FORM
################## ADD_VALIDATE ##################################
# called by add_form, used to insert/modify data in DB
} elsif ($op eq 'add_validate') {
	my $dbh = C4::Context->dbh;
    my @itemtypecodesarray = $input->param('itemtypecodes');
    my $itemtypecodes=join('|', at itemtypecodesarray);
	my $sth=$dbh->prepare("replace mediatypetable (mediatypecode,description,itemtypecodes) values (?,?,?)");
	$sth->execute(
		$input->param('mediatypecode'),$input->param('description'),
		$itemtypecodes
        );
	$sth->finish;
	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=mediatype.pl\"></html>";
	exit;
													# END $OP eq ADD_VALIDATE
################## DELETE_CONFIRM ##################################
# called by default form, used to confirm deletion of data in DB
} elsif ($op eq 'delete_confirm') {
	#start the page and read in includes
	my $dbh = C4::Context->dbh;
	my $sth=$dbh->prepare("select mediatypecode,description,itemtypecodes from mediatypetable where mediatypecode=?");
	$sth->execute($mediatypecode);
	my $data=$sth->fetchrow_hashref;
	$sth->finish;

	$template->param(mediatypecode => $mediatypecode,
							description => $data->{'description'},
							itemtypecodes => $data->{'itemtypecodes'});
													# END $OP eq DELETE_CONFIRM
################## DELETE_CONFIRMED ##################################
# called by delete_confirm, used to effectively confirm deletion of data in DB
} elsif ($op eq 'delete_confirmed') {
	#start the page and read in includes
	my $dbh = C4::Context->dbh;
	my $mediatypecode=uc($input->param('mediatypecode'));
	my $sth=$dbh->prepare("delete from mediatypetable where mediatypecode=?");
	$sth->execute($mediatypecode);
	$sth->finish;
	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=mediatype.pl\"></html>";
	exit;
													# END $OP eq DELETE_CONFIRMED
################## DEFAULT ##################################
} else { # DEFAULT
	my $env;
	my ($count,$results)=StringSearch($env,$searchfield,'web');
	my $toggle=0;
	my @loop_data;
	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
		my %row_data;
		if ($toggle eq 0){
			$toggle=1;
		} else {
			$toggle=0;
		}
		$row_data{toggle} = $toggle;
		$row_data{mediatypecode} = $results->[$i]{mediatypecode};
		$row_data{description} = $results->[$i]{description};
		$row_data{itemtypecodes} = $results->[$i]{itemtypecodes};
		push(@loop_data, \%row_data);
	}
	$template->param(loop => \@loop_data);
	if ($offset>0) {
		my $prevpage = $offset-$pagesize;
		$template->param(previous => "$script_name?offset=".$prevpage);
	}
	if ($offset+$pagesize<$count) {
		my $nextpage =$offset+$pagesize;
		$template->param(next => "$script_name?offset=".$nextpage);
	}
} #---- END $OP eq DEFAULT
output_html_with_http_headers $input, $cookie, $template->output;

# Local Variables:
# tab-width: 4
# End:




From genjimoto at users.sourceforge.net  Thu Jun  2 05:08:25 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 20:08:25 -0700
Subject: [Koha-cvs] CVS: koha/admin itemtypecategory.pl,NONE,1.1
Message-ID: <E1Ddg4H-0004qg-1Y@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18598

Added Files:
	itemtypecategory.pl 
Log Message:
script to edit the category table.

--- NEW FILE ---
#!/usr/bin/perl
# NOTE: 4-character tabs

#script to administer the itemtype categories table
#modified from the itemtype script written 20/02/2002 by paul.poulain at free.fr
#This script written by waylon at robertson.net.nz at 2nd June, 2005
# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)

# ALGO :
# this script use an $op to know what to do.
# if $op is empty or none of the above values,
#	- the default screen is build (with all records, or filtered datas).
#	- the   user can clic on add, modify or delete record.
# if $op=add_form
#	- if primkey exists, this is a modification,so we read the $primkey record
#	- builds the add/modify form
# if $op=add_validate
#	- the user has just send datas, so we create/modify the record
# if $op=delete_form
#	- we show the record having primkey=$primkey and ask for deletion validation form
# if $op=delete_confirm
#	- we delete the record having primkey=$primkey


# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use CGI;
use C4::Context;
use C4::Output;
use C4::Search;
use C4::Auth;
use C4::Interface::CGI::Output;
use HTML::Template;

sub StringSearch  {
	my ($env,$searchstring,$type)=@_;
	my $dbh = C4::Context->dbh;
	$searchstring=~ s/\'/\\\'/g;
	my @data=split(' ',$searchstring);
	my $count=@data;
	my $sth=$dbh->prepare("Select * from categorytable where (description like ?) order by categorycode");
	$sth->execute("$data[0]%");
	my @results;
	while (my $data=$sth->fetchrow_hashref){
	push(@results,$data);
	}
	#  $sth->execute;
	$sth->finish;
	return (scalar(@results),\@results);
}

my $input = new CGI;
my $searchfield=$input->param('description');
my $offset=$input->param('offset');
my $script_name="/cgi-bin/koha/admin/itemtypecategory.pl";
my $categorycode=$input->param('categorycode');
my $pagesize=20;
my $op = $input->param('op');
$searchfield=~ s/\,//g;
my ($template, $borrowernumber, $cookie)
    = get_template_and_user({template_name => "parameters/itemtypecategory.tmpl",
			     query => $input,
			     type => "intranet",
			     authnotrequired => 0,
			     flagsrequired => {parameters => 1, management => 1},
			     debug => 1,
			     });

if ($op) {
$template->param(script_name => $script_name,
						$op              => 1); # we show only the TMPL_VAR names $op
} else {
$template->param(script_name => $script_name,
						else              => 1); # we show only the TMPL_VAR names $op
}
################## ADD_FORM ##################################
# called by default. Used to create form to add or  modify a record
if ($op eq 'add_form') {
	#start the page and read in includes
	#---- if primkey exists, it's a modify action, so read values to modify...
	my $data;
    my $itemtypes;
    my $dbh = C4::Context->dbh;
    my @itemtypesselected;
	if ($categorycode) {
    	my $sth=$dbh->prepare("select categorycode,description,itemtypecodes from categorytable where categorycode=?");
		$sth->execute($categorycode);
		$data=$sth->fetchrow_hashref;
		$sth->finish;
        @itemtypesselected = split ( /\|/, $data->{'itemtypecodes'} );
	}

    my $sth=$dbh->prepare("select description,itemtype from itemtypes order by description");
    $sth->execute;
    while (my ($description,$itemtype) = $sth->fetchrow) {
        $itemtypes .='<td><input type="checkbox" name="itemtypecodes" value="'.$itemtype.'"';
        if(grep /$itemtype/, at itemtypesselected){
            $itemtypes .=' checked';
        }
        $itemtypes .='>'.$description.'</td>';
    }

	$template->param(categorycode => $categorycode,
							description => $data->{'description'},
                            itemtypes => $itemtypes
							);
;
													# END $OP eq ADD_FORM
################## ADD_VALIDATE ##################################
# called by add_form, used to insert/modify data in DB
} elsif ($op eq 'add_validate') {
	my $dbh = C4::Context->dbh;
    my @itemtypecodesarray = $input->param('itemtypecodes');
    my $itemtypecodes=join('|', at itemtypecodesarray);
	my $sth=$dbh->prepare("replace categorytable (categorycode,description,itemtypecodes) values (?,?,?)");
	$sth->execute(
		$input->param('categorycode'),$input->param('description'),
		$itemtypecodes
        );
	$sth->finish;
	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=itemtypecategory.pl\"></html>";
	exit;
													# END $OP eq ADD_VALIDATE
################## DELETE_CONFIRM ##################################
# called by default form, used to confirm deletion of data in DB
} elsif ($op eq 'delete_confirm') {
	#start the page and read in includes
	my $dbh = C4::Context->dbh;
	my $sth=$dbh->prepare("select categorycode,description,itemtypecodes from categorytable where categorycode=?");
	$sth->execute($categorycode);
	my $data=$sth->fetchrow_hashref;
	$sth->finish;

	$template->param(categorycode => $categorycode,
							description => $data->{'description'},
							itemtypecodes => $data->{'itemtypecodes'});
													# END $OP eq DELETE_CONFIRM
################## DELETE_CONFIRMED ##################################
# called by delete_confirm, used to effectively confirm deletion of data in DB
} elsif ($op eq 'delete_confirmed') {
	#start the page and read in includes
	my $dbh = C4::Context->dbh;
	my $itemtype=uc($input->param('categorycode'));
	my $sth=$dbh->prepare("delete from categorytable where categorycode=?");
	$sth->execute($itemtype);
	$sth->finish;
	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=itemtypecategory.pl\"></html>";
	exit;
													# END $OP eq DELETE_CONFIRMED
################## DEFAULT ##################################
} else { # DEFAULT
	my $env;
	my ($count,$results)=StringSearch($env,$searchfield,'web');
	my $toggle=0;
	my @loop_data;
	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
		my %row_data;
		if ($toggle eq 0){
			$toggle=1;
		} else {
			$toggle=0;
		}
		$row_data{toggle} = $toggle;
		$row_data{categorycode} = $results->[$i]{categorycode};
		$row_data{description} = $results->[$i]{description};
		$row_data{itemtypecodes} = $results->[$i]{itemtypecodes};
		push(@loop_data, \%row_data);
	}
	$template->param(loop => \@loop_data);
	if ($offset>0) {
		my $prevpage = $offset-$pagesize;
		$template->param(previous => "$script_name?offset=".$prevpage);
	}
	if ($offset+$pagesize<$count) {
		my $nextpage =$offset+$pagesize;
		$template->param(next => "$script_name?offset=".$nextpage);
	}
} #---- END $OP eq DEFAULT
output_html_with_http_headers $input, $cookie, $template->output;

# Local Variables:
# tab-width: 4
# End:




From genjimoto at users.sourceforge.net  Thu Jun  2 05:31:19 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 20:31:19 -0700
Subject: [Koha-cvs] CVS: koha/admin itemtypesubcategory.pl,NONE,1.1
Message-ID: <E1DdgQR-00084o-0J@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30998

Added Files:
	itemtypesubcategory.pl 
Log Message:
script to edit the item subcategory table.

--- NEW FILE ---
#!/usr/bin/perl
# NOTE: 4-character tabs

#script to administer the itemtype subcategories table
#modified from the itemtype script written 20/02/2002 by paul.poulain at free.fr
#This script written by waylon at robertson.net.nz at 2nd June, 2005
# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)

# ALGO :
# this script use an $op to know what to do.
# if $op is empty or none of the above values,
#	- the default screen is build (with all records, or filtered datas).
#	- the   user can clic on add, modify or delete record.
# if $op=add_form
#	- if primkey exists, this is a modification,so we read the $primkey record
#	- builds the add/modify form
# if $op=add_validate
#	- the user has just send datas, so we create/modify the record
# if $op=delete_form
#	- we show the record having primkey=$primkey and ask for deletion validation form
# if $op=delete_confirm
#	- we delete the record having primkey=$primkey


# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use CGI;
use C4::Context;
use C4::Output;
use C4::Search;
use C4::Auth;
use C4::Interface::CGI::Output;
use HTML::Template;

sub StringSearch  {
	my ($env,$searchstring,$type)=@_;
	my $dbh = C4::Context->dbh;
	$searchstring=~ s/\'/\\\'/g;
	my @data=split(' ',$searchstring);
	my $count=@data;
	my $sth=$dbh->prepare("Select * from subcategorytable where (description like ?) order by subcategorycode");
	$sth->execute("$data[0]%");
	my @results;
	while (my $data=$sth->fetchrow_hashref){
	push(@results,$data);
	}
	#  $sth->execute;
	$sth->finish;
	return (scalar(@results),\@results);
}

my $input = new CGI;
my $searchfield=$input->param('description');
my $offset=$input->param('offset');
my $script_name="/cgi-bin/koha/admin/itemtypesubcategory.pl";
my $subcategorycode=$input->param('subcategorycode');
my $pagesize=20;
my $op = $input->param('op');
$searchfield=~ s/\,//g;
my ($template, $borrowernumber, $cookie)
    = get_template_and_user({template_name => "parameters/itemtypesubcategory.tmpl",
			     query => $input,
			     type => "intranet",
			     authnotrequired => 0,
			     flagsrequired => {parameters => 1, management => 1},
			     debug => 1,
			     });

if ($op) {
$template->param(script_name => $script_name,
						$op              => 1); # we show only the TMPL_VAR names $op
} else {
$template->param(script_name => $script_name,
						else              => 1); # we show only the TMPL_VAR names $op
}
################## ADD_FORM ##################################
# called by default. Used to create form to add or  modify a record
if ($op eq 'add_form') {
	#start the page and read in includes
	#---- if primkey exists, it's a modify action, so read values to modify...
	my $data;
    my $itemtypes;
    my $dbh = C4::Context->dbh;
    my @itemtypesselected;
	if ($subcategorycode) {
    	my $sth=$dbh->prepare("select subcategorycode,description,itemtypecodes from subcategorytable where subcategorycode=?");
		$sth->execute($subcategorycode);
		$data=$sth->fetchrow_hashref;
		$sth->finish;
        @itemtypesselected = split ( /\|/, $data->{'itemtypecodes'} );
	}

    my $sth=$dbh->prepare("select description,itemtype from itemtypes order by description");
    $sth->execute;
    while (my ($description,$itemtype) = $sth->fetchrow) {
        $itemtypes .='<td><input type="checkbox" name="itemtypecodes" value="'.$itemtype.'"';
        if(grep /$itemtype/, at itemtypesselected){
            $itemtypes .=' checked';
        }
        $itemtypes .='>'.$description.'</td>';
    }

	$template->param(subcategorycode => $subcategorycode,
							description => $data->{'description'},
                            itemtypes => $itemtypes
							);
;
													# END $OP eq ADD_FORM
################## ADD_VALIDATE ##################################
# called by add_form, used to insert/modify data in DB
} elsif ($op eq 'add_validate') {
	my $dbh = C4::Context->dbh;
    my @itemtypecodesarray = $input->param('itemtypecodes');
    my $itemtypecodes=join('|', at itemtypecodesarray);
	my $sth=$dbh->prepare("replace subcategorytable (subcategorycode,description,itemtypecodes) values (?,?,?)");
	$sth->execute(
		$input->param('subcategorycode'),$input->param('description'),
		$itemtypecodes
        );
	$sth->finish;
	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=itemtypesubcategory.pl\"></html>";
	exit;
													# END $OP eq ADD_VALIDATE
################## DELETE_CONFIRM ##################################
# called by default form, used to confirm deletion of data in DB
} elsif ($op eq 'delete_confirm') {
	#start the page and read in includes
	my $dbh = C4::Context->dbh;
	my $sth=$dbh->prepare("select subcategorycode,description,itemtypecodes from subcategorytable where subcategorycode=?");
	$sth->execute($subcategorycode);
	my $data=$sth->fetchrow_hashref;
	$sth->finish;

	$template->param(subcategorycode => $subcategorycode,
							description => $data->{'description'},
							itemtypecodes => $data->{'itemtypecodes'});
													# END $OP eq DELETE_CONFIRM
################## DELETE_CONFIRMED ##################################
# called by delete_confirm, used to effectively confirm deletion of data in DB
} elsif ($op eq 'delete_confirmed') {
	#start the page and read in includes
	my $dbh = C4::Context->dbh;
	my $subcategorycode=uc($input->param('subcategorycode'));
	my $sth=$dbh->prepare("delete from subcategorytable where subcategorycode=?");
	$sth->execute($subcategorycode);
	$sth->finish;
	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=itemtypesubcategory.pl\"></html>";
	exit;
													# END $OP eq DELETE_CONFIRMED
################## DEFAULT ##################################
} else { # DEFAULT
	my $env;
	my ($count,$results)=StringSearch($env,$searchfield,'web');
	my $toggle=0;
	my @loop_data;
	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
		my %row_data;
		if ($toggle eq 0){
			$toggle=1;
		} else {
			$toggle=0;
		}
		$row_data{toggle} = $toggle;
		$row_data{subcategorycode} = $results->[$i]{subcategorycode};
		$row_data{description} = $results->[$i]{description};
		$row_data{itemtypecodes} = $results->[$i]{itemtypecodes};
		push(@loop_data, \%row_data);
	}
	$template->param(loop => \@loop_data);
	if ($offset>0) {
		my $prevpage = $offset-$pagesize;
		$template->param(previous => "$script_name?offset=".$prevpage);
	}
	if ($offset+$pagesize<$count) {
		my $nextpage =$offset+$pagesize;
		$template->param(next => "$script_name?offset=".$nextpage);
	}
} #---- END $OP eq DEFAULT
output_html_with_http_headers $input, $cookie, $template->output;

# Local Variables:
# tab-width: 4
# End:




From genjimoto at users.sourceforge.net  Thu Jun  2 05:55:28 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 20:55:28 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters itemtypesubcategory.tmpl,NONE,1.1
Message-ID: <E1Ddgno-0002eG-JD@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	itemtypesubcategory.tmpl 
Log Message:
template to edit the item subcategory table.

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->

<script language="javascript" type="text/javascript">
function _(s) { return s } // dummy function for gettext
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNotNull(f,noalert) {
	if (f.value.length ==0) {
		return false;
	}
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function toUC(f) {
	var x=f.value.toUpperCase();
	f.value=x;
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNum(v,maybenull) {
var n = new Number(v.value);
if (isNaN(n)) {
	return false;
	}
if (maybenull==0 && v.value=='') {
	return false;
}
return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isDate(f) {
	var t = Date.parse(f.value);
	if (isNaN(t)) {
		return false;
	}
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function Check(f) {
	var ok=1;
	var _alertString="";
	var alertString2;
	if (f.subcategorycode.value.length==0) {
		_alertString += "\n- " + _("Subcategorycode missing");
	}
	if (!(isNotNull(window.document.Aform.description,1))) {
		_alertString += "\n- " + _("Description missing");
	}
	if (_alertString.length==0) {
		document.Aform.submit();
	} else {
		alertString2  = _("Form not submitted because of the following problem(s)");
		alertString2 += "\n------------------------------------------------------------------------------------\n";
		alertString2 += _alertString;
		alert(alertString2);
	}
}
</script>
<div id="mainbloc">
<!-- TMPL_IF NAME="add_form" -->
	<!-- TMPL_IF NAME="itemtype" -->
		<h1 class="parameters">Modify Subcategory</h1>
	<!-- TMPL_ELSE -->
		<h1 class="parameters">Add Subcategory</h1>
	<!-- /TMPL_IF -->
	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
		<input type="hidden" name="op" value="add_validate">
		<input type="hidden" name="checked" value="0">
			<!-- TMPL_IF NAME="subcategorycode" -->
				<p><label class="label100">Subcategory Code<label><input type="hidden" name="subcategorycode" value="<!-- TMPL_VAR NAME="subcategorycode" -->"><!-- TMPL_VAR NAME="subcategorycode" --></p>
			<!-- TMPL_ELSE -->
				<p><label class="label100">Subcategory Code<label><input type="text" name="subcategorycode" size="6" maxlength="4" onblur="toUC(this)"></p>
			<!-- /TMPL_IF -->
			<p>
				<label class="label100">Description</label>
				<input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="description" escape=HTML -->">
			</p>
			<p>
				<label class="label100">Itemtypes assigned</label>
                <!-- TMPL_VAR NAME="itemtypes" -->

			</p>

			<p>
				<input type="button" value="OK" class="button" onclick="Check(this.form)">
			</p>
	</form>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirm" -->
		<p><label>Subcategory Code</label><!-- TMPL_VAR NAME="subcategorycode" --></p>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="subcategorycode" value="<!-- TMPL_VAR NAME="subcategorycode" -->">
	<p><label>Description</label><!-- TMPL_VAR NAME="description" --></p>
		<p>CONFIRM DELETION</p>
		<p>
			<input type="submit" value="YES" class="button parameters"></form>
			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO" class="button parameters"></form>
		</p>


<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="else" -->
<h1 class="parameters">Subcategory Admin</h1>
<table>
	<tr>
		<th class="parameters">Code</th>
		<th class="parameters">Description</th>
        <th class="parameters">Itemtype codes</th>
		<th class="parameters">Edit</th>
		<th class="parameters">Delete</th>
	</tr>
	<!-- TMPL_LOOP NAME="loop" -->
		<tr>
			<td><!-- TMPL_VAR NAME="subcategorycode" --></td>
			<td><!-- TMPL_VAR NAME="description" --></td>
			<td><!-- TMPL_VAR NAME="itemtypecodes" --></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&subcategorycode=<!-- TMPL_VAR NAME="subcategorycode" escape="HTML" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&subcategorycode=<!-- TMPL_VAR NAME="subcategorycode" escape="HTML" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
		</tr>
	<!-- /TMPL_LOOP -->
</table>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<input type="hidden" name="op" value="add_form">
	<input type="submit" class="button parameters" value="Add Subcategory" title="Add Subcategory" alt="Add Subcategory" >
	<td width="33%"><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->"><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0"></a><!-- /TMPL_IF --></td>
	<td width="33%"><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->"><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0"></a><!-- /TMPL_IF --></td>
</form>
</div>
<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->




From genjimoto at users.sourceforge.net  Thu Jun  2 05:56:01 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 20:56:01 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters mediatype.tmpl,NONE,1.1
Message-ID: <E1DdgoL-0002hl-7b@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	mediatype.tmpl 
Log Message:
template to edit the mediatype table.

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->

<script language="javascript" type="text/javascript">
function _(s) { return s } // dummy function for gettext
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNotNull(f,noalert) {
	if (f.value.length ==0) {
		return false;
	}
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function toUC(f) {
	var x=f.value.toUpperCase();
	f.value=x;
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNum(v,maybenull) {
var n = new Number(v.value);
if (isNaN(n)) {
	return false;
	}
if (maybenull==0 && v.value=='') {
	return false;
}
return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isDate(f) {
	var t = Date.parse(f.value);
	if (isNaN(t)) {
		return false;
	}
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function Check(f) {
	var ok=1;
	var _alertString="";
	var alertString2;
	if (f.mediatypecode.value.length==0) {
		_alertString += "\n- " + _("mediatypecode missing");
	}
	if (!(isNotNull(window.document.Aform.description,1))) {
		_alertString += "\n- " + _("Description missing");
	}
	if (_alertString.length==0) {
		document.Aform.submit();
	} else {
		alertString2  = _("Form not submitted because of the following problem(s)");
		alertString2 += "\n------------------------------------------------------------------------------------\n";
		alertString2 += _alertString;
		alert(alertString2);
	}
}
</script>
<div id="mainbloc">
<!-- TMPL_IF NAME="add_form" -->
	<!-- TMPL_IF NAME="itemtype" -->
		<h1 class="parameters">Modify mediatype</h1>
	<!-- TMPL_ELSE -->
		<h1 class="parameters">Add mediatype</h1>
	<!-- /TMPL_IF -->
	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
		<input type="hidden" name="op" value="add_validate">
		<input type="hidden" name="checked" value="0">
			<!-- TMPL_IF NAME="mediatypecode" -->
				<p><label class="label100">mediatype Code<label><input type="hidden" name="mediatypecode" value="<!-- TMPL_VAR NAME="mediatypecode" -->"><!-- TMPL_VAR NAME="mediatypecode" --></p>
			<!-- TMPL_ELSE -->
				<p><label class="label100">mediatype Code<label><input type="text" name="mediatypecode" size="6" maxlength="4" onblur="toUC(this)"></p>
			<!-- /TMPL_IF -->
			<p>
				<label class="label100">Description</label>
				<input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="description" escape=HTML -->">
			</p>
			<p>
				<label class="label100">Itemtypes assigned</label>
                <!-- TMPL_VAR NAME="itemtypes" -->

			</p>

			<p>
				<input type="button" value="OK" class="button" onclick="Check(this.form)">
			</p>
	</form>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirm" -->
		<p><label>mediatype Code</label><!-- TMPL_VAR NAME="mediatypecode" --></p>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="mediatypecode" value="<!-- TMPL_VAR NAME="mediatypecode" -->">
	<p><label>Description</label><!-- TMPL_VAR NAME="description" --></p>
		<p>CONFIRM DELETION</p>
		<p>
			<input type="submit" value="YES" class="button parameters"></form>
			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO" class="button parameters"></form>
		</p>


<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="else" -->
<h1 class="parameters">mediatype Admin</h1>
<table>
	<tr>
		<th class="parameters">Code</th>
		<th class="parameters">Description</th>
        <th class="parameters">Itemtype codes</th>
		<th class="parameters">Edit</th>
		<th class="parameters">Delete</th>
	</tr>
	<!-- TMPL_LOOP NAME="loop" -->
		<tr>
			<td><!-- TMPL_VAR NAME="mediatypecode" --></td>
			<td><!-- TMPL_VAR NAME="description" --></td>
			<td><!-- TMPL_VAR NAME="itemtypecodes" --></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&mediatypecode=<!-- TMPL_VAR NAME="mediatypecode" escape="HTML" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&mediatypecode=<!-- TMPL_VAR NAME="mediatypecode" escape="HTML" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
		</tr>
	<!-- /TMPL_LOOP -->
</table>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<input type="hidden" name="op" value="add_form">
	<input type="submit" class="button parameters" value="Add mediatype" title="Add mediatype" alt="Add mediatype" >
	<td width="33%"><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->"><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0"></a><!-- /TMPL_IF --></td>
	<td width="33%"><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->"><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0"></a><!-- /TMPL_IF --></td>
</form>
</div>
<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->




From genjimoto at users.sourceforge.net  Thu Jun  2 05:55:04 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 20:55:04 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters itemtypecategory.tmpl,NONE,1.1
Message-ID: <E1DdgnQ-0002Z0-FS@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	itemtypecategory.tmpl 
Log Message:
template to edit the item category table.

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->

<script language="javascript" type="text/javascript">
function _(s) { return s } // dummy function for gettext
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNotNull(f,noalert) {
	if (f.value.length ==0) {
		return false;
	}
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function toUC(f) {
	var x=f.value.toUpperCase();
	f.value=x;
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNum(v,maybenull) {
var n = new Number(v.value);
if (isNaN(n)) {
	return false;
	}
if (maybenull==0 && v.value=='') {
	return false;
}
return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isDate(f) {
	var t = Date.parse(f.value);
	if (isNaN(t)) {
		return false;
	}
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function Check(f) {
	var ok=1;
	var _alertString="";
	var alertString2;
	if (f.categorycode.value.length==0) {
		_alertString += "\n- " + _("Categorycode missing");
	}
	if (!(isNotNull(window.document.Aform.description,1))) {
		_alertString += "\n- " + _("Description missing");
	}
	if (_alertString.length==0) {
		document.Aform.submit();
	} else {
		alertString2  = _("Form not submitted because of the following problem(s)");
		alertString2 += "\n------------------------------------------------------------------------------------\n";
		alertString2 += _alertString;
		alert(alertString2);
	}
}
</script>
<div id="mainbloc">
<!-- TMPL_IF NAME="add_form" -->
	<!-- TMPL_IF NAME="itemtype" -->
		<h1 class="parameters">Modify Category</h1>
	<!-- TMPL_ELSE -->
		<h1 class="parameters">Add Category</h1>
	<!-- /TMPL_IF -->
	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
		<input type="hidden" name="op" value="add_validate">
		<input type="hidden" name="checked" value="0">
			<!-- TMPL_IF NAME="categorycode" -->
				<p><label class="label100">Category Code<label><input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->"><!-- TMPL_VAR NAME="categorycode" --></p>
			<!-- TMPL_ELSE -->
				<p><label class="label100">Category Code<label><input type="text" name="categorycode" size="6" maxlength="4" onblur="toUC(this)"></p>
			<!-- /TMPL_IF -->
			<p>
				<label class="label100">Description</label>
				<input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="description" escape=HTML -->">
			</p>
			<p>
				<label class="label100">Itemtypes assigned</label>
                <!-- TMPL_VAR NAME="itemtypes" -->

			</p>

			<p>
				<input type="button" value="OK" class="button" onclick="Check(this.form)">
			</p>
	</form>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirm" -->
		<p><label>Category Code</label><!-- TMPL_VAR NAME="categorycode" --></p>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->">
	<p><label>Description</label><!-- TMPL_VAR NAME="description" --></p>
		<p>CONFIRM DELETION</p>
		<p>
			<input type="submit" value="YES" class="button parameters"></form>
			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO" class="button parameters"></form>
		</p>


<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="else" -->
<h1 class="parameters">Category Admin</h1>
<table>
	<tr>
		<th class="parameters">Code</th>
		<th class="parameters">Description</th>
        <th class="parameters">Itemtype codes</th>
		<th class="parameters">Edit</th>
		<th class="parameters">Delete</th>
	</tr>
	<!-- TMPL_LOOP NAME="loop" -->
		<tr>
			<td><!-- TMPL_VAR NAME="categorycode" --></td>
			<td><!-- TMPL_VAR NAME="description" --></td>
			<td><!-- TMPL_VAR NAME="itemtypecodes" --></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&categorycode=<!-- TMPL_VAR NAME="categorycode" escape="HTML" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&categorycode=<!-- TMPL_VAR NAME="categorycode" escape="HTML" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
		</tr>
	<!-- /TMPL_LOOP -->
</table>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<input type="hidden" name="op" value="add_form">
	<input type="submit" class="button parameters" value="Add Category" title="Add Category" alt="Add Category" >
	<td width="33%"><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->"><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0"></a><!-- /TMPL_IF --></td>
	<td width="33%"><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->"><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0"></a><!-- /TMPL_IF --></td>
</form>
</div>
<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->




From genjimoto at users.sourceforge.net  Thu Jun  2 06:36:24 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 21:36:24 -0700
Subject: [Koha-cvs] CVS: koha/opac searchoptions.pl,1.1,1.2
Message-ID: <E1DdhRQ-0007cU-Mm@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29233

Modified Files:
	searchoptions.pl 
Log Message:
minor bugfix

Index: searchoptions.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/searchoptions.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** searchoptions.pl	2 Jun 2005 00:47:58 -0000	1.1
--- searchoptions.pl	2 Jun 2005 04:36:22 -0000	1.2
***************
*** 34,48 ****
  my $count=0;
  my $newquery='';
! my $subfoundbool=0;
! my $itemtypefoundbool=0;
! my $branchfoundbool=0;
  my $itemtypeslist;
  my $itemtypescatlist;
  my $itemtypessubcatlist;
  my $mediatypeslist;
  $count=0;
  my $dbh=C4::Context->dbh;
  $newquery='op=do_search&nbstatements='.$nbstatements;
! if ($allcategoriesbool eq '' && $category ne ''){
  
      my $sth=$dbh->prepare("select itemtypecodes from categorytable where categorycode=?");
--- 34,47 ----
  my $count=0;
  my $newquery='';
! my $keywordfoundbool=0;
  my $itemtypeslist;
  my $itemtypescatlist;
  my $itemtypessubcatlist;
  my $mediatypeslist;
+ 
  $count=0;
  my $dbh=C4::Context->dbh;
  $newquery='op=do_search&nbstatements='.$nbstatements;
! if ($allcategoriesbool == 0 && $category ne ''){
  
      my $sth=$dbh->prepare("select itemtypecodes from categorytable where categorycode=?");
***************
*** 51,55 ****
      $sth->finish;
  }
! if ($allmediatypesbool eq '' && @mediatypeswanted ne ''){
      foreach my $mediatype (@mediatypeswanted){
          my $sth=$dbh->prepare("select itemtypecodes from mediatypetable where mediatypecode=?");
--- 50,54 ----
      $sth->finish;
  }
! if ($allmediatypesbool == 0 && @mediatypeswanted ne ''){
      foreach my $mediatype (@mediatypeswanted){
          my $sth=$dbh->prepare("select itemtypecodes from mediatypetable where mediatypecode=?");
***************
*** 60,64 ****
      }
  }
! if ($allsubcategoriesbool eq '' && @subcategorieswanted ne ''){
      foreach my $subcategory (@subcategorieswanted){
          my $sth=$dbh->prepare("select itemtypecodes from subcategorytable where subcategorycode=?");
--- 59,63 ----
      }
  }
! if ($allsubcategoriesbool == 0 && @subcategorieswanted ne ''){
      foreach my $subcategory (@subcategorieswanted){
          my $sth=$dbh->prepare("select itemtypecodes from subcategorytable where subcategorycode=?");
***************
*** 69,79 ****
      }
  }
! if ($allitemtypesbool ne ''){
! #warn @itemtypeswanted;
  $itemtypeslist .=$itemtypescatlist.$itemtypessubcatlist.$mediatypeslist.$itemtypessearched.join ("|", @itemtypeswanted)
  } else {
  $itemtypeslist .=$itemtypescatlist.$itemtypessubcatlist.$mediatypeslist.$itemtypessearched
  }
! #warn $itemtypeslist;
  if ($allbranchesbool == 0){
     $brancheslist = join("|", at brancheswanted)
--- 68,78 ----
      }
  }
! if ($allitemtypesbool == 0){
! 
  $itemtypeslist .=$itemtypescatlist.$itemtypessubcatlist.$mediatypeslist.$itemtypessearched.join ("|", @itemtypeswanted)
  } else {
  $itemtypeslist .=$itemtypescatlist.$itemtypessubcatlist.$mediatypeslist.$itemtypessearched
  }
! 
  if ($allbranchesbool == 0){
     $brancheslist = join("|", at brancheswanted)
***************
*** 97,102 ****
           $newquery .= '&value='.$value[$count];
           if ($marclist[$count] eq ''){
!              if ($subfoundbool=0){
!                 $subfoundbool=1;
                  $newquery .=" ".join(" ", at keywords)
               }
--- 96,101 ----
           $newquery .= '&value='.$value[$count];
           if ($marclist[$count] eq ''){
!              if ($keywordfoundbool=0){
!                 $keywordfoundbool=1;
                  $newquery .=" ".join(" ", at keywords)
               }
***************
*** 105,109 ****
  
      }
!     if ($subfoundbool == 0 && $query->param('keysub') ne ''){
          $newquery .= '&marclist=&and_or=and&excluding=&operator=contains&value=';
          $newquery .=join(" ", at keywords)
--- 104,108 ----
  
      }
!     if ($keywordfoundbool == 0 && $query->param('keysub') ne ''){
          $newquery .= '&marclist=&and_or=and&excluding=&operator=contains&value=';
          $newquery .=join(" ", at keywords)




From hdl at users.sourceforge.net  Thu Jun  2 15:03:37 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 02 Jun 2005 06:03:37 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-sendbasket.pl,1.4.2.2,1.4.2.3
Message-ID: <E1DdpMH-0004mE-2H@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18305/opac

Modified Files:
      Tag: rel_2_2
	opac-sendbasket.pl 
Log Message:
Sending e-mail with joined file.
Seems to work OK. But I never received the email. 
May be my postfix configuration.

Index: opac-sendbasket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-sendbasket.pl,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -r1.4.2.2 -r1.4.2.3
*** opac-sendbasket.pl	1 Jun 2005 19:55:53 -0000	1.4.2.2
--- opac-sendbasket.pl	2 Jun 2005 13:03:31 -0000	1.4.2.3
***************
*** 130,133 ****
--- 130,135 ----
  	if (sendmail %mail) {
  	# do something if it works....
+ #		warn " ".$mail{body};
+ #		warn " ".$mail{PJ};
  		warn "Mail sent ok\n";
  		$template->param(SENT => "1");




From genjimoto at users.sourceforge.net  Thu Jun  2 15:29:30 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Thu, 02 Jun 2005 06:29:30 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-search.pl,1.25,1.26
Message-ID: <E1DdplK-0008CR-GY@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31474

Modified Files:
	opac-search.pl 
Log Message:
minor bugfix

Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** opac-search.pl	1 Jun 2005 23:07:17 -0000	1.25
--- opac-search.pl	2 Jun 2005 13:29:28 -0000	1.26
***************
*** 409,410 ****
--- 409,411 ----
  else {
  output_html_with_http_headers $query, $cookie, $template->output;
+ }




From gmccullagh at users.sourceforge.net  Thu Jun  2 15:47:49 2005
From: gmccullagh at users.sourceforge.net (gavin)
Date: Thu, 02 Jun 2005 06:47:49 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-search.pl,1.26,1.27
Message-ID: <E1Ddq33-0002LI-FM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8814

Modified Files:
	opac-search.pl 
Log Message:
just declared $totalResults and added an indent at the end


Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** opac-search.pl	2 Jun 2005 13:29:28 -0000	1.26
--- opac-search.pl	2 Jun 2005 13:47:47 -0000	1.27
***************
*** 23,26 ****
--- 23,29 ----
  my $subcategorylist;
  my $mediatypelist;
+ # added by Gavin 
+ my $totalresults;
+ 
  my $dbh=C4::Context->dbh;
  my $sth=$dbh->prepare("select description,itemtype from itemtypes order by description");
***************
*** 181,186 ****
  #      how this is done
  # 4.
! # 
  $totalresults = $total;
  ## This formats the 'search results' string and populates
  ## the 'OPLIN' variable as well as the 'spellcheck' variable
--- 184,190 ----
  #      how this is done
  # 4.
!  
  $totalresults = $total;
+ 
  ## This formats the 'search results' string and populates
  ## the 'OPLIN' variable as well as the 'spellcheck' variable
***************
*** 408,411 ****
  }
  else {
! output_html_with_http_headers $query, $cookie, $template->output;
  }
--- 412,415 ----
  }
  else {
!   output_html_with_http_headers $query, $cookie, $template->output;
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:16:56 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:16:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_100.tmpl,1.4,1.5
Message-ID: <E1DdrRI-0006D3-V0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23811/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_100.tmpl 
Log Message:
Template for 100a field plugin

Index: unimarc_field_100.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_100.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** unimarc_field_100.tmpl	1 Mar 2005 13:41:02 -0000	1.4
--- unimarc_field_100.tmpl	2 Jun 2005 15:16:54 -0000	1.5
***************
*** 1,652 ****
! <html>
! <head>
! <title>UNIMARC Field 100 builder</title>
! </head>
! <body>
  <form name="f_pop" onSubmit="javascript:report()">
! <table>
! 	<tr>
! 		<td>Date d'enregistrement</td>
! 		<td><input type="text" name="f1" maxlength=8 size=9 value="<!-- TMPL_VAR name="f1" -->"></td>
[...1364 lines suppressed...]
+ 		var jour = now.getDate();
+ 		var annee = now.getYear();
+ 
+ 		mois += 1;
+ 		if (mois < 10) { mois = "0" + mois; }
+ 		
+ 		if (annee < 2000) { annee += 1900; }
+ 		
+ 		var dateString = annee + mois + jour;
+ 		return dateString; 
+ 	}
+ 
+ 	function initForm() {
+ 		if (document.f_pop.f1.value == "") { document.f_pop.f1.value = formeDate(); }
+ 	}
+ 
+ 	initForm();
  </script>
! 
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From hdl at users.sourceforge.net  Thu Jun  2 17:19:37 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 02 Jun 2005 08:19:37 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-serial-issues.tmpl,1.2.2.2,1.2.2.3
Message-ID: <E1DdrTt-0006gF-OF@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-serial-issues.tmpl 
Log Message:
Adding history of received and missing serials to simple information

Index: opac-serial-issues.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -r1.2.2.2 -r1.2.2.3
*** opac-serial-issues.tmpl	4 Mar 2005 16:13:55 -0000	1.2.2.2
--- opac-serial-issues.tmpl	2 Jun 2005 15:19:35 -0000	1.2.2.3
***************
*** 75,78 ****
--- 75,79 ----
  		since <b><!-- TMPl_VAR name="startdate" --></b>
  		</p>
+ <!--TMPL_UNLESS Name=fullinfo -->
  		<p><!-- TMPL_VAR name="notes" --></p>
  	<!-- TMPL_IF name="opacnote" -->
***************
*** 82,85 ****
--- 83,99 ----
  		</p>
  	<!-- /TMPL_IF -->
+ 	<!-- TMPL_IF name="recievedlist" -->
+ 		<p>
+ 		<!-- TMPL_VAR name="recievedlist" -->
+ 			are recieved.
+ 		</p>
+ 	<!--/TMPL_IF -->
+ 	<!-- TMPL_IF name="missinglist" -->
+ 	<p>
+ 			<!-- TMPL_VAR name="missinglist" -->
+ 		are missing.
+ 	</p>
+ 	<!--/TMPL_IF -->
+ <!-- /TMPL_UNLESS -->
  </div>
  <!-- /TMPL_LOOP -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:20:00 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:20:00 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_105.tmpl,1.4,1.5
Message-ID: <E1DdrUG-0006ic-FR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25724/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_105.tmpl 
Log Message:
Template for 105a field plugin

Index: unimarc_field_105.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_105.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** unimarc_field_105.tmpl	1 Mar 2005 13:41:02 -0000	1.4
--- unimarc_field_105.tmpl	2 Jun 2005 15:19:57 -0000	1.5
***************
*** 1,1168 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 105</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Illustration 1:</td>

! 		<td>

[...2179 lines suppressed...]
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:15em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value +document.f_pop.f6.value +document.f_pop.f7.value +document.f_pop.f8.value +document.f_pop.f9.value +document.f_pop.f10.value +document.f_pop.f11.value +document.f_pop.f12.value +document.f_pop.f13.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:20:27 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:20:27 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_106.tmpl,1.2,1.3
Message-ID: <E1DdrUh-0006pQ-L2@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26214/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_106.tmpl 
Log Message:
Template for 106a field plugin

Index: unimarc_field_106.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_106.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_106.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_106.tmpl	2 Jun 2005 15:20:25 -0000	1.3
***************
*** 1,81 ****
! <html>
! <head>
! <title>UNIMARC Field 106 builder</title>
! </head>
! <body>
  <form name="f_pop" onSubmit="javascript:report()">
- <table>
- 	<tr>
- 		<td>Texte presentation physique</td>
- 		<td>
- 			<select name="f1" size="1">
- 	                        <!-- TMPL_IF name="f1 " -->
-                                 <option value=" " SELECTED>Aucun</option>
-                         <!-- TMPL_ELSE -->
-                                 <option value=" ">Aucun</option>
-                         <!-- /TMPL_IF -->
  
! 			<!-- TMPL_IF name="f1r" -->
! 				<option value="r" SELECTED>Impression normale</option>
! 			<!-- TMPL_ELSE -->
! 				<option value="r">Impression normale</option>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="f1b" -->
! 				<option value="d" SELECTED>Impression
! 				en gros caractere</option>
! 			<!-- TMPL_ELSE -->
! 				<option value="d">Impression en gros caractere</option>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="f1e" -->
! 				<option value="e" SELECTED>Journal</option>
! 			<!-- TMPL_ELSE -->
! 				<option value="e">Journal</option>
! 	
! 			<!-- /TMPL_IF -->
  
  
- 			<!-- TMPL_IF name="f1f" -->
- 				<option value="f" SELECTED>Caractere braille et moon</option>
- 			<!-- TMPL_ELSE -->
- 				<option value="f">Caractere braille et moon</option>
- 	
- 			<!-- /TMPL_IF -->
- 			<!-- TMPL_IF name="f1g" -->
- 				<option value="g" SELECTED>Micro-impression</option>
- 			<!-- TMPL_ELSE -->
- 				<option value="g">Micro-impression</option>
- 	
- 			<!-- /TMPL_IF -->
- 			<!-- TMPL_IF name="f1h" -->
- 				<option value="h" SELECTED>Manuscrit</option>
- 			<!-- TMPL_ELSE -->
- 				<option value="h">Manuscrit</option>
- 	
- 			<!-- /TMPL_IF -->
- 			<!-- TMPL_IF name="f1i" -->
- 				<option value="i" SELECTED>Multimedia</option>
- 			<!-- TMPL_ELSE -->
- 				<option value="i">Multimedia</option>
- 	
- 			<!-- /TMPL_IF -->
- 			<!-- TMPL_IF name="f1j" -->
- 				<option value="j" SELECTED>Impression en reduction</option>
- 			<!-- TMPL_ELSE -->
- 				<option value="j">Impression en reduction</option>
- 	
- 			<!-- /TMPL_IF -->
- 			<!-- TMPL_IF name="f1z" -->
- 				<option value="z" SELECTED>Autres formes de presentation</option>
- 			<!-- TMPL_ELSE -->
- 				<option value="z">Autres formes de presentation</option>
- 	
- 			<!-- /TMPL_IF -->
- 			</select>
- 		</td>
- 	</tr>
- 	
- 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>
- </table>
  </form>
  <script>
  	function report() {
--- 1,71 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 106a</h1>
  <form name="f_pop" onSubmit="javascript:report()">
  
! <p>
! 	<label style="width:15em;">Texte présentation physique</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1r" -->
! 		<option value="r" SELECTED>Impression normale</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="r">Impression normale</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="d" SELECTED>Impression en gros caractères</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Impression en gros caractères</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Journal</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Journal</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1f" -->
! 		<option value="f" SELECTED>Caractères braille et moon</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Caractères braille et moon</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1g" -->
! 		<option value="g" SELECTED>Micro-impression</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Micro-impression</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1h" -->
! 		<option value="h" SELECTED>Manuscrit</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Manuscrit</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1i" -->
! 		<option value="i" SELECTED>Multimédia</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="i">Multimédia</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1j" -->
! 		<option value="j" SELECTED>Impression en réduction</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="j">Impression en réduction</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1z" -->
! 		<option value="z" SELECTED>Autres formes de présentation</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autres formes de présentation</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
  
+ <br>
+ <p>
+ 	<label style="width:15em;">&nbsp;</label>
+ 	<input type="submit" value="OK" class="button authority">
+ </p>
  
  </form>
+ </div>
  <script>
  	function report() {
***************
*** 87,90 ****
  	}
  </script>
! </body>
! </html>
--- 77,79 ----
  	}
  </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:20:57 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:20:57 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_110.tmpl,1.2,1.3
Message-ID: <E1DdrVB-0006tk-0f@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26457/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_110.tmpl 
Log Message:
Template for 110a field plugin

Index: unimarc_field_110.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_110.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_110.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_110.tmpl	2 Jun 2005 15:20:54 -0000	1.3
***************
*** 1,662 ****
! <html>
! <head>
! <title>UNIMARC Field 106 builder</title>
! </head>
! <body>
  <form name="f_pop" onSubmit="javascript:report()">
! <table>
! 	<tr>
! 		<td>Type de publication en serie</td>
! 		<td>
[...1137 lines suppressed...]
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
  </form>
+ </div>
  <script>
  	function report() {
***************
*** 674,677 ****
  	}
  </script>
! </body>
! </html>
--- 506,508 ----
  	}
  </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:21:21 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:21:21 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_115a.tmpl,1.2,1.3
Message-ID: <E1DdrVZ-0006zq-1B@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26823/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_115a.tmpl 
Log Message:
Template for 115a field plugin

Index: unimarc_field_115a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_115a.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_115a.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_115a.tmpl	2 Jun 2005 15:21:18 -0000	1.3
***************
*** 1,1309 ****
! <html>
! <head>
! <title>UNIMARC Field 115a builder</title>
! </head>
! <body>
  <form name="f_pop" onSubmit="javascript:report()">
! <table>
! 	<tr>
! 		<td>Type de document</td>
! 		<td>
[...2258 lines suppressed...]
! <br>
! <p>
! 	<label style="width:22em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
  </form>
+ </div>
  <script>
  	function report() {
***************
*** 1317,1320 ****
  	}
  </script>
! </body>
! </html>
--- 976,978 ----
  	}
  </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:22:15 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:22:15 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_116.tmpl,1.2,1.3
Message-ID: <E1DdrWR-00078g-Vv@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27379/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_116.tmpl 
Log Message:
Template for 116a field plugin

Index: unimarc_field_116.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_116.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_116.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_116.tmpl	2 Jun 2005 15:22:13 -0000	1.3
***************
*** 1,1585 ****
! <html>
! <head>
! <title>UNIMARC Field 116 builder</title>
! </head>
! <body>
  <form name="f_pop" onSubmit="javascript:report()">
- <table>
- 	<tr>
- 		<td>Presentation materielle</td>
- 		<td>
[...2938 lines suppressed...]
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
  
  </form>
+ </div>
  <script>
  	function report() {
***************
*** 1589,1592 ****
  	}
  </script>
! </body>
! </html>
--- 1375,1378 ----
  	}
  </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->
! 




From doxulting at users.sourceforge.net  Thu Jun  2 17:22:40 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:22:40 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_117.tmpl,1.2,1.3
Message-ID: <E1DdrWq-0007BJ-O5@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27565/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_117.tmpl 
Log Message:
Template for 117a field plugin

Index: unimarc_field_117.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_117.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_117.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_117.tmpl	2 Jun 2005 15:22:38 -0000	1.3
***************
*** 1,801 ****
! <html>
! <head>
! <title>UNIMARC Field 117 builder</title>
! </head>
! <body>
  <form name="f_pop" onSubmit="javascript:report()">
! <table>
! 	<tr>
! 		<td>Presentation materielle</td>
! 		<td>
[...1503 lines suppressed...]
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
  </form>
+ </div>
  <script>
  	function report() {
***************
*** 805,808 ****
  	}
  </script>
! </body>
! </html>
--- 725,727 ----
  	}
  </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:23:15 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:23:15 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_120.tmpl,1.2,1.3
Message-ID: <E1DdrXP-0007HC-VD@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27907/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_120.tmpl 
Log Message:
Template for 120a field plugin

Index: unimarc_field_120.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_120.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_120.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_120.tmpl	2 Jun 2005 15:23:13 -0000	1.3
***************
*** 1,1340 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 120</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Indicateur de couleur:</td>

! 		<td>

[...2388 lines suppressed...]
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:16em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value +document.f_pop.f6.value +document.f_pop.f7.value +document.f_pop.f8.value +document.f_pop.f9.value +document.f_pop.f10.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:23:40 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:23:40 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_121a.tmpl,1.2,1.3
Message-ID: <E1DdrXo-0007Ki-My@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28143/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_121a.tmpl 
Log Message:
Template for 121a field plugin

Index: unimarc_field_121a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_121a.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_121a.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_121a.tmpl	2 Jun 2005 15:23:38 -0000	1.3
***************
*** 1,411 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 121a</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Dimensions physiques:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Bi-dimensionnel</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Bi-dimensionnel</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Tri-dimensionnel</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Tri-dimensionnel</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr><tr>

! 		<td>Image cartographique originale 1:</td>

! 		<td>

! 			<select name="f2" size="1">

! 			<!-- TMPL_IF name="f2 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2a" -->

! 				<option value="a" SELECTED>Manuelle et

! 				par releve</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Manuelle et par releve</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2b" -->

! 				<option value="b" SELECTED>photographique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Photographique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2c" -->

! 				<option value="c" SELECTED>Par ordinateur</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Par ordinateur</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2d" -->

! 				<option value="d" SELECTED>Par

! 				technique de teledetection active</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Par technique de

! 				teledetection active</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2e" -->

! 				<option value="e" SELECTED>Par

! 				technique de teledetection passive</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Par technique de

! 				teledetection passive</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td>		<td>Image cartographique originale 2:</td>

! 		<td>

! 			<select name="f3" size="1">

! 			<!-- TMPL_IF name="f3 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3a" -->

! 				<option value="a" SELECTED>Manuelle et

! 				par releve</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Manuelle et par releve</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3b" -->

! 				<option value="b" SELECTED>photographique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Photographique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3c" -->

! 				<option value="c" SELECTED>Par ordinateur</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Par ordinateur</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3d" -->

! 				<option value="d" SELECTED>Par

! 				technique de teledetection active</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Par technique de

! 				teledetection active</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3e" -->

! 				<option value="e" SELECTED>Par

! 				technique de teledetection passive</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Par technique de

! 				teledetection passive</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr><tr>

! 		<td>Support physique:</td>

! 		<td>

! 			<select name="f4" size="1">

! 			<!-- TMPL_IF name="f4  " -->

! 				<option value="  " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="  ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4aa" -->

! 				<option value="aa" SELECTED>Papier</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="aa">Papier</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ab" -->

! 				<option value="ab" SELECTED>Bois</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ab">Bois</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ac" -->

! 				<option value="ac" SELECTED>Pierre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ac">Pierre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ad" -->

! 				<option value="ad" SELECTED>Metal</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ad">Metal</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ae" -->

! 				<option value="ae" SELECTED>Materiaux synthetiques</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ae">Materiaux synthetiques</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4af" -->

! 				<option value="af" SELECTED>Peau

! 				(parchemin, velin...)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="af">Peau (parchemin, velin...) </option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ag" -->

! 				<option value="ag" SELECTED>Textile (y

! 				compris les fibres synthetiques)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ag">Textile (y compris

! 				les fibres synthetiques)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ah" -->

! 				<option value="ah" SELECTED>Stockage

! 				sur support magnetique - informatique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ah">Stockage sur

! 				support magnetique - informatique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ai" -->

! 				<option value="ai" SELECTED>Stockage

! 				sur support magnetique - non informatique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ai">Stockage sur

! 				support magnetique - non informatique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4aj" -->

! 				<option value="aj" SELECTED>Papier calque</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="aj">Papier calque</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ak" -->

! 				<option value="ak" SELECTED>Carton</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ak">Carton</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ap" -->

! 				<option value="ap" SELECTED>Platre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ap">Platre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4au" -->

! 				<option value="au" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="au">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4az" -->

! 				<option value="az" SELECTED>Autre

! 				procede non-photographique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="az">Autre procede non-photographique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ba" -->

! 				<option value="ba" SELECTED>Positif

! 				sur base flexible</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ba">Positif sur base flexible</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4bb" -->

! 				<option value="bb" SELECTED>Negatif

! 				sur base flexible</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bb">Negatif sur base flexible</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4bc" -->

! 				<option value="bc" SELECTED>Positif

! 				sur base rigide</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bc">Positif sur base rigide</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4bd" -->

! 				<option value="bd" SELECTED>Negatif

! 				sur base rigide</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bd">Negatif sur base rigide</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4bz" -->

! 				<option value="bz" SELECTED>Autre

! 				procede photographique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bz">Autre procede photographique</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr><tr>

! 		<td>Mode de realisation technique:</td>

! 		<td>

! 			<select name="f5" size="1">

! 			<!-- TMPL_IF name="f5 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f5a" -->

! 				<option value="a" SELECTED>Manuscrit</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Manuscrit</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f5b" -->

! 				<option value="b" SELECTED>Imprime</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Imprime</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f5c" -->

! 				<option value="c" SELECTED>Photographie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Photographie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f5d" -->

! 				<option value="d" SELECTED>Microphotographie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Microphotographie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f5u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f5y" -->

! 				<option value="y" SELECTED>N'est pas

! 				le produit final</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="y">N'est pas le produit

! 				final</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f5z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td>

! 	</tr><tr>

! 		<td>Forme de reproduction:</td>

! 		<td>

! 			<select name="f6" size="1">

! 			<!-- TMPL_IF name="f6 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6a" -->

! 				<option value="a" SELECTED>Manuscrit</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Manuscrit</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6b" -->

! 				<option value="b" SELECTED>Imprime</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Imprime</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6c" -->

! 				<option value="c" SELECTED>Photographie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Photographie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6d" -->

! 				<option value="d" SELECTED>Impression

! 				par transfert ligne a ligne</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Impression par

! 				transfert ligne a ligne</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6y" -->

! 				<option value="y" SELECTED>Ce n'est

! 				pas une reproduction</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="y">Ce n'est pas une reproduction</option>

! 			<!-- /TMPL_IF -->

! 		</td>

! 	</tr><tr>

! 		<td>Reperes geodesiques:</td>

! 		<td>

! 			<select name="f7" size="1">

! 			<!-- TMPL_IF name="f7 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7a" -->

! 				<option value="a" SELECTED>Pas de repere</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Pas de repere</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7b" -->

! 				<option value="b" SELECTED>Repere mais

! 				sans systeme de coordonnees</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Repere mais sans

! 				systeme de coordonnees</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7c" -->

! 				<option value="c" SELECTED>Repere avec

! 				systeme de coordonnees</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Repere avec systeme

! 				de coordonnees</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7x" -->

! 				<option value="x" SELECTED>Non applicable</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="x">Non applicable</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td>

! 	</tr>

! <tr>

! 		<td>Forme materielle d'edition:</td>

! 		<td>

! 			<select name="f8" size="1">

! 			<!-- TMPL_IF name="f8 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8a" -->

! 				<option value="a" SELECTED>Publication

! 				autonome</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Publication autonome</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8b" -->

! 				<option value="b" SELECTED>En parties

! 				(CAD publie en serie, en periodique...)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">En parties (CAD

! 				publie en serie, en periodique...)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8c" -->

! 				<option value="c" SELECTED>Atlas</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Atlas</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8d" -->

! 				<option value="d" SELECTED>Supplement

! 				separe d'une revue, d'une monographie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Supplement separe

! 				d'une revue, d'une monographie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8e" -->

! 				<option value="e" SELECTED>Reliee dans

! 				une revue, une monographie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Reliee dans une

! 				revue, une monographie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td>

! 	</tr>

! 

! 

! 

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value +document.f_pop.f6.value +document.f_pop.f7.value +document.f_pop.f8.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,378 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 121a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Dimensions physiques</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Bi-dimensionnel</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Bi-dimensionnel</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Tri-dimensionnel</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Tri-dimensionnel</option>
! 		<!-- /TMPL_IF -->
! 		</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Image cartographique originale 1</label>
! 	<select name="f2" size="1">
! 		<!-- TMPL_IF name="f2 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2a" -->
! 		<option value="a" SELECTED>Manuelle et par relevé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Manuelle et par relevé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2b" -->
! 		<option value="b" SELECTED>Photographique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Photographique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2c" -->
! 		<option value="c" SELECTED>Par ordinateur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Par ordinateur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2d" -->
! 		<option value="d" SELECTED>Par technique de télédétection active</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Par technique de télédétection active</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2e" -->
! 		<option value="e" SELECTED>Par technique de télédétection passive</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Par technique de télédétection passive</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Image cartographique originale 2</label>
! 	<select name="f3" size="1">
! 		<!-- TMPL_IF name="f3 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3a" -->
! 		<option value="a" SELECTED>Manuelle et par relevé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Manuelle et par relevé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3b" -->
! 		<option value="b" SELECTED>Photographique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Photographique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3c" -->
! 		<option value="c" SELECTED>Par ordinateur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Par ordinateur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3d" -->
! 		<option value="d" SELECTED>Par technique de télédétection active</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Par technique de télédétection active</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3e" -->
! 		<option value="e" SELECTED>Par technique de télédétection passive</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Par technique de télédétection passive</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Support physique</label>
! 	<select name="f4" size="1">
! 		<!-- TMPL_IF name="f4  " -->
! 		<option value="  " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="  ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Procédé non photographique :</option>
! 		<!-- TMPL_IF name="f4aa" -->
! 		<option value="aa" SELECTED>Papier</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="aa">Papier</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4ab" -->
! 		<option value="ab" SELECTED>Bois</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ab">Bois</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4ac" -->
! 		<option value="ac" SELECTED>Pierre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ac">Pierre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4ad" -->
! 		<option value="ad" SELECTED>Métal</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ad">Métal</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4ae" -->
! 		<option value="ae" SELECTED>Matériaux synthétiques</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ae">Matériaux synthétiques</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4af" -->
! 		<option value="af" SELECTED>Peau (parchemin, velin...)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="af">Peau (parchemin, velin...) </option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4ag" -->
! 		<option value="ag" SELECTED>Textile (y compris les fibres synthétiques)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ag">Textile (y compris les fibres synthétiques)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4ah" -->
! 		<option value="ah" SELECTED>Stockage sur support magnétique - informatique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ah">Stockage sur support magnétique - informatique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4ai" -->
! 		<option value="ai" SELECTED>Stockage sur support magnétique - non informatique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ai">Stockage sur support magnétique - non informatique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4aj" -->
! 		<option value="aj" SELECTED>Papier calque</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="aj">Papier calque</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4ak" -->
! 		<option value="ak" SELECTED>Carton</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ak">Carton</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4ap" -->
! 		<option value="ap" SELECTED>Plâtre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ap">Plâtre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4au" -->
! 		<option value="au" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="au">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4az" -->
! 		<option value="az" SELECTED>Autre procédé non-photographique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="az">Autre procédé non-photographique</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Procédé photographique :</option>
! 		<!-- TMPL_IF name="f4ba" -->
! 		<option value="ba" SELECTED>Positif sur base flexible transparente ou opaque</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ba">Positif sur base flexible transparente ou opaque</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4bb" -->
! 		<option value="bb" SELECTED>Négatif sur base flexible transparente ou opaque</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bb">Négatif sur base flexible transparente ou opaque</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4bc" -->
! 		<option value="bc" SELECTED>Positif sur base rigide transparente ou opaque</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bc">Positif sur base rigide transparente ou opaque</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4bd" -->
! 		<option value="bd" SELECTED>Négatif sur base rigide transparente ou opaque</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bd">Négatif sur base rigide transparente ou opaque</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4bz" -->
! 		<option value="bz" SELECTED>Autre procédé photographique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bz">Autre procédé photographique</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Mode de réalisation technique</label>
! 	<select name="f5" size="1">
! 		<!-- TMPL_IF name="f5 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5a" -->
! 		<option value="a" SELECTED>Manuscrit</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Manuscrit</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5b" -->
! 		<option value="b" SELECTED>Imprimé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Imprimé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5c" -->
! 		<option value="c" SELECTED>Photographie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Photographie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5d" -->
! 		<option value="d" SELECTED>Microphotographie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Microphotographie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5y" -->
! 		<option value="y" SELECTED>N'est pas le produit final</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="y">N'est pas le produit final</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Forme de reproduction</label>
! 	<select name="f6" size="1">
! 		<!-- TMPL_IF name="f6 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6a" -->
! 		<option value="a" SELECTED>Manuscrit</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Manuscrit</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6b" -->
! 		<option value="b" SELECTED>Imprimé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Imprimé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6c" -->
! 		<option value="c" SELECTED>Photographie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Photographie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6d" -->
! 		<option value="d" SELECTED>Impression par transfert ligne a ligne</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Impression par transfert ligne a ligne</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6y" -->
! 		<option value="y" SELECTED>Ce n'est pas une reproduction</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="y">Ce n'est pas une reproduction</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Repères géodésiques:</label>
! 		<select name="f7" size="1">
! 		<!-- TMPL_IF name="f7 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7a" -->
! 		<option value="a" SELECTED>Pas de repère</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Pas de repère</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7b" -->
! 		<option value="b" SELECTED>Repéré mais sans système de coordonnées</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Repéré mais sans système de coordonnées</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7c" -->
! 		<option value="c" SELECTED>Repéré avec systeme de coordonnées</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Repéré avec systeme de coordonnées</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7x" -->
! 		<option value="x" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="x">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 		</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Forme matérielle d'édition</label>
! 	<select name="f8" size="1">
! 		<!-- TMPL_IF name="f8 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8a" -->
! 		<option value="a" SELECTED>Publication autonome</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Publication autonome</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8b" -->
! 		<option value="b" SELECTED>En parties (c'est-à-dire publié en série, en périodique...)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">En parties (c'est-à-dire publié en série, en périodique...)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8c" -->
! 		<option value="c" SELECTED>Atlas</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Atlas</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8d" -->
! 		<option value="d" SELECTED>Supplément séparé d'une revue, d'une monographie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Supplément séparé d'une revue, d'une monographie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8e" -->
! 		<option value="e" SELECTED>Relié dans une revue, une monographie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Relié dans une revue, une monographie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value +document.f_pop.f6.value +document.f_pop.f7.value +document.f_pop.f8.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:21:50 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:21:50 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_115b.tmpl,1.2,1.3
Message-ID: <E1DdrW2-00074a-Nx@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27127/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_115b.tmpl 
Log Message:
Template for 115b field plugin

Index: unimarc_field_115b.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_115b.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_115b.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_115b.tmpl	2 Jun 2005 15:21:47 -0000	1.3
***************
*** 1,673 ****
! <html>
! <head>
! <title>UNIMARC Field 115b builder</title>
! </head>
! <body>
  <form name="f_pop" onSubmit="javascript:report()">
! <table>
! 	<tr>
! 		<td>Copie (generation)</td>
! 		<td>
[...1174 lines suppressed...]
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
  </form>
+ </div>
  <script>
  	function report() {
***************
*** 682,685 ****
  	}
  </script>
! </body>
! </html>
--- 529,531 ----
  	}
  </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:24:22 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:24:22 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_122.tmpl,1.2,1.3
Message-ID: <E1DdrYU-0007RZ-Jr@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28606/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_122.tmpl 
Log Message:
Template for 122a field plugin

Index: unimarc_field_122.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_122.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_122.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_122.tmpl	2 Jun 2005 15:24:20 -0000	1.3
***************
*** 1,84 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 122</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Ere code:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>La date

! 				tombe avant l'an 1 du calendrier gregorien</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">La date tombe avant

! 				l'an 1 du calendrier gregorien</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1d" -->

! 				<option value="d" SELECTED>La date

! 				tombe apres l'an 1</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">La date tombe apres

! 				l'an 1</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Spatiale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Spatiale</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! <tr>		<td>Annee:</td>

! 		   <td><input type="text" name="f2" maxlength=4 size=5

! 		   value="<!-- TMPL_VAR name="f2" -->">

! 		</td>

! 

! 		<td>Mois:</td>

! 		         <td><input type="text" name="f3" maxlength=2

! 		         size=3

!                    value="<!-- TMPL_VAR name="f3" -->"></td>

! 		<td>Jour:</td>

! 		         <td><input type="text" name="f4" maxlength=2

! 		         size=3

!                    value="<!-- TMPL_VAR name="f4" -->"></td>

! 

! 		<td>Heure:</td>

! 		         <td><input type="text" name="f5" maxlength=2

! 		         size=3

!                    value="<!-- TMPL_VAR name="f5" -->"></td>

! 

! 		</tr>

! 

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! document.f_pop.f2.value=document.f_pop.f2.value+'    ';

! document.f_pop.f3.value=document.f_pop.f3.value+'  ';

! document.f_pop.f4.value=document.f_pop.f4.value+'  ';

! document.f_pop.f5.value=document.f_pop.f5.value+'  ';

! 

! 

! 

! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,4);

! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);

! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);

! document.f_pop.f5.value=document.f_pop.f5.value.substring(0,2);

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value ;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,77 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 122a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:15em;">Code ère</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>La date tombe avant l'an 1 du calendrier grégorien</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">La date tombe avant l'an 1 du calendrier grégorien</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1d" -->
! 		<option value="d" SELECTED>La date tombe après l'an 1 du calendrier grégorien</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">La date tombe après l'an 1 du calendrier grégorien</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:15em;">Année</label>
! 	<input type="text" name="f2" maxlength=4 size=5 value="<!-- TMPL_VAR name="f2" -->">
! </p>
! 
! <p>
! 	<label style="width:15em;">Mois</label>
! 	<input type="text" name="f3" maxlength=2 size=3 value="<!-- TMPL_VAR name="f3" -->">
! </p>
! 
! <p>
! 	<label style="width:15em;">Jour</label>
! 	<input type="text" name="f4" maxlength=2 size=3 value="<!-- TMPL_VAR name="f4" -->">
! </p>
! 
! <p>
! 	<label style="width:15em;">Heure</label>
! 	<input type="text" name="f5" maxlength=2 size=3 value="<!-- TMPL_VAR name="f5" -->">
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:15em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! document.f_pop.f2.value=document.f_pop.f2.value+'    ';
! document.f_pop.f3.value=document.f_pop.f3.value+'  ';
! document.f_pop.f4.value=document.f_pop.f4.value+'  ';
! document.f_pop.f5.value=document.f_pop.f5.value+'  ';
! 
! 
! 
! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,4);
! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
! document.f_pop.f5.value=document.f_pop.f5.value.substring(0,2);
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value ;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:24:46 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:24:46 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_123a.tmpl,1.2,1.3
Message-ID: <E1DdrYs-0007Up-Ez@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28769/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_123a.tmpl 
Log Message:
Template for 123a field plugin

Index: unimarc_field_123a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123a.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_123a.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_123a.tmpl	2 Jun 2005 15:24:44 -0000	1.3
***************
*** 1,47 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 123a</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Type d'echelle:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Echelle lineaire</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Echelle lineaire</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Echelle angulaire</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Echelle angulaire</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1z" -->

! 				<option value="z" SELECTED>Autre type d'echelle</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre type d'echelle</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,48 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 123a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Type d'échelle</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Echelle linéaire</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Echelle linéaire</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Echelle angulaire</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Echelle angulaire</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1z" -->
! 		<option value="z" SELECTED>Autre type d'échelle</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre type d'échelle</option>
! 		<!-- /TMPL_IF -->
! 		</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:25:11 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:25:11 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_123d.tmpl,1.2,1.3
Message-ID: <E1DdrZH-0007am-3d@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29137/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_123d.tmpl 
Log Message:
Template for 123d field plugin

Index: unimarc_field_123d.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123d.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_123d.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_123d.tmpl	2 Jun 2005 15:25:08 -0000	1.3
***************
*** 1,79 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 123d</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Hemisphere:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1w" -->

! 				<option value="w" SELECTED>Ouest</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="w">Ouest</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Est</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Est</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1n" -->

! 				<option value="n" SELECTED>Nord</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="n">Nord</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1s" -->

! 				<option value="s" SELECTED>Sud</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="s">Sud</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 

! <tr>          <td>Degres (completer avec des 0):</td>

!                          <td><input type="text" name="f2" maxlength=3

!                          size=4

!                    value="<!-- TMPL_VAR name="f2" -->"></td>

! </tr>

! <tr>          <td>Minutes (completer avec des 0):</td>

!                          <td><input type="text" name="f3" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f3" -->"></td>

! </tr>

! <tr>          <td>Secondes (completer avec des 0):</td>

!                          <td><input type="text" name="f4" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f4" -->"></td>

! </tr>

! 

! 

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! document.f_pop.f2.value=document.f_pop.f2.value+'   ';

! document.f_pop.f3.value=document.f_pop.f3.value+'  ';

! document.f_pop.f4.value=document.f_pop.f4.value+'  ';

! 

! 

! 

! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);

! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);

! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,79 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 123d</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Hémisphère</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1w" -->
! 		<option value="w" SELECTED>Ouest</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="w">Ouest</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Est</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Est</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1n" -->
! 		<option value="n" SELECTED>Nord</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Nord</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1s" -->
! 		<option value="s" SELECTED>Sud</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="s">Sud</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>	
! 
! <p>
! 	<label style="width:20em;">Degrés (compléter avec des 0)</label>
! 	<input type="text" name="f2" maxlength=3 size=4 value="<!-- TMPL_VAR name="f2" -->">
! </p>
! 
! <p>
! 	<label style="width:20em;">Minutes (compléter avec des 0)</label>
! 	<input type="text" name="f3" maxlength=2 size=3 value="<!-- TMPL_VAR name="f3" -->">
! </p>
! 
! <p>
! 	<label style="width:20em;">Secondes (compléter avec des 0)</label>
! 	<input type="text" name="f4" maxlength=2 size=3 value="<!-- TMPL_VAR name="f4" -->">
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! document.f_pop.f2.value=document.f_pop.f2.value+'   ';
! document.f_pop.f3.value=document.f_pop.f3.value+'  ';
! document.f_pop.f4.value=document.f_pop.f4.value+'  ';
! 
! 
! 
! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:25:37 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:25:37 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_123e.tmpl,1.2,1.3
Message-ID: <E1DdrZh-0007eT-2s@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29371/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_123e.tmpl 
Log Message:
Template for 123e field plugin

Index: unimarc_field_123e.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123e.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_123e.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_123e.tmpl	2 Jun 2005 15:25:34 -0000	1.3
***************
*** 1,79 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 123e</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Hemisphere:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1w" -->

! 				<option value="w" SELECTED>Ouest</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="w">Ouest</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Est</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Est</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1n" -->

! 				<option value="n" SELECTED>Nord</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="n">Nord</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1s" -->

! 				<option value="s" SELECTED>Sud</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="s">Sud</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 

! <tr>          <td>Degres (completer avec des 0):</td>

!                          <td><input type="text" name="f2" maxlength=3

!                          size=4

!                    value="<!-- TMPL_VAR name="f2" -->"></td>

! </tr>

! <tr>          <td>Minutes (completer avec des 0):</td>

!                          <td><input type="text" name="f3" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f3" -->"></td>

! </tr>

! <tr>          <td>Secondes (completer avec des 0):</td>

!                          <td><input type="text" name="f4" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f4" -->"></td>

! </tr>

! 

! 

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! document.f_pop.f2.value=document.f_pop.f2.value+'   ';

! document.f_pop.f3.value=document.f_pop.f3.value+'  ';

! document.f_pop.f4.value=document.f_pop.f4.value+'  ';

! 

! 

! 

! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);

! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);

! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,79 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 123e</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Hémisphère</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1w" -->
! 		<option value="w" SELECTED>Ouest</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="w">Ouest</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Est</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Est</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1n" -->
! 		<option value="n" SELECTED>Nord</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Nord</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1s" -->
! 		<option value="s" SELECTED>Sud</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="s">Sud</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>	
! 
! <p>
! 	<label style="width:20em;">Degrés (compléter avec des 0)</label>
! 	<input type="text" name="f2" maxlength=3 size=4 value="<!-- TMPL_VAR name="f2" -->">
! </p>
! 
! <p>
! 	<label style="width:20em;">Minutes (compléter avec des 0)</label>
! 	<input type="text" name="f3" maxlength=2 size=3 value="<!-- TMPL_VAR name="f3" -->">
! </p>
! 
! <p>
! 	<label style="width:20em;">Secondes (compléter avec des 0)</label>
! 	<input type="text" name="f4" maxlength=2 size=3 value="<!-- TMPL_VAR name="f4" -->">
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! document.f_pop.f2.value=document.f_pop.f2.value+'   ';
! document.f_pop.f3.value=document.f_pop.f3.value+'  ';
! document.f_pop.f4.value=document.f_pop.f4.value+'  ';
! 
! 
! 
! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:24:01 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:24:01 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_121b.tmpl,1.2,1.3
Message-ID: <E1DdrY9-0007P6-65@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28425/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_121b.tmpl 
Log Message:
Template for 121b field plugin

Index: unimarc_field_121b.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_121b.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_121b.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_121b.tmpl	2 Jun 2005 15:23:59 -0000	1.3
***************
*** 1,291 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 121b</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Altitude du capteur:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Terrestre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Terrestre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Aerienne</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Aerienne</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Spatiale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Spatiale</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr><tr>

! 		<td>Orientation du capteur :</td>

! 		<td>

! 			<select name="f2" size="1">

! 			<!-- TMPL_IF name="f2 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2a" -->

! 				<option value="a" SELECTED>Oblique faible</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Oblique faible</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2b" -->

! 				<option value="b" SELECTED>Oblique forte</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Oblique forte</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2c" -->

! 				<option value="c" SELECTED>Verticale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Verticale</option>

! 			<!-- /TMPL_IF -->

! 		</td></tr><tr>		<td>Bandes spectrales (nombre

! 		a deux chiffres 01->99 ou xx (ecrire 01 pour 1):</td>

! 		   <td><input type="text" name="f3" maxlength=2 size=3

! 		   value="<!-- TMPL_VAR name="f3" -->">

! 		</td></tr>

! <tr>

! 		<td>Qualite de l'image:</td>

! 		<td>

! 			<select name="f4" size="1">

! 			<!-- TMPL_IF name="f4 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4a" -->

! 				<option value="a" SELECTED>Faible</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Faible</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4b" -->

! 				<option value="b" SELECTED>Acceptable</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Acceptable</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4c" -->

! 				<option value="c" SELECTED>Bonne</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Bonne</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4d" -->

! 				<option value="d" SELECTED>Tres bonne</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Tres bonne</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr><tr>

! 		<td>Couverture nuageuse exprimee en huitieme:</td>

! 		<td>

! 			<select name="f5" size="1">

! 			<!-- TMPL_IF name="f5 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f51" -->

! 				<option value="1" SELECTED>1/8</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="1">1/8</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f52" -->

! 				<option value="2" SELECTED>2/8</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="2">2/8</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f53" -->

! 				<option value="3" SELECTED>3/8</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="3">3/8</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f54" -->

! 				<option value="4" SELECTED>4/8</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="4">4/8</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f55" -->

! 				<option value="5" SELECTED>5/8</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="5">5/8</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f56" -->

! 				<option value="6" SELECTED>6/8</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="6">6/8</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f57" -->

! 				<option value="7" SELECTED>7/8</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="7">7/8</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f58" -->

! 				<option value="8" SELECTED>Couverture totale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="8">Couverture totale</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr><tr>

! 

! 		       <td>Qualite de l'image:</td>

!                 <td>

!                         <select name="f6" size="1">

!                         <!-- TMPL_IF name="f6 " -->

!                                 <option value=" "

!                 SELECTED>Aucun</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value=" ">Aucun</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f6-" -->

!                                 <option value="-"

!                 SELECTED>Inferieure au cm</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="-">Inferieure au cm</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f61" -->

!                                 <option value="1"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="1">1</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f62" -->

!                                 <option value="2"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="2">2</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f63" -->

!                                 <option value="3"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="3">3</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f64" -->

!                                 <option value="4"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="4">4</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f51" -->

!                                 <option value="5"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="5">5</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f66" -->

!                                 <option value="6"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="6">6</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f71" -->

!                                 <option value="7"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="7">7</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f68" -->

!                                 <option value="8"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="8">8</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f69" -->

!                                 <option value="9"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="9">9</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f6+" -->

!                                 <option value="+"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="+">+</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f6x" -->

!                                 <option value="x"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="x">x</option>

!                         <!-- /TMPL_IF -->

!                         </select>

!                 

! 			<select name="f7" size="1">

! 			<!-- TMPL_IF name="f7 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7c" -->

! 				<option value="c" SELECTED>Centimetres</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Centimetres</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7i" -->

! 				<option value="i" SELECTED>Decimetres</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="i">Decimetres</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7m" -->

! 				<option value="m" SELECTED>Metres</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="m">Metres</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7d" -->

! 				<option value="d" SELECTED>Decametres</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Decametres</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7h" -->

! 				<option value="h" SELECTED>Hectometres</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Hectometres</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7k" -->

! 				<option value="k" SELECTED>Kilometres</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="k">Kilometres</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7x" -->

! 				<option value="x" SELECTED>Non applicable</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="x">Non applicable</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td>

! 	</tr>

! 

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! document.f_pop.f3.value=document.f_pop.f3.value+'  ';

! 

! 

! 

! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value +document.f_pop.f6.value +document.f_pop.f7.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,284 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 121b</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Altitude du capteur</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Terrestre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Terrestre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Aérienne</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Aérienne</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Spatiale</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Spatiale</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Orientation du capteur</label>
! 	<select name="f2" size="1">
! 		<!-- TMPL_IF name="f2 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2a" -->
! 		<option value="a" SELECTED>Oblique faible</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Oblique faible</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2b" -->
! 		<option value="b" SELECTED>Oblique forte</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Oblique forte</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2c" -->
! 		<option value="c" SELECTED>Verticale</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Verticale</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Bandes spectrales</label>
! 	<input type="text" name="f3" maxlength=2 size=3 value="<!-- TMPL_VAR name="f3" -->"> <i>nombre à deux chiffres 01->99 ou xx (ecrire 01 pour 1)</i>
! </p>
! 
! <p>
! 	<label style="width:20em;">Qualité de l'image</label>
! 		<select name="f4" size="1">
! 		<!-- TMPL_IF name="f4 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4a" -->
! 		<option value="a" SELECTED>Faible</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Faible</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4b" -->
! 		<option value="b" SELECTED>Acceptable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Acceptable</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4c" -->
! 		<option value="c" SELECTED>Bonne</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Bonne</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4d" -->
! 		<option value="d" SELECTED>Très bonne</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Très bonne</option>
! 		<!-- /TMPL_IF -->
! 		</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Couverture nuageuse exprimée en huitièmes</label>
! 		<select name="f5" size="1">
! 		<!-- TMPL_IF name="f5 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f51" -->
! 		<option value="1" SELECTED>1/8</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="1">1/8</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f52" -->
! 		<option value="2" SELECTED>2/8</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="2">2/8</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f53" -->
! 		<option value="3" SELECTED>3/8</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="3">3/8</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f54" -->
! 		<option value="4" SELECTED>4/8</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="4">4/8</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f55" -->
! 		<option value="5" SELECTED>5/8</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="5">5/8</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f56" -->
! 		<option value="6" SELECTED>6/8</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="6">6/8</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f57" -->
! 		<option value="7" SELECTED>7/8</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="7">7/8</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f58" -->
! 		<option value="8" SELECTED>Couverture totale</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="8">Couverture totale</option>
! 		<!-- /TMPL_IF -->
! 		</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Valeur moyenne de la résolution au sol</label>
! 		<select name="f6" size="1">
! 		<!-- TMPL_IF name="f6 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6-" -->
! 		<option value="-" SELECTED>Inferieure au cm</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="-">Inferieure au cm</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f61" -->
! 		<option value="1" SELECTED>1</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="1">1</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f62" -->
! 		<option value="2" SELECTED>2</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="2">2</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f63" -->
! 		<option value="3" SELECTED>3</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="3">3</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f64" -->
! 		<option value="4" SELECTED>4</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="4">4</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f65" -->
! 		<option value="5" SELECTED>5</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="5">5</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f66" -->
! 		<option value="6" SELECTED>6</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="6">6</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f67" -->
! 		<option value="7" SELECTED>7</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="7">7</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f68" -->
! 		<option value="8" SELECTED>8</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="8">8</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f69" -->
! 		<option value="9" SELECTED>9</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="9">9</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6+" -->
! 		<option value="+" SELECTED>Supérieure à 9 kilomètres</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="+">Supérieure à 9 kilomètres</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6x" -->
! 		<option value="x" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="x">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! <p>
! 	<label style="width:20em;">Unité métrique</label>
! 	<select name="f7" size="1">
! 		<!-- TMPL_IF name="f7 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7c" -->
! 		<option value="c" SELECTED>Centimètres</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Centimètres</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7i" -->
! 		<option value="i" SELECTED>Décimètres</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="i">Décimètres</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7m" -->
! 		<option value="m" SELECTED>Mètres</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="m">Mètres</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7d" -->
! 		<option value="d" SELECTED>Décamètres</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Décamètres</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7h" -->
! 		<option value="h" SELECTED>Hectomètres</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Hectomètres</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7k" -->
! 		<option value="k" SELECTED>Kilomètres</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="k">Kilomètres</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7x" -->
! 		<option value="x" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="x">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! document.f_pop.f3.value=document.f_pop.f3.value+'  ';
! 
! 
! 
! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value +document.f_pop.f6.value +document.f_pop.f7.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:25:55 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:25:55 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_123f.tmpl,1.2,1.3
Message-ID: <E1DdrZz-0007or-Qv@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29995/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_123f.tmpl 
Log Message:
Template for 123f field plugin

Index: unimarc_field_123f.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123f.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_123f.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_123f.tmpl	2 Jun 2005 15:25:53 -0000	1.3
***************
*** 1,79 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 123f</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Hemisphere:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1w" -->

! 				<option value="w" SELECTED>Ouest</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="w">Ouest</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Est</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Est</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1n" -->

! 				<option value="n" SELECTED>Nord</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="n">Nord</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1s" -->

! 				<option value="s" SELECTED>Sud</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="s">Sud</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 

! <tr>          <td>Degres (completer avec des 0):</td>

!                          <td><input type="text" name="f2" maxlength=3

!                          size=4

!                    value="<!-- TMPL_VAR name="f2" -->"></td>

! </tr>

! <tr>          <td>Minutes (completer avec des 0):</td>

!                          <td><input type="text" name="f3" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f3" -->"></td>

! </tr>

! <tr>          <td>Secondes (completer avec des 0):</td>

!                          <td><input type="text" name="f4" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f4" -->"></td>

! </tr>

! 

! 

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! document.f_pop.f2.value=document.f_pop.f2.value+'   ';

! document.f_pop.f3.value=document.f_pop.f3.value+'  ';

! document.f_pop.f4.value=document.f_pop.f4.value+'  ';

! 

! 

! 

! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);

! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);

! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,79 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 123f</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Hémisphère</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1w" -->
! 		<option value="w" SELECTED>Ouest</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="w">Ouest</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Est</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Est</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1n" -->
! 		<option value="n" SELECTED>Nord</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Nord</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1s" -->
! 		<option value="s" SELECTED>Sud</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="s">Sud</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>	
! 
! <p>
! 	<label style="width:20em;">Degrés (compléter avec des 0)</label>
! 	<input type="text" name="f2" maxlength=3 size=4 value="<!-- TMPL_VAR name="f2" -->">
! </p>
! 
! <p>
! 	<label style="width:20em;">Minutes (compléter avec des 0)</label>
! 	<input type="text" name="f3" maxlength=2 size=3 value="<!-- TMPL_VAR name="f3" -->">
! </p>
! 
! <p>
! 	<label style="width:20em;">Secondes (compléter avec des 0)</label>
! 	<input type="text" name="f4" maxlength=2 size=3 value="<!-- TMPL_VAR name="f4" -->">
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! document.f_pop.f2.value=document.f_pop.f2.value+'   ';
! document.f_pop.f3.value=document.f_pop.f3.value+'  ';
! document.f_pop.f4.value=document.f_pop.f4.value+'  ';
! 
! 
! 
! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:26:19 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:26:19 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_123g.tmpl,1.2,1.3
Message-ID: <E1DdraN-0007rs-Hj@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30203/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_123g.tmpl 
Log Message:
Template for 123g field plugin

Index: unimarc_field_123g.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123g.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_123g.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_123g.tmpl	2 Jun 2005 15:26:17 -0000	1.3
***************
*** 1,79 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 123g</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Hemisphere:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1w" -->

! 				<option value="w" SELECTED>Ouest</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="w">Ouest</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Est</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Est</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1n" -->

! 				<option value="n" SELECTED>Nord</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="n">Nord</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1s" -->

! 				<option value="s" SELECTED>Sud</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="s">Sud</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 

! <tr>          <td>Degres (completer avec des 0):</td>

!                          <td><input type="text" name="f2" maxlength=3

!                          size=4

!                    value="<!-- TMPL_VAR name="f2" -->"></td>

! </tr>

! <tr>          <td>Minutes (completer avec des 0):</td>

!                          <td><input type="text" name="f3" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f3" -->"></td>

! </tr>

! <tr>          <td>Secondes (completer avec des 0):</td>

!                          <td><input type="text" name="f4" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f4" -->"></td>

! </tr>

! 

! 

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! document.f_pop.f2.value=document.f_pop.f2.value+'   ';

! document.f_pop.f3.value=document.f_pop.f3.value+'  ';

! document.f_pop.f4.value=document.f_pop.f4.value+'  ';

! 

! 

! 

! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);

! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);

! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,79 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 123g</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Hémisphère</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1w" -->
! 		<option value="w" SELECTED>Ouest</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="w">Ouest</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Est</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Est</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1n" -->
! 		<option value="n" SELECTED>Nord</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Nord</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1s" -->
! 		<option value="s" SELECTED>Sud</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="s">Sud</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>	
! 
! <p>
! 	<label style="width:20em;">Degrés (compléter avec des 0)</label>
! 	<input type="text" name="f2" maxlength=3 size=4 value="<!-- TMPL_VAR name="f2" -->">
! </p>
! 
! <p>
! 	<label style="width:20em;">Minutes (compléter avec des 0)</label>
! 	<input type="text" name="f3" maxlength=2 size=3 value="<!-- TMPL_VAR name="f3" -->">
! </p>
! 
! <p>
! 	<label style="width:20em;">Secondes (compléter avec des 0)</label>
! 	<input type="text" name="f4" maxlength=2 size=3 value="<!-- TMPL_VAR name="f4" -->">
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! document.f_pop.f2.value=document.f_pop.f2.value+'   ';
! document.f_pop.f3.value=document.f_pop.f3.value+'  ';
! document.f_pop.f4.value=document.f_pop.f4.value+'  ';
! 
! 
! 
! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:26:38 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:26:38 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_123i.tmpl,NONE,1.1
Message-ID: <E1Ddrag-0007vS-Pj@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30434/koha-tmpl/intranet-tmpl/default/fr/value_builder

Added Files:
	unimarc_field_123i.tmpl 
Log Message:
Template for 123i field plugin

--- NEW FILE ---
<!-- TMPL_INCLUDE Name="popup-top.inc" -->
<div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
<h1 class="authority">Assistant champ codé 123i</h1>
<form name="f_pop" onSubmit="javascript:report()">

<p>
	<label style="width:20em;">Hémisphère</label>
	<select name="f1" size="1">
		<!-- TMPL_IF name="f1 " -->
		<option value=" " SELECTED>Aucun</option>
		<!-- TMPL_ELSE -->
		<option value=" ">Aucun</option>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF name="f1w" -->
		<option value="w" SELECTED>Ouest</option>
		<!-- TMPL_ELSE -->
		<option value="w">Ouest</option>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF name="f1e" -->
		<option value="e" SELECTED>Est</option>
		<!-- TMPL_ELSE -->
		<option value="e">Est</option>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF name="f1n" -->
		<option value="n" SELECTED>Nord</option>
		<!-- TMPL_ELSE -->
		<option value="n">Nord</option>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF name="f1s" -->
		<option value="s" SELECTED>Sud</option>
		<!-- TMPL_ELSE -->
		<option value="s">Sud</option>
		<!-- /TMPL_IF -->
	</select>
</p>	

<p>
	<label style="width:20em;">Degrés (compléter avec des 0)</label>
	<input type="text" name="f2" maxlength=3 size=4 value="<!-- TMPL_VAR name="f2" -->">
</p>

<p>
	<label style="width:20em;">Minutes (compléter avec des 0)</label>
	<input type="text" name="f3" maxlength=2 size=3 value="<!-- TMPL_VAR name="f3" -->">
</p>

<p>
	<label style="width:20em;">Secondes (compléter avec des 0)</label>
	<input type="text" name="f4" maxlength=2 size=3 value="<!-- TMPL_VAR name="f4" -->">
</p>


<br>
<p>
	<label style="width:20em;">&nbsp;</label>
	<input type="submit" value="OK" class="button authority">
</p>

</form>
</div>
<script>
	function report() {
document.f_pop.f2.value=document.f_pop.f2.value+'   ';
document.f_pop.f3.value=document.f_pop.f3.value+'  ';
document.f_pop.f4.value=document.f_pop.f4.value+'  ';



document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);


		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
		self.close();
		return false;
	}
</script>
<!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:26:59 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:26:59 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_123j.tmpl,NONE,1.1
Message-ID: <E1Ddrb1-0007yi-JK@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30653/koha-tmpl/intranet-tmpl/default/fr/value_builder

Added Files:
	unimarc_field_123j.tmpl 
Log Message:
Template for 123j field plugin

--- NEW FILE ---
<!-- TMPL_INCLUDE Name="popup-top.inc" -->
<div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
<h1 class="authority">Assistant champ codé 123i</h1>
<form name="f_pop" onSubmit="javascript:report()">

<p>
	<label style="width:20em;">Hémisphère</label>
	<select name="f1" size="1">
		<!-- TMPL_IF name="f1 " -->
		<option value=" " SELECTED>Aucun</option>
		<!-- TMPL_ELSE -->
		<option value=" ">Aucun</option>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF name="f1w" -->
		<option value="w" SELECTED>Ouest</option>
		<!-- TMPL_ELSE -->
		<option value="w">Ouest</option>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF name="f1e" -->
		<option value="e" SELECTED>Est</option>
		<!-- TMPL_ELSE -->
		<option value="e">Est</option>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF name="f1n" -->
		<option value="n" SELECTED>Nord</option>
		<!-- TMPL_ELSE -->
		<option value="n">Nord</option>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF name="f1s" -->
		<option value="s" SELECTED>Sud</option>
		<!-- TMPL_ELSE -->
		<option value="s">Sud</option>
		<!-- /TMPL_IF -->
	</select>
</p>	

<p>
	<label style="width:20em;">Degrés (compléter avec des 0)</label>
	<input type="text" name="f2" maxlength=3 size=4 value="<!-- TMPL_VAR name="f2" -->">
</p>

<p>
	<label style="width:20em;">Minutes (compléter avec des 0)</label>
	<input type="text" name="f3" maxlength=2 size=3 value="<!-- TMPL_VAR name="f3" -->">
</p>

<p>
	<label style="width:20em;">Secondes (compléter avec des 0)</label>
	<input type="text" name="f4" maxlength=2 size=3 value="<!-- TMPL_VAR name="f4" -->">
</p>


<br>
<p>
	<label style="width:20em;">&nbsp;</label>
	<input type="submit" value="OK" class="button authority">
</p>

</form>
</div>
<script>
	function report() {
document.f_pop.f2.value=document.f_pop.f2.value+'   ';
document.f_pop.f3.value=document.f_pop.f3.value+'  ';
document.f_pop.f4.value=document.f_pop.f4.value+'  ';



document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);


		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
		self.close();
		return false;
	}
</script>
<!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:27:22 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:27:22 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_124a.tmpl,1.2,1.3
Message-ID: <E1DdrbO-00082i-Pq@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30874/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_124a.tmpl 
Log Message:
Template for 124a field plugin

Index: unimarc_field_124a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124a.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_124a.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_124a.tmpl	2 Jun 2005 15:27:20 -0000	1.3
***************
*** 1,47 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 124a</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Origine de l'image:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Image non-photographique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Image non-photographique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Image photographique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Image photographique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Image de teledetection</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Image de teledetection</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,49 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 124a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Origine de l'image</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Image non-photographique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Image non-photographique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Image photographique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Image photographique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Image de télédétection</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Image de télédétection</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:27:44 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:27:44 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_124b.tmpl,1.2,1.3
Message-ID: <E1Ddrbk-00085l-JS@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31055/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_124b.tmpl 
Log Message:
Template for 124b field plugin

Index: unimarc_field_124b.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124b.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_124b.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_124b.tmpl	2 Jun 2005 15:27:42 -0000	1.3
***************
*** 1,87 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 124b</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Forme du document cartographique:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Atlas</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Atlas</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Diagramme</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Diagramme</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Globe</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Globe</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1d" -->

! 				<option value="d" SELECTED>Carte</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Carte</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Maquette</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Maquette</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1f" -->

! 				<option value="f" SELECTED>Profil</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Profil</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1g" -->

! 				<option value="g" SELECTED>Image de teledetection</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">Image de teledetection</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1h" -->

! 				<option value="h" SELECTED>Coupe</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Coupe</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1i" -->

! 				<option value="i" SELECTED>Vue</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="i">Vue</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1j" -->

! 				<option value="j" SELECTED>Plan</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="j">Plan</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,90 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 124b</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Forme du document cartographique</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Atlas</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Atlas</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Diagramme</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Diagramme</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Globe</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Globe</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1d" -->
! 		<option value="d" SELECTED>Carte</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Carte</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Maquette</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Maquette</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1f" -->
! 		<option value="f" SELECTED>Profil</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Profil</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1g" -->
! 		<option value="g" SELECTED>Image de télédétection</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Image de télédétection</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1h" -->
! 		<option value="h" SELECTED>Coupe</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Coupe</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1i" -->
! 		<option value="i" SELECTED>Vue</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="i">Vue</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1j" -->
! 		<option value="j" SELECTED>Plan</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="j">Plan</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:28:08 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:28:08 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_124c.tmpl,1.2,1.3
Message-ID: <E1Ddrc8-0008Aj-Uh@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31368/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_124c.tmpl 
Log Message:
Template for 124c field plugin

Index: unimarc_field_124c.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124c.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_124c.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_124c.tmpl	2 Jun 2005 15:28:06 -0000	1.3
***************
*** 1,142 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 124c</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Presentation technique dans le cas d'images photographiques ou non photographiques:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1  " -->

! 				<option value="  " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="  ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1aa" -->

! 				<option value="aa" SELECTED>Anaglyphique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="aa">Anaglyphique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ab" -->

! 				<option value="ab" SELECTED>Polarisee</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ab">Polarisee</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ac" -->

! 				<option value="ac" SELECTED>Planimetrique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ac">Planimetrique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ad" -->

! 				<option value="ad" SELECTED>Carte diagramme</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ad">Carte diagramme</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ae" -->

! 				<option value="ae" SELECTED>Carte par courbes de niveau</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ae">Carte par courbes de niveau</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1af" -->

! 				<option value="af" SELECTED>Carte par points</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="af">Carte par points</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ag" -->

! 				<option value="ag" SELECTED>Carte diagrammatique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ag">Carte diagrammatique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ah" -->

! 				<option value="ah" SELECTED>Choroplethe</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ah">Choroplethe</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ai" -->

! 				<option value="ai" SELECTED>Chorochromatique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ai">Chorochromatique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1aj" -->

! 				<option value="aj" SELECTED>Dasymetrique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="aj">Dasymetrique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ak" -->

! 				<option value="ak" SELECTED>Isoplethe</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ak">Isoplethe</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1am" -->

! 				<option value="am" SELECTED>Anamorphique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="am">Anamorphique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1an" -->

! 				<option value="an" SELECTED>Carte peinte</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="an">Carte peinte</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ao" -->

! 				<option value="ao" SELECTED>Representation des volumes en 2 dimensions</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ao">Representation des volumes en 2 dimensions</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ap" -->

! 				<option value="ap" SELECTED>Carte mentale ou cognitive</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ap">Carte mentale ou cognitive</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1aq" -->

! 				<option value="aq" SELECTED>Vues avec horizon</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="aq">Vues avec horizon</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ar" -->

! 				<option value="ar" SELECTED>Vues sans horizon</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ar">Vues sans horizon</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1as" -->

! 				<option value="as" SELECTED>Infographie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="as">Infographie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1da" -->

! 				<option value="da" SELECTED>Pictocarte</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="da">Pictocarte</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1db" -->

! 				<option value="db" SELECTED>Carte par pointille</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="db">Carte par pointille</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1dc" -->

! 				<option value="dc" SELECTED>Tramee</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="dc">Tramee</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1dd" -->

! 				<option value="dd" SELECTED>Non tramee</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="dd">Non tramee</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,145 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 124c</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:25em;">Présentation technique dans le cas d'images photographiques ou non photographiques</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1  " -->
! 		<option value="  " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="  ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1aa" -->
! 		<option value="aa" SELECTED>Anaglyphique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="aa">Anaglyphique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ab" -->
! 		<option value="ab" SELECTED>Polarisée</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ab">Polarisée</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ac" -->
! 		<option value="ac" SELECTED>Planimétrique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ac">Planimétrique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ad" -->
! 		<option value="ad" SELECTED>Carte diagramme</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ad">Carte diagramme</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ae" -->
! 		<option value="ae" SELECTED>Carte par courbes de niveau</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ae">Carte par courbes de niveau</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1af" -->
! 		<option value="af" SELECTED>Carte par points</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="af">Carte par points</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ag" -->
! 		<option value="ag" SELECTED>Carte diagrammatique (c'est-à-dire cartogramme)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ag">Carte diagrammatique (c'est-à-dire cartogramme)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ah" -->
! 		<option value="ah" SELECTED>Choroplethe</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ah">Choroplethe</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ai" -->
! 		<option value="ai" SELECTED>Chorochromatique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ai">Chorochromatique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1aj" -->
! 		<option value="aj" SELECTED>Dasymétrique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="aj">Dasymétrique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ak" -->
! 		<option value="ak" SELECTED>Isoplethe</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ak">Isoplethe</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1am" -->
! 		<option value="am" SELECTED>Anamorphique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="am">Anamorphique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1an" -->
! 		<option value="an" SELECTED>Carte peinte</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="an">Carte peinte</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ao" -->
! 		<option value="ao" SELECTED>Représentation des volumes en 2 dimensions</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ao">Représentation des volumes en 2 dimensions</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ap" -->
! 		<option value="ap" SELECTED>Carte mentale ou cognitive</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ap">Carte mentale ou cognitive</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1aq" -->
! 		<option value="aq" SELECTED>Vues avec horizon (y compris les vues panoramiques)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="aq">Vues avec horizon (y compris les vues panoramiques)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ar" -->
! 		<option value="ar" SELECTED>Vues sans horizon (y compris les vues panoramiques)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ar">Vues sans horizon (y compris les vues panoramiques)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1as" -->
! 		<option value="as" SELECTED>Infographie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="as">Infographie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1da" -->
! 		<option value="da" SELECTED>Pictocarte</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="da">Pictocarte</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1db" -->
! 		<option value="db" SELECTED>Carte par pointillé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="db">Carte par pointillé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1dc" -->
! 		<option value="dc" SELECTED>Tramée</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="dc">Tramée</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1dd" -->
! 		<option value="dd" SELECTED>Non tramée</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="dd">Non tramée</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:25em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:28:37 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:28:37 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_124d.tmpl,1.2,1.3
Message-ID: <E1Ddrcb-0008E5-BN@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31558/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_124d.tmpl 
Log Message:
Template for 124d field plugin

Index: unimarc_field_124d.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124d.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_124d.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_124d.tmpl	2 Jun 2005 15:28:35 -0000	1.3
***************
*** 1,47 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 124d</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Position de la base pour les images photographiques ou de teledetection:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Terrestre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Terrestre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Aerienne</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Aerienne</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Spatiale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Spatiale</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,49 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 124d</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:25em;">Position de la base pour les images photographiques ou de télédétection</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Terrestre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Terrestre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Aérienne</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Aérienne</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Spatiale</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Spatiale</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:25em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:28:56 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:28:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_124e.tmpl,1.2,1.3
Message-ID: <E1Ddrcu-0008Hs-AM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31810/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_124e.tmpl 
Log Message:
Template for 124e field plugin

Index: unimarc_field_124e.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124e.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_124e.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_124e.tmpl	2 Jun 2005 15:28:54 -0000	1.3
***************
*** 1,47 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 124e</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Categorie du satellite pour la teledetection:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Meteorologique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Meteorologique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Exploration terrestre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Exploration terrestre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Observation spatiale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Observation spatiale</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,49 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 124e</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Catégorie du satellite pour la télédétection</label>
! 		<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Météorologique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Météorologique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Exploration terrestre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Exploration terrestre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Observation spatiale</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Observation spatiale</option>
! 		<!-- /TMPL_IF -->
! 		</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:29:15 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:29:15 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_124f.tmpl,1.2,1.3
Message-ID: <E1DdrdD-0008Lo-CU@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32053/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_124f.tmpl 
Log Message:
Template for 124f field plugin

Index: unimarc_field_124f.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124f.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_124f.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_124f.tmpl	2 Jun 2005 15:29:13 -0000	1.3
***************
*** 1,122 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 124f</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Nom du satellite pour la teledetection:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1  " -->

! 				<option value="  " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="  ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1aa" -->

! 				<option value="aa" SELECTED>Tiros</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="aa">Tiros</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ab" -->

! 				<option value="ab" SELECTED>ATS</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ab">ATS</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ac" -->

! 				<option value="ac" SELECTED>NOAA</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ac">NOAA</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ad" -->

! 				<option value="ad" SELECTED>Nimbus</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ad">Nimbus</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ae" -->

! 				<option value="ae" SELECTED>METEOSAT</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ae">METEOSAT</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ma" -->

! 				<option value="ma" SELECTED>Explorer I</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ma">Explorer I</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1mb" -->

! 				<option value="mb" SELECTED>Explorer II</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="mb">Explorer II</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ga" -->

! 				<option value="ga" SELECTED>ERTS</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ga">ERTS</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gb" -->

! 				<option value="gb" SELECTED>Landsat I</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gb">Landsat I</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gc" -->

! 				<option value="gc" SELECTED>Landsat II</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gc">Landsat II</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gd" -->

! 				<option value="gd" SELECTED>Landsat III</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gd">Landsat III</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ge" -->

! 				<option value="ge" SELECTED>Seasat</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ge">Seasat</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gf" -->

! 				<option value="gf" SELECTED>Skylab</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gf">Skylab</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gg" -->

! 				<option value="gg" SELECTED>Spacelab</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gg">Spacelab</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gk" -->

! 				<option value="gk" SELECTED>Spot 1</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gk">Spot 1</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gl" -->

! 				<option value="gl" SELECTED>Spot 2</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gl">Spot 2</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gm" -->

! 				<option value="gm" SELECTED>Spot 3</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gm">Spot 3</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gz" -->

! 				<option value="gz" SELECTED>Autres codes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gz">Autres codes</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,127 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 124f</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Nom du satellite pour la télédétection</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1  " -->
! 		<option value="  " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="  ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Météorologique :</option>
! 		<!-- TMPL_IF name="f1aa" -->
! 		<option value="aa" SELECTED>Tiros</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="aa">Tiros</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ab" -->
! 		<option value="ab" SELECTED>ATS</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ab">ATS</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ac" -->
! 		<option value="ac" SELECTED>NOAA</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ac">NOAA</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ad" -->
! 		<option value="ad" SELECTED>Nimbus</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ad">Nimbus</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ae" -->
! 		<option value="ae" SELECTED>METEOSAT</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ae">METEOSAT</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Exploration spatiale :</option>
! 		<!-- TMPL_IF name="f1ma" -->
! 		<option value="ma" SELECTED>Explorer I</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ma">Explorer I</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1mb" -->
! 		<option value="mb" SELECTED>Explorer II</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="mb">Explorer II</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Exploration terrestre :</option>
! 		<!-- TMPL_IF name="f1ga" -->
! 		<option value="ga" SELECTED>ERTS</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ga">ERTS</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gb" -->
! 		<option value="gb" SELECTED>Landsat I</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gb">Landsat I</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gc" -->
! 		<option value="gc" SELECTED>Landsat II</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gc">Landsat II</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gd" -->
! 		<option value="gd" SELECTED>Landsat III</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gd">Landsat III</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ge" -->
! 		<option value="ge" SELECTED>Seasat</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ge">Seasat</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gf" -->
! 		<option value="gf" SELECTED>Skylab</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gf">Skylab</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gg" -->
! 		<option value="gg" SELECTED>Spacelab</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gg">Spacelab</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gk" -->
! 		<option value="gk" SELECTED>Spot 1</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gk">Spot 1</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gl" -->
! 		<option value="gl" SELECTED>Spot 2</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gl">Spot 2</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gm" -->
! 		<option value="gm" SELECTED>Spot 3</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gm">Spot 3</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gz" -->
! 		<option value="gz" SELECTED>Autres codes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gz">Autres codes</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:29:35 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:29:35 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_124g.tmpl,1.2,1.3
Message-ID: <E1DdrdX-0008OS-Tk@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32240/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_124g.tmpl 
Log Message:
Template for 124g field plugin

Index: unimarc_field_124g.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124g.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_124g.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_124g.tmpl	2 Jun 2005 15:29:33 -0000	1.3
***************
*** 1,82 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 124g</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Technique d'enregistrement pour les images de teledetection:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1  " -->

! 				<option value="  " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="  ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1aa" -->

! 				<option value="aa" SELECTED>Enregistrement video</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="aa">Enregistrement video</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ab" -->

! 				<option value="ab" SELECTED>Photographie en fausse couleur</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ab">Photographie en fausse couleur</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ac" -->

! 				<option value="ac" SELECTED>Photographie multispectrale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ac">Photographie multispectrale</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ad" -->

! 				<option value="ad" SELECTED>Balayage multispectrale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ad">Balayage multispectrale</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1av" -->

! 				<option value="av" SELECTED>Combinaisons de techniques en faible emission</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="av">Combinaisons de techiques en faible emission</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1da" -->

! 				<option value="da" SELECTED>Balayage par ligne infrarouge</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="da">Balayage par ligne infrarouge</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1dv" -->

! 				<option value="dv" SELECTED>Combinaisons de techniques diverses de detection thermique par infrarouge</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="dv">Combinaisons de techiques diverses de detection thermique par infrarouge</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ga" -->

! 				<option value="ga" SELECTED>Sidelooking Airbone Radar</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ga">Sidelooking Airbone Radar</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gb" -->

! 				<option value="gb" SELECTED>Synthetic Aperture Radar</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gb">Synthetic Aperture Radar</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gc" -->

! 				<option value="gc" SELECTED>Couverture passive par ondes micrometriques</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gc">Couverture passive par onde micrometrique</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,87 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 124g</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:18em;">Technique d'enregistrement pour les images de télédétection</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1  " -->
! 		<option value="  " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="  ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Emission faible :</option>
! 		<!-- TMPL_IF name="f1aa" -->
! 		<option value="aa" SELECTED>Enregistrement vidéo</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="aa">Enregistrement vidéo</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ab" -->
! 		<option value="ab" SELECTED>Photographie en fausse couleur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ab">Photographie en fausse couleur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ac" -->
! 		<option value="ac" SELECTED>Photographie multispectrale</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ac">Photographie multispectrale</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ad" -->
! 		<option value="ad" SELECTED>Balayage multispectral</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ad">Balayage multispectral</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1av" -->
! 		<option value="av" SELECTED>Combinaisons de techniques en faible émission</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="av">Combinaisons de techiques en faible émission</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Détection thermique par infrarouge :</option>
! 		<!-- TMPL_IF name="f1da" -->
! 		<option value="da" SELECTED>Balayage par ligne infrarouge</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="da">Balayage par ligne infrarouge</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1dv" -->
! 		<option value="dv" SELECTED>Combinaisons de techniques diverses de détection thermique par infrarouge</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="dv">Combinaisons de techiques diverses de détection thermique par infrarouge</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Emission d'ondes micrométriques :</option>
! 		<!-- TMPL_IF name="f1ga" -->
! 		<option value="ga" SELECTED>Sidelooking Airbone Radar (SLAR)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ga">Sidelooking Airbone Radar (SLAR)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gb" -->
! 		<option value="gb" SELECTED>Synthetic Aperture Radar (SAR)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gb">Synthetic Aperture Radar (SAR)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gc" -->
! 		<option value="gc" SELECTED>Couverture passive par ondes micrométriques</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gc">Couverture passive par ondes micrométriques</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:18em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:30:07 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:30:07 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_125a.tmpl,1.2,1.3
Message-ID: <E1Ddre3-0008TM-Tf@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32474/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_125a.tmpl 
Log Message:
Template for 125a field plugin

Index: unimarc_field_125a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_125a.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_125a.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_125a.tmpl	2 Jun 2005 15:30:05 -0000	1.3
***************
*** 1,113 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 125a</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Type de partition:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Partition d'orchestre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Partition d'orchestre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Partition miniature ou d'etude</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Partition miniature ou d'etude</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Partition chant, accompagnement reduit pour le piano</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Partition chant, accompagnement reduit pour le piano</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1d" -->

! 				<option value="d" SELECTED>Partition vocale, partition chorale, sans accompagnement</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Partition vocale, partition chorale, sans accompagnement</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Partition condensee, partition de direction a partir du piano</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Partition condensee, partition de direction a partir du piano</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1g" -->

! 				<option value="g" SELECTED>Partition combinee dans laquelle plusieurs voix sont sur la meme portee</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">Partition combinee dans laquelle plusieurs voix sont sur la meme portee</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1m" -->

! 				<option value="m" SELECTED>Formes diverses</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="m">Formes diverses</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1x" -->

! 				<option value="x" SELECTED>Non applicable ce n'est pas une partition</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="x">Non applicable ce n'est pas une partition</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr>

! 		<td>Indicateur de parties:</td>

! 		<td>

! 			<select name="f2" size="1">

! 			<!-- TMPL_IF name="f2 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2a" -->

! 				<option value="a" SELECTED>Parties existantes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Parties existantes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2x" -->

! 				<option value="x" SELECTED>Non applicable</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="x">Non applicable</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2y" -->

! 				<option value="y" SELECTED>Parties inexistantes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="y">Parties inexistantes</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,115 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 125a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Type de partition</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Partition d'orchestre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Partition d'orchestre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Partition miniature ou d'étude</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Partition miniature ou d'étude</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Partition chant, accompagnement réduit pour le piano</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Partition chant, accompagnement réduit pour le piano</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1d" -->
! 		<option value="d" SELECTED>Partition vocale, partition chorale, sans accompagnement</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Partition vocale, partition chorale, sans accompagnement</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Partition condensée, partition de direction à partir du piano</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Partition condensée, partition de direction à partir du piano</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1g" -->
! 		<option value="g" SELECTED>Partition combinée dans laquelle plusieurs voix sont sur la meme portée</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Partition combineée dans laquelle plusieurs voix sont sur la meme portée</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1m" -->
! 		<option value="m" SELECTED>Formes diverses</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="m">Formes diverses</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1x" -->
! 		<option value="x" SELECTED>Non applicable ce n'est pas une partition</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="x">Non applicable ce n'est pas une partition</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Indicateur de parties</label>
! 	<select name="f2" size="1">
! 		<!-- TMPL_IF name="f2 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2a" -->
! 		<option value="a" SELECTED>Parties existantes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Parties existantes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2x" -->
! 		<option value="x" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="x">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2y" -->
! 		<option value="y" SELECTED>Parties inexistantes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="y">Parties inexistantes</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:30:24 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:30:24 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_125b.tmpl,1.2,1.3
Message-ID: <E1DdreK-00005f-L6@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv311/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_125b.tmpl 
Log Message:
Template for 125b field plugin

Index: unimarc_field_125b.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_125b.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_125b.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_125b.tmpl	2 Jun 2005 15:30:22 -0000	1.3
***************
*** 1,137 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 125b</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Forme du document cartographique:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Poesie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Poesie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Theatre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Theatre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Fiction</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Fiction</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1d" -->

! 				<option value="d" SELECTED>Histoire</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Histoire</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Conferences, discours</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Conferences, discours</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1f" -->

! 				<option value="f" SELECTED>Instructions</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Instructions</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1g" -->

! 				<option value="g" SELECTED>Sons</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">Sons</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1h" -->

! 				<option value="h" SELECTED>Autobiographie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Autobiographie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1i" -->

! 				<option value="i" SELECTED>Biographie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="i">Biographie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1j" -->

! 				<option value="j" SELECTED>Essais</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="j">Essais</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1k" -->

! 				<option value="k" SELECTED>Comptes-rendus</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="k">Comptes-rendus</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1l" -->

! 				<option value="l" SELECTED>Memoires</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="l">Memoires</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1m" -->

! 				<option value="m" SELECTED>Repetition</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="m">Repetition</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1n" -->

! 				<option value="n" SELECTED>Entretiens</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="n">Entretiens</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1o" -->

! 				<option value="o" SELECTED>Textes publicitaires</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="o">Textes publicitaires</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1p" -->

! 				<option value="p" SELECTED>Cours de langues</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="p">Cours de langues</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1q" -->

! 				<option value="q" SELECTED>Actes de colloque</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="q">Actes de colloque</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1r" -->

! 				<option value="r" SELECTED>Comedie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="r">Comedie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1s" -->

! 				<option value="s" SELECTED>Contes populaires</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="s">Contes populaires</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1t" -->

! 				<option value="t" SELECTED>Textes sacres</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="t">Textes sacres</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1z" -->

! 				<option value="z" SELECTED>Autres textes litteraires</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autres textes litteraires</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,139 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 125b</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Type de texte écrit</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Poésie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Poésie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Théâtre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Théâtre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Fiction</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Fiction</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1d" -->
! 		<option value="d" SELECTED>Histoire</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Histoire</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Conférences, discours</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Conférences, discours</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1f" -->
! 		<option value="f" SELECTED>Instructions</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Instructions</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1g" -->
! 		<option value="g" SELECTED>Sons</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Sons</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1h" -->
! 		<option value="h" SELECTED>Autobiographie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Autobiographie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1i" -->
! 		<option value="i" SELECTED>Biographie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="i">Biographie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1j" -->
! 		<option value="j" SELECTED>Essais</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="j">Essais</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1k" -->
! 		<option value="k" SELECTED>Comptes-rendus</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="k">Comptes-rendus</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1l" -->
! 		<option value="l" SELECTED>Mémoires</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="l">Mémoires</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1m" -->
! 		<option value="m" SELECTED>Répétition</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="m">Répétition</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1n" -->
! 		<option value="n" SELECTED>Entretiens</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Entretiens</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1o" -->
! 		<option value="o" SELECTED>Textes publicitaires</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="o">Textes publicitaires</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1p" -->
! 		<option value="p" SELECTED>Cours de langues</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="p">Cours de langues</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1q" -->
! 		<option value="q" SELECTED>Actes de colloque</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="q">Actes de colloque</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1r" -->
! 		<option value="r" SELECTED>Comédie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="r">Comédie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1s" -->
! 		<option value="s" SELECTED>Contes populaires</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="s">Contes populaires</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1t" -->
! 		<option value="t" SELECTED>Textes sacrés</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="t">Textes sacrés</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1z" -->
! 		<option value="z" SELECTED>Autres textes littéraires</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autres textes littéraires</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:30:48 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:30:48 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_126a.tmpl,1.2,1.3
Message-ID: <E1Ddrei-000086-4U@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv455/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_126a.tmpl 
Log Message:
Template for 126a field plugin

Index: unimarc_field_126a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_126a.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_126a.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_126a.tmpl	2 Jun 2005 15:30:45 -0000	1.3
***************
*** 1,1076 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 126a</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Presentation materielle:</td>

! 		<td>

[...2128 lines suppressed...]
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value+document.f_pop.f10.value+document.f_pop.f11.value+document.f_pop.f12.value+document.f_pop.f13.value+document.f_pop.f14.value+document.f_pop.f15.value ;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:31:06 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:31:06 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_126b.tmpl,1.2,1.3
Message-ID: <E1Ddrf0-0000CH-SE@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv713/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_126b.tmpl 
Log Message:
Template for 126b field plugin

Index: unimarc_field_126b.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_126b.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_126b.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_126b.tmpl	2 Jun 2005 15:31:04 -0000	1.3
***************
*** 1,194 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 126b</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Type de disque, cylindre ou bande magnetique:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Gravure directe</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Gravure directe</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Production industrielle</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Production industrielle</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Bande "Master"</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Bande "Master"</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1d" -->

! 				<option value="d" SELECTED>Bande reproduite a partir du "master"</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Bande reproduite a partir du master</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Disque "pere" (negatif)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Disque "pere" (negatif)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1f" -->

! 				<option value="f" SELECTED>Disque "mere" (positif)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Disque "mere" (positif)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1g" -->

! 				<option value="g" SELECTED>Matrice (negatif)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">Matrice (negatif)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1h" -->

! 				<option value="h" SELECTED>Pressage de test</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Pressage de test</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr>

! 		<td>Type de document:</td>

! 		<td>

! 			<select name="f2" size="1">

! 			<!-- TMPL_IF name="f2 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2x" -->

! 				<option value="x" SELECTED>Non applicable</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="x">Non applicable</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2g" -->

! 				<option value="g" SELECTED>Cire (gravure directe)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">Cire (gravure directe)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2h" -->

! 				<option value="h" SELECTED>Plastique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Plastique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2a" -->

! 				<option value="a" SELECTED>Laque</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Laque</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2b" -->

! 				<option value="b" SELECTED>Metal</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Metal</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2c" -->

! 				<option value="c" SELECTED>Pressage laque</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Pressage laque</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2d" -->

! 				<option value="d" SELECTED>Pressage plastique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Pressage plastique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2e" -->

! 				<option value="e" SELECTED>Metal et plastique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Metal et plastique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2i" -->

! 				<option value="i" SELECTED>Dos papier</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="i">Dos papier</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2j" -->

! 				<option value="j" SELECTED>Acetate</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="j">Acetate</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2k" -->

! 				<option value="k" SELECTED>P.V.C.</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="k">P.V.C.</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2l" -->

! 				<option value="l" SELECTED>Polyester</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="l">Polyester</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr>

! 		<td>Type de gravure:</td>

! 		<td>

! 			<select name="f3" size="1">

! 			<!-- TMPL_IF name="f3 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3a" -->

! 				<option value="a" SELECTED>Gravure laterale ou combinee</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Gravure laterale ou combinee</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3b" -->

! 				<option value="b" SELECTED>Gravure verticale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Gravure verticale</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3u" -->

! 				<option value="u" SELECTED>Gravure inconnue</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Gravure inconnue</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3x" -->

! 				<option value="x" SELECTED>Non applicable</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="x">Non applicable</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value ;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,199 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 126b</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:22em;">Type de disque, cylindre ou bande magnétique</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Gravure directe</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Gravure directe</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Production industrielle</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Production industrielle</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Bande "master"</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Bande "master"</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1d" -->
! 		<option value="d" SELECTED>Bande reproduite à partir du "master"</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Bande reproduite à partir du "master"</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Disque "père" (négatif)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Disque "père" (négatif)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1f" -->
! 		<option value="f" SELECTED>Disque "mère" (positif)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Disque "mère" (positif)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1g" -->
! 		<option value="g" SELECTED>Matrice (négatif)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Matrice (négatif)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1h" -->
! 		<option value="h" SELECTED>Pressage de test</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Pressage de test</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:22em;">Type de document</label>
! 	<select name="f2" size="1">
! 		<!-- TMPL_IF name="f2 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2x" -->
! 		<option value="x" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="x">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Disques :</option>
! 		<!-- TMPL_IF name="f2a" -->
! 		<option value="a" SELECTED>Laque</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Laque</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2b" -->
! 		<option value="b" SELECTED>Métal</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Métal</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2c" -->
! 		<option value="c" SELECTED>Pressage laque</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Pressage laque</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2d" -->
! 		<option value="d" SELECTED>Pressage plastique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Pressage plastique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2e" -->
! 		<option value="e" SELECTED>Métal et plastique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Métal et plastique</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Cylindres :</option>
! 		<!-- TMPL_IF name="f2g" -->
! 		<option value="g" SELECTED>Cire (gravure directe)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Cire (gravure directe)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2h" -->
! 		<option value="h" SELECTED>Plastique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Plastique</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Bandes :</option>
! 		<!-- TMPL_IF name="f2i" -->
! 		<option value="i" SELECTED>Dos papier</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="i">Dos papier</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2j" -->
! 		<option value="j" SELECTED>Acétate</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="j">Acétate</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2k" -->
! 		<option value="k" SELECTED>P.V.C.</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="k">P.V.C.</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2l" -->
! 		<option value="l" SELECTED>Polyester</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="l">Polyester</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:22em;">Type de gravure</label>
! 	<select name="f3" size="1">
! 		<!-- TMPL_IF name="f3 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3a" -->
! 		<option value="a" SELECTED>Gravure latérale ou combinée</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Gravure latérale ou combinée</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3b" -->
! 		<option value="b" SELECTED>Gravure verticale</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Gravure verticale</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3u" -->
! 		<option value="u" SELECTED>Gravure inconnue</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Gravure inconnue</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3x" -->
! 		<option value="x" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="x">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:22em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value ;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:31:30 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:31:30 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_127.tmpl,1.1,1.2
Message-ID: <E1DdrfO-0000F8-0p@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv890/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_127.tmpl 
Log Message:
Template for 127a field plugin

Index: unimarc_field_127.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_127.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_127.tmpl	24 Nov 2004 16:21:17 -0000	1.1
--- unimarc_field_127.tmpl	2 Jun 2005 15:31:27 -0000	1.2
***************
*** 1,46 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 127</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! <tr>(Completer avec des 0 a gauche)</tr>

! <tr>          <td>Heure:</td>

!                          <td><input type="text" name="f1" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f1" -->"></td>

!           <td>Minutes:</td>

!                          <td><input type="text" name="f2" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f2" -->"></td>

!           <td>Secondes:</td>

!                          <td><input type="text" name="f3" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f3" -->"></td>

! </tr>

! 

! 

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! document.f_pop.f1.value=document.f_pop.f1.value+'   ';

! document.f_pop.f2.value=document.f_pop.f2.value+'  ';

! document.f_pop.f3.value=document.f_pop.f3.value+'  ';

! 

! 

! 

! document.f_pop.f1.value=document.f_pop.f1.value.substring(0,2);

! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,2);

! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,45 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 127a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Durée (compléter avec des 0 à gauche)</label>
! 	<label style="width:6em;">Heures</label><input type="text" name="f1" maxlength=2 size=3 value="<!-- TMPL_VAR name="f1" -->">
! </p>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<label style="width:6em;">Minutes</label><input type="text" name="f2" maxlength=2 size=3 value="<!-- TMPL_VAR name="f2" -->">
! </p>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<label style="width:6em;">Secondes</label><input type="text" name="f3" maxlength=2 size=3 value="<!-- TMPL_VAR name="f3" -->">
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! document.f_pop.f1.value=document.f_pop.f1.value+'   ';
! document.f_pop.f2.value=document.f_pop.f2.value+'  ';
! document.f_pop.f3.value=document.f_pop.f3.value+'  ';
! 
! 
! 
! document.f_pop.f1.value=document.f_pop.f1.value.substring(0,2);
! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,2);
! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:32:52 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:32:52 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_128c.tmpl,1.2,1.3
Message-ID: <E1Ddrgi-0000RV-TD@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1665/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_128c.tmpl 
Log Message:
Template for 128c field plugin

Index: unimarc_field_128c.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_128c.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_128c.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_128c.tmpl	2 Jun 2005 15:32:50 -0000	1.3
***************
*** 1,472 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 128c</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Instruments ou voix dans un ensemble:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1  " -->

! 				<option value="  " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="  ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ba" -->

! 				<option value="ba" SELECTED>Cor</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ba">Cor</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bb" -->

! 				<option value="bb" SELECTED>Trompette</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bb">Trompette</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bc" -->

! 				<option value="bc" SELECTED>Cornet a piston</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bc">Cornet a piston</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bd" -->

! 				<option value="bd" SELECTED>Trombone</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bd">Trombone</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1be" -->

! 				<option value="be" SELECTED>Tuba</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="be">Tuba</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bf" -->

! 				<option value="bf" SELECTED>Saxophone</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bf">Saxophone</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bt" -->

! 				<option value="bt" SELECTED>Ethniques</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bt">Ethniques</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bu" -->

! 				<option value="bu" SELECTED>Non precise (Cuivre)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bu">Non precise (Cuivre)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bz" -->

! 				<option value="bz" SELECTED>Autre cuivre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bz">Autre cuivre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ca" -->

! 				<option value="ca" SELECTED>Mixtes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ca">Mixtes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cb" -->

! 				<option value="cb" SELECTED>Femmes </option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cb">Femmes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cc" -->

! 				<option value="cc" SELECTED>Hommes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cc">Hommes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cd" -->

! 				<option value="cd" SELECTED>Enfants</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cd">Enfants</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ct" -->

! 				<option value="ct" SELECTED>Ethniques</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ct">Ethniques</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cu" -->

! 				<option value="cu" SELECTED>Non precise (Choeurs)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cu">Non precise (Choeurs)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1oa" -->

! 				<option value="oa" SELECTED>Orchestre symphonique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="oa">Orchestre symphonique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ob" -->

! 				<option value="ob" SELECTED>Orchestre de chambre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ob">Orchestre de chambre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1oc" -->

! 				<option value="oc" SELECTED>Orchestres a cordes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="oc">Orchestres a cordes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1od" -->

! 				<option value="od" SELECTED>Fanfare</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="od">Fanfare</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1oe" -->

! 				<option value="oe" SELECTED>Orchestre de danse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="oe">Orchestre de danse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1of" -->

! 				<option value="of" SELECTED>Grand ensemble - orchestre de cuivres</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="of">Grand ensemble - orchestre de cuivres</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ot" -->

! 				<option value="ot" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ot">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ou" -->

! 				<option value="ou" SELECTED>Non precise (orchestre)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ou">Non precise (orchestre)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1oz" -->

! 				<option value="oz" SELECTED>Autre orchestre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="oz">Autre orchestre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pa" -->

! 				<option value="pa" SELECTED>Tympanon</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pa">Tympanon</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pb" -->

! 				<option value="pb" SELECTED>Xylophone</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pb">Xylophone</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pc" -->

! 				<option value="pc" SELECTED>Marimba</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pc">Marimba</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pd" -->

! 				<option value="pd" SELECTED>Tambour, batterie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pd">Tambour, batterie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pt" -->

! 				<option value="pt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pu" -->

! 				<option value="pu" SELECTED>Non precise (percussion)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pu">Non precise (percussion)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pz -->

! 				<option value="pz" SELECTED>Autre percussions</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pz">Autre percussions</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sa" -->

! 				<option value="sa" SELECTED>Violon</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sa">Violon</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sb" -->

! 				<option value="sb" SELECTED>Alto</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sb">Alto</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sc" -->

! 				<option value="sc" SELECTED>Violoncelle</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sc">Violoncelle</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sd" -->

! 				<option value="sd" SELECTED>Contrebasse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sd">Contrebasse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1se" -->

! 				<option value="se" SELECTED>Viole</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="se">Viole</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sf" -->

! 				<option value="sf" SELECTED>Viole d'amour</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sf">Viole d'amour</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sg" -->

! 				<option value="sg" SELECTED>Viole de gambe</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sg">Viole de gambe</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1st" -->

! 				<option value="st" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="st">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1su" -->

! 				<option value="su" SELECTED>Non precise (Corde frottee)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="su">Non precise (Corde frottee)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sz" -->

! 				<option value="sz" SELECTED>Autre (Corde frottee)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sz">Autre (Corde frottee)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1uu" -->

! 				<option value="uu" SELECTED>Non precise (Non precise)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="uu">Non precise (Non precise)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ea" -->

! 				<option value="ea" SELECTED>Synthetiseur</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ea">Synthetiseur</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1eb" -->

! 				<option value="eb" SELECTED>Bande magnetique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="eb">Bande magnetique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ec" -->

! 				<option value="ec" SELECTED>Ordinateur</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ec">Ordinateur</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ed" -->

! 				<option value="ed" SELECTED>Ondes Martenot</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ed">Ondes Martenot</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1eu" -->

! 				<option value="eu" SELECTED>Non precise (Electronique)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="eu">Non precise (Electronique)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ez" -->

! 				<option value="ez" SELECTED>Autre (Electronique)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ez">Autre (Electronique)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ka" -->

! 				<option value="ka" SELECTED>Piano</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ka">Piano</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kb" -->

! 				<option value="kb" SELECTED>Orgue</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kb">Orgue</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kc" -->

! 				<option value="kc" SELECTED>Clavecin</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kc">Clavecin</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kd" -->

! 				<option value="kd" SELECTED>Clavicorde</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kd">Clavicorde</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ke" -->

! 				<option value="ke" SELECTED>Continuo</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ke">Continuo</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kf" -->

! 				<option value="kf" SELECTED>Celesta</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kf">Celesta</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kt" -->

! 				<option value="kt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ku" -->

! 				<option value="ku" SELECTED>Non precise (clavier)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ku">Non precise (clavier)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kz" -->

! 				<option value="kz" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kz">Autre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1va" -->

! 				<option value="va" SELECTED>Soprano</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="va">Soprano</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vb" -->

! 				<option value="vb" SELECTED>Mezzo-soprano</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vb">Mezzo-soprano</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vc" -->

! 				<option value="vc" SELECTED>Alto</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vc">Alto</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vd" -->

! 				<option value="vd" SELECTED>Tenor</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vd">Tenor</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ve" -->

! 				<option value="ve" SELECTED>Baryton</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ve">Baryton</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vf" -->

! 				<option value="vf" SELECTED>Basse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vf">Basse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vg" -->

! 				<option value="vg" SELECTED>Haute contre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vg">Haute contre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vh" -->

! 				<option value="vh" SELECTED>Voix aigues</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vh">Voix aigues</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vi" -->

! 				<option value="vi" SELECTED>Voix medium</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vi">Voix medium</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vj" -->

! 				<option value="vj" SELECTED>Voix graves</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vj">Voix graves</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vt" -->

! 				<option value="vt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vu" -->

! 				<option value="vu" SELECTED>Non precise (Voix precise)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vu">Non precise (Voix precise)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ta" -->

! 				<option value="ta" SELECTED>Harpe</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ta">Harpe</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tb" -->

! 				<option value="tb" SELECTED>Famille de la guitare</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tb">Famille de la guitare</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tc" -->

! 				<option value="tc" SELECTED>Famille du luth</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tc">Famille du luth</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1td" -->

! 				<option value="td" SELECTED>Mandoline</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="td">Mandoline</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tt" -->

! 				<option value="tt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tu" -->

! 				<option value="tu" SELECTED>Non precise (Cordes pincees)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tu">Non precise (Cordes pincees)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tz" -->

! 				<option value="tz" SELECTED>Autre corde pincee</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tz">Autre corde pincee</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wa" -->

! 				<option value="wa" SELECTED>Flute traversiere</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wa">Flute traversiere</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wb" -->

! 				<option value="wb" SELECTED>Hautbois</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wb">Hautbois</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wc" -->

! 				<option value="wc" SELECTED>Clarinette</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wc">Clarinette</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wd" -->

! 				<option value="wd" SELECTED>Basson</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wd">Basson</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1we" -->

! 				<option value="we" SELECTED>Piccolo</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="we">Piccolo</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wf" -->

! 				<option value="wf" SELECTED>Cor anglais</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wf">Cor anglais</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wg" -->

! 				<option value="wg" SELECTED>Clarinette basse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wg">Clarinette basse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wh" -->

! 				<option value="wh" SELECTED>Flute a bec </option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wh">Flute a bec</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wi" -->

! 				<option value="wi" SELECTED>Saxophone</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wi">Saxophone</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wt" -->

! 				<option value="wt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wu" -->

! 				<option value="wu" SELECTED>Non precise</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wu">Non precise</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wz" -->

! 				<option value="wz" SELECTED>Autre bois</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wz">Autre bois</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,493 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 128c</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:10em;">Instruments ou voix pour solistes</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1  " -->
! 		<option value="  " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="  ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Cuivres :</option>
! 		<!-- TMPL_IF name="f1ba" -->
! 		<option value="ba" SELECTED>Cor</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ba">Cor</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bb" -->
! 		<option value="bb" SELECTED>Trompette</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bb">Trompette</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bc" -->
! 		<option value="bc" SELECTED>Cornet à piston</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bc">Cornet à piston</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bd" -->
! 		<option value="bd" SELECTED>Trombone</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bd">Trombone</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1be" -->
! 		<option value="be" SELECTED>Tuba</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="be">Tuba</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bf" -->
! 		<option value="bf" SELECTED>Saxophone</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bf">Saxophone</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bt" -->
! 		<option value="bt" SELECTED>Ethniques</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bt">Ethniques</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bu" -->
! 		<option value="bu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bz" -->
! 		<option value="bz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Choeurs :</option>
! 		<!-- TMPL_IF name="f1ca" -->
! 		<option value="ca" SELECTED>Mixtes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ca">Mixtes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cb" -->
! 		<option value="cb" SELECTED>Femmes </option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cb">Femmes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cc" -->
! 		<option value="cc" SELECTED>Hommes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cc">Hommes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cd" -->
! 		<option value="cd" SELECTED>Enfants</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cd">Enfants</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ct" -->
! 		<option value="ct" SELECTED>Ethniques</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ct">Ethniques</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cu" -->
! 		<option value="cu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Orchestre :</option>
! 		<!-- TMPL_IF name="f1oa" -->
! 		<option value="oa" SELECTED>Orchestre symphonique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="oa">Orchestre symphonique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ob" -->
! 		<option value="ob" SELECTED>Orchestre de chambre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ob">Orchestre de chambre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1oc" -->
! 		<option value="oc" SELECTED>Orchestres à cordes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="oc">Orchestres à cordes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1od" -->
! 		<option value="od" SELECTED>Fanfare</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="od">Fanfare</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1oe" -->
! 		<option value="oe" SELECTED>Orchestre de danse</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="oe">Orchestre de danse</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1of" -->
! 		<option value="of" SELECTED>Grand ensemble - orchestre de cuivres (cuivres doublés ou non, avec ou sans percussions)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="of">Grand ensemble - orchestre de cuivres (cuivres doublés ou non, avec ou sans percussions)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ot" -->
! 		<option value="ot" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ot">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ou" -->
! 		<option value="ou" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ou">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1oz" -->
! 		<option value="oz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="oz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Percussions :</option>
! 		<!-- TMPL_IF name="f1pa" -->
! 		<option value="pa" SELECTED>Tympanon</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pa">Tympanon</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pb" -->
! 		<option value="pb" SELECTED>Xylophone</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pb">Xylophone</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pc" -->
! 		<option value="pc" SELECTED>Marimba</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pc">Marimba</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pd" -->
! 		<option value="pd" SELECTED>Tambour, batterie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pd">Tambour, batterie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pt" -->
! 		<option value="pt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pu" -->
! 		<option value="pu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pz -->
! 		<option value="pz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Cordes frottées :</option>
! 		<!-- TMPL_IF name="f1sa" -->
! 		<option value="sa" SELECTED>Violon</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sa">Violon</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sb" -->
! 		<option value="sb" SELECTED>Alto</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sb">Alto</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sc" -->
! 		<option value="sc" SELECTED>Violoncelle</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sc">Violoncelle</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sd" -->
! 		<option value="sd" SELECTED>Contrebasse</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sd">Contrebasse</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1se" -->
! 		<option value="se" SELECTED>Viole</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="se">Viole</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sf" -->
! 		<option value="sf" SELECTED>Viole d'amour</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sf">Viole d'amour</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sg" -->
! 		<option value="sg" SELECTED>Viole de gambe</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sg">Viole de gambe</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1st" -->
! 		<option value="st" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="st">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1su" -->
! 		<option value="su" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="su">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sz" -->
! 		<option value="sz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Electronique :</option>
! 		<!-- TMPL_IF name="f1ea" -->
! 		<option value="ea" SELECTED>Synthétiseur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ea">Synthétiseur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1eb" -->
! 		<option value="eb" SELECTED>Bande magnétique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="eb">Bande magnétique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ec" -->
! 		<option value="ec" SELECTED>Ordinateur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ec">Ordinateur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ed" -->
! 		<option value="ed" SELECTED>Ondes Martenot</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ed">Ondes Martenot</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1eu" -->
! 		<option value="eu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="eu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ez" -->
! 		<option value="ez" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ez">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Claviers :</option>
! 		<!-- TMPL_IF name="f1ka" -->
! 		<option value="ka" SELECTED>Piano</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ka">Piano</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kb" -->
! 		<option value="kb" SELECTED>Orgue</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kb">Orgue</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kc" -->
! 		<option value="kc" SELECTED>Clavecin</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kc">Clavecin</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kd" -->
! 		<option value="kd" SELECTED>Clavicorde</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kd">Clavicorde</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ke" -->
! 		<option value="ke" SELECTED>Continuo</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ke">Continuo</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kf" -->
! 		<option value="kf" SELECTED>Célesta</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kf">Célesta</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kt" -->
! 		<option value="kt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ku" -->
! 		<option value="ku" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ku">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kz" -->
! 		<option value="kz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Voix :</option>
! 		<!-- TMPL_IF name="f1va" -->
! 		<option value="va" SELECTED>Soprano</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="va">Soprano</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vb" -->
! 		<option value="vb" SELECTED>Mezzo-soprano</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vb">Mezzo-soprano</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vc" -->
! 		<option value="vc" SELECTED>Alto</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vc">Alto</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vd" -->
! 		<option value="vd" SELECTED>Tenor</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vd">Tenor</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ve" -->
! 		<option value="ve" SELECTED>Baryton</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ve">Baryton</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vf" -->
! 		<option value="vf" SELECTED>Basse</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vf">Basse</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vg" -->
! 		<option value="vg" SELECTED>Haute contre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vg">Haute contre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vh" -->
! 		<option value="vh" SELECTED>Voix aiguës</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vh">Voix aiguës</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vi" -->
! 		<option value="vi" SELECTED>Voix médium</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vi">Voix médium</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vj" -->
! 		<option value="vj" SELECTED>Voix graves</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vj">Voix graves</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vt" -->
! 		<option value="vt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vu" -->
! 		<option value="vu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Cordes pincées :</option>
! 		<!-- TMPL_IF name="f1ta" -->
! 		<option value="ta" SELECTED>Harpe</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ta">Harpe</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tb" -->
! 		<option value="tb" SELECTED>Famille de la guitare</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tb">Famille de la guitare</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tc" -->
! 		<option value="tc" SELECTED>Famille du luth</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tc">Famille du luth</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1td" -->
! 		<option value="td" SELECTED>Mandoline</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="td">Mandoline</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tt" -->
! 		<option value="tt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tu" -->
! 		<option value="tu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tz" -->
! 		<option value="tz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Bois :</option>
! 		<!-- TMPL_IF name="f1wa" -->
! 		<option value="wa" SELECTED>Flûte (traversière)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wa">Flûte (traversière)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wb" -->
! 		<option value="wb" SELECTED>Hautbois</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wb">Hautbois</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wc" -->
! 		<option value="wc" SELECTED>Clarinette</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wc">Clarinette</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wd" -->
! 		<option value="wd" SELECTED>Basson</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wd">Basson</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1we" -->
! 		<option value="we" SELECTED>Piccolo</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="we">Piccolo</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wf" -->
! 		<option value="wf" SELECTED>Cor anglais</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wf">Cor anglais</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wg" -->
! 		<option value="wg" SELECTED>Clarinette basse</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wg">Clarinette basse</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wh" -->
! 		<option value="wh" SELECTED>Flûte à bec </option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wh">Flûte à bec</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wi" -->
! 		<option value="wi" SELECTED>Saxophone</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wi">Saxophone</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wt" -->
! 		<option value="wt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wu" -->
! 		<option value="wu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wz" -->
! 		<option value="wz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Non précisé :</option>
! 		<!-- TMPL_IF name="f1uu" -->
! 		<option value="uu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="uu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! 
! <p>
! 	<label style="width:10em;">Nombre</label>
! 	<input type="text" name="f2" maxlength=2 size=3 value="<!-- TMPL_VAR name="f2" -->"> (sur deux chiffres, compléter éventuellement avec un 0)
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:10em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 		document.f_pop.f2.value=document.f_pop.f2.value+'  ';
! 		document.f_pop.f2.value=document.f_pop.f2.value.substring(0,2);
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:33:44 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:33:44 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_135a.tmpl,1.2,1.3
Message-ID: <E1DdrhY-0000b2-Ry@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2244/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_135a.tmpl 
Log Message:
Template for 135a field plugin

Index: unimarc_field_135a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_135a.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_135a.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_135a.tmpl	2 Jun 2005 15:33:42 -0000	1.3
***************
*** 1,65 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 135a</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Type de fichier informatique:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Donnees numeriques</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Donnees numeriques</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Programmes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Programmes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Representations</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Representations</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1d" -->

! 				<option value="d" SELECTED>Texte</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Texte</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1v" -->

! 				<option value="v" SELECTED>Combinaison de donnees</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="v">Combinaison de donnees</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,484 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 135a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Type de fichier informatique</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Données numériques</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Données numériques</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Programmes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Programmes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Représentations</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Représentations</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1d" -->
! 		<option value="d" SELECTED>Texte</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Texte</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Données bibliographiques</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Données bibliographiques</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1f" -->
! 		<option value="f" SELECTED>Fonte</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Fonte</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1g" -->
! 		<option value="g" SELECTED>Jeu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Jeu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1h" -->
! 		<option value="h" SELECTED>Son</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Son</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1i" -->
! 		<option value="i" SELECTED>Multimédia interactif</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="i">Multimédia interactif</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1j" -->
! 		<option value="j" SELECTED>Système en ligne</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="j">Système en ligne</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1v" -->
! 		<option value="v" SELECTED>Combinaison de données</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="v">Combinaison de données</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Type de support utilisé</label>
! 	<select name="f2" size="1">
! 		<!-- TMPL_IF name="f2 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2a" -->
! 		<option value="a" SELECTED>Bande magnétique en cartouche</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Bande magnétique en cartouche</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2b" -->
! 		<option value="b" SELECTED>Puce d'ordinateur en cartouche</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Puce d'ordinateur en cartouche</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2c" -->
! 		<option value="c" SELECTED>Disque optique en cartouche</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Disque optique en cartouche</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2f" -->
! 		<option value="f" SELECTED>Bande magnétique en cassette</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Bande magnétique en cassette</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2h" -->
! 		<option value="h" SELECTED>Bande magnétique pour gros ordinateur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Bande magnétique pour gros ordinateur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2j" -->
! 		<option value="j" SELECTED>Disquette</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="j">Disquette</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2m" -->
! 		<option value="m" SELECTED>Disque magnéto-optique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="m">Disque magnéto-optique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2o" -->
! 		<option value="o" SELECTED>Disque optique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="o">Disque optique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2r" -->
! 		<option value="r" SELECTED>Système en ligne</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="r">Système en ligne</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Couleur</label>
! 	<select name="f3" size="1">
! 		<!-- TMPL_IF name="f3 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3a" -->
! 		<option value="a" SELECTED>Une couleur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Une couleur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3b" -->
! 		<option value="b" SELECTED>Noir et blanc</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Noir et blanc</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3c" -->
! 		<option value="c" SELECTED>Polychrome</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Polychrome</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3g" -->
! 		<option value="g" SELECTED>Gris</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Gris</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3m" -->
! 		<option value="m" SELECTED>Mélangé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="m">Mélangé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3n" -->
! 		<option value="n" SELECTED>Ne s'applique pas</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Ne s'applique pas</option>
! 		<!-- /TMPL_IF -->		
! 		<!-- TMPL_IF name="f3u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Dimensions</label>
! 	<select name="f4" size="1">
! 		<!-- TMPL_IF name="f4 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4a" -->
! 		<option value="a" SELECTED>3 1/2 in</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">3 1/2 in</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4b" -->
! 		<option value="b" SELECTED>12 in</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">12 in</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4g" -->
! 		<option value="g" SELECTED>4 3/4 in ou 12 cm</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">4 3/4 in ou 12 cm</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4i" -->
! 		<option value="i" SELECTED>1 1/8 x 2 3/8 in</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="i">1 1/8 x 2 3/8 in</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4j" -->
! 		<option value="j" SELECTED>3 7/8 x 2 1/2 in</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="j">3 7/8 x 2 1/2 in</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4n" -->
! 		<option value="n" SELECTED>Ne s'applique pas</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Ne s'applique pas</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4o" -->
! 		<option value="o" SELECTED>5 1/4 in</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="o">5 1/4 in</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4v" -->
! 		<option value="v" SELECTED>8 in</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="v">8 in</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Son</label>
! 	<select name="f5" size="1">
! 		<!-- TMPL_IF name="f5 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5#" -->
! 		<option value="#" SELECTED>Pas de son (silencieux)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="#">Pas de son (silencieux)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5a" -->
! 		<option value="a" SELECTED>Il y a du son sur le support</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Il y a du son sur le support</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Bits par pixel</label>
! 	<input type="text" name="f6" maxlength=3 size=3 value="<!-- TMPL_VAR name="f6" -->"> (sur trois caractères)
! </p>
! 
! <p>
! 	<label style="width:20em;">Nombre de formats de fichier</label>
! 	<select name="f7" size="1">
! 		<!-- TMPL_IF name="f7 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7a" -->
! 		<option value="a" SELECTED>Un seul format</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Un seul format</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7m" -->
! 		<option value="m" SELECTED>Formats multiples</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="m">Formats multiples</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Assurance de qualité</label>
! 	<select name="f8" size="1">
! 		<!-- TMPL_IF name="f8 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8a" -->
! 		<option value="a" SELECTED>Absent</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Absent</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8n" -->
! 		<option value="n" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8p" -->
! 		<option value="p" SELECTED>Présent</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="p">Présent</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Source ou antécédent</label>
! 	<select name="f9" size="1">
! 		<!-- TMPL_IF name="f9 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9a" -->
! 		<option value="a" SELECTED>Fichier reproduit depuis un original</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Fichier reproduit depuis un original</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9b" -->
! 		<option value="b" SELECTED>Fichier reproduit depuis un microfilm</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Fichier reproduit depuis un microfilm</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9c" -->
! 		<option value="c" SELECTED>Fichier reproduit d'après un fichier informatique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Fichier reproduit d'après un fichier informatique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9d" -->
! 		<option value="d" SELECTED>Fichier reproduit d'après un intermédiaire qui n'est pas un microfilm</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Fichier reproduit d'après un intermédiaire qui n'est pas un microfilm</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9m" -->
! 		<option value="m" SELECTED>Mélangé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="m">Mélangé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9n" -->
! 		<option value="n" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Compression</label>
! 	<select name="f10" size="1">
! 		<!-- TMPL_IF name="f10 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f10a" -->
! 		<option value="a" SELECTED>Non comprimé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Non comprimé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f10b" -->
! 		<option value="b" SELECTED>Sans pertes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Sans pertes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f10d" -->
! 		<option value="d" SELECTED>Avec des pertes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Avec des pertes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f10m" -->
! 		<option value="m" SELECTED>Mélangé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="m">Mélangé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f10u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Qualité du reformatage</label>
! 	<select name="f11" size="1">
! 		<!-- TMPL_IF name="f11" -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f11a" -->
! 		<option value="a" SELECTED>Accès</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Accès</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f11n" -->
! 		<option value="n" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f11p" -->
! 		<option value="p" SELECTED>Préservation</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="p">Préservation</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f11r" -->
! 		<option value="r" SELECTED>Remplacement</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="r">Remplacement</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f11u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 		document.f_pop.f6.value=document.f_pop.f6.value+'   ';
! 		document.f_pop.f6.value=document.f_pop.f6.value.substring(0,3);
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value+document.f_pop.f10.value+document.f_pop.f11.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:34:19 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:34:19 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_140.tmpl,1.2,1.3
Message-ID: <E1Ddri7-0000gD-MB@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2554/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_140.tmpl 
Log Message:
Template for 140a field plugin

Index: unimarc_field_140.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_140.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_140.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_140.tmpl	2 Jun 2005 15:34:17 -0000	1.3
***************
*** 1,1713 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 140</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Illustration dans le texte 1:</td>

! 		<td>

[...3417 lines suppressed...]
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value+document.f_pop.f10.value+document.f_pop.f11.value+document.f_pop.f12.value+document.f_pop.f13.value+document.f_pop.f14.value+document.f_pop.f15.value+document.f_pop.f16.value+document.f_pop.f17.value+document.f_pop.f18.value+document.f_pop.f19.value+document.f_pop.f20.value+document.f_pop.f21.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:34:43 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:34:43 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_141.tmpl,1.2,1.3
Message-ID: <E1DdriV-0000ij-Ja@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2722/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_141.tmpl 
Log Message:
Template for 141a field plugin

Index: unimarc_field_141.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_141.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_141.tmpl	1 Mar 2005 13:41:03 -0000	1.2
--- unimarc_field_141.tmpl	2 Jun 2005 15:34:40 -0000	1.3
***************
*** 1,386 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 141</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Materiau de reliure 1:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Parchemin, velin</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Parchemin, velin</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Cuir</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Cuir</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Bois</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Bois</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1d" -->

! 				<option value="d" SELECTED>Tissus</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Tissus</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Materiau synthetique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Materiau synthetique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1f" -->

! 				<option value="f" SELECTED>Carton</ption>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Carton</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1g" -->

! 				<option value="g" SELECTED>Papier</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">Papier</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1h" -->

! 				<option value="h" SELECTED>Non relie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Non relie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 	</select>

! 		</td></tr>	<tr>

! 		<td>Materiau de reliure 2:</td>

! 		<td>

! 			<select name="f2" size="1">

! 			<!-- TMPL_IF name="f2 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2a" -->

! 				<option value="a" SELECTED>Parchemin, velin</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Parchemin, velin</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2b" -->

! 				<option value="b" SELECTED>Cuir</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Cuir</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2c" -->

! 				<option value="c" SELECTED>Bois</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Bois</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2d" -->

! 				<option value="d" SELECTED>Tissus</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Tissus</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2e" -->

! 				<option value="e" SELECTED>Materiau synthetique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Materiau synthetique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2f" -->

! 				<option value="f" SELECTED>Carton</ption>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Carton</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2g" -->

! 				<option value="g" SELECTED>Papier</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">Papier</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2h" -->

! 				<option value="h" SELECTED>Non relie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Non relie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 	</select>

! 		</td></tr>	<tr>

! 		<td>Materiau de reliure 3:</td>

! 		<td>

! 			<select name="f3" size="1">

! 			<!-- TMPL_IF name="f3 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3a" -->

! 				<option value="a" SELECTED>Parchemin, velin</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Parchemin, velin</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3b" -->

! 				<option value="b" SELECTED>Cuir</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Cuir</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3c" -->

! 				<option value="c" SELECTED>Bois</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Bois</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3d" -->

! 				<option value="d" SELECTED>Tissus</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Tissus</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3e" -->

! 				<option value="e" SELECTED>Materiau synthetique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Materiau synthetique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3f" -->

! 				<option value="f" SELECTED>Carton</ption>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Carton</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3g" -->

! 				<option value="g" SELECTED>Papier</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">Papier</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3h" -->

! 				<option value="h" SELECTED>Non relie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Non relie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 	</select>

! 		</td></tr>

! 		<td>Type de reliure:</td>

! 		<td>

! 			<select name="f4" size="1">

! 			<!-- TMPL_IF name="f4 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4a" -->

! 				<option value="a" SELECTED>Originale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Originale</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4b" -->

! 				<option value="b" SELECTED>Deuxieme reliure</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Deuxieme reliure</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4c" -->

! 				<option value="c" SELECTED>Reliure moderne</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Reliure moderne</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4d" -->

! 				<option value="d" SELECTED>Restauree, fac simile</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Restauree, fac simile</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4e" -->

! 				<option value="e" SELECTED>Restauree, imitation</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Restauree, imitation</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4f" -->

! 				<option value="f" SELECTED>Reliee avec un autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Reliee avec un autre</ption>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4h" -->

! 				<option value="h" SELECTED>Non relie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Non relie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 		</td></tr>	<tr>

! 		<td>Relie avec:</td>

! 		<td>

! 			<select name="f5" size="1">

! 			<!-- TMPL_IF name="f5 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f50" -->

! 				<option value="0" SELECTED>Relie seul</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="0">Relie seul</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f51" -->

! 				<option value="1" SELECTED>Relie avec d'autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="1">Relie avec d'autre</option>

! 			<!-- /TMPL_IF -->

! 		</td></tr><tr>

! 	<td>Etat de conservation - reliure:</td>

! 		<td>

! 			<select name="f6" size="1">

! 			<!-- TMPL_IF name="f6 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6a" -->

! 				<option value="a" SELECTED>Excellent</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Excellent</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6b" -->

! 				<option value="b" SELECTED>Bon</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Bon</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6c" -->

! 				<option value="c" SELECTED>Usage</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Usage</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6d" -->

! 				<option value="d" SELECTED>Deteriore</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Deteriore</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6e" -->

! 				<option value="e" SELECTED>Dos casse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Dos casse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6f" -->

! 				<option value="f" SELECTED>Pages manquantes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Pages manquantes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! </td></tr><tr>

! 	<td>Etat de conservation - livre 1 :</td>

! 		<td>

! 			<select name="f7" size="1">

! 			<!-- TMPL_IF name="f7 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7a" -->

! 				<option value="a" SELECTED>Excellent</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Excellent</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7b" -->

! 				<option value="b" SELECTED>Bon</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Bon</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7c" -->

! 				<option value="c" SELECTED>Usage</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Usage</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7d" -->

! 				<option value="d" SELECTED>Deteriore</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Deteriore</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7e" -->

! 				<option value="e" SELECTED>Dos casse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Dos casse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7f" -->

! 				<option value="f" SELECTED>Pages manquantes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Pages manquantes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! </td></tr><tr>

! 	<td>Etat de conservation - livre 2 :</td>

! 		<td>

! 			<select name="f8" size="1">

! 			<!-- TMPL_IF name="f8 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8a" -->

! 				<option value="a" SELECTED>Excellent</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Excellent</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8b" -->

! 				<option value="b" SELECTED>Bon</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Bon</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8c" -->

! 				<option value="c" SELECTED>Usage</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Usage</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8d" -->

! 				<option value="d" SELECTED>Deteriore</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Deteriore</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8e" -->

! 				<option value="e" SELECTED>Dos casse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Dos casse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8f" -->

! 				<option value="f" SELECTED>Pages manquantes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Pages manquantes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! </td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,401 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 141a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Matériau de reliure 1</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Parchemin, velin</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Parchemin, velin</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Cuir</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Cuir</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Bois</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Bois</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1d" -->
! 		<option value="d" SELECTED>Tissus</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Tissus</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Matériau synthétique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Matériau synthétique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1f" -->
! 		<option value="f" SELECTED>Carton</ption>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Carton</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1g" -->
! 		<option value="g" SELECTED>Papier</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Papier</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1h" -->
! 		<option value="h" SELECTED>Non relié</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Non relié</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Matériau de reliure 2</label>
! 	<select name="f2" size="1">
! 		<!-- TMPL_IF name="f2 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2a" -->
! 		<option value="a" SELECTED>Parchemin, velin</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Parchemin, velin</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2b" -->
! 		<option value="b" SELECTED>Cuir</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Cuir</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2c" -->
! 		<option value="c" SELECTED>Bois</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Bois</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2d" -->
! 		<option value="d" SELECTED>Tissus</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Tissus</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2e" -->
! 		<option value="e" SELECTED>Matériau synthétique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Matériau synthétique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2f" -->
! 		<option value="f" SELECTED>Carton</ption>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Carton</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2g" -->
! 		<option value="g" SELECTED>Papier</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Papier</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2h" -->
! 		<option value="h" SELECTED>Non relié</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Non relié</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Matériau de reliure 3</label>
! 	<select name="f3" size="1">
! 		<!-- TMPL_IF name="f3 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3a" -->
! 		<option value="a" SELECTED>Parchemin, velin</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Parchemin, velin</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3b" -->
! 		<option value="b" SELECTED>Cuir</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Cuir</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3c" -->
! 		<option value="c" SELECTED>Bois</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Bois</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3d" -->
! 		<option value="d" SELECTED>Tissus</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Tissus</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3e" -->
! 		<option value="e" SELECTED>Matériau synthétique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Matériau synthétique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3f" -->
! 		<option value="f" SELECTED>Carton</ption>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Carton</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3g" -->
! 		<option value="g" SELECTED>Papier</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Papier</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3h" -->
! 		<option value="h" SELECTED>Non relié</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Non relié</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Type de reliure</label>
! 	<select name="f4" size="1">
! 		<!-- TMPL_IF name="f4 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4a" -->
! 		<option value="a" SELECTED>Originale</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Originale</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4b" -->
! 		<option value="b" SELECTED>Deuxième reliure</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Deuxième reliure</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4c" -->
! 		<option value="c" SELECTED>Reliure moderne</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Reliure moderne</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4d" -->
! 		<option value="d" SELECTED>Restaurée, fac-similé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Restaurée, fac-similé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4e" -->
! 		<option value="e" SELECTED>Restaurée, imitation</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Restaurée, imitation</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4f" -->
! 		<option value="f" SELECTED>Relié avec un autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Relié avec un autre</ption>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4h" -->
! 		<option value="h" SELECTED>Non relié</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Non relié</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Relié avec</label>
! 	<select name="f5" size="1">
! 		<!-- TMPL_IF name="f5 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f50" -->
! 		<option value="0" SELECTED>Relié seul</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="0">Relié seul</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f51" -->
! 		<option value="1" SELECTED>Relié avec d'autres</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="1">Relié avec d'autres</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Etat de conservation - reliure</label>
! 	<select name="f6" size="1">
! 		<!-- TMPL_IF name="f6 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6a" -->
! 		<option value="a" SELECTED>Excellent</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Excellent</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6b" -->
! 		<option value="b" SELECTED>Bon</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Bon</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6c" -->
! 		<option value="c" SELECTED>Usagé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Usagé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6d" -->
! 		<option value="d" SELECTED>Détérioré</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Détérioré</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6e" -->
! 		<option value="e" SELECTED>Dos cassé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Dos cassé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6f" -->
! 		<option value="f" SELECTED>Pages manquantes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Pages manquantes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Etat de conservation - livre 1</label>
! 	<select name="f7" size="1">
! 		<!-- TMPL_IF name="f7 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7a" -->
! 		<option value="a" SELECTED>Excellent</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Excellent</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7b" -->
! 		<option value="b" SELECTED>Bon</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Bon</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7c" -->
! 		<option value="c" SELECTED>Usagé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Usagé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7d" -->
! 		<option value="d" SELECTED>Détérioré</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Détérioré</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7e" -->
! 		<option value="e" SELECTED>Dos cassé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Dos cassé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7f" -->
! 		<option value="f" SELECTED>Pages manquantes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Pages manquantes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Etat de conservation - livre 2</label>
! 	<select name="f8" size="1">
! 		<!-- TMPL_IF name="f8 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8a" -->
! 		<option value="a" SELECTED>Excellent</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Excellent</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8b" -->
! 		<option value="b" SELECTED>Bon</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Bon</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8c" -->
! 		<option value="c" SELECTED>Usagé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Usagé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8d" -->
! 		<option value="d" SELECTED>Détérioré</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Détérioré</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8e" -->
! 		<option value="e" SELECTED>Dos cassé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Dos cassé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8f" -->
! 		<option value="f" SELECTED>Pages manquantes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Pages manquantes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:31:56 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:31:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_128a.tmpl,1.2,1.3
Message-ID: <E1Ddrfo-0000Kz-UM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1271/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_128a.tmpl 
Log Message:
Template for 128a field plugin

Index: unimarc_field_128a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_128a.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_128a.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_128a.tmpl	2 Jun 2005 15:31:54 -0000	1.3
***************
*** 1,382 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 128a</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Forme de la composition:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1  " -->

! 				<option value="  " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="  ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ai" -->

! 				<option value="ai" SELECTED>Airs</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ai">Airs</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1an" -->

! 				<option value="an" SELECTED>Hymnes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="an">Hymnes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ar" -->

! 				<option value="ar" SELECTED>Arias</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ar">Arias</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bt" -->

! 				<option value="bt" SELECTED>Ballets</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bt">Ballets</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bd" -->

! 				<option value="bd" SELECTED>Ballades</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bd">Ballades</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bg" -->

! 				<option value="bg" SELECTED>Bluegrass</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bg">Bluegrass</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bl" -->

! 				<option value="bl" SELECTED>Blues</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bl">Blues</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cb" -->

! 				<option value="cb" SELECTED>Chant (non chretien)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cb">Chant (non chretien)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cc" -->

! 				<option value="cc" SELECTED>Chant (chretien)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cc">Chant (chretien)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cl" -->

! 				<option value="cl" SELECTED>Chorale-prelude</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cl">Chorale-prelude</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cg" -->

! 				<option value="cg" SELECTED>Concerto grosso</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cg">Concerto grosso</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ch" -->

! 				<option value="ch" SELECTED>Chorales</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ch">Chorales</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cn" -->

! 				<option value="cn" SELECTED>Canons</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cn">Canons</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1co" -->

! 				<option value="co" SELECTED>Concertos</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="co">Concertos</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cp" -->

! 				<option value="cp" SELECTED>Chansons (Polyphoniques)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cp">Chansons (Polyphoniques)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cr" -->

! 				<option value="cr" SELECTED>Chant de noel</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cr">Chant de noel</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cs" -->

! 				<option value="cs" SELECTED>Musique aleatoire</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cs">Musique aleatoire</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ct" -->

! 				<option value="ct" SELECTED>Cantates</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ct">Cantates</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cy" -->

! 				<option value="cy" SELECTED>Country music</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cy">Country music</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cz" -->

! 				<option value="cz" SELECTED>Canzones</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cz">Canzones</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1df" -->

! 				<option value="df" SELECTED>Danse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="df">Danse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1dv" -->

! 				<option value="dv" SELECTED>Divertimentos</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="dv">Divertimentos</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1fg" -->

! 				<option value="fg" SELECTED>Fugues</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="fg">Fugues</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1fm" -->

! 				<option value="fm" SELECTED>Musique Folklorique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="fm">Musique Folklorique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ft" -->

! 				<option value="ft" SELECTED>Fantaisies</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ft">Fantaisies</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gm" -->

! 				<option value="gm" SELECTED>Gospel</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gm">Gospel</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1hy" -->

! 				<option value="hy" SELECTED>Hymnes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="hy">Hymnes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1in" -->

! 				<option value="in" SELECTED>Intermezzos</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="in">Intermezzos</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1jz" -->

! 				<option value="jz" SELECTED>Jazz</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="jz">Jazz</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1li" -->

! 				<option value="li" SELECTED>Lieder</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="li">Lieder</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1mc" -->

! 				<option value="mc" SELECTED>Comedies musicales,revues</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="mc">Comedies musicales, revues</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1md" -->

! 				<option value="md" SELECTED>Madrigaux</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="md">Madrigaux</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1mi" -->

! 				<option value="mi" SELECTED>Menuets</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="mi">Menuets</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1mr" -->

! 				<option value="mr" SELECTED>Marches</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="mr">Marches</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ms" -->

! 				<option value="ms" SELECTED>Messes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ms">Messes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1mo" -->

! 				<option value="mo" SELECTED>Motets</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="mo">Motets</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1mp" -->

! 				<option value="mp" SELECTED>Bande originale du film</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="mp">Bande originale du film</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1mu" -->

! 				<option value="mu" SELECTED>Formes multiples</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="mu">Formes multiples</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1mz" -->

! 				<option value="mz" SELECTED>Mazurkas</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="mz">Mazurkas</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1nc" -->

! 				<option value="nc" SELECTED>Nocturnes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="nc">Nocturnes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1op" -->

! 				<option value="op" SELECTED>Operas, operettes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="op">Operas, operettes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1or" -->

! 				<option value="or" SELECTED>Oratorios</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="or">Oratorios</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ov" -->

! 				<option value="ov" SELECTED>Ouvertures</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ov">Ouvertures</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pf" -->

! 				<option value="pf" SELECTED>Prelude et fugue</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pf">Prelude et fugue</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pg" -->

! 				<option value="pg" SELECTED>Musique descriptive</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pg">Musique descriptive</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pm" -->

! 				<option value="pm" SELECTED>Passions</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pm">Passions</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1po" -->

! 				<option value="po" SELECTED>Polonaises</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="po">Polonaises</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pp" -->

! 				<option value="pp" SELECTED>Musique populaire</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pp">Musique populaire</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ps" -->

! 				<option value="ps" SELECTED>Passacailles</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ps">Passacailles</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pt" -->

! 				<option value="pt" SELECTED>Chant</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pt">Chant</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pv" -->

! 				<option value="pv" SELECTED>Pavanes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pv">Pavanes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1rc" -->

! 				<option value="rc" SELECTED>Rock</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="rc">Rock</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1rd" -->

! 				<option value="rd" SELECTED>Rondos</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="rd">Rondos</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1rg" -->

! 				<option value="rg" SELECTED>Ragtime</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="rg">Ragtime</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ri" -->

! 				<option value="ri" SELECTED>Ricercari</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ri">Ricercari</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1rp" -->

! 				<option value="rp" SELECTED>Rhapsodies</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="rp">Rhapsodies</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1rq" -->

! 				<option value="rq" SELECTED>Requiem</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="rq">Requiem</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sg" -->

! 				<option value="sg" SELECTED>Chansons, melodies</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sg">Chansons, melodies</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1si" -->

! 				<option value="si" SELECTED>Sinfonias</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="si">Sinfonias</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sn" -->

! 				<option value="sn" SELECTED>Sonates</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sn">Sonates</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sp" -->

! 				<option value="sp" SELECTED>Poemes symphoniques</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sp">Poemes symphoniques</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sq" -->

! 				<option value="sq" SELECTED>Square dance</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sq">Square dance</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1st" -->

! 				<option value="st" SELECTED>Etudes et exercices</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="st">Etudes et exercices</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1su" -->

! 				<option value="su" SELECTED>Suites</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="su">Suites</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sy" -->

! 				<option value="sy" SELECTED>Symphonies</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sy">Symphonies</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tc" -->

! 				<option value="tc" SELECTED>Toccatas</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tc">Toccatas</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ts" -->

! 				<option value="ts" SELECTED>Sonates en trio</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ts">Sonates en trio</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vr" -->

! 				<option value="vr" SELECTED>Variations</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vr">Variations</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wz" -->

! 				<option value="wz" SELECTED>Valses</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wz">Valses</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1zz" -->

! 				<option value="zz" SELECTED>Variations</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="zz">Variations</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,384 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 128a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Forme de la composition</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1  " -->
! 		<option value="  " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="  ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ai" -->
! 		<option value="ai" SELECTED>Airs</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ai">Airs</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1an" -->
! 		<option value="an" SELECTED>Hymnes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="an">Hymnes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ar" -->
! 		<option value="ar" SELECTED>Arias</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ar">Arias</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bt" -->
! 		<option value="bt" SELECTED>Ballets</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bt">Ballets</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bd" -->
! 		<option value="bd" SELECTED>Ballades</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bd">Ballades</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1mp" -->
! 		<option value="mp" SELECTED>Bande originale de film</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="mp">Bande originale de film</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bg" -->
! 		<option value="bg" SELECTED>Bluegrass</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bg">Bluegrass</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bl" -->
! 		<option value="bl" SELECTED>Blues</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bl">Blues</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ct" -->
! 		<option value="ct" SELECTED>Cantates</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ct">Cantates</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cn" -->
! 		<option value="cn" SELECTED>Canons</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cn">Canons</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cz" -->
! 		<option value="cz" SELECTED>Canzones</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cz">Canzones</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sg" -->
! 		<option value="sg" SELECTED>Chansons, mélodies</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sg">Chansons, mélodies</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cp" -->
! 		<option value="cp" SELECTED>Chansons (Polyphoniques)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cp">Chansons (Polyphoniques)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cb" -->
! 		<option value="cb" SELECTED>Chant (non chrétien)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cb">Chant (non chrétien)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cc" -->
! 		<option value="cc" SELECTED>Chant (chrétien)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cc">Chant (chrétien)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pt" -->
! 		<option value="pt" SELECTED>Chant (plusieurs voix)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pt">Chant (plusieurs voix)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cr" -->
! 		<option value="cr" SELECTED>Chants de Noël</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cr">Chants de Noël</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ch" -->
! 		<option value="ch" SELECTED>Chorales</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ch">Chorales</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1mc" -->
! 		<option value="mc" SELECTED>Comédies musicales, revues</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="mc">Comédies musicales, revues</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cg" -->
! 		<option value="cg" SELECTED>Concerto grosso</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cg">Concerto grosso</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1co" -->
! 		<option value="co" SELECTED>Concertos</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="co">Concertos</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cy" -->
! 		<option value="cy" SELECTED>Country music</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cy">Country music</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1df" -->
! 		<option value="df" SELECTED>Danse</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="df">Danse</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1dv" -->
! 		<option value="dv" SELECTED>Divertimentos</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="dv">Divertimentos</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1st" -->
! 		<option value="st" SELECTED>Etudes et exercices</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="st">Etudes et exercices</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1fg" -->
! 		<option value="fg" SELECTED>Fugues</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="fg">Fugues</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ft" -->
! 		<option value="ft" SELECTED>Fantaisies</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ft">Fantaisies</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1mu" -->
! 		<option value="mu" SELECTED>Formes multiples</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="mu">Formes multiples</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gm" -->
! 		<option value="gm" SELECTED>Gospel</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gm">Gospel</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1hy" -->
! 		<option value="hy" SELECTED>Hymnes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="hy">Hymnes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1in" -->
! 		<option value="in" SELECTED>Intermezzos</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="in">Intermezzos</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1jz" -->
! 		<option value="jz" SELECTED>Jazz</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="jz">Jazz</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1li" -->
! 		<option value="li" SELECTED>Lieder</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="li">Lieder</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1md" -->
! 		<option value="md" SELECTED>Madrigaux</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="md">Madrigaux</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1mi" -->
! 		<option value="mi" SELECTED>Menuets</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="mi">Menuets</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1mr" -->
! 		<option value="mr" SELECTED>Marches</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="mr">Marches</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ms" -->
! 		<option value="ms" SELECTED>Messes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ms">Messes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1mo" -->
! 		<option value="mo" SELECTED>Motets</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="mo">Motets</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1mz" -->
! 		<option value="mz" SELECTED>Mazurkas</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="mz">Mazurkas</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pg" -->
! 		<option value="pg" SELECTED>Musique descriptive</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pg">Musique descriptive</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cs" -->
! 		<option value="cs" SELECTED>Musique aléatoire</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cs">Musique aléatoire</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1fm" -->
! 		<option value="fm" SELECTED>Musique folklorique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="fm">Musique folklorique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1nc" -->
! 		<option value="nc" SELECTED>Nocturnes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="nc">Nocturnes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1op" -->
! 		<option value="op" SELECTED>Opéras, opérettes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="op">Opéras, opérettes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1or" -->
! 		<option value="or" SELECTED>Oratorios</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="or">Oratorios</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ov" -->
! 		<option value="ov" SELECTED>Ouvertures</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ov">Ouvertures</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pf" -->
! 		<option value="pf" SELECTED>Prélude et fugue</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pf">Prélude et fugue</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pm" -->
! 		<option value="pm" SELECTED>Passions</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pm">Passions</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1po" -->
! 		<option value="po" SELECTED>Polonaises</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="po">Polonaises</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pp" -->
! 		<option value="pp" SELECTED>Musique populaire</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pp">Musique populaire</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ps" -->
! 		<option value="ps" SELECTED>Passacailles</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ps">Passacailles</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pv" -->
! 		<option value="pv" SELECTED>Pavanes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pv">Pavanes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sp" -->
! 		<option value="sp" SELECTED>Poèmes symphoniques</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sp">Poèmes symphoniques</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cl" -->
! 		<option value="cl" SELECTED>Prélude choral</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cl">Prélude choral</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1rg" -->
! 		<option value="rg" SELECTED>Ragtime</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="rg">Ragtime</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1rq" -->
! 		<option value="rq" SELECTED>Requiems</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="rq">Requiems</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1rp" -->
! 		<option value="rp" SELECTED>Rhapsodies</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="rp">Rhapsodies</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ri" -->
! 		<option value="ri" SELECTED>Ricercari</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ri">Ricercari</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1rc" -->
! 		<option value="rc" SELECTED>Rock</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="rc">Rock</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1rd" -->
! 		<option value="rd" SELECTED>Rondos</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="rd">Rondos</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1si" -->
! 		<option value="si" SELECTED>Sinfonias</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="si">Sinfonias</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sn" -->
! 		<option value="sn" SELECTED>Sonates</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sn">Sonates</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ts" -->
! 		<option value="ts" SELECTED>Sonates en trio</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ts">Sonates en trio</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sq" -->
! 		<option value="sq" SELECTED>Square dance</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sq">Square dance</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1su" -->
! 		<option value="su" SELECTED>Suites</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="su">Suites</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sy" -->
! 		<option value="sy" SELECTED>Symphonies</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sy">Symphonies</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tc" -->
! 		<option value="tc" SELECTED>Toccatas</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tc">Toccatas</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wz" -->
! 		<option value="wz" SELECTED>Valses</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wz">Valses</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vr" -->
! 		<option value="vr" SELECTED>Variations</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vr">Variations</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1zz" -->
! 		<option value="zz" SELECTED>Autres</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="zz">Autres</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:32:23 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:32:23 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_128b.tmpl,1.2,1.3
Message-ID: <E1DdrgF-0000MD-9T@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1362/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_128b.tmpl 
Log Message:
Template for 128b field plugin

Index: unimarc_field_128b.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_128b.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_128b.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_128b.tmpl	2 Jun 2005 15:32:21 -0000	1.3
***************
*** 1,472 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 128b</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Instruments ou voix dans un ensemble:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1  " -->

! 				<option value="  " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="  ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ba" -->

! 				<option value="ba" SELECTED>Cor</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ba">Cor</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bb" -->

! 				<option value="bb" SELECTED>Trompette</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bb">Trompette</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bc" -->

! 				<option value="bc" SELECTED>Cornet a piston</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bc">Cornet a piston</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bd" -->

! 				<option value="bd" SELECTED>Trombone</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bd">Trombone</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1be" -->

! 				<option value="be" SELECTED>Tuba</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="be">Tuba</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bf" -->

! 				<option value="bf" SELECTED>Saxophone</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bf">Saxophone</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bt" -->

! 				<option value="bt" SELECTED>Ethniques</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bt">Ethniques</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bu" -->

! 				<option value="bu" SELECTED>Non precise (Cuivre)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bu">Non precise (Cuivre)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bz" -->

! 				<option value="bz" SELECTED>Autre cuivre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bz">Autre cuivre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ca" -->

! 				<option value="ca" SELECTED>Mixtes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ca">Mixtes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cb" -->

! 				<option value="cb" SELECTED>Femmes </option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cb">Femmes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cc" -->

! 				<option value="cc" SELECTED>Hommes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cc">Hommes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cd" -->

! 				<option value="cd" SELECTED>Enfants</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cd">Enfants</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ct" -->

! 				<option value="ct" SELECTED>Ethniques</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ct">Ethniques</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cu" -->

! 				<option value="cu" SELECTED>Non precise (Choeurs)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cu">Non precise (Choeurs)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1oa" -->

! 				<option value="oa" SELECTED>Orchestre symphonique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="oa">Orchestre symphonique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ob" -->

! 				<option value="ob" SELECTED>Orchestre de chambre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ob">Orchestre de chambre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1oc" -->

! 				<option value="oc" SELECTED>Orchestres a cordes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="oc">Orchestres a cordes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1od" -->

! 				<option value="od" SELECTED>Fanfare</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="od">Fanfare</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1oe" -->

! 				<option value="oe" SELECTED>Orchestre de danse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="oe">Orchestre de danse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1of" -->

! 				<option value="of" SELECTED>Grand ensemble - orchestre de cuivres</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="of">Grand ensemble - orchestre de cuivres</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ot" -->

! 				<option value="ot" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ot">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ou" -->

! 				<option value="ou" SELECTED>Non precise (orchestre)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ou">Non precise (orchestre)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1oz" -->

! 				<option value="oz" SELECTED>Autre orchestre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="oz">Autre orchestre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pa" -->

! 				<option value="pa" SELECTED>Tympanon</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pa">Tympanon</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pb" -->

! 				<option value="pb" SELECTED>Xylophone</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pb">Xylophone</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pc" -->

! 				<option value="pc" SELECTED>Marimba</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pc">Marimba</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pd" -->

! 				<option value="pd" SELECTED>Tambour, batterie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pd">Tambour, batterie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pt" -->

! 				<option value="pt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pu" -->

! 				<option value="pu" SELECTED>Non precise (percussion)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pu">Non precise (percussion)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pz -->

! 				<option value="pz" SELECTED>Autre percussions</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pz">Autre percussions</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sa" -->

! 				<option value="sa" SELECTED>Violon</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sa">Violon</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sb" -->

! 				<option value="sb" SELECTED>Alto</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sb">Alto</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sc" -->

! 				<option value="sc" SELECTED>Violoncelle</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sc">Violoncelle</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sd" -->

! 				<option value="sd" SELECTED>Contrebasse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sd">Contrebasse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1se" -->

! 				<option value="se" SELECTED>Viole</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="se">Viole</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sf" -->

! 				<option value="sf" SELECTED>Viole d'amour</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sf">Viole d'amour</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sg" -->

! 				<option value="sg" SELECTED>Viole de gambe</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sg">Viole de gambe</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1st" -->

! 				<option value="st" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="st">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1su" -->

! 				<option value="su" SELECTED>Non precise (Corde frottee)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="su">Non precise (Corde frottee)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sz" -->

! 				<option value="sz" SELECTED>Autre (Corde frottee)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sz">Autre (Corde frottee)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1uu" -->

! 				<option value="uu" SELECTED>Non precise (Non precise)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="uu">Non precise (Non precise)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ea" -->

! 				<option value="ea" SELECTED>Synthetiseur</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ea">Synthetiseur</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1eb" -->

! 				<option value="eb" SELECTED>Bande magnetique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="eb">Bande magnetique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ec" -->

! 				<option value="ec" SELECTED>Ordinateur</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ec">Ordinateur</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ed" -->

! 				<option value="ed" SELECTED>Ondes Martenot</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ed">Ondes Martenot</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1eu" -->

! 				<option value="eu" SELECTED>Non precise (Electronique)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="eu">Non precise (Electronique)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ez" -->

! 				<option value="ez" SELECTED>Autre (Electronique)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ez">Autre (Electronique)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ka" -->

! 				<option value="ka" SELECTED>Piano</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ka">Piano</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kb" -->

! 				<option value="kb" SELECTED>Orgue</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kb">Orgue</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kc" -->

! 				<option value="kc" SELECTED>Clavecin</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kc">Clavecin</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kd" -->

! 				<option value="kd" SELECTED>Clavicorde</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kd">Clavicorde</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ke" -->

! 				<option value="ke" SELECTED>Continuo</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ke">Continuo</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kf" -->

! 				<option value="kf" SELECTED>Celesta</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kf">Celesta</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kt" -->

! 				<option value="kt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ku" -->

! 				<option value="ku" SELECTED>Non precise (clavier)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ku">Non precise (clavier)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kz" -->

! 				<option value="kz" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kz">Autre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1va" -->

! 				<option value="va" SELECTED>Soprano</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="va">Soprano</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vb" -->

! 				<option value="vb" SELECTED>Mezzo-soprano</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vb">Mezzo-soprano</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vc" -->

! 				<option value="vc" SELECTED>Alto</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vc">Alto</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vd" -->

! 				<option value="vd" SELECTED>Tenor</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vd">Tenor</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ve" -->

! 				<option value="ve" SELECTED>Baryton</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ve">Baryton</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vf" -->

! 				<option value="vf" SELECTED>Basse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vf">Basse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vg" -->

! 				<option value="vg" SELECTED>Haute contre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vg">Haute contre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vh" -->

! 				<option value="vh" SELECTED>Voix aigues</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vh">Voix aigues</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vi" -->

! 				<option value="vi" SELECTED>Voix medium</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vi">Voix medium</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vj" -->

! 				<option value="vj" SELECTED>Voix graves</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vj">Voix graves</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vt" -->

! 				<option value="vt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vu" -->

! 				<option value="vu" SELECTED>Non precise (Voix precise)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vu">Non precise (Voix precise)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ta" -->

! 				<option value="ta" SELECTED>Harpe</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ta">Harpe</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tb" -->

! 				<option value="tb" SELECTED>Famille de la guitare</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tb">Famille de la guitare</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tc" -->

! 				<option value="tc" SELECTED>Famille du luth</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tc">Famille du luth</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1td" -->

! 				<option value="td" SELECTED>Mandoline</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="td">Mandoline</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tt" -->

! 				<option value="tt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tu" -->

! 				<option value="tu" SELECTED>Non precise (Cordes pincees)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tu">Non precise (Cordes pincees)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tz" -->

! 				<option value="tz" SELECTED>Autre corde pincee</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tz">Autre corde pincee</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wa" -->

! 				<option value="wa" SELECTED>Flute traversiere</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wa">Flute traversiere</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wb" -->

! 				<option value="wb" SELECTED>Hautbois</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wb">Hautbois</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wc" -->

! 				<option value="wc" SELECTED>Clarinette</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wc">Clarinette</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wd" -->

! 				<option value="wd" SELECTED>Basson</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wd">Basson</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1we" -->

! 				<option value="we" SELECTED>Piccolo</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="we">Piccolo</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wf" -->

! 				<option value="wf" SELECTED>Cor anglais</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wf">Cor anglais</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wg" -->

! 				<option value="wg" SELECTED>Clarinette basse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wg">Clarinette basse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wh" -->

! 				<option value="wh" SELECTED>Flute a bec </option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wh">Flute a bec</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wi" -->

! 				<option value="wi" SELECTED>Saxophone</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wi">Saxophone</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wt" -->

! 				<option value="wt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wu" -->

! 				<option value="wu" SELECTED>Non precise</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wu">Non precise</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wz" -->

! 				<option value="wz" SELECTED>Autre bois</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wz">Autre bois</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,492 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 128b</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:10em;">Instruments ou voix dans un ensemble</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1  " -->
! 		<option value="  " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="  ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Cuivres :</option>
! 		<!-- TMPL_IF name="f1ba" -->
! 		<option value="ba" SELECTED>Cor</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ba">Cor</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bb" -->
! 		<option value="bb" SELECTED>Trompette</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bb">Trompette</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bc" -->
! 		<option value="bc" SELECTED>Cornet à piston</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bc">Cornet à piston</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bd" -->
! 		<option value="bd" SELECTED>Trombone</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bd">Trombone</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1be" -->
! 		<option value="be" SELECTED>Tuba</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="be">Tuba</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bf" -->
! 		<option value="bf" SELECTED>Saxophone</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bf">Saxophone</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bt" -->
! 		<option value="bt" SELECTED>Ethniques</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bt">Ethniques</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bu" -->
! 		<option value="bu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bz" -->
! 		<option value="bz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Choeurs :</option>
! 		<!-- TMPL_IF name="f1ca" -->
! 		<option value="ca" SELECTED>Mixtes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ca">Mixtes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cb" -->
! 		<option value="cb" SELECTED>Femmes </option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cb">Femmes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cc" -->
! 		<option value="cc" SELECTED>Hommes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cc">Hommes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cd" -->
! 		<option value="cd" SELECTED>Enfants</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cd">Enfants</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ct" -->
! 		<option value="ct" SELECTED>Ethniques</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ct">Ethniques</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cu" -->
! 		<option value="cu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Orchestre :</option>
! 		<!-- TMPL_IF name="f1oa" -->
! 		<option value="oa" SELECTED>Orchestre symphonique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="oa">Orchestre symphonique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ob" -->
! 		<option value="ob" SELECTED>Orchestre de chambre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ob">Orchestre de chambre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1oc" -->
! 		<option value="oc" SELECTED>Orchestres à cordes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="oc">Orchestres à cordes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1od" -->
! 		<option value="od" SELECTED>Fanfare</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="od">Fanfare</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1oe" -->
! 		<option value="oe" SELECTED>Orchestre de danse</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="oe">Orchestre de danse</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1of" -->
! 		<option value="of" SELECTED>Grand ensemble - orchestre de cuivres (cuivres doublés ou non, avec ou sans percussions)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="of">Grand ensemble - orchestre de cuivres (cuivres doublés ou non, avec ou sans percussions)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ot" -->
! 		<option value="ot" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ot">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ou" -->
! 		<option value="ou" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ou">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1oz" -->
! 		<option value="oz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="oz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Percussions :</option>
! 		<!-- TMPL_IF name="f1pa" -->
! 		<option value="pa" SELECTED>Tympanon</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pa">Tympanon</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pb" -->
! 		<option value="pb" SELECTED>Xylophone</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pb">Xylophone</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pc" -->
! 		<option value="pc" SELECTED>Marimba</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pc">Marimba</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pd" -->
! 		<option value="pd" SELECTED>Tambour, batterie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pd">Tambour, batterie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pt" -->
! 		<option value="pt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pu" -->
! 		<option value="pu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pz -->
! 		<option value="pz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Cordes frottées :</option>
! 		<!-- TMPL_IF name="f1sa" -->
! 		<option value="sa" SELECTED>Violon</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sa">Violon</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sb" -->
! 		<option value="sb" SELECTED>Alto</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sb">Alto</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sc" -->
! 		<option value="sc" SELECTED>Violoncelle</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sc">Violoncelle</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sd" -->
! 		<option value="sd" SELECTED>Contrebasse</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sd">Contrebasse</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1se" -->
! 		<option value="se" SELECTED>Viole</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="se">Viole</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sf" -->
! 		<option value="sf" SELECTED>Viole d'amour</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sf">Viole d'amour</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sg" -->
! 		<option value="sg" SELECTED>Viole de gambe</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sg">Viole de gambe</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1st" -->
! 		<option value="st" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="st">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1su" -->
! 		<option value="su" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="su">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sz" -->
! 		<option value="sz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Electronique :</option>
! 		<!-- TMPL_IF name="f1ea" -->
! 		<option value="ea" SELECTED>Synthétiseur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ea">Synthétiseur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1eb" -->
! 		<option value="eb" SELECTED>Bande magnétique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="eb">Bande magnétique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ec" -->
! 		<option value="ec" SELECTED>Ordinateur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ec">Ordinateur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ed" -->
! 		<option value="ed" SELECTED>Ondes Martenot</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ed">Ondes Martenot</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1eu" -->
! 		<option value="eu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="eu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ez" -->
! 		<option value="ez" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ez">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Claviers :</option>
! 		<!-- TMPL_IF name="f1ka" -->
! 		<option value="ka" SELECTED>Piano</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ka">Piano</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kb" -->
! 		<option value="kb" SELECTED>Orgue</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kb">Orgue</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kc" -->
! 		<option value="kc" SELECTED>Clavecin</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kc">Clavecin</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kd" -->
! 		<option value="kd" SELECTED>Clavicorde</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kd">Clavicorde</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ke" -->
! 		<option value="ke" SELECTED>Continuo</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ke">Continuo</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kf" -->
! 		<option value="kf" SELECTED>Célesta</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kf">Célesta</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kt" -->
! 		<option value="kt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ku" -->
! 		<option value="ku" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ku">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kz" -->
! 		<option value="kz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Voix :</option>
! 		<!-- TMPL_IF name="f1va" -->
! 		<option value="va" SELECTED>Soprano</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="va">Soprano</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vb" -->
! 		<option value="vb" SELECTED>Mezzo-soprano</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vb">Mezzo-soprano</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vc" -->
! 		<option value="vc" SELECTED>Alto</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vc">Alto</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vd" -->
! 		<option value="vd" SELECTED>Tenor</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vd">Tenor</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ve" -->
! 		<option value="ve" SELECTED>Baryton</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ve">Baryton</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vf" -->
! 		<option value="vf" SELECTED>Basse</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vf">Basse</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vg" -->
! 		<option value="vg" SELECTED>Haute contre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vg">Haute contre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vh" -->
! 		<option value="vh" SELECTED>Voix aiguës</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vh">Voix aiguës</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vi" -->
! 		<option value="vi" SELECTED>Voix médium</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vi">Voix médium</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vj" -->
! 		<option value="vj" SELECTED>Voix graves</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vj">Voix graves</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vt" -->
! 		<option value="vt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vu" -->
! 		<option value="vu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Cordes pincées :</option>
! 		<!-- TMPL_IF name="f1ta" -->
! 		<option value="ta" SELECTED>Harpe</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ta">Harpe</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tb" -->
! 		<option value="tb" SELECTED>Famille de la guitare</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tb">Famille de la guitare</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tc" -->
! 		<option value="tc" SELECTED>Famille du luth</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tc">Famille du luth</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1td" -->
! 		<option value="td" SELECTED>Mandoline</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="td">Mandoline</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tt" -->
! 		<option value="tt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tu" -->
! 		<option value="tu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tz" -->
! 		<option value="tz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Bois :</option>
! 		<!-- TMPL_IF name="f1wa" -->
! 		<option value="wa" SELECTED>Flûte (traversière)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wa">Flûte (traversière)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wb" -->
! 		<option value="wb" SELECTED>Hautbois</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wb">Hautbois</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wc" -->
! 		<option value="wc" SELECTED>Clarinette</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wc">Clarinette</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wd" -->
! 		<option value="wd" SELECTED>Basson</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wd">Basson</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1we" -->
! 		<option value="we" SELECTED>Piccolo</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="we">Piccolo</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wf" -->
! 		<option value="wf" SELECTED>Cor anglais</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wf">Cor anglais</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wg" -->
! 		<option value="wg" SELECTED>Clarinette basse</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wg">Clarinette basse</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wh" -->
! 		<option value="wh" SELECTED>Flûte à bec </option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wh">Flûte à bec</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wi" -->
! 		<option value="wi" SELECTED>Saxophone</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wi">Saxophone</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wt" -->
! 		<option value="wt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wu" -->
! 		<option value="wu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wz" -->
! 		<option value="wz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Non précisé :</option>
! 		<!-- TMPL_IF name="f1uu" -->
! 		<option value="uu" SELECTED>Non précisé</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="uu">Non précisé</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:10em;">Nombre</label>
! 	<input type="text" name="f2" maxlength=2 size=3 value="<!-- TMPL_VAR name="f2" -->"> (sur deux chiffres, compléter éventuellement avec un 0)
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:10em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 		document.f_pop.f2.value=document.f_pop.f2.value+'  ';
! 		document.f_pop.f2.value=document.f_pop.f2.value.substring(0,2);
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:33:19 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:33:19 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_130.tmpl,1.2,1.3
Message-ID: <E1Ddrh9-0000V4-Np@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1881/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_130.tmpl 
Log Message:
Template for 130a field plugin

Index: unimarc_field_130.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_130.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_130.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_130.tmpl	2 Jun 2005 15:33:17 -0000	1.3
***************
*** 1,376 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 130</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Presentation materielle:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Carte a fenetre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Carte a fenetre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Microfilm en cartouche</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Microfilm en cartouche</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Microfilm en cassette</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Microfilm en cassette</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1d" -->

! 				<option value="d" SELECTED>Microfilm en bobine</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Microfilm en bobine</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Microfiche</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Microfiche</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1f" -->

! 				<option value="f" SELECTED>Microfiche en cassette</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Microfiche en cassette</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1g" -->

! 				<option value="g" SELECTED>Micro opaque</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">Micro opaque</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1h" -->

! 				<option value="h" SELECTED>Bande microfilm</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Bande microfilm</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr>

! 		<td>Polarite:</td>

! 		<td>

! 			<select name="f2" size="1">

! 			<!-- TMPL_IF name="f2 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2a" -->

! 				<option value="a" SELECTED>Positif</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Positif</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2b" -->

! 				<option value="b" SELECTED>Negatif</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Negatif</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2c" -->

! 				<option value="c" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2d" -->

! 				<option value="d" SELECTED>Plusieurs polarites</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Plusieurs polarites</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr>

! 		<td>Dimensions:</td>

! 		<td>

! 			<select name="f3" size="1">

! 			<!-- TMPL_IF name="f3 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3a" -->

! 				<option value="a" SELECTED>8 mm (microfilm)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">8 mm (microfilm)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3d" -->

! 				<option value="d" SELECTED>16 mm (microfilm)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">16 mm (microfilm)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3f" -->

! 				<option value="f" SELECTED>35 mm (microfilm)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">35 mm (microfilm)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3g" -->

! 				<option value="g" SELECTED>70 mm (microfilm)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">70 mm (microfilm)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3h" -->

! 				<option value="h" SELECTED>105 mm (microfilm)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">105 mm (microfilm)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3l" -->

! 				<option value="l" SELECTED>3 x 5 pouces</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="l">3 x 5 pouces</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3m" -->

! 				<option value="m" SELECTED>4 x 6 pouces</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="m">4 x 6 pouces</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3o" -->

! 				<option value="o" SELECTED>6 x 9 pouces</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="o">6 x 9 pouces</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3p" -->

! 				<option value="p" SELECTED>9 x 19 cm</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="p">9 x 19 cm</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr>

! 		<td>Rapport de reduction:</td>

! 		<td>

! 			<select name="f4" size="1">

! 			<!-- TMPL_IF name="f4 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4a" -->

! 				<option value="a" SELECTED>Faible reduction</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Faible reduction</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4b" -->

! 				<option value="b" SELECTED>Normale (16x - 30x)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Normale (16x - 30x)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4c" -->

! 				<option value="c" SELECTED>Elevee (31x - 60x)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Elevee (31x - 60x)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4d" -->

! 				<option value="d" SELECTED>Tres elevee (61x - 90x)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Tres elevee (61x - 90x)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4e" -->

! 				<option value="e" SELECTED>Ultra elevee (91x -)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Ultra elevee (91x -)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4v" -->

! 				<option value="v" SELECTED>Divers</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="v">Divers</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

!     <tr>

!                 <td>Rapport de reduction specifique</td>

!                 <td><input type="text" name="f5" maxlength=3 size=4 

! value="<!-- TMPL_VAR name="f5" -->"></td>

!         </tr>

! 

! 		</td></tr>

! 	<tr>

! 		<td>Couleur:</td>

! 		<td>

! 			<select name="f6" size="1">

! 			<!-- TMPL_IF name="f6 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6a" -->

! 				<option value="a" SELECTED>Monochrome</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Monochrome</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6b" -->

! 				<option value="b" SELECTED>Couleur</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Couleur</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6v" -->

! 				<option value="v" SELECTED>Divers</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="v">Divers</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr>

! 		<td>Emulsion:</td>

! 		<td>

! 			<select name="f7" size="1">

! 			<!-- TMPL_IF name="f7 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7a" -->

! 				<option value="a" SELECTED>Sel d'argent</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Sel d'argent</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7b" -->

! 				<option value="b" SELECTED>Diazoique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Diazoique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7c" -->

! 				<option value="c" SELECTED>Vesiculaire</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Vesiculaire</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7d" -->

! 				<option value="d" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7u" -->

! 				<option value="u" SELECTED>Emulsions diverses</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Emulsions diverses</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7x" -->

! 				<option value="x" SELECTED>Non applicable</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="x">Non applicable</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr>

! 		<td>Generation (copies):</td>

! 		<td>

! 			<select name="f8" size="1">

! 			<!-- TMPL_IF name="f8 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8a" -->

! 				<option value="a" SELECTED>Premiere generation (master)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Premiere generation (master)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8b" -->

! 				<option value="b" SELECTED>Tirage</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Tirage</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8c" -->

! 				<option value="c" SELECTED>Copie de service</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Copie de service</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8v" -->

! 				<option value="v" SELECTED>Generations diverses</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="v">Generations diverses</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr>

! 		<td>Support de film:</td>

! 		<td>

! 			<select name="f9" size="1">

! 			<!-- TMPL_IF name="f9 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f9a" -->

! 				<option value="a" SELECTED>Support de securite</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Support de securite</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f9b" -->

! 				<option value="b" SELECTED>Il ne s'agit pas d'un support de securite</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Il ne s'agit pas d'un support de securite</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f9u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f9x" -->

! 				<option value="x" SELECTED>Non applicable</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="x">Non applicable</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 	    document.f_pop.f5.value=document.f_pop.f5.value+'   ';

! 

! 

! 

! 	    document.f_pop.f5.value=document.f_pop.f5.value.substring(0,3);

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value ;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,376 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ codé 130a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Présentation matérielle</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Carte à fenêtre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Carte à fenêtre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Microfilm en cartouche</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Microfilm en cartouche</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Microfilm en cassette</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Microfilm en cassette</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1d" -->
! 		<option value="d" SELECTED>Microfilm en bobine</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Microfilm en bobine</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Microfiche</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Microfiche</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1f" -->
! 		<option value="f" SELECTED>Microfiche en cassette</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Microfiche en cassette</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1g" -->
! 		<option value="g" SELECTED>Micro opaque</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Micro opaque</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1h" -->
! 		<option value="h" SELECTED>Bande microfilm</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Bande microfilm</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Polarité</label>
! 	<select name="f2" size="1">
! 		<!-- TMPL_IF name="f2 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2a" -->
! 		<option value="a" SELECTED>Positif</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Positif</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2b" -->
! 		<option value="b" SELECTED>Négatif</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Négatif</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2c" -->
! 		<option value="c" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2d" -->
! 		<option value="d" SELECTED>Plusieurs polarités</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Plusieurs polarités</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Dimensions</label>
! 	<select name="f3" size="1">
! 		<!-- TMPL_IF name="f3 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3a" -->
! 		<option value="a" SELECTED>8 mm (microfilm)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">8 mm (microfilm)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3d" -->
! 		<option value="d" SELECTED>16 mm (microfilm)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">16 mm (microfilm)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3f" -->
! 		<option value="f" SELECTED>35 mm (microfilm)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">35 mm (microfilm)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3g" -->
! 		<option value="g" SELECTED>70 mm (microfilm)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">70 mm (microfilm)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3h" -->
! 		<option value="h" SELECTED>105 mm (microfilm)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">105 mm (microfilm)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3l" -->
! 		<option value="l" SELECTED>3x5 pouces (8x13 cm) (microfiche ou micro opaque)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="l">3x5 pouces (8x13 cm) (microfiche ou micro opaque)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3m" -->
! 		<option value="m" SELECTED>4x6 pouces (10x15 cm) (microfiche ou micro opaque)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="m">4x6 pouces (10x15 cm) (microfiche ou micro opaque)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3o" -->
! 		<option value="o" SELECTED>6x9 pouces (16x23 cm) (microfiche ou micro opaque)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="o">6x9 pouces (16x23 cm) (microfiche ou micro opaque)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3p" -->
! 		<option value="p" SELECTED>3 1/4x7 3/8 pouces (9x19 cm) (carte à fenêtre)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="p">3 1/4x7 3/8 pouces (9x19 cm) (carte à fenêtre)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Rapport de réduction</label>
! 	<select name="f4" size="1">
! 		<!-- TMPL_IF name="f4 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4a" -->
! 		<option value="a" SELECTED>Faible réduction</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Faible réduction</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4b" -->
! 		<option value="b" SELECTED>Normale (16x - 30x)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Normale (16x - 30x)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4c" -->
! 		<option value="c" SELECTED>Elevée (31x - 60x)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Elevée (31x - 60x)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4d" -->
! 		<option value="d" SELECTED>Très élevée (61x - 90x)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Très élevée (61x - 90x)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4e" -->
! 		<option value="e" SELECTED>Ultra élevée (91x -)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Ultra élevée (91x -)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4v" -->
! 		<option value="v" SELECTED>Divers</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="v">Divers</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Rapport de réduction spécifique</label>
! 	<input type="text" name="f5" maxlength=3 size=4 value="<!-- TMPL_VAR name="f5" -->">
! </p>
! 
! <p>
! 	<label style="width:20em;">Couleur</label>
! 	<select name="f6" size="1">
! 		<!-- TMPL_IF name="f6 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6a" -->
! 		<option value="a" SELECTED>Monochrome</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Monochrome</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6b" -->
! 		<option value="b" SELECTED>Couleur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Couleur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6v" -->
! 		<option value="v" SELECTED>Divers</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="v">Divers</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Emulsion</label>
! 	<select name="f7" size="1">
! 			<!-- TMPL_IF name="f7 " -->
! 			<option value=" " SELECTED>Aucun</option>
! 			<!-- TMPL_ELSE -->
! 			<option value=" ">Aucun</option>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="f7a" -->
! 			<option value="a" SELECTED>Sel d'argent</option>
! 			<!-- TMPL_ELSE -->
! 			<option value="a">Sel d'argent</option>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="f7b" -->
! 			<option value="b" SELECTED>Diazoïque</option>
! 			<!-- TMPL_ELSE -->
! 			<option value="b">Diazoïque</option>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="f7c" -->
! 			<option value="c" SELECTED>Vésiculaire</option>
! 			<!-- TMPL_ELSE -->
! 			<option value="c">Vésiculaire</option>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="f7d" -->
! 			<option value="d" SELECTED>Inconnu</option>
! 			<!-- TMPL_ELSE -->
! 			<option value="d">Inconnu</option>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="f7u" -->
! 			<option value="u" SELECTED>Emulsions diverses</option>
! 			<!-- TMPL_ELSE -->
! 			<option value="u">Emulsions diverses</option>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="f7x" -->
! 			<option value="x" SELECTED>Non applicable</option>
! 			<!-- TMPL_ELSE -->
! 			<option value="x">Non applicable</option>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="f7z" -->
! 			<option value="z" SELECTED>Autre</option>
! 			<!-- TMPL_ELSE -->
! 			<option value="z">Autre</option>
! 			<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Génération (copies)</label>
! 	<select name="f8" size="1">
! 		<!-- TMPL_IF name="f8 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8a" -->
! 		<option value="a" SELECTED>Première génération (master)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Première génération (master)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8b" -->
! 		<option value="b" SELECTED>Tirage</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Tirage</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8c" -->
! 		<option value="c" SELECTED>Copie de service</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Copie de service</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8v" -->
! 		<option value="v" SELECTED>Générations diverses</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="v">Générations diverses</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Support de film</label>
! 	<select name="f9" size="1">
! 		<!-- TMPL_IF name="f9 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9a" -->
! 		<option value="a" SELECTED>Support de sécurité</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Support de sécurité</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9b" -->
! 		<option value="b" SELECTED>Il ne s'agit pas d'un support de sécurité</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Il ne s'agit pas d'un support de sécurité</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9x" -->
! 		<option value="x" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="x">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 	    document.f_pop.f5.value=document.f_pop.f5.value+'   ';
! 
! 
! 
! 	    document.f_pop.f5.value=document.f_pop.f5.value.substring(0,3);
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value ;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:37:16 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:37:16 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_100.pl,1.7,1.8
Message-ID: <E1Ddrky-00016y-Fw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4217/value_builder

Modified Files:
	unimarc_field_100.pl 
Log Message:
Plugin for field 100a

Index: unimarc_field_100.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_100.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** unimarc_field_100.pl	7 Jun 2004 10:07:40 -0000	1.7
--- unimarc_field_100.pl	2 Jun 2005 15:37:14 -0000	1.8
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:37:35 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:37:35 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_105.pl,1.1,1.2
Message-ID: <E1DdrlH-0001AU-LV@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4481/value_builder

Modified Files:
	unimarc_field_105.pl 
Log Message:
Plugin for field 105a

Index: unimarc_field_105.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_105.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_105.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_105.pl	2 Jun 2005 15:37:33 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_105.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 105\",'width=1200,height=400,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_105.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 105\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:38:06 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:38:06 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_106.pl,1.1,1.2
Message-ID: <E1Ddrlm-0001DN-LM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4632/value_builder

Modified Files:
	unimarc_field_106.pl 
Log Message:
Plugin for field 106a

Index: unimarc_field_106.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_106.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_106.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_106.pl	2 Jun 2005 15:38:03 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_106.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 106\",'width=500,height=400,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_106.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 106\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:38:26 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:38:26 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_110.pl,1.1,1.2
Message-ID: <E1Ddrm6-0001Hg-1c@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4887/value_builder

Modified Files:
	unimarc_field_110.pl 
Log Message:
Plugin for field 110a

Index: unimarc_field_110.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_110.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_110.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_110.pl	2 Jun 2005 15:38:23 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_110.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 110\",'width=700,height=600,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_110.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 110\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:38:54 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:38:54 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_115a.pl,1.1,1.2
Message-ID: <E1DdrmY-0001K8-6r@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5026/value_builder

Modified Files:
	unimarc_field_115a.pl 
Log Message:
Plugin for field 115a

Index: unimarc_field_115a.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_115a.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_115a.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_115a.pl	2 Jun 2005 15:38:51 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_115a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 115a\",'width=1200,height=600,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_115a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 115a\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:39:35 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:39:35 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_115b.pl,1.1,1.2
Message-ID: <E1DdrnD-0001QH-EP@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5408/value_builder

Modified Files:
	unimarc_field_115b.pl 
Log Message:
Plugin for field 115b

Index: unimarc_field_115b.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_115b.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_115b.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_115b.pl	2 Jun 2005 15:39:33 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_115b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 115b\",'width=1200,height=600,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_115b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 115b\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:40:08 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:40:08 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_116.pl,1.1,1.2
Message-ID: <E1Ddrnk-0001Ws-Na@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5842/value_builder

Modified Files:
	unimarc_field_116.pl 
Log Message:
Plugin for field 116a

Index: unimarc_field_116.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_116.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_116.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_116.pl	2 Jun 2005 15:40:06 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_116.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 116\",'width=1200,height=600,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_116.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 116\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:40:42 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:40:42 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_117.pl,1.1,1.2
Message-ID: <E1DdroI-0001b8-Qk@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6109/value_builder

Modified Files:
	unimarc_field_117.pl 
Log Message:
Plugin for field 117a

Index: unimarc_field_117.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_117.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_117.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_117.pl	2 Jun 2005 15:40:40 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_117.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 117\",'width=600,height=225,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_117.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 117\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:41:01 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:41:01 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_120.pl,1.1,1.2
Message-ID: <E1Ddrob-0001fk-MJ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6387/value_builder

Modified Files:
	unimarc_field_120.pl 
Log Message:
Plugin for field 120a

Index: unimarc_field_120.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_120.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_120.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_120.pl	2 Jun 2005 15:40:59 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_120.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 120\",'width=1200,height=750,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_120.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 120\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:41:23 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:41:23 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_121a.pl,1.1,1.2
Message-ID: <E1Ddrox-0001iU-UD@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6557/value_builder

Modified Files:
	unimarc_field_121a.pl 
Log Message:
Plugin for field 121a

Index: unimarc_field_121a.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_121a.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_121a.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_121a.pl	2 Jun 2005 15:41:20 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_121a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 121a\",'width=1210,height=750,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_121a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 121a\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:41:40 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:41:40 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_121b.pl,1.1,1.2
Message-ID: <E1DdrpE-0001mM-Lq@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6796/value_builder

Modified Files:
	unimarc_field_121b.pl 
Log Message:
Plugin for field 121b

Index: unimarc_field_121b.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_121b.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_121b.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_121b.pl	2 Jun 2005 15:41:38 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_121b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 121b\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_121b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 121b\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:42:11 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:42:11 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_122.pl,1.1,1.2
Message-ID: <E1Ddrpj-0001p7-KX@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6982/value_builder

Modified Files:
	unimarc_field_122.pl 
Log Message:
Plugin for field 122a

Index: unimarc_field_122.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_122.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_122.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_122.pl	2 Jun 2005 15:42:03 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_122.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 122\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_122.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 122\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:42:39 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:42:39 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_123a.pl,1.1,1.2
Message-ID: <E1DdrqB-0001rs-OR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7138/value_builder

Modified Files:
	unimarc_field_123a.pl 
Log Message:
Plugin for field 123a

Index: unimarc_field_123a.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_123a.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_123a.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_123a.pl	2 Jun 2005 15:42:31 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123a\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123a\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:42:56 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:42:56 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_123d.pl,1.1,1.2
Message-ID: <E1DdrqS-0001tf-Ea@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7265/value_builder

Modified Files:
	unimarc_field_123d.pl 
Log Message:
Plugin for field 123d

Index: unimarc_field_123d.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_123d.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_123d.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_123d.pl	2 Jun 2005 15:42:54 -0000	1.2
***************
*** 40,44 ****
  sub plugin_javascript {
  my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
! my $function_name= "123g".(int(rand(100000))+1);
  my $res="
  <script>
--- 40,44 ----
  sub plugin_javascript {
  my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
! my $function_name= "123d".(int(rand(100000))+1);
  my $res="
  <script>
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123g.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123g\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123d.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123d\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }
***************
*** 73,77 ****
  
  my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "value_builder/unimarc_field_123g.tmpl",
  			     query => $input,
  			     type => "intranet",
--- 73,77 ----
  
  my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "value_builder/unimarc_field_123d.tmpl",
  			     query => $input,
  			     type => "intranet",




From doxulting at users.sourceforge.net  Thu Jun  2 17:43:13 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:43:13 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_123e.pl,1.1,1.2
Message-ID: <E1Ddrqj-0001vt-Jg@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7400/value_builder

Modified Files:
	unimarc_field_123e.pl 
Log Message:
Plugin for field 123e

Index: unimarc_field_123e.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_123e.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_123e.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_123e.pl	2 Jun 2005 15:43:11 -0000	1.2
***************
*** 40,44 ****
  sub plugin_javascript {
  my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
! my $function_name= "123g".(int(rand(100000))+1);
  my $res="
  <script>
--- 40,44 ----
  sub plugin_javascript {
  my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
! my $function_name= "123e".(int(rand(100000))+1);
  my $res="
  <script>
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123g.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123g\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123e.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123e\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }
***************
*** 73,77 ****
  
  my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "value_builder/unimarc_field_123g.tmpl",
  			     query => $input,
  			     type => "intranet",
--- 73,77 ----
  
  my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "value_builder/unimarc_field_123e.tmpl",
  			     query => $input,
  			     type => "intranet",




From doxulting at users.sourceforge.net  Thu Jun  2 17:43:30 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:43:30 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_123f.pl,1.1,1.2
Message-ID: <E1Ddrr0-0001xY-MX@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7504/value_builder

Modified Files:
	unimarc_field_123f.pl 
Log Message:
Plugin for field 123f

Index: unimarc_field_123f.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_123f.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_123f.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_123f.pl	2 Jun 2005 15:43:27 -0000	1.2
***************
*** 40,44 ****
  sub plugin_javascript {
  my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
! my $function_name= "123g".(int(rand(100000))+1);
  my $res="
  <script>
--- 40,44 ----
  sub plugin_javascript {
  my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
! my $function_name= "123f".(int(rand(100000))+1);
  my $res="
  <script>
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123g.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123g\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123f.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123f\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }
***************
*** 73,77 ****
  
  my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "value_builder/unimarc_field_123g.tmpl",
  			     query => $input,
  			     type => "intranet",
--- 73,77 ----
  
  my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "value_builder/unimarc_field_123f.tmpl",
  			     query => $input,
  			     type => "intranet",




From doxulting at users.sourceforge.net  Thu Jun  2 17:43:49 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:43:49 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_123g.pl,1.1,1.2
Message-ID: <E1DdrrJ-0001zg-C2@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7647/value_builder

Modified Files:
	unimarc_field_123g.pl 
Log Message:
Plugin for field 123g

Index: unimarc_field_123g.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_123g.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_123g.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_123g.pl	2 Jun 2005 15:43:47 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123g.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123g\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123g.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123g\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:44:04 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:44:04 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_123i.pl,NONE,1.1
Message-ID: <E1DdrrY-00021s-Hx@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7768/value_builder

Added Files:
	unimarc_field_123i.pl 
Log Message:
Plugin for field 123i

--- NEW FILE ---
#!/usr/bin/perl

# $Id: unimarc_field_123i.pl,v 1.1 2005/06/02 15:44:02 doxulting Exp $

# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use C4::Auth;
use CGI;
use C4::Context;
use HTML::Template;
use C4::Search;
use C4::Output;

=head1

plugin_parameters : other parameters added when the plugin is called by the dopop function

=cut
sub plugin_parameters {
my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
return "";
}

sub plugin_javascript {
my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
my $function_name= "123i".(int(rand(100000))+1);
my $res="
<script>
function Focus$function_name(subfield_managed) {
return 1;
}

function Blur$function_name(subfield_managed) {
	return 1;
}

function Clic$function_name(i) {
	defaultvalue=document.forms[0].field_value[i].value;
	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123i.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123i\",'width=800,height=400,toolbar=false,scrollbars=yes');

}
</script>
";

return ($function_name,$res);
}
sub plugin {
my ($input) = @_;
	my %env;

#	my $input = new CGI;
	my $index= $input->param('index');
	my $result= $input->param('result');


	my $dbh = C4::Context->dbh;

my ($template, $loggedinuser, $cookie)
    = get_template_and_user({template_name => "value_builder/unimarc_field_123i.tmpl",
			     query => $input,
			     type => "intranet",
			     authnotrequired => 0,
			     flagsrequired => {parameters => 1},
			     debug => 1,
			     });
	my $f1 = substr($result,0,1);
	my $f2 = substr($result,1,3);
	my $f3 = substr($result,4,2);
	my $f4 = substr($result,6,2);
	$template->param(index => $index,
			 "f1$f1" => $f1,
			 f2 => $f2,
			 f3 => $f3,
			 f4 => $f4);
	print $input->header(-cookie => $cookie),$template->output;
}

1;




From doxulting at users.sourceforge.net  Thu Jun  2 17:44:31 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:44:31 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_123j.pl,NONE,1.1
Message-ID: <E1Ddrrz-00024s-By@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7947/value_builder

Added Files:
	unimarc_field_123j.pl 
Log Message:
Plugin for field 123j

--- NEW FILE ---
#!/usr/bin/perl

# $Id: unimarc_field_123j.pl,v 1.1 2005/06/02 15:44:29 doxulting Exp $

# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use C4::Auth;
use CGI;
use C4::Context;
use HTML::Template;
use C4::Search;
use C4::Output;

=head1

plugin_parameters : other parameters added when the plugin is called by the dopop function

=cut
sub plugin_parameters {
my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
return "";
}

sub plugin_javascript {
my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
my $function_name= "123j".(int(rand(100000))+1);
my $res="
<script>
function Focus$function_name(subfield_managed) {
return 1;
}

function Blur$function_name(subfield_managed) {
	return 1;
}

function Clic$function_name(i) {
	defaultvalue=document.forms[0].field_value[i].value;
	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123j.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123j\",'width=800,height=400,toolbar=false,scrollbars=yes');

}
</script>
";

return ($function_name,$res);
}
sub plugin {
my ($input) = @_;
	my %env;

#	my $input = new CGI;
	my $index= $input->param('index');
	my $result= $input->param('result');


	my $dbh = C4::Context->dbh;

my ($template, $loggedinuser, $cookie)
    = get_template_and_user({template_name => "value_builder/unimarc_field_123j.tmpl",
			     query => $input,
			     type => "intranet",
			     authnotrequired => 0,
			     flagsrequired => {parameters => 1},
			     debug => 1,
			     });
	my $f1 = substr($result,0,1);
	my $f2 = substr($result,1,3);
	my $f3 = substr($result,4,2);
	my $f4 = substr($result,6,2);
	$template->param(index => $index,
			 "f1$f1" => $f1,
			 f2 => $f2,
			 f3 => $f3,
			 f4 => $f4);
	print $input->header(-cookie => $cookie),$template->output;
}

1;




From doxulting at users.sourceforge.net  Thu Jun  2 17:45:04 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:45:04 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_124.pl,1.1,1.2
Message-ID: <E1DdrsW-00029K-Jo@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8220/value_builder

Modified Files:
	unimarc_field_124.pl 
Log Message:
Plugin for field 124

Index: unimarc_field_124.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_124.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_124.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_124.pl	2 Jun 2005 15:44:51 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=500,height=400,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:45:20 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:45:20 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_124a.pl,1.1,1.2
Message-ID: <E1Ddrsm-0002Cv-Ko@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8447/value_builder

Modified Files:
	unimarc_field_124a.pl 
Log Message:
Plugin for field 124a

Index: unimarc_field_124a.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_124a.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_124a.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_124a.pl	2 Jun 2005 15:45:18 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124a\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124a\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:45:52 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:45:52 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_124b.pl,1.1,1.2
Message-ID: <E1DdrtI-0002Hw-I7@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8671/value_builder

Modified Files:
	unimarc_field_124b.pl 
Log Message:
Plugin for field 124b

Index: unimarc_field_124b.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_124b.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_124b.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_124b.pl	2 Jun 2005 15:45:50 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124b\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124b\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:46:13 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:46:13 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_124c.pl,1.1,1.2
Message-ID: <E1Ddrtd-0002Ka-UO@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8915/value_builder

Modified Files:
	unimarc_field_124c.pl 
Log Message:
Plugin for field 124c

Index: unimarc_field_124c.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_124c.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_124c.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_124c.pl	2 Jun 2005 15:46:11 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124c.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124c\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124c.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124c\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:46:30 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:46:30 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_124d.pl,1.1,1.2
Message-ID: <E1Ddrtu-0002OK-OT@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9148/value_builder

Modified Files:
	unimarc_field_124d.pl 
Log Message:
Plugin for field 124d

Index: unimarc_field_124d.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_124d.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_124d.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_124d.pl	2 Jun 2005 15:46:28 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124d.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124d\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124d.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124d\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:46:51 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:46:51 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_124e.pl,1.1,1.2
Message-ID: <E1DdruF-0002RD-0o@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9327/value_builder

Modified Files:
	unimarc_field_124e.pl 
Log Message:
Plugin for field 124e

Index: unimarc_field_124e.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_124e.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_124e.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_124e.pl	2 Jun 2005 15:46:43 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124e.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124e\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124e.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124e\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:47:08 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:47:08 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_124f.pl,1.1,1.2
Message-ID: <E1DdruW-0002Uv-AP@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9557/value_builder

Modified Files:
	unimarc_field_124f.pl 
Log Message:
Plugin for field 124f

Index: unimarc_field_124f.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_124f.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_124f.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_124f.pl	2 Jun 2005 15:47:06 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124f.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124f\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124f.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124f\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:47:37 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:47:37 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_124g.pl,1.1,1.2
Message-ID: <E1Ddruz-0002ZG-6Z@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9807/value_builder

Modified Files:
	unimarc_field_124g.pl 
Log Message:
Plugin for field 124g

Index: unimarc_field_124g.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_124g.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_124g.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_124g.pl	2 Jun 2005 15:47:26 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124g.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124g\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124g.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124g\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:47:53 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:47:53 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_125.pl,1.1,1.2
Message-ID: <E1DdrvF-0002dD-As@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10071/value_builder

Modified Files:
	unimarc_field_125.pl 
Log Message:
Plugin for field 125

Index: unimarc_field_125.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_125.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_125.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_125.pl	2 Jun 2005 15:47:51 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=500,height=400,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:48:18 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:48:18 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_125a.pl,1.1,1.2
Message-ID: <E1Ddrve-0002gA-U6@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10256/value_builder

Modified Files:
	unimarc_field_125a.pl 
Log Message:
Plugin for field 125a

Index: unimarc_field_125a.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_125a.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_125a.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_125a.pl	2 Jun 2005 15:48:14 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_125a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 125a\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_125a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 125a\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:48:38 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:48:38 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_125b.pl,1.1,1.2
Message-ID: <E1Ddrvy-0002kq-L9@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10546/value_builder

Modified Files:
	unimarc_field_125b.pl 
Log Message:
Plugin for field 125b

Index: unimarc_field_125b.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_125b.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_125b.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_125b.pl	2 Jun 2005 15:48:36 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_125b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 125b\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_125b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 125b\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:49:30 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:49:30 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_126b.pl,1.1,1.2
Message-ID: <E1Ddrwo-0002sz-Jq@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11030/value_builder

Modified Files:
	unimarc_field_126b.pl 
Log Message:
Plugin for field 126b

Index: unimarc_field_126b.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_126b.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_126b.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_126b.pl	2 Jun 2005 15:49:28 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_126b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 126b\",'width=1000,height=575,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_126b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 126b\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:49:46 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:49:46 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_127.pl,1.1,1.2
Message-ID: <E1Ddrx4-0002wt-Gg@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11288/value_builder

Modified Files:
	unimarc_field_127.pl 
Log Message:
Plugin for field 127a

Index: unimarc_field_127.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_127.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_127.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_127.pl	2 Jun 2005 15:49:44 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_127.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 127\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_127.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 127\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:50:06 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:50:06 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_128a.pl,1.1,1.2
Message-ID: <E1DdrxO-00031v-U9@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11572/value_builder

Modified Files:
	unimarc_field_128a.pl 
Log Message:
Plugin for field 128a

Index: unimarc_field_128a.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_128a.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_128a.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_128a.pl	2 Jun 2005 15:50:04 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_128a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 128a\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_128a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 128a\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:50:26 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:50:26 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_128b.pl,1.1,1.2
Message-ID: <E1Ddrxi-00033n-1k@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11737/value_builder

Modified Files:
	unimarc_field_128b.pl 
Log Message:
Plugin for field 128b

Index: unimarc_field_128b.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_128b.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_128b.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_128b.pl	2 Jun 2005 15:50:23 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_128b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 128b\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_128b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 128b\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }
***************
*** 81,86 ****
  			     });
  	my $f1 = substr($result,0,2);
  	$template->param(index => $index,
! 			 "f1$f1" => $f1);
  	print $input->header(-cookie => $cookie),$template->output;
  }
--- 81,88 ----
  			     });
  	my $f1 = substr($result,0,2);
+ 	my $f2 = substr($result,2,2);
  	$template->param(index => $index,
! 			 "f1$f1" => $f1,
! 			f2 => $f2);
  	print $input->header(-cookie => $cookie),$template->output;
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:50:41 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:50:41 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_128c.pl,1.1,1.2
Message-ID: <E1Ddrxx-000376-D9@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11927/value_builder

Modified Files:
	unimarc_field_128c.pl 
Log Message:
Plugin for field 128c

Index: unimarc_field_128c.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_128c.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_128c.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_128c.pl	2 Jun 2005 15:50:39 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_128c.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 128c\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_128c.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 128c\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }
***************
*** 81,86 ****
  			     });
  	my $f1 = substr($result,0,2);
  	$template->param(index => $index,
! 			 "f1$f1" => $f1);
  	print $input->header(-cookie => $cookie),$template->output;
  }
--- 81,88 ----
  			     });
  	my $f1 = substr($result,0,2);
+ 	my $f2 = substr($result,2,2);
  	$template->param(index => $index,
! 			 "f1$f1" => $f1,
! 			f2 => $f2);
  	print $input->header(-cookie => $cookie),$template->output;
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:51:02 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:51:02 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_130.pl,1.1,1.2
Message-ID: <E1DdryI-00039J-Uw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12092/value_builder

Modified Files:
	unimarc_field_130.pl 
Log Message:
Plugin for field 130a

Index: unimarc_field_130.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_130.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_130.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_130.pl	2 Jun 2005 15:50:59 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_130.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 130\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_130.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 130\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:48:56 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:48:56 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_126.pl,1.1,1.2
Message-ID: <E1DdrwG-0002oK-Eh@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10767/value_builder

Modified Files:
	unimarc_field_126.pl 
Log Message:
Plugin for field 126

Index: unimarc_field_126.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_126.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_126.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_126.pl	2 Jun 2005 15:48:54 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=500,height=400,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:49:10 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:49:10 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_126a.pl,1.1,1.2
Message-ID: <E1DdrwU-0002qs-5K@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10927/value_builder

Modified Files:
	unimarc_field_126a.pl 
Log Message:
Plugin for field 126a

Index: unimarc_field_126a.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_126a.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_126a.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_126a.pl	2 Jun 2005 15:49:08 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_126a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 126a\",'width=1000,height=575,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_126a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 126a\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:51:36 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:51:36 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_135a.pl,1.1,1.2
Message-ID: <E1Ddryq-0003DU-Kp@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12278/value_builder

Modified Files:
	unimarc_field_135a.pl 
Log Message:
Plugin for field 135a

Index: unimarc_field_135a.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_135a.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_135a.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_135a.pl	2 Jun 2005 15:51:18 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_135a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 135a\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_135a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 135a\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }
***************
*** 84,104 ****
  	my $f3 = substr($result,2,1);
  	my $f4 = substr($result,3,1);
! 	my $f5 = substr($result,4,3);
! 	my $f6 = substr($result,7,1);
  	my $f7 = substr($result,8,1);
  	my $f8 = substr($result,9,1);
  	my $f9 = substr($result,10,1);
  
! 	$template->param(index => $index,
  			 "f1$f1" => $f1,
  			 "f2$f2" => $f2,
  			 "f3$f3" => $f3,
  			 "f4$f4" => $f4,
! 			 "f5" => $f5,
! 			 "f6$f6" => $f6,
  			 "f7$f7" => $f7,
  			 "f8$f8" => $f8,
! 			 "f9$f9" => $f9
! 
  );
  	print $input->header(-cookie => $cookie),$template->output;
--- 84,107 ----
  	my $f3 = substr($result,2,1);
  	my $f4 = substr($result,3,1);
! 	my $f5 = substr($result,4,1);
! 	my $f6 = substr($result,5,3);
  	my $f7 = substr($result,8,1);
  	my $f8 = substr($result,9,1);
  	my $f9 = substr($result,10,1);
+ 	my $f10 = substr($result,11,1);
+ 	my $f11 = substr($result,12,1);
  
! 	$template->param("index" => $index,
  			 "f1$f1" => $f1,
  			 "f2$f2" => $f2,
  			 "f3$f3" => $f3,
  			 "f4$f4" => $f4,
! 			 "f5$f5" => $f5,
! 			 "f6" => $f6,
  			 "f7$f7" => $f7,
  			 "f8$f8" => $f8,
! 			 "f9$f9" => $f9,
! 			 "f10$f10" => $f10,
! 			 "f11$f11" => $f11
  );
  	print $input->header(-cookie => $cookie),$template->output;




From doxulting at users.sourceforge.net  Thu Jun  2 17:51:52 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:51:52 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_140.pl,1.1,1.2
Message-ID: <E1Ddrz6-0003Gz-V3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12548/value_builder

Modified Files:
	unimarc_field_140.pl 
Log Message:
Plugin for field 140a

Index: unimarc_field_140.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_140.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_140.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_140.pl	2 Jun 2005 15:51:50 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_140.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 140\",'width=1000,height=575,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_140.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 140\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:52:09 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:52:09 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_141.pl,1.1,1.2
Message-ID: <E1DdrzN-0003Kx-IX@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12775/value_builder

Modified Files:
	unimarc_field_141.pl 
Log Message:
Plugin for field 141a

Index: unimarc_field_141.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_141.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_141.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_141.pl	2 Jun 2005 15:52:07 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_141.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 141\",'width=1000,height=575,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_141.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 141\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From hdl at users.sourceforge.net  Thu Jun  2 23:04:37 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 02 Jun 2005 14:04:37 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-full-serial-issues.tmpl,NONE,1.1.2.1
Message-ID: <E1Ddwrl-0004dt-Uy@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
      Tag: rel_2_2
	opac-full-serial-issues.tmpl 
Log Message:
Adding full history support to opac serial
Needs fixing

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="opac-top.inc" -->


<!-- TMPL_UNLESS name="popup" -->
<div class="tabbed">
<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>
		<h2 class="catalogue">Subscription information for biblio number : <!-- TMPL_VAR NAME="biblionumber" --> with title : <!-- TMPL_VAR name="bibliotitle" --></h2>

</div>
<!-- /TMPL_UNLESS -->
	<div class="tabs">
	<!-- TMPL_LOOP NAME="years" -->
		<!-- TMPL_IF NAME="year" -->
			<div id="link<!--TMPL_VAR Name="year" -->"><a href="javascript:active(<!-- TMPL_VAR NAME="year" -->)"><!-- TMPL_VAR NAME="year" --></a></div>
		<!-- /TMPL_IF -->
	<!-- /TMPL_LOOP -->
	</div>

	<!-- TMPL_LOOP NAME="years" -->
	<div name="<!-- TMPL_VAR NAME="year" -->XX" id="<!-- TMPL_VAR NAME="year" -->XX" class="tab" style="visibility:visible">
		<table>
			<tr>
				<th> Date
				</th>
				<th> Number
				</th>
				<th> Status
				</th>
			</tr>
			<!-- TMPL_LOOP Name="serials" -->
			<tr>
				<td>
					<!-- TMPL_VAR Name="planneddate" -->
				</td>
				<td>
					<!-- TMPL_VAR Name="serialseq" -->
				</td>
				<td>
					<!-- TMPL_VAR Name="status" -->
				</td>
			</tr>
			<!-- /TMPL_LOOP -->
	</div>
	<!--/TMPL_LOOP -->

<script language="JavaScript" type="text/javascript">
function active(numlayer)
{
	for (i=<!--TMPL_VAR Name="yearmin"-->; i <= <!--TMPL_VAR Name="yearmax"--> ; i++ ) {
		ong = i+"XX";
		link = "link"+i;
		if (numlayer==i) {
			document.getElementById(ong).style.visibility="visible";
		} else {
			document.getElementById(ong).style.visibility="hidden";
		}
	}
}

</script>
</body>
</html>




From hdl at users.sourceforge.net  Thu Jun  2 23:04:37 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 02 Jun 2005 14:04:37 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-serial-issues.pl,1.1.2.4,1.1.2.5
Message-ID: <E1Ddwrl-0004du-Vx@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17766/opac

Modified Files:
      Tag: rel_2_2
	opac-serial-issues.pl 
Log Message:
Adding full history support to opac serial
Needs fixing

Index: opac-serial-issues.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-serial-issues.pl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** opac-serial-issues.pl	1 Jun 2005 20:05:41 -0000	1.1.2.4
--- opac-serial-issues.pl	2 Jun 2005 21:04:35 -0000	1.1.2.5
***************
*** 15,22 ****
--- 15,58 ----
  my $op = $query->param('op');
  my $dbh = C4::Context->dbh;
+ my $selectview = C4::Context->preference("SubscriptionHistory");
+ warn "selectview : ".$selectview;
+ 
  my $sth;
  # my $id;
  my ($template, $loggedinuser, $cookie);
  my $biblionumber = $query->param('biblionumber');
+ if ($selectview eq "full"){
+ my $subscriptions = get_full_subscription_list_from_biblionumber($biblionumber);
+ 
+ my $year;
+ my $yearmin=$subscriptions->[1]{year};
+ warn "yearmin".$yearmin;
+ my $yearmax;
+ my @loopissues;
+ my $yearmax=$subscriptions->[scalar(@$subscriptions)]{year};
+ warn "yearmax".$yearmax;
+ 
+ 
+ ($template, $loggedinuser, $cookie)
+ = get_template_and_user({template_name => "opac-full-serial-issues.tmpl",
+ 				query => $query,
+ 				type => "opac",
+ 				authnotrequired => 1,
+ 				debug => 1,
+ 				});
+ 
+ # replace CR by <br> in librarian note
+ # $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
+ 
+ $template->param(
+ 	biblionumber => $query->param('biblionumber'),
+ 	years => $subscriptions,
+ 	yearmin => $yearmin,
+ 	yearmax =>$yearmax,
+ 	suggestion => C4::Context->preference("suggestion"),
+ 	virtualshelves => C4::Context->preference("virtualshelves"),
+ 	);
+ 
+ } else {
  my $subscriptions = get_subscription_list_from_biblionumber($biblionumber);
  
***************
*** 38,41 ****
  	virtualshelves => C4::Context->preference("virtualshelves"),
  	);
! 
  output_html_with_http_headers $query, $cookie, $template->output;
--- 74,77 ----
  	virtualshelves => C4::Context->preference("virtualshelves"),
  	);
! }
  output_html_with_http_headers $query, $cookie, $template->output;




From hdl at users.sourceforge.net  Thu Jun  2 23:04:38 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 02 Jun 2005 14:04:38 -0700
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.6.2.5,1.6.2.6
Message-ID: <E1Ddwrm-0004e2-Dv@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17766/C4

Modified Files:
      Tag: rel_2_2
	Bull.pm 
Log Message:
Adding full history support to opac serial
Needs fixing

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.6.2.5
retrieving revision 1.6.2.6
diff -C2 -r1.6.2.5 -r1.6.2.6
*** Bull.pm	28 Apr 2005 08:49:40 -0000	1.6.2.5
--- Bull.pm	2 Jun 2005 21:04:35 -0000	1.6.2.6
***************
*** 47,50 ****
--- 47,51 ----
  @EXPORT = qw(&newsubscription &modsubscription &delsubscription &getsubscriptions &getsubscription 
  			&getsubscriptionfrombiblionumber &get_subscription_list_from_biblionumber
+ 			&get_full_subscription_list_from_biblionumber 
  			&modsubscriptionhistory &newissue
  			&getserials &serialchangestatus
***************
*** 167,171 ****
  	my ($biblionumber) = @_;
  	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare('select subscription.*,subscriptionhistory.*,aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle 
  							from subscription 
  							left join subscriptionhistory on subscription.subscriptionid=subscriptionhistory.subscriptionid
--- 168,172 ----
  	my ($biblionumber) = @_;
  	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare('select subscription.*,subscriptionhistory.*,  aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle 
  							from subscription 
  							left join subscriptionhistory on subscription.subscriptionid=subscriptionhistory.subscriptionid
***************
*** 186,189 ****
--- 187,223 ----
  }
  
+ sub get_full_subscription_list_from_biblionumber {
+ 	my ($biblionumber) = @_;
+ 	my $dbh = C4::Context->dbh;
+ 	my $sth = $dbh->prepare('select year(subscription.startdate) as year,subscription.*, aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle 
+ 							from subscription 
+ 							left join aqbudget on subscription.aqbudgetid=aqbudget.aqbudgetid 
+ 							left join aqbooksellers on subscription.aqbooksellerid=aqbooksellers.id 
+ 							left join biblio on biblio.biblionumber=subscription.biblionumber 
+ 							where subscription.biblionumber = ? order by subscription.startdate');
+ 	$sth->execute($biblionumber);
+ 	my @res;
+ 	my $year;
+ 	my @loopissues;
+ 	while (my $subs = $sth->fetchrow_hashref) {
+ 		my $sth2 = $dbh->prepare('select serial.serialseq, serial.planneddate, year(serial.planneddate) as year, serial.status from serial where serial.biblionumber = ? and serial.subscriptionid=? order by serial.planneddate');
+ 		$sth2->execute($biblionumber,$subs->{'subscriptionid'});
+ 		while (my $issues = $sth2->fetchrow_hashref){
+ 				push @loopissues,
+ 					{'planneddate' => $issues->{'planneddate'}, 
+ 					'serialseq' => $issues->{'serialseq'},
+ 					'status' => $issues->{'status'}};
+ # 				warn "planneddate ".$issues->{'planneddate'};
+ # 				warn "serialseq".$issues->{'serialseq'};
+ 		}
+ 		my %cell;
+ 		$cell{'year'}=$subs->{year};
+ 		$cell{'title'}=$subs->{title};
+ 		$cell{'booksellername'}=$subs->{booksellername};
+ 		$cell{'serials'}=\@loopissues;
+ 		push @res,\%cell;
+ 	}
+ 	return \@res;
+ }
  
  sub modsubscription {




From hdl at users.sourceforge.net  Thu Jun  2 23:05:39 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 02 Jun 2005 14:05:39 -0700
Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.100.2.2,1.100.2.3
Message-ID: <E1Ddwsl-0004ki-Fk@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/updater
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18239/updater

Modified Files:
      Tag: rel_2_2
	updatedatabase 
Log Message:
adding variable SubscriptionHistory

Index: updatedatabase
===================================================================
RCS file: /cvsroot/koha/koha/updater/updatedatabase,v
retrieving revision 1.100.2.2
retrieving revision 1.100.2.3
diff -C2 -r1.100.2.2 -r1.100.2.3
*** updatedatabase	29 Mar 2005 15:41:43 -0000	1.100.2.2
--- updatedatabase	2 Jun 2005 21:05:34 -0000	1.100.2.3
***************
*** 848,851 ****
--- 848,862 ----
  	        options		=> ';|tabulation|,|/|\|#'
          },
+         {
+             uniquefieldrequired => 'variable',
+             variable            => 'SubscriptionHistory',
+             value               => ';',
+ 	        forceupdate		=> { 'explanation' => 1,
+ 	    			     'type' => 1,
+ 				     'options' => 1},
+             explanation         => 'Define the information level for serials history in OPAC',
+ 	        type		=> 'Choice',
+ 	        options		=> 'simplified|full'
+         },
      ],
  
***************
*** 1433,1436 ****
--- 1444,1450 ----
  
  # $Log$
+ # Revision 1.100.2.3  2005/06/02 21:05:34  hdl
+ # adding variable SubscriptionHistory
+ #
  # Revision 1.100.2.2  2005/03/29 15:41:43  tipaul
  # * new permissions : management & tools. You now have 2 new permissions :




From genjimoto at users.sourceforge.net  Fri Jun  3 05:51:28 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Thu, 02 Jun 2005 20:51:28 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-search.pl,1.27,1.28
Message-ID: <E1De3DU-0001i3-UN@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6543

Modified Files:
	opac-search.pl 
Log Message:
Search for availablilty feature implemented.

Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** opac-search.pl	2 Jun 2005 13:47:47 -0000	1.27
--- opac-search.pl	3 Jun 2005 03:51:26 -0000	1.28
***************
*** 16,20 ****
  my $firstbiblionumber; # needed for directly sending user to first item
  # use C4::Search;
! 
  
  my $itemtypelist;
--- 16,20 ----
  my $firstbiblionumber; # needed for directly sending user to first item
  # use C4::Search;
! my $totalresults;
  
  my $itemtypelist;
***************
*** 56,60 ****
  my $op = $query->param("op");
  my $type=$query->param('type');
! 
  my $itemtypesstring=$query->param("itemtypesstring");
  $itemtypesstring =~s/"//g;
--- 56,60 ----
  my $op = $query->param("op");
  my $type=$query->param('type');
! my $avail=$query->param('avail');
  my $itemtypesstring=$query->param("itemtypesstring");
  $itemtypesstring =~s/"//g;
***************
*** 141,145 ****
          $sqlstring .= '))'
      }
! 
  	my ($results,$total) = catalogsearch($dbh, \@tags,\@and_or,
  										\@excluding, \@operator, \@value,
--- 141,147 ----
          $sqlstring .= '))'
      }
!   if ($avail){
!     $sqlstring .= "and biblioitems.biblioitemnumber=items.biblioitemnumber and items.itemnumber !=issues.itemnumber and biblio.biblionumber !=reserves.biblionumber and (items.itemlost IS NULL or items.itemlost = 0) and (items.notforloan IS NULL or items.notforloan =0) and (items.wthdrawn IS NULL or items.wthdrawn =0) ";
!   }
  	my ($results,$total) = catalogsearch($dbh, \@tags,\@and_or,
  										\@excluding, \@operator, \@value,




From genjimoto at users.sourceforge.net  Fri Jun  3 05:58:28 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Thu, 02 Jun 2005 20:58:28 -0700
Subject: [Koha-cvs] CVS: koha/C4 SearchMarc.pm,1.43,1.44
Message-ID: <E1De3KG-0002cV-N5@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10028

Modified Files:
	SearchMarc.pm 
Log Message:
Added necessary tables for search for availablity feature into Catalogsearch. Someone needs to speed it up somehow.

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** SearchMarc.pm	1 Jun 2005 21:18:39 -0000	1.43
--- SearchMarc.pm	3 Jun 2005 03:58:26 -0000	1.44
***************
*** 277,289 ****
  	# Finds the basic results without the NOT requests
  	my ($sql_tables, $sql_where1, $sql_where2) = create_request($dbh,\@normal_tags, \@normal_and_or, \@normal_operator, \@normal_value);
!   $sql_where1 .=" ". $sqlstring;
  	$sql_where1 .= "and TO_DAYS( NOW( ) ) - TO_DAYS( biblio.timestamp ) <30" if $orderby =~ "biblio.timestamp";
  	my $sth;
  	if ($sql_where2) {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc");
! 		warn "Q2 : select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc term is  @$value";
  	} else {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc");
! 		warn "Q : select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc";
  	}
  	$sth->execute();
--- 277,289 ----
  	# Finds the basic results without the NOT requests
  	my ($sql_tables, $sql_where1, $sql_where2) = create_request($dbh,\@normal_tags, \@normal_and_or, \@normal_operator, \@normal_value);
!   $sql_where1 .= $sqlstring;
  	$sql_where1 .= "and TO_DAYS( NOW( ) ) - TO_DAYS( biblio.timestamp ) <30" if $orderby =~ "biblio.timestamp";
  	my $sth;
  	if ($sql_where2) {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,issues,reserves,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc");
! 		warn "Q2 : select distinct m1.bibid from biblio,biblioitems,items,issues,reserves,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc term is  @$value";
  	} else {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,issues,reserves,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc");
! 		warn "Q : select distinct m1.bibid from biblio,biblioitems,items,issues,reserves,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc";
  	}
  	$sth->execute();




From genjimoto at users.sourceforge.net  Fri Jun  3 06:15:31 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Thu, 02 Jun 2005 21:15:31 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-search.pl,1.28,1.29
Message-ID: <E1De3al-0004kO-Gm@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18197

Modified Files:
	opac-search.pl 
Log Message:
Added avail into the template parameters

Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** opac-search.pl	3 Jun 2005 03:51:26 -0000	1.28
--- opac-search.pl	3 Jun 2005 04:15:29 -0000	1.29
***************
*** 88,95 ****
--- 88,99 ----
      $searchdesc .= join(" ", at itemtypes)
    }
+ 
    if ($branchesstring ne ''){
      $searchdesc .= ' in branches ';
      $searchdesc .= join(" ", at branches)
    }
+   if ($avail ne ''){
+     $searchdesc .= '. Only available items shown.'
+   }
  	$resultsperpage= $query->param('resultsperpage');
  	$resultsperpage = 19 if(!defined $resultsperpage);
***************
*** 353,356 ****
--- 357,361 ----
                mediatypelist => $mediatypelist,
                itemtypesstring => $itemtypesstring,
+               avail => $avail,
  							);
  




From genjimoto at users.sourceforge.net  Fri Jun  3 06:16:55 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Thu, 02 Jun 2005 21:16:55 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-searchresults.tmpl,1.23,1.24
Message-ID: <E1De3c7-0004uP-V8@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac-searchresults.tmpl 
Log Message:
the avail checkbox now gets checked if the template gets avail in its parameters

Index: opac-searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** opac-searchresults.tmpl	1 Jun 2005 22:20:16 -0000	1.23
--- opac-searchresults.tmpl	3 Jun 2005 04:16:53 -0000	1.24
***************
*** 180,184 ****
  <!-- TMPL_VAR NAME="brancheslist" -->
  </select><br>
! <input type="checkbox" name="avail"> Only show titles available (Not on loan)<br>
  <input type="submit" value="Search">
  </form>
--- 180,188 ----
  <!-- TMPL_VAR NAME="brancheslist" -->
  </select><br>
! 
! <input type="checkbox" name="avail"
! <!-- TMPL_IF NAME="avail" --> checked
! <!-- /TMPL_IF -->
! > Only show titles available (Not on loan)<br>
  <input type="submit" value="Search">
  </form>




From hellen at users.sourceforge.net  Fri Jun  3 13:38:13 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Fri, 03 Jun 2005 04:38:13 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/acqui supplier.tmpl,1.1,1.2
Message-ID: <E1DeAVB-0003io-Vi@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	supplier.tmpl 
Log Message:
translated by hellen

Index: supplier.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui/supplier.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** supplier.tmpl	12 May 2005 19:26:13 -0000	1.1
--- supplier.tmpl	3 Jun 2005 11:38:11 -0000	1.2
***************
*** 18,26 ****
  		</p>
  		<p>
! 			<label>Postal Address</label>
  				<textarea name="company_postal" cols="40" rows="3"><!-- TMPL_VAR NAME="postal" --></textarea>
  		</p>
  		<p>
! 			<label>Physical Address</label>
  			<textarea name="physical" cols="40" rows="4"><!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></textarea>
  		</p>
--- 18,26 ----
  		</p>
  		<p>
! 			<label>Anschrift</label>
  				<textarea name="company_postal" cols="40" rows="3"><!-- TMPL_VAR NAME="postal" --></textarea>
  		</p>
  		<p>
! 			<label>Anschrift 2</label>
  			<textarea name="physical" cols="40" rows="4"><!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></textarea>
  		</p>
***************
*** 51,55 ****
  		</p>
  		<p>
! 			<label>Weiter Rufnummer</label>
  			<input type="text" size="20" name="contact_phone_2" value="<!-- TMPL_VAR NAME="contaltphone" -->">
  		</p>
--- 51,55 ----
  		</p>
  		<p>
! 			<label>Weitere Rufnummer</label>
  			<input type="text" size="20" name="contact_phone_2" value="<!-- TMPL_VAR NAME="contaltphone" -->">
  		</p>
***************
*** 84,88 ****
  		</p>
  		<p>
! 			<label class="label100">List Prices are</label>
  				<select name="list_currency" size="1">
  				<!-- TMPL_LOOP NAME="loop_pricescurrency" -->
--- 84,88 ----
  		</p>
  		<p>
! 			<label class="label100">Listenpreise/label>
  				<select name="list_currency" size="1">
  				<!-- TMPL_LOOP NAME="loop_pricescurrency" -->
***************
*** 100,108 ****
  		</p>
  		<p>
! 			<label class="label100">GST Registered</label>
  				<input type="radio" name="gst" value="1" <!-- TMPL_IF name="gstreg" -->checked<!-- /TMPL_IF -->>Ja <input type="radio" name="gst" value="0" <!-- TMPL_UNLESS name="gstreg" -->checked<!-- /TMPL_UNLESS -->>Nein
  		</p>
  		<p>
! 			<label class="label100">List Item Price Includes GST</label>
  				<input type="radio" name="list_gst" value="1" <!-- TMPL_IF name="listincgst" -->checked<!-- /TMPL_IF -->>Ja <input type="radio" name="list_gst" value="0" <!-- TMPL_UNLESS name="listincgst" -->checked<!-- /TMPL_UNLESS -->>Nein
  		</p>
--- 100,108 ----
  		</p>
  		<p>
! 			<label class="label100">MWST</label>
  				<input type="radio" name="gst" value="1" <!-- TMPL_IF name="gstreg" -->checked<!-- /TMPL_IF -->>Ja <input type="radio" name="gst" value="0" <!-- TMPL_UNLESS name="gstreg" -->checked<!-- /TMPL_UNLESS -->>Nein
  		</p>
  		<p>
! 			<label class="label100">Listenpreis einschl. MWST</label>
  				<input type="radio" name="list_gst" value="1" <!-- TMPL_IF name="listincgst" -->checked<!-- /TMPL_IF -->>Ja <input type="radio" name="list_gst" value="0" <!-- TMPL_UNLESS name="listincgst" -->checked<!-- /TMPL_UNLESS -->>Nein
  		</p>




From hdl at users.sourceforge.net  Fri Jun  3 14:53:10 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 03 Jun 2005 05:53:10 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-serial-issues.pl,1.1.2.5,1.1.2.6
Message-ID: <E1DeBfi-0005tY-B0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22616/opac

Modified Files:
      Tag: rel_2_2
	opac-serial-issues.pl 
Log Message:
Featuring OPAC with Full History Subscription

Index: opac-serial-issues.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-serial-issues.pl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -r1.1.2.5 -r1.1.2.6
*** opac-serial-issues.pl	2 Jun 2005 21:04:35 -0000	1.1.2.5
--- opac-serial-issues.pl	3 Jun 2005 12:53:08 -0000	1.1.2.6
***************
*** 25,35 ****
  my $subscriptions = get_full_subscription_list_from_biblionumber($biblionumber);
  
! my $year;
! my $yearmin=$subscriptions->[1]{year};
! warn "yearmin".$yearmin;
! my $yearmax;
! my @loopissues;
! my $yearmax=$subscriptions->[scalar(@$subscriptions)]{year};
! warn "yearmax".$yearmax;
  
  
--- 25,34 ----
  my $subscriptions = get_full_subscription_list_from_biblionumber($biblionumber);
  
! my $title = $subscriptions->[0]{bibliotitle};
! warn "title ".$title;
! my $yearmin=$subscriptions->[0]{year};
! warn "yearmin ".$yearmin;
! my $yearmax=$subscriptions->[scalar(@$subscriptions)-1]{year};
! warn "yearmax ".$yearmax;
  
  
***************
*** 50,53 ****
--- 49,53 ----
  	yearmin => $yearmin,
  	yearmax =>$yearmax,
+ 	bibliotitle => $title,
  	suggestion => C4::Context->preference("suggestion"),
  	virtualshelves => C4::Context->preference("virtualshelves"),




From hdl at users.sourceforge.net  Fri Jun  3 14:53:10 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 03 Jun 2005 05:53:10 -0700
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.6.2.6,1.6.2.7
Message-ID: <E1DeBfi-0005tk-ME@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22616/C4

Modified Files:
      Tag: rel_2_2
	Bull.pm 
Log Message:
Featuring OPAC with Full History Subscription

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.6.2.6
retrieving revision 1.6.2.7
diff -C2 -r1.6.2.6 -r1.6.2.7
*** Bull.pm	2 Jun 2005 21:04:35 -0000	1.6.2.6
--- Bull.pm	3 Jun 2005 12:53:08 -0000	1.6.2.7
***************
*** 190,220 ****
  	my ($biblionumber) = @_;
  	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare('select year(subscription.startdate) as year,subscription.*, aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle 
! 							from subscription 
  							left join aqbudget on subscription.aqbudgetid=aqbudget.aqbudgetid 
  							left join aqbooksellers on subscription.aqbooksellerid=aqbooksellers.id 
  							left join biblio on biblio.biblionumber=subscription.biblionumber 
! 							where subscription.biblionumber = ? order by subscription.startdate');
  	$sth->execute($biblionumber);
  	my @res;
  	my $year;
  	my @loopissues;
  	while (my $subs = $sth->fetchrow_hashref) {
! 		my $sth2 = $dbh->prepare('select serial.serialseq, serial.planneddate, year(serial.planneddate) as year, serial.status from serial where serial.biblionumber = ? and serial.subscriptionid=? order by serial.planneddate');
! 		$sth2->execute($biblionumber,$subs->{'subscriptionid'});
! 		while (my $issues = $sth2->fetchrow_hashref){
! 				push @loopissues,
! 					{'planneddate' => $issues->{'planneddate'}, 
! 					'serialseq' => $issues->{'serialseq'},
! 					'status' => $issues->{'status'}};
  # 				warn "planneddate ".$issues->{'planneddate'};
  # 				warn "serialseq".$issues->{'serialseq'};
  		}
- 		my %cell;
- 		$cell{'year'}=$subs->{year};
- 		$cell{'title'}=$subs->{title};
- 		$cell{'booksellername'}=$subs->{booksellername};
- 		$cell{'serials'}=\@loopissues;
- 		push @res,\%cell;
  	}
  	return \@res;
--- 190,250 ----
  	my ($biblionumber) = @_;
  	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare('select serial.serialseq, serial.planneddate, serial.status, year(serial.planneddate) as year,subscription.*, aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle 
! 							from serial left join subscription on (serial.subscriptionid=subscription.subscriptionid and subscription.biblionumber=serial.biblionumber)
  							left join aqbudget on subscription.aqbudgetid=aqbudget.aqbudgetid 
  							left join aqbooksellers on subscription.aqbooksellerid=aqbooksellers.id 
  							left join biblio on biblio.biblionumber=subscription.biblionumber 
! 							where subscription.biblionumber = ? order by year,serial.planneddate');
  	$sth->execute($biblionumber);
  	my @res;
  	my $year;
+ 	my $startdate;
+ 	my $aqbooksellername;
+ 	my $bibliotitle;
  	my @loopissues;
+ 	my $first;
  	while (my $subs = $sth->fetchrow_hashref) {
! # 		my $sth2 = $dbh->prepare('select * from serial where serial.biblionumber = ? and serial.subscriptionid=? order by serial.planneddate');
! # 		$sth2->execute($biblionumber,$subs->{'subscriptionid'});
! # 		while (my $issues = $sth2->fetchrow_hashref){
  # 				warn "planneddate ".$issues->{'planneddate'};
  # 				warn "serialseq".$issues->{'serialseq'};
+ # 		}
+ 		if ($year and ($year==$subs->{year})){
+ 			if ($first eq 1){$first=0;}
+ 			my $temp=$res[scalar(@res)-1]->{'serials'};
+ 			push @$temp,
+ 				{'planneddate' => $subs->{'planneddate'}, 
+ 				'serialseq' => $subs->{'serialseq'},
+ 				'status1' => $subs->{'status'}==1,
+ 				'status2' => $subs->{'status'}==2,
+ 				'status3' => $subs->{'status'}==3,
+ 				'status4' => $subs->{'status'}==4,
+ 				};
+ 		}else {
+ 			$year= $subs->{'year'};
+ 			$startdate= $subs->{'startdate'};
+ 			$aqbooksellername= $subs->{'aqbooksellername'};
+ 			$bibliotitle= $subs->{'bibliotitle'};
+ 			$first=1 if (not $year);
+ 			my @temp;
+ 			push @temp,
+ 				{'planneddate' => $subs->{'planneddate'}, 
+ 				'serialseq' => $subs->{'serialseq'},
+ 				'status1' => $subs->{'status'}==1,
+ 				'status2' => $subs->{'status'}==2,
+ 				'status3' => $subs->{'status'}==3,
+ 				'status4' => $subs->{'status'}==4,
+ 				};
+ 			
+ 			push @res,{
+ 				'year'=>$year,
+ 				'startdate'=>$startdate,
+ 				'aqbooksellername'=>$aqbooksellername,
+ 				'bibliotitle'=>$bibliotitle,
+ 				'serials'=>\@temp,
+ 				'first'=>$first 
+ 			};
  		}
  	}
  	return \@res;




From hdl at users.sourceforge.net  Fri Jun  3 14:53:10 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 03 Jun 2005 05:53:10 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-full-serial-issues.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1DeBfi-0005tc-EK@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-full-serial-issues.tmpl 
Log Message:
Featuring OPAC with Full History Subscription

Index: opac-full-serial-issues.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/Attic/opac-full-serial-issues.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac-full-serial-issues.tmpl	2 Jun 2005 21:04:35 -0000	1.1.2.1
--- opac-full-serial-issues.tmpl	3 Jun 2005 12:53:08 -0000	1.1.2.2
***************
*** 3,17 ****
  
  <!-- TMPL_UNLESS name="popup" -->
! <div class="tabbed">
! <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>
- 		<h2 class="catalogue">Subscription information for biblio number : <!-- TMPL_VAR NAME="biblionumber" --> with title : <!-- TMPL_VAR name="bibliotitle" --></h2>
  
  </div>
  <!-- /TMPL_UNLESS -->
! 	<div class="tabs">
  	<!-- TMPL_LOOP NAME="years" -->
  		<!-- TMPL_IF NAME="year" -->
! 			<div id="link<!--TMPL_VAR Name="year" -->"><a href="javascript:active(<!-- TMPL_VAR NAME="year" -->)"><!-- TMPL_VAR NAME="year" --></a></div>
  		<!-- /TMPL_IF -->
  	<!-- /TMPL_LOOP -->
--- 3,16 ----
  
  <!-- TMPL_UNLESS name="popup" -->
! <div class="mainbloc">
! 		<h1 class="catalogue">Subscription information for biblio #<!-- TMPL_VAR NAME="biblionumber" --> with title : <!-- TMPL_VAR name="bibliotitle" --></h1>
  <a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Back to biblio</a>
  
  </div>
  <!-- /TMPL_UNLESS -->
! 	<div class="tabsubs">
  	<!-- TMPL_LOOP NAME="years" -->
  		<!-- TMPL_IF NAME="year" -->
! 			<div id="link<!--TMPL_VAR Name="year" -->" ><a href="javascript:active(<!-- TMPL_VAR NAME="year" -->)"><!-- TMPL_VAR NAME="year" --></a></div>
  		<!-- /TMPL_IF -->
  	<!-- /TMPL_LOOP -->
***************
*** 19,23 ****
  
  	<!-- TMPL_LOOP NAME="years" -->
! 	<div name="<!-- TMPL_VAR NAME="year" -->XX" id="<!-- TMPL_VAR NAME="year" -->XX" class="tab" style="visibility:visible">
  		<table>
  			<tr>
--- 18,22 ----
  
  	<!-- TMPL_LOOP NAME="years" -->
! 	<div name="<!-- TMPL_VAR NAME="year" -->" id="<!-- TMPL_VAR NAME="year" -->" class="tabsub" <!--TMPL_IF Name="first" -->style="visibility:visible"<!--/TMPL_IF -->>
  		<table>
  			<tr>
***************
*** 38,45 ****
  				</td>
  				<td>
! 					<!-- TMPL_VAR Name="status" -->
  				</td>
  			</tr>
  			<!-- /TMPL_LOOP -->
  	</div>
  	<!--/TMPL_LOOP -->
--- 37,48 ----
  				</td>
  				<td>
! 					<!-- TMPL_IF Name="status1" -->Arrived<!-- /TMPL_IF -->
! 					<!-- TMPL_IF Name="status2" -->Waited<!-- /TMPL_IF -->
! 					<!-- TMPL_IF Name="status3" -->Late<!-- /TMPL_IF -->
! 					<!-- TMPL_IF Name="status4" -->Missing<!-- /TMPL_IF -->
  				</td>
  			</tr>
  			<!-- /TMPL_LOOP -->
+ 		</table>
  	</div>
  	<!--/TMPL_LOOP -->
***************
*** 48,53 ****
  function active(numlayer)
  {
! 	for (i=<!--TMPL_VAR Name="yearmin"-->; i <= <!--TMPL_VAR Name="yearmax"--> ; i++ ) {
! 		ong = i+"XX";
  		link = "link"+i;
  		if (numlayer==i) {
--- 51,56 ----
  function active(numlayer)
  {
! 	for (i=<!--TMPL_VAR Name="yearmin"-->; i<=<!--TMPL_VAR Name="yearmax"-->; i++ ) {
! 		ong = i;
  		link = "link"+i;
  		if (numlayer==i) {




From hdl at users.sourceforge.net  Fri Jun  3 15:01:26 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 03 Jun 2005 06:01:26 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.17.2.3,1.17.2.4
Message-ID: <E1DeBni-00074y-6z@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac.css 
Log Message:
adding tabsub for subbscription tabs.

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.17.2.3
retrieving revision 1.17.2.4
diff -C2 -r1.17.2.3 -r1.17.2.4
*** opac.css	18 Mar 2005 09:52:21 -0000	1.17.2.3
--- opac.css	3 Jun 2005 13:01:23 -0000	1.17.2.4
***************
*** 367,370 ****
--- 367,399 ----
  }
  
+ /* for SubscritptionHistory view  */
+ div.tabsubs {
+ 	width:25px;
+ 	position:absolute;
+ 	display:block;
+ 	margin-left:10px;
+ 	margin-top:100px;
+ }
+ 
+ div.tabsubs a {
+ 	display:block;
+ 	font-size: small;
+ 	border: thin solid black;
+ 	margin-right: 2px;
+ 	padding: 15px 30px;
+ 	-moz-border-radius: 5px 0px 0px 5px;
+ }
+ 
+ div.tabsub {
+ 	background-color: #ACE6E6;
+ 	display: block;
+ 	visibility:hidden;
+ 	position:absolute;
+ 	margin-left:72px;
+ 	margin-top:100px;
+ 	margin-right:10%;
+ }
+ 
+ 
  /* for MARC view  */
  div.tabs {




From hdl at users.sourceforge.net  Fri Jun  3 15:27:27 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 03 Jun 2005 06:27:27 -0700
Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.88.2.4,1.88.2.5
Message-ID: <E1DeCCt-0002EM-TQ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8492/misc

Modified Files:
      Tag: rel_2_2
	Install.pm 
Log Message:
Bug Fixing  : PDF::API2 Not mandatory

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.88.2.4
retrieving revision 1.88.2.5
diff -C2 -r1.88.2.4 -r1.88.2.5
*** Install.pm	4 Feb 2005 18:41:42 -0000	1.88.2.4
--- Install.pm	3 Jun 2005 13:27:25 -0000	1.88.2.5
***************
*** 860,865 ****
  	unless (eval {require MARC::Record})     { push @missing,"MARC::Record" };
  	unless (eval {require Mail::Sendmail})   { push @missing,"Mail::Sendmail" };
- 	unless (eval {require PDF::API2})   { push @missing,"PDF::API2" };
  # The following modules are not mandatory, depends on how the library want to use Koha
  	unless (eval {require Net::LDAP})       {
  		if ($#missing>=0) { # only when $#missing >= 0 so this isn't fatal
--- 860,869 ----
  	unless (eval {require MARC::Record})     { push @missing,"MARC::Record" };
  	unless (eval {require Mail::Sendmail})   { push @missing,"Mail::Sendmail" };
  # The following modules are not mandatory, depends on how the library want to use Koha
+ 	unless (eval {require PDF::API2})   { 
+ 			if ($#missing>=0) { # only when $#missing >= 0 so this isn't fatal
+ 				push @missing,"You will need PDF::API2 for barcode generator" 
+ 			}
+ 	}
  	unless (eval {require Net::LDAP})       {
  		if ($#missing>=0) { # only when $#missing >= 0 so this isn't fatal




From gmccullagh at users.sourceforge.net  Fri Jun  3 19:01:55 2005
From: gmccullagh at users.sourceforge.net (gavin)
Date: Fri, 03 Jun 2005 10:01:55 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-search-biblio.pl,NONE,1.1
Message-ID: <E1DeFYR-0004Uw-JB@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15229/opac

Added Files:
	opac-search-biblio.pl 
Log Message:
two new files 
  SearchBiblio.pm forked from SearchMarc.pm
  opac-search-biblio.pl forked from opac-search.pl (just change module)
an attempt at a new search using FULLTEXT indexes.
NB: Boolean won't work without MySQL >v4.0
NNB: Will be slow without indexes added on Biblio table as follows:
  ALTER TABLE biblio ADD FULLTEXT (author,title,unititle,seriestitle);
Only searching on "Any word" field just now. 
more to come.



--- NEW FILE ---
#!/usr/bin/perl
use strict;
require Exporter;

use C4::Auth;
use C4::Interface::CGI::Output;
use C4::Context;
use CGI;
use C4::Database;
use HTML::Template;
use C4::SearchBiblio;
use C4::Acquisition;
use C4::Biblio;
my @spsuggest; # the array for holding suggestions
my $suggest;   # a flag to be set (if there are suggestions it's 1)
my $firstbiblionumber; # needed for directly sending user to first item
# use C4::Search;


my $itemtypelist;
my $brancheslist;
my $categorylist;
my $subcategorylist;
my $mediatypelist;
# added by Gavin 
my $totalresults;

my $dbh=C4::Context->dbh;
my $sth=$dbh->prepare("select description,itemtype from itemtypes order by description");
$sth->execute;
while (my ($description,$itemtype) = $sth->fetchrow) {
    $itemtypelist.="<option value=\"$itemtype\">$description</option>\n";
}
my $sth=$dbh->prepare("select description,subcategorycode from subcategorytable order by description");
$sth->execute;
while (my ($description,$subcategorycode) = $sth->fetchrow) {
    $subcategorylist.="<option value=\"$subcategorycode\">$description</option>\n";
}
my $sth=$dbh->prepare("select description,mediatypecode from mediatypetable order by description");
$sth->execute;
while (my ($description,$mediatypecode) = $sth->fetchrow) {
    $mediatypelist.="<option value=\"$mediatypecode\">$description</option>\n";
}
my $sth=$dbh->prepare("select description,categorycode from categorytable order by description");
$sth->execute;
while (my ($description,$categorycode) = $sth->fetchrow) {
    $categorylist .= '<input type="radio" name="categorylist" value="'.$categorycode.'">'.$description.'<br>';
}
my $sth=$dbh->prepare("select branchname,branchcode from branches order by branchname");
$sth->execute;

while (my ($branchname,$branchcode) = $sth->fetchrow) {
    $brancheslist.="<option value=\"$branchcode\">$branchname</option>\n";
}
my $query = new CGI;
my $op = $query->param("op");
my $type=$query->param('type');

my $itemtypesstring=$query->param("itemtypesstring");
$itemtypesstring =~s/"//g;
my @itemtypes = split ( /\|/, $itemtypesstring);
my $branchesstring=$query->param("branchesstring");
$branchesstring =~s/"//g;
my @branches = split (/\|/, $branchesstring);

my $startfrom=$query->param('startfrom');
$startfrom=0 if(!defined $startfrom);
my ($template, $loggedinuser, $cookie);
my $resultsperpage;
my $searchdesc;

if ($op eq "do_search") {
	my @marclist = $query->param('marclist');
	my @and_or = $query->param('and_or');
	my @excluding = $query->param('excluding');
	my @operator = $query->param('operator');
	my @value = $query->param('value');

	for (my $i=0;$i<=$#marclist;$i++) {
		if ($searchdesc) { # don't put the and_or on the 1st search term
			$searchdesc .= $and_or[$i]." ".$excluding[$i]." ".($marclist[$i]?$marclist[$i]:"*")." ".$operator[$i]." ".$value[$i]." " if ($value[$i]);
		} else {
			$searchdesc = $excluding[$i]." ".($marclist[$i]?$marclist[$i]:"*")." ".$operator[$i]." ".$value[$i]." " if ($value[$i]);
		}
	}
  if ($itemtypesstring ne ''){
    $searchdesc .= 'filtered by itemtypes ';
    $searchdesc .= join(" ", at itemtypes)
  }
  if ($branchesstring ne ''){
    $searchdesc .= ' in branches ';
    $searchdesc .= join(" ", at branches)
  }
	$resultsperpage= $query->param('resultsperpage');
	$resultsperpage = 19 if(!defined $resultsperpage);
	my $orderby = $query->param('orderby');
	my $desc_or_asc = $query->param('desc_or_asc');
	# builds tag and subfield arrays
	my @tags;

	foreach my $marc (@marclist) {
		if ($marc) {
			my ($tag,$subfield) = MARCfind_marc_from_kohafield($dbh,$marc,'');
			if ($tag) {
				push @tags,$dbh->quote("$tag$subfield");
			} else {
				push @tags, $dbh->quote(substr($marc,0,4));
			}
		} else {
			push @tags, "";
		}
	}
	findseealso($dbh,\@tags);
    my $sqlstring;
    if ($itemtypesstring ne ''){
        $sqlstring = 'and (biblioitems.itemtype IN (';
        my $itemtypeloop=0;
        foreach my $itemtype (@itemtypes){
            if ($itemtype ne ''){
                if ($itemtypeloop != 0){
                    $sqlstring .=','
                }
                $sqlstring .= '"'.$itemtype.'"';
                $itemtypeloop++;
            }
        }
        $sqlstring .= '))'
    }
    if ($branchesstring ne ''){
        $sqlstring .= 'and biblio.biblionumber=items.biblionumber and (items.holdingbranch IN (';
        my $branchesloop=0;
        foreach my $branch (@branches){
            if ($branch ne ''){
                if ($branchesloop != 0){
                    $sqlstring .=','
                }
                $sqlstring .= '"'.$branch.'"';
                $branchesloop++;
            }
        }
        $sqlstring .= '))'
    }

	my ($results,$total) = catalogsearch1($dbh, \@tags,\@and_or,
										\@excluding, \@operator, \@value,
										$startfrom*$resultsperpage, $resultsperpage,$orderby,$desc_or_asc,$sqlstring);
	if ($total ==1) {
	if (C4::Context->preference("BiblioDefaultView") eq "normal") {
	     print $query->redirect("/cgi-bin/koha/opac-detail.pl?bib=".@$results[0]->{biblionumber});
	} elsif (C4::Context->preference("BiblioDefaultView") eq "MARC") {
	     print $query->redirect("/cgi-bin/koha/MARCdetail.pl?bib=".@$results[0]->{biblionumber});
	} else {
	     print $query->redirect("/cgi-bin/koha/ISBDdetail.pl?bib=".@$results[0]->{biblionumber});
	}
	exit;
	}
	($template, $loggedinuser, $cookie)
		= get_template_and_user({template_name => "opac-searchresults.tmpl",
				query => $query,
				type => 'opac',
				authnotrequired => 1,
				debug => 1,
				});

	# multi page display gestion
	my $displaynext=0;
	my $displayprev=$startfrom;
	if(($total - (($startfrom+1)*($resultsperpage))) > 0 ){
		$displaynext = 1;
	}

	my @field_data = ();

### Added by JF
## This next does a number of things:
# 1. It allows you to track all the searches made for stats, etc.
# 2. It fixes the 'searchdesc' variable problem by introducing
#         a. 'searchterms' which comes out as 'Keyword: neal stephenson'
#         b. 'phraseorterm' which comes out as 'neal stephenson'
#      both of these are useful for differen purposes ... I use searchterms
#      for display purposes and phraseorterm for passing the search terms
#      to an external source through a url (like a database search)
# 3. It provides the variables necessary for the spellchecking (look below for
#      how this is done
# 4.
 
$totalresults = $total;

## This formats the 'search results' string and populates
## the 'OPLIN' variable as well as the 'spellcheck' variable
## with appropriate values based on the user's search input

my $searchterms; #returned in place of searchdesc for 'results for search'
                 # as a string (can format if need be)

my @spphrases;
my $phraseorterm;
my %searchtypehash = ( # used only for the searchterms string formation
                        # and for spellcheck string
        '0' => 'keyword',
        '1' => 'title',
        '2' => 'author',
        '3' => 'subject',
        '4' => 'series',
        '5' => 'format',
        );

my @searchterm = $query->param('value');

for (my $i=0; $i <= $#searchterm; $i++) {
        my $searchtype = $searchtypehash{$i};
        push @spphrases, $searchterm[$i];
        if ($searchterms) { #don't put and in again
                if ($searchterm[$i]) {
                $phraseorterm.=$searchterm[$i];
                $searchterms.=" AND ".$searchtype." : \'".$searchterm[$i]."\'";
                }
        } else {
                if ($searchterm[$i]) {
                $phraseorterm.=$searchterm[$i];
                $searchterms.=$searchtype.": \'".$searchterm[$i]."\'";
                }
        }
}

# Spellchecck stuff ... needs to use above scheme but must change
# cgi script first
my $phrases = $query->param('value');
#my $searchterms = $query->param('value');
# warn "here is searchterms:".$searchterms;

# FIXME: should be obvious ;-)
#foreach my $phrases (@spphrases) {
$phrases =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\})/ /g;
$phrases =~ s/(\Athe |\Aa |\Aan |)//g;
my $spchkphraseorterm = $phraseorterm;
        $spchkphraseorterm =~ tr/A-Z/a-z/;
        $spchkphraseorterm =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\})/ /g;
        $spchkphraseorterm =~s/(\Aand-or |\Aand\/or |\Aanon |\Aan |\Aa |\Abut |\Aby |\Ade |\Ader |\Adr |\Adu|et |\Afor |\Afrom |\Ain |\Ainto |\Ait |\Amy |\Anot |\Aon |\Aor |\Aper |\Apt |\Aspp |\Ato |\Avs |\Awith |\Athe )/ /g;
        $spchkphraseorterm =~s/( and-or | and\/or | anon | an | a | but | by | de | der | dr | du|et | for | from | in | into | it | my | not | on | or | per | pt | spp | to | vs | with | the )/ /g;
 
        $spchkphraseorterm =~s/  / /g;
my $resultcount = $total;
my $ipaddress = $query->remote_host();
#

if (
#need to create a table to record the search info
#...FIXME: add the script name that creates the table
# 
my $dbhpop=DBI->connect("DBI:mysql:demosuggest:localhost","auth","YourPass")) {

# insert the search info query
my $insertpop = "INSERT INTO phrase_log(phr_phrase,phr_resultcount,phr_ip) VALUES(?,?,?)";

# grab spelling suggestions query
my $getsugg = "SELECT display FROM spellcheck WHERE strcmp(soundex(suggestion), soundex(?)) = 0 order by soundex(suggestion) limit 0,5";

#get spelling suggestions when there are no results
if ($resultcount eq 0) {
        my $sthgetsugg=$dbhpop->prepare($getsugg);
        $sthgetsugg->execute($spchkphraseorterm);
        while (my ($spsuggestion)=$sthgetsugg->fetchrow_array) {
#               warn "==>$spsuggestion";
                #push @spsuggest, +{ spsuggestion => $spsuggestion };
                my %line;
                $line{spsuggestion} = $spsuggestion;
                push @spsuggest,\%line;
                $suggest = 1;
        }
#       warn "==>".$#spsuggest;
        $sthgetsugg->finish;
}
# end of spelling suggestions

my $sthpop=$dbhpop->prepare($insertpop);

#$sthpop->execute($phrases,$resultcount,$ipaddress);
$sthpop->finish;
}
#
### end of tracking stuff  --  jmf at kados dot org
#
$template->param(suggest => $suggest );
$template->param( SPELL_SUGGEST => \@spsuggest );
$template->param( searchterms => $searchterms );
$template->param( phraseorterm => $phraseorterm );
#warn "here's the search terms: ".$searchterms;
#
### end of spelling suggestions
### /Added by JF

	for(my $i = 0 ; $i <= $#marclist ; $i++)
	{
		push @field_data, { term => "marclist", val=>$marclist[$i] };
		push @field_data, { term => "and_or", val=>$and_or[$i] };
		push @field_data, { term => "excluding", val=>$excluding[$i] };
		push @field_data, { term => "operator", val=>$operator[$i] };
		push @field_data, { term => "value", val=>$value[$i] };
	}

	my @numbers = ();

	if ($total>$resultsperpage)
	{
		for (my $i=1; $i<$total/$resultsperpage+1; $i++)
		{
			if ($i<16)
			{
	    		my $highlight=0;
	    		($startfrom==($i-1)) && ($highlight=1);
	    		push @numbers, { number => $i,
					highlight => $highlight ,
					searchdata=> \@field_data,
					startfrom => ($i-1)};
			}
    	}
	}

	my $from = $startfrom*$resultsperpage+1;
	my $to;

 	if($total < (($startfrom+1)*$resultsperpage))
	{
		$to = $total;
	} else {
		$to = (($startfrom+1)*$resultsperpage);
	}
	my $defaultview = 'BiblioDefaultView'.C4::Context->preference('BiblioDefaultView');
	$template->param(results => $results,
							startfrom=> $startfrom,
							displaynext=> $displaynext,
							displayprev=> $displayprev,
							resultsperpage => $resultsperpage,
							orderby => $orderby,
							startfromnext => $startfrom+1,
							startfromprev => $startfrom-1,
							searchdata=>\@field_data,
							total=>$total,
							from=>$from,
							to=>$to,
							numbers=>\@numbers,
							searchdesc=> $searchdesc,
							$defaultview => 1,
							suggestion => C4::Context->preference("suggestion"),
							virtualshelves => C4::Context->preference("virtualshelves"),
                itemtypelist => $itemtypelist,
              subcategorylist => $subcategorylist,
              brancheslist => $brancheslist,
              categorylist => $categorylist,
              mediatypelist => $mediatypelist,
              itemtypesstring => $itemtypesstring,
							);

} else {
	($template, $loggedinuser, $cookie)
		= get_template_and_user({template_name => "opac-search.tmpl",
					query => $query,
					type => "opac",
					authnotrequired => 1,
				});
	
	
	$sth=$dbh->prepare("Select itemtype,description from itemtypes order by description");
	$sth->execute;
	my  @itemtype;
	my %itemtypes;
	push @itemtype, "";
	$itemtypes{''} = "";
	while (my ($value,$lib) = $sth->fetchrow_array) {
		push @itemtype, $value;
		$itemtypes{$value}=$lib;
	}
	
	my $CGIitemtype=CGI::scrolling_list( -name     => 'value',
				-values   => \@itemtype,
				-labels   => \%itemtypes,
				-size     => 1,
				-multiple => 0 );
	$sth->finish;
	
	my @branches;
	my @select_branch;
	my %select_branches;
	my ($count2, at branches)=branches();
	push @select_branch, "";
	$select_branches{''} = "";
	for (my $i=0;$i<$count2;$i++){
		push @select_branch, $branches[$i]->{'branchcode'};#
		$select_branches{$branches[$i]->{'branchcode'}} = $branches[$i]->{'branchname'};
	}
	my $CGIbranch=CGI::scrolling_list( -name     => 'value',
				-values   => \@select_branch,
				-labels   => \%select_branches,
				-size     => 1,
				-multiple => 0 );
	$sth->finish;
    
	$template->param(itemtypelist => $itemtypelist,
					CGIitemtype => $CGIitemtype,
					CGIbranch => $CGIbranch,
					suggestion => C4::Context->preference("suggestion"),
					virtualshelves => C4::Context->preference("virtualshelves"),
	);
}
# ADDED BY JF
if ($totalresults == 1){
    # if its a barcode search by definition we will only have one result.
    # And if we have a result
    # lets jump straight to the detail.pl page
    print $query->redirect("/cgi-bin/koha/opac-detail.pl?bib=$firstbiblionumber");
}
else {
  output_html_with_http_headers $query, $cookie, $template->output;
}




From gmccullagh at users.sourceforge.net  Fri Jun  3 19:01:55 2005
From: gmccullagh at users.sourceforge.net (gavin)
Date: Fri, 03 Jun 2005 10:01:55 -0700
Subject: [Koha-cvs] CVS: koha/C4 SearchBiblio.pm,NONE,1.1
Message-ID: <E1DeFYR-0004Us-Ez@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15229/C4

Added Files:
	SearchBiblio.pm 
Log Message:
two new files 
  SearchBiblio.pm forked from SearchMarc.pm
  opac-search-biblio.pl forked from opac-search.pl (just change module)
an attempt at a new search using FULLTEXT indexes.
NB: Boolean won't work without MySQL >v4.0
NNB: Will be slow without indexes added on Biblio table as follows:
  ALTER TABLE biblio ADD FULLTEXT (author,title,unititle,seriestitle);
Only searching on "Any word" field just now. 
more to come.



--- NEW FILE ---
package C4::SearchBiblio;

# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
require Exporter;
use DBI;
use C4::Context;
use C4::Biblio;
use C4::Date;
use Date::Manip;

use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);

# set the version for version checking
$VERSION = 0.02;

=head1 NAME

C4::Search - Functions for searching the Koha MARC catalog

=head1 FUNCTIONS

This module provides the searching facilities for the Koha MARC catalog

=cut

@ISA = qw(Exporter);
@EXPORT = qw(&catalogsearch1 &catalogsearch &findseealso &findsuggestion &getMARCnotes &getMARCsubjects);

=head1 findsuggestion($dbh,$values);

=head2 $dbh is a link to the DB handler.

use C4::Context;
my $dbh =C4::Context->dbh;

=head2 $values is a word

Searches words with the same soundex, ordered by frequency of use.
Useful to suggest other searches to the users.

=cut

sub findsuggestion {
	my ($dbh,$values) = @_;
	my $sth = $dbh->prepare("SELECT count( * ) AS total, word FROM marc_word WHERE sndx_word = soundex( ? ) AND word <> ? GROUP BY word ORDER BY total DESC");
	my @results;
	for(my $i = 0 ; $i <= $#{$values} ; $i++) {
		if (length(@$values[$i]) >=5) {
			$sth->execute(@$values[$i],@$values[$i]);
			my $resfound = 1;
			my @resline;
			while ((my ($count,$word) = $sth->fetchrow) and $resfound <=10) {
				push @results, "@$values[$i]|$word|$count";
#				$results{@$values[$i]} = \@resline;
				$resfound++;
			}
		}
	}
	return \@results;
}

=head1 findseealso($dbh,$fields);

=head2 $dbh is a link to the DB handler.

use C4::Context;
my $dbh =C4::Context->dbh;

=head2 $fields is a reference to the fields array

This function modify the @$fields array and add related fields to search on.

=cut

sub findseealso {
	my ($dbh, $fields) = @_;
	my $tagslib = MARCgettagslib ($dbh,1);
	for (my $i=0;$i<=$#{$fields};$i++) {
		my ($tag) =substr(@$fields[$i],1,3);
		my ($subfield) =substr(@$fields[$i],4,1);
		@$fields[$i].=','.$tagslib->{$tag}->{$subfield}->{seealso} if ($tagslib->{$tag}->{$subfield}->{seealso});
	}
}

=head1  my ($count, @results) = catalogsearch($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby,$sqlstring);

=head2 $dbh is a link to the DB handler.

use C4::Context;
my $dbh =C4::Context->dbh;

$tags,$and_or, $excluding, $operator, $value are references to array

=head2 $tags

contains the list of tags+subfields (for example : $@tags[0] = '200a')
A field can be a list of fields : '200f','700a','700b','701a','701b'

Example

=head2 $and_or

contains  a list of strings containing and or or. The 1st value is useless.

=head2 $excluding

contains 0 or 1. If 1, then the request is negated.

=head2 $operator

contains contains,=,start,>,>=,<,<= the = and start work on the complete subfield. The contains operator works on every word in the subfield.

examples :
contains home, search home anywhere.
= home, search a string being home.

=head2 $value

contains the value to search
If it contains a * or a %, then the search is partial.

=head2 $offset and $length

returns $length results, beginning at $offset

=head2 $orderby

define the field used to order the request. Any field in the biblio/biblioitem tables can be used. DESC is possible too

(for example title, title DESC,...)

=head2 $sqlstring

optional argument containing an sql string to be used in the 'where' statement. see usage in opac-search.pl.

=head2 RETURNS

returns an array containing hashes. The hash contains all biblio & biblioitems fields and a reference to an item hash. The "item hash contains one line for each callnumber & the number of items related to the callnumber.

=cut

=head2 my $marcnotesarray = &getMARCnotes($dbh,$bibid,$marcflavour);

Returns a reference to an array containing all the notes stored in the MARC database for the given bibid.
$marcflavour ("MARC21" or "UNIMARC") determines which tags are used for retrieving subjects.

=head2 my $marcsubjctsarray = &getMARCsubjects($dbh,$bibid,$marcflavour);

Returns a reference to an array containing all the subjects stored in the MARC database for the given bibid.
$marcflavour ("MARC21" or "UNIMARC") determines which tags are used for retrieving subjects.

=cut

sub catalogsearch1 {
	my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby,$desc_or_asc,$sqlstring) = @_;
#    warn "==================";
#    warn "
#                  db: $dbh,
#                  tags_array: @$tags,
#                  andor_array: @$and_or,
#                  excludes_array: @$excluding, 
#                  operator_array: @$operator, 
#                  value_array: @$value,
#                  start: $offset,
#                  resultsperpage: $length,
#                  orderby: $orderby,
#                  order: $desc_or_asc,  
#                  sqlstring: $sqlstring)\n";
#    warn "==================\n";

    my @cols = ('biblionumber','author','title','unititle','notes','serial','seriestitle',
                'copyrightdate','timestamp','abstract','illus','biblioitemnumber','marc',
                'url','isbn','volumeddesc','classification','publicationyear','pages','number',
                'itemtype','place','issn','size','dewey','publishercode','lccn','volume',
                'subclass', 'volumedate','subtitle','bibid','notforloan',);
                # missing 'CN', 'description', 'odd', 'bn', 'norequests', 'totitem', 
    my @valarray = @$value;
#    warn "@$value\n";
#    warn "$valarray[0]\n";
    my $sql = "
      SELECT biblio.biblionumber, biblio.author, biblio.title, biblio.unititle,
        biblio.notes, biblio.serial, biblio.seriestitle, biblio.copyrightdate,
        biblio.timestamp, biblio.abstract,
        biblioitems.illus, biblioitems.biblioitemnumber, biblioitems.marc,
        biblioitems.url, biblioitems.isbn, biblioitems.volumeddesc,
        biblioitems.classification, biblioitems.publicationyear,
        biblioitems.pages, biblioitems.number, biblioitems.itemtype,
        biblioitems.place, biblioitems.issn, biblioitems.size,
        biblioitems.dewey, biblioitems.publishercode, biblioitems.lccn,
        biblioitems.volume, biblioitems.subclass, biblioitems.volumedate,
        bibliosubtitle.subtitle,
        marc_biblio.bibid,
        items.notforloan, 
        MATCH(biblio.title,biblio.author,biblio.unititle,biblio.seriestitle) 
        AGAINST ('$$value[0]' IN BOOLEAN MODE) as Relevance
      FROM biblio
        LEFT JOIN biblioitems ON biblioitems.biblionumber=biblio.biblionumber
        LEFT JOIN bibliosubtitle ON bibliosubtitle.biblionumber=biblio.biblionumber
        LEFT JOIN marc_biblio ON marc_biblio.biblionumber=biblio.biblionumber
        LEFT JOIN items ON items.biblionumber=biblio.biblionumber
      WHERE MATCH(biblio.title,biblio.author,biblio.unititle,biblio.seriestitle) 
        AGAINST ('$$value[0]' IN BOOLEAN MODE)
      ORDER BY Relevance DESC;";
    warn "$sql\n";
    my $sth = $dbh->prepare($sql);
	$sth->execute;
    my @biblioArray=();
    my $numBooks=0;
    while (my @vals = $sth->fetchrow) {
      my $numcols = $#vals;
      my %biblioEntryHash=();
      for(my $i=0; $i<$numcols; $i++) {
        $biblioEntryHash{$cols[$i]} = $vals[$i];
      }
      $biblioEntryHash{odd} = ((($numBooks+1) % 2) > 0) ? 1 : ""; 
      #FIXME
      $biblioEntryHash{notforloan} = "";
      #warn "\$biblioEntryHash{odd}  = .$biblioEntryHash{odd}.\n";
      push(@biblioArray,\%biblioEntryHash);
      $numBooks++;
    }


# CN: ARRAY(0x89d1540)?  branch + location + callnumber + status
#                       CDI SL (N8KIM) (2) (if several, group them)
# description: ?
# odd: 1 ?
# bn: 501? biblionumber?
# norequests: 0? 
# totitem: 1?

#    my ($res,$numres) = catalogsearch(@_);
#    my @results = @$res;
#    warn "==================\n";
#    warn "\n\tres: @$res:,\n\tnumres: $numres\n";
#    while ( (my ($key, $value) = each(%{$results[0]})) && (my ($key1, $value1) = each(%{$biblioArray[0]})) ) {
#      warn "\t$key => $value\t$key1 => $value1\n";
#    }
#    warn "a. " . $results[0]->{odd} . "\t" . $biblioArray[0]->{odd}. "\n";
#    warn "b. " . $results[1]->{odd} . "\t" . $biblioArray[1]->{odd}. "\n";
#    warn "==================\n";
    #return ($res,$numres);
    return (\@biblioArray,$numBooks);
}

sub catalogsearch {
	my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby,$desc_or_asc,$sqlstring) = @_;
	# build the sql request. She will look like :
	# select m1.bibid
	#		from marc_subfield_table as m1, marc_subfield_table as m2
	#		where m1.bibid=m2.bibid and
	#		(m1.subfieldvalue like "Des%" and m2.subfieldvalue like "27%")

	# last minute stripping out of stuff
	# doesn't work @$value =~ s/\'/ /;
	# @$value = map { $_ =~ s/\'/ /g } @$value;
	
	# "Normal" statements
	my @normal_tags = ();
	my @normal_and_or = ();
	my @normal_operator = ();
	my @normal_value = ();
	# Extracts the NOT statements from the list of statements
	my @not_tags = ();
	my @not_and_or = ();
	my @not_operator = ();
	my @not_value = ();
	my $any_not = 0;
	$orderby = "biblio.title" unless $orderby;
	$desc_or_asc = "ASC" unless $desc_or_asc;
	#last minute stripping out of ' and ,
# paul : quoting, it's done a few lines lated.
# 	foreach $_ (@$value) {
# 		$_=~ s/\'/ /g;
# 		$_=~ s/\,/ /g;
# 	}

# the item.notforloan contains an integer. Every value <>0 means "book unavailable for loan".
# but each library can have it's own table of meaning for each value. Get them
# 1st search if there is a list of authorised values connected to items.notforloan
	my $sth = $dbh->prepare('select authorised_value from marc_subfield_structure where kohafield="items.notforloan"');
	$sth->execute;
	my %notforloanstatus;
	my ($authorised_valuecode) = $sth->fetchrow;
	if ($authorised_valuecode) {
		$sth = $dbh->prepare("select authorised_value,lib from authorised_values where category=?");
		$sth->execute($authorised_valuecode);
		while (my ($authorised_value,$lib) = $sth->fetchrow) {
			$notforloanstatus{$authorised_value} = $lib?$lib:$authorised_value;
		}
	}
	for(my $i = 0 ; $i <= $#{$value} ; $i++)
	{
		# replace * by %
		@$value[$i] =~ s/\*/%/g;
		# remove % at the beginning
		@$value[$i] =~ s/^%//g;
	    @$value[$i] =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g if @$operator[$i] eq "contains";
		if(@$excluding[$i])	# NOT statements
		{
			$any_not = 1;
			if(@$operator[$i] eq "contains")
			{
				foreach my $word (split(/ /, @$value[$i]))	# if operator is contains, splits the words in separate requests
				{
					# remove the "%" for small word (3 letters. (note : the >4 is due to the % at the end)
# 					warn "word : $word";
					$word =~ s/%//g unless length($word)>4;
					unless (C4::Context->stopwords->{uc($word)} or length($word)==1) {	#it's NOT a stopword => use it. Otherwise, ignore
						push @not_tags, @$tags[$i];
						push @not_and_or, "or"; # as request is negated, finds "foo" or "bar" if final request is NOT "foo" and "bar"
						push @not_operator, @$operator[$i];
						push @not_value, $word;
					}
				}
			}
			else
			{
				push @not_tags, @$tags[$i];
				push @not_and_or, "or"; # as request is negated, finds "foo" or "bar" if final request is NOT "foo" and "bar"
				push @not_operator, @$operator[$i];
				push @not_value, @$value[$i];
			}
		}
		else	# NORMAL statements
		{
			if(@$operator[$i] eq "contains") # if operator is contains, splits the words in separate requests
			{
				foreach my $word (split(/ /, @$value[$i]))
				{
					# remove the "%" for small word (3 letters. (note : the >4 is due to the % at the end)
# 					warn "word : $word";
					$word =~ s/%//g unless length($word)>4;
					unless (C4::Context->stopwords->{uc($word)} or length($word)==1) {	#it's NOT a stopword => use it. Otherwise, ignore
						push @normal_tags, @$tags[$i];
						push @normal_and_or, "and";	# assumes "foo" and "bar" if "foo bar" is entered
						push @normal_operator, @$operator[$i];
						push @normal_value, $word;
					}
				}
			}
			else
			{
				push @normal_tags, @$tags[$i];
				push @normal_and_or, @$and_or[$i];
				push @normal_operator, @$operator[$i];
				push @normal_value, @$value[$i];
			}
		}
	}

	# Finds the basic results without the NOT requests
	my ($sql_tables, $sql_where1, $sql_where2) = create_request($dbh,\@normal_tags, \@normal_and_or, \@normal_operator, \@normal_value);
  $sql_where1 .=" ". $sqlstring;
	$sql_where1 .= "and TO_DAYS( NOW( ) ) - TO_DAYS( biblio.timestamp ) <30" if $orderby =~ "biblio.timestamp";
	my $sth;
	if ($sql_where2) {
		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc");
		warn "Q2 : select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc term is  @$value";
	} else {
		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc");
		warn "Q : select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc";
	}
	$sth->execute();
	my @result = ();
        my $subtitle; # Added by JF for Subtitles

	# Processes the NOT if any and there are results
	my ($not_sql_tables, $not_sql_where1, $not_sql_where2);

	if( ($sth->rows) && $any_not )	# some results to tune up and some NOT statements
	{
		($not_sql_tables, $not_sql_where1, $not_sql_where2) = create_request($dbh,\@not_tags, \@not_and_or, \@not_operator, \@not_value);

		my @tmpresult;

		while (my ($bibid) = $sth->fetchrow) {
			push @tmpresult,$bibid;
		}
		my $sth_not;
		warn "NOT : select distinct m1.bibid from $not_sql_tables where $not_sql_where2 and ($not_sql_where1)";
		if ($not_sql_where2) {
			$sth_not = $dbh->prepare("select distinct m1.bibid from $not_sql_tables where $not_sql_where2 and ($not_sql_where1)");
		} else {
			$sth_not = $dbh->prepare("select distinct m1.bibid from $not_sql_tables where $not_sql_where1");
		}
		$sth_not->execute();

		if($sth_not->rows)
		{
			my %not_bibids = ();
			while(my $bibid = $sth_not->fetchrow()) {
				$not_bibids{$bibid} = 1;	# populates the hashtable with the bibids matching the NOT statement
			}

			foreach my $bibid (@tmpresult)
			{
				if(!$not_bibids{$bibid})
				{
					push @result, $bibid;
				}
			}
		}
		$sth_not->finish();
	}
	else	# no NOT statements
	{
		while (my ($bibid) = $sth->fetchrow) {
			push @result,$bibid;
		}
	}

	# we have bibid list. Now, loads title and author from [offset] to [offset]+[length]
	my $counter = $offset;
	# HINT : biblionumber as bn is important. The hash is fills biblionumber with items.biblionumber.
	# so if you dont' has an item, you get a not nice empty value.
	$sth = $dbh->prepare("SELECT biblio.biblionumber as bn,biblio.*, biblioitems.*,marc_biblio.bibid,itemtypes.notforloan,itemtypes.description
							FROM biblio, marc_biblio 
							LEFT JOIN biblioitems on biblio.biblionumber = biblioitems.biblionumber
							LEFT JOIN itemtypes on itemtypes.itemtype=biblioitems.itemtype
							WHERE biblio.biblionumber = marc_biblio.biblionumber AND bibid = ?");
        my $sth_subtitle = $dbh->prepare("SELECT subtitle FROM bibliosubtitle WHERE biblionumber=?"); # Added BY JF for Subtitles
	my @finalresult = ();
	my @CNresults=();
	my $totalitems=0;
	my $oldline;
	my ($oldbibid, $oldauthor, $oldtitle);
	my $sth_itemCN = $dbh->prepare("select items.* from items where biblionumber=?");
	my $sth_issue = $dbh->prepare("select date_due,returndate from issues where itemnumber=?");
	# parse all biblios between start & end.
	while (($counter <= $#result) && ($counter <= ($offset + $length))) {
		# search & parse all items & note itemcallnumber
		$sth->execute($result[$counter]);
		my $continue=1;
		my $line = $sth->fetchrow_hashref;
		my $biblionumber=$line->{bn};
        # Return subtitles first ADDED BY JF
                $sth_subtitle->execute($biblionumber);
                my $subtitle_here.= $sth_subtitle->fetchrow." ";
                chop $subtitle_here;
                $subtitle = $subtitle_here;
#               warn "Here's the Biblionumber ".$biblionumber;
#                warn "and here's the subtitle: ".$subtitle_here;

        # /ADDED BY JF

# 		$continue=0 unless $line->{bn};
# 		my $lastitemnumber;
		$sth_itemCN->execute($biblionumber);
		my @CNresults = ();
		my $notforloan=1; # to see if there is at least 1 item that can be issued
		while (my $item = $sth_itemCN->fetchrow_hashref) {
			# parse the result, putting holdingbranch & itemcallnumber in separate array
			# then all other fields in the main array
			
			# search if item is on loan
			my $date_due;
			$sth_issue->execute($item->{itemnumber});
			while (my $loan = $sth_issue->fetchrow_hashref) {
				if ($loan->{date_due} and !$loan->{returndate}) {
					$date_due = $loan->{date_due};
				}
			}
			# store this item
			my %lineCN;
			$lineCN{holdingbranch} = $item->{holdingbranch};
			$lineCN{itemcallnumber} = $item->{itemcallnumber};
			$lineCN{location} = $item->{location};
			$lineCN{date_due} = format_date($date_due);
			$lineCN{notforloan} = $notforloanstatus{$line->{notforloan}} if ($line->{notforloan}); # setting not forloan if itemtype is not for loan
			$lineCN{notforloan} = $notforloanstatus{$item->{notforloan}} if ($item->{notforloan}); # setting not forloan it this item is not for loan
			$notforloan=0 unless ($item->{notforloan} or $item->{wthdrawn} or $item->{itemlost});
			push @CNresults,\%lineCN;
			$totalitems++;
		}
		# save the biblio in the final array, with item and item issue status
		my %newline;
		%newline = %$line;
		$newline{totitem} = $totalitems;
		# if $totalitems == 0, check if it's being ordered.
		if ($totalitems == 0) {
			my $sth = $dbh->prepare("select count(*) from aqorders where biblionumber=? and datecancellationprinted is NULL");
			$sth->execute($biblionumber);
			my ($ordered) = $sth->fetchrow;
			$newline{onorder} = 1 if $ordered;
		}
		$newline{biblionumber} = $biblionumber;
		$newline{norequests} = 0;
		$newline{norequests} = 1 if ($line->{notforloan}); # itemtype not issuable
		$newline{norequests} = 1 if (!$line->{notforloan} && $notforloan); # itemtype issuable but all items not issuable for instance
                $newline{subtitle} = $subtitle;  # put the subtitle in ADDED BY JF

		my @CNresults2= @CNresults;
		$newline{CN} = \@CNresults2;
		$newline{'even'} = 1 if $#finalresult % 2 == 0;
		$newline{'odd'} = 1 if $#finalresult % 2 == 1;
		$newline{'timestamp'} = format_date($newline{timestamp});
		@CNresults = ();
		push @finalresult, \%newline;
		$totalitems=0;
		$counter++;
	}
	my $nbresults = $#result+1;
	return (\@finalresult, $nbresults);
}

# Creates the SQL Request

sub create_request {
	my ($dbh,$tags, $and_or, $operator, $value) = @_;

	my $sql_tables; # will contain marc_subfield_table as m1,...
	my $sql_where1; # will contain the "true" where
	my $sql_where2 = "("; # will contain m1.bibid=m2.bibid
	my $nb_active=0; # will contain the number of "active" entries. an entry is active if a value is provided.
	my $nb_table=1; # will contain the number of table. ++ on each entry EXCEPT when an OR  is provided.

	my $maxloop=8; # the maximum number of words to avoid a too complex search.
	$maxloop = @$value if @$value<$maxloop;
	
	for(my $i=0; $i<=$maxloop;$i++) {
		if (@$value[$i]) {
			$nb_active++;
			if ($nb_active==1) {
				if (@$operator[$i] eq "start") {
					$sql_tables .= "marc_subfield_table as m$nb_table,";
					$sql_where1 .= "(m1.subfieldvalue like ".$dbh->quote("@$value[$i]%");
					if (@$tags[$i]) {
						$sql_where1 .=" and concat(m1.tag,m1.subfieldcode) in (@$tags[$i])";
					}
					$sql_where1.=")";
				} elsif (@$operator[$i] eq "contains") {
					$sql_tables .= "marc_word as m$nb_table,";
					$sql_where1 .= "(m1.word  like ".$dbh->quote("@$value[$i]");
					if (@$tags[$i]) {
						 $sql_where1 .=" and m1.tagsubfield in (@$tags[$i])";
					}
					$sql_where1.=")";
				} else {
					$sql_tables .= "marc_subfield_table as m$nb_table,";
					$sql_where1 .= "(m1.subfieldvalue @$operator[$i] ".$dbh->quote("@$value[$i]");
					if (@$tags[$i]) {
						 $sql_where1 .=" and concat(m1.tag,m1.subfieldcode) in (@$tags[$i])";
					}
					$sql_where1.=")";
				}
			} else {
				if (@$operator[$i] eq "start") {
					$nb_table++;
					$sql_tables .= "marc_subfield_table as m$nb_table,";
					$sql_where1 .= "@$and_or[$i] (m$nb_table.subfieldvalue like ".$dbh->quote("@$value[$i]%");
					if (@$tags[$i]) {
					 	$sql_where1 .=" and concat(m$nb_table.tag,m$nb_table.subfieldcode) in (@$tags[$i])";
					}
					$sql_where1.=")";
					$sql_where2 .= "m1.bibid=m$nb_table.bibid and ";
				} elsif (@$operator[$i] eq "contains") {
					if (@$and_or[$i] eq 'and') {
						$nb_table++;
						$sql_tables .= "marc_word as m$nb_table,";
						$sql_where1 .= "@$and_or[$i] (m$nb_table.word like ".$dbh->quote("@$value[$i]");
						if (@$tags[$i]) {
							$sql_where1 .=" and m$nb_table.tagsubfield in(@$tags[$i])";
						}
						$sql_where1.=")";
						$sql_where2 .= "m1.bibid=m$nb_table.bibid and ";
					} else {
						$sql_where1 .= "@$and_or[$i] (m$nb_table.word like ".$dbh->quote("@$value[$i]");
						if (@$tags[$i]) {
							$sql_where1 .="  and m$nb_table.tagsubfield in (@$tags[$i])";
						}
						$sql_where1.=")";
						$sql_where2 .= "m1.bibid=m$nb_table.bibid and ";
					}
				} else {
					$nb_table++;
					$sql_tables .= "marc_subfield_table as m$nb_table,";
					$sql_where1 .= "@$and_or[$i] (m$nb_table.subfieldvalue @$operator[$i] ".$dbh->quote(@$value[$i]);
					if (@$tags[$i]) {
					 	$sql_where1 .="  and concat(m$nb_table.tag,m$nb_table.subfieldcode) in (@$tags[$i])";
					}
					$sql_where2 .= "m1.bibid=m$nb_table.bibid and ";
					$sql_where1.=")";
				}
			}
		}
	}

	if($sql_where2 ne "(")	# some datas added to sql_where2, processing
	{
		$sql_where2 = substr($sql_where2, 0, (length($sql_where2)-5)); # deletes the trailing ' and '
		$sql_where2 .= ")";
	}
	else	# no sql_where2 statement, deleting '('
	{
		$sql_where2 = "";
	}
	chop $sql_tables;	# deletes the trailing ','
	return ($sql_tables, $sql_where1, $sql_where2);
}

sub getMARCnotes {
        my ($dbh, $bibid, $marcflavour) = @_;
	my ($mintag, $maxtag);
	if ($marcflavour eq "MARC21") {
	        $mintag = "500";
		$maxtag = "599";
	} else {           # assume unimarc if not marc21
		$mintag = "300";
		$maxtag = "399";
	}

	my $sth=$dbh->prepare("SELECT subfieldvalue,tag FROM marc_subfield_table WHERE bibid=? AND tag BETWEEN ? AND ? ORDER BY tagorder");

	$sth->execute($bibid,$mintag,$maxtag);

	my @marcnotes;
	my $note = "";
	my $tag = "";
	my $marcnote;

	while (my $data=$sth->fetchrow_arrayref) {
		my $value=$data->[0];
		my $thistag=$data->[1];
		if ($value=~/\.$/) {
		        $value=$value . "  ";
		}
		if ($thistag ne $tag && $note ne "") {
		        $marcnote = {marcnote => $note,};
			push @marcnotes, $marcnote;
			$note=$value;
			$tag=$thistag;
		}
		if ($note ne $value) {
		        $note = $note." ".$value;
		}
	}

	if ($note) {
	        $marcnote = {marcnote => $note};
		push @marcnotes, $marcnote;   #load last tag into array
	}

	$sth->finish;
	$dbh->disconnect;

	my $marcnotesarray=\@marcnotes;
	return $marcnotesarray;
}  # end getMARCnotes


sub getMARCsubjects {
    my ($dbh, $bibid, $marcflavour) = @_;
	my ($mintag, $maxtag);
	if ($marcflavour eq "MARC21") {
	        $mintag = "600";
		$maxtag = "699";
	} else {           # assume unimarc if not marc21
		$mintag = "600";
		$maxtag = "619";
	}
	my $sth=$dbh->prepare("SELECT subfieldvalue,subfieldcode FROM marc_subfield_table WHERE bibid=? AND tag BETWEEN ? AND ? ORDER BY tagorder");

	$sth->execute($bibid,$mintag,$maxtag);

	my @marcsubjcts;
	my $subjct = "";
	my $subfield = "";
	my $marcsubjct;

	while (my $data=$sth->fetchrow_arrayref) {
		my $value = $data->[0];
		my $subfield = $data->[1];
		if ($subfield eq "a" && $value ne $subjct) {
		        $marcsubjct = {MARCSUBJCT => $value,};
			push @marcsubjcts, $marcsubjct;
			$subjct = $value;
		}
	}

	$sth->finish;
	$dbh->disconnect;

	my $marcsubjctsarray=\@marcsubjcts;
        return $marcsubjctsarray;
}  #end getMARCsubjects

END { }       # module clean-up code here (global destructor)

1;
__END__

=back

=head1 AUTHOR

Koha Developement team <info at koha.org>

=cut




From hellen at users.sourceforge.net  Sun Jun  5 16:45:20 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sun, 05 Jun 2005 07:45:20 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple addbiblio-nomarc.tmpl,1.1,1.2 addbiblio.tmpl,1.2,1.3 addbooks.tmpl,1.2,1.3 additem-nomarc.tmpl,1.2,1.3 additem.tmpl,1.2,1.3 marcimport.tmpl,1.2,1.3
Message-ID: <E1DewNM-0002qd-0f@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	addbiblio-nomarc.tmpl addbiblio.tmpl addbooks.tmpl 
	additem-nomarc.tmpl additem.tmpl marcimport.tmpl 
Log Message:
translated for 2.2.2 by hellen

Index: addbiblio-nomarc.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/addbiblio-nomarc.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** addbiblio-nomarc.tmpl	12 May 2005 19:26:13 -0000	1.1
--- addbiblio-nomarc.tmpl	5 Jun 2005 14:45:17 -0000	1.2
***************
*** 8,12 ****
  	
  		<!-- TMPL_IF NAME="ERROR" -->
! 			<p class="problem">Please Specify a Title</p>
  		<!-- /TMPL_IF -->
  		
--- 8,12 ----
  	
  		<!-- TMPL_IF NAME="ERROR" -->
! 			<p class="problem">Bitte einen Titel ausw&auml;hlen</p>
  		<!-- /TMPL_IF -->
  		

Index: addbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/addbiblio.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** addbiblio.tmpl	17 May 2005 13:21:35 -0000	1.2
--- addbiblio.tmpl	5 Jun 2005 14:45:17 -0000	1.3
***************
*** 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">Biblionummer : <!-- TMPL_VAR NAME="oldbiblionumber" --></h1>
  	<p>
  		<input type="hidden" name="op" value="addbiblio">

Index: addbooks.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/addbooks.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** addbooks.tmpl	17 May 2005 13:21:35 -0000	1.2
--- addbooks.tmpl	5 Jun 2005 14:45:17 -0000	1.3
***************
*** 13,17 ****
  			<h2 class="catalogue">Um neue bibliografische Daten (und evtl. entsprechende Medien) aufzunehmen, scannen Sie die ISBN/ISSN oder geben Sie sie hier ein.</h2>
  			<p>
! 				<label class="label100" for="title">Title</label>
  				<input type="hidden" name="marclist" value="biblio.title">
  	
--- 13,17 ----
  			<h2 class="catalogue">Um neue bibliografische Daten (und evtl. entsprechende Medien) aufzunehmen, scannen Sie die ISBN/ISSN oder geben Sie sie hier ein.</h2>
  			<p>
! 				<label class="label100" for="title">Titel</label>
  				<input type="hidden" name="marclist" value="biblio.title">
  	
***************
*** 51,55 ****
  		<h2 class="catalogue">Hinweis</h2>
  		<p>Wenn bereits Daten für die ISBN in der Datenbank hinterlegt sind, werden diese angezeigt und k&ouml;nnen bearbeitet werden.<br/>
! 			 Wenn Fremddaten für die ISBN abgerufen wurden sich im Zwischenspeicher befinden, werden diese ebenfalls angezeigt und dienen als Grundlage f&uuml;r einen neuen Datensatz.<br/>
  			 Anderenfalls wird eine leerer Datensatz angelegt und Sie m&uuml;ssen alle Daten selbst eintragen.</p>
  	</div>
--- 51,55 ----
  		<h2 class="catalogue">Hinweis</h2>
  		<p>Wenn bereits Daten für die ISBN in der Datenbank hinterlegt sind, werden diese angezeigt und k&ouml;nnen bearbeitet werden.<br/>
! 			 Wenn Fremddaten für die ISBN abgerufen wurden und sich im Zwischenspeicher befinden, werden diese ebenfalls angezeigt und dienen als Grundlage f&uuml;r einen neuen Datensatz.<br/>
  			 Anderenfalls wird eine leerer Datensatz angelegt und Sie m&uuml;ssen alle Daten selbst eintragen.</p>
  	</div>

Index: additem-nomarc.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/additem-nomarc.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** additem-nomarc.tmpl	17 May 2005 13:21:35 -0000	1.2
--- additem-nomarc.tmpl	5 Jun 2005 14:45:17 -0000	1.3
***************
*** 5,9 ****
  		<p>
  		<!-- TMPL_IF NAME="NOBARCODE" -->
! 			<p class="problem">Sie m&uuml;ssen dem Exemplar einen Strichcode zuordnen</p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="NOBIBLIOITEM" -->
--- 5,9 ----
  		<p>
  		<!-- TMPL_IF NAME="NOBARCODE" -->
! 			<p class="problem">Sie m&uuml;ssen dem Exemplar einen Barcode zuordnen</p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="NOBIBLIOITEM" -->
***************
*** 11,15 ****
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="BARCODEINUSE" -->
! 			<p class="problem">Der Strichcode wird bereits verwendet</p>
  		<!-- /TMPL_IF -->
  		<h2 class="catalogue">BIBLIO SATZ <!-- TMPL_VAR NAME="BIBNUM" --></h2>
--- 11,15 ----
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="BARCODEINUSE" -->
! 			<p class="problem">Der Barcode wird bereits verwendet</p>
  		<!-- /TMPL_IF -->
  		<h2 class="catalogue">BIBLIO SATZ <!-- TMPL_VAR NAME="BIBNUM" --></h2>

Index: additem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/additem.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** additem.tmpl	17 May 2005 13:21:35 -0000	1.2
--- additem.tmpl	5 Jun 2005 14:45:17 -0000	1.3
***************
*** 53,57 ****
  	<input type="hidden" name="itemnum" value="<!-- TMPL_VAR NAME="itemnum" -->">
  	<!-- TMPL_IF name="barcode_not_unique" -->
! 		<div id="problem"><b>FEHLER: Strichcode ist bereits vorhanden<b></div>
  	<!-- /TMPL_IF -->
  	<!-- TMPL_IF name="opisadd" -->
--- 53,57 ----
  	<input type="hidden" name="itemnum" value="<!-- TMPL_VAR NAME="itemnum" -->">
  	<!-- TMPL_IF name="barcode_not_unique" -->
! 		<div id="problem"><b>FEHLER: Barcode ist bereits vorhanden<b></div>
  	<!-- /TMPL_IF -->
  	<!-- TMPL_IF name="opisadd" -->
***************
*** 100,106 ****
  		document.f.submit();
  	} else {
! 		alertString2  = _("Form not submitted because of the following problem(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_errors+_("Pflichtfelder leer (sieh fett dargestellte Unterfelder)");
  		alert(alertString2);
  	}
--- 100,106 ----
  		document.f.submit();
  	} else {
! 		alertString2  = _("Formular nicht bearbeitet wegen der folgenden Probleme");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_errors+_("Pflichtfelder leer (siehe fett dargestellte Unterfelder)");
  		alert(alertString2);
  	}

Index: marcimport.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/marcimport.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** marcimport.tmpl	17 May 2005 13:21:35 -0000	1.2
--- marcimport.tmpl	5 Jun 2005 14:45:17 -0000	1.3
***************
*** 46,50 ****
  	</tr>
  	<tr valign="top">
! 		<td>If ISBN is already in the reservoir: </td>
  		<td><input type="radio" name="overwrite_biblio" value="0" checked> Ignorieren, den vorhandenen Satz behalten<br/>
  			<input type="radio" name="overwrite_biblio" value="1">den vorhandenen Satz &uuml;berschreiben</td>
--- 46,50 ----
  	</tr>
  	<tr valign="top">
! 		<td>Wenn die ISBN bereits im Fremddatenpool ist: </td>
  		<td><input type="radio" name="overwrite_biblio" value="0" checked> Ignorieren, den vorhandenen Satz behalten<br/>
  			<input type="radio" name="overwrite_biblio" value="1">den vorhandenen Satz &uuml;berschreiben</td>




From hellen at users.sourceforge.net  Sun Jun  5 20:10:15 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sun, 05 Jun 2005 11:10:15 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/acqui acqui-home.tmpl,1.2,1.3 acquire.tmpl,1.2,1.3 basket.tmpl,1.2,1.3
Message-ID: <E1DezZf-000731-CN@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	acqui-home.tmpl acquire.tmpl basket.tmpl 
Log Message:
translated for 2.2.2 by hellen

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui/acqui-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** acqui-home.tmpl	4 Jun 2005 14:10:26 -0000	1.2
--- acqui-home.tmpl	5 Jun 2005 18:10:12 -0000	1.3
***************
*** 77,81 ****
  		<p>W&auml;hlen Sie dann einen Einkausfkorb aus bzw. legen Sie einen neuen Korb an. Beachten Sie bitte, dass der neue Korb dem angemeldeten Benutzer zugeordnet wird.</p>
  		<p>Sie m&uuml;ssen das zu bestellende Exemplar einem bestehenden Biblio zuordnen, oder erst einen neuen Biblio anlegen.</p>
! 		<p>Um einen Einkaufskorb zu schlie&szlig;en, klicken Sie auf "Einkaufkorb anzeiegn", dann auf "Einkaufskorb best&auml;tigen".</p>
  	</ul>
  </div>
--- 77,81 ----
  		<p>W&auml;hlen Sie dann einen Einkausfkorb aus bzw. legen Sie einen neuen Korb an. Beachten Sie bitte, dass der neue Korb dem angemeldeten Benutzer zugeordnet wird.</p>
  		<p>Sie m&uuml;ssen das zu bestellende Exemplar einem bestehenden Biblio zuordnen, oder erst einen neuen Biblio anlegen.</p>
! 		<p>Um einen Einkaufskorb zu schlie&szlig;en, klicken Sie auf "Einkaufkorb anzeigen", dann auf "Einkaufskorb best&auml;tigen".</p>
  	</ul>
  </div>

Index: acquire.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui/acquire.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** acquire.tmpl	4 Jun 2005 14:10:26 -0000	1.2
--- acquire.tmpl	5 Jun 2005 18:10:13 -0000	1.3
***************
*** 105,109 ****
  			<th class="acquisition">TITEL</th>
  			<th class="acquisition">VERFASSER</th>
! 			<th class="acquisition">Qty</th>
  			<th class="acquisition">Eingegangen</th>
  		</tr>
--- 105,109 ----
  			<th class="acquisition">TITEL</th>
  			<th class="acquisition">VERFASSER</th>
! 			<th class="acquisition">MENGE</th>
  			<th class="acquisition">Eingegangen</th>
  		</tr>

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui/basket.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** basket.tmpl	4 Jun 2005 14:10:26 -0000	1.2
--- basket.tmpl	5 Jun 2005 18:10:13 -0000	1.3
***************
*** 28,33 ****
  				<th class="acquisition">Titel</th>
  				<th class="acquisition">Verfasser</th>
! 				<th class="acquisition">rrp</th>
! 				<th class="acquisition doNotPrint">est</th>
  				<th class="acquisition">Menge</th>
  				<th class="acquisition">Gesamt</th>
--- 28,33 ----
  				<th class="acquisition">Titel</th>
  				<th class="acquisition">Verfasser</th>
! 				<th class="acquisition">EK-Preis</th>
! 				<th class="acquisition doNotPrint">Nettopreis</th>
  				<th class="acquisition">Menge</th>
  				<th class="acquisition">Gesamt</th>




From tipaul at users.sourceforge.net  Mon Jun  6 11:27:46 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 02:27:46 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.17.2.4,1.17.2.5 opac-top.inc,1.8.2.3,1.8.2.4
Message-ID: <E1DfDta-0008Kj-14@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac.css opac-top.inc 
Log Message:
some CSS improvements (opac works better with opera & konqueror now)

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.17.2.4
retrieving revision 1.17.2.5
diff -C2 -r1.17.2.4 -r1.17.2.5
*** opac.css	3 Jun 2005 13:01:23 -0000	1.17.2.4
--- opac.css	6 Jun 2005 09:27:42 -0000	1.17.2.5
***************
*** 91,99 ****
  	font-weight:bold;
  	font-size: 115%;
- 	text-align : center;
  	vertical-align:top;
  	padding: 2px;
  	width:100%;
- 	margin-left:70px;
  }
  
--- 91,97 ----
***************
*** 143,147 ****
  	border:1px solid #000000;
  	border-collapse:collapse;
! 	width:90%;
  }
  /* header */
--- 141,145 ----
  	border:1px solid #000000;
  	border-collapse:collapse;
! 	position:static;
  }
  /* header */
***************
*** 155,165 ****
  	border-bottom:1px solid #000000;
  	border-top:1px solid #000000;
- 	padding:5px;
  }
  /* standard cell */
  td {
  	font-size:10pt;
  	border-left:1px solid #000000;
  	vertical-align:top;
  }
  
--- 153,171 ----
  	border-bottom:1px solid #000000;
  	border-top:1px solid #000000;
  }
  /* standard cell */
+ 
+ tr {
+ 	display:table-row;
+ 	position:static;
+ }
+ 
  td {
  	font-size:10pt;
  	border-left:1px solid #000000;
  	vertical-align:top;
+ 	position:static;
+ /*	position:relative;*/
+ 	display:table-cell;
  }
  
***************
*** 345,350 ****
  
  #menuline {
- 	float:left;
  	display:block;
  }
  
--- 351,356 ----
  
  #menuline {
  	display:block;
+ 	margin-left:100px;
  }
  
***************
*** 358,365 ****
  
  /* a little spacer. should not be used */
- .spacer {
- 	padding-left:20pt;
- 	float:left;
- }
  .basketspacer {
  	padding-left:8pt;
--- 364,367 ----
***************
*** 370,375 ****
  div.tabsubs {
  	width:25px;
- 	position:absolute;
- 	display:block;
  	margin-left:10px;
  	margin-top:100px;
--- 372,375 ----
***************
*** 387,393 ****
  div.tabsub {
  	background-color: #ACE6E6;
- 	display: block;
  	visibility:hidden;
- 	position:absolute;
  	margin-left:72px;
  	margin-top:100px;
--- 387,391 ----
***************
*** 399,406 ****
  div.tabs {
  	width:10px;
- 	position:absolute;
  	display:block;
- 	margin-left:50px;
- 	margin-top:150px;
  }
  
--- 397,401 ----
***************
*** 414,417 ****
--- 409,420 ----
  }
  
+ div.tabbloc {
+ 	position:absolute;
+ 	display:block;
+ 	top:123px;
+ 	left:42px;
+ 	border: 1px solid black;
+ }
+ 
  div.tab {
  	background-color: #ACE6E6;
***************
*** 419,425 ****
  	visibility:hidden;
  	position:absolute;
! 	margin-left:72px;
! 	margin-top:150px;
! 	margin-right:10%;
  }
  
--- 422,426 ----
  	visibility:hidden;
  	position:absolute;
! 	float:left;
  }
  

Index: opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -C2 -r1.8.2.3 -r1.8.2.4
*** opac-top.inc	25 Mar 2005 16:58:23 -0000	1.8.2.3
--- opac-top.inc	6 Jun 2005 09:27:43 -0000	1.8.2.4
***************
*** 31,41 ****
  <body>
  	<!-- MENUS -->
  	<div id="menuline">
- 		<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo" style="float: left" />
  		<div class="SmallLibraryName"><!--TMPL_VAR name="LibraryName"--></div>
- 		<span class="spacer">&nbsp;</span>
- 		<span class="spacer">&nbsp;</span>
  		<a class="menu" href="/cgi-bin/koha/opac-main.pl" title="Koha home page">Home</a>
- 		<span class="spacer">&nbsp;</span>
  		<a class="menu" href="/cgi-bin/koha/opac-search.pl" title="Advanced search">Advanced search</a>
  		<!-- TMPL_IF NAME="loggedinusername" -->
--- 31,38 ----
  <body>
  	<!-- MENUS -->
+ 	<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo"/>
  	<div id="menuline">
  		<div class="SmallLibraryName"><!--TMPL_VAR name="LibraryName"--></div>
  		<a class="menu" href="/cgi-bin/koha/opac-main.pl" title="Koha home page">Home</a>
  		<a class="menu" href="/cgi-bin/koha/opac-search.pl" title="Advanced search">Advanced search</a>
  		<!-- TMPL_IF NAME="loggedinusername" -->
***************
*** 47,53 ****
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_IF -->
- 		<span class="spacer">&nbsp;</span>
  		<a class="menu" href="/cgi-bin/koha/opac-user.pl" title="Member Home page" >Personal page</a>
- 		<span class="spacer">&nbsp;</span>
  		<a class="menu" href="javascript:openBasket()" title="Biblio basket">Biblio basket <span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a>
  	</div>
--- 44,48 ----




From tipaul at users.sourceforge.net  Mon Jun  6 13:41:10 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 04:41:10 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.15.2.10,1.15.2.11
Message-ID: <E1DfFyg-0003UW-JN@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-detail.tmpl 
Log Message:
* changing unititle label
* hidding "number of items" if there is none

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.15.2.10
retrieving revision 1.15.2.11
diff -C2 -r1.15.2.10 -r1.15.2.11
*** opac-detail.tmpl	19 May 2005 22:43:28 -0000	1.15.2.10
--- opac-detail.tmpl	6 Jun 2005 11:41:08 -0000	1.15.2.11
***************
*** 69,73 ****
  				<!-- 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 -->
--- 69,73 ----
  				<!-- 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>




From tipaul at users.sourceforge.net  Mon Jun  6 14:16:09 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 05:16:09 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-full-serial-issues.tmpl,1.1.2.2,1.1.2.3
Message-ID: <E1DfGWX-00005x-AQ@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-full-serial-issues.tmpl 
Log Message:
small css fixes

Index: opac-full-serial-issues.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/Attic/opac-full-serial-issues.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** opac-full-serial-issues.tmpl	3 Jun 2005 12:53:08 -0000	1.1.2.2
--- opac-full-serial-issues.tmpl	6 Jun 2005 12:16:06 -0000	1.1.2.3
***************
*** 3,11 ****
  
  <!-- TMPL_UNLESS name="popup" -->
! <div class="mainbloc">
! 		<h1 class="catalogue">Subscription information for biblio #<!-- TMPL_VAR NAME="biblionumber" --> with title : <!-- TMPL_VAR name="bibliotitle" --></h1>
! <a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Back to biblio</a>
! 
! </div>
  <!-- /TMPL_UNLESS -->
  	<div class="tabsubs">
--- 3,9 ----
  
  <!-- TMPL_UNLESS name="popup" -->
! <div id="mainbloc">
! 	<h1 class="catalogue">Subscription information for biblio #<!-- TMPL_VAR NAME="biblionumber" --> with title : <!-- TMPL_VAR name="bibliotitle" --></h1>
! 	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Back to biblio</a>
  <!-- /TMPL_UNLESS -->
  	<div class="tabsubs">
***************
*** 47,51 ****
  	</div>
  	<!--/TMPL_LOOP -->
! 
  <script language="JavaScript" type="text/javascript">
  function active(numlayer)
--- 45,49 ----
  	</div>
  	<!--/TMPL_LOOP -->
! </div>
  <script language="JavaScript" type="text/javascript">
  function active(numlayer)




From tipaul at users.sourceforge.net  Mon Jun  6 14:38:18 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 05:38:18 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-MARCdetail.tmpl,1.5.2.1,1.5.2.2
Message-ID: <E1DfGry-0003Ww-99@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-MARCdetail.tmpl 
Log Message:
some css changes, for better compliance & look

Index: opac-MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -C2 -r1.5.2.1 -r1.5.2.2
*** opac-MARCdetail.tmpl	10 Mar 2005 15:52:37 -0000	1.5.2.1
--- opac-MARCdetail.tmpl	6 Jun 2005 12:38:16 -0000	1.5.2.2
***************
*** 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,32 ----
  	<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Add to basket</a>
  </div>
! <div id="mainbloc">
  	<div class="tabs">
  		<!-- TMPL_IF name="0XX" -->
***************
*** 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" -->
--- 62,66 ----
  		<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 ****
--- 320,325 ----
  		</table>
  	</div>
+ </div>
+ </div>
  <script language="JavaScript" type="text/javascript">
  function active(numlayer)




From tipaul at users.sourceforge.net  Mon Jun  6 16:03:58 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:03:58 -0700
Subject: [Koha-cvs] CVS: koha/C4 Output.pm,1.51,1.51.2.1
Message-ID: <E1DfICs-0006pI-K0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26202/C4

Modified Files:
      Tag: rel_2_2
	Output.pm 
Log Message:
adding opacsmallimage parameter if applicable

Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.51
retrieving revision 1.51.2.1
diff -C2 -r1.51 -r1.51.2.1
*** Output.pm	3 Jan 2005 10:58:46 -0000	1.51
--- Output.pm	6 Jun 2005 14:03:54 -0000	1.51.2.1
***************
*** 84,87 ****
--- 84,88 ----
  							theme => $theme,
  							opacstylesheet => $opacstylesheet,
+ 							opacsmallimage => C4::Context->preference('opacsmallimage'),
  							lang => $lang);
  




From tipaul at users.sourceforge.net  Mon Jun  6 16:06:16 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:06:16 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.17.2.5,1.17.2.6
Message-ID: <E1DfIF6-000779-TP@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac.css 
Log Message:
improving stylesheet
(adding title & tabs entries + some minor changes)
works fine on opera & konqueror

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.17.2.5
retrieving revision 1.17.2.6
diff -C2 -r1.17.2.5 -r1.17.2.6
*** opac.css	6 Jun 2005 09:27:42 -0000	1.17.2.5
--- opac.css	6 Jun 2005 14:06:14 -0000	1.17.2.6
***************
*** 51,55 ****
  	border-width:0px;
  	text-align:left;
! 	position:absolute;
  }
  
--- 51,58 ----
  	border-width:0px;
  	text-align:left;
! 	display:inline;
! 	float:left;
! 	padding-left:10px;
! 	padding-right:10px;
  }
  
***************
*** 350,353 ****
--- 353,361 ----
  }
  
+ #title {
+ 	display:block;
+ 	margin-left:0px;
+ }
+ 
  #menuline {
  	display:block;




From tipaul at users.sourceforge.net  Mon Jun  6 16:07:29 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:07:29 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac-top.inc,1.8.2.4,1.8.2.5
Message-ID: <E1DfIGH-0007Jx-Vq@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-top.inc 
Log Message:
splitting title in 2 parts :
* title (logo + title)
* menuline (the menuline)
to be able to have a vertical menuline
* adding parameter to have an alternate image as logo

Index: opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -C2 -r1.8.2.4 -r1.8.2.5
*** opac-top.inc	6 Jun 2005 09:27:43 -0000	1.8.2.4
--- opac-top.inc	6 Jun 2005 14:07:27 -0000	1.8.2.5
***************
*** 31,37 ****
  <body>
  	<!-- MENUS -->
! 	<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo"/>
! 	<div id="menuline">
  		<div class="SmallLibraryName"><!--TMPL_VAR name="LibraryName"--></div>
  		<a class="menu" href="/cgi-bin/koha/opac-main.pl" title="Koha home page">Home</a>
  		<a class="menu" href="/cgi-bin/koha/opac-search.pl" title="Advanced search">Advanced search</a>
--- 31,43 ----
  <body>
  	<!-- MENUS -->
! 	<div id="title">
! 		<!-- TMPL_IF name="opacsmallimage" -->
! 			<img src="<!-- TMPL_VAR name="opacsmallimage"-->" height="50" alt="koha logo"/>
! 		<!-- TMPL_ELSE -->
! 			<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo"/>
! 		<!-- /TMPL_IF -->
  		<div class="SmallLibraryName"><!--TMPL_VAR name="LibraryName"--></div>
+ 	</div>
+ 	<div id="menuline">
  		<a class="menu" href="/cgi-bin/koha/opac-main.pl" title="Koha home page">Home</a>
  		<a class="menu" href="/cgi-bin/koha/opac-search.pl" title="Advanced search">Advanced search</a>




From tipaul at users.sourceforge.net  Mon Jun  6 16:08:38 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:08:38 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-main.tmpl,1.16.2.4,1.16.2.5
Message-ID: <E1DfIHO-0007SY-G5@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-main.tmpl 
Log Message:
* adding parameter to have an alternate image as logo

Index: opac-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl,v
retrieving revision 1.16.2.4
retrieving revision 1.16.2.5
diff -C2 -r1.16.2.4 -r1.16.2.5
*** opac-main.tmpl	18 Mar 2005 09:52:06 -0000	1.16.2.4
--- opac-main.tmpl	6 Jun 2005 14:08:35 -0000	1.16.2.5
***************
*** 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>
  




From tipaul at users.sourceforge.net  Mon Jun  6 16:12:17 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:12:17 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-serial-issues.tmpl,1.2.2.3,1.2.2.4
Message-ID: <E1DfIKv-0007xy-Lr@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-serial-issues.tmpl 
Log Message:


Index: opac-serial-issues.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -r1.2.2.3 -r1.2.2.4
*** opac-serial-issues.tmpl	2 Jun 2005 15:19:35 -0000	1.2.2.3
--- opac-serial-issues.tmpl	6 Jun 2005 14:12:14 -0000	1.2.2.4
***************
*** 2,11 ****
  <!--------------------------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>
--- 2,10 ----
  <!--------------------------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>
! 	<!-- 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>
***************
*** 75,100 ****
  		since <b><!-- TMPl_VAR name="startdate" --></b>
  		</p>
! <!--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" -->
! 		<p>
! 		<!-- TMPL_VAR name="recievedlist" -->
! 			are recieved.
! 		</p>
! 	<!--/TMPL_IF -->
! 	<!-- TMPL_IF name="missinglist" -->
! 	<p>
! 			<!-- TMPL_VAR name="missinglist" -->
! 		are missing.
! 	</p>
! 	<!--/TMPL_IF -->
! <!-- /TMPL_UNLESS -->
! </div>
  <!-- /TMPL_LOOP -->
  </div>
--- 74,99 ----
  		since <b><!-- TMPl_VAR name="startdate" --></b>
  		</p>
! 	<!--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>




From tipaul at users.sourceforge.net  Mon Jun  6 16:11:49 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:11:49 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-searchresults.tmpl,1.20.2.3,1.20.2.4
Message-ID: <E1DfIKT-0007vE-Do@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-searchresults.tmpl 
Log Message:
minor change (to fill a table bottom)

Index: opac-searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl,v
retrieving revision 1.20.2.3
retrieving revision 1.20.2.4
diff -C2 -r1.20.2.3 -r1.20.2.4
*** opac-searchresults.tmpl	25 Mar 2005 17:02:34 -0000	1.20.2.3
--- opac-searchresults.tmpl	6 Jun 2005 14:11:47 -0000	1.20.2.4
***************
*** 115,119 ****
  				<!-- /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>
--- 115,119 ----
  				<!-- /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>




From tipaul at users.sourceforge.net  Mon Jun  6 16:13:24 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:13:24 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-user.tmpl,1.8.2.2,1.8.2.3
Message-ID: <E1DfIM0-00086y-KZ@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-user.tmpl 
Log Message:
minor graphic change + library message shown just after login

Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -C2 -r1.8.2.2 -r1.8.2.3
*** opac-user.tmpl	25 Mar 2005 17:02:59 -0000	1.8.2.2
--- opac-user.tmpl	6 Jun 2005 14:13:22 -0000	1.8.2.3
***************
*** 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" -->




From tipaul at users.sourceforge.net  Mon Jun  6 16:14:01 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:14:01 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-userupdate.tmpl,1.5,1.5.2.1
Message-ID: <E1DfIMb-0008Bz-OO@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-userupdate.tmpl 
Log Message:
minor graphic change + library message shown just after login

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.5.2.1
diff -C2 -r1.5 -r1.5.2.1
*** opac-userupdate.tmpl	12 Nov 2004 16:28:10 -0000	1.5
--- opac-userupdate.tmpl	6 Jun 2005 14:13:59 -0000	1.5.2.1
***************
*** 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>




From tipaul at users.sourceforge.net  Mon Jun  6 16:15:10 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:15:10 -0700
Subject: [Koha-cvs] CVS: koha pay.pl,1.9.2.1,1.9.2.2
Message-ID: <E1DfINi-0008MY-8u@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32105

Modified Files:
      Tag: rel_2_2
	pay.pl 
Log Message:
* fixing a bug
* redirecting to patron page, it's more logic

Index: pay.pl
===================================================================
RCS file: /cvsroot/koha/koha/pay.pl,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -r1.9.2.1 -r1.9.2.2
*** pay.pl	16 Feb 2005 19:16:35 -0000	1.9.2.1
--- pay.pl	6 Jun 2005 14:15:08 -0000	1.9.2.2
***************
*** 56,60 ****
  my $check=0;
  for (my $i=0;$i<@names;$i++){
! 	my$temp=$input->param($names[$i]);
  	if ($temp eq 'wo'){
  		$inp{$names[$i]}=$temp;
--- 56,60 ----
  my $check=0;
  for (my $i=0;$i<@names;$i++){
! 	my $temp=$input->param($names[$i]);
  	if ($temp eq 'wo'){
  		$inp{$names[$i]}=$temp;
***************
*** 65,68 ****
--- 65,69 ----
  		$user=~ s/Foxton/F/i;
  		$user=~ s/Shannon/S/i;
+ 		# FIXME : using array +4, +5, +6 is dirty. Should use arrays for each accountline
  		my $amount=$input->param($names[$i+4]);
  		my $bornum=$input->param($names[$i+5]);
***************
*** 146,150 ****
  	}
  	$bornum=$input->param('bornum');
! 	print $input->redirect("/cgi-bin/koha/pay.pl?bornum=$bornum");
  }
  
--- 147,151 ----
  	}
  	$bornum=$input->param('bornum');
! 	print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$bornum");
  }
  




From tipaul at users.sourceforge.net  Mon Jun  6 16:15:57 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:15:57 -0700
Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.100.2.3,1.100.2.4
Message-ID: <E1DfIOT-0008Rc-Q4@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/updater
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32401/updater

Modified Files:
      Tag: rel_2_2
	updatedatabase 
Log Message:
adding 2 systemparameters to define an alternate image as logo in opac (the image on main page & on each top-left page)

Index: updatedatabase
===================================================================
RCS file: /cvsroot/koha/koha/updater/updatedatabase,v
retrieving revision 1.100.2.3
retrieving revision 1.100.2.4
diff -C2 -r1.100.2.3 -r1.100.2.4
*** updatedatabase	2 Jun 2005 21:05:34 -0000	1.100.2.3
--- updatedatabase	6 Jun 2005 14:15:55 -0000	1.100.2.4
***************
*** 819,822 ****
--- 819,840 ----
          {
              uniquefieldrequired => 'variable',
+             variable            => 'opacsmallimage',
+             value               => '',
+ 	    forceupdate		=> { 'explanation' => 1,
+ 	    			     'type' => 1},
+             explanation         => 'Enter a complete URL to an image, will be on top/left instead of the Koha logo',
+ 	    type		=> 'free',
+         },
+         {
+             uniquefieldrequired => 'variable',
+             variable            => 'opaclargeimage',
+             value               => '',
+ 	    forceupdate		=> { 'explanation' => 1,
+ 	    			     'type' => 1},
+             explanation         => 'Enter a complete URL to an image, will be on the main page, instead of the Koha logo',
+ 	    type		=> 'free',
+         },
+         {
+             uniquefieldrequired => 'variable',
              variable            => 'delimiter',
              value               => ';',
***************
*** 1444,1447 ****
--- 1462,1468 ----
  
  # $Log$
+ # Revision 1.100.2.4  2005/06/06 14:15:55  tipaul
+ # adding 2 systemparameters to define an alternate image as logo in opac (the image on main page & on each top-left page)
+ #
  # Revision 1.100.2.3  2005/06/02 21:05:34  hdl
  # adding variable SubscriptionHistory




From tipaul at users.sourceforge.net  Mon Jun  6 16:16:15 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:16:15 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-main.pl,1.16,1.16.2.1
Message-ID: <E1DfIOl-0008VP-7O@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32650/opac

Modified Files:
      Tag: rel_2_2
	opac-main.pl 
Log Message:
minor change (to fill a table bottom)

Index: opac-main.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-main.pl,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -C2 -r1.16 -r1.16.2.1
*** opac-main.pl	4 Oct 2004 20:20:25 -0000	1.16
--- opac-main.pl	6 Jun 2005 14:16:13 -0000	1.16.2.1
***************
*** 53,56 ****
--- 53,57 ----
  				languages => \@options,
  				textmessaging => $borrower->{textmessaging},
+ 				opaclargeimage => C4::Context->preference("opaclargeimage"),
  );
  output_html_with_http_headers $input, $cookie, $template->output;




From tipaul at users.sourceforge.net  Mon Jun  6 17:23:38 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 08:23:38 -0700
Subject: [Koha-cvs] CVS: koha/C4 SearchMarc.pm,1.36.2.10,1.36.2.11
Message-ID: <E1DfJRy-0001iU-G9@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6460/C4

Modified Files:
      Tag: rel_2_2
	SearchMarc.pm 
Log Message:
adding a systempref to choose either to show or hide "lost" items. Note that "lost items" can be related to an authorised value list, so does not necessary mean "item definetly lost". Even here, some libraries want to see lost items, and some don't want. This parameter will make everybody happy !

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.36.2.10
retrieving revision 1.36.2.11
diff -C2 -r1.36.2.10 -r1.36.2.11
*** SearchMarc.pm	21 May 2005 03:11:04 -0000	1.36.2.10
--- SearchMarc.pm	6 Jun 2005 15:23:35 -0000	1.36.2.11
***************
*** 274,278 ****
  	my ($sql_tables, $sql_where1, $sql_where2) = create_request($dbh,\@normal_tags, \@normal_and_or, \@normal_operator, \@normal_value);
  
! 	$sql_where1 .= "and TO_DAYS( NOW( ) ) - TO_DAYS( biblio.timestamp ) <30" if $orderby =~ "biblio.timestamp";
  	my $sth;
  	if ($sql_where2) {
--- 274,278 ----
  	my ($sql_tables, $sql_where1, $sql_where2) = create_request($dbh,\@normal_tags, \@normal_and_or, \@normal_operator, \@normal_value);
  
! 	$sql_where1 .= "and TO_DAYS( NOW( ) ) - TO_DAYS( biblio.timestamp ) <300" if $orderby =~ "biblio.timestamp";
  	my $sth;
  	if ($sql_where2) {
***************
*** 336,340 ****
  	# HINT : biblionumber as bn is important. The hash is fills biblionumber with items.biblionumber.
  	# so if you dont' has an item, you get a not nice empty value.
! 	$sth = $dbh->prepare("SELECT biblio.biblionumber as bn,biblio.*, biblioitems.*,marc_biblio.bibid,itemtypes.notforloan,itemtypes.description
  							FROM biblio, marc_biblio 
  							LEFT JOIN biblioitems on biblio.biblionumber = biblioitems.biblionumber
--- 336,340 ----
  	# HINT : biblionumber as bn is important. The hash is fills biblionumber with items.biblionumber.
  	# so if you dont' has an item, you get a not nice empty value.
! 	$sth = $dbh->prepare("SELECT biblio.biblionumber as bn,biblioitems.*,biblio.*, marc_biblio.bibid,itemtypes.notforloan,itemtypes.description
  							FROM biblio, marc_biblio 
  							LEFT JOIN biblioitems on biblio.biblionumber = biblioitems.biblionumber
***************
*** 347,351 ****
  	my $oldline;
  	my ($oldbibid, $oldauthor, $oldtitle);
! 	my $sth_itemCN = $dbh->prepare("select items.* from items where biblionumber=? and (itemlost = 0 or itemlost is NULL)");
  	my $sth_issue = $dbh->prepare("select date_due,returndate from issues where itemnumber=?");
  	# parse all biblios between start & end.
--- 347,356 ----
  	my $oldline;
  	my ($oldbibid, $oldauthor, $oldtitle);
! 	my $sth_itemCN;
! 	if (C4::Context->preference('hidelostitem')) {
! 		$sth_itemCN = $dbh->prepare("select items.* from items where biblionumber=? and (itemlost = 0 or itemlost is NULL)");
! 	} else {
! 		$sth_itemCN = $dbh->prepare("select items.* from items where biblionumber=?");
! 	}
  	my $sth_issue = $dbh->prepare("select date_due,returndate from issues where itemnumber=?");
  	# parse all biblios between start & end.




From tipaul at users.sourceforge.net  Mon Jun  6 17:23:39 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 08:23:39 -0700
Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.100.2.4,1.100.2.5
Message-ID: <E1DfJRz-0001ij-F1@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/updater
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6460/updater

Modified Files:
      Tag: rel_2_2
	updatedatabase 
Log Message:
adding a systempref to choose either to show or hide "lost" items. Note that "lost items" can be related to an authorised value list, so does not necessary mean "item definetly lost". Even here, some libraries want to see lost items, and some don't want. This parameter will make everybody happy !

Index: updatedatabase
===================================================================
RCS file: /cvsroot/koha/koha/updater/updatedatabase,v
retrieving revision 1.100.2.4
retrieving revision 1.100.2.5
diff -C2 -r1.100.2.4 -r1.100.2.5
*** updatedatabase	6 Jun 2005 14:15:55 -0000	1.100.2.4
--- updatedatabase	6 Jun 2005 15:23:36 -0000	1.100.2.5
***************
*** 877,880 ****
--- 877,889 ----
  	        options		=> 'simplified|full'
          },
+         {
+             uniquefieldrequired => 'variable',
+             variable            => 'hidelostitems',
+             value               => 'No',
+ 	    forceupdate		=> { 'explanation' => 1,
+ 	    			     'type' => 1},
+             explanation         => 'show or hide "lost" items in OPAC.',
+ 	    type		=> 'YesNo',
+         },
      ],
  
***************
*** 1462,1465 ****
--- 1471,1477 ----
  
  # $Log$
+ # Revision 1.100.2.5  2005/06/06 15:23:36  tipaul
+ # adding a systempref to choose either to show or hide "lost" items. Note that "lost items" can be related to an authorised value list, so does not necessary mean "item definetly lost". Even here, some libraries want to see lost items, and some don't want. This parameter will make everybody happy !
+ #
  # Revision 1.100.2.4  2005/06/06 14:15:55  tipaul
  # adding 2 systemparameters to define an alternate image as logo in opac (the image on main page & on each top-left page)




From tipaul at users.sourceforge.net  Mon Jun  6 17:47:30 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 08:47:30 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-sendbasket.pl,1.4.2.3,1.4.2.4
Message-ID: <E1DfJp4-0005AV-Pt@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19826/opac

Modified Files:
      Tag: rel_2_2
	opac-sendbasket.pl 
Log Message:
fix to send an iso2709 file as attachment

Index: opac-sendbasket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-sendbasket.pl,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -r1.4.2.3 -r1.4.2.4
*** opac-sendbasket.pl	2 Jun 2005 13:03:31 -0000	1.4.2.3
--- opac-sendbasket.pl	6 Jun 2005 15:47:27 -0000	1.4.2.4
***************
*** 90,101 ****
  
  	my $boundary = "====" . time() . "====";
  	$mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
  
! 	$email_header = encode_qp($email_header);
  
! 	$boundary = "--".$boundary;
  
! 	# Writing mail
! 	$mail{body} = <<END_OF_BODY;
  $boundary
  Content-Type: text/plain; charset="iso-8859-1"
--- 90,131 ----
  
  	my $boundary = "====" . time() . "====";
+ # 	$mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
+ # 
+ # 	$email_header = encode_qp($email_header);
+ # 
+ # 	$boundary = "--".$boundary;
+ # 
+ # 	# Writing mail
+ # 	$mail{body} =
  	$mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
  
! 	my $message = encode_qp( "" );
  
! # $file = $^X; # This is the perl executable
! # 
! # open (F, $file) or die "Cannot read $file: $!";
! # binmode F; undef $/;
! $mail{body} = encode_base64($iso2709);
! # close F;
  
! $boundary = '--'.$boundary;
! $mail{body} = <<END_OF_BODY;
! $boundary
! Content-Type: text/plain; charset="iso-8859-1"
! Content-Transfer-Encoding: quoted-printable
! 
! $message
! $boundary
! Content-Type: application/octet-stream; name="basket"
! Content-Transfer-Encoding: base64
! Content-Disposition: attachment; filename="basket"
! 
! $mail{body}
! $boundary--
! END_OF_BODY
! 
! 
! 
! 	 <<END_OF_BODY;
  $boundary
  Content-Type: text/plain; charset="iso-8859-1"
***************
*** 109,113 ****
  END_OF_BODY
  
! $mail{PJ} = $iso2709;
  #	$mail{body} = <<END_OF_BODY;
  #$boundary
--- 139,143 ----
  END_OF_BODY
  
! $mail{attachment} = $iso2709;
  #	$mail{body} = <<END_OF_BODY;
  #$boundary
***************
*** 132,136 ****
  #		warn " ".$mail{body};
  #		warn " ".$mail{PJ};
- 		warn "Mail sent ok\n";
  		$template->param(SENT => "1");
  		$template->param(email_add => $email_add);
--- 162,165 ----




From hdl at users.sourceforge.net  Mon Jun  6 18:01:15 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 06 Jun 2005 09:01:15 -0700
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.6.2.7,1.6.2.8
Message-ID: <E1DfK2N-0006uJ-PS@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26413/C4

Modified Files:
      Tag: rel_2_2
	Bull.pm 
Log Message:
Fixing Bug : Not on first page when viewing opac-full-serial.tmpl

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.6.2.7
retrieving revision 1.6.2.8
diff -C2 -r1.6.2.7 -r1.6.2.8
*** Bull.pm	3 Jun 2005 12:53:08 -0000	1.6.2.7
--- Bull.pm	6 Jun 2005 16:00:56 -0000	1.6.2.8
***************
*** 223,231 ****
  				};
  		}else {
  			$year= $subs->{'year'};
  			$startdate= $subs->{'startdate'};
  			$aqbooksellername= $subs->{'aqbooksellername'};
  			$bibliotitle= $subs->{'bibliotitle'};
- 			$first=1 if (not $year);
  			my @temp;
  			push @temp,
--- 223,231 ----
  				};
  		}else {
+ 			$first=1 if (not $year);
  			$year= $subs->{'year'};
  			$startdate= $subs->{'startdate'};
  			$aqbooksellername= $subs->{'aqbooksellername'};
  			$bibliotitle= $subs->{'bibliotitle'};
  			my @temp;
  			push @temp,




From tipaul at users.sourceforge.net  Mon Jun  6 18:11:00 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 09:11:00 -0700
Subject: [Koha-cvs] CVS: koha/admin checkmarc.pl,1.6,1.6.2.1
Message-ID: <E1DfKBo-00081p-1o@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30805/admin

Modified Files:
      Tag: rel_2_2
	checkmarc.pl 
Log Message:
adding 2 new checkings for MARC setup :
* only 1 MARC tag must be mapped to item tab
* warning if there is NULL in a frameworkcode

Index: checkmarc.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/checkmarc.pl,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** checkmarc.pl	22 Dec 2003 19:16:58 -0000	1.6
--- checkmarc.pl	6 Jun 2005 16:10:57 -0000	1.6.2.1
***************
*** 77,80 ****
--- 77,81 ----
  my $tab = $res2;
  my $subtotal=0;
+ warn "TAGF : $tagfield";
  while (($res,$res2,$field) = $sth->fetchrow) {
  	# (ignore itemnumber, that must be in -1 tab)
***************
*** 97,100 ****
--- 98,118 ----
  	$total++;
  }
+ 
+ $sth = $dbh->prepare("select distinct tagfield from marc_subfield_structure where tab = 10");
+ $sth->execute;
+ my $totaltags = 0;
+ my $list = "";
+ while (($res2) = $sth->fetchrow) {
+ 	$totaltags++;
+ 	$list.=$res2.",";
+ }
+ if ($totaltags > 1) {
+ 	$template->param(itemtags => $list);
+ 	$total++;
+ } else {
+ 	$template->param(itemtags => 0);
+ }
+ 
+ 
  # checks biblioitems.itemtype must be mapped and use authorised_value=itemtype
  $sth = $dbh->prepare("select tagfield,tab,authorised_value from marc_subfield_structure where kohafield = \"biblioitems.itemtype\"");
***************
*** 146,149 ****
--- 164,189 ----
  }
  
+ $sth = $dbh->prepare("select count(*) from marc_biblio where frameworkcode is NULL");
+ $sth->execute;
+ ($res) = $sth->fetchrow;
+ if ($res) {
+ 	$template->param(frameworknull =>1);
+ 	$total++;
+ }
+ $sth = $dbh->prepare("select count(*) from marc_subfield_structure where frameworkcode is NULL");
+ $sth->execute;
+ ($res) = $sth->fetchrow;
+ if ($res) {
+ 	$template->param(frameworknull =>1);
+ 	$total++;
+ }
+ $sth = $dbh->prepare("select count(*) from marc_tag_structure where frameworkcode is NULL");
+ $sth->execute;
+ ($res) = $sth->fetchrow;
+ if ($res) {
+ 	$template->param(frameworknull =>1);
+ 	$total++;
+ }
+ 
  $template->param(total => $total);
  output_html_with_http_headers $input, $cookie, $template->output;




From tipaul at users.sourceforge.net  Mon Jun  6 18:11:00 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 09:11:00 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters checkmarc.tmpl,1.10,1.10.2.1
Message-ID: <E1DfKBo-00081y-Gy@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	checkmarc.tmpl 
Log Message:
adding 2 new checkings for MARC setup :
* only 1 MARC tag must be mapped to item tab
* warning if there is NULL in a frameworkcode

Index: checkmarc.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -r1.10 -r1.10.2.1
*** checkmarc.tmpl	19 Jul 2004 19:20:29 -0000	1.10
--- checkmarc.tmpl	6 Jun 2005 16:10:57 -0000	1.10.2.1
***************
*** 36,39 ****
--- 36,51 ----
  	<!-- /TMPL_IF -->
  	<!-- -------------------------------------------------------------------------------------------------------- -->
+ 	<!-- TMPL_IF NAME="itemtags" -->
+ 		<tr>
+ 			<td><b>Item tag</b></td>
+ 			<td>There is more than 1 MARC tag related to items tab (10) : <!-- TMPL_VAR name="itemtags" --></td>
+ 		</tr>
+ 	<!-- TMPL_ELSE -->
+ 		<tr>
+ 			<td>OK</td>
+ 			<td><i>Only 1 marc tag mapped to items</i></td>
+ 		</tr>
+ 	<!-- /TMPL_IF -->
+ 	<!-- -------------------------------------------------------------------------------------------------------- -->
  	<!-- TMPL_IF NAME="itemtypes_empty" -->
  		<tr>
***************
*** 117,120 ****
--- 129,147 ----
  	<!-- /TMPL_IF -->
  	<!-- -------------------------------------------------------------------------------------------------------- -->
+ 	<!-- TMPL_IF NAME="frameworknull" -->
+ 		<tr>
+ 			<td><b>framework values</b></td>
+ 			<td>there is a null value in a frameworkcode. Check the following tables<br/>
+ 				<li>select * from marc_subfield_structure where frameworkcode is NULL</li>
+ 				<li>select * from marc_tag_structure where frameworkcode is NULL</li>
+ 				<li>select * from marc_biblio where frameworkcode is NULL</li></td>
+ 		</tr>
+ 	<!-- TMPL_ELSE -->
+ 		<tr>
+ 			<td>OK</td>
+ 			<td><i>no NULL value in frameworkcode</i></td>
+ 		</tr>
+ 	<!-- /TMPL_IF -->
+ 	<!-- -------------------------------------------------------------------------------------------------------- -->
  	<!-- TMPL_IF NAME="total" -->
  		<tr>




From tipaul at users.sourceforge.net  Mon Jun  6 18:32:11 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 09:32:11 -0700
Subject: [Koha-cvs] CVS: koha/acqui recieveorder.pl,1.9.2.1,1.9.2.2
Message-ID: <E1DfKWJ-0001xZ-17@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7492/acqui

Modified Files:
      Tag: rel_2_2
	recieveorder.pl 
Log Message:
The correct parameter is supplierid, not id.

Index: recieveorder.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/recieveorder.pl,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -r1.9.2.1 -r1.9.2.2
*** recieveorder.pl	14 Apr 2005 21:21:08 -0000	1.9.2.1
--- recieveorder.pl	6 Jun 2005 16:32:08 -0000	1.9.2.2
***************
*** 33,37 ****
  
  my $input=new CGI;
! my $supplierid=$input->param('id');
  my ($count, at booksellers)=bookseller($supplierid);
  
--- 33,37 ----
  
  my $input=new CGI;
! my $supplierid=$input->param('supplierid');
  my ($count, at booksellers)=bookseller($supplierid);
  




From tipaul at users.sourceforge.net  Mon Jun  6 18:36:45 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 09:36:45 -0700
Subject: [Koha-cvs] CVS: koha/C4 Acquisition.pm,1.9.2.3,1.9.2.4
Message-ID: <E1DfKaj-0002T5-RW@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9430/C4

Modified Files:
      Tag: rel_2_2
	Acquisition.pm 
Log Message:
specifying table order to have aqorders.notes and not biblio.notes in {notes} field

Index: Acquisition.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -C2 -r1.9.2.3 -r1.9.2.4
*** Acquisition.pm	26 May 2005 09:21:29 -0000	1.9.2.3
--- Acquisition.pm	6 Jun 2005 16:36:43 -0000	1.9.2.4
***************
*** 563,567 ****
  	map { push(@searchterms,"$_%","% $_%") } @data;
  	push(@searchterms,$search,$search,$biblio);
! 	my $sth=$dbh->prepare("Select *,biblio.title from aqorders,biblioitems,biblio,aqbasket
  		where aqorders.biblioitemnumber = biblioitems.biblioitemnumber and
  		aqorders.basketno = aqbasket.basketno
--- 563,567 ----
  	map { push(@searchterms,"$_%","% $_%") } @data;
  	push(@searchterms,$search,$search,$biblio);
! 	my $sth=$dbh->prepare("Select biblio.*,biblioitems.*,aqorders.*,aqbasket.*,biblio.title from aqorders,biblioitems,biblio,aqbasket
  		where aqorders.biblioitemnumber = biblioitems.biblioitemnumber and
  		aqorders.basketno = aqbasket.basketno




From rangi at users.sourceforge.net  Tue Jun  7 01:29:38 2005
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Mon, 06 Jun 2005 16:29:38 -0700
Subject: [Koha-cvs] CVS: koha/C4 Acquisition.pm,1.11,1.12
Message-ID: <E1DfR2I-0007Xf-Jy@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28428

Modified Files:
	Acquisition.pm 
Log Message:
Fix for a bug in full acquisitions basket.pl
Ordernumber not showing


Index: Acquisition.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** Acquisition.pm	4 May 2005 15:39:08 -0000	1.11
--- Acquisition.pm	6 Jun 2005 23:29:36 -0000	1.12
***************
*** 105,109 ****
  	my ($basketno,$supplier,$orderby)=@_;
  	my $dbh = C4::Context->dbh;
! 	my $query="Select *,biblio.title from aqorders,biblio,biblioitems
  	left join aqorderbreakdown on aqorderbreakdown.ordernumber=aqorders.ordernumber
  	where basketno='$basketno'
--- 105,109 ----
  	my ($basketno,$supplier,$orderby)=@_;
  	my $dbh = C4::Context->dbh;
! 	my $query="Select *,biblio.title,aqorders.ordernumber from aqorders,biblio,biblioitems
  	left join aqorderbreakdown on aqorderbreakdown.ordernumber=aqorders.ordernumber
  	where basketno='$basketno'




From tipaul at users.sourceforge.net  Tue Jun  7 12:00:51 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 03:00:51 -0700
Subject: [Koha-cvs] CVS: koha/C4 AuthoritiesMarc.pm,1.17,1.18
Message-ID: <E1Dfat9-0006Mi-Li@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24420/C4

Modified Files:
	AuthoritiesMarc.pm 
Log Message:
adding $b to mainentry (in UNIMARC, for personal names, $a is the surname, $b is the firstname)

Index: AuthoritiesMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/AuthoritiesMarc.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** AuthoritiesMarc.pm	1 Jun 2005 12:51:02 -0000	1.17
--- AuthoritiesMarc.pm	7 Jun 2005 10:00:47 -0000	1.18
***************
*** 184,188 ****
  		$newline{biblio_fields} = $tags_using_authtype;
  		$newline{even} = $counter % 2;
! 		$newline{mainentry} = $record->field($mainentrytag)->subfield('a') if $record->field($mainentrytag);
  		$counter++;
  		push @finalresult, \%newline;
--- 184,188 ----
  		$newline{biblio_fields} = $tags_using_authtype;
  		$newline{even} = $counter % 2;
! 		$newline{mainentry} = $record->field($mainentrytag)->subfield('a')." ".$record->field($mainentrytag)->subfield('b') if $record->field($mainentrytag);
  		$counter++;
  		push @finalresult, \%newline;
***************
*** 922,925 ****
--- 922,928 ----
  # $Id$
  # $Log$
+ # Revision 1.18  2005/06/07 10:00:47  tipaul
+ # adding $b to mainentry (in UNIMARC, for personal names, $a is the surname, $b is the firstname)
+ #
  # Revision 1.17  2005/06/01 12:51:02  tipaul
  # some fixes & improvements for dictionnary search in librarian interface




From tipaul at users.sourceforge.net  Tue Jun  7 12:02:03 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 03:02:03 -0700
Subject: [Koha-cvs] CVS: koha/C4 AuthoritiesMarc.pm,1.9.2.5,1.9.2.6
Message-ID: <E1DfauJ-0006VX-Qi@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24943/C4

Modified Files:
      Tag: rel_2_2
	AuthoritiesMarc.pm 
Log Message:
porting dictionnary search from head to 2.2. there is now a ... facing titles, author & subject, to search in biblio & authorities existing values.

Index: AuthoritiesMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/AuthoritiesMarc.pm,v
retrieving revision 1.9.2.5
retrieving revision 1.9.2.6
diff -C2 -r1.9.2.5 -r1.9.2.6
*** AuthoritiesMarc.pm	31 May 2005 14:50:46 -0000	1.9.2.5
--- AuthoritiesMarc.pm	7 Jun 2005 10:02:00 -0000	1.9.2.6
***************
*** 65,73 ****
  	# the marclist may contain "mainentry". In this case, search the tag_to_report, that depends on
  	# the authtypecode. Then, search on $a of this tag_to_report
  	for (my $i=0;$i<$#{$tags};$i++) {
  		if (@$tags[$i] eq "mainentry") {
- 			my $sth = $dbh->prepare("select auth_tag_to_report from auth_types where authtypecode=?");
- 			$sth->execute($authtypecode);
- 			my ($tag_to_report) = $sth->fetchrow;
  			@$tags[$i] = $tag_to_report."a";
  		}
--- 65,76 ----
  	# the marclist may contain "mainentry". In this case, search the tag_to_report, that depends on
  	# the authtypecode. Then, search on $a of this tag_to_report
+ 	# also store main entry MARC tag, to extract it at end of search
+ 	my $mainentrytag;
+ 	my $sth = $dbh->prepare("select auth_tag_to_report from auth_types where authtypecode=?");
+ 	$sth->execute($authtypecode);
+ 	my ($tag_to_report) = $sth->fetchrow;
+ 	$mainentrytag = $tag_to_report;
  	for (my $i=0;$i<$#{$tags};$i++) {
  		if (@$tags[$i] eq "mainentry") {
  			@$tags[$i] = $tag_to_report."a";
  		}
***************
*** 88,91 ****
--- 91,99 ----
  	for(my $i = 0 ; $i <= $#{$value} ; $i++)
  	{
+ 		# replace * by %
+ 		@$value[$i] =~ s/\*/%/g;
+ 		# remove % at the beginning
+ 		@$value[$i] =~ s/^%//g;
+ 	    @$value[$i] =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g if @$operator[$i] eq "contains";
  		if(@$operator[$i] eq "contains") # if operator is contains, splits the words in separate requests
  		{
***************
*** 175,178 ****
--- 183,188 ----
  		$newline{used} = &AUTHcount_usage($result[$counter]);
  		$newline{biblio_fields} = $tags_using_authtype;
+ 		$newline{even} = $counter % 2;
+ 		$newline{mainentry} = $record->field($mainentrytag)->subfield('a')." ".$record->field($mainentrytag)->subfield('b') if $record->field($mainentrytag);
  		$counter++;
  		push @finalresult, \%newline;
***************
*** 917,920 ****
--- 927,933 ----
  # $Id$
  # $Log$
+ # Revision 1.9.2.6  2005/06/07 10:02:00  tipaul
+ # porting dictionnary search from head to 2.2. there is now a ... facing titles, author & subject, to search in biblio & authorities existing values.
+ #
  # Revision 1.9.2.5  2005/05/31 14:50:46  tipaul
  # fix for authority merging. There was a bug on official installs




From tipaul at users.sourceforge.net  Tue Jun  7 12:02:03 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 03:02:03 -0700
Subject: [Koha-cvs] CVS: koha/search.marc dictionary.pl,NONE,1.6.2.2
Message-ID: <E1DfauJ-0006VU-L7@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24943/search.marc

Added Files:
      Tag: rel_2_2
	dictionary.pl 
Log Message:
porting dictionnary search from head to 2.2. there is now a ... facing titles, author & subject, to search in biblio & authorities existing values.

--- NEW FILE ---
#!/usr/bin/perl


# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Auth;
use CGI;
use C4::Search;
use C4::SearchMarc;
use C4::AuthoritiesMarc;
use C4::Context;
use C4::Biblio;
use HTML::Template;

=head1 NAME

dictionnary.pl : script to search in biblio & authority an existing value

=head1 SYNOPSIS

useful when the user want to search a term before running a query. For example, to see if "computer" is used in the database

The parameter "marclist" tells which field is searched (title, author, subject, but could be anything else)

This script searches in both biblios & authority
* in biblio, the script search in all marc fields related to what the user is looking for (for example, if the dictionnary is used on "author", the script searches in biblio.author, but also in additional authors & any MARC field related to author (through the "seealso" MARC constraint)
* in authority, the script search everywhere. Thus, the accepted & rejected forms are found.

The script shows all results & the user can choose what he want, that is copied into search form.

=cut

my $input = new CGI;
my $field =$input->param('marclist');
#warn "field :$field";
my ($tablename, $kohafield)=split /./,$field;
#my $tablename=$input->param('tablename');
$tablename="biblio" unless ($tablename);
#my $kohafield = $input->param('kohafield');
my @search = $input->param('search');
# warn " ".$search[0];
my $index = $input->param('index');
# warn " index: ".$index;
my $op=$input->param('op');
if (($search[0]) and not ($op eq 'do_search')){
	$op='do_search';
}
my $script_name = 'search.marc/dictionary.pl';
my $query;
my $type=$input->param('type');
#warn " ".$type;

my $dbh = C4::Context->dbh;
my ($template, $loggedinuser, $cookie);

my $env;

my $startfrom=$input->param('startfrom');
$startfrom=0 if(!defined $startfrom);
my $searchdesc;
my $resultsperpage;

#warn "Starting process";

if ($op eq "do_search") {
	#
	# searching in biblio
	#
	my $sth=$dbh->prepare("Select distinct tagfield,tagsubfield from marc_subfield_structure where kohafield = ?");
	$sth->execute("$field");
	my (@tags, @and_or, @operator, @excluding, at value);
	
 	while ((my $tagfield,my $tagsubfield,my $liblibrarian) = $sth->fetchrow) {
 		push @tags, $dbh->quote("$tagfield$tagsubfield");
 	}

	$resultsperpage= $input->param('resultsperpage');
	$resultsperpage = 19 if(!defined $resultsperpage);
	my $orderby = $input->param('orderby');

	findseealso($dbh,\@tags);

	my @results, my $total;
	my $strsth="select distinct subfieldvalue, count(marc_subfield_table.bibid) from marc_subfield_table,marc_word where marc_word.word like ? and marc_subfield_table.bibid=marc_word.bibid and marc_subfield_table.tagorder=marc_word.tagorder and marc_word.tagsubfield in ";
	my $listtags="(";
	foreach my $tag (@tags){
		$listtags .= $tag .",";
	}
	$listtags =~s/,$/)/;
	$strsth .= $listtags." and marc_word.tagsubfield=marc_subfield_table.tag+marc_subfield_table.subfieldcode group by subfieldvalue ";
# 	warn "search in biblio : ".$strsth;
	my $value = uc($search[0]);
	$value=~s/\*/%/g;
	$value.= "%" if not($value=~m/%/);
# 	warn " texte : ".$value;

	$sth=$dbh->prepare($strsth);
	$sth->execute($value);
	my $total;
	my @catresults;
	while (my ($value,$ctresults)=$sth->fetchrow) {
# 		warn "countresults : ".$ctresults;
		push @catresults,{value=> $value, 
						  even=>($total-$startfrom*$resultsperpage)%2,
						  count=>$ctresults
						  } if (($total>=$startfrom*$resultsperpage) and ($total<($startfrom+1)*$resultsperpage));
		$total++;
	}
	

	my $strsth="Select distinct authtypecode from marc_subfield_structure where (";
	foreach my $listtags (@tags){
		my @taglist=split /,/,$listtags;
		foreach my $curtag (@taglist){
			$strsth.="(tagfield='".substr($curtag,1,3)."' AND tagsubfield='".substr($curtag,4,1)."') OR";
		}
	}
	
	$strsth=~s/ OR$/)/;
	my $strsth = $strsth." and authtypecode is not NULL";
# 	warn $strsth;
	my $sth=$dbh->prepare($strsth);
	$sth->execute;
	
	#
	# searching in authorities
	#
	my @authresults;
	my $authnbresults;
	while ((my $authtypecode) = $sth->fetchrow) {
		my ($curauthresults,$nbresults) = authoritysearch($dbh,[''],[''],[''],['contains'],
														\@search,$startfrom*$resultsperpage, $resultsperpage,$authtypecode);
		push @authresults, @$curauthresults;
		$authnbresults+=$nbresults;
#		warn "auth : $authtypecode nbauthresults : $nbresults";
	}
	
	# 
	# OK, filling the template with authorities & biblio entries found.
	#
	($template, $loggedinuser, $cookie)
		= get_template_and_user({template_name => "search.marc/dictionary.tmpl",
				query => $input,
				type => $type,
				authnotrequired => 0,
				flagsrequired => {catalogue => 1},
				debug => 1,
				});

	# multi page display gestion
	my $displaynext=0;
	my $displayprev=$startfrom;
	if(($total - (($startfrom+1)*($resultsperpage))) > 0 ) {
		$displaynext = 1;
	}

	my @field_data = ();

	for(my $i = 0 ; $i <= $#tags ; $i++) {
		push @field_data, { term => "marclist", val=>$tags[$i] };
		push @field_data, { term => "and_or", val=>$and_or[$i] };
		push @field_data, { term => "excluding", val=>$excluding[$i] };
		push @field_data, { term => "operator", val=>$operator[$i] };
		push @field_data, { term => "value", val=>$value[$i] };
	}

	my @numbers = ();

	if ($total>$resultsperpage) {
		for (my $i=1; $i<$total/$resultsperpage+1; $i++) {
			if ($i<16) {
	    		my $highlight=0;
	    		($startfrom==($i-1)) && ($highlight=1);
	    		push @numbers, { number => $i,
					highlight => $highlight ,
					searchdata=> \@field_data,
					startfrom => ($i-1)};
			}
    	}
	}

	my $from = $startfrom*$resultsperpage+1;
	my $to;

 	if($total < (($startfrom+1)*$resultsperpage))
	{
		$to = $total;
	} else {
		$to = (($startfrom+1)*$resultsperpage);
	}
	$template->param(anindex => $input->param('index'));
	$template->param(result => \@results,
					 catresult=> \@catresults,
						search => $search[0],
						marclist =>$field,
						authresult => \@authresults,
						nbresults => $authnbresults,
						startfrom=> $startfrom,
						displaynext=> $displaynext,
						displayprev=> $displayprev,
						resultsperpage => $resultsperpage,
						startfromnext => $startfrom+1,
						startfromprev => $startfrom-1,
						searchdata=>\@field_data,
						total=>$total,
						from=>$from,
						to=>$to,
						numbers=>\@numbers,
						MARC_ON => C4::Context->preference("marc"),
						);

 } else {
 	($template, $loggedinuser, $cookie)
 		= get_template_and_user({template_name => "search.marc/dictionary.tmpl",
 				query => $input,
 				type => $type,
				authnotrequired => 0,
 				flagsrequired => {catalogue => 1},
 				debug => 1,
 				});
#warn "type : $type";
 
 }
$template->param(search => $search[0],
					marclist =>$field,
					type=>$type,
					anindex => $input->param('index'));

# Print the page
output_html_with_http_headers $input, $cookie, $template->output;

# Local Variables:
# tab-width: 4
# End:




From tipaul at users.sourceforge.net  Tue Jun  7 12:02:03 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 03:02:03 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/search.marc dictionary.tmpl,NONE,1.5.2.2 search.tmpl,1.21.2.1,1.21.2.2
Message-ID: <E1DfauJ-0006VW-Q6@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	search.tmpl 
Added Files:
      Tag: rel_2_2
	dictionary.tmpl 
Log Message:
porting dictionnary search from head to 2.2. there is now a ... facing titles, author & subject, to search in biblio & authorities existing values.

--- NEW FILE ---
    <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<title>KOHA: Dictionary</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">

<script language="JavaScript" type="text/javascript">
<!-- Hide from old browsers
function openWindow(targeturl, windowname) {
	newwin =
window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
}
function Help() {
	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
}
// end hiding -->
</script>

<link rel="stylesheet" type="text/css" href="/intranet-tmpl/default/en/includes/common-style.css">
<style type="text/css">
.catalogue {
	background-color:#ad11ad;
	color:#FFFFFF;
	background-image:none;
	text-decoration: normal;
	}
a.catalogue:hover {
	background-color: #ad11ad;
	color: #FFFFFF;
	text-decoration: none;
	}
</style>
</head>

<body>
<div id="mainbloc">
	<h1 class="catalogue">Dictionary Search</h1>
	
	<form name="f" method="post" action="/cgi-bin/koha/search.marc/dictionary.pl">
		<div class="bloc25">
			<h2 class="catalogue">Search on</h2>
			<p>
				<input type="hidden" name="op" value="do_search">
				<label class="label100" for="keyword"></label>
				<input type="hidden" name="marclist" value="<!-- TMPL_VAR Name="marclist" -->">
				<input type="text" name="search" value="<!-- TMPL_VAR Name="search" -->" size="35">
				<input type="submit" value="Start search" class="button catalogue">
				<input type="hidden" name="type" value="<!-- TMPL_VAR Name="type" -->">
				<input type="hidden" name="index" value="<!-- TMPL_VAR Name="anindex" ESCAPE="URL" -->">
			</p>
		</div>
	</form>

<!-- TMPL_IF Name=search -->
	<div class="bloc25">
	<h2 class="catalogue">Dictionary Search results</h2>
	<!-- TMPL_IF NAME="authresult" -->
		<div id="resultnumber">
			<p><!-- TMPL_IF NAME="displayprev" --> 
					<a class="resultnumber" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&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="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
					<!-- /TMPL_IF -->
				<!-- /TMPL_LOOP --> 
				<!-- TMPL_IF NAME="displaynext" -->
					<a class="resultnumber" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">Next&gt;&gt;</a>
				<!-- /TMPL_IF -->
			</p>
			<p class="resultcount">
			<!-- TMPL_IF NAME="nbresults" -->
					Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="nbresults" --><!-- TMPL_ELSE -->No results found.
			<!-- /TMPL_IF -->
			</p>
		</div>
		<div id="resultlist">
			<table>
				<tr>
					<th colspan="3" class="catalogue">Authorities</th>
				</tr>
				<tr>
					<th class="catalogue">Summary</th>
					<th class="catalogue">Used in</th>
					<th class="catalogue">Select</th>
				</tr>
				<!-- TMPL_LOOP NAME="authresult" -->
					<tr>
						<!-- TMPL_IF NAME="even" -->
							<td class="hilighted">
						<!-- TMPL_ELSE -->
							<td>
						<!-- /TMPL_IF -->
							<!-- TMPL_VAR NAME="summary" -->
						</td>
						<!-- TMPL_IF NAME="even" -->
							<td class="hilighted">
						<!-- TMPL_ELSE -->
							<td>
						<!-- /TMPL_IF -->
							<!-- TMPL_VAR NAME="used" --> biblio(s)
						</td>
						<!-- TMPL_IF NAME="even" -->
							<td class="hilighted">
						<!-- TMPL_ELSE -->
							<td>
						<!-- /TMPL_IF -->
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)" class="button catalogue">select</a>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)" class="button catalogue">sel&amp;close</a>
						</td>
					</tr>
				<!-- /TMPL_LOOP -->
			</table>
		</div>
		<!-- TMPL_ELSE -->
			<h3 class="catalogue">No results in Authorities</h3>
	<!-- /TMPL_IF -->
		
		
	<!-- TMPL_IF Name=catresult -->	
		<div id="resultnumber">
			<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>
		<div id="resultlist">
			<table>
				<tr>
					<th class="catalogue">Summary</th>
					<th class="catalogue">Used in</th>
					<th class="catalogue">Select</th>
				</tr>
				<!-- TMPL_LOOP NAME="catresult" -->
				<tr>
					<!-- TMPL_IF NAME="even" -->
					<td class="hilighted">
					<!-- TMPL_ELSE -->
					<td>
					<!-- /TMPL_IF -->
								<!-- TMPL_IF name="MARC_ON" -->
									<!-- TMPL_VAR NAME="value" -->
								<!-- TMPL_ELSE -->
									<!-- TMPL_VAR NAME="value" -->
								<!-- /TMPL_IF -->
					</td>
					<td align="center" <!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
						<!-- TMPL_VAR NAME="count" --> biblio(s)
					</td>
					<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)" class="button catalogue">Select</a>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)" class="button catalogue">Sel&amp;close</a>
					</td>
				</tr>
				<!-- /TMPL_LOOP -->
			</table>
		</div>
		<div id="resultnumber">
			<p><!-- TMPL_IF NAME="displayprev" --> 
					<a class="resultnumber" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&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="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
					<!-- /TMPL_IF -->
				<!-- /TMPL_LOOP --> 
				<!-- TMPL_IF NAME="displaynext" -->
					<a class="resultnumber" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">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>
	<!-- /TMPL_IF -->
	<script language="JavaScript" type="text/javascript">
	function SelectEntry(myentry, myindex, wclose){
		if (opener.document.f.value[myindex].value!=""){ 
			opener.document.f.value[myindex].value=opener.document.f.value[myindex].value+" "+myentry
		} else {
			opener.document.f.value[myindex].value=myentry
		}
		if (wclose == 1) {
	// 	alert("closing")
			self.close();
		}
	}
	</script>
	</div>
<!-- /TMPL_IF -->
</div>
</body>
</html>
Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -C2 -r1.21.2.1 -r1.21.2.2
*** search.tmpl	7 Mar 2005 09:49:07 -0000	1.21.2.1
--- search.tmpl	7 Jun 2005 10:02:01 -0000	1.21.2.2
***************
*** 31,34 ****
--- 31,37 ----
  			<input type="hidden" name="operator" value="contains">
  			<input type="text" name="value" id="title" onchange="sql_update()" size="35">
+ 			<a href="javascript:Dopop('dictionary.pl?marclist=biblio.title&amp;type=intranet&amp;index=1',1)" class="button catalogue">
+ 				...
+ 			</a>
  		</p>
  		<p>
***************
*** 38,41 ****
--- 41,47 ----
  			<input type="hidden" name="operator" value="contains">
  			<input type="text" name="value" id="author" onchange="sql_update()" size="35">
+ 			<a href="javascript:Dopop('dictionary.pl?marclist=biblio.author&amp;type=intranet&amp;index=2',2)" class="button catalogue">
+ 				...
+ 			</a>
  		</p>
  		<p>
***************
*** 46,49 ****
--- 52,58 ----
  			<input type="hidden" name="operator" value="contains">  
  			<input type="text" name="value" id="subject" onchange="sql_update()" size="35">
+ 			<a href="javascript:Dopop('dictionary.pl?marclist=bibliosubject.subject&amp;type=intranet&amp;index=3',3)" class="button catalogue">
+ 				...
+ 			</a>
  		</p>
  		<p>
***************
*** 151,155 ****
  		<p>
  			<input type="submit" value="Start search" class="button catalogue">
! 			<a href="/cgi-bin/koha/search.marc/suggest.pl" onclick="PopupSuggestion(); return false;" class="button catalogue">Suggestions</a>
  		</p>
  	</div>
--- 160,164 ----
  		<p>
  			<input type="submit" value="Start search" class="button catalogue">
! 			<a href="/cgi-bin/koha/search.marc/suggest.pl" onclick="PopupSuggestion(); return false;" class="button catalogue">Spelling suggestion</a>
  		</p>
  	</div>
***************
*** 177,180 ****
--- 186,195 ----
  }
  
+ function Dopop(link,i) {
+ 	var searchstring=document.forms[0].value[i].value;
+ 	newin=window.open(link+'&amp;search='+searchstring,"popup",'width=700,height=550,toolbar=false,scrollbars=yes');
+ }
+ 
+ 
  function PopupSuggestion() {
      var strQuery="";




From tipaul at users.sourceforge.net  Tue Jun  7 12:23:16 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 03:23:16 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-dictionary.pl,NONE,1.1.2.1
Message-ID: <E1DfbEq-0000z6-02@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3722/opac

Added Files:
      Tag: rel_2_2
	opac-dictionary.pl 
Log Message:
porting dictionary search to OPAC

--- NEW FILE ---
#!/usr/bin/perl


# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Auth;
use CGI;
use C4::Search;
use C4::SearchMarc;
use C4::AuthoritiesMarc;
use C4::Context;
use C4::Biblio;
use HTML::Template;

=head1 NAME

dictionnary.pl : script to search in biblio & authority an existing value

=head1 SYNOPSIS

useful when the user want to search a term before running a query. For example, to see if "computer" is used in the database

The parameter "marclist" tells which field is searched (title, author, subject, but could be anything else)

This script searches in both biblios & authority
* in biblio, the script search in all marc fields related to what the user is looking for (for example, if the dictionnary is used on "author", the script searches in biblio.author, but also in additional authors & any MARC field related to author (through the "seealso" MARC constraint)
* in authority, the script search everywhere. Thus, the accepted & rejected forms are found.

The script shows all results & the user can choose what he want, that is copied into search form.

=cut

my $input = new CGI;
my $field =$input->param('marclist');
#warn "field :$field";
my ($tablename, $kohafield)=split /./,$field;
#my $tablename=$input->param('tablename');
$tablename="biblio" unless ($tablename);
#my $kohafield = $input->param('kohafield');
my @search = $input->param('search');
# warn " ".$search[0];
my $index = $input->param('index');
# warn " index: ".$index;
my $op=$input->param('op');
if (($search[0]) and not ($op eq 'do_search')){
	$op='do_search';
}
my $script_name = 'opac-dictionary.pl';
my $query;
my $type=$input->param('type');
#warn " ".$type;

my $dbh = C4::Context->dbh;
my ($template, $loggedinuser, $cookie);

my $env;

my $startfrom=$input->param('startfrom');
$startfrom=0 if(!defined $startfrom);
my $searchdesc;
my $resultsperpage;

#warn "Starting process";

if ($op eq "do_search") {
	#
	# searching in biblio
	#
	my $sth=$dbh->prepare("Select distinct tagfield,tagsubfield from marc_subfield_structure where kohafield = ?");
	$sth->execute("$field");
	my (@tags, @and_or, @operator, @excluding, at value);
	
 	while ((my $tagfield,my $tagsubfield,my $liblibrarian) = $sth->fetchrow) {
 		push @tags, $dbh->quote("$tagfield$tagsubfield");
 	}

	$resultsperpage= $input->param('resultsperpage');
	$resultsperpage = 19 if(!defined $resultsperpage);
	my $orderby = $input->param('orderby');

	findseealso($dbh,\@tags);

	my @results, my $total;
	my $strsth="select distinct subfieldvalue, count(marc_subfield_table.bibid) from marc_subfield_table,marc_word where marc_word.word like ? and marc_subfield_table.bibid=marc_word.bibid and marc_subfield_table.tagorder=marc_word.tagorder and marc_word.tagsubfield in ";
	my $listtags="(";
	foreach my $tag (@tags){
		$listtags .= $tag .",";
	}
	$listtags =~s/,$/)/;
	$strsth .= $listtags." and marc_word.tagsubfield=marc_subfield_table.tag+marc_subfield_table.subfieldcode group by subfieldvalue ";
# 	warn "search in biblio : ".$strsth;
	my $value = uc($search[0]);
	$value=~s/\*/%/g;
	$value.= "%" if not($value=~m/%/);
# 	warn " texte : ".$value;

	$sth=$dbh->prepare($strsth);
	$sth->execute($value);
	my $total;
	my @catresults;
	while (my ($value,$ctresults)=$sth->fetchrow) {
# 		warn "countresults : ".$ctresults;
		push @catresults,{value=> $value, 
						  even=>($total-$startfrom*$resultsperpage)%2,
						  count=>$ctresults
						  } if (($total>=$startfrom*$resultsperpage) and ($total<($startfrom+1)*$resultsperpage));
		$total++;
	}
	

	my $strsth="Select distinct authtypecode from marc_subfield_structure where (";
	foreach my $listtags (@tags){
		my @taglist=split /,/,$listtags;
		foreach my $curtag (@taglist){
			$strsth.="(tagfield='".substr($curtag,1,3)."' AND tagsubfield='".substr($curtag,4,1)."') OR";
		}
	}
	
	$strsth=~s/ OR$/)/;
	my $strsth = $strsth." and authtypecode is not NULL";
# 	warn $strsth;
	my $sth=$dbh->prepare($strsth);
	$sth->execute;
	
	#
	# searching in authorities
	#
	my @authresults;
	my $authnbresults;
	while ((my $authtypecode) = $sth->fetchrow) {
		my ($curauthresults,$nbresults) = authoritysearch($dbh,[''],[''],[''],['contains'],
														\@search,$startfrom*$resultsperpage, $resultsperpage,$authtypecode);
		push @authresults, @$curauthresults;
		$authnbresults+=$nbresults;
#		warn "auth : $authtypecode nbauthresults : $nbresults";
	}
	
	# 
	# OK, filling the template with authorities & biblio entries found.
	#
	($template, $loggedinuser, $cookie)
		= get_template_and_user({template_name => "opac-dictionary.tmpl",
				query => $input,
				type => 'opac',
				authnotrequired => 1,
				debug => 1,
				});

	# multi page display gestion
	my $displaynext=0;
	my $displayprev=$startfrom;
	if(($total - (($startfrom+1)*($resultsperpage))) > 0 ) {
		$displaynext = 1;
	}

	my @field_data = ();

	for(my $i = 0 ; $i <= $#tags ; $i++) {
		push @field_data, { term => "marclist", val=>$tags[$i] };
		push @field_data, { term => "and_or", val=>$and_or[$i] };
		push @field_data, { term => "excluding", val=>$excluding[$i] };
		push @field_data, { term => "operator", val=>$operator[$i] };
		push @field_data, { term => "value", val=>$value[$i] };
	}

	my @numbers = ();

	if ($total>$resultsperpage) {
		for (my $i=1; $i<$total/$resultsperpage+1; $i++) {
			if ($i<16) {
	    		my $highlight=0;
	    		($startfrom==($i-1)) && ($highlight=1);
	    		push @numbers, { number => $i,
					highlight => $highlight ,
					searchdata=> \@field_data,
					startfrom => ($i-1)};
			}
    	}
	}

	my $from = $startfrom*$resultsperpage+1;
	my $to;

 	if($total < (($startfrom+1)*$resultsperpage))
	{
		$to = $total;
	} else {
		$to = (($startfrom+1)*$resultsperpage);
	}
	$template->param(anindex => $input->param('index'));
	$template->param(result => \@results,
					 catresult=> \@catresults,
						search => $search[0],
						marclist =>$field,
						authresult => \@authresults,
						nbresults => $authnbresults,
						startfrom=> $startfrom,
						displaynext=> $displaynext,
						displayprev=> $displayprev,
						resultsperpage => $resultsperpage,
						startfromnext => $startfrom+1,
						startfromprev => $startfrom-1,
						searchdata=>\@field_data,
						total=>$total,
						from=>$from,
						to=>$to,
						numbers=>\@numbers,
						MARC_ON => C4::Context->preference("marc"),
						);

 } else {
 	($template, $loggedinuser, $cookie)
 		= get_template_and_user({template_name => "opac-dictionary.tmpl",
 				query => $input,
 				type => 'opac',
				authnotrequired => 1,
 				debug => 1,
 				});
#warn "type : $type";
 
 }
$template->param(search => $search[0],
					marclist =>$field,
					type=>$type,
					anindex => $input->param('index'));

# Print the page
output_html_with_http_headers $input, $cookie, $template->output;

# Local Variables:
# tab-width: 4
# End:




From tipaul at users.sourceforge.net  Tue Jun  7 12:23:15 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 03:23:15 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-dictionary.tmpl,NONE,1.1.2.1 opac-search.tmpl,1.11.2.7,1.11.2.8
Message-ID: <E1DfbEp-0000z3-VL@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-search.tmpl 
Added Files:
      Tag: rel_2_2
	opac-dictionary.tmpl 
Log Message:
porting dictionary search to OPAC

--- NEW FILE ---
<!-- TMPL_INCLUDE name="popup-top.inc"-->
<body>
<div id="mainbloc">
	<h1 class="catalogue">Dictionary Search</h1>
	
	<form name="f" method="post" action="opac-dictionary.pl">
		<div class="bloc25">
			<h2 class="catalogue">Search on</h2>
			<p>
				<input type="hidden" name="op" value="do_search">
				<label class="label100" for="keyword"></label>
				<input type="hidden" name="marclist" value="<!-- TMPL_VAR Name="marclist" -->">
				<input type="text" name="search" value="<!-- TMPL_VAR Name="search" -->" size="35">
				<input type="submit" value="Start search" class="button catalogue">
				<input type="hidden" name="type" value="<!-- TMPL_VAR Name="type" -->">
				<input type="hidden" name="index" value="<!-- TMPL_VAR Name="anindex" ESCAPE="URL" -->">
			</p>
		</div>
	</form>

<!-- TMPL_IF Name=search -->
	<div class="bloc25">
	<h2 class="catalogue">Dictionary Search results</h2>
	<!-- TMPL_IF NAME="authresult" -->
		<div id="resultnumber">
			<p><!-- TMPL_IF NAME="displayprev" --> 
					<a class="resultnumber" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&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="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
					<!-- /TMPL_IF -->
				<!-- /TMPL_LOOP --> 
				<!-- TMPL_IF NAME="displaynext" -->
					<a class="resultnumber" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">Next&gt;&gt;</a>
				<!-- /TMPL_IF -->
			</p>
			<p class="resultcount">
			<!-- TMPL_IF NAME="nbresults" -->
					Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="nbresults" --><!-- TMPL_ELSE -->No results found.
			<!-- /TMPL_IF -->
			</p>
		</div>
		<div id="resultlist">
			<table>
				<tr>
					<th colspan="3" class="catalogue">Authorities</th>
				</tr>
				<tr>
					<th class="catalogue">Summary</th>
					<th class="catalogue">Used in</th>
					<th class="catalogue">Select</th>
				</tr>
				<!-- TMPL_LOOP NAME="authresult" -->
					<tr>
						<!-- TMPL_IF NAME="even" -->
							<td class="hilighted">
						<!-- TMPL_ELSE -->
							<td>
						<!-- /TMPL_IF -->
							<!-- TMPL_VAR NAME="summary" -->
						</td>
						<!-- TMPL_IF NAME="even" -->
							<td class="hilighted">
						<!-- TMPL_ELSE -->
							<td>
						<!-- /TMPL_IF -->
							<!-- TMPL_VAR NAME="used" --> biblio(s)
						</td>
						<!-- TMPL_IF NAME="even" -->
							<td class="hilighted">
						<!-- TMPL_ELSE -->
							<td>
						<!-- /TMPL_IF -->
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)" class="button catalogue">select</a>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)" class="button catalogue">sel&amp;close</a>
						</td>
					</tr>
				<!-- /TMPL_LOOP -->
			</table>
		</div>
		<!-- TMPL_ELSE -->
			<h3 class="catalogue">No results in Authorities</h3>
	<!-- /TMPL_IF -->
		
		
	<!-- TMPL_IF Name=catresult -->	
		<div id="resultnumber">
			<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>
		<div id="resultlist">
			<table>
				<tr>
					<th class="catalogue">Summary</th>
					<th class="catalogue">Used in</th>
					<th class="catalogue">Select</th>
				</tr>
				<!-- TMPL_LOOP NAME="catresult" -->
				<tr>
					<!-- TMPL_IF NAME="even" -->
					<td class="hilighted">
					<!-- TMPL_ELSE -->
					<td>
					<!-- /TMPL_IF -->
								<!-- TMPL_IF name="MARC_ON" -->
									<!-- TMPL_VAR NAME="value" -->
								<!-- TMPL_ELSE -->
									<!-- TMPL_VAR NAME="value" -->
								<!-- /TMPL_IF -->
					</td>
					<td align="center" <!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
						<!-- TMPL_VAR NAME="count" --> biblio(s)
					</td>
					<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)" class="button catalogue">Select</a>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)" class="button catalogue">Sel&amp;close</a>
					</td>
				</tr>
				<!-- /TMPL_LOOP -->
			</table>
		</div>
		<div id="resultnumber">
			<p><!-- TMPL_IF NAME="displayprev" --> 
					<a class="resultnumber" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&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="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
					<!-- /TMPL_IF -->
				<!-- /TMPL_LOOP --> 
				<!-- TMPL_IF NAME="displaynext" -->
					<a class="resultnumber" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">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>
	<!-- /TMPL_IF -->
	<script language="JavaScript" type="text/javascript">
	function SelectEntry(myentry, myindex, wclose){
		if (opener.document.f.value[myindex].value!=""){ 
			opener.document.f.value[myindex].value=opener.document.f.value[myindex].value+" "+myentry
		} else {
			opener.document.f.value[myindex].value=myentry
		}
		if (wclose == 1) {
	// 	alert("closing")
			self.close();
		}
	}
	</script>
	</div>
<!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE name="opac-bottom.inc" -->
Index: opac-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl,v
retrieving revision 1.11.2.7
retrieving revision 1.11.2.8
diff -C2 -r1.11.2.7 -r1.11.2.8
*** opac-search.tmpl	31 May 2005 15:15:28 -0000	1.11.2.7
--- opac-search.tmpl	7 Jun 2005 10:23:13 -0000	1.11.2.8
***************
*** 25,28 ****
--- 25,31 ----
  			<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>
***************
*** 32,35 ****
--- 35,41 ----
  			<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>
***************
*** 40,43 ****
--- 46,52 ----
  			<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>
***************
*** 155,158 ****
--- 164,169 ----
  		<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>




From tipaul at users.sourceforge.net  Tue Jun  7 13:03:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 04:03:54 -0700
Subject: [Koha-cvs] CVS: koha/acqui basket.pl,1.24.2.2,1.24.2.3
Message-ID: <E1DfbsA-0006Fz-Mq@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23970/acqui

Modified Files:
      Tag: rel_2_2
	basket.pl 
Log Message:
adding total to calculate rrp & est prices separately

Index: basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/basket.pl,v
retrieving revision 1.24.2.2
retrieving revision 1.24.2.3
diff -C2 -r1.24.2.2 -r1.24.2.3
*** basket.pl	14 Apr 2005 20:31:38 -0000	1.24.2.2
--- basket.pl	7 Jun 2005 11:03:52 -0000	1.24.2.3
***************
*** 56,59 ****
--- 56,61 ----
  my ($count2, at booksellers)=bookseller($booksellerid);
  
+ # get librarian branch...
+ 
  # if new basket, pre-fill infos
  $basket->{creationdate} = "" unless ($basket->{creationdate});
***************
*** 66,69 ****
--- 68,76 ----
  my $grand_total; # $subttotal + $gist
  
+ # my $line_total_est; # total of each line
+ my $sub_total_est; # total of line totals
+ my $gist_est;      # GST
+ my $grand_total_est; # $subttotal + $gist
+ 
  my @books_loop;
  for (my $i=0;$i<$count;$i++){
***************
*** 71,74 ****
--- 78,82 ----
  	$rrp=curconvert($results[$i]->{'currency'},$rrp);
  
+ 	$sub_total_est+=$results[$i]->{'quantity'}*$results[$i]->{'rrp'};
  	$line_total=$results[$i]->{'quantity'}*$results[$i]->{'ecost'};
  	$sub_total+=$line_total;
***************
*** 99,102 ****
--- 107,112 ----
  $gist=sprintf("%.2f",$sub_total*$prefgist);
  $grand_total=$sub_total+$gist;
+ $grand_total_est = $sub_total_est+sprintf("%.2f",$sub_total_est*$prefgist);
+ $gist_est = sprintf("%.2f",$sub_total_est*$prefgist);
  $template->param(basketno => $basketno,
  				creationdate => $basket->{creationdate},
***************
*** 107,110 ****
--- 117,124 ----
  				booksellerid=> $booksellers[0]->{'id'},
  				name => $booksellers[0]->{'name'},
+ 				address1 => $booksellers[0]->{'address1'},
+ 				address2 => $booksellers[0]->{'address2'},
+ 				address3 => $booksellers[0]->{'address3'},
+ 				address4 => $booksellers[0]->{'address4'},
  				entrydate => format_date($results[0]->{'entrydate'}),
  				books_loop => \@books_loop,
***************
*** 113,116 ****
--- 127,133 ----
  				gist => $gist,
  				grand_total =>$grand_total,
+ 				sub_total_est => $sub_total_est,
+ 				gist_est => $gist_est,
+ 				grand_total_est =>$grand_total_est,
  				currency => $booksellers[0]->{'listprice'},
  				);




From tipaul at users.sourceforge.net  Tue Jun  7 13:03:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 04:03:54 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui basket.tmpl,1.15.2.5,1.15.2.6
Message-ID: <E1DfbsA-0006G0-NV@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	basket.tmpl 
Log Message:
adding total to calculate rrp & est prices separately

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.15.2.5
retrieving revision 1.15.2.6
diff -C2 -r1.15.2.5 -r1.15.2.6
*** basket.tmpl	19 May 2005 22:41:07 -0000	1.15.2.5
--- basket.tmpl	7 Jun 2005 11:03:52 -0000	1.15.2.6
***************
*** 32,38 ****
  				<th class="acquisition doNotPrint">Order</th>
  				<th class="acquisition">Publisher<a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=biblioitems.publishercode" class="acquisition doNotPrint">[order]</a></th>
- 				<th class="acquisition">Isbn</th>
  				<th class="acquisition">Title</th>
- 				<th class="acquisition">Author</th>
  				<th class="acquisition">rrp</th>
  				<th class="acquisition doNotPrint">est</th>
--- 32,36 ----
***************
*** 50,60 ****
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
- 					<td><!-- TMPL_VAR NAME="isbn" --></td>
  					<!-- TMPL_IF name="closedate" -->
! 						<td><!-- TMPL_VAR NAME="title" --></td>
  					<!-- TMPL_ELSE -->
! 						<td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
  					<!-- /TMPL_IF -->
- 					<td><!-- TMPL_VAR NAME="author" --></td>
  					<td><!-- TMPL_VAR NAME="rrp" --></td>
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="ecost" --></td>
--- 48,69 ----
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
  					<!-- TMPL_IF name="closedate" -->
! 						<td><p>
! 							<b><!-- TMPL_VAR NAME="title" --></b><br/>
! 								<!-- TMPL_VAR NAME="author" -->
! 								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! 							</p>
! 						</td>
  					<!-- TMPL_ELSE -->
! 						<td>
! 							<p>
! 							<a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a><br/>
! 								<!-- TMPL_VAR NAME="author" -->
! 								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! 							</p>
! 						</td>
  					<!-- /TMPL_IF -->
  					<td><!-- TMPL_VAR NAME="rrp" --></td>
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="ecost" --></td>
***************
*** 76,92 ****
  			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
  			<tr>
! 				<td colspan="4" rowspan=3>
  					&nbsp;
  				</td>
! 				<th colspan="2" class="acquisition">SubTotal</th>
! 				<th class="acquisition"><!-- TMPL_VAR NAME="currency" --><!-- TMPL_VAR NAME="sub_total" --></th>
! 			</tr>
! 			<tr>
! 				<th colspan="2" class="acquisition">GST</th>
! 				<th class="acquisition"><!-- TMPL_VAR NAME="currency" --><!-- TMPL_VAR NAME="gist" --></th>
! 			</tr>
! 			<tr>
! 				<th colspan="2" class="acquisition">TOTAL</th>
! 				<th class="acquisition"><!-- TMPL_VAR NAME="currency" --><!-- TMPL_VAR NAME="grand_total" --></th>
  			</tr>
  		</table>
--- 85,121 ----
  			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
  			<tr>
! 				<td colspan="2" class="acquisition">
  					&nbsp;
  				</td>
! 				<td class="acquisition number">
! 					<p>Sub total</p>
! 					<p>GST</p>
! 					<p>TOTAL (<!-- TMPL_VAR NAME="currency" -->)</p>
! 				</td>
! 				<td class="acquisition number">
! 					<p><!-- TMPL_VAR NAME="sub_total_est" --></p>
! 					<p><!-- TMPL_VAR NAME="gist_est" --></p>
! 					<p><!-- TMPL_VAR NAME="grand_total_est" --></p>
! 				</td>
! 				<td class="acquisition number">
! 					<p><!-- TMPL_VAR NAME="sub_total" --></p>
! 					<p><!-- TMPL_VAR NAME="gist" --></p>
! 					<p><!-- TMPL_VAR NAME="grand_total" --></p>
! 				</td>
! 				<td class="acquisition">
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 				</td>
! 				<td class="acquisition">
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 				</td>
! 				<td class="acquisition">
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 				</td>
  			</tr>
  		</table>




From tipaul at users.sourceforge.net  Tue Jun  7 14:56:39 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 05:56:39 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui basket.tmpl,1.15.2.6,1.15.2.7
Message-ID: <E1DfddH-00051Q-Oa@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	basket.tmpl 
Log Message:
fix for #958 : showing notes in order list screen. The note can be used for whatever the library want, and should be seen here.
The table has been improved :
* title / isbn / author / note are on the same column, as in marc search
* alternate colors working

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.15.2.6
retrieving revision 1.15.2.7
diff -C2 -r1.15.2.6 -r1.15.2.7
*** basket.tmpl	7 Jun 2005 11:03:52 -0000	1.15.2.6
--- basket.tmpl	7 Jun 2005 12:56:37 -0000	1.15.2.7
***************
*** 45,49 ****
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
! 				<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="color" -->">
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
--- 45,53 ----
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
! 				<!-- TMPL_IF name="odd" -->
! 				<tr class="hilighted">
! 				<!-- TMPL_ELSE -->
! 				<tr>
! 				<!-- /TMPL_IF -->
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
***************
*** 53,57 ****
  								<!-- TMPL_VAR NAME="author" -->
  								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
  							</p>
  						</td>
--- 57,61 ----
  								<!-- TMPL_VAR NAME="author" -->
  								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
  							</p>
  						</td>
***************
*** 62,73 ****
  								<!-- TMPL_VAR NAME="author" -->
  								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
  							</p>
  						</td>
  					<!-- /TMPL_IF -->
! 					<td><!-- TMPL_VAR NAME="rrp" --></td>
! 					<td class="doNotPrint"><!-- TMPL_VAR NAME="ecost" --></td>
! 					<td><!-- TMPL_VAR NAME="quantity" --></td>
! 					<td><!-- TMPL_VAR NAME="line_total" --></td>
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="bookfundid" --></td>
  					<!-- TMPL_IF name="active" -->
--- 66,77 ----
  								<!-- TMPL_VAR NAME="author" -->
  								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
  							</p>
  						</td>
  					<!-- /TMPL_IF -->
! 					<td class="number"><!-- TMPL_VAR NAME="rrp" --></td>
! 					<td class="doNotPrint number"><!-- TMPL_VAR NAME="ecost" --></td>
! 					<td class="number"><!-- TMPL_VAR NAME="quantity" --></td>
! 					<td class="number"><!-- TMPL_VAR NAME="line_total" --></td>
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="bookfundid" --></td>
  					<!-- TMPL_IF name="active" -->
***************
*** 104,108 ****
  				</td>
  				<td class="acquisition">
! 					<p>&nbsp;</p>
  					<p>&nbsp;</p>
  					<p>&nbsp;</p>
--- 108,112 ----
  				</td>
  				<td class="acquisition">
! 					<p><!-- TMPL_VAR name="qty_total" --></p>
  					<p>&nbsp;</p>
  					<p>&nbsp;</p>




From tipaul at users.sourceforge.net  Tue Jun  7 14:56:39 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 05:56:39 -0700
Subject: [Koha-cvs] CVS: koha/C4 Acquisition.pm,1.9.2.4,1.9.2.5
Message-ID: <E1DfddH-00051V-Rh@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19188/C4

Modified Files:
      Tag: rel_2_2
	Acquisition.pm 
Log Message:
fix for #958 : showing notes in order list screen. The note can be used for whatever the library want, and should be seen here.
The table has been improved :
* title / isbn / author / note are on the same column, as in marc search
* alternate colors working

Index: Acquisition.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.9.2.4
retrieving revision 1.9.2.5
diff -C2 -r1.9.2.4 -r1.9.2.5
*** Acquisition.pm	6 Jun 2005 16:36:43 -0000	1.9.2.4
--- Acquisition.pm	7 Jun 2005 12:56:37 -0000	1.9.2.5
***************
*** 105,109 ****
  	my ($basketno,$supplier,$orderby)=@_;
  	my $dbh = C4::Context->dbh;
! 	my $query="Select *,biblio.title from aqorders,biblio,biblioitems
  	left join aqorderbreakdown on aqorderbreakdown.ordernumber=aqorders.ordernumber
  	where basketno='$basketno'
--- 105,109 ----
  	my ($basketno,$supplier,$orderby)=@_;
  	my $dbh = C4::Context->dbh;
! 	my $query="Select biblio.*,biblioitems.*,aqorders.*,aqorderbreakdown.*,biblio.title from aqorders,biblio,biblioitems
  	left join aqorderbreakdown on aqorderbreakdown.ordernumber=aqorders.ordernumber
  	where basketno='$basketno'




From tipaul at users.sourceforge.net  Tue Jun  7 14:56:39 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 05:56:39 -0700
Subject: [Koha-cvs] CVS: koha/acqui basket.pl,1.24.2.3,1.24.2.4
Message-ID: <E1DfddH-00051T-R2@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19188/acqui

Modified Files:
      Tag: rel_2_2
	basket.pl 
Log Message:
fix for #958 : showing notes in order list screen. The note can be used for whatever the library want, and should be seen here.
The table has been improved :
* title / isbn / author / note are on the same column, as in marc search
* alternate colors working

Index: basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/basket.pl,v
retrieving revision 1.24.2.3
retrieving revision 1.24.2.4
diff -C2 -r1.24.2.3 -r1.24.2.4
*** basket.pl	7 Jun 2005 11:03:52 -0000	1.24.2.3
--- basket.pl	7 Jun 2005 12:56:36 -0000	1.24.2.4
***************
*** 73,76 ****
--- 73,78 ----
  my $grand_total_est; # $subttotal + $gist
  
+ my $qty_total;
+ 
  my @books_loop;
  for (my $i=0;$i<$count;$i++){
***************
*** 81,90 ****
  	$line_total=$results[$i]->{'quantity'}*$results[$i]->{'ecost'};
  	$sub_total+=$line_total;
  	my %line;
- 	if ($i % 2){
- 		$line{highlight}=1;
- 	} else {
- 		$line{highlight}=0;
- 	}
  	$line{ordernumber} = $results[$i]->{'ordernumber'};
  	$line{publishercode} = $results[$i]->{'publishercode'};
--- 83,88 ----
  	$line_total=$results[$i]->{'quantity'}*$results[$i]->{'ecost'};
  	$sub_total+=$line_total;
+ 	$qty_total += $results[$i]->{'quantity'};
  	my %line;
  	$line{ordernumber} = $results[$i]->{'ordernumber'};
  	$line{publishercode} = $results[$i]->{'publishercode'};
***************
*** 93,96 ****
--- 91,95 ----
  	$line{basketno}=$basketno;
  	$line{title} = $results[$i]->{'title'};
+ 	$line{notes} = $results[$i]->{'notes'};
  	$line{author} = $results[$i]->{'author'};
  	$line{i} = $i;
***************
*** 102,105 ****
--- 101,105 ----
  	$line{biblionumber} = $results[$i]->{'biblionumber'};
  	$line{bookfundid} = $results[$i]->{'bookfundid'};
+ 	$line{odd} = $i %2;
  	push @books_loop, \%line;
  }
***************
*** 131,134 ****
--- 131,135 ----
  				grand_total_est =>$grand_total_est,
  				currency => $booksellers[0]->{'listprice'},
+ 				qty_total => $qty_total,
  				);
  output_html_with_http_headers $query, $cookie, $template->output;




From tipaul at users.sourceforge.net  Tue Jun  7 15:17:41 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 06:17:41 -0700
Subject: [Koha-cvs] CVS: koha/acqui acqui-home.pl,1.3,1.3.2.1
Message-ID: <E1Dfdxd-00088W-SN@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31177/acqui

Modified Files:
      Tag: rel_2_2
	acqui-home.pl 
Log Message:
warn the user if no budget is defined (& prevent creating an order, as it would be buggy)

Index: acqui-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/acqui-home.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** acqui-home.pl	13 Jul 2004 12:53:00 -0000	1.3
--- acqui-home.pl	7 Jun 2005 13:17:38 -0000	1.3.2.1
***************
*** 64,68 ****
  						totspent => sprintf("%.2f",$totspent),
  						totcomtd => sprintf("%.2f",$totcomtd),
! 						totavail => sprintf("%.2f",$totavail));
  
  output_html_with_http_headers $query, $cookie, $template->output;
--- 64,69 ----
  						totspent => sprintf("%.2f",$totspent),
  						totcomtd => sprintf("%.2f",$totcomtd),
! 						totavail => sprintf("%.2f",$totavail),
! 						nobudget => $#results==-1?1:0);
  
  output_html_with_http_headers $query, $cookie, $template->output;




From tipaul at users.sourceforge.net  Tue Jun  7 15:17:41 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 06:17:41 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui acqui-home.tmpl,1.14,1.14.2.1
Message-ID: <E1Dfdxd-00088U-MD@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	acqui-home.tmpl 
Log Message:
warn the user if no budget is defined (& prevent creating an order, as it would be buggy)

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C2 -r1.14 -r1.14.2.1
*** acqui-home.tmpl	19 Oct 2004 12:24:57 -0000	1.14
--- acqui-home.tmpl	7 Jun 2005 13:17:38 -0000	1.14.2.1
***************
*** 5,8 ****
--- 5,11 ----
  <div id="bloc25">
  	<h2 class="acquisition">Start, receive, modify order</h2>
+ 	<!-- TMPL_IF name="nobudget" -->
+ 		<p class="problem">You must define a budget in parameters</p>
+ 	<!-- TMPL_ELSE -->
  		<form action="/cgi-bin/koha/acqui/order.pl" method="post">
  			Supplier name : <input type="text"  size="25"   name="supplier">
***************
*** 10,13 ****
--- 13,17 ----
  		</form>
  	<p>or <a href="histsearch.pl" class="button acquisition">Search order history</a></p>
+ 	<!-- /TMPL_IF -->
  </div>
  
***************
*** 38,43 ****
  <!-- showbudget-->
  <div id="bloc25">
! 	<form action="/cgi-bin/koha/search.pl">
! 		<h2 class="acquisition">budgets and bookfunds</h2>
  		<table class="noborder">
  			<tr>
--- 42,49 ----
  <!-- showbudget-->
  <div id="bloc25">
! 	<h2 class="acquisition">budgets and bookfunds</h2>
! 	<!-- TMPL_IF name="nobudget" -->
! 		<p class="problem">You must define a budget in parameters</p>
! 	<!-- TMPL_ELSE -->
  		<table class="noborder">
  			<tr>
***************
*** 68,72 ****
  		Use your reload button to get the most recent figures. Committed figures are approximate only, as exchange rates will affect the amount actually paid.
  		</p>
! 	</form>
  </div>
  
--- 74,78 ----
  		Use your reload button to get the most recent figures. Committed figures are approximate only, as exchange rates will affect the amount actually paid.
  		</p>
! 	<!-- /TMPL_IF -->
  </div>
  




From tipaul at users.sourceforge.net  Tue Jun  7 16:35:27 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 07:35:27 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue detail.tmpl,1.17.2.5,1.17.2.6
Message-ID: <E1DffAt-0001NM-8O@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	detail.tmpl 
Log Message:
adding issn & not showing total number of items if there are no

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl,v
retrieving revision 1.17.2.5
retrieving revision 1.17.2.6
diff -C2 -r1.17.2.5 -r1.17.2.6
*** detail.tmpl	27 May 2005 10:02:49 -0000	1.17.2.5
--- detail.tmpl	7 Jun 2005 14:35:23 -0000	1.17.2.6
***************
*** 67,70 ****
--- 67,71 ----
  				<!-- 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>
***************
*** 74,78 ****
  				<!-- 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 -->
--- 75,79 ----
  				<!-- 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>




From oleonard at users.sourceforge.net  Tue Jun  7 22:39:31 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 07 Jun 2005 13:39:31 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui acqui-home.tmpl,1.3.2.1,1.3.2.2
Message-ID: <E1DfkrD-0001RV-Mj@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	acqui-home.tmpl 
Log Message:
Synching with default template

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** acqui-home.tmpl	20 Jan 2005 19:31:57 -0000	1.3.2.1
--- acqui-home.tmpl	7 Jun 2005 20:39:28 -0000	1.3.2.2
***************
*** 6,11 ****
  
  <h1>Acquisitions</h1>
! 
! <div class="details"><form action="/cgi-bin/koha/acqui/order.pl" method="post"><table>
  <caption>Start, Recieve, or Modify Any Order</caption>
  <tr>
--- 6,14 ----
  
  <h1>Acquisitions</h1>
! 	<!-- TMPL_IF name="nobudget" -->
! 		<div class="error">You must define a budget in parameters</div>
! 	<!-- TMPL_ELSE -->
! <div class="details">
! <form action="/cgi-bin/koha/acqui/order.pl" method="post"><table>
  <caption>Start, Recieve, or Modify Any Order</caption>
  <tr>
***************
*** 15,19 ****
--- 18,25 ----
  </table>
  <input type="submit" class="submit" value="Search" /></form>
+ <p>	<form action="histsearch.pl" method="get"><input type="submit" class="submit" value="Search Order History" /></form></p>
  </div>
+ <!-- /TMPL_IF -->
+ 
  <div class="details">
  <form action="/cgi-bin/koha/acqui/acquire.pl" method="post"><table>
***************
*** 66,70 ****
  
  <!-- showbudget-->
! 	<div class="table"><table>
  		<caption>Budgets and Bookfunds</caption>
  			<tr>
--- 72,80 ----
  
  <!-- showbudget-->
! 	<div class="table">
! 		<!-- TMPL_IF name="nobudget" -->
! 		<div class="error">You must define a budget in parameters</div>
! 	<!-- TMPL_ELSE -->
! 	<table>
  		<caption>Budgets and Bookfunds</caption>
  			<tr>
***************
*** 93,97 ****
  				</tfoot>
  			</tr>
! 		</table></div>
  <p>		Use your reload button [ctrl + r] to get the most recent figures.
  		Committed figures are approximate only, as exchange rates will affect the amount actually paid.</p>
--- 103,107 ----
  				</tfoot>
  			</tr>
! 		</table><!-- /TMPL_IF --></div>
  <p>		Use your reload button [ctrl + r] to get the most recent figures.
  		Committed figures are approximate only, as exchange rates will affect the amount actually paid.</p>




From oleonard at users.sourceforge.net  Tue Jun  7 22:39:59 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 07 Jun 2005 13:39:59 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui acqui-home.tmpl,1.4,1.5
Message-ID: <E1Dfkrf-0001XO-2Z@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	acqui-home.tmpl 
Log Message:
Synching with default template

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** acqui-home.tmpl	14 Jan 2005 21:08:45 -0000	1.4
--- acqui-home.tmpl	7 Jun 2005 20:39:56 -0000	1.5
***************
*** 6,11 ****
  
  <h1>Acquisitions</h1>
! 
! <div class="details"><form action="/cgi-bin/koha/acqui/order.pl" method="post"><table>
  <caption>Start, Recieve, or Modify Any Order</caption>
  <tr>
--- 6,14 ----
  
  <h1>Acquisitions</h1>
! 	<!-- TMPL_IF name="nobudget" -->
! 		<div class="error">You must define a budget in parameters</div>
! 	<!-- TMPL_ELSE -->
! <div class="details">
! <form action="/cgi-bin/koha/acqui/order.pl" method="post"><table>
  <caption>Start, Recieve, or Modify Any Order</caption>
  <tr>
***************
*** 15,19 ****
--- 18,25 ----
  </table>
  <input type="submit" class="submit" value="Search" /></form>
+ <p>	<form action="histsearch.pl" method="get"><input type="submit" class="submit" value="Search Order History" /></form></p>
  </div>
+ <!-- /TMPL_IF -->
+ 
  <div class="details">
  <form action="/cgi-bin/koha/acqui/acquire.pl" method="post"><table>
***************
*** 66,70 ****
  
  <!-- showbudget-->
! 	<div class="table"><table>
  		<caption>Budgets and Bookfunds</caption>
  			<tr>
--- 72,80 ----
  
  <!-- showbudget-->
! 	<div class="table">
! 		<!-- TMPL_IF name="nobudget" -->
! 		<div class="error">You must define a budget in parameters</div>
! 	<!-- TMPL_ELSE -->
! 	<table>
  		<caption>Budgets and Bookfunds</caption>
  			<tr>
***************
*** 93,97 ****
  				</tfoot>
  			</tr>
! 		</table></div>
  <p>		Use your reload button [ctrl + r] to get the most recent figures.
  		Committed figures are approximate only, as exchange rates will affect the amount actually paid.</p>
--- 103,107 ----
  				</tfoot>
  			</tr>
! 		</table><!-- /TMPL_IF --></div>
  <p>		Use your reload button [ctrl + r] to get the most recent figures.
  		Committed figures are approximate only, as exchange rates will affect the amount actually paid.</p>




From hellen at users.sourceforge.net  Wed Jun  8 13:28:11 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Wed, 08 Jun 2005 04:28:11 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/catalogue catalogue-home.tmpl,1.2,1.3 detail.tmpl,1.2,1.3 ISBDdetail.tmpl,1.2,1.3 MARCdetail.tmpl,1.2,1.3
Message-ID: <E1DfyjD-0008BR-1P@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	catalogue-home.tmpl detail.tmpl ISBDdetail.tmpl 
	MARCdetail.tmpl 
Log Message:
translated by hellen

Index: catalogue-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/catalogue/catalogue-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** catalogue-home.tmpl	17 May 2005 13:21:35 -0000	1.2
--- catalogue-home.tmpl	8 Jun 2005 11:28:08 -0000	1.3
***************
*** 27,37 ****
  			</select></p>
  			
! 					<p><label class="label100">Search Stil:</label><input type="radio" name="ttype" id=" ttype" value="normal" checked>Normal <input type="radio" name="ttype" value="exact">Exakt</p>
  			</div>
  			
  	<div id="bloc25">
! 		<h2 class="catalogue">Strichcode-Suche</h2>
  		<p>
! 		<label class="label100" for="itemnumber">Strichcode:</label><input type="text"  size="25" id="itemnumber" name="itemnumber"></p>
  </div>
  
--- 27,37 ----
  			</select></p>
  			
! 					<p><label class="label100">Suchart:</label><input type="radio" name="ttype" id=" ttype" value="normal" checked>Normal <input type="radio" name="ttype" value="exact">Exakt</p>
  			</div>
  			
  	<div id="bloc25">
! 		<h2 class="catalogue">Barcode-Suche</h2>
  		<p>
! 		<label class="label100" for="itemnumber">Barcode:</label><input type="text"  size="25" id="itemnumber" name="itemnumber"></p>
  </div>
  

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/catalogue/detail.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** detail.tmpl	17 May 2005 13:21:35 -0000	1.2
--- detail.tmpl	8 Jun 2005 11:28:08 -0000	1.3
***************
*** 34,38 ****
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="author" --><label class="label100"><b>Verfasser</b> </label><!-- TMPL_VAR NAME="author" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="additional" --><label class="label100"><b>Additional Author:</b></label><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><label class="label100"><b>Verlag:</b></label><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" --><br />
  				<!-- TMPL_IF name="publicationyear" --><label class="label100"><b>Ort:</b></label><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
--- 34,38 ----
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="author" --><label class="label100"><b>Verfasser</b> </label><!-- TMPL_VAR NAME="author" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="additional" --><label class="label100"><b>Weitere Verfasser:</b></label><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><label class="label100"><b>Verlag:</b></label><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" --><br />
  				<!-- TMPL_IF name="publicationyear" --><label class="label100"><b>Ort:</b></label><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
***************
*** 72,76 ****
  			<th class="catalogue">Entliehen bis</th>
  			<th class="catalogue">Zuletzt gesehen</th>
! 			<th class="catalogue">Strichcode</th>
  			<th class="catalogue">Band</th>
  		</tr>
--- 72,76 ----
  			<th class="catalogue">Entliehen bis</th>
  			<th class="catalogue">Zuletzt gesehen</th>
! 			<th class="catalogue">Barcode</th>
  			<th class="catalogue">Band</th>
  		</tr>
***************
*** 92,96 ****
  				<!-- TMPL_IF NAME="type" -->
  					<td>
! 						<a href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;item=<!-- TMPL_VAR NAME="itemtype" -->">Fix Itemtype</a>
  					</td>
  				<!-- /TMPL_IF -->
--- 92,96 ----
  				<!-- TMPL_IF NAME="type" -->
  					<td>
! 						<a href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;item=<!-- TMPL_VAR NAME="itemtype" -->">Medientyp &auml;ndern</a>
  					</td>
  				<!-- /TMPL_IF -->

Index: ISBDdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/catalogue/ISBDdetail.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ISBDdetail.tmpl	17 May 2005 13:21:35 -0000	1.2
--- ISBDdetail.tmpl	8 Jun 2005 11:28:08 -0000	1.3
***************
*** 4,8 ****
  	<div id="bibliomenu">
  		<h1 class="catalogue">MARC Biblio : <!-- TMPL_VAR NAME="bibid" --></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="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue">  Edit item  </a>   <a href="javascript:confirm_deletion()" class="button catalogue">  delete  </a>  <a href="MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Complete  </a>  <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normal  </a>  <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD  </a>  <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  Add to shelf  </a>  <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  Print  </a>
  		<!-- TMPL_IF name="subscriptionsnumber" -->
  		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
--- 4,8 ----
  	<div id="bibliomenu">
  		<h1 class="catalogue">MARC Biblio : <!-- TMPL_VAR NAME="bibid" --></h1>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Biblio &auml;ndern  </a>  <a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">  Duplizieren  </a>  <a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue">  Exemplar bearbeiten  </a>   <a href="javascript:confirm_deletion()" class="button catalogue">  l&ouml;schen  </a>  <a href="MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Vollanzeige  </a>  <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normal  </a>  <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD  </a>  <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  Zum Regal hinzuf&uuml;gen  </a>  <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  Drucken  </a>
  		<!-- TMPL_IF name="subscriptionsnumber" -->
  		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">

Index: MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/catalogue/MARCdetail.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** MARCdetail.tmpl	17 May 2005 13:21:35 -0000	1.2
--- MARCdetail.tmpl	8 Jun 2005 11:28:08 -0000	1.3
***************
*** 4,8 ****
  	<div class="tabbed">
  		<h1 class="catalogue">Biblionummer : <!-- TMPL_VAR NAME="biblionumber" --></h1>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Biblio bearbeiten  </a>  <a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">  Duplizieren  </a>  <a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue">  Exemplar bearbeiten  </a>   <a href="javascript:confirm_deletion()" class="button catalogue">  L&ouml;schen  </a>  <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Vollanzeige  </a>  <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normalanzeige  </a>  <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD  </a>  <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  zu vituellem Regal hinzuf&uuml;gen  </a>  <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  Drucken  </a>
  		<!-- TMPL_IF name="subscriptionsnumber" -->
  		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
--- 4,8 ----
  	<div class="tabbed">
  		<h1 class="catalogue">Biblionummer : <!-- TMPL_VAR NAME="biblionumber" --></h1>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Biblio bearbeiten  </a>  <a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">  Duplizieren  </a>  <a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue">  Exemplar bearbeiten  </a>   <a href="javascript:confirm_deletion()" class="button catalogue">  L&ouml;schen  </a>  <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Vollanzeige  </a>  <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normalanzeige  </a>  <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD  </a>  <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  zu virtuellem Regal hinzuf&uuml;gen  </a>  <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  Drucken  </a>
  		<!-- TMPL_IF name="subscriptionsnumber" -->
  		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">




From hellen at users.sourceforge.net  Wed Jun  8 13:28:10 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Wed, 08 Jun 2005 04:28:10 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de about.tmpl,1.2,1.3
Message-ID: <E1DfyjC-0008BO-Tu@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	about.tmpl 
Log Message:
translated by hellen

Index: about.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/about.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** about.tmpl	17 May 2005 13:21:34 -0000	1.2
--- about.tmpl	8 Jun 2005 11:28:08 -0000	1.3
***************
*** 48,51 ****
--- 48,52 ----
  					<p>David Strainchamps</p>
  					<p>Dorian Meid (Deutsche &Uuml;bersetzung)</p>
+ 					<p>Friedrich zur Hellen (Deutsche &Uuml;bersetzung)</p>
  					<p>doXulting (Matthieu Branlat) OPAC basket</p>
  					<p>Ed Summers (einigen code und Perl-Module wie MARC::Record)</p>




From hellen at users.sourceforge.net  Wed Jun  8 13:28:10 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Wed, 08 Jun 2005 04:28:10 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple addbooks.tmpl,1.3,1.4 isbnsearch.tmpl,1.2,1.3
Message-ID: <E1DfyjC-0008BM-TB@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	addbooks.tmpl isbnsearch.tmpl 
Log Message:
translated by hellen

Index: addbooks.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/addbooks.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** addbooks.tmpl	5 Jun 2005 14:45:17 -0000	1.3
--- addbooks.tmpl	8 Jun 2005 11:28:08 -0000	1.4
***************
*** 51,55 ****
  		<h2 class="catalogue">Hinweis</h2>
  		<p>Wenn bereits Daten für die ISBN in der Datenbank hinterlegt sind, werden diese angezeigt und k&ouml;nnen bearbeitet werden.<br/>
! 			 Wenn Fremddaten für die ISBN abgerufen wurden und sich im Zwischenspeicher befinden, werden diese ebenfalls angezeigt und dienen als Grundlage f&uuml;r einen neuen Datensatz.<br/>
  			 Anderenfalls wird eine leerer Datensatz angelegt und Sie m&uuml;ssen alle Daten selbst eintragen.</p>
  	</div>
--- 51,55 ----
  		<h2 class="catalogue">Hinweis</h2>
  		<p>Wenn bereits Daten für die ISBN in der Datenbank hinterlegt sind, werden diese angezeigt und k&ouml;nnen bearbeitet werden.<br/>
! 			 Wenn Fremddaten für die ISBN abgerufen wurden und sich im Fremddatenpool befinden, werden diese ebenfalls angezeigt und dienen als Grundlage f&uuml;r einen neuen Datensatz.<br/>
  			 Anderenfalls wird eine leerer Datensatz angelegt und Sie m&uuml;ssen alle Daten selbst eintragen.</p>
  	</div>

Index: isbnsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/isbnsearch.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** isbnsearch.tmpl	17 May 2005 13:21:35 -0000	1.2
--- isbnsearch.tmpl	8 Jun 2005 11:28:08 -0000	1.3
***************
*** 62,71 ****
  						<td><a href="additem-nomarc.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Exemplare hinzuf&uuml;gen</a></td>
  						<!-- TMPL_ELSE -->
! 						<td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Bearbeite...</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>
--- 62,71 ----
  						<td><a href="additem-nomarc.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Exemplare hinzuf&uuml;gen</a></td>
  						<!-- TMPL_ELSE -->
! 						<td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Bearbeiten</a></td>
  						<!-- /TMPL_IF -->
  						<!-- TMPL_UNLESS NAME="NOTMARC" -->
  						<td>
  							<a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">
! 								Duplizieren
  							</a>
  						</td>
***************
*** 109,113 ****
  	</div>
  	<div id="bloc25">
! 		<h2 class="catalogue">Bibliografische Daten im Zwischenspeicher</h2>
  		<!-- TMPL_IF name="breeding_loop" -->
  			<table>
--- 109,113 ----
  	</div>
  	<div id="bloc25">
! 		<h2 class="catalogue">Bibliografische Daten im Fremddatenpool</h2>
  		<!-- TMPL_IF name="breeding_loop" -->
  			<table>




From oleonard at users.sourceforge.net  Wed Jun  8 19:03:03 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 10:03:03 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui basket.tmpl,1.2.2.3,1.2.2.4
Message-ID: <E1Dg3xH-0004t7-Ag@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	basket.tmpl 
Log Message:
Synching with default template

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -r1.2.2.3 -r1.2.2.4
*** basket.tmpl	21 Apr 2005 21:39:46 -0000	1.2.2.3
--- basket.tmpl	8 Jun 2005 17:03:00 -0000	1.2.2.4
***************
*** 18,21 ****
--- 18,22 ----
  		</div>
  	<!-- /TMPL_UNLESS -->
+ 	
  	<div class="data">
  	<!-- TMPL_IF name="books_loop" -->
***************
*** 25,39 ****
  				<th scope="col">Order</th>
  				<th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=biblioitems.publishercode">Publisher</a></th>
- 				<th scope="col">ISBN</th>
  				<th scope="col">Title</th>
! 				<th scope="col">Author</th>
! 				<th scope="col">rrp</th>
! 				<th scope="col">est</th>
! 				<th scope="col">Qty</th>
  				<th scope="col">Total</th>
  				<th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=aqorderbreakdown.bookfundid,biblioitems.publishercode">Fund</a></th>
  <!-- TMPL_UNLESS name="closedate" -->
  					<th scope="col">Remove</th>
  				<!-- /TMPL_UNLESS -->
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
--- 26,40 ----
  				<th scope="col">Order</th>
  				<th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=biblioitems.publishercode">Publisher</a></th>
  				<th scope="col">Title</th>
! 				<th scope="col">RRP</th>
! 				<th scope="col">Est.</th>
! 				<th scope="col">Qty.</th>
  				<th scope="col">Total</th>
  				<th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=aqorderbreakdown.bookfundid,biblioitems.publishercode">Fund</a></th>
+ <!-- TMPL_IF name="active" -->
  <!-- TMPL_UNLESS name="closedate" -->
  					<th scope="col">Remove</th>
  				<!-- /TMPL_UNLESS -->
+ 					<!-- /TMPL_IF -->
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
***************
*** 41,47 ****
  							<td><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
! 					<td><!-- TMPL_VAR NAME="isbn" --></td>
! 					<td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
! 					<td><!-- TMPL_VAR NAME="author" --></td>
  					<td><!-- TMPL_VAR NAME="rrp" --></td>
  					<td><!-- TMPL_VAR NAME="ecost" --></td>
--- 42,63 ----
  							<td><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
! <!-- TMPL_IF name="closedate" -->
! 						<td><p>
! 							<b><!-- TMPL_VAR NAME="title" --></b><br/>
! 								<!-- TMPL_VAR NAME="author" -->
! 								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! 							</p>
! 						</td>
! 					<!-- TMPL_ELSE -->
! 						<td>
! 							<p>
! 							<a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a><br/>
! 								<!-- TMPL_VAR NAME="author" -->
! 								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! 							</p>
! 						</td>
! 					<!-- /TMPL_IF -->
  					<td><!-- TMPL_VAR NAME="rrp" --></td>
  					<td><!-- TMPL_VAR NAME="ecost" --></td>
***************
*** 49,52 ****
--- 65,69 ----
  					<td><!-- TMPL_VAR NAME="line_total" --></td>
  					<td><!-- TMPL_VAR NAME="bookfundid" --></td>
+ 					<!-- TMPL_IF name="active" -->
  					<!-- TMPL_UNLESS name="closedate" -->
  					<td>
***************
*** 54,75 ****
  						</td>
  					<!-- /TMPL_UNLESS -->
  				</tr>
  			<!-- /TMPL_LOOP -->
  			
  			<tr>
! 				<td colspan="4" rowspan="3">
! 					&nbsp;<input type="hidden" name="number" value="<!-- TMPL_VAR NAME="count" -->" />
! 			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
! 				</td>
! 				<th colspan="2">SubTotal</th>
! 				<th><!-- TMPL_VAR NAME="currency" --> <!-- TMPL_VAR NAME="sub_total" --></th><td rowspan="3" colspan="4">&nbsp;</td>
  			</tr>
  			<tr>
! 				<th colspan="2">GST</th>
! 				<th><!-- TMPL_VAR NAME="currency" --> <!-- TMPL_VAR NAME="gist" --></th>
  			</tr>
  			<tr>
! 				<th colspan="2">TOTAL</th>
! 				<th><!-- TMPL_VAR NAME="currency" --> <!-- TMPL_VAR NAME="grand_total" --></th>
  			</tr>
  		</table>
--- 71,99 ----
  						</td>
  					<!-- /TMPL_UNLESS -->
+ 						<!-- /TMPL_IF -->
  				</tr>
  			<!-- /TMPL_LOOP -->
  			
  			<tr>
! 				<td colspan="2" rowspan="3">
! <input type="hidden" name="number" value="<!-- TMPL_VAR NAME="count" -->" /><input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />	</td>
! 				<th>SubTotal</th>
! 				<th><!-- TMPL_VAR NAME="sub_total_est" --></th>
! 				<th><!-- TMPL_VAR NAME="sub_total" --></td>
! 				<th><!-- TMPL_VAR name="qty_total" --></th>
! 				<td colspan="2" rowspan="3">&nbsp;</td>
! 				
  			</tr>
  			<tr>
! 				<th>GST</th>
! 				<th><!-- TMPL_VAR NAME="gist_est" --></th>
! 				<th><!-- TMPL_VAR NAME="gist" --></th>
! 				<th>&nbsp;</th>
  			</tr>
  			<tr>
! 				<th>TOTAL  (<!-- TMPL_VAR NAME="currency" -->)</th>
! 				<th><!-- TMPL_VAR NAME="grand_total_est" --></th>
! 				<th><!-- TMPL_VAR NAME="grand_total" --></th>
! 				<th>&nbsp;</th>
  			</tr>
  		</table>




From oleonard at users.sourceforge.net  Wed Jun  8 19:03:52 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 10:03:52 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui basket.tmpl,1.4,1.5
Message-ID: <E1Dg3y4-0004z8-5K@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	basket.tmpl 
Log Message:
Synching with rel_2_2.

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** basket.tmpl	2 May 2005 18:06:45 -0000	1.4
--- basket.tmpl	8 Jun 2005 17:03:49 -0000	1.5
***************
*** 18,21 ****
--- 18,22 ----
  		</div>
  	<!-- /TMPL_UNLESS -->
+ 	
  	<div class="data">
  	<!-- TMPL_IF name="books_loop" -->
***************
*** 25,39 ****
  				<th scope="col">Order</th>
  				<th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=biblioitems.publishercode">Publisher</a></th>
- 				<th scope="col">ISBN</th>
  				<th scope="col">Title</th>
! 				<th scope="col">Author</th>
! 				<th scope="col">rrp</th>
! 				<th scope="col">est</th>
! 				<th scope="col">Qty</th>
  				<th scope="col">Total</th>
  				<th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=aqorderbreakdown.bookfundid,biblioitems.publishercode">Fund</a></th>
  <!-- TMPL_UNLESS name="closedate" -->
  					<th scope="col">Remove</th>
  				<!-- /TMPL_UNLESS -->
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
--- 26,40 ----
  				<th scope="col">Order</th>
  				<th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=biblioitems.publishercode">Publisher</a></th>
  				<th scope="col">Title</th>
! 				<th scope="col">RRP</th>
! 				<th scope="col">Est.</th>
! 				<th scope="col">Qty.</th>
  				<th scope="col">Total</th>
  				<th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=aqorderbreakdown.bookfundid,biblioitems.publishercode">Fund</a></th>
+ <!-- TMPL_IF name="active" -->
  <!-- TMPL_UNLESS name="closedate" -->
  					<th scope="col">Remove</th>
  				<!-- /TMPL_UNLESS -->
+ 					<!-- /TMPL_IF -->
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
***************
*** 41,47 ****
  							<td><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
! 					<td><!-- TMPL_VAR NAME="isbn" --></td>
! 					<td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
! 					<td><!-- TMPL_VAR NAME="author" --></td>
  					<td><!-- TMPL_VAR NAME="rrp" --></td>
  					<td><!-- TMPL_VAR NAME="ecost" --></td>
--- 42,63 ----
  							<td><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
! <!-- TMPL_IF name="closedate" -->
! 						<td><p>
! 							<b><!-- TMPL_VAR NAME="title" --></b><br/>
! 								<!-- TMPL_VAR NAME="author" -->
! 								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! 							</p>
! 						</td>
! 					<!-- TMPL_ELSE -->
! 						<td>
! 							<p>
! 							<a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a><br/>
! 								<!-- TMPL_VAR NAME="author" -->
! 								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! 							</p>
! 						</td>
! 					<!-- /TMPL_IF -->
  					<td><!-- TMPL_VAR NAME="rrp" --></td>
  					<td><!-- TMPL_VAR NAME="ecost" --></td>
***************
*** 49,52 ****
--- 65,69 ----
  					<td><!-- TMPL_VAR NAME="line_total" --></td>
  					<td><!-- TMPL_VAR NAME="bookfundid" --></td>
+ 					<!-- TMPL_IF name="active" -->
  					<!-- TMPL_UNLESS name="closedate" -->
  					<td>
***************
*** 54,75 ****
  						</td>
  					<!-- /TMPL_UNLESS -->
  				</tr>
  			<!-- /TMPL_LOOP -->
  			
  			<tr>
! 				<td colspan="4" rowspan="3">
! 					&nbsp;<input type="hidden" name="number" value="<!-- TMPL_VAR NAME="count" -->" />
! 			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
! 				</td>
! 				<th colspan="2">SubTotal</th>
! 				<th><!-- TMPL_VAR NAME="currency" --> <!-- TMPL_VAR NAME="sub_total" --></th><td rowspan="3" colspan="4">&nbsp;</td>
  			</tr>
  			<tr>
! 				<th colspan="2">GST</th>
! 				<th><!-- TMPL_VAR NAME="currency" --> <!-- TMPL_VAR NAME="gist" --></th>
  			</tr>
  			<tr>
! 				<th colspan="2">TOTAL</th>
! 				<th><!-- TMPL_VAR NAME="currency" --> <!-- TMPL_VAR NAME="grand_total" --></th>
  			</tr>
  		</table>
--- 71,99 ----
  						</td>
  					<!-- /TMPL_UNLESS -->
+ 						<!-- /TMPL_IF -->
  				</tr>
  			<!-- /TMPL_LOOP -->
  			
  			<tr>
! 				<td colspan="2" rowspan="3">
! <input type="hidden" name="number" value="<!-- TMPL_VAR NAME="count" -->" /><input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />	</td>
! 				<th>SubTotal</th>
! 				<th><!-- TMPL_VAR NAME="sub_total_est" --></th>
! 				<th><!-- TMPL_VAR NAME="sub_total" --></td>
! 				<th><!-- TMPL_VAR name="qty_total" --></th>
! 				<td colspan="2" rowspan="3">&nbsp;</td>
! 				
  			</tr>
  			<tr>
! 				<th>GST</th>
! 				<th><!-- TMPL_VAR NAME="gist_est" --></th>
! 				<th><!-- TMPL_VAR NAME="gist" --></th>
! 				<th>&nbsp;</th>
  			</tr>
  			<tr>
! 				<th>TOTAL  (<!-- TMPL_VAR NAME="currency" -->)</th>
! 				<th><!-- TMPL_VAR NAME="grand_total_est" --></th>
! 				<th><!-- TMPL_VAR NAME="grand_total" --></th>
! 				<th>&nbsp;</th>
  			</tr>
  		</table>




From oleonard at users.sourceforge.net  Wed Jun  8 19:14:00 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 10:14:00 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui histsearch.tmpl,1.1.2.2,1.1.2.3
Message-ID: <E1Dg47s-00068d-Ff@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	histsearch.tmpl 
Log Message:
Synching with default template

Index: histsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/histsearch.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** histsearch.tmpl	17 Feb 2005 17:49:40 -0000	1.1.2.2
--- histsearch.tmpl	8 Jun 2005 17:13:55 -0000	1.1.2.3
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions: Order Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions: Order Search<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
***************
*** 23,27 ****
  				<th><input type="text" name="author" value="<!-- TMPL_VAR name="author" -->" /></th>
  				<th><input type="text" name="name" value="<!-- TMPL_VAR name="name" -->" /></th>
! 				<th>&nbsp;</th>
  				<th>&nbsp;</th>
  				<th>&nbsp;</th>
--- 23,83 ----
  				<th><input type="text" name="author" value="<!-- TMPL_VAR name="author" -->" /></th>
  				<th><input type="text" name="name" value="<!-- TMPL_VAR name="name" -->" /></th>
! 				<th>					From <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
! 					<input type="text" readonly="readonly" size="10" id="from" name="fromplacedon" value="<!-- TMPL_VAR name="from_placed_on" -->">
! 					<script language="JavaScript" type="text/javascript">
! 						function validate1(date) {
! 							var day = date.getDate();
! 							var month = date.getMonth() + 1;
! 							var year = date.getFullYear();
! 							var weekDay = date.getDay();
! 							var dayMonth = month + '-' + day;
! 							var dateString = year + '-' + month + '-' + day;
! 							var dateTo = document.getElementById('to').value.split("-");
! 							var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
! 							if (date > limitDate) {
! 								return true;
! 							} else {
! 								return false;
! 							}
! 						}
! 						Calendar.setup(
! 							{
! 								inputField : "from",
! 								ifFormat : "%Y-%m-%d",
! 								button : "openCalendarFrom",
! 								disableFunc : validate1,
! 								dateStatusFunc : validate1
! 							}
! 						);
! 					</script>
! 					To <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" border="0" />
! 					<input readonly="readonly" size="10" id="to" name="toplacedon" value="<!-- TMPL_VAR name="to_placed_on" -->" type="text" />
! 					<script type="text/javascript">
! 						function validate2(date) {
! 							var day = date.getDate();
! 							var month = date.getMonth() + 1;
! 							var year = date.getFullYear();
! 							var weekDay = date.getDay();
! 							var dayMonth = month + '-' + day;
! 							var dateString = year + '-' + month + '-' + day;
! 							var dateFrom = document.getElementById('from').value.split("-");
! 							var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
! 							if (limitDate > date) {
! 								return true;
! 							} else {
! 								return false;
! 							}
! 						}
! 
! 						Calendar.setup(
! 							{
! 								inputField : "to",
! 								ifFormat : "%Y-%m-%d",
! 								button : "openCalendarTo",
! 								disableFunc : validate2,
! 								dateStatusFunc : validate2
! 							}
! 						);
! 					</script></th>
  				<th>&nbsp;</th>
  				<th>&nbsp;</th>




From oleonard at users.sourceforge.net  Wed Jun  8 20:38:24 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 11:38:24 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui histsearch.tmpl,1.3,1.4
Message-ID: <E1Dg5RY-0007Y5-Jv@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	histsearch.tmpl 
Log Message:
Synching with rel_2_2.

Index: histsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/histsearch.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** histsearch.tmpl	17 Feb 2005 17:49:44 -0000	1.3
--- histsearch.tmpl	8 Jun 2005 18:38:19 -0000	1.4
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions: Order Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions: Order Search<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
***************
*** 23,27 ****
  				<th><input type="text" name="author" value="<!-- TMPL_VAR name="author" -->" /></th>
  				<th><input type="text" name="name" value="<!-- TMPL_VAR name="name" -->" /></th>
! 				<th>&nbsp;</th>
  				<th>&nbsp;</th>
  				<th>&nbsp;</th>
--- 23,83 ----
  				<th><input type="text" name="author" value="<!-- TMPL_VAR name="author" -->" /></th>
  				<th><input type="text" name="name" value="<!-- TMPL_VAR name="name" -->" /></th>
! 				<th>					From <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
! 					<input type="text" readonly="readonly" size="10" id="from" name="fromplacedon" value="<!-- TMPL_VAR name="from_placed_on" -->">
! 					<script language="JavaScript" type="text/javascript">
! 						function validate1(date) {
! 							var day = date.getDate();
! 							var month = date.getMonth() + 1;
! 							var year = date.getFullYear();
! 							var weekDay = date.getDay();
! 							var dayMonth = month + '-' + day;
! 							var dateString = year + '-' + month + '-' + day;
! 							var dateTo = document.getElementById('to').value.split("-");
! 							var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
! 							if (date > limitDate) {
! 								return true;
! 							} else {
! 								return false;
! 							}
! 						}
! 						Calendar.setup(
! 							{
! 								inputField : "from",
! 								ifFormat : "%Y-%m-%d",
! 								button : "openCalendarFrom",
! 								disableFunc : validate1,
! 								dateStatusFunc : validate1
! 							}
! 						);
! 					</script>
! 					To <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" border="0" />
! 					<input readonly="readonly" size="10" id="to" name="toplacedon" value="<!-- TMPL_VAR name="to_placed_on" -->" type="text" />
! 					<script type="text/javascript">
! 						function validate2(date) {
! 							var day = date.getDate();
! 							var month = date.getMonth() + 1;
! 							var year = date.getFullYear();
! 							var weekDay = date.getDay();
! 							var dayMonth = month + '-' + day;
! 							var dateString = year + '-' + month + '-' + day;
! 							var dateFrom = document.getElementById('from').value.split("-");
! 							var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
! 							if (limitDate > date) {
! 								return true;
! 							} else {
! 								return false;
! 							}
! 						}
! 
! 						Calendar.setup(
! 							{
! 								inputField : "to",
! 								ifFormat : "%Y-%m-%d",
! 								button : "openCalendarTo",
! 								disableFunc : validate2,
! 								dateStatusFunc : validate2
! 							}
! 						);
! 					</script></th>
  				<th>&nbsp;</th>
  				<th>&nbsp;</th>




From oleonard at users.sourceforge.net  Wed Jun  8 20:39:00 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 11:39:00 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple addbiblio.tmpl,1.4.2.5,1.4.2.6
Message-ID: <E1Dg5S8-0007bo-D4@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	addbiblio.tmpl 
Log Message:
Synching with default template

Index: addbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -C2 -r1.4.2.5 -r1.4.2.6
*** addbiblio.tmpl	25 Apr 2005 22:08:39 -0000	1.4.2.5
--- addbiblio.tmpl	8 Jun 2005 18:38:57 -0000	1.4.2.6
***************
*** 12,16 ****
  
  	<form method="post" name="f" id="f" action="addbiblio.pl">
! <h1><!-- TMPL_IF NAME="oldbiblionumtagfield" -->Edit MARC Record Number <!-- TMPL_VAR name="bibid" --><!-- TMPL_ELSE -->Add MARC Record<!-- /TMPL_IF --></h1>
  
  
--- 12,16 ----
  
  	<form method="post" name="f" id="f" action="addbiblio.pl">
! <h1><!-- TMPL_IF NAME="oldbiblionumtagfield" -->Edit MARC Record Number <!-- TMPL_VAR name="oldbiblionumber" --><!-- TMPL_ELSE -->Add MARC Record<!-- /TMPL_IF --> With Framework : <!--TMPL_VAR Name="framework" --></h1>
  
  
***************
*** 430,436 ****
--- 430,438 ----
  			with(document){
  			document.getElementById(ong).style.visibility="hidden";
+ 			if (document.getElementById(link)) {
  			document.getElementById(link).style.color="#669999";
  			document.getElementById(link).style.backgroundColor="#D8DEB8";
  			}
+ 			}
  		}
  	}
***************
*** 564,567 ****
--- 566,574 ----
  }
  
+ function Changefwk(FwkList) {
+   var fwk = FwkList.options[FwkList.selectedIndex].value;
+   window.location = "addbiblio.pl?oldbiblionumber=<!--TMPL_VAR Name="oldbiblionumber"-->&frameworkcode="+fwk;
+ }
+ 
  function AddField(field) {
  	document.forms[0].op.value = "addfield";




From oleonard at users.sourceforge.net  Wed Jun  8 20:39:09 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 11:39:09 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple addbiblio.tmpl,1.6,1.7
Message-ID: <E1Dg5SH-0007d6-5A@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	addbiblio.tmpl 
Log Message:
Synching with rel_2_2.

Index: addbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** addbiblio.tmpl	2 May 2005 18:11:11 -0000	1.6
--- addbiblio.tmpl	8 Jun 2005 18:39:06 -0000	1.7
***************
*** 12,16 ****
  
  	<form method="post" name="f" id="f" action="addbiblio.pl">
! <h1><!-- TMPL_IF NAME="oldbiblionumtagfield" -->Edit MARC Record Number <!-- TMPL_VAR name="bibid" --><!-- TMPL_ELSE -->Add MARC Record<!-- /TMPL_IF --></h1>
  
  
--- 12,16 ----
  
  	<form method="post" name="f" id="f" action="addbiblio.pl">
! <h1><!-- TMPL_IF NAME="oldbiblionumtagfield" -->Edit MARC Record Number <!-- TMPL_VAR name="oldbiblionumber" --><!-- TMPL_ELSE -->Add MARC Record<!-- /TMPL_IF --> With Framework : <!--TMPL_VAR Name="framework" --></h1>
  
  
***************
*** 430,436 ****
--- 430,438 ----
  			with(document){
  			document.getElementById(ong).style.visibility="hidden";
+ 			if (document.getElementById(link)) {
  			document.getElementById(link).style.color="#669999";
  			document.getElementById(link).style.backgroundColor="#D8DEB8";
  			}
+ 			}
  		}
  	}
***************
*** 564,567 ****
--- 566,574 ----
  }
  
+ function Changefwk(FwkList) {
+   var fwk = FwkList.options[FwkList.selectedIndex].value;
+   window.location = "addbiblio.pl?oldbiblionumber=<!--TMPL_VAR Name="oldbiblionumber"-->&frameworkcode="+fwk;
+ }
+ 
  function AddField(field) {
  	document.forms[0].op.value = "addfield";




From oleonard at users.sourceforge.net  Wed Jun  8 20:47:54 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 11:47:54 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple additem.tmpl,1.3.2.4,1.3.2.5
Message-ID: <E1Dg5ak-00008s-IG@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	additem.tmpl 
Log Message:
Synching with default template

Index: additem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/additem.tmpl,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -C2 -r1.3.2.4 -r1.3.2.5
*** additem.tmpl	25 Apr 2005 16:56:08 -0000	1.3.2.4
--- additem.tmpl	8 Jun 2005 18:47:47 -0000	1.3.2.5
***************
*** 5,11 ****
  <div id="main">
  
! <h1>Edit Items for Bibliographic Record <!-- TMPL_VAR NAME="biblionumber" --></h1>
  
! 		<div class="tabitem"><form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR name="biblionumber" -->"><input type="submit" class="submit" value="Edit Bibliographic Record"></form> <form action="acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" name="op" value="duplicate" /><input type="submit" class="submit" value="Duplicate this Record" /></form></div> <div class="tabitem"><form action="/cgi-bin/koha/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View in Catalog"></form> <form action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View MARC in Catalog"></form>  <form action="/cgi-bin/koha/ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View ISBD in Catalog"></form></div>
  
  	<form method="post" action="additem.pl" name="f">
--- 5,11 ----
  <div id="main">
  
! <h1>Items for <em><!-- TMPL_VAR name="title" --></em> <!-- TMPL_IF NAME="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF --> (Record #<!-- TMPL_VAR NAME="biblionumber" -->)</h1>
  
! 		<div class="tabitem"><form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR name="biblionumber" -->"><input type="submit" class="submit" value="Edit Bibliographic Record"></form></div> <div class="tabitem"><form action="/cgi-bin/koha/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View in Catalog"></form> <form action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View MARC in Catalog"></form>  <form action="/cgi-bin/koha/ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View ISBD in Catalog"></form></div>
  
  	<form method="post" action="additem.pl" name="f">




From oleonard at users.sourceforge.net  Wed Jun  8 20:48:36 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 11:48:36 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple additem.tmpl,1.4,1.5
Message-ID: <E1Dg5bQ-0000DE-FW@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	additem.tmpl 
Log Message:
Synching with rel_2_2.

Index: additem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/additem.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** additem.tmpl	2 May 2005 18:11:12 -0000	1.4
--- additem.tmpl	8 Jun 2005 18:48:34 -0000	1.5
***************
*** 5,11 ****
  <div id="main">
  
! <h1>Edit Items for Bibliographic Record <!-- TMPL_VAR NAME="biblionumber" --></h1>
  
! 		<div class="tabitem"><form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR name="biblionumber" -->"><input type="submit" class="submit" value="Edit Bibliographic Record"></form> <form action="acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" name="op" value="duplicate" /><input type="submit" class="submit" value="Duplicate this Record" /></form></div> <div class="tabitem"><form action="/cgi-bin/koha/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View in Catalog"></form> <form action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View MARC in Catalog"></form>  <form action="/cgi-bin/koha/ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View ISBD in Catalog"></form></div>
  
  	<form method="post" action="additem.pl" name="f">
--- 5,11 ----
  <div id="main">
  
! <h1>Items for <em><!-- TMPL_VAR name="title" --></em> <!-- TMPL_IF NAME="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF --> (Record #<!-- TMPL_VAR NAME="biblionumber" -->)</h1>
  
! 		<div class="tabitem"><form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR name="biblionumber" -->"><input type="submit" class="submit" value="Edit Bibliographic Record"></form></div> <div class="tabitem"><form action="/cgi-bin/koha/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View in Catalog"></form> <form action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View MARC in Catalog"></form>  <form action="/cgi-bin/koha/ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View ISBD in Catalog"></form></div>
  
  	<form method="post" action="additem.pl" name="f">




From oleonard at users.sourceforge.net  Wed Jun  8 21:18:55 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 12:18:55 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/authorities authorities.tmpl,1.2,1.3 detail.tmpl,1.2,1.3
Message-ID: <E1Dg64l-0003dC-Hg@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13911/koha-tmpl/intranet-tmpl/npl/en/authorities

Modified Files:
	authorities.tmpl detail.tmpl 
Log Message:
Synching with rel_2_2.

Index: authorities.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** authorities.tmpl	2 May 2005 18:15:31 -0000	1.2
--- authorities.tmpl	8 Jun 2005 19:18:52 -0000	1.3
***************
*** 9,23 ****
  
  <div class="tabbed">
! 	<form method="post" name="f">
! 	<h1>Authority number <!-- TMPL_VAR NAME="authid" --></h1>
  	<p>
! 		<input type="hidden" name="op" value="add">
! 		<input type="hidden" name="addfield_field">
! 		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
! 		<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->">
  		<!-- TMPL_IF name="authid" -->
! 			<input type="button" value="Save" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- TMPL_ELSE -->
! 			<input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- /TMPL_IF -->
  <!--		<a href="javascript:PopupZ3950()" class="button authority">z3950 search</a> -->
--- 9,27 ----
  
  <div class="tabbed">
! 	<form method="post" action="authorities.pl" name="f">
! 	<!-- TMPL_IF name="authid" -->
! 		<h1>Modify authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
! 	<!-- TMPL_ELSE -->
! 		<h1>Adding authority (<!-- TMPL_VAR name="authtypetext" -->)</h1>
! 	<!-- /TMPL_IF -->
  	<p>
! 		<input type="hidden" name="op" value="add" />
! 		<input type="hidden" name="addfield_field" />
! 		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
! 		<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->" />
  		<!-- TMPL_IF name="authid" -->
! 			<input type="button" value="Save" onClick="Check(this.form)" accesskey="w" class="submit" />
  		<!-- TMPL_ELSE -->
! 			<input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="submit" />
  		<!-- /TMPL_IF -->
  <!--		<a href="javascript:PopupZ3950()" class="button authority">z3950 search</a> -->
***************
*** 25,29 ****
  </div>
  
! <br><br><br><br><br><br><br><br><br><br><br>
  
  <!-- TMPL_LOOP NAME="0XX" -->
--- 29,42 ----
  </div>
  
! <!-- TMPL_IF name="duplicateauthid" -->
! 	<div class="error">
! 		<p>Duplicate suspected with <a href="javascript:openWindow('detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&amp;popup=1', 'Duplicate Authority')"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
! 		<p>You must either :</p>
! 		<ul>
! 			<p><input type="checkbox" value="1" name="confirm_not_duplicate" />confirm it's not a duplicate (and click on <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority"> again)</p>
! 			<p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >original authority</a></p>
! 		</ul>
! 	</div>
! <!-- /TMPL_IF -->
  
  <!-- TMPL_LOOP NAME="0XX" -->
***************
*** 172,177 ****
  
  function AddField(field) {
! 	document.forms[0].op.value = "addfield";
! 	document.forms[0].addfield_field.value=field;
  	document.f.submit();
  }
--- 185,190 ----
  
  function AddField(field) {
! 	document.forms[1].op.value = "addfield";
! 	document.forms[1].addfield_field.value=field;
  	document.f.submit();
  }

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/detail.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** detail.tmpl	2 May 2005 18:15:31 -0000	1.2
--- detail.tmpl	8 Jun 2005 19:18:52 -0000	1.3
***************
*** 8,12 ****
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1>Authority number : <!-- TMPL_VAR NAME="authid" --></h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
--- 8,12 ----
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1>Authority number : <!-- TMPL_VAR NAME="authid" -->  <!-- TMPL_IF NAME="authtypetext" -->(<!-- TMPL_VAR name="authtypetext" -->)<!-- /TMPL_IF --></h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
***************
*** 42,48 ****
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Are you sure you want to delete this biblio?');
  	if (is_confirmed) {
! 		window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";
  	}
  }
--- 42,48 ----
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Are you sure you want to delete this authority?');
  	if (is_confirmed) {
! 		window.location="authorities-home.pl?op=delete&amp;authid=<!-- TMPL_VAR NAME="authid" -->";
  	}
  }




From oleonard at users.sourceforge.net  Wed Jun  8 21:19:43 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 12:19:43 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/authorities authorities.tmpl,1.1.2.1,1.1.2.2 detail.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1Dg65X-0003iv-8o@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14245/koha-tmpl/intranet-tmpl/npl/en/authorities

Modified Files:
      Tag: rel_2_2
	authorities.tmpl detail.tmpl 
Log Message:
Synching with default template

Index: authorities.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** authorities.tmpl	19 Apr 2005 19:13:34 -0000	1.1.2.1
--- authorities.tmpl	8 Jun 2005 19:19:40 -0000	1.1.2.2
***************
*** 9,23 ****
  
  <div class="tabbed">
! 	<form method="post" name="f">
! 	<h1>Authority number <!-- TMPL_VAR NAME="authid" --></h1>
  	<p>
! 		<input type="hidden" name="op" value="add">
! 		<input type="hidden" name="addfield_field">
! 		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
! 		<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->">
  		<!-- TMPL_IF name="authid" -->
! 			<input type="button" value="Save" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- TMPL_ELSE -->
! 			<input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- /TMPL_IF -->
  <!--		<a href="javascript:PopupZ3950()" class="button authority">z3950 search</a> -->
--- 9,27 ----
  
  <div class="tabbed">
! 	<form method="post" action="authorities.pl" name="f">
! 	<!-- TMPL_IF name="authid" -->
! 		<h1>Modify authority #<!-- TMPL_VAR NAME="authid" --> <!-- TMPL_IF NAME="authtypetext" -->(<!-- TMPL_VAR name="authtypetext" -->)<!-- /TMPL_IF --></h1>
! 	<!-- TMPL_ELSE -->
! 		<h1>Adding authority <!-- TMPL_IF NAME="authtypetext" -->(<!-- TMPL_VAR name="authtypetext" -->)<!-- /TMPL_IF --></h1>
! 	<!-- /TMPL_IF -->
  	<p>
! 		<input type="hidden" name="op" value="add" />
! 		<input type="hidden" name="addfield_field" />
! 		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
! 		<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->" />
  		<!-- TMPL_IF name="authid" -->
! 			<input type="button" value="Save" onClick="Check(this.form)" accesskey="w" class="submit" />
  		<!-- TMPL_ELSE -->
! 			<input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="submit" />
  		<!-- /TMPL_IF -->
  <!--		<a href="javascript:PopupZ3950()" class="button authority">z3950 search</a> -->
***************
*** 25,29 ****
  </div>
  
! <br><br><br><br><br><br><br><br><br><br><br>
  
  <!-- TMPL_LOOP NAME="0XX" -->
--- 29,42 ----
  </div>
  
! <!-- TMPL_IF name="duplicateauthid" -->
! 	<div class="error">
! 		<p>Duplicate suspected with <a href="javascript:openWindow('detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&amp;popup=1', 'Duplicate Authority')"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
! 		<p>You must either :</p>
! 		<ul>
! 			<p><input type="checkbox" value="1" name="confirm_not_duplicate" />confirm it's not a duplicate (and click on <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority"> again)</p>
! 			<p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >original authority</a></p>
! 		</ul>
! 	</div>
! <!-- /TMPL_IF -->
  
  <!-- TMPL_LOOP NAME="0XX" -->
***************
*** 172,177 ****
  
  function AddField(field) {
! 	document.forms[0].op.value = "addfield";
! 	document.forms[0].addfield_field.value=field;
  	document.f.submit();
  }
--- 185,190 ----
  
  function AddField(field) {
! 	document.forms[1].op.value = "addfield";
! 	document.forms[1].addfield_field.value=field;
  	document.f.submit();
  }

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/detail.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** detail.tmpl	19 Apr 2005 19:13:34 -0000	1.1.2.1
--- detail.tmpl	8 Jun 2005 19:19:40 -0000	1.1.2.2
***************
*** 8,12 ****
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1>Authority number : <!-- TMPL_VAR NAME="authid" --></h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
--- 8,12 ----
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1>Authority number : <!-- TMPL_VAR NAME="authid" -->  <!-- TMPL_IF NAME="authtypetext" -->(<!-- TMPL_VAR name="authtypetext" -->)<!-- /TMPL_IF --></h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
***************
*** 42,48 ****
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Are you sure you want to delete this biblio?');
  	if (is_confirmed) {
! 		window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";
  	}
  }
--- 42,48 ----
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Are you sure you want to delete this authority?');
  	if (is_confirmed) {
! 		window.location="authorities-home.pl?op=delete&amp;authid=<!-- TMPL_VAR NAME="authid" -->";
  	}
  }




From oleonard at users.sourceforge.net  Wed Jun  8 22:04:47 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:04:47 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/catalogue MARCdetail.tmpl,1.4,1.5
Message-ID: <E1Dg6n9-0001Ih-Ef@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	MARCdetail.tmpl 
Log Message:
Synching with rel_2_2.

Index: MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/MARCdetail.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** MARCdetail.tmpl	2 May 2005 20:22:24 -0000	1.4
--- MARCdetail.tmpl	8 Jun 2005 20:04:44 -0000	1.5
***************
*** 5,15 ****
  
  <div id="main">
! <h2>MARC Record for <em><!-- TMPL_VAR NAME="biblio_title" --><!-- TMPL_IF NAME="biblio_subtitle" -->: <!-- TMPL_VAR NAME="biblio_subtitle" --><!-- /TMPL_IF --></em></h2>
  <div class="tabitem"><form action="/cgi-bin/koha/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" value="intra" name="type" /><input type="submit" class="submit" value="Brief Display" /></form><!-- TMPL_IF NAME="norequests" -->&nbsp;<!-- TMPL_ELSE --> <form action="request.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> <input type="submit" class="submit" value="Place Reserve" /></form>
  		<!-- /TMPL_IF --><form action="/cgi-bin/koha/detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Simple Print View" /></form> <!-- TMPL_IF name="subscriptionid" --><form action="/cgi-bin/koha/bull/subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Subscription" class="submit" /></form>
! <form action="/cgi-bin/koha/bull/serial-issues.pl" method="get"><input type="hidden" name="subscriptionid" value="!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Serial Issues" class="submit" /></form><!-- /TMPL_IF -->  <form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Edit MARC" /></form> <form action="/cgi-bin/koha/acqui.simple/additem.pl" method="get"><input type="hidden" name="bibid" value="<!-- TMPL_VAR name="bibid"-->" /><input type="submit" class="submit" value="Edit Items" /></form> <form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="bibid" value="<!-- TMPL_VAR NAME="bibid" -->" /><input type="submit" class="cancel" value="Delete Record" onclick="confirm_deletion(); return false;" /></form></div>
  
  <!-- TMPL_IF NAME="0XX" -->
! <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="0XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 5,17 ----
  
  <div id="main">
! <h2>MARC Record <em><!-- TMPL_VAR NAME="biblionumber" --></em></h2>
  <div class="tabitem"><form action="/cgi-bin/koha/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" value="intra" name="type" /><input type="submit" class="submit" value="Brief Display" /></form><!-- TMPL_IF NAME="norequests" -->&nbsp;<!-- TMPL_ELSE --> <form action="request.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> <input type="submit" class="submit" value="Place Reserve" /></form>
  		<!-- /TMPL_IF --><form action="/cgi-bin/koha/detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Simple Print View" /></form> <!-- TMPL_IF name="subscriptionid" --><form action="/cgi-bin/koha/bull/subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Subscription" class="submit" /></form>
! <form action="/cgi-bin/koha/bull/serial-issues.pl" method="get"><input type="hidden" name="subscriptionid" value="!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Serial Issues" class="submit" /></form><!-- /TMPL_IF -->  </div>
! 
! <div id="controls"><form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Edit MARC" /></form> <form action="/cgi-bin/koha/acqui.simple/additem.pl" method="get"><input type="hidden" name="bibid" value="<!-- TMPL_VAR name="bibid"-->" /><input type="submit" class="submit" value="Edit Items" /></form> <form name="duplicate"><h4>Duplicate</h4> using <!--TMPL_VAR Name="framework" -->Framework <input type="submit" class="submit" value="Duplicate" onclick="Addbiblio('duplicate'); return false;" /></form> <form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="bibid" value="<!-- TMPL_VAR NAME="bibid" -->" /><input type="submit" class="cancel" value="Delete Record" onclick="confirm_deletion(); return false;" /></form></div>
  
  <!-- TMPL_IF NAME="0XX" -->
! <table class="marc">
  	<!-- TMPL_LOOP NAME="0XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 24,32 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="1XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="1XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 26,34 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="1XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="1XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 41,49 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  	 
  <!-- TMPL_IF NAME="2XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="2XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 43,51 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  	 
  <!-- TMPL_IF NAME="2XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="2XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 58,66 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  	 
  <!-- TMPL_IF NAME="3XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="3XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 60,68 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  	 
  <!-- TMPL_IF NAME="3XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="3XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 75,83 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="4XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="4XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 77,85 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="4XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="4XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 92,100 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="5XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="5XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 94,102 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="5XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="5XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 109,117 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="6XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="6XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 111,119 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="6XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="6XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 126,134 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="7XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="7XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 128,136 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="7XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="7XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 143,152 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  	 
  <!-- TMPL_IF NAME="8XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="8XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 145,154 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  	 
  <!-- TMPL_IF NAME="8XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="8XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 161,169 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="9XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="9XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 163,171 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="9XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="9XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 178,186 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="item_header_loop -->
!     <div class="table"><table>
  		<tr>
  			<!-- TMPL_LOOP NAME="item_header_loop" --><th><!-- TMPL_VAR NAME="header_value" --></th><!-- /TMPL_LOOP -->
--- 180,188 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="item_header_loop -->
!     <table>
  		<tr>
  			<!-- TMPL_LOOP NAME="item_header_loop" --><th><!-- TMPL_VAR NAME="header_value" --></th><!-- /TMPL_LOOP -->
***************
*** 191,195 ****
  			</tr>
  		<!-- /TMPL_LOOP -->
!      </table></div>
  <!-- /TMPL_IF -->
  	 </div>
--- 193,197 ----
  			</tr>
  		<!-- /TMPL_LOOP -->
!      </table>
  <!-- /TMPL_IF -->
  	 </div>
***************
*** 201,204 ****
--- 203,214 ----
  	}
  }
+ 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['duplicate'].Frameworks.options[document.forms['duplicate'].Frameworks.selectedIndex].value;
+   window.location = "acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode="+fwk+"&op="+op; 
+ }
  </script>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file




From oleonard at users.sourceforge.net  Wed Jun  8 22:04:17 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:04:17 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/catalogue MARCdetail.tmpl,1.3.2.1,1.3.2.2
Message-ID: <E1Dg6mf-0001Ep-HX@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	MARCdetail.tmpl 
Log Message:
Synching with default template

Index: MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/MARCdetail.tmpl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** MARCdetail.tmpl	30 Mar 2005 22:51:53 -0000	1.3.2.1
--- MARCdetail.tmpl	8 Jun 2005 20:04:14 -0000	1.3.2.2
***************
*** 5,15 ****
  
  <div id="main">
! <h2>MARC Record for <em><!-- TMPL_VAR NAME="biblio_title" --><!-- TMPL_IF NAME="biblio_subtitle" -->: <!-- TMPL_VAR NAME="biblio_subtitle" --><!-- /TMPL_IF --></em></h2>
  <div class="tabitem"><form action="/cgi-bin/koha/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" value="intra" name="type" /><input type="submit" class="submit" value="Brief Display" /></form><!-- TMPL_IF NAME="norequests" -->&nbsp;<!-- TMPL_ELSE --> <form action="request.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> <input type="submit" class="submit" value="Place Reserve" /></form>
  		<!-- /TMPL_IF --><form action="/cgi-bin/koha/detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Simple Print View" /></form> <!-- TMPL_IF name="subscriptionid" --><form action="/cgi-bin/koha/bull/subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Subscription" class="submit" /></form>
! <form action="/cgi-bin/koha/bull/serial-issues.pl" method="get"><input type="hidden" name="subscriptionid" value="!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Serial Issues" class="submit" /></form><!-- /TMPL_IF -->  <form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Edit MARC" /></form> <form action="/cgi-bin/koha/acqui.simple/additem.pl" method="get"><input type="hidden" name="bibid" value="<!-- TMPL_VAR name="bibid"-->" /><input type="submit" class="submit" value="Edit Items" /></form> <form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="bibid" value="<!-- TMPL_VAR NAME="bibid" -->" /><input type="submit" class="cancel" value="Delete Record" onclick="confirm_deletion(); return false;" /></form></div>
  
  <!-- TMPL_IF NAME="0XX" -->
! <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="0XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 5,17 ----
  
  <div id="main">
! <h2>MARC Record <em><!-- TMPL_VAR NAME="biblionumber" --></em></h2>
  <div class="tabitem"><form action="/cgi-bin/koha/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" value="intra" name="type" /><input type="submit" class="submit" value="Brief Display" /></form><!-- TMPL_IF NAME="norequests" -->&nbsp;<!-- TMPL_ELSE --> <form action="request.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> <input type="submit" class="submit" value="Place Reserve" /></form>
  		<!-- /TMPL_IF --><form action="/cgi-bin/koha/detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Simple Print View" /></form> <!-- TMPL_IF name="subscriptionid" --><form action="/cgi-bin/koha/bull/subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Subscription" class="submit" /></form>
! <form action="/cgi-bin/koha/bull/serial-issues.pl" method="get"><input type="hidden" name="subscriptionid" value="!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Serial Issues" class="submit" /></form><!-- /TMPL_IF -->  </div>
! 
! <div id="controls"><form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Edit MARC" /></form> <form action="/cgi-bin/koha/acqui.simple/additem.pl" method="get"><input type="hidden" name="bibid" value="<!-- TMPL_VAR name="bibid"-->" /><input type="submit" class="submit" value="Edit Items" /></form> <form name="duplicate"><h4>Duplicate</h4> using <!--TMPL_VAR Name="framework" -->Framework <input type="submit" class="submit" value="Duplicate" onclick="Addbiblio('duplicate'); return false;" /></form> <form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="bibid" value="<!-- TMPL_VAR NAME="bibid" -->" /><input type="submit" class="cancel" value="Delete Record" onclick="confirm_deletion(); return false;" /></form></div>
  
  <!-- TMPL_IF NAME="0XX" -->
! <table class="marc">
  	<!-- TMPL_LOOP NAME="0XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 24,32 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="1XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="1XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 26,34 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="1XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="1XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 41,49 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  	 
  <!-- TMPL_IF NAME="2XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="2XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 43,51 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  	 
  <!-- TMPL_IF NAME="2XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="2XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 58,66 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  	 
  <!-- TMPL_IF NAME="3XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="3XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 60,68 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  	 
  <!-- TMPL_IF NAME="3XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="3XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 75,83 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="4XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="4XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 77,85 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="4XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="4XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 92,100 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="5XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="5XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 94,102 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="5XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="5XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 109,117 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="6XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="6XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 111,119 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="6XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="6XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 126,134 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="7XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="7XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 128,136 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="7XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="7XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 143,152 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  	 
  <!-- TMPL_IF NAME="8XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="8XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 145,154 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  	 
  <!-- TMPL_IF NAME="8XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="8XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 161,169 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="9XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="9XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 163,171 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="9XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="9XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 178,186 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="item_header_loop -->
!     <div class="table"><table>
  		<tr>
  			<!-- TMPL_LOOP NAME="item_header_loop" --><th><!-- TMPL_VAR NAME="header_value" --></th><!-- /TMPL_LOOP -->
--- 180,188 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="item_header_loop -->
!     <table>
  		<tr>
  			<!-- TMPL_LOOP NAME="item_header_loop" --><th><!-- TMPL_VAR NAME="header_value" --></th><!-- /TMPL_LOOP -->
***************
*** 191,195 ****
  			</tr>
  		<!-- /TMPL_LOOP -->
!      </table></div>
  <!-- /TMPL_IF -->
  	 </div>
--- 193,197 ----
  			</tr>
  		<!-- /TMPL_LOOP -->
!      </table>
  <!-- /TMPL_IF -->
  	 </div>
***************
*** 201,204 ****
--- 203,214 ----
  	}
  }
+ 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['duplicate'].Frameworks.options[document.forms['duplicate'].Frameworks.selectedIndex].value;
+   window.location = "acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode="+fwk+"&op="+op; 
+ }
  </script>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file




From oleonard at users.sourceforge.net  Wed Jun  8 22:15:02 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:15:02 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/catalogue detail.tmpl,1.4.2.3,1.4.2.4 searchresults.tmpl,1.2,1.2.2.1
Message-ID: <E1Dg6x4-0002V2-Dd@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	detail.tmpl searchresults.tmpl 
Log Message:
Synching with default template

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/detail.tmpl,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -r1.4.2.3 -r1.4.2.4
*** detail.tmpl	16 May 2005 17:49:26 -0000	1.4.2.3
--- detail.tmpl	8 Jun 2005 20:14:59 -0000	1.4.2.4
***************
*** 22,31 ****
  			<!-- TMPL_IF NAME="additional" --><li><b>Additional Author:</b> <!-- TMPL_VAR NAME="additional" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="isbn" --><li><strong>ISBN:</strong> <!-- TMPL_VAR NAME="isbn" --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="seriestitle" --><li><b>Series Title:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- TMPL_IF NAME="volume" --><!-- TMPL_VAR NAME="volume" --><!-- /TMPL_IF --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="subject" --><li><b>Subject:</b> <!-- TMPL_VAR NAME="subject" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="copyrightdate" --><li><b>Copyright:</b> <!-- TMPL_VAR NAME="copyrightdate" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="notes" --><li><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="unititle" --><li><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="url" --><li><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a></li><!-- /TMPL_IF -->
  			<!-- Hide from NPL --><!-- TMPL_IF NAME="serial" --><li><b>Serial:</b> <!-- TMPL_VAR NAME="serial" --></li><!-- /TMPL_IF --> <!-- /Hide from NPL -->
  			<li><b>Biblio Record</b> <!-- TMPL_VAR NAME="biblionumber" --></li>
--- 22,33 ----
  			<!-- TMPL_IF NAME="additional" --><li><b>Additional Author:</b> <!-- TMPL_VAR NAME="additional" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="isbn" --><li><strong>ISBN:</strong> <!-- TMPL_VAR NAME="isbn" --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="issn" --><li><strong>ISSN:</strong> <!-- TMPL_VAR NAME="issn" --></li><!-- /TMPL_IF --><!-- TMPL_IF NAME="seriestitle" --><li><b>Series Title:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- TMPL_IF NAME="volume" --><!-- TMPL_VAR NAME="volume" --><!-- /TMPL_IF --></li><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="subjects" --><li><strong>Subject(s):</strong>
! 					<!-- TMPL_LOOP name="subjects" -->
! 						<a href="/cgi-bin/koha/search.pl?type=intra&amp;subjectitems=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP --></li>
! 					<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="copyrightdate" --><li><b>Copyright:</b> <!-- TMPL_VAR NAME="copyrightdate" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="notes" --><li><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="unititle" --><li><b>Alternate Title:</b> <!-- TMPL_VAR NAME="unititle" --></li><!-- /TMPL_IF -->
  			<!-- Hide from NPL --><!-- TMPL_IF NAME="serial" --><li><b>Serial:</b> <!-- TMPL_VAR NAME="serial" --></li><!-- /TMPL_IF --> <!-- /Hide from NPL -->
  			<li><b>Biblio Record</b> <!-- TMPL_VAR NAME="biblionumber" --></li>

Index: searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/searchresults.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** searchresults.tmpl	13 Apr 2004 16:52:55 -0000	1.2
--- searchresults.tmpl	8 Jun 2005 20:15:00 -0000	1.2.2.1
***************
*** 8,12 ****
  	You searched for <span class="ex"><!-- TMPL_VAR NAME="searchdesc" --></span>
  <!-- TMPL_ELSE -->
! 	You did not specify any seach criteria
  <!-- /TMPL_IF -->
  </h3>
--- 8,12 ----
  	You searched for <span class="ex"><!-- TMPL_VAR NAME="searchdesc" --></span>
  <!-- TMPL_ELSE -->
! 	You did not specify any search criteria
  <!-- /TMPL_IF -->
  </h3>




From oleonard at users.sourceforge.net  Wed Jun  8 22:15:29 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:15:29 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/catalogue detail.tmpl,1.5,1.6 searchresults.tmpl,1.2,1.3
Message-ID: <E1Dg6xV-0002Xr-01@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	detail.tmpl searchresults.tmpl 
Log Message:
Synching with rel_2_2.

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/detail.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** detail.tmpl	2 May 2005 20:22:24 -0000	1.5
--- detail.tmpl	8 Jun 2005 20:15:26 -0000	1.6
***************
*** 22,30 ****
  			<!-- TMPL_IF NAME="additional" --><li><b>Additional Author:</b> <!-- TMPL_VAR NAME="additional" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="isbn" --><li><strong>ISBN:</strong> <!-- TMPL_VAR NAME="isbn" --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="seriestitle" --><li><b>Series Title:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- TMPL_IF NAME="volume" --><!-- TMPL_VAR NAME="volume" --><!-- /TMPL_IF --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="subject" --><li><b>Subject:</b> <!-- TMPL_VAR NAME="subject" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="copyrightdate" --><li><b>Copyright:</b> <!-- TMPL_VAR NAME="copyrightdate" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="notes" --><li><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="unititle" --><li><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --></li><!-- /TMPL_IF -->
  			<!-- Hide from NPL --><!-- TMPL_IF NAME="serial" --><li><b>Serial:</b> <!-- TMPL_VAR NAME="serial" --></li><!-- /TMPL_IF --> <!-- /Hide from NPL -->
  			<li><b>Biblio Record</b> <!-- TMPL_VAR NAME="biblionumber" --></li>
--- 22,33 ----
  			<!-- TMPL_IF NAME="additional" --><li><b>Additional Author:</b> <!-- TMPL_VAR NAME="additional" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="isbn" --><li><strong>ISBN:</strong> <!-- TMPL_VAR NAME="isbn" --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="issn" --><li><strong>ISSN:</strong> <!-- TMPL_VAR NAME="issn" --></li><!-- /TMPL_IF --><!-- TMPL_IF NAME="seriestitle" --><li><b>Series Title:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- TMPL_IF NAME="volume" --><!-- TMPL_VAR NAME="volume" --><!-- /TMPL_IF --></li><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="subjects" --><li><strong>Subject(s):</strong>
! 					<!-- TMPL_LOOP name="subjects" -->
! 						<a href="/cgi-bin/koha/search.pl?type=intra&amp;subjectitems=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP --></li>
! 					<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="copyrightdate" --><li><b>Copyright:</b> <!-- TMPL_VAR NAME="copyrightdate" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="notes" --><li><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="unititle" --><li><b>Alternate Title:</b> <!-- TMPL_VAR NAME="unititle" --></li><!-- /TMPL_IF -->
  			<!-- Hide from NPL --><!-- TMPL_IF NAME="serial" --><li><b>Serial:</b> <!-- TMPL_VAR NAME="serial" --></li><!-- /TMPL_IF --> <!-- /Hide from NPL -->
  			<li><b>Biblio Record</b> <!-- TMPL_VAR NAME="biblionumber" --></li>

Index: searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/searchresults.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** searchresults.tmpl	13 Apr 2004 16:52:55 -0000	1.2
--- searchresults.tmpl	8 Jun 2005 20:15:26 -0000	1.3
***************
*** 8,12 ****
  	You searched for <span class="ex"><!-- TMPL_VAR NAME="searchdesc" --></span>
  <!-- TMPL_ELSE -->
! 	You did not specify any seach criteria
  <!-- /TMPL_IF -->
  </h3>
--- 8,12 ----
  	You searched for <span class="ex"><!-- TMPL_VAR NAME="searchdesc" --></span>
  <!-- TMPL_ELSE -->
! 	You did not specify any search criteria
  <!-- /TMPL_IF -->
  </h3>




From oleonard at users.sourceforge.net  Wed Jun  8 22:36:32 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:36:32 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members memberentry.tmpl,1.3.2.3,1.3.2.4
Message-ID: <E1Dg7Hs-0005Vf-Re@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21096/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
      Tag: rel_2_2
	memberentry.tmpl 
Log Message:
Synching with default template

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/memberentry.tmpl,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -C2 -r1.3.2.3 -r1.3.2.4
*** memberentry.tmpl	7 Apr 2005 17:06:16 -0000	1.3.2.3
--- memberentry.tmpl	8 Jun 2005 20:36:30 -0000	1.3.2.4
***************
*** 46,51 ****
  	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
  		<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
- 		<input type="hidden" name="joining" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
- 		<input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="expiry" -->">
  		<input type="hidden" name="type" value="borrowers">
  		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
--- 46,49 ----
***************
*** 85,105 ****
  
  	<tr><th>Addresses:</th><td colspan="4"><fieldset><legend>Mailing Address</legend><label for="streetaddress"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->><a name="address" id="address">Address:</a> </label><input type="text" id="streetaddress" name="streetaddress" size="25" value="<!-- TMPL_VAR NAME="address" -->"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->>
! <br><label for="city"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF -->><a name="#city" id="#city">City, State:</a></label> <input type="text" id="city" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF -->>
  <br><label for="zipcode">Zip Code:</label> <input type="text" id="zipcode" name="zipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="zipcode" -->"></fieldset>
  
  <fieldset><legend>Street Address (if different)</legend>
! <label for="physstreet">Address:</label><input type="text" id="physstreet" name="physstreet" size="25" value="<!-- TMPL_VAR NAME="physstreet" -->">
! <br><label for="streetcity">City, State: </label><input type="text" id="streetcity" name="streetcity" size="20" value="<!-- TMPL_VAR NAME="streetcity" -->">
! <br><label for="homezipcode">Zip Code:</label><input type="text" id="homezipcode" name="homezipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="homezipcode" -->">
  </fieldset>
  </td></tr>
  
! 	<tr><th><label for="phone">Phone (Home):</label> </th><td colspan="4"><input type="text" id="phone" name="phone" size="20" value="<!-- TMPL_VAR NAME="phone" -->"></td></tr>
! 	<tr><th><label for="phoneday">Phone (Daytime):</label> </th><td colspan="4"><input type="text" id="phoneday" name="phoneday" size="20" value="<!-- TMPL_VAR NAME="phoneday" -->"></td></tr>
! 	<tr><th><label for="faxnumber">Fax: </label></th><td colspan="4"><input type="text" id="faxnumber" name="faxnumber" size="20" value="<!-- TMPL_VAR NAME="faxnumber" -->"></td></tr>
! 	<tr><th><label for="emailaddress">Email :</label> </th><td colspan="4"><input type="text" id="emailaddress" name="emailaddress" size="40" value="<!-- TMPL_VAR NAME="emailaddress" -->"></td></tr>
  			</tr>
  	<tr><th><label for="textmessaging">Patron message:</label><p> (appears in OPAC)</p></th><td colspan="4"><textarea id="textmessaging" name="textmessaging" cols="30" rows="3"><!-- TMPL_VAR NAME="textmessaging" --></textarea></td></tr>
  	<tr><th><label for="borrowernotes">Circulation note:</label> <p>(appears in Circulation)</p> </th><td colspan="4"><textarea id="borrowernotes" name="borrowernotes" cols="30" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td></tr>
  			</table></div>
  
--- 83,118 ----
  
  	<tr><th>Addresses:</th><td colspan="4"><fieldset><legend>Mailing Address</legend><label for="streetaddress"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->><a name="address" id="address">Address:</a> </label><input type="text" id="streetaddress" name="streetaddress" size="25" value="<!-- TMPL_VAR NAME="address" -->"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->>
! <br><label for="city"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF -->><a name="#city" id="#city">City, State:</a></label> <input type="text" id="city" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF --> />
  <br><label for="zipcode">Zip Code:</label> <input type="text" id="zipcode" name="zipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="zipcode" -->"></fieldset>
  
  <fieldset><legend>Street Address (if different)</legend>
! <label for="physstreet">Address:</label><input type="text" id="physstreet" name="physstreet" size="25" value="<!-- TMPL_VAR NAME="physstreet" -->" />
! <br><label for="streetcity">City, State: </label><input type="text" id="streetcity" name="streetcity" size="20" value="<!-- TMPL_VAR NAME="streetcity" -->" />
! <br><label for="homezipcode">Zip Code:</label><input type="text" id="homezipcode" name="homezipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="homezipcode" -->" /> 
  </fieldset>
  </td></tr>
  
! 	<tr><th><label for="phone">Phone (Home):</label> </th><td colspan="4"><input type="text" id="phone" name="phone" size="20" value="<!-- TMPL_VAR NAME="phone" -->" /></td></tr>
! 	<tr><th><label for="phoneday">Phone (Daytime):</label> </th><td colspan="4"><input type="text" id="phoneday" name="phoneday" size="20" value="<!-- TMPL_VAR NAME="phoneday" -->" /></td></tr>
! 	<tr><th><label for="faxnumber">Fax: </label></th><td colspan="4"><input type="text" id="faxnumber" name="faxnumber" size="20" value="<!-- TMPL_VAR NAME="faxnumber" -->" /></td></tr>
! 	<tr><th><label for="emailaddress">Email :</label> </th><td colspan="4"><input type="text" id="emailaddress" name="emailaddress" size="40" value="<!-- TMPL_VAR NAME="emailaddress" -->" /></td></tr>
  			</tr>
  	<tr><th><label for="textmessaging">Patron message:</label><p> (appears in OPAC)</p></th><td colspan="4"><textarea id="textmessaging" name="textmessaging" cols="30" rows="3"><!-- TMPL_VAR NAME="textmessaging" --></textarea></td></tr>
  	<tr><th><label for="borrowernotes">Circulation note:</label> <p>(appears in Circulation)</p> </th><td colspan="4"><textarea id="borrowernotes" name="borrowernotes" cols="30" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td></tr>
+ 
+ 			<tr>
+ 				<!-- TMPL_IF NAME="addAction" -->
+ 					<th>Joining date (leave blank for today): </th>
+ 					<td colspan="4"><input type="text" name="joining" size="12" maxlength="10" value="<!-- TMPL_VAR name="joining" -->" /></td>
+ 				<!-- TMPL_ELSE -->
+ 					<th>Joining date: </th>
+ 					<td colspan="4"><!-- TMPL_VAR name="joining" --></td>
+ 				<!-- /TMPL_IF -->
+ 			</tr>
+ 			<tr>
+ 				<th>Expiry date (leave blank for auto calc): </th>
+ 				<td><input type="text" name="expiry" size="12" maxlength="10" value="<!-- TMPL_VAR name="expiry" -->" /></td>
+ 			</tr>
+ 
  			</table></div>
  




From oleonard at users.sourceforge.net  Wed Jun  8 22:36:34 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:36:34 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members memberentry.tmpl,1.6,1.7
Message-ID: <E1Dg7Hu-0005Vu-6R@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21086/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
	memberentry.tmpl 
Log Message:
Synching with rel_2_2.

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/memberentry.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** memberentry.tmpl	2 May 2005 20:21:12 -0000	1.6
--- memberentry.tmpl	8 Jun 2005 20:36:32 -0000	1.7
***************
*** 46,51 ****
  	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
  		<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
- 		<input type="hidden" name="joining" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
- 		<input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="expiry" -->">
  		<input type="hidden" name="type" value="borrowers">
  		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
--- 46,49 ----
***************
*** 61,65 ****
  	<!-- TMPL_UNLESS name="institution" --><tr><th><label for="title">Salutation:</label></th><td colspan="4"><!-- TMPL_VAR NAME="Mr" -->
  				<select name="title" id="title">
! 					<option <!-- TMPL_VAR NAME="title_selected_ " --> value=" ">No Title</option>
  					<option value="Miss" <!-- TMPL_VAR NAME="title_Miss" -->>Miss</option>
  					<option value="Mrs" <!-- TMPL_VAR NAME="title_Mrs" -->>Mrs</option>
--- 59,63 ----
  	<!-- TMPL_UNLESS name="institution" --><tr><th><label for="title">Salutation:</label></th><td colspan="4"><!-- TMPL_VAR NAME="Mr" -->
  				<select name="title" id="title">
! 					<option <!-- TMPL_VAR NAME="title_selected_ " --> value="">No Title</option>
  					<option value="Miss" <!-- TMPL_VAR NAME="title_Miss" -->>Miss</option>
  					<option value="Mrs" <!-- TMPL_VAR NAME="title_Mrs" -->>Mrs</option>
***************
*** 85,105 ****
  
  	<tr><th>Addresses:</th><td colspan="4"><fieldset><legend>Mailing Address</legend><label for="streetaddress"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->><a name="address" id="address">Address:</a> </label><input type="text" id="streetaddress" name="streetaddress" size="25" value="<!-- TMPL_VAR NAME="address" -->"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->>
! <br><label for="city"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF -->><a name="#city" id="#city">City, State:</a></label> <input type="text" id="city" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF -->>
  <br><label for="zipcode">Zip Code:</label> <input type="text" id="zipcode" name="zipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="zipcode" -->"></fieldset>
  
  <fieldset><legend>Street Address (if different)</legend>
! <label for="physstreet">Address:</label><input type="text" id="physstreet" name="physstreet" size="25" value="<!-- TMPL_VAR NAME="physstreet" -->">
! <br><label for="streetcity">City, State: </label><input type="text" id="streetcity" name="streetcity" size="20" value="<!-- TMPL_VAR NAME="streetcity" -->">
! <br><label for="homezipcode">Zip Code:</label><input type="text" id="homezipcode" name="homezipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="homezipcode" -->">
  </fieldset>
  </td></tr>
  
! 	<tr><th><label for="phone">Phone (Home):</label> </th><td colspan="4"><input type="text" id="phone" name="phone" size="20" value="<!-- TMPL_VAR NAME="phone" -->"></td></tr>
! 	<tr><th><label for="phoneday">Phone (Daytime):</label> </th><td colspan="4"><input type="text" id="phoneday" name="phoneday" size="20" value="<!-- TMPL_VAR NAME="phoneday" -->"></td></tr>
! 	<tr><th><label for="faxnumber">Fax: </label></th><td colspan="4"><input type="text" id="faxnumber" name="faxnumber" size="20" value="<!-- TMPL_VAR NAME="faxnumber" -->"></td></tr>
! 	<tr><th><label for="emailaddress">Email :</label> </th><td colspan="4"><input type="text" id="emailaddress" name="emailaddress" size="40" value="<!-- TMPL_VAR NAME="emailaddress" -->"></td></tr>
  			</tr>
  	<tr><th><label for="textmessaging">Patron message:</label><p> (appears in OPAC)</p></th><td colspan="4"><textarea id="textmessaging" name="textmessaging" cols="30" rows="3"><!-- TMPL_VAR NAME="textmessaging" --></textarea></td></tr>
  	<tr><th><label for="borrowernotes">Circulation note:</label> <p>(appears in Circulation)</p> </th><td colspan="4"><textarea id="borrowernotes" name="borrowernotes" cols="30" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td></tr>
  			</table></div>
  
--- 83,118 ----
  
  	<tr><th>Addresses:</th><td colspan="4"><fieldset><legend>Mailing Address</legend><label for="streetaddress"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->><a name="address" id="address">Address:</a> </label><input type="text" id="streetaddress" name="streetaddress" size="25" value="<!-- TMPL_VAR NAME="address" -->"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->>
! <br><label for="city"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF -->><a name="#city" id="#city">City, State:</a></label> <input type="text" id="city" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF --> />
  <br><label for="zipcode">Zip Code:</label> <input type="text" id="zipcode" name="zipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="zipcode" -->"></fieldset>
  
  <fieldset><legend>Street Address (if different)</legend>
! <label for="physstreet">Address:</label><input type="text" id="physstreet" name="physstreet" size="25" value="<!-- TMPL_VAR NAME="physstreet" -->" />
! <br><label for="streetcity">City, State: </label><input type="text" id="streetcity" name="streetcity" size="20" value="<!-- TMPL_VAR NAME="streetcity" -->" />
! <br><label for="homezipcode">Zip Code:</label><input type="text" id="homezipcode" name="homezipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="homezipcode" -->" /> 
  </fieldset>
  </td></tr>
  
! 	<tr><th><label for="phone">Phone (Home):</label> </th><td colspan="4"><input type="text" id="phone" name="phone" size="20" value="<!-- TMPL_VAR NAME="phone" -->" /></td></tr>
! 	<tr><th><label for="phoneday">Phone (Daytime):</label> </th><td colspan="4"><input type="text" id="phoneday" name="phoneday" size="20" value="<!-- TMPL_VAR NAME="phoneday" -->" /></td></tr>
! 	<tr><th><label for="faxnumber">Fax: </label></th><td colspan="4"><input type="text" id="faxnumber" name="faxnumber" size="20" value="<!-- TMPL_VAR NAME="faxnumber" -->" /></td></tr>
! 	<tr><th><label for="emailaddress">Email :</label> </th><td colspan="4"><input type="text" id="emailaddress" name="emailaddress" size="40" value="<!-- TMPL_VAR NAME="emailaddress" -->" /></td></tr>
  			</tr>
  	<tr><th><label for="textmessaging">Patron message:</label><p> (appears in OPAC)</p></th><td colspan="4"><textarea id="textmessaging" name="textmessaging" cols="30" rows="3"><!-- TMPL_VAR NAME="textmessaging" --></textarea></td></tr>
  	<tr><th><label for="borrowernotes">Circulation note:</label> <p>(appears in Circulation)</p> </th><td colspan="4"><textarea id="borrowernotes" name="borrowernotes" cols="30" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td></tr>
+ 
+ 			<tr>
+ 				<!-- TMPL_IF NAME="addAction" -->
+ 					<th>Joining date (leave blank for today): </th>
+ 					<td colspan="4"><input type="text" name="joining" size="12" maxlength="10" value="<!-- TMPL_VAR name="joining" -->" /></td>
+ 				<!-- TMPL_ELSE -->
+ 					<th>Joining date: </th>
+ 					<td colspan="4"><!-- TMPL_VAR name="joining" --></td>
+ 				<!-- /TMPL_IF -->
+ 			</tr>
+ 			<tr>
+ 				<th>Expiry date (leave blank for auto calc): </th>
+ 				<td><input type="text" name="expiry" size="12" maxlength="10" value="<!-- TMPL_VAR name="expiry" -->" /></td>
+ 			</tr>
+ 
  			</table></div>
  




From oleonard at users.sourceforge.net  Wed Jun  8 22:43:11 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:43:11 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ circulation.tmpl,1.15,1.16
Message-ID: <E1Dg7OJ-0006bM-ED@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25311/koha-tmpl/intranet-tmpl/npl/en/circ

Modified Files:
	circulation.tmpl 
Log Message:
Synching with rel_2_2.

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** circulation.tmpl	3 May 2005 18:32:12 -0000	1.15
--- circulation.tmpl	8 Jun 2005 20:43:07 -0000	1.16
***************
*** 47,50 ****
--- 47,53 ----
  				<li>No more renewals possible</li>
  			<!-- /TMPL_IF -->
+ 			<!-- TMPL_IF NAME="EXPIRED" -->
+ 				<li>Patron's card is expired</li>
+ 			<!-- /TMPL_IF -->
  			</ul>
  		</div>




From oleonard at users.sourceforge.net  Wed Jun  8 22:43:14 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:43:14 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ circulation.tmpl,1.6.2.9,1.6.2.10
Message-ID: <E1Dg7OM-0006bq-Uh@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25358/koha-tmpl/intranet-tmpl/npl/en/circ

Modified Files:
      Tag: rel_2_2
	circulation.tmpl 
Log Message:
Synching with default template

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl,v
retrieving revision 1.6.2.9
retrieving revision 1.6.2.10
diff -C2 -r1.6.2.9 -r1.6.2.10
*** circulation.tmpl	3 May 2005 18:31:34 -0000	1.6.2.9
--- circulation.tmpl	8 Jun 2005 20:43:12 -0000	1.6.2.10
***************
*** 47,50 ****
--- 47,53 ----
  				<li>No more renewals possible</li>
  			<!-- /TMPL_IF -->
+ 			<!-- TMPL_IF NAME="EXPIRED" -->
+ 				<li>Patron's card is expired</li>
+ 			<!-- /TMPL_IF -->
  			</ul>
  		</div>




From oleonard at users.sourceforge.net  Wed Jun  8 22:53:14 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:53:14 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/reports borrowers_out.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1Dg7Y2-0007tK-RU@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30287/koha-tmpl/intranet-tmpl/npl/en/reports

Modified Files:
      Tag: rel_2_2
	borrowers_out.tmpl 
Log Message:
Synching with default template

Index: borrowers_out.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports/borrowers_out.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** borrowers_out.tmpl	21 Apr 2005 19:38:11 -0000	1.1.2.1
--- borrowers_out.tmpl	8 Jun 2005 20:53:12 -0000	1.1.2.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
***************
*** 77,80 ****
--- 77,96 ----
  				<td><input type="text" name="Filter" id="borrowercategory" value="" /></td>
  			</tr>
+ 						<tr class="hilighted">
+ 				<td>&nbsp;</td>
+ 				<td>&nbsp;</td>
+ 				<td><label for="issuessince">Without issues since:</label> </td>
+ 				<td><input size="10" id="to" id="issuessince" name="Filter" value="" type="text" />
+ 						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" />
+ 							<script type="text/javascript">
+ 								Calendar.setup(
+ 									{
+ 										inputField : "to",
+ 										ifFormat : "%Y-%m-%d",
+ 										button : "openCalendarTo",
+ 									}
+ 								);
+ 							</script></td>
+ 			</tr>
  		</tbody>
  	</table>




From oleonard at users.sourceforge.net  Wed Jun  8 22:53:16 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:53:16 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/reports borrowers_out.tmpl,1.2,1.3
Message-ID: <E1Dg7Y4-0007ti-8r@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30276/koha-tmpl/intranet-tmpl/npl/en/reports

Modified Files:
	borrowers_out.tmpl 
Log Message:
Synching with rel_2_2.

Index: borrowers_out.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports/borrowers_out.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** borrowers_out.tmpl	2 May 2005 20:08:28 -0000	1.2
--- borrowers_out.tmpl	8 Jun 2005 20:53:14 -0000	1.3
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
***************
*** 77,80 ****
--- 77,96 ----
  				<td><input type="text" name="Filter" id="borrowercategory" value="" /></td>
  			</tr>
+ 						<tr class="hilighted">
+ 				<td>&nbsp;</td>
+ 				<td>&nbsp;</td>
+ 				<td><label for="issuessince">Without issues since:</label> </td>
+ 				<td><input size="10" id="to" id="issuessince" name="Filter" value="" type="text" />
+ 						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" />
+ 							<script type="text/javascript">
+ 								Calendar.setup(
+ 									{
+ 										inputField : "to",
+ 										ifFormat : "%Y-%m-%d",
+ 										button : "openCalendarTo",
+ 									}
+ 								);
+ 							</script></td>
+ 			</tr>
  		</tbody>
  	</table>




From oleonard at users.sourceforge.net  Wed Jun  8 23:22:30 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 14:22:30 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters checkmarc.tmpl,1.2.2.1,1.2.2.2 marctagstructure.tmpl,1.2.2.3,1.2.2.4
Message-ID: <E1Dg80M-0003Nl-OY@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12916/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
      Tag: rel_2_2
	checkmarc.tmpl marctagstructure.tmpl 
Log Message:
Synching with default template

Index: checkmarc.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/checkmarc.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** checkmarc.tmpl	4 Feb 2005 19:24:46 -0000	1.2.2.1
--- checkmarc.tmpl	8 Jun 2005 21:22:22 -0000	1.2.2.2
***************
*** 41,44 ****
--- 41,56 ----
  <!-- /TMPL_IF -->
  <!-- -->
+ 	<!-- TMPL_IF NAME="itemtags" -->
+ 		<tr>
+ 			<td><b>Item tag</b></td>
+ 			<td>There is more than 1 MARC tag related to items tab (10) : <!-- TMPL_VAR name="itemtags" --></td>
+ 		</tr>
+ 	<!-- TMPL_ELSE -->
+ 		<tr>
+ 			<td>OK</td>
+ 			<td><i>Only 1 MARC tag mapped to items</i></td>
+ 		</tr>
+ 	<!-- /TMPL_IF -->
+ 	<!--  -->
  <!-- TMPL_IF name="itemtype" -->
  	<tr>
***************
*** 97,100 ****
--- 109,128 ----
  	</tr>
  <!-- /TMPL_IF -->
+ 
+ 	<!-- TMPL_IF NAME="frameworknull" -->
+ 		<tr>
+ 			<td><b>framework values</b></td>
+ 			<td>there is a null value in a frameworkcode. Check the following tables<br/>
+ 				<li>select * from marc_subfield_structure where frameworkcode is NULL</li>
+ 				<li>select * from marc_tag_structure where frameworkcode is NULL</li>
+ 				<li>select * from marc_biblio where frameworkcode is NULL</li></td>
+ 		</tr>
+ 	<!-- TMPL_ELSE -->
+ 		<tr>
+ 			<td>OK</td>
+ 			<td><i>no NULL value in frameworkcode</i></td>
+ 		</tr>
+ 	<!-- /TMPL_IF -->
+ 
  <!-- -->
  <!-- TMPL_IF name="total" -->

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -r1.2.2.3 -r1.2.2.4
*** marctagstructure.tmpl	30 Mar 2005 19:57:22 -0000	1.2.2.3
--- marctagstructure.tmpl	8 Jun 2005 21:22:28 -0000	1.2.2.4
***************
*** 119,123 ****
  <!-- TMPL_IF NAME="else" -->
  
! <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  <label for="frameworkcode">Select a framework: </label>
  	<select id="frameworkcode" name="frameworkcode">
--- 119,123 ----
  <!-- TMPL_IF NAME="else" -->
  
! <form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  <label for="frameworkcode">Select a framework: </label>
  	<select id="frameworkcode" name="frameworkcode">
***************
*** 130,133 ****
--- 130,136 ----
  	<input type="text" name="searchfield" id="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
  	<input type="submit" value="Search" class="submit">
+ 			<p>
+ 		<label for="select_display">Display only used Tags/Subfields</label> <input type="checkbox" name="select_display" id="select_display" value="True"<!-- TMPL_IF Name="select_display"--> checked="checked"<!--/TMPL_IF -->  onchange="this.form.submit();" />
+ 		</p>
  </form>
  <p class="note">NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script.</p>
***************
*** 143,146 ****
--- 146,176 ----
  		<th>Edit</th>
  		<th>Delete</th>
+ 				<tr>
+ 	<!-- TMPL_IF NAME="select_display" -->
+ 		<!-- TMPL_LOOP NAME="loop" -->
+ 			<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
+ 			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
+ 			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
+ 			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+ 			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+ 			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
+ 			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
+ 			<td><a href="<!-- TMPL_VAR NAME="edit" -->">Edit</a></td>
+ 			<td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
+ 		</tr>
+ 			<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
+ 			<td>
+ 				&nbsp;
+ 			</td>
+ 			<td colspan="7">
+ 				<!-- TMPL_LOOP NAME="subfields" -->
+ 					<p>	Tab:<!-- TMPL_VAR NAME="tab" --> | $<!-- TMPL_VAR NAME="tagsubfield" -->
+ 							<!-- TMPL_VAR NAME="liblibrarian" --> <!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!--/TMPL_IF --><!-- TMPL_IF NAME="repeatable" -->, repeatable<!-- /TMPL_IF --><!-- TMPL_IF NAME="mandatory" -->, Mandatory<!-- /TMPL_IF --><!-- TMPL_IF NAME="seealso" -->, See <!-- TMPL_VAR name="seealso" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authorised_value" -->, <!-- TMPL_VAR NAME="authorised_value" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authtypecode" -->, <!-- TMPL_VAR NAME="authtypecode" --><!--/TMPL_IF --><!-- TMPL_IF NAME="value_builder" -->, <!-- TMPL_VAR NAME="value_builder" --><!--/TMPL_IF -->
+ 					</p>
+ 				<!-- /TMPL_LOOP -->
+ 			</td>
+ 		</tr>
+ 		<!-- /TMPL_LOOP -->
+ 	<!-- TMPL_ELSE -->
  	<!-- TMPL_LOOP NAME="loop" -->
  	<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
***************
*** 155,161 ****
  	</tr>
  	<!-- /TMPL_LOOP -->
  	</table>
  <div id="pages">	<!-- TMPL_IF NAME="isprevpage" -->
! 			<a class="pages" href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">&lt;&lt; Previous</a>
  		<!-- /TMPL_IF --><form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<input type="hidden" name="op" value="add_form">
--- 185,192 ----
  	</tr>
  	<!-- /TMPL_LOOP -->
+ 	<!--/TMPL_IF -->
  	</table>
  <div id="pages">	<!-- TMPL_IF NAME="isprevpage" -->
! 			<a class="pages" href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">&lt;&lt; Previous</a>
  		<!-- /TMPL_IF --><form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<input type="hidden" name="op" value="add_form">
***************
*** 166,171 ****
  	</form>
  		<!-- TMPL_IF NAME="nextpage" -->
! 			<a class="pages" href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">Next &gt;&gt;</a>
  		<!-- /TMPL_IF --></div>
  </div>
  <!-- /TMPL_IF -->
--- 197,207 ----
  	</form>
  		<!-- TMPL_IF NAME="nextpage" -->
! 			<a class="pages" href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">Next &gt;&gt;</a>
  		<!-- /TMPL_IF --></div>
+ 		<script language="javascript" type="text/javascript">
+ 	function ChangeDisplay(checkbox) {
+ 		window.
+ 	}
+ </script>
  </div>
  <!-- /TMPL_IF -->




From oleonard at users.sourceforge.net  Wed Jun  8 23:23:46 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 14:23:46 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters checkmarc.tmpl,1.3,1.4 marctagstructure.tmpl,1.7,1.8
Message-ID: <E1Dg81a-0003b3-2D@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13662/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
	checkmarc.tmpl marctagstructure.tmpl 
Log Message:
Synching with rel_2_2.

Index: checkmarc.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/checkmarc.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** checkmarc.tmpl	4 Feb 2005 19:26:14 -0000	1.3
--- checkmarc.tmpl	8 Jun 2005 21:23:43 -0000	1.4
***************
*** 41,44 ****
--- 41,56 ----
  <!-- /TMPL_IF -->
  <!-- -->
+ 	<!-- TMPL_IF NAME="itemtags" -->
+ 		<tr>
+ 			<td><b>Item tag</b></td>
+ 			<td>There is more than 1 MARC tag related to items tab (10) : <!-- TMPL_VAR name="itemtags" --></td>
+ 		</tr>
+ 	<!-- TMPL_ELSE -->
+ 		<tr>
+ 			<td>OK</td>
+ 			<td><i>Only 1 MARC tag mapped to items</i></td>
+ 		</tr>
+ 	<!-- /TMPL_IF -->
+ 	<!--  -->
  <!-- TMPL_IF name="itemtype" -->
  	<tr>
***************
*** 97,100 ****
--- 109,128 ----
  	</tr>
  <!-- /TMPL_IF -->
+ 
+ 	<!-- TMPL_IF NAME="frameworknull" -->
+ 		<tr>
+ 			<td><b>framework values</b></td>
+ 			<td>there is a null value in a frameworkcode. Check the following tables<br/>
+ 				<li>select * from marc_subfield_structure where frameworkcode is NULL</li>
+ 				<li>select * from marc_tag_structure where frameworkcode is NULL</li>
+ 				<li>select * from marc_biblio where frameworkcode is NULL</li></td>
+ 		</tr>
+ 	<!-- TMPL_ELSE -->
+ 		<tr>
+ 			<td>OK</td>
+ 			<td><i>no NULL value in frameworkcode</i></td>
+ 		</tr>
+ 	<!-- /TMPL_IF -->
+ 
  <!-- -->
  <!-- TMPL_IF name="total" -->

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** marctagstructure.tmpl	2 May 2005 19:56:15 -0000	1.7
--- marctagstructure.tmpl	8 Jun 2005 21:23:43 -0000	1.8
***************
*** 119,123 ****
  <!-- TMPL_IF NAME="else" -->
  
! <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  <label for="frameworkcode">Select a framework: </label>
  	<select id="frameworkcode" name="frameworkcode">
--- 119,123 ----
  <!-- TMPL_IF NAME="else" -->
  
! <form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  <label for="frameworkcode">Select a framework: </label>
  	<select id="frameworkcode" name="frameworkcode">
***************
*** 130,133 ****
--- 130,136 ----
  	<input type="text" name="searchfield" id="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
  	<input type="submit" value="Search" class="submit">
+ 			<p>
+ 		<label for="select_display">Display only used Tags/Subfields</label> <input type="checkbox" name="select_display" id="select_display" value="True"<!-- TMPL_IF Name="select_display"--> checked="checked"<!--/TMPL_IF -->  onchange="this.form.submit();" />
+ 		</p>
  </form>
  <p class="note">NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script.</p>
***************
*** 143,146 ****
--- 146,176 ----
  		<th>Edit</th>
  		<th>Delete</th>
+ 				<tr>
+ 	<!-- TMPL_IF NAME="select_display" -->
+ 		<!-- TMPL_LOOP NAME="loop" -->
+ 			<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
+ 			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
+ 			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
+ 			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+ 			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+ 			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
+ 			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
+ 			<td><a href="<!-- TMPL_VAR NAME="edit" -->">Edit</a></td>
+ 			<td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
+ 		</tr>
+ 			<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
+ 			<td>
+ 				&nbsp;
+ 			</td>
+ 			<td colspan="7">
+ 				<!-- TMPL_LOOP NAME="subfields" -->
+ 					<p>	Tab:<!-- TMPL_VAR NAME="tab" --> | $<!-- TMPL_VAR NAME="tagsubfield" -->
+ 							<!-- TMPL_VAR NAME="liblibrarian" --> <!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!--/TMPL_IF --><!-- TMPL_IF NAME="repeatable" -->, repeatable<!-- /TMPL_IF --><!-- TMPL_IF NAME="mandatory" -->, Mandatory<!-- /TMPL_IF --><!-- TMPL_IF NAME="seealso" -->, See <!-- TMPL_VAR name="seealso" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authorised_value" -->, <!-- TMPL_VAR NAME="authorised_value" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authtypecode" -->, <!-- TMPL_VAR NAME="authtypecode" --><!--/TMPL_IF --><!-- TMPL_IF NAME="value_builder" -->, <!-- TMPL_VAR NAME="value_builder" --><!--/TMPL_IF -->
+ 					</p>
+ 				<!-- /TMPL_LOOP -->
+ 			</td>
+ 		</tr>
+ 		<!-- /TMPL_LOOP -->
+ 	<!-- TMPL_ELSE -->
  	<!-- TMPL_LOOP NAME="loop" -->
  	<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
***************
*** 155,161 ****
  	</tr>
  	<!-- /TMPL_LOOP -->
  	</table>
  <div id="pages">	<!-- TMPL_IF NAME="isprevpage" -->
! 			<a class="pages" href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">&lt;&lt; Previous</a>
  		<!-- /TMPL_IF --><form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<input type="hidden" name="op" value="add_form">
--- 185,192 ----
  	</tr>
  	<!-- /TMPL_LOOP -->
+ 	<!--/TMPL_IF -->
  	</table>
  <div id="pages">	<!-- TMPL_IF NAME="isprevpage" -->
! 			<a class="pages" href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">&lt;&lt; Previous</a>
  		<!-- /TMPL_IF --><form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<input type="hidden" name="op" value="add_form">
***************
*** 166,171 ****
  	</form>
  		<!-- TMPL_IF NAME="nextpage" -->
! 			<a class="pages" href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">Next &gt;&gt;</a>
  		<!-- /TMPL_IF --></div>
  </div>
  <!-- /TMPL_IF -->
--- 197,207 ----
  	</form>
  		<!-- TMPL_IF NAME="nextpage" -->
! 			<a class="pages" href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">Next &gt;&gt;</a>
  		<!-- /TMPL_IF --></div>
+ 		<script language="javascript" type="text/javascript">
+ 	function ChangeDisplay(checkbox) {
+ 		window.
+ 	}
+ </script>
  </div>
  <!-- /TMPL_IF -->




From hellen at users.sourceforge.net  Thu Jun  9 10:37:44 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 09 Jun 2005 01:37:44 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/acqui acqui-home.tmpl,1.3,1.4
Message-ID: <E1DgIXo-0002UP-D5@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	acqui-home.tmpl 
Log Message:
translated by hellen

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui/acqui-home.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** acqui-home.tmpl	5 Jun 2005 18:10:12 -0000	1.3
--- acqui-home.tmpl	9 Jun 2005 08:37:41 -0000	1.4
***************
*** 1,3 ****
--- 1,4 ----
  <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
+ <!-- version 1.14.2.1, Tue Jun 7 13:17:38 200, geaendert 080605 by hellen -->
  <div id="mainbloc">
  
***************
*** 5,8 ****
--- 6,12 ----
  <div id="bloc25">
  	<h2 class="acquisition">Beginnen, Eingangsbearbeitung, &auml;ndern von Bestellungen</h2>
+ 	<!-- TMPL_IF name="nobudget" -->
+   	                 <p class="problem">Sie m&uuml;ssen unter Parameter ein Budget definieren</p>
+   	         <!-- TMPL_ELSE -->
  		<form action="/cgi-bin/koha/acqui/order.pl" method="post">
  			Lieferantenname: <input type="text"  size="25"   name="supplier">
***************
*** 10,13 ****
--- 14,18 ----
  		</form>
  	<p>oder <a href="histsearch.pl" class="button acquisition"> Suche Bestellhistorie</a></p>
+ 	<!-- /TMPL_IF -->
  </div>
  
***************
*** 40,48 ****
  	<form action="/cgi-bin/koha/search.pl">
  		<h2 class="acquisition">Etats und Budgets</h2>
  		<table class="noborder">
  			<tr>
  				<th class="acquisition">Etats</th>
! 				<th class="acquisition">Total</th>
! 				<th class="acquisition">geschenkt</th>
  				<th class="acquisition">Verausgabt</th>
  				<th class="acquisition">Verf&uuml;gbar </th>
--- 45,56 ----
  	<form action="/cgi-bin/koha/search.pl">
  		<h2 class="acquisition">Etats und Budgets</h2>
+ 		<!-- TMPL_IF name="nobudget" -->
+   	                 <p class="problem">Sie m&uuml;sen unter Parameter ein Budget definieren</p>
+   	         <!-- TMPL_ELSE -->
  		<table class="noborder">
  			<tr>
  				<th class="acquisition">Etats</th>
! 				<th class="acquisition">Gesamt</th>
! 				<th class="acquisition">Geschenkt</th>
  				<th class="acquisition">Verausgabt</th>
  				<th class="acquisition">Verf&uuml;gbar </th>
***************
*** 66,72 ****
  		</table>
  		<p>
! Benutzen Sie den "neu laden"-Button des Browsers zur Anzeige der aktuellen Werte. Die angezeigten Werte sind nur ungef&auml;hre Werte, da bei Zahlung eines Betrags der dann aktuelle Wechselkurs berechnet wird.
  		</p>
! 	</form>
  </div>
  
--- 74,80 ----
  		</table>
  		<p>
! Benutzen Sie den "neu laden"-Button des Browsers zur Anzeige der aktuellen Betr&auml;ge. Die angezeigten Werte sind nur ungef&auml;hre Werte, da bei Zahlung eines Betrags der dann aktuelle Wechselkurs berechnet wird.
  		</p>
! 	<!-- /TMPL_IF -->
  </div>
  
***************
*** 74,81 ****
  	<h2 class="acquisition">HILFE Bestellungen</h2>
  	<ul>
! 		<p>Zu Beginn einer Bestellung, eines direkten Kaufs oder Eingabe eines Geschenks, suchen Sie zuerst nach einem Lieferanten. Falls n&ouml;tig, f&uuml;gen Sie einen neuen hinzu.</p>
  		<p>W&auml;hlen Sie dann einen Einkausfkorb aus bzw. legen Sie einen neuen Korb an. Beachten Sie bitte, dass der neue Korb dem angemeldeten Benutzer zugeordnet wird.</p>
  		<p>Sie m&uuml;ssen das zu bestellende Exemplar einem bestehenden Biblio zuordnen, oder erst einen neuen Biblio anlegen.</p>
! 		<p>Um einen Einkaufskorb zu schlie&szlig;en, klicken Sie auf "Einkaufkorb anzeigen", dann auf "Einkaufskorb best&auml;tigen".</p>
  	</ul>
  </div>
--- 82,89 ----
  	<h2 class="acquisition">HILFE Bestellungen</h2>
  	<ul>
! 		<p>Zu Beginn eines Erwerbungsvorgangs, gleichg&uuml;ltig, ob es eine Bestellung, ein direkter Kauf oder ein Geschenk ist, mu&szlig; zuerst ein Lieferant aufgerufen werden. Falls n&ouml;tig, f&uuml;gen Sie einen neuen hinzu.</p>
  		<p>W&auml;hlen Sie dann einen Einkausfkorb aus bzw. legen Sie einen neuen Korb an. Beachten Sie bitte, dass der neue Korb dem angemeldeten Benutzer zugeordnet wird.</p>
  		<p>Sie m&uuml;ssen das zu bestellende Exemplar einem bestehenden Biblio zuordnen, oder erst einen neuen Biblio anlegen.</p>
! 		<p>Um einen Einkaufskorb zu schlie&szlig;en, klicken Sie auf "Einkaufskorb anzeigen", dann auf "Einkaufskorb best&auml;tigen".</p>
  	</ul>
  </div>




From hellen at users.sourceforge.net  Thu Jun  9 10:37:44 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 09 Jun 2005 01:37:44 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/help/admin biblio_framework.tmpl,1.1,1.2
Message-ID: <E1DgIXo-0002Ua-I0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/help/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9482/koha-tmpl/intranet-tmpl/default/de/help/admin

Modified Files:
	biblio_framework.tmpl 
Log Message:
translated by hellen

Index: biblio_framework.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/help/admin/biblio_framework.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** biblio_framework.tmpl	12 May 2005 19:26:15 -0000	1.1
--- biblio_framework.tmpl	9 Jun 2005 08:37:42 -0000	1.2
***************
*** 1,6 ****
  <!-- TMPL_INCLUDE NAME="help-top.inc" -->
  	<h1>Biblio Framework</h1>
! 	<p>biblio frameworks are used to catalogue your biblios.</p>
! 	<p>Unlike Koha 2.0, in this version you can have more than 1 framework to catalogate differently various materials. You can, for example, define 1 framework for monographies, 1 framework for serials, 1 framework for URL...</p>
! 	<p>Once a framework type is created, you can clic on "MARC structure" to define the exact MARC structure. The first time, Koha will ask you to select an existing framework to copy into the new one. Thus, you don't have to define all the MARC structure</p>
! <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
--- 1,6 ----
  <!-- TMPL_INCLUDE NAME="help-top.inc" -->
  	<h1>Biblio Framework</h1>
! 	<p>Biblio Frameworks werden zur Katalogisierung ihrer Biblios ben&ouml;tigt.</p>
! 	<p>Im Gegensatz zu Koha 2.0 kann man mehr als ein Framework f&uuml;r die Katalogisierung unterschiedlicher Materialien definieren. Sie k&ouml;nnen z.B. 1 Framework f&uuml;r Monographien, 1 Framework f&uuml;r Serien, 1 Framework f&uuml;r URL's usw. einrichten.</p>
! 	<p>Ist ein Framework angelegt, klicken sie auf "MARC structure" zur Definition der speziellen MARC-Struktur. Zuerst fragt Koha sie, ob ein bereits existierendes in das neue Framework kopiert werden soll. Dies ist sinnvoll, damit nicht die komplette MARC-Struktur neu angelegt werden mu&szlig;.</p>
! <!-- TMPL_INCLUDE name="help-bottom.inc" -->




From hellen at users.sourceforge.net  Thu Jun  9 10:37:44 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 09 Jun 2005 01:37:44 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/z3950 searchresult.tmpl,1.1,1.2
Message-ID: <E1DgIXo-0002Uj-M1@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/z3950
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9482/koha-tmpl/intranet-tmpl/default/de/z3950

Modified Files:
	searchresult.tmpl 
Log Message:
translated by hellen

Index: searchresult.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/z3950/searchresult.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** searchresult.tmpl	12 May 2005 19:27:06 -0000	1.1
--- searchresult.tmpl	9 Jun 2005 08:37:42 -0000	1.2
***************
*** 47,51 ****
  				<p>Nichts gefunden</p>
  	<!-- /TMPL_IF -->
! 	<!-- TMPL_IF NAME="numberpending" --><h1 class="catalogue">Still <!-- TMPL_VAR NAME="numberpending" --> requests to go</h1><!-- /TMPL_IF -->
  	<script language="javascript" type="text/javascript">
  		function Import(GetThisOne) {
--- 47,51 ----
  				<p>Nichts gefunden</p>
  	<!-- /TMPL_IF -->
! 	<!-- TMPL_IF NAME="numberpending" --><h1 class="catalogue">Noch <!-- TMPL_VAR NAME="numberpending" --> Anfrage(n) zu erledigen</h1><!-- /TMPL_IF -->
  	<script language="javascript" type="text/javascript">
  		function Import(GetThisOne) {




From hellen at users.sourceforge.net  Thu Jun  9 10:37:44 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 09 Jun 2005 01:37:44 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/bookshelves addbookbybiblionumber.tmpl,1.2,1.3 shelves.tmpl,1.2,1.3
Message-ID: <E1DgIXo-0002UZ-H8@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/bookshelves
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9482/koha-tmpl/intranet-tmpl/default/de/bookshelves

Modified Files:
	addbookbybiblionumber.tmpl shelves.tmpl 
Log Message:
translated by hellen

Index: addbookbybiblionumber.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/bookshelves/addbookbybiblionumber.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** addbookbybiblionumber.tmpl	17 May 2005 13:21:35 -0000	1.2
--- addbookbybiblionumber.tmpl	9 Jun 2005 08:37:42 -0000	1.3
***************
*** 7,11 ****
  	<p><label>Verfasser</label><!-- TMPL_VAR NAME="author" --></p>
  	<p><label>Zum virtuellen Regal <!-- TMPL_VAR NAME="CGIbookshelves" --> hinzuf&uuml;gen</label></p>
! 	<p>oder zu einem neuen virtuellem Regal hinzuf&uuml;gen </p>
  	<p><input type="text" name="newbookshelf" maxlength=40 size=40>
  		<select name="category">
--- 7,11 ----
  	<p><label>Verfasser</label><!-- TMPL_VAR NAME="author" --></p>
  	<p><label>Zum virtuellen Regal <!-- TMPL_VAR NAME="CGIbookshelves" --> hinzuf&uuml;gen</label></p>
! 	<p>oder zu einem neuen virtuellen Regal hinzuf&uuml;gen </p>
  	<p><input type="text" name="newbookshelf" maxlength=40 size=40>
  		<select name="category">

Index: shelves.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/bookshelves/shelves.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** shelves.tmpl	17 May 2005 13:21:35 -0000	1.2
--- shelves.tmpl	9 Jun 2005 08:37:42 -0000	1.3
***************
*** 36,40 ****
  	<div id="bloc25">
  		<form>
! 		<h2 class="catalogue">Buch mittels Strichcode hinzuf&uuml;gen</h2>
  			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
  			<input type="hidden" name="modifyshelfcontents" value="1">
--- 36,40 ----
  	<div id="bloc25">
  		<form>
! 		<h2 class="catalogue">Buch mittels Barcode hinzuf&uuml;gen</h2>
  			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
  			<input type="hidden" name="modifyshelfcontents" value="1">
***************
*** 48,52 ****
  	<!-- /TMPL_IF -->
  	<div id="bloc25">
! 		<a href="shelves.pl" class="button catalogue">Shelf-Liste</a>
  	</div>
  <!-- TMPL_ELSE -->
--- 48,52 ----
  	<!-- /TMPL_IF -->
  	<div id="bloc25">
! 		<a href="shelves.pl" class="button catalogue">Regalliste</a>
  	</div>
  <!-- TMPL_ELSE -->
***************
*** 93,97 ****
  					</select>
  				</p>
! 				<p> <li>ein privates Regal wird durch Sie verwaltet und kann nur von Ihnen eingesehen werden</li>
  					<li> Ein &ouml;ffentliches Regal wird durch Sie verwaltet, kann aber von jedermann eingesehen werden.</li>
  					<li> Ein freies Regal kann von jedem Benutzer bearbeitet und betrachtet werden.</li>
--- 93,97 ----
  					</select>
  				</p>
! 				<p> <li>Ein privates Regal wird durch Sie verwaltet und kann nur von Ihnen eingesehen werden</li>
  					<li> Ein &ouml;ffentliches Regal wird durch Sie verwaltet, kann aber von jedermann eingesehen werden.</li>
  					<li> Ein freies Regal kann von jedem Benutzer bearbeitet und betrachtet werden.</li>
***************
*** 165,169 ****
  				</select>
  			</p>
! 				<p> <li>ein privates Regal wird durch Sie verwaltet und kann nur von Ihnen eingesehen werden</li>
  					<li> Ein &ouml;ffentliches Regal wird durch Sie verwaltet, kann aber von jedermann eingesehen werden.</li>
  					<li> Ein freies Regal kann von jedem Benutzer bearbeitet und betrachtet werden.</li>
--- 165,169 ----
  				</select>
  			</p>
! 				<p> <li>Ein privates Regal wird durch Sie verwaltet und kann nur von Ihnen eingesehen werden</li>
  					<li> Ein &ouml;ffentliches Regal wird durch Sie verwaltet, kann aber von jedermann eingesehen werden.</li>
  					<li> Ein freies Regal kann von jedem Benutzer bearbeitet und betrachtet werden.</li>




From hellen at users.sourceforge.net  Thu Jun  9 10:37:44 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 09 Jun 2005 01:37:44 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/help nohelp.tmpl,1.1,1.2
Message-ID: <E1DgIXo-0002Ue-KI@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/help
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9482/koha-tmpl/intranet-tmpl/default/de/help

Modified Files:
	nohelp.tmpl 
Log Message:
translated by hellen

Index: nohelp.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/help/nohelp.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** nohelp.tmpl	12 May 2005 19:26:15 -0000	1.1
--- nohelp.tmpl	9 Jun 2005 08:37:42 -0000	1.2
***************
*** 1,4 ****
  <!-- TMPL_INCLUDE NAME="help-top.inc" -->
  	<h1>Online Hilfe</h1>
! 	<p>Sorry, keine Hilfe f&uuml;r diesen Punkt</p>
! <!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
--- 1,4 ----
  <!-- TMPL_INCLUDE NAME="help-top.inc" -->
  	<h1>Online Hilfe</h1>
! 	<p>Sorry, keine Hilfe f&uuml;r diesen Punkt verf&uuml;gbar</p>
! <!-- TMPL_INCLUDE NAME="help-bottom.inc" -->




From oleonard at users.sourceforge.net  Thu Jun  9 18:19:21 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 09:19:21 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/search.marc dictionary.tmpl,NONE,1.1.2.1 search.tmpl,1.6.2.4,1.6.2.5
Message-ID: <E1DgPkX-0006i8-Ta@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	search.tmpl 
Added Files:
      Tag: rel_2_2
	dictionary.tmpl 
Log Message:
Adding authority search functionality to intranet advanced search page, to synch with default template

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Dictionary Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<div id="main-compact">
	<h1>Dictionary Search</h1>
	<div class="form"><form name="f" method="post" action="/cgi-bin/koha/search.marc/dictionary.pl">
	<input type="hidden" name="op" value="do_search" />
				<label for="keyword">Search for keyword(s): </label>
				<input type="hidden" name="marclist" value="<!-- TMPL_VAR Name="marclist" -->" />
				<input type="text" name="search" value="<!-- TMPL_VAR Name="search" -->" size="35" />
				<input type="submit" value="Start search" class="submit" />
				<input type="hidden" name="type" value="<!-- TMPL_VAR Name="type" -->" />
				<input type="hidden" name="index" value="<!-- TMPL_VAR Name="anindex" ESCAPE="URL" -->" /></form></div>

<!-- TMPL_IF Name=search -->
	<!-- TMPL_IF NAME="authresult" -->
		<div id="pages">
			<!-- TMPL_IF NAME="displayprev" --> 
					<a class="pages" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
				<!-- /TMPL_IF -->
				<!-- TMPL_LOOP NAME="numbers" -->
					<!-- TMPL_IF NAME="highlight" -->
						<span class="current"><!-- TMPL_VAR NAME="number" --></span>
					<!-- TMPL_ELSE --> 
						<a class="pages" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
					<!-- /TMPL_IF -->
				<!-- /TMPL_LOOP --> 
				<!-- TMPL_IF NAME="displaynext" -->
					<a class="pages" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">Next&gt;&gt;</a>
				<!-- /TMPL_IF -->
			</div>
			<div id="results">
			<!-- TMPL_IF NAME="nbresults" -->
					Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="nbresults" --> in Authorities<!-- TMPL_ELSE -->No results found.
			<!-- /TMPL_IF -->
			</div>
		
		<div id="resultlist">
			<table>
				<caption>Authority Results</caption>
				<tr>
					<th>Summary</th>
					<th>Used in</th>
					<th>Select</th>
				</tr>
				<!-- TMPL_LOOP NAME="authresult" -->
					<!-- TMPL_IF NAME="even" --><tr class="hilighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
					<td>
							<!-- TMPL_VAR NAME="summary" -->
						</td>
						<td>
							<!-- TMPL_VAR NAME="used" --> records(s)
						</td>
							<td>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)">Select</a> | 
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)">Sel. &amp; close</a>
						</td>
					</tr>
				<!-- /TMPL_LOOP -->
			</table>
		</div>
		<!-- TMPL_ELSE -->
			<h3>No results in Authorities</h3>
	<!-- /TMPL_IF -->
		
		
	<!-- TMPL_IF Name="catresult" -->
	<h2>Catalog Results</h2>
			<div id="results">
			<!-- TMPL_IF NAME="total" -->
					Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --> in the Catalog<!-- TMPL_ELSE -->No results found.
			<!-- /TMPL_IF -->
		</div>
			<table>
				<tr>
					<th>Summary</th>
					<th>Used in</th>
					<th>Select</th>
				</tr>
				<!-- TMPL_LOOP NAME="catresult" -->
				<!-- TMPL_IF NAME="even" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
				<td>
					<!-- TMPL_IF name="MARC_ON" -->
									<!-- TMPL_VAR NAME="value" -->
								<!-- TMPL_ELSE -->
									<!-- TMPL_VAR NAME="value" -->
								<!-- /TMPL_IF -->
					</td>
					<td>
						<!-- TMPL_VAR NAME="count" --> records(s)
					</td>
					<td>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)">Select</a> | 
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)">Sel. &amp; close</a>
					</td>
				</tr>
				<!-- /TMPL_LOOP -->
			</table>
		<div id="pages">
			<!-- TMPL_IF NAME="displayprev" --> 
					<a class="pages" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
				<!-- /TMPL_IF -->
				<!-- TMPL_LOOP NAME="numbers" -->
					<!-- TMPL_IF NAME="highlight" -->
						<span class="current"><!-- TMPL_VAR NAME="number" --></span>
					<!-- TMPL_ELSE --> 
						<a class="pages" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
					<!-- /TMPL_IF -->
				<!-- /TMPL_LOOP --> 
				<!-- TMPL_IF NAME="displaynext" -->
					<a class="pages" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">Next&gt;&gt;</a>
				<!-- /TMPL_IF -->
</div>
			<div id="results">
			<!-- TMPL_IF NAME="total" -->
					Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --> in the Catalog<!-- TMPL_ELSE -->No results found.
			<!-- /TMPL_IF -->
			</div>
		
	<!-- /TMPL_IF -->
	<script language="JavaScript" type="text/javascript">
	function SelectEntry(myentry, myindex, wclose){
		if (opener.document.f.value[myindex].value!=""){ 
			opener.document.f.value[myindex].value=opener.document.f.value[myindex].value+" "+myentry
		} else {
			opener.document.f.value[myindex].value=myentry
		}
		if (wclose == 1) {
	// 	alert("closing")
			self.close();
		}
	}
	</script>
	</div>
<!-- /TMPL_IF -->
</div>
</body>
</html>
Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc/search.tmpl,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -C2 -r1.6.2.4 -r1.6.2.5
*** search.tmpl	19 Apr 2005 19:31:16 -0000	1.6.2.4
--- search.tmpl	9 Jun 2005 16:19:19 -0000	1.6.2.5
***************
*** 28,32 ****
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="title" name="value" onchange="sql_update()" size="35" accesskey="t" /></td>
  		</tr>
  		<tr>
--- 28,34 ----
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="title" name="value" onchange="sql_update()" size="35" accesskey="t" />			<a href="javascript:Dopop('dictionary.pl?marclist=biblio.title&amp;type=intranet&amp;index=1',1)" class="button catalogue">
! 				<strong>...</strong>
! 			</a></td>
  		</tr>
  		<tr>
***************
*** 36,40 ****
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="author" name="value" onchange="sql_update()" size="35" accesskey="a" /></td>
  		</tr>
  		<tr>
--- 38,44 ----
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="author" name="value" onchange="sql_update()" size="35" accesskey="a" />			<a href="javascript:Dopop('dictionary.pl?marclist=biblio.author&amp;type=intranet&amp;index=2',2)" class="button catalogue">
! 				<strong>...</strong>
! 			</a></td>
  		</tr>
  		<tr>
***************
*** 44,48 ****
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />  
! 			<input type="text" id="subject" name="value" onchange="sql_update()" size="35" accesskey="s" /></td>
  		</tr>
  <tr><th><label for="seriestitle">Series title</label></th><td>			
--- 48,54 ----
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />  
! 			<input type="text" id="subject" name="value" onchange="sql_update()" size="35" accesskey="s" />			<a href="javascript:Dopop('dictionary.pl?marclist=bibliosubject.subject&amp;type=intranet&amp;index=3',3)" class="button catalogue">
! 				<strong>...</strong>
! 			</a></td>
  		</tr>
  <tr><th><label for="seriestitle">Series title</label></th><td>			
***************
*** 189,192 ****
--- 195,203 ----
  }
  
+ function Dopop(link,i) {
+ 	var searchstring=document.forms[4].value[i].value;
+ 	newin=window.open(link+'&amp;search='+searchstring,"popup",'width=700,height=550,toolbar=false,scrollbars=yes');
+ }
+ 
  function PopupSuggestion() {
      var strQuery="";




From hellen at users.sourceforge.net  Thu Jun  9 19:54:33 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 09 Jun 2005 10:54:33 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple additem.tmpl,1.3,1.4
Message-ID: <E1DgREf-0003J8-Ty@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	additem.tmpl 
Log Message:
translated by hellen

Index: additem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/additem.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** additem.tmpl	5 Jun 2005 14:45:17 -0000	1.3
--- additem.tmpl	9 Jun 2005 17:54:31 -0000	1.4
***************
*** 6,10 ****
  	<div class="tabbed">
  		<h1 class="catalogue">Biblionummer: <!-- TMPL_VAR NAME="biblionumber" --></h1>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Bibliografische daten bearbeiten  </a>
  		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">  Duplizieren  </a>
  		<a href="../MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  MARC  </a>
--- 6,10 ----
  	<div class="tabbed">
  		<h1 class="catalogue">Biblionummer: <!-- TMPL_VAR NAME="biblionumber" --></h1>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Bibliografische Daten bearbeiten  </a>
  		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">  Duplizieren  </a>
  		<a href="../MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  MARC  </a>




From hellen at users.sourceforge.net  Thu Jun  9 19:54:34 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 09 Jun 2005 10:54:34 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/errors 404.tmpl,1.1,1.2
Message-ID: <E1DgREg-0003JJ-8e@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12634/koha-tmpl/intranet-tmpl/default/de/errors

Modified Files:
	404.tmpl 
Log Message:
translated by hellen

Index: 404.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/errors/404.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 404.tmpl	12 May 2005 19:26:14 -0000	1.1
--- 404.tmpl	9 Jun 2005 17:54:32 -0000	1.2
***************
*** 5,11 ****
  <h2>Fehler 404</h2>
  <ul>
! <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>
--- 5,11 ----
  <h2>Fehler 404</h2>
  <ul>
! <li>Dieser Fehler besagt, dass die aufgerufene Seite nicht existiert.</li>	
! <li>Um diesen Fehler zu melden, k&ouml;nnen Sie eine Mail <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">an den Koha Administrator schicken</a>.</li>
! <li>&Uuml;ber das Men&uuml; k&ouml;nnen Sie andere Bereiche von Koha ausw&auml;hlen.</li>
  </ul>
  </div>




From hellen at users.sourceforge.net  Thu Jun  9 19:54:34 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 09 Jun 2005 10:54:34 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/parameters categorie.tmpl,1.1,1.2 issuingrules.tmpl,1.1,1.2
Message-ID: <E1DgREg-0003JY-T6@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12634/koha-tmpl/intranet-tmpl/default/de/parameters

Modified Files:
	categorie.tmpl issuingrules.tmpl 
Log Message:
translated by hellen

Index: categorie.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/categorie.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** categorie.tmpl	12 May 2005 19:26:35 -0000	1.1
--- categorie.tmpl	9 Jun 2005 17:54:32 -0000	1.2
***************
*** 97,101 ****
  			</tr>
  			<tr>
! 				<td>G&uuml;ltigkeitsdauer</td>
  				<td>
  					<input type="text" name="enrolmentperiod" size="3" maxlength="2" value="<!-- TMPL_VAR NAME="enrolmentperiod" -->"> Jahr(e)
--- 97,101 ----
  			</tr>
  			<tr>
! 				<td>G&uuml;ltigkeit</td>
  				<td>
  					<input type="text" name="enrolmentperiod" size="3" maxlength="2" value="<!-- TMPL_VAR NAME="enrolmentperiod" -->"> Jahr(e)
***************
*** 173,178 ****
  			</tr>
  			<tr>
! 				<td>G&uuml;ltigkeitsdauer</td>
! 				<td><!-- TMPL_VAR NAME="enrolmentperiod" --> Jashr(e)</td>
  			</tr>
  			<tr>
--- 173,178 ----
  			</tr>
  			<tr>
! 				<td>G&uuml;ltigkeit</td>
! 				<td><!-- TMPL_VAR NAME="enrolmentperiod" --> Jahr(e)</td>
  			</tr>
  			<tr>
***************
*** 182,186 ****
  			<tr>
  				<td>Mindestalter</td>
! 				<td><!-- TMPL_VAR NAME="dateofbirthrequired" --> Jashr(e)</td>
  			</tr>
  			<tr>
--- 182,186 ----
  			<tr>
  				<td>Mindestalter</td>
! 				<td><!-- TMPL_VAR NAME="dateofbirthrequired" --> Jahr(e)</td>
  			</tr>
  			<tr>
***************
*** 251,258 ****
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Kategorie</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Beschreibung</b></td>
! 				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>G&uuml;ltigkeitsdauer</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Geb&uuml;hr</b></td>
! 				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Obere Altersgrenze</b></td>
! 				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Mindestalter</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>&Uuml;berf&auml;llig</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Vormerkung</b></td>
--- 251,258 ----
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Kategorie</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Beschreibung</b></td>
! 				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>G&uuml;ltigkeit</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Geb&uuml;hr</b></td>
! 				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Max. Alter</b></td>
! 				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Min. Alter</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>&Uuml;berf&auml;llig</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Vormerkung</b></td>

Index: issuingrules.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/issuingrules.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** issuingrules.tmpl	12 May 2005 19:26:35 -0000	1.1
--- issuingrules.tmpl	9 Jun 2005 17:54:32 -0000	1.2
***************
*** 1,8 ****
  <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="parameters">Definition der Ausleihkonditionen f&uuml;r <!-- TMPL_VAR NAME="branch" --></h1>
  	<div id="bloc25">
  		<h2 class="parameters">TIPP f&uuml;r Ausleihen</h2>
! 		<p>Each box needs to be filled with issuelength, maxissues</p>
  		<p> - z.B.: 21,5 = 21 Tage Leihfrist und max. 5 Ausleihen</p>
  		<h2 class="parameters">TIPP f&uuml;r Mahngeb&uuml;hren</h2>
--- 1,8 ----
  <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="parameters">Definition der Ausleihkonditionen <!-- TMPL_VAR NAME="branch" --></h1>
  	<div id="bloc25">
  		<h2 class="parameters">TIPP f&uuml;r Ausleihen</h2>
! 		<p>Jedes Feld mu&szlig; mit Leihfrist und Anzahl der Ausleihen gef&uuml;llt werden</p>
  		<p> - z.B.: 21,5 = 21 Tage Leihfrist und max. 5 Ausleihen</p>
  		<h2 class="parameters">TIPP f&uuml;r Mahngeb&uuml;hren</h2>
***************
*** 17,21 ****
  		<ul>
  			<li>selbe Zweigstelle und selbe Benutzerkategorie, Medientyp *</li>
! 			<li> selbe Zweigstelle und selber Medientyp, Benutzerkategorie *</li>
  			<li>selber Medientyp und Benutzerkategorie, Zweigstelle *</li>
  			<li>&uuml;berall</li>
--- 17,21 ----
  		<ul>
  			<li>selbe Zweigstelle und selbe Benutzerkategorie, Medientyp *</li>
! 			<li>selbe Zweigstelle und selber Medientyp, Benutzerkategorie *</li>
  			<li>selber Medientyp und Benutzerkategorie, Zweigstelle *</li>
  			<li>&uuml;berall</li>




From hellen at users.sourceforge.net  Thu Jun  9 19:54:34 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 09 Jun 2005 10:54:34 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/catalogue MARCdetail.tmpl,1.3,1.4
Message-ID: <E1DgREg-0003JD-4b@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	MARCdetail.tmpl 
Log Message:
translated by hellen

Index: MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/catalogue/MARCdetail.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** MARCdetail.tmpl	8 Jun 2005 11:28:08 -0000	1.3
--- MARCdetail.tmpl	9 Jun 2005 17:54:31 -0000	1.4
***************
*** 363,367 ****
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Are you sure you want to delete this biblio?');
  	if (is_confirmed) {
  		window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";
--- 363,367 ----
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Wollen Sie diesen Biblio wirklich l&ouml;schen?');
  	if (is_confirmed) {
  		window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";




From oleonard at users.sourceforge.net  Thu Jun  9 20:21:42 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 11:21:42 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-dictionary.tmpl,NONE,1.1.2.1 opac-search.tmpl,1.1.2.6,1.1.2.7
Message-ID: <E1DgRew-00073F-9h@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-search.tmpl 
Added Files:
      Tag: rel_2_2
	opac-dictionary.tmpl 
Log Message:
Adding authority search functionality to OPAC advanced search page, to synch with default template

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Dictionary Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

<div id="window">
	<h1>Dictionary Search</h1>
	
	<div class="content-block"><form name="f" method="post" action="opac-dictionary.pl">
				<input type="hidden" name="op" value="do_search" />
				<label for="keyword">Keyword(s): </label>
				<input type="hidden" name="marclist" value="<!-- TMPL_VAR Name="marclist" -->" />
				<input type="text" name="search" value="<!-- TMPL_VAR Name="search" -->" size="20" />
				<input type="submit" value="Start search" class="submit" />
				<input type="hidden" name="type" value="<!-- TMPL_VAR Name="type" -->" />
				<input type="hidden" name="index" value="<!-- TMPL_VAR Name="anindex" ESCAPE="URL" -->" />
	</form></div>

<!-- TMPL_IF Name=search -->
	<!-- TMPL_IF NAME="authresult" -->
		<div class="pages">
			<!-- TMPL_IF NAME="displayprev" --> 
					<a class="nav" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
				<!-- /TMPL_IF -->
				<!-- TMPL_LOOP NAME="numbers" -->
					<!-- TMPL_IF NAME="highlight" -->
						<span class="current"><!-- TMPL_VAR NAME="number" --></span>
					<!-- TMPL_ELSE --> 
						<a class="nav" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
					<!-- /TMPL_IF -->
				<!-- /TMPL_LOOP --> 
				<!-- TMPL_IF NAME="displaynext" -->
					<a class="nav" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">Next&gt;&gt;</a>
				<!-- /TMPL_IF -->
</div>
			<div id="results">
			<!-- TMPL_IF NAME="nbresults" -->
					Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="nbresults" --> in Authorities.<!-- TMPL_ELSE -->No results found in Authorities.
			<!-- /TMPL_IF -->
		</div>

			<table>
				<tr>
					<th colspan="3">Authorities</th>
				</tr>
				<tr>
					<th>Summary</th>
					<th>Used in</th>
					<th>Select</th>
				</tr>
				<!-- TMPL_LOOP NAME="authresult" -->
					<!-- TMPL_IF NAME="even" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
							<td>
							<!-- TMPL_VAR NAME="summary" -->
						</td>
						<td>
							<!-- TMPL_VAR NAME="used" --> record(s)
						</td>
							<td>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)" class="button catalogue">Select</a> | 
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)" class="button catalogue">Sel &amp; close</a>
						</td>
					</tr>
				<!-- /TMPL_LOOP -->
			</table>
		<!-- TMPL_ELSE -->
			<h4>No results in Authorities</h4>
	<!-- /TMPL_IF -->
		
		
	<!-- TMPL_IF Name=catresult -->	
	<h3>Catalog Search Results</h3>
		<div id="results">
			<!-- TMPL_IF NAME="total" -->
					Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --> in the catalog<!-- TMPL_ELSE -->No results found in the catalog.
			<!-- /TMPL_IF -->
		</div>

			<table>
				<tr>
					<th>Summary</th>
					<th>Used in</th>
					<th>Select</th>
				</tr>
				<!-- TMPL_LOOP NAME="catresult" -->
				<!-- TMPL_IF NAME="even" --><tr class="highlight"><!-- TMPL_ELSE --><!-- /TMPL_IF -->
				<td>
							<!-- TMPL_IF name="MARC_ON" -->
									<!-- TMPL_VAR NAME="value" -->
								<!-- TMPL_ELSE -->
									<!-- TMPL_VAR NAME="value" -->
								<!-- /TMPL_IF -->
					</td>
					<td>
						<!-- TMPL_VAR NAME="count" --> record(s)
					</td>
					<td>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)" class="button catalogue">Select</a> | 
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)" class="button catalogue">Sel &amp; close</a>
					</td>
				</tr>
				<!-- /TMPL_LOOP -->
			</table>

		<div class="pages">
			<!-- TMPL_IF NAME="displayprev" --> 
					<a class="nav" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
				<!-- /TMPL_IF -->
				<!-- TMPL_LOOP NAME="numbers" -->
					<!-- TMPL_IF NAME="highlight" -->
						<span class="current"><!-- TMPL_VAR NAME="number" --></span>
					<!-- TMPL_ELSE --> 
						<a class="nav" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
					<!-- /TMPL_IF -->
				<!-- /TMPL_LOOP --> 
				<!-- TMPL_IF NAME="displaynext" -->
					<a class="nav" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">Next&gt;&gt;</a>
				<!-- /TMPL_IF -->

			<div id="results">
			<!-- TMPL_IF NAME="total" -->
					Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --> in the catalog.<!-- TMPL_ELSE -->No results found in the catalog.
			<!-- /TMPL_IF -->
		</div>
		
	<!-- /TMPL_IF -->
	<script language="JavaScript" type="text/javascript">
	function SelectEntry(myentry, myindex, wclose){
		if (opener.document.f.value[myindex].value!=""){ 
			opener.document.f.value[myindex].value=opener.document.f.value[myindex].value+" "+myentry
		} else {
			opener.document.f.value[myindex].value=myentry
		}
		if (wclose == 1) {
	// 	alert("closing")
			self.close();
		}
	}
	</script>
<!-- /TMPL_IF -->

</div>

</body>
</html>
Index: opac-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-search.tmpl,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -r1.1.2.6 -r1.1.2.7
*** opac-search.tmpl	21 Apr 2005 20:06:55 -0000	1.1.2.6
--- opac-search.tmpl	9 Jun 2005 18:21:40 -0000	1.1.2.7
***************
*** 51,60 ****
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="title" name="value" /></td></tr>
  <tr><th><label for="author">Author</label></th><td><input type="hidden" name="marclist" value="biblio.author" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="author" name="value" /></td></tr>
  <tr><th><label for="subject">Subject</label></th><td>			
  			<input type="hidden" name="marclist" value="bibliosubject.subject" />
--- 51,60 ----
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="title" name="value" /><a href="javascript:Dopop('opac-dictionary.pl?marclist=biblio.title&amp;type=intranet&amp;index=1',1)"><strong>...</strong></a></td></tr>
  <tr><th><label for="author">Author</label></th><td><input type="hidden" name="marclist" value="biblio.author" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="author" name="value" /><a href="javascript:Dopop('opac-dictionary.pl?marclist=biblio.author&amp;type=intranet&amp;index=2',2)"><strong>...</strong></a></td></tr>
  <tr><th><label for="subject">Subject</label></th><td>			
  			<input type="hidden" name="marclist" value="bibliosubject.subject" />
***************
*** 62,66 ****
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />  
! 			<input type="text" id="subject" name="value" size="35" /></td></tr>
  <tr><th><label for="seriestitle">Series title</label></th><td>			
  			<input type="hidden" name="marclist" value="biblio.seriestitle" />
--- 62,66 ----
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />  
! 			<input type="text" id="subject" name="value" size="35" /><a href="javascript:Dopop('opac-dictionary.pl?marclist=bibliosubject.subject&amp;type=intranet&amp;index=3',3)"><strong>...</strong></a></td></tr>
  <tr><th><label for="seriestitle">Series title</label></th><td>			
  			<input type="hidden" name="marclist" value="biblio.seriestitle" />




From oleonard at users.sourceforge.net  Thu Jun  9 21:21:13 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 12:21:13 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-detail.tmpl,1.1.2.3,1.1.2.4
Message-ID: <E1DgSaX-00072T-7t@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-detail.tmpl 
Log Message:
Bugfix for display problem

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** opac-detail.tmpl	17 Mar 2005 22:19:54 -0000	1.1.2.3
--- opac-detail.tmpl	9 Jun 2005 19:21:10 -0000	1.1.2.4
***************
*** 7,17 ****
  <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
  <div class="details">
! <!-- Display for NPL // <div class="detail-sidebar">
! <!-- TMPL_IF NAME="isbn" --><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn" -->.01.MZZZZZZZ.jpg" alt="Book Cover Image" /><!-- /TMPL_IF -->  //Display for NPL -->
  <div class="operations">
  <ul>
  <!-- TMPL_UNLESS NAME="norequests" --><li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Place Reserve</a></li><!-- /TMPL_UNLESS -->
  <li><a class="detail" href="/cgi-bin/koha/opac-MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">MARC View</a></li>
! <!-- Hide from NPL // <li><a class="isbd" href="/cgi-bin/koha/opac-ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD</a></li> //Hide from NPL -->
  <li><a class="print" href="/cgi-bin/koha/opac-detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Print</a></li>
  <!-- TMPL_IF name="virtualshelves" --><li><a class="shelf" href="/cgi-bin/koha/opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Add to My Book List</a></li><!-- /TMPL_IF -->
--- 7,17 ----
  <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
  <div class="details">
! <div class="detail-sidebar">
! <!-- Display for NPL // <!-- TMPL_IF NAME="isbn" --><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn" -->.01.MZZZZZZZ.jpg" alt="Book Cover Image" /><!-- /TMPL_IF -->  //Display for NPL -->
  <div class="operations">
  <ul>
  <!-- TMPL_UNLESS NAME="norequests" --><li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Place Reserve</a></li><!-- /TMPL_UNLESS -->
  <li><a class="detail" href="/cgi-bin/koha/opac-MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">MARC View</a></li>
! <!-- Hide from NPL --> <li><a class="isbd" href="/cgi-bin/koha/opac-ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD</a></li> <!-- Hide from NPL -->
  <li><a class="print" href="/cgi-bin/koha/opac-detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Print</a></li>
  <!-- TMPL_IF name="virtualshelves" --><li><a class="shelf" href="/cgi-bin/koha/opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Add to My Book List</a></li><!-- /TMPL_IF -->




From oleonard at users.sourceforge.net  Thu Jun  9 21:21:19 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 12:21:19 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-detail.tmpl,1.3,1.4
Message-ID: <E1DgSad-00073Q-Ur@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac-detail.tmpl 
Log Message:
Bugfix for display problem, enabling Amazon cover images

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-detail.tmpl	25 Jan 2005 22:47:21 -0000	1.3
--- opac-detail.tmpl	9 Jun 2005 19:21:17 -0000	1.4
***************
*** 7,22 ****
  <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
  <div class="details">
! <!-- Display for NPL 			<div style="float: right; padding: 5px;">
! <img src="/cgi-bin/koha/imgcheck.pl?image_location=/usr/local/images2/<!-- TMPL_VAR NAME="isbn" -->.jpg" alt="Book Cover Image" />
  </div>
!  /Display for NPL --><h2><!-- TMPL_VAR NAME="title" --></h2>
! <!-- TMPL_IF NAME="author" --><h3 class="author">By <!-- TMPL_VAR NAME="author" --></h3><!-- /TMPL_IF --> 
  
  <table>
! <!-- TMPL_IF NAME="subtitle" --><tr><th>Subtitle: </th><td><!-- TMPL_VAR NAME="subtitle" --></td></tr><!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="abstract" --><tr><th>Format:</th><td><!-- TMPL_VAR NAME="abstract" --></td></tr><!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="copyrightdate" -->
      <tr><th>Copyright:</th><td><!-- TMPL_VAR NAME="copyrightdate" --></td></tr>
  <!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="isbn" -->
  	    <tr><th>ISBN:</th><td><!-- TMPL_VAR NAME="isbn" --></td></tr>
--- 7,38 ----
  <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
  <div class="details">
! <div class="detail-sidebar">
! <!-- Display for NPL // <!-- TMPL_IF NAME="isbn" --><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn" -->.01.MZZZZZZZ.jpg" alt="Book Cover Image" /><!-- /TMPL_IF -->  //Display for NPL -->
! <div class="operations">
! <ul>
! <!-- TMPL_UNLESS NAME="norequests" --><li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Place Reserve</a></li><!-- /TMPL_UNLESS -->
! <li><a class="detail" href="/cgi-bin/koha/opac-MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">MARC View</a></li>
! <!-- Hide from NPL --> <li><a class="isbd" href="/cgi-bin/koha/opac-ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD</a></li> <!-- Hide from NPL -->
! <li><a class="print" href="/cgi-bin/koha/opac-detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Print</a></li>
! <!-- TMPL_IF name="virtualshelves" --><li><a class="shelf" href="/cgi-bin/koha/opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Add to My Book List</a></li><!-- /TMPL_IF -->
! <li><a class="cart" href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Add to My Book Bag</a></li>
! </ul>
  </div>
! <div class="further">
! <h4>Search for this title in:</h4>
! <ul><!-- Display for NPL // <li><a href="http://search3.webfeat.org/cgi-bin/webfeat.dll?Command=Search&BypassSessData=yes&noserial=1&Databases=wf_sirsdiscover,wf_elibrary2_e,wf_ebonline,wf_healthsourceconsumer,wf_masterfileprem,wf_newspapersource&wf_cat=0&Client_ID=oplin&wf_all_years=yes&wf_field1=wf_keyword&wf_term1=<!-- TMPL_VAR NAME="title" -->&rurl=http%3A//www.oplin.org/&wut_code=OH0156">Local Databases (OPLIN)</a></li> //Display for NPL -->
! <li><a href="http://www.google.com/search?q=<!-- TMPL_VAR NAME="title" -->%20england+site:worldcatlibraries.org">Other Libraries(WorldCat)</a></li>
! <li><a href="http://www.scholar.google.com/scholar?q=<!-- TMPL_VAR NAME="title" -->">Other Databases (Google Scholar)</a></li></ul></div>
! </div>
! <h2><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="subtitle" --> <span class="subtitle"><!-- TMPL_VAR NAME="subtitle" --></span><!-- /TMPL_IF --></h2>
! <!-- TMPL_IF NAME="author" --><h3 class="author">By <a href="/cgi-bin/koha/opac-search.pl?marclist=biblio.author&and_or=and&excluding=&operator=contains&value=<!-- TMPL_VAR NAME="author" -->.&resultsperpage=20&orderby=biblio.title&op=do_search"><!-- TMPL_VAR NAME="author" --></a></h3><!-- /TMPL_IF --> 
  
  <table>
! 
  <!-- TMPL_IF NAME="abstract" --><tr><th>Format:</th><td><!-- TMPL_VAR NAME="abstract" --></td></tr><!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="copyrightdate" -->
      <tr><th>Copyright:</th><td><!-- TMPL_VAR NAME="copyrightdate" --></td></tr>
  <!-- /TMPL_IF -->
+ 			<!-- TMPL_IF NAME="seriestitle" --><tr><th>Series Title:</th><td><a href="/cgi-bin/koha/opac-search.pl?marclist=biblio.seriestitle&and_or=and&excluding=&operator=contains&value=<!-- TMPL_VAR NAME="seriestitle" ESCAPE=URL -->.&resultsperpage=20&orderby=biblio.title&op=do_search"><!-- TMPL_VAR NAME="seriestitle" --></a><!-- TMPL_IF NAME="volume" --><!-- TMPL_VAR NAME="volume" --><!-- /TMPL_IF --></td></tr><!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="isbn" -->
  	    <tr><th>ISBN:</th><td><!-- TMPL_VAR NAME="isbn" --></td></tr>
***************
*** 31,38 ****
  	<tr><th>Physical Details: </th><td><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></td></tr>
  <!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="notes" -->
! <tr><th>Notes:</th><td><div class="notes"><!-- TMPL_VAR NAME="notes" --></div></td></tr>
! 	<!-- /TMPL_IF -->
! 	<!-- /TMPL_LOOP -->
  	
  <!-- TMPL_UNLESS NAME="MARCSUBJCTS" -->
--- 47,58 ----
  	<tr><th>Physical Details: </th><td><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></td></tr>
  <!-- /TMPL_IF -->
+ <!-- /TMPL_LOOP -->
+ 
+ <!-- TMPL_UNLESS NAME="MARCNOTES" -->
+ <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
  <!-- TMPL_IF NAME="notes" -->
! <tr><th>Notes:</th><td><div class="notes"><!-- TMPL_VAR NAME="notes" --></div></td></tr><!-- /TMPL_IF -->
! <!-- /TMPL_LOOP -->
! <!-- /TMPL_UNLESS -->
  	
  <!-- TMPL_UNLESS NAME="MARCSUBJCTS" -->
***************
*** 42,47 ****
  <!-- /TMPL_UNLESS -->
  
! <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
!  <tr><th>Record No.:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr> <!-- /TMPL_LOOP -->
  
  <!-- TMPL_IF NAME="MARCNOTES" -->
--- 62,67 ----
  <!-- /TMPL_UNLESS -->
  
! <!-- Hide from NPL --> <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
!  <tr><th>Record No.:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr> <!-- /TMPL_LOOP --> <!-- Hide from NPL -->
  
  <!-- TMPL_IF NAME="MARCNOTES" -->
***************
*** 56,76 ****
  	<!-- /TMPL_IF -->
  </table>
! 
! <!-- TMPL_UNLESS NAME="norequests" -->
!     <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
!     <input type="submit" name="submit"  value="Place Reserve" class="icon reserve" />
!     <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
!     </form>
! <!-- /TMPL_UNLESS -->
! 
! <form class="inline" action="opac-MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon detail" value="MARC View" /></form>
! 
! <form class="inline" action="opac-ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon isbd" value="ISBD" /></form>
! 
! <form class="inline" action="opac-detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon print" value="Print" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form>
! 
! <form class="inline" action="opac-addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="icon shelf" value="Add to Shelf" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form>
! 
! <form class="inline"><input type="submit" class="icon cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
  </div>
  
--- 76,80 ----
  	<!-- /TMPL_IF -->
  </table>
! <br clear="right" />
  </div>
  




From oleonard at users.sourceforge.net  Thu Jun  9 21:41:02 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 12:41:02 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull subscription-renew.tmpl,1.1,1.1.2.1
Message-ID: <E1DgSti-0001T0-OE@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5611/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
      Tag: rel_2_2
	subscription-renew.tmpl 
Log Message:
Fixing to conform with NPL template design

Index: subscription-renew.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-renew.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** subscription-renew.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- subscription-renew.tmpl	9 Jun 2005 19:41:00 -0000	1.1.2.1
***************
*** 1,20 ****
! <!-- TMPL_INCLUDE NAME="main-top-blank.inc" -->
! <div>
  
! <h1>subscription renewal for <!-- TMPL_VAR name="bibliotitle" --></h1>
  
! <form name="f" method="post">
! 	<div>
! 		<input type="hidden" name="op" value="renew">
! 		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
! 		<p><label>start date</label><input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->"></p>
! 		<p>Subscription length :</p>
! 		<p><label>Number of num</label><input type="text" name="numberlength" value="<!-- TMPL_VAR name="numberlength" -->"></p>
! 		<p><label>Number of weeks</label><input type="text" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></p>
! 		<p><label>Number of months</label><input type="text" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></p>
! 		<p>Note for the librarian that will manage your renewal request</p>
! 		<ul><textarea name="note" rows="10" cols="60"></textarea></ul>
! 		<input type="submit" value="Request a renewal" class="submit">
! 	</div>
  </form>
  </div>
--- 1,19 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Subscription Renewal for <!-- TMPL_VAR name="bibliotitle" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <div id="main-compact">
  
! <h1>Subscription Renewal for <!-- TMPL_VAR name="bibliotitle" --></h1>
  
! <form name="f" method="post" action="subscription-renew.pl">
! 	<div class="data">
! 		<table><tr><th><label>Start Date: </label></th><td><input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" /><input type="hidden" name="op" value="renew" /><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /></td></tr></table>	
! 		
! 	<table><caption>Subscription Length:</caption>
! 	<tr><th><label for="numberlength">Number of Issues: </label></th><td><input type="text" name="numberlength" id="numberlength" value="<!-- TMPL_VAR name="numberlength" -->"></td></tr>
! 	<tr><th><label for="weeklength">Number of Weeks: </label></th><td><input type="text" name="weeklength" id="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></td></tr>
! 	<tr><th><label for="monthlength">Number of Months: </label></th><td><input type="text" name="monthlength" id="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></td></tr>
! 	<tr><th><label for="note">Comments for the librarian that will manage your renewal request:</label></th><td><textarea name="note" id="note" rows="3" cols="30"></textarea></td></tr>
! 	</table>
! 	<p><input type="submit" value="Request a renewal" class="submit" /></p>
! </div>
  </form>
  </div>




From oleonard at users.sourceforge.net  Thu Jun  9 21:41:46 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 12:41:46 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull subscription-renew.tmpl,1.1,1.2
Message-ID: <E1DgSuQ-0001aM-Jo@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6075/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
	subscription-renew.tmpl 
Log Message:
Fixing to conform with NPL template design

Index: subscription-renew.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-renew.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** subscription-renew.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- subscription-renew.tmpl	9 Jun 2005 19:41:44 -0000	1.2
***************
*** 1,20 ****
! <!-- TMPL_INCLUDE NAME="main-top-blank.inc" -->
! <div>
  
! <h1>subscription renewal for <!-- TMPL_VAR name="bibliotitle" --></h1>
  
! <form name="f" method="post">
! 	<div>
! 		<input type="hidden" name="op" value="renew">
! 		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
! 		<p><label>start date</label><input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->"></p>
! 		<p>Subscription length :</p>
! 		<p><label>Number of num</label><input type="text" name="numberlength" value="<!-- TMPL_VAR name="numberlength" -->"></p>
! 		<p><label>Number of weeks</label><input type="text" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></p>
! 		<p><label>Number of months</label><input type="text" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></p>
! 		<p>Note for the librarian that will manage your renewal request</p>
! 		<ul><textarea name="note" rows="10" cols="60"></textarea></ul>
! 		<input type="submit" value="Request a renewal" class="submit">
! 	</div>
  </form>
  </div>
--- 1,19 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Subscription Renewal for <!-- TMPL_VAR name="bibliotitle" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <div id="main-compact">
  
! <h1>Subscription Renewal for <!-- TMPL_VAR name="bibliotitle" --></h1>
  
! <form name="f" method="post" action="subscription-renew.pl">
! 	<div class="data">
! 		<table><tr><th><label>Start Date: </label></th><td><input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" /><input type="hidden" name="op" value="renew" /><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /></td></tr></table>	
! 		
! 	<table><caption>Subscription Length:</caption>
! 	<tr><th><label for="numberlength">Number of Issues: </label></th><td><input type="text" name="numberlength" id="numberlength" value="<!-- TMPL_VAR name="numberlength" -->"></td></tr>
! 	<tr><th><label for="weeklength">Number of Weeks: </label></th><td><input type="text" name="weeklength" id="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></td></tr>
! 	<tr><th><label for="monthlength">Number of Months: </label></th><td><input type="text" name="monthlength" id="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></td></tr>
! 	<tr><th><label for="note">Comments for the librarian that will manage your renewal request:</label></th><td><textarea name="note" id="note" rows="3" cols="30"></textarea></td></tr>
! 	</table>
! 	<p><input type="submit" value="Request a renewal" class="submit" /></p>
! </div>
  </form>
  </div>




From oleonard at users.sourceforge.net  Thu Jun  9 23:16:22 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 14:16:22 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-full-serial-issues.tmpl,NONE,1.1.2.1
Message-ID: <E1DgUNy-0007DL-Q2@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
      Tag: rel_2_2
	opac-full-serial-issues.tmpl 
Log Message:
Full view for opac-serials.  Includes tabbed view ported from addbiblio in the intranet, but still haven't figured out how to get the container div to extend to the bottom of the content

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Serials
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!--TMPL_INCLUDE NAME="masthead_adv.inc" -->
<!--TMPL_INCLUDE NAME="navigation.inc" -->



<!-- TMPL_UNLESS name="popup" -->
<div id="main">
	<h2>Subscription information for <em><!-- TMPL_VAR name="bibliotitle" --></em></h2>
	<form action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon brief" value="Normal View" /></form>
<!-- /TMPL_UNLESS -->

	<div class="tabs">
	<!-- TMPL_LOOP NAME="years" -->
		<!-- TMPL_IF NAME="year" -->
			<a href="#" onclick="active(<!-- TMPL_VAR NAME="year" -->); return false;" id="link<!-- TMPL_VAR NAME="year" -->"><!-- TMPL_VAR NAME="year" --></a>
		<!-- /TMPL_IF -->
	<!-- /TMPL_LOOP -->
	</div>

	<!-- TMPL_LOOP NAME="years" -->
	<div name="<!-- TMPL_VAR NAME="year" -->" id="<!-- TMPL_VAR NAME="year" -->" class="tab" <!--TMPL_IF Name="first" -->style="visibility:visible"<!--/TMPL_IF -->>
		<table>
			<caption><!-- TMPL_VAR NAME="year" --> Issues</caption>
			<tr>
				<th> Date
				</th>
				<th> Number
				</th>
				<th> Status
				</th>
			</tr>
			<!-- TMPL_LOOP Name="serials" -->
			<tr>
				<td>
					<!-- TMPL_VAR Name="planneddate" -->
				</td>
				<td>
					<!-- TMPL_VAR Name="serialseq" -->
				</td>
				<td>
					<!-- TMPL_IF Name="status1" -->Arrived<!-- /TMPL_IF -->
					<!-- TMPL_IF Name="status2" -->Waited<!-- /TMPL_IF -->
					<!-- TMPL_IF Name="status3" -->Late<!-- /TMPL_IF -->
					<!-- TMPL_IF Name="status4" -->Missing<!-- /TMPL_IF -->
				</td>
			</tr>
			<!-- /TMPL_LOOP -->
		</table>
	</div>
	<!--/TMPL_LOOP -->
</div>
<script language="JavaScript" type="text/javascript">
function active(numlayer)
{
	for (i=<!--TMPL_VAR Name="yearmin"-->; i<=<!--TMPL_VAR Name="yearmax"-->; i++ ) {
		ong = i;
		link = "link"+i;
		if (numlayer==i) {
			document.getElementById(ong).style.visibility="visible";
			document.getElementById(link).style.color="#000066";
			document.getElementById(link).style.backgroundColor="#FFFFCC";
		} else {
			document.getElementById(ong).style.visibility="hidden";
			if (document.getElementById(link)) {
			document.getElementById(link).style.color="#669999";
			document.getElementById(link).style.backgroundColor="#D8DEB8";
			}
		}
	}
}
<!-- TMPL_LOOP name="years" -->
<!-- TMPL_IF NAME="first" -->
	active(<!-- TMPL_VAR NAME="year" -->);
<!-- /TMPL_IF -->
	<!--/TMPL_LOOP -->
</script>
</body>
</html>




From oleonard at users.sourceforge.net  Thu Jun  9 23:16:56 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 14:16:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-full-serial-issues.tmpl,1.1,1.2
Message-ID: <E1DgUOW-0007Gj-0u@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	opac-full-serial-issues.tmpl 
Log Message:
Full view for opac-serials.  Includes tabbed view ported from addbiblio in the intranet, but still haven't figured out how to get the container div to extend to the bottom of the content





From oleonard at users.sourceforge.net  Thu Jun  9 23:17:34 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 14:17:34 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes marc-editor.css,1.1,1.1.2.1
Message-ID: <E1DgUP8-0007M9-T1@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	marc-editor.css 
Log Message:
Updated to work with full serials display

Index: marc-editor.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/marc-editor.css,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** marc-editor.css	20 Oct 2004 19:15:06 -0000	1.1
--- marc-editor.css	9 Jun 2005 21:17:31 -0000	1.1.2.1
***************
*** 1,41 ****
  div.tabs {
! 	width:10px;
! 	position:absolute;
! 	margin-left:50px;
! 	margin-top:120px;
  }
  
  div.tabs a {
  	display:block;
! 	font-size: small;
! 	border: thin solid black;
! 	margin-right: 2px;
! 	padding: 10px 10px;
! 	-moz-border-radius: 5px 0px 0px 5px;
  }
  
  div.tab {
! 	background-color: #FFFFCC;
  	display: block;
  	visibility:hidden;
! 	position:absolute;
! 
! }
! td {
! 	border:0px;
  }
  
! .MARCtag { /* style for tag definition (700 - Statement of responsability) */
! 	font-weight:bold;
! 	color:#FF6600;
! 	background-color:FFFFFF;
! 	background-image:none;
! 	border-bottom: 1px solid #999900;
! 	margin-right:30%;
  }
  
! .labelsubfield { /* style for each subfield (like : a Publication year), just before the biblio subfield */
! 	float:left;
! 	width: 12em;
! 	margin-left:30px;
  }
--- 1,91 ----
+ div.tabbed {
+ 	/*border : 1px solid red;
+ 	position: absolute;*/
+ 	margin-left:5%;
+ 	width:90%;
+ /*	display:block;*/
+ }
+ 
  div.tabs {
! /*	border : 1px solid aqua;*/
! 	float : left;
! 	margin : 5px 0 0 0;
! /*	position:absolute;
! 	margin-left: .5em;
! 	margin-top:110px;*/
  }
  
  div.tabs a {
  	display:block;
! 	background-color: #D8DEB8;
! 	color: #000066;
! 	font-weight : bold;
! 	text-decoration : none;
! 	border-bottom : 1px solid #999933;
! 	border-left : 1px solid #999933;
! 	border-right : 1px solid #FFFFCC;
! 	border-top : 1px solid #FFFFCC;
! 	margin : 0 0 2px 0;
! 	padding: 10px 5px 10px 5px;
! 	
! }
! 
! div.tabs a:hover {
! 	background-color : #CCFF99;
! 	border-left : 1px solid #000066;
! 	border-bottom : 1px solid #000066;
  }
  
  div.tab {
! 	background-color : #FFFFCC;
! 	border : 1px solid #D8DEB8;
! 	border-top : 1px solid #FFFFCC;
  	display: block;
  	visibility:hidden;
! 	position : absolute;
! 	margin : 5px 0 0 55px;
! 	padding : 3px 3px 3px 10px;
! 	width : 70%;
! 	/*margin-top:110px;*/
  }
  
! /* style for tag definition (e.g. 700 - Statement of responsibility) */
! .MARCtag { 
! 	clear : left;
! 	color : #000000;
! 	background-color : #FFFFCC;
! 	border-top : 7px solid #FFFFCC;
! 	border-bottom : thin solid #CCCC99;
! 	font-weight : bold;
! 	font-size : .8em;
! 	margin-top : 5px;
  }
  
! div.tab p {
! 	margin : 3px;
! }	
! 
! /* style for each subfield (e.g.: Publication year), just before the biblio subfield */
! .labelsubfield { 
! 	background-color : #FFFFE1;
! /*	border : 1px solid red;*/
! 	clear : left;
! 	float : left;
! 	font-size : .8em;
! 	font-weight : normal;
! 	width : 12em;
! 	margin-left : 30px;
! 	display : inline;
  }
+ 
+ #loading {
+ 	position: absolute;
+ 	top: 3em;
+ 	left: 3em;
+ 	padding: 1em;
+ 	mozopacity: 50%;
+ 	background-color: #FFFFFF;
+ 	border: 10px solid #CCCC99;
+ 	font-size: 1.5em;
+ 	z-index: 999;
+ 	}
\ No newline at end of file




From oleonard at users.sourceforge.net  Thu Jun  9 23:17:56 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 14:17:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes marc-editor.css,1.1,1.2
Message-ID: <E1DgUPU-0007PV-6d@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	marc-editor.css 
Log Message:
Updated to work with full serials display

Index: marc-editor.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/marc-editor.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** marc-editor.css	20 Oct 2004 19:15:06 -0000	1.1
--- marc-editor.css	9 Jun 2005 21:17:54 -0000	1.2
***************
*** 1,41 ****
  div.tabs {
! 	width:10px;
! 	position:absolute;
! 	margin-left:50px;
! 	margin-top:120px;
  }
  
  div.tabs a {
  	display:block;
! 	font-size: small;
! 	border: thin solid black;
! 	margin-right: 2px;
! 	padding: 10px 10px;
! 	-moz-border-radius: 5px 0px 0px 5px;
  }
  
  div.tab {
! 	background-color: #FFFFCC;
  	display: block;
  	visibility:hidden;
! 	position:absolute;
! 
! }
! td {
! 	border:0px;
  }
  
! .MARCtag { /* style for tag definition (700 - Statement of responsability) */
! 	font-weight:bold;
! 	color:#FF6600;
! 	background-color:FFFFFF;
! 	background-image:none;
! 	border-bottom: 1px solid #999900;
! 	margin-right:30%;
  }
  
! .labelsubfield { /* style for each subfield (like : a Publication year), just before the biblio subfield */
! 	float:left;
! 	width: 12em;
! 	margin-left:30px;
  }
--- 1,91 ----
+ div.tabbed {
+ 	/*border : 1px solid red;
+ 	position: absolute;*/
+ 	margin-left:5%;
+ 	width:90%;
+ /*	display:block;*/
+ }
+ 
  div.tabs {
! /*	border : 1px solid aqua;*/
! 	float : left;
! 	margin : 5px 0 0 0;
! /*	position:absolute;
! 	margin-left: .5em;
! 	margin-top:110px;*/
  }
  
  div.tabs a {
  	display:block;
! 	background-color: #D8DEB8;
! 	color: #000066;
! 	font-weight : bold;
! 	text-decoration : none;
! 	border-bottom : 1px solid #999933;
! 	border-left : 1px solid #999933;
! 	border-right : 1px solid #FFFFCC;
! 	border-top : 1px solid #FFFFCC;
! 	margin : 0 0 2px 0;
! 	padding: 10px 5px 10px 5px;
! 	
! }
! 
! div.tabs a:hover {
! 	background-color : #CCFF99;
! 	border-left : 1px solid #000066;
! 	border-bottom : 1px solid #000066;
  }
  
  div.tab {
! 	background-color : #FFFFCC;
! 	border : 1px solid #D8DEB8;
! 	border-top : 1px solid #FFFFCC;
  	display: block;
  	visibility:hidden;
! 	position : absolute;
! 	margin : 5px 0 0 55px;
! 	padding : 3px 3px 3px 10px;
! 	width : 70%;
! 	/*margin-top:110px;*/
  }
  
! /* style for tag definition (e.g. 700 - Statement of responsibility) */
! .MARCtag { 
! 	clear : left;
! 	color : #000000;
! 	background-color : #FFFFCC;
! 	border-top : 7px solid #FFFFCC;
! 	border-bottom : thin solid #CCCC99;
! 	font-weight : bold;
! 	font-size : .8em;
! 	margin-top : 5px;
  }
  
! div.tab p {
! 	margin : 3px;
! }	
! 
! /* style for each subfield (e.g.: Publication year), just before the biblio subfield */
! .labelsubfield { 
! 	background-color : #FFFFE1;
! /*	border : 1px solid red;*/
! 	clear : left;
! 	float : left;
! 	font-size : .8em;
! 	font-weight : normal;
! 	width : 12em;
! 	margin-left : 30px;
! 	display : inline;
  }
+ 
+ #loading {
+ 	position: absolute;
+ 	top: 3em;
+ 	left: 3em;
+ 	padding: 1em;
+ 	mozopacity: 50%;
+ 	background-color: #FFFFFF;
+ 	border: 10px solid #CCCC99;
+ 	font-size: 1.5em;
+ 	z-index: 999;
+ 	}
\ No newline at end of file




From oleonard at users.sourceforge.net  Thu Jun  9 23:18:50 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 14:18:50 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes doc-head-close.inc,1.1.2.1,1.1.2.2
Message-ID: <E1DgUQM-0007W1-Gh@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	doc-head-close.inc 
Log Message:
Including marc-editor.css for full serials display

Index: doc-head-close.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/doc-head-close.inc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** doc-head-close.inc	17 Mar 2005 21:36:49 -0000	1.1.2.1
--- doc-head-close.inc	9 Jun 2005 21:18:44 -0000	1.1.2.2
***************
*** 5,8 ****
--- 5,9 ----
  <style type="text/css"> 
  	@import url(<TMPL_VAR NAME="themelang">/includes/opac.css);
+ 	@import url(<TMPL_VAR NAME="themelang">/includes/marc-editor.css);	
  </style>
  <script type="text/javascript" language="javascript" src="<TMPL_VAR NAME="themelang">/includes/script.js"></script>




From oleonard at users.sourceforge.net  Thu Jun  9 23:19:08 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 14:19:08 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes doc-head-close.inc,1.1,1.2
Message-ID: <E1DgUQe-0007XL-SM@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	doc-head-close.inc 
Log Message:
Including marc-editor.css for full serials display

Index: doc-head-close.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/doc-head-close.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** doc-head-close.inc	20 Oct 2004 19:15:06 -0000	1.1
--- doc-head-close.inc	9 Jun 2005 21:19:06 -0000	1.2
***************
*** 2,7 ****
--- 2,9 ----
  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
  <meta http-equiv="Content-Language" content="en-us" />
+ <link rel="shortcut icon" href="<TMPL_VAR NAME="themelang">/includes/favicon.ico" type="image/x-icon" />
  <style type="text/css"> 
  	@import url(<TMPL_VAR NAME="themelang">/includes/opac.css);
+ 	@import url(<TMPL_VAR NAME="themelang">/includes/marc-editor.css);	
  </style>
  <script type="text/javascript" language="javascript" src="<TMPL_VAR NAME="themelang">/includes/script.js"></script>




From oleonard at users.sourceforge.net  Thu Jun  9 23:20:55 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 14:20:55 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes intranet.css,1.5.2.9,1.5.2.10
Message-ID: <E1DgUSN-0007o4-C4@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29940/koha-tmpl/intranet-tmpl/npl/en/includes

Modified Files:
      Tag: rel_2_2
	intranet.css 
Log Message:
Adding 'control box' styles for MARC detail screens

Index: intranet.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/intranet.css,v
retrieving revision 1.5.2.9
retrieving revision 1.5.2.10
diff -C2 -r1.5.2.9 -r1.5.2.10
*** intranet.css	20 Apr 2005 21:30:48 -0000	1.5.2.9
--- intranet.css	9 Jun 2005 21:20:53 -0000	1.5.2.10
***************
*** 624,628 ****
  	margin : 3px 0px 5px 0px;
  	padding : 0px;
! 	width : 95%;
  }
  
--- 624,628 ----
  	margin : 3px 0px 5px 0px;
  	padding : 0px;
! 	width : auto;
  }
  
***************
*** 1229,1231 ****
--- 1229,1244 ----
  .accesskey {
  	text-decoration : underline;
+ }
+ 
+ div#controls {
+ 	float: right;
+ 	margin-left : .7em;
+ 	width : 15%;
+ }
+ 
+ div#controls form {
+ 	background-color : #FFFFCC;
+ 	font-size : 80%;
+ 	margin : .3em 0;
+ 	padding : .3em;
  }
\ No newline at end of file




From hdl at users.sourceforge.net  Fri Jun 10 10:40:11 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 10 Jun 2005 01:40:11 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ selectbranchprinter.tmpl,1.6,1.6.2.1 branchtransfers.tmpl,1.12,1.12.2.1
Message-ID: <E1Dgf3j-0005IV-Ts@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	selectbranchprinter.tmpl branchtransfers.tmpl 
Log Message:
Fixing : css class error on titles.

Index: selectbranchprinter.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/selectbranchprinter.tmpl,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** selectbranchprinter.tmpl	19 Jul 2004 19:58:38 -0000	1.6
--- selectbranchprinter.tmpl	10 Jun 2005 08:40:09 -0000	1.6.2.1
***************
*** 2,6 ****
  
  <div id="mainbloc">
! <h1>Circulation: Select Printer and Branch Settings</h1>
  
  <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
--- 2,6 ----
  
  <div id="mainbloc">
! <h1 class="circulation">Circulation: Select Printer and Branch Settings</h1>
  
  <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
***************
*** 30,34 ****
  <!-- /TMPL_IF --></p>
  <p><input type="hidden" name="setcookies" value="1">
! <input type="submit" value="Submit" type="changesettings" class="button"></p>
  </form>
  
--- 30,34 ----
  <!-- /TMPL_IF --></p>
  <p><input type="hidden" name="setcookies" value="1">
! <input type="submit" value="Submit" type="changesettings" class="button circulation"></p>
  </form>
  

Index: branchtransfers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -r1.12 -r1.12.2.1
*** branchtransfers.tmpl	5 Nov 2004 10:18:24 -0000	1.12
--- branchtransfers.tmpl	10 Jun 2005 08:40:09 -0000	1.12.2.1
***************
*** 1,15 ****
  <!-- TMPL_INCLUDE Name="circulation-top.inc" -->
  <div id="mainbloc">
- <div class="bloc25">
- <a class="button" href="circulation.pl">
- Next Borrower</a>
- <a class="button" href="returns.pl">
- Returns</a>
- </div>
  
! <h1>Circulation: Transfers</h1>
  <b>Branch:</b> <!-- TMPL_VAR NAME="genbrname" --> &nbsp;
  <b>Printer:</b> <!-- TMPL_VAR NAME="genprname" -->
! <a href="selectbranchprinter.pl" class="button">Change Settings</a>
  <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
  <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
--- 1,9 ----
  <!-- TMPL_INCLUDE Name="circulation-top.inc" -->
  <div id="mainbloc">
  
! <h1 class="circulation">Circulation: Transfers</h1>
  <b>Branch:</b> <!-- TMPL_VAR NAME="genbrname" --> &nbsp;
  <b>Printer:</b> <!-- TMPL_VAR NAME="genprname" -->
! <a href="selectbranchprinter.pl" class="button circulation">Change Settings</a>
  <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
  <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
***************
*** 17,21 ****
  <!-- TMPL_IF Name="found" -->
  	<table>
! 	<tr><th>Reserve Found</th></tr>
  	<tr><td>
  	<!-- TMPL_IF Name="reserved" -->
--- 11,15 ----
  <!-- TMPL_IF Name="found" -->
  	<table>
! 	<tr><th class="circulation">Reserve Found</th></tr>
  	<tr><td>
  	<!-- TMPL_IF Name="reserved" -->
***************
*** 38,45 ****
  				<!-- TMPL_IF Name="waiting" --><input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
  					<input type="hidden" name="request" value="KillWaiting">
! 					<input type="submit" value="Cancel" class="button">
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF Name="reserved" --><input type="hidden" name="request" value="SetWaiting">
! 					<input type="submit" value="Waiting" class="button"><!-- /TMPL_IF -->
  			</form></p>
  
--- 32,39 ----
  				<!-- TMPL_IF Name="waiting" --><input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
  					<input type="hidden" name="request" value="KillWaiting">
! 					<input type="submit" value="Cancel" class="button circulation">
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF Name="reserved" --><input type="hidden" name="request" value="SetWaiting">
! 					<input type="submit" value="Waiting" class="button circulation"><!-- /TMPL_IF -->
  			</form></p>
  
***************
*** 58,62 ****
  			<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
  			<input type="hidden" name="request" value="KillReserved">
! 			<input type="submit" value="Cancel" class="button">
  			</form></p>
  		<!-- /TMPL_IF -->
--- 52,56 ----
  			<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
  			<input type="hidden" name="request" value="KillReserved">
! 			<input type="submit" value="Cancel" class="button circulation">
  			</form></p>
  		<!-- /TMPL_IF -->
***************
*** 70,74 ****
  				<input type="hidden" name="tb-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="tobrcd" -->">
  			<!-- /TMPL_LOOP -->
! 			<input type="submit" value="Ignore" class="button">
  			</form></p>
  
--- 64,68 ----
  				<input type="hidden" name="tb-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="tobrcd" -->">
  			<!-- /TMPL_LOOP -->
! 			<input type="submit" value="Ignore" class="button circulation">
  			</form></p>
  
***************
*** 77,81 ****
  <!-- TMPL_ELSE -->
  	<table>
! 	<tr><th>Messages</th></tr>
  	<tr><td>
  	<!-- TMPL_IF Name="reqmessage" -->
--- 71,75 ----
  <!-- TMPL_ELSE -->
  	<table>
! 	<tr><th class="circulation">Messages</th></tr>
  	<tr><td>
  	<!-- TMPL_IF Name="reqmessage" -->
***************
*** 125,130 ****
  		<p>
  		<table border="1" cellpadding="5" cellspacing="0" bgcolor="#dddddd">
! 		<tr><th colspan="6">Transfered Items</th></tr>
! 		<tr><th>Barcode</th><th>Title</th><th>Author</th><th>Type</th><th>From</th><th>To</th></tr>
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td align="center" bgcolor="<!-- TMPL_VAR NAME="color" -->">
--- 119,124 ----
  		<p>
  		<table border="1" cellpadding="5" cellspacing="0" bgcolor="#dddddd">
! 		<tr><th colspan="6" class="circulation">Transfered Items</th></tr>
! 		<tr><th class="circulation">Barcode</th><th class="circulation">Title</th><th class="circulation">Author</th><th class="circulation">Type</th><th class="circulation">From</th><th class="circulation">To</th></tr>
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td align="center" bgcolor="<!-- TMPL_VAR NAME="color" -->">
***************
*** 140,143 ****
--- 134,143 ----
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
+ <div class="bloc25">
+ <a class="button circulation" href="circulation.pl">
+ Next Borrower</a>
+ <a class="button circulation" href="returns.pl">
+ Returns</a>
+ </div>
  
  </div>




From shedges at users.sourceforge.net  Mon Jun 13 12:24:31 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Mon, 13 Jun 2005 03:24:31 -0700
Subject: [Koha-cvs] CVS: koha-doc/fr/opac - New directory
Message-ID: <E1Dhm7L-0003nL-6J@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/fr/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14570/fr/opac

Log Message:
Directory /cvsroot/koha/koha-doc/fr/opac added to the repository





From shedges at users.sourceforge.net  Mon Jun 13 12:25:00 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Mon, 13 Jun 2005 03:25:00 -0700
Subject: [Koha-cvs] CVS: koha-doc/fr/opac/CatKOHAimages - New directory
Message-ID: <E1Dhm7o-0003rp-31@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/fr/opac/CatKOHAimages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14857/fr/opac/CatKOHAimages

Log Message:
Directory /cvsroot/koha/koha-doc/fr/opac/CatKOHAimages added to the repository





From shedges at users.sourceforge.net  Mon Jun 13 12:26:57 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Mon, 13 Jun 2005 03:26:57 -0700
Subject: [Koha-cvs] CVS: koha-doc/fr/opac CatKOHA.xml,NONE,1.1
Message-ID: <E1Dhm9h-000473-QT@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/fr/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15727/fr/opac

Added Files:
	CatKOHA.xml 
Log Message:
Adding Bib. de soc. CNRS opac users guide

--- NEW FILE ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
<article>
  <title>Catalogue KOHA : mode d’emploi</title>

  <articleinfo>
    <pubdate>2005-06-11</pubdate>

    <copyright>
      <year>2005</year>

      <holder>Bibliothèque de sociologie du CNRS, Paris</holder>
    </copyright>

    <legalnotice>
      <para>Document sous licence Gnu-GPL</para>

      <para>This document is related to Koha and is licensed to you under the
      GNU General Public License version 2 or later (<ulink
      url="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</ulink>).</para>

      <para>Koha-related documents may be reproduced and distributed in whole
      or in part, in any medium physical or electronic, as long as this
      copyright notice is retained on all copies.</para>

      <para>You may create a derivative work and distribute it provided that
      you:</para>

      <orderedlist>
        <listitem>
          <para>License the derivative work with this same license, or the
          Linux Documentation Project License (<ulink
          url="http://www.tldp.org/COPYRIGHT.html">http://www.tldp.org/COPYRIGHT.html</ulink>).
          Include a copyright notice and at least a pointer to the license
          used.</para>
        </listitem>

        <listitem>
          <para>Give due credit to previous authors and major
          contributors.</para>
        </listitem>
      </orderedlist>

      <para>Commercial redistribution is allowed and encouraged; however, the
      author would like to be notified of any such distributions.</para>

      <para>No liability for the contents of this document can be accepted.
      Use the concepts, examples and information at your own risk. There may
      be errors and inaccuracies, that could be damaging to your system.
      Proceed with caution, and although this is highly unlikely, the
      author(s) do not take any responsibility.</para>

      <para>All copyrights are held by their by their respective owners,
      unless specifically noted otherwise. Use of a term in this document
      should not be regarded as affecting the validity of any trademark or
      service mark. Naming of particular products or brands should not be seen
      as endorsements.</para>
    </legalnotice>

    <revhistory>
      <revision>
        <revnumber>2.2.2</revnumber>

        <date>2005-06-11</date>

        <revdescription>
          <para>Initial XML markup.</para>
        </revdescription>
      </revision>
    </revhistory>
  </articleinfo>

  <section>
    <title>Le catalogue</title>

    <para>Le catalogue rassemble tous les documents acquis par la
    bibliothèque. Il contient également la liste complète des périodiques
    disponibles et environ 5000 notices descriptives correspondant à des
    articles de périodiques (20 revues analysées).</para>

    <para>Il permet d’effectuer des recherches documentaires à partir du fonds
    de la bibliothèque et de connaître la disponibilité d’un document à
    emprunter ou à consulter.</para>

    <section>
      <title>Page d’accueil et modes d’accès</title>

      <para>La catalogue se consulte sur le web : <ulink
      url="http://catalogue.bibliothequedesociologie.cnrs.fr">http://catalogue.bibliothequedesociologie.cnrs.fr</ulink>.
      Il est vivement recommandé d’utiliser le navigateur Mozilla, disponible
      gratuitement sur Internet.</para>

      <para>Vous avez le choix d’accéder au catalogue de manière anonyme ou en
      vous identifiant (réservé aux lecteurs inscrits à la
      bibliothèque).</para>

      <figure>
        <title>Page d’accueil</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image1.gif" />
          </imageobject>
        </mediaobject>
      </figure>

      <para>Vous pouvez modifier la langue de l’interface si vous le souhaitez
      (mais la langue d’indexation des documents est le français. Seules
      quelques notices ont fait l’objet d’un résumé dans une autre
      langue).</para>
    </section>

    <section>
      <title>Pour s’identifier</title>

      <para>Saisissez votre identifiant (nom de famille en minuscules) et le
      mot de passe fourni au moment de votre inscription (si vous avez oublié
      votre mot de passe, contactez la bibliothèque).</para>

      <figure>
        <title>Identification</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image2.gif" />
          </imageobject>
        </mediaobject>
      </figure>

      <para>L’accès en mode « Identifié » vous permet de consulter vos
      informations personnelles, d’effectuer des suggestions d’achats pour la
      bibliothèque, de vous constituer des étagères virtuelles.</para>

      <warning>
        <para>Attention : pensez à vous déconnecter à la fin de votre
        consultation.</para>
      </warning>
    </section>
  </section>

  <section>
    <title>Méthode de recherche : quelques conseils</title>

    <itemizedlist>
      <listitem>
        <para>Les recherches peuvent s'effectuer en texte intégral ou porter
        sur des champs ou des critères précis : auteur, titre, année de
        publication, éditeur ... </para>
      </listitem>

      <listitem>
        <para>Il n'est pas nécessaire de respecter les combinaisons
        majuscules/minuscules, les signes diacritiques (accent, tréma) ...
        </para>
      </listitem>

      <listitem>
        <para>Une recherche est faite sur tous les mots que vous entrez. Les
        mots vides sont ignorés. Si vous entrez, par exemple "les cadres en
        France" dans le titre, la liste de réponses contiendra tous les
        documents avec cadre ET France dans le titre ou le sous-titre. "Les"
        et « En » seront exclus.</para>
      </listitem>

      <listitem>
        <para>Si vous voulez entrer une partie de mot, mettez une * ou un % à
        la fin du mot. Par exemple, "urbanis*" donnera "urbanisme" mais aussi
        "urbanistique", « urbanisation », etc. </para>
      </listitem>
    </itemizedlist>

    <section>
      <title>Deux modes de recherche vous sont proposés : </title>

      <variablelist>
        <varlistentry>
          <term>Recherche simple</term>

          <listitem>
            <para>Allez sur la page d’accueil et tapez un ou plusieurs termes
            dans la zone de saisie. Cliquez sur OK<figure>
                <title>Recherche simple</title>

                <mediaobject>
                  <imageobject>
                    <imagedata fileref="CatKOHAimages/image3.gif" />
                  </imageobject>
                </mediaobject>
              </figure></para>

            <para>Les termes saisis dans cette zone sont par défaut reliés par
            l'opérateur ET.</para>
          </listitem>
        </varlistentry>

        <varlistentry>
          <term>Recherche avancée</term>

          <listitem>
            <para>Cliquez sur Recherche avancée<figure>
                <title>Recherche avancée</title>

                <mediaobject>
                  <imageobject>
                    <imagedata fileref="CatKOHAimages/image4.gif" />
                  </imageobject>
                </mediaobject>
              </figure></para>

            <para>Tapez un ou plusieurs termes dans la zone "N’importe où". La
            recherche portera sur tous les éléments de la notice du document.
            Les termes saisis dans cette zone sont par défaut reliés par
            l'opérateur ET.</para>

            <para><emphasis role="bold">ou</emphasis></para>

            <para>Tapez un ou plusieurs termes dans les zones dédiées aux
            informations souhaitées (auteur, titre, etc.). Entre chaque zone,
            l’opérateur par défaut est le « ET ».</para>

            <para>Zone Titre : vous pouvez entrer un titre complet ou partiel.
            La recherche sera faite aussi sur les sous-titres et les autres
            champs relatifs au titre.</para>

            <para>Zone auteur : vous pouvez entrer un nom ou un prénom. La
            recherche est aussi faite sur les co-auteurs et les autres champs
            en relation (traducteur, illustrateur...). N'oubliez pas qu'un
            auteur peut concerner un auteur physique (Pierre Bourdieu) ou
            moral (CNRS...).</para>

            <para>Une recherche plus sélective est possible en précisant : un
            type de document : périodiques, article de périodiques, thèse,
            rapport, etc.</para>
          </listitem>
        </varlistentry>
      </variablelist>
    </section>
  </section>

  <section>
    <title>Affichage des résultats</title>

    <section>
      <title>Affichage sous forme de liste</title>

      <para>Cet affichage vous permet de vérifier la disponibilité des
      documents et leur localisation (Cote)</para>

      <itemizedlist>
        <listitem>
          <para>Cliquez sur le titre pour consulter la notice.</para>
        </listitem>

        <listitem>
          <para>Cochez les notices à ajouter dans votre panier.</para>
        </listitem>

        <listitem>
          <para>Cliquez sur « réserver » pour réserver un document :
          <emphasis>le document ne pourra pas être emprunté par un autre
          lecteur.</emphasis> La réservation s’annule automatiquement au bout
          de 3 semaines ou lorsque vous avez emprunté le document. Si le
          document est déjà réservé par un autre lecteur, votre demande sera
          mise en file d’attente.</para>

          <note>
            <para>Attention : la réservation n'est pas une commande. Pour
            obtenir l’ouvrage réservé, il faut remplir un formulaire de prêt
            en salle de lecture.</para>
          </note>
        </listitem>
      </itemizedlist>

      <figure>
        <title>Affichage sous forme de liste</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image5.gif" />
          </imageobject>
        </mediaobject>
      </figure>
    </section>

    <section>
      <title>Format d’affichage SIMPLE</title>

      <para>Vous pouvez « rebondir » sur les mots clés de la notice pour une
      nouvelle recherche</para>

      <figure>
        <title>Format d’affichage SIMPLE</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image6.gif" />
          </imageobject>
        </mediaobject>
      </figure>
    </section>

    <section>
      <title>Format d’affichage ISBD (International Standard Book
      Description)</title>

      <para>Vous pouvez récupérer cette notice dans un traitement de texte en
      effectuant un Copier/Coller</para>

      <figure>
        <title>Format d’affichage ISBD</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image7.gif" />
          </imageobject>
        </mediaobject>
      </figure>
    </section>

    <section>
      <title>Format d’affichage « Notice Complète »</title>

      <para>Cliquez sur les onglets (0/1/2/3) pour visualiser les
      informations. L’onglet « Items » contient les indications relatives aux
      exemplaires (la cote par exemple)</para>

      <figure>
        <title>Notice Complète</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image8.gif" />
          </imageobject>
        </mediaobject>
      </figure>
    </section>
  </section>

  <section>
    <title>Informations lecteurs</title>

    <para>Pour consulter vos informations, il faut vous identifier.</para>

    <para>Pour modifier vos coordonnées, cliquez sur «mettre à jour » et
    indiquez quelles sont les données à corriger.</para>

    <figure>
      <title>Informations lecteurs</title>

      <mediaobject>
        <imageobject>
          <imagedata fileref="CatKOHAimages/image9.gif" />
        </imageobject>
      </mediaobject>
    </figure>
  </section>

  <section>
    <title>Panier</title>

    <para>Pour se constituer un panier, cochez les notices dans la liste des
    résultats et cliquez sur « Ajoutez les éléments cochés au panier »:
    <figure>
        <title>Ajoutez les éléments cochés au panier</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image10.gif" />
          </imageobject>
        </mediaobject>
      </figure></para>

    <para>Cliquez sur « Panier de notice » pour visualisez les notices
    sélectionnées<figure>
        <title>Panier de notice</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image11.gif" />
          </imageobject>
        </mediaobject>
      </figure></para>

    <para>Pour visualiser une notice dans un autre format d’affichage, cliquez
    sur le titre du document.</para>

    <para>Vous pouvez imprimer les notices du panier ou les envoyer par
    mél.<figure>
        <title>Les envoyer par mél</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image12.gif" />
          </imageobject>
        </mediaobject>
      </figure></para>
  </section>

  <section>
    <title>Étagères virtuelles</title>

    <para>Cette fonctionnalité vous permet de sélectionner un ensemble de
    documents et de conserver la sélection d’une session à l’autre
    (contrairement au Panier qui disparaît à l’issue de chaque consultation du
    catalogue).</para>

    <para>Pour créer ou consulter une étagère virtuelle, il faut vous
    identifier.</para>

    <itemizedlist>
      <listitem>
        <para>Cliquez sur « Étagères virtuelles » à partir de la page
        d’accueil, pour consulter les étagères déjà créées.</para>
      </listitem>

      <listitem>
        <para>Pour créer une nouvelle étagère, cliquez sur créer une nouvelle
        étagère.</para>
      </listitem>
    </itemizedlist>

    <para>Il existe 3 catégories d’étagères : </para>

    <orderedlist>
      <listitem>
        <para>Une étagère virtuelle privée est gérée par vous seul, et ne peut
        être vue que de vous.</para>
      </listitem>

      <listitem>
        <para>Une étagère publique peut être vue par tous, mais gérée
        uniquement par vous.</para>
      </listitem>

      <listitem>
        <para>Une étagère libre peut être gérée par n'importe quel
        utilisateur.</para>
      </listitem>
    </orderedlist>

    <figure>
      <title>Étagères virtuelles</title>

      <mediaobject>
        <imageobject>
          <imagedata fileref="CatKOHAimages/image13.gif" />
        </imageobject>
      </mediaobject>
    </figure>

    <para>Lorsque vous consultez le catalogue, vous pouvez sélectionner une ou
    plusieurs notices à ajouter dans l'étagère : cliquez sur la notice et
    ensuite sur la fonction « Ajouter dans l’étagère ». Sélectionnez l’étagère
    dans laquelle vous souhaitez déposer la notice.</para>
  </section>

  <section>
    <title>Suggestions d’achat</title>

    <para>Cette fonctionnalité vous permet de proposer des suggestions
    d’acquisition à l’équipe de la bibliothèque. Vous recevrez automatiquement
    un mél en réponse à votre suggestion d’achat.</para>

    <para>Pour consulter vos suggestions, sélectionnez « moi-même » dans la
    colonne «Suggéré par » et cliquez sur « Chercher » </para>

    <figure>
      <title>Suggestions d’achat</title>

      <mediaobject>
        <imageobject>
          <imagedata fileref="CatKOHAimages/image14.gif" />
        </imageobject>
      </mediaobject>
    </figure>

    <para>Lorsque vous saisissez une suggestion, remplissez la grille de
    manière la plus précise possible. Ajoutez dans la zone « Note » les
    éventuels commentaires que vous auriez à formuler.<figure>
        <title>Saisir une nouvelle suggestion</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image15.gif" />
          </imageobject>
        </mediaobject>
      </figure></para>
  </section>
</article>



From shedges at users.sourceforge.net  Mon Jun 13 12:31:17 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Mon, 13 Jun 2005 03:31:17 -0700
Subject: [Koha-cvs] CVS: koha-doc/fr migrer_ses_donnees.xml,1.2,NONE scripts ligne de commande.xml,1.2,NONE
Message-ID: <E1DhmDt-0004ir-Ld@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/fr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18139/fr

Removed Files:
	migrer_ses_donnees.xml scripts ligne de commande.xml 
Log Message:
Removing duplicate documents that have been moved to subdirectories.

--- migrer_ses_donnees.xml DELETED ---

***** Bogus filespec: scripts
***** Bogus filespec: ligne
***** Bogus filespec: de
--- commande.xml DELETED ---




From shedges at users.sourceforge.net  Mon Jun 13 13:08:53 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Mon, 13 Jun 2005 04:08:53 -0700
Subject: [Koha-cvs] CVS: koha-doc codingguidelines.xml,NONE,1.1
Message-ID: <E1DhmoH-00016o-CR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4193

Added Files:
	codingguidelines.xml 
Log Message:
draft of coding standards and guidelines

--- NEW FILE ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
<article>
  <title>Koha Coding Standards and Guidelines for Contributors</title>

  <section>
    <title>Introduction</title>

    <para>As in other free and open source software projects, Koha contains
    code that has been contributed to the project by many different
    developers. Koha is now a complex piece of software, and we'd like
    continue to improve the overall code standards to make it easier for new
    developers to join the project, and to make existing code easier to
    maintain. These standards and guidelines are intended to give Koha a
    reasonably consistent style throughout the code and to ensure
    maintainability.</para>

    <para>When you commit new code to Koha, please do your best to comply with
    these guidelines -- it will increase the chances of your code become part
    of a stable Koha release. And if you find code in Koha that doesn't comply
    with these guidelines, please feel free to fix it, just as you would
    correct any bug.</para>
  </section>

  <section>
    <title>Code style</title>

    <para>Koha code should conform to the guidelines defined in the <ulink
    url="http://perldoc.perl.org/perlstyle.html">perlstyle</ulink> man page as
    they apply to code details (indenting, etc.). As for the general structure
    of the code, all Koha code must be separated into three types:</para>

    <itemizedlist>
      <listitem>
        <para>the Perl code;</para>
      </listitem>

      <listitem>
        <para>the database (DB) access code; and</para>
      </listitem>

      <listitem>
        <para>the HTML code.</para>
      </listitem>
    </itemizedlist>

    <para>These three code types, as well as the Koha naming conventions, are
    explained in the following sections.</para>

    <section>
      <title>HTML</title>

      <para>All code controlling the "appearance layer" is contained in
      <filename>HTML::Template</filename> files. These files are located in
      the <filename>koha-tmpl</filename> directory in CVS (currently <ulink
      url="http://sourceforge.net/cvs/?group_id=16466">http://sourceforge.net/cvs/?group_id=16466</ulink>).
      They must contain all the code controlling the presentation layer. There
      are at least two good reasons for this:</para>

      <itemizedlist>
        <listitem>
          <para>the look of Koha can be changed by rewriting only the
          templates, changing nothing in the Perl code itself; and</para>
        </listitem>

        <listitem>
          <para>there is a tool to translate templates, so it's the only way
          to localise our preferred ILS.</para>
        </listitem>
      </itemizedlist>

      <para>Almost all the actual Koha presentation pages use templates. Only
      a few exceptions (that can be considered bugs) remain at the time of
      writing.</para>

      <section>
        <title>Templates location</title>

        <para>The <filename>koha-tmpl</filename> directory contains two
        different sub-directories: <filename>opac-tmpl</filename> and
        <filename>intranet-tmpl</filename>. Under those two are the themes
        directories, and one directory for each language -- for example,
        <filename>intranet-tmpl/default/en</filename> for English default
        templates. The templates should be stored in a directory that
        parallels the location of the Perl scripts. For example, the Perl
        scripts located in the <filename>$KOHA/acqui.simple</filename>
        directory should use templates located in
        <filename>$KOHA/koha-tmpl/intranet-tmpl/&lt;theme&gt;/&lt;language&gt;/acqui.simple</filename>.</para>

        <para><emphasis>Exceptions:</emphasis></para>

        <itemizedlist>
          <listitem>
            <para>Scripts located in <filename>$KOHA/admin/</filename> use
            templates located in
            <filename>$KOHA/intranet-tmpl/&lt;theme&gt;/&lt;language&gt;/parameters/</filename></para>
          </listitem>

          <listitem>
            <para>Some scripts in <filename>$KOHA/members/</filename> use
            templates located in
            <filename>$KOHA/intranet-tmpl/&lt;theme&gt;/&lt;language&gt;/</filename></para>
          </listitem>

          <listitem>
            <para>Simple HTML "includes" files for placing standard headers
            and footers on Koha pages are located in
            <filename>$KOHA/intranet-tmpl/&lt;theme&gt;/&lt;language&gt;/includes/</filename></para>
          </listitem>
        </itemizedlist>

        <para>When modifying templates, you should only modify the English one
        manually. All other languages are automatically generated from the
        English templates through a <filename>.po</filename> file and the
        script located in
        <filename>misc/translator/tmpl_process3.pl</filename>.</para>
      </section>

      <section>
        <title>Online help</title>

        <para>The
        <filename>$KOHA/koha-tmpl/&lt;theme&gt;/&lt;language&gt;/help</filename>
        directory contains online help. Under the <filename>help</filename>
        directory is a complete copy of the Koha directory structure, with
        templates using the same name as the "true" templates. These templates
        must contain online help. The <filename>$KOHA/help.pl</filename>
        script is called when the user clicks on "Help," which opens/shows the
        templates in this directory.</para>

        <para>PLEASE write online help when you add features.</para>
      </section>

      <section>
        <title>Template content</title>

        <para>There is usually only one template for a given
        <filename>.pl</filename> file. For example, the template related to
        <filename>circulation/returns.pl</filename> should be
        <filename>circulation/returns.tmpl</filename>.</para>

        <para>If there are different possible behaviours, they should be
        separated by a <varname>TMPL_IF</varname>. For example,
        <filename>$KOHA/koha-tmpl/intranet-tmpl/&lt;theme&gt;/&lt;language&gt;/parameters</filename>
        contains:</para>

        <programlisting>&lt;!-- TMPL_IF name="add_form" --&gt;</programlisting>

        <para>that controls what is shown when the user wants to add something
        (as determined by the Perl script):</para>

        <programlisting>if ($op) {
$template-&gt;param(script_name =&gt; $script_name,
$op              =&gt; 1);  # We show only the TMPL_VAR names $op.
} else {
$template-&gt;param(script_name =&gt; $script_name,
else              =&gt; 1); # We show only the TMPL_VAR names $op.
}</programlisting>

        <para>Note that some scripts use two different templates, depending on
        what the user wants to do. This is sometimes a mistake in Koha design,
        sometimes not. For example, in
        <filename>$KOHA/opac/opac-search.pl</filename>, we can use the
        <filename>opac-search</filename> or
        <filename>opac-searchresults</filename> template, depending on the
        step of the search. Both templates are big, so merging them would not
        be a good idea for maintenance and readability of Koha code.</para>
      </section>
    </section>

    <section>
      <title>DB access</title>

      <para>No database (DB) access routines should ever be included in
      <filename>.pl</filename> files. All DB access routines should be in the
      <filename>C4</filename> directory, in <filename>.pm</filename> modules.
      There is one <filename>.pm</filename> module for each logical "librarian
      activity." For example, everything related to circulation must be in
      <filename>C4/Circulation/Circ2.pm</filename>.</para>

      <para>All inclusion of Perl variables in SQL commands should be done
      through <userinput>prepare()</userinput> statements with
      <userinput>?</userinput> placeholders, and then using
      <userinput>bind()</userinput> and/or <userinput>execute()</userinput>
      calls. This helps with security and other testing.</para>

      <para>The <filename>C4/Context.pm</filename> module contains everything
      related to technical variables (creating a DB handler, getting a
      systempreference, etc.).</para>

      <para>The <filename>C4/Koha.pm</filename> module contains everything
      related to things that are useful everywhere in Koha, such as getting a
      branch list or a branch detail. (At the time of writing, this module
      probably should be improved. Some subroutines, for instance, are located
      in other modules but would be better here.)</para>

      <para><emphasis>Exception:</emphasis> parameters management scripts. For
      historic reasons, and because they don't do anything complex in the
      database, all scripts in <filename>$KOHA/admin/</filename> deal directly
      with the database. This is not really a bug, even if it does seem to
      break the rule. (Think of it as "the exception that proves the
      rule.")</para>
    </section>

    <section>
      <title>Perl scripts</title>

      <para>Perl scripts are the scripts that are run from
      <filename>cgi-bin</filename> (or <filename>mod_perl</filename>). They
      all have (almost) the same behaviour:</para>

      <itemizedlist>
        <listitem>
          <para>read parameters;</para>
        </listitem>

        <listitem>
          <para>open an <filename>HTML::Template</filename> file (that checks
          the user rights to access the page if needed -- if the user doesn't
          have the correct permissions, show a "sorry no access" page and
          end);</para>
        </listitem>

        <listitem>
          <para>depending on the parameters (often, in a
          <varname>$op</varname> variable, but not always), run subroutines
          from a <filename>C4/*.pm</filename> package to do something in the
          database;</para>
        </listitem>

        <listitem>
          <para>using the parameters and the results of the previous
          operations, fill the template; and</para>
        </listitem>

        <listitem>
          <para>send the template to the user.</para>
        </listitem>
      </itemizedlist>

      <para>Some scripts are run on the command line. They all are located in
      the <filename>misc</filename> directory. The <filename>misc</filename>
      directory does not contain any scripts that can be run as
      <filename>cgi-bin</filename>.</para>

      <para>Command line scripts executed without any parameters should return
      a "help" listing of possible parameters and exit without doing
      anything.</para>
    </section>

    <section>
      <title>Naming conventions</title>

      <section>
        <title>Script names</title>

        <para>The script names must be related to what they do, and they must
        be located in a directory that is related to a logical "librarian
        activity". For example, all scripts related to circulation are in
        <filename>$KOHA/circ/</filename>.</para>

        <para><emphasis>Exceptions:</emphasis></para>

        <itemizedlist>
          <listitem>
            <para>The <filename>acqui.simple</filename> directory contains all
            the code for MARC cataloguing. The directory name obviously is not
            related to the "librarian activity," but it's historic.</para>
          </listitem>

          <listitem>
            <para>The <filename>bull</filename> directory is related to
            serials management. Most of the code in this directory was
            developed in France, and "serials management" is "bulletinage" in
            French -- but in general, script and directory names should be in
            English.</para>
          </listitem>

          <listitem>
            <para>Some scripts related to borrowers are still in the
            <filename>$KOHA/</filename> directory (<filename>pay.pl</filename>
            for example).</para>
          </listitem>
        </itemizedlist>
      </section>

      <section>
        <title>Variable names</title>

        <para>Variables can be of three types:</para>

        <itemizedlist>
          <listitem>
            <para>Perl variables;</para>
          </listitem>

          <listitem>
            <para>template variables; or</para>
          </listitem>

          <listitem>
            <para>hash entries from a SQL request.</para>
          </listitem>
        </itemizedlist>

        <para>All three variables should have the same name. For example, if
        you get the field <varname>issuelength</varname> from the
        <filename>issuingrules</filename> table, then you should have a
        <userinput>&lt;!-- TMPL_VAR name="issuelength" --&gt;</userinput> in
        the template, and either a <varname>$issuelength</varname> or
        <varname>$issuingrules-&gt;{'issuelength'}</varname> variable in the
        Perl code.</para>

        <para>Sometimes you must use the same field/variable from two
        different points of view. In this case, use two variable names, with
        something distinctive before the "simple" name. For example if you
        need "librarian name" and "borrower name" from
        <varname>borrowers.surname</varname>, use
        <varname>librariansurname</varname> and
        <varname>borrowersurname</varname>.</para>
      </section>
    </section>
  </section>

  <section>
    <title>Commenting style</title>

    <para>Scripts and modules in Koha are expected to contain clear and
    helpful comments to assist other developers who want to work on the code.
    Despite the availability of external documentation, source code listings
    should be able to stand on their own, because external documentation may
    not adequately describe the details and intent of the developer(s). Please
    make sure you include enough comments to keep your coding intentions
    understandable, and try to follow these guidelines:</para>

    <orderedlist>
      <listitem>
        <para>Please write your comments in English or request
        translation.</para>

        <para>Write in complete sentences, capitalize the first word, and put
        two spaces after the end of each sentence (so that the Emacs sentence
        commands will work).</para>

        <para>Comments should start with a # and a single space.</para>
      </listitem>

      <listitem>
        <para>Comment your code when you do something that someone else may
        not think is "trivial." In other words, comment anything that is not
        readily obvious in the code.</para>
      </listitem>

      <listitem>
        <para>Each Koha file should begin with a block comment
        containing:</para>

        <orderedlist>
          <listitem>
            <para>basic information about the file, such as file name,
            version, date, author:<programlisting># addbiblio.pl, v 1.52.2.6, 2005/05/19, tipaul</programlisting></para>
          </listitem>

          <listitem>
            <para>the standard Koha copyright message:<programlisting># Copyright 2000-2005 Katipo Communications
# Copyright 2005 &lt;author or employer&gt;
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA</programlisting></para>
          </listitem>
        </orderedlist>
      </listitem>

      <listitem>
        <para>All block comments should consist of one or more paragraphs
        built out of complete sentences, and each sentence should end in a
        period.</para>

        <para>Block comments generally apply to some (or all) code that
        follows them, and are indented to the same level as that code. Each
        line of a block comment starts with a # and a single space (unless it
        is indented text inside the comment). Paragraphs inside a block
        comment are separated by a line containing a single #. Block comments
        are best surrounded by a blank line above and below them.</para>
      </listitem>

      <listitem>
        <para>Provide comments at the beginning of every function (unless the
        function is very short and its purpose is obvious) indicating the
        function's purpose, assumptions, and limitations.</para>

        <para>The comments should be a brief introduction to understand why
        the function exists and what it can do. Document how it does it, too,
        if that is not obvious.</para>

        <para>Place a blank line between a function and its description.
        Include information about the sorts of arguments it gets, and what the
        possible values of arguments mean and are used for. Also explain the
        significance of the return value, if there is one.</para>
      </listitem>

      <listitem>
        <para>Use comments on code that consists of loops and logic branches.
        These are key areas that will assist the reader when reading source
        code.</para>
      </listitem>

      <listitem>
        <para>Try to avoid adding comments at the end of a line of code;
        end-line comments make code more difficult to read.</para>

        <para>End-line comments are appropriate, however, when annotating
        variable declarations. In this case, try to align all end-line
        comments at a common tab stop. (End-line comments should be separated
        by at least two spaces from the statement.)</para>
      </listitem>

      <listitem>
        <para>When modifying code, always keep the commenting around it up to
        date.</para>

        <para>Keeping the comments up-to-date when the code changes is a
        priority -- comments that contradict the code are worse than no
        comments! Identify the change with the date and your user name.</para>
      </listitem>

      <listitem>
        <para>Avoid using clutter comments, such as an entire line of
        asterisks. Instead, use white space to separate comments from
        code.</para>

        <para>Avoid the use of superfluous or inappropriate comments, such as
        humorous sidebar remarks.</para>
      </listitem>

      <listitem>
        <para>To prevent recurring problems, always use comments on bug fixes
        and work-around code, especially in this team environment.</para>

        <para>When you want to leave notes about functionalities to be added,
        put <userinput>TODO:</userinput> in front of the actual comments so
        developers can easily search for them.</para>

        <para>When you want to leave notes about bugs to be fixed, put
        <userinput>FIXME:</userinput> in front of the actual comments so
        developers can easily search for them.</para>
      </listitem>
    </orderedlist>

    <para>One other type of comment that developers may overlook is the cvs
    log message added when committing a file, but these comments are also very
    important. The messages should never be omitted and should give enough
    description to let other developers know what you are doing without having
    to read the code itself. In the case of bug fixes, it is also recommended
    that the messages include the bug number and the bug title, as well as a
    brief description of the fix.</para>
  </section>

  <section>
    <title>POD style (in modules)</title>

    <para>Koha modules should be documented with extensive comments written in
    POD ("Plain Old Documentation") format. Instructions for the POD markup
    language can be found in the <ulink
    url="http://perldoc.perl.org/perlpod.html">perlpod</ulink> man
    page.</para>

    <para>POD comments should include as least the following headings:</para>

    <variablelist>
      <varlistentry>
        <term>NAME</term>

        <listitem>
          <para>The name of the module and a very brief description of the
          type of functions contained in the module.</para>
        </listitem>
      </varlistentry>

      <varlistentry>
        <term>SYNOPSIS</term>

        <listitem>
          <para>This may give an example of how to access the module from a
          script, but it may also contain any general discussion of the
          purpose or behavior of the module's functions, and discussion of
          changes made to the module.</para>
        </listitem>
      </varlistentry>

      <varlistentry>
        <term>DESCRIPTION</term>

        <listitem>
          <para>If not included in the SYNOPSIS, a general description of the
          module's purpose should appear here.</para>
        </listitem>
      </varlistentry>

      <varlistentry>
        <term>FUNCTIONS</term>

        <listitem>
          <para>Descriptions of each function in the module, beginning with an
          example of how the function is called and continuing with a
          description of the behavior of the function.</para>
        </listitem>
      </varlistentry>

      <varlistentry>
        <term>AUTHOR</term>

        <listitem>
          <para>This will generally be the "Koha Development Team," but may
          also be an individual developer who has made significant
          contributions to the module. Give a contact e-mail address.</para>
        </listitem>
      </varlistentry>
    </variablelist>

    <para>For two examples, see the POD comments in the
    <filename>Search.pm</filename> module (<userinput>perldoc
    Search.pm</userinput>) and the <filename>Biblio.pm</filename>
    module.</para>
  </section>
</article>



From tipaul at users.sourceforge.net  Mon Jun 13 17:12:21 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 13 Jun 2005 08:12:21 -0700
Subject: [Koha-cvs] CVS: koha/misc/translator/po css_opac_fr_FR.po,1.6.2.4,1.6.2.5 default_intranet_fr_FR.po,1.5.2.5,1.5.2.6
Message-ID: <E1Dhqbt-0002qF-CF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10372/misc/translator/po

Modified Files:
      Tag: rel_2_2
	css_opac_fr_FR.po default_intranet_fr_FR.po 
Log Message:
translation update for 2.2.3 release

Index: css_opac_fr_FR.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/css_opac_fr_FR.po,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -C2 -r1.6.2.4 -r1.6.2.5
*** css_opac_fr_FR.po	31 Mar 2005 07:47:01 -0000	1.6.2.4
--- css_opac_fr_FR.po	13 Jun 2005 15:12:03 -0000	1.6.2.5
***************
*** 9,14 ****
  msgstr ""
  "Project-Id-Version: css_opac_fr_FR\n"
! "POT-Creation-Date: 2005-03-30 15:44+0200\n"
! "PO-Revision-Date: 2005-03-30 16:34+0200\n"
  "Last-Translator: POULAIN <paul at koha-fr.org>\n"
  "Language-Team: fr_FR\n"
--- 9,14 ----
  msgstr ""
  "Project-Id-Version: css_opac_fr_FR\n"
! "POT-Creation-Date: 2005-06-13 14:55+0200\n"
[...2358 lines suppressed...]
  msgid "week"
  msgstr "semaine"
  
! #: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:40
  msgid "year"
  msgstr "année"
--- 2296,2308 ----
  msgstr "vol. %s"
  
! #: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:54
! msgid "wednesday"
! msgstr "mercredi"
! 
! #: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:17
  msgid "week"
  msgstr "semaine"
  
! #: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:41
  msgid "year"
  msgstr "année"

Index: default_intranet_fr_FR.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_fr_FR.po,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -C2 -r1.5.2.5 -r1.5.2.6
*** default_intranet_fr_FR.po	7 Apr 2005 12:02:10 -0000	1.5.2.5
--- default_intranet_fr_FR.po	13 Jun 2005 15:12:13 -0000	1.5.2.6
***************
*** 9,14 ****
  msgstr ""
  "Project-Id-Version: default_intranet_fr_FR\n"
! "POT-Creation-Date: 2005-04-06 14:34+0200\n"
! "PO-Revision-Date: 2005-04-06 14:45+0200\n"
  "Last-Translator: POULAIN <paul at koha-fr.org>\n"
  "Language-Team: fr_FR\n"
--- 9,14 ----
  msgstr ""
  "Project-Id-Version: default_intranet_fr_FR\n"
! "POT-Creation-Date: 2005-06-07 16:19+0200\n"
[...7442 lines suppressed...]
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:144
! #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:140
  msgid "value"
  msgstr "valeur"
***************
*** 13394,13399 ****
  msgstr "semaine"
  
- #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:24
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:25
  msgid "will result in the following issues numbers :"
  msgstr "Donnera les numéros de parution suivants"
--- 13585,13590 ----
  msgstr "semaine"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:25
+ #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:24
  msgid "will result in the following issues numbers :"
  msgstr "Donnera les numéros de parution suivants"




From joshferraro at users.sourceforge.net  Tue Jun 14 20:24:25 2005
From: joshferraro at users.sourceforge.net (Joshua Ferraro)
Date: Tue, 14 Jun 2005 11:24:25 -0700
Subject: [Koha-cvs] CVS: koha/misc/sql-datas/english sample_usmarc.readme,NONE,1.1.2.1
Message-ID: <E1DiG5J-0006OS-NQ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/sql-datas/english
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24497

Added Files:
      Tag: rel_2_2
	sample_usmarc.readme 
Log Message:
readme for sample usmarc file.


--- NEW FILE ---
The included sample_usmarc.mrc can be used to demonstrate
import of a set of MARC21 (iso2709) records. The set includes
about 3K records. Note that if you want holdings to work
correctly you'll have to tweak the records to match your
local configuration. To import the records use the 
bulkmarcimport tool in misc/migration_tools/

If you have questions feel free to ask them on the list
or email me directly.

Joshua Ferraro
jmf at liblime dot com




From joshferraro at users.sourceforge.net  Wed Jun 15 01:18:55 2005
From: joshferraro at users.sourceforge.net (Joshua Ferraro)
Date: Tue, 14 Jun 2005 16:18:55 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes favicon.ico,1.1,1.2
Message-ID: <E1DiKgJ-0005GA-DC@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	favicon.ico 
Log Message:
to get rid of pesky log message complaining about favicon.ico






From joshferraro at users.sourceforge.net  Wed Jun 15 01:22:13 2005
From: joshferraro at users.sourceforge.net (Joshua Ferraro)
Date: Tue, 14 Jun 2005 16:22:13 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl favicon.ico,NONE,1.1
Message-ID: <E1DiKjV-0005dL-LM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21595

Added Files:
	favicon.ico 
Log Message:
Getting rid of pesky favicon.ico log message


--- NEW FILE ---


>?ÿÿÿ

ÿÿÿ67789:;ÿÿÿ

ÿÿÿ010234ÿ5ÿÿÿ

ÿÿÿ,-./ÿÿÿÿÿ

ÿÿÿ'()*+ÿÿÿÿÿÿ

ÿÿÿ
$

ÿÿÿÿ

ÿÿÿÿÿ	ÿÿÿÿÿ

ÿÿÿÿ



From hdl at users.sourceforge.net  Wed Jun 15 15:21:25 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 15 Jun 2005 06:21:25 -0700
Subject: [Koha-cvs] CVS: koha/C4 SearchMarc.pm,1.44,1.45
Message-ID: <E1DiXpd-0008Lv-3n@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31993/C4

Modified Files:
	SearchMarc.pm 
Log Message:
Deleting joined tables without condition.
Issues, reserves, items.
Major Bug fixed : Catalogsearch would work no more. 

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** SearchMarc.pm	3 Jun 2005 03:58:26 -0000	1.44
--- SearchMarc.pm	15 Jun 2005 13:21:22 -0000	1.45
***************
*** 281,289 ****
  	my $sth;
  	if ($sql_where2) {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,issues,reserves,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc");
! 		warn "Q2 : select distinct m1.bibid from biblio,biblioitems,items,issues,reserves,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc term is  @$value";
  	} else {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,issues,reserves,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc");
! 		warn "Q : select distinct m1.bibid from biblio,biblioitems,items,issues,reserves,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc";
  	}
  	$sth->execute();
--- 281,289 ----
  	my $sth;
  	if ($sql_where2) {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc");
! 		warn "Q2 : select distinct m1.bibid from biblio,biblioitems,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc term is  @$value";
  	} else {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc");
! 		warn "Q : select distinct m1.bibid from biblio,biblioitems,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc";
  	}
  	$sth->execute();




From hdl at users.sourceforge.net  Wed Jun 15 18:09:46 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 15 Jun 2005 09:09:46 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-MARCdetail.pl,1.6,1.7
Message-ID: <E1DiaSY-000682-F3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23328/opac

Modified Files:
	opac-MARCdetail.pl 
Log Message:
Displaying dashed isbn.

Index: opac-MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-MARCdetail.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** opac-MARCdetail.pl	4 May 2005 09:02:38 -0000	1.6
--- opac-MARCdetail.pl	15 Jun 2005 16:09:42 -0000	1.7
***************
*** 118,121 ****
--- 118,124 ----
  				if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{isurl}) {
  					$subfield_data{marc_value}="<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";
+ 				} elsif ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{kohafield} eq "biblioitems.isbn") {
+ #					warn " tag : ".$tagslib->{$fields[$x_i]->tag()}." subfield :".$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}. "ISBN : ".$subf[$i][1]."PosttraitementISBN :".DisplayISBN($subf[$i][1]);
+ 					$subfield_data{marc_value}=DisplayISBN($subf[$i][1]);
  				} else {
  					if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{authtypecode}) {




From hdl at users.sourceforge.net  Wed Jun 15 18:09:46 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 15 Jun 2005 09:09:46 -0700
Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.119,1.120
Message-ID: <E1DiaSY-000685-Ga@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23328/C4

Modified Files:
	Biblio.pm 
Log Message:
Displaying dashed isbn.

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.119
retrieving revision 1.120
diff -C2 -r1.119 -r1.120
*** Biblio.pm	1 Jun 2005 20:43:58 -0000	1.119
--- Biblio.pm	15 Jun 2005 16:09:43 -0000	1.120
***************
*** 71,74 ****
--- 71,75 ----
    
    &FindDuplicate
+   &DisplayISBN
  );
  
***************
*** 476,479 ****
--- 477,481 ----
      my ( $dbh, $bibid ) = @_;
      my $record = MARC::Record->new();
+ #	warn "". $bidid;
  
      #---- TODO : the leader is missing
***************
*** 2621,2625 ****
  	return;
  }
! 
  END { }    # module clean-up code here (global destructor)
  
--- 2623,2661 ----
  	return;
  }
! sub DisplayISBN {
! 	my ($isbn)=@_;
! 	my $seg1;
! 	if(substr($isbn, 0, 1) <=7) {
! 		$seg1 = substr($isbn, 0, 1);
! 	} elsif(substr($isbn, 0, 2) <= 94) {
! 		$seg1 = substr($isbn, 0, 2);
! 	} elsif(substr($isbn, 0, 3) <= 995) {
! 		$seg1 = substr($isbn, 0, 3);
! 	} elsif(substr($isbn, 0, 4) <= 9989) {
! 		$seg1 = substr($isbn, 0, 4);
! 	} else {
! 		$seg1 = substr($isbn, 0, 5);
! 	}
! 	my $x = substr($isbn, length($seg1));
! 	my $seg2;
! 	if(substr($x, 0, 2) <= 19) {
! # 		if(sTmp2 < 10) sTmp2 = "0" sTmp2;
! 		$seg2 = substr($x, 0, 2);
! 	} elsif(substr($x, 0, 3) <= 699) {
! 		$seg2 = substr($x, 0, 3);
! 	} elsif(substr($x, 0, 4) <= 8399) {
! 		$seg2 = substr($x, 0, 4);
! 	} elsif(substr($x, 0, 5) <= 89999) {
! 		$seg2 = substr($x, 0, 5);
! 	} elsif(substr($x, 0, 6) <= 9499999) {
! 		$seg2 = substr($x, 0, 6);
! 	} else {
! 		$seg2 = substr($x, 0, 7);
! 	}
! 	my $seg3=substr($x,length($seg2));
! 	$seg3=substr($seg3,0,length($seg3)-1) ;
! 	my $seg4 = substr($x, -1, 1);
! 	return "$seg1-$seg2-$seg3-$seg4";
! }
  END { }    # module clean-up code here (global destructor)
  
***************
*** 2636,2639 ****
--- 2672,2678 ----
  # $Id$
  # $Log$
+ # Revision 1.120  2005/06/15 16:09:43  hdl
+ # Displaying dashed isbn.
+ #
  # Revision 1.119  2005/06/01 20:43:58  genjimoto
  # patch from Genji (Waylon R.) to update subjects in MARC tables when systempref has MARC=OFF




From hdl at users.sourceforge.net  Wed Jun 15 18:09:46 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 15 Jun 2005 09:09:46 -0700
Subject: [Koha-cvs] CVS: koha MARCdetail.pl,1.26,1.27
Message-ID: <E1DiaSY-00068B-O3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23328

Modified Files:
	MARCdetail.pl 
Log Message:
Displaying dashed isbn.

Index: MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/MARCdetail.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** MARCdetail.pl	1 Mar 2005 13:40:47 -0000	1.26
--- MARCdetail.pl	15 Jun 2005 16:09:44 -0000	1.27
***************
*** 116,121 ****
--- 116,125 ----
  				$subfield_data{marc_lib}=$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{lib};
  				$subfield_data{link}=$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{link};
+ # 				warn "tag : ".$tagslib->{$fields[$x_i]->tag()}." subfield :".$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}."lien koha? : "$subfield_data{link};
  				if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{isurl}) {
  					$subfield_data{marc_value}="<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";
+ 				} elsif ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{kohafield} eq "biblioitems.isbn") {
+ #					warn " tag : ".$tagslib->{$fields[$x_i]->tag()}." subfield :".$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}. "ISBN : ".$subf[$i][1]."PosttraitementISBN :".DisplayISBN($subf[$i][1]);
+ 					$subfield_data{marc_value}=DisplayISBN($subf[$i][1]);
  				} else {
  					if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{authtypecode}) {




From hdl at users.sourceforge.net  Wed Jun 15 21:55:16 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 15 Jun 2005 12:55:16 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.19,1.20
Message-ID: <E1Didym-0005r5-Qo@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac.css 
Log Message:
Displaying overdues with red font.


Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** opac.css	4 May 2005 08:58:30 -0000	1.19
--- opac.css	15 Jun 2005 19:55:14 -0000	1.20
***************
*** 268,271 ****
--- 268,282 ----
  /* BLOCS */
  
+ #problem {
+ 	color: white;
+ 	font-weight:bold;
+ 	background-color:red;
+ }
+ .problem {
+ 	color: white;
+ 	font-weight:bold;
+ 	background-color:red;
+ }
+ 
  /* the mainbloc : everything is in mainbloc, except menu */
  #mainbloc {




From hdl at users.sourceforge.net  Wed Jun 15 21:55:17 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 15 Jun 2005 12:55:17 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-user.tmpl,1.9,1.10
Message-ID: <E1Didyn-0005rB-0O@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac-user.tmpl 
Log Message:
Displaying overdues with red font.


Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** opac-user.tmpl	4 May 2005 08:58:32 -0000	1.9
--- opac-user.tmpl	15 Jun 2005 19:55:14 -0000	1.10
***************
*** 61,69 ****
  			</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>
--- 61,71 ----
  			</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>
***************
*** 71,85 ****
  						<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>
--- 73,76 ----




From hdl at users.sourceforge.net  Thu Jun 16 17:06:25 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 16 Jun 2005 08:06:25 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes intranet-main.css,1.4,1.4.2.1
Message-ID: <E1Divwn-0008PW-Ar@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	intranet-main.css 
Log Message:
adding rapid links to pages inside

Index: intranet-main.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/intranet-main.css,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** intranet-main.css	30 Jul 2004 14:29:40 -0000	1.4
--- intranet-main.css	16 Jun 2005 15:06:22 -0000	1.4.2.1
***************
*** 55,59 ****
  	text-align:center;
  	background-color:#ad11ad;
! 	color: #FFFFFF;
  	text-decoration: normal;
  	font-weight: bold;
--- 55,59 ----
  	text-align:center;
  	background-color:#ad11ad;
! 	color: #000000;
  	text-decoration: normal;
  	font-weight: bold;
***************
*** 84,87 ****
--- 84,106 ----
  }
  
+ h2 {
+ 	margin-top:0px;
+ 	margin-bottom:4px;
+ 	text-align:center;
+ 	padding:0px;
+ 	font-size:125%;
+ 	padding-left:10px;
+ 	padding-right:10px;
+ 	padding-bottom:3px;
+ 	padding-top:3px;
+ }
+ h2.reports{
+ 	text-align:center;
+ 	background-color: #6b7cbe;
+ 	color: #FFFFFF;
+ 	text-decoration: normal;
+ 	font-weight: bold;
+ }
+ 
  h1.circulation{
  	text-align:center;
***************
*** 92,95 ****
--- 111,123 ----
  }
  
+ h1.authority {
+ 	text-align:center;
+ 	background-color: #6b7cbe;
+ 	color:#000000;
+ 	text-decoration: normal;
+ 	font-weight: bold;
+ 	background-image:none;
+ 	}
+ 
  h1.parameters{
  	text-align:center;
***************
*** 121,125 ****
  	cursor: hand;
  	background-color:#ad11ad;
! 	color:#FFFFFF;
  	font-weight: bold;
  	border:1px solid #000000;
--- 149,153 ----
  	cursor: hand;
  	background-color:#ad11ad;
! 	color:#000000;
  	font-weight: bold;
  	border:1px solid #000000;
***************
*** 127,131 ****
  	}
  
! a.members {
  	font-weight: normal;
  	text-decoration: none;
--- 155,167 ----
  	}
  
! .little {
! 	font-weight: normal;
! 	font-size:10pt;
! 	padding:0px 0px 0px 0px;
! 	text-decoration: none;
! 	line-height:100%;
! 	}
! 
! .members {
  	font-weight: normal;
  	text-decoration: none;
***************
*** 135,139 ****
  	line-height:200%;
  	}
! a.members:hover {
  	background-color: #86c268;
  	border:1px solid #000000;
--- 171,175 ----
  	line-height:200%;
  	}
! .members:hover {
  	background-color: #86c268;
  	border:1px solid #000000;
***************
*** 144,148 ****
  	}
  
! a.acquisition {
  	font-weight: normal;
  	text-decoration: none;
--- 180,200 ----
  	}
  
! a.authority {
! 	font-weight: normal;
! 	text-decoration: none;
! 	cursor: hand;
! 	color:#777777;
! 	font-weight: bold;
! 	line-height:200%;
! 	}
! a.authority:hover {
! 	background-color: #6b7cbe;
! 	border:1px solid #000000;
! 	color: #000000;
! 	text-decoration: none;
! 	font-weight: bold;
! 	}
! 
! .acquisition {
  	font-weight: normal;
  	text-decoration: none;
***************
*** 152,156 ****
  	line-height:200%;
  	}
! a.acquisition:hover {
  	background-color: #ffdf61;
  	border:1px solid #000000;
--- 204,208 ----
  	line-height:200%;
  	}
! .acquisition:hover {
  	background-color: #ffdf61;
  	border:1px solid #000000;
***************
*** 169,172 ****
--- 221,225 ----
  	line-height:200%;
  	}
+ 
  a.reports:hover {
  	background-color: #6b7cbe;
***************
*** 178,182 ****
  	}
  
! a.circulation {
  	font-weight: normal;
  	text-decoration: none;
--- 231,235 ----
  	}
  
! .circulation {
  	font-weight: normal;
  	text-decoration: none;
***************
*** 186,190 ****
  	line-height:200%;
  	}
! a.circulation:hover {
  	background-color: #be6170;
  	border:1px solid #000000;
--- 239,243 ----
  	line-height:200%;
  	}
! .circulation:hover {
  	background-color: #be6170;
  	border:1px solid #000000;
***************
*** 262,263 ****
--- 315,323 ----
  	padding:0px;
  }
+ 
+ #bloc25, .bloc25 {
+ 	float:left;
+ 	border:1px solid #000000;
+ 	margin:0px;
+ 	padding:0px;
+ }




From hdl at users.sourceforge.net  Thu Jun 16 17:06:26 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 16 Jun 2005 08:06:26 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en intranet-main.tmpl,1.25,1.25.2.1
Message-ID: <E1Divwo-0008Pg-1J@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	intranet-main.tmpl 
Log Message:
adding rapid links to pages inside

Index: intranet-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -C2 -r1.25 -r1.25.2.1
*** intranet-main.tmpl	20 Sep 2004 15:25:22 -0000	1.25
--- intranet-main.tmpl	16 Jun 2005 15:06:23 -0000	1.25.2.1
***************
*** 43,46 ****
--- 43,55 ----
  			layer.style.visibility = 'hidden';
  		}
+ 		function addauthority() {
+ 			X = document.forms["f"].authtype.value;
+ 			window.location="/cgi-bin/koha/authorities/authorities.pl?authtypecode="+X;
+ 		}
+ 		function searchauthority() {
+ 			X = document.forms["f"].authtype2.value;
+ 			Y = document.forms["f"].value.value;
+ 			window.location="/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&authtypecode="+X+"&value="+Y+"&marclist=&and_or=and&excluding=&operator=contains";
+ 		}
  	</script>
  	<script language="javascript" type="text/javascript">
***************
*** 115,126 ****
  			<h1 class="acquisition">Acquisitions</h1>
  			Order items, receive orders, set budgets...
  		</div>
  		<div id="Hint4" class="hint">
  			<h1 class="reports">Reports</h1>
  			All the system reports
  		</div>
  		<div id="Hint5" class="hint">
! 			<h1 class="reports">Authorities</h1>
  			Authorities management &amp; searches
  		</div>
  		<div id="Hint6" class="hint">
--- 124,204 ----
  			<h1 class="acquisition">Acquisitions</h1>
  			Order items, receive orders, set budgets...
+ 			<form action="/cgi-bin/koha/acqui/order.pl" method="post">
+ 			Supplier name : <input type="text"  size="25"   name="supplier">
+ 			<input type="submit" class="button acquisition" value="OK">
+ 			</form>
+ 			<p>or <a href="histsearch.pl" class="button acquisition">Search order history</a></p>
+ 			
  		</div>
  		<div id="Hint4" class="hint">
  			<h1 class="reports">Reports</h1>
  			All the system reports
+ 			<div id="bloc25">
+ 			<h2 class="reports">Stats</h2>
+ 			<ul>
+ 			<li>on catalogue
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/inventory.pl">Inventory/Stocktaking</a></p>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalogue by itemtype</a></p>
+ 			<li>on issues
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/stats.pl?time=yesterday">Till Reconcipation:</a> Daily Report (yesterday)</p>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/stats.pl?time=today">Till Reconcipation:</a> Daily Report (today)</p>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/overdue.pl">Overdue items</a></p>
+ 			</ul>
+ 			</div>
+ 			<div id="bloc25">
+ 			<h2 class="reports">Stat wizards</h2>
+ 			<table>
+ 			<tr>
+ 			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions</a></td>
+ 			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/borrowers_stats.pl">Borrowers</a></td>
+ 			</tr>
+ 			<tr>
+ 			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/catalogue_stats.pl">Catalogue</a></td>
+ 			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/issues_stats.pl">Circulation</a></td>
+ 			</tr>
+ 			</table>
+ 			</div>
+ 			<div id="bloc25">
+ 			<h2 class="reports">Top Lists</h2>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/bor_issues_top.pl">Most issuing Borrowers</a></p>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/cat_issues_top.pl">Most issued items</a></p>
+ 			</div>
  		</div>
+ 		
  		<div id="Hint5" class="hint">
! 			<h1 class="authority">Authorities</h1>
  			Authorities management &amp; searches
+ 			<form name="f" >
+ 				<h2 >
+ 					<select name="authtype">
+ 					<!-- TMPL_LOOP NAME="authtypesloop" -->
+ 						<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
+ 							<!-- TMPL_VAR NAME="authtypetext" -->
+ 						</option>
+ 					<!-- /TMPL_LOOP -->
+ 					</select>
+ 					<a href="javascript:addauthority()" class="authority">Add Authority</a>
+ 				</h2>
+ 				<h2>Search 
+ 				<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
+ 				in
+ 					<select name="authtype2">
+ 					<!-- TMPL_LOOP NAME="authtypesloop" -->
+ 						<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
+ 							<!-- TMPL_VAR NAME="authtypetext" -->
+ 						</option>
+ 					<!-- /TMPL_LOOP -->
+ 					</select>
+ 				</h2>
+ 				<input type="hidden" name="marclist" value="">
+ 				<input type="hidden" name="and_or" value="and">
+ 				<input type="hidden" name="excluding" value="">
+ 				<input type="hidden" name="operator" value="contains">
+ 				<input type="hidden" name="op" value="do_search">
+ 				<img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0">
+ 				<a href="javascript:searchauthority()" class="authority">
+ 					Search
+ 				</a>
+ 			</form>
  		</div>
  		<div id="Hint6" class="hint">
***************
*** 133,136 ****
--- 211,230 ----
  			<h1 class="circulation">Circulation</h1>
  			Work at the front desk on Issues and returns using only a barcode reader and a mouse
+ 				<h2 class="circulation">
+ 					Issue
+ 				</h2>
+ 				<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+ 					<p>Enter borrower card number or partial last name <input name="findborrower">
+ 					<input type="submit" value="OK" class="button circulation"></p>
+ 				</form>
+ 				<h2 class="circulation">
+ 					Return
+ 				</h2>
+ 				<form method="post" action="/cgi-bin/koha/circ/returns.pl">
+ 				<p>Enter Book Barcode</p>
+ 				<label class="label20">Item Barcode:</label><input name="barcode" size="10">
+ 				<input type="submit" value="OK" class="button circulation">
+ 				</form>
+ 
  		</div>
  <!-- MAIN MENU -->




From hdl at users.sourceforge.net  Thu Jun 16 17:06:26 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 16 Jun 2005 08:06:26 -0700
Subject: [Koha-cvs] CVS: koha mainpage.pl,1.9,1.9.2.1
Message-ID: <E1Divwo-0008Pi-2E@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32277

Modified Files:
      Tag: rel_2_2
	mainpage.pl 
Log Message:
adding rapid links to pages inside

Index: mainpage.pl
===================================================================
RCS file: /cvsroot/koha/koha/mainpage.pl,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -r1.9 -r1.9.2.1
*** mainpage.pl	22 Dec 2003 14:54:53 -0000	1.9
--- mainpage.pl	16 Jun 2005 15:06:23 -0000	1.9.2.1
***************
*** 8,13 ****
--- 8,24 ----
  use CGI;
  use C4::Auth;
+ use C4::AuthoritiesMarc;
+ use C4::Koha;
  
  my $query = new CGI;
+ my $authtypes = getauthtypes;
+ my @authtypesloop;
+ foreach my $thisauthtype (sort { $authtypes->{$a} <=> $authtypes->{$b} } keys %$authtypes) {
+ 	my %row =(value => $thisauthtype,
+ 				authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
+ 			);
+ 	push @authtypesloop, \%row;
+ }
+ 
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "intranet-main.tmpl",
***************
*** 25,28 ****
--- 36,40 ----
  my $marc_p = C4::Context->boolean_preference("marc");
  $template->param(NOTMARC => !$marc_p);
+ $template->param(authtypesloop => \@authtypesloop);
  
  output_html_with_http_headers $query, $cookie, $template->output;




From tipaul at users.sourceforge.net  Thu Jun 16 17:35:29 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:35:29 -0700
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.6.2.8,1.6.2.9
Message-ID: <E1DiwOv-0003tX-Pz@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14962/C4

Modified Files:
      Tag: rel_2_2
	Bull.pm 
Log Message:
formating dates to user format

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.6.2.8
retrieving revision 1.6.2.9
diff -C2 -r1.6.2.8 -r1.6.2.9
*** Bull.pm	6 Jun 2005 16:00:56 -0000	1.6.2.8
--- Bull.pm	16 Jun 2005 15:35:27 -0000	1.6.2.9
***************
*** 102,105 ****
--- 102,106 ----
  	return @issuelist;
  }
+ 
  sub newsubscription {
  	my ($auser,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber,
***************
*** 141,144 ****
--- 142,146 ----
  	return $subscriptionid;
  }
+ 
  sub getsubscription {
  	my ($subscriptionid) = @_;
***************
*** 179,185 ****
--- 181,194 ----
  	while (my $subs = $sth->fetchrow_hashref) {
  		$subs->{startdate} = format_date($subs->{startdate});
+ 		$subs->{histstartdate} = format_date($subs->{histstartdate});
  		$subs->{opacnote} =~ s/\n/\<br\/\>/g;
  		$subs->{missinglist} =~ s/\n/\<br\/\>/g;
  		$subs->{recievedlist} =~ s/\n/\<br\/\>/g;
+ 		$subs->{"periodicity".$subs->{periodicity}} = 1;
+ 		if ($subs->{enddate} eq '0000-00-00') {
+ 			$subs->{enddate}='';
+ 		} else {
+ 			$subs->{enddate} = format_date($subs->{enddate});
+ 		}
  		push @res,$subs;
  	}
***************
*** 215,219 ****
  			my $temp=$res[scalar(@res)-1]->{'serials'};
  			push @$temp,
! 				{'planneddate' => $subs->{'planneddate'}, 
  				'serialseq' => $subs->{'serialseq'},
  				'status1' => $subs->{'status'}==1,
--- 224,228 ----
  			my $temp=$res[scalar(@res)-1]->{'serials'};
  			push @$temp,
! 				{'planneddate' => format_date($subs->{'planneddate'}), 
  				'serialseq' => $subs->{'serialseq'},
  				'status1' => $subs->{'status'}==1,
***************
*** 225,234 ****
  			$first=1 if (not $year);
  			$year= $subs->{'year'};
! 			$startdate= $subs->{'startdate'};
  			$aqbooksellername= $subs->{'aqbooksellername'};
  			$bibliotitle= $subs->{'bibliotitle'};
  			my @temp;
  			push @temp,
! 				{'planneddate' => $subs->{'planneddate'}, 
  				'serialseq' => $subs->{'serialseq'},
  				'status1' => $subs->{'status'}==1,
--- 234,243 ----
  			$first=1 if (not $year);
  			$year= $subs->{'year'};
! 			$startdate= format_date($subs->{'startdate'});
  			$aqbooksellername= $subs->{'aqbooksellername'};
  			$bibliotitle= $subs->{'bibliotitle'};
  			my @temp;
  			push @temp,
! 				{'planneddate' => format_date($subs->{'planneddate'}), 
  				'serialseq' => $subs->{'serialseq'},
  				'status1' => $subs->{'status'}==1,




From tipaul at users.sourceforge.net  Thu Jun 16 17:37:18 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:37:18 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/circ - New directory
Message-ID: <E1DiwQg-000401-Nd@sc8-pr-cvs1.sourceforge.net>

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

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/help/circ added to the repository
--> Using per-directory sticky tag `rel_2_2'





From tipaul at users.sourceforge.net  Thu Jun 16 17:37:50 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:37:50 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/export - New directory
Message-ID: <E1DiwRC-00041b-Mg@sc8-pr-cvs1.sourceforge.net>

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

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/help/export added to the repository
--> Using per-directory sticky tag `rel_2_2'





From tipaul at users.sourceforge.net  Thu Jun 16 17:38:07 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:38:07 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/import - New directory
Message-ID: <E1DiwRT-00042G-9R@sc8-pr-cvs1.sourceforge.net>

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

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/help/import added to the repository
--> Using per-directory sticky tag `rel_2_2'





From tipaul at users.sourceforge.net  Thu Jun 16 17:38:38 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:38:38 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/export marc.tmpl,NONE,1.1.2.1
Message-ID: <E1DiwRy-00045a-Pw@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
      Tag: rel_2_2
	marc.tmpl 
Log Message:
online help (missing files or cvs problem on my computer)

--- NEW FILE ---
<!-- TMPL_INCLUDE name="help-top.inc" -->
<h1>iso 2709 export</h1>
<p>This is a tool to export your bibliographic records in standard MARC communications format (ISO2709). It exports only the basic bibliographic information with no holdings information other than any holdings information originally loaded into Koha using the bulkmarcimport tool.</p>

<p>You are asked to provide a starting biblio record number and an ending number for the export. If you want to export all of your records, leave the start and end numbers blank.</p>

<p>Records are downloaded to the workstation that requests the export and are saved in a file called "marc.pl."</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->




From tipaul at users.sourceforge.net  Thu Jun 16 17:38:38 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:38:38 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/circ circulation.tmpl,NONE,1.1.2.1 returns.tmpl,NONE,1.1.2.1
Message-ID: <E1DiwRy-00045W-NZ@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
      Tag: rel_2_2
	circulation.tmpl returns.tmpl 
Log Message:
online help (missing files or cvs problem on my computer)

--- NEW FILE ---
<!-- TMPL_INCLUDE name="help-top.inc" -->
<h1>Circulation / Issues help</h1>
<p>Before you begin, it is very important that you take note of the branch and printer settings and change them if necessary. This should only have to be done the first time you do circulations from a workstation, after which a browser cookie will remember the correct settings. If you do circulations under the wrong branch settings (for example, your branch setting is "Suburb," but you are actually working at the "Downtown" branch), then Koha will reset the location of all items scanned to the incorrect branch (Suburb) and the statistical reports will credit all circulations to the wrong branch.</p>

<p>Now start by scanning the borrower's barcode or type in their name to find their account. Once Koha has found the borrower, you will see a new form for scanning or typing the item's identifying number (usually a barcode).</p>

<p>If you wish to have this item and all subsequent items in this transaction to have a date due other than the default date due defined for the item type, use the "Sticky Due Date" to set the date due before scanning the first item.</p>

<p>If the issuing has nothing specific, it will be done immediatly and shown (with other borrower issues) at bottom.</p>
<p>If the issuing is problematic, then another box will appear (in <b>RED</b>) and ask for confirmation if possible. If the issuing is really impossible (for example, the barcode does not exist), then you can't confirm the issue. If it is possible but has something that needs confirmation (like item being issued to another borrower, or borrower having issued too many items), then you must confirm the issuing. If the confirmation means another operation (if item is issued to another borrower, then issuing also means make the return), then it's also done</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE name="help-top.inc" -->
<h1>Circulation / Returns help</h1>
<p>Before you begin, it is very important that you take note of the branch and printer settings and change them if necessary. This should only have to be done the first time you do circulations (or returns) from a workstation, after which a browser cookie will remember the correct settings. If you do returns under the wrong branch settings (for example, your branch setting is "Suburb," but you are actually working at the "Downtown" branch), then Koha will reset the location of all items scanned to the incorrect branch (Suburb).</p>

<p>Now simply scan or type the returned item's identifying number (usually a barcode) in the box provided.</p>

<p>The return is done and if there is something specific for the item or the borrower (like borrower having debts), a red box will warn you</p>
<p>If the item has been requested by someone else, you also are asked to validate the request. If you confirm it, item is changed to a "waiting" status and you should warn the borrower that the item is available</p>
<p>If the item is requested by someone in anothe branch, then you must validate the transfer too</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->




From tipaul at users.sourceforge.net  Thu Jun 16 17:38:38 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:38:38 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/import breeding.tmpl,NONE,1.1.2.1
Message-ID: <E1DiwRy-00045f-Sz@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
      Tag: rel_2_2
	breeding.tmpl 
Log Message:
online help (missing files or cvs problem on my computer)

--- NEW FILE ---
<!-- TMPL_INCLUDE name="help-top.inc" -->
<h1>Import iso2709 file</h1>
<p>This is one of the screens you will see frequently if you are starting from scratch.</p>
<p>It is useful to import a bunch of iso2709 biblios that can be used later for a quick cataloguing</p>
<p>First, you need to browse your computer to find the MARC record that you grabbed for your item. Click on</p>
<p>Choose File to browse.</p>
<p>If you aren't sure if you've already imported a record, keep the radio button set to</p>
<p>Ignore this one, keep the existing one.</p>
<p>You can "name" the import to help you when you need to choose between more than 1 imported biblio (or just want to keep trace on where the biblios comes from)</p>
<p>You can also change char encoding between MARC21 and UNIMARC</p>
<p>You don't need to actually name every import, so you don't need to fill in this box if you don't want to. It is useful for telling imports apart if you've more than one of the same record.</p>
<p><b>IMPORTANT : This tool is NOT intended to import iso2709 in your ACTIVE DB. If you need to migrate datas from another ILS, then you must consider $kohaInstall/scripts/misc/bulkmarcimport.pl</b></p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->




From tipaul at users.sourceforge.net  Thu Jun 16 17:39:53 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:39:53 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/images filefind.png,NONE,1.1.2.1
Message-ID: <E1DiwTB-0004GI-HD@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
      Tag: rel_2_2
	filefind.png 
Log Message:
adding the little glass to CVS

--- NEW FILE ---
‰PNG



T}ø¨¤ì€
ùÛºsôÙÇŽ~Ÿé馧×&B%"tttpñâEöïßÀ׌¡×.òQž\PÌåLmB(æZè˯§¯»�öÅEŽýà‡œ;wŽ“'ÊÏ~òct:Óô×’W,ÝùóçI¥RÌÍÍ1::ÊŽ¯ràÀ7xqp_î	­ÚXL¥1$$›ÒÝ)ËÅ?¼ÍÙ³LOÏðúë{yÿ—¿
áår9wãÆ
J¥sssÜ»w�¹¹9–ª‹|ò¯Û«¶Ôøø8ccc+³tÃÃË_Â÷}vîÜÅáÇ)‹O­„
ÃÏóð}Ÿžž
œ(¬(¬¤qQ¥x˜]�`%DG\ùàòª*•J
`¥†�jØ(ÄŠ©ÃDx6áÅ©X°6Ùó¬<
 
122ÂìgŸ¯
¡¬µ	@T�NÂd‡¸åYjØúþòº	ó®^½êFFF˜¯
ˆ;wîÐÛÛë



From tipaul at users.sourceforge.net  Thu Jun 16 17:41:12 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:41:12 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac-top.inc,1.8.2.5,1.8.2.6
Message-ID: <E1DiwUS-0004VF-7Z@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-top.inc 
Log Message:
changing popup size

Index: opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc,v
retrieving revision 1.8.2.5
retrieving revision 1.8.2.6
diff -C2 -r1.8.2.5 -r1.8.2.6
*** opac-top.inc	6 Jun 2005 14:07:27 -0000	1.8.2.5
--- opac-top.inc	16 Jun 2005 15:41:09 -0000	1.8.2.6
***************
*** 25,29 ****
  	var MSG_NO_RECORD_ADDED = _("No biblio added");
  	function Dopop(link) {
! 		newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
  	}
  	</script>
--- 25,29 ----
  	var MSG_NO_RECORD_ADDED = _("No biblio added");
  	function Dopop(link) {
! 		newin=window.open(link,'popup','width=700,height=500,toolbar=false,scrollbars=yes');
  	}
  	</script>




From tipaul at users.sourceforge.net  Thu Jun 16 17:40:17 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:40:17 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.17.2.6,1.17.2.7
Message-ID: <E1DiwTZ-0004IG-VB@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac.css 
Log Message:
minor changes in css for better IE compliance

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.17.2.6
retrieving revision 1.17.2.7
diff -C2 -r1.17.2.6 -r1.17.2.7
*** opac.css	6 Jun 2005 14:06:14 -0000	1.17.2.6
--- opac.css	16 Jun 2005 15:40:15 -0000	1.17.2.7
***************
*** 169,173 ****
  	vertical-align:top;
  	position:static;
- /*	position:relative;*/
  	display:table-cell;
  }
--- 169,172 ----
***************
*** 379,405 ****
  /* for SubscritptionHistory view  */
  div.tabsubs {
! 	width:25px;
! 	margin-left:10px;
! 	margin-top:100px;
  }
  
  div.tabsubs a {
- 	display:block;
  	font-size: small;
  	border: thin solid black;
  	margin-right: 2px;
! 	padding: 15px 30px;
! 	-moz-border-radius: 5px 0px 0px 5px;
  }
  
  div.tabsub {
  	background-color: #ACE6E6;
  	visibility:hidden;
! 	margin-left:72px;
! 	margin-top:100px;
! 	margin-right:10%;
  }
  
- 
  /* for MARC view  */
  div.tabs {
--- 378,402 ----
  /* for SubscritptionHistory view  */
  div.tabsubs {
! 	margin-left:150px;
! 	position:inline;
  }
  
  div.tabsubs a {
  	font-size: small;
  	border: thin solid black;
  	margin-right: 2px;
! 	padding: 10px 10px;
! 	-moz-border-radius: 5px 5px 0px 0px;
  }
  
  div.tabsub {
  	background-color: #ACE6E6;
+ 	position:absolute;
  	visibility:hidden;
! 	margin-left:150px;
! 	margin-top:0px;
! border:4px;
  }
  
  /* for MARC view  */
  div.tabs {




From tipaul at users.sourceforge.net  Thu Jun 16 17:42:12 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:42:12 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-full-serial-issues.tmpl,1.1.2.3,1.1.2.4
Message-ID: <E1DiwVQ-0004b0-7e@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-full-serial-issues.tmpl 
Log Message:
* css change for better IE compliance
* adding switch from complete to compact history view

Index: opac-full-serial-issues.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/Attic/opac-full-serial-issues.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** opac-full-serial-issues.tmpl	6 Jun 2005 12:16:06 -0000	1.1.2.3
--- opac-full-serial-issues.tmpl	16 Jun 2005 15:42:03 -0000	1.1.2.4
***************
*** 3,7 ****
  
  <!-- TMPL_UNLESS name="popup" -->
- <div id="mainbloc">
  	<h1 class="catalogue">Subscription information for biblio #<!-- TMPL_VAR NAME="biblionumber" --> with title : <!-- TMPL_VAR name="bibliotitle" --></h1>
  	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Back to biblio</a>
--- 3,6 ----
***************
*** 10,16 ****
  	<!-- TMPL_LOOP NAME="years" -->
  		<!-- TMPL_IF NAME="year" -->
! 			<div id="link<!--TMPL_VAR Name="year" -->" ><a href="javascript:active(<!-- TMPL_VAR NAME="year" -->)"><!-- TMPL_VAR NAME="year" --></a></div>
  		<!-- /TMPL_IF -->
  	<!-- /TMPL_LOOP -->
  	</div>
  
--- 9,16 ----
  	<!-- TMPL_LOOP NAME="years" -->
  		<!-- TMPL_IF NAME="year" -->
! 			<a  class="tabsubs" href="javascript:active(<!-- TMPL_VAR NAME="year" -->)"><!-- TMPL_VAR NAME="year" --></a>
  		<!-- /TMPL_IF -->
  	<!-- /TMPL_LOOP -->
+ 	<a class="tabsubs" href="opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->&selectview=small">Compact view</a>
  	</div>
  
***************
*** 45,50 ****
  	</div>
  	<!--/TMPL_LOOP -->
- </div>
  <script language="JavaScript" type="text/javascript">
  function active(numlayer)
  {
--- 45,50 ----
  	</div>
  	<!--/TMPL_LOOP -->
  <script language="JavaScript" type="text/javascript">
+ active(<!-- TMPL_VAR name="yearmin" -->);
  function active(numlayer)
  {




From tipaul at users.sourceforge.net  Thu Jun 16 17:43:46 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:43:46 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-searchresults.tmpl,1.20.2.4,1.20.2.5
Message-ID: <E1DiwWw-0004ud-E1@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-searchresults.tmpl 
Log Message:
changing some html (minor)

Index: opac-searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl,v
retrieving revision 1.20.2.4
retrieving revision 1.20.2.5
diff -C2 -r1.20.2.4 -r1.20.2.5
*** opac-searchresults.tmpl	6 Jun 2005 14:11:47 -0000	1.20.2.4
--- opac-searchresults.tmpl	16 Jun 2005 15:43:44 -0000	1.20.2.5
***************
*** 54,69 ****
  				<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 -->
--- 54,68 ----
  				<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 -->




From tipaul at users.sourceforge.net  Thu Jun 16 17:44:34 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:44:34 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-serial-issues.tmpl,1.2.2.4,1.2.2.5
Message-ID: <E1DiwXi-0004yS-0k@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-serial-issues.tmpl 
Log Message:
proofread & better english & better look

Index: opac-serial-issues.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -C2 -r1.2.2.4 -r1.2.2.5
*** opac-serial-issues.tmpl	6 Jun 2005 14:12:14 -0000	1.2.2.4
--- opac-serial-issues.tmpl	16 Jun 2005 15:44:31 -0000	1.2.2.5
***************
*** 3,11 ****
  <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>
  	<!-- 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" -->
--- 3,13 ----
  <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" -->
***************
*** 43,70 ****
  		<!-- /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 -->
***************
*** 72,77 ****
  			<!-- TMPL_IF name="monthlength" --><!-- TMPL_VAR name="monthlength" --> months<!-- /TMPL_IF -->
  			</b>
- 		since <b><!-- TMPl_VAR name="startdate" --></b>
  		</p>
  	<!--TMPL_UNLESS Name=fullinfo -->
  		<p><!-- TMPL_VAR name="notes" --></p>
--- 71,77 ----
  			<!-- 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>




From tipaul at users.sourceforge.net  Thu Jun 16 17:46:01 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:46:01 -0700
Subject: [Koha-cvs] CVS: koha/misc/migration_tools check_marc_definition.pl,1.1.2.2,1.1.2.3
Message-ID: <E1DiwZ7-00058n-PK@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/migration_tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19752/misc/migration_tools

Modified Files:
      Tag: rel_2_2
	check_marc_definition.pl 
Log Message:
improving script with a new parameter to show all the subfields usage.

Index: check_marc_definition.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/migration_tools/check_marc_definition.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** check_marc_definition.pl	7 Apr 2005 12:00:57 -0000	1.1.2.2
--- check_marc_definition.pl	16 Jun 2005 15:45:59 -0000	1.1.2.3
***************
*** 15,22 ****
  use Getopt::Long;
  my ( $input_marc_file, $number) = ('',0);
! my ($version,$confirm);
  GetOptions(
      'h' => \$version,
      'c' => \$confirm,
  );
  
--- 15,23 ----
  use Getopt::Long;
  my ( $input_marc_file, $number) = ('',0);
! my ($version,$confirm,$all);
  GetOptions(
      'h' => \$version,
      'c' => \$confirm,
+ 	'a' => \$all,
  );
  
***************
*** 26,29 ****
--- 27,32 ----
  It show all fields/subfields that are in the MARC DB but NOT in any tab (= fields used but not visible) Usually, this means you made an error in your MARC editor. Sometimes, this is something normal.
  
+ options
+ \t-a : will show all subfields usages, not only subfields in tab ignore that are used.
  Enter $0 -c to run this script (the -c being here only to "confirm"
  EOF
***************
*** 38,47 ****
  my %tags;
  my $sth2 = $dbh->prepare("select tab,liblibrarian,kohafield from marc_subfield_structure where tagfield=? and tagsubfield=? and frameworkcode=?");
  while (my ($total,$tag,$subfield,$frameworkcode) = $sth->fetchrow) {
  	$sth2->execute($tag,$subfield,$frameworkcode);
  	$tags{$frameworkcode." / ".$tag." / ".$subfield} ++;
  	my ($tab,$liblibrarian,$kohafield) = $sth2->fetchrow;
! 	if ($tab eq -1 && $kohafield ne "biblio.biblionumber" && $kohafield ne "biblioitems.biblioitemnumber" && $kohafield ne "items.itemnumber") {
! 		print "Tab ignore for framework $frameworkcode, $tag\$$subfield - $liblibrarian (used $total times)\n";
  	}
  }
--- 41,57 ----
  my %tags;
  my $sth2 = $dbh->prepare("select tab,liblibrarian,kohafield from marc_subfield_structure where tagfield=? and tagsubfield=? and frameworkcode=?");
+ if ($all) {
+ 	print "framework|tag|subfield|value|used|tab\n";
+ }
  while (my ($total,$tag,$subfield,$frameworkcode) = $sth->fetchrow) {
  	$sth2->execute($tag,$subfield,$frameworkcode);
  	$tags{$frameworkcode." / ".$tag." / ".$subfield} ++;
  	my ($tab,$liblibrarian,$kohafield) = $sth2->fetchrow;
! 	if ($all) {
! 		print $frameworkcode."|".$tag.'|$'.$subfield."|".$liblibrarian."|".$total."|".$tab."\n";
! 	} else {
! 		if ($tab eq -1 && $kohafield ne "biblio.biblionumber" && $kohafield ne "biblioitems.biblioitemnumber" && $kohafield ne "items.itemnumber") {
! 			print "Tab ignore for framework $frameworkcode, $tag\$$subfield - $liblibrarian (used $total times)\n";
! 		}
  	}
  }




From tipaul at users.sourceforge.net  Thu Jun 16 17:47:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:47:54 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-serial-issues.pl,1.1.2.6,1.1.2.7
Message-ID: <E1Diwaw-0005Qk-MA@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20840/opac

Modified Files:
      Tag: rel_2_2
	opac-serial-issues.pl 
Log Message:
switching to complete or standard history view

Index: opac-serial-issues.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-serial-issues.pl,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -r1.1.2.6 -r1.1.2.7
*** opac-serial-issues.pl	3 Jun 2005 12:53:08 -0000	1.1.2.6
--- opac-serial-issues.pl	16 Jun 2005 15:47:52 -0000	1.1.2.7
***************
*** 15,20 ****
  my $op = $query->param('op');
  my $dbh = C4::Context->dbh;
! my $selectview = C4::Context->preference("SubscriptionHistory");
! warn "selectview : ".$selectview;
  
  my $sth;
--- 15,20 ----
  my $op = $query->param('op');
  my $dbh = C4::Context->dbh;
! my $selectview = $query->param('selectview');
! $selectview = C4::Context->preference("SubscriptionHistory") unless $selectview;
  
  my $sth;
***************
*** 23,77 ****
  my $biblionumber = $query->param('biblionumber');
  if ($selectview eq "full"){
! my $subscriptions = get_full_subscription_list_from_biblionumber($biblionumber);
! 
! my $title = $subscriptions->[0]{bibliotitle};
! warn "title ".$title;
! my $yearmin=$subscriptions->[0]{year};
! warn "yearmin ".$yearmin;
! my $yearmax=$subscriptions->[scalar(@$subscriptions)-1]{year};
! warn "yearmax ".$yearmax;
! 
! 
! ($template, $loggedinuser, $cookie)
! = get_template_and_user({template_name => "opac-full-serial-issues.tmpl",
! 				query => $query,
! 				type => "opac",
! 				authnotrequired => 1,
! 				debug => 1,
! 				});
! 
! # replace CR by <br> in librarian note
! # $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
! 
! $template->param(
! 	biblionumber => $query->param('biblionumber'),
! 	years => $subscriptions,
! 	yearmin => $yearmin,
! 	yearmax =>$yearmax,
! 	bibliotitle => $title,
! 	suggestion => C4::Context->preference("suggestion"),
! 	virtualshelves => C4::Context->preference("virtualshelves"),
! 	);
  
  } else {
! my $subscriptions = get_subscription_list_from_biblionumber($biblionumber);
! 
! ($template, $loggedinuser, $cookie)
! = get_template_and_user({template_name => "opac-serial-issues.tmpl",
! 				query => $query,
! 				type => "opac",
! 				authnotrequired => 1,
! 				debug => 1,
! 				});
! 
! # replace CR by <br> in librarian note
! # $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
! 
! $template->param(
! 	biblionumber => $query->param('biblionumber'),
! 	subscription_LOOP => $subscriptions,
! 	suggestion => C4::Context->preference("suggestion"),
! 	virtualshelves => C4::Context->preference("virtualshelves"),
! 	);
  }
  output_html_with_http_headers $query, $cookie, $template->output;
--- 23,77 ----
  my $biblionumber = $query->param('biblionumber');
  if ($selectview eq "full"){
! 	my $subscriptions = get_full_subscription_list_from_biblionumber($biblionumber);
! 	
! 	my $title = $subscriptions->[0]{bibliotitle};
! # 	warn "title ".$title;
! 	my $yearmin=$subscriptions->[0]{year};
! # 	warn "yearmin ".$yearmin;
! 	my $yearmax=$subscriptions->[scalar(@$subscriptions)-1]{year};
! # 	warn "yearmax ".$yearmax;
! 	
! 	
! 	($template, $loggedinuser, $cookie)
! 	= get_template_and_user({template_name => "opac-full-serial-issues.tmpl",
! 					query => $query,
! 					type => "opac",
! 					authnotrequired => 1,
! 					debug => 1,
! 					});
! 	
! 	# replace CR by <br> in librarian note
! 	# $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
! 	
! 	$template->param(
! 		biblionumber => $query->param('biblionumber'),
! 		years => $subscriptions,
! 		yearmin => $yearmin,
! 		yearmax =>$yearmax,
! 		bibliotitle => $title,
! 		suggestion => C4::Context->preference("suggestion"),
! 		virtualshelves => C4::Context->preference("virtualshelves"),
! 		);
  
  } else {
! 	my $subscriptions = get_subscription_list_from_biblionumber($biblionumber);
! 	
! 	($template, $loggedinuser, $cookie)
! 	= get_template_and_user({template_name => "opac-serial-issues.tmpl",
! 					query => $query,
! 					type => "opac",
! 					authnotrequired => 1,
! 					debug => 1,
! 					});
! 	
! 	# replace CR by <br> in librarian note
! 	# $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
! 	
! 	$template->param(
! 		biblionumber => $query->param('biblionumber'),
! 		subscription_LOOP => $subscriptions,
! 		suggestion => C4::Context->preference("suggestion"),
! 		virtualshelves => C4::Context->preference("virtualshelves"),
! 		);
  }
  output_html_with_http_headers $query, $cookie, $template->output;




From tipaul at users.sourceforge.net  Thu Jun 16 17:49:09 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:49:09 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-user.pl,1.14.2.2,1.14.2.3
Message-ID: <E1Diwc9-0005cu-3i@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21579/opac

Modified Files:
      Tag: rel_2_2
	opac-user.pl 
Log Message:
adding opac text messaging to login page.

Index: opac-user.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-user.pl,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -C2 -r1.14.2.2 -r1.14.2.3
*** opac-user.pl	25 Mar 2005 17:04:28 -0000	1.14.2.2
--- opac-user.pl	16 Jun 2005 15:49:05 -0000	1.14.2.3
***************
*** 137,143 ****
  $template->param(WAITING => \@waiting);
  $template->param(waiting_count => $wcount,
! 			     LibraryName => C4::Context->preference("LibraryName"),
! 					suggestion => C4::Context->preference("suggestion"),
! 					virtualshelves => C4::Context->preference("virtualshelves"),
  );
  
--- 137,144 ----
  $template->param(WAITING => \@waiting);
  $template->param(waiting_count => $wcount,
! 				LibraryName => C4::Context->preference("LibraryName"),
! 				suggestion => C4::Context->preference("suggestion"),
! 				virtualshelves => C4::Context->preference("virtualshelves"),
! 				textmessaging => $borr->{textmessaging},
  );
  




From tipaul at users.sourceforge.net  Thu Jun 16 17:49:42 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:49:42 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_123i.pl,NONE,1.1.2.2 unimarc_field_123j.pl,NONE,1.1.2.2 unimarc_field_225a.pl,1.8.2.2,1.8.2.3
Message-ID: <E1Diwcg-0005fE-NE@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21727/value_builder

Modified Files:
      Tag: rel_2_2
	unimarc_field_225a.pl 
Added Files:
      Tag: rel_2_2
	unimarc_field_123i.pl unimarc_field_123j.pl 
Log Message:
missing plugins

--- NEW FILE ---
#!/usr/bin/perl

# $Id: unimarc_field_123i.pl,v 1.1.2.2 2005/06/16 15:49:40 tipaul Exp $

# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use C4::Auth;
use CGI;
use C4::Context;
use HTML::Template;
use C4::Search;
use C4::Output;

=head1

plugin_parameters : other parameters added when the plugin is called by the dopop function

=cut
sub plugin_parameters {
my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
return "";
}

sub plugin_javascript {
my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
my $function_name= "123i".(int(rand(100000))+1);
my $res="
<script>
function Focus$function_name(subfield_managed) {
return 1;
}

function Blur$function_name(subfield_managed) {
	return 1;
}

function Clic$function_name(i) {
	defaultvalue=document.forms[0].field_value[i].value;
	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123i.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123i\",'width=800,height=400,toolbar=false,scrollbars=yes');

}
</script>
";

return ($function_name,$res);
}
sub plugin {
my ($input) = @_;
	my %env;

#	my $input = new CGI;
	my $index= $input->param('index');
	my $result= $input->param('result');


	my $dbh = C4::Context->dbh;

my ($template, $loggedinuser, $cookie)
    = get_template_and_user({template_name => "value_builder/unimarc_field_123i.tmpl",
			     query => $input,
			     type => "intranet",
			     authnotrequired => 0,
			     flagsrequired => {parameters => 1},
			     debug => 1,
			     });
	my $f1 = substr($result,0,1);
	my $f2 = substr($result,1,3);
	my $f3 = substr($result,4,2);
	my $f4 = substr($result,6,2);
	$template->param(index => $index,
			 "f1$f1" => $f1,
			 f2 => $f2,
			 f3 => $f3,
			 f4 => $f4);
	print $input->header(-cookie => $cookie),$template->output;
}

1;

--- NEW FILE ---
#!/usr/bin/perl

# $Id: unimarc_field_123j.pl,v 1.1.2.2 2005/06/16 15:49:40 tipaul Exp $

# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use C4::Auth;
use CGI;
use C4::Context;
use HTML::Template;
use C4::Search;
use C4::Output;

=head1

plugin_parameters : other parameters added when the plugin is called by the dopop function

=cut
sub plugin_parameters {
my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
return "";
}

sub plugin_javascript {
my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
my $function_name= "123j".(int(rand(100000))+1);
my $res="
<script>
function Focus$function_name(subfield_managed) {
return 1;
}

function Blur$function_name(subfield_managed) {
	return 1;
}

function Clic$function_name(i) {
	defaultvalue=document.forms[0].field_value[i].value;
	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123j.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123j\",'width=800,height=400,toolbar=false,scrollbars=yes');

}
</script>
";

return ($function_name,$res);
}
sub plugin {
my ($input) = @_;
	my %env;

#	my $input = new CGI;
	my $index= $input->param('index');
	my $result= $input->param('result');


	my $dbh = C4::Context->dbh;

my ($template, $loggedinuser, $cookie)
    = get_template_and_user({template_name => "value_builder/unimarc_field_123j.tmpl",
			     query => $input,
			     type => "intranet",
			     authnotrequired => 0,
			     flagsrequired => {parameters => 1},
			     debug => 1,
			     });
	my $f1 = substr($result,0,1);
	my $f2 = substr($result,1,3);
	my $f3 = substr($result,4,2);
	my $f4 = substr($result,6,2);
	$template->param(index => $index,
			 "f1$f1" => $f1,
			 f2 => $f2,
			 f3 => $f3,
			 f4 => $f4);
	print $input->header(-cookie => $cookie),$template->output;
}

1;





From tipaul at users.sourceforge.net  Thu Jun 16 17:51:07 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:51:07 -0700
Subject: [Koha-cvs] CVS: koha/z3950 processz3950queue,1.13.2.1,1.13.2.2
Message-ID: <E1Diwe3-0005mu-98@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/z3950
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22225/z3950

Modified Files:
      Tag: rel_2_2
	processz3950queue 
Log Message:
fix for UNIMARC BNF behaviour (now work as expected)

Index: processz3950queue
===================================================================
RCS file: /cvsroot/koha/koha/z3950/processz3950queue,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -C2 -r1.13.2.1 -r1.13.2.2
*** processz3950queue	30 Mar 2005 09:53:39 -0000	1.13.2.1
--- processz3950queue	16 Jun 2005 15:51:05 -0000	1.13.2.2
***************
*** 281,292 ****
  									for ($i=1; $i<=(($numresults<80) ? ($numresults) : (80)); $i++) {
  										my $rec=$rs->record($i);
!  										my $marcdata;
! 										# use render() or rawdata() depending on the type of the returned record
! 										if (ref($rec) eq "Net::Z3950::Record::USMARC") {
! 											$marcdata = $rec->rawdata();
! 										}
! 										if (ref($rec) eq "Net::Z3950::Record::UNIMARC") {
! 											$marcdata = $rec->rawdata();
! 										}
  										$globalencoding = ref($rec);
   										$result.=$marcdata;
--- 281,285 ----
  									for ($i=1; $i<=(($numresults<80) ? ($numresults) : (80)); $i++) {
  										my $rec=$rs->record($i);
!  										my $marcdata = $rec->rawdata();
  										$globalencoding = ref($rec);
   										$result.=$marcdata;




From tipaul at users.sourceforge.net  Thu Jun 16 17:50:24 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:50:24 -0700
Subject: [Koha-cvs] CVS: koha/z3950/server zed-koha-server.pl,1.4,1.4.2.1
Message-ID: <E1DiwdM-0005it-8P@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/z3950/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21986/z3950/server

Modified Files:
      Tag: rel_2_2
	zed-koha-server.pl 
Log Message:
bugfix in SQL query. Now the z3950 server works...

Index: zed-koha-server.pl
===================================================================
RCS file: /cvsroot/koha/koha/z3950/server/zed-koha-server.pl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** zed-koha-server.pl	3 Jun 2004 01:48:19 -0000	1.4
--- zed-koha-server.pl	16 Jun 2005 15:50:22 -0000	1.4.2.1
***************
*** 58,62 ****
  use C4::Biblio;
  use strict;
! my $dbh = C4::Context->dbh;
  my @bib_list;		## Stores the list of biblionumbers in a query 
  			## I should eventually move this to different scope
--- 58,62 ----
  use C4::Biblio;
  use strict;
! # my $dbh = C4::Context->dbh;
  my @bib_list;		## Stores the list of biblionumbers in a query 
  			## I should eventually move this to different scope
***************
*** 86,89 ****
--- 86,90 ----
  sub run_query {		## Run the query and store the biblionumbers: 
  	my ($sql_query, $query, $args) = @_;
+ 		my $dbh = C4::Context->dbh;
         	my $sth_get = $dbh->prepare("$sql_query");
  
***************
*** 145,149 ****
  		print "The query was:\n";        
  		print "$query\n";
! 		my $sql_query = "SELECT marc_biblio.bibid FROM marc_biblio RIGHT JOIN biblio ON marc_biblio.biblionumber = biblio.biblionumber WHERE biblio.isbn LIKE ?";
  		&run_query($sql_query, $query, $args);
  
--- 146,150 ----
  		print "The query was:\n";        
  		print "$query\n";
! 		my $sql_query = "SELECT marc_biblio.bibid FROM marc_biblio RIGHT JOIN biblioitems ON marc_biblio.biblionumber = biblioitems.biblionumber WHERE biblioitems.isbn LIKE ?";
  		&run_query($sql_query, $query, $args);
  
***************
*** 269,392 ****
          $offset -= 1;                   ## because $args->{OFFSET} 1 = record #1
          chomp (my $bibid = $bib_list[$offset]); ## Not sure about this
!                 ## print "the bibid is:$bibid\n";
!                 my $MARCRecord = &MARCgetbiblio($dbh,$bibid);
!                 my $recordstring=$MARCRecord->as_usmarc();
!                 ## print "here is my record: $recordstring\n";
! 
! 		## Troubleshooting:
! 		## use Data::Dumper;
! 		## Dumper $recordstring;
! 		## open (MARC, ">/root/marc.dump");
!                 ## print MARC "$recordstring";
! 		## close MARC;
! 		
! 		## Convert from 852/4 to 952:
! 		## 942a --> 852a  Organization code
! 		## 952b --> 852b  Home branch
! 		## 942k --> 852h  Classification
! 		## 952p --> 852p  Barcode
! 
! my $record = MARC::Record->new_from_usmarc($recordstring);
!     my @fields942 = $record->field('942');
!     my $field842 = $fields942[0];
! 	my ($field952, $sub852a, $sub852k, $sub852b, $sub852p, $sub852h);
!        
! 
! ## while ( my $record = $batch->next() ) {
!   ##  my @fields942 = $record->field('942');
!   ##  my $field842 = $fields942[0];
!   ##     #grab first 942 (only need one, they are same for all items)
!   ##  my $sub852a = ($field842->subfield('a') || '');
!   ##  my $sub852h = ($field842->subfield('k') || '');
! 
!   ##  my @fields952 = $record->field('952');
!   ##  foreach my $field952 (@fields952) {   #get all 952s
!   ##      my $sub852b = ($field952->subfield('b') || '');
!   ##      my $sub852p = ($field952->subfield('p') || '');
! 
! 
! #grab first 942 (only need one, they are same for all items)
! 	unless (! $field952){
! 		$sub852a = ($field952->subfield('a') || '') ;
! }
! 	unless (! $field952){ #->subfield('k')) { 
! 		$sub852k = ($field952->subfield('k') || '') ;
! 
! }
! 
!     my @fields952 = $record->field('952');
!     foreach my $field952 (@fields952) {   #get all 952s
!         
!         unless (! $field952) { #->subfield('b')) { 
! 		$sub852b = ($field952->subfield('b') || '') ;
! } 
!  unless (! $field952) { #->subfield('p')) { 
! 		$sub852p = ($field952->subfield('p') || '') ;
! }
!      #make it one big happy family
!         my $new852 = MARC::Field->new(
!                                       852,'','',
!                                       'a' => $sub852a,
! 				      'b' => $sub852b,
!                                       'h' => $sub852h,
!                                       'p' => $sub852p,
!                                       );
!         $record->append_fields($new852);
! 
! }
! 
! my $recordstringdone = $record->as_usmarc();
! 
  		## Set the REP_FORM
! 		$args->{REP_FORM} = &Net::Z3950::OID::usmarc;
  		
  		## Return the record string to the client 
! 	        $args->{RECORD} = $recordstringdone;
  
  }
  
- # That's all folks!
- # 
- # OLD OLD OLD OLD
- 
- sub fetch_handler_old {
- 	my ($args) = @_;	
- 	# warn "in fetch_handler";	## troubleshooting
- 	my $offset = $args->{OFFSET};
- 	$offset -= 1;			## because $args->{OFFSET} 1 = record #1
- 	chomp (my $bibid = $bib_list[$offset]);	## Not sure about this
-         my $sql_query = "SELECT tag, subfieldcode, subfieldvalue FROM marc_subfield_table where bibid=?";
- 	my $sth_get = $dbh->prepare("$sql_query");
-         $sth_get->execute($bibid);
- 	
- 	## create a MARC::Record object 
-         my $rec = MARC::Record->new();
- 
- 	## create the fields
-         while (my @data=$sth_get->fetchrow_array) {
- 
-         	my $tag = $data[0];
-        		my $subfieldcode = $data[1];
-         	my $subfieldvalue = $data[2];
- 
-         	my $field = MARC::Field->new(
-                 	                          $tag,'','',
-                         	                  $subfieldcode => $subfieldvalue,
-                                 	    );
  
-  	       	$rec->append_fields($field);
- 		
- 		## build the marc string and put into $record         
-         	my $tmp_record = $rec->as_usmarc();
- 		my $reclen = length $tmp_record;
- 		my $baseaddr = "$reclen + dirlen";
- #		set_leader_lengths($reclen,$baseaddr);
- 		my $record = $rec->as_usmarc(); 	
- 		$args->{RECORD} = $record;
- 	}
- 
- }
- 
- 	
  ## This stuff doesn't work yet...I should include boolean searching someday
  ## though
--- 270,287 ----
          $offset -= 1;                   ## because $args->{OFFSET} 1 = record #1
          chomp (my $bibid = $bib_list[$offset]); ## Not sure about this
! 				## print "the bibid is:$bibid\n";
! 				my $dbh = C4::Context->dbh;
! 				my $MARCRecord = &MARCgetbiblio($dbh,$bibid);
! 				$MARCRecord->leader('     nac  22     1u 4500');
  		## Set the REP_FORM
! 		$args->{REP_FORM} = &Net::Z3950::OID::unimarc;
  		
  		## Return the record string to the client 
! 			$args->{RECORD} = $MARCRecord->as_usmarc();
! # 	        $args->{RECORD} = $recordstringdone;
  
  }
  
  
  ## This stuff doesn't work yet...I should include boolean searching someday
  ## though




From hellen at users.sourceforge.net  Thu Jun 16 20:31:32 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 16 Jun 2005 11:31:32 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/bookshelves shelves.tmpl,1.3,1.4
Message-ID: <E1Diz9I-0005uR-As@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/bookshelves
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22530/koha-tmpl/intranet-tmpl/default/de/bookshelves

Modified Files:
	shelves.tmpl 
Log Message:
translated by hellen

Index: shelves.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/bookshelves/shelves.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** shelves.tmpl	9 Jun 2005 08:37:42 -0000	1.3
--- shelves.tmpl	16 Jun 2005 18:31:25 -0000	1.4
***************
*** 11,15 ****
  				<tr colspan="4">
  					<th class="catalogue">l&ouml;schen</th>
! 					<th class="catalogue">Strichcode</th>
  					<th class="catalogue">Titel</th>
  					<th class="catalogue">Verfasser</th>
--- 11,15 ----
  				<tr colspan="4">
  					<th class="catalogue">l&ouml;schen</th>
! 					<th class="catalogue">Barcode</th>
  					<th class="catalogue">Titel</th>
  					<th class="catalogue">Verfasser</th>
***************
*** 28,32 ****
  			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
  			<!-- TMPL_IF name="manageshelf" -->
! 				<input type="submit" value="Ausgew&auml;hlte exemplare l&ouml;schen" class="button catalogue">
  			<!-- /TMPL_IF -->
  		</div>
--- 28,32 ----
  			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
  			<!-- TMPL_IF name="manageshelf" -->
! 				<input type="submit" value="Ausgew&auml;hlte Exemplare l&ouml;schen" class="button catalogue">
  			<!-- /TMPL_IF -->
  		</div>
***************
*** 106,110 ****
  	<!-- TMPL_ELSE -->
  		<div id="bloc25">
! 			<h2 class="catalogue">Shelf-Liste</h2>
  			<table class="small">
  				<tr>
--- 106,110 ----
  	<!-- TMPL_ELSE -->
  		<div id="bloc25">
! 			<h2 class="catalogue">Regalliste</h2>
  			<table class="small">
  				<tr>
***************
*** 145,149 ****
  		</div>
  		<div id="bloc25">
! 			<a href="shelves.pl?shelves=1" class="button catalogue">Virtueles Regal hinzuf&uuml;gen oder l&ouml;schen</a>
  		</div>
  	<!-- /TMPL_IF -->
--- 145,149 ----
  		</div>
  		<div id="bloc25">
! 			<a href="shelves.pl?shelves=1" class="button catalogue">Virtuelles Regal hinzuf&uuml;gen oder l&ouml;schen</a>
  		</div>
  	<!-- /TMPL_IF -->




From hellen at users.sourceforge.net  Thu Jun 16 20:31:32 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 16 Jun 2005 11:31:32 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/parameters aqbudget.tmpl,1.1,1.2
Message-ID: <E1Diz9I-0005ua-HE@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22530/koha-tmpl/intranet-tmpl/default/de/parameters

Modified Files:
	aqbudget.tmpl 
Log Message:
translated by hellen

Index: aqbudget.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/aqbudget.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** aqbudget.tmpl	12 May 2005 19:26:35 -0000	1.1
--- aqbudget.tmpl	16 Jun 2005 18:31:30 -0000	1.2
***************
*** 107,111 ****
  			</p>
  			<p>
! 				<label class="label100">Name des Etats</label><!-- TMPL_VAR NAME="bookfundname" -->
  			</p>
  		<!-- /TMPL_IF -->
--- 107,111 ----
  			</p>
  			<p>
! 				<label class="label100">Etatname</label><!-- TMPL_VAR NAME="bookfundname" -->
  			</p>
  		<!-- /TMPL_IF -->




From hdl at users.sourceforge.net  Thu Jun 16 21:10:12 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 16 Jun 2005 12:10:12 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bull statecollection.tmpl,1.5,1.6
Message-ID: <E1Dizki-00032s-Tf@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	statecollection.tmpl 
Log Message:
Adding 2 status to serial issues :
	- delete : to delete the current issue
	- not issued : to distinguish missing from not issued serial number.

Index: statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** statecollection.tmpl	4 May 2005 08:52:51 -0000	1.5
--- statecollection.tmpl	16 Jun 2005 19:10:09 -0000	1.6
***************
*** 54,57 ****
--- 54,67 ----
  						<option value="4">Missing</option>
  					<!-- /TMPL_IF -->
+ 					<!--TMPL_IF name="status5" -->
+ 						<option value="5" selected>Not issued</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="5">Not issued</option>
+ 					<!-- /TMPL_IF -->
+ 					<!--TMPL_IF name="status6" -->
+ 						<option value="6" selected>Delete</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="6">Delete</option>
+ 					<!-- /TMPL_IF -->
  				</select>
  			</td>
***************
*** 98,101 ****
--- 108,115 ----
  		<p>Missing issues</p>
  		<p>&nbsp;<textarea name="missinglist" COLS=60 ROWS=2><!-- TMPL_VAR name="missinglist" --></textarea></p>
+ 		<!--TMPL_IF Name="notissuedlist"-->
+ 		<p>Not issued</p>
+ 		<p>&nbsp;<textarea name="notissuedlist" COLS=60 ROWS=2><!-- TMPL_VAR name="notissuedlist" --></textarea></p>
+ 		<!--/TMPL_IF-->
  		<p>Opac's note</p>
  		<p>&nbsp;<textarea name="opacnote" COLS=60 ROWS=5><!-- TMPL_VAR name="opacnote" --></textarea></p>




From hdl at users.sourceforge.net  Thu Jun 16 21:10:15 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 16 Jun 2005 12:10:15 -0700
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.9,1.10
Message-ID: <E1Dizkl-00033Q-Pr@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11586/C4

Modified Files:
	Bull.pm 
Log Message:
Adding 2 status to serial issues :
	- delete : to delete the current issue
	- not issued : to distinguish missing from not issued serial number.

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Bull.pm	4 May 2005 15:40:01 -0000	1.9
--- Bull.pm	16 Jun 2005 19:10:10 -0000	1.10
***************
*** 51,55 ****
  			&Find_Next_Date, &Get_Next_Seq
  			&hassubscriptionexpired &subscriptionexpirationdate &subscriptionrenew
! 			&getSupplierListWithLateIssues &GetLateIssues);
  
  sub getSupplierListWithLateIssues {
--- 51,55 ----
  			&Find_Next_Date, &Get_Next_Seq
  			&hassubscriptionexpired &subscriptionexpirationdate &subscriptionrenew
! 			&getSupplierListWithLateIssues &GetLateIssues &serialdelete);
  
  sub getSupplierListWithLateIssues {
***************
*** 275,279 ****
  	my $dbh = C4::Context->dbh;
  	# status = 2 is "arrived"
! 	my $sth=$dbh->prepare("select serialid,serialseq, status, planneddate from serial where subscriptionid = ? and status <>2 and status <>4");
  	$sth->execute($subscriptionid);
  	my @serials;
--- 275,279 ----
  	my $dbh = C4::Context->dbh;
  	# status = 2 is "arrived"
! 	my $sth=$dbh->prepare("select serialid,serialseq, status, planneddate from serial where subscriptionid = ? and status <>2 and status <>4 and status <>5");
  	$sth->execute($subscriptionid);
  	my @serials;
***************
*** 289,296 ****
  }
  
! sub serialchangestatus {
! 	my ($serialid,$serialseq,$planneddate,$status)=@_;
! # 	warn "($serialid,$serialseq,$planneddate,$status)";
! 	# 1st, get previous status : if we change from "waited" to something else, then we will have to create a new "waited" entry
  	my $dbh = C4::Context->dbh;
  	my $sth = $dbh->prepare("select subscriptionid,status from serial where serialid=?");
--- 289,294 ----
  }
  
! sub serialdelete {
! 	my ($serialid,$serialseq)=@_;
  	my $dbh = C4::Context->dbh;
  	my $sth = $dbh->prepare("select subscriptionid,status from serial where serialid=?");
***************
*** 298,314 ****
  	my ($subscriptionid,$oldstatus) = $sth->fetchrow;
  	# change status & update subscriptionhistory
! 	$sth = $dbh->prepare("update serial set serialseq=?,planneddate=?,status=? where serialid = ?");
! 	$sth->execute($serialseq,$planneddate,$status,$serialid);
  	$sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
  	$sth->execute($subscriptionid);
  	my ($missinglist,$recievedlist) = $sth->fetchrow;
! 	if ($status eq 2) {
! 		$recievedlist .= ",$serialseq";
! 	}
! 	if ($status eq 4) {
! 		$missinglist .= ",$serialseq";
! 	}
  	$sth=$dbh->prepare("update subscriptionhistory set recievedlist=?, missinglist=? where subscriptionid=?");
  	$sth->execute($recievedlist,$missinglist,$subscriptionid);
  	# create new waited entry if needed (ie : was a "waited" and has changed)
  	if ($oldstatus eq 1 && $status ne 1) {
--- 296,336 ----
  	my ($subscriptionid,$oldstatus) = $sth->fetchrow;
  	# change status & update subscriptionhistory
! 	my $sth = $dbh->prepare("delete * from serial  where serialid = ?");
! 	$sth->execute($serialid);
  	$sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
  	$sth->execute($subscriptionid);
  	my ($missinglist,$recievedlist) = $sth->fetchrow;
! 	$recievedlist =~ s/",$serialseq"//;
! 	$missinglist =~ s/",$serialseq"//;
  	$sth=$dbh->prepare("update subscriptionhistory set recievedlist=?, missinglist=? where subscriptionid=?");
  	$sth->execute($recievedlist,$missinglist,$subscriptionid);
+ }
+ 
+ sub serialchangestatus {
+ 	my ($serialid,$serialseq,$planneddate,$status)=@_;
+ # 	warn "($serialid,$serialseq,$planneddate,$status)";
+ 	# 1st, get previous status : if we change from "waited" to something else, then we will have to create a new "waited" entry
+ 	my $dbh = C4::Context->dbh;
+ 	my $sth = $dbh->prepare("select subscriptionid,status from serial where serialid=?");
+ 	$sth->execute($serialid);
+ 	my ($subscriptionid,$oldstatus) = $sth->fetchrow;
+ 	# change status & update subscriptionhistory
+ 	if ($status eq 6){
+ 		delissue($serialseq, $subscriptionid) 
+ 	}else{
+ 		$sth = $dbh->prepare("update serial set serialseq=?,planneddate=?,status=? where serialid = ?");
+ 		$sth->execute($serialseq,$planneddate,$status,$serialid);
+ 		$sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
+ 		$sth->execute($subscriptionid);
+ 		my ($missinglist,$recievedlist) = $sth->fetchrow;
+ 		if ($status eq 2) {
+ 			$recievedlist .= ",$serialseq";
+ 		}
+ 		$missinglist .= ",$serialseq" if ($status eq 4) ;
+ 		$missinglist .= ",not issued $serialseq" if ($status eq 5);
+ 		$sth=$dbh->prepare("update subscriptionhistory set recievedlist=?, missinglist=? where subscriptionid=?");
+ 		$sth->execute($recievedlist,$missinglist,$subscriptionid);
+ 	}
+ 
  	# create new waited entry if needed (ie : was a "waited" and has changed)
  	if ($oldstatus eq 1 && $status ne 1) {
***************
*** 335,338 ****
--- 357,367 ----
  }
  
+ sub delissue {
+ 	my ($serialseq,$subscriptionid) = @_;
+ 	my $dbh = C4::Context->dbh;
+ 	my $sth = $dbh->prepare("delete from serial where serialseq= ? and subscriptionid= ? ");
+ 	$sth->execute($serialseq,$subscriptionid);
+ }
+ 
  sub Get_Next_Date(@) {
  	my ($planneddate,$subscription) = @_;




From tipaul at users.sourceforge.net  Fri Jun 17 14:31:46 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Fri, 17 Jun 2005 05:31:46 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-auth.tmpl,1.3,1.3.2.1 opac-MARCdetail.tmpl,1.5.2.2,1.5.2.3 opac-user.tmpl,1.8.2.3,1.8.2.4
Message-ID: <E1DjG0g-0000bi-Od@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-auth.tmpl opac-MARCdetail.tmpl opac-user.tmpl 
Log Message:
last commits before 2.2.3
* css fixes for better IE compliance
* adding LibraryName parameter in login screen

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.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** opac-auth.tmpl	8 Dec 2004 10:26:32 -0000	1.3
--- opac-auth.tmpl	17 Jun 2005 12:31:44 -0000	1.3.2.1
***************
*** 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-MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -C2 -r1.5.2.2 -r1.5.2.3
*** opac-MARCdetail.tmpl	6 Jun 2005 12:38:16 -0000	1.5.2.2
--- opac-MARCdetail.tmpl	17 Jun 2005 12:31:44 -0000	1.5.2.3
***************
*** 28,32 ****
  	<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Add to basket</a>
  </div>
- <div id="mainbloc">
  	<div class="tabs">
  		<!-- TMPL_IF name="0XX" -->
--- 28,31 ----
***************
*** 321,325 ****
  	</div>
  </div>
- </div>
  <script language="JavaScript" type="text/javascript">
  function active(numlayer)
--- 320,323 ----

Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -C2 -r1.8.2.3 -r1.8.2.4
*** opac-user.tmpl	6 Jun 2005 14:13:22 -0000	1.8.2.3
--- opac-user.tmpl	17 Jun 2005 12:31:44 -0000	1.8.2.4
***************
*** 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" -->
  
--- 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" -->
  




From tipaul at users.sourceforge.net  Fri Jun 17 14:31:46 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Fri, 17 Jun 2005 05:31:46 -0700
Subject: [Koha-cvs] CVS: koha/C4 Auth.pm,1.36.2.2,1.36.2.3
Message-ID: <E1DjG0g-0000bN-Bp@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2234/C4

Modified Files:
      Tag: rel_2_2
	Auth.pm 
Log Message:
last commits before 2.2.3
* css fixes for better IE compliance
* adding LibraryName parameter in login screen

Index: Auth.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Auth.pm,v
retrieving revision 1.36.2.2
retrieving revision 1.36.2.3
diff -C2 -r1.36.2.2 -r1.36.2.3
*** Auth.pm	28 Apr 2005 08:26:39 -0000	1.36.2.2
--- Auth.pm	17 Jun 2005 12:31:43 -0000	1.36.2.3
***************
*** 400,404 ****
  
  	my $self_url = $query->url(-absolute => 1);
! 	$template->param(url => $self_url);
  	$template->param(\%info);
  	$cookie=$query->cookie(-name => 'sessionID',
--- 400,404 ----
  
  	my $self_url = $query->url(-absolute => 1);
! 	$template->param(url => $self_url, LibraryName=> => C4::Context->preference("LibraryName"),);
  	$template->param(\%info);
  	$cookie=$query->cookie(-name => 'sessionID',




From tipaul at users.sourceforge.net  Fri Jun 17 14:31:46 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Fri, 17 Jun 2005 05:31:46 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.17.2.7,1.17.2.8
Message-ID: <E1DjG0g-0000bS-Hb@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac.css 
Log Message:
last commits before 2.2.3
* css fixes for better IE compliance
* adding LibraryName parameter in login screen

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.17.2.7
retrieving revision 1.17.2.8
diff -C2 -r1.17.2.7 -r1.17.2.8
*** opac.css	16 Jun 2005 15:40:15 -0000	1.17.2.7
--- opac.css	17 Jun 2005 12:31:44 -0000	1.17.2.8
***************
*** 401,406 ****
  /* for MARC view  */
  div.tabs {
! 	width:10px;
  	display:block;
  }
  
--- 401,408 ----
  /* for MARC view  */
  div.tabs {
! 	width:15px;
  	display:block;
+ 	margin-top:70px;
+ 	margin-left:40px;
  }
  
***************
*** 417,423 ****
  	position:absolute;
  	display:block;
! 	top:123px;
! 	left:42px;
  	border: 1px solid black;
  }
  
--- 419,427 ----
  	position:absolute;
  	display:block;
! 	top:140px;
! 	left:62px;
! 	margin-right:0px;
  	border: 1px solid black;
+ 	background-color:none;
  }
  
***************
*** 428,431 ****
--- 432,437 ----
  	position:absolute;
  	float:left;
+ 	margin-right:0px;
+ 	background-color:none;
  }
  




From hdl at users.sourceforge.net  Fri Jun 17 15:44:27 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 17 Jun 2005 06:44:27 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.18,1.19
Message-ID: <E1DjH91-0001Hs-9M@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac-detail.tmpl 
Log Message:
Detailing the three latest issues on OPAC for serials

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** opac-detail.tmpl	4 May 2005 08:58:31 -0000	1.18
--- opac-detail.tmpl	17 Jun 2005 13:44:25 -0000	1.19
***************
*** 158,167 ****
  	</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>
--- 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>




From hdl at users.sourceforge.net  Fri Jun 17 15:44:27 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 17 Jun 2005 06:44:27 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-detail.pl,1.18,1.19
Message-ID: <E1DjH91-0001Ho-84@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4905/opac

Modified Files:
	opac-detail.pl 
Log Message:
Detailing the three latest issues on OPAC for serials

Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** opac-detail.pl	4 May 2005 09:02:38 -0000	1.18
--- opac-detail.pl	17 Jun 2005 13:44:25 -0000	1.19
***************
*** 30,34 ****
  my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
  my ($websitecount, @websites)             = &getwebsites($biblionumber);
- my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
  
  $dat->{'count'}=@items;
--- 30,33 ----
***************
*** 67,70 ****
--- 66,83 ----
  my $sitearray=\@websites;
  
+ #coping with subscriptions
+ my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
+ my @subscriptions = getsubscriptions($dat->{title},$dat->{issn},$biblionumber);
+ my @subs;
+ foreach my $subscription (@subscriptions){
+ 	warn "subsid :".$subscription->{subscriptionid};
+ 	my %cell;
+ 	$cell{subscriptionid}= $subscription->{subscriptionid};
+ 	$cell{subscriptionnotes}= $subscription->{notes};
+ 	#get the three latest serials.
+ 	$cell{latestserials}=getlatestserials($subscription->{subscriptionid},3);
+ 	push @subs, \%cell;
+ }
+ 
  $template->param(BIBLIO_RESULTS => $resultsarray,
  				ITEM_RESULTS => $itemsarray,
***************
*** 72,75 ****
--- 85,89 ----
  				SITE_RESULTS => $sitearray,
  				subscriptionsnumber => $subscriptionsnumber,
+ 				subscriptions => \@subs,
  			     LibraryName => C4::Context->preference("LibraryName"),
  				suggestion => C4::Context->preference("suggestion"),
***************
*** 108,111 ****
  output_html_with_http_headers $query, $cookie, $template->output;
  
! output_html_with_http_headers $query, $cookie, $template->output;
  
--- 122,125 ----
  output_html_with_http_headers $query, $cookie, $template->output;
  
! #output_html_with_http_headers $query, $cookie, $template->output;
  




From hdl at users.sourceforge.net  Fri Jun 17 15:44:27 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 17 Jun 2005 06:44:27 -0700
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.10,1.11
Message-ID: <E1DjH91-0001Hw-CM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4905/C4

Modified Files:
	Bull.pm 
Log Message:
Detailing the three latest issues on OPAC for serials

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Bull.pm	16 Jun 2005 19:10:10 -0000	1.10
--- Bull.pm	17 Jun 2005 13:44:25 -0000	1.11
***************
*** 51,55 ****
  			&Find_Next_Date, &Get_Next_Seq
  			&hassubscriptionexpired &subscriptionexpirationdate &subscriptionrenew
! 			&getSupplierListWithLateIssues &GetLateIssues &serialdelete);
  
  sub getSupplierListWithLateIssues {
--- 51,55 ----
  			&Find_Next_Date, &Get_Next_Seq
  			&hassubscriptionexpired &subscriptionexpirationdate &subscriptionrenew
! 			&getSupplierListWithLateIssues &GetLateIssues &serialdelete &getlatestserials);
  
  sub getSupplierListWithLateIssues {
***************
*** 288,291 ****
--- 288,306 ----
  	return ($totalissues, at serials);
  }
+ sub getlatestserials{
+ 	my ($subscriptionid,$limit) =@_;
+ 	my $dbh = C4::Context->dbh;
+ 	# status = 2 is "arrived"
+ 	my $strsth="select serialid,serialseq, status, planneddate from serial where subscriptionid = ? and (status =2 or status=4) order by planneddate DESC LIMIT 0,$limit";
+ 	my $sth=$dbh->prepare($strsth);
+ 	$sth->execute($subscriptionid);
+ 	my @serials;
+ 	while(my $line = $sth->fetchrow_hashref) {
+ 		$line->{"status".$line->{status}} = 1; # fills a "statusX" value, used for template status select list
+ 		$line->{"planneddate"} = format_date($line->{"planneddate"});
+ 		push @serials,$line;
+ 	}
+ 	return \@serials;
+ }
  
  sub serialdelete {
***************
*** 317,321 ****
  	# change status & update subscriptionhistory
  	if ($status eq 6){
! 		delissue($serialseq, $subscriptionid) 
  	}else{
  		$sth = $dbh->prepare("update serial set serialseq=?,planneddate=?,status=? where serialid = ?");
--- 332,336 ----
  	# change status & update subscriptionhistory
  	if ($status eq 6){
! 		delissue($serialseq, $subscriptionid); 
  	}else{
  		$sth = $dbh->prepare("update serial set serialseq=?,planneddate=?,status=? where serialid = ?");




From tipaul at users.sourceforge.net  Fri Jun 17 17:51:56 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Fri, 17 Jun 2005 08:51:56 -0700
Subject: [Koha-cvs] CVS: koha/bull statecollection.pl,1.3.2.3,1.3.2.4
Message-ID: <E1DjJ8O-0002Sp-ME@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9456/bull

Modified Files:
      Tag: rel_2_2
	statecollection.pl 
Log Message:
bugfix : when saving a special issue, "arrived" and "missing" status must be stored in history as well.

Index: statecollection.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/statecollection.pl,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -C2 -r1.3.2.3 -r1.3.2.4
*** statecollection.pl	28 Apr 2005 08:26:38 -0000	1.3.2.3
--- statecollection.pl	17 Jun 2005 15:51:54 -0000	1.3.2.4
***************
*** 39,42 ****
--- 39,43 ----
  			serialchangestatus($serialids[$i],$serialseqs[$i],format_date_in_iso($planneddates[$i]),$status[$i]) unless ($hassubscriptionexpired && $oldstatus == 1);
  		} else {
+ 			# add a special issue
  			if ($serialseqs[$i]) {
  				my $subscription=getsubscription($subscriptionid);




From tipaul at users.sourceforge.net  Fri Jun 17 17:53:37 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Fri, 17 Jun 2005 08:53:37 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-dictionary.pl,1.1.2.1,1.1.2.2
Message-ID: <E1DjJA1-0002ih-6j@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10444/opac

Modified Files:
      Tag: rel_2_2
	opac-dictionary.pl 
Log Message:
special bugfix for HDL : when doing X+Y on 2 fields that can have a numeric value, you will get X+Y as result. What you wanted to do was concat(X,Y), to have 700+9 being 7009 and not 709 ;-)

Index: opac-dictionary.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/Attic/opac-dictionary.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac-dictionary.pl	7 Jun 2005 10:23:13 -0000	1.1.2.1
--- opac-dictionary.pl	17 Jun 2005 15:53:35 -0000	1.1.2.2
***************
*** 106,110 ****
  	}
  	$listtags =~s/,$/)/;
! 	$strsth .= $listtags." and marc_word.tagsubfield=marc_subfield_table.tag+marc_subfield_table.subfieldcode group by subfieldvalue ";
  # 	warn "search in biblio : ".$strsth;
  	my $value = uc($search[0]);
--- 106,110 ----
  	}
  	$listtags =~s/,$/)/;
! 	$strsth .= $listtags." and marc_word.tagsubfield=concat(marc_subfield_table.tag,marc_subfield_table.subfieldcode) group by subfieldvalue ";
  # 	warn "search in biblio : ".$strsth;
  	my $value = uc($search[0]);




From tipaul at users.sourceforge.net  Fri Jun 17 17:53:37 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Fri, 17 Jun 2005 08:53:37 -0700
Subject: [Koha-cvs] CVS: koha/search.marc dictionary.pl,1.6.2.2,1.6.2.3
Message-ID: <E1DjJA1-0002il-9O@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10444/search.marc

Modified Files:
      Tag: rel_2_2
	dictionary.pl 
Log Message:
special bugfix for HDL : when doing X+Y on 2 fields that can have a numeric value, you will get X+Y as result. What you wanted to do was concat(X,Y), to have 700+9 being 7009 and not 709 ;-)

Index: dictionary.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.marc/dictionary.pl,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -C2 -r1.6.2.2 -r1.6.2.3
*** dictionary.pl	7 Jun 2005 10:02:01 -0000	1.6.2.2
--- dictionary.pl	17 Jun 2005 15:53:35 -0000	1.6.2.3
***************
*** 106,110 ****
  	}
  	$listtags =~s/,$/)/;
! 	$strsth .= $listtags." and marc_word.tagsubfield=marc_subfield_table.tag+marc_subfield_table.subfieldcode group by subfieldvalue ";
  # 	warn "search in biblio : ".$strsth;
  	my $value = uc($search[0]);
--- 106,110 ----
  	}
  	$listtags =~s/,$/)/;
! 	$strsth .= $listtags." and marc_word.tagsubfield=concat(marc_subfield_table.tag,marc_subfield_table.subfieldcode) group by subfieldvalue ";
  # 	warn "search in biblio : ".$strsth;
  	my $value = uc($search[0]);




From tipaul at users.sourceforge.net  Fri Jun 17 17:51:56 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Fri, 17 Jun 2005 08:51:56 -0700
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.6.2.9,1.6.2.10
Message-ID: <E1DjJ8O-0002St-PG@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9456/C4

Modified Files:
      Tag: rel_2_2
	Bull.pm 
Log Message:
bugfix : when saving a special issue, "arrived" and "missing" status must be stored in history as well.

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.6.2.9
retrieving revision 1.6.2.10
diff -C2 -r1.6.2.9 -r1.6.2.10
*** Bull.pm	16 Jun 2005 15:35:27 -0000	1.6.2.9
--- Bull.pm	17 Jun 2005 15:51:54 -0000	1.6.2.10
***************
*** 406,409 ****
--- 406,420 ----
  	my $sth = $dbh->prepare("insert into serial (serialseq,subscriptionid,biblionumber,status, planneddate) values (?,?,?,?,?)");
  	$sth->execute($serialseq,$subscriptionid,$biblionumber,$status, $planneddate);
+ 	$sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
+ 	$sth->execute($subscriptionid);
+ 	my ($missinglist,$recievedlist) = $sth->fetchrow;
+ 	if ($status eq 2) {
+ 		$recievedlist .= ",$serialseq";
+ 	}
+ 	if ($status eq 4) {
+ 		$missinglist .= ",$serialseq";
+ 	}
+ 	$sth=$dbh->prepare("update subscriptionhistory set recievedlist=?, missinglist=? where subscriptionid=?");
+ 	$sth->execute($recievedlist,$missinglist,$subscriptionid);
  }
  




From tipaul at users.sourceforge.net  Fri Jun 17 17:54:42 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Fri, 17 Jun 2005 08:54:42 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui basket.tmpl,1.15.2.7,1.15.2.8
Message-ID: <E1DjJB4-0002sN-A7@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	basket.tmpl 
Log Message:
bugfix : some columns where "doNotPrint" style & should not

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.15.2.7
retrieving revision 1.15.2.8
diff -C2 -r1.15.2.7 -r1.15.2.8
*** basket.tmpl	7 Jun 2005 12:56:37 -0000	1.15.2.7
--- basket.tmpl	17 Jun 2005 15:54:40 -0000	1.15.2.8
***************
*** 31,35 ****
  			<tr valign="top" bgcolor="#ffdf61">
  				<th class="acquisition doNotPrint">Order</th>
! 				<th class="acquisition">Publisher<a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=biblioitems.publishercode" class="acquisition doNotPrint">[order]</a></th>
  				<th class="acquisition">Title</th>
  				<th class="acquisition">rrp</th>
--- 31,35 ----
  			<tr valign="top" bgcolor="#ffdf61">
  				<th class="acquisition doNotPrint">Order</th>
! 				<th class="acquisition">Publisher<a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=biblioitems.publishercode" class="acquisition">[order]</a></th>
  				<th class="acquisition">Title</th>
  				<th class="acquisition">rrp</th>
***************
*** 53,62 ****
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
  					<!-- TMPL_IF name="closedate" -->
! 						<td><p>
  							<b><!-- TMPL_VAR NAME="title" --></b><br/>
  								<!-- TMPL_VAR NAME="author" -->
  								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! 							</p>
  						</td>
  					<!-- TMPL_ELSE -->
--- 53,61 ----
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
  					<!-- TMPL_IF name="closedate" -->
! 						<td>
  							<b><!-- TMPL_VAR NAME="title" --></b><br/>
  								<!-- TMPL_VAR NAME="author" -->
  								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --><p class="doNotPrint"><i><!--TMPL_VAR name="notes" --></i></p><!-- /TMPL_IF -->
  						</td>
  					<!-- TMPL_ELSE -->




From hdl at users.sourceforge.net  Fri Jun 17 18:37:03 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 17 Jun 2005 09:37:03 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters systempreferences.tmpl,1.31,1.32
Message-ID: <E1DjJq3-0001CX-49@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	systempreferences.tmpl 
Log Message:
Displaying system preferences by category

Index: systempreferences.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** systempreferences.tmpl	11 Feb 2005 16:52:53 -0000	1.31
--- systempreferences.tmpl	17 Jun 2005 16:37:00 -0000	1.32
***************
*** 137,140 ****
--- 137,176 ----
  	<!-- TMPL_IF NAME="else" -->
  	<h1>System preferences admin</h1>
+ 	<table>
+ 		<tr>
+ 			<td>
+ 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin">Admin
+ 				</a>
+ 			</td>
+ 			<td>
+ 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions">Acquisitions
+ 				</a>
+ 			</td>
+ 			<td>
+ 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities">Authorities
+ 				</a>
+ 			</td>
+ 			<td>
+ 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue">Catalogue
+ 				</a>
+ 			</td>
+ 			<td>
+ 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation">Circulation
+ 				</a>
+ 			</td>
+ 			<td>
+ 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members">Members
+ 				</a>
+ 			</td>
+ 			<td>
+ 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC">OPAC
+ 				</a>
+ 			</td>
+ 			<td>
+ 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=">Others
+ 				</a>
+ 			</td>
+ 		</tr>
+ 	</table>
  	<form action="/cgi-bin/koha/admin/systempreferences.pl" method="post">
  		<input type="text" name="searchfield" value="">




From hdl at users.sourceforge.net  Fri Jun 17 18:37:03 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 17 Jun 2005 09:37:03 -0700
Subject: [Koha-cvs] CVS: koha/admin systempreferences.pl,1.23,1.24
Message-ID: <E1DjJq3-0001Cc-B6@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4576/admin

Modified Files:
	systempreferences.pl 
Log Message:
Displaying system preferences by category

Index: systempreferences.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** systempreferences.pl	11 Feb 2005 16:24:11 -0000	1.23
--- systempreferences.pl	17 Jun 2005 16:37:01 -0000	1.24
***************
*** 50,53 ****
--- 50,79 ----
  
  
+ my %tabsysprefs;
+ $tabsysprefs{acquisitions}="Acquisitions";
+ $tabsysprefs{gist}="Acquisitions";
+ $tabsysprefs{authoritysep}="Authorities";
+ $tabsysprefs{ISBD}="Catalogue";
+ $tabsysprefs{marc}="Catalogue";
+ $tabsysprefs{marcflavour}="Catalogue";
+ $tabsysprefs{SubscriptionHistory}="Catalogue";
+ $tabsysprefs{maxoutstanding}="Circulation";
+ $tabsysprefs{printcirculationslips}="Circulation";
+ $tabsysprefs{suggestion}="Circulation";
+ $tabsysprefs{automembernum}="Members";
+ $tabsysprefs{noissuescharge}="Circulation";
+ $tabsysprefs{opacthemes}="OPAC";
+ $tabsysprefs{opaclanguages}="OPAC";
+ $tabsysprefs{LibraryName}="OPAC";
+ $tabsysprefs{opacstylesheet}="OPAC";
+ $tabsysprefs{BiblioDefaultView}="OPAC";
+ $tabsysprefs{hidelostitem}="OPAC";
+ $tabsysprefs{KohaAdmin}="Admin";
+ $tabsysprefs{checkdigit}="Admin";
+ $tabsysprefs{dateformat}="Admin";
+ $tabsysprefs{insecure}="Admin";
+ $tabsysprefs{ldapinfos}="Admin";
+ $tabsysprefs{ldapserver}="Admin";
+ 
  sub StringSearch  {
  	my ($env,$searchstring,$type)=@_;
***************
*** 56,71 ****
  	my @data=split(' ',$searchstring);
  	my $count=@data;
- 	my $sth=$dbh->prepare("Select variable,value,explanation,type,options from systempreferences where (variable like ?) order by variable");
- 	$sth->execute("$data[0]%");
  	my @results;
  	my $cnt=0;
! 	while (my $data=$sth->fetchrow_hashref){
! 		push(@results,$data);
! 		$cnt ++;
  	}
- 	$sth->finish;
  	return ($cnt,\@results);
  }
  
  my $input = new CGI;
  my $searchfield=$input->param('searchfield');
--- 82,119 ----
  	my @data=split(' ',$searchstring);
  	my $count=@data;
  	my @results;
  	my $cnt=0;
! 	if ($type){
! 		foreach my $syspref (sort keys %tabsysprefs){
! 			if ($tabsysprefs{$syspref} eq $type){
! 				my $sth=$dbh->prepare("Select variable,value,explanation,type,options from systempreferences where (variable like ?) order by variable");
! 				$sth->execute($syspref);
! 				while (my $data=$sth->fetchrow_hashref){
! 					push(@results,$data);
! 					$cnt ++;
! 				}
! 				$sth->finish;
! 			}
! 		}
! 	}else {
! 		my $strsth ="Select variable,value,explanation,type,options from systempreferences where variable not in (";  
! 		foreach my $syspref (keys %tabsysprefs){
! 			$strsth .= $dbh->quote($syspref).",";
! 		}
! 		$strsth =~ s/,$/) /;
! 		$strsth .= " order by variable";
! 		warn $strsth;
! 		my $sth=$dbh->prepare($strsth);
! 		$sth->execute();
! 		while (my $data=$sth->fetchrow_hashref){
! 			push(@results,$data);
! 			$cnt ++;
! 		}
! 		$sth->finish;
  	}
  	return ($cnt,\@results);
  }
  
+ 
  my $input = new CGI;
  my $searchfield=$input->param('searchfield');
***************
*** 279,295 ****
  ################## DEFAULT ##################################
  } else { # DEFAULT
  	if  ($searchfield ne '') {
  		 $template->param(searchfield => "<p>You Searched for <strong>$searchfield</strong></p>");
  	}
  	my $env;
! 	my ($count,$results)=StringSearch($env,$searchfield,'web');
  	my $toggle=0;
  	my @loop_data = ();
  	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
! 	  	if ($toggle eq 0){
  			$toggle=1;
! 	  	} else {
  			$toggle=0;
! 	  	}
  		my %row_data;  # get a fresh hash for the row data
  		$row_data{variable} = $results->[$i]{'variable'};
--- 327,346 ----
  ################## DEFAULT ##################################
  } else { # DEFAULT
+ 	#Adding tab management for system preferences
+ 	my $tab=$input->param('tab');
+ 	
  	if  ($searchfield ne '') {
  		 $template->param(searchfield => "<p>You Searched for <strong>$searchfield</strong></p>");
  	}
  	my $env;
! 	my ($count,$results)=StringSearch($env,$searchfield,$tab);
  	my $toggle=0;
  	my @loop_data = ();
  	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
! 		if ($toggle eq 0){
  			$toggle=1;
! 		} else {
  			$toggle=0;
! 		}
  		my %row_data;  # get a fresh hash for the row data
  		$row_data{variable} = $results->[$i]{'variable'};




From hellen at users.sourceforge.net  Sat Jun 18 12:33:32 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 18 Jun 2005 03:33:32 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/parameters checkmarc.tmpl,1.1,1.2
Message-ID: <E1Djado-00031x-1R@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11617/koha-tmpl/intranet-tmpl/default/de/parameters

Modified Files:
	checkmarc.tmpl 
Log Message:
translated by hellen

Index: checkmarc.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/checkmarc.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** checkmarc.tmpl	12 May 2005 19:26:35 -0000	1.1
--- checkmarc.tmpl	18 Jun 2005 10:33:29 -0000	1.2
***************
*** 2,10 ****
  
  <div id="mainbloc">
! 	<h1>&uuml;berpr&uuml;fe MARC Setup</h1>
  	<table>
  		<tr>
  			<th>Test</th>
! 			<th>Treffer</th>
  		</tr>
  	<!-- -------------------------------------------------------------------------------------------------------- -->
--- 2,10 ----
  
  <div id="mainbloc">
! 	<h1>&Uuml;berpr&uuml;fung der MARC-Struktur</h1>
  	<table>
  		<tr>
  			<th>Test</th>
! 			<th>Meldung</th>
  		</tr>
  	<!-- -------------------------------------------------------------------------------------------------------- -->
***************
*** 12,16 ****
  		<tr>
  			<td><b>itemnum</b></td>
! 			<td><li>The field itemnum MUST be mapped </li>
  				<li>The correspounding subfield MUST be in with -1 (ignore) tab</td>
  		</tr>
--- 12,16 ----
  		<tr>
  			<td><b>itemnum</b></td>
! 			<td><li>Das Feld itemnum MUSS zugeordnet sein </li>
  				<li>The correspounding subfield MUST be in with -1 (ignore) tab</td>
  		</tr>




From hellen at users.sourceforge.net  Sat Jun 18 12:33:31 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 18 Jun 2005 03:33:31 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/members moremember.tmpl,1.1,1.2
Message-ID: <E1Djadn-00031t-VL@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11617/koha-tmpl/intranet-tmpl/default/de/members

Modified Files:
	moremember.tmpl 
Log Message:
translated by hellen

Index: moremember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/members/moremember.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** moremember.tmpl	12 May 2005 19:26:35 -0000	1.1
--- moremember.tmpl	18 Jun 2005 10:33:29 -0000	1.2
***************
*** 10,14 ****
  		<!-- TMPL_UNLESS name="I" --><label class="label100">Zweitanschrift: </label><!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR NAME="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" --><br>
  		<label class="label100">Tel.: </label><!-- TMPL_VAR NAME="phone" --><br><!-- /TMPL_UNLESS -->
! 		<label class="label100">Phone daytime: </label><!-- TMPL_VAR NAME="phoneday" --><br>
  		<label class="label100">Fax: </label><!-- TMPL_VAR NAME="faxnumber" --><br>
  		<label class="label100">E-mail: </label><a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a><br>
--- 10,14 ----
  		<!-- TMPL_UNLESS name="I" --><label class="label100">Zweitanschrift: </label><!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR NAME="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" --><br>
  		<label class="label100">Tel.: </label><!-- TMPL_VAR NAME="phone" --><br><!-- /TMPL_UNLESS -->
! 		<label class="label100">Tel. tags&uuml;ber: </label><!-- TMPL_VAR NAME="phoneday" --><br>
  		<label class="label100">Fax: </label><!-- TMPL_VAR NAME="faxnumber" --><br>
  		<label class="label100">E-mail: </label><a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a><br>
***************
*** 29,42 ****
  		<!-- /TMPL_UNLESS -->
  		<label class="label100">Kontakt: </label><!-- TMPL_VAR NAME="contactname" --><br>
! 		<label class="label100">Phone: </label><!-- TMPL_VAR NAME="altphone" --><br>
  		<!-- TMPL_UNLESS name="I" -->
! 			<label class="label100">Relationship: </label><!-- TMPL_VAR NAME="altrelationship" --><br>
  		<!-- /TMPL_UNLESS -->
  		<label class="label100">Bemerkung: </label><!-- TMPL_VAR NAME="altnotes" -->
  		<!-- TMPL_IF NAME="sort1" -->
! 			<p><label class="label100">Sort field 1 : </label><!-- TMPL_VAR NAME="sort1" --></p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="sort2" -->
! 			<p><label class="label100">Sort field 2 : </label><!-- TMPL_VAR NAME="sort2" --></p>
  		<!-- /TMPL_IF -->
  		</p>
--- 29,42 ----
  		<!-- /TMPL_UNLESS -->
  		<label class="label100">Kontakt: </label><!-- TMPL_VAR NAME="contactname" --><br>
! 		<label class="label100">Tel: </label><!-- TMPL_VAR NAME="altphone" --><br>
  		<!-- TMPL_UNLESS name="I" -->
! 			<label class="label100">Bezug: </label><!-- TMPL_VAR NAME="altrelationship" --><br>
  		<!-- /TMPL_UNLESS -->
  		<label class="label100">Bemerkung: </label><!-- TMPL_VAR NAME="altnotes" -->
  		<!-- TMPL_IF NAME="sort1" -->
! 			<p><label class="label100">Sortierung 1 : </label><!-- TMPL_VAR NAME="sort1" --></p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="sort2" -->
! 			<p><label class="label100">Sortierung 2 : </label><!-- TMPL_VAR NAME="sort2" --></p>
  		<!-- /TMPL_IF -->
  		</p>
***************
*** 81,89 ****
  	
  <!-- TMPL_IF NAME="flagged" -->	<div class="bloc25">
! 		<h2 class="members">Member Flags</h2>
  		<ul>
! 		<!-- TMPL_IF NAME="debarred" --><li>Member is debarred.</li><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="gonenoaddress" --><li>Member's address is in doubt.</li><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="lost" --><li>Member's card has been reported lost.</li><!-- /TMPL_IF -->
  		</ul>
  	</div><!-- /TMPL_IF -->
--- 81,89 ----
  	
  <!-- TMPL_IF NAME="flagged" -->	<div class="bloc25">
! 		<h2 class="members">Benutzer-Flags</h2>
  		<ul>
! 		<!-- TMPL_IF NAME="debarred" --><li>Benutzer ist gesperrt.</li><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="gonenoaddress" --><li>Benutzeradresse zweifelhaft.</li><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="lost" --><li>Benutzerausweis als verloren gemeldet.</li><!-- /TMPL_IF -->
  		</ul>
  	</div><!-- /TMPL_IF -->




From rangi at users.sourceforge.net  Mon Jun 20 03:01:08 2005
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Sun, 19 Jun 2005 18:01:08 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-sendbasket.pl,1.5,1.6
Message-ID: <E1DkAey-0004Xw-O8@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17237

Modified Files:
	opac-sendbasket.pl 
Log Message:
This simply wasnt working before.
It is now not erroring, not sure if its actually sending mail, working on
that now


Index: opac-sendbasket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-sendbasket.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** opac-sendbasket.pl	4 May 2005 09:02:38 -0000	1.5
--- opac-sendbasket.pl	20 Jun 2005 01:01:06 -0000	1.6
***************
*** 6,94 ****
  use MIME::QuotedPrint;
  use MIME::Base64;
! 
  use C4::Search;
  use C4::Auth;
  use C4::Interface::CGI::Output;
  use HTML::Template;
  
  my $query = new CGI;
  
! my ($template, $borrowernumber, $cookie) 
!     = get_template_and_user({template_name => "opac-sendbasketform.tmpl",
! 			     query => $query,
! 			     type => "opac",
! 			     authnotrequired => 1,
! 			     flagsrequired => {borrow => 1},
! 			 });
! 
! my $bib_list=$query->param('bib_list');
! my $email_add=$query->param('email_add');
! my $email_sender=$query->param('email_sender');
! 
! if ($email_add) {
! 	my $email_from = C4::Context->preference('KohaAdminEmailAddress');
! 
! 	my %mail = (	 To      => $email_add,
! 						 From    => $email_from);
! 
! 	my ($template2, $borrowernumber, $cookie) 
!     = get_template_and_user({template_name => "opac-sendbasket.tmpl",
! 			     query => $query,
! 			     type => "opac",
! 			     authnotrequired => 1,
! 			     flagsrequired => {borrow => 1},
! 			 });
! 
! 	my @bibs = split(/\//, $bib_list);
! 	my @results;
! 	my $iso2709;
! 	foreach my $biblionumber (@bibs) {
! 		$template2->param(biblionumber => $biblionumber);
! 
! 		my $dat = &bibdata($biblionumber);
! 		my ($authorcount, $addauthor) = &addauthor($biblionumber);
! 		my @items                     = &ItemInfo(undef, $biblionumber, 'opac');
! 
! 		$dat->{'additional'}=$addauthor->[0]->{'author'};
! 		for (my $i = 1; $i < $authorcount; $i++) {
! 			$dat->{'additional'} .= "|" . $addauthor->[$i]->{'author'};
! 		}
  
! 		$dat->{'biblionumber'} = $biblionumber;
! 		$dat->{ITEM_RESULTS} = \@items;
! 		my $record = MARCgetbiblio($dbh,$bibid);
! 		$iso2709 .= $record->as_usmarc();
  
! 		push (@results, $dat);
! 	}
! 
! 	my $resultsarray=\@results;
! 	$template2->param(BIBLIO_RESULTS => $resultsarray,
! 					email_sender => $email_sender);
! 
! 	# Getting template result
! 	my $template_res = $template2->output();
! 
! 	# Analysing information and getting mail properties
! 	if ($template_res =~ /<SUBJECT>\n(.*)\n<END_SUBJECT>/s) { $mail{'subject'} = $1; }
! 	else { $mail{'subject'} = "no subject"; }
! 
! 	my $email_header = "";
! 	if ($template_res =~ /<HEADER>\n(.*)\n<END_HEADER>/s) { $email_header = $1; }
! 
! 	my $email_file = "basket.txt";
! 	if ($template_res =~ /<FILENAME>\n(.*)\n<END_FILENAME>/s) { $email_file = $1; }
! 
! 	if ($template_res =~ /<MESSAGE>\n(.*)\n<END_MESSAGE>/s) { $mail{'body'} = $1; }
  
! 	my $boundary = "====" . time() . "====";
! 	$mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
  
! 	$email_header = encode_qp($email_header);
  
! 	$boundary = "--".$boundary;
  
! 	# Writing mail
! 	$mail{body} = <<END_OF_BODY;
  $boundary
  Content-Type: text/plain; charset="iso-8859-1"
--- 6,113 ----
  use MIME::QuotedPrint;
  use MIME::Base64;
! use C4::Context;
  use C4::Search;
  use C4::Auth;
  use C4::Interface::CGI::Output;
+ use C4::Biblio;
  use HTML::Template;
  
  my $query = new CGI;
  
! my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
!     {
!         template_name   => "opac-sendbasketform.tmpl",
!         query           => $query,
!         type            => "opac",
!         authnotrequired => 1,
!         flagsrequired   => { borrow => 1 },
!     }
! );
! 
! my $bib_list     = $query->param('bib_list');
! my $email_add    = $query->param('email_add');
! my $email_sender = $query->param('email_sender');
  
! my $dbh = C4::Context->dbh();
  
! if ($email_add) {
!     my $email_from = C4::Context->preference('KohaAdminEmailAddress');
  
!     my %mail = (
!         To   => $email_add,
!         From => $email_from
!     );
! 
!     my ( $template2, $borrowernumber, $cookie ) = get_template_and_user(
!         {
!             template_name   => "opac-sendbasket.tmpl",
!             query           => $query,
!             type            => "opac",
!             authnotrequired => 1,
!             flagsrequired   => { borrow => 1 },
!         }
!     );
! 
!     my @bibs = split ( /\//, $bib_list );
!     my @results;
!     my $iso2709;
!     foreach my $biblionumber (@bibs) {
!         $template2->param( biblionumber => $biblionumber );
! 
!         my $dat = &bibdata($biblionumber);
!         my ( $authorcount, $addauthor ) = &addauthor($biblionumber);
!         my @items = &ItemInfo( undef, $biblionumber, 'opac' );
! 
!         $dat->{'additional'} = $addauthor->[0]->{'author'};
!         for ( my $i = 1 ; $i < $authorcount ; $i++ ) {
!             $dat->{'additional'} .= "|" . $addauthor->[$i]->{'author'};
!         }
! 
!         $dat->{'biblionumber'} = $biblionumber;
!         $dat->{ITEM_RESULTS} = \@items;
!         my $record = MARCgetbiblio( $dbh, $biblionumber );
!         $iso2709 .= $record->as_usmarc();
! 
!         push ( @results, $dat );
!     }
! 
!     my $resultsarray = \@results;
!     $template2->param(
!         BIBLIO_RESULTS => $resultsarray,
!         email_sender   => $email_sender
!     );
! 
!     # Getting template result
!     my $template_res = $template2->output();
! 
!     # Analysing information and getting mail properties
!     if ( $template_res =~ /<SUBJECT>\n(.*)\n<END_SUBJECT>/s ) {
!         $mail{'subject'} = $1;
!     }
!     else { $mail{'subject'} = "no subject"; }
! 
!     my $email_header = "";
!     if ( $template_res =~ /<HEADER>\n(.*)\n<END_HEADER>/s ) {
!         $email_header = $1;
!     }
! 
!     my $email_file = "basket.txt";
!     if ( $template_res =~ /<FILENAME>\n(.*)\n<END_FILENAME>/s ) {
!         $email_file = $1;
!     }
! 
!     if ( $template_res =~ /<MESSAGE>\n(.*)\n<END_MESSAGE>/s ) {
!         $mail{'body'} = $1;
!     }
! 
!     my $boundary = "====" . time() . "====";
!     $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
  
!     $email_header = encode_qp($email_header);
  
!     $boundary = "--" . $boundary;
  
!     # Writing mail
!     $mail{body} = <<END_OF_BODY;
  $boundary
  Content-Type: text/plain; charset="iso-8859-1"
***************
*** 102,142 ****
  END_OF_BODY
  
! $mail{PJ} = $iso2709;
! #	$mail{body} = <<END_OF_BODY;
! #$boundary
! #Content-Type: text/plain; charset="iso-8859-1"
! #Content-Transfer-Encoding: quoted-printable
! #
! #$email_header
! #
! #$boundary
! #Content-Type: text/plain; name="$email_file"
! #Content-Transfer-Encoding: quoted-printable
! #Content-Disposition: attachment; filename="$email_file"
! #
! #$mail{'body'}
! #
! #$boundary--
! #END_OF_BODY
! 
! 	# Sending mail
! 	if (sendmail %mail) {
! 	# do something if it works....
! 		warn "Mail sent ok\n";
! 		$template->param(SENT => "1");
! 		$template->param(email_add => $email_add);
! 	} else {
! 		# do something if it doesnt work....
! 		warn "Error sending mail: $Mail::Sendmail::error \n";
! 	}
  
! 	output_html_with_http_headers $query, $cookie, $template->output;
  }
  else {
! 	$template->param(bib_list => $bib_list);
! 	$template->param(url => "/cgi-bin/koha/opac-sendbasket.pl",
! 	suggestion => C4::Context->preference("suggestion"),
! 	virtualshelves => C4::Context->preference("virtualshelves"),
! 	);
! 	output_html_with_http_headers $query, $cookie, $template->output;
  }
--- 121,148 ----
  END_OF_BODY
  
!     # Sending mail
!     if ( sendmail %mail ) {
! 
!         # do something if it works....
!         warn "Mail sent ok\n";
!         $template->param( SENT      => "1" );
!         $template->param( email_add => $email_add );
!     }
!     else {
! 
!         # do something if it doesnt work....
!         warn "Error sending mail: $Mail::Sendmail::error \n";
!         warn "$mail{'body'}";
!     }
  
!     output_html_with_http_headers $query, $cookie, $template->output;
  }
  else {
!     $template->param( bib_list => $bib_list );
!     $template->param(
!         url            => "/cgi-bin/koha/opac-sendbasket.pl",
!         suggestion     => C4::Context->preference("suggestion"),
!         virtualshelves => C4::Context->preference("virtualshelves"),
!     );
!     output_html_with_http_headers $query, $cookie, $template->output;
  }




From hdl at users.sourceforge.net  Mon Jun 20 12:14:15 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 20 Jun 2005 03:14:15 -0700
Subject: [Koha-cvs] CVS: koha/acqui histsearch.pl,1.1,1.2
Message-ID: <E1DkJIF-0001xz-0i@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7362/acqui

Modified Files:
	histsearch.pl 
Log Message:
Displaying search results count

Index: histsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/histsearch.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** histsearch.pl	19 Oct 2004 12:24:56 -0000	1.1
--- histsearch.pl	20 Jun 2005 10:14:12 -0000	1.2
***************
*** 24,28 ****
  			     });
  my $order_loop= &histsearch($title,$author,$name);
! $template->param(suggestions_loop => $order_loop,
  				title => $title,
  				author => $author,
--- 24,30 ----
  			     });
  my $order_loop= &histsearch($title,$author,$name);
! 
! $template->param(numresults => scalar(@$order_loop),
! 				suggestions_loop => $order_loop,
  				title => $title,
  				author => $author,




From hdl at users.sourceforge.net  Mon Jun 20 12:14:14 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 20 Jun 2005 03:14:14 -0700
Subject: [Koha-cvs] CVS: koha/members member.pl,1.5,1.6
Message-ID: <E1DkJIE-0001xc-OT@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7362/members

Modified Files:
	member.pl 
Log Message:
Displaying search results count

Index: member.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/member.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** member.pl	7 Mar 2005 08:55:30 -0000	1.5
--- member.pl	20 Jun 2005 10:14:12 -0000	1.6
***************
*** 106,109 ****
--- 106,110 ----
  $template->param( 
  			member          => $member,
+ 			numresults      => $count,
  			resultsloop     => \@resultsdata );
  




From hdl at users.sourceforge.net  Mon Jun 20 12:14:14 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 20 Jun 2005 03:14:14 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui histsearch.tmpl,1.2,1.3
Message-ID: <E1DkJIE-0001xl-Ra@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	histsearch.tmpl 
Log Message:
Displaying search results count

Index: histsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** histsearch.tmpl	1 Mar 2005 13:40:51 -0000	1.2
--- histsearch.tmpl	20 Jun 2005 10:14:12 -0000	1.3
***************
*** 2,5 ****
--- 2,7 ----
  <div id="mainbloc">
  	<h1 class="acquisition">Order search</h1>
+ 	<p class="resultcount"><!-- TMPL_VAR Name ="numresults" --> orders were found.
+ 	 </p>
  	<table>
  		<tr>




From hdl at users.sourceforge.net  Mon Jun 20 12:14:14 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 20 Jun 2005 03:14:14 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members member.tmpl,1.15,1.16 member-quicksearch-results.tmpl,1.1,1.2
Message-ID: <E1DkJIE-0001xj-Qu@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	member.tmpl member-quicksearch-results.tmpl 
Log Message:
Displaying search results count

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** member.tmpl	1 Mar 2005 13:40:54 -0000	1.15
--- member.tmpl	20 Jun 2005 10:14:12 -0000	1.16
***************
*** 18,21 ****
--- 18,23 ----
  <div class="bloc100">
  	<div class="bloctitle">You Searched for <!-- TMPL_VAR NAME="member" --></div>
+ 	<p class="resultcount"><!-- TMPL_VAR Name ="numresults" --> members were found.
+ 	 </p>
  	<table>
  		<tr>

Index: member-quicksearch-results.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** member-quicksearch-results.tmpl	13 Jan 2005 22:41:54 -0000	1.1
--- member-quicksearch-results.tmpl	20 Jun 2005 10:14:12 -0000	1.2
***************
*** 5,8 ****
--- 5,10 ----
  
  <div class="bloc100">
+ 	<p><!-- TMPL_VAR Name ="numresults" --> records match you search.
+ 	 </p>
  	<table>
  		<tr>




From hdl at users.sourceforge.net  Mon Jun 20 12:28:11 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 20 Jun 2005 03:28:11 -0700
Subject: [Koha-cvs] CVS: koha/reports acquisitions_stats.pl,1.5,1.6
Message-ID: <E1DkJVj-0004F9-QR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/reports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16241/reports

Modified Files:
	acquisitions_stats.pl 
Log Message:
Reordering dates with usual order and not alphabetical one

Index: acquisitions_stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/acquisitions_stats.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** acquisitions_stats.pl	4 May 2005 09:02:38 -0000	1.5
--- acquisitions_stats.pl	20 Jun 2005 10:28:09 -0000	1.6
***************
*** 272,296 ****
                                                
  # 1st, loop rows.                             
! 	my $linefield;                               
  	if (($line =~/closedate/) and ($podsp == 1)) {
  		#Display by day
! 		$linefield .="dayname($line)";  
  	} elsif (($line=~/closedate/) and ($podsp == 2)) {
  		#Display by Month
  		$linefield .="monthname($line)";  
  	} elsif (($line=~/closedate/) and ($podsp == 3)) {
  		#Display by Year
  		$linefield .="Year($line)";
  	} elsif (($line =~/received/) and ($rodsp == 1)) {
  		#Display by day
  		$linefield .="dayname($line)";  
  	} elsif (($line=~/received/) and ($rodsp == 2)) {
  		#Display by Month
  		$linefield .="monthname($line)";  
  	} elsif (($line=~/received/) and ($rodsp == 3)) {
  		#Display by Year
  		$linefield .="Year($line)";
  	} else {
  		$linefield .= $line;
  	}  
  	
--- 272,304 ----
                                                
  # 1st, loop rows.                             
! 	my $linefield;
! 	my $lineorder;                               
  	if (($line =~/closedate/) and ($podsp == 1)) {
  		#Display by day
! 		$linefield .="dayname($line)";
! 		$lineorder .="weekday($line)";  
  	} elsif (($line=~/closedate/) and ($podsp == 2)) {
  		#Display by Month
  		$linefield .="monthname($line)";  
+ 		$lineorder .="month($line)";  
  	} elsif (($line=~/closedate/) and ($podsp == 3)) {
  		#Display by Year
  		$linefield .="Year($line)";
+ 		$lineorder .="Year($line)";
  	} elsif (($line =~/received/) and ($rodsp == 1)) {
  		#Display by day
  		$linefield .="dayname($line)";  
+ 		$lineorder .="weekday($line)";  
  	} elsif (($line=~/received/) and ($rodsp == 2)) {
  		#Display by Month
  		$linefield .="monthname($line)";  
+ 		$lineorder .="month($line)";  
  	} elsif (($line=~/received/) and ($rodsp == 3)) {
  		#Display by Year
  		$linefield .="Year($line)";
+ 		$lineorder .="Year($line)";
  	} else {
  		$linefield .= $line;
+ 		$lineorder .= $line;
  	}  
  	
***************
*** 313,317 ****
   	}
  	$strsth .=" group by $linefield";
! 	$strsth .=" order by $linefield";
  	warn "". $strsth;
  	
--- 321,325 ----
   	}
  	$strsth .=" group by $linefield";
! 	$strsth .=" order by $lineorder";
  	warn "". $strsth;
  	
***************
*** 338,361 ****
--- 346,377 ----
  # 2nd, loop cols.
  	my $colfield;
+ 	my $colorder;
  	if (($column =~/closedate/) and ($podsp == 1)) {
  		#Display by day
  		$colfield .="dayname($column)";  
+ 		$colorder .="weekday($column)";  
  	} elsif (($column=~/closedate/) and ($podsp == 2)) {
  		#Display by Month
  		$colfield .="monthname($column)";  
+ 		$colorder .="month($column)";  
  	} elsif (($column=~/closedate/) and ($podsp == 3)) {
  		#Display by Year
  		$colfield .="Year($column)";
+ 		$colorder .="Year($column)";
  	} elsif (($column =~/received/) and ($rodsp == 1)) {
  		#Display by day
  		$colfield .="dayname($column)";  
+ 		$colorder .="weekday($column)";  
  	} elsif (($column=~/received/) and ($rodsp == 2)) {
  		#Display by Month
  		$colfield .="monthname($column)";  
+ 		$colorder .="month($column)";  
  	} elsif (($column=~/received/) and ($rodsp == 3)) {
  		#Display by Year
  		$colfield .="Year($column)";
+ 		$colorder .="Year($column)";
  	} else {
  		$colfield .= $column;
+ 		$colorder .= $column;
  	}  
  	
***************
*** 378,387 ****
   	}
  	$strsth2 .=" group by $colfield";
! 	$strsth2 .=" order by $colfield";
   	warn "". $strsth2;
  	
  	my $sth2 = $dbh->prepare( $strsth2 );
  	if (( @colfilter ) and ($colfilter[1])){
! 		warn "from : ".$colfilter[0]." To  :".$colfilter[1];
  		$sth2->execute("'".$colfilter[0]."'","'".$colfilter[1]."'");
  	} elsif ($colfilter[0]) {
--- 394,403 ----
   	}
  	$strsth2 .=" group by $colfield";
! 	$strsth2 .=" order by $colorder";
   	warn "". $strsth2;
  	
  	my $sth2 = $dbh->prepare( $strsth2 );
  	if (( @colfilter ) and ($colfilter[1])){
! #		warn "from : ".$colfilter[0]." To  :".$colfilter[1];
  		$sth2->execute("'".$colfilter[0]."'","'".$colfilter[1]."'");
  	} elsif ($colfilter[0]) {
***************
*** 439,443 ****
  	@$filters[7]=~ s/\*/%/g if (@$filters[7]);
  	$strcalc .= " AND aqorders.sort2 like '" . @$filters[7] ."'" if ( @$filters[7] );
! 	$strcalc .= " group by $linefield, $colfield order by $linefield,$colfield";
  	warn "". $strcalc;
  	my $dbcalc = $dbh->prepare($strcalc);
--- 455,459 ----
  	@$filters[7]=~ s/\*/%/g if (@$filters[7]);
  	$strcalc .= " AND aqorders.sort2 like '" . @$filters[7] ."'" if ( @$filters[7] );
! 	$strcalc .= " group by $linefield, $colfield order by $lineorder,$colorder";
  	warn "". $strcalc;
  	my $dbcalc = $dbh->prepare($strcalc);




From tipaul at users.sourceforge.net  Mon Jun 20 15:12:14 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 06:12:14 -0700
Subject: [Koha-cvs] CVS: koha/admin systempreferences.pl,1.24,1.25
Message-ID: <E1DkM4U-0001MD-BO@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5189/admin

Modified Files:
	systempreferences.pl 
Log Message:
improving systempref selector :
* showing active tab better
* removing useless filter form
* adding some systemprefs to their correct tab

Index: systempreferences.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** systempreferences.pl	17 Jun 2005 16:37:01 -0000	1.24
--- systempreferences.pl	20 Jun 2005 13:12:11 -0000	1.25
***************
*** 60,64 ****
  $tabsysprefs{maxoutstanding}="Circulation";
  $tabsysprefs{printcirculationslips}="Circulation";
! $tabsysprefs{suggestion}="Circulation";
  $tabsysprefs{automembernum}="Members";
  $tabsysprefs{noissuescharge}="Circulation";
--- 60,64 ----
  $tabsysprefs{maxoutstanding}="Circulation";
  $tabsysprefs{printcirculationslips}="Circulation";
! $tabsysprefs{suggestion}="Acquisitions";
  $tabsysprefs{automembernum}="Members";
  $tabsysprefs{noissuescharge}="Circulation";
***************
*** 75,78 ****
--- 75,81 ----
  $tabsysprefs{ldapinfos}="Admin";
  $tabsysprefs{ldapserver}="Admin";
+ $tabsysprefs{itemcallnumber}="Catalogue";
+ $tabsysprefs{maxreserves}="Circulation";
+ $tabsysprefs{virtualshelves}="OPAC";
  
  sub StringSearch  {
***************
*** 135,142 ****
  if ($op) {
  $template->param(script_name => $script_name,
! 						$op              => 1); # we show only the TMPL_VAR names $op
  } else {
  $template->param(script_name => $script_name,
! 						else              => 1); # we show only the TMPL_VAR names $op
  }
  
--- 138,145 ----
  if ($op) {
  $template->param(script_name => $script_name,
! 						$op              => 1,); # we show only the TMPL_VAR names $op
  } else {
  $template->param(script_name => $script_name,
! 						else              => 1,); # we show only the TMPL_VAR names $op
  }
  
***************
*** 352,356 ****
  		push(@loop_data, \%row_data);
  	}
! 	$template->param(loop => \@loop_data);
  	if ($offset>0) {
  		my $prevpage = $offset-$pagesize;
--- 355,359 ----
  		push(@loop_data, \%row_data);
  	}
! 	$template->param(loop => \@loop_data, $tab => 1);
  	if ($offset>0) {
  		my $prevpage = $offset-$pagesize;




From tipaul at users.sourceforge.net  Mon Jun 20 15:12:14 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 06:12:14 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters systempreferences.tmpl,1.32,1.33
Message-ID: <E1DkM4U-0001MH-Ec@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	systempreferences.tmpl 
Log Message:
improving systempref selector :
* showing active tab better
* removing useless filter form
* adding some systemprefs to their correct tab

Index: systempreferences.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** systempreferences.tmpl	17 Jun 2005 16:37:00 -0000	1.32
--- systempreferences.tmpl	20 Jun 2005 13:12:12 -0000	1.33
***************
*** 140,180 ****
  		<tr>
  			<td>
! 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin">Admin
! 				</a>
  			</td>
  			<td>
! 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions">Acquisitions
! 				</a>
  			</td>
  			<td>
! 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities">Authorities
! 				</a>
  			</td>
  			<td>
! 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue">Catalogue
! 				</a>
  			</td>
  			<td>
! 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation">Circulation
! 				</a>
  			</td>
  			<td>
! 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members">Members
! 				</a>
  			</td>
  			<td>
! 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC">OPAC
! 				</a>
  			</td>
  			<td>
! 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=">Others
! 				</a>
  			</td>
  		</tr>
  	</table>
- 	<form action="/cgi-bin/koha/admin/systempreferences.pl" method="post">
- 		<input type="text" name="searchfield" value="">
- 		<input type="reset" name="reset" value="clr">
- 	</form>
  	<!-- TMPL_VAR NAME="searchfield" -->
  	<table border="0" cellspacing="0" cellpadding="2">
--- 140,200 ----
  		<tr>
  			<td>
! 				<!-- TMPL_IF name="Admin" -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin" class="button">Admin</a>
! 				<!-- TMPL_ELSE -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin">Admin</a>
! 				<!-- /TMPL_IF -->
  			</td>
  			<td>
! 				<!-- TMPL_IF name="Acquisitions" -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions" class="button">Acquisitions</a>
! 				<!-- TMPL_ELSE -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions">Acquisitions</a>
! 				<!-- /TMPL_IF -->
  			</td>
  			<td>
! 				<!-- TMPL_IF name="Authorities" -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities" class="button">Authorities</a>
! 				<!-- TMPL_ELSE -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities">Authorities</a>
! 				<!-- /TMPL_IF -->
  			</td>
  			<td>
! 				<!-- TMPL_IF name="Catalogue" -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue" class="button">Catalogue</a>
! 				<!-- TMPL_ELSE -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue">Catalogue</a>
! 				<!-- /TMPL_IF -->
  			</td>
  			<td>
! 				<!-- TMPL_IF name="Circulation" -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation" class="button">Circulation</a>
! 				<!-- TMPL_ELSE -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation">Circulation</a>
! 				<!-- /TMPL_IF -->
  			</td>
  			<td>
! 				<!-- TMPL_IF name="Members" -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members" class="button">Members</a>
! 				<!-- TMPL_ELSE -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members">Members</a>
! 				<!-- /TMPL_IF -->
  			</td>
  			<td>
! 				<!-- TMPL_IF name="OPAC" -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC" class="button">OPAC</a>
! 				<!-- TMPL_ELSE -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC">OPAC</a>
! 				<!-- /TMPL_IF -->
  			</td>
  			<td>
! 				<!-- TMPL_IF name="Others" -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=" class="button">Others</a>
! 				<!-- TMPL_ELSE -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=">Others</a>
! 				<!-- /TMPL_IF -->
  			</td>
  		</tr>
  	</table>
  	<!-- TMPL_VAR NAME="searchfield" -->
  	<table border="0" cellspacing="0" cellpadding="2">




From tipaul at users.sourceforge.net  Mon Jun 20 15:15:49 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 06:15:49 -0700
Subject: [Koha-cvs] CVS: koha/acqui acqui-home.pl,1.3,1.4 basket.pl,1.25,1.26 histsearch.pl,1.2,1.3
Message-ID: <E1DkM7x-0001o4-TY@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6858/acqui

Modified Files:
	acqui-home.pl basket.pl histsearch.pl 
Log Message:
synch'ing 2.2 and head

Index: acqui-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/acqui-home.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** acqui-home.pl	13 Jul 2004 12:53:00 -0000	1.3
--- acqui-home.pl	20 Jun 2005 13:15:46 -0000	1.4
***************
*** 64,68 ****
  						totspent => sprintf("%.2f",$totspent),
  						totcomtd => sprintf("%.2f",$totcomtd),
! 						totavail => sprintf("%.2f",$totavail));
  
  output_html_with_http_headers $query, $cookie, $template->output;
--- 64,69 ----
  						totspent => sprintf("%.2f",$totspent),
  						totcomtd => sprintf("%.2f",$totcomtd),
! 						totavail => sprintf("%.2f",$totavail),
! 						nobudget => $#results==-1?1:0);
  
  output_html_with_http_headers $query, $cookie, $template->output;

Index: basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/basket.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** basket.pl	4 May 2005 08:45:03 -0000	1.25
--- basket.pl	20 Jun 2005 13:15:46 -0000	1.26
***************
*** 56,59 ****
--- 56,61 ----
  my ($count2, at booksellers)=bookseller($booksellerid);
  
+ # get librarian branch...
+ 
  # if new basket, pre-fill infos
  $basket->{creationdate} = "" unless ($basket->{creationdate});
***************
*** 66,69 ****
--- 68,78 ----
  my $grand_total; # $subttotal + $gist
  
+ # my $line_total_est; # total of each line
+ my $sub_total_est; # total of line totals
+ my $gist_est;      # GST
+ my $grand_total_est; # $subttotal + $gist
+ 
+ my $qty_total;
+ 
  my @books_loop;
  for (my $i=0;$i<$count;$i++){
***************
*** 71,82 ****
  	$rrp=curconvert($results[$i]->{'currency'},$rrp);
  
  	$line_total=$results[$i]->{'quantity'}*$results[$i]->{'ecost'};
  	$sub_total+=$line_total;
  	my %line;
- 	if ($i % 2){
- 		$line{highlight}=1;
- 	} else {
- 		$line{highlight}=0;
- 	}
  	$line{ordernumber} = $results[$i]->{'ordernumber'};
  	$line{publishercode} = $results[$i]->{'publishercode'};
--- 80,88 ----
  	$rrp=curconvert($results[$i]->{'currency'},$rrp);
  
+ 	$sub_total_est+=$results[$i]->{'quantity'}*$results[$i]->{'rrp'};
  	$line_total=$results[$i]->{'quantity'}*$results[$i]->{'ecost'};
  	$sub_total+=$line_total;
+ 	$qty_total += $results[$i]->{'quantity'};
  	my %line;
  	$line{ordernumber} = $results[$i]->{'ordernumber'};
  	$line{publishercode} = $results[$i]->{'publishercode'};
***************
*** 85,88 ****
--- 91,95 ----
  	$line{basketno}=$basketno;
  	$line{title} = $results[$i]->{'title'};
+ 	$line{notes} = $results[$i]->{'notes'};
  	$line{author} = $results[$i]->{'author'};
  	$line{i} = $i;
***************
*** 94,97 ****
--- 101,105 ----
  	$line{biblionumber} = $results[$i]->{'biblionumber'};
  	$line{bookfundid} = $results[$i]->{'bookfundid'};
+ 	$line{odd} = $i %2;
  	push @books_loop, \%line;
  }
***************
*** 99,102 ****
--- 107,112 ----
  $gist=sprintf("%.2f",$sub_total*$prefgist);
  $grand_total=$sub_total+$gist;
+ $grand_total_est = $sub_total_est+sprintf("%.2f",$sub_total_est*$prefgist);
+ $gist_est = sprintf("%.2f",$sub_total_est*$prefgist);
  $template->param(basketno => $basketno,
  				creationdate => $basket->{creationdate},
***************
*** 107,110 ****
--- 117,124 ----
  				booksellerid=> $booksellers[0]->{'id'},
  				name => $booksellers[0]->{'name'},
+ 				address1 => $booksellers[0]->{'address1'},
+ 				address2 => $booksellers[0]->{'address2'},
+ 				address3 => $booksellers[0]->{'address3'},
+ 				address4 => $booksellers[0]->{'address4'},
  				entrydate => format_date($results[0]->{'entrydate'}),
  				books_loop => \@books_loop,
***************
*** 113,117 ****
--- 127,135 ----
  				gist => $gist,
  				grand_total =>$grand_total,
+ 				sub_total_est => $sub_total_est,
+ 				gist_est => $gist_est,
+ 				grand_total_est =>$grand_total_est,
  				currency => $booksellers[0]->{'listprice'},
+ 				qty_total => $qty_total,
  				);
  output_html_with_http_headers $query, $cookie, $template->output;

Index: histsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/histsearch.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** histsearch.pl	20 Jun 2005 10:14:12 -0000	1.2
--- histsearch.pl	20 Jun 2005 13:15:46 -0000	1.3
***************
*** 13,16 ****
--- 13,18 ----
  my $author = $input->param('author');
  my $name = $input->param('name');
+ my $from_placed_on = $input->param('fromplacedon');
+ my $to_placed_on = $input->param('toplacedon');
  
  my $dbh = C4::Context->dbh;
***************
*** 23,33 ****
  			     debug => 1,
  			     });
! my $order_loop= &histsearch($title,$author,$name);
! 
! $template->param(numresults => scalar(@$order_loop),
! 				suggestions_loop => $order_loop,
  				title => $title,
  				author => $author,
  				name => $name,
  );
  output_html_with_http_headers $input, $cookie, $template->output;
--- 25,35 ----
  			     debug => 1,
  			     });
! my $order_loop= &histsearch($title,$author,$name,$from_placed_on,$to_placed_on);
! $template->param(suggestions_loop => $order_loop,
  				title => $title,
  				author => $author,
  				name => $name,
+ 				from_placed_on =>$from_placed_on,
+ 				to_placed_on =>$to_placed_on
  );
  output_html_with_http_headers $input, $cookie, $template->output;




From tipaul at users.sourceforge.net  Mon Jun 20 15:16:13 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 06:16:13 -0700
Subject: [Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.55,1.56 isbnsearch.pl,1.16,1.17
Message-ID: <E1DkM8L-0001s1-0d@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui.simple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7168/acqui.simple

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

Index: addbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/addbiblio.pl,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -r1.55 -r1.56
*** addbiblio.pl	4 May 2005 08:45:22 -0000	1.55
--- addbiblio.pl	20 Jun 2005 13:16:10 -0000	1.56
***************
*** 186,190 ****
  			$cgidir = C4::Context->intranetdir."/value_builder";
  		} 
! 		my $plugin=$cgidir."/".$tagslib->{$tag}->{$subfield}->{'value_builder'};
  		require $plugin;
  		my $extended_param = plugin_parameters($dbh,$rec,$tagslib,$i,$tabloop);
--- 186,190 ----
  			$cgidir = C4::Context->intranetdir."/value_builder";
  		} 
! 		my $plugin=$cgidir."/".$tagslib->{$tag}->{$subfield}->{'value_builder'}; 
  		require $plugin;
  		my $extended_param = plugin_parameters($dbh,$rec,$tagslib,$i,$tabloop);
***************
*** 341,352 ****
  my $dbh = C4::Context->dbh;
  my $bibid;
  if ($oldbiblionumber) {
  	$bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$oldbiblionumber);
  	# find framework type
! 	$frameworkcode = &MARCfind_frameworkcode($dbh,$bibid) if $bibid;
  }else {
  	$bibid = $input->param('bibid');
! 	$frameworkcode = &MARCfind_frameworkcode($dbh,$bibid) if $bibid;
  }
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "acqui.simple/addbiblio.tmpl",
--- 341,355 ----
  my $dbh = C4::Context->dbh;
  my $bibid;
+ 
+ 
  if ($oldbiblionumber) {
  	$bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$oldbiblionumber);
  	# find framework type
! 	$frameworkcode = &MARCfind_frameworkcode($dbh,$bibid) if ($bibid and not ($frameworkcode));
  }else {
  	$bibid = $input->param('bibid');
! 	$frameworkcode = &MARCfind_frameworkcode($dbh,$bibid) if ($bibid and not ($frameworkcode));
  }
+ $frameworkcode='' if ($frameworkcode eq 'Default');
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "acqui.simple/addbiblio.tmpl",
***************
*** 358,361 ****
--- 361,387 ----
  			     });
  
+ #Getting the list of all frameworks
+ my $queryfwk =$dbh->prepare("select frameworktext, frameworkcode from biblio_framework");
+ $queryfwk->execute;
+ my %select_fwk;
+ my @select_fwk;
+ my $curfwk;
+ push @select_fwk,"Default";
+ $select_fwk{"Default"} = "Default";
+ while (my ($description, $fwk) =$queryfwk->fetchrow) {
+ 	push @select_fwk, $fwk;
+ 	$select_fwk{$fwk} = $description;
+ }
+ $curfwk=$frameworkcode;
+ my $framework=CGI::scrolling_list( -name     => 'Frameworks',
+ 			-id => 'Frameworks',
+ 			-default => $curfwk,
+ 			-OnChange => 'Changefwk(this);',
+ 			-values   => \@select_fwk,
+ 			-labels   => \%select_fwk,
+ 			-size     => 1,
+ 			-multiple => 0 );
+ $template->param( framework => $framework);
+ 
  $tagslib = &MARCgettagslib($dbh,1,$frameworkcode);
  my $record=-1;
***************
*** 401,404 ****
--- 427,431 ----
  		my $oldbibitemnum;
  		if ($is_a_modif) {
+ 			NEWmodbiblioframework($dbh,$bibid,$frameworkcode);
  			NEWmodbiblio($dbh,$record,$bibid,$frameworkcode);
  		} else {
***************
*** 435,468 ****
  	my @ind_tag = $input->param('ind_tag');
  	my @indicator = $input->param('indicator');
- 	splice(@tags,$addedfield,0,$tags[$addedfield]);
- 	splice(@subfields,$addedfield,0,$subfields[$addedfield]);
- 	splice(@values,$addedfield,0,$values[$addedfield]);
- 	splice(@ind_tag,$addedfield,0,$ind_tag[$addedfield]);
- 	my %indicators;
- 	for (my $i=0;$i<=$#ind_tag;$i++) {
- 		$indicators{$ind_tag[$i]} = $indicator[$i];
- 	}
- # search the part of the array to duplicate.
- 	my $start=0;
- 	my $end=0;
- 	my $started;
- 	for (my $i=$#tags;$i>0;$i--) {
- 		$end=$i if ($end eq 0 && $tags[$i] == $addedfield);
- 		$start=$i if ($end>0 && $tags[$i] eq $addedfield);
- 		last if ($end>0 && $tags[$i] ne $addedfield);
- 	}
- 	# add an empty line in all arrays. This forces a new field in MARC::Record.
- 	splice(@tags,$end+1,0,'');
- 	splice(@subfields,$end+1,0,'');
- 	splice(@values,$end+1,0,'');
- 	splice(@ind_tag,$end+1,0,'');
- 	splice(@indicator,$end+1,0,'');
- # then duplicate the field.
- 	splice(@tags,$end+2,0, at tags[$start..$end]);
- 	splice(@subfields,$end+2,0, at subfields[$start..$end]);
- 	splice(@values,$end+2,0, at values[$start..$end]);
- 	splice(@ind_tag,$end+2,0, at ind_tag[$start..$end]);
- 	splice(@indicator,$end+2,0, at indicator[$start..$end]);
- 
  	my %indicators;
  	for (my $i=0;$i<=$#ind_tag;$i++) {
--- 462,465 ----
***************
*** 470,473 ****
--- 467,473 ----
  	}
  	my $record = MARChtml2marc($dbh,\@tags,\@subfields,\@values,%indicators);
+ 	# adding an empty field
+ 	my $field = MARC::Field->new("$addedfield",'','','a'=> "");
+ 	$record->append_fields($field);
  	build_tabs ($template, $record, $dbh,$encoding);
  	build_hidden_data;
***************
*** 496,500 ****
  		$oldbiblionumber= "";
  	}
! 
  	build_tabs ($template, $record, $dbh,$encoding);
  	build_hidden_data;
--- 496,500 ----
  		$oldbiblionumber= "";
  	}
!  
  	build_tabs ($template, $record, $dbh,$encoding);
  	build_hidden_data;

Index: isbnsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/isbnsearch.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** isbnsearch.pl	4 May 2005 08:45:33 -0000	1.16
--- isbnsearch.pl	20 Jun 2005 13:16:10 -0000	1.17
***************
*** 125,195 ****
  	}
  
!     if ( $count < ( $offset + $num ) ) {
!         $total = $count;
!     }
!     else {
!         $total = $offset + $num;
!     }    # else
! 
!     my @loop_data = ();
!     my $toggle;
!     for ( my $i = $offset ; $i < $total ; $i++ ) {
!         if ( $i % 2 ) {
!             $toggle = 0;
!         } else {
!             $toggle = 1;
!         }
!         my %row_data;    # get a fresh hash for the row data
!         $row_data{toggle}        = $toggle;
!         $row_data{biblionumber}  = $results[$i]->{'biblionumber'};
!         $row_data{title}         = $results[$i]->{'title'};
!         $row_data{author}        = $results[$i]->{'author'};
!         $row_data{copyrightdate} = $results[$i]->{'copyrightdate'};
! 		$row_data{classification} = $results[$i]->{'classification'};
!         $row_data{NOTMARC}       = !$marc_p;	
!         push ( @loop_data, \%row_data );
!     }
!     $template->param( startfrom => $offset + 1 );
!     ( $offset + $num <= $count )
!       ? ( $template->param( endat => $offset + $num ) )
!       : ( $template->param( endat => $count ) );
!     $template->param( numrecords => $count );
!     my $nextstartfrom = ( $offset + $num < $count ) ? ( $offset + $num ) : (-1);
!     my $prevstartfrom = ( $offset - $num >= 0 ) ? ( $offset - $num ) : (-1);
!     $template->param( nextstartfrom => $nextstartfrom );
!     my $displaynext = 1;
!     my $displayprev = 0;
!     ( $nextstartfrom == -1 ) ? ( $displaynext = 0 ) : ( $displaynext = 1 );
!     ( $prevstartfrom == -1 ) ? ( $displayprev = 0 ) : ( $displayprev = 1 );
!     $template->param( displaynext => $displaynext );
!     $template->param( displayprev => $displayprev );
!     my @numbers = ();
!     my $term;
!     my $value;
! 
!     if ($isbn) {
!         $term  = "isbn";
!         $value = $isbn;
!     }
!     else {
!         $term  = "title";
!         $value = $title;
!     }
!     if ( $count > 10 ) {
!         for ( my $i = 1 ; $i < $count / 10 + 1 ; $i++ ) {
!             if ( $i < 16 ) {
!                 my $highlight = 0;
!                 ( $offset == ( $i - 1 ) * 10 ) && ( $highlight = 1 );
!                 push @numbers,
!                   {
!                     number    => $i,
!                     highlight => $highlight,
!                     term      => $term,
!                     value     => $value,
!                     startfrom => ( $i - 1 ) * 10
!                 };
!             }
!         }
!     }
  
      # fill with books in breeding farm
--- 125,151 ----
  	}
  
! 	my @numbers = ();
! 
! 	if ($total>$resultsperpage) {
! 		for (my $i=1; $i<$total/$resultsperpage+1; $i++) {
! 			if ($i<16) {
! 	    		my $highlight=0;
! 	    		($startfrom==($i-1)) && ($highlight=1);
! 	    		push @numbers, { number => $i,
! 					highlight => $highlight ,
! 					searchdata=> \@field_data,
! 					startfrom => ($i-1)};
! 			}
!     	}
! 	}
! 	my $from = $startfrom*$resultsperpage+1;
! 	my $to;
! 
! 	if($total < (($startfrom+1)*$resultsperpage))
! 	{
! 		$to = $total;
! 	} else {
! 		$to = (($startfrom+1)*$resultsperpage);
! 	}
  
      # fill with books in breeding farm




From tipaul at users.sourceforge.net  Mon Jun 20 15:17:19 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 06:17:19 -0700
Subject: [Koha-cvs] CVS: koha/admin checkmarc.pl,1.6,1.7 itemtypes.pl,1.18,1.19 marctagstructure.pl,1.28,1.29
Message-ID: <E1DkM9P-00022T-Bd@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7703/admin

Modified Files:
	checkmarc.pl itemtypes.pl marctagstructure.pl 
Log Message:
synch'ing 2.2 and head

Index: checkmarc.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/checkmarc.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** checkmarc.pl	22 Dec 2003 19:16:58 -0000	1.6
--- checkmarc.pl	20 Jun 2005 13:17:16 -0000	1.7
***************
*** 77,80 ****
--- 77,81 ----
  my $tab = $res2;
  my $subtotal=0;
+ warn "TAGF : $tagfield";
  while (($res,$res2,$field) = $sth->fetchrow) {
  	# (ignore itemnumber, that must be in -1 tab)
***************
*** 97,100 ****
--- 98,118 ----
  	$total++;
  }
+ 
+ $sth = $dbh->prepare("select distinct tagfield from marc_subfield_structure where tab = 10");
+ $sth->execute;
+ my $totaltags = 0;
+ my $list = "";
+ while (($res2) = $sth->fetchrow) {
+ 	$totaltags++;
+ 	$list.=$res2.",";
+ }
+ if ($totaltags > 1) {
+ 	$template->param(itemtags => $list);
+ 	$total++;
+ } else {
+ 	$template->param(itemtags => 0);
+ }
+ 
+ 
  # checks biblioitems.itemtype must be mapped and use authorised_value=itemtype
  $sth = $dbh->prepare("select tagfield,tab,authorised_value from marc_subfield_structure where kohafield = \"biblioitems.itemtype\"");
***************
*** 146,149 ****
--- 164,189 ----
  }
  
+ $sth = $dbh->prepare("select count(*) from marc_biblio where frameworkcode is NULL");
+ $sth->execute;
+ ($res) = $sth->fetchrow;
+ if ($res) {
+ 	$template->param(frameworknull =>1);
+ 	$total++;
+ }
+ $sth = $dbh->prepare("select count(*) from marc_subfield_structure where frameworkcode is NULL");
+ $sth->execute;
+ ($res) = $sth->fetchrow;
+ if ($res) {
+ 	$template->param(frameworknull =>1);
+ 	$total++;
+ }
+ $sth = $dbh->prepare("select count(*) from marc_tag_structure where frameworkcode is NULL");
+ $sth->execute;
+ ($res) = $sth->fetchrow;
+ if ($res) {
+ 	$template->param(frameworknull =>1);
+ 	$total++;
+ }
+ 
  $template->param(total => $total);
  output_html_with_http_headers $input, $cookie, $template->output;

Index: itemtypes.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/itemtypes.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** itemtypes.pl	23 Mar 2005 09:44:59 -0000	1.18
--- itemtypes.pl	20 Jun 2005 13:17:16 -0000	1.19
***************
*** 177,184 ****
  		}
  		$row_data{toggle} = $toggle;
! 		$row_data{itemtype} = $results->[$i]{'itemtype'};
! 		$row_data{description} = $results->[$i]{'description'};
! 		$row_data{renewalsallowed} = $results->[$i]{'renewalsallowed'};
! 		$row_data{rentalcharge} = sprintf("%.2f",$results->[$i]{'rentalcharge'});
  		push(@loop_data, \%row_data);
  	}
--- 177,185 ----
  		}
  		$row_data{toggle} = $toggle;
! 		$row_data{itemtype} = $results->[$i]{itemtype};
! 		$row_data{description} = $results->[$i]{description};
! 		$row_data{renewalsallowed} = $results->[$i]{renewalsallowed};
! 		$row_data{notforloan} = $results->[$i]{notforloan};
! 		$row_data{rentalcharge} = sprintf("%.2f",$results->[$i]{rentalcharge});
  		push(@loop_data, \%row_data);
  	}

Index: marctagstructure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marctagstructure.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** marctagstructure.pl	1 Mar 2005 13:40:50 -0000	1.28
--- marctagstructure.pl	20 Jun 2005 13:17:17 -0000	1.29
***************
*** 43,46 ****
--- 43,47 ----
  my $offset=$input->param('offset');
  my $op = $input->param('op');
+ my $dspchoice = $input->param('select_display');
  my $pagesize=20;
  
***************
*** 217,243 ****
  		 $template->param(searchfield => $searchfield);
  	}
! 	my $env;
! 	my ($count,$results)=StringSearch($env,$searchfield,$frameworkcode);
! 	my $toggle=0;
! 	my @loop_data = ();
! 	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
! 	  	if ($toggle eq 0){
! 			$toggle=1;
! 	  	} else {
! 			$toggle=0;
! 	  	}
! 		my %row_data;  # get a fresh hash for the row data
! 		$row_data{tagfield} = $results->[$i]{'tagfield'};
! 		$row_data{liblibrarian} = $results->[$i]{'liblibrarian'};
! 		$row_data{repeatable} = $results->[$i]{'repeatable'};
! 		$row_data{mandatory} = $results->[$i]{'mandatory'};
! 		$row_data{authorised_value} = $results->[$i]{'authorised_value'};
! 		$row_data{subfield_link} ="marc_subfields_structure.pl?tagfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
! 		$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
! 		$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
! 		$row_data{toggle} = $toggle;
! 		push(@loop_data, \%row_data);
  	}
- 	$template->param(loop => \@loop_data);
  	if ($offset>0) {
  		my $prevpage = $offset-$pagesize;
--- 218,317 ----
  		 $template->param(searchfield => $searchfield);
  	}
! 	my $cnt=0;
! 	if ($dspchoice) {
! 		#here, user only wants used tags/subfields displayed
! 		my $env;
! 		$searchfield=~ s/\'/\\\'/g;
! 		my @data=split(' ',$searchfield);
! 		my $sth=$dbh->prepare("Select marc_tag_structure.tagfield as mts_tagfield,marc_tag_structure.liblibrarian as mts_liblibrarian,marc_tag_structure.libopac as mts_libopac,marc_tag_structure.repeatable as mts_repeatable,marc_tag_structure.mandatory as mts_mandatory,marc_tag_structure.authorised_value as mts_authorized_value,marc_subfield_structure.* from marc_tag_structure LEFT JOIN marc_subfield_structure ON (marc_tag_structure.tagfield=marc_subfield_structure.tagfield AND marc_tag_structure.frameworkcode=marc_subfield_structure.frameworkcode) where (marc_tag_structure.tagfield >= ? and marc_tag_structure.frameworkcode=?) AND marc_subfield_structure.tab>=0 order by marc_tag_structure.tagfield,marc_subfield_structure.tagsubfield");
! 		#could be ordoned by tab
! 		$sth->execute($data[0], $frameworkcode);
! 		my @results = ();
! 		while (my $data=$sth->fetchrow_hashref){
! 			push(@results,$data);
! 			$cnt++;
! 		}
! 		$sth->finish;
! 		
! 		my $toggle=0;
! 		my @loop_data = ();
! 		my $j=1;
! 		my $i=$offset;
! 		while ($i < ($offset+$pagesize<$cnt?$offset+$pagesize:$cnt)) {
! 			if ($toggle eq 0){
! 				$toggle=1;
! 			} else {
! 				$toggle=0;
! 			}
! 			my %row_data;  # get a fresh hash for the row data
! 			$row_data{tagfield} = $results[$i]->{'mts_tagfield'};
! 			$row_data{liblibrarian} = $results[$i]->{'mts_liblibrarian'};
! 			$row_data{repeatable} = $results[$i]->{'mts_repeatable'};
! 			$row_data{mandatory} = $results[$i]->{'mts_mandatory'};
! 			$row_data{authorised_value} = $results[$i]->{'mts_authorised_value'};
! 			$row_data{subfield_link} ="marc_subfields_structure.pl?op=add_form&tagfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
! 			$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
! 			$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
! 			$row_data{toggle} = $toggle;
! 			$j=$i;
! 			my @internal_loop = ();
! 			while (($results[$i]->{'tagfield'}==$results[$j]->{'tagfield'}) and ($j< ($offset+$pagesize<$cnt?$offset+$pagesize:$cnt))) {
! 				if ($toggle eq 0) {
! 					$toggle=1;
! 				} else {
! 					$toggle=0;
! 				}
! 				my %subfield_data;
! 				$subfield_data{tagsubfield} = $results[$j]->{'tagsubfield'};
! 				$subfield_data{liblibrarian} = $results[$j]->{'liblibrarian'};
! 				$subfield_data{kohafield} = $results[$j]->{'kohafield'};
! 				$subfield_data{repeatable} = $results[$j]->{'repeatable'};
! 				$subfield_data{mandatory} = $results[$j]->{'mandatory'};
! 				$subfield_data{tab} = $results[$j]->{'tab'};
! 				$subfield_data{seealso} = $results[$j]->{'seealso'};
! 				$subfield_data{authorised_value} = $results[$j]->{'authorised_value'};
! 				$subfield_data{authtypecode}= $results[$j]->{'authtypecode'};
! 				$subfield_data{value_builder}= $results[$j]->{'value_builder'};
! 				$subfield_data{toggle}	= $toggle;
! # 				warn "tagfield :  ".$results[$j]->{'tagfield'}." tagsubfield :".$results[$j]->{'tagsubfield'};
! 				push @internal_loop,\%subfield_data;
! 				$j++;
! 			}
! 			$row_data{'subfields'}=\@internal_loop;
! 			push(@loop_data, \%row_data);
! #			undef @internal_loop;
! 			$i=$j;
! 		}
! 		$template->param(select_display => "True",
! 						loop => \@loop_data);
! 		#  $sth->execute;
! 		$sth->finish;
! 	} else {
! 		#here, normal old style : display every tags
! 		my $env;
! 		my ($count,$results)=StringSearch($env,$searchfield,$frameworkcode);
! 		$cnt = $count;
! 		my $toggle=0;
! 		my @loop_data = ();
! 		for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
! 			if ($toggle eq 0){
! 				$toggle=1;
! 			} else {
! 				$toggle=0;
! 			}
! 			my %row_data;  # get a fresh hash for the row data
! 			$row_data{tagfield} = $results->[$i]{'tagfield'};
! 			$row_data{liblibrarian} = $results->[$i]{'liblibrarian'};
! 			$row_data{repeatable} = $results->[$i]{'repeatable'};
! 			$row_data{mandatory} = $results->[$i]{'mandatory'};
! 			$row_data{authorised_value} = $results->[$i]{'authorised_value'};
! 			$row_data{subfield_link} ="marc_subfields_structure.pl?tagfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
! 			$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
! 			$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
! 			$row_data{toggle} = $toggle;
! 			push(@loop_data, \%row_data);
! 		}
! 		$template->param(loop => \@loop_data);
  	}
  	if ($offset>0) {
  		my $prevpage = $offset-$pagesize;
***************
*** 247,253 ****
  						script_name => $script_name,
  						frameworkcode => $frameworkcode,
! 		 );
  	}
! 	if ($offset+$pagesize<$count) {
  		my $nextpage =$offset+$pagesize;
  		$template->param(nextpage =>$nextpage,
--- 321,327 ----
  						script_name => $script_name,
  						frameworkcode => $frameworkcode,
! 		);
  	}
! 	if ($offset+$pagesize<$cnt) {
  		my $nextpage =$offset+$pagesize;
  		$template->param(nextpage =>$nextpage,




From tipaul at users.sourceforge.net  Mon Jun 20 15:17:59 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 06:17:59 -0700
Subject: [Koha-cvs] CVS: koha/authorities authorities-home.pl,1.9,1.10 authorities.pl,1.11,1.12 blinddetail-biblio-search.pl,1.4,1.5 detail.pl,1.2,1.3
Message-ID: <E1DkMA3-0002Bn-CP@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8375/authorities

Modified Files:
	authorities-home.pl authorities.pl 
	blinddetail-biblio-search.pl detail.pl 
Log Message:
synch'ing 2.2 and head

Index: authorities-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/authorities-home.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** authorities-home.pl	1 Mar 2005 13:40:50 -0000	1.9
--- authorities-home.pl	20 Jun 2005 13:17:56 -0000	1.10
***************
*** 88,95 ****
  	my @field_data = ();
  
! 
  	for(my $i = 0 ; $i <= $#marclist ; $i++)
  	{
! 		push @field_data, { term => "marclist", val=>$marclist[$i] };
  		push @field_data, { term => "and_or", val=>$and_or[$i] };
  		push @field_data, { term => "excluding", val=>$excluding[$i] };
--- 88,96 ----
  	my @field_data = ();
  
! 	# we must get parameters once again. Because if there is a mainentry, it has been replaced by something else during the search, thus the links next/previous would not work anymore 
! 	my @marclist_ini = $query->param('marclist');
  	for(my $i = 0 ; $i <= $#marclist ; $i++)
  	{
! 		push @field_data, { term => "marclist", val=>$marclist_ini[$i] };
  		push @field_data, { term => "and_or", val=>$and_or[$i] };
  		push @field_data, { term => "excluding", val=>$excluding[$i] };

Index: authorities.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/authorities.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** authorities.pl	4 May 2005 08:51:07 -0000	1.11
--- authorities.pl	20 Jun 2005 13:17:56 -0000	1.12
***************
*** 240,243 ****
--- 240,244 ----
  				$tag_data{tag} = $tag;
  				$tag_data{tag_lib} = $tagslib->{$tag}->{lib};
+ 				$tag_data{repeatable} = $tagslib->{$tag}->{repeatable};
  				$tag_data{indicator} = $indicator;
  				$tag_data{subfield_loop} = \@subfields_data;
***************
*** 366,404 ****
  	my @ind_tag = $input->param('ind_tag');
  	my @indicator = $input->param('indicator');
- 	splice(@tags,$addedfield,0,$tags[$addedfield]);
- 	splice(@subfields,$addedfield,0,$subfields[$addedfield]);
- 	splice(@values,$addedfield,0,$values[$addedfield]);
- 	splice(@ind_tag,$addedfield,0,$ind_tag[$addedfield]);
  	my %indicators;
  	for (my $i=0;$i<=$#ind_tag;$i++) {
  		$indicators{$ind_tag[$i]} = $indicator[$i];
  	}
! # search the part of the array to duplicate.
! 	my $start=0;
! 	my $end=0;
! 	my $started;
! 	for (my $i=0;$i<=$#tags;$i++) {
! 		$start=$i if ($start eq 0 && $tags[$i] == $addedfield);
! 		$end=$i if ($start>0 && $tags[$i] eq $addedfield);
! 		last if ($start>0 && $tags[$i] ne $addedfield);
! 	}
! # add an empty line in all arrays. This forces a new field in MARC::Record.
! 	splice(@tags,$end+1,0,'');
! 	splice(@subfields,$end+1,0,'');
! 	splice(@values,$end+1,0,'');
! 	splice(@ind_tag,$end+1,0,'');
! 	splice(@indicator,$end+1,0,'');
! # then duplicate the field.
! 	splice(@tags,$end+2,0, at tags[$start..$end]);
! 	splice(@subfields,$end+2,0, at subfields[$start..$end]);
! 	splice(@values,$end+2,0, at values[$start..$end]);
! 	splice(@ind_tag,$end+2,0, at ind_tag[$start..$end]);
! 	splice(@indicator,$end+2,0, at indicator[$start..$end]);
  
- 	my %indicators;
- 	for (my $i=0;$i<=$#ind_tag;$i++) {
- 		$indicators{$ind_tag[$i]} = $indicator[$i];
- 	}
- 	my $record = MARChtml2marc($dbh,\@tags,\@subfields,\@values,%indicators);
  	build_tabs ($template, $record, $dbh,$encoding);
  	build_hidden_data;
--- 367,378 ----
  	my @ind_tag = $input->param('ind_tag');
  	my @indicator = $input->param('indicator');
  	my %indicators;
  	for (my $i=0;$i<=$#ind_tag;$i++) {
  		$indicators{$ind_tag[$i]} = $indicator[$i];
  	}
! 	my $record = AUTHhtml2marc($dbh,\@tags,\@subfields,\@values,%indicators);
! 	my $field = MARC::Field->new("$addedfield",'','','a'=> "");
! 	$record->append_fields($field);
  
  	build_tabs ($template, $record, $dbh,$encoding);
  	build_hidden_data;
***************
*** 418,422 ****
  }
  
! if ($authid) {
  	build_tabs ($template, $record, $dbh,$encoding);
  	build_hidden_data;
--- 392,397 ----
  }
  
! unless ($op) {
! # 	warn "BUILDING";
  	build_tabs ($template, $record, $dbh,$encoding);
  	build_hidden_data;
***************
*** 432,436 ****
  	);
  
! 	my $authtypes = getauthtypes;
  my @authtypesloop;
  foreach my $thisauthtype (keys %$authtypes) {
--- 407,411 ----
  	);
  
! my $authtypes = getauthtypes;
  my @authtypesloop;
  foreach my $thisauthtype (keys %$authtypes) {
***************
*** 443,446 ****
  }
  
! $template->param(authtypesloop => \@authtypesloop);
  output_html_with_http_headers $input, $cookie, $template->output;
--- 418,423 ----
  }
  
! $template->param(authtypesloop => \@authtypesloop,
! 				authtypetext => $authtypes->{$authtypecode}{'authtypetext'},
! 				);
  output_html_with_http_headers $input, $cookie, $template->output;

Index: blinddetail-biblio-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/blinddetail-biblio-search.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** blinddetail-biblio-search.pl	16 Sep 2004 09:45:44 -0000	1.4
--- blinddetail-biblio-search.pl	20 Jun 2005 13:17:56 -0000	1.5
***************
*** 80,84 ****
  my @loop_data =();
  if ($authid) {
- warn "report $authtypecode => ".$auth_type->{auth_tag_to_report}.$record->as_formatted;
  	foreach my $field ($record->field($auth_type->{auth_tag_to_report})) {
  			my @subfields_data;
--- 80,83 ----

Index: detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/detail.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** detail.pl	8 Nov 2004 19:46:11 -0000	1.2
--- detail.pl	20 Jun 2005 13:17:56 -0000	1.3
***************
*** 144,147 ****
--- 144,148 ----
  				count => $count,
  				biblio_fields => $biblio_fields,
+ 				authtypetext => $authtypes->{$authtypecode}{'authtypetext'},
  				authtypesloop => \@authtypesloop);
  output_html_with_http_headers $query, $cookie, $template->output;




From tipaul at users.sourceforge.net  Mon Jun 20 15:18:47 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 06:18:47 -0700
Subject: [Koha-cvs] CVS: koha/bull statecollection.pl,1.4,1.5
Message-ID: <E1DkMAp-0002HI-W3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8739/bull

Modified Files:
	statecollection.pl 
Log Message:
synch'ing 2.2 and head

Index: statecollection.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/statecollection.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** statecollection.pl	1 Mar 2005 13:40:50 -0000	1.4
--- statecollection.pl	20 Jun 2005 13:18:45 -0000	1.5
***************
*** 32,40 ****
  # change status except, if subscription has expired, for the "waited" issue.
  if ($op eq 'serialchangestatus') {
! 	my $sth = $dbh->prepare("select subscriptionid,status from serial where serialid=?");
  	for (my $i=0;$i<=$#serialids;$i++) {
  		$sth->execute($serialids[$i]);
! 		my ($x,$oldstatus) = $sth->fetchrow;
! 		serialchangestatus($serialids[$i],$serialseqs[$i],format_date_in_iso($planneddates[$i]),$status[$i]) unless ($hassubscriptionexpired && $oldstatus == 1);
  	}
  }
--- 32,48 ----
  # change status except, if subscription has expired, for the "waited" issue.
  if ($op eq 'serialchangestatus') {
! 	my $sth = $dbh->prepare("select status from serial where serialid=?");
  	for (my $i=0;$i<=$#serialids;$i++) {
  		$sth->execute($serialids[$i]);
! 		my ($oldstatus) = $sth->fetchrow;
! 		if ($serialids[$i]) {
! 			serialchangestatus($serialids[$i],$serialseqs[$i],format_date_in_iso($planneddates[$i]),$status[$i]) unless ($hassubscriptionexpired && $oldstatus == 1);
! 		} else {
! 			# add a special issue
! 			if ($serialseqs[$i]) {
! 				my $subscription=getsubscription($subscriptionid);
! 				newissue($serialseqs[$i],$subscriptionid,$subscription->{biblionumber},$status[$i], format_date_in_iso($planneddates[$i]));
! 			}
! 		}
  	}
  }




From tipaul at users.sourceforge.net  Mon Jun 20 16:10:05 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:10:05 -0700
Subject: [Koha-cvs] CVS: koha/C4 Accounts2.pm,1.22,1.23 Acquisition.pm,1.12,1.13 AuthoritiesMarc.pm,1.18,1.19 Auth.pm,1.38,1.39 Auth_with_ldap.pm,1.3,1.4 Biblio.pm,1.120,1.121 Bull.pm,1.11,1.12 Context.pm,1.20,1.21 Members.pm,1.7,1.8 Output.pm,1.51,1.52 SearchMarc.pm,1.45,1.46
Message-ID: <E1DkMyT-0000Nz-UD@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1223/C4

Modified Files:
	Accounts2.pm Acquisition.pm AuthoritiesMarc.pm Auth.pm 
	Auth_with_ldap.pm Biblio.pm Bull.pm Context.pm Members.pm 
	Output.pm SearchMarc.pm 
Log Message:
synch'ing 2.2 and head

Index: Accounts2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Accounts2.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** Accounts2.pm	9 Dec 2003 15:03:00 -0000	1.22
--- Accounts2.pm	20 Jun 2005 14:10:00 -0000	1.23
***************
*** 302,310 ****
    }
    if ($itemnum ne ''){
- #FIXME to use ? before uncommenting
- #     my $sth=$dbh->prepare("Select * from items where barcode='$itemnum'");
- #     $sth->execute;
- #     my $data=$sth->fetchrow_hashref;
- #     $sth->finish;
      $desc.=" ".$itemnum;
      my $sth=$dbh->prepare("INSERT INTO	accountlines
--- 302,305 ----
***************
*** 314,318 ****
       $sth->execute($bornum, $accountno, $amount, $desc, $type, $amountleft, $itemnum);
    } else {
-     $desc=$dbh->quote($desc);
      my $sth=$dbh->prepare("INSERT INTO	accountlines
  			(borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding)
--- 309,312 ----

Index: Acquisition.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** Acquisition.pm	6 Jun 2005 23:29:36 -0000	1.12
--- Acquisition.pm	20 Jun 2005 14:10:00 -0000	1.13
***************
*** 105,109 ****
  	my ($basketno,$supplier,$orderby)=@_;
  	my $dbh = C4::Context->dbh;
! 	my $query="Select *,biblio.title,aqorders.ordernumber from aqorders,biblio,biblioitems
  	left join aqorderbreakdown on aqorderbreakdown.ordernumber=aqorders.ordernumber
  	where basketno='$basketno'
--- 105,109 ----
  	my ($basketno,$supplier,$orderby)=@_;
  	my $dbh = C4::Context->dbh;
! 	my $query="Select biblio.*,biblioitems.*,aqorders.*,aqorderbreakdown.*,biblio.title from aqorders,biblio,biblioitems
  	left join aqorderbreakdown on aqorderbreakdown.ordernumber=aqorders.ordernumber
  	where basketno='$basketno'
***************
*** 563,567 ****
  	map { push(@searchterms,"$_%","% $_%") } @data;
  	push(@searchterms,$search,$search,$biblio);
! 	my $sth=$dbh->prepare("Select *,biblio.title from aqorders,biblioitems,biblio,aqbasket
  		where aqorders.biblioitemnumber = biblioitems.biblioitemnumber and
  		aqorders.basketno = aqbasket.basketno
--- 563,567 ----
  	map { push(@searchterms,"$_%","% $_%") } @data;
  	push(@searchterms,$search,$search,$biblio);
! 	my $sth=$dbh->prepare("Select biblio.*,biblioitems.*,aqorders.*,aqbasket.*,biblio.title from aqorders,biblioitems,biblio,aqbasket
  		where aqorders.biblioitemnumber = biblioitems.biblioitemnumber and
  		aqorders.basketno = aqbasket.basketno
***************
*** 598,610 ****
  
  sub histsearch {
! 	my ($title,$author,$name)=@_;
  	my $dbh= C4::Context->dbh;
! 	my $query = "select biblio.title,aqorders.basketno,name,aqbasket.creationdate,aqorders.datereceived, aqorders.quantity, aqorders.ecost
! 							from aqorders,aqbasket,aqbooksellers,biblio 
! 							where aqorders.basketno=aqbasket.basketno and aqbasket.booksellerid=aqbooksellers.id and
! 							biblio.biblionumber=aqorders.biblionumber";
  	$query .= " and biblio.title like ".$dbh->quote("%".$title."%") if $title;
  	$query .= " and biblio.author like ".$dbh->quote("%".$author."%") if $author;
  	$query .= " and name like ".$dbh->quote("%".$name."%") if $name;
  	my $sth = $dbh->prepare($query);
  	$sth->execute;
--- 598,612 ----
  
  sub histsearch {
! 	my ($title,$author,$name,$from_placed_on,$to_placed_on)=@_;
  	my $dbh= C4::Context->dbh;
! 	my $query = "select biblio.title,aqorders.basketno,name,aqbasket.creationdate,aqorders.datereceived, aqorders.quantity, aqorders.ecost from aqorders,aqbasket,aqbooksellers,biblio 
! where aqorders.basketno=aqbasket.basketno and aqbasket.booksellerid=aqbooksellers.id and
! biblio.biblionumber=aqorders.biblionumber";
  	$query .= " and biblio.title like ".$dbh->quote("%".$title."%") if $title;
  	$query .= " and biblio.author like ".$dbh->quote("%".$author."%") if $author;
  	$query .= " and name like ".$dbh->quote("%".$name."%") if $name;
+ 	$query .= " and creationdate >" .$dbh->quote($from_placed_on) if $from_placed_on;
+ 	$query .= " and creationdate<".$dbh->quote($to_placed_on) if $to_placed_on;
+ 	warn "C4:Acquisition : ".$query;
  	my $sth = $dbh->prepare($query);
  	$sth->execute;

Index: AuthoritiesMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/AuthoritiesMarc.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** AuthoritiesMarc.pm	7 Jun 2005 10:00:47 -0000	1.18
--- AuthoritiesMarc.pm	20 Jun 2005 14:10:00 -0000	1.19
***************
*** 667,671 ****
--- 667,673 ----
  			if (@$rtags[$i] <10) {
  				$prevvalue= @$rvalues[$i];
+ 				undef $field;
  			} else {
+ 				undef $prevvalue;
  				$field = MARC::Field->new( (sprintf "%03s",@$rtags[$i]), substr($indicators{@$rtags[$i]},0,1),substr($indicators{@$rtags[$i]},1,1), @$rsubfields[$i] => @$rvalues[$i]);
  			}
***************
*** 675,679 ****
  				$prevvalue=@$rvalues[$i];
  			} else {
! 				if (@$rvalues[$i]) {
  					$field->add_subfields(@$rsubfields[$i] => @$rvalues[$i]);
  				}
--- 677,681 ----
  				$prevvalue=@$rvalues[$i];
  			} else {
! 				if (length(@$rvalues[$i])>0) {
  					$field->add_subfields(@$rsubfields[$i] => @$rvalues[$i]);
  				}
***************
*** 683,688 ****
  	}
  	# the last has not been included inside the loop... do it now !
! 	$record->add_fields($field);
! # 	warn $record->as_formatted;
  	return $record;
  }
--- 685,689 ----
  	}
  	# the last has not been included inside the loop... do it now !
! 	$record->add_fields($field) if $field;
  	return $record;
  }
***************
*** 922,925 ****
--- 923,929 ----
  # $Id$
  # $Log$
+ # Revision 1.19  2005/06/20 14:10:00  tipaul
+ # synch'ing 2.2 and head
+ #
  # Revision 1.18  2005/06/07 10:00:47  tipaul
  # adding $b to mainentry (in UNIMARC, for personal names, $a is the surname, $b is the firstname)

Index: Auth.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Auth.pm,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** Auth.pm	4 May 2005 15:40:01 -0000	1.38
--- Auth.pm	20 Jun 2005 14:10:00 -0000	1.39
***************
*** 400,404 ****
  
  	my $self_url = $query->url(-absolute => 1);
! 	$template->param(url => $self_url);
  	$template->param(\%info);
  	$cookie=$query->cookie(-name => 'sessionID',
--- 400,404 ----
  
  	my $self_url = $query->url(-absolute => 1);
! 	$template->param(url => $self_url, LibraryName=> => C4::Context->preference("LibraryName"),);
  	$template->param(\%info);
  	$cookie=$query->cookie(-name => 'sessionID',

Index: Auth_with_ldap.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Auth_with_ldap.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Auth_with_ldap.pm	4 May 2005 15:40:01 -0000	1.3
--- Auth_with_ldap.pm	20 Jun 2005 14:10:00 -0000	1.4
***************
*** 138,142 ****
  		$template->param(USER_INFO => \@bordat,
  		);
- 		
  		# We are going to use the $flags returned by checkauth
  		# to create the template's parameters that will indicate
--- 138,141 ----
***************
*** 164,167 ****
--- 163,167 ----
  			$template->param(CAN_user_catalogue => 1); }
  		
+ 
  		if ($flags->{parameters} == 1) {
  			$template->param(CAN_user_parameters => 1);	
***************
*** 169,175 ****
--- 169,177 ----
  			$template->param(CAN_user_tools => 1); }
  		
+ 
  		if ($flags->{borrowers} == 1) {
  			$template->param(CAN_user_borrowers => 1); }
  		
+ 
  		if ($flags->{permissions} == 1) {
  			$template->param(CAN_user_permission => 1); }
***************
*** 178,190 ****
--- 180,196 ----
  			$template->param(CAN_user_reserveforothers => 1); }
  		
+ 
  		if ($flags->{borrow} == 1) {
  			$template->param(CAN_user_borrow => 1); }
  		
+ 
  		if ($flags->{reserveforself} == 1) {
  			$template->param(CAN_user_reserveforself => 1); }
  		
+ 
  		if ($flags->{editcatalogue} == 1) {
  			$template->param(CAN_user_editcatalogue => 1); }
  		
+ 
  		if ($flags->{updatecharges} == 1) {
  			$template->param(CAN_user_updatecharge => 1); }

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -r1.120 -r1.121
*** Biblio.pm	15 Jun 2005 16:09:43 -0000	1.120
--- Biblio.pm	20 Jun 2005 14:10:00 -0000	1.121
***************
*** 59,62 ****
--- 59,63 ----
    &NEWmodbiblio &NEWmoditem
    &NEWdelbiblio &NEWdelitem
+   &NEWmodbiblioframework
  
    &MARCaddbiblio &MARCadditem
***************
*** 930,934 ****
              $row->{'author'},'' );
      }
!     my $sth2 =
        $dbh->prepare(" SELECT subject FROM bibliosubject WHERE biblionumber=?");
      $sth2->execute($biblionumber);
--- 931,935 ----
              $row->{'author'},'' );
      }
!     $sth2 =
        $dbh->prepare(" SELECT subject FROM bibliosubject WHERE biblionumber=?");
      $sth2->execute($biblionumber);
***************
*** 937,941 ****
              $row->{'subject'},'' );
      }
!     my $sth2 =
        $dbh->prepare(
          " SELECT subtitle FROM bibliosubtitle WHERE biblionumber=?");
--- 938,942 ----
              $row->{'subject'},'' );
      }
!     $sth2 =
        $dbh->prepare(
          " SELECT subtitle FROM bibliosubtitle WHERE biblionumber=?");
***************
*** 1044,1048 ****
--- 1045,1051 ----
  			if (@$rtags[$i] <10) {
  				$prevvalue= @$rvalues[$i];
+ 				undef $field;
  			} else {
+ 				undef $prevvalue;
  				$field = MARC::Field->new( (sprintf "%03s",@$rtags[$i]), substr($indicators{@$rtags[$i]},0,1),substr($indicators{@$rtags[$i]},1,1), @$rsubfields[$i] => @$rvalues[$i]);
  # 			warn "1=>".@$rtags[$i].@$rsubfields[$i]." = ".@$rvalues[$i].": ".$field->as_formatted;
***************
*** 1062,1066 ****
  	}
  	# the last has not been included inside the loop... do it now !
! 	$record->add_fields($field);
  # 	warn "HTML2MARC=".$record->as_formatted;
  	return $record;
--- 1065,1069 ----
  	}
  	# the last has not been included inside the loop... do it now !
! 	$record->add_fields($field) if $field;
  # 	warn "HTML2MARC=".$record->as_formatted;
  	return $record;
***************
*** 1101,1105 ****
  	}
  # modify publicationyear to keep only the 1st year found
! 	my $temp = $result->{'publicationyear'};
  	$temp =~ m/c(\d\d\d\d)/; # search cYYYY first
  	if ($1>0) {
--- 1104,1108 ----
  	}
  # modify publicationyear to keep only the 1st year found
! 	$temp = $result->{'publicationyear'};
  	$temp =~ m/c(\d\d\d\d)/; # search cYYYY first
  	if ($1>0) {
***************
*** 1275,1278 ****
--- 1278,1287 ----
  }
  
+ sub NEWmodbiblioframework {
+ 	my ($dbh,$bibid,$frameworkcode) =@_;
+ 	my $sth = $dbh->prepare("Update marc_biblio SET frameworkcode=? WHERE bibid=$bibid");
+ 	$sth->execute($frameworkcode);
+ 	return 1;
+ }
  sub NEWmodbiblio {
  	my ($dbh,$record,$bibid,$frameworkcode) =@_;
***************
*** 1348,1352 ****
  
      # add itemnumber to MARC::Record before adding the item.
!     my $sth =
        $dbh->prepare(
  "select tagfield,tagsubfield from marc_subfield_structure where frameworkcode=? and kohafield=?"
--- 1357,1361 ----
  
      # add itemnumber to MARC::Record before adding the item.
!     $sth =
        $dbh->prepare(
  "select tagfield,tagsubfield from marc_subfield_structure where frameworkcode=? and kohafield=?"
***************
*** 1458,1462 ****
      $sth =
        $dbh->prepare(
! "insert into biblio set biblionumber  = ?, title = ?, author = ?, copyrightdate = ?, serial = ?, seriestitle = ?, notes = ?, abstract = ?"
      );
      $sth->execute(
--- 1467,1471 ----
      $sth =
        $dbh->prepare(
! "insert into biblio set biblionumber  = ?, title = ?, author = ?, copyrightdate = ?, serial = ?, seriestitle = ?, notes = ?, abstract = ?, unititle = ?"
      );
      $sth->execute(
***************
*** 1464,1468 ****
          $biblio->{'author'}, $biblio->{'copyrightdate'},
          $biblio->{'serial'},             $biblio->{'seriestitle'},
!         $biblio->{'notes'},  $biblio->{'abstract'}
      );
  
--- 1473,1478 ----
          $biblio->{'author'}, $biblio->{'copyrightdate'},
          $biblio->{'serial'},             $biblio->{'seriestitle'},
!         $biblio->{'notes'},  $biblio->{'abstract'},
! 		$biblio->{'unititle'},
      );
  
***************
*** 2672,2675 ****
--- 2682,2688 ----
  # $Id$
  # $Log$
+ # Revision 1.121  2005/06/20 14:10:00  tipaul
+ # synch'ing 2.2 and head
+ #
  # Revision 1.120  2005/06/15 16:09:43  hdl
  # Displaying dashed isbn.

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** Bull.pm	17 Jun 2005 13:44:25 -0000	1.11
--- Bull.pm	20 Jun 2005 14:10:01 -0000	1.12
***************
*** 47,50 ****
--- 47,51 ----
  @EXPORT = qw(&newsubscription &modsubscription &delsubscription &getsubscriptions &getsubscription 
  			&getsubscriptionfrombiblionumber &get_subscription_list_from_biblionumber
+ 			&get_full_subscription_list_from_biblionumber 
  			&modsubscriptionhistory &newissue
  			&getserials &serialchangestatus
***************
*** 101,104 ****
--- 102,106 ----
  	return @issuelist;
  }
+ 
  sub newsubscription {
  	my ($auser,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber,
***************
*** 140,143 ****
--- 142,146 ----
  	return $subscriptionid;
  }
+ 
  sub getsubscription {
  	my ($subscriptionid) = @_;
***************
*** 167,171 ****
  	my ($biblionumber) = @_;
  	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare('select subscription.*,subscriptionhistory.*,aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle 
  							from subscription 
  							left join subscriptionhistory on subscription.subscriptionid=subscriptionhistory.subscriptionid
--- 170,174 ----
  	my ($biblionumber) = @_;
  	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare('select subscription.*,subscriptionhistory.*,  aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle 
  							from subscription 
  							left join subscriptionhistory on subscription.subscriptionid=subscriptionhistory.subscriptionid
***************
*** 178,184 ****
--- 181,194 ----
  	while (my $subs = $sth->fetchrow_hashref) {
  		$subs->{startdate} = format_date($subs->{startdate});
+ 		$subs->{histstartdate} = format_date($subs->{histstartdate});
  		$subs->{opacnote} =~ s/\n/\<br\/\>/g;
  		$subs->{missinglist} =~ s/\n/\<br\/\>/g;
  		$subs->{recievedlist} =~ s/\n/\<br\/\>/g;
+ 		$subs->{"periodicity".$subs->{periodicity}} = 1;
+ 		if ($subs->{enddate} eq '0000-00-00') {
+ 			$subs->{enddate}='';
+ 		} else {
+ 			$subs->{enddate} = format_date($subs->{enddate});
+ 		}
  		push @res,$subs;
  	}
***************
*** 186,189 ****
--- 196,263 ----
  }
  
+ sub get_full_subscription_list_from_biblionumber {
+ 	my ($biblionumber) = @_;
+ 	my $dbh = C4::Context->dbh;
+ 	my $sth = $dbh->prepare('select serial.serialseq, serial.planneddate, serial.status, year(serial.planneddate) as year,subscription.*, aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle 
+ 							from serial left join subscription on (serial.subscriptionid=subscription.subscriptionid and subscription.biblionumber=serial.biblionumber)
+ 							left join aqbudget on subscription.aqbudgetid=aqbudget.aqbudgetid 
+ 							left join aqbooksellers on subscription.aqbooksellerid=aqbooksellers.id 
+ 							left join biblio on biblio.biblionumber=subscription.biblionumber 
+ 							where subscription.biblionumber = ? order by year,serial.planneddate');
+ 	$sth->execute($biblionumber);
+ 	my @res;
+ 	my $year;
+ 	my $startdate;
+ 	my $aqbooksellername;
+ 	my $bibliotitle;
+ 	my @loopissues;
+ 	my $first;
+ 	while (my $subs = $sth->fetchrow_hashref) {
+ # 		my $sth2 = $dbh->prepare('select * from serial where serial.biblionumber = ? and serial.subscriptionid=? order by serial.planneddate');
+ # 		$sth2->execute($biblionumber,$subs->{'subscriptionid'});
+ # 		while (my $issues = $sth2->fetchrow_hashref){
+ # 				warn "planneddate ".$issues->{'planneddate'};
+ # 				warn "serialseq".$issues->{'serialseq'};
+ # 		}
+ 		if ($year and ($year==$subs->{year})){
+ 			if ($first eq 1){$first=0;}
+ 			my $temp=$res[scalar(@res)-1]->{'serials'};
+ 			push @$temp,
+ 				{'planneddate' => format_date($subs->{'planneddate'}), 
+ 				'serialseq' => $subs->{'serialseq'},
+ 				'status1' => $subs->{'status'}==1,
+ 				'status2' => $subs->{'status'}==2,
+ 				'status3' => $subs->{'status'}==3,
+ 				'status4' => $subs->{'status'}==4,
+ 				};
+ 		}else {
+ 			$first=1 if (not $year);
+ 			$year= $subs->{'year'};
+ 			$startdate= format_date($subs->{'startdate'});
+ 			$aqbooksellername= $subs->{'aqbooksellername'};
+ 			$bibliotitle= $subs->{'bibliotitle'};
+ 			my @temp;
+ 			push @temp,
+ 				{'planneddate' => format_date($subs->{'planneddate'}), 
+ 				'serialseq' => $subs->{'serialseq'},
+ 				'status1' => $subs->{'status'}==1,
+ 				'status2' => $subs->{'status'}==2,
+ 				'status3' => $subs->{'status'}==3,
+ 				'status4' => $subs->{'status'}==4,
+ 				};
+ 			
+ 			push @res,{
+ 				'year'=>$year,
+ 				'startdate'=>$startdate,
+ 				'aqbooksellername'=>$aqbooksellername,
+ 				'bibliotitle'=>$bibliotitle,
+ 				'serials'=>\@temp,
+ 				'first'=>$first 
+ 			};
+ 		}
+ 	}
+ 	return \@res;
+ }
+ 
  
  sub modsubscription {
***************
*** 301,323 ****
  		push @serials,$line;
  	}
! 	return \@serials;
! }
! 
! sub serialdelete {
! 	my ($serialid,$serialseq)=@_;
! 	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare("select subscriptionid,status from serial where serialid=?");
! 	$sth->execute($serialid);
! 	my ($subscriptionid,$oldstatus) = $sth->fetchrow;
! 	# change status & update subscriptionhistory
! 	my $sth = $dbh->prepare("delete * from serial  where serialid = ?");
! 	$sth->execute($serialid);
! 	$sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
  	$sth->execute($subscriptionid);
! 	my ($missinglist,$recievedlist) = $sth->fetchrow;
! 	$recievedlist =~ s/",$serialseq"//;
! 	$missinglist =~ s/",$serialseq"//;
! 	$sth=$dbh->prepare("update subscriptionhistory set recievedlist=?, missinglist=? where subscriptionid=?");
! 	$sth->execute($recievedlist,$missinglist,$subscriptionid);
  }
  
--- 375,382 ----
  		push @serials,$line;
  	}
! 	$sth=$dbh->prepare("select count(*) from serial where subscriptionid=?");
  	$sth->execute($subscriptionid);
! 	my ($totalissues) = $sth->fetchrow;
! 	return ($totalissues, at serials);
  }
  
***************
*** 370,380 ****
  	my $sth = $dbh->prepare("insert into serial (serialseq,subscriptionid,biblionumber,status, planneddate) values (?,?,?,?,?)");
  	$sth->execute($serialseq,$subscriptionid,$biblionumber,$status, $planneddate);
! }
! 
! sub delissue {
! 	my ($serialseq,$subscriptionid) = @_;
! 	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare("delete from serial where serialseq= ? and subscriptionid= ? ");
! 	$sth->execute($serialseq,$subscriptionid);
  }
  
--- 429,443 ----
  	my $sth = $dbh->prepare("insert into serial (serialseq,subscriptionid,biblionumber,status, planneddate) values (?,?,?,?,?)");
  	$sth->execute($serialseq,$subscriptionid,$biblionumber,$status, $planneddate);
! 	$sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
! 	$sth->execute($subscriptionid);
! 	my ($missinglist,$recievedlist) = $sth->fetchrow;
! 	if ($status eq 2) {
! 		$recievedlist .= ",$serialseq";
! 	}
! 	if ($status eq 4) {
! 		$missinglist .= ",$serialseq";
! 	}
! 	$sth=$dbh->prepare("update subscriptionhistory set recievedlist=?, missinglist=? where subscriptionid=?");
! 	$sth->execute($recievedlist,$missinglist,$subscriptionid);
  }
  


Index: Members.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Members.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Members.pm	4 May 2005 15:40:01 -0000	1.7
--- Members.pm	20 Jun 2005 14:10:01 -0000	1.8
***************
*** 100,104 ****
  	my $dbh = C4::Context->dbh;
  	$data{'dateofbirth'}=format_date_in_iso($data{'dateofbirth'});
- 	$data{'joining'}=format_date_in_iso($data{'joining'});
  	$data{'expiry'}=format_date_in_iso($data{'expiry'});
  	my $query="update borrowers set title='$data{'title'}',expiry='$data{'expiry'}',
--- 100,103 ----
***************
*** 106,110 ****
  	streetaddress='$data{'streetaddress'}',faxnumber='$data{'faxnumber'}',firstname='$data{'firstname'}',
  	altnotes='$data{'altnotes'}',dateofbirth='$data{'dateofbirth'}',contactname='$data{'contactname'}',
! 	emailaddress='$data{'emailaddress'}',dateenrolled='$data{'joining'}',streetcity='$data{'streetcity'}',
  	altrelationship='$data{'altrelationship'}',othernames='$data{'othernames'}',phoneday='$data{'phoneday'}',
  	categorycode='$data{'categorycode'}',city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}',
--- 105,109 ----
  	streetaddress='$data{'streetaddress'}',faxnumber='$data{'faxnumber'}',firstname='$data{'firstname'}',
  	altnotes='$data{'altnotes'}',dateofbirth='$data{'dateofbirth'}',contactname='$data{'contactname'}',
! 	emailaddress='$data{'emailaddress'}',streetcity='$data{'streetcity'}',
  	altrelationship='$data{'altrelationship'}',othernames='$data{'othernames'}',phoneday='$data{'phoneday'}',
  	categorycode='$data{'categorycode'}',city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}',
***************
*** 131,135 ****
--- 130,143 ----
  	my $dbh = C4::Context->dbh;
  	$data{'dateofbirth'}=format_date_in_iso($data{'dateofbirth'});
+ 	$data{'joining'} = &ParseDate("today") unless $data{'joining'};
  	$data{'joining'}=format_date_in_iso($data{'joining'});
+ 	# if expirydate is not set, calculate it from borrower category subscription duration
+ 	unless ($data{'expiry'}) {
+ 		my $sth = $dbh->prepare("select enrolmentperiod from categories where categorycode=?");
+ 		$sth->execute($data{'categorycode'});
+ 		my ($enrolmentperiod) = $sth->fetchrow;
+ 		$enrolmentperiod = 12 unless ($enrolmentperiod);
+ 		$data{'expiry'} = &DateCalc($data{'joining'},"$enrolmentperiod years");
+ 	}
  	$data{'expiry'}=format_date_in_iso($data{'expiry'});
  # 	$data{'borrowernumber'}=NewBorrowerNumber();

Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -r1.51 -r1.52
*** Output.pm	3 Jan 2005 10:58:46 -0000	1.51
--- Output.pm	20 Jun 2005 14:10:01 -0000	1.52
***************
*** 84,87 ****
--- 84,88 ----
  							theme => $theme,
  							opacstylesheet => $opacstylesheet,
+ 							opacsmallimage => C4::Context->preference('opacsmallimage'),
  							lang => $lang);
  

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** SearchMarc.pm	15 Jun 2005 13:21:22 -0000	1.45
--- SearchMarc.pm	20 Jun 2005 14:10:01 -0000	1.46
***************
*** 340,344 ****
  	# HINT : biblionumber as bn is important. The hash is fills biblionumber with items.biblionumber.
  	# so if you dont' has an item, you get a not nice empty value.
! 	$sth = $dbh->prepare("SELECT biblio.biblionumber as bn,biblio.*, biblioitems.*,marc_biblio.bibid,itemtypes.notforloan,itemtypes.description
  							FROM biblio, marc_biblio 
  							LEFT JOIN biblioitems on biblio.biblionumber = biblioitems.biblionumber
--- 340,344 ----
  	# HINT : biblionumber as bn is important. The hash is fills biblionumber with items.biblionumber.
  	# so if you dont' has an item, you get a not nice empty value.
! 	$sth = $dbh->prepare("SELECT biblio.biblionumber as bn,biblioitems.*,biblio.*, marc_biblio.bibid,itemtypes.notforloan,itemtypes.description
  							FROM biblio, marc_biblio 
  							LEFT JOIN biblioitems on biblio.biblionumber = biblioitems.biblionumber
***************
*** 351,355 ****
  	my $oldline;
  	my ($oldbibid, $oldauthor, $oldtitle);
! 	my $sth_itemCN = $dbh->prepare("select items.* from items where biblionumber=?");
  	my $sth_issue = $dbh->prepare("select date_due,returndate from issues where itemnumber=?");
  	# parse all biblios between start & end.
--- 351,360 ----
  	my $oldline;
  	my ($oldbibid, $oldauthor, $oldtitle);
! 	my $sth_itemCN;
! 	if (C4::Context->preference('hidelostitem')) {
! 		$sth_itemCN = $dbh->prepare("select items.* from items where biblionumber=? and (itemlost = 0 or itemlost is NULL)");
! 	} else {
! 		$sth_itemCN = $dbh->prepare("select items.* from items where biblionumber=?");
! 	}
  	my $sth_issue = $dbh->prepare("select date_due,returndate from issues where itemnumber=?");
  	# parse all biblios between start & end.




From tipaul at users.sourceforge.net  Mon Jun 20 16:10:42 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:10:42 -0700
Subject: [Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.93,1.94 Fines.pm,1.10,1.11
Message-ID: <E1DkMz4-0000Rg-Pr@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Circulation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1597/C4/Circulation

Modified Files:
	Circ2.pm Fines.pm 
Log Message:
synch'ing 2.2 and head

Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -r1.93 -r1.94
*** Circ2.pm	15 May 2005 04:34:09 -0000	1.93
--- Circ2.pm	20 Jun 2005 14:10:30 -0000	1.94
***************
*** 609,613 ****
  	$sth->execute($cat_borrower, $type, $branch_borrower);
  	my $result = $sth->fetchrow_hashref;
! # 	warn "==>".$result->{maxissueqty};
  	if (defined($result)) {
  		$sth2->execute($borrower->{'borrowernumber'}, "%$type%");
--- 609,613 ----
  	$sth->execute($cat_borrower, $type, $branch_borrower);
  	my $result = $sth->fetchrow_hashref;
! #	warn "==>".$result->{maxissueqty};
  	if (defined($result)) {
  		$sth2->execute($borrower->{'borrowernumber'}, "%$type%");
***************
*** 628,632 ****
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my $alreadyissued = $sth2->fetchrow;
  		return ("c $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}
--- 628,633 ----
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my ($alreadyissued) = $sth3->fetchrow;
! 		warn "HERE : $alreadyissued / ($result->{maxissueqty} for $borrower->{'borrowernumber'}";
  		return ("c $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}
***************
*** 644,648 ****
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my $alreadyissued = $sth2->fetchrow;
  		return ("e $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}
--- 645,649 ----
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my $alreadyissued = $sth3->fetchrow;
  		return ("e $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}
***************
*** 668,672 ****
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my $alreadyissued = $sth2->fetchrow;
  		return ("h $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}
--- 669,673 ----
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my $alreadyissued = $sth3->fetchrow;
  		return ("h $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}
***************
*** 699,702 ****
--- 700,706 ----
  		$issuingimpossible{DEBARRED} = 1;
  	}
+ 	if (&Date_Cmp(&ParseDate($borrower->{expiry}),&ParseDate("today"))<0) {
+ 		$issuingimpossible{EXPIRED} = 1;
+ 	}
  #
  # BORROWER STATUS
***************
*** 767,771 ****
  			my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
  			$needsconfirmation{RESERVE_WAITING} = "$resborrower->{'firstname'} $resborrower->{'surname'} ($resborrower->{'cardnumber'}, $branchname)";
! 			CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'});
  		} elsif ($restype eq "Reserved") {
  			# The item is on reserve for someone else.
--- 771,775 ----
  			my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
  			$needsconfirmation{RESERVE_WAITING} = "$resborrower->{'firstname'} $resborrower->{'surname'} ($resborrower->{'cardnumber'}, $branchname)";
! 			# CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'}); Doesn't belong in a checking subroutine.
  		} elsif ($restype eq "Reserved") {
  			# The item is on reserve for someone else.
***************
*** 842,846 ****
  				my $branches = getbranches();
  				my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
! 				CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'});
  			} elsif ($restype eq "Reserved") {
  				warn "Reserved";
--- 846,852 ----
  				my $branches = getbranches();
  				my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
!                 if ($cancelreserve){
!     				CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'});
!                 }
  			} elsif ($restype eq "Reserved") {
  				warn "Reserved";
***************
*** 853,861 ****
  					CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'});
  					# also cancel reserve on biblio related to this item
! 					my $st_Fbiblio = $dbh->prepare("select biblionumber from items where itemnumber=?");
! 					$st_Fbiblio->execute($res->{'itemnumber'});
! 					my $biblionumber = $st_Fbiblio->fetchrow;
! 					CancelReserve($biblionumber,0,$res->{'borrowernumber'});
! 					warn "CancelReserve $res->{'itemnumber'}, $res->{'borrowernumber'}";
  				} else {
  # 					my $tobrcd = ReserveWaiting($res->{'itemnumber'}, $res->{'borrowernumber'});
--- 859,867 ----
  					CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'});
  					# also cancel reserve on biblio related to this item
! 					#my $st_Fbiblio = $dbh->prepare("select biblionumber from items where itemnumber=?");
! 					#$st_Fbiblio->execute($res->{'itemnumber'});
! 					#my $biblionumber = $st_Fbiblio->fetchrow;
! 					#CancelReserve($biblionumber,0,$res->{'borrowernumber'});
! 					#warn "CancelReserve $res->{'itemnumber'}, $res->{'borrowernumber'}";
  				} else {
  # 					my $tobrcd = ReserveWaiting($res->{'itemnumber'}, $res->{'borrowernumber'});
***************
*** 1619,1622 ****
--- 1625,1637 ----
  		}
  		$sth2->finish;
+ 		my ($resfound, $resrec) = CheckReserves($itemno);
+ 		if ($resfound) {
+ 			$renewokay = 0;
+ 		}
+ 		my ($resfound, $resrec) = CheckReserves($itemno);
+                 if ($resfound) {
+                         $renewokay = 0;
+                 }
+ 
  	}
  	$sth1->finish;

Index: Fines.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Fines.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Fines.pm	1 Mar 2005 03:08:00 -0000	1.10
--- Fines.pm	20 Jun 2005 14:10:31 -0000	1.11
***************
*** 152,157 ****
    biblioitems.itemtype=itemtypes.itemtype and
    categoryitem.itemtype=itemtypes.itemtype and
!   categoryitem.categorycode=? and
!   (items.itemlost <> 1 or items.itemlost is NULL)");
  #  print $query;
    $sth->execute($itemnumber,$bortype);
--- 152,156 ----
    biblioitems.itemtype=itemtypes.itemtype and
    categoryitem.itemtype=itemtypes.itemtype and
!   categoryitem.categorycode=? and (items.itemlost <> 1 or items.itemlost is NULL)");
  #  print $query;
    $sth->execute($itemnumber,$bortype);




From tipaul at users.sourceforge.net  Mon Jun 20 16:13:24 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:13:24 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui acqui-home.tmpl,1.14,1.15 basket.tmpl,1.21,1.22 histsearch.tmpl,1.3,1.4
Message-ID: <E1DkN1g-0000uX-Qi@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	acqui-home.tmpl basket.tmpl histsearch.tmpl 
Log Message:
synch'ing 2.2 and head

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** acqui-home.tmpl	19 Oct 2004 12:24:57 -0000	1.14
--- acqui-home.tmpl	20 Jun 2005 14:13:12 -0000	1.15
***************
*** 5,8 ****
--- 5,11 ----
  <div id="bloc25">
  	<h2 class="acquisition">Start, receive, modify order</h2>
+ 	<!-- TMPL_IF name="nobudget" -->
+ 		<p class="problem">You must define a budget in parameters</p>
+ 	<!-- TMPL_ELSE -->
  		<form action="/cgi-bin/koha/acqui/order.pl" method="post">
  			Supplier name : <input type="text"  size="25"   name="supplier">
***************
*** 10,13 ****
--- 13,17 ----
  		</form>
  	<p>or <a href="histsearch.pl" class="button acquisition">Search order history</a></p>
+ 	<!-- /TMPL_IF -->
  </div>
  
***************
*** 38,43 ****
  <!-- showbudget-->
  <div id="bloc25">
! 	<form action="/cgi-bin/koha/search.pl">
! 		<h2 class="acquisition">budgets and bookfunds</h2>
  		<table class="noborder">
  			<tr>
--- 42,49 ----
  <!-- showbudget-->
  <div id="bloc25">
! 	<h2 class="acquisition">budgets and bookfunds</h2>
! 	<!-- TMPL_IF name="nobudget" -->
! 		<p class="problem">You must define a budget in parameters</p>
! 	<!-- TMPL_ELSE -->
  		<table class="noborder">
  			<tr>
***************
*** 68,72 ****
  		Use your reload button to get the most recent figures. Committed figures are approximate only, as exchange rates will affect the amount actually paid.
  		</p>
! 	</form>
  </div>
  
--- 74,78 ----
  		Use your reload button to get the most recent figures. Committed figures are approximate only, as exchange rates will affect the amount actually paid.
  		</p>
! 	<!-- /TMPL_IF -->
  </div>
  

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** basket.tmpl	4 May 2005 08:52:49 -0000	1.21
--- basket.tmpl	20 Jun 2005 14:13:22 -0000	1.22
***************
*** 18,21 ****
--- 18,28 ----
  		</div>
  	<!-- /TMPL_UNLESS -->
+ 	<div id="bloc25" style="align:right">
+ 		<p><!-- TMPL_VAR name="name" --></p>
+ 		<p><!-- TMPL_VAR name="address1" --></p>
+ 		<p><!-- TMPL_VAR name="address2" --></p>
+ 		<p><!-- TMPL_VAR name="address3" --></p>
+ 		<p><!-- TMPL_VAR name="address4" --></p>
+ 	</div>
  	<div id="bloc100">
  	<h2 class="acquisition">Order</h2>
***************
*** 24,31 ****
  			<tr valign="top" bgcolor="#ffdf61">
  				<th class="acquisition doNotPrint">Order</th>
! 				<th class="acquisition">Publisher<a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=biblioitems.publishercode" class="acquisition doNotPrint">[order]</a></th>
! 				<th class="acquisition">Isbn</th>
  				<th class="acquisition">Title</th>
- 				<th class="acquisition">Author</th>
  				<th class="acquisition">rrp</th>
  				<th class="acquisition doNotPrint">est</th>
--- 31,36 ----
  			<tr valign="top" bgcolor="#ffdf61">
  				<th class="acquisition doNotPrint">Order</th>
! 				<th class="acquisition">Publisher<a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=biblioitems.publishercode" class="acquisition">[order]</a></th>
  				<th class="acquisition">Title</th>
  				<th class="acquisition">rrp</th>
  				<th class="acquisition doNotPrint">est</th>
***************
*** 40,57 ****
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
! 				<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="color" -->">
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
- 					<td><!-- TMPL_VAR NAME="isbn" --></td>
  					<!-- TMPL_IF name="closedate" -->
! 						<td><!-- TMPL_VAR NAME="title" --></td>
  					<!-- TMPL_ELSE -->
! 						<td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
  					<!-- /TMPL_IF -->
! 					<td><!-- TMPL_VAR NAME="author" --></td>
! 					<td><!-- TMPL_VAR NAME="rrp" --></td>
! 					<td class="doNotPrint"><!-- TMPL_VAR NAME="ecost" --></td>
! 					<td><!-- TMPL_VAR NAME="quantity" --></td>
! 					<td><!-- TMPL_VAR NAME="line_total" --></td>
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="bookfundid" --></td>
  					<!-- TMPL_IF name="active" -->
--- 45,76 ----
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
! 				<!-- TMPL_IF name="odd" -->
! 				<tr class="hilighted">
! 				<!-- TMPL_ELSE -->
! 				<tr>
! 				<!-- /TMPL_IF -->
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
  					<!-- TMPL_IF name="closedate" -->
! 						<td>
! 							<b><!-- TMPL_VAR NAME="title" --></b><br/>
! 								<!-- TMPL_VAR NAME="author" -->
! 								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --><p class="doNotPrint"><i><!--TMPL_VAR name="notes" --></i></p><!-- /TMPL_IF -->
! 						</td>
  					<!-- TMPL_ELSE -->
! 						<td>
! 							<p>
! 							<a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a><br/>
! 								<!-- TMPL_VAR NAME="author" -->
! 								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! 							</p>
! 						</td>
  					<!-- /TMPL_IF -->
! 					<td class="number"><!-- TMPL_VAR NAME="rrp" --></td>
! 					<td class="doNotPrint number"><!-- TMPL_VAR NAME="ecost" --></td>
! 					<td class="number"><!-- TMPL_VAR NAME="quantity" --></td>
! 					<td class="number"><!-- TMPL_VAR NAME="line_total" --></td>
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="bookfundid" --></td>
  					<!-- TMPL_IF name="active" -->
***************
*** 69,85 ****
  			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
  			<tr>
! 				<td colspan="4" rowspan=3>
  					&nbsp;
  				</td>
! 				<th colspan="2" class="acquisition">SubTotal</th>
! 				<th class="acquisition"><!-- TMPL_VAR NAME="currency" --><!-- TMPL_VAR NAME="sub_total" --></th>
! 			</tr>
! 			<tr>
! 				<th colspan="2" class="acquisition">GST</th>
! 				<th class="acquisition"><!-- TMPL_VAR NAME="currency" --><!-- TMPL_VAR NAME="gist" --></th>
! 			</tr>
! 			<tr>
! 				<th colspan="2" class="acquisition">TOTAL</th>
! 				<th class="acquisition"><!-- TMPL_VAR NAME="currency" --><!-- TMPL_VAR NAME="grand_total" --></th>
  			</tr>
  		</table>
--- 88,124 ----
  			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
  			<tr>
! 				<td colspan="2" class="acquisition">
  					&nbsp;
  				</td>
! 				<td class="acquisition number">
! 					<p>Sub total</p>
! 					<p>GST</p>
! 					<p>TOTAL (<!-- TMPL_VAR NAME="currency" -->)</p>
! 				</td>
! 				<td class="acquisition number">
! 					<p><!-- TMPL_VAR NAME="sub_total_est" --></p>
! 					<p><!-- TMPL_VAR NAME="gist_est" --></p>
! 					<p><!-- TMPL_VAR NAME="grand_total_est" --></p>
! 				</td>
! 				<td class="acquisition number">
! 					<p><!-- TMPL_VAR NAME="sub_total" --></p>
! 					<p><!-- TMPL_VAR NAME="gist" --></p>
! 					<p><!-- TMPL_VAR NAME="grand_total" --></p>
! 				</td>
! 				<td class="acquisition">
! 					<p><!-- TMPL_VAR name="qty_total" --></p>
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 				</td>
! 				<td class="acquisition">
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 				</td>
! 				<td class="acquisition">
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 				</td>
  			</tr>
  		</table>

Index: histsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** histsearch.tmpl	20 Jun 2005 10:14:12 -0000	1.3
--- histsearch.tmpl	20 Jun 2005 14:13:22 -0000	1.4
***************
*** 31,34 ****
--- 31,93 ----
  				</th>
  				<th class="acquisition">
+ 					From <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
+ 					<input type="text" readonly="readonly" size="10" id="from" name="fromplacedon" value="<!-- TMPL_VAR name="from_placed_on" -->">
+ 					<script language="JavaScript" type="text/javascript">
+ 						function validate1(date) {
+ 							var day = date.getDate();
+ 							var month = date.getMonth() + 1;
+ 							var year = date.getFullYear();
+ 							var weekDay = date.getDay();
+ 							var dayMonth = month + '-' + day;
+ 							var dateString = year + '-' + month + '-' + day;
+ 							var dateTo = document.getElementById('to').value.split("-");
+ 							var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
+ 							if (date > limitDate) {
+ 								return true;
+ 							} else {
+ 								return false;
+ 							}
+ 						}
+ 						Calendar.setup(
+ 							{
+ 								inputField : "from",
+ 								ifFormat : "%Y-%m-%d",
+ 								button : "openCalendarFrom",
+ 								disableFunc : validate1,
+ 								dateStatusFunc : validate1
+ 							}
+ 						);
+ 					</script>
+ 					To <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
+ 					<input readonly="readonly" size="10" id="to" name="toplacedon" value="<!-- TMPL_VAR name="to_placed_on" -->" type="text">
+ 					<script type="text/javascript">
+ 						function validate2(date) {
+ 							var day = date.getDate();
+ 							var month = date.getMonth() + 1;
+ 							var year = date.getFullYear();
+ 							var weekDay = date.getDay();
+ 							var dayMonth = month + '-' + day;
+ 							var dateString = year + '-' + month + '-' + day;
+ 							var dateFrom = document.getElementById('from').value.split("-");
+ 							var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
+ 							if (limitDate > date) {
+ 								return true;
+ 							} else {
+ 								return false;
+ 							}
+ 						}
+ 
+ 						Calendar.setup(
+ 							{
+ 								inputField : "to",
+ 								ifFormat : "%Y-%m-%d",
+ 								button : "openCalendarTo",
+ 								disableFunc : validate2,
+ 								dateStatusFunc : validate2
+ 							}
+ 						);
+ 					</script>
+ 				</th>
+ 				<th class="acquisition">
  					&nbsp;
  				</th>
***************
*** 77,79 ****
--- 136,139 ----
  	</table>
  </div>
+ 
  <!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->




From tipaul at users.sourceforge.net  Mon Jun 20 16:16:06 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:16:06 -0700
Subject: [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
Message-ID: <E1DkN4I-0001E8-1K@sc8-pr-cvs1.sourceforge.net>

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>




From tipaul at users.sourceforge.net  Mon Jun 20 16:17:07 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:17:07 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/authorities authorities.tmpl,1.9,1.10 detail.tmpl,1.4,1.5
Message-ID: <E1DkN5H-0001PQ-Em@sc8-pr-cvs1.sourceforge.net>

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

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

Index: authorities.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** authorities.tmpl	4 May 2005 08:52:51 -0000	1.9
--- authorities.tmpl	20 Jun 2005 14:17:04 -0000	1.10
***************
*** 4,8 ****
  <div class="tabbed">
  	<form method="post" name="f">
! 	<h1 class="authority">Authority number <!-- TMPL_VAR NAME="authid" --></h1>
  	<p>
  		<input type="hidden" name="op" value="add">
--- 4,12 ----
  <div class="tabbed">
  	<form method="post" name="f">
! 	<!-- TMPL_IF name="authid" -->
! 		<h1 class="authority">Modify authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
! 	<!-- TMPL_ELSE -->
! 		<h1 class="authority">Adding authority (<!-- TMPL_VAR name="authtypetext" -->)</h1>
! 	<!-- /TMPL_IF -->
  	<p>
  		<input type="hidden" name="op" value="add">
***************
*** 21,28 ****
  <!-- TMPL_IF name="duplicateauthid" -->
  	<div class="problem">
! 		<p>Duplicate suspected with <a href='javascript:openWindow("detail.pl?authid=<!-- TMPL_VAR name="duplicateauthnumber" -->&popup=1", "Duplicate Authority")' class="button authority"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
  		<p>You must either :</p>
  		<ul>
! 			<p><input type="checkbox" value=1 name="confirm_not_duplicate">confirm it's not a duplicate (and click on Add Auth again)</p>
  			<p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >original authority</a></p>
  		</ul>
--- 25,32 ----
  <!-- TMPL_IF name="duplicateauthid" -->
  	<div class="problem">
! 		<p>Duplicate suspected with <a href='javascript:openWindow("detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&popup=1", "Duplicate Authority")' class="button authority"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
  		<p>You must either :</p>
  		<ul>
! 			<p><input type="checkbox" value=1 name="confirm_not_duplicate">confirm it's not a duplicate (and click on <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority"> again)</p>
  			<p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >original authority</a></p>
  		</ul>
***************
*** 30,43 ****
  <!-- /TMPL_IF -->
  
- <!-- TMPL_IF name="duplicateauthnumber" -->
- 	<div class="problem">
- 		<p>Duplicate suspected with <a href='javascript:openWindow("detail.pl?authid=<!-- TMPL_VAR name="duplicateauthnumber" -->&popup=1", "Duplicate Authority")' class="button authority"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
- 		<p>You must either :</p>
- 		<ul>
- 			<p><input type="checkbox" value=1 name="confirm_not_duplicate">confirm it's not a duplicate (and click on Add Auth again)</p>
- 			<p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >edit items</a> from this duplicate Authority</p>
- 		</ul>
- 	</div>
- <!-- /TMPL_IF -->
  <!-- TMPL_LOOP NAME="0XX" -->
  	<!-- TMPL_IF name="tag" -->
--- 34,37 ----
***************
*** 185,190 ****
  
  function AddField(field) {
! 	document.forms[0].op.value = "addfield";
! 	document.forms[0].addfield_field.value=field;
  	document.f.submit();
  }
--- 179,184 ----
  
  function AddField(field) {
! 	document.forms[1].op.value = "addfield";
! 	document.forms[1].addfield_field.value=field;
  	document.f.submit();
  }

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** detail.tmpl	4 May 2005 08:52:51 -0000	1.4
--- detail.tmpl	20 Jun 2005 14:17:04 -0000	1.5
***************
*** 2,6 ****
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1 class="authority">Authority number : <!-- TMPL_VAR NAME="authid" --></h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
--- 2,6 ----
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1 class="authority">Authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">




From tipaul at users.sourceforge.net  Mon Jun 20 16:17:51 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:17:51 -0700
Subject: [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
Message-ID: <E1DkN5z-0001VY-6o@sc8-pr-cvs1.sourceforge.net>

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>
  




From tipaul at users.sourceforge.net  Mon Jun 20 16:18:44 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:18:44 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ branchtransfers.tmpl,1.12,1.13 circulation.tmpl,1.37,1.38 selectbranchprinter.tmpl,1.6,1.7
Message-ID: <E1DkN6q-0001gB-5T@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	branchtransfers.tmpl circulation.tmpl selectbranchprinter.tmpl 
Log Message:
synch'ing 2.2 and head

Index: branchtransfers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** branchtransfers.tmpl	5 Nov 2004 10:18:24 -0000	1.12
--- branchtransfers.tmpl	20 Jun 2005 14:18:41 -0000	1.13
***************
*** 1,15 ****
  <!-- TMPL_INCLUDE Name="circulation-top.inc" -->
  <div id="mainbloc">
- <div class="bloc25">
- <a class="button" href="circulation.pl">
- Next Borrower</a>
- <a class="button" href="returns.pl">
- Returns</a>
- </div>
  
! <h1>Circulation: Transfers</h1>
  <b>Branch:</b> <!-- TMPL_VAR NAME="genbrname" --> &nbsp;
  <b>Printer:</b> <!-- TMPL_VAR NAME="genprname" -->
! <a href="selectbranchprinter.pl" class="button">Change Settings</a>
  <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
  <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
--- 1,9 ----
  <!-- TMPL_INCLUDE Name="circulation-top.inc" -->
  <div id="mainbloc">
  
! <h1 class="circulation">Circulation: Transfers</h1>
  <b>Branch:</b> <!-- TMPL_VAR NAME="genbrname" --> &nbsp;
  <b>Printer:</b> <!-- TMPL_VAR NAME="genprname" -->
! <a href="selectbranchprinter.pl" class="button circulation">Change Settings</a>
  <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
  <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
***************
*** 17,21 ****
  <!-- TMPL_IF Name="found" -->
  	<table>
! 	<tr><th>Reserve Found</th></tr>
  	<tr><td>
  	<!-- TMPL_IF Name="reserved" -->
--- 11,15 ----
  <!-- TMPL_IF Name="found" -->
  	<table>
! 	<tr><th class="circulation">Reserve Found</th></tr>
  	<tr><td>
  	<!-- TMPL_IF Name="reserved" -->
***************
*** 38,45 ****
  				<!-- TMPL_IF Name="waiting" --><input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
  					<input type="hidden" name="request" value="KillWaiting">
! 					<input type="submit" value="Cancel" class="button">
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF Name="reserved" --><input type="hidden" name="request" value="SetWaiting">
! 					<input type="submit" value="Waiting" class="button"><!-- /TMPL_IF -->
  			</form></p>
  
--- 32,39 ----
  				<!-- TMPL_IF Name="waiting" --><input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
  					<input type="hidden" name="request" value="KillWaiting">
! 					<input type="submit" value="Cancel" class="button circulation">
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF Name="reserved" --><input type="hidden" name="request" value="SetWaiting">
! 					<input type="submit" value="Waiting" class="button circulation"><!-- /TMPL_IF -->
  			</form></p>
  
***************
*** 58,62 ****
  			<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
  			<input type="hidden" name="request" value="KillReserved">
! 			<input type="submit" value="Cancel" class="button">
  			</form></p>
  		<!-- /TMPL_IF -->
--- 52,56 ----
  			<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
  			<input type="hidden" name="request" value="KillReserved">
! 			<input type="submit" value="Cancel" class="button circulation">
  			</form></p>
  		<!-- /TMPL_IF -->
***************
*** 70,74 ****
  				<input type="hidden" name="tb-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="tobrcd" -->">
  			<!-- /TMPL_LOOP -->
! 			<input type="submit" value="Ignore" class="button">
  			</form></p>
  
--- 64,68 ----
  				<input type="hidden" name="tb-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="tobrcd" -->">
  			<!-- /TMPL_LOOP -->
! 			<input type="submit" value="Ignore" class="button circulation">
  			</form></p>
  
***************
*** 77,81 ****
  <!-- TMPL_ELSE -->
  	<table>
! 	<tr><th>Messages</th></tr>
  	<tr><td>
  	<!-- TMPL_IF Name="reqmessage" -->
--- 71,75 ----
  <!-- TMPL_ELSE -->
  	<table>
! 	<tr><th class="circulation">Messages</th></tr>
  	<tr><td>
  	<!-- TMPL_IF Name="reqmessage" -->
***************
*** 125,130 ****
  		<p>
  		<table border="1" cellpadding="5" cellspacing="0" bgcolor="#dddddd">
! 		<tr><th colspan="6">Transfered Items</th></tr>
! 		<tr><th>Barcode</th><th>Title</th><th>Author</th><th>Type</th><th>From</th><th>To</th></tr>
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td align="center" bgcolor="<!-- TMPL_VAR NAME="color" -->">
--- 119,124 ----
  		<p>
  		<table border="1" cellpadding="5" cellspacing="0" bgcolor="#dddddd">
! 		<tr><th colspan="6" class="circulation">Transfered Items</th></tr>
! 		<tr><th class="circulation">Barcode</th><th class="circulation">Title</th><th class="circulation">Author</th><th class="circulation">Type</th><th class="circulation">From</th><th class="circulation">To</th></tr>
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td align="center" bgcolor="<!-- TMPL_VAR NAME="color" -->">
***************
*** 140,143 ****
--- 134,143 ----
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
+ <div class="bloc25">
+ <a class="button circulation" href="circulation.pl">
+ Next Borrower</a>
+ <a class="button circulation" href="returns.pl">
+ Returns</a>
+ </div>
  
  </div>

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** circulation.tmpl	4 May 2005 08:52:53 -0000	1.37
--- circulation.tmpl	20 Jun 2005 14:18:41 -0000	1.38
***************
*** 184,187 ****
--- 184,190 ----
  				<p class="problem">No more renewals possible</p>
  			<!-- /TMPL_IF -->
+ 			<!-- TMPL_IF NAME="EXPIRED" -->
+ 				<p class="problem">Borrower card expired</p>
+ 			<!-- /TMPL_IF -->
  			<br/>
  		<!-- /TMPL_IF -->

Index: selectbranchprinter.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/selectbranchprinter.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** selectbranchprinter.tmpl	19 Jul 2004 19:58:38 -0000	1.6
--- selectbranchprinter.tmpl	20 Jun 2005 14:18:41 -0000	1.7
***************
*** 2,6 ****
  
  <div id="mainbloc">
! <h1>Circulation: Select Printer and Branch Settings</h1>
  
  <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
--- 2,6 ----
  
  <div id="mainbloc">
! <h1 class="circulation">Circulation: Select Printer and Branch Settings</h1>
  
  <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
***************
*** 30,34 ****
  <!-- /TMPL_IF --></p>
  <p><input type="hidden" name="setcookies" value="1">
! <input type="submit" value="Submit" type="changesettings" class="button"></p>
  </form>
  
--- 30,34 ----
  <!-- /TMPL_IF --></p>
  <p><input type="hidden" name="setcookies" value="1">
! <input type="submit" value="Submit" type="changesettings" class="button circulation"></p>
  </form>
  




From tipaul at users.sourceforge.net  Mon Jun 20 16:18:57 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:18:57 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/circ circulation.tmpl,1.1,1.2 returns.tmpl,1.1,1.2
Message-ID: <E1DkN73-0001hW-R5@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	circulation.tmpl returns.tmpl 
Log Message:
synch'ing 2.2 and head






From tipaul at users.sourceforge.net  Mon Jun 20 16:18:57 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:18:57 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/admin marc_subfields_structure.tmpl,1.1,1.2
Message-ID: <E1DkN73-0001hV-QF@sc8-pr-cvs1.sourceforge.net>

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

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

Index: marc_subfields_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** marc_subfields_structure.tmpl	19 Nov 2004 15:13:11 -0000	1.1
--- marc_subfields_structure.tmpl	20 Jun 2005 14:18:55 -0000	1.2
***************
*** 21,25 ****
  <li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
  <li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
! <li>link : useless for instance</li>
  </ul>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- 21,30 ----
  <li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
  <li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
! <li>link : If you enter a field/subfield here (200b), a little glass appears after the subfield. If the user clic on the glass, a search is done on the DB for the field/subfield with the same value. Can be used for 2 main topic : 
! 	<ul>
! 		<li>on a field like author (200f in UNIMARC), put 200f here, you will be able to see all biblios with the same author</li>
! 		<li>on a field that is a link (4xx) to reach another biblio. For example, put 011a in 464$x, will find the serial that was previously with this issn. With the 4xx pligin, you get a powerful tool to manage biblios connected to biblios</li>
! 	</ul>
! </li>
  </ul>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->




From tipaul at users.sourceforge.net  Mon Jun 20 16:18:57 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:18:57 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/export marc.tmpl,1.1,1.2
Message-ID: <E1DkN73-0001hY-SB@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	marc.tmpl 
Log Message:
synch'ing 2.2 and head





From tipaul at users.sourceforge.net  Mon Jun 20 16:19:53 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:19:53 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes/calendar calendar.js,1.1,1.2 calendar-setup.js,1.1,1.2
Message-ID: <E1DkN7x-0001vc-2U@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	calendar.js calendar-setup.js 
Log Message:
synch'ing 2.2 and head






From tipaul at users.sourceforge.net  Mon Jun 20 16:19:53 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:19:53 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes acquisitions-top.inc,1.26,1.27 common-print.css,1.1,1.2 common-style.css,1.35,1.36 intranet-main.css,1.4,1.5 marc-top.inc,1.12,1.13
Message-ID: <E1DkN7x-0001w0-IF@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	acquisitions-top.inc common-print.css common-style.css 
	intranet-main.css marc-top.inc 
Log Message:
synch'ing 2.2 and head

Index: acquisitions-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** acquisitions-top.inc	8 Mar 2005 14:15:29 -0000	1.26
--- acquisitions-top.inc	20 Jun 2005 14:19:50 -0000	1.27
***************
*** 6,9 ****
--- 6,19 ----
  <link rel="stylesheet" type="text/css" media="print" href="<!-- TMPL_VAR name="themelang" -->/includes/common-print.css">
  <link rel="stylesheet" type="text/css" media="screen" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
+ <!-- Additions for Calendar-system -->
+ <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
+ <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar.js">
+ </script>
+ <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-en.js">
+ </script>
+ <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-setup.js">
+ </script>
+ <!-- /Additions for Calendar-system -->
+ 
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  <script language="JavaScript" type="text/javascript">

Index: common-print.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/common-print.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** common-print.css	8 Mar 2005 10:37:31 -0000	1.1
--- common-print.css	20 Jun 2005 14:19:50 -0000	1.2
***************
*** 34,36 ****
  {
  	display: block;
! }
\ No newline at end of file
--- 34,38 ----
  {
  	display: block;
! }
! 
! 

Index: common-style.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** common-style.css	20 Jan 2005 18:03:33 -0000	1.35
--- common-style.css	20 Jun 2005 14:19:50 -0000	1.36
***************
*** 75,78 ****
--- 75,79 ----
  	border:0px;
  	border-collapse:collapse;
+ 	font-size:10pt;
  	margin : auto;
  }

Index: intranet-main.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/intranet-main.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** intranet-main.css	30 Jul 2004 14:29:40 -0000	1.4
--- intranet-main.css	20 Jun 2005 14:19:50 -0000	1.5
***************
*** 55,59 ****
  	text-align:center;
  	background-color:#ad11ad;
! 	color: #FFFFFF;
  	text-decoration: normal;
  	font-weight: bold;
--- 55,59 ----
  	text-align:center;
  	background-color:#ad11ad;
! 	color: #000000;
  	text-decoration: normal;
  	font-weight: bold;
***************
*** 84,87 ****
--- 84,106 ----
  }
  
+ h2 {
+ 	margin-top:0px;
+ 	margin-bottom:4px;
+ 	text-align:center;
+ 	padding:0px;
+ 	font-size:125%;
+ 	padding-left:10px;
+ 	padding-right:10px;
+ 	padding-bottom:3px;
+ 	padding-top:3px;
+ }
+ h2.reports{
+ 	text-align:center;
+ 	background-color: #6b7cbe;
+ 	color: #FFFFFF;
+ 	text-decoration: normal;
+ 	font-weight: bold;
+ }
+ 
  h1.circulation{
  	text-align:center;
***************
*** 92,95 ****
--- 111,123 ----
  }
  
+ h1.authority {
+ 	text-align:center;
+ 	background-color: #6b7cbe;
+ 	color:#000000;
+ 	text-decoration: normal;
+ 	font-weight: bold;
+ 	background-image:none;
+ 	}
+ 
  h1.parameters{
  	text-align:center;
***************
*** 121,125 ****
  	cursor: hand;
  	background-color:#ad11ad;
! 	color:#FFFFFF;
  	font-weight: bold;
  	border:1px solid #000000;
--- 149,153 ----
  	cursor: hand;
  	background-color:#ad11ad;
! 	color:#000000;
  	font-weight: bold;
  	border:1px solid #000000;
***************
*** 127,131 ****
  	}
  
! a.members {
  	font-weight: normal;
  	text-decoration: none;
--- 155,167 ----
  	}
  
! .little {
! 	font-weight: normal;
! 	font-size:10pt;
! 	padding:0px 0px 0px 0px;
! 	text-decoration: none;
! 	line-height:100%;
! 	}
! 
! .members {
  	font-weight: normal;
  	text-decoration: none;
***************
*** 135,139 ****
  	line-height:200%;
  	}
! a.members:hover {
  	background-color: #86c268;
  	border:1px solid #000000;
--- 171,175 ----
  	line-height:200%;
  	}
! .members:hover {
  	background-color: #86c268;
  	border:1px solid #000000;
***************
*** 144,148 ****
  	}
  
! a.acquisition {
  	font-weight: normal;
  	text-decoration: none;
--- 180,200 ----
  	}
  
! a.authority {
! 	font-weight: normal;
! 	text-decoration: none;
! 	cursor: hand;
! 	color:#777777;
! 	font-weight: bold;
! 	line-height:200%;
! 	}
! a.authority:hover {
! 	background-color: #6b7cbe;
! 	border:1px solid #000000;
! 	color: #000000;
! 	text-decoration: none;
! 	font-weight: bold;
! 	}
! 
! .acquisition {
  	font-weight: normal;
  	text-decoration: none;
***************
*** 152,156 ****
  	line-height:200%;
  	}
! a.acquisition:hover {
  	background-color: #ffdf61;
  	border:1px solid #000000;
--- 204,208 ----
  	line-height:200%;
  	}
! .acquisition:hover {
  	background-color: #ffdf61;
  	border:1px solid #000000;
***************
*** 169,172 ****
--- 221,225 ----
  	line-height:200%;
  	}
+ 
  a.reports:hover {
  	background-color: #6b7cbe;
***************
*** 178,182 ****
  	}
  
! a.circulation {
  	font-weight: normal;
  	text-decoration: none;
--- 231,235 ----
  	}
  
! .circulation {
  	font-weight: normal;
  	text-decoration: none;
***************
*** 186,190 ****
  	line-height:200%;
  	}
! a.circulation:hover {
  	background-color: #be6170;
  	border:1px solid #000000;
--- 239,243 ----
  	line-height:200%;
  	}
! .circulation:hover {
  	background-color: #be6170;
  	border:1px solid #000000;
***************
*** 262,263 ****
--- 315,323 ----
  	padding:0px;
  }
+ 
+ #bloc25, .bloc25 {
+ 	float:left;
+ 	border:1px solid #000000;
+ 	margin:0px;
+ 	padding:0px;
+ }

Index: marc-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** marc-top.inc	2 Dec 2004 16:43:28 -0000	1.12
--- marc-top.inc	20 Jun 2005 14:19:50 -0000	1.13
***************
*** 62,67 ****
  <!-- /TMPL_UNLESS -->
  <!-- TMPL_IF NAME="loggedinusername" -->
!     <p align="left">Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
  <!-- TMPL_ELSE -->
!     <p align="left"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
  <!-- /TMPL_IF -->
--- 62,67 ----
  <!-- /TMPL_UNLESS -->
  <!-- TMPL_IF NAME="loggedinusername" -->
!     <p> Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
  <!-- TMPL_ELSE -->
!     <p><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
  <!-- /TMPL_IF -->




From tipaul at users.sourceforge.net  Mon Jun 20 16:20:08 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:20:08 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members memberentry.tmpl,1.35,1.36 pay.tmpl,1.8,1.9
Message-ID: <E1DkN8C-00021G-0u@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	memberentry.tmpl pay.tmpl 
Log Message:
synch'ing 2.2 and head

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** memberentry.tmpl	4 May 2005 08:59:59 -0000	1.35
--- memberentry.tmpl	20 Jun 2005 14:20:05 -0000	1.36
***************
*** 40,45 ****
  	<!-- /TMPL_IF -->
  	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
- 		<input type="hidden" name="joining" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
- 		<input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="expiry" -->">
  		<input type="hidden" name="type" value="borrowers">
  		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
--- 40,43 ----
***************
*** 239,242 ****
--- 237,251 ----
  			</tr>
  			<tr>
+ 				<!-- TMPL_IF NAME="addAction" -->
+ 					<td>Joining date (leave blank for today)</td>
+ 					<td><input type="text" name="joining" size="12" maxlength="10" value="<!-- TMPL_VAR name="joining" -->"></td>
+ 				<!-- TMPL_ELSE -->
+ 					<td>Joining date</td>
+ 					<td><!-- TMPL_VAR name="joining" --></td>
+ 				<!-- /TMPL_IF -->
+ 				<td>Expiry date (leave blank for auto calc)</td>
+ 				<td><input type="text" name="expiry" size="12" maxlength="10" value="<!-- TMPL_VAR name="expiry" -->"></td>
+ 			</tr>
+ 			<tr>
  				<td>Borrower message (appears in OPAC)</td>
  				<td colspan="4"><textarea name="textmessaging" cols="70" rows="3"><!-- TMPL_VAR NAME="textmessaging" --></textarea></td>

Index: pay.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/pay.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** pay.tmpl	19 Jul 2004 20:33:52 -0000	1.8
--- pay.tmpl	20 Jun 2005 14:20:05 -0000	1.9
***************
*** 3,24 ****
  <h1>Pay Fines for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
  
! 	<form action="/cgi-bin/koha/pay.pl" method="post">
! <table cellspacing="0" cellpadding="5" border="1">
! <tr valign="top">
! 	<td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan="4"><b>FINES &amp; CHARGES</b></td>
! 	<td bgcolor="#99cc33" background="/images/background-mem.gif" colspan="4"><b>AMOUNT OWING</b></td>
  </tr>
  	
  <!-- TMPL_LOOP NAME="loop_pay" -->
! <tr valign="top">
! 	<td><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->"><input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="no" checked="checked">Unpaid
! 	<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="yes">Pay
! 	<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="wo">Writeoff
! 	<input type="hidden" name="itemnumber<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="itemnumber" -->">
! 	<input type="hidden" name="accounttype<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="accounttype" -->">
! 	<input type="hidden" name="amount<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="amount'}" -->">
! 	<input type="hidden" name="out<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="amountoutstanding" -->">
! 	<input type="hidden" name="bornum<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="bornum" -->">
! 	<input type="hidden" name="accountno<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="accountno" -->">
  	</td>
  	<td><!-- TMPL_VAR NAME="description" --> <!-- TMPL_VAR NAME="title" --></td>
--- 3,26 ----
  <h1>Pay Fines for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
  
! <form action="/cgi-bin/koha/pay.pl" method="post">
! <table>
! <tr>
! 	<th colspan="3">FINES &amp; CHARGES</th>
! 	<th colspan="2">AMOUNT OWING</th>
  </tr>
  	
  <!-- TMPL_LOOP NAME="loop_pay" -->
! <tr>
! 	<td>
! 		<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
! 		<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="no" checked="checked">Unpaid
! 		<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="yes">Pay
! 		<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="wo">Writeoff
! 		<input type="hidden" name="itemnumber<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="itemnumber" -->">
! 		<input type="hidden" name="accounttype<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="accounttype" -->">
! 		<input type="hidden" name="amount<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="amount'}" -->">
! 		<input type="hidden" name="out<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="amountoutstanding" -->">
! 		<input type="hidden" name="bornum<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="bornum" -->">
! 		<input type="hidden" name="accountno<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="accountno" -->">
  	</td>
  	<td><!-- TMPL_VAR NAME="description" --> <!-- TMPL_VAR NAME="title" --></td>
***************
*** 29,36 ****
  <!-- /TMPL_LOOP -->
  <tr valign="top">
! 	<td colspan="4" align="right"><b>Total Due</b></td>
! 	<td><b><!-- TMPL_VAR NAME="total" --></b></td>
! 	</tr>
! 	<tr valign="top">
  	<td colspan="5" align="right">
  	<input type="submit" name="submit"  value="Pay" class="button"></td>
--- 31,38 ----
  <!-- /TMPL_LOOP -->
  <tr valign="top">
! 	<th colspan="4" align="right">Total Due</th>
! 	<th><!-- TMPL_VAR NAME="total" --></th>
! </tr>
! <tr>
  	<td colspan="5" align="right">
  	<input type="submit" name="submit"  value="Pay" class="button"></td>
***************
*** 39,43 ****
  </form>
  
! <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Return</a> to Member Record
  </div>
  <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
--- 41,45 ----
  </form>
  
! <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" class="button member">Return to Member Record </a>
  </div>
  <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->




From tipaul at users.sourceforge.net  Mon Jun 20 16:21:04 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:21:04 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters admin-home.tmpl,1.36,1.37 checkmarc.tmpl,1.10,1.11 marc_subfields_structure.tmpl,1.41,1.42 marctagstructure.tmpl,1.29,1.30 printers.tmpl,1.12,1.13 z3950servers.tmpl,1.16,1.17
Message-ID: <E1DkN96-0002A8-D8@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	admin-home.tmpl checkmarc.tmpl marc_subfields_structure.tmpl 
	marctagstructure.tmpl printers.tmpl z3950servers.tmpl 
Log Message:
synch'ing 2.2 and head

Index: admin-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** admin-home.tmpl	1 Jun 2005 21:41:03 -0000	1.36
--- admin-home.tmpl	20 Jun 2005 14:21:01 -0000	1.37
***************
*** 36,54 ****
  		</tr>
  
-     <tr>
-       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/itemtypecategory.pl"> Item categories</a></td>
-       <td>Define item categories. (Non-Fiction, Fiction, Non-Fiction and Fiction...)</td>
-     </tr>
- 
-     <tr>
-       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/itemtypesubcategory.pl"> Item subcategories</a></td>
-       <td>Define item Subcategories. (Junior Fiction, Junior Non fiction.... Adult Fiction.)</td>
-     </tr>
- 
-     <tr>
-       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/mediatype.pl"> Item mediatypes</a></td>
-       <td>Define item mediatypes. (CD, Video, Book, Game...)</td>
-     </tr>
- 
  		<tr>
  			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/categorie.pl">Borrower categories</a></td>
--- 36,39 ----

Index: checkmarc.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** checkmarc.tmpl	19 Jul 2004 19:20:29 -0000	1.10
--- checkmarc.tmpl	20 Jun 2005 14:21:01 -0000	1.11
***************
*** 36,39 ****
--- 36,51 ----
  	<!-- /TMPL_IF -->
  	<!-- -------------------------------------------------------------------------------------------------------- -->
+ 	<!-- TMPL_IF NAME="itemtags" -->
+ 		<tr>
+ 			<td><b>Item tag</b></td>
+ 			<td>There is more than 1 MARC tag related to items tab (10) : <!-- TMPL_VAR name="itemtags" --></td>
+ 		</tr>
+ 	<!-- TMPL_ELSE -->
+ 		<tr>
+ 			<td>OK</td>
+ 			<td><i>Only 1 marc tag mapped to items</i></td>
+ 		</tr>
+ 	<!-- /TMPL_IF -->
+ 	<!-- -------------------------------------------------------------------------------------------------------- -->
  	<!-- TMPL_IF NAME="itemtypes_empty" -->
  		<tr>
***************
*** 117,120 ****
--- 129,147 ----
  	<!-- /TMPL_IF -->
  	<!-- -------------------------------------------------------------------------------------------------------- -->
+ 	<!-- TMPL_IF NAME="frameworknull" -->
+ 		<tr>
+ 			<td><b>framework values</b></td>
+ 			<td>there is a null value in a frameworkcode. Check the following tables<br/>
+ 				<li>select * from marc_subfield_structure where frameworkcode is NULL</li>
+ 				<li>select * from marc_tag_structure where frameworkcode is NULL</li>
+ 				<li>select * from marc_biblio where frameworkcode is NULL</li></td>
+ 		</tr>
+ 	<!-- TMPL_ELSE -->
+ 		<tr>
+ 			<td>OK</td>
+ 			<td><i>no NULL value in frameworkcode</i></td>
+ 		</tr>
+ 	<!-- /TMPL_IF -->
+ 	<!-- -------------------------------------------------------------------------------------------------------- -->
  	<!-- TMPL_IF NAME="total" -->
  		<tr>

Index: marc_subfields_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** marc_subfields_structure.tmpl	1 Mar 2005 13:40:55 -0000	1.41
--- marc_subfields_structure.tmpl	20 Jun 2005 14:21:01 -0000	1.42
***************
*** 1,4 ****
- <!-- clarification needed about this page. many questions... what is Lib? a Library? -->
- 
  <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
  
--- 1,2 ----
***************
*** 8,12 ****
  	<h1>
  	<!-- TMPL_IF NAME="use-heading-flags-p" -->
! 	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit MARC subfields constraints<!-- /TMPL_IF -->
  	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
  	</h1>
--- 6,10 ----
  	<h1>
  	<!-- TMPL_IF NAME="use-heading-flags-p" -->
! 	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit MARC subfields constraints for framework <!-- TMPL_IF name="frameworkcode" --><!-- TMPL_VAR NAME="frameworkcode" --><!-- TMPL_ELSE -->default<!-- /TMPL_IF --><!-- /TMPL_IF -->
  	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
  	</h1>
***************
*** 20,50 ****
  			<h2 class="parameters">Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
  			<h3>MARC constraints</h3>
! 			<p>
! 				<label>&nbsp;</label><!-- TMPL_VAR NAME="repeatable" --> repeatable 
! 				<!-- TMPL_VAR NAME="mandatory" --> mandatory
! 			</p>
! 			<p>
! 				<label>&nbsp;</label>
! 				<label>Search also</label><input type="text" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size=20> (example for 200a : '200c','200d','200e'...)
! 			</p>
! 			<p><label>&nbsp;</label><label>Koha link:</label> <!-- TMPL_VAR NAME="kohafield" --></p>
  			<h3>Editor constaints</h3>
! 			<p> <label>&nbsp;</label>
! 				<label>Text for librarian</label>
! 				<input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80">
! 			</p>
! 			<p>
! 				<label>&nbsp;</label>
! 				<label>Text for OPAC</label> <input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80">
! 			</p>
! 			<p><label>&nbsp;</label><label>Managed in tab</label> <!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT managed by Koha)</p>
! 			<p><label>&nbsp;</label><!-- TMPL_VAR NAME="hidden" --> hidden (subfield is managed, but hidden. -should be filled by a plugin or thesaurus-)</p>
! 			<p><label>&nbsp;</label><!-- TMPL_VAR NAME="isurl" --> URL (if checked, it means that the subfield is an URL and can be clicked</p>
! 			<p>
! 				<label>&nbsp;</label><label>Auth value:</label> <!-- TMPL_VAR NAME="authorised_value" -->
! 				or thesaurus: <!-- TMPL_VAR NAME="authtypes" -->
! 				or plugin: <!-- TMPL_VAR NAME="value_builder" -->
! 				or link: <input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5"> (exemple :200b)
! 			</p>
  		</td>
  		</tr>
--- 18,54 ----
  			<h2 class="parameters">Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
  			<h3>MARC constraints</h3>
! 			<ul>
! 				<p>
! 					<!-- TMPL_VAR NAME="repeatable" --> repeatable 
! 					<!-- TMPL_VAR NAME="mandatory" --> mandatory
! 				</p>
! 				<!-- TMPL_IF name="frameworkcode" -->
! 					<p>Search also: <i>(meaningful only for default framework)</i></p>
! 				<!-- TMPL_ELSE -->
! 					<p>
! 						Search also: <input type="text" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size=20> (example for 200a : '200c','200d','200e'...)
! 					</p>
! 				<!-- /TMPL_IF -->
! 				<p>Koha link:<!-- TMPL_VAR NAME="kohafield" --></p>
! 			</ul>
  			<h3>Editor constaints</h3>
! 			<ul>
! 				<p>Text for librarian: <input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80">
! 				</p>
! 				<p>Text for OPAC: <input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80">
! 				</p>
! 				<p>Managed in tab<!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT managed by Koha)</p>
! 				<p><!-- TMPL_VAR NAME="hidden" --> hidden (subfield is managed, but hidden. -should be filled by a plugin or thesaurus-)</p>
! 				<p><!-- TMPL_VAR NAME="isurl" --> URL (if checked, it means that the subfield is an URL and can be clicked</p>
! 				<p>
! 					<label>Auth value:</label> <!-- TMPL_VAR NAME="authorised_value" -->
! 					or thesaurus: <!-- TMPL_VAR NAME="authtypes" -->
! 					or plugin: <!-- TMPL_VAR NAME="value_builder" -->
! 				</p>
! 				<p>
! 					<label>&nbsp;</label>Link to field :
! 					<input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5"> (exemple :200b)
! 				</p>
! 			</ul>
  		</td>
  		</tr>
***************
*** 52,61 ****
  	</table>
  	<input type="submit" value="OK">
- 	<p>Note: in the last column, you can choose:
- 	<ul><li>An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table.</li>
- 	<li>A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table.</li>
- 	<li>A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically.</li>
- 	</ul>
- 	</p>
  	</form>
  <!-- /TMPL_IF -->
--- 56,59 ----

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** marctagstructure.tmpl	14 Apr 2005 14:15:01 -0000	1.29
--- marctagstructure.tmpl	20 Jun 2005 14:21:01 -0000	1.30
***************
*** 112,155 ****
  	</form>
  <!-- /TMPL_IF -->
- 
  <!-- ------------------------------------------------------------------------ -->
  <!-- TMPL_IF NAME="else" -->
! <div id="bloc25">
! <h2 class="parameters">Select a framework</h2>
! <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 	<select name="frameworkcode">
! 		<option value="">Default</option>
! 	<!-- TMPL_LOOP NAME="frameworkloop" -->
! 		<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="frameworktext" --></option>
! 	<!-- /TMPL_LOOP -->
! 	</select>
! 	<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 	<input type="submit" value="OK" class="button">
! </form>
! <b>NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script.</b>
! </div>
! <div id="bloc100">
  	<table>
! 	<tr>
! 		<th>Tag</th>
! 		<th>Lib</th>
! 		<th>Repeatable</th>
! 		<th>Mandatory</th>
! 		<th>Authorised<br />value</th>
! 		<th>Subfields</th>
! 		<th>Edit</th>
! 		<th>Delete</th>
! 	<!-- TMPL_LOOP NAME="loop" -->
! 	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
! 		<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
! 		<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 		<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 		<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 		<td><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->" class="button">subfields</a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkdcode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 	</tr>
! 	<!-- /TMPL_LOOP -->
  	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<input type="hidden" name="op" value="add_form">
--- 112,186 ----
  	</form>
  <!-- /TMPL_IF -->
  <!-- ------------------------------------------------------------------------ -->
  <!-- TMPL_IF NAME="else" -->
! 	<div id="bloc25">
! 	<h2 class="parameters">Select a framework</h2>
! 	<form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 		<select name="frameworkcode">
! 			<option value="">Default</option>
! 		<!-- TMPL_LOOP NAME="frameworkloop" -->
! 			<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="frameworktext" --></option>
! 		<!-- /TMPL_LOOP -->
! 		</select>
! 		<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 		<input type="submit" value="OK" class="button">
! 		<p>
! 		<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True" <!-- TMPL_IF Name="select_display"-->checked<!--/TMPL_IF -->  OnChange="javascript:document.f.submit()">
! 		</p>
! 	</form>
! 	<b>NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script.</b>
! 	</div>
! 	<div id="bloc100">
  	<table>
! 		<tr>
! 			<th>Tag</th>
! 			<th>Lib</th>
! 			<th>Repeatable</th>
! 			<th>Mandatory</th>
! 			<th>Authorised<br />value</th>
! 			<th>Subfields</th>
! 			<th>Edit</th>
! 			<th>Delete</th>
! 		<tr>
! 	<!-- TMPL_IF NAME="select_display" -->
! 		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr class="hilighted">
! 			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
! 			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
! 			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
! 			<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 			<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 		</tr>
! 		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 			<td>
! 				&nbsp;
! 			</td>
! 			<td colspan=7 border=0>
! 				<!-- TMPL_LOOP NAME="subfields" -->
! 					<p><label>&nbsp;</label>
! 							Tab:<!-- TMPL_VAR NAME="tab" --> | $<!-- TMPL_VAR NAME="tagsubfield" -->
! 							<!-- TMPL_VAR NAME="liblibrarian" --> <!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!--/TMPL_IF --><!-- TMPL_IF NAME="repeatable" -->, repeatable<!-- /TMPL_IF --><!-- TMPL_IF NAME="mandatory" -->, Mandatory<!-- /TMPL_IF --><!-- TMPL_IF NAME="seealso" -->, See <!-- TMPL_VAR name="seealso" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authorised_value" -->, <!-- TMPL_VAR NAME="authorised_value" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authtypecode" -->, <!-- TMPL_VAR NAME="authtypecode" --><!--/TMPL_IF --><!-- TMPL_IF NAME="value_builder" -->, <!-- TMPL_VAR NAME="value_builder" --><!--/TMPL_IF -->
! 					</p>
! 				<!-- /TMPL_LOOP -->
! 			</td>
! 		</tr>
! 		<!-- /TMPL_LOOP -->
! 	<!-- TMPL_ELSE -->
! 		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
! 			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
! 			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
! 			<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 			<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 		</tr>
! 		<!-- /TMPL_LOOP -->
! 	<!--/TMPL_IF -->
  	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<input type="hidden" name="op" value="add_form">
***************
*** 160,175 ****
  		<input type="submit" class="button" value="Add Tag" title="Add Tag" alt="Add Tag" >
  		<!-- TMPL_IF NAME="isprevpage" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">
  			<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0">
  			</a>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="nextpage" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">
  				<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0">
  			</a>
  		<!-- /TMPL_IF -->
! 	</form>
  </div>
  <!-- /TMPL_IF -->
  </div>
  <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
--- 191,212 ----
  		<input type="submit" class="button" value="Add Tag" title="Add Tag" alt="Add Tag" >
  		<!-- TMPL_IF NAME="isprevpage" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">
  			<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0">
  			</a>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="nextpage" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">
  				<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0">
  			</a>
  		<!-- /TMPL_IF -->
! </form>
! <script language="javascript" type="text/javascript">
! 	function ChangeDisplay(checkbox) {
! 		window.
! 	}
! </script>
  </div>
  <!-- /TMPL_IF -->
+ 
  </div>
  <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: printers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** printers.tmpl	19 Jul 2004 19:20:29 -0000	1.12
--- printers.tmpl	20 Jun 2005 14:21:01 -0000	1.13
***************
*** 1,205 ****
  <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
  
! <!-- TMPL_IF NAME="add_form" -->
!         <script language="javascript" type="text/javascript">
! 	function _(s) { return s } // dummy function for gettext
!         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
!         function isNotNull(f,noalert) {
!                 if (f.value.length ==0) {
!    return false;
!                 }
!                 return true;
!         }
!         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
!         function toUC(f) {
!                 var x=f.value.toUpperCase();
!                 f.value=x;
!                 return true;
!         }
!         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
!         function isNum(v,maybenull) {
!         var n = new Number(v.value);
!         if (isNaN(n)) {
!                 return false;
!                 }
!         if (maybenull==0 && v.value=='') {
!                 return false;
!         }
!         return true;
!         }
!         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
!         function isDate(f) {
!                 var t = Date.parse(f.value);
!                 if (isNaN(t)) {
!                         return false;
!                 }
!         }
!         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
!         function Check(f) {
!                 var ok=1;
!                 var _alertString="";
!                 var alertString2;
!                 if (f.printername.value.length==0) {
!                         _alertString += "\n- " + _("printer name missing");
!                 }
!                 if (f.printqueue.value.length==0) {
!                         _alertString += "\n- " + _("Queue missing");
!                 }
!                 if (_alertString.length==0) {
!                         document.Aform.submit();
!                 } else {
!                         alertString2  = _("Form not submitted because of the following problem(s)");
!                         alertString2 += "\n------------------------------------------------------------------------------------\n";
!                         alertString2 += _alertString;
!                         alert(alertString2);
!                 }
!         }
!         </script>
! 
! 	<!-- TMPL_IF NAME="searchfield" -->
! 		<h1>Modify printer</h1>
! 	<!-- TMPL_ELSE -->
! 		<h1>Add printer</h1>
  	<!-- /TMPL_IF -->
! 
!         <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
!         <input type="hidden" name="op" value="add_validate">
!         
! 
! 	<table>
! 
! 	<!-- TMPL_IF NAME="searchfield" -->
! 		<tr>
! 			<td>Printer Name</td>
! 			<td>
! 				<input type="hidden" name="printername" value="<!-- TMPL_VAR NAME="searchfield" -->"><!-- TMPL_VAR NAME="searchfield" -->
! 			</td>
! 		</tr>
! 	<!-- TMPL_ELSE -->
! 		<tr>
! 			<td>Printer Name</td>
! 			<td>
! 				<input type="text" name="printername" size="50" maxlength="50">
! 			</td>
! 		</tr>
  	<!-- /TMPL_IF -->
! 
!         	<tr>
! 			<td>Queue</td>
! 			<td><input type="text" name="printqueue" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printqueue" -->"> </td>
! 		</tr>
!         	<tr>
! 			<td>Type</td>
! 			<td><input type="text" name="printtype" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printtype" -->"> </td>
! 		</tr>
!         	<tr>
! 			<td> </td>
! 			<td><input type="button" value="OK" onclick="Check(this.form)"></td>
! 		</tr>
!         </table>
!         </form>
! 
! <!-- /TMPL_IF -->
! 
! <!-- TMPL_IF NAME="add_validate" -->
! 	Data recorded
!         <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
!         <input type="submit" value="OK">
!         </form>
! <!-- /TMPL_IF -->
! 
! <!-- TMPL_IF NAME="delete_confirm" -->
! 	<table border="0" cellspacing="0" cellpadding="5">
! 		<tr bgcolor="#99cc33">
! 			<td background="/images/background-mem.gif"><b>Printer</b></td>
! 			<td background="/images/background-mem.gif"><b><!-- TMPL_VAR NAME="searchfield" --></b></td>
! 		</tr>
! 
!         	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 			<input type="hidden" name="op" value="delete_confirmed">
! 			<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
!         
! 		<tr>
! 			<td>Queue</td>
! 			<td><!-- TMPL_VAR NAME="printqueue" --></td>
! 		</tr>
!         	<tr>
! 			<td>Type</td>
! 			<td><!-- TMPL_VAR NAME="printtype" --></td>
! 		</tr>
!         	<tr>
! 			<td colspan="2" align="center">CONFIRM DELETION</td>
! 		</tr>
!         	<tr>
! 			<td>
! 				<input type="submit" value="YES">
! 				</form>
! 			</td>
! 			<td>
  				<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 				<input type="submit" value="NO">
! 				</form>
! 			</td>
! 		</tr>
! 	</table>
! <!-- /TMPL_IF -->
! 
! <!-- TMPL_IF NAME="delete_confirmed" -->
! 	Data deleted
! 	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 		<input type="submit" value="OK">
! 	</form>
! <!-- /TMPL_IF -->
! 
! <!-- TMPL_IF NAME="else" -->
! 	<h2>Printer admin</h2>
!         <form action="<!-- TMPL_VAR NAME="script_name">" method="post">
!                 <input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
!                 <input type="reset" name="reset" value="clr">
!         </form>
! 
! 	<!-- TMPL_IF NAME="searchfield" -->
! 		You searched for <b><!-- TMPL_VAR NAME="searchfield" --></b>
  	<!-- /TMPL_IF -->
- 
- 	<table border="0" cellspacing="0" cellpadding="5">
- 		<tr bgcolor="#99cc33">
- 			<td background="/images/background-mem.gif"><b>Name</b></td>
- 			<td background="/images/background-mem.gif"><b>Queue</b></td>
- 			<td background="/images/background-mem.gif"><b>Type</b></td>
- 			<td background="/images/background-mem.gif"> </td>
- 			<td background="/images/background-mem.gif"> </td>
- 		</tr>
- 		<!-- TMPL_LOOP NAME="loop" -->
- 		<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
- 			<td><!-- TMPL_VAR NAME="printername" --></td>
- 			<td><!-- TMPL_VAR NAME="printqueue" --></td>
- 			<td><!-- TMPL_VAR NAME="printtype" --></td>
- 			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->">Edit</a></td>
-                         <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->">Delete</a></td>
- 		</tr>
- 		<!-- /TMPL_LOOP -->
- 	</table>
- 
- 	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-         <input type="hidden" name="op" value="add_form">
  	
! 	<!-- TMPL_IF NAME="offsetgtzero" -->
! 		<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Prev</a>
  	<!-- /TMPL_IF -->
! 
! 	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
! 
! 	<!-- TMPL_IF NAME="ltcount" -->
! 		<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">Next &gt;&gt;</a>	
! 	<!-- /TMPL_iF -->
! 
!         <br>
! 	<input type="submit" class="button" value="Add printer" alt="Add printer">
! 	<br>
!         </form>
! 
! <!-- /TMPL_IF -->
! 
  
  <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
--- 1,181 ----
  <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
  
! <div id="mainbloc">
! 		<h1>Printer admin</h1>
! 	<!-- TMPL_IF NAME="add_form" -->
! 			<script language="javascript" type="text/javascript">
! 		function _(s) { return s } // dummy function for gettext
! 			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
! 			function isNotNull(f,noalert) {
! 					if (f.value.length ==0) {
! 	return false;
! 					}
! 					return true;
! 			}
! 			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
! 			function toUC(f) {
! 					var x=f.value.toUpperCase();
! 					f.value=x;
! 					return true;
! 			}
! 			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
! 			function isNum(v,maybenull) {
! 			var n = new Number(v.value);
! 			if (isNaN(n)) {
! 					return false;
! 					}
! 			if (maybenull==0 && v.value=='') {
! 					return false;
! 			}
! 			return true;
! 			}
! 			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
! 			function isDate(f) {
! 					var t = Date.parse(f.value);
! 					if (isNaN(t)) {
! 							return false;
! 					}
! 			}
! 			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
! 			function Check(f) {
! 					var ok=1;
! 					var _alertString="";
! 					var alertString2;
! 					if (f.printername.value.length==0) {
! 							_alertString += "\n- " + _("printer name missing");
! 					}
! 					if (f.printqueue.value.length==0) {
! 							_alertString += "\n- " + _("Queue missing");
! 					}
! 					if (_alertString.length==0) {
! 							document.Aform.submit();
! 					} else {
! 							alertString2  = _("Form not submitted because of the following problem(s)");
! 							alertString2 += "\n------------------------------------------------------------------------------------\n";
! 							alertString2 += _alertString;
! 							alert(alertString2);
! 					}
! 			}
! 			</script>
! 	<div id="bloc25">
! 		<!-- TMPL_IF NAME="searchfield" -->
! 			<h2 class="parameters">Modify printer</h2>
! 		<!-- TMPL_ELSE -->
! 			<h2 class="parameters">Add printer</h2>
! 		<!-- /TMPL_IF -->
! 	
! 			<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
! 				<input type="hidden" name="op" value="add_validate">
! 				<!-- TMPL_IF NAME="searchfield" -->
! 						<p><label>Printer Name</label><input type="hidden" name="printername" value="<!-- TMPL_VAR NAME="searchfield" -->"><!-- TMPL_VAR NAME="searchfield" --></p>
! 				<!-- TMPL_ELSE -->
! 						<p><label>Printer Name</label><input type="text" name="printername" size="50" maxlength="50"></p>
! 				<!-- /TMPL_IF -->
! 				<p><label>Queue</label><input type="text" name="printqueue" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printqueue" -->"> </p>
! 				<p><label>Type</label><input type="text" name="printtype" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printtype" -->"> </p>
! 				<p><input type="button" value="OK" onclick="Check(this.form)" class="button"></p>
! 			</form>
! 	</div>
  	<!-- /TMPL_IF -->
! 	
! 	<!-- TMPL_IF NAME="add_validate" -->
! 		Data recorded
! 			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 			<input type="submit" value="OK" class="button">
! 			</form>
  	<!-- /TMPL_IF -->
! 	
! 	<!-- TMPL_IF NAME="delete_confirm" -->
! 		<table border="0" cellspacing="0" cellpadding="5">
! 			<tr bgcolor="#99cc33">
! 				<td background="/images/background-mem.gif"><b>Printer</b></td>
! 				<td background="/images/background-mem.gif"><b><!-- TMPL_VAR NAME="searchfield" --></b></td>
! 			</tr>
! 	
  				<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 				<input type="hidden" name="op" value="delete_confirmed">
! 				<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 			
! 			<tr>
! 				<td>Queue</td>
! 				<td><!-- TMPL_VAR NAME="printqueue" --></td>
! 			</tr>
! 				<tr>
! 				<td>Type</td>
! 				<td><!-- TMPL_VAR NAME="printtype" --></td>
! 			</tr>
! 				<tr>
! 				<td colspan="2" align="center">CONFIRM DELETION</td>
! 			</tr>
! 				<tr>
! 				<td>
! 					<input type="submit" value="YES">
! 					</form>
! 				</td>
! 				<td>
! 					<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 					<input type="submit" value="NO">
! 					</form>
! 				</td>
! 			</tr>
! 		</table>
  	<!-- /TMPL_IF -->
  	
! 	<!-- TMPL_IF NAME="delete_confirmed" -->
! 		Data deleted
! 		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 			<input type="submit" value="OK">
! 		</form>
  	<!-- /TMPL_IF -->
! 	
! 	<!-- TMPL_IF NAME="else" -->
! 			<form action="<!-- TMPL_VAR NAME="script_name">" method="post">
! 					<input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 					<input type="reset" name="reset" value="clr">
! 			</form>
! 	
! 		<!-- TMPL_IF NAME="searchfield" -->
! 			You searched for <b><!-- TMPL_VAR NAME="searchfield" --></b>
! 		<!-- /TMPL_IF -->
! 	
! 		<table border="0" cellspacing="0" cellpadding="5">
! 			<tr bgcolor="#99cc33">
! 				<td background="/images/background-mem.gif"><b>Name</b></td>
! 				<td background="/images/background-mem.gif"><b>Queue</b></td>
! 				<td background="/images/background-mem.gif"><b>Type</b></td>
! 				<td background="/images/background-mem.gif"> </td>
! 				<td background="/images/background-mem.gif"> </td>
! 			</tr>
! 			<!-- TMPL_LOOP NAME="loop" -->
! 			<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
! 				<td><!-- TMPL_VAR NAME="printername" --></td>
! 				<td><!-- TMPL_VAR NAME="printqueue" --></td>
! 				<td><!-- TMPL_VAR NAME="printtype" --></td>
! 				<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->" class="button">Edit</a></td>
! 							<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->" class="button">Delete</a></td>
! 			</tr>
! 			<!-- /TMPL_LOOP -->
! 		</table>
! 	
! 		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 			<input type="hidden" name="op" value="add_form">
! 		
! 		<!-- TMPL_IF NAME="offsetgtzero" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Prev</a>
! 		<!-- /TMPL_IF -->
! 	
! 		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
! 	
! 		<!-- TMPL_IF NAME="ltcount" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">Next &gt;&gt;</a>	
! 		<!-- /TMPL_iF -->
! 	
! 			<br>
! 		<input type="submit" class="button" value="Add printer" alt="Add printer">
! 		<br>
! 			</form>
! 	
! 	<!-- /TMPL_IF -->
! </div>
  
  <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: z3950servers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** z3950servers.tmpl	13 Sep 2004 15:31:13 -0000	1.16
--- z3950servers.tmpl	20 Jun 2005 14:21:01 -0000	1.17
***************
*** 214,218 ****
  				</tr>
  				<!-- TMPL_LOOP NAME="loop" -->
! 				<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
  					<td><!-- TMPL_VAR NAME="name" --></td>
  					<td><!-- TMPL_VAR NAME="host" --></td>
--- 214,218 ----
  				</tr>
  				<!-- TMPL_LOOP NAME="loop" -->
! 				<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="hilighted"><!-- /TMPL_IF -->
  					<td><!-- TMPL_VAR NAME="name" --></td>
  					<td><!-- TMPL_VAR NAME="host" --></td>




From tipaul at users.sourceforge.net  Mon Jun 20 16:21:20 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:21:20 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/reports borrowers_out.tmpl,1.1,1.2
Message-ID: <E1DkN9M-0002CM-Vo@sc8-pr-cvs1.sourceforge.net>

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

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

Index: borrowers_out.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/reports/borrowers_out.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** borrowers_out.tmpl	24 Mar 2005 15:19:48 -0000	1.1
--- borrowers_out.tmpl	20 Jun 2005 14:21:18 -0000	1.2
***************
*** 73,76 ****
--- 73,92 ----
  				<td><input type="text" name="Filter" value=""></td>
  			</tr>
+ 			<tr class="hilighted">
+ 				<td>&nbsp;</td>
+ 				<td>&nbsp;</td>
+ 				<td>Without issues since</td>
+ 				<td><input size="10" id="to" name="Filter" value="" type="text">
+ 						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
+ 							<script type="text/javascript">
+ 								Calendar.setup(
+ 									{
+ 										inputField : "to",
+ 										ifFormat : "%Y-%m-%d",
+ 										button : "openCalendarTo",
+ 									}
+ 								);
+ 							</script></td>
+ 			</tr>
  		</tbody>
  	</table>




From tipaul at users.sourceforge.net  Mon Jun 20 16:21:42 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:21:42 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en boraccount.tmpl,1.10,1.11 intranet-main.tmpl,1.25,1.26 mancredit.tmpl,1.3,1.4 maninvoice.tmpl,1.3,1.4
Message-ID: <E1DkN9i-0002EO-QO@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	boraccount.tmpl intranet-main.tmpl mancredit.tmpl 
	maninvoice.tmpl 
Log Message:
synch'ing 2.2 and head

Index: boraccount.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/boraccount.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** boraccount.tmpl	26 Nov 2004 20:32:17 -0000	1.10
--- boraccount.tmpl	20 Jun 2005 14:21:39 -0000	1.11
***************
*** 1,47 ****
  <!-- TMPL_INCLUDE NAME="members-top.inc" -->
! 
! <!-- The manual invoice and credit buttons -->
! 
! <h1>Account for <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a></h1><P>
! <a class="button" href="/cgi-bin/koha/maninvoice.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Create Manual Invoice</a>
! &nbsp;
! <a class="button" href="/cgi-bin/koha/mancredit.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Create Manual Credit</a>
! <center>
! <p>
! 
! <!-- The table with the account items -->
! 
! <table  cellspacing="0"  cellpadding="5" border="1" >
! 
!   <tr valign="top">
!     <td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif" colspan="2"><b>FINES &amp; CHARGES</td>
!     <td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif" colspan="1"><b>AMOUNT</td>
!     <td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif" colspan="1"><b>STILL OWING</td>
!   </tr>
! 
!   <!-- TMPL_LOOP NAME="accounts" -->
! 
!     <tr valign="top">
!       <td><!-- TMPL_VAR NAME="date" --></td>
!       <td><!-- TMPL_VAR NAME="description" --><!-- TMPL_IF NAME="printtitle" --> <!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF --></td>
!       <td><!-- TMPL_VAR NAME="amount" --></td>
!       <td><!-- TMPL_VAR NAME="amountoutstanding" --></td>
!     </tr>
! 
!   <!-- /TMPL_LOOP -->
! 
!   <tr valign="top">
!     <td></td>
!     <td colspan="2"><b>Total Due</b></td>
!     <td><b><!-- TMPL_VAR NAME="total" --></b></td>
!   </tr>
! 
! </table>
! 
! <br clear="all">
! <p> &nbsp; </p>
! 
! <!-- endmenu (member) -->
! 
  <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
  
--- 1,39 ----
  <!-- TMPL_INCLUDE NAME="members-top.inc" -->
! <div id="mainbloc">
! 	<!-- The manual invoice and credit buttons -->
! 	
! 	<h1>Account for <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a></h1><P>
! 	<a class="button" href="/cgi-bin/koha/maninvoice.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Create Manual Invoice</a>
! 	&nbsp;
! 	<a class="button" href="/cgi-bin/koha/mancredit.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Create Manual Credit</a>
! 	<!-- The table with the account items -->
! 	
! 	<table>
! 	
! 	<tr>
! 		<th>FINES &amp; CHARGES</th>
! 		<th>AMOUNT</th>
! 		<th>STILL OWING</th>
! 	</tr>
! 	
! 	<!-- TMPL_LOOP NAME="accounts" -->
! 	
! 		<tr>
! 		<td><!-- TMPL_VAR NAME="date" --> <!-- TMPL_VAR NAME="description" --><!-- TMPL_IF NAME="printtitle" --> <!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF --></td>
! 		<td><!-- TMPL_VAR NAME="amount" --></td>
! 		<td><!-- TMPL_VAR NAME="amountoutstanding" --></td>
! 		</tr>
! 	
! 	<!-- /TMPL_LOOP -->
! 	
! 	<tr>
! 		<th>Total Due</th>
! 		<th colspan="2"><!-- TMPL_VAR NAME="total" --></th>
! 	</tr>
! 	
! 	</table>
! 	
! 	<!-- endmenu (member) -->
! </div>
  <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
  

Index: intranet-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** intranet-main.tmpl	20 Sep 2004 15:25:22 -0000	1.25
--- intranet-main.tmpl	20 Jun 2005 14:21:39 -0000	1.26
***************
*** 43,46 ****
--- 43,55 ----
  			layer.style.visibility = 'hidden';
  		}
+ 		function addauthority() {
+ 			X = document.forms["f"].authtype.value;
+ 			window.location="/cgi-bin/koha/authorities/authorities.pl?authtypecode="+X;
+ 		}
+ 		function searchauthority() {
+ 			X = document.forms["f"].authtype2.value;
+ 			Y = document.forms["f"].value.value;
+ 			window.location="/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&authtypecode="+X+"&value="+Y+"&marclist=&and_or=and&excluding=&operator=contains";
+ 		}
  	</script>
  	<script language="javascript" type="text/javascript">
***************
*** 115,126 ****
  			<h1 class="acquisition">Acquisitions</h1>
  			Order items, receive orders, set budgets...
  		</div>
  		<div id="Hint4" class="hint">
  			<h1 class="reports">Reports</h1>
  			All the system reports
  		</div>
  		<div id="Hint5" class="hint">
! 			<h1 class="reports">Authorities</h1>
  			Authorities management &amp; searches
  		</div>
  		<div id="Hint6" class="hint">
--- 124,204 ----
  			<h1 class="acquisition">Acquisitions</h1>
  			Order items, receive orders, set budgets...
+ 			<form action="/cgi-bin/koha/acqui/order.pl" method="post">
+ 			Supplier name : <input type="text"  size="25"   name="supplier">
+ 			<input type="submit" class="button acquisition" value="OK">
+ 			</form>
+ 			<p>or <a href="histsearch.pl" class="button acquisition">Search order history</a></p>
+ 			
  		</div>
  		<div id="Hint4" class="hint">
  			<h1 class="reports">Reports</h1>
  			All the system reports
+ 			<div id="bloc25">
+ 			<h2 class="reports">Stats</h2>
+ 			<ul>
+ 			<li>on catalogue
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/inventory.pl">Inventory/Stocktaking</a></p>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalogue by itemtype</a></p>
+ 			<li>on issues
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/stats.pl?time=yesterday">Till Reconcipation:</a> Daily Report (yesterday)</p>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/stats.pl?time=today">Till Reconcipation:</a> Daily Report (today)</p>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/overdue.pl">Overdue items</a></p>
+ 			</ul>
+ 			</div>
+ 			<div id="bloc25">
+ 			<h2 class="reports">Stat wizards</h2>
+ 			<table>
+ 			<tr>
+ 			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions</a></td>
+ 			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/borrowers_stats.pl">Borrowers</a></td>
+ 			</tr>
+ 			<tr>
+ 			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/catalogue_stats.pl">Catalogue</a></td>
+ 			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/issues_stats.pl">Circulation</a></td>
+ 			</tr>
+ 			</table>
+ 			</div>
+ 			<div id="bloc25">
+ 			<h2 class="reports">Top Lists</h2>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/bor_issues_top.pl">Most issuing Borrowers</a></p>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/cat_issues_top.pl">Most issued items</a></p>
+ 			</div>
  		</div>
+ 		
  		<div id="Hint5" class="hint">
! 			<h1 class="authority">Authorities</h1>
  			Authorities management &amp; searches
+ 			<form name="f" >
+ 				<h2 >
+ 					<select name="authtype">
+ 					<!-- TMPL_LOOP NAME="authtypesloop" -->
+ 						<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
+ 							<!-- TMPL_VAR NAME="authtypetext" -->
+ 						</option>
+ 					<!-- /TMPL_LOOP -->
+ 					</select>
+ 					<a href="javascript:addauthority()" class="authority">Add Authority</a>
+ 				</h2>
+ 				<h2>Search 
+ 				<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
+ 				in
+ 					<select name="authtype2">
+ 					<!-- TMPL_LOOP NAME="authtypesloop" -->
+ 						<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
+ 							<!-- TMPL_VAR NAME="authtypetext" -->
+ 						</option>
+ 					<!-- /TMPL_LOOP -->
+ 					</select>
+ 				</h2>
+ 				<input type="hidden" name="marclist" value="">
+ 				<input type="hidden" name="and_or" value="and">
+ 				<input type="hidden" name="excluding" value="">
+ 				<input type="hidden" name="operator" value="contains">
+ 				<input type="hidden" name="op" value="do_search">
+ 				<img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0">
+ 				<a href="javascript:searchauthority()" class="authority">
+ 					Search
+ 				</a>
+ 			</form>
  		</div>
  		<div id="Hint6" class="hint">
***************
*** 133,136 ****
--- 211,230 ----
  			<h1 class="circulation">Circulation</h1>
  			Work at the front desk on Issues and returns using only a barcode reader and a mouse
+ 				<h2 class="circulation">
+ 					Issue
+ 				</h2>
+ 				<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+ 					<p>Enter borrower card number or partial last name <input name="findborrower">
+ 					<input type="submit" value="OK" class="button circulation"></p>
+ 				</form>
+ 				<h2 class="circulation">
+ 					Return
+ 				</h2>
+ 				<form method="post" action="/cgi-bin/koha/circ/returns.pl">
+ 				<p>Enter Book Barcode</p>
+ 				<label class="label20">Item Barcode:</label><input name="barcode" size="10">
+ 				<input type="submit" value="OK" class="button circulation">
+ 				</form>
+ 
  		</div>
  <!-- MAIN MENU -->

Index: mancredit.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/mancredit.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** mancredit.tmpl	19 Jul 2004 21:41:29 -0000	1.3
--- mancredit.tmpl	20 Jun 2005 14:21:40 -0000	1.4
***************
*** 1,22 ****
  <!-- TMPL_INCLUDE Name="members-top.inc" -->
! 
! <Center><h3>Manual Credit</h3></center>
! <form action="/cgi-bin/koha/mancredit.pl" method="post">
! <table cellpadding="2" cellspacing="0" border="0">
! <input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
! <tr><td><b>Borrowernumber<b></td><td><!-- TMPL_VAR NAME="bornum" --></td></tr>
! <tr><td><b>Type</b></td><Td>
! <select name="type">
! <option value="C">Credit</option>
! <option value="BAY">Baycorp Adjustment</option>
! <option value="WORK">Worked off</option>
! </select>
! </td></tr>
! <tr><td><b>Itemnumber</b></td><td><input type="text" name="itemnum"></td></tr>
! <tr><td><b>Description</b></td><td><input type="text" name="desc" size="50"></td></tr>
! <tr><td><b>Amount</b></td><td><input type="text" name="amount"></td></tr>
! <tr><td><input type="submit" name="add" value="Add"></td></tr>
! </table>
! </form>
! 
  <!-- TMPL_INCLUDE Name="members-bottom.inc" -->
\ No newline at end of file
--- 1,20 ----
  <!-- TMPL_INCLUDE Name="members-top.inc" -->
! <div id="mainbloc">
! 	<h1 class="member">Manual Credit</h1>
! 	<form action="/cgi-bin/koha/mancredit.pl" method="post">
! 		<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
! 		<p><label class="label100">Borrowernumber</label><!-- TMPL_VAR NAME="bornum" --></p>
! 		<p><label class="label100">Type</label>
! 			<select name="type">
! 				<option value="C">Credit</option>
! 				<option value="BAY">Baycorp Adjustment</option>
! 				<option value="WORK">Worked off</option>
! 			</select>
! 		</p>
! 		<p><label class="label100">Itemnumber</label><input type="text" name="itemnum"></p>
! 		<p><label class="label100">Description</label><input type="text" name="desc" size="50"></p>
! 		<p><label class="label100">Amount</label><input type="text" name="amount"></p>
! 		<p><input type="submit" name="add" value="Add" class="button"></p>
! 	</form>
! </div>
  <!-- TMPL_INCLUDE Name="members-bottom.inc" -->
\ No newline at end of file

Index: maninvoice.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/maninvoice.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** maninvoice.tmpl	19 Jul 2004 21:41:29 -0000	1.3
--- maninvoice.tmpl	20 Jun 2005 14:21:40 -0000	1.4
***************
*** 1,25 ****
  <!-- TMPL_INCLUDE Name="members-top.inc" -->
! 
! <Center><h3>Manual Invoice</h3></center>
! <form action="/cgi-bin/koha/maninvoice.pl" method="post">
! <table cellpadding="2" cellspacing="0" border="0">
! <input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
! <tr><td><b>Borrowernumber<b></td><td><!-- TMPL_VAR NAME="bornum" --></td></tr>
! <tr><td><b>Type</b></td><Td>
! <select name="type">
! <option value="L">Lost Item</option>
! <option value="F">Fine</option>
! <option value="A">Account Management Fee</option>
! <option value="N">New Card</option>
! <option value="M">Sundry</option>
! <option value="REF">Cash Refund</option>
! </select>
! </td></tr>
! <tr><td><b>Itemnumber</b></td><td><input type="text" name="itemnum"></td></tr>
! <tr><td><b>Description</b></td><td><input type="text" name="desc" size="50"></td></tr>
! <tr><td><b>Amount</b></td><td><input type="text" name="amount"></td></tr>
! <tr><td><input type="submit" name="add" value="Add"></td></tr>
! </table>
! </form>
! 
  <!-- TMPL_INCLUDE Name="members-bottom.inc" -->
--- 1,25 ----
  <!-- TMPL_INCLUDE Name="members-top.inc" -->
! <div id="mainbloc">
! 	<h1 class="member">Manual Invoice</h1>
! 	<form action="/cgi-bin/koha/maninvoice.pl" method="post">
! 	<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
! 	<p><label class="label100">Borrowernumber </label><!-- TMPL_VAR NAME="bornum" --></p>
! 	<p>
! 		<label class="label100"><b>Type</label>
! 		<select name="type">
! 			<option value="L">Lost Item</option>
! 			<option value="F">Fine</option>
! 			<option value="A">Account Management Fee</option>
! 			<option value="N">New Card</option>
! 			<option value="M">Sundry</option>
! 			<option value="REF">Cash Refund</option>
! 		</select>
! 	</p>
! 	<p><label class="label100">Itemnumber</label><input type="text" name="itemnum"></p>
! 	<p><label class="label100">Description</label><input type="text" name="desc" size="50"></p>
! 	<p><label class="label100">Amount</label><input type="text" name="amount"></p>
! 	<p><label class="label100"><input type="submit" class="button" name="add" value="Add"></p>
! 	</table>
! 	</form>
! </div>
  <!-- TMPL_INCLUDE Name="members-bottom.inc" -->




From tipaul at users.sourceforge.net  Mon Jun 20 16:22:32 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:22:32 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/images filefind.png,1.1,1.2
Message-ID: <E1DkNAW-0002Mw-1E@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	filefind.png 
Log Message:
synch'ing 2.2 and head





From tipaul at users.sourceforge.net  Mon Jun 20 16:22:32 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:22:32 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.20,1.21 opac-top.inc,1.10,1.11
Message-ID: <E1DkNAW-0002N6-9J@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac.css opac-top.inc 
Log Message:
synch'ing 2.2 and head

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** opac.css	15 Jun 2005 19:55:14 -0000	1.20
--- opac.css	20 Jun 2005 14:22:29 -0000	1.21
***************
*** 51,55 ****
  	border-width:0px;
  	text-align:left;
! 	position:absolute;
  }
  
--- 51,58 ----
  	border-width:0px;
  	text-align:left;
! 	display:inline;
! 	float:left;
! 	padding-left:10px;
! 	padding-right:10px;
  }
  
***************
*** 91,99 ****
  	font-weight:bold;
  	font-size: 115%;
- 	text-align : center;
  	vertical-align:top;
  	padding: 2px;
  	width:100%;
- 	margin-left:70px;
  }
  
--- 94,100 ----
***************
*** 143,147 ****
  	border:1px solid #000000;
  	border-collapse:collapse;
! 	width:90%;
  }
  /* header */
--- 144,148 ----
  	border:1px solid #000000;
  	border-collapse:collapse;
! 	position:static;
  }
  /* header */
***************
*** 155,165 ****
  	border-bottom:1px solid #000000;
  	border-top:1px solid #000000;
- 	padding:5px;
  }
  /* standard cell */
  td {
  	font-size:10pt;
  	border-left:1px solid #000000;
  	vertical-align:top;
  }
  
--- 156,173 ----
  	border-bottom:1px solid #000000;
  	border-top:1px solid #000000;
  }
  /* standard cell */
+ 
+ tr {
+ 	display:table-row;
+ 	position:static;
+ }
+ 
  td {
  	font-size:10pt;
  	border-left:1px solid #000000;
  	vertical-align:top;
+ 	position:static;
+ 	display:table-cell;
  }
  
***************
*** 355,361 ****
  }
  
  #menuline {
- 	float:left;
  	display:block;
  }
  
--- 363,374 ----
  }
  
+ #title {
+ 	display:block;
+ 	margin-left:0px;
+ }
+ 
  #menuline {
  	display:block;
+ 	margin-left:100px;
  }
  
***************
*** 369,376 ****
  
  /* a little spacer. should not be used */
- .spacer {
- 	padding-left:20pt;
- 	float:left;
- }
  .basketspacer {
  	padding-left:8pt;
--- 382,385 ----
***************
*** 378,388 ****
  }
  
  /* for MARC view  */
  div.tabs {
! 	width:10px;
! 	position:absolute;
  	display:block;
! 	margin-left:50px;
! 	margin-top:150px;
  }
  
--- 387,419 ----
  }
  
+ /* for SubscritptionHistory view  */
+ div.tabsubs {
+ 	margin-left:150px;
+ 	position:inline;
+ }
+ 
+ div.tabsubs a {
+ 	font-size: small;
+ 	border: thin solid black;
+ 	margin-right: 2px;
+ 	padding: 10px 10px;
+ 	-moz-border-radius: 5px 5px 0px 0px;
+ }
+ 
+ div.tabsub {
+ 	background-color: #ACE6E6;
+ 	position:absolute;
+ 	visibility:hidden;
+ 	margin-left:150px;
+ 	margin-top:0px;
+ border:4px;
+ }
+ 
  /* for MARC view  */
  div.tabs {
! 	width:15px;
  	display:block;
! 	margin-top:70px;
! 	margin-left:40px;
  }
  
***************
*** 396,399 ****
--- 427,440 ----
  }
  
+ div.tabbloc {
+ 	position:absolute;
+ 	display:block;
+ 	top:140px;
+ 	left:62px;
+ 	margin-right:0px;
+ 	border: 1px solid black;
+ 	background-color:none;
+ }
+ 
  div.tab {
  	background-color: #ACE6E6;
***************
*** 401,407 ****
  	visibility:hidden;
  	position:absolute;
! 	margin-left:72px;
! 	margin-top:150px;
! 	margin-right:10%;
  }
  
--- 442,448 ----
  	visibility:hidden;
  	position:absolute;
! 	float:left;
! 	margin-right:0px;
! 	background-color:none;
  }
  

Index: opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** opac-top.inc	4 May 2005 08:58:30 -0000	1.10
--- opac-top.inc	20 Jun 2005 14:22:30 -0000	1.11
***************
*** 25,29 ****
  	var MSG_NO_RECORD_ADDED = _("No biblio added");
  	function Dopop(link) {
! 		newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
  	}
  	</script>
--- 25,29 ----
  	var MSG_NO_RECORD_ADDED = _("No biblio added");
  	function Dopop(link) {
! 		newin=window.open(link,'popup','width=700,height=500,toolbar=false,scrollbars=yes');
  	}
  	</script>
***************
*** 31,41 ****
  <body>
  	<!-- MENUS -->
! 	<div id="menuline">
! 		<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo" style="float: left" />
  		<div class="SmallLibraryName"><!--TMPL_VAR name="LibraryName"--></div>
! 		<span class="spacer">&nbsp;</span>
! 		<span class="spacer">&nbsp;</span>
  		<a class="menu" href="/cgi-bin/koha/opac-main.pl" title="Koha home page">Home</a>
- 		<span class="spacer">&nbsp;</span>
  		<a class="menu" href="/cgi-bin/koha/opac-search.pl" title="Advanced search">Advanced search</a>
  		<!-- TMPL_IF NAME="loggedinusername" -->
--- 31,44 ----
  <body>
  	<!-- MENUS -->
! 	<div id="title">
! 		<!-- TMPL_IF name="opacsmallimage" -->
! 			<img src="<!-- TMPL_VAR name="opacsmallimage"-->" height="50" alt="koha logo"/>
! 		<!-- TMPL_ELSE -->
! 			<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo"/>
! 		<!-- /TMPL_IF -->
  		<div class="SmallLibraryName"><!--TMPL_VAR name="LibraryName"--></div>
! 	</div>
! 	<div id="menuline">
  		<a class="menu" href="/cgi-bin/koha/opac-main.pl" title="Koha home page">Home</a>
  		<a class="menu" href="/cgi-bin/koha/opac-search.pl" title="Advanced search">Advanced search</a>
  		<!-- TMPL_IF NAME="loggedinusername" -->
***************
*** 47,53 ****
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_IF -->
- 		<span class="spacer">&nbsp;</span>
  		<a class="menu" href="/cgi-bin/koha/opac-user.pl" title="Member Home page" >Personal page</a>
- 		<span class="spacer">&nbsp;</span>
  		<a class="menu" href="javascript:openBasket()" title="Biblio basket">Biblio basket <span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a>
  	</div>
--- 50,54 ----




From tipaul at users.sourceforge.net  Mon Jun 20 16:25:19 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:25:19 -0700
Subject: [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
Message-ID: <E1DkNDD-0002bu-BQ@sc8-pr-cvs1.sourceforge.net>

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>




From tipaul at users.sourceforge.net  Mon Jun 20 16:26:06 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:26:06 -0700
Subject: [Koha-cvs] CVS: koha/localfile/modified_authorities DO_NOT_REMOVE,1.1,1.2
Message-ID: <E1DkNDy-0002ki-4w@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/localfile/modified_authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10499/localfile/modified_authorities

Added Files:
	DO_NOT_REMOVE 
Log Message:
synch'ing 2.2 and head





From tipaul at users.sourceforge.net  Mon Jun 20 16:26:23 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:26:23 -0700
Subject: [Koha-cvs] CVS: koha/misc/release notes release_notes_223.txt,1.1,1.2
Message-ID: <E1DkNEE-0002mc-WE@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/release notes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10680/misc/release notes

Added Files:
	release_notes_223.txt 
Log Message:
synch'ing 2.2 and head

***** Bogus filespec: notes




From tipaul at users.sourceforge.net  Mon Jun 20 16:26:06 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:26:06 -0700
Subject: [Koha-cvs] CVS: koha/members memberentry.pl,1.9,1.10
Message-ID: <E1DkNDy-0002kj-52@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10499/members

Modified Files:
	memberentry.pl 
Log Message:
synch'ing 2.2 and head

Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/memberentry.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** memberentry.pl	4 May 2005 09:01:58 -0000	1.9
--- memberentry.pl	20 Jun 2005 14:26:03 -0000	1.10
***************
*** 129,138 ****
  		print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrowernumber");
  		}
- 		
- 	if($destination eq "circ"){
- 		print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$data{'cardnumber'}");
- 	} else {
- 		print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$data{'borrowernumber'}");
- 		}
  	}
  }
--- 129,132 ----
***************
*** 242,246 ****
  	$template->param(	actionType 		=> $actionType,
  				destination => $destination,
! 				member          => $member,
  				address         => $data->{'streetaddress'},
  				firstname       => $data->{'firstname'},
--- 236,240 ----
  	$template->param(	actionType 		=> $actionType,
  				destination => $destination,
! 				borrowernumber          => $borrowernumber,
  				address         => $data->{'streetaddress'},
  				firstname       => $data->{'firstname'},
***************
*** 268,273 ****
  				relshiploop	=> \@relshipdata,
  				"title_".$data->{'title'} => " SELECTED ",
! 				dateenrolled	=> $data->{'dateenrolled'},
! 				expiry		=> $data->{'expiry'},
  				cardnumber	=> $cardnumber,
  				dateofbirth	=> $data->{'dateofbirth'},
--- 262,267 ----
  				relshiploop	=> \@relshipdata,
  				"title_".$data->{'title'} => " SELECTED ",
! 				joining	=> format_date($data->{'dateenrolled'}),
! 				expiry		=> format_date($data->{'expiry'}),
  				cardnumber	=> $cardnumber,
  				dateofbirth	=> $data->{'dateofbirth'},




From tipaul at users.sourceforge.net  Mon Jun 20 16:27:51 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:27:51 -0700
Subject: [Koha-cvs] CVS: koha/misc/sql-datas/english sample_usmarc.mrc,1.1,1.2 sample_usmarc.readme,1.1,1.2
Message-ID: <E1DkNFf-0002yC-ST@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/sql-datas/english
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10788/misc/sql-datas/english

Added Files:
	sample_usmarc.mrc sample_usmarc.readme 
Log Message:
synch'ing 2.2 and head






From tipaul at users.sourceforge.net  Mon Jun 20 16:28:23 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:28:23 -0700
Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.90,1.91 overduenotices.pl,1.3,1.4
Message-ID: <E1DkNGB-00030Y-OG@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11485/misc

Modified Files:
	Install.pm overduenotices.pl 
Log Message:
synch'ing 2.2 and head

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -r1.90 -r1.91
*** Install.pm	27 May 2005 13:33:42 -0000	1.90
--- Install.pm	20 Jun 2005 14:28:10 -0000	1.91
***************
*** 3,7 ****
  
  # Copyright 2000-2002 Katipo Communications
! # Contains parts Copyright 2003-5 MJ Ray
  #
  # This file is part of Koha.
--- 3,7 ----
  
  # Copyright 2000-2002 Katipo Communications
! # Contains parts Copyright 2003-4 MJ Ray
  #
  # This file is part of Koha.
***************
*** 860,865 ****
  	unless (eval {require MARC::Record})     { push @missing,"MARC::Record" };
  	unless (eval {require Mail::Sendmail})   { push @missing,"Mail::Sendmail" };
- 	unless (eval {require PDF::API2})   { push @missing,"PDF::API2" };
  # The following modules are not mandatory, depends on how the library want to use Koha
  	unless (eval {require Net::LDAP})       {
  		if ($#missing>=0) { # only when $#missing >= 0 so this isn't fatal
--- 860,869 ----
  	unless (eval {require MARC::Record})     { push @missing,"MARC::Record" };
  	unless (eval {require Mail::Sendmail})   { push @missing,"Mail::Sendmail" };
  # The following modules are not mandatory, depends on how the library want to use Koha
+ 	unless (eval {require PDF::API2})   { 
+ 			if ($#missing>=0) { # only when $#missing >= 0 so this isn't fatal
+ 				push @missing,"You will need PDF::API2 for barcode generator" 
+ 			}
+ 	}
  	unless (eval {require Net::LDAP})       {
  		if ($#missing>=0) { # only when $#missing >= 0 so this isn't fatal
***************
*** 1952,1958 ****
  
  		startsysout();
! 		system("$mysqldir/bin/mysql '-u$user' -e \"insert into branches (branchcode,branchname,issuing) values ('$branchcode', '$branch', 1)\" '$database'");
! 		system("$mysqldir/bin/mysql '-u$user' -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\" '$database'");
! 		system("$mysqldir/bin/mysql '-u$user' -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\" '$database'");
  
  		my $printername='lp';
--- 1956,1962 ----
  
  		startsysout();
! 		system("$mysqldir/bin/mysql -u$user -e \"insert into branches (branchcode,branchname,issuing) values ('$branchcode', '$branch', 1)\" $database");
! 		system("$mysqldir/bin/mysql -u$user -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\" $database");
! 		system("$mysqldir/bin/mysql -u$user -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\" $database");
  
  		my $printername='lp';
***************
*** 1973,1977 ****
  		}
  		startsysout();	
! 		system("$mysqldir/bin/mysql '-u$user' -e \"insert into printers (printername,printqueue,printtype) values ('$printername', '$printerqueue', '')\" '$database'");
  	}
  	my $language;
--- 1977,1981 ----
  		}
  		startsysout();	
! 		system("$mysqldir/bin/mysql -u$user -e \"insert into printers (printername,printqueue,printtype) values ('$printername', '$printerqueue', '')\" $database");
  	}
  	my $language;
***************
*** 1983,1987 ****
  	}
  	startsysout();	
! 	system("$mysqldir/bin/mysql '-u$user' -e \"update systempreferences set value='$language' where variable='opaclanguages'\" '$database'");
  	my @dirs;
  	if (-d "scripts/misc/sql-datas") {
--- 1987,1991 ----
  	}
  	startsysout();	
! 	system("$mysqldir/bin/mysql -u$user -e \"update systempreferences set value='$language' where variable='opaclanguages'\" $database");
  	my @dirs;
  	if (-d "scripts/misc/sql-datas") {
***************
*** 2154,2158 ****
  
  setmysqlclipass($pass); 
! open (MD, "$mysqldir/bin/mysqldump '--user=$user' --host=$hostname '$database'|");
  
  (open BF, ">$backupdir/Koha.backup_$date") || (die "Error opening up backup file $backupdir/Koha.backup_$date: $!\n");
--- 2158,2162 ----
  
  setmysqlclipass($pass); 
! open (MD, "$mysqldir/bin/mysqldump --user=$user --host=$hostname $database|");
  
  (open BF, ">$backupdir/Koha.backup_$date") || (die "Error opening up backup file $backupdir/Koha.backup_$date: $!\n");

Index: overduenotices.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/overduenotices.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** overduenotices.pl	4 May 2005 09:02:37 -0000	1.3
--- overduenotices.pl	20 Jun 2005 14:28:12 -0000	1.4
***************
*** 74,78 ****
  # The following fields are available :
  # <date> <itemcount> <firstname> <lastname> <address1> <address2> <address3> <city> <postcode>
! my $mailtext = "\n\n\nDear library borrower\n\n\n       <date>\n\n       According to our records, you have <itemcount> items that are at\n       least a week overdue for return to the library or renewal.\n       If you have registered a password with the library, you may use it\n       and your library card to login at http://XXX.org\n       to check the status of your account, or you may call any of our branch\n       Please be advised that all library services will be blocked\n       if items are allowed to go more than 30 days overdue.\n\n       Thank you for using your public libraries.\n\n\n                                             <firstname> <lastname>\n                                             <address1>\n                                             <address2>\n                                             <city>  <postcode>\n\n\n\n\n\n";
  #
  # END OF PARAMETERS
--- 74,79 ----
  # The following fields are available :
  # <date> <itemcount> <firstname> <lastname> <address1> <address2> <address3> <city> <postcode>
! my $mailtext = "\n\n\nDear library borrower\n\n\n       <date>\n\n       According to our records, you have <itemcount> items, the description of which follows, that are at\n       least a week overdue for return to the library or renewal:\n		title		author		barcode\n<titles>\n
!        If you have registered a password with the library, you may use it\n       and your library card to login at http://XXX.org\n       to check the status of your account, or you may call any of our branch\n       Please be advised that all library services will be blocked\n       if items are allowed to go more than 30 days overdue.\n\n       Thank you for using your public libraries.\n\n\n                                             <firstname> <lastname>\n                                             <address1>\n                                             <address2>\n                                             <city>  <postcode>\n\n\n\n\n\n";
  #
  # END OF PARAMETERS
***************
*** 85,89 ****
  
  my $dbh = C4::Context->dbh;
! my $sth = $dbh->prepare ("SELECT count(*), issues.borrowernumber,firstname,surname,streetaddress,physstreet,city,zipcode,emailaddress FROM issues,borrowers,categories WHERE returndate IS NULL AND TO_DAYS(NOW())-TO_DAYS(date_due) BETWEEN 0 and 500 AND issues.borrowernumber=borrowers.borrowernumber and borrowers.categorycode=categories.categorycode and categories.overduenoticerequired=1 group by issues.borrowernumber");
  $sth->execute;
  # 
--- 86,92 ----
  
  my $dbh = C4::Context->dbh;
! my $sth = $dbh->prepare ("SELECT COUNT(*), issues.borrowernumber,firstname,surname,streetaddress,physstreet,city,zipcode,emailaddress FROM issues,borrowers,categories WHERE returndate IS NULL AND TO_DAYS(NOW())-TO_DAYS(date_due) BETWEEN 0 and 500 AND issues.borrowernumber=borrowers.borrowernumber and borrowers.categorycode=categories.categorycode and categories.overduenoticerequired=1 group by issues.borrowernumber");
! my $sth2 = $dbh->prepare("SELECT biblio.title,biblio.author,items.barcode FROM issues,items,biblio WHERE items.itemnumber=issues.itemnumber and biblio.biblionumber=items.biblionumber AND issues.borrowernumber=? AND returndate IS NULL AND TO_DAYS(NOW())-TO_DAYS(date_due) BETWEEN 0 and 500");
! 
  $sth->execute;
  # 
***************
*** 92,95 ****
--- 95,99 ----
  my $count = 0;   # to keep track of how many notices are printed
  my $e_count = 0;   # and e-mailed
+ my $date=localtime;
  my ($itemcount,$borrnum,$firstname,$lastname,$address1,$address2,$city,$postcode,$email);
  
***************
*** 103,107 ****
  		$notice =~ s/\<city\>/$city/g;
  		$notice =~ s/\<postcode\>/$postcode/g;
! 	
  	# if not using e-mail notices, comment out the following lines
  		if ($email) {   # or you might check for borrowers.preferredcont 
--- 107,120 ----
  		$notice =~ s/\<city\>/$city/g;
  		$notice =~ s/\<postcode\>/$postcode/g;
! 		$notice =~ s/\<date\>/$date/g;
! 
! 		$sth2->execute($borrnum);
! 		my $titles="";
! 		my ($title, $author, $barcode);
! 		while (($title, $author, $barcode) = $sth2->fetchrow){
! 			$titles .= "		".($title?$title:"")."	".($author?$author:"")."	".($barcode?$barcode:"")."\n";
! 		}
! 		$notice =~ s/\<titles\>/$titles/g;
! 		$sth2->finish;
  	# if not using e-mail notices, comment out the following lines
  		if ($email) {   # or you might check for borrowers.preferredcont 
***************
*** 136,140 ****
  		$notice .= <ODUES>;
  		if ($nomail) {
! 			print "TO => $email\n";
  			print "FROM => $from\n";
  			print "SUBJECT => Koha overdue\n";
--- 149,153 ----
  		$notice .= <ODUES>;
  		if ($nomail) {
! 			print "TO => $email\n" if $email;
  			print "FROM => $from\n";
  			print "SUBJECT => Koha overdue\n";




From tipaul at users.sourceforge.net  Mon Jun 20 16:33:35 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:33:35 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-dictionary.pl,1.1,1.2 opac-detail.pl,1.19,1.20 opac-main.pl,1.16,1.17 opac-search.pl,1.29,1.30 opac-sendbasket.pl,1.6,1.7 opac-serial-issues.pl,1.3,1.4 opac-user.pl,1.16,1.17
Message-ID: <E1DkNLD-0003sh-Lt@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14868/opac

Modified Files:
	opac-detail.pl opac-main.pl opac-search.pl opac-sendbasket.pl 
	opac-serial-issues.pl opac-user.pl 
Added Files:
	opac-dictionary.pl 
Log Message:
synch'ing 2.2 and head


Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** opac-detail.pl	17 Jun 2005 13:44:25 -0000	1.19
--- opac-detail.pl	20 Jun 2005 14:33:32 -0000	1.20
***************
*** 30,33 ****
--- 30,34 ----
  my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
  my ($websitecount, @websites)             = &getwebsites($biblionumber);
+ my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
  
  $dat->{'count'}=@items;
***************
*** 85,89 ****
  				SITE_RESULTS => $sitearray,
  				subscriptionsnumber => $subscriptionsnumber,
- 				subscriptions => \@subs,
  			     LibraryName => C4::Context->preference("LibraryName"),
  				suggestion => C4::Context->preference("suggestion"),
--- 86,89 ----
***************
*** 124,125 ****
--- 124,127 ----
  #output_html_with_http_headers $query, $cookie, $template->output;
  
+ output_html_with_http_headers $query, $cookie, $template->output;
+ 

Index: opac-main.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-main.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** opac-main.pl	4 Oct 2004 20:20:25 -0000	1.16
--- opac-main.pl	20 Jun 2005 14:33:32 -0000	1.17
***************
*** 53,56 ****
--- 53,57 ----
  				languages => \@options,
  				textmessaging => $borrower->{textmessaging},
+ 				opaclargeimage => C4::Context->preference("opaclargeimage"),
  );
  output_html_with_http_headers $input, $cookie, $template->output;

Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** opac-search.pl	3 Jun 2005 04:15:29 -0000	1.29
--- opac-search.pl	20 Jun 2005 14:33:32 -0000	1.30
***************
*** 9,13 ****
  use C4::Database;
  use HTML::Template;
! use C4::SearchMarc;
  use C4::Acquisition;
  use C4::Biblio;
--- 9,13 ----
  use C4::Database;
  use HTML::Template;
! use C4::SearchMarcTest;
  use C4::Acquisition;
  use C4::Biblio;
***************
*** 412,416 ****
  }
  # ADDED BY JF
! if ($totalresults == 1){
      # if its a barcode search by definition we will only have one result.
      # And if we have a result
--- 412,416 ----
  }
  # ADDED BY JF
! #if ($totalresults == 1){
      # if its a barcode search by definition we will only have one result.
      # And if we have a result

Index: opac-sendbasket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-sendbasket.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** opac-sendbasket.pl	20 Jun 2005 01:01:06 -0000	1.6
--- opac-sendbasket.pl	20 Jun 2005 14:33:32 -0000	1.7
***************
*** 8,11 ****
--- 8,12 ----
  use C4::Context;
  use C4::Search;
+ use C4::Biblio;
  use C4::Auth;
  use C4::Interface::CGI::Output;
***************
*** 15,106 ****
  my $query = new CGI;
  
! my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
!     {
!         template_name   => "opac-sendbasketform.tmpl",
!         query           => $query,
!         type            => "opac",
!         authnotrequired => 1,
!         flagsrequired   => { borrow => 1 },
!     }
! );
! 
! my $bib_list     = $query->param('bib_list');
! my $email_add    = $query->param('email_add');
! my $email_sender = $query->param('email_sender');
  
- my $dbh = C4::Context->dbh();
  
  if ($email_add) {
!     my $email_from = C4::Context->preference('KohaAdminEmailAddress');
  
!     my %mail = (
!         To   => $email_add,
!         From => $email_from
!     );
! 
!     my ( $template2, $borrowernumber, $cookie ) = get_template_and_user(
!         {
!             template_name   => "opac-sendbasket.tmpl",
!             query           => $query,
!             type            => "opac",
!             authnotrequired => 1,
!             flagsrequired   => { borrow => 1 },
!         }
!     );
! 
!     my @bibs = split ( /\//, $bib_list );
!     my @results;
!     my $iso2709;
!     foreach my $biblionumber (@bibs) {
!         $template2->param( biblionumber => $biblionumber );
! 
!         my $dat = &bibdata($biblionumber);
!         my ( $authorcount, $addauthor ) = &addauthor($biblionumber);
!         my @items = &ItemInfo( undef, $biblionumber, 'opac' );
! 
!         $dat->{'additional'} = $addauthor->[0]->{'author'};
!         for ( my $i = 1 ; $i < $authorcount ; $i++ ) {
!             $dat->{'additional'} .= "|" . $addauthor->[$i]->{'author'};
!         }
! 
!         $dat->{'biblionumber'} = $biblionumber;
!         $dat->{ITEM_RESULTS} = \@items;
!         my $record = MARCgetbiblio( $dbh, $biblionumber );
!         $iso2709 .= $record->as_usmarc();
! 
!         push ( @results, $dat );
!     }
! 
!     my $resultsarray = \@results;
!     $template2->param(
!         BIBLIO_RESULTS => $resultsarray,
!         email_sender   => $email_sender
!     );
! 
!     # Getting template result
!     my $template_res = $template2->output();
! 
!     # Analysing information and getting mail properties
!     if ( $template_res =~ /<SUBJECT>\n(.*)\n<END_SUBJECT>/s ) {
!         $mail{'subject'} = $1;
!     }
!     else { $mail{'subject'} = "no subject"; }
! 
!     my $email_header = "";
!     if ( $template_res =~ /<HEADER>\n(.*)\n<END_HEADER>/s ) {
!         $email_header = $1;
!     }
! 
!     my $email_file = "basket.txt";
!     if ( $template_res =~ /<FILENAME>\n(.*)\n<END_FILENAME>/s ) {
!         $email_file = $1;
!     }
! 
!     if ( $template_res =~ /<MESSAGE>\n(.*)\n<END_MESSAGE>/s ) {
!         $mail{'body'} = $1;
!     }
  
!     my $boundary = "====" . time() . "====";
!     $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
  
      $email_header = encode_qp($email_header);
--- 16,73 ----
  my $query = new CGI;
  
! my ($template, $borrowernumber, $cookie) 
!     = get_template_and_user({template_name => "opac-sendbasketform.tmpl",
! 			     query => $query,
! 			     type => "opac",
! 			     authnotrequired => 1,
! 			     flagsrequired => {borrow => 1},
! 			 });
! 
! my $bib_list=$query->param('bib_list');
! my $email_add=$query->param('email_add');
! my $email_sender=$query->param('email_sender');
! my $dbh=C4::Context->dbh;
! my $sth;
! $sth=$dbh->prepare("select bibid from marc_biblio where biblionumber=? order by bibid");
  
  
  if ($email_add) {
! 	my $email_from = C4::Context->preference('KohaAdminEmailAddress');
! 
! 	my %mail = (	 To      => $email_add,
! 						 From    => $email_from);
  
! 	my ($template2, $borrowernumber, $cookie) 
!     = get_template_and_user({template_name => "opac-sendbasket.tmpl",
! 			     query => $query,
! 			     type => "opac",
! 			     authnotrequired => 1,
! 			     flagsrequired => {borrow => 1},
! 			 });
! 
! 	my @bibs = split(/\//, $bib_list);
! 	my @results;
! 	my $iso2709;
! 	foreach my $biblionumber (@bibs) {
! 		$template2->param(biblionumber => $biblionumber);
! 
! 		my $dat = &bibdata($biblionumber);
! 		my ($authorcount, $addauthor) = &addauthor($biblionumber);
! 		my @items                     = &ItemInfo(undef, $biblionumber, 'opac');
! 
! 		$dat->{'additional'}=$addauthor->[0]->{'author'};
! 		for (my $i = 1; $i < $authorcount; $i++) {
! 			$dat->{'additional'} .= "|" . $addauthor->[$i]->{'author'};
! 		}
! 
! 		$dat->{'biblionumber'} = $biblionumber;
! 		$dat->{ITEM_RESULTS} = \@items;
! 		$sth->execute($biblionumber);
! 		my ($bibid) = $sth->fetchrow;
! 		my $record = MARCgetbiblio($dbh,$bibid);
! 		$iso2709 .= $record->as_usmarc();
  
! 		push (@results, $dat);
! 	}
  
      $email_header = encode_qp($email_header);
***************
*** 108,113 ****
      $boundary = "--" . $boundary;
  
!     # Writing mail
!     $mail{body} = <<END_OF_BODY;
  $boundary
  Content-Type: text/plain; charset="iso-8859-1"
--- 75,129 ----
      $boundary = "--" . $boundary;
  
! 	# Analysing information and getting mail properties
! 	if ($template_res =~ /<SUBJECT>\n(.*)\n<END_SUBJECT>/s) { $mail{'subject'} = $1; }
! 	else { $mail{'subject'} = "no subject"; }
! 
! 	my $email_header = "";
! 	if ($template_res =~ /<HEADER>\n(.*)\n<END_HEADER>/s) { $email_header = $1; }
! 
! 	my $email_file = "basket.txt";
! 	if ($template_res =~ /<FILENAME>\n(.*)\n<END_FILENAME>/s) { $email_file = $1; }
! 
! 	if ($template_res =~ /<MESSAGE>\n(.*)\n<END_MESSAGE>/s) { $mail{'body'} = $1; }
! 
! 	my $boundary = "====" . time() . "====";
! # 	$mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
! # 
! # 	$email_header = encode_qp($email_header);
! # 
! # 	$boundary = "--".$boundary;
! # 
! # 	# Writing mail
! # 	$mail{body} =
! 	$mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
! 
! 	my $message = encode_qp( "" );
! 
! # $file = $^X; # This is the perl executable
! # 
! # open (F, $file) or die "Cannot read $file: $!";
! # binmode F; undef $/;
! $mail{body} = encode_base64($iso2709);
! # close F;
! 
! $boundary = '--'.$boundary;
! $mail{body} = <<END_OF_BODY;
! $boundary
! Content-Type: text/plain; charset="iso-8859-1"
! Content-Transfer-Encoding: quoted-printable
! 
! $message
! $boundary
! Content-Type: application/octet-stream; name="basket"
! Content-Transfer-Encoding: base64
! Content-Disposition: attachment; filename="basket"
! 
! $mail{body}
! $boundary--
! END_OF_BODY
! 
! 
! 
! 	 <<END_OF_BODY;
  $boundary
  Content-Type: text/plain; charset="iso-8859-1"
***************
*** 121,148 ****
  END_OF_BODY
  
!     # Sending mail
!     if ( sendmail %mail ) {
! 
!         # do something if it works....
!         warn "Mail sent ok\n";
!         $template->param( SENT      => "1" );
!         $template->param( email_add => $email_add );
!     }
!     else {
! 
!         # do something if it doesnt work....
!         warn "Error sending mail: $Mail::Sendmail::error \n";
!         warn "$mail{'body'}";
!     }
  
      output_html_with_http_headers $query, $cookie, $template->output;
  }
  else {
!     $template->param( bib_list => $bib_list );
!     $template->param(
!         url            => "/cgi-bin/koha/opac-sendbasket.pl",
!         suggestion     => C4::Context->preference("suggestion"),
!         virtualshelves => C4::Context->preference("virtualshelves"),
!     );
!     output_html_with_http_headers $query, $cookie, $template->output;
  }
--- 137,178 ----
  END_OF_BODY
  
! $mail{attachment} = $iso2709;
! #	$mail{body} = <<END_OF_BODY;
! #$boundary
! #Content-Type: text/plain; charset="iso-8859-1"
! #Content-Transfer-Encoding: quoted-printable
! #
! #$email_header
! #
! #$boundary
! #Content-Type: text/plain; name="$email_file"
! #Content-Transfer-Encoding: quoted-printable
! #Content-Disposition: attachment; filename="$email_file"
! #
! #$mail{'body'}
! #
! #$boundary--
! #END_OF_BODY
! 
! 	# Sending mail
! 	if (sendmail %mail) {
! 	# do something if it works....
! #		warn " ".$mail{body};
! #		warn " ".$mail{PJ};
! 		$template->param(SENT => "1");
! 		$template->param(email_add => $email_add);
! 	} else {
! 		# do something if it doesnt work....
! 		warn "Error sending mail: $Mail::Sendmail::error \n";
! 	}
  
      output_html_with_http_headers $query, $cookie, $template->output;
  }
  else {
! 	$template->param(bib_list => $bib_list);
! 	$template->param(url => "/cgi-bin/koha/opac-sendbasket.pl",
! 	suggestion => C4::Context->preference("suggestion"),
! 	virtualshelves => C4::Context->preference("virtualshelves"),
! 	);
! 	output_html_with_http_headers $query, $cookie, $template->output;
  }

Index: opac-serial-issues.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-serial-issues.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-serial-issues.pl	4 May 2005 09:02:38 -0000	1.3
--- opac-serial-issues.pl	20 Jun 2005 14:33:32 -0000	1.4
***************
*** 15,41 ****
  my $op = $query->param('op');
  my $dbh = C4::Context->dbh;
  my $sth;
  # my $id;
  my ($template, $loggedinuser, $cookie);
  my $biblionumber = $query->param('biblionumber');
! my $subscriptions = get_subscription_list_from_biblionumber($biblionumber);
! 
! ($template, $loggedinuser, $cookie)
! = get_template_and_user({template_name => "opac-serial-issues.tmpl",
! 				query => $query,
! 				type => "opac",
! 				authnotrequired => 1,
! 				debug => 1,
! 				});
! 
! # replace CR by <br> in librarian note
! # $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
! 
! $template->param(
! 	biblionumber => $query->param('biblionumber'),
! 	subscription_LOOP => $subscriptions
! 	suggestion => C4::Context->preference("suggestion"),
! 	virtualshelves => C4::Context->preference("virtualshelves"),
! 	);
  
  output_html_with_http_headers $query, $cookie, $template->output;
--- 15,77 ----
  my $op = $query->param('op');
  my $dbh = C4::Context->dbh;
+ my $selectview = $query->param('selectview');
+ $selectview = C4::Context->preference("SubscriptionHistory") unless $selectview;
+ 
  my $sth;
  # my $id;
  my ($template, $loggedinuser, $cookie);
  my $biblionumber = $query->param('biblionumber');
! if ($selectview eq "full"){
! 	my $subscriptions = get_full_subscription_list_from_biblionumber($biblionumber);
! 	
! 	my $title = $subscriptions->[0]{bibliotitle};
! # 	warn "title ".$title;
! 	my $yearmin=$subscriptions->[0]{year};
! # 	warn "yearmin ".$yearmin;
! 	my $yearmax=$subscriptions->[scalar(@$subscriptions)-1]{year};
! # 	warn "yearmax ".$yearmax;
! 	
! 	
! 	($template, $loggedinuser, $cookie)
! 	= get_template_and_user({template_name => "opac-full-serial-issues.tmpl",
! 					query => $query,
! 					type => "opac",
! 					authnotrequired => 1,
! 					debug => 1,
! 					});
! 	
! 	# replace CR by <br> in librarian note
! 	# $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
! 	
! 	$template->param(
! 		biblionumber => $query->param('biblionumber'),
! 		years => $subscriptions,
! 		yearmin => $yearmin,
! 		yearmax =>$yearmax,
! 		bibliotitle => $title,
! 		suggestion => C4::Context->preference("suggestion"),
! 		virtualshelves => C4::Context->preference("virtualshelves"),
! 		);
  
+ } else {
+ 	my $subscriptions = get_subscription_list_from_biblionumber($biblionumber);
+ 	
+ 	($template, $loggedinuser, $cookie)
+ 	= get_template_and_user({template_name => "opac-serial-issues.tmpl",
+ 					query => $query,
+ 					type => "opac",
+ 					authnotrequired => 1,
+ 					debug => 1,
+ 					});
+ 	
+ 	# replace CR by <br> in librarian note
+ 	# $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
+ 	
+ 	$template->param(
+ 		biblionumber => $query->param('biblionumber'),
+ 		subscription_LOOP => $subscriptions,
+ 		suggestion => C4::Context->preference("suggestion"),
+ 		virtualshelves => C4::Context->preference("virtualshelves"),
+ 		);
+ }
  output_html_with_http_headers $query, $cookie, $template->output;

Index: opac-user.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-user.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** opac-user.pl	4 May 2005 09:02:38 -0000	1.16
--- opac-user.pl	20 Jun 2005 14:33:32 -0000	1.17
***************
*** 137,143 ****
  $template->param(WAITING => \@waiting);
  $template->param(waiting_count => $wcount,
! 			     LibraryName => C4::Context->preference("LibraryName"),
! 					suggestion => C4::Context->preference("suggestion"),
! 					virtualshelves => C4::Context->preference("virtualshelves"),
  );
  
--- 137,144 ----
  $template->param(WAITING => \@waiting);
  $template->param(waiting_count => $wcount,
! 				LibraryName => C4::Context->preference("LibraryName"),
! 				suggestion => C4::Context->preference("suggestion"),
! 				virtualshelves => C4::Context->preference("virtualshelves"),
! 				textmessaging => $borr->{textmessaging},
  );
  




From tipaul at users.sourceforge.net  Mon Jun 20 16:34:47 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:34:47 -0700
Subject: [Koha-cvs] CVS: koha/reports borrowers_out.pl,1.2,1.3
Message-ID: <E1DkNMN-00046z-Mw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/reports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15651/reports

Modified Files:
	borrowers_out.pl 
Log Message:
synch'ing 2.2 and head

Index: borrowers_out.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/borrowers_out.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** borrowers_out.pl	4 May 2005 09:02:38 -0000	1.2
--- borrowers_out.pl	20 Jun 2005 14:34:45 -0000	1.3
***************
*** 160,164 ****
  #
  	my @loopfilter;
! 	for (my $i=0;$i<=6;$i++) {
  		my %cell;
  		if ( @$filters[$i] ) {
--- 160,164 ----
  #
  	my @loopfilter;
! 	for (my $i=0;$i<=2;$i++) {
  		my %cell;
  		if ( @$filters[$i] ) {
***************
*** 168,171 ****
--- 168,172 ----
  			$cell{filter} .= @$filters[$i];
  			$cell{crit} .="Bor Cat" if ($i==0);
+ 			$cell{crit} .="Without issues since" if ($i==1);
  			push @loopfilter, \%cell;
  		}
***************
*** 229,239 ****
  	my $strcalc ;
  	
! # Processing average loanperiods
  	$strcalc .= "SELECT CONCAT( borrowers.surname , \"\\t\",borrowers.firstname, \"\\t\", borrowers.cardnumber)";
  	$strcalc .= " , $colfield " if ($colfield);
! 	$strcalc .= " FROM borrowers LEFT JOIN issues ON  issues.borrowernumber=borrowers.borrowernumber WHERE issues.borrowernumber is null";
  	@$filters[0]=~ s/\*/%/g if (@$filters[0]);
  	$strcalc .= " AND borrowers.categorycode like '" . @$filters[0] ."'" if ( @$filters[0] );
! 	
  	$strcalc .= " group by borrowers.borrowernumber";
  	$strcalc .= ", $colfield" if ($column);
--- 230,253 ----
  	my $strcalc ;
  	
! # Processing calculation
  	$strcalc .= "SELECT CONCAT( borrowers.surname , \"\\t\",borrowers.firstname, \"\\t\", borrowers.cardnumber)";
  	$strcalc .= " , $colfield " if ($colfield);
! 	$strcalc .= " FROM borrowers ";
! 	$strcalc .= "WHERE 1 ";
  	@$filters[0]=~ s/\*/%/g if (@$filters[0]);
  	$strcalc .= " AND borrowers.categorycode like '" . @$filters[0] ."'" if ( @$filters[0] );
! 	if (@$filters[1]){
! 		my $queryfilter = $dbh->prepare("SELECT DISTINCT borrowernumber FROM issues where issues.timestamp>?");
! 		$queryfilter->execute(@$filters[1]);
! 		while (my ($bornum)=$queryfilter->fetchrow){
! 			$strcalc .= " AND borrowers.borrowernumber <> $bornum ";
! 		}
! 	} else {
! 		my $queryfilter = $dbh->prepare("SELECT DISTINCT borrowernumber FROM issues ");
! 		$queryfilter->execute;
! 		while (my ($bornum)=$queryfilter->fetchrow){
! 			$strcalc .= " AND borrowers.borrowernumber <> $bornum ";
! 		}
! 	}
  	$strcalc .= " group by borrowers.borrowernumber";
  	$strcalc .= ", $colfield" if ($column);




From tipaul at users.sourceforge.net  Mon Jun 20 16:36:47 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:36:47 -0700
Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.104,1.105
Message-ID: <E1DkNOJ-0004MS-Cq@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/updater
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16715/updater

Modified Files:
	updatedatabase 
Log Message:
synch'ing 2.2 and head

Index: updatedatabase
===================================================================
RCS file: /cvsroot/koha/koha/updater/updatedatabase,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -r1.104 -r1.105
*** updatedatabase	1 Jun 2005 21:35:05 -0000	1.104
--- updatedatabase	20 Jun 2005 14:36:44 -0000	1.105
***************
*** 834,837 ****
--- 834,855 ----
          {
              uniquefieldrequired => 'variable',
+             variable            => 'opacsmallimage',
+             value               => '',
+ 	    forceupdate		=> { 'explanation' => 1,
+ 	    			     'type' => 1},
+             explanation         => 'Enter a complete URL to an image, will be on top/left instead of the Koha logo',
+ 	    type		=> 'free',
+         },
+         {
+             uniquefieldrequired => 'variable',
+             variable            => 'opaclargeimage',
+             value               => '',
+ 	    forceupdate		=> { 'explanation' => 1,
+ 	    			     'type' => 1},
+             explanation         => 'Enter a complete URL to an image, will be on the main page, instead of the Koha logo',
+ 	    type		=> 'free',
+         },
+         {
+             uniquefieldrequired => 'variable',
              variable            => 'delimiter',
              value               => ';',
***************
*** 863,866 ****
--- 881,904 ----
  	        options		=> ';|tabulation|,|/|\|#'
          },
+         {
+             uniquefieldrequired => 'variable',
+             variable            => 'SubscriptionHistory',
+             value               => ';',
+ 	        forceupdate		=> { 'explanation' => 1,
+ 	    			     'type' => 1,
+ 				     'options' => 1},
+             explanation         => 'Define the information level for serials history in OPAC',
+ 	        type		=> 'Choice',
+ 	        options		=> 'simplified|full'
+         },
+         {
+             uniquefieldrequired => 'variable',
+             variable            => 'hidelostitems',
+             value               => 'No',
+ 	    forceupdate		=> { 'explanation' => 1,
+ 	    			     'type' => 1},
+             explanation         => 'show or hide "lost" items in OPAC.',
+ 	    type		=> 'YesNo',
+         },
      ],
  
***************
*** 1448,1457 ****
  
  # $Log$
! # Revision 1.104  2005/06/01 21:35:05  genjimoto
! # New Feature: catalogsearch() has a new parameter, $sqlstring. A developer puts into it whatever they want to tack onto the end of the where statement. See usage in opac-search.pl
! #
! # Revision 1.103  2005/05/04 09:04:52  tipaul
  # synch'ing 2.2 and head
  #
  # Revision 1.100.2.2  2005/03/29 15:41:43  tipaul
  # * new permissions : management & tools. You now have 2 new permissions :
--- 1486,1501 ----
  
  # $Log$
! # Revision 1.105  2005/06/20 14:36:44  tipaul
  # synch'ing 2.2 and head
  #
+ # Revision 1.100.2.5  2005/06/06 15:23:36  tipaul
+ # adding a systempref to choose either to show or hide "lost" items. Note that "lost items" can be related to an authorised value list, so does not necessary mean "item definetly lost". Even here, some libraries want to see lost items, and some don't want. This parameter will make everybody happy !
+ #
+ # Revision 1.100.2.4  2005/06/06 14:15:55  tipaul
+ # adding 2 systemparameters to define an alternate image as logo in opac (the image on main page & on each top-left page)
+ #
+ # Revision 1.100.2.3  2005/06/02 21:05:34  hdl
+ # adding variable SubscriptionHistory
+ #
  # Revision 1.100.2.2  2005/03/29 15:41:43  tipaul
  # * new permissions : management & tools. You now have 2 new permissions :




From tipaul at users.sourceforge.net  Mon Jun 20 16:36:47 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:36:47 -0700
Subject: [Koha-cvs] CVS: koha/search.marc dictionary.pl,1.6,1.7
Message-ID: <E1DkNOJ-0004ML-02@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16715/search.marc

Modified Files:
	dictionary.pl 
Log Message:
synch'ing 2.2 and head

Index: dictionary.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.marc/dictionary.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** dictionary.pl	1 Jun 2005 12:51:02 -0000	1.6
--- dictionary.pl	20 Jun 2005 14:36:44 -0000	1.7
***************
*** 106,110 ****
  	}
  	$listtags =~s/,$/)/;
! 	$strsth .= $listtags." and marc_word.tagsubfield=marc_subfield_table.tag+marc_subfield_table.subfieldcode group by subfieldvalue ";
  # 	warn "search in biblio : ".$strsth;
  	my $value = uc($search[0]);
--- 106,110 ----
  	}
  	$listtags =~s/,$/)/;
! 	$strsth .= $listtags." and marc_word.tagsubfield=concat(marc_subfield_table.tag,marc_subfield_table.subfieldcode) group by subfieldvalue ";
  # 	warn "search in biblio : ".$strsth;
  	my $value = uc($search[0]);




From tipaul at users.sourceforge.net  Mon Jun 20 16:37:17 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:37:17 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_123i.pl,1.1,1.2 unimarc_field_123j.pl,1.1,1.2
Message-ID: <E1DkNOn-0004Q8-PA@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16867/value_builder

Modified Files:
	unimarc_field_123i.pl unimarc_field_123j.pl 
Log Message:
synch'ing 2.2 and head






From tipaul at users.sourceforge.net  Mon Jun 20 16:37:17 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:37:17 -0700
Subject: [Koha-cvs] CVS: koha/z3950/server zed-koha-server.pl,1.4,1.5
Message-ID: <E1DkNOn-0004QA-PJ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/z3950/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16867/z3950/server

Modified Files:
	zed-koha-server.pl 
Log Message:
synch'ing 2.2 and head

Index: zed-koha-server.pl
===================================================================
RCS file: /cvsroot/koha/koha/z3950/server/zed-koha-server.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** zed-koha-server.pl	3 Jun 2004 01:48:19 -0000	1.4
--- zed-koha-server.pl	20 Jun 2005 14:37:15 -0000	1.5
***************
*** 58,62 ****
  use C4::Biblio;
  use strict;
! my $dbh = C4::Context->dbh;
  my @bib_list;		## Stores the list of biblionumbers in a query 
  			## I should eventually move this to different scope
--- 58,62 ----
  use C4::Biblio;
  use strict;
! # my $dbh = C4::Context->dbh;
  my @bib_list;		## Stores the list of biblionumbers in a query 
  			## I should eventually move this to different scope
***************
*** 86,89 ****
--- 86,90 ----
  sub run_query {		## Run the query and store the biblionumbers: 
  	my ($sql_query, $query, $args) = @_;
+ 		my $dbh = C4::Context->dbh;
         	my $sth_get = $dbh->prepare("$sql_query");
  
***************
*** 145,149 ****
  		print "The query was:\n";        
  		print "$query\n";
! 		my $sql_query = "SELECT marc_biblio.bibid FROM marc_biblio RIGHT JOIN biblio ON marc_biblio.biblionumber = biblio.biblionumber WHERE biblio.isbn LIKE ?";
  		&run_query($sql_query, $query, $args);
  
--- 146,150 ----
  		print "The query was:\n";        
  		print "$query\n";
! 		my $sql_query = "SELECT marc_biblio.bibid FROM marc_biblio RIGHT JOIN biblioitems ON marc_biblio.biblionumber = biblioitems.biblionumber WHERE biblioitems.isbn LIKE ?";
  		&run_query($sql_query, $query, $args);
  
***************
*** 269,392 ****
          $offset -= 1;                   ## because $args->{OFFSET} 1 = record #1
          chomp (my $bibid = $bib_list[$offset]); ## Not sure about this
!                 ## print "the bibid is:$bibid\n";
!                 my $MARCRecord = &MARCgetbiblio($dbh,$bibid);
!                 my $recordstring=$MARCRecord->as_usmarc();
!                 ## print "here is my record: $recordstring\n";
! 
! 		## Troubleshooting:
! 		## use Data::Dumper;
! 		## Dumper $recordstring;
! 		## open (MARC, ">/root/marc.dump");
!                 ## print MARC "$recordstring";
! 		## close MARC;
! 		
! 		## Convert from 852/4 to 952:
! 		## 942a --> 852a  Organization code
! 		## 952b --> 852b  Home branch
! 		## 942k --> 852h  Classification
! 		## 952p --> 852p  Barcode
! 
! my $record = MARC::Record->new_from_usmarc($recordstring);
!     my @fields942 = $record->field('942');
!     my $field842 = $fields942[0];
! 	my ($field952, $sub852a, $sub852k, $sub852b, $sub852p, $sub852h);
!        
! 
! ## while ( my $record = $batch->next() ) {
!   ##  my @fields942 = $record->field('942');
!   ##  my $field842 = $fields942[0];
!   ##     #grab first 942 (only need one, they are same for all items)
!   ##  my $sub852a = ($field842->subfield('a') || '');
!   ##  my $sub852h = ($field842->subfield('k') || '');
! 
!   ##  my @fields952 = $record->field('952');
!   ##  foreach my $field952 (@fields952) {   #get all 952s
!   ##      my $sub852b = ($field952->subfield('b') || '');
!   ##      my $sub852p = ($field952->subfield('p') || '');
! 
! 
! #grab first 942 (only need one, they are same for all items)
! 	unless (! $field952){
! 		$sub852a = ($field952->subfield('a') || '') ;
! }
! 	unless (! $field952){ #->subfield('k')) { 
! 		$sub852k = ($field952->subfield('k') || '') ;
! 
! }
! 
!     my @fields952 = $record->field('952');
!     foreach my $field952 (@fields952) {   #get all 952s
!         
!         unless (! $field952) { #->subfield('b')) { 
! 		$sub852b = ($field952->subfield('b') || '') ;
! } 
!  unless (! $field952) { #->subfield('p')) { 
! 		$sub852p = ($field952->subfield('p') || '') ;
! }
!      #make it one big happy family
!         my $new852 = MARC::Field->new(
!                                       852,'','',
!                                       'a' => $sub852a,
! 				      'b' => $sub852b,
!                                       'h' => $sub852h,
!                                       'p' => $sub852p,
!                                       );
!         $record->append_fields($new852);
! 
! }
! 
! my $recordstringdone = $record->as_usmarc();
! 
  		## Set the REP_FORM
! 		$args->{REP_FORM} = &Net::Z3950::OID::usmarc;
  		
  		## Return the record string to the client 
! 	        $args->{RECORD} = $recordstringdone;
  
  }
  
- # That's all folks!
- # 
- # OLD OLD OLD OLD
- 
- sub fetch_handler_old {
- 	my ($args) = @_;	
- 	# warn "in fetch_handler";	## troubleshooting
- 	my $offset = $args->{OFFSET};
- 	$offset -= 1;			## because $args->{OFFSET} 1 = record #1
- 	chomp (my $bibid = $bib_list[$offset]);	## Not sure about this
-         my $sql_query = "SELECT tag, subfieldcode, subfieldvalue FROM marc_subfield_table where bibid=?";
- 	my $sth_get = $dbh->prepare("$sql_query");
-         $sth_get->execute($bibid);
- 	
- 	## create a MARC::Record object 
-         my $rec = MARC::Record->new();
- 
- 	## create the fields
-         while (my @data=$sth_get->fetchrow_array) {
- 
-         	my $tag = $data[0];
-        		my $subfieldcode = $data[1];
-         	my $subfieldvalue = $data[2];
- 
-         	my $field = MARC::Field->new(
-                 	                          $tag,'','',
-                         	                  $subfieldcode => $subfieldvalue,
-                                 	    );
  
-  	       	$rec->append_fields($field);
- 		
- 		## build the marc string and put into $record         
-         	my $tmp_record = $rec->as_usmarc();
- 		my $reclen = length $tmp_record;
- 		my $baseaddr = "$reclen + dirlen";
- #		set_leader_lengths($reclen,$baseaddr);
- 		my $record = $rec->as_usmarc(); 	
- 		$args->{RECORD} = $record;
- 	}
- 
- }
- 
- 	
  ## This stuff doesn't work yet...I should include boolean searching someday
  ## though
--- 270,287 ----
          $offset -= 1;                   ## because $args->{OFFSET} 1 = record #1
          chomp (my $bibid = $bib_list[$offset]); ## Not sure about this
! 				## print "the bibid is:$bibid\n";
! 				my $dbh = C4::Context->dbh;
! 				my $MARCRecord = &MARCgetbiblio($dbh,$bibid);
! 				$MARCRecord->leader('     nac  22     1u 4500');
  		## Set the REP_FORM
! 		$args->{REP_FORM} = &Net::Z3950::OID::unimarc;
  		
  		## Return the record string to the client 
! 			$args->{RECORD} = $MARCRecord->as_usmarc();
! # 	        $args->{RECORD} = $recordstringdone;
  
  }
  
  
  ## This stuff doesn't work yet...I should include boolean searching someday
  ## though




From tipaul at users.sourceforge.net  Mon Jun 20 16:37:53 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:37:53 -0700
Subject: [Koha-cvs] CVS: koha/z3950 processz3950queue,1.14,1.15
Message-ID: <E1DkNPN-0004aL-VM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/z3950
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17418/z3950

Modified Files:
	processz3950queue 
Log Message:
synch'ing 2.2 and head

Index: processz3950queue
===================================================================
RCS file: /cvsroot/koha/koha/z3950/processz3950queue,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** processz3950queue	4 May 2005 09:04:52 -0000	1.14
--- processz3950queue	20 Jun 2005 14:37:51 -0000	1.15
***************
*** 281,292 ****
  									for ($i=1; $i<=(($numresults<80) ? ($numresults) : (80)); $i++) {
  										my $rec=$rs->record($i);
!  										my $marcdata;
! 										# use render() or rawdata() depending on the type of the returned record
! 										if (ref($rec) eq "Net::Z3950::Record::USMARC") {
! 											$marcdata = $rec->rawdata();
! 										}
! 										if (ref($rec) eq "Net::Z3950::Record::UNIMARC") {
! 											$marcdata = $rec->rawdata();
! 										}
  										$globalencoding = ref($rec);
   										$result.=$marcdata;
--- 281,285 ----
  									for ($i=1; $i<=(($numresults<80) ? ($numresults) : (80)); $i++) {
  										my $rec=$rs->record($i);
!  										my $marcdata = $rec->rawdata();
  										$globalencoding = ref($rec);
   										$result.=$marcdata;




From tipaul at users.sourceforge.net  Mon Jun 20 16:37:55 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:37:55 -0700
Subject: [Koha-cvs] CVS: koha help.pl,1.1,1.2 mainpage.pl,1.9,1.10 MARCdetail.pl,1.27,1.28
Message-ID: <E1DkNPP-0004aj-6E@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17418

Modified Files:
	help.pl mainpage.pl MARCdetail.pl 
Log Message:
synch'ing 2.2 and head

Index: help.pl
===================================================================
RCS file: /cvsroot/koha/koha/help.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** help.pl	3 Jun 2004 10:22:59 -0000	1.1
--- help.pl	20 Jun 2005 14:37:51 -0000	1.2
***************
*** 30,34 ****
  	unless (-e "$htdocs/$theme/$lang/$tmplbase") {
  		$tmplbase="help/nohelp.tmpl";
! 		my ($theme, $lang) = themelanguage($htdocs, $tmplbase, "intranet");
  	}
  	my $template = HTML::Template->new(filename      => "$htdocs/$theme/$lang/$tmplbase",
--- 30,34 ----
  	unless (-e "$htdocs/$theme/$lang/$tmplbase") {
  		$tmplbase="help/nohelp.tmpl";
! 		($theme, $lang) = themelanguage($htdocs, $tmplbase, "intranet");
  	}
  	my $template = HTML::Template->new(filename      => "$htdocs/$theme/$lang/$tmplbase",

Index: mainpage.pl
===================================================================
RCS file: /cvsroot/koha/koha/mainpage.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** mainpage.pl	22 Dec 2003 14:54:53 -0000	1.9
--- mainpage.pl	20 Jun 2005 14:37:52 -0000	1.10
***************
*** 8,13 ****
--- 8,24 ----
  use CGI;
  use C4::Auth;
+ use C4::AuthoritiesMarc;
+ use C4::Koha;
  
  my $query = new CGI;
+ my $authtypes = getauthtypes;
+ my @authtypesloop;
+ foreach my $thisauthtype (sort { $authtypes->{$a} <=> $authtypes->{$b} } keys %$authtypes) {
+ 	my %row =(value => $thisauthtype,
+ 				authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
+ 			);
+ 	push @authtypesloop, \%row;
+ }
+ 
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "intranet-main.tmpl",
***************
*** 25,28 ****
--- 36,40 ----
  my $marc_p = C4::Context->boolean_preference("marc");
  $template->param(NOTMARC => !$marc_p);
+ $template->param(authtypesloop => \@authtypesloop);
  
  output_html_with_http_headers $query, $cookie, $template->output;

Index: MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/MARCdetail.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** MARCdetail.pl	15 Jun 2005 16:09:44 -0000	1.27
--- MARCdetail.pl	20 Jun 2005 14:37:52 -0000	1.28
***************
*** 66,74 ****
  my $biblionumber=$query->param('bib');
  my $bibid = $query->param('bibid');
  my $popup = $query->param('popup'); # if set to 1, then don't insert links, it's just to show the biblio
  
  $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber) unless $bibid;
  $biblionumber = &MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid) unless $biblionumber;
! my $itemtype = &MARCfind_frameworkcode($dbh,$bibid);
  my $tagslib = &MARCgettagslib($dbh,1,$itemtype);
  
--- 66,78 ----
  my $biblionumber=$query->param('bib');
  my $bibid = $query->param('bibid');
+ my $itemtype = $query->param('frameworkcode');
  my $popup = $query->param('popup'); # if set to 1, then don't insert links, it's just to show the biblio
  
  $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber) unless $bibid;
  $biblionumber = &MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid) unless $biblionumber;
! $itemtype = &MARCfind_frameworkcode($dbh,$bibid) if not ($itemtype);
! $itemtype = '' if ($itemtype eq 'Default');
! warn "itemtype :".$itemtype;
! 
  my $tagslib = &MARCgettagslib($dbh,1,$itemtype);
  
***************
*** 84,87 ****
--- 88,115 ----
  			     });
  
+ #Getting the list of all frameworks
+ my $queryfwk =$dbh->prepare("select frameworktext, frameworkcode from biblio_framework");
+ $queryfwk->execute;
+ my %select_fwk;
+ my @select_fwk;
+ my $curfwk;
+ push @select_fwk,"Default";
+ $select_fwk{"Default"} = "Default";
+ while (my ($description, $fwk) =$queryfwk->fetchrow) {
+ 	push @select_fwk, $fwk;
+ 	$select_fwk{$fwk} = $description;
+ }
+ $curfwk=$itemtype;
+ warn "current fwk :".$curfwk ;
+ my $framework=CGI::scrolling_list( -name     => 'Frameworks',
+ 			-id => 'Frameworks',
+ 			-default => $curfwk,
+ 			-OnChange => 'Changefwk(this);',
+ 			-values   => \@select_fwk,
+ 			-labels   => \%select_fwk,
+ 			-size     => 1,
+ 			-multiple => 0 );
+ 
+ $template->param( framework => $framework);
  # fill arrays
  my @loop_data =();




From tipaul at users.sourceforge.net  Mon Jun 20 16:39:15 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:39:15 -0700
Subject: [Koha-cvs] CVS: koha pay.pl,1.11,1.12 search.pl,1.35,1.36
Message-ID: <E1DkNQh-0004lu-00@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18131

Modified Files:
	pay.pl search.pl 
Log Message:
synch'ing 2.2 and head

Index: pay.pl
===================================================================
RCS file: /cvsroot/koha/koha/pay.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** pay.pl	1 Mar 2005 13:40:47 -0000	1.11
--- pay.pl	20 Jun 2005 14:39:01 -0000	1.12
***************
*** 56,60 ****
  my $check=0;
  for (my $i=0;$i<@names;$i++){
! 	my$temp=$input->param($names[$i]);
  	if ($temp eq 'wo'){
  		$inp{$names[$i]}=$temp;
--- 56,60 ----
  my $check=0;
  for (my $i=0;$i<@names;$i++){
! 	my $temp=$input->param($names[$i]);
  	if ($temp eq 'wo'){
  		$inp{$names[$i]}=$temp;
***************
*** 65,68 ****
--- 65,69 ----
  		$user=~ s/Foxton/F/i;
  		$user=~ s/Shannon/S/i;
+ 		# FIXME : using array +4, +5, +6 is dirty. Should use arrays for each accountline
  		my $amount=$input->param($names[$i+4]);
  		my $bornum=$input->param($names[$i+5]);
***************
*** 146,150 ****
  	}
  	$bornum=$input->param('bornum');
! 	print $input->redirect("/cgi-bin/koha/pay.pl?bornum=$bornum");
  }
  
--- 147,151 ----
  	}
  	$bornum=$input->param('bornum');
! 	print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$bornum");
  }
  

Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.pl,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** search.pl	7 Apr 2004 22:43:04 -0000	1.35
--- search.pl	20 Jun 2005 14:39:11 -0000	1.36
***************
*** 20,23 ****
--- 20,30 ----
  
  # $Log$
+ # Revision 1.36  2005/06/20 14:39:11  tipaul
+ # synch'ing 2.2 and head
+ #
+ # Revision 1.35.2.1  2005/05/27 10:02:50  hdl
+ # Bug Fixing : Using old search.pl with subjectitems In normal mode display.
+ # Problem : Changing Page doesn't work.
+ #
  # Revision 1.35  2004/04/07 22:43:04  rangi
  # Fix for bug 217
***************
*** 100,104 ****
  foreach my $term (qw(keyword subject author illustrator itemnumber
  		     isbn date-before class dewey branch title abstract
! 		     publisher ttype))
  {
  	my $value = $query->param($term);
--- 107,111 ----
  foreach my $term (qw(keyword subject author illustrator itemnumber
  		     isbn date-before class dewey branch title abstract
! 		     publisher ttype subjectitems))
  {
  	my $value = $query->param($term);




From slef at users.sourceforge.net  Mon Jun 20 19:05:20 2005
From: slef at users.sourceforge.net (MJ Ray)
Date: Mon, 20 Jun 2005 10:05:20 -0700
Subject: [Koha-cvs] CVS: koha/z3950 z3950-daemon-launch.sh,1.4,1.5
Message-ID: <E1DkPi4-0008G5-Ae@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/z3950
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31711

Modified Files:
	z3950-daemon-launch.sh 
Log Message:
Removed -s from su call after Thomas D reports it breaks FreeBSD

Index: z3950-daemon-launch.sh
===================================================================
RCS file: /cvsroot/koha/koha/z3950/z3950-daemon-launch.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** z3950-daemon-launch.sh	5 Nov 2003 23:33:45 -0000	1.4
--- z3950-daemon-launch.sh	20 Jun 2005 17:05:17 -0000	1.5
***************
*** 33,37 ****
  fi
  
! su -s /bin/sh -c $KohaZ3950Shell - $RunAsUser &
  
  exit
--- 33,38 ----
  fi
  
! #MJR: removed -s option, as we have a #! at the start of z3950-daemon-shell.sh
! su -c $KohaZ3950Shell - $RunAsUser &
  
  exit
***************
*** 39,42 ****
--- 40,46 ----
  #--------------
  # $Log$
+ # Revision 1.5  2005/06/20 17:05:17  slef
+ # Removed -s from su call after Thomas D reports it breaks FreeBSD
+ #
  # Revision 1.4  2003/11/05 23:33:45  slef
  # Now figures out what directory the scripts are in




From hdl at users.sourceforge.net  Tue Jun 21 09:39:23 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 21 Jun 2005 00:39:23 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members member.tmpl,1.16,1.17 member-quicksearch-results.tmpl,1.2,1.3
Message-ID: <E1DkdLv-0006BO-4R@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	member.tmpl member-quicksearch-results.tmpl 
Log Message:
Displaying line counter 

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** member.tmpl	20 Jun 2005 10:14:12 -0000	1.16
--- member.tmpl	21 Jun 2005 07:39:20 -0000	1.17
***************
*** 22,25 ****
--- 22,26 ----
  	<table>
  		<tr>
+ 			<th>&nbsp;</th>
  			<th>Card</th>
  			<th>Surname</th>
***************
*** 37,40 ****
--- 38,42 ----
  				<tr bgcolor="white">
  			<!-- /TMPL_IF -->
+ 				<td><!-- TMPL_VAR NAME="count" --></td>
  				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
  				<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" --></a></td>

Index: member-quicksearch-results.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** member-quicksearch-results.tmpl	20 Jun 2005 10:14:12 -0000	1.2
--- member-quicksearch-results.tmpl	21 Jun 2005 07:39:20 -0000	1.3
***************
*** 21,25 ****
  				<tr bgcolor="white">
  			<!-- /TMPL_IF -->
! 				<td><form action="member-search-results.pl" method="get"><input type="button" class="button" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','request','member'); return false;" /></form></td>
  				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
  				<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" --></a></td>
--- 21,25 ----
  				<tr bgcolor="white">
  			<!-- /TMPL_IF -->
! 				<td><!-- TMPL_VAR NAME="count" --><form action="member-search-results.pl" method="get"><input type="button" class="button" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','request','member'); return false;" /></form></td>
  				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
  				<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" --></a></td>




From hdl at users.sourceforge.net  Tue Jun 21 09:42:26 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 21 Jun 2005 00:42:26 -0700
Subject: [Koha-cvs] CVS: koha/members member.pl,1.6,1.7
Message-ID: <E1DkdOs-0006TL-Ee@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24852/members

Modified Files:
	member.pl 
Log Message:
Adding countlines

Index: member.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/member.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** member.pl	20 Jun 2005 10:14:12 -0000	1.6
--- member.pl	21 Jun 2005 07:42:24 -0000	1.7
***************
*** 90,93 ****
--- 90,94 ----
    my %row = (
    	background => $background,
+ 		count => $i + 1,
          borrowernumber => $results->[$i]{'borrowernumber'},
          cardnumber => $results->[$i]{'cardnumber'},




From hdl at users.sourceforge.net  Tue Jun 21 12:09:41 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 21 Jun 2005 03:09:41 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui histsearch.tmpl,1.4,1.5
Message-ID: <E1DkfhN-0000Ec-Lr@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	histsearch.tmpl 
Log Message:
Adding line counter

Index: histsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** histsearch.tmpl	20 Jun 2005 14:13:22 -0000	1.4
--- histsearch.tmpl	21 Jun 2005 10:09:39 -0000	1.5
***************
*** 109,113 ****
  			<tr>
  				<td>
! 					&nbsp;
  				</td>
  				<td>
--- 109,113 ----
  			<tr>
  				<td>
! 					<!-- TMPL_VAR Name="count"-->
  				</td>
  				<td>




From tipaul at users.sourceforge.net  Tue Jun 21 16:50:30 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 21 Jun 2005 07:50:30 -0700
Subject: [Koha-cvs] CVS: koha/authorities auth_finder.pl,1.5.2.2,1.5.2.3
Message-ID: <E1Dkk58-0004Ia-8C@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16360/authorities

Modified Files:
      Tag: rel_2_2
	auth_finder.pl 
Log Message:
bugfix for next/previous and number links on result list, when long list of results

Index: auth_finder.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/auth_finder.pl,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -C2 -r1.5.2.2 -r1.5.2.3
*** auth_finder.pl	7 Apr 2005 10:03:24 -0000	1.5.2.2
--- auth_finder.pl	21 Jun 2005 14:50:26 -0000	1.5.2.3
***************
*** 93,98 ****
  
  
  	for(my $i = 0 ; $i <= $#marclist ; $i++) {
! 		push @field_data, { term => "marclist", val=>$marclist[$i] };
  		push @field_data, { term => "and_or", val=>$and_or[$i] };
  		push @field_data, { term => "excluding", val=>$excluding[$i] };
--- 93,99 ----
  
  
+ 	my @marclist_ini = $query->param('marclist'); # get marclist again, as the previous one has been modified by catalogsearch (mainentry replaced by field name
  	for(my $i = 0 ; $i <= $#marclist ; $i++) {
! 		push @field_data, { term => "marclist", val=>$marclist_ini[$i] };
  		push @field_data, { term => "and_or", val=>$and_or[$i] };
  		push @field_data, { term => "excluding", val=>$excluding[$i] };
***************
*** 158,162 ****
  $template->param(authtypesloop => \@authtypesloop,
  				authtypecode => $authtypecode);
- warn "CAT : $authtypecode";
  
  # Print the page
--- 159,162 ----




From tipaul at users.sourceforge.net  Tue Jun 21 16:50:31 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 21 Jun 2005 07:50:31 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/authorities searchresultlist-auth.tmpl,1.5.2.2,1.5.2.3
Message-ID: <E1Dkk59-0004J3-QL@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	searchresultlist-auth.tmpl 
Log Message:
bugfix for next/previous and number links on result list, when long list of results

Index: searchresultlist-auth.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -C2 -r1.5.2.2 -r1.5.2.3
*** searchresultlist-auth.tmpl	18 Mar 2005 09:42:26 -0000	1.5.2.2
--- searchresultlist-auth.tmpl	21 Jun 2005 14:50:26 -0000	1.5.2.3
***************
*** 46,50 ****
  			<p>
  				<!-- TMPL_IF name="displayprev" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  						<img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
  					</a>
--- 46,50 ----
  			<p>
  				<!-- TMPL_IF name="displayprev" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  						<img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
  					</a>
***************
*** 54,63 ****
  						<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
  					<!-- TMPL_ELSE -->
! 						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  							<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
  					<!-- /TMPL_IF -->
  				<!-- /TMPL_LOOP -->
  				<!-- TMPL_IF name="displaynext" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  						<img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
  				<!-- /TMPL_IF -->
--- 54,63 ----
  						<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
  					<!-- TMPL_ELSE -->
! 						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  							<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
  					<!-- /TMPL_IF -->
  				<!-- /TMPL_LOOP -->
  				<!-- TMPL_IF name="displaynext" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  						<img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
  				<!-- /TMPL_IF -->




From tipaul at users.sourceforge.net  Tue Jun 21 15:34:29 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 21 Jun 2005 06:34:29 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marctagstructure.tmpl,1.27.2.6,1.27.2.7
Message-ID: <E1DkitZ-0003bE-8C@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	marctagstructure.tmpl 
Log Message:
template creators : REMEMBER that TRANSLATOR tool really HATES <!-- TMPL_IF --> inside a standard html tag, like :
<td <!-- tmpl_if name="x">class="x"<!-- /TMPL_IF -->> or
<input ... <!-- tmpl_if name="y" --> checked<!-- /TMPL_IF -->>

pls alway write :
<!-- TMPL_IF name="y" -->
	<input ... checked>
<!-- TMPL_ELSE -->
	<input ...>
<!-- /TMPL_IF -->

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.27.2.6
retrieving revision 1.27.2.7
diff -C2 -r1.27.2.6 -r1.27.2.7
*** marctagstructure.tmpl	1 Jun 2005 14:29:21 -0000	1.27.2.6
--- marctagstructure.tmpl	21 Jun 2005 13:34:26 -0000	1.27.2.7
***************
*** 125,130 ****
  		<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
  		<input type="submit" value="OK" class="button">
! 		<p>
! 		<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True" <!-- TMPL_IF Name="select_display"-->checked<!--/TMPL_IF -->  OnChange="javascript:document.f.submit()">
  		</p>
  	</form>
--- 125,133 ----
  		<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
  		<input type="submit" value="OK" class="button">
! 		<p><!-- TMPL_IF Name="select_display"-->
! 				<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True" checked OnChange="javascript:document.f.submit()">
! 			<!-- TMPL_ELSE -->
! 				<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True" OnChange="javascript:document.f.submit()">
! 			<!--/TMPL_IF --> 
  		</p>
  	</form>




From oleonard at users.sourceforge.net  Wed Jun 22 00:05:33 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 21 Jun 2005 15:05:33 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-detail.tmpl,1.1.2.4,1.1.2.5
Message-ID: <E1Dkqs9-0000Ci-2W@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-detail.tmpl 
Log Message:
Removing extra junk from WorldCat query string

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** opac-detail.tmpl	9 Jun 2005 19:21:10 -0000	1.1.2.4
--- opac-detail.tmpl	21 Jun 2005 22:05:30 -0000	1.1.2.5
***************
*** 22,27 ****
  <h4>Search for this title in:</h4>
  <ul><!-- Display for NPL // <li><a href="http://search3.webfeat.org/cgi-bin/webfeat.dll?Command=Search&BypassSessData=yes&noserial=1&Databases=wf_sirsdiscover,wf_elibrary2_e,wf_ebonline,wf_healthsourceconsumer,wf_masterfileprem,wf_newspapersource&wf_cat=0&Client_ID=oplin&wf_all_years=yes&wf_field1=wf_keyword&wf_term1=<!-- TMPL_VAR NAME="title" -->&rurl=http%3A//www.oplin.org/&wut_code=OH0156">Local Databases (OPLIN)</a></li> //Display for NPL -->
! <li><a href="http://www.google.com/search?q=<!-- TMPL_VAR NAME="title" -->%20england+site:worldcatlibraries.org">Other Libraries(WorldCat)</a></li>
! <li><a href="http://www.scholar.google.com/scholar?q=<!-- TMPL_VAR NAME="title" -->">Other Databases (Google Scholar)</a></li></ul></div>
  </div>
  <h2><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="subtitle" --> <span class="subtitle"><!-- TMPL_VAR NAME="subtitle" --></span><!-- /TMPL_IF --></h2>
--- 22,27 ----
  <h4>Search for this title in:</h4>
  <ul><!-- Display for NPL // <li><a href="http://search3.webfeat.org/cgi-bin/webfeat.dll?Command=Search&BypassSessData=yes&noserial=1&Databases=wf_sirsdiscover,wf_elibrary2_e,wf_ebonline,wf_healthsourceconsumer,wf_masterfileprem,wf_newspapersource&wf_cat=0&Client_ID=oplin&wf_all_years=yes&wf_field1=wf_keyword&wf_term1=<!-- TMPL_VAR NAME="title" -->&rurl=http%3A//www.oplin.org/&wut_code=OH0156">Local Databases (OPLIN)</a></li> //Display for NPL -->
! <li><a href="http://www.google.com/search?q=<!-- TMPL_VAR NAME="title" ESCAPE="url" -->+site:worldcatlibraries.org">Other Libraries(WorldCat)</a></li>
! <li><a href="http://www.scholar.google.com/scholar?q=<!-- TMPL_VAR NAME="title" ESCAPE="url" -->">Other Databases (Google Scholar)</a></li></ul></div>
  </div>
  <h2><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="subtitle" --> <span class="subtitle"><!-- TMPL_VAR NAME="subtitle" --></span><!-- /TMPL_IF --></h2>




From hdl at users.sourceforge.net  Wed Jun 22 11:36:26 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 22 Jun 2005 02:36:26 -0700
Subject: [Koha-cvs] CVS: koha/acqui newbiblio.pl,1.21,1.22
Message-ID: <E1Dl1ek-0005Uo-QO@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21033/acqui

Modified Files:
	newbiblio.pl 
Log Message:
Adding scrolling list for sort1 and sort2

Index: newbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** newbiblio.pl	14 Sep 2004 12:09:52 -0000	1.21
--- newbiblio.pl	22 Jun 2005 09:36:24 -0000	1.22
***************
*** 25,28 ****
--- 25,29 ----
  use CGI;
  use C4::Context;
+ use C4::Input;
  use C4::Database;
  use C4::Auth;
***************
*** 140,143 ****
--- 141,159 ----
  			-multiple => 0 );
  
+ my $CGIsort1 = buildCGIsort("Bsort1","sort1",$data->{'sort1'});
+ if ($CGIsort1) {
+ 	$template->param(CGIsort1 => $CGIsort1);
+ } else {
+ 	$template->param( sort1 => $data->{'sort1'});
+ }
+ 
+ my $CGIsort2 = buildCGIsort("Bsort2","sort2",$data->{'sort2'});
+ if ($CGIsort2) {
+ 	$template->param(CGIsort2 =>$CGIsort2);
+ } else {
+ 	$template->param( sort2 => $data->{'sort2'});
+ }
+ 			
+ 			
  # fill template
  $template->param( existing => $biblio,
***************
*** 173,178 ****
  						ecost => $data->{'ecost'},
  						notes => $data->{'notes'},
- 						sort1 => $data->{'sort1'},
- 						sort2 => $data->{'sort2'},
  						publishercode => $data->{'publishercode'});
  
--- 189,192 ----




From hdl at users.sourceforge.net  Wed Jun 22 11:36:26 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 22 Jun 2005 02:36:26 -0700
Subject: [Koha-cvs] CVS: koha/members memberentry.pl,1.10,1.11
Message-ID: <E1Dl1ek-0005UP-Dp@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21033/members

Modified Files:
	memberentry.pl 
Log Message:
Adding scrolling list for sort1 and sort2

Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/memberentry.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** memberentry.pl	20 Jun 2005 14:26:03 -0000	1.10
--- memberentry.pl	22 Jun 2005 09:36:24 -0000	1.11
***************
*** 61,64 ****
--- 61,66 ----
  my $destination=$input->param('destination');
  
+ 
+ 
  my $nok;
  # if a add or modify is requested => check validity of data.
***************
*** 233,237 ****
--- 235,254 ----
  				-size     => 1,
  				-multiple => 0 );
+ 				
  
+ 	my $CGIsort1 = buildCGIsort("Bsort1","sort1",$data->{'sort1'});
+ 	if ($CGIsort1) {
+ 		$template->param(CGIsort1 => $CGIsort1);
+ 	} else {
+ 		$template->param( sort1 => $data->{'sort1'});
+ 	}
+ 
+ 	my $CGIsort2 = buildCGIsort("Bsort2","sort2",$data->{'sort2'});
+ 	if ($CGIsort2) {
+ 		$template->param(CGIsort2 =>$CGIsort2);
+ 	} else {
+ 		$template->param( sort2 => $data->{'sort2'});
+ 	}
+ 	
  	$template->param(	actionType 		=> $actionType,
  				destination => $destination,
***************
*** 266,271 ****
  				cardnumber	=> $cardnumber,
  				dateofbirth	=> $data->{'dateofbirth'},
- 				sort1 => $data->{'sort1'},
- 				sort2 => $data->{'sort2'},
  				dateformat      => display_date_format(),
  			        modify          => $modify,
--- 283,286 ----




From hdl at users.sourceforge.net  Wed Jun 22 11:36:26 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 22 Jun 2005 02:36:26 -0700
Subject: [Koha-cvs] CVS: koha/C4 Input.pm,1.16,1.17
Message-ID: <E1Dl1ek-0005Uh-Na@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21033/C4

Modified Files:
	Input.pm 
Log Message:
Adding scrolling list for sort1 and sort2

Index: Input.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Input.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** Input.pm	28 Nov 2003 14:06:57 -0000	1.16
--- Input.pm	22 Jun 2005 09:36:24 -0000	1.17
***************
*** 22,25 ****
--- 22,26 ----
  require Exporter;
  use C4::Context;
+ use CGI;
  
  use vars qw($VERSION @ISA @EXPORT);
***************
*** 50,53 ****
--- 51,55 ----
  @EXPORT = qw(
  	&checkdigit &checkvalidisbn
+ 	&buildCGIsort
  );
  
***************
*** 141,175 ****
  #   of 10 digits and valid checksum
  sub checkvalidisbn {
!         use strict;
!         my ($q)=@_ ;	# Input: ISBN number
! 
!         my $isbngood = 0; # Return: true or false
! 
!         $q=~s/x$/X/g;           # upshift lower case X
!         $q=~s/[^X\d]//g;
!         $q=~s/X.//g;
!         
! 	#return 0 if $q is not ten digits long
! 	if (length($q)!=10) {
! 		return 0;
! 	}
  	
! 	#If we get to here, length($q) must be 10
!         my $checksum=substr($q,9,1);
!         my $isbn=substr($q,0,9);
!         my $i;
!         my $c=0;
!         for ($i=0; $i<9; $i++) {
!             my $digit=substr($q,$i,1);
!             $c+=$digit*(10-$i);
!         }
  	$c %= 11;
!         ($c==10) && ($c='X');
!         $isbngood = $c eq $checksum;
! 
!         return $isbngood;
  
  } # sub checkvalidisbn
  
  END { }       # module clean-up code here (global destructor)
  
--- 143,214 ----
  #   of 10 digits and valid checksum
  sub checkvalidisbn {
! 	use strict;
! 	my ($q)=@_ ;	# Input: ISBN number
! 	
! 	my $isbngood = 0; # Return: true or false
! 	
! 	$q=~s/x$/X/g;   # upshift lower case X
! 	$q=~s/[^X\d]//g;
! 	$q=~s/X.//g;
  	
! 		#return 0 if $q is not ten digits long
! 		if (length($q)!=10) {
! 			return 0;
! 		}
! 		
! 		#If we get to here, length($q) must be 10
! 	my $checksum=substr($q,9,1);
! 	my $isbn=substr($q,0,9);
! 	my $i;
! 	my $c=0;
! 	for ($i=0; $i<9; $i++) {
! 		my $digit=substr($q,$i,1);
! 		$c+=$digit*(10-$i);
! 	}
  	$c %= 11;
! 	($c==10) && ($c='X');
! 	$isbngood = $c eq $checksum;
! 	return $isbngood;
  
  } # sub checkvalidisbn
  
+ =item buildCGISort
+ 
+   $CGIScrollingList = &BuildCGISort($name string, $input_name string);
+ 
+ Returns the scrolling list with name $input_name, built on authorised Values named $name.
+ Returns NULL if no authorised values found
+ 
+ =cut
+ #'
+ #--------------------------------------
+ # Determine if a number is a valid ISBN number, according to length
+ #   of 10 digits and valid checksum
+ sub buildCGIsort {
+     use strict;
+ 	my ($name,$input_name,$data) = @_;
+ 	my $dbh=C4::Context->dbh;
+ 	my $query=qq{SELECT * FROM authorised_values WHERE category=?};
+ 	my $sth=$dbh->prepare($query);
+ 	$sth->execute($name);
+ 	my $CGISort;
+ 	if ($sth->rows>0){
+ 		my @values;
+ 		my %labels;
+ 		for (my $i =0;$i<=$sth->rows;$i++){
+ 			my $results = $sth->fetchrow_hashref;
+  			push @values, $results->{authorised_value};
+  			$labels{$results->{authorised_value}}=$results->{lib};
+ 		}
+  		$CGISort= CGI::scrolling_list(
+  					-name => $input_name,
+  					-values => \@values,
+  					-labels => \%labels,
+ 					-default=> $data,
+  					-size => 1,
+  					-multiple => 0);
+ 	} 
+ 	return $CGISort;
+ }
  END { }       # module clean-up code here (global destructor)
  




From hdl at users.sourceforge.net  Wed Jun 22 11:36:26 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 22 Jun 2005 02:36:26 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui newbiblio.tmpl,1.19,1.20
Message-ID: <E1Dl1ek-0005Ud-Kv@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	newbiblio.tmpl 
Log Message:
Adding scrolling list for sort1 and sort2

Index: newbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** newbiblio.tmpl	4 May 2005 08:52:49 -0000	1.19
--- newbiblio.tmpl	22 Jun 2005 09:36:24 -0000	1.20
***************
*** 199,207 ****
  		<p>
  			<label class="label100">Sort field 1</label>
! 			<input type="text" size="20" name=sort1 value="<!-- TMPL_VAR NAME="sort1" -->">
  		</p>
  		<p>
  			<label class="label100">Sort field 2</label>
! 			<input type="text" size="20" name=sort2 value="<!-- TMPL_VAR NAME="sort2" -->">
  		</p>
  		<p>
--- 199,215 ----
  		<p>
  			<label class="label100">Sort field 1</label>
! 			<!-- TMPL_IF Name="CGIsort1" -->
! 				<!-- TMPL_VAR Name="CGIsort1" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
! 			<!--/TMPL_IF -->
  		</p>
  		<p>
  			<label class="label100">Sort field 2</label>
! 			<!-- TMPL_IF Name="CGIsort2" -->
! 				<!-- TMPL_VAR Name="CGIsort2" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
! 			<!--/TMPL_IF -->
  		</p>
  		<p>




From hdl at users.sourceforge.net  Wed Jun 22 11:36:26 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 22 Jun 2005 02:36:26 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members memberentry.tmpl,1.36,1.37
Message-ID: <E1Dl1ek-0005UU-I2@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	memberentry.tmpl 
Log Message:
Adding scrolling list for sort1 and sort2

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** memberentry.tmpl	20 Jun 2005 14:20:05 -0000	1.36
--- memberentry.tmpl	22 Jun 2005 09:36:24 -0000	1.37
***************
*** 270,274 ****
  				<td>Sorting field 1</td>
  				<td colspan="4">
! 					<input type="text" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
  				</td>
  			</tr>
--- 270,278 ----
  				<td>Sorting field 1</td>
  				<td colspan="4">
! 					<!-- TMPL_IF Name="CGIsort1" -->
! 						<!-- TMPL_VAR Name="CGIsort1" -->
! 					<!-- TMPL_ELSE -->
! 						<input type="text" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
! 					<!--/TMPL_IF -->
  				</td>
  			</tr>
***************
*** 276,280 ****
  				<td>Sorting field 2</td>
  				<td colspan="4">
! 					<input type="text" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
  				</td>
  			</tr>
--- 280,288 ----
  				<td>Sorting field 2</td>
  				<td colspan="4">
! 					<!-- TMPL_IF Name="CGIsort2" -->
! 						<!-- TMPL_VAR Name="CGIsort2" -->
! 					<!-- TMPL_ELSE -->
! 						<input type="text" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
! 					<!--/TMPL_IF -->
  				</td>
  			</tr>




From tipaul at users.sourceforge.net  Wed Jun 22 14:45:39 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 22 Jun 2005 05:45:39 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac-top.inc,1.8.2.6,1.8.2.7
Message-ID: <E1Dl4br-0003nY-TS@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-top.inc 
Log Message:
changing image size (on top-left)

Index: opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc,v
retrieving revision 1.8.2.6
retrieving revision 1.8.2.7
diff -C2 -r1.8.2.6 -r1.8.2.7
*** opac-top.inc	16 Jun 2005 15:41:09 -0000	1.8.2.6
--- opac-top.inc	22 Jun 2005 12:45:37 -0000	1.8.2.7
***************
*** 33,37 ****
  	<div id="title">
  		<!-- TMPL_IF name="opacsmallimage" -->
! 			<img src="<!-- TMPL_VAR name="opacsmallimage"-->" height="50" alt="koha logo"/>
  		<!-- TMPL_ELSE -->
  			<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo"/>
--- 33,37 ----
  	<div id="title">
  		<!-- TMPL_IF name="opacsmallimage" -->
! 			<img src="<!-- TMPL_VAR name="opacsmallimage"-->" height="65" alt="koha logo"/>
  		<!-- TMPL_ELSE -->
  			<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo"/>




From tipaul at users.sourceforge.net  Wed Jun 22 14:46:55 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 22 Jun 2005 05:46:55 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-dictionary.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1Dl4d5-0003wq-0O@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-dictionary.tmpl 
Log Message:
small changes in template look

Index: opac-dictionary.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-dictionary.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac-dictionary.tmpl	7 Jun 2005 10:23:13 -0000	1.1.2.1
--- opac-dictionary.tmpl	22 Jun 2005 12:46:52 -0000	1.1.2.2
***************
*** 20,27 ****
  
  <!-- TMPL_IF Name=search -->
! 	<div class="bloc25">
! 	<h2 class="catalogue">Dictionary Search results</h2>
  	<!-- TMPL_IF NAME="authresult" -->
  		<div id="resultnumber">
  			<p><!-- TMPL_IF NAME="displayprev" --> 
  					<a class="resultnumber" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
--- 20,28 ----
  
  <!-- TMPL_IF Name=search -->
! 	<h1>Dictionary Search results</h1>
  	<!-- TMPL_IF NAME="authresult" -->
+ 	<div class="bloc20">
  		<div id="resultnumber">
+ 			<h2>Values in authorities</h2>
  			<p><!-- TMPL_IF NAME="displayprev" --> 
  					<a class="resultnumber" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
***************
*** 82,91 ****
  			</table>
  		</div>
! 		<!-- TMPL_ELSE -->
! 			<h3 class="catalogue">No results in Authorities</h3>
  	<!-- /TMPL_IF -->
  		
  		
  	<!-- TMPL_IF Name=catresult -->	
  		<div id="resultnumber">
  			<p class="resultcount">
--- 83,93 ----
  			</table>
  		</div>
! 	</div>
  	<!-- /TMPL_IF -->
  		
  		
  	<!-- TMPL_IF Name=catresult -->	
+ 	<div class="bloc20">
+ 		<h2>Values in biblios</h2>
  		<div id="resultnumber">
  			<p class="resultcount">




From tipaul at users.sourceforge.net  Wed Jun 22 14:48:10 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 22 Jun 2005 05:48:10 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-MARCdetail.tmpl,1.5.2.3,1.5.2.4
Message-ID: <E1Dl4eI-00047l-A6@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-MARCdetail.tmpl 
Log Message:
minor css changes

Index: opac-MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -C2 -r1.5.2.3 -r1.5.2.4
*** opac-MARCdetail.tmpl	17 Jun 2005 12:31:44 -0000	1.5.2.3
--- opac-MARCdetail.tmpl	22 Jun 2005 12:48:08 -0000	1.5.2.4
***************
*** 77,81 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 77,81 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
***************
*** 101,105 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 101,105 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
***************
*** 125,129 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 125,129 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
***************
*** 149,153 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 149,153 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
***************
*** 173,177 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 173,177 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
***************
*** 197,201 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 197,201 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
***************
*** 221,225 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 221,225 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
***************
*** 245,249 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 245,249 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
***************
*** 269,273 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 269,273 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
***************
*** 293,297 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 293,297 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>




From tipaul at users.sourceforge.net  Wed Jun 22 14:49:30 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 22 Jun 2005 05:49:30 -0700
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_fr_FR.po,1.5.2.6,1.5.2.7
Message-ID: <E1Dl4fa-0004G0-06@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16133/misc/translator/po

Modified Files:
      Tag: rel_2_2
	default_intranet_fr_FR.po 
Log Message:
updated french translation

Index: default_intranet_fr_FR.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_fr_FR.po,v
retrieving revision 1.5.2.6
retrieving revision 1.5.2.7
diff -C2 -r1.5.2.6 -r1.5.2.7
*** default_intranet_fr_FR.po	13 Jun 2005 15:12:13 -0000	1.5.2.6
--- default_intranet_fr_FR.po	22 Jun 2005 12:49:22 -0000	1.5.2.7
***************
*** 9,14 ****
  msgstr ""
  "Project-Id-Version: default_intranet_fr_FR\n"
! "POT-Creation-Date: 2005-06-07 16:19+0200\n"
! "PO-Revision-Date: 2005-06-10 17:47+0200\n"
  "Last-Translator: POULAIN <paul at koha-fr.org>\n"
  "Language-Team: fr_FR\n"
--- 9,14 ----
  msgstr ""
  "Project-Id-Version: default_intranet_fr_FR\n"
! "POT-Creation-Date: 2005-06-21 15:28+0200\n"
[...1547 lines suppressed...]
--- 13443,13448 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:155
! #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:156
! #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:182
  msgid "subfields"
  msgstr "sous-champs"
***************
*** 13551,13555 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:144
! #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:140
  msgid "value"
  msgstr "valeur"
--- 13609,13613 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:144
! #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:143
  msgid "value"
  msgstr "valeur"




From tipaul at users.sourceforge.net  Wed Jun 22 14:49:53 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 22 Jun 2005 05:49:53 -0700
Subject: [Koha-cvs] CVS: koha/misc/translator/po css_opac_pl_PL.po,NONE,1.1.2.1
Message-ID: <E1Dl4fx-0004Hq-6F@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16462/misc/translator/po

Added Files:
      Tag: rel_2_2
	css_opac_pl_PL.po 
Log Message:
polish translation for OPAC

--- NEW FILE ---
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
#
# --- !! WERSJA ROBOCZA !! --- 
#
# bledy w tlumaczeniu sa sukcesywnie poprawiane
# wszelkie bledy/sugestie prosze zglaszac na emaila
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: css_opac_pl\n"
"POT-Creation-Date: 2005-06-20 14:04+0200\n"
"PO-Revision-Date: 2005-06-21 00:29+0200\n"
"Last-Translator: Wojciech Zatorski <wojciech at zatorski.net>\n"
"Language-Team: Polish \n"
"MIME-Version: 1.0\n"
[...2341 lines suppressed...]
#~ msgid "Only show titles available (Not on loan)"
#~ msgstr "Pokaż tylko tytuły dostępnych (nie wypożyczonych)"

#~ msgid "Search"
#~ msgstr "Wyszukaj"

#~ msgid "Search options"
#~ msgstr "Opcje wyszukiwania"

#~ msgid "Search using keywords or subject."
#~ msgstr "Wyszukiwanie przy użyciu haseł kluczowych lub tematów."

#~ msgid "Select a category"
#~ msgstr "Wybierz kategorie"

#~ msgid "Unititle:"
#~ msgstr "Tytuł ujednolicony:"

#~ msgid "since <b>%s</b>"
#~ msgstr "od <b>%s</b>"




From tipaul at users.sourceforge.net  Wed Jun 22 14:51:12 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 22 Jun 2005 05:51:12 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-ISBDdetail.pl,1.5.2.3,1.5.2.4
Message-ID: <E1Dl4hE-0004RR-KE@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17046/opac

Modified Files:
      Tag: rel_2_2
	opac-ISBDdetail.pl 
Log Message:
bugfix (in repeated subfield separator position)

Index: opac-ISBDdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-ISBDdetail.pl,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -C2 -r1.5.2.3 -r1.5.2.4
*** opac-ISBDdetail.pl	25 Mar 2005 17:04:27 -0000	1.5.2.3
--- opac-ISBDdetail.pl	22 Jun 2005 12:51:10 -0000	1.5.2.4
***************
*** 115,119 ****
  						my $subfieldvalue = get_authorised_value_desc($tag, $subf[$i][0], $subf[$i][1], '', $dbh);
  						my $tagsubf = $tag.$subfieldcode;
! 						$calculated =~ s/\{(.?.?.?)$tagsubf(.*?)\}/$1$subfieldvalue\{$1$tagsubf$2\}$2/g;
  					}
  					# field builded, store the result
--- 115,119 ----
  						my $subfieldvalue = get_authorised_value_desc($tag, $subf[$i][0], $subf[$i][1], '', $dbh);
  						my $tagsubf = $tag.$subfieldcode;
! 						$calculated =~ s/\{(.?.?.?)$tagsubf(.*?)\}/$1$subfieldvalue$2\{$1$tagsubf$2\}/g;
  					}
  					# field builded, store the result




From hdl at users.sourceforge.net  Wed Jun 22 15:12:22 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 22 Jun 2005 06:12:22 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/acqui - New directory
Message-ID: <E1Dl51i-0006vC-Rd@sc8-pr-cvs1.sourceforge.net>

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

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/help/acqui added to the repository





From hdl at users.sourceforge.net  Wed Jun 22 15:14:14 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 22 Jun 2005 06:14:14 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/acqui newbiblio.tmpl,NONE,1.1
Message-ID: <E1Dl53W-0007Dn-Bp@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	newbiblio.tmpl 
Log Message:
Online Help on Scrolling_list building for sort1 and sort2.
Minor Bug Fix for newbiblio.pl : Bsort becomes Asort

--- NEW FILE ---
<!-- TMPL_INCLUDE name="help-top.inc" -->
<h1>Add Biblio help</h1>

<p>sort1 and sort2 may now be related to a list of Authorized Values. All you have to do is define a Asort1 or Asort2 category of authorised values and enter the desired values into these categories. You will then be able to use them through Add/Modify Biblio Page</p>





From hdl at users.sourceforge.net  Wed Jun 22 15:14:14 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 22 Jun 2005 06:14:14 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/members memberentry.tmpl,1.1,1.2
Message-ID: <E1Dl53W-0007Dk-B3@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	memberentry.tmpl 
Log Message:
Online Help on Scrolling_list building for sort1 and sort2.
Minor Bug Fix for newbiblio.pl : Bsort becomes Asort

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/help/members/memberentry.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** memberentry.tmpl	22 Dec 2004 16:12:45 -0000	1.1
--- memberentry.tmpl	22 Jun 2005 13:14:12 -0000	1.2
***************
*** 1,4 ****
--- 1,7 ----
  <!-- TMPL_INCLUDE name="help-top.inc" -->
  <h1>Add member help</h1>
+ 
+ <p>sort1 and sort2 may now be related to a list of Authorized Values. All you have to do is define a Bsort1 or Bsort2 category of authorised values and enter the desired values into these categories. You will then be able to use them through Add/Modify Member Page</p>
+ 
  <h2>Add Member, person</h2>
  <p>This is the form for adding a new single member to the database. There is also a form for organisations, such as other libraries and non profit organisations you might lend to. You should use the Add Organisation tab at the top of the Member page for that.</p>




From hdl at users.sourceforge.net  Wed Jun 22 15:14:14 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 22 Jun 2005 06:14:14 -0700
Subject: [Koha-cvs] CVS: koha/acqui newbiblio.pl,1.22,1.23
Message-ID: <E1Dl53W-0007Dr-Fw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27695/acqui

Modified Files:
	newbiblio.pl 
Log Message:
Online Help on Scrolling_list building for sort1 and sort2.
Minor Bug Fix for newbiblio.pl : Bsort becomes Asort

Index: newbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** newbiblio.pl	22 Jun 2005 09:36:24 -0000	1.22
--- newbiblio.pl	22 Jun 2005 13:14:12 -0000	1.23
***************
*** 141,145 ****
  			-multiple => 0 );
  
! my $CGIsort1 = buildCGIsort("Bsort1","sort1",$data->{'sort1'});
  if ($CGIsort1) {
  	$template->param(CGIsort1 => $CGIsort1);
--- 141,145 ----
  			-multiple => 0 );
  
! my $CGIsort1 = buildCGIsort("Asort1","sort1",$data->{'sort1'});
  if ($CGIsort1) {
  	$template->param(CGIsort1 => $CGIsort1);
***************
*** 148,152 ****
  }
  
! my $CGIsort2 = buildCGIsort("Bsort2","sort2",$data->{'sort2'});
  if ($CGIsort2) {
  	$template->param(CGIsort2 =>$CGIsort2);
--- 148,152 ----
  }
  
! my $CGIsort2 = buildCGIsort("Asort2","sort2",$data->{'sort2'});
  if ($CGIsort2) {
  	$template->param(CGIsort2 =>$CGIsort2);




From hdl at users.sourceforge.net  Thu Jun 23 10:58:34 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 23 Jun 2005 01:58:34 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/search.marc suggest.tmpl,1.2,1.3
Message-ID: <E1DlNXe-0007CW-Ni@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	suggest.tmpl 
Log Message:
Closing suggest window after selection

Index: suggest.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/suggest.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** suggest.tmpl	19 Jul 2004 20:59:34 -0000	1.2
--- suggest.tmpl	23 Jun 2005 08:58:30 -0000	1.3
***************
*** 45,49 ****
  //			}
  //			opener.document.location= "../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR NAME="oldbiblionumber" -->&breedingid="+GetThisOne;
! //			self.close();
  //			return false;
  		}
--- 45,49 ----
  //			}
  //			opener.document.location= "../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR NAME="oldbiblionumber" -->&breedingid="+GetThisOne;
! 			self.close();
  //			return false;
  		}




From shedges at users.sourceforge.net  Thu Jun 23 13:25:04 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 23 Jun 2005 04:25:04 -0700
Subject: [Koha-cvs] CVS: koha-doc/es/sysadmin - New directory
Message-ID: <E1DlPpQ-0001nl-50@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/es/sysadmin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6880/sysadmin

Log Message:
Directory /cvsroot/koha/koha-doc/es/sysadmin added to the repository





From shedges at users.sourceforge.net  Thu Jun 23 13:25:28 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 23 Jun 2005 04:25:28 -0700
Subject: [Koha-cvs] CVS: koha-doc/es/sysadmin/templates - New directory
Message-ID: <E1DlPpo-0001qe-FG@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/es/sysadmin/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7085/sysadmin/templates

Log Message:
Directory /cvsroot/koha/koha-doc/es/sysadmin/templates added to the repository





From shedges at users.sourceforge.net  Thu Jun 23 13:26:21 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 23 Jun 2005 04:26:21 -0700
Subject: [Koha-cvs] CVS: koha-doc/es/sysadmin/templates/imágenes - New directory
Message-ID: <E1DlPqf-0001xn-Gh@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/es/sysadmin/templates/imágenes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7514/sysadmin/templates/imágenes

Log Message:
Directory /cvsroot/koha/koha-doc/es/sysadmin/templates/imágenes added to the repository





From shedges at users.sourceforge.net  Thu Jun 23 13:27:11 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 23 Jun 2005 04:27:11 -0700
Subject: [Koha-cvs] CVS: koha-doc/es/sysadmin/templates traduccion.xml,NONE,1.1
Message-ID: <E1DlPrT-00025u-5v@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/es/sysadmin/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7990/sysadmin/templates

Added Files:
	traduccion.xml 
Log Message:
Initial xml markup

--- NEW FILE ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<article>
  <title>Traducción de “Templates� de KOHA</title>

  <articleinfo>
    <pubdate>2005-06-22</pubdate>

    <author>
      <firstname>J. Martín</firstname>

      <surname>Longo</surname>

      <email>jmlongo AT uncu.edu.ar</email>
    </author>

    <copyright>
      <year>2005</year>

      <holder>J. Martín Longo</holder>
    </copyright>

    <legalnotice>
      <para>El documento se entrega bajo licencia GNU-GPL</para>

      <para>This document is related to Koha and is licensed to you under the
      GNU General Public License version 2 or later (<ulink
      url="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</ulink>).</para>

      <para>Koha-related documents may be reproduced and distributed in whole
      or in part, in any medium physical or electronic, as long as this
      copyright notice is retained on all copies.</para>

      <para>You may create a derivative work and distribute it provided that
      you:</para>

      <orderedlist>
        <listitem>
          <para>License the derivative work with this same license, or the
          Linux Documentation Project License (<ulink
          url="http://www.tldp.org/COPYRIGHT.html">http://www.tldp.org/COPYRIGHT.html</ulink>).
          Include a copyright notice and at least a pointer to the license
          used.</para>
        </listitem>

        <listitem>
          <para>Give due credit to previous authors and major
          contributors.</para>
        </listitem>
      </orderedlist>

      <para>Commercial redistribution is allowed and encouraged; however, the
      author would like to be notified of any such distributions.</para>

      <para>No liability for the contents of this document can be accepted.
      Use the concepts, examples and information at your own risk. There may
      be errors and inaccuracies, that could be damaging to your system.
      Proceed with caution, and although this is highly unlikely, the
      author(s) do not take any responsibility.</para>

      <para>All copyrights are held by their by their respective owners,
      unless specifically noted otherwise. Use of a term in this document
      should not be regarded as affecting the validity of any trademark or
      service mark. Naming of particular products or brands should not be seen
      as endorsements.</para>
    </legalnotice>

    <revhistory>
      <revision>
        <revnumber>2.2.2</revnumber>

        <date>2005-06-22</date>

        <revdescription>
          <para>Initial XML markup.</para>
        </revdescription>
      </revision>
    </revhistory>
  </articleinfo>

  <section>
    <title>Introducción</title>

    <note>
      <para><emphasis>Nota aclaratoria:</emphasis> Se supone, en todos los
      ejemplos, que se ha descargado el archivo
      <filename>koha-2.1.1.tar.gz</filename> y se lo ha desempaquetado en el
      directorio 'home' del usuario 'usuario'. Por lo tanto, se debería contar
      con un directorio <filename>koha-2.1.1</filename> en el directorio
      <filename>/home/usuario/</filename></para>

      <para>En cada sistema, se deberán adecuar los nombres de directorios y
      de usuarios como corresponda.</para>
    </note>

    <para>La internacionalización de KOHA puede lograrse mediante la
    traducción de los textos contenidos en los archivos '.tmpl' (que viene de
    Template) contenidos en
    <filename>/home/usuario/koha-2.1.1/intranet-html/intranet-tmpl/default/en</filename></para>

    <para>En ocasiones anteriores, el procedimiento de traducción que se ha
    seguido ha sido el de copiar todo el contenido del directorio mencionado
    al directorio
    <filename>/home/usuario/koha-2.1.1/intranet-html/intranet-tmpl/default/es</filename>
    y, posteriormente, configurar KOHA para que utilice el idioma
    español.</para>

    <para>Este procedimiento, si bien ha dado resultados aceptables, es
    bastante lento y trabajoso, ya que se deben buscar una por una las cadenas
    de texto a traducir dentro de cada archivo '.tmpl', al tiempo que quien
    realiza el trabajo se debe cuidar de no modificar ninguna etiqueta o
    marca, ya que eso produce errores en la visualización.</para>

    <para>Por este motivo, se ha optado por la utilización del script
    <filename>tmpl_process3.pl</filename> (provisto en la distribución de
    KOHA). Este script toma como entrada el archivo o un directorio que
    contenga los archivos que se quiera traducir y genera como salida un único
    archivo con formato específico y extensión '.po' (que viene de Portable
    Object) conteniendo todas las cadenas de texto que pueden ser traducidas.
    Este tipo de archivos es un estándar en el trabajo de internacionalización
    de software en el mundo del Software Libre y, por lo tanto, hay
    herramientas desarrolladas para su tratamiento.</para>

    <para>El presente tutorial pretende mostrar el uso del script
    <filename>tmpl_process3.pl</filename> y, posteriormente, sentar las bases
    para la utilización de una herramienta para el tratamiento del archivo
    '.po' generado por el mismo (en este caso, la herramienta
    <application>Kbabel</application>).</para>
  </section>

  <section>
    <title>Usando tmpl_process3.pl para generar archivos '.po'</title>

    <para>El script <filename>tmpl_process3.pl</filename> se encuentra ubicado
    en <filename>/home/usuario/koha-2.1.1/scripts/misc/translator/</filename>
    y depende algunos módulos ubicados en ese mismo directorio. Por lo tanto,
    para poder ejecutarlo, se deberá estar ubicado en el directorio
    <filename>/home/usuario/koha-2.1.1/scripts/misc/translator/</filename><example>
        <title>Ejemplo:</title>

        <programlisting>usuario at host: cd /home/usuario/koha-2.1.1/scripts/misc/translator/

usuario at host: ./tmpl_process3.pl --help</programlisting>
      </example></para>

    <para>Los comandos mostrados en el ejemplo producirán como salida el
    listado de las opciones y el modo de uso del script, como se muestra a
    continuación:</para>

    <programlisting>Usage: ./tmpl_process3.pl create [OPTION]
  or:  ./tmpl_process3.pl update [OPTION]
  or:  ./tmpl_process3.pl install [OPTION]
  or:  ./tmpl_process3.pl --help
Create or update PO files from templates, or install translated templates.

  -i, --input=SOURCE          Get or update strings from SOURCE file.
                              SOURCE is a directory if -r is also specified.
  -o, --outputdir=DIRECTORY   Install translation(s) to specified DIRECTORY
      --pedantic-warnings     Issue warnings even for detected problems
                              which are likely to be harmless
  -r, --recursive             SOURCE in the -i option is a directory
  -s, --str-file=FILE         Specify FILE as the translation (po) file
                              for input (install) or output (create, update)
  -x, --exclude=REGEXP        Exclude files matching the given REGEXP
      --help                  Display this help and exit

The -o option is ignored for the "create" and "update" actions.
Try `perldoc ./tmpl_process3.pl' for perhaps more information.</programlisting>

    <para>Para crear un archivo 'circ_es.po' que contenga los textos de todos
    los templates contenidos en el directorio 'circ' de la intranet de KOHA
    que están en inglés, el procedimiento sería el siguiente:</para>

    <programlisting>usuario at host: cd /home/usuario/koha-2.1.1/scripts/misc/translator/

usuario at host: ./tmpl_process3.pl create -r -i /home/usuario/koha-2.1.1/intranet-html/intranet-tmpl/default/en/circ/ -s /home/usuario/traduccion/circ_es.po</programlisting>

    <para>En el ejemplo anterior:</para>

    <itemizedlist>
      <listitem>
        <para>'<emphasis role="bold">create</emphasis>' indica que se debe
        generar un archivo '.po'.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-r</emphasis> indica que el proceso se
        realizará sobre un directorio.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-i</emphasis> indica el directorio en el
        que se encuentran los archivos de los que se extraerán las cadenas de
        texto.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-s</emphasis> indica el directorio y el
        nombre del archivo '.po' a crear.</para>
      </listitem>
    </itemizedlist>

    <para>Al ejecutar el comando anterior es posible que se generen algunas
    advertencias o 'warnings' por cuestiones de sintaxis.</para>

    <para>Al ejecutar el ejemplo sugerido, se produjo la siguiente salida en
    el equipo de prueba:</para>

    <programlisting>Warning: Can't determine original templates' charset, defaulting to ISO-8859-1
Removing empty file /home/jmlongo/tmp/temp.po
xgettext.pl: Warning (negligible): selectbranchprinter.tmpl: line 15: Suggest ESCAPE=HTML for TMPL_VAR in attribute "value": "&lt;!-- TMPL_VAR NAME="value" --&gt;"
xgettext.pl: Warning (negligible): selectbranchprinter.tmpl: Further similar negligible warnings will not be reported, use --pedantic for details
xgettext.pl: Warning: returns.tmpl: line 17: Strange attribute syntax: /cgi-bin/koha/moremember.pl?bornum=&lt;!-- TMPL_VAR NAME="bornum" --&gt;", "Member"); return false;"
xgettext.pl: Warning: branchtransfers.tmpl: line 20: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
xgettext.pl: Warning: branchtransfers.tmpl: line 22: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
xgettext.pl: Warning: branchtransfers.tmpl: line 98: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
xgettext.pl: Warning: branchtransfers.tmpl: line 128: Probably missing whitespace before or missing quotation mark near: Item", 480, 640); return false;"
The create seems to be successful.</programlisting>

    <para>A pesar de estas advertencias, la última línea (<emphasis
    role="bold">The create seems to be successful.</emphasis>) indica que el
    proceso ha tenido éxito y que se cuenta con el archivo '.po' en el lugar y
    con el nombre seleccionados. Este archivo deberá ser abierto usando KBabel
    para iniciar el proceso de traducción.</para>
  </section>

  <section>
    <title>Usando KBabel para traducir un archivo '.po'</title>

    <para>La aplicación <application>KBabel</application> presenta cuatro
    áreas, dentro de la ventana principal, cada una de ellas orientada a una
    utilidad en especial. Con esta aplicación se trabaja traduciendo una a una
    las cadenas de texto que están contenidas en el archivo '.po' generado
    anteriormente.</para>

    <para>Para lograr esto de manera eficiente,
    <application>KBabel</application> pone a disposición distintas
    herramientas, como se muestra en la siguiente captura de pantalla:</para>

    <figure>
      <title>Screenshot 1</title>

      <mediaobject>
        <imageobject>
          <imagedata fileref="imágenes/image1.gif" />
        </imageobject>
      </mediaobject>
    </figure>

    <itemizedlist>
      <listitem>
        <para>El área marcada en la figura como <emphasis role="bold">Texto
        Original</emphasis> es de sólo lectura y presenta la cadena de texto
        que se está traduciendo.</para>
      </listitem>

      <listitem>
        <para>El área marcada en la figura como <emphasis role="bold">Texto
        Traducido</emphasis> es el lugar donde se escribe la traducción de lo
        que aparece en el cuadro <emphasis role="bold">Texto
        Original</emphasis>.</para>
      </listitem>

      <listitem>
        <para>El área marcada en la figura como <emphasis
        role="bold">Comentarios y Nombres de Archivos</emphasis> es el lugar
        donde aparecen los comentarios que los desarrolladores dejaron al
        momento de crear el template que se está traduciendo, con el objetivo
        de hacer alguna aclaración. Además, aparece el nombre del o los
        archivos en los cuales está contenida la cadena de texto que se está
        traduciendo.</para>
      </listitem>

      <listitem>
        <para>El área marcada en la figura como <emphasis
        role="bold">Contexto</emphasis> es el lugar en el que aparecen las
        cadenas de texto anteriores y posteriores a la que se está
        traduciendo, como una ayuda para saber en qué contexto se encuentra la
        frase que se está traduciendo.</para>
      </listitem>
    </itemizedlist>

    <section>
      <title>Ejemplos</title>

      <para>Algunos delimitadores y etiquetas no deben ser modificados en la
      traducción</para>

      <figure>
        <title>Screenshot 2</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="imágenes/image2.gif" />
          </imageobject>
        </mediaobject>
      </figure>

      <para>Cuando la traducción implique el uso de acentos y caracteres
      especiales, los mismos deberán ser reemplazados por las entidades
      correspondientes, para evitar problemas a la hora de la
      visualización.</para>

      <figure>
        <title>Screenshot 3</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="imágenes/image3.gif" />
          </imageobject>
        </mediaobject>
      </figure>

      <para>Para navegar entre las cadenas de texto y realizar algunas
      funciones útiles, se pueden utilizar los íconos de la barra de
      herramientas o atajos de teclado.</para>

      <informaltable>
        <tgroup cols="2">
          <tbody>
            <row>
              <entry align="center" valign="middle"><emphasis
              role="bold">Función</emphasis></entry>

              <entry align="center" valign="middle"><emphasis
              role="bold">Teclado</emphasis></entry>
            </row>

            <row>
              <entry>Ver el la cadena de texto anterior</entry>

              <entry><emphasis role="bold">RePág</emphasis></entry>
            </row>

            <row>
              <entry>Ver el la cadena de texto siguiente</entry>

              <entry><emphasis role="bold">AvPág</emphasis></entry>
            </row>

            <row>
              <entry>Ver el la cadena de texto anterior no traducida</entry>

              <entry><emphasis role="bold">Alt+RePág</emphasis></entry>
            </row>

            <row>
              <entry>Ver el la cadena de texto siguiente no traducida</entry>

              <entry><emphasis role="bold">Alt+AvPág</emphasis></entry>
            </row>

            <row>
              <entry>Copiar la cadena de texto que está en la ventana de Texto
              Original a la ventana de traducción</entry>

              <entry><emphasis role="bold">Ctrl+Espacio</emphasis></entry>
            </row>
          </tbody>
        </tgroup>
      </informaltable>
    </section>
  </section>

  <section>
    <title>Usando tmpl_process3.pl para generar “templates� traducidos</title>

    <para>Siguiendo los ejemplos anteriores, hemos creado, en primer lugar, un
    archivo '.po' con nombre <filename>circ_es.po</filename> conteniendo todas
    las cadenas de texto extraídas de todos los 'templates' que están en el
    directorio
    <filename>/home/usuario/koha-2.1.1/intranet-html/intranet-tmpl/default/en/circ</filename>.</para>

    <para>Por otro lado, ya hemos utilizado <application>KBABEL</application>
    para realizar la traducción de todas esas cadenas de texto.</para>

    <para>Finalmente, sólo resta la generación de los nuevos 'templates'
    traducidos en un directorio a elección, siempre y cuando tenga una copia
    de los 'templates' originales. A los efectos de este ejemplo, crearemos
    los templates traducidos en el directorio
    <filename>/home/usuario/koha-2.1.1/intranet-html/intranet-tmpl/default/es/circ</filename>.</para>

    <para>Para lograr esto, utilizaremos nuevamente el script
    <filename>tmpl_process3.pl</filename> pero con parámetros ligeramente
    distintos:</para>

    <programlisting>usuario at host: cd /home/usuario/koha-2.1.1/scripts/misc/translator/ 

usuario at host: ./tmpl_process3.pl install -s /home/usuario/traduccion/ circ_es.po -r -i /home/usuario/koha-2.1.1/intranet-html/intranet-tmpl/default/en/circ/ -o /home/usuario/koha-2.1.1/intranet-html/intranet-tmpl/default/es/circ/</programlisting>

    <para>En el ejemplo anterior:</para>

    <itemizedlist>
      <listitem>
        <para>'<emphasis role="bold">install</emphasis>' indica que se
        generarán 'templates' a partir de un archivo '.po'.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-r</emphasis> indica que el proceso se
        realizará sobre un directorio.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-i</emphasis> indica el directorio en el
        que se encuentran los 'templates' originales de los cuales se
        extrajeron las cadenas de texto.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-s</emphasis> indica el directorio en el
        que se crearán los 'templates' traducidos.</para>
      </listitem>
    </itemizedlist>

    <para>Al igual que durante la creación del archivo '.po', al ejecutar el
    comando sugerido, pueden producirse advertencias. La siguiente es la
    salida obtenido en el equipo de prueba:</para>

    <programlisting>Warning: Can't determine original templates' charset, defaulting to ISO-8859-1
Creating /home/jmlongo/documentos/koha/koha-2.1.1/intranet-html/intranet-tmpl/default/pl/circ//selectbranchprinter.tmpl...
tmpl_process3.pl: Warning (negligible): selectbranchprinter.tmpl: line 15: Suggest ESCAPE=HTML for TMPL_VAR in attribute "value": "&lt;!-- TMPL_VAR NAME="value" --&gt;"
tmpl_process3.pl: Warning (negligible): selectbranchprinter.tmpl: Further similar negligible warnings will not be reported, use --pedantic for details
Creating /home/jmlongo/documentos/koha/koha-2.1.1/intranet-html/intranet-tmpl/default/pl/circ//returns.tmpl...
tmpl_process3.pl: Warning: returns.tmpl: line 17: Strange attribute syntax: /cgi-bin/koha/moremember.pl?bornum=&lt;!-- TMPL_VAR NAME="bornum" --&gt;", "Member"); return false;"
Creating /home/jmlongo/documentos/koha/koha-2.1.1/intranet-html/intranet-tmpl/default/pl/circ//circulation.tmpl...
Creating /home/jmlongo/documentos/koha/koha-2.1.1/intranet-html/intranet-tmpl/default/pl/circ//branchtransfers.tmpl...
tmpl_process3.pl: Warning: branchtransfers.tmpl: line 20: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
tmpl_process3.pl: Warning: branchtransfers.tmpl: line 22: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
tmpl_process3.pl: Warning: branchtransfers.tmpl: line 98: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
tmpl_process3.pl: Warning: branchtransfers.tmpl: line 128: Probably missing whitespace before or missing quotation mark near: Item", 480, 640); return false;"
The install seems to be successful.</programlisting>

    <para>A pesar de estas advertencias, la última línea (<emphasis
    role="bold">The install seems to be successful.</emphasis>) indica que el
    proceso ha tenido éxito y que se cuenta con un juego de 'templates'
    traducidos en
    <filename>/home/usuario/koha-2.1.1/intranet-html/intranet-tmpl/default/es/circ</filename>.</para>

    <para>Para comprobar el éxito de este proceso, basta con abrir cualquiera
    de los 'templates' contenidos en el directorio mencionado con el editor de
    texto prefereido.</para>
  </section>

  <section>
    <title>Consultas, quejas y propuestas</title>

    <para>Si tiene alguna consulta acerca del proceso descrito en este
    documento, o quiere realizar alguna propuesta (o plantear una queja, ¿por
    qué no?) que sirva para mejorarlo, puede contactarse con Martín Longo
    (<email>jmlongo AT uncu.edu.ar</email>)</para>
  </section>
</article>



From shedges at users.sourceforge.net  Thu Jun 23 13:29:51 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 23 Jun 2005 04:29:51 -0700
Subject: [Koha-cvs] CVS: koha-doc/en/sysadmin/templates/imagesfolder - New directory
Message-ID: <E1DlPu3-0002Yn-IP@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/en/sysadmin/templates/imagesfolder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9833/templates/imagesfolder

Log Message:
Directory /cvsroot/koha/koha-doc/en/sysadmin/templates/imagesfolder added to the repository





From shedges at users.sourceforge.net  Thu Jun 23 13:29:16 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 23 Jun 2005 04:29:16 -0700
Subject: [Koha-cvs] CVS: koha-doc/en/sysadmin/templates - New directory
Message-ID: <E1DlPtU-0002Rs-Ad@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/en/sysadmin/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9367/templates

Log Message:
Directory /cvsroot/koha/koha-doc/en/sysadmin/templates added to the repository





From shedges at users.sourceforge.net  Thu Jun 23 13:30:20 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 23 Jun 2005 04:30:20 -0700
Subject: [Koha-cvs] CVS: koha-doc/en/sysadmin/templates translation.xml,NONE,1.1
Message-ID: <E1DlPuW-0002e4-G0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/en/sysadmin/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10138/templates

Added Files:
	translation.xml 
Log Message:
Initial xml markup

--- NEW FILE ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
<article>
  <title>KOHA's Template Translation</title>

  <articleinfo>
    <pubdate>2005-06-22</pubdate>

    <author>
      <firstname>J. Martin</firstname>

      <surname>Longo</surname>

      <email>jmlongo AT uncu.edu.ar</email>
    </author>

    <copyright>
      <year>2005</year>

      <holder>J. Martin Longo</holder>
    </copyright>

    <legalnotice>
      <para>This document is related to Koha and is licensed to you under the
      GNU General Public License version 2 or later (<ulink
      url="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</ulink>).</para>

      <para>Koha-related documents may be reproduced and distributed in whole
      or in part, in any medium physical or electronic, as long as this
      copyright notice is retained on all copies.</para>

      <para>You may create a derivative work and distribute it provided that
      you:</para>

      <orderedlist>
        <listitem>
          <para>License the derivative work with this same license, or the
          Linux Documentation Project License (<ulink
          url="http://www.tldp.org/COPYRIGHT.html">http://www.tldp.org/COPYRIGHT.html</ulink>).
          Include a copyright notice and at least a pointer to the license
          used.</para>
        </listitem>

        <listitem>
          <para>Give due credit to previous authors and major
          contributors.</para>
        </listitem>
      </orderedlist>

      <para>Commercial redistribution is allowed and encouraged; however, the
      author would like to be notified of any such distributions.</para>

      <para>No liability for the contents of this document can be accepted.
      Use the concepts, examples and information at your own risk. There may
      be errors and inaccuracies, that could be damaging to your system.
      Proceed with caution, and although this is highly unlikely, the
      author(s) do not take any responsibility.</para>

      <para>All copyrights are held by their by their respective owners,
      unless specifically noted otherwise. Use of a term in this document
      should not be regarded as affecting the validity of any trademark or
      service mark. Naming of particular products or brands should not be seen
      as endorsements.</para>
    </legalnotice>

    <revhistory>
      <revision>
        <revnumber>2.2.2</revnumber>

        <date>2005-06-22</date>

        <revdescription>
          <para>Initial XML markup.</para>
        </revdescription>
      </revision>
    </revhistory>
  </articleinfo>

  <section>
    <title>Introduction</title>

    <note>
      <para>It's assumed, in every example, that you have downloaded the file
      <filename>koha-2.x.tar.gz</filename> and that you have unpacked it in
      the 'home' directory of the 'user' user. Provided this, you should have
      a <filename>koha-2.x</filename> directory under
      <filename>/home/user/</filename></para>

      <para>In each system, directory and user names should be replaced
      accordingly.</para>
    </note>

    <para>KOHA internationalization can be achieved in several ways. Not so
    long ago, it was necesary to copy the entire
    <filename>/home/usuario/koha-2.x/intranet-html/intranet-tmpl/default/en</filename>
    directory into another (i.e.
    <filename>/home/usuario/koha-2.x/intranet-html/intranet-tmpl/default/es</filename>)
    then manually edit each one of the templates contained in the newly
    created directory, translating the text strings they contain, trying, of
    course, not to touch or change anything else. Once the translation was
    finished, it was only necesary to configure KOHA's 'opaclanguages' System
    Preference to use the new language (i.e. es).</para>

    <para>This procedure works and has produced acceptable results but is,
    obviously, very slow and difficult.</para>

    <para>Now, thanks to KOHA's developer team, we have the
    <filename>tmpl_process3.pl</filename> script (provided with the KOHA
    distribution).</para>

    <para>In short, this script takes the file or directory that we want to
    translate (i.e.
    <filename>/home/usuario/koha-2.x/intranet-html/intranet-tmpl/default/en</filename>)
    and generates a single '.po' file (.po comes from Portable Object)
    containing only the text strings contained inside KOHA's template files.
    This type of file is a format standard in the software
    internationalization work in the Free Software world and, because of this,
    there are several tools developed to edit them.</para>

    <para>The present tutorial aims to show how to use the
    <filename>tmpl_process3.pl</filename> script to generate a '.po' file from
    KOHA's templates, introduce the use of one of the tools developed for
    '.po' files treatment (<application>Kbabel</application>) and then the use
    of the <filename>tmpl_process3.pl</filename> script again, to generate a
    set of translated templates for use in our KOHA installation.</para>
  </section>

  <section>
    <title>Using tmpl_process3.pl to generate a '.po' file</title>

    <para>The <filename>tmpl_process3.pl</filename> script lives under the
    <filename>/home/usuario/koha-2.x/scripts/misc/translator/</filename>
    directory and depends on some modules located under the same directory.
    Because of this, in order for it to work, the script must be run from
    inside that directory.</para>

    <example>
      <title>Running tmpl_process3.pl</title>

      <programlisting>user at host: cd /home/usuario/koha-2.x/scripts/misc/translator/ 

user at host: ./tmpl_process3.pl --help</programlisting>
    </example>

    <para>The previous command will produce, as output, a list of options and
    a little help about the script's usage, as shown below:</para>

    <programlisting>Usage: ./tmpl_process3.pl create [OPTION]
  or:  ./tmpl_process3.pl update [OPTION]
  or:  ./tmpl_process3.pl install [OPTION]
  or:  ./tmpl_process3.pl --help
Create or update PO files from templates, or install translated templates.

  -i, --input=SOURCE          Get or update strings from SOURCE file.
                              SOURCE is a directory if -r is also specified.
  -o, --outputdir=DIRECTORY   Install translation(s) to specified DIRECTORY
      --pedantic-warnings     Issue warnings even for detected problems
                              which are likely to be harmless
  -r, --recursive             SOURCE in the -i option is a directory
  -s, --str-file=FILE         Specify FILE as the translation (po) file
                              for input (install) or output (create, update)
  -x, --exclude=REGEXP        Exclude files matching the given REGEXP
      --help                  Display this help and exit

The -o option is ignored for the "create" and "update" actions.
Try `perldoc ./tmpl_process3.pl' for perhaps more information.</programlisting>

    <para>To create a 'circ_es.po' containing the text strings of the English
    templates located in the 'circ' directory of the KOHA's intranet, the
    procedure would be:</para>

    <programlisting>user at host: cd /home/user/koha-2.x/scripts/misc/translator/ 

user at host: ./tmpl_process3.pl create -r -i /home/user/koha-2.x/intranet-html/intranet-tmpl/default/en/circ/ -s /home/user/translation/circ_es.po</programlisting>

    <para>In the above example:</para>

    <itemizedlist>
      <listitem>
        <para>'<emphasis role="bold">create</emphasis>' indicates that we want
        to create a new '.po' file.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-r</emphasis> indicates that the source is
        a directory.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-i</emphasis> indicates the path from
        where the text string will be extracted.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-s</emphasis> indicates the path and name
        of the '.po' file that will be created.</para>
      </listitem>
    </itemizedlist>

    <para>When running the script, there may be some 'warnings' about syntax
    errors in the original templates.</para>

    <para>Output will look like this:</para>

    <programlisting>Warning: Can't determine original templates' charset, defaulting to ISO-8859-1
Removing empty file /home/user/tmp/temp.po
xgettext.pl: Warning (negligible): selectbranchprinter.tmpl: line 15: Suggest ESCAPE=HTML for TMPL_VAR in attribute "value": "&lt;!-- TMPL_VAR NAME="value" --&gt;"
xgettext.pl: Warning (negligible): selectbranchprinter.tmpl: Further similar negligible warnings will not be reported, use --pedantic for details
xgettext.pl: Warning: returns.tmpl: line 17: Strange attribute syntax: /cgi-bin/koha/moremember.pl?bornum=&lt;!-- TMPL_VAR NAME="bornum" --&gt;", "Member"); return false;"
xgettext.pl: Warning: branchtransfers.tmpl: line 20: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
xgettext.pl: Warning: branchtransfers.tmpl: line 22: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
xgettext.pl: Warning: branchtransfers.tmpl: line 98: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
xgettext.pl: Warning: branchtransfers.tmpl: line 128: Probably missing whitespace before or missing quotation mark near: Item", 480, 640); return false;"
The create seems to be successful.</programlisting>

    <para>Despite these warnings, the last line (<emphasis role="bold">The
    create seems to be successful.</emphasis>) indicates that the process has
    ended successfully and that now we have our brand new 'circ_es.po' file in
    <filename>/home/user/translation/</filename> so now we can use
    <application>Kbabel</application> to begin the translation process.</para>
  </section>

  <section>
    <title>Using KBabel to translate a '.po' file</title>

    <para>The <application>KBabel</application> application presents four
    areas, inside the mail window, each one oriented to a particular function.
    You'll work translating the text strings extracted from the templates one
    by one.</para>

    <para>To achieve this efficiently, <application>KBabel</application> gives
    you several tools, as can be seen in the next screenshot:</para>

    <figure>
      <title>Screenshot 1</title>

      <mediaobject>
        <imageobject>
          <imagedata fileref="imagesfolder/image1.gif" />
        </imageobject>
      </mediaobject>
    </figure>

    <itemizedlist>
      <listitem>
        <para>The area marked as <emphasis role="bold">Original
        Text</emphasis> is read only and displays the text string to be
        translated.</para>
      </listitem>

      <listitem>
        <para>The area marked as <emphasis role="bold">Translated
        Text</emphasis> is where we will write the translation of the string
        displayed in the <emphasis role="bold">Original Text</emphasis>
        area.</para>
      </listitem>

      <listitem>
        <para>The area marked as <emphasis role="bold">File Names</emphasis>
        displays the path and name of the template files where the text string
        being translated was extracted from.</para>
      </listitem>

      <listitem>
        <para>The area marked as <emphasis role="bold">Context</emphasis>
        displays the previous and next text strings to the one being
        translated, to provide some help about the context of the current text
        string.</para>
      </listitem>
    </itemizedlist>

    <section>
      <title>Examples</title>

      <para>Some tags and markups should not be modified during
      translation:</para>

      <figure>
        <title>Screenshot 2</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="imagesfolder/image2.gif" />
          </imageobject>
        </mediaobject>
      </figure>

      <para>Whenever the translation implies the use of accented words or
      special characters, they should be replaced with the corresponding
      entities, to avoid visualisation problems or errors.</para>

      <figure>
        <title>Screenshot 3</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="imagesfolder/image3.gif" />
          </imageobject>
        </mediaobject>
      </figure>

      <para>To navigate between text strings and launch some useful commands,
      there are shortcuts in the toolbar and many keyboard key
      combinations.</para>

      <informaltable>
        <tgroup cols="2">
          <tbody>
            <row>
              <entry align="center" valign="middle"><emphasis
              role="bold">Command</emphasis></entry>

              <entry align="center" valign="middle"><emphasis
              role="bold">Keyboard</emphasis></entry>
            </row>

            <row>
              <entry>Next text string</entry>

              <entry><emphasis role="bold">PgDown</emphasis></entry>
            </row>

            <row>
              <entry>Previous text string</entry>

              <entry><emphasis role="bold">PgUp</emphasis></entry>
            </row>

            <row>
              <entry>Next not translated text string</entry>

              <entry><emphasis role="bold">Alt+PgDown</emphasis></entry>
            </row>

            <row>
              <entry>Previous not translated text string</entry>

              <entry><emphasis role="bold">Alt+PgUp</emphasis></entry>
            </row>

            <row>
              <entry>Copy the text string displayed on the Original Text area
              to the Translated Text area</entry>

              <entry><emphasis role="bold">Ctrl+Space</emphasis></entry>
            </row>
          </tbody>
        </tgroup>
      </informaltable>
    </section>
  </section>

  <section>
    <title>Using tmpl_process3.pl to generate translated templates</title>

    <para>Following the previous examples, we have created a '.po' file named
    <filename>circ_es.po</filename> containing all the text strings present in
    the templates located at
    <filename>/home/user/koha-2.x/intranet-html/intranet-tmpl/default/en/circ</filename></para>

    <para>Afterwards, we used <application>Kbabel</application> to translate
    all those text strings.</para>

    <para>Finally, we only need to generate a new set of translated templates,
    using the original ones as a basis. For this example, we will create our
    new set of translated templates in the
    <filename>/home/user/koha-2.x/intranet-html/intranet-tmpl/default/es/circ</filename>
    directory.</para>

    <para>To achieve this, we'll use the <filename>tmpl_process3.pl</filename>
    script again, but with slightly different parameters:</para>

    <programlisting>user at host: cd /home/user/koha-2.x/scripts/misc/translator/ 

user at host: ./tmpl_process3.pl install -s /home/user/translation/circ_es.po -r -i /home/user/koha-2.x/intranet-html/intranet-tmpl/default/en/circ/ -o /home/user/koha-2.x/intranet-html/intranet-tmpl/default/es/circ/</programlisting>

    <para>In the above example:</para>

    <itemizedlist>
      <listitem>
        <para>'<emphasis role="bold">install</emphasis>' indicates that we
        want to create a set of templates from a '.po' file.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-r</emphasis> indicates that the target is
        a directory.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-i</emphasis> indicates the path where the
        original templates are located (the ones we extracted the text strings
        from).</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-s</emphasis> indicates the path and name
        of the '.po' file that will be used in the process.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-o</emphasis> indicates the path where the
        new set of translated templates will be created.</para>
      </listitem>
    </itemizedlist>

    <para>As happened when we launched the script to create the '.po' file,
    there may be some 'warnings' about syntax errors in the original
    templates.</para>

    <para>Output will look like this:</para>

    <programlisting>Warning: Can't determine original templates' charset, defaulting to ISO-8859-1
Creating /home/jmlongo/documentos/koha/koha-2.1.1/intranet-html/intranet-tmpl/default/pl/circ//selectbranchprinter.tmpl...
tmpl_process3.pl: Warning (negligible): selectbranchprinter.tmpl: line 15: Suggest ESCAPE=HTML for TMPL_VAR in attribute "value": "&lt;!-- TMPL_VAR NAME="value" --&gt;"
tmpl_process3.pl: Warning (negligible): selectbranchprinter.tmpl: Further similar negligible warnings will not be reported, use --pedantic for details
Creating /home/jmlongo/documentos/koha/koha-2.1.1/intranet-html/intranet-tmpl/default/pl/circ//returns.tmpl...
tmpl_process3.pl: Warning: returns.tmpl: line 17: Strange attribute syntax: /cgi-bin/koha/moremember.pl?bornum=&lt;!-- TMPL_VAR NAME="bornum" --&gt;", "Member"); return false;"
Creating /home/jmlongo/documentos/koha/koha-2.1.1/intranet-html/intranet-tmpl/default/pl/circ//circulation.tmpl...
Creating /home/jmlongo/documentos/koha/koha-2.1.1/intranet-html/intranet-tmpl/default/pl/circ//branchtransfers.tmpl...
tmpl_process3.pl: Warning: branchtransfers.tmpl: line 20: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
tmpl_process3.pl: Warning: branchtransfers.tmpl: line 22: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
tmpl_process3.pl: Warning: branchtransfers.tmpl: line 98: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
tmpl_process3.pl: Warning: branchtransfers.tmpl: line 128: Probably missing whitespace before or missing quotation mark near: Item", 480, 640); return false;"
The install seems to be successful.</programlisting>

    <para>Despite these warnings, the last line (<emphasis role="bold">The
    install seems to be successful.</emphasis>) indicates that the process has
    ended successfully and that now we have our brand new set of translated
    templates at
    <filename>/home/user/koha-2.x/intranet-html/intranet-tmpl/default/es/circ</filename>
    directory.</para>

    <para>To verify this you can use your favorite text editor to open one of
    the various templates located in that directory.</para>
  </section>

  <section>
    <title>Questions, complaints and proposals</title>

    <para>If you have any questions about the process outlined in this
    document or a comment that helps to improve it, you can reach me (Martin
    Longo) at <email>jmlongo AT uncu.edu.ar</email>.</para>
  </section>
</article>



From slef at users.sourceforge.net  Fri Jun 24 14:19:36 2005
From: slef at users.sourceforge.net (MJ Ray)
Date: Fri, 24 Jun 2005 05:19:36 -0700
Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.91,1.92
Message-ID: <E1Dln9k-0007iB-Nm@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29581

Modified Files:
	Install.pm 
Log Message:
perldoc and prototype updates

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -r1.91 -r1.92
*** Install.pm	20 Jun 2005 14:28:10 -0000	1.91
--- Install.pm	24 Jun 2005 12:19:34 -0000	1.92
***************
*** 20,25 ****
  # Suite 330, Boston, MA  02111-1307 USA
  #
! # Recent Authors
! # MJR: my.cnf, etcdir, prefix, new display, apache conf, copying fixups
  
  use strict;
--- 20,24 ----
  # Suite 330, Boston, MA  02111-1307 USA
  #
! # Current maintainer MJR slef at users.sourceforge.net
[...1186 lines suppressed...]
  
  =cut
  
! sub loadconfigfile {
      my %configfile;
  
--- 2174,2186 ----
  
  
! =item C<loadconfigfile()>
  
! Opens the existing koha.conf file and gets its values, saving the
! values to some global variables.  If the existing koha.conf file
! cannot be opened for any reason, the file is silently ignored.
  
  =cut
  
! sub loadconfigfile () {
      my %configfile;
  




From genjimoto at users.sourceforge.net  Sat Jun 25 07:22:02 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Fri, 24 Jun 2005 22:22:02 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-detail.pl,1.20,1.21
Message-ID: <E1Dm37C-0004FY-Ev@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16290

Modified Files:
	opac-detail.pl 
Log Message:
Added code to support search options sidebar ref to http://katipo.co.nz/gallery/koha2-4/search_ideas_details_001

Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** opac-detail.pl	20 Jun 2005 14:33:32 -0000	1.20
--- opac-detail.pl	25 Jun 2005 05:22:00 -0000	1.21
***************
*** 33,40 ****
  
  $dat->{'count'}=@items;
! 
  $dat->{'additional'}=$addauthor->[0]->{'author'};
  for (my $i = 1; $i < $authorcount; $i++) {
          $dat->{'additional'} .= " ; " . $addauthor->[$i]->{'author'};
  } # for
  
--- 33,43 ----
  
  $dat->{'count'}=@items;
! my @author;
  $dat->{'additional'}=$addauthor->[0]->{'author'};
  for (my $i = 1; $i < $authorcount; $i++) {
          $dat->{'additional'} .= " ; " . $addauthor->[$i]->{'author'};
+         my %authorpush;
+         $authorpush{author} =$addauthor->[$i]->{'author'};
+         push @author, \%authorpush
  } # for
  
***************
*** 61,64 ****
--- 64,90 ----
  
  my @results = ($dat,);
+ my @title;
+ 
+ 
+ foreach my $word (split(" ", $dat->{'title'})){
+         unless (length($word) == 4){
+                 $word =~s/\%//g
+         }
+         unless (C4::Context->stopwords->{uc($word)} or length($word)==1) {
+         my %titlepush;
+         $titlepush{title} =$word;
+                 push @title, \%titlepush;
+         }#it's NOT a stopword => use it. Otherwise, ignore
+ }
+ foreach my $word (split(" ", $dat->{'author'})){
+         unless (length($word) == 4){
+                 $word =~s/\%//g
+         }
+         unless (C4::Context->stopwords->{uc($word)} or length($word)==1) {
+         my %authorpush;
+         $authorpush{author}=$word;
+                 push @author, \%authorpush;
+         }#it's NOT a stopword => use it. Otherwise, ignore
+ }
  
  my $resultsarray=\@results;
***************
*** 66,69 ****
--- 92,98 ----
  my $webarray=\@webbiblioitems;
  my $sitearray=\@websites;
+ my $titlewords=\@title;
+ my $authorwords=\@author;
+ 
  
  #coping with subscriptions
***************
*** 89,92 ****
--- 118,123 ----
  				suggestion => C4::Context->preference("suggestion"),
  				virtualshelves => C4::Context->preference("virtualshelves"),
+         titlewords => $titlewords,
+         authorwords => $authorwords,
  );
    ## Amazon.com stuff
***************
*** 121,127 ****
  =cut
  output_html_with_http_headers $query, $cookie, $template->output;
- 
- #output_html_with_http_headers $query, $cookie, $template->output;
- 
- output_html_with_http_headers $query, $cookie, $template->output;
- 
--- 152,153 ----




From genjimoto at users.sourceforge.net  Sat Jun 25 07:26:16 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Fri, 24 Jun 2005 22:26:16 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-search.pl,1.30,1.31
Message-ID: <E1Dm3BI-0004dc-Je@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17784

Modified Files:
	opac-search.pl 
Log Message:
restored search for available books functionality while ensuring that a search not asking about the availablity doesn't take longer than normal. Achieved via new parameter in SearchMarc::Catalogsearch called $extratables.

Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** opac-search.pl	20 Jun 2005 14:33:32 -0000	1.30
--- opac-search.pl	25 Jun 2005 05:26:14 -0000	1.31
***************
*** 9,13 ****
  use C4::Database;
  use HTML::Template;
! use C4::SearchMarcTest;
  use C4::Acquisition;
  use C4::Biblio;
--- 9,13 ----
  use C4::Database;
  use HTML::Template;
! use C4::SearchMarc;
  use C4::Acquisition;
  use C4::Biblio;
***************
*** 117,120 ****
--- 117,121 ----
  	findseealso($dbh,\@tags);
      my $sqlstring;
+     my $extratables;
      if ($itemtypesstring ne ''){
          $sqlstring = 'and (biblioitems.itemtype IN (';
***************
*** 134,137 ****
--- 135,139 ----
          $sqlstring .= 'and biblio.biblionumber=items.biblionumber and (items.holdingbranch IN (';
          my $branchesloop=0;
+         $extratables = ',items';
          foreach my $branch (@branches){
              if ($branch ne ''){
***************
*** 146,154 ****
      }
    if ($avail){
      $sqlstring .= "and biblioitems.biblioitemnumber=items.biblioitemnumber and items.itemnumber !=issues.itemnumber and biblio.biblionumber !=reserves.biblionumber and (items.itemlost IS NULL or items.itemlost = 0) and (items.notforloan IS NULL or items.notforloan =0) and (items.wthdrawn IS NULL or items.wthdrawn =0) ";
    }
  	my ($results,$total) = catalogsearch($dbh, \@tags,\@and_or,
  										\@excluding, \@operator, \@value,
! 										$startfrom*$resultsperpage, $resultsperpage,$orderby,$desc_or_asc,$sqlstring);
  	if ($total ==1) {
  	if (C4::Context->preference("BiblioDefaultView") eq "normal") {
--- 148,157 ----
      }
    if ($avail){
+   	$extratables .= ',items,issues,reserves';
      $sqlstring .= "and biblioitems.biblioitemnumber=items.biblioitemnumber and items.itemnumber !=issues.itemnumber and biblio.biblionumber !=reserves.biblionumber and (items.itemlost IS NULL or items.itemlost = 0) and (items.notforloan IS NULL or items.notforloan =0) and (items.wthdrawn IS NULL or items.wthdrawn =0) ";
    }
  	my ($results,$total) = catalogsearch($dbh, \@tags,\@and_or,
  										\@excluding, \@operator, \@value,
! 										$startfrom*$resultsperpage, $resultsperpage,$orderby,$desc_or_asc,$sqlstring, $extratables);
  	if ($total ==1) {
  	if (C4::Context->preference("BiblioDefaultView") eq "normal") {
***************
*** 412,416 ****
  }
  # ADDED BY JF
! #if ($totalresults == 1){
      # if its a barcode search by definition we will only have one result.
      # And if we have a result
--- 415,419 ----
  }
  # ADDED BY JF
! if ($totalresults == 1){
      # if its a barcode search by definition we will only have one result.
      # And if we have a result




From genjimoto at users.sourceforge.net  Sat Jun 25 07:35:31 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Fri, 24 Jun 2005 22:35:31 -0700
Subject: [Koha-cvs] CVS: koha/C4 SearchMarc.pm,1.46,1.47
Message-ID: <E1Dm3KF-0005oB-UL@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22287

Modified Files:
	SearchMarc.pm 
Log Message:
New code making a search not needing to use tables not already used in searching.. doesn't take longer than normal. Achieved via new parameter in Catalogsearch called $extratables.

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** SearchMarc.pm	20 Jun 2005 14:10:01 -0000	1.46
--- SearchMarc.pm	25 Jun 2005 05:35:29 -0000	1.47
***************
*** 151,154 ****
--- 151,159 ----
  optional argument containing an sql string to be used in the 'where' statement. see usage in opac-search.pl.
  
+ =head2 $extratables
+ 
+ optional argument containing extra tables to search. Used in conjunction with $sqlstring. See usage in opac-search.pl.
+ String... so ',items,issues,reserves' allows the items, issues and reserves tables to be used.in a where.
+ 
  =head2 RETURNS
  
***************
*** 170,174 ****
  
  sub catalogsearch {
! 	my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby,$desc_or_asc,$sqlstring) = @_;
  	# build the sql request. She will look like :
  	# select m1.bibid
--- 175,179 ----
  
  sub catalogsearch {
! 	my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby,$desc_or_asc,$sqlstring, $extratables) = @_;
  	# build the sql request. She will look like :
  	# select m1.bibid
***************
*** 278,281 ****
--- 283,287 ----
  	my ($sql_tables, $sql_where1, $sql_where2) = create_request($dbh,\@normal_tags, \@normal_and_or, \@normal_operator, \@normal_value);
    $sql_where1 .= $sqlstring;
+   $sql_tables .= $extratables;
  	$sql_where1 .= "and TO_DAYS( NOW( ) ) - TO_DAYS( biblio.timestamp ) <30" if $orderby =~ "biblio.timestamp";
  	my $sth;




From genjimoto at users.sourceforge.net  Sat Jun 25 07:59:10 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Fri, 24 Jun 2005 22:59:10 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.20,1.21
Message-ID: <E1Dm3h8-0000IN-6r@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac-detail.tmpl 
Log Message:
New search options bar implemented as per http://katipo.co.nz/gallery/koha2-4/search_ideas_details_001

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** opac-detail.tmpl	20 Jun 2005 14:25:00 -0000	1.20
--- opac-detail.tmpl	25 Jun 2005 05:59:08 -0000	1.21
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
! 
  <div id="bibliomenu">
  	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
--- 1,7 ----
  <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
! <table width="100%">
! <tr>
! <td width="70%">
  <div id="bibliomenu">
  	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
***************
*** 80,84 ****
  				</p>
  				<!-- TMPL_IF name="count" -->
! 					<p><b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" --></p>
  				<!-- /TMPL_IF -->
  			</td>
--- 82,86 ----
  				</p>
  				<!-- TMPL_IF name="count" -->
! 				<p><b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" --></p>
  				<!-- /TMPL_IF -->
  			</td>
***************
*** 169,171 ****
--- 171,206 ----
  	</div>
  </div>
+ </td>
+ <td width="30%">
+ Search Options:<br>
+ Select keywords from list<br>
+ <br>
+ <form name="searchoptions" action="searchoptions.pl" method="get">
+ <input type="hidden" name="searchtype" value="NewSearch">
+ Titles:<br>
+ <!-- TMPL_LOOP NAME="titlewords" -->
+ <input type="checkbox" name="keyword" value="<!-- TMPL_VAR NAME="title" -->"><!-- TMPL_VAR NAME="title" --><br>
+ <!-- /TMPL_LOOP --><br>
+ Authors:<br>
+ <!-- TMPL_LOOP NAME="authorwords" -->
+ <input type="checkbox" name="keyword" value="<!-- TMPL_VAR NAME="author" -->"><!-- TMPL_VAR NAME="author" --><br>
+ <!-- /TMPL_LOOP --><br>
+ Subjects:<br>
+ <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+ <!-- TMPL_LOOP NAME="subjects" -->
+ <input type="checkbox" name="keyword" value="<!-- TMPL_VAR NAME="subject" -->"><!-- TMPL_VAR NAME="subject" --><br>
+ <!-- /TMPL_LOOP --><br>
+ Itemtype:<br>
+ <input type="checkbox" name="itemtypeswanted" value="<!-- TMPL_VAR NAME="itemtype" -->">
+ !-- TMPL_IF name="description" -->
+ <!-- TMPL_VAR name="description" -->
+ <!-- TMPL_ELSE -->
+ <!-- TMPL_VAR NAME="itemtype" -->
+ <!-- /TMPL_IF -->
+ <!-- /TMPL_LOOP --><br>
+ <input type="submit" value="Search">
+ </form>
+ </td>
+ </tr>
+ </table>
  <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->




From genjimoto at users.sourceforge.net  Sat Jun 25 08:56:50 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Fri, 24 Jun 2005 23:56:50 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.21,1.22
Message-ID: <E1Dm4aw-0006zh-0G@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac-detail.tmpl 
Log Message:
minor fix

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** opac-detail.tmpl	25 Jun 2005 05:59:08 -0000	1.21
--- opac-detail.tmpl	25 Jun 2005 06:56:47 -0000	1.22
***************
*** 193,197 ****
  Itemtype:<br>
  <input type="checkbox" name="itemtypeswanted" value="<!-- TMPL_VAR NAME="itemtype" -->">
! !-- TMPL_IF name="description" -->
  <!-- TMPL_VAR name="description" -->
  <!-- TMPL_ELSE -->
--- 193,197 ----
  Itemtype:<br>
  <input type="checkbox" name="itemtypeswanted" value="<!-- TMPL_VAR NAME="itemtype" -->">
! <!-- TMPL_IF name="description" -->
  <!-- TMPL_VAR name="description" -->
  <!-- TMPL_ELSE -->




From genjimoto at users.sourceforge.net  Sat Jun 25 09:26:52 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Sat, 25 Jun 2005 00:26:52 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-searchresults.tmpl,1.25,1.26
Message-ID: <E1Dm540-00024j-3b@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac-searchresults.tmpl 
Log Message:
Fix so clicking on numbers carries over the itemtype and availaiblity search parameters

Index: opac-searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** opac-searchresults.tmpl	20 Jun 2005 14:25:00 -0000	1.25
--- opac-searchresults.tmpl	25 Jun 2005 07:26:49 -0000	1.26
***************
*** 17,29 ****
  		<p class="center">
  			<!-- TMPL_IF NAME=displayprev -->
! 				<a class="results" href="opac-search.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;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search">&lt;&lt;Previous</a>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME="numbers" -->
  				<!-- TMPL_IF NAME="highlight" --><!-- TMPL_VAR NAME="number" --><!-- TMPL_ELSE -->
! 					<a class="results" href="opac-search.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;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
  			<!-- 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;</a>
  				<!-- /TMPL_IF -->
  		</p>
--- 17,32 ----
  		<p class="center">
  			<!-- TMPL_IF NAME=displayprev -->
! 				<a class="results" href="opac-search.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;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search
! 				<!-- TMPL_IF NAME="itemtypesstring">&itemtypesstring=<!-- TMPL_VAR NAME="itemtypesstring"><!-- /TMPL_IF --><!-- TMPL_IF NAME="avail" -->&avail=1<!-- /TMPL_IF -->">&lt;&lt;Previous</a>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME="numbers" -->
  				<!-- TMPL_IF NAME="highlight" --><!-- TMPL_VAR NAME="number" --><!-- TMPL_ELSE -->
! 					<a class="results" href="opac-search.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;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search
! 					<!-- TMPL_IF NAME="itemtypesstring">&itemtypesstring=<!-- TMPL_VAR NAME="itemtypesstring"><!-- /TMPL_IF --><!-- TMPL_IF NAME="avail" -->&avail=1<!-- /TMPL_IF -->"><!-- TMPL_VAR NAME="number" --></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
  			<!-- 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
! 				<!-- TMPL_IF NAME="itemtypesstring">&itemtypesstring=<!-- TMPL_VAR NAME="itemtypesstring"><!-- /TMPL_IF --><!-- TMPL_IF NAME="avail" -->&avail=1<!-- /TMPL_IF -->">Next &gt;&gt;</a>
  				<!-- /TMPL_IF -->
  		</p>
***************
*** 196,208 ****
  		<p class="center">
  			<!-- TMPL_IF NAME="displayprev" -->
! 				<a class="results" href="opac-search.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;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search">&lt;&lt;Previous</a>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME="numbers" -->
  				<!-- TMPL_IF NAME="highlight" --><!-- TMPL_VAR NAME="number" --><!-- TMPL_ELSE -->
! 					<a class="results" href="opac-search.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;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
  			<!-- 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;</a>
  				<!-- /TMPL_IF -->
  		</p>
--- 199,214 ----
  		<p class="center">
  			<!-- TMPL_IF NAME="displayprev" -->
! 				<a class="results" href="opac-search.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;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search
! 				<!-- TMPL_IF NAME="itemtypesstring">&itemtypesstring=<!-- TMPL_VAR NAME="itemtypesstring"><!-- /TMPL_IF --><!-- TMPL_IF NAME="avail" -->&avail=1<!-- /TMPL_IF -->">&lt;&lt;Previous</a>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME="numbers" -->
  				<!-- TMPL_IF NAME="highlight" --><!-- TMPL_VAR NAME="number" --><!-- TMPL_ELSE -->
! 					<a class="results" href="opac-search.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;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search
! 					<!-- TMPL_IF NAME="itemtypesstring">&itemtypesstring=<!-- TMPL_VAR NAME="itemtypesstring"><!-- /TMPL_IF --><!-- TMPL_IF NAME="avail" -->&avail=1<!-- /TMPL_IF -->"><!-- TMPL_VAR NAME="number" --></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
  			<!-- 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
! 				<!-- TMPL_IF NAME="itemtypesstring">&itemtypesstring=<!-- TMPL_VAR NAME="itemtypesstring"><!-- /TMPL_IF --><!-- TMPL_IF NAME="avail" -->&avail=1<!-- /TMPL_IF -->">Next &gt;&gt;</a>
  				<!-- /TMPL_IF -->
  		</p>




From hellen at users.sourceforge.net  Sat Jun 25 14:55:05 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:55:05 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/parameters admin-home.tmpl,1.1,1.2
Message-ID: <E1DmABd-0007ZC-Ai@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28983/koha-tmpl/intranet-tmpl/default/de/parameters

Modified Files:
	admin-home.tmpl 
Log Message:
adjustments for 2.2.3

Index: admin-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/admin-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** admin-home.tmpl	12 May 2005 19:26:35 -0000	1.1
--- admin-home.tmpl	25 Jun 2005 12:55:02 -0000	1.2
***************
*** 35,39 ****
  			<td>Medientypen definieren</td>
  		</tr>
! 
  		<tr>
  			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/categorie.pl">Benutzerkategorien</a></td>
--- 35,52 ----
  			<td>Medientypen definieren</td>
  		</tr>
! <tr>
!       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/itemtypecategory.pl"> Exemplarkategorien</a></td>
!       <td>Definition von Exemplarkategorien. (Sachliteratur, Sch&ouml;ne Literatur...)</td>
!     </tr>
! 
!     <tr>
!       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/itemtypesubcategory.pl"> Exemplarunterkategorien</a></td>
!       <td>Definition der Unterkategorien. (Sch&ouml;ne Literatur Jugendliche, Sachliteratur Jugendliche.... Sch&ouml;ne Literatur Erwachsene.)</td>
!     </tr>
! 
!     <tr>
!       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/mediatype.pl"> Exemplarmedientypen</a></td>
!       <td>Definition der Exemplarmedientypen. (CD, Video, Buch, Spiel...)</td>
!     </tr>
  		<tr>
  			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/categorie.pl">Benutzerkategorien</a></td>




From hellen at users.sourceforge.net  Sat Jun 25 14:58:55 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:55 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de mancredit.tmpl,1.2,1.3
Message-ID: <E1DmAFL-0007xd-HK@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	mancredit.tmpl 
Log Message:
adjustments for 2.2.3

Index: mancredit.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/mancredit.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** mancredit.tmpl	17 May 2005 13:21:35 -0000	1.2
--- mancredit.tmpl	25 Jun 2005 12:58:53 -0000	1.3
***************
*** 10,14 ****
  <option value="C">Gutschrift</option>
  <option value="BAY">Baycorp Adjustment</option>
! <option value="WORK">Arbeitsleistung</option>
  </select>
  </td></tr>
--- 10,14 ----
  <option value="C">Gutschrift</option>
  <option value="BAY">Baycorp Adjustment</option>
! <option value="WORK">Erledigt</option>
  </select>
  </td></tr>




From hellen at users.sourceforge.net  Sat Jun 25 14:58:56 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/bull statecollection.tmpl,1.2,1.3
Message-ID: <E1DmAFM-0007y6-5E@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30254/koha-tmpl/intranet-tmpl/default/de/bull

Modified Files:
	statecollection.tmpl 
Log Message:
adjustments for 2.2.3

Index: statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/bull/statecollection.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** statecollection.tmpl	17 May 2005 13:21:35 -0000	1.2
--- statecollection.tmpl	25 Jun 2005 12:58:53 -0000	1.3
***************
*** 35,43 ****
  			<td>
  				<input type="hidden" name="serialid" value="<!-- TMPL_VAR name="serialid" -->">
! 				<select name="status" size="1">					
! 						<option value="1" <!--TMPL_IF name="status1" -->selected<!-- /TMPL_IF -->>erwartet</option>		
! 						<option value="2" <!--TMPL_IF name="status2" -->selected<!-- /TMPL_IF -->>eingegangen</option>
! 						<option value="3" <!--TMPL_IF name="status3" -->selected<!-- /TMPL_IF -->>versp&auml;tet</option>					
! 						<option value="4" <!--TMPL_IF name="status4" -->selected<!-- /TMPL_IF -->>&uuml;berf&auml;llig</option>					
  				</select>
  			</td>
--- 35,57 ----
  			<td>
  				<input type="hidden" name="serialid" value="<!-- TMPL_VAR name="serialid" -->">
! 				<select name="status" size="1">	
! 					<!--TMPL_IF name="status1" -->				
! 						<option value="1" selected>erwartet</option>
! 						<!-- /TMPL_IF -->
! 						<!--TMPL_IF name="status2" -->		
! 						<option value="2" selected>eingegangen</option>
! 						<!-- /TMPL_ELSE -->
! 						<option value="2" selected>eingegangen</option>
! 						<!-- /TMPL_IF -->
! 						<!--TMPL_IF name="status3" -->
! 						<option value="3"selected>versp&auml;tet</option>
! 						<!-- /TMPL_ELSE -->
! 						<option value="3"selected>versp&auml;tet</option>
! 						<!-- /TMPL_IF -->
! 						 <!--TMPL_IF name="status4" -->					
! 						<option value="4"selected>&uuml;berf&auml;llig</option>
! 						<!-- /TMPL_ELSE -->
! 						<option value="4"selected>&uuml;berf&auml;llig</option>
! 						<!-- /TMPL_IF -->					
  				</select>
  			</td>
***************
*** 55,59 ****
  				<input type="hidden" name="serialid" value="0">
  				<select name="status" size="1">
- 						<option value="1">erwartet</option>				
  						<option value="2">eingegangen</option>
  						<option value="3" selected>versp&auml;tet</option>
--- 69,72 ----




From hellen at users.sourceforge.net  Sat Jun 25 14:58:56 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/authorities authorities.tmpl,1.1,1.2
Message-ID: <E1DmAFM-0007y2-4Q@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30254/koha-tmpl/intranet-tmpl/default/de/authorities

Modified Files:
	authorities.tmpl 
Log Message:
adjustments for 2.2.3

Index: authorities.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities/authorities.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** authorities.tmpl	12 May 2005 19:26:14 -0000	1.1
--- authorities.tmpl	25 Jun 2005 12:58:53 -0000	1.2
***************
*** 4,8 ****
  <div class="tabbed">
  	<form method="post" name="f">
! 	<h1 class="authority">Authority number <!-- TMPL_VAR NAME="authid" --></h1>
  	<p>
  		<input type="hidden" name="op" value="add">
--- 4,12 ----
  <div class="tabbed">
  	<form method="post" name="f">
! 	<!-- TMPL_IF name="authid" -->
! 		<h1 class="authority">Modify authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
! 	<!-- TMPL_ELSE -->
! 		<h1 class="authority">Adding authority (<!-- TMPL_VAR name="authtypetext" -->)</h1>
! 	<!-- /TMPL_IF -->
  	<p>
  		<input type="hidden" name="op" value="add">
***************
*** 11,17 ****
  		<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->">
  		<!-- TMPL_IF name="authid" -->
! 			<input type="button" value="Speichern" onclick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- TMPL_ELSE -->
! 			<input type="button" value="Authority hinzuf&uuml;gen" onclick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- /TMPL_IF -->
  	</p>
--- 15,21 ----
  		<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->">
  		<!-- TMPL_IF name="authid" -->
! 			<input type="button" value="Save" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- TMPL_ELSE -->
! 			<input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- /TMPL_IF -->
  	</p>
***************
*** 19,22 ****
--- 23,36 ----
  
  <br><br><br><br><br><br><br><br><br><br><br>
+ <!-- TMPL_IF name="duplicateauthid" -->
+ 	<div class="problem">
+ 		<p>Duplicate suspected with <a href='javascript:openWindow("detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&popup=1", "Duplicate Authority")' class="button authority"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
+ 		<p>You must either :</p>
+ 		<ul>
+ 			<p><input type="checkbox" value=1 name="confirm_not_duplicate">confirm it's not a duplicate (and click on <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority"> again)</p>
+ 			<p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >original authority</a></p>
+ 		</ul>
+ 	</div>
+ <!-- /TMPL_IF -->
  
  <!-- TMPL_LOOP NAME="0XX" -->
***************
*** 133,138 ****
  		alertString2  = _("Form not submitted because of the following problem(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_missing_mandatory_tags +_("Pflichttags leer");
! 		alertString2 += "\n- "+ total_missing_mandatory_subfields +_("Pflichtfeld leer (sieh fett dargestellte Unterfelder)");
  		alert(alertString2);
  	} else {
--- 147,152 ----
  		alertString2  = _("Form not submitted because of the following problem(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_missing_mandatory_tags +_(" mandatory tags empty");
! 		alertString2 += "\n- "+ total_missing_mandatory_subfields +_(" mandatory fields empty (see bold subfields)");
  		alert(alertString2);
  	} else {
***************
*** 165,170 ****
  
  function AddField(field) {
! 	document.forms[0].op.value = "addfield";
! 	document.forms[0].addfield_field.value=field;
  	document.f.submit();
  }
--- 179,184 ----
  
  function AddField(field) {
! 	document.forms[1].op.value = "addfield";
! 	document.forms[1].addfield_field.value=field;
  	document.f.submit();
  }




From hellen at users.sourceforge.net  Sat Jun 25 14:58:56 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/catalogue MARCdetail.tmpl,1.4,1.5 detail.tmpl,1.3,1.4 searchresults.tmpl,1.2,1.3
Message-ID: <E1DmAFM-0007yJ-Bs@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	MARCdetail.tmpl detail.tmpl searchresults.tmpl 
Log Message:
adjustments for 2.2.3

Index: MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/catalogue/MARCdetail.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** MARCdetail.tmpl	9 Jun 2005 17:54:31 -0000	1.4
--- MARCdetail.tmpl	25 Jun 2005 12:58:53 -0000	1.5
***************
*** 4,8 ****
  	<div class="tabbed">
  		<h1 class="catalogue">Biblionummer : <!-- TMPL_VAR NAME="biblionumber" --></h1>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Biblio bearbeiten  </a>  <a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">  Duplizieren  </a>  <a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue">  Exemplar bearbeiten  </a>   <a href="javascript:confirm_deletion()" class="button catalogue">  L&ouml;schen  </a>  <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Vollanzeige  </a>  <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normalanzeige  </a>  <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD  </a>  <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  zu virtuellem Regal hinzuf&uuml;gen  </a>  <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  Drucken  </a>
  		<!-- TMPL_IF name="subscriptionsnumber" -->
  		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
--- 4,29 ----
  	<div class="tabbed">
  		<h1 class="catalogue">Biblionummer : <!-- TMPL_VAR NAME="biblionumber" --></h1>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Biblio bearbeiten
! 		  </a>
! 		    <a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">
! 		      Duplizieren 
! 		       </a>  <a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue">
! 		         Exemplar bearbeiten
! 			   </a>   <a href="javascript:confirm_deletion()" class="button catalogue">
! 			     L&ouml;schen 
! 			      </a> 
! 			       <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue"> 
! 			        Vollanzeige
! 				  </a> 
! 				   <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normalanzeige
! 				     </a>
! 				       <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD
! 				         </a> 
! 					  <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
! 					    zu vituellem Regal hinzuf&uuml;gen
! 					      </a> 
! 					       <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
! 					         Drucken
! 						   </a>
  		<!-- TMPL_IF name="subscriptionsnumber" -->
  		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
***************
*** 363,367 ****
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Wollen Sie diesen Biblio wirklich l&ouml;schen?');
  	if (is_confirmed) {
  		window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";
--- 384,388 ----
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Are you sure you want to delete this biblio?');
  	if (is_confirmed) {
  		window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/catalogue/detail.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** detail.tmpl	8 Jun 2005 11:28:08 -0000	1.3
--- detail.tmpl	25 Jun 2005 12:58:53 -0000	1.4
***************
*** 5,9 ****
  	<h1 class="catalogue"><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->) <!-- TMPL_VAR NAME="class" --></h1>
  	<div class="bibliomenu">
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Biblio bearbeiten  </a>  <a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">  Duplizieren  </a>  <a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue">  Exemplar bearbeiten  </a>   <a href="javascript:confirm_deletion()" class="button catalogue">  L&ouml;schen  </a>  <a href="MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  MARC-Vollanzeige  </a>  <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normalanzeige  </a>  <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD  </a>  <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  zu virtuellem Regal hinzuf&uuml;gen  </a>  <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  Drucken  </a>
  		<!-- TMPL_IF name="subscriptionsnumber" -->
  		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
--- 5,31 ----
  	<h1 class="catalogue"><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->) <!-- TMPL_VAR NAME="class" --></h1>
  	<div class="bibliomenu">
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Biblio bearbeiten
! 		  </a>
! 		    <a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">
! 		     Duplizieren 
! 		      </a>
! 		        <a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue">
! 			  Exemplar bearbeiten
! 			    </a>
! 			       <a href="javascript:confirm_deletion()" class="button catalogue">
! 			         L&ouml;schen 
! 				  </a>
! 				    <a href="MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  MARC-Vollanzeige
! 				      </a>
! 				        <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normalanzeige
! 					  </a>
! 					    <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD
! 					      </a>
! 					        <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
! 						  zu virtuellem Regal hinzuf&uuml;gen
! 						    </a>
! 						      <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
! 						        Drucken
! 							  </a>
  		<!-- TMPL_IF name="subscriptionsnumber" -->
  		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
***************
*** 34,38 ****
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="author" --><label class="label100"><b>Verfasser</b> </label><!-- TMPL_VAR NAME="author" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="additional" --><label class="label100"><b>Weitere Verfasser:</b></label><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><label class="label100"><b>Verlag:</b></label><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" --><br />
  				<!-- TMPL_IF name="publicationyear" --><label class="label100"><b>Ort:</b></label><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
--- 56,60 ----
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="author" --><label class="label100"><b>Verfasser</b> </label><!-- TMPL_VAR NAME="author" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="additional" --><label class="label100"><b>Additional Author:</b></label><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><label class="label100"><b>Verlag:</b></label><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" --><br />
  				<!-- TMPL_IF name="publicationyear" --><label class="label100"><b>Ort:</b></label><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
***************
*** 72,76 ****
  			<th class="catalogue">Entliehen bis</th>
  			<th class="catalogue">Zuletzt gesehen</th>
! 			<th class="catalogue">Barcode</th>
  			<th class="catalogue">Band</th>
  		</tr>
--- 94,98 ----
  			<th class="catalogue">Entliehen bis</th>
  			<th class="catalogue">Zuletzt gesehen</th>
! 			<th class="catalogue">Strichcode</th>
  			<th class="catalogue">Band</th>
  		</tr>
***************
*** 92,96 ****
  				<!-- TMPL_IF NAME="type" -->
  					<td>
! 						<a href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;item=<!-- TMPL_VAR NAME="itemtype" -->">Medientyp &auml;ndern</a>
  					</td>
  				<!-- /TMPL_IF -->
--- 114,118 ----
  				<!-- TMPL_IF NAME="type" -->
  					<td>
! 						<a href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;item=<!-- TMPL_VAR NAME="itemtype" -->">Fix Itemtype</a>
  					</td>
  				<!-- /TMPL_IF -->

Index: searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/catalogue/searchresults.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** searchresults.tmpl	17 May 2005 13:21:35 -0000	1.2
--- searchresults.tmpl	25 Jun 2005 12:58:53 -0000	1.3
***************
*** 63,67 ****
  		<!-- TMPL_IF NAME=not-available-p -->Nicht verf&uuml;gbar<!-- TMPL_IF NAME=not-available-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME=lost-p -->Exemplar vermi&szlig;t<!-- TMPL_IF NAME=lost-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME=withdrawn-p -->Ausgemustert<!-- TMPL_IF NAME=withdrawn-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME=on-loan-p -->Entliehen<!-- TMPL_IF NAME=on-loan-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
  		<!-- TMPL_ELSE -->
--- 63,67 ----
  		<!-- TMPL_IF NAME=not-available-p -->Nicht verf&uuml;gbar<!-- TMPL_IF NAME=not-available-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME=lost-p -->Exemplar vermi&szlig;t<!-- TMPL_IF NAME=lost-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME=withdrawn-p -->Gel&ouml;scht<!-- TMPL_IF NAME=withdrawn-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME=on-loan-p -->Entliehen<!-- TMPL_IF NAME=on-loan-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
  		<!-- TMPL_ELSE -->




From hellen at users.sourceforge.net  Sat Jun 25 14:58:56 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple addbiblio.tmpl,1.3,1.4 additem.tmpl,1.4,1.5 isbnsearch.tmpl,1.3,1.4
Message-ID: <E1DmAFM-0007yD-7g@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	addbiblio.tmpl additem.tmpl isbnsearch.tmpl 
Log Message:
adjustments for 2.2.3

Index: addbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/addbiblio.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** addbiblio.tmpl	5 Jun 2005 14:45:17 -0000	1.3
--- addbiblio.tmpl	25 Jun 2005 12:58:53 -0000	1.4
***************
*** 2,6 ****
  <div class="tabbed">
  	<form method="post" name="f">
! 	<h1 class="catalogue">Biblionummer : <!-- 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" --></h1>
  	<p>
  		<input type="hidden" name="op" value="addbiblio">
***************
*** 9,15 ****
  		<input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="oldbiblionumber" -->">
  		<!-- TMPL_IF name="bibid" -->
! 			<BUTTON value="Save" onclick="Check(this.form)" accesskey="s" class="button catalogue">&Auml;nderungen <u>s</u>ichern</BUTTON>
  		<!-- TMPL_ELSE -->
! 			<BUTTON value="Add biblio" onclick="Check(this.form)" accesskey="n" class="button catalogue"><u>N</u>euer Eintrag</BUTTON>
  		<!-- /TMPL_IF -->
  		<a href="javascript:PopupZ3950()" class="button catalogue">z3950 Suche</a>
--- 9,15 ----
  		<input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="oldbiblionumber" -->">
  		<!-- TMPL_IF name="bibid" -->
! 			<input type ="button" value="Speichern" onclick="Check(this.form)" accesskey="w" class="button catalogue">
  		<!-- TMPL_ELSE -->
! 			<input type ="button" value="Biblio hinzuf&uuml;gen" onclick="Check(this.form)" accesskey="w" class="button catalogue">
  		<!-- /TMPL_IF -->
  		<a href="javascript:PopupZ3950()" class="button catalogue">z3950 Suche</a>

Index: additem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/additem.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** additem.tmpl	9 Jun 2005 17:54:31 -0000	1.4
--- additem.tmpl	25 Jun 2005 12:58:53 -0000	1.5
***************
*** 5,14 ****
  	<input type="hidden" name="bibid" value="<!-- TMPL_VAR NAME="bibid" -->">
  	<div class="tabbed">
! 		<h1 class="catalogue">Biblionummer: <!-- TMPL_VAR NAME="biblionumber" --></h1>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Bibliografische Daten bearbeiten  </a>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">  Duplizieren  </a>
! 		<a href="../MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  MARC  </a>
! 		<a href="../detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normal  </a>
! 		<a href="../ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD  </a>
  	</div>
  	<!-- TMPL_IF name="item_loop" -->
--- 5,19 ----
  	<input type="hidden" name="bibid" value="<!-- TMPL_VAR NAME="bibid" -->">
  	<div class="tabbed">
! 	<h1 class="catalogue"><!-- TMPL_VAR name="title" --> (<!-- TMPL_VAR name="author" --> Biblionummer:<!-- TMPL_VAR NAME="biblionumber" -->)</h1>
! 				<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
! 				  Biblio bearbeiten  </a>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">
! 		  Duplizieren  </a>
! 		<a href="../MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
! 		  MARC  </a>
! 		<a href="../detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
! 		  Normal  </a>
! 		<a href="../ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
! 		  ISBD  </a>
  	</div>
  	<!-- TMPL_IF name="item_loop" -->
***************
*** 53,57 ****
  	<input type="hidden" name="itemnum" value="<!-- TMPL_VAR NAME="itemnum" -->">
  	<!-- TMPL_IF name="barcode_not_unique" -->
! 		<div id="problem"><b>FEHLER: Barcode ist bereits vorhanden<b></div>
  	<!-- /TMPL_IF -->
  	<!-- TMPL_IF name="opisadd" -->
--- 58,62 ----
  	<input type="hidden" name="itemnum" value="<!-- TMPL_VAR NAME="itemnum" -->">
  	<!-- TMPL_IF name="barcode_not_unique" -->
! 		<div id="problem"><b>FEHLER: Strichcode ist bereits vorhanden<b></div>
  	<!-- /TMPL_IF -->
  	<!-- TMPL_IF name="opisadd" -->
***************
*** 100,106 ****
  		document.f.submit();
  	} else {
! 		alertString2  = _("Formular nicht bearbeitet wegen der folgenden Probleme");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_errors+_("Pflichtfelder leer (siehe fett dargestellte Unterfelder)");
  		alert(alertString2);
  	}
--- 105,111 ----
  		document.f.submit();
  	} else {
! 		alertString2  = _("Form not submitted because of the following problem(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_errors+_("Pflichtfelder leer (sieh fett dargestellte Unterfelder)");
  		alert(alertString2);
  	}

Index: isbnsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/isbnsearch.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** isbnsearch.tmpl	8 Jun 2005 11:28:08 -0000	1.3
--- isbnsearch.tmpl	25 Jun 2005 12:58:53 -0000	1.4
***************
*** 12,16 ****
  	</div>
  	<div id="bloc25">
! 		<h2 class="catalogue">Ergebnisse in der Datenbank</h2>
  		<!-- TMPL_IF name="loop" -->
  			<div id="resultnumber">
--- 12,16 ----
  	</div>
  	<div id="bloc25">
! 		<h2 class="catalogue">Biblios in der Datenbank</h2>
  		<!-- TMPL_IF name="loop" -->
  			<div id="resultnumber">
***************
*** 32,36 ****
  					<!-- 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">
! 							Weitere &gt;&gt;
  						</a>
  					<!-- /TMPL_IF -->
--- 32,36 ----
  					<!-- 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">
! 							Weitere&gt;&gt;
  						</a>
  					<!-- /TMPL_IF -->
***************
*** 38,44 ****
  			<p class="resultcount">
  				<!-- TMPL_IF NAME="total" -->
! 					Treffer <i><!-- TMPL_VAR NAME="from" --></i> bis <i><!-- TMPL_VAR NAME="to" --></i>
  				<!-- TMPL_ELSE -->
! 					Keine Treffer
  				<!-- /TMPL_IF -->
  			</p>
--- 38,44 ----
  			<p class="resultcount">
  				<!-- TMPL_IF NAME="total" -->
! 					Ergebnisse <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" -->
  				<!-- TMPL_ELSE -->
! 					Nichts gefunden.
  				<!-- /TMPL_IF -->
  			</p>
***************
*** 62,71 ****
  						<td><a href="additem-nomarc.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Exemplare hinzuf&uuml;gen</a></td>
  						<!-- TMPL_ELSE -->
! 						<td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Bearbeiten</a></td>
  						<!-- /TMPL_IF -->
  						<!-- TMPL_UNLESS NAME="NOTMARC" -->
  						<td>
  							<a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">
! 								Duplizieren
  							</a>
  						</td>
--- 62,71 ----
  						<td><a href="additem-nomarc.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Exemplare hinzuf&uuml;gen</a></td>
  						<!-- TMPL_ELSE -->
! 						<td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Bearbeiten...</a></td>
  						<!-- /TMPL_IF -->
  						<!-- TMPL_UNLESS NAME="NOTMARC" -->
  						<td>
  							<a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">
! 								Duplikate
  							</a>
  						</td>
***************
*** 92,96 ****
  					<!-- 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">
! 							Weitere &gt;&gt;
  						</a>
  					<!-- /TMPL_IF -->
--- 92,96 ----
  					<!-- 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">
! 							Weitere&gt;&gt;
  						</a>
  					<!-- /TMPL_IF -->
***************
*** 98,113 ****
  			<p class="resultcount">
  				<!-- TMPL_IF NAME="total" -->
! 					Treffer <i><!-- TMPL_VAR NAME="from" --></i> bis <i><!-- TMPL_VAR NAME="to" --></i>
  				<!-- TMPL_ELSE -->
! 					Keine Treffer
  				<!-- /TMPL_IF -->
  			</p>
  		</div>
  		<!-- TMPL_ELSE -->
! 			<p>Keine</p>
  		<!-- /TMPL_IF -->
  	</div>
  	<div id="bloc25">
! 		<h2 class="catalogue">Bibliografische Daten im Fremddatenpool</h2>
  		<!-- TMPL_IF name="breeding_loop" -->
  			<table>
--- 98,113 ----
  			<p class="resultcount">
  				<!-- TMPL_IF NAME="total" -->
! 					Ergebnisse <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" -->
  				<!-- TMPL_ELSE -->
! 					Nichts gefunden.
  				<!-- /TMPL_IF -->
  			</p>
  		</div>
  		<!-- TMPL_ELSE -->
! 			<p>None</p>
  		<!-- /TMPL_IF -->
  	</div>
  	<div id="bloc25">
! 		<h2 class="catalogue">Biblios im fremddatenpool</h2>
  		<!-- TMPL_IF name="breeding_loop" -->
  			<table>
***************
*** 129,133 ****
  							
  							<!-- TMPL_ELSE -->
! 							<td><a href="addbiblio.pl?breedingid=<!-- TMPL_VAR NAME="id" -->" class="button catalogue">Biblio zur Datenbank hinzuf&uuml;gen</a></td>
  							<!-- /TMPL_IF -->
  						</tr>
--- 129,133 ----
  							
  							<!-- TMPL_ELSE -->
! 							<td><a href="addbiblio.pl?breedingid=<!-- TMPL_VAR NAME="id" -->" class="button catalogue">Biblio hinzuf&uuml;gen</a></td>
  							<!-- /TMPL_IF -->
  						</tr>
***************
*** 139,143 ****
  	</div>
  	<div id="bloc25">
! 		<h2 class="catalogue">Biblio zur Datenbank hinzuf&uuml;gen</h2>
  		<p class="center">
  		<!-- TMPL_IF NAME="NOTMARC" -->
--- 139,143 ----
  	</div>
  	<div id="bloc25">
! 		<h2 class="catalogue">Biblio hinzuf&uuml;gen</h2>
  		<p class="center">
  		<!-- TMPL_IF NAME="NOTMARC" -->




From hellen at users.sourceforge.net  Sat Jun 25 14:58:56 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/acqui acqui-home.tmpl,1.4,1.5 basket.tmpl,1.3,1.4 newbiblio.tmpl,1.2,1.3
Message-ID: <E1DmAFM-0007y9-76@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	acqui-home.tmpl basket.tmpl newbiblio.tmpl 
Log Message:
adjustments for 2.2.3

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui/acqui-home.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** acqui-home.tmpl	9 Jun 2005 08:37:41 -0000	1.4
--- acqui-home.tmpl	25 Jun 2005 12:58:53 -0000	1.5
***************
*** 6,18 ****
  <div id="bloc25">
  	<h2 class="acquisition">Beginnen, Eingangsbearbeitung, &auml;ndern von Bestellungen</h2>
! 	<!-- TMPL_IF name="nobudget" -->
!   	                 <p class="problem">Sie m&uuml;ssen unter Parameter ein Budget definieren</p>
!   	         <!-- TMPL_ELSE -->
! 		<form action="/cgi-bin/koha/acqui/order.pl" method="post">
  			Lieferantenname: <input type="text"  size="25"   name="supplier">
  			<input type="submit" class="button acquisition" value="OK">
  		</form>
  	<p>oder <a href="histsearch.pl" class="button acquisition"> Suche Bestellhistorie</a></p>
- 	<!-- /TMPL_IF -->
  </div>
  
--- 6,14 ----
  <div id="bloc25">
  	<h2 class="acquisition">Beginnen, Eingangsbearbeitung, &auml;ndern von Bestellungen</h2>
!   	        <form action="/cgi-bin/koha/acqui/order.pl" method="post">
  			Lieferantenname: <input type="text"  size="25"   name="supplier">
  			<input type="submit" class="button acquisition" value="OK">
  		</form>
  	<p>oder <a href="histsearch.pl" class="button acquisition"> Suche Bestellhistorie</a></p>
  </div>
  
***************
*** 35,39 ****
  	<h2 class="acquisition">zu pr&uuml;fende Vorschl&auml;ge</h2>
  		<!-- TMPL_IF name="suggestion" -->
! 			<!--TMPL_VAR NAME="suggestion" --> offene Anschaffungsvorschl%auml;ge <a href="/cgi-bin/koha/suggestion/acceptorreject.pl" class="button acquisition">Manage</a>
  		<!-- TMPL_ELSE -->
  			Keine Anschaffungsvorschl&auml;ge offen
--- 31,35 ----
  	<h2 class="acquisition">zu pr&uuml;fende Vorschl&auml;ge</h2>
  		<!-- TMPL_IF name="suggestion" -->
! 			<!--TMPL_VAR NAME="suggestion" --> suggestions waiting <a href="/cgi-bin/koha/suggestion/acceptorreject.pl" class="button acquisition">Manage</a>
  		<!-- TMPL_ELSE -->
  			Keine Anschaffungsvorschl&auml;ge offen
***************
*** 43,58 ****
  <!-- showbudget-->
  <div id="bloc25">
! 	<form action="/cgi-bin/koha/search.pl">
  		<h2 class="acquisition">Etats und Budgets</h2>
- 		<!-- TMPL_IF name="nobudget" -->
-   	                 <p class="problem">Sie m&uuml;sen unter Parameter ein Budget definieren</p>
-   	         <!-- TMPL_ELSE -->
  		<table class="noborder">
  			<tr>
  				<th class="acquisition">Etats</th>
! 				<th class="acquisition">Gesamt</th>
  				<th class="acquisition">Geschenkt</th>
  				<th class="acquisition">Verausgabt</th>
! 				<th class="acquisition">Verf&uuml;gbar </th>
  			</tr>
  			<!-- TMPL_LOOP NAME="loop_budget" -->
--- 39,51 ----
  <!-- showbudget-->
  <div id="bloc25">
! 		<form action="/cgi-bin/koha/search.pl">	
  		<h2 class="acquisition">Etats und Budgets</h2>
  		<table class="noborder">
  			<tr>
  				<th class="acquisition">Etats</th>
! 				<th class="acquisition">Total</th>
  				<th class="acquisition">Geschenkt</th>
  				<th class="acquisition">Verausgabt</th>
! 				<th class="acquisition">Verf&uuml;gbar</th>
  			</tr>
  			<!-- TMPL_LOOP NAME="loop_budget" -->
***************
*** 66,70 ****
  			<!-- /TMPL_LOOP -->
  			<tr>
! 				<th class="acquisition" align="right">Gesamt</th>
  				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="total" --></th>
  				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="totspent" --></th>
--- 59,63 ----
  			<!-- /TMPL_LOOP -->
  			<tr>
! 				<th class="acquisition" align="right">Total</th>
  				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="total" --></th>
  				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="totspent" --></th>
***************
*** 74,80 ****
  		</table>
  		<p>
! Benutzen Sie den "neu laden"-Button des Browsers zur Anzeige der aktuellen Betr&auml;ge. Die angezeigten Werte sind nur ungef&auml;hre Werte, da bei Zahlung eines Betrags der dann aktuelle Wechselkurs berechnet wird.
  		</p>
! 	<!-- /TMPL_IF -->
  </div>
  
--- 67,73 ----
  		</table>
  		<p>
! 		Benutzen Sie den "neu laden"-Button des Browsers zur Anzeige der aktuellen Betr&auml;ge. Die angezeigten Werte sind nur ungef&auml;hre Werte, da bei Zahlung eines Betrags der dann aktuelle Wechselkurs berechnet wird.
  		</p>
! 	 </form>
  </div>
  

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui/basket.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** basket.tmpl	5 Jun 2005 18:10:13 -0000	1.3
--- basket.tmpl	25 Jun 2005 12:58:53 -0000	1.4
***************
*** 1,4 ****
  <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
! 
  <div id="mainbloc">
  	<h1 class="acquisition"><!-- TMPL_UNLESS name="basketno" -->Neu <!-- /TMPL_UNLESS -->Einkaufskorb <b><!-- TMPL_VAR NAME="basketno" --> </b>f&uuml;r <a href="supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a></h1><br />
--- 1,4 ----
  <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
! <!-- angepasst fuer 2.2.3, hellen, 24/06/05 -->
  <div id="mainbloc">
  	<h1 class="acquisition"><!-- TMPL_UNLESS name="basketno" -->Neu <!-- /TMPL_UNLESS -->Einkaufskorb <b><!-- TMPL_VAR NAME="basketno" --> </b>f&uuml;r <a href="supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a></h1><br />
***************
*** 7,12 ****
  			<h2 class="acquisition">Korb-Info</h2>
  			<p><label class="label100">Korb-Nummer<label> <!-- TMPL_VAR NAME="basketno" --></p>
! 			<p><label class="label100">Bearbeitet von<label><!-- TMPL_VAR NAME="authorisedbyname" --></p>
! 			<p><label class="label100">Begonnen am<label> <!-- TMPL_VAR NAME="creationdate" --></p>
  			<p><label class="label100">f&uuml;r<label> <!-- TMPL_VAR NAME="booksellerid" --></p>
  			<p><label class="label100">Rechnungsnummer </label><!-- TMPL_VAR NAME="booksellerinvoicenumber" --></p>
--- 7,12 ----
  			<h2 class="acquisition">Korb-Info</h2>
  			<p><label class="label100">Korb-Nummer<label> <!-- TMPL_VAR NAME="basketno" --></p>
! 			<p><label class="label100">Managed by<label><!-- TMPL_VAR NAME="authorisedbyname" --></p>
! 			<p><label class="label100">open on<label> <!-- TMPL_VAR NAME="creationdate" --></p>
  			<p><label class="label100">f&uuml;r<label> <!-- TMPL_VAR NAME="booksellerid" --></p>
  			<p><label class="label100">Rechnungsnummer </label><!-- TMPL_VAR NAME="booksellerinvoicenumber" --></p>
***************
*** 28,35 ****
  				<th class="acquisition">Titel</th>
  				<th class="acquisition">Verfasser</th>
! 				<th class="acquisition">EK-Preis</th>
! 				<th class="acquisition doNotPrint">Nettopreis</th>
! 				<th class="acquisition">Menge</th>
! 				<th class="acquisition">Gesamt</th>
  				<th class="acquisition doNotPrint">Etat <a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=aqorderbreakdown.bookfundid,biblioitems.publishercode">[Bestellung]</a></th>
  				<!-- TMPL_IF name="active" -->
--- 28,35 ----
  				<th class="acquisition">Titel</th>
  				<th class="acquisition">Verfasser</th>
! 				<th class="acquisition">rrp</th>
! 				<th class="acquisition doNotPrint">est</th>
! 				<th class="acquisition">Qty</th>
! 				<th class="acquisition">Total</th>
  				<th class="acquisition doNotPrint">Etat <a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=aqorderbreakdown.bookfundid,biblioitems.publishercode">[Bestellung]</a></th>
  				<!-- TMPL_IF name="active" -->
***************
*** 91,100 ****
  		<!-- TMPL_UNLESS name="closedate" -->
  		<div id="bloc25">
! 			<h2 class="acquisition">Weitere Bestellung</h2>
  			<form action="/cgi-bin/koha/acqui/newbasket2.pl" method="post">
  				<input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->">
  				<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
  				<p>von einem vorhandenen Biblio </b><input type="text"  size="25"   name="search"><input type="submit" class="button acquisition" value="Suche"></p>
! 				<p>oder <a href="/cgi-bin/koha/acqui/suggestion-select.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition"> f&uuml;r einen Anschaffungsvorschlag </a> <a href="/cgi-bin/koha/acqui/newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition"> Neuer Biblio </a>
  				</p>
  			</form>
--- 91,105 ----
  		<!-- TMPL_UNLESS name="closedate" -->
  		<div id="bloc25">
! 			<h2 class="acquisition">Add order line</h2>
  			<form action="/cgi-bin/koha/acqui/newbasket2.pl" method="post">
  				<input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->">
  				<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
  				<p>von einem vorhandenen Biblio </b><input type="text"  size="25"   name="search"><input type="submit" class="button acquisition" value="Suche"></p>
! 				<p>oder
! 				 <a href="/cgi-bin/koha/acqui/suggestion-select.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">
! 				  f&uuml;r einen Anschaffungsvorschlag
! 				   </a> <a href="/cgi-bin/koha/acqui/newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">
! 				    Neuer Biblio
! 				     </a>
  				</p>
  			</form>

Index: newbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui/newbiblio.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** newbiblio.tmpl	4 Jun 2005 14:10:26 -0000	1.2
--- newbiblio.tmpl	25 Jun 2005 12:58:53 -0000	1.3
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  <script language="javascript" type="text/javascript">
! 
  <!--
  function update(f){
--- 1,5 ----
  <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  <script language="javascript" type="text/javascript">
! <!-- aktualisiert fuer 2.2.3, hellen 24/06/05 -->
  <!--
  function update(f){
***************
*** 87,90 ****
--- 87,91 ----
  	<!-- /TMPL_LOOP -->
  	<a href="basket.pl?basket=<!-- TMPL_VAR NAME="basket" -->" class="button acquisition">Korb ansehen</a> <h1 class="acquisition">
+ 	<h1 class="acquisition">
  		<!-- TMPL_IF name="ordnum" -->
  			Bestellung bearbeiten (Zeile #<!-- TMPL_VAR NAME="ordnum" -->)
***************
*** 94,98 ****
  		 <!-- TMPL_IF name="suggestionid" -->(bestimmt durch Vorschlag)<!-- /TMPL_IF -->
  	</h1>
! 	Einkaufkorb f&uuml;r <!-- TMPL_VAR NAME="name" -->
  	<div id="bloc25">
  		<h2 class="acquisition">Katalog-Details</h2>
--- 95,99 ----
  		 <!-- TMPL_IF name="suggestionid" -->(bestimmt durch Vorschlag)<!-- /TMPL_IF -->
  	</h1>
! 	Shopping Basket For <!-- TMPL_VAR NAME="name" -->
  	<div id="bloc25">
  		<h2 class="acquisition">Katalog-Details</h2>
***************
*** 142,146 ****
  		</p>
  		<p>
! 			<label class="label100">Serie</label>
  			<!-- TMPL_IF name="biblio" -->
  				<input type="hidden" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->"><!-- TMPL_VAR NAME="seriestitle" -->
--- 143,147 ----
  		</p>
  		<p>
! 			<label class="label100">Serien</label>
  			<!-- TMPL_IF name="biblio" -->
  				<input type="hidden" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->"><!-- TMPL_VAR NAME="seriestitle" -->
***************
*** 181,185 ****
  		</p>
  		<p>
! 			<label class="label100"><b>GESAMTSUMME</b></label>
  			<input type="text" size="20" name="total" value="" onchange="update(this.form)">
  		</p>
--- 182,186 ----
  		</p>
  		<p>
! 			<label class="label100"><b>BUDGETED TOTAL</b></label>
  			<input type="text" size="20" name="total" value="" onchange="update(this.form)">
  		</p>




From hellen at users.sourceforge.net  Sat Jun 25 14:58:56 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/help/members memberentry.tmpl,1.1,1.2
Message-ID: <E1DmAFM-0007yG-8t@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/help/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30254/koha-tmpl/intranet-tmpl/default/de/help/members

Modified Files:
	memberentry.tmpl 
Log Message:
adjustments for 2.2.3

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/help/members/memberentry.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** memberentry.tmpl	12 May 2005 19:26:15 -0000	1.1
--- memberentry.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE name="help-top.inc" -->
! <h1>Hilfe f&uuml;r Benutzer hinzuf&uuml;gen</h1>
! <h2>Benutzer hinzuf&uuml;gen, Person</h2>
  <p>This is the form for adding a new single member to the database. There is also a form for organisations, such as other libraries and non profit organisations you might lend to. You should use the Add Organisation tab at the top of the Member page for that.</p>
  <p>Every field with an asterisk must be filled out, or you will get an error, and the record will not be added to the database.</p>
--- 1,8 ----
  <!-- TMPL_INCLUDE name="help-top.inc" -->
! <h1>Hilfe: Benutzer hinzuf&uuml;gen</h1>
! 
! <p>sort1 and sort2 may now be related to a list of Authorized Values. All you have to do is define a Bsort1 or Bsort2 category of authorised values and enter the desired values into these categories. You will then be able to use them through Add/Modify Member Page</p>
! 
! <h2>Add Member, person</h2>
  <p>This is the form for adding a new single member to the database. There is also a form for organisations, such as other libraries and non profit organisations you might lend to. You should use the Add Organisation tab at the top of the Member page for that.</p>
  <p>Every field with an asterisk must be filled out, or you will get an error, and the record will not be added to the database.</p>
***************
*** 8,12 ****
  <p>The clear all Fields button will reset the page to a blank form in case you made a mistake.</p>
  
! <h2>Benutzer hinzuf&uuml;gen, Institution</h2>
  <p>This is the form for adding a group of members. Suppose you had a YMCA group, or lend books to other Libraries. This would be the form to use for that purpose.</p>
  <p>Every field with an asterisk must be filled out, or you will get an error, and the record will not be added to the database.</p>
--- 11,15 ----
  <p>The clear all Fields button will reset the page to a blank form in case you made a mistake.</p>
  
! <h2>Add Member, Institutional</h2>
  <p>This is the form for adding a group of members. Suppose you had a YMCA group, or lend books to other Libraries. This would be the form to use for that purpose.</p>
  <p>Every field with an asterisk must be filled out, or you will get an error, and the record will not be added to the database.</p>




From hellen at users.sourceforge.net  Sat Jun 25 14:58:57 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:57 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/parameters marc_subfields_structure.tmpl,1.1,1.2 marctagstructure.tmpl,1.1,1.2 printers.tmpl,1.1,1.2 systempreferences.tmpl,1.1,1.2 z3950servers.tmpl,1.1,1.2
Message-ID: <E1DmAFN-0007z9-GB@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30254/koha-tmpl/intranet-tmpl/default/de/parameters

Modified Files:
	marc_subfields_structure.tmpl marctagstructure.tmpl 
	printers.tmpl systempreferences.tmpl z3950servers.tmpl 
Log Message:
adjustments for 2.2.3

Index: marc_subfields_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/marc_subfields_structure.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** marc_subfields_structure.tmpl	12 May 2005 19:26:35 -0000	1.1
--- marc_subfields_structure.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 20,24 ****
  			<ul>
  				<p>
! 					<!-- TMPL_VAR NAME="repeatable" --> repeatable  <!-- TMPL_VAR NAME="mandatory" --> mandatory
  				</p>
  				<!-- TMPL_IF name="frameworkcode" -->
--- 20,25 ----
  			<ul>
  				<p>
! 					<!-- TMPL_VAR NAME="repeatable" --> repeatable 
! 					<!-- TMPL_VAR NAME="mandatory" --> mandatory
  				</p>
  				<!-- TMPL_IF name="frameworkcode" -->
***************
*** 41,48 ****
  				<p><!-- TMPL_VAR NAME="isurl" --> URL (if checked, it means that the subfield is an URL and can be clicked</p>
  				<p>
! 					<label>Auth value:</label> <!-- TMPL_VAR NAME="authorised_value" --> oder Thesaurus: <!-- TMPL_VAR NAME="authtypes" --> oder Plugin: <!-- TMPL_VAR NAME="value_builder" -->
  				</p>
  				<p>
! 					<label>&nbsp;</label>Link to field :  <input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5"> (exemple :200b)
  				</p>
  			</ul>
--- 42,52 ----
  				<p><!-- TMPL_VAR NAME="isurl" --> URL (if checked, it means that the subfield is an URL and can be clicked</p>
  				<p>
! 					<label>Auth value:</label> <!-- TMPL_VAR NAME="authorised_value" -->
! 					or thesaurus: <!-- TMPL_VAR NAME="authtypes" -->
! 					or plugin: <!-- TMPL_VAR NAME="value_builder" -->
  				</p>
  				<p>
! 					<label>&nbsp;</label>Link to field :
! 					<input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5"> (exemple :200b)
  				</p>
  			</ul>
***************
*** 63,67 ****
  	</tr>
  	<tr><td>&nbsp;</td><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
! 	<tr><td colspan="2" align="center">L&ouml;schen best&auml;tigen</td></tr>
  	<tr>
  		<td>
--- 67,71 ----
  	</tr>
  	<tr><td>&nbsp;</td><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
! 	<tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>
  	<tr>
  		<td>
***************
*** 72,76 ****
  				<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->">
  				<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
! 				<input type="submit" value="JA">
  			</form>
  		</td>
--- 76,80 ----
  				<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->">
  				<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
! 				<input type="submit" value="YES">
  			</form>
  		</td>
***************
*** 81,85 ****
  				<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->">
  				<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
! 				<input type="submit" value="NEIN">
  			</form>
  		</td>
--- 85,89 ----
  				<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->">
  				<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
! 				<input type="submit" value="NO">
  			</form>
  		</td>
***************
*** 89,93 ****
  <!-- TMPL_IF NAME="delete_confirmed" -->
  <!-- ------------------------------------------------------------------------ -->
! 	Daten gel&ouml;scht
  	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
  	<input type="submit" value="OK">
--- 93,97 ----
  <!-- TMPL_IF NAME="delete_confirmed" -->
  <!-- ------------------------------------------------------------------------ -->
! 	Data deleted
  	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
  	<input type="submit" value="OK">
***************
*** 104,110 ****
  <tr>
  	<th>Subfield</th>
! 	<th>Texte</th>
  	<th>Constraints</th>
! 	<th>L&ouml;schen</th>
  <!-- TMPL_LOOP NAME="loop" -->
  <tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
--- 108,114 ----
  <tr>
  	<th>Subfield</th>
! 	<th>Text</th>
  	<th>Constraints</th>
! 	<th>Delete</th>
  <!-- TMPL_LOOP NAME="loop" -->
  <tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
***************
*** 122,131 ****
  		<!-- TMPL_ELSE -->
  			Tab :<!-- TMPL_VAR NAME="tab" -->,
! 			<!-- TMPL_IF NAME="kohafield" -->Koha-Feld : <!-- TMPL_VAR NAME="kohafield" -->, <!--/TMPL_IF -->
! 			<!-- TMPL_IF NAME="repeatable" -->Wiederholbar, <!-- TMPL_ELSE -->Nicht wiederholbar<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="mandatory" -->Obligatorisch, <!-- TMPL_ELSE -->Nicht obligatorisch,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="seealso" -->siehe auch: <!-- TMPL_VAR NAME="seealso" --><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="hidden" -->versteckt<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="isurl" -->ist ein URL<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="authorised_value" --> Auth value :<!-- TMPL_VAR NAME="authorised_value" -->,<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="authtypecode" --> Authority :<!-- TMPL_VAR NAME="authtypecode" -->,<!-- /TMPL_IF -->
--- 126,135 ----
  		<!-- TMPL_ELSE -->
  			Tab :<!-- TMPL_VAR NAME="tab" -->,
! 			<!-- TMPL_IF NAME="kohafield" -->Koha field : <!-- TMPL_VAR NAME="kohafield" -->, <!--/TMPL_IF -->
! 			<!-- TMPL_IF NAME="repeatable" -->Repeatable, <!-- TMPL_ELSE -->Not repeatable,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="mandatory" -->Mandatory, <!-- TMPL_ELSE -->Not mandatory,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="seealso" -->see also : <!-- TMPL_VAR NAME="seealso" -->,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="hidden" -->hidden,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="isurl" -->is an url,<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="authorised_value" --> Auth value :<!-- TMPL_VAR NAME="authorised_value" -->,<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="authtypecode" --> Authority :<!-- TMPL_VAR NAME="authtypecode" -->,<!-- /TMPL_IF -->
***************
*** 143,147 ****
  </a>
  <!-- TMPL_IF NAME="previous" -->
! 	<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="vorheriges" alt="vorheriges" border="0">
  	</a><!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="next" -->
--- 147,151 ----
  </a>
  <!-- TMPL_IF NAME="previous" -->
! 	<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0" >
  	</a><!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="next" -->

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/marctagstructure.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** marctagstructure.tmpl	12 May 2005 19:26:35 -0000	1.1
--- marctagstructure.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 116,120 ****
  <!-- TMPL_IF NAME="else" -->
  <div id="bloc25">
! <h2 class="parameters">Framework ausw%auml;hlen</h2>
  <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<select name="frameworkcode">
--- 116,120 ----
  <!-- TMPL_IF NAME="else" -->
  <div id="bloc25">
! <h2 class="parameters">Framework ausw&auml;hlen</h2>
  <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<select name="frameworkcode">

Index: printers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/printers.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** printers.tmpl	12 May 2005 19:26:35 -0000	1.1
--- printers.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 43,47 ****
  					var alertString2;
  					if (f.printername.value.length==0) {
! 							_alertString += "\n- " + _("Druckername fehlt ");
  					}
  					if (f.printqueue.value.length==0) {
--- 43,47 ----
  					var alertString2;
  					if (f.printername.value.length==0) {
! 							_alertString += "\n- " + _("Druckername fehlt");
  					}
  					if (f.printqueue.value.length==0) {
***************
*** 51,55 ****
  							document.Aform.submit();
  					} else {
! 							alertString2  = _("Form not submitted because of the following problem(s)");
  							alertString2 += "\n------------------------------------------------------------------------------------\n";
  							alertString2 += _alertString;
--- 51,55 ----
  							document.Aform.submit();
  					} else {
! 							alertString2  = _("Form wird nicht unterstuetzt wegen der folgenden Probleme");
  							alertString2 += "\n------------------------------------------------------------------------------------\n";
  							alertString2 += _alertString;
***************
*** 60,64 ****
  	<div id="bloc25">
  		<!-- TMPL_IF NAME="searchfield" -->
! 			<h2 class="parameters">Drucker bearbeiten</h2>
  		<!-- TMPL_ELSE -->
  			<h2 class="parameters">Drucker hinzuf&uuml;gen</h2>
--- 60,64 ----
  	<div id="bloc25">
  		<!-- TMPL_IF NAME="searchfield" -->
! 			<h2 class="parameters">Drucker &auml;ndern</h2>
  		<!-- TMPL_ELSE -->
  			<h2 class="parameters">Drucker hinzuf&uuml;gen</h2>
***************
*** 80,84 ****
  	
  	<!-- TMPL_IF NAME="add_validate" -->
! 		Daten gespeichert
  			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  			<input type="submit" value="OK" class="button">
--- 80,84 ----
  	
  	<!-- TMPL_IF NAME="add_validate" -->
! 		Daten hinzugef&uuml;gt
  			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  			<input type="submit" value="OK" class="button">
***************
*** 106,110 ****
  			</tr>
  				<tr>
! 				<td colspan="2" align="center">L&ouml;schen best&auml;tigen</td>
  			</tr>
  				<tr>
--- 106,110 ----
  			</tr>
  				<tr>
! 				<td colspan="2" align="center">L&Ouml;SCHUNG BEST&Auml;TIGEN</td>
  			</tr>
  				<tr>
***************
*** 132,140 ****
  			<form action="<!-- TMPL_VAR NAME="script_name">" method="post">
  					<input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 					<input type="reset" name="reset" value="l&ouml;schen">
  			</form>
  	
  		<!-- TMPL_IF NAME="searchfield" -->
! 			You searched for <b><!-- TMPL_VAR NAME="searchfield" --></b>
  		<!-- /TMPL_IF -->
  	
--- 132,140 ----
  			<form action="<!-- TMPL_VAR NAME="script_name">" method="post">
  					<input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 					<input type="reset" name="reset" value="clr">
  			</form>
  	
  		<!-- TMPL_IF NAME="searchfield" -->
! 			Sie suchten nach <b><!-- TMPL_VAR NAME="searchfield" --></b>
  		<!-- /TMPL_IF -->
  	
***************
*** 153,157 ****
  				<td><!-- TMPL_VAR NAME="printtype" --></td>
  				<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->" class="button">Bearbeiten</a></td>
! 							<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->" class="button">L&ouml;schen</a></td>
  			</tr>
  			<!-- /TMPL_LOOP -->
--- 153,157 ----
  				<td><!-- TMPL_VAR NAME="printtype" --></td>
  				<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->" class="button">Bearbeiten</a></td>
! 				<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->" class="button">L&ouml;schen</a></td>
  			</tr>
  			<!-- /TMPL_LOOP -->
***************
*** 162,166 ****
  		
  		<!-- TMPL_IF NAME="offsetgtzero" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Prev</a>
  		<!-- /TMPL_IF -->
  	
--- 162,166 ----
  		
  		<!-- TMPL_IF NAME="offsetgtzero" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Vorherige</a>
  		<!-- /TMPL_IF -->
  	
***************
*** 168,176 ****
  	
  		<!-- TMPL_IF NAME="ltcount" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">N&auml;chster &gt;&gt;</a>	
  		<!-- /TMPL_iF -->
  	
  			<br>
! 		<input type="submit" class="button" value="Drucker hinzuf&uuml;gen" alt="Drucker hinzuf&uuml;gen">
  		<br>
  			</form>
--- 168,176 ----
  	
  		<!-- TMPL_IF NAME="ltcount" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">N&auml;chste &gt;&gt;</a>	
  		<!-- /TMPL_iF -->
  	
  			<br>
! 		<input type="submit" class="button" value="Drucker hinzuf&uuml;gen" alt="Add printer">
  		<br>
  			</form>

Index: systempreferences.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/systempreferences.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** systempreferences.tmpl	12 May 2005 19:26:35 -0000	1.1
--- systempreferences.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 40,52 ****
  			var alertString2;
  			if (f.variable.value.length==0) {
! 				_alertString += "\n- " + _("variable missing");
  			}
  			if (f.value.value.length==0) {
! 				_alertString += "\n- " + _("value missing");
  			}
  			if (_alertString.length==0) {
  				document.Aform.submit();
  			} else {
! 				alertString2  = _("Form not submitted because of the following problem(s)");
  				alertString2 += "\n------------------------------------------------------------------------------------\n";
  				alertString2 += _alertString;
--- 40,52 ----
  			var alertString2;
  			if (f.variable.value.length==0) {
! 				_alertString += "\n- " + _("Variable fehlt");
  			}
  			if (f.value.value.length==0) {
! 				_alertString += "\n- " + _("Wert fehlt");
  			}
  			if (_alertString.length==0) {
  				document.Aform.submit();
  			} else {
! 				alertString2  = _("Daten wegen der folgenden Probleme nicht gespeichert");
  				alertString2 += "\n------------------------------------------------------------------------------------\n";
  				alertString2 += _alertString;
***************
*** 89,93 ****
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF NAME="type-yesno" -->
! 					<input type="radio" name="value" value="1"<!-- TMPL_IF NAME="value-yes" --> checked<!-- /TMPL_IF -->>Ja <input type="radio" name="value" value="0"<!-- TMPL_IF NAME="value-no" --> checked<!-- /TMPL_IF -->>Nein
  				<!-- /TMPL_IF -->
  	
--- 89,94 ----
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF NAME="type-yesno" -->
! 					<input type="radio" name="value" value="1"<!-- TMPL_IF NAME="value-yes" --> checked<!-- /TMPL_IF -->>Ja 
! 					<input type="radio" name="value" value="0"<!-- TMPL_IF NAME="value-no" --> checked<!-- /TMPL_IF -->>Nein
  				<!-- /TMPL_IF -->
  	

Index: z3950servers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/z3950servers.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** z3950servers.tmpl	12 May 2005 19:26:35 -0000	1.1
--- z3950servers.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 64,68 ****
  							document.Aform.submit();
  					} else {
! 							alertString2  = _("Form not submitted because of the following problem(s)");
  							alertString2 += "\n------------------------------------------------------------------------------------\n";
  							alertString2 += _alertString;
--- 64,68 ----
  							document.Aform.submit();
  					} else {
! 							alertString2  = _("Daten wegen der folgenden Probleme nicht gespeichert");
  							alertString2 += "\n------------------------------------------------------------------------------------\n";
  							alertString2 += _alertString;
***************
*** 191,195 ****
  	
  	<!-- TMPL_IF NAME="else" -->
! 			<h1 class="parameters">Admin Z39.50 Server</h1>
  			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  				<input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
--- 191,195 ----
  	
  	<!-- TMPL_IF NAME="else" -->
! 			<h1 class="parameters">Administration Z39.50 Server</h1>
  			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  				<input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
***************
*** 197,201 ****
  			</form>
  			<!-- TMPL_IF NAME="searchfield" -->
! 				You searched for <b><!-- TMPL_VAR NAME="searchfield" --></b>
  			<!-- /TMPL_IF -->
  			<table>
--- 197,201 ----
  			</form>
  			<!-- TMPL_IF NAME="searchfield" -->
! 				Sie suchten nach <b><!-- TMPL_VAR NAME="searchfield" --></b>
  			<!-- /TMPL_IF -->
  			<table>




From hellen at users.sourceforge.net  Sat Jun 25 14:58:57 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:57 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/reports borrowers_out.tmpl,1.1,1.2
Message-ID: <E1DmAFN-0007yy-0a@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/reports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30254/koha-tmpl/intranet-tmpl/default/de/reports

Modified Files:
	borrowers_out.tmpl 
Log Message:
adjustments for 2.2.3

Index: borrowers_out.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/reports/borrowers_out.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** borrowers_out.tmpl	12 May 2005 19:26:35 -0000	1.1
--- borrowers_out.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 1,3 ****
--- 1,4 ----
  <!-- TMPL_INCLUDE NAME="reportswcal-top.inc" -->
+ <!-- angepasst fuer 2.2.3, hellen 24/06/05 -->
  <div id="mainbloc" >
  
***************
*** 80,84 ****
  		<input type="radio" checked name="output" value="screen" > In ein Browserfenster
  		<br>
! 		<input type="radio" name="output" value="file"> In eine Datei <input type="text" name="basename" value="Export"> In eine Anwendung <!-- TMPL_VAR NAME="CGIextChoice" --> <!-- TMPL_VAR NAME="CGIsepChoice" -->
  	</p>
  	</div>
--- 81,87 ----
  		<input type="radio" checked name="output" value="screen" > In ein Browserfenster
  		<br>
! 		<input type="radio" name="output" value="file"> In eine Datei <input type="text" name="basename" value="Export"> In eine Anwendung
! 		<!-- TMPL_VAR NAME="CGIextChoice" -->
! 		<!-- TMPL_VAR NAME="CGIsepChoice" -->
  	</p>
  	</div>




From hellen at users.sourceforge.net  Sat Jun 25 14:58:56 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/includes acquisitions-top.inc,1.1,1.2 common-style.css,1.1,1.2 marc-top.inc,1.1,1.2
Message-ID: <E1DmAFM-0007ye-MX@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30254/koha-tmpl/intranet-tmpl/default/de/includes

Modified Files:
	acquisitions-top.inc common-style.css marc-top.inc 
Log Message:
adjustments for 2.2.3

Index: acquisitions-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/includes/acquisitions-top.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** acquisitions-top.inc	12 May 2005 19:26:16 -0000	1.1
--- acquisitions-top.inc	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 34,38 ****
  <div id="menubar">
  	<span class="koha"><a class="home" href="/cgi-bin/koha/mainpage.pl">Koha</a></span>
! 	<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Erwerbung</a> <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Katalog</a> <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Ausleihe</a> <a class="members" href="/cgi-bin/koha/members/members-home.pl">Benutzer</a> <a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> <a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a> <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameter</a> <a class="about" href="/cgi-bin/koha/about.pl">&Uuml;ber</a> <a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Hilfe</a>
  </div>
  <!-- TMPL_IF NAME="loggedinusername" -->
--- 34,46 ----
  <div id="menubar">
  	<span class="koha"><a class="home" href="/cgi-bin/koha/mainpage.pl">Koha</a></span>
! 	<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Erwerbung</a> 
! 	<a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Katalog</a>
! 	<a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Ausleihe</a> 
! 	<a class="members" href="/cgi-bin/koha/members/members-home.pl">Benutzer</a> 
! 	<a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> 
! 	<a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a> 
! 	<a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameter</a> 
! 	<a class="about" href="/cgi-bin/koha/about.pl">&Uuml;ber</a> 
! 	<a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Hilfe</a>
  </div>
  <!-- TMPL_IF NAME="loggedinusername" -->

Index: common-style.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/includes/common-style.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** common-style.css	12 May 2005 19:26:16 -0000	1.1
--- common-style.css	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 75,79 ****
  	border:0px;
  	border-collapse:collapse;
- 	font-size:10pt;
  	margin : auto;
  }
--- 75,78 ----

Index: marc-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/includes/marc-top.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** marc-top.inc	12 May 2005 19:26:16 -0000	1.1
--- marc-top.inc	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 43,51 ****
  	<div id="menubar">
  		<span class="koha"><a class="home" href="/cgi-bin/koha/mainpage.pl">Koha</a></span>
! 		<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Erwerbung</a> <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Katalog</a> <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Ausleihe</a> <a class="members" href="/cgi-bin/koha/members/members-home.pl">Benutzer</a> <a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> <a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a> <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameter</a> <a class="about" href="/cgi-bin/koha/about.pl">&Uuml;ber</a> <a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Hilfe</a>
  	</div>
  	<div id="submenu">
  		<span class="koha">Optionen &gt;&gt;&nbsp;&nbsp;</span>
! 		<a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&amp;type=intranet" class="submenu2">Suche</a> <a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&amp;type=intranet" class="submenu">Biblio hinzuf&uuml;gen</a> <a class="submenu2" href="/cgi-bin/koha/bull-home.pl">Serie</a> <a href="/cgi-bin/koha/bookshelves/shelves.pl" class="submenu">Virtuelle Regale</a>
  	</div>
  <!-- /TMPL_UNLESS -->
--- 43,62 ----
  	<div id="menubar">
  		<span class="koha"><a class="home" href="/cgi-bin/koha/mainpage.pl">Koha</a></span>
! 		<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Erwerbung</a> 
! 		<a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Katalog</a> 
! 		<a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Ausleihe</a> 
! 		<a class="members" href="/cgi-bin/koha/members/members-home.pl">Benutzer</a> 
! 		<a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> 
! 		<a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a> 
! 		<a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameter</a> 
! 		<a class="about" href="/cgi-bin/koha/about.pl">&Uuml;ber</a> 
! 		<a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Hilfe</a>
  	</div>
  	<div id="submenu">
  		<span class="koha">Optionen &gt;&gt;&nbsp;&nbsp;</span>
! 		<a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&amp;type=intranet" class="submenu2">Suche</a> 
! 		<a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&amp;type=intranet" class="submenu">Biblio hinzuf&uuml;gen</a> 
! 		<a class="submenu2" href="/cgi-bin/koha/bull-home.pl">Serie</a> 
! 		<a href="/cgi-bin/koha/bookshelves/shelves.pl" class="submenu">Virtuelle Regale</a>
  	</div>
  <!-- /TMPL_UNLESS -->




From hellen at users.sourceforge.net  Sat Jun 25 14:58:56 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/members member.tmpl,1.1,1.2 memberentry.tmpl,1.1,1.2 pay.tmpl,1.1,1.2
Message-ID: <E1DmAFM-0007yn-T6@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30254/koha-tmpl/intranet-tmpl/default/de/members

Modified Files:
	member.tmpl memberentry.tmpl pay.tmpl 
Log Message:
adjustments for 2.2.3

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/members/member.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** member.tmpl	12 May 2005 19:26:35 -0000	1.1
--- member.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 2,10 ****
  <div id="mainbloc">
  <h1>Benutzersuche</h1>
! 
  <div class="bloc100">
  	<div class="bloctitle">Suche nach</div>
  	<form action="/cgi-bin/koha/members/member.pl" method="post">
! 		<input type="text" name="member" value="<!-- TMPL_VAR NAME="member" -->">  order by 
  		<select name="orderby">
  			<option value="surname,firstname">Nachname</option>
--- 2,11 ----
  <div id="mainbloc">
  <h1>Benutzersuche</h1>
! <!-- angepasst fuer 2.2.3, hellen 24/06/05 -->
  <div class="bloc100">
  	<div class="bloctitle">Suche nach</div>
  	<form action="/cgi-bin/koha/members/member.pl" method="post">
! 		<input type="text" name="member" value="<!-- TMPL_VAR NAME="member" -->">
! 		  order by 
  		<select name="orderby">
  			<option value="surname,firstname">Nachname</option>
***************
*** 47,51 ****
  	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
  	<input type="submit" class="button" value="Benutzer hinzuf&uuml;gen" title="Benutzer hinzuf&uuml;gen" alt="Benutzer hinzuf&uuml;gen">
! 	<input type="radio" name="categorycode" value="" checked>Erwachsener <input type="radio" name="categorycode" value="I" >Organisation
  	<input type="hidden" name="actionType" value="Add">
  	</form>
--- 48,53 ----
  	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
  	<input type="submit" class="button" value="Benutzer hinzuf&uuml;gen" title="Benutzer hinzuf&uuml;gen" alt="Benutzer hinzuf&uuml;gen">
! 	<input type="radio" name="categorycode" value="" checked>Erwachsener
! 	<input type="radio" name="categorycode" value="I" >Organisation
  	<input type="hidden" name="actionType" value="Add">
  	</form>

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/members/memberentry.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** memberentry.tmpl	12 May 2005 19:26:35 -0000	1.1
--- memberentry.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 1,4 ****
  <!-- TMPL_INCLUDE NAME="members-top.inc" -->
! 
  <div id="mainbloc">
  	<!-- TMPL_IF NAME="addAction" -->
--- 1,4 ----
  <!-- TMPL_INCLUDE NAME="members-top.inc" -->
! <!-- angepasst fuer 2.2.3, hellen 24/06/05 -->
  <div id="mainbloc">
  	<!-- TMPL_IF NAME="addAction" -->
***************
*** 102,106 ****
  				<td colspan="2">
  				<!-- TMPL_UNLESS name="institution" -->
! 					<input type="radio" name="sex" value="F"<!-- TMPL_IF NAME="female" --> checked<!-- /TMPL_IF -->>F  <input type="radio" name="sex" value="M"<!-- TMPL_UNLESS name="female" --> checked<!-- /TMPL_UNLESS -->> M
  				<!-- /TMPL_UNLESS -->
  
--- 102,109 ----
  				<td colspan="2">
  				<!-- TMPL_UNLESS name="institution" -->
! 					<input type="radio" name="sex" value="F"<!-- TMPL_IF NAME="female" --> checked<!-- /TMPL_IF -->>F  
! 					<input type="radio" name="sex" value="M"<!-- TMPL_UNLESS NAME="female" --> checked<!-- /TMPL_UNLESS -->>M  
! 					
! 
  				<!-- /TMPL_UNLESS -->
  
***************
*** 248,252 ****
  				<tr>
  					<td colspan="2"><!-- TMPL_VAR NAME="html" --></td>
! 					<td colspan="3"><input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR NAME="yes" -->>Ja <input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="0" <!-- TMPL_VAR NAME="no" -->>Nein
  					</td>
  				</tr>
--- 251,256 ----
  				<tr>
  					<td colspan="2"><!-- TMPL_VAR NAME="html" --></td>
! 					<td colspan="3"><input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR NAME="yes" -->>Ja 
! 					<input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="0" <!-- TMPL_VAR NAME="no" -->>Nein
  					</td>
  				</tr>

Index: pay.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/members/pay.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** pay.tmpl	12 May 2005 19:26:35 -0000	1.1
--- pay.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 1,3 ****
--- 1,4 ----
  <!-- TMPL_INCLUDE NAME="members-top.inc" -->
+ <!-- angepasst fuer 2.2.3, hellen 24/06/05 -->
  <div id="mainbloc">
  <h1>Zahlung Mahngeb&uuml;hren f&uuml;r <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
***************
*** 12,16 ****
  <!-- TMPL_LOOP NAME="loop_pay" -->
  <tr valign="top">
! 	<td><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->"><input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="no" checked="checked">Unpaid  <input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="yes">Pay  <input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="wo">Writeoff
  	<input type="hidden" name="itemnumber<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="itemnumber" -->">
  	<input type="hidden" name="accounttype<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="accounttype" -->">
--- 13,19 ----
  <!-- TMPL_LOOP NAME="loop_pay" -->
  <tr valign="top">
! 	<td><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->"><input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="no" checked="checked">Unbezahlt
! 	<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="yes">Zahlen 
! 	<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="wo">Abschreiben
  	<input type="hidden" name="itemnumber<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="itemnumber" -->">
  	<input type="hidden" name="accounttype<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="accounttype" -->">




From hellen at users.sourceforge.net  Sat Jun 25 14:58:56 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/circ branchtransfers.tmpl,1.2,1.3 circulation.tmpl,1.2,1.3 selectbranchprinter.tmpl,1.2,1.3
Message-ID: <E1DmAFM-0007yL-CY@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30254/koha-tmpl/intranet-tmpl/default/de/circ

Modified Files:
	branchtransfers.tmpl circulation.tmpl selectbranchprinter.tmpl 
Log Message:
adjustments for 2.2.3

Index: branchtransfers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/circ/branchtransfers.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** branchtransfers.tmpl	17 May 2005 13:21:35 -0000	1.2
--- branchtransfers.tmpl	25 Jun 2005 12:58:53 -0000	1.3
***************
*** 6,10 ****
  
  <h1>Ausleihe: Leihverkehr</h1>
! <b>Zweigstelle:</b> <!-- TMPL_VAR NAME="genbrname" --> &nbsp; <b>Drucker:</b> <!-- TMPL_VAR NAME="genprname" --> <a href="selectbranchprinter.pl" class="button">Einstellungen &auml;ndern</a>
  <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
  <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
--- 6,12 ----
  
  <h1>Ausleihe: Leihverkehr</h1>
! <b>Zweigstelle:</b> <!-- TMPL_VAR NAME="genbrname" --> &nbsp;
!  <b>Drucker:</b> <!-- TMPL_VAR NAME="genprname" -->
!  <a href="selectbranchprinter.pl" class="button">Einstellungen &auml;ndern</a>
  <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
  <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/circ/circulation.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** circulation.tmpl	17 May 2005 13:21:35 -0000	1.2
--- circulation.tmpl	25 Jun 2005 12:58:53 -0000	1.3
***************
*** 11,15 ****
  		<h2 class="circulation">Parameter</h2>
  		<p>
! 			<b>Zweigstelle:</b> <!-- TMPL_VAR NAME="branchname" --> &nbsp; <b>Drucker:</b> <!-- TMPL_VAR NAME="printername" --> <a href="selectbranchprinter.pl" class="button circulation">Einstellungen &auml;ndern</a>
  		</p>
  	
--- 11,16 ----
  		<h2 class="circulation">Parameter</h2>
  		<p>
! 			<b>Zweigstelle:</b> <!-- TMPL_VAR NAME="branchname" --> &nbsp; 
! 			<b>Drucker:</b> <!-- TMPL_VAR NAME="printername" --> <a href="selectbranchprinter.pl" class="button circulation">Einstellungen &auml;ndern</a>
  		</p>
  	

Index: selectbranchprinter.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/circ/selectbranchprinter.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** selectbranchprinter.tmpl	17 May 2005 13:21:35 -0000	1.2
--- selectbranchprinter.tmpl	25 Jun 2005 12:58:53 -0000	1.3
***************
*** 30,34 ****
  <!-- /TMPL_IF --></p>
  <p><input type="hidden" name="setcookies" value="1">
! <input value="Abschicken" type="changesettings" class="button"></p>
  </form>
  
--- 30,34 ----
  <!-- /TMPL_IF --></p>
  <p><input type="hidden" name="setcookies" value="1">
! <input type="submit" value="Abschicken" type="changesettings" class="button"></p>
  </form>
  




From shedges at users.sourceforge.net  Mon Jun 27 02:47:44 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Sun, 26 Jun 2005 17:47:44 -0700
Subject: [Koha-cvs] CVS: koha-doc codingguidelines.xml,1.1,1.2
Message-ID: <E1Dmhmq-0006gG-DC@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25672

Modified Files:
	codingguidelines.xml 
Log Message:
Added warning about TMPL_IF inside html tags

Index: codingguidelines.xml
===================================================================
RCS file: /cvsroot/koha/koha-doc/codingguidelines.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** codingguidelines.xml	13 Jun 2005 11:08:51 -0000	1.1
--- codingguidelines.xml	27 Jun 2005 00:47:42 -0000	1.2
***************
*** 159,162 ****
--- 159,173 ----
  }</programlisting>
  
+         <para>Be aware that Koha's translation tool cannot handle
+         <userinput>&lt;!-- TMPL_IF --&gt;</userinput> inside a standard HTML
+         tag, like:<programlisting>&lt;td &lt;!-- tmpl_if name="x"&gt;class="x"&lt;!-- /TMPL_IF --&gt;&gt; or
+ &lt;input ... &lt;!-- tmpl_if name="y" --&gt; checked&lt;!-- /TMPL_IF --&gt;&gt;</programlisting></para>
+ 
+         <para>PLEASE always write:<programlisting>&lt;!-- TMPL_IF name="y" --&gt;
+     &lt;input ... checked&gt;
+ &lt;!-- TMPL_ELSE --&gt;
+     &lt;input ...&gt;
+ &lt;!-- /TMPL_IF --&gt;</programlisting></para>
+ 
          <para>Note that some scripts use two different templates, depending on
          what the user wants to do. This is sometimes a mistake in Koha design,




From tipaul at users.sourceforge.net  Mon Jun 27 15:11:24 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 27 Jun 2005 06:11:24 -0700
Subject: [Koha-cvs] CVS: koha/misc/zebra/unimarc - New directory
Message-ID: <E1DmtOW-0002JJ-2M@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/zebra/unimarc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8833/misc/zebra/unimarc

Log Message:
Directory /cvsroot/koha/koha/misc/zebra/unimarc added to the repository





From tipaul at users.sourceforge.net  Mon Jun 27 15:11:12 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 27 Jun 2005 06:11:12 -0700
Subject: [Koha-cvs] CVS: koha/misc/zebra - New directory
Message-ID: <E1DmtOK-0002H4-97@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/zebra
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8723/misc/zebra

Log Message:
Directory /cvsroot/koha/koha/misc/zebra added to the repository





From tipaul at users.sourceforge.net  Mon Jun 27 15:13:20 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 27 Jun 2005 06:13:20 -0700
Subject: [Koha-cvs] CVS: koha/misc/zebra/unimarc explain.att,NONE,1.1 unimarc.abs,NONE,1.1 unimarc.mar,NONE,1.1 unimarc.tag,NONE,1.1 zebra.cfg,NONE,1.1
Message-ID: <E1DmtQO-0002Yd-Uf@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/zebra/unimarc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9796

Added Files:
	explain.att unimarc.abs unimarc.mar unimarc.tag zebra.cfg 
Log Message:
some parameter files for zebra for UNIMARC. Just for testing & sharing purposes for instance.

--- NEW FILE ---
# The Explain Attribute Set
#
# $Id: explain.att,v 1.1 2005/06/27 13:13:17 tipaul Exp $
name explain
reference Exp-1

att 1			ExplainCategory
att 2			HumanStringLanguage
att 3			DatabaseName
att 4			Targetname
att 5			AttributeSetOID
att 6			RecordSyntaxOID
att 7			TagSetOID
att 8			ExtendedServicesOID
att 9			DateAdded
att 10			DateChanged
att 11			DateExpired
att 12			ElementSetName
att 13			ProcessingContext
att 14			ProcessingName
att 15			TermListName
att 16			SchemaOID
att 17			Producer
att 18			Supplier
att 19			Availability
att 20			Proprietary
att 21			UserFee

--- NEW FILE ---
name unimarc
reference Usmarc
attset bib1.att
tagset unimarc.tag

marc unimarc.mar

esetname B @
esetname F @

elm 700            Author                  -
elm 700/?          Author                  -
elm 700/?/a        Author                  !:w

#elm 701            Author                  -
#elm 701/?          Author                  -
#elm 701/?/a        Author                  !:w

elm 200            Title                   -
elm 200/?          Title                   -
elm 200/?/a        Title                   !:w,!:p
elm 200/?/e        Title                   !:w,!:p 

elm 210            Publisher               -
elm 210/?          Publisher               -
elm 210/?/c        Publisher               !:w
elm 210/?/d        Date-of-publication     !:w



--- NEW FILE ---
name unimarc
reference Usmarc

--- NEW FILE ---
# pseudo-tagset for unimarc (bib)

name unimarc
type 4

tag 701 701 string
tag 200 200 string
tag 210 210 string
tag 225 225 string
tag 010 010 string
tag 100 100 string
tag 005 005 generalizedtime
tag 615 615 string
tag 995 995 string



--- NEW FILE ---
# Simple Zebra configuration file that defines
# a database with USMARC records.
# $Id: zebra.cfg,v 1.1 2005/06/27 13:13:17 tipaul Exp $
#
# Where are the config files located?
profilePath: ${srcdir:-.}:${srcdir:-.}/../tab

# Files that describe the attribute sets supported.
attset: bib1.att
attset: explain.att

# Specify record type
recordType: grs.marc.unimarc

# Lock File Area
lockDir: lock

# Temp File area for result sets
setTmpDir: tmp

# Temp File area for index program
keyTmpDir: tmp

# Approx. Memory usage during indexing
memMax: 4




From hellen at users.sourceforge.net  Mon Jun 27 21:24:02 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Mon, 27 Jun 2005 12:24:02 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/includes auth-bottom.inc,1.1,1.2 auth-top.inc,1.1,1.2
Message-ID: <E1DmzD8-0005ap-9b@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21124/koha-tmpl/intranet-tmpl/default/de/includes

Modified Files:
	auth-bottom.inc auth-top.inc 
Log Message:
adjustments for 2.2.3

Index: auth-bottom.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/includes/auth-bottom.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** auth-bottom.inc	12 May 2005 19:26:16 -0000	1.1
--- auth-bottom.inc	27 Jun 2005 19:23:33 -0000	1.2
***************
*** 8,12 ****
  <a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Erwerbung</a> ||
  <a href="/cgi-bin/koha/circ/circulation.pl">Ausleihe</a> ||
! <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> ||
  <a href="/cgi-bin/koha/reports-home.pl">Reports</a> ||
  <a href="/cgi-bin/koha/admin-home.pl">Parameter</a> ||
--- 8,12 ----
  <a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Erwerbung</a> ||
  <a href="/cgi-bin/koha/circ/circulation.pl">Ausleihe</a> ||
! <a href="/cgi-bin/koha/authorities/authorities-home.pl">Autorit&auml;ten</a> ||
  <a href="/cgi-bin/koha/reports-home.pl">Reports</a> ||
  <a href="/cgi-bin/koha/admin-home.pl">Parameter</a> ||

Index: auth-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/includes/auth-top.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** auth-top.inc	12 May 2005 19:26:16 -0000	1.1
--- auth-top.inc	27 Jun 2005 19:23:36 -0000	1.2
***************
*** 3,7 ****
  <html>
  <head>
! <title>KOHA INTRANET: Authorities</title>
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  
--- 3,7 ----
  <html>
  <head>
! <title>KOHA INTRANET: Authorit&auml;ten</title>
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  
***************
*** 17,21 ****
  <script language="JavaScript" type="text/javascript">
  function Help() {
! 	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
  }
  
--- 17,21 ----
  <script language="JavaScript" type="text/javascript">
  function Help() {
! 	newin=window.open("/cgi-bin/koha/help.pl","Koha Hilfe",'width=600,height=600,toolbar=false,scrollbars=yes');
  }
  
***************
*** 74,78 ****
  	</select>
  	<a href="javascript:addauthority()" class="submenu2">
! 		Authority hinzuf&uuml;gen
  	</a>
  </div>
--- 74,78 ----
  	</select>
  	<a href="javascript:addauthority()" class="submenu2">
! 		Autorit&auml;t hinzuf&uuml;gen
  	</a>
  </div>
***************
*** 81,84 ****
      <p align="left">Angemeldet als: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Abmelden</a>]</p>
  <!-- TMPL_ELSE -->
!     <p align="left"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
  <!-- /TMPL_IF -->
--- 81,84 ----
      <p align="left">Angemeldet als: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Abmelden</a>]</p>
  <!-- TMPL_ELSE -->
!     <p align="left"><a href="/cgi-bin/koha/opac-user.pl">Anmelden</a> bei Koha</p>
  <!-- /TMPL_IF -->




From hellen at users.sourceforge.net  Mon Jun 27 21:25:15 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Mon, 27 Jun 2005 12:25:15 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/authorities auth_finder.tmpl,1.1,1.2 authorities-home.tmpl,1.1,1.2 authorities.tmpl,1.2,1.3 detail-biblio-search.tmpl,1.1,1.2 detail.tmpl,1.1,1.2 searchresultlist-auth.tmpl,1.1,1.2 searchresultlist.tmpl,1.1,1.2
Message-ID: <E1DmzEJ-0005jM-GM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21124/koha-tmpl/intranet-tmpl/default/de/authorities

Modified Files:
	auth_finder.tmpl authorities-home.tmpl authorities.tmpl 
	detail-biblio-search.tmpl detail.tmpl 
	searchresultlist-auth.tmpl searchresultlist.tmpl 
Log Message:
adjustments for 2.2.3

Index: auth_finder.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities/auth_finder.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** auth_finder.tmpl	12 May 2005 19:26:14 -0000	1.1
--- auth_finder.tmpl	27 Jun 2005 19:23:28 -0000	1.2
***************
*** 2,6 ****
  <div id="mainbloc">
  
! <h1 class="authority">Authority search</h1>
  
  <form name="f" method="post">
--- 2,6 ----
  <div id="mainbloc">
  
! <h1 class="authority">Autorit&auml;tensuche</h1>
  
  <form name="f" method="post">
***************
*** 11,37 ****
  		<h2 class="authority">Suche nach</h2>
  		<p>
! 			<label class="label100">Authority type</label>
  			<!-- TMPL_VAR NAME="authtypecode" -->
  			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
  		</p>
  		<p>
! 			<label class="label100">Main entry</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->">
  			<input type="hidden" name="marclist" value="mainentry">
  			<input type="hidden" name="and_or" value="and">
  			<input type="hidden" name="excluding" value="">
  			<select name="operator">
! 				<option value="start">start by</option>
! 				<option value="contains">contains</option>
  			</select>
  			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
  		</p>
  		<p>
! 			<label class="label100">Anywhere</label><input type="text" name="value">
  			<input type="hidden" name="marclist" value="">
  			<input type="hidden" name="and_or" value="and">
  			<input type="hidden" name="excluding" value="">
  			<select name="operator">
! 				<option value="contains">contains</option>
! 				<option value="start">start by</option>
  			</select>
  			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
--- 11,37 ----
  		<h2 class="authority">Suche nach</h2>
  		<p>
! 			<label class="label100">Autorit&auml;tstyp</label>
  			<!-- TMPL_VAR NAME="authtypecode" -->
  			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
  		</p>
  		<p>
! 			<label class="label100">Haupteintrag</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->">
  			<input type="hidden" name="marclist" value="mainentry">
  			<input type="hidden" name="and_or" value="and">
  			<input type="hidden" name="excluding" value="">
  			<select name="operator">
! 				<option value="start">starten mit</option>
! 				<option value="contains">enth&auml;lt</option>
  			</select>
  			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
  		</p>
  		<p>
! 			<label class="label100">Irgendwo</label><input type="text" name="value">
  			<input type="hidden" name="marclist" value="">
  			<input type="hidden" name="and_or" value="and">
  			<input type="hidden" name="excluding" value="">
  			<select name="operator">
! 				<option value="contains">enth&auml;lt</option>
! 				<option value="start">starten mit</option>
  			</select>
  			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">

Index: authorities-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities/authorities-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** authorities-home.tmpl	12 May 2005 19:26:14 -0000	1.1
--- authorities-home.tmpl	27 Jun 2005 19:23:31 -0000	1.2
***************
*** 2,6 ****
  <div id="mainbloc">
  
! <h1 class="authority">Authority search</h1>
  
  <form name="f" method="post">
--- 2,6 ----
  <div id="mainbloc">
  
! <h1 class="authority">Autorit&auml;tensuche</h1>
  
  <form name="f" method="post">
***************
*** 19,23 ****
  		</h2>
  		<p>
! 			<label class="label100">Main entry</label>
  			<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
  			<input type="hidden" name="marclist" value="mainentry">
--- 19,23 ----
  		</h2>
  		<p>
! 			<label class="label100">Haupteintrag</label>
  			<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
  			<input type="hidden" name="marclist" value="mainentry">
***************
*** 25,34 ****
  			<input type="hidden" name="excluding" value="">
  			<select name="operator">
! 				<option value="contains">contains</option>
! 				<option value="start">start by</option>
  			</select>
  		</p>
  		<p>
! 			<label class="label100">Anywhere</label>
  			<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
  			<input type="hidden" name="marclist" value="">
--- 25,34 ----
  			<input type="hidden" name="excluding" value="">
  			<select name="operator">
! 				<option value="contains">enth&auml;lt</option>
! 				<option value="start">starten mit</option>
  			</select>
  		</p>
  		<p>
! 			<label class="label100">Irgendwo</label>
  			<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
  			<input type="hidden" name="marclist" value="">
***************
*** 36,41 ****
  			<input type="hidden" name="excluding" value="">
  			<select name="operator">
! 				<option value="contains">contains</option>
! 				<option value="start">start by</option>
  			</select>
  		</p>
--- 36,41 ----
  			<input type="hidden" name="excluding" value="">
  			<select name="operator">
! 				<option value="contains">enth&auml;lt</option>
! 				<option value="start">starten mit</option>
  			</select>
  		</p>

Index: authorities.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities/authorities.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** authorities.tmpl	25 Jun 2005 12:58:53 -0000	1.2
--- authorities.tmpl	27 Jun 2005 19:23:32 -0000	1.3
***************
*** 5,11 ****
  	<form method="post" name="f">
  	<!-- TMPL_IF name="authid" -->
! 		<h1 class="authority">Modify authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
  	<!-- TMPL_ELSE -->
! 		<h1 class="authority">Adding authority (<!-- TMPL_VAR name="authtypetext" -->)</h1>
  	<!-- /TMPL_IF -->
  	<p>
--- 5,11 ----
  	<form method="post" name="f">
  	<!-- TMPL_IF name="authid" -->
! 		<h1 class="authority">Autorit&auml;t &auml;ndern<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
  	<!-- TMPL_ELSE -->
! 		<h1 class="authority">Autorit&auml;t hinzuf&uuml;gen (<!-- TMPL_VAR name="authtypetext" -->)</h1>
  	<!-- /TMPL_IF -->
  	<p>
***************
*** 15,21 ****
  		<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->">
  		<!-- TMPL_IF name="authid" -->
! 			<input type="button" value="Save" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- TMPL_ELSE -->
! 			<input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- /TMPL_IF -->
  	</p>
--- 15,21 ----
  		<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->">
  		<!-- TMPL_IF name="authid" -->
! 			<input type="button" value="Speichern" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- TMPL_ELSE -->
! 			<input type="button" value="Autorit&auml;t hinzuf&uuml;gen" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- /TMPL_IF -->
  	</p>
***************
*** 25,33 ****
  <!-- TMPL_IF name="duplicateauthid" -->
  	<div class="problem">
! 		<p>Duplicate suspected with <a href='javascript:openWindow("detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&popup=1", "Duplicate Authority")' class="button authority"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
! 		<p>You must either :</p>
  		<ul>
! 			<p><input type="checkbox" value=1 name="confirm_not_duplicate">confirm it's not a duplicate (and click on <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority"> again)</p>
! 			<p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >original authority</a></p>
  		</ul>
  	</div>
--- 25,33 ----
  <!-- TMPL_IF name="duplicateauthid" -->
  	<div class="problem">
! 		<p>Duplikat vermutlich mit <a href='javascript:openWindow("detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&popup=1", "Duplicate Authority")' class="button authority"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
! 		<p>Sie m&uuml;sen entweder :</p>
  		<ul>
! 			<p><input type="checkbox" value=1 name="confirm_not_duplicate">best&auml;tigen, da&szlig; es kein Duplikat ist (und auf den Button <input type="button" value="Autorit&auml;t hinzuf&uuml;gen" onClick="Check(this.form)" accesskey="w" class="button authority"> klicken)</p>
! 			<p>oder zur <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >originalen Autorit&auml;t gehen</a></p>
  		</ul>
  	</div>
***************
*** 145,152 ****
  	var alertString2;
  	if (total_errors!=0) {
! 		alertString2  = _("Form not submitted because of the following problem(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_missing_mandatory_tags +_(" mandatory tags empty");
! 		alertString2 += "\n- "+ total_missing_mandatory_subfields +_(" mandatory fields empty (see bold subfields)");
  		alert(alertString2);
  	} else {
--- 145,152 ----
  	var alertString2;
  	if (total_errors!=0) {
! 		alertString2  = _("Daten wegen der folgenden Probleme nicht gespeichert");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_missing_mandatory_tags +_(" Pflichttag leer");
! 		alertString2 += "\n- "+ total_missing_mandatory_subfields +_(" Pflichttags leer (siehe fett abgebildete Subfields)");
  		alert(alertString2);
  	} else {

Index: detail-biblio-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities/detail-biblio-search.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** detail-biblio-search.tmpl	12 May 2005 19:26:14 -0000	1.1
--- detail-biblio-search.tmpl	27 Jun 2005 19:23:32 -0000	1.2
***************
*** 2,6 ****
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1 class="authority">Authority number : <!-- TMPL_VAR NAME="authid" --></h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
--- 2,6 ----
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1 class="authority">Autorit&auml;tsnummer : <!-- TMPL_VAR NAME="authid" --></h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
***************
*** 39,43 ****
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Are you sure you want to delete this biblio?');
  	if (is_confirmed) {
  		window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";
--- 39,43 ----
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Sind Sie sicher, da&szlig Sie diesen Biblio l&ouml;schen wollen?');
  	if (is_confirmed) {
  		window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities/detail.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** detail.tmpl	12 May 2005 19:26:14 -0000	1.1
--- detail.tmpl	27 Jun 2005 19:23:32 -0000	1.2
***************
*** 2,6 ****
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1 class="authority">Authority number : <!-- TMPL_VAR NAME="authid" --></h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
--- 2,6 ----
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1 class="authority">Autorit&auml;tsnummer: <!-- TMPL_VAR NAME="authid" --></h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
***************
*** 9,13 ****
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png">
  	</a>
! 	<a href="javascript:Dopop('detailprint.pl?authid=<!-- TMPL_VAR NAME="authid" -->')" class="button authority">  Print  </a>  <a href="../search.marc/search.pl?type=intranet&amp;op=do_search&amp;marclist=<!-- TMPL_VAR NAME="biblio_fields" -->&amp;operator==&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;and_or=and&amp;excluding=" class="button authority"><!-- TMPL_VAR name="count" --> biblios</a>
  </div>
  
--- 9,13 ----
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png">
  	</a>
! 	<a href="javascript:Dopop('detailprint.pl?authid=<!-- TMPL_VAR NAME="authid" -->')" class="button authority">  Drucken  </a>  <a href="../search.marc/search.pl?type=intranet&amp;op=do_search&amp;marclist=<!-- TMPL_VAR NAME="biblio_fields" -->&amp;operator==&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;and_or=and&amp;excluding=" class="button authority"><!-- TMPL_VAR name="count" --> biblios</a>
  </div>
  
***************
*** 34,38 ****
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Are you sure you want to delete this authority?');
  	if (is_confirmed) {
  		window.location="authorities-home.pl?op=delete&amp;authid=<!-- TMPL_VAR NAME="authid" -->";
--- 34,38 ----
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Sid Sie sicher, da&szlig Sie diese Autorit&auml;t l&ouml;schen wollen?');
  	if (is_confirmed) {
  		window.location="authorities-home.pl?op=delete&amp;authid=<!-- TMPL_VAR NAME="authid" -->";

Index: searchresultlist-auth.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities/searchresultlist-auth.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** searchresultlist-auth.tmpl	12 May 2005 19:26:14 -0000	1.1
--- searchresultlist-auth.tmpl	27 Jun 2005 19:23:33 -0000	1.2
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE NAME="auth-search-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="authority">Authority search results</h1>
  	<div id="bloc25">
  		<form name="f" method="post" action="auth_finder.pl">
--- 1,5 ----
  <!-- TMPL_INCLUDE NAME="auth-search-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="authority">Autorit&auml;ten: Suchergebnisse</h1>
  	<div id="bloc25">
  		<form name="f" method="post" action="auth_finder.pl">
***************
*** 10,36 ****
  				<h2 class="authority">Suche nach</h2>
  				<p>
! 					<label class="label100">Authority type</label>
  					<!-- TMPL_VAR NAME="authtypecode" -->
  					<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
  				</p>
  				<p>
! 					<label class="label100">Main entry</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->">
  					<input type="hidden" name="marclist" value="mainentry">
  					<input type="hidden" name="and_or" value="and">
  					<input type="hidden" name="excluding" value="">
  					<select name="operator">
! 						<option value="start">start by</option>
! 						<option value="contains">contains</option>
  					</select>
  					<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
  				</p>
  				<p>
! 					<label class="label100">Anywhere</label><input type="text" name="value">
  					<input type="hidden" name="marclist" value="">
  					<input type="hidden" name="and_or" value="and">
  					<input type="hidden" name="excluding" value="">
  					<select name="operator">
! 						<option value="contains">contains</option>
! 						<option value="start">start by</option>
  					</select>
  					<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
--- 10,36 ----
  				<h2 class="authority">Suche nach</h2>
  				<p>
! 					<label class="label100">Autorit&auml;tstyp</label>
  					<!-- TMPL_VAR NAME="authtypecode" -->
  					<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
  				</p>
  				<p>
! 					<label class="label100">Haupteintrag</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->">
  					<input type="hidden" name="marclist" value="mainentry">
  					<input type="hidden" name="and_or" value="and">
  					<input type="hidden" name="excluding" value="">
  					<select name="operator">
! 						<option value="start">Start mit</option>
! 						<option value="contains">enth&auml;lt</option>
  					</select>
  					<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
  				</p>
  				<p>
! 					<label class="label100">Irgendwo</label><input type="text" name="value">
  					<input type="hidden" name="marclist" value="">
  					<input type="hidden" name="and_or" value="and">
  					<input type="hidden" name="excluding" value="">
  					<select name="operator">
! 						<option value="contains">enth&auml;lt</option>
! 						<option value="start">Start mit</option>
  					</select>
  					<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
***************
*** 75,80 ****
  				<tr>
  					<th class="authority">Zusammenfassung</th>
! 					<th class="authority">Used</th>
! 					<th class="authority">Get It!</th>
  				</tr>
  				<tr>
--- 75,80 ----
  				<tr>
  					<th class="authority">Zusammenfassung</th>
! 					<th class="authority">Verwendet</th>
! 					<th class="authority">Nehmen!</th>
  				</tr>
  				<tr>

Index: searchresultlist.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities/searchresultlist.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** searchresultlist.tmpl	12 May 2005 19:26:14 -0000	1.1
--- searchresultlist.tmpl	27 Jun 2005 19:23:33 -0000	1.2
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE NAME="auth-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="authority">Authority search results</h1>
  	<div id="resultnumber">
  		<p>
--- 1,5 ----
  <!-- TMPL_INCLUDE NAME="auth-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="authority">Autorit&auml;ten-Suchergebnisse</h1>
  	<div id="resultnumber">
  		<p>
***************
*** 36,40 ****
  			<tr>
  				<th class="authority">Zusammenfassung</th>
! 				<th class="authority">Used in</th>
  				<th class="authority">Zeige</th>
  				<th class="authority">L&ouml;schen</th>
--- 36,40 ----
  			<tr>
  				<th class="authority">Zusammenfassung</th>
! 				<th class="authority">Verwendet in</th>
  				<th class="authority">Zeige</th>
  				<th class="authority">L&ouml;schen</th>




From genjimoto at users.sourceforge.net  Tue Jun 28 00:22:56 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Mon, 27 Jun 2005 15:22:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.22,1.23
Message-ID: <E1Dn20G-0007kh-DJ@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac-detail.tmpl 
Log Message:
CSSed the sidebar implementation

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** opac-detail.tmpl	25 Jun 2005 06:56:47 -0000	1.22
--- opac-detail.tmpl	27 Jun 2005 22:22:52 -0000	1.23
***************
*** 1,7 ****
  <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
! <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
! <table width="100%">
! <tr>
! <td width="70%">
  <div id="bibliomenu">
  	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
--- 1,5 ----
  <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
! <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css"/>
! 
  <div id="bibliomenu">
  	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
***************
*** 32,36 ****
  	<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Add to basket</a>
  </div>
! 
  <div id="mainbloc">
  	<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
--- 30,34 ----
  	<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Add to basket</a>
  </div>
! <div id="homebloc">
  <div id="mainbloc">
  	<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
***************
*** 171,176 ****
  	</div>
  </div>
! </td>
! <td width="30%">
  Search Options:<br>
  Select keywords from list<br>
--- 169,174 ----
  	</div>
  </div>
! </div>
! <div id="rightbloc">
  Search Options:<br>
  Select keywords from list<br>
***************
*** 201,206 ****
  <input type="submit" value="Search">
  </form>
! </td>
! </tr>
! </table>
  <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
--- 199,202 ----
  <input type="submit" value="Search">
  </form>
! </div>
  <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->




From genjimoto at users.sourceforge.net  Tue Jun 28 00:24:01 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Mon, 27 Jun 2005 15:24:01 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.21,1.22
Message-ID: <E1Dn21J-0007t8-Jm@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac.css 
Log Message:
theres a leftbloc. Why not a rightbloc? There is now.

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** opac.css	20 Jun 2005 14:22:29 -0000	1.21
--- opac.css	27 Jun 2005 22:23:58 -0000	1.22
***************
*** 312,316 ****
  	border:0;
  }
! 
  #bottombloc {
  	width:100%;
--- 312,320 ----
  	border:0;
  }
! #rightbloc {
! 	float:right;
! 	width:40%;
! 	border:0;
! }
  #bottombloc {
  	width:100%;




From genjimoto at users.sourceforge.net  Tue Jun 28 00:26:31 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Mon, 27 Jun 2005 15:26:31 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-detail.pl,1.21,1.22
Message-ID: <E1Dn23j-00087x-0U@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31154

Modified Files:
	opac-detail.pl 
Log Message:
Moved the title words splitting, changed the authorwords routine abit. added a check for author and additionalauthors. No use having checkboxes for non-existant data.

Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** opac-detail.pl	25 Jun 2005 05:22:00 -0000	1.21
--- opac-detail.pl	27 Jun 2005 22:26:16 -0000	1.22
***************
*** 32,42 ****
  my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
  
  $dat->{'count'}=@items;
  my @author;
  $dat->{'additional'}=$addauthor->[0]->{'author'};
  for (my $i = 1; $i < $authorcount; $i++) {
          $dat->{'additional'} .= " ; " . $addauthor->[$i]->{'author'};
          my %authorpush;
!         $authorpush{author} =$addauthor->[$i]->{'author'};
          push @author, \%authorpush
  } # for
--- 32,66 ----
  my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
  
+ my @title;
  $dat->{'count'}=@items;
  my @author;
+ if ($dat->{'author'}){
+ 	my %authorpush; 
+ 	$authorpush{author}=$dat->{'author'};
+ 	push @author, \%authorpush
+ }
  $dat->{'additional'}=$addauthor->[0]->{'author'};
+ if ($dat->{'additional'}){
+ 	my %authorpush;
+ 	$authorpush{author} =$addauthor->[0]->{'author'};
+ 	push @author, \%authorpush
+ }
+ 
+ foreach my $word (split(" ", $dat->{'title'})){
+         unless (length($word) == 4){
+                 $word =~s/\%//g
+         }
+         unless (C4::Context->stopwords->{uc($word)} or length($word)==1) {
+         my %titlepush;
+         $titlepush{title} =$word;
+                 push @title, \%titlepush;
+         }#it's NOT a stopword => use it. Otherwise, ignore
+ }
+ 
  for (my $i = 1; $i < $authorcount; $i++) {
          $dat->{'additional'} .= " ; " . $addauthor->[$i]->{'author'};
+     
          my %authorpush;
!         $authorpush{author}=$addauthor->[$i]->{'author'};
          push @author, \%authorpush
  } # for
***************
*** 64,90 ****
  
  my @results = ($dat,);
- my @title;
  
  
! foreach my $word (split(" ", $dat->{'title'})){
!         unless (length($word) == 4){
!                 $word =~s/\%//g
!         }
!         unless (C4::Context->stopwords->{uc($word)} or length($word)==1) {
!         my %titlepush;
!         $titlepush{title} =$word;
!                 push @title, \%titlepush;
!         }#it's NOT a stopword => use it. Otherwise, ignore
! }
! foreach my $word (split(" ", $dat->{'author'})){
!         unless (length($word) == 4){
!                 $word =~s/\%//g
!         }
!         unless (C4::Context->stopwords->{uc($word)} or length($word)==1) {
!         my %authorpush;
!         $authorpush{author}=$word;
!                 push @author, \%authorpush;
!         }#it's NOT a stopword => use it. Otherwise, ignore
! }
  
  my $resultsarray=\@results;
--- 88,96 ----
  
  my @results = ($dat,);
  
  
! 
! 
! 
  
  my $resultsarray=\@results;




From hdl at users.sourceforge.net  Tue Jun 28 00:58:44 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 27 Jun 2005 15:58:44 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl favicon.ico,NONE,1.1.2.2
Message-ID: <E1Dn2Yu-0003Ip-2v@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12657/koha-tmpl

Added Files:
      Tag: rel_2_2
	favicon.ico 
Log Message:
Adding favicon.ico

--- NEW FILE ---


>?ÿÿÿ

ÿÿÿ67789:;ÿÿÿ

ÿÿÿ010234ÿ5ÿÿÿ

ÿÿÿ,-./ÿÿÿÿÿ

ÿÿÿ'()*+ÿÿÿÿÿÿ

ÿÿÿ
$

ÿÿÿÿ

ÿÿÿÿÿ	ÿÿÿÿÿ

ÿÿÿÿ



From hdl at users.sourceforge.net  Tue Jun 28 01:03:11 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 27 Jun 2005 16:03:11 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes favicon.ico,NONE,1.1.2.1
Message-ID: <E1Dn2dD-0003oi-KH@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
      Tag: rel_2_2
	favicon.ico 
Log Message:
Adding favicon.ico to default en... Getting rid of favicon.ico warning in logs

--- NEW FILE ---


>?ÿÿÿ

ÿÿÿ67789:;ÿÿÿ

ÿÿÿ010234ÿ5ÿÿÿ

ÿÿÿ,-./ÿÿÿÿÿ

ÿÿÿ'()*+ÿÿÿÿÿÿ

ÿÿÿ
$

ÿÿÿÿ

ÿÿÿÿÿ	ÿÿÿÿÿ

ÿÿÿÿ



From hdl at users.sourceforge.net  Tue Jun 28 01:06:59 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 27 Jun 2005 16:06:59 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/catalogue detail.tmpl,1.9.2.1,1.9.2.2
Message-ID: <E1Dn2gt-0004FV-CW@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	detail.tmpl 
Log Message:
Reporting Doxulting Fix on a french template.

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/detail.tmpl,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -r1.9.2.1 -r1.9.2.2
*** detail.tmpl	17 Feb 2005 13:06:28 -0000	1.9.2.1
--- detail.tmpl	27 Jun 2005 23:06:42 -0000	1.9.2.2
***************
*** 29,33 ****
  				<!-- TMPL_IF name="additional" --><label class="label100"><b>Additional Author:</b></label><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><label class="label100"><b>édité par :</b></label><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" --><br />
! 				<!-- TMPL_IF name="publicationyear" --><label class="label100"><b>S'inscrire </b></label><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
  				<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
  				<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br />
--- 29,33 ----
  				<!-- TMPL_IF name="additional" --><label class="label100"><b>Additional Author:</b></label><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><label class="label100"><b>édité par :</b></label><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" --><br />
! 				<!-- TMPL_IF name="publicationyear" --><label class="label100"><b>en </b></label><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
  				<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
  				<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br />




From hdl at users.sourceforge.net  Tue Jun 28 01:10:59 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 27 Jun 2005 16:10:59 -0700
Subject: [Koha-cvs] CVS: koha/z3950 z3950-daemon-launch.sh,1.4,1.4.4.1
Message-ID: <E1Dn2kl-0004fz-1f@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/z3950
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17937/z3950

Modified Files:
      Tag: rel_2_2
	z3950-daemon-launch.sh 
Log Message:
Removing -s from su call after Thomas D reports it breaks FreeBSD

Index: z3950-daemon-launch.sh
===================================================================
RCS file: /cvsroot/koha/koha/z3950/z3950-daemon-launch.sh,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -r1.4 -r1.4.4.1
*** z3950-daemon-launch.sh	5 Nov 2003 23:33:45 -0000	1.4
--- z3950-daemon-launch.sh	27 Jun 2005 23:10:55 -0000	1.4.4.1
***************
*** 33,37 ****
  fi
  
! su -s /bin/sh -c $KohaZ3950Shell - $RunAsUser &
  
  exit
--- 33,37 ----
  fi
  
! su -c $KohaZ3950Shell - $RunAsUser &
  
  exit
***************
*** 39,42 ****
--- 39,45 ----
  #--------------
  # $Log$
+ # Revision 1.4.4.1  2005/06/27 23:10:55  hdl
+ # Removing -s from su call after Thomas D reports it breaks FreeBSD
+ #
  # Revision 1.4  2003/11/05 23:33:45  slef
  # Now figures out what directory the scripts are in




From hdl at users.sourceforge.net  Tue Jun 28 01:24:10 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 27 Jun 2005 16:24:10 -0700
Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.115.2.13,1.115.2.14
Message-ID: <E1Dn2xW-0006E7-AF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23754/C4

Modified Files:
      Tag: rel_2_2
	Biblio.pm 
Log Message:
Display dashed ISBN


Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.115.2.13
retrieving revision 1.115.2.14
diff -C2 -r1.115.2.13 -r1.115.2.14
*** Biblio.pm	31 May 2005 12:44:26 -0000	1.115.2.13
--- Biblio.pm	27 Jun 2005 23:24:06 -0000	1.115.2.14
***************
*** 72,75 ****
--- 72,76 ----
    
    &FindDuplicate
+   &DisplayISBN
  );
  
***************
*** 2630,2633 ****
--- 2631,2671 ----
  }
  
+ sub DisplayISBN {
+ 	my ($isbn)=@_;
+ 	my $seg1;
+ 	if(substr($isbn, 0, 1) <=7) {
+ 		$seg1 = substr($isbn, 0, 1);
+ 	} elsif(substr($isbn, 0, 2) <= 94) {
+ 		$seg1 = substr($isbn, 0, 2);
+ 	} elsif(substr($isbn, 0, 3) <= 995) {
+ 		$seg1 = substr($isbn, 0, 3);
+ 	} elsif(substr($isbn, 0, 4) <= 9989) {
+ 		$seg1 = substr($isbn, 0, 4);
+ 	} else {
+ 		$seg1 = substr($isbn, 0, 5);
+ 	}
+ 	my $x = substr($isbn, length($seg1));
+ 	my $seg2;
+ 	if(substr($x, 0, 2) <= 19) {
+ # 		if(sTmp2 < 10) sTmp2 = "0" sTmp2;
+ 		$seg2 = substr($x, 0, 2);
+ 	} elsif(substr($x, 0, 3) <= 699) {
+ 		$seg2 = substr($x, 0, 3);
+ 	} elsif(substr($x, 0, 4) <= 8399) {
+ 		$seg2 = substr($x, 0, 4);
+ 	} elsif(substr($x, 0, 5) <= 89999) {
+ 		$seg2 = substr($x, 0, 5);
+ 	} elsif(substr($x, 0, 6) <= 9499999) {
+ 		$seg2 = substr($x, 0, 6);
+ 	} else {
+ 		$seg2 = substr($x, 0, 7);
+ 	}
+ 	my $seg3=substr($x,length($seg2));
+ 	$seg3=substr($seg3,0,length($seg3)-1) ;
+ 	my $seg4 = substr($x, -1, 1);
+ 	return "$seg1-$seg2-$seg3-$seg4";
+ }
+ 
+ 
  END { }    # module clean-up code here (global destructor)
  
***************
*** 2644,2647 ****
--- 2682,2688 ----
  # $Id$
  # $Log$
+ # Revision 1.115.2.14  2005/06/27 23:24:06  hdl
+ # Display dashed ISBN
+ #
  # Revision 1.115.2.13  2005/05/31 12:44:26  tipaul
  # patch from Genji (Waylon R.) to update subjects in MARC tables when systempref has MARC=OFF




From hdl at users.sourceforge.net  Tue Jun 28 01:24:38 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 27 Jun 2005 16:24:38 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-MARCdetail.pl,1.4.2.3,1.4.2.4
Message-ID: <E1Dn2xy-0006K0-Qm@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23754/opac

Modified Files:
      Tag: rel_2_2
	opac-MARCdetail.pl 
Log Message:
Display dashed ISBN


Index: opac-MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-MARCdetail.pl,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -r1.4.2.3 -r1.4.2.4
*** opac-MARCdetail.pl	25 Mar 2005 17:04:27 -0000	1.4.2.3
--- opac-MARCdetail.pl	27 Jun 2005 23:24:06 -0000	1.4.2.4
***************
*** 118,121 ****
--- 118,124 ----
  				if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{isurl}) {
  					$subfield_data{marc_value}="<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";
+ 				} elsif ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{kohafield} eq "biblioitems.isbn") {
+ #					warn " tag : ".$tagslib->{$fields[$x_i]->tag()}." subfield :".$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}. "ISBN : ".$subf[$i][1]."PosttraitementISBN :".DisplayISBN($subf[$i][1]);
+ 					$subfield_data{marc_value}=DisplayISBN($subf[$i][1]);
  				} else {
  					if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{authtypecode}) {




From hdl at users.sourceforge.net  Tue Jun 28 01:24:10 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 27 Jun 2005 16:24:10 -0700
Subject: [Koha-cvs] CVS: koha MARCdetail.pl,1.25.2.9,1.25.2.10
Message-ID: <E1Dn2xW-0006EI-S3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23754

Modified Files:
      Tag: rel_2_2
	MARCdetail.pl 
Log Message:
Display dashed ISBN


Index: MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/MARCdetail.pl,v
retrieving revision 1.25.2.9
retrieving revision 1.25.2.10
diff -C2 -r1.25.2.9 -r1.25.2.10
*** MARCdetail.pl	25 May 2005 09:34:40 -0000	1.25.2.9
--- MARCdetail.pl	27 Jun 2005 23:24:08 -0000	1.25.2.10
***************
*** 146,149 ****
--- 146,152 ----
  				if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{isurl}) {
  					$subfield_data{marc_value}="<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";
+ 				} elsif ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{kohafield} eq "biblioitems.isbn") {
+ #					warn " tag : ".$tagslib->{$fields[$x_i]->tag()}." subfield :".$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}. "ISBN : ".$subf[$i][1]."PosttraitementISBN :".DisplayISBN($subf[$i][1]);
+ 					$subfield_data{marc_value}=DisplayISBN($subf[$i][1]);
  				} else {
  					if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{authtypecode}) {




From hdl at users.sourceforge.net  Tue Jun 28 02:08:23 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 27 Jun 2005 17:08:23 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.17.2.8,1.17.2.9
Message-ID: <E1Dn3eJ-000457-3Q@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac.css 
Log Message:
Displaying overdue items  with red color... English version

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.17.2.8
retrieving revision 1.17.2.9
diff -C2 -r1.17.2.8 -r1.17.2.9
*** opac.css	17 Jun 2005 12:31:44 -0000	1.17.2.8
--- opac.css	28 Jun 2005 00:08:20 -0000	1.17.2.9
***************
*** 276,279 ****
--- 276,290 ----
  /* BLOCS */
  
+ #problem {
+ 	color: white;
+ 	font-weight:bold;
+ 	background-color:red;
+ }
+ .problem {
+ 	color: white;
+ 	font-weight:bold;
+ 	background-color:red;
+ }
+ 
  /* the mainbloc : everything is in mainbloc, except menu */
  #mainbloc {




From hdl at users.sourceforge.net  Tue Jun 28 02:08:23 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 27 Jun 2005 17:08:23 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-user.tmpl,1.8.2.4,1.8.2.5
Message-ID: <E1Dn3eJ-00045D-Fp@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-user.tmpl 
Log Message:
Displaying overdue items  with red color... English version

Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -C2 -r1.8.2.4 -r1.8.2.5
*** opac-user.tmpl	17 Jun 2005 12:31:44 -0000	1.8.2.4
--- opac-user.tmpl	28 Jun 2005 00:08:20 -0000	1.8.2.5
***************
*** 67,81 ****
  				<!-- 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>
--- 67,74 ----
  				<!-- TMPL_LOOP NAME="ISSUES" -->
  					<!-- TMPL_IF name="overdue"-->
! 						<tr class="problem">
  					<!-- TMPL_ELSE -->
  						<tr>
+ 					<!-- /TMPL_IF-->
  							<td><!-- TMPL_VAR NAME="title" --></td>
  							<td><!-- TMPL_VAR NAME="author" --></td>
***************
*** 86,90 ****
  							<td><!-- TMPL_IF NAME="status" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
  						</tr>
- 					<!-- /TMPL_IF -->
  				<!-- /TMPL_LOOP -->
  			</table>
--- 79,82 ----




From hdl at users.sourceforge.net  Tue Jun 28 09:35:51 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 00:35:51 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-detail.pl,1.14.2.3,1.14.2.4
Message-ID: <E1DnAdL-0005Fn-4u@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20116/opac

Modified Files:
      Tag: rel_2_2
	opac-detail.pl 
Log Message:
Adding not issued and delete state to state collection
And display the three latest numbers of every subscription received or lacked in opac.

Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.14.2.3
retrieving revision 1.14.2.4
diff -C2 -r1.14.2.3 -r1.14.2.4
*** opac-detail.pl	25 Mar 2005 17:04:27 -0000	1.14.2.3
--- opac-detail.pl	28 Jun 2005 07:35:48 -0000	1.14.2.4
***************
*** 30,35 ****
  my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
  my ($websitecount, @websites)             = &getwebsites($biblionumber);
- my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
  
  $dat->{'count'}=@items;
  
--- 30,48 ----
  my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
  my ($websitecount, @websites)             = &getwebsites($biblionumber);
  
+  #coping with subscriptions
+  my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
+  my @subscriptions = getsubscriptions($dat->{title},$dat->{issn},$biblionumber);
+  my @subs;
+  foreach my $subscription (@subscriptions){
+  	warn "subsid :".$subscription->{subscriptionid};
+  	my %cell;
+  	$cell{subscriptionid}= $subscription->{subscriptionid};
+  	$cell{subscriptionnotes}= $subscription->{notes};
+  	#get the three latest serials.
+  	$cell{latestserials}=getlatestserials($subscription->{subscriptionid},3);
+  	push @subs, \%cell;
+  }
+  
  $dat->{'count'}=@items;
  
***************
*** 71,74 ****
--- 84,88 ----
  				WEB_RESULTS => $webarray,
  				SITE_RESULTS => $sitearray,
+ 				subscriptions => \@subs,
  				subscriptionsnumber => $subscriptionsnumber,
  			     LibraryName => C4::Context->preference("LibraryName"),




From hdl at users.sourceforge.net  Tue Jun 28 09:35:51 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 00:35:51 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.15.2.11,1.15.2.12
Message-ID: <E1DnAdL-0005G1-MC@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-detail.tmpl 
Log Message:
Adding not issued and delete state to state collection
And display the three latest numbers of every subscription received or lacked in opac.

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.15.2.11
retrieving revision 1.15.2.12
diff -C2 -r1.15.2.11 -r1.15.2.12
*** opac-detail.tmpl	6 Jun 2005 11:41:08 -0000	1.15.2.11
--- opac-detail.tmpl	28 Jun 2005 07:35:49 -0000	1.15.2.12
***************
*** 158,170 ****
  			</tr>
  		<!-- /TMPL_LOOP -->
  	</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>
  </div>
--- 158,204 ----
  			</tr>
  		<!-- /TMPL_LOOP -->
+ 	
  	</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 :Click <a href="/cgi-bin/koha/opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" title="Serial issues"> here to look for Issues</a> we have or don't have</p>
! 		</div>
!  	<!-- /TMPL_IF -->
  	</div>
  </div>




From hdl at users.sourceforge.net  Tue Jun 28 09:35:51 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 00:35:51 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bull statecollection.tmpl,1.4.2.1,1.4.2.2
Message-ID: <E1DnAdL-0005G0-MI@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	statecollection.tmpl 
Log Message:
Adding not issued and delete state to state collection
And display the three latest numbers of every subscription received or lacked in opac.

Index: statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** statecollection.tmpl	25 Mar 2005 16:46:40 -0000	1.4.2.1
--- statecollection.tmpl	28 Jun 2005 07:35:49 -0000	1.4.2.2
***************
*** 54,57 ****
--- 54,67 ----
  						<option value="4">Missing</option>
  					<!-- /TMPL_IF -->
+ 					<!--TMPL_IF name="status5" -->
+ 						<option value="5" selected>Not issued</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="5">Not issued</option>
+ 					<!-- /TMPL_IF -->
+ 					<!--TMPL_IF name="status6" -->
+ 						<option value="6" selected>Delete</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="6">Delete</option>
+ 					<!-- /TMPL_IF -->
  				</select>
  			</td>




From hdl at users.sourceforge.net  Tue Jun 28 09:35:51 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 00:35:51 -0700
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.6.2.10,1.6.2.11
Message-ID: <E1DnAdL-0005G6-PV@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20116/C4

Modified Files:
      Tag: rel_2_2
	Bull.pm 
Log Message:
Adding not issued and delete state to state collection
And display the three latest numbers of every subscription received or lacked in opac.

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.6.2.10
retrieving revision 1.6.2.11
diff -C2 -r1.6.2.10 -r1.6.2.11
*** Bull.pm	17 Jun 2005 15:51:54 -0000	1.6.2.10
--- Bull.pm	28 Jun 2005 07:35:49 -0000	1.6.2.11
***************
*** 49,53 ****
  			&get_full_subscription_list_from_biblionumber 
  			&modsubscriptionhistory &newissue
! 			&getserials &serialchangestatus
  			&Find_Next_Date, &Get_Next_Seq
  			&hassubscriptionexpired &subscriptionexpirationdate &subscriptionrenew
--- 49,53 ----
  			&get_full_subscription_list_from_biblionumber 
  			&modsubscriptionhistory &newissue
! 			&getserials &getlatestserials &serialchangestatus
  			&Find_Next_Date, &Get_Next_Seq
  			&hassubscriptionexpired &subscriptionexpirationdate &subscriptionrenew
***************
*** 348,352 ****
  	my $dbh = C4::Context->dbh;
  	# status = 2 is "arrived"
! 	my $sth=$dbh->prepare("select serialid,serialseq, status, planneddate from serial where subscriptionid = ? and status <>2 and status <>4");
  	$sth->execute($subscriptionid);
  	my @serials;
--- 348,352 ----
  	my $dbh = C4::Context->dbh;
  	# status = 2 is "arrived"
! 	my $sth=$dbh->prepare("select serialid,serialseq, status, planneddate from serial where subscriptionid = ? and status <>2 and status <>4 and status <>5");
  	$sth->execute($subscriptionid);
  	my @serials;
***************
*** 362,365 ****
--- 362,385 ----
  }
  
+ # get the $limit's latest serials arrived or missing for a given subscription
+ sub getlatestserials{
+ 	my ($subscriptionid,$limit) =@_;
+ 	my $dbh = C4::Context->dbh;
+ 	# status = 2 is "arrived"
+ 	my $strsth="select serialid,serialseq, status, planneddate from serial where subscriptionid = ? and (status =2 or status=4) order by planneddate DESC LIMIT 0,$limit";
+ 	my $sth=$dbh->prepare($strsth);
+ 	$sth->execute($subscriptionid);
+ 	my @serials;
+ 	while(my $line = $sth->fetchrow_hashref) {
+ 		$line->{"status".$line->{status}} = 1; # fills a "statusX" value, used for template status select list
+ 		$line->{"planneddate"} = format_date($line->{"planneddate"});
+ 		push @serials,$line;
+ 	}
+ 	$sth=$dbh->prepare("select count(*) from serial where subscriptionid=?");
+ 	$sth->execute($subscriptionid);
+ 	my ($totalissues) = $sth->fetchrow;
+ 	return \@serials;
+ }
+ 
  sub serialchangestatus {
  	my ($serialid,$serialseq,$planneddate,$status)=@_;
***************
*** 371,387 ****
  	my ($subscriptionid,$oldstatus) = $sth->fetchrow;
  	# change status & update subscriptionhistory
! 	$sth = $dbh->prepare("update serial set serialseq=?,planneddate=?,status=? where serialid = ?");
! 	$sth->execute($serialseq,$planneddate,$status,$serialid);
! 	$sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
! 	$sth->execute($subscriptionid);
! 	my ($missinglist,$recievedlist) = $sth->fetchrow;
! 	if ($status eq 2) {
! 		$recievedlist .= ",$serialseq";
! 	}
! 	if ($status eq 4) {
! 		$missinglist .= ",$serialseq";
  	}
- 	$sth=$dbh->prepare("update subscriptionhistory set recievedlist=?, missinglist=? where subscriptionid=?");
- 	$sth->execute($recievedlist,$missinglist,$subscriptionid);
  	# create new waited entry if needed (ie : was a "waited" and has changed)
  	if ($oldstatus eq 1 && $status ne 1) {
--- 391,410 ----
  	my ($subscriptionid,$oldstatus) = $sth->fetchrow;
  	# change status & update subscriptionhistory
! 	if ($status eq 6){
! 		delissue($serialseq, $subscriptionid) 
! 	}else{
! 		$sth = $dbh->prepare("update serial set serialseq=?,planneddate=?,status=? where serialid = ?");
! 		$sth->execute($serialseq,$planneddate,$status,$serialid);
! 		$sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
! 		$sth->execute($subscriptionid);
! 		my ($missinglist,$recievedlist) = $sth->fetchrow;
! 		if ($status eq 2) {
! 			$recievedlist .= ",$serialseq";
! 		}
! 		$missinglist .= ",$serialseq" if ($status eq 4) ;
! 		$missinglist .= ",not issued $serialseq" if ($status eq 5);
! 		$sth=$dbh->prepare("update subscriptionhistory set recievedlist=?, missinglist=? where subscriptionid=?");
! 		$sth->execute($recievedlist,$missinglist,$subscriptionid);
  	}
  	# create new waited entry if needed (ie : was a "waited" and has changed)
  	if ($oldstatus eq 1 && $status ne 1) {
***************
*** 419,422 ****
--- 442,452 ----
  }
  
+ sub delissue {
+ 	my ($serialseq,$subscriptionid) = @_;
+ 	my $dbh = C4::Context->dbh;
+ 	my $sth = $dbh->prepare("delete from serial where serialseq= ? and subscriptionid= ? ");
+ 	$sth->execute($serialseq,$subscriptionid);
+ }
+ 
  sub Get_Next_Date(@) {
  	my ($planneddate,$subscription) = @_;




From hdl at users.sourceforge.net  Tue Jun 28 11:37:19 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 02:37:19 -0700
Subject: [Koha-cvs] CVS: koha/admin systempreferences.pl,1.22.2.1,1.22.2.2
Message-ID: <E1DnCWt-0005f1-JZ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21713/admin

Modified Files:
      Tag: rel_2_2
	systempreferences.pl 
Log Message:
Adding system preference category.
Managing them in tabs.
Taking Paul's first improvements on Head Version into account.

Index: systempreferences.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -C2 -r1.22.2.1 -r1.22.2.2
*** systempreferences.pl	11 Feb 2005 16:23:31 -0000	1.22.2.1
--- systempreferences.pl	28 Jun 2005 09:37:17 -0000	1.22.2.2
***************
*** 49,52 ****
--- 49,80 ----
  use C4::Context;
  
+ my %tabsysprefs;
+ $tabsysprefs{acquisitions}="Acquisitions";
+ $tabsysprefs{gist}="Acquisitions";
+ $tabsysprefs{authoritysep}="Authorities";
+ $tabsysprefs{ISBD}="Catalogue";
+ $tabsysprefs{marc}="Catalogue";
+ $tabsysprefs{marcflavour}="Catalogue";
+ $tabsysprefs{SubscriptionHistory}="Catalogue";
+ $tabsysprefs{maxoutstanding}="Circulation";
+ $tabsysprefs{printcirculationslips}="Circulation";
+ $tabsysprefs{suggestion}="Acquisitions";
+ $tabsysprefs{automembernum}="Members";
+ $tabsysprefs{noissuescharge}="Circulation";
+ $tabsysprefs{opacthemes}="OPAC";
+ $tabsysprefs{opaclanguages}="OPAC";
+ $tabsysprefs{LibraryName}="OPAC";
+ $tabsysprefs{opacstylesheet}="OPAC";
+ $tabsysprefs{BiblioDefaultView}="OPAC";
+ $tabsysprefs{hidelostitem}="OPAC";
+ $tabsysprefs{KohaAdmin}="Admin";
+ $tabsysprefs{checkdigit}="Admin";
+ $tabsysprefs{dateformat}="Admin";
+ $tabsysprefs{insecure}="Admin";
+ $tabsysprefs{ldapinfos}="Admin";
+ $tabsysprefs{ldapserver}="Admin";
+ $tabsysprefs{itemcallnumber}="Catalogue";
+ $tabsysprefs{maxreserves}="Circulation";
+ $tabsysprefs{virtualshelves}="OPAC";
  
  sub StringSearch  {
***************
*** 56,68 ****
  	my @data=split(' ',$searchstring);
  	my $count=@data;
- 	my $sth=$dbh->prepare("Select variable,value,explanation,type,options from systempreferences where (variable like ?) order by variable");
- 	$sth->execute("$data[0]%");
  	my @results;
  	my $cnt=0;
! 	while (my $data=$sth->fetchrow_hashref){
! 		push(@results,$data);
! 		$cnt ++;
  	}
- 	$sth->finish;
  	return ($cnt,\@results);
  }
--- 84,117 ----
  	my @data=split(' ',$searchstring);
  	my $count=@data;
  	my @results;
  	my $cnt=0;
! 	if ($type){
! 		foreach my $syspref (sort keys %tabsysprefs){
! 			if ($tabsysprefs{$syspref} eq $type){
! 				my $sth=$dbh->prepare("Select variable,value,explanation,type,options from systempreferences where (variable like ?) order by variable");
! 				$sth->execute($syspref);
! 				while (my $data=$sth->fetchrow_hashref){
! 					push(@results,$data);
! 					$cnt++;
! 				}
! 				$sth->finish;
! 			}
! 		}
! 	} else {
! 		my $strsth ="Select variable,value,explanation,type,options from systempreferences where variable not in (";  
! 		foreach my $syspref (keys %tabsysprefs){
! 			$strsth .= $dbh->quote($syspref).",";
! 		}
! 		$strsth =~ s/,$/) /;
! 		$strsth .= " order by variable";
! 		warn $strsth;
! 		my $sth=$dbh->prepare($strsth);
! 		$sth->execute();
! 		while (my $data=$sth->fetchrow_hashref){
! 			push(@results,$data);
! 			$cnt++;
! 		}
! 		$sth->finish;
  	}
  	return ($cnt,\@results);
  }
***************
*** 279,287 ****
  ################## DEFAULT ##################################
  } else { # DEFAULT
! 	if  ($searchfield ne '') {
! 		 $template->param(searchfield => "<p>You Searched for <strong>$searchfield</strong></p>");
! 	}
  	my $env;
! 	my ($count,$results)=StringSearch($env,$searchfield,'web');
  	my $toggle=0;
  	my @loop_data = ();
--- 328,336 ----
  ################## DEFAULT ##################################
  } else { # DEFAULT
! 	#Adding tab management for system preferences
! 	my $tab=$input->param('tab');
! 	
  	my $env;
! 	my ($count,$results)=StringSearch($env,$searchfield,$tab);
  	my $toggle=0;
  	my @loop_data = ();
***************
*** 301,305 ****
  		push(@loop_data, \%row_data);
  	}
! 	$template->param(loop => \@loop_data);
  	if ($offset>0) {
  		my $prevpage = $offset-$pagesize;
--- 350,355 ----
  		push(@loop_data, \%row_data);
  	}
! 	$tab=($tab?$tab:"Others");
! 	$template->param(loop => \@loop_data, $tab => 1);
  	if ($offset>0) {
  		my $prevpage = $offset-$pagesize;




From hdl at users.sourceforge.net  Tue Jun 28 11:37:19 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 02:37:19 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters systempreferences.tmpl,1.29.2.2,1.29.2.3
Message-ID: <E1DnCWt-0005ew-FS@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	systempreferences.tmpl 
Log Message:
Adding system preference category.
Managing them in tabs.
Taking Paul's first improvements on Head Version into account.

Index: systempreferences.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl,v
retrieving revision 1.29.2.2
retrieving revision 1.29.2.3
diff -C2 -r1.29.2.2 -r1.29.2.3
*** systempreferences.tmpl	11 Feb 2005 16:48:13 -0000	1.29.2.2
--- systempreferences.tmpl	28 Jun 2005 09:37:17 -0000	1.29.2.3
***************
*** 137,145 ****
  	<!-- TMPL_IF NAME="else" -->
  	<h1>System preferences admin</h1>
! 	<form action="/cgi-bin/koha/admin/systempreferences.pl" method="post">
! 		<input type="text" name="searchfield" value="">
! 		<input type="reset" name="reset" value="clr">
! 	</form>
! 	<!-- TMPL_VAR NAME="searchfield" -->
  	<table border="0" cellspacing="0" cellpadding="2">
  	<tr valign="top" bgcolor="#99cc33">
--- 137,216 ----
  	<!-- TMPL_IF NAME="else" -->
  	<h1>System preferences admin</h1>
! 	<table>
! 		<tr>
! 			<td>
! 				<!--TMPL_IF Name="Admin"-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin" class="button">Admin
! 					</a>
! 				<!--TMPL_ELSE-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin">Admin
! 					</a>
! 				<!--/TMPL_IF-->
! 			</td>
! 			<td>
! 				<!--TMPL_IF Name="Acquisitions"-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions" class="button">Acquisitions
! 					</a>
! 				<!--TMPL_ELSE-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions">Acquisitions
! 					</a>
! 				<!--/TMPL_IF-->
! 			</td>
! 			<td>
! 				<!--TMPL_IF Name="Authorities"-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities" class="button">Authorities
! 					</a>
! 				<!--TMPL_ELSE-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities">Authorities
! 					</a>
! 				<!--/TMPL_IF-->
! 			</td>
! 			<td>
! 				<!--TMPL_IF Name="Catalogue"-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue" class="button">Catalogue
! 					</a>
! 				<!--TMPL_ELSE-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue">Catalogue
! 					</a>
! 				<!--/TMPL_IF-->
! 			</td>
! 			<td>
! 				<!--TMPL_IF Name="Circulation"-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation" class="button">Circulation
! 					</a>
! 				<!--TMPL_ELSE-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation">Circulation
! 					</a>
! 				<!--/TMPL_IF-->
! 			</td>
! 			<td>
! 				<!--TMPL_IF Name="Members"-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members" class="button">Members
! 					</a>
! 				<!--TMPL_ELSE-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members">Members
! 					</a>
! 				<!--/TMPL_IF-->
! 			</td>
! 			<td>
! 				<!--TMPL_IF Name="OPAC"-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC" class="button">OPAC
! 					</a>
! 				<!--TMPL_ELSE-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC">OPAC
! 					</a>
! 				<!--/TMPL_IF-->
! 			</td>
! 			<td>
! 				<!--TMPL_IF Name="Others"-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=" class="button">Others
! 					</a>
! 				<!--TMPL_ELSE-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=">Others
! 					</a>
! 				<!--/TMPL_IF-->
! 			</td>
! 		</tr>
! 	</table>
  	<table border="0" cellspacing="0" cellpadding="2">
  	<tr valign="top" bgcolor="#99cc33">




From hdl at users.sourceforge.net  Tue Jun 28 12:15:14 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 03:15:14 -0700
Subject: [Koha-cvs] CVS: koha/reports acquisitions_stats.pl,1.4.2.2,1.4.2.3
Message-ID: <E1DnD7a-00024a-6R@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/reports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7912/reports

Modified Files:
      Tag: rel_2_2
	acquisitions_stats.pl 
Log Message:
Minor bug Fix: Displaying Months and day in usual order.

Index: acquisitions_stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/acquisitions_stats.pl,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -r1.4.2.2 -r1.4.2.3
*** acquisitions_stats.pl	7 Apr 2005 12:18:43 -0000	1.4.2.2
--- acquisitions_stats.pl	28 Jun 2005 10:15:11 -0000	1.4.2.3
***************
*** 272,296 ****
                                                
  # 1st, loop rows.                             
! 	my $linefield;                               
  	if (($line =~/closedate/) and ($podsp == 1)) {
  		#Display by day
  		$linefield .="dayname($line)";  
  	} elsif (($line=~/closedate/) and ($podsp == 2)) {
  		#Display by Month
  		$linefield .="monthname($line)";  
  	} elsif (($line=~/closedate/) and ($podsp == 3)) {
  		#Display by Year
  		$linefield .="Year($line)";
  	} elsif (($line =~/received/) and ($rodsp == 1)) {
  		#Display by day
  		$linefield .="dayname($line)";  
  	} elsif (($line=~/received/) and ($rodsp == 2)) {
  		#Display by Month
  		$linefield .="monthname($line)";  
  	} elsif (($line=~/received/) and ($rodsp == 3)) {
  		#Display by Year
  		$linefield .="Year($line)";
  	} else {
  		$linefield .= $line;
  	}  
  	
--- 272,304 ----
                                                
  # 1st, loop rows.                             
! 	my $linefield;
! 	my $lineorder;                               
  	if (($line =~/closedate/) and ($podsp == 1)) {
  		#Display by day
  		$linefield .="dayname($line)";  
+ 		$lineorder .="weekday($line)";  
  	} elsif (($line=~/closedate/) and ($podsp == 2)) {
  		#Display by Month
  		$linefield .="monthname($line)";  
+ 		$lineorder .="month($line)";  
  	} elsif (($line=~/closedate/) and ($podsp == 3)) {
  		#Display by Year
  		$linefield .="Year($line)";
+ 		$lineorder .=$linefield;  
  	} elsif (($line =~/received/) and ($rodsp == 1)) {
  		#Display by day
  		$linefield .="dayname($line)";  
+ 		$lineorder .="weekday($line)";  
  	} elsif (($line=~/received/) and ($rodsp == 2)) {
  		#Display by Month
  		$linefield .="monthname($line)";  
+ 		$lineorder .="month($line)";  
  	} elsif (($line=~/received/) and ($rodsp == 3)) {
  		#Display by Year
  		$linefield .="Year($line)";
+ 		$lineorder .=$linefield;  
  	} else {
  		$linefield .= $line;
+ 		$lineorder .=$linefield;  
  	}  
  	
***************
*** 313,317 ****
   	}
  	$strsth .=" group by $linefield";
! 	$strsth .=" order by $linefield";
  	warn "". $strsth;
  	
--- 321,325 ----
   	}
  	$strsth .=" group by $linefield";
! 	$strsth .=" order by $lineorder";
  	warn "". $strsth;
  	
***************
*** 338,361 ****
  # 2nd, loop cols.
  	my $colfield;
  	if (($column =~/closedate/) and ($podsp == 1)) {
  		#Display by day
! 		$colfield .="dayname($column)";  
  	} elsif (($column=~/closedate/) and ($podsp == 2)) {
  		#Display by Month
  		$colfield .="monthname($column)";  
  	} elsif (($column=~/closedate/) and ($podsp == 3)) {
  		#Display by Year
  		$colfield .="Year($column)";
  	} elsif (($column =~/received/) and ($rodsp == 1)) {
  		#Display by day
  		$colfield .="dayname($column)";  
  	} elsif (($column=~/received/) and ($rodsp == 2)) {
  		#Display by Month
  		$colfield .="monthname($column)";  
  	} elsif (($column=~/received/) and ($rodsp == 3)) {
  		#Display by Year
  		$colfield .="Year($column)";
  	} else {
  		$colfield .= $column;
  	}  
  	
--- 346,377 ----
  # 2nd, loop cols.
  	my $colfield;
+ 	my $colorder;
  	if (($column =~/closedate/) and ($podsp == 1)) {
  		#Display by day
! 		$colfield .="dayname($column)";
! 		$colorder .="weekday($column)";
  	} elsif (($column=~/closedate/) and ($podsp == 2)) {
  		#Display by Month
  		$colfield .="monthname($column)";  
+ 		$colorder .="month($column)";
  	} elsif (($column=~/closedate/) and ($podsp == 3)) {
  		#Display by Year
  		$colfield .="Year($column)";
+ 		$colorder .= $colfield;
  	} elsif (($column =~/received/) and ($rodsp == 1)) {
  		#Display by day
  		$colfield .="dayname($column)";  
+ 		$colorder .="weekday($column)";
  	} elsif (($column=~/received/) and ($rodsp == 2)) {
  		#Display by Month
  		$colfield .="monthname($column)";  
+ 		$colorder .="month($column)";
  	} elsif (($column=~/received/) and ($rodsp == 3)) {
  		#Display by Year
  		$colfield .="Year($column)";
+ 		$colorder .= $colfield;
  	} else {
  		$colfield .= $column;
+ 		$colorder .= $colfield;
  	}  
  	
***************
*** 378,382 ****
   	}
  	$strsth2 .=" group by $colfield";
! 	$strsth2 .=" order by $colfield";
   	warn "". $strsth2;
  	
--- 394,398 ----
   	}
  	$strsth2 .=" group by $colfield";
! 	$strsth2 .=" order by $colorder";
   	warn "". $strsth2;
  	
***************
*** 439,443 ****
  	@$filters[7]=~ s/\*/%/g if (@$filters[7]);
  	$strcalc .= " AND aqorders.sort2 like '" . @$filters[7] ."'" if ( @$filters[7] );
! 	$strcalc .= " group by $linefield, $colfield order by $linefield,$colfield";
  	warn "". $strcalc;
  	my $dbcalc = $dbh->prepare($strcalc);
--- 455,459 ----
  	@$filters[7]=~ s/\*/%/g if (@$filters[7]);
  	$strcalc .= " AND aqorders.sort2 like '" . @$filters[7] ."'" if ( @$filters[7] );
! 	$strcalc .= " group by $linefield, $colfield order by $lineorder,$colorder";
  	warn "". $strcalc;
  	my $dbcalc = $dbh->prepare($strcalc);




From hdl at users.sourceforge.net  Tue Jun 28 12:17:57 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 03:17:57 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/search.marc suggest.tmpl,1.2,1.2.2.1
Message-ID: <E1DnDAD-0002Oj-HC@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	suggest.tmpl 
Log Message:
Closing Suggest Window choice made

Index: suggest.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/suggest.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** suggest.tmpl	19 Jul 2004 20:59:34 -0000	1.2
--- suggest.tmpl	28 Jun 2005 10:17:55 -0000	1.2.2.1
***************
*** 45,49 ****
  //			}
  //			opener.document.location= "../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR NAME="oldbiblionumber" -->&breedingid="+GetThisOne;
! //			self.close();
  //			return false;
  		}
--- 45,49 ----
  //			}
  //			opener.document.location= "../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR NAME="oldbiblionumber" -->&breedingid="+GetThisOne;
! 			self.close();
  //			return false;
  		}




From hdl at users.sourceforge.net  Tue Jun 28 12:21:31 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 03:21:31 -0700
Subject: [Koha-cvs] CVS: koha/members member.pl,1.2.2.3,1.2.2.4
Message-ID: <E1DnDDf-0002yl-Bx@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11373/members

Modified Files:
      Tag: rel_2_2
	member.pl 
Log Message:
Adding Result counts and line counters to 
- histsearch (search order)
- members search

Index: member.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/member.pl,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -r1.2.2.3 -r1.2.2.4
*** member.pl	1 Mar 2005 13:13:42 -0000	1.2.2.3
--- member.pl	28 Jun 2005 10:21:29 -0000	1.2.2.4
***************
*** 90,93 ****
--- 90,94 ----
    my %row = (
    	background => $background,
+ 	count => $i+1,
          borrowernumber => $results->[$i]{'borrowernumber'},
          cardnumber => $results->[$i]{'cardnumber'},
***************
*** 106,109 ****
--- 107,111 ----
  $template->param( 
  			member          => $member,
+ 			numresults		=> $count,
  			resultsloop     => \@resultsdata );
  




From hdl at users.sourceforge.net  Tue Jun 28 12:21:31 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 03:21:31 -0700
Subject: [Koha-cvs] CVS: koha/C4 Acquisition.pm,1.9.2.5,1.9.2.6
Message-ID: <E1DnDDf-0002z4-NK@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11373/C4

Modified Files:
      Tag: rel_2_2
	Acquisition.pm 
Log Message:
Adding Result counts and line counters to 
- histsearch (search order)
- members search

Index: Acquisition.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.9.2.5
retrieving revision 1.9.2.6
diff -C2 -r1.9.2.5 -r1.9.2.6
*** Acquisition.pm	7 Jun 2005 12:56:37 -0000	1.9.2.5
--- Acquisition.pm	28 Jun 2005 10:21:29 -0000	1.9.2.6
***************
*** 612,616 ****
--- 612,618 ----
  	$sth->execute;
  	my @order_loop;
+ 	my $cnt=1;
  	while (my $line = $sth->fetchrow_hashref) {
+ 		$line->{count}=$cnt++;
  		push @order_loop, $line;
  	}




From hdl at users.sourceforge.net  Tue Jun 28 12:21:31 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 03:21:31 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui histsearch.tmpl,1.1.2.2,1.1.2.3
Message-ID: <E1DnDDf-0002z0-JY@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	histsearch.tmpl 
Log Message:
Adding Result counts and line counters to 
- histsearch (search order)
- members search

Index: histsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** histsearch.tmpl	26 May 2005 09:21:29 -0000	1.1.2.2
--- histsearch.tmpl	28 Jun 2005 10:21:29 -0000	1.1.2.3
***************
*** 2,5 ****
--- 2,7 ----
  <div id="mainbloc">
  	<h1 class="acquisition">Order search</h1>
+ 	<p class="resultcount"><!-- TMPL_VAR Name ="numresults" --> orders were found.
+ 	 </p>
  	<table>
  		<tr>
***************
*** 104,108 ****
  			<tr>
  				<td>
! 					&nbsp;
  				</td>
  				<td>
--- 106,110 ----
  			<tr>
  				<td>
! 					<!-- TMPL_VAR NAME="count" -->
  				</td>
  				<td>




From hdl at users.sourceforge.net  Tue Jun 28 12:21:31 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 03:21:31 -0700
Subject: [Koha-cvs] CVS: koha/acqui histsearch.pl,1.1.2.1,1.1.2.2
Message-ID: <E1DnDDf-0002z9-Py@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11373/acqui

Modified Files:
      Tag: rel_2_2
	histsearch.pl 
Log Message:
Adding Result counts and line counters to 
- histsearch (search order)
- members search

Index: histsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/histsearch.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** histsearch.pl	26 May 2005 09:21:30 -0000	1.1.2.1
--- histsearch.pl	28 Jun 2005 10:21:29 -0000	1.1.2.2
***************
*** 27,30 ****
--- 27,31 ----
  my $order_loop= &histsearch($title,$author,$name,$from_placed_on,$to_placed_on);
  $template->param(suggestions_loop => $order_loop,
+ 				numresults => scalar(@$order_loop),
  				title => $title,
  				author => $author,




From hdl at users.sourceforge.net  Tue Jun 28 12:21:31 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 03:21:31 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members member.tmpl,1.14.2.1,1.14.2.2 member-quicksearch-results.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1DnDDf-0002ys-I1@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	member.tmpl member-quicksearch-results.tmpl 
Log Message:
Adding Result counts and line counters to 
- histsearch (search order)
- members search

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -C2 -r1.14.2.1 -r1.14.2.2
*** member.tmpl	17 Feb 2005 12:49:09 -0000	1.14.2.1
--- member.tmpl	28 Jun 2005 10:21:29 -0000	1.14.2.2
***************
*** 18,23 ****
--- 18,26 ----
  <div class="bloc100">
  	<div class="bloctitle">You Searched for <!-- TMPL_VAR NAME="member" --></div>
+ 	<p class="resultcount"><!-- TMPL_VAR Name ="numresults" --> members were found.
+ 	 </p>
  	<table>
  		<tr>
+ 			<th>&nbsp;</th>
  			<th>Card</th>
  			<th>Surname</th>
***************
*** 35,38 ****
--- 38,42 ----
  				<tr bgcolor="white">
  			<!-- /TMPL_IF -->
+ 				<td><!-- TMPL_VAR NAME="count" --></td>
  				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
  				<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" --></a></td>

Index: member-quicksearch-results.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** member-quicksearch-results.tmpl	18 Jan 2005 21:57:05 -0000	1.1.2.1
--- member-quicksearch-results.tmpl	28 Jun 2005 10:21:29 -0000	1.1.2.2
***************
*** 5,8 ****
--- 5,10 ----
  
  <div class="bloc100">
+ 	<p class="resultcount"><!-- TMPL_VAR Name ="numresults" --> members were found.
+ 	 </p>
  	<table>
  		<tr>
***************
*** 19,23 ****
  				<tr bgcolor="white">
  			<!-- /TMPL_IF -->
! 				<td><form action="member-search-results.pl" method="get"><input type="button" class="button" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','request','member'); return false;" /></form></td>
  				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
  				<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" --></a></td>
--- 21,26 ----
  				<tr bgcolor="white">
  			<!-- /TMPL_IF -->
! 				<td><!-- TMPL_VAR NAME="count" -->
! <form action="member-search-results.pl" method="get"><input type="button" class="button" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','request','member'); return false;" /></form></td>
  				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
  				<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" --></a></td>




From hdl at users.sourceforge.net  Tue Jun 28 13:52:00 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 04:52:00 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members memberentry.tmpl,1.33.2.4,1.33.2.5
Message-ID: <E1DnEdE-0007Ma-JP@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	memberentry.tmpl 
Log Message:
Adding choice lists for sort1/Sort2 For biblios and patrons management.
Commiting along Help Modifications

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl,v
retrieving revision 1.33.2.4
retrieving revision 1.33.2.5
diff -C2 -r1.33.2.4 -r1.33.2.5
*** memberentry.tmpl	19 May 2005 21:52:46 -0000	1.33.2.4
--- memberentry.tmpl	28 Jun 2005 11:51:58 -0000	1.33.2.5
***************
*** 270,274 ****
  				<td>Sorting field 1</td>
  				<td colspan="4">
! 					<input type="text" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
  				</td>
  			</tr>
--- 270,278 ----
  				<td>Sorting field 1</td>
  				<td colspan="4">
! 					<!-- TMPL_IF Name="CGIsort1" -->
! 						<!-- TMPL_VAR Name="CGIsort1" -->
! 					<!-- TMPL_ELSE -->
! 						<input type="text" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
! 					<!--/TMPL_IF -->
  				</td>
  			</tr>
***************
*** 276,280 ****
  				<td>Sorting field 2</td>
  				<td colspan="4">
! 					<input type="text" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
  				</td>
  			</tr>
--- 280,288 ----
  				<td>Sorting field 2</td>
  				<td colspan="4">
! 					<!-- TMPL_IF Name="CGIsort2" -->
! 						<!-- TMPL_VAR Name="CGIsort2" -->
! 					<!-- TMPL_ELSE -->
! 						<input type="text" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
! 					<!--/TMPL_IF -->
  				</td>
  			</tr>




From hdl at users.sourceforge.net  Tue Jun 28 13:52:00 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 04:52:00 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/acqui newbiblio.tmpl,NONE,1.1.2.2
Message-ID: <E1DnEdE-0007Mg-OT@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
      Tag: rel_2_2
	newbiblio.tmpl 
Log Message:
Adding choice lists for sort1/Sort2 For biblios and patrons management.
Commiting along Help Modifications

--- NEW FILE ---
<!-- TMPL_INCLUDE name="help-top.inc" -->
<h1>Add Biblio help</h1>

<p>sort1 and sort2 may now be related to a list of Authorized Values. All you have to do is define a Asort1 or Asort2 category of authorised values and enter the desired values into these categories. You will then be able to use them through Add/Modify Biblio Page</p>





From hdl at users.sourceforge.net  Tue Jun 28 13:52:00 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 04:52:00 -0700
Subject: [Koha-cvs] CVS: koha/members memberentry.pl,1.5.2.4,1.5.2.5
Message-ID: <E1DnEdE-0007MP-6Q@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28209/members

Modified Files:
      Tag: rel_2_2
	memberentry.pl 
Log Message:
Adding choice lists for sort1/Sort2 For biblios and patrons management.
Commiting along Help Modifications

Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/memberentry.pl,v
retrieving revision 1.5.2.4
retrieving revision 1.5.2.5
diff -C2 -r1.5.2.4 -r1.5.2.5
*** memberentry.pl	19 May 2005 21:52:46 -0000	1.5.2.4
--- memberentry.pl	28 Jun 2005 11:51:57 -0000	1.5.2.5
***************
*** 233,236 ****
--- 233,250 ----
  				-size     => 1,
  				-multiple => 0 );
+ 	
+ 	my $CGIsort1 = buildCGIsort("Bsort1","sort1",$data->{'sort1'});
+ 	if ($CGIsort1) {
+ 		$template->param(CGIsort1 => $CGIsort1);
+ 	} else {
+ 		$template->param( sort1 => $data->{'sort1'});
+ 	}
+ 	
+ 	my $CGIsort2 = buildCGIsort("Bsort2","sort2",$data->{'sort2'});
+ 	if ($CGIsort2) {
+ 		$template->param(CGIsort2 =>$CGIsort2);
+ 	} else {
+ 		$template->param( sort2 => $data->{'sort2'});
+ 	}
  
  	$template->param(	actionType 		=> $actionType,
***************
*** 266,271 ****
  				cardnumber	=> $cardnumber,
  				dateofbirth	=> $data->{'dateofbirth'},
- 				sort1 => $data->{'sort1'},
- 				sort2 => $data->{'sort2'},
  				dateformat      => display_date_format(),
  			        modify          => $modify,
--- 280,283 ----




From hdl at users.sourceforge.net  Tue Jun 28 13:52:01 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 04:52:01 -0700
Subject: [Koha-cvs] CVS: koha/C4 Input.pm,1.16,1.16.4.1
Message-ID: <E1DnEdF-0007N9-PJ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28209/C4

Modified Files:
      Tag: rel_2_2
	Input.pm 
Log Message:
Adding choice lists for sort1/Sort2 For biblios and patrons management.
Commiting along Help Modifications

Index: Input.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Input.pm,v
retrieving revision 1.16
retrieving revision 1.16.4.1
diff -C2 -r1.16 -r1.16.4.1
*** Input.pm	28 Nov 2003 14:06:57 -0000	1.16
--- Input.pm	28 Jun 2005 11:51:58 -0000	1.16.4.1
***************
*** 50,53 ****
--- 50,54 ----
  @EXPORT = qw(
  	&checkdigit &checkvalidisbn
+ 	&buildCGIsort
  );
  
***************
*** 172,175 ****
--- 173,211 ----
  } # sub checkvalidisbn
  
+ =item buildCGISort
+ 
+   $CGIScrollingList = &BuildCGISort($name string, $input_name string);
+ 
+ Returns the scrolling list with name $input_name, built on authorised Values named $name.
+ Returns NULL if no authorised values found
+ 
+ =cut
+ sub buildCGIsort {
+     use strict;
+ 	my ($name,$input_name,$data) = @_;
+ 	my $dbh=C4::Context->dbh;
+ 	my $query=qq{SELECT * FROM authorised_values WHERE category=?};
+ 	my $sth=$dbh->prepare($query);
+ 	$sth->execute($name);
+ 	my $CGISort;
+ 	if ($sth->rows>0){
+ 		my @values;
+ 		my %labels;
+ 		for (my $i =0;$i<=$sth->rows;$i++){
+ 			my $results = $sth->fetchrow_hashref;
+  			push @values, $results->{authorised_value};
+  			$labels{$results->{authorised_value}}=$results->{lib};
+ 		}
+  		$CGISort= CGI::scrolling_list(
+  					-name => $input_name,
+  					-values => \@values,
+  					-labels => \%labels,
+ 					-default=> $data,
+  					-size => 1,
+  					-multiple => 0);
+ 	}
+ 	$sth->finish; 
+ 	return $CGISort;
+ }
  END { }       # module clean-up code here (global destructor)
  




From hdl at users.sourceforge.net  Tue Jun 28 13:52:01 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 04:52:01 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui newbiblio.tmpl,1.15.2.2,1.15.2.3
Message-ID: <E1DnEdF-0007Mn-2s@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	newbiblio.tmpl 
Log Message:
Adding choice lists for sort1/Sort2 For biblios and patrons management.
Commiting along Help Modifications

Index: newbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl,v
retrieving revision 1.15.2.2
retrieving revision 1.15.2.3
diff -C2 -r1.15.2.2 -r1.15.2.3
*** newbiblio.tmpl	8 Mar 2005 14:02:17 -0000	1.15.2.2
--- newbiblio.tmpl	28 Jun 2005 11:51:58 -0000	1.15.2.3
***************
*** 199,207 ****
  		<p>
  			<label class="label100">Sort field 1</label>
! 			<input type="text" size="20" name=sort1 value="<!-- TMPL_VAR NAME="sort1" -->">
  		</p>
  		<p>
  			<label class="label100">Sort field 2</label>
! 			<input type="text" size="20" name=sort2 value="<!-- TMPL_VAR NAME="sort2" -->">
  		</p>
  		<p>
--- 199,215 ----
  		<p>
  			<label class="label100">Sort field 1</label>
! 			<!-- TMPL_IF Name="CGIsort1" -->
! 				<!-- TMPL_VAR Name="CGIsort1" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
! 			<!--/TMPL_IF -->
  		</p>
  		<p>
  			<label class="label100">Sort field 2</label>
! 			<!-- TMPL_IF Name="CGIsort2" -->
! 				<!-- TMPL_VAR Name="CGIsort2" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
! 			<!--/TMPL_IF -->
  		</p>
  		<p>




From hdl at users.sourceforge.net  Tue Jun 28 13:52:01 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 04:52:01 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/members memberentry.tmpl,1.1,1.1.2.1
Message-ID: <E1DnEdF-0007Ml-2H@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	memberentry.tmpl 
Log Message:
Adding choice lists for sort1/Sort2 For biblios and patrons management.
Commiting along Help Modifications

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/help/members/memberentry.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** memberentry.tmpl	22 Dec 2004 16:12:45 -0000	1.1
--- memberentry.tmpl	28 Jun 2005 11:51:58 -0000	1.1.2.1
***************
*** 1,4 ****
--- 1,8 ----
  <!-- TMPL_INCLUDE name="help-top.inc" -->
  <h1>Add member help</h1>
+ 
+ 
+ <p>sort1 and sort2 may now be related to a list of Authorized Values. All you have to do is define a Bsort1 or Bsort2 category of authorised values and enter the desired values into these categories. You will then be able to use them through Add/Modify Member Page</p>
+ 
  <h2>Add Member, person</h2>
  <p>This is the form for adding a new single member to the database. There is also a form for organisations, such as other libraries and non profit organisations you might lend to. You should use the Add Organisation tab at the top of the Member page for that.</p>




From hdl at users.sourceforge.net  Tue Jun 28 13:52:02 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 04:52:02 -0700
Subject: [Koha-cvs] CVS: koha/acqui newbiblio.pl,1.21,1.21.2.1
Message-ID: <E1DnEdG-0007NK-DT@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28209/acqui

Modified Files:
      Tag: rel_2_2
	newbiblio.pl 
Log Message:
Adding choice lists for sort1/Sort2 For biblios and patrons management.
Commiting along Help Modifications

Index: newbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -C2 -r1.21 -r1.21.2.1
*** newbiblio.pl	14 Sep 2004 12:09:52 -0000	1.21
--- newbiblio.pl	28 Jun 2005 11:51:59 -0000	1.21.2.1
***************
*** 31,34 ****
--- 31,35 ----
  use C4::Search;
  use C4::Output;
+ use C4::Input;
  use C4::Interface::CGI::Output;
  use HTML::Template;
***************
*** 140,143 ****
--- 141,159 ----
  			-multiple => 0 );
  
+ #Build sort lists
+ my $CGIsort1 = buildCGIsort("Asort1","sort1",$data->{'sort1'});
+ if ($CGIsort1) {
+ 	$template->param(CGIsort1 => $CGIsort1);
+ } else {
+ 	$template->param( sort1 => $data->{'sort1'});
+ }
+ 
+ my $CGIsort2 = buildCGIsort("Asort2","sort2",$data->{'sort2'});
+ if ($CGIsort2) {
+ 	$template->param(CGIsort2 =>$CGIsort2);
+ } else {
+ 	$template->param( sort2 => $data->{'sort2'});
+ }
+ 
  # fill template
  $template->param( existing => $biblio,
***************
*** 173,178 ****
  						ecost => $data->{'ecost'},
  						notes => $data->{'notes'},
- 						sort1 => $data->{'sort1'},
- 						sort2 => $data->{'sort2'},
  						publishercode => $data->{'publishercode'});
  
--- 189,192 ----




From rangi at users.sourceforge.net  Wed Jun 29 02:05:23 2005
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Tue, 28 Jun 2005 17:05:23 -0700
Subject: [Koha-cvs] CVS: koha modbibitem.pl,1.14,1.15
Message-ID: <E1DnQ4x-0007qi-Gp@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29825

Modified Files:
	modbibitem.pl 
Log Message:
We dont use images as buttons in the templates anymore, fixing the code to reflect that


Index: modbibitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/modbibitem.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** modbibitem.pl	13 Jul 2004 12:55:01 -0000	1.14
--- modbibitem.pl	29 Jun 2005 00:05:21 -0000	1.15
***************
*** 44,48 ****
  my $data=bibitemdata($bibitemnum);
  my $biblio=$input->param('biblio');
! my $submit=$input->param('submit.x');
  if ($submit eq ''){
    print $input->redirect("deletebiblioitem.pl?biblioitemnumber=$bibitemnum&biblionumber=$biblio");
--- 44,48 ----
  my $data=bibitemdata($bibitemnum);
  my $biblio=$input->param('biblio');
! my $submit=$input->param('submit');
  if ($submit eq ''){
    print $input->redirect("deletebiblioitem.pl?biblioitemnumber=$bibitemnum&biblionumber=$biblio");




From rangi at users.sourceforge.net  Wed Jun 29 03:00:51 2005
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Tue, 28 Jun 2005 18:00:51 -0700
Subject: [Koha-cvs] CVS: koha/acqui newbiblio.pl,1.23,1.24
Message-ID: <E1DnQwd-0007HT-T2@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27605

Modified Files:
	newbiblio.pl 
Log Message:
Some of the values from the bookseller table werent being passed through to the templates


Index: newbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** newbiblio.pl	22 Jun 2005 13:14:12 -0000	1.23
--- newbiblio.pl	29 Jun 2005 01:00:49 -0000	1.24
***************
*** 170,173 ****
--- 170,176 ----
  						listprice => $booksellers[0]->{'listprice'},
  						gstreg => $booksellers[0]->{'gstreg'},
+                                                 invoiceinc => $booksellers[0]->{'invoiceincgst'},                              
+                                                 invoicedisc => $booksellers[0]->{'invoicedisc'},                               
+                                                 nocalc => $booksellers[0]->{'nocalc'},
  						name => $booksellers[0]->{'name'},
  						currency => $booksellers[0]->{'listprice'},




From rangi at users.sourceforge.net  Wed Jun 29 03:03:08 2005
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Tue, 28 Jun 2005 18:03:08 -0700
Subject: [Koha-cvs] CVS: koha/acqui updatesupplier.pl,1.5,1.6
Message-ID: <E1DnQyq-0007Wt-Cv@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28793

Modified Files:
	updatesupplier.pl 
Log Message:
Removing a line that was adding a \ in front of every ' in a suppliers name


Index: updatesupplier.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/updatesupplier.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** updatesupplier.pl	13 Jul 2004 12:53:00 -0000	1.5
--- updatesupplier.pl	29 Jun 2005 01:03:06 -0000	1.6
***************
*** 36,40 ****
  
  $data{'name'}=$input->param('company');
- $data{'name'}=~ s/\'/\\\'/g;
  $data{'postal'}=$input->param('company_postal');
  my $address=$input->param('physical');
--- 36,39 ----




From rangi at users.sourceforge.net  Wed Jun 29 03:16:39 2005
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Tue, 28 Jun 2005 18:16:39 -0700
Subject: [Koha-cvs] CVS: koha/acqui basket.pl,1.26,1.27
Message-ID: <E1DnRBv-0000ht-UA@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2657

Modified Files:
	basket.pl 
Log Message:
Formatting the creation date correctly


Index: basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/basket.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** basket.pl	20 Jun 2005 13:15:46 -0000	1.26
--- basket.pl	29 Jun 2005 01:16:37 -0000	1.27
***************
*** 110,114 ****
  $gist_est = sprintf("%.2f",$sub_total_est*$prefgist);
  $template->param(basketno => $basketno,
! 				creationdate => $basket->{creationdate},
  				authorisedby => $basket->{authorisedby},
  				authorisedbyname => $basket->{authorisedbyname},
--- 110,114 ----
  $gist_est = sprintf("%.2f",$sub_total_est*$prefgist);
  $template->param(basketno => $basketno,
! 				creationdate => format_date($basket->{creationdate}),
  				authorisedby => $basket->{authorisedby},
  				authorisedbyname => $basket->{authorisedbyname},




From rangi at users.sourceforge.net  Wed Jun 29 04:01:05 2005
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Tue, 28 Jun 2005 19:01:05 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-sendbasket.pl,1.7,1.8
Message-ID: <E1DnRsv-0006x2-QR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26427

Modified Files:
	opac-sendbasket.pl 
Log Message:
Fixing a bug caused by the syncing with the 2.2 branch


Index: opac-sendbasket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-sendbasket.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** opac-sendbasket.pl	20 Jun 2005 14:33:32 -0000	1.7
--- opac-sendbasket.pl	29 Jun 2005 02:01:03 -0000	1.8
***************
*** 71,78 ****
  	}
  
!     $email_header = encode_qp($email_header);
! 
!     $boundary = "--" . $boundary;
! 
  	# Analysing information and getting mail properties
  	if ($template_res =~ /<SUBJECT>\n(.*)\n<END_SUBJECT>/s) { $mail{'subject'} = $1; }
--- 71,76 ----
  	}
  
!     # Getting template result                                                                                             
!     my $template_res = $template2->output();
  	# Analysing information and getting mail properties
  	if ($template_res =~ /<SUBJECT>\n(.*)\n<END_SUBJECT>/s) { $mail{'subject'} = $1; }




From hdl at users.sourceforge.net  Thu Jun 30 10:56:35 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 30 Jun 2005 01:56:35 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marctagstructure.tmpl,1.27.2.7,1.27.2.8
Message-ID: <E1DnuqZ-00012N-5T@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	marctagstructure.tmpl 
Log Message:
Adding TAG Input Field to MARCtagstructure When adding a field.

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.27.2.7
retrieving revision 1.27.2.8
diff -C2 -r1.27.2.7 -r1.27.2.8
*** marctagstructure.tmpl	21 Jun 2005 13:34:26 -0000	1.27.2.7
--- marctagstructure.tmpl	30 Jun 2005 08:56:32 -0000	1.27.2.8
***************
*** 66,70 ****
  		<input type="hidden" name="op" value="add_validate">
  		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
! 		<p><label>Tag<label><!-- TMPL_VAR NAME="searchfield" --></p>
  		<p><label>Lib for librarians</label><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape=HTML -->" size="80" maxlength="100"></p>
  		<p><label>Lib for opac</label><input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="80" maxlength="100"></p>
--- 66,75 ----
  		<input type="hidden" name="op" value="add_validate">
  		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
! 		<p><label>Tag<label><!-- TMPL_IF Name="searchfield" -->
! 		<!-- TMPL_VAR NAME="searchfield" -->
! 		<!-- TMPL_ELSE -->
! 		<input type="text" name="tagfield" value="" escape=HTML -->
! 		<!-- /TMPL_IF -->
! 		</p>
  		<p><label>Lib for librarians</label><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape=HTML -->" size="80" maxlength="100"></p>
  		<p><label>Lib for opac</label><input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="80" maxlength="100"></p>




From oleonard at users.sourceforge.net  Thu Jun 30 21:53:32 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 12:53:32 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui histsearch.tmpl,1.1.2.3,1.1.2.4
Message-ID: <E1Do56K-00044A-Vs@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	histsearch.tmpl 
Log Message:
Synching with default template

Index: histsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/histsearch.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** histsearch.tmpl	8 Jun 2005 17:13:55 -0000	1.1.2.3
--- histsearch.tmpl	30 Jun 2005 19:53:20 -0000	1.1.2.4
***************
*** 5,8 ****
--- 5,9 ----
  <div id="main">
  	<h1>Order search</h3>
+ 	<div class="results"><!-- TMPL_VAR Name ="numresults" --> orders were found.</div>
  	<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post"><table>
  		<tr>
***************
*** 87,91 ****
  		<!-- TMPL_LOOP NAME="suggestions_loop" -->
  			<tr>
! 				<td>&nbsp;</td>
  				<td><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
  				<td><!-- TMPL_VAR NAME="author" --></td>
--- 88,92 ----
  		<!-- TMPL_LOOP NAME="suggestions_loop" -->
  			<tr>
! 				<td><!-- TMPL_VAR NAME="count" --></td>
  				<td><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
  				<td><!-- TMPL_VAR NAME="author" --></td>




From oleonard at users.sourceforge.net  Thu Jun 30 21:54:31 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 12:54:31 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui histsearch.tmpl,1.4,1.5
Message-ID: <E1Do57H-00049p-S2@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	histsearch.tmpl 
Log Message:
Synching with rel_2_2.

Index: histsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/histsearch.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** histsearch.tmpl	8 Jun 2005 18:38:19 -0000	1.4
--- histsearch.tmpl	30 Jun 2005 19:54:23 -0000	1.5
***************
*** 5,8 ****
--- 5,9 ----
  <div id="main">
  	<h1>Order search</h3>
+ 	<div class="results"><!-- TMPL_VAR Name ="numresults" --> orders were found.</div>
  	<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post"><table>
  		<tr>
***************
*** 87,91 ****
  		<!-- TMPL_LOOP NAME="suggestions_loop" -->
  			<tr>
! 				<td>&nbsp;</td>
  				<td><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
  				<td><!-- TMPL_VAR NAME="author" --></td>
--- 88,92 ----
  		<!-- TMPL_LOOP NAME="suggestions_loop" -->
  			<tr>
! 				<td><!-- TMPL_VAR NAME="count" --></td>
  				<td><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
  				<td><!-- TMPL_VAR NAME="author" --></td>




From oleonard at users.sourceforge.net  Thu Jun 30 22:01:17 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:01:17 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui newbiblio.tmpl,1.3,1.4
Message-ID: <E1Do5Dp-00057x-Qg@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	newbiblio.tmpl 
Log Message:
Synching with rel_2_2.

Index: newbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** newbiblio.tmpl	2 May 2005 18:06:49 -0000	1.3
--- newbiblio.tmpl	30 Jun 2005 20:01:15 -0000	1.4
***************
*** 144,149 ****
  		<tr><th><label for="invoice">Invoice Number *</label></th><td><input type="text" size="20" id="invoice" name="invoice"  value="<!-- TMPL_VAR name="invoice" -->" /></td></tr>
  		<tr><th><label for="notes-details">Notes</label></th><td><input type="text" size="20" id="notes-details" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" /></td></tr>
! 		<tr><th><label for="sort1">Sort field 1</label></th><td><input type="text" size="20" id="sort1" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" /></td></tr>
! 		<tr><th><label for="sort2">Sort field 2</label></th><td><input type="text" size="20" id="sort2" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" /></td></tr>
  		</table></div>
  		<p>The 'Sort' fields are available for your own usage. They can be useful for stat purposes</p>	
--- 144,159 ----
  		<tr><th><label for="invoice">Invoice Number *</label></th><td><input type="text" size="20" id="invoice" name="invoice"  value="<!-- TMPL_VAR name="invoice" -->" /></td></tr>
  		<tr><th><label for="notes-details">Notes</label></th><td><input type="text" size="20" id="notes-details" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" /></td></tr>
! 		<tr><th><label for="sort1">Sort field 1</label></th><td>
! 		<!-- TMPL_IF Name="CGIsort1" -->
! 				<!-- TMPL_VAR Name="CGIsort1" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" id="sort1" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
! 			<!--/TMPL_IF -->
! 	</td></tr>
! 		<tr><th><label for="sort2">Sort field 2</label></th><td><!-- TMPL_IF Name="CGIsort2" -->
! 				<!-- TMPL_VAR Name="CGIsort2" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" id="sort2" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
! 			<!--/TMPL_IF --></td></tr>
  		</table></div>
  		<p>The 'Sort' fields are available for your own usage. They can be useful for stat purposes</p>	




From oleonard at users.sourceforge.net  Thu Jun 30 22:02:43 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:02:43 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui newbiblio.tmpl,1.2.2.1,1.2.2.2
Message-ID: <E1Do5FD-0005JW-EG@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	newbiblio.tmpl 
Log Message:
Synching with default template

Index: newbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** newbiblio.tmpl	14 Apr 2005 21:28:27 -0000	1.2.2.1
--- newbiblio.tmpl	30 Jun 2005 20:02:40 -0000	1.2.2.2
***************
*** 144,149 ****
  		<tr><th><label for="invoice">Invoice Number *</label></th><td><input type="text" size="20" id="invoice" name="invoice"  value="<!-- TMPL_VAR name="invoice" -->" /></td></tr>
  		<tr><th><label for="notes-details">Notes</label></th><td><input type="text" size="20" id="notes-details" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" /></td></tr>
! 		<tr><th><label for="sort1">Sort field 1</label></th><td><input type="text" size="20" id="sort1" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" /></td></tr>
! 		<tr><th><label for="sort2">Sort field 2</label></th><td><input type="text" size="20" id="sort2" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" /></td></tr>
  		</table></div>
  		<p>The 'Sort' fields are available for your own usage. They can be useful for stat purposes</p>	
--- 144,159 ----
  		<tr><th><label for="invoice">Invoice Number *</label></th><td><input type="text" size="20" id="invoice" name="invoice"  value="<!-- TMPL_VAR name="invoice" -->" /></td></tr>
  		<tr><th><label for="notes-details">Notes</label></th><td><input type="text" size="20" id="notes-details" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" /></td></tr>
! 		<tr><th><label for="sort1">Sort field 1</label></th><td>
! 		<!-- TMPL_IF Name="CGIsort1" -->
! 				<!-- TMPL_VAR Name="CGIsort1" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" id="sort1" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
! 			<!--/TMPL_IF -->
! 	</td></tr>
! 		<tr><th><label for="sort2">Sort field 2</label></th><td><!-- TMPL_IF Name="CGIsort2" -->
! 				<!-- TMPL_VAR Name="CGIsort2" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" id="sort2" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
! 			<!--/TMPL_IF --></td></tr>
  		</table></div>
  		<p>The 'Sort' fields are available for your own usage. They can be useful for stat purposes</p>	




From oleonard at users.sourceforge.net  Thu Jun 30 22:09:09 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:09:09 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/authorities searchresultlist-auth.tmpl,1.2,1.3
Message-ID: <E1Do5LR-0006BN-6i@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23723/koha-tmpl/intranet-tmpl/npl/en/authorities

Modified Files:
	searchresultlist-auth.tmpl 
Log Message:
Synching with rel_2_2.

Index: searchresultlist-auth.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/searchresultlist-auth.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** searchresultlist-auth.tmpl	2 May 2005 18:15:31 -0000	1.2
--- searchresultlist-auth.tmpl	30 Jun 2005 20:09:06 -0000	1.3
***************
*** 37,41 ****
  			<p>
  				<!-- TMPL_IF name="displayprev" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet">
  						<img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
  					</a>
--- 37,41 ----
  			<p>
  				<!-- TMPL_IF name="displayprev" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  						<img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
  					</a>
***************
*** 45,54 ****
  						<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
  					<!-- TMPL_ELSE -->
! 						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet">
  							<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
  					<!-- /TMPL_IF -->
  				<!-- /TMPL_LOOP -->
  				<!-- TMPL_IF name="displaynext" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet">
  						<img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
  				<!-- /TMPL_IF -->
--- 45,54 ----
  						<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
  					<!-- TMPL_ELSE -->
! 						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  							<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
  					<!-- /TMPL_IF -->
  				<!-- /TMPL_LOOP -->
  				<!-- TMPL_IF name="displaynext" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  						<img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
  				<!-- /TMPL_IF -->




From oleonard at users.sourceforge.net  Thu Jun 30 22:11:43 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:11:43 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/authorities searchresultlist-auth.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1Do5Nv-0006hL-FJ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25735/koha-tmpl/intranet-tmpl/npl/en/authorities

Modified Files:
      Tag: rel_2_2
	searchresultlist-auth.tmpl 
Log Message:
Synching with default template

Index: searchresultlist-auth.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/searchresultlist-auth.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** searchresultlist-auth.tmpl	19 Apr 2005 19:13:34 -0000	1.1.2.1
--- searchresultlist-auth.tmpl	30 Jun 2005 20:11:41 -0000	1.1.2.2
***************
*** 37,41 ****
  			<p>
  				<!-- TMPL_IF name="displayprev" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet">
  						<img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
  					</a>
--- 37,41 ----
  			<p>
  				<!-- TMPL_IF name="displayprev" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  						<img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
  					</a>
***************
*** 45,54 ****
  						<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
  					<!-- TMPL_ELSE -->
! 						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet">
  							<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
  					<!-- /TMPL_IF -->
  				<!-- /TMPL_LOOP -->
  				<!-- TMPL_IF name="displaynext" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet">
  						<img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
  				<!-- /TMPL_IF -->
--- 45,54 ----
  						<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
  					<!-- TMPL_ELSE -->
! 						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  							<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
  					<!-- /TMPL_IF -->
  				<!-- /TMPL_LOOP -->
  				<!-- TMPL_IF name="displaynext" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  						<img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
  				<!-- /TMPL_IF -->




From oleonard at users.sourceforge.net  Thu Jun 30 22:17:23 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:17:23 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull statecollection.tmpl,1.2.2.1,1.2.2.2
Message-ID: <E1Do5TP-0007Sz-Vv@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28637/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
      Tag: rel_2_2
	statecollection.tmpl 
Log Message:
Synching with default template

Index: statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/statecollection.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** statecollection.tmpl	10 Jan 2005 17:05:03 -0000	1.2.2.1
--- statecollection.tmpl	30 Jun 2005 20:17:20 -0000	1.2.2.2
***************
*** 70,73 ****
--- 70,83 ----
  						<option value="4">Missing</option>
  					<!-- /TMPL_IF -->
+ 					<!--TMPL_IF name="status5" -->
+ 						<option value="5" selected>Not issued</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="5">Not issued</option>
+ 					<!-- /TMPL_IF -->
+ 					<!--TMPL_IF name="status6" -->
+ 						<option value="6" selected>Delete</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="6">Delete</option>
+ 					<!-- /TMPL_IF -->
  				</select>
  			</td>




From oleonard at users.sourceforge.net  Thu Jun 30 22:19:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:19:18 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull statecollection.tmpl,1.3,1.4
Message-ID: <E1Do5VG-0007hj-71@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29578/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
	statecollection.tmpl 
Log Message:
Synching with rel_2_2.

Index: statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/statecollection.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** statecollection.tmpl	10 Jan 2005 17:02:54 -0000	1.3
--- statecollection.tmpl	30 Jun 2005 20:19:15 -0000	1.4
***************
*** 70,73 ****
--- 70,83 ----
  						<option value="4">Missing</option>
  					<!-- /TMPL_IF -->
+ 					<!--TMPL_IF name="status5" -->
+ 						<option value="5" selected>Not issued</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="5">Not issued</option>
+ 					<!-- /TMPL_IF -->
+ 					<!--TMPL_IF name="status6" -->
+ 						<option value="6" selected>Delete</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="6">Delete</option>
+ 					<!-- /TMPL_IF -->
  				</select>
  			</td>




From oleonard at users.sourceforge.net  Thu Jun 30 22:26:39 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:26:39 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member-quicksearch-results.tmpl,1.1,1.2
Message-ID: <E1Do5cN-0000CC-MR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv699/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
	member-quicksearch-results.tmpl 
Log Message:
Synching with rel_2_2.

Index: member-quicksearch-results.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/member-quicksearch-results.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** member-quicksearch-results.tmpl	13 Jan 2005 21:50:28 -0000	1.1
--- member-quicksearch-results.tmpl	30 Jun 2005 20:26:37 -0000	1.2
***************
*** 2,9 ****
  
  <div id="main-compact">
! 
! <div class="table"><table>
    <tr>
!   	<th>&nbsp;</th>
      <th>Card</th>
      <th>Name (Cat.)</th>
--- 2,9 ----
  
  <div id="main-compact">
! <div class="results"><!-- TMPL_VAR Name ="numresults" --> patrons found.</div>
! <table>
    <tr>
!   	<th colspan="2">&nbsp;</th>
      <th>Card</th>
      <th>Name (Cat.)</th>
***************
*** 17,21 ****
      <tr>
      <!-- /TMPL_IF -->
! 	 <td><form action="member-search-results.pl" method="get"><input type="button" class="submit" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','mainform','member'); return false;" /></form></td>
        <td><!-- TMPL_VAR NAME="cardnumber" --></td>
        <td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> (<!-- TMPL_VAR NAME="categorycode" -->)</td>
--- 17,21 ----
      <tr>
      <!-- /TMPL_IF -->
! 	 <td><!-- TMPL_VAR NAME="count" --></td><td><form action="member-search-results.pl" method="get"><input type="button" class="submit" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','mainform','member'); return false;" /></form></td>
        <td><!-- TMPL_VAR NAME="cardnumber" --></td>
        <td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> (<!-- TMPL_VAR NAME="categorycode" -->)</td>
***************
*** 24,28 ****
    <!-- /TMPL_LOOP -->
    <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
! </table></div>
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
--- 24,28 ----
    <!-- /TMPL_LOOP -->
    <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
! </table>
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file




From oleonard at users.sourceforge.net  Thu Jun 30 22:27:09 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:27:09 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member-quicksearch-results.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1Do5cr-0000G0-QU@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv691/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
      Tag: rel_2_2
	member-quicksearch-results.tmpl 
Log Message:
Synching with default template

Index: member-quicksearch-results.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/member-quicksearch-results.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** member-quicksearch-results.tmpl	18 Jan 2005 21:55:17 -0000	1.1.2.1
--- member-quicksearch-results.tmpl	30 Jun 2005 20:27:07 -0000	1.1.2.2
***************
*** 2,9 ****
  
  <div id="main-compact">
! 
! <div class="table"><table>
    <tr>
!   	<th>&nbsp;</th>
      <th>Card</th>
      <th>Name (Cat.)</th>
--- 2,9 ----
  
  <div id="main-compact">
! <div class="results"><!-- TMPL_VAR Name ="numresults" --> patrons found.</div>
! <table>
    <tr>
!   	<th colspan="2">&nbsp;</th>
      <th>Card</th>
      <th>Name (Cat.)</th>
***************
*** 17,21 ****
      <tr>
      <!-- /TMPL_IF -->
! 	 <td><form action="member-search-results.pl" method="get"><input type="button" class="submit" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','mainform','member'); return false;" /></form></td>
        <td><!-- TMPL_VAR NAME="cardnumber" --></td>
        <td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> (<!-- TMPL_VAR NAME="categorycode" -->)</td>
--- 17,21 ----
      <tr>
      <!-- /TMPL_IF -->
! 	 <td><!-- TMPL_VAR NAME="count" --></td><td><form action="member-search-results.pl" method="get"><input type="button" class="submit" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','mainform','member'); return false;" /></form></td>
        <td><!-- TMPL_VAR NAME="cardnumber" --></td>
        <td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> (<!-- TMPL_VAR NAME="categorycode" -->)</td>
***************
*** 24,28 ****
    <!-- /TMPL_LOOP -->
    <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
! </table></div>
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
--- 24,28 ----
    <!-- /TMPL_LOOP -->
    <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
! </table>
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file




From oleonard at users.sourceforge.net  Thu Jun 30 22:34:11 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:34:11 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member.tmpl,1.4.2.3,1.4.2.4
Message-ID: <E1Do5jf-0001K0-Pi@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5043/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
      Tag: rel_2_2
	member.tmpl 
Log Message:
Synching with default template

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/member.tmpl,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -r1.4.2.3 -r1.4.2.4
*** member.tmpl	7 Apr 2005 17:03:31 -0000	1.4.2.3
--- member.tmpl	30 Jun 2005 20:34:09 -0000	1.4.2.4
***************
*** 5,11 ****
  
  <div id="main">
! <div class="table"><table>
! 	<caption>Patron Search Results</caption>
    <tr>
      <th>Card</th>
      <th>Name</th>
--- 5,13 ----
  
  <div id="main">
!     <h3>Results for Search: <span class="ex"><!-- TMPL_VAR NAME="member" --></span></h3>
! 	<div class="results"><!-- TMPL_VAR Name ="numresults" --> patrons found.</div>
! <table>
    <tr>
+   	<th>&nbsp;</th>
      <th>Card</th>
      <th>Name</th>
***************
*** 13,17 ****
      <th>Address</th>
      <th>OD/Issues</th>
! <!--     <th>Charges</th> -->
      <th>Notes</th>
  	<th>&nbsp;</th>
--- 15,19 ----
      <th>Address</th>
      <th>OD/Issues</th>
! 	<!-- Hide from NPL --><th>Charges</th><!-- /Hide from NPL -->
      <th>Notes</th>
  	<th>&nbsp;</th>
***************
*** 24,27 ****
--- 26,30 ----
      <tr>
      <!-- /TMPL_IF -->
+ 		<td><!-- TMPL_VAR NAME="count" --></td>
        <td><!-- TMPL_VAR NAME="cardnumber" --> (<a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->" title="Issue to this Patron">Issue</a>)</td>
        <td><a class="searchresults" href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> </td>
***************
*** 29,33 ****
        <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></td>
        <td><!-- TMPL_VAR NAME="odissue" --></td>
! <!--       <td><!-- TMPL_VAR NAME="fines" --></td> -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
  	  <td><a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;modify=edit">Edit</a></td>
--- 32,36 ----
        <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></td>
        <td><!-- TMPL_VAR NAME="odissue" --></td>
! 		<!-- Hide from NPL --><td><!-- TMPL_VAR NAME="fines" --></td><!-- /Hide from NPL -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
  	  <td><a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;modify=edit">Edit</a></td>
***************
*** 35,39 ****
    <!-- /TMPL_LOOP -->
    <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
! </table></div>
  <div class="tabitem"><form action="/cgi-bin/koha/members/memberentry.pl" method="post"><input type="hidden" name="categorycode" value="" /><input type="hidden" name="actionType" value="Add" />
  	<input type="submit" class="submit" value="Add New Patron" /></form>
--- 38,43 ----
    <!-- /TMPL_LOOP -->
    <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
! </table>
! 
  <div class="tabitem"><form action="/cgi-bin/koha/members/memberentry.pl" method="post"><input type="hidden" name="categorycode" value="" /><input type="hidden" name="actionType" value="Add" />
  	<input type="submit" class="submit" value="Add New Patron" /></form>




From oleonard at users.sourceforge.net  Thu Jun 30 22:34:12 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:34:12 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member.tmpl,1.6,1.7
Message-ID: <E1Do5jg-0001KA-3e@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5053/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
	member.tmpl 
Log Message:
Synching with rel_2_2.

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/member.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** member.tmpl	2 May 2005 20:21:12 -0000	1.6
--- member.tmpl	30 Jun 2005 20:34:09 -0000	1.7
***************
*** 5,11 ****
  
  <div id="main">
! <div class="table"><table>
! 	<caption>Patron Search Results</caption>
    <tr>
      <th>Card</th>
      <th>Name</th>
--- 5,13 ----
  
  <div id="main">
!     <h3>Results for Search: <span class="ex"><!-- TMPL_VAR NAME="member" --></span></h3>
! 	<div class="results"><!-- TMPL_VAR Name ="numresults" --> patrons found.</div>
! <table>
    <tr>
+   	<th>&nbsp;</th>
      <th>Card</th>
      <th>Name</th>
***************
*** 13,17 ****
      <th>Address</th>
      <th>OD/Issues</th>
! <!--     <th>Charges</th> -->
      <th>Notes</th>
  	<th>&nbsp;</th>
--- 15,19 ----
      <th>Address</th>
      <th>OD/Issues</th>
! 	<!-- Hide from NPL --><th>Charges</th><!-- /Hide from NPL -->
      <th>Notes</th>
  	<th>&nbsp;</th>
***************
*** 24,27 ****
--- 26,30 ----
      <tr>
      <!-- /TMPL_IF -->
+ 		<td><!-- TMPL_VAR NAME="count" --></td>
        <td><!-- TMPL_VAR NAME="cardnumber" --> (<a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->" title="Issue to this Patron">Issue</a>)</td>
        <td><a class="searchresults" href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> </td>
***************
*** 29,33 ****
        <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></td>
        <td><!-- TMPL_VAR NAME="odissue" --></td>
! <!--       <td><!-- TMPL_VAR NAME="fines" --></td> -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
  	  <td><a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;modify=edit">Edit</a></td>
--- 32,36 ----
        <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></td>
        <td><!-- TMPL_VAR NAME="odissue" --></td>
! 		<!-- Hide from NPL --><td><!-- TMPL_VAR NAME="fines" --></td><!-- /Hide from NPL -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
  	  <td><a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;modify=edit">Edit</a></td>
***************
*** 35,39 ****
    <!-- /TMPL_LOOP -->
    <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
! </table></div>
  <div class="tabitem"><form action="/cgi-bin/koha/members/memberentry.pl" method="post"><input type="hidden" name="categorycode" value="" /><input type="hidden" name="actionType" value="Add" />
  	<input type="submit" class="submit" value="Add New Patron" /></form>
--- 38,43 ----
    <!-- /TMPL_LOOP -->
    <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
! </table>
! 
  <div class="tabitem"><form action="/cgi-bin/koha/members/memberentry.pl" method="post"><input type="hidden" name="categorycode" value="" /><input type="hidden" name="actionType" value="Add" />
  	<input type="submit" class="submit" value="Add New Patron" /></form>




From oleonard at users.sourceforge.net  Thu Jun 30 22:36:51 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:36:51 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members memberentry.tmpl,1.3.2.4,1.3.2.5
Message-ID: <E1Do5mF-0001hE-Fb@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6465/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
      Tag: rel_2_2
	memberentry.tmpl 
Log Message:
Synching with default template

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/memberentry.tmpl,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -C2 -r1.3.2.4 -r1.3.2.5
*** memberentry.tmpl	8 Jun 2005 20:36:30 -0000	1.3.2.4
--- memberentry.tmpl	30 Jun 2005 20:36:49 -0000	1.3.2.5
***************
*** 146,151 ****
  </table>
  <table><caption>Additional Fields</caption>
! 	<tr><th><label for="sort1">Sorting field 1</label></th><td><input type="text" id="sort1" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->"></td><td rowspan="2"><p>These fields are available for your own usage. They can be useful for statistical purposes</p></td></tr>
! 	<tr><th><label for="sort2">Sorting field 2</label></th><td><input type="text" id="sort2" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->"></td></tr>
  </table>
  </div>
--- 146,159 ----
  </table>
  <table><caption>Additional Fields</caption>
! 	<tr><th><label for="sort1">Sorting field 1</label></th><td><!-- TMPL_IF Name="CGIsort1" -->
! 						<!-- TMPL_VAR Name="CGIsort1" -->
! 					<!-- TMPL_ELSE -->
! 						<input type="text" name="sort1" id="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
! 					<!--/TMPL_IF --></td><td rowspan="2"><p>These fields are available for your own usage. They can be useful for statistical purposes</p></td></tr>
! 	<tr><th><label for="sort2">Sorting field 2</label></th><td><!-- TMPL_IF Name="CGIsort2" -->
! 						<!-- TMPL_VAR Name="CGIsort2" -->
! 					<!-- TMPL_ELSE -->
! 						<input type="text" name="sort2" id="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
! 					<!--/TMPL_IF --></td></tr>
  </table>
  </div>




From oleonard at users.sourceforge.net  Thu Jun 30 22:37:17 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:37:17 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members memberentry.tmpl,1.7,1.8
Message-ID: <E1Do5mf-0001kw-VT@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6642/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
	memberentry.tmpl 
Log Message:
Synching with rel_2_2.

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/memberentry.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** memberentry.tmpl	8 Jun 2005 20:36:32 -0000	1.7
--- memberentry.tmpl	30 Jun 2005 20:37:00 -0000	1.8
***************
*** 146,151 ****
  </table>
  <table><caption>Additional Fields</caption>
! 	<tr><th><label for="sort1">Sorting field 1</label></th><td><input type="text" id="sort1" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->"></td><td rowspan="2"><p>These fields are available for your own usage. They can be useful for statistical purposes</p></td></tr>
! 	<tr><th><label for="sort2">Sorting field 2</label></th><td><input type="text" id="sort2" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->"></td></tr>
  </table>
  </div>
--- 146,159 ----
  </table>
  <table><caption>Additional Fields</caption>
! 	<tr><th><label for="sort1">Sorting field 1</label></th><td><!-- TMPL_IF Name="CGIsort1" -->
! 						<!-- TMPL_VAR Name="CGIsort1" -->
! 					<!-- TMPL_ELSE -->
! 						<input type="text" name="sort1" id="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
! 					<!--/TMPL_IF --></td><td rowspan="2"><p>These fields are available for your own usage. They can be useful for statistical purposes</p></td></tr>
! 	<tr><th><label for="sort2">Sorting field 2</label></th><td><!-- TMPL_IF Name="CGIsort2" -->
! 						<!-- TMPL_VAR Name="CGIsort2" -->
! 					<!-- TMPL_ELSE -->
! 						<input type="text" name="sort2" id="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
! 					<!--/TMPL_IF --></td></tr>
  </table>
  </div>




From shedges at users.sourceforge.net  Mon Jun 13 12:28:58 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Mon, 13 Jun 2005 03:28:58 -0700
Subject: [Koha-cvs] CVS: koha-doc/fr/opac/CatKOHAimages image10.gif,NONE,1.1 image11.gif,NONE,1.1 image12.gif,NONE,1.1 image13.gif,NONE,1.1 image14.gif,NONE,1.1 image15.gif,NONE,1.1 image1.gif,NONE,1.1 image2.gif,NONE,1.1 image3.gif,NONE,1.1 image4.gif,NONE,1.1 image5.gif,NONE,1.1 image6.gif,NONE,1.1 image7.gif,NONE,1.1 image8.gif,NONE,1.1 image9.gif,NONE,1.1
Message-ID: <E1DhmBe-0004Ng-Ib@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/fr/opac/CatKOHAimages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16589/fr/opac/CatKOHAimages

Added Files:
	image10.gif image11.gif image12.gif image13.gif image14.gif 
	image15.gif image1.gif image2.gif image3.gif image4.gif 
	image5.gif image6.gif image7.gif image8.gif image9.gif 
Log Message:
images for CatKOHA.xml document

--- NEW FILE ---
GIF89a©

ð
-<?	>N>I%5A3;@7D;CD
BRGOKWO`Ud'DH(JW(RZ7IH9LU;QK7PV&Oa*Ve1N`5Vd(bp6am7gv@@ 	AKICNPBRHGWT@\dAkyEn‚o¢¥¯¯}¶¶xþˆ¸¸’¯³–º»¡º¼‹¾À—¼Â£¼Ã†Á¼™À¾ªÌ¼®Ô¿´×¼ŽÌÊ�ÍЋÐÍ�ÔÑ”ÌÍ–ÍИÍГÑΓÑÒ–ÓÙ•ÙÕšÑÓœÖØœÙÔ�ÛÚ—ÒâšÖãœÝãžàÖžáÝžãâ£È˧ÌѦÓÍ£ÓÓ£ÕÙ£ÚÕ£ÜÛªÔÓ«ÕÙ«ÙÖ«ÛÛ±ËʵÎÒ¸ÙÉ´ÚÚ¬Ìå¥Þà¥Ýì¯Óã«Ýá­Üì©Þð¶Ýâ­àϧàפáÝ©á׫âݬèݼâÍ´âÔ³âÝ·èÓ¼âÓ¼âݼèÕ¼èÝ¥âã¥åé¦èä¦êé«ää¬æè¬èå¬èè¥åó­äò­äø¬êð­èø¬ðí®òñ¯ôù²äâ±åé³éå²êê»ãâ»âèºéå»ëë°äñ±æú´íð²ëú¼ãñ»íñ¾éü³ñí¼ðá»ñí¼øî´òñ³ñøµøô¶ûø»òó¼õø»ùô¼ùúЦ�Ù·œÎ»³Ùº¦â¾©à¿°ÐÓžÌÍ¢ÉÇ·ÏѪÛìÛǶ×Ø©ÜÜ·Þà­Þà´èŬéʶêÓ»òË­ó̵òÒ­üؽâä­çéºîð¼òí½òô½ÂÙËÄÚÛ×ÊÀÛÙÄØÛÚÃÝâØÝåÁâÌÁãÒÍñÛ×æÇÙè×ÛôÌÝñÖÃèéÅìòÄñìÂóóÃõùÂùõÃûûÊóóÊõùËùöËüü×åçÕéõÕõåÔûûåÍÁë×ÆìÝÒúÚÅôÜÒëëÆëêÔíñÅéúÙûäÊûèÔúüÊüýÕçèéæëóêþâéùúöëçôíòýýã÷úùÿ
Ü
v«Ý´ÚrG˜¸Û&wÄdÛ­·Úf÷—våö®ºÛr;/tö*X\ºÊ½Û¯¡çÂKn¿6ŽfØ¿ƒ‘Û˜wñÖFˆátˆ+dÐN1ôt†abüêëq¿ãê;íÈ"ƒ‹¯·Ô"�mæáºßT·‚5Õ«ú�Eó}T!;ÌéUµz>ëL+2ßüsH�À

4Ý4
QÀB¢@…'P�
RxB«ðA(DÁ„(<¡
SȺ°…0|¡cHê�
7Ì¡	q˜BÚ°†@ü¡ÿƒ˜B>¡
$â—¨Ä&F
‰&¡AØ(žðˆM at C®Ð„&DaMØ®
R !ªPALr2ƒœ”B9Ê
–R”¢%;ùÉNZr
Tpea)K,Г¯Œ%.g©KLò²–d¥+KyAT~2
™Ì¤oiJT6Ó”¤Lå(WéI
Öò–¾´e/-MN
3ƒ „¦8EÙJpZ“”è§)U™Áj^0�ä´&&áÇTN¡p,‚²pÿµ
@mmhڒਉ!	MCÎ ªapÂÚp¶aDH¨ æ"t´u¨ 2XÏg†Ó�«Œ¥9³	Ne>1•àl§qéIjªž§$&Tç–Ð!’‹H]êTGT¡Õ¨ÂjP—: Õ¥.©‡°IP‰*ÕÖ5©J½ªVŸZÔ­Z•«FM]U¡Ö®R©K�êTœúÕ¨¶¬7é*YßêU¬²µ¬p…+TϺԛõ'}ÅUé:W¬•¯OÅkZÛ×´Zõ_Íêb™µˆŒ$‚±�˜*Zƒ:Œ@¶ª�elc½ÊW·Š5²jí*^·
V¤vÕ&vµkêЀ‰
ÿP�Ü`rH@â³·ì­p‡KÜâ÷¸ÈM®r—ËÜæ:÷¹Ð�®t§KÝêZw¸^¼îsqèÜìË-
ÀCz(Qðà'xÁ	` ^ôÊ`¡p!À	L(ä=ŒP%zµ‡D˜Bá Ã&6±X A2	*oqS 
"31…Mö ShÂ3iÄ‘‰>�¡MëD 2Ñ=ìa
À%|EìÁšèƒ„ù`
2b¾

=è!l¸„)ú°Ÿáù‚)ü€
,
«`ÂôÆQqÛª#
‹ð}ê!ª BA	rp‰ 
7�® }±31h°5
Á28§p™°h�	¼!grÀÄ[@	š‚Rq€ÈhÀ¼�	}¸TbˆVYv	Ý0Äb_u
Öh[žÀãˆ7�КPy'Š½
,ïñ*«w€5ѧÀx%¦ØÆØæÇxó…
~0bÆ
@ž@ç�š�	h †l°
˜
eÐnj ƒP_upŽ¯èÁxP&	P‹€iæÖ
Qð„ŒÝ€™c |u	Œ×„¢y‰€A%ŠT—€
�y	ëö
x0`õxfZ�	…�Æaôù»Ùö‰Ÿ²)‰
‘Y9Ñ„
›0ãŸAŒiu¡™Ebøù#JŒ© —@bZYPÁø)Š¶Yia¢0£š
Zv šŸŠ£QQ¡Á æ±›Ú2°)•ÅA¤“WiQ*Š2
<Š %úšš ŸôeÃãJ üy_³9:Cq€Ã‚u`[èp’Ó€7Ù”c0
Y 	ä`¶u}¸`¢uª¨šªªºª¬Úª®úª°«²zª:«¶z«¸š«Œåš0
­Ê
¬Ì`­Ø:¬Ö
¬Ëªך¬÷ÀË
ÙJ¬ËÚ®ë
®ÇŠ­Ö*­Ç:¯Õ¬íú­Ä
¯ßZ¯Òš¬Ãz
+°þz­¯ÁÊ®óª¬ój®îº®
›°á:¬Øš­Âº°æ®Úª±òº¯
Û±ó
¯
[¯
;­Äº+²+¬Û¬øú¯[°+®‹± ÿ±3‹³#‹²õÚ³K¬Ê ®àŠ³íú³à£�ð«Êªè€Ò�P{kùpk, ÆêϪ³K¬ð 

³Úê®+;Ç¿:ÅÙ›¿êz¸â
²+ÉA‹±=›®÷@ˆœ®æZ±³;»ö
Ë‹µƒÜ¶ð 
fg~
l€så
…-J;…„PÅ
…nöÞ=q	~@Ü=bé=›æ�ß#FPˆd
1Üø�”gßúgß=Aà
1’þß7vcÂÝàÜ=ßÎßòÝÞê}ßåaÜù-ÜÁ
”2èfòÝM–ß8—àÎßÅ]â>b.b
ÁÝæÍâ"æ† ÜÜ}ãö]ß0þß;nãNà9ä8ŽàDÞãîãî½ãEnÜFŽãNäGåJžäL~ß»B	�˜kø€ý€¶öû�k�€	•‹_
	�@	� ½†xàO

ywî!,þ±_‘746SîQnv5³+ñ!ÄòušŠ2cv²H3²hwêQéñ!,`!4W÷*‚’鲚F£u¦>êp˜ŠøÑ43‚çéJqw™õ]±®ua‘+ã…êŸNwË^®Žw¼nvcW+ªì´nê4¼²Ýž,U^ýÁŸ kçÞñêÉf›	9xS±‡TÚŒf_Cxq(‚Ø¡P˜@
Ô9凶I^¤ ïq5	¯	h {À{x€f0„ HŠ‰x	¯	ý¾zZzÈ™œåðß�
‡x¨	® ›¡ "ÿ/ï&�KØèpX®@€S¡
X'g§
Aó;(Ú—�è¹»!¡róCñ©±¤
H¸+Yp�žÃ™ÁÙðAóˆñч ¯	éG+03r@‡h ®P‚1ïð;…‹ð
‡�éø‡àó03„f-ãT"ð+Èsè	}gÅuЮ­SŠõ%ôg·3‚÷ ÊùŠØ#371xà	•ç4*¦•t"	Ê-
UÑ„—\Á‚”EÊcD64H‘�PA/&ùäEJêÐÄ­ý~2HñÚ³1¾ð„2. }”.þø‹É…ôÑC)ƒ´ÑG뢼2H˜
är¿÷Üsë
Mt+Ì$a²îÈ5‡üÑÍ-±s±áÔ2¼9ÕÜ�ŒrÎF¬ðC%ÿ÷2>
„3Ì@kT¯O+÷<1ë0¹�F¸Q¤ÓNýó�»|Ú(B€
 ¬@:a#ŒÆÁ«�L°0'‰ÒxJ€
‰Oœßi¸Œöé°ŽMä^÷¸×ÞŽTÌcõÈÅ'ò±†¼b»ÇG Ò‘‚œ_ƒøF#Ö�‘9¼Ç2ˆHÉ"Ê°Š‘Ì$§Çf’’‡„£9iÇQ†²�£œ¢!ó8ÈAð’°¼å#yC?ø¡ƒÀ`åÈC÷9“ö`a-(€`æ’ŽÅd&
 ÈìÑÿÐ�Åt`k˜L>
 ÑÌž!ƒY¿R
0{õp`3,¨=6æO
@�îùóž
�&·	 ÓŸ÷˜‡6¯Y at eÀo�`÷8ÊÌNPÑä^ö.è¿zìÔ¦îÄh
Ä8£¨PXîR†_…dé‘Dy‘‹gÕ^5YINær¢¨Dd
ªºJTµ«Kä##9IGYvOo¼GU÷(Ãi&R�§,è+)?9R–ÿö`Æ
#[ÊĉœôccÊÀZtˆÇD¬%õ™ÄÉ’s�y”*\9ÙWíѱ‡žÌë=R‹È¹v¯¶ñ¸‡RåÇQ{À¦Y­ì]�ˆÍÎ/œþËieúÎy›
ì<1]múÂ-fÿiC
úßL.N
pR=ú‚P/MiCÇ>’�mPq&V{|dÆ;ÛñÞúc€þà¨
€F3¢\4o÷JzÓÒC©ÉÌI_øÔ	öƒñØ'"øÌ	L©Jm{Ïs2�£*–ÿ1!�ëÜb0{¾.fñhCmW±ªíãmXW-+’YFd	kÙÉ޵̒ܲ(7ÙÊ/_6•„¤l-áœÃ¢†uÊGõêœuéeÀZ“Í ÄæÙÇ1O¹“�d¥$§LË2U—rþrOÇìH9?
r�%´pWÁ!?‹xÉK@͈:Ø
Ô¦.õ©�S³ºÔ®¶ƒKH=ëðÔá-¶žõ>mëR§Úר6õ¬aëC›×âµ~­êT³zÕÊÎ
´a�Ÿd3Ø£nÑ[ä mn›zÔ½¾ö²Ånr[ÛÜã>÷¬‹½,„â”ÈÂ"B¡'H@âiÊ#$qˆU`!MéÃ!ÿ>p�<àÔ&u¸g½ìo£šÔßþô"¾‡«<à‡@O~
3†ÖóÜÀº³ÀÖcÀÖ£
¨¿×KÂÀþ{=w Á>4†ßKÁÖs„ÃLÁúó¿ÿ[‡†dغaˆˆ@P”8ñ˜A’(ñ“ý�¾“#™—¡™èc>	™#!�ù—'Y‘bëì)€xøÂþƒÆwè~hvh~¸…wh‡mÜÆhÔFzhpG|Fo4ÇsDÇs„À/dGmäFmLÇx”ÇsÔBo¬GMô¿|\À}ÌÇy„ÆräÇnLÅþ+Gs\‡wAxôÇt|=ü«‡vøZØ™4XŠÿÀX„^ÒƒSP
…Ð	uPÙ¨ÙÐPôPÿѵ}P=ÐEеP
½ÐÅPuÐP[P
MÑUÑEÑEÐ-Ñ
°ˆRÀ„ÿ	P™0ÒüÄ8
ÖX
4‡ÿLÐç>Hôø�™M”Lˆòˆg¦å8ß‚V å|CkMÀW�cœ˜ë°Žòèó:¸WØUx�A	ƒDeJðsM …:À‚-çׄms‹òð�‰ætñh0À
J˜·ExØ(‘˜¸ô Jˆ‹AÁ4PQf"‘N_‘‘Éò
ÕFódLpÀ9pLÞE‡ÿ€Îõ:
«Æ‹ƒ¸„šÀé Šó6,8ƒà
‹�Lðƒü]¨ÝÔÏ¢,úeÔ_ýÔ¿ú«ýÖýÙ‡}Õ‡
ÿÔ—}Ý73æÚ÷}Õ?}ÖþÞ_}×þØ÷}¨¨}äŸ}Ö‡~ßÿ}æw~ã¯~åÇþâW~aÎþè~aÖ~á¿þáÏ}aFþÓïýÝ7ýïÇýæ'~ðÿ~Þ—ýÐ}„G�g©>0„�N·xægˆK™5º„
6;vna¹rÝV|¸pZ¸|6ì·råÇ�)?f<X/çÄu÷%»²c͉;Sf¬V¬&8
&Xåÿ€'ÞÆÏ~ÇÍ_xKÚ7av·Õ¤‹e†i_Öq¹ßšWfGvò�xyrÚ#’&›L§œ?äó>ÿ(Ú�¢Š¦ðÏqÉQ9i‚ð$¨£=Ì\Ê\�:6·’m®÷$’WÊž�Ë5#"
$Ú¦_�ËTzå=íy�<÷CŸŽšÞÃ!{D*Hbx°’·ª¯EÚf=]Þê=úá×áqúýz&môxw*´W^Zæ‹2g^xI’÷¤Ÿ´Y_¹Þ"Y¤uÊ<™ ¬.«,ª¥Þ#ß²÷0ùëq[î»ê¥E{3Ú!I/�ÔaZ�‚Ãsp‚k
0Ûªû"Lk�"Ζá–ý6·ž±Ê-BÉÿ"�Êi�Tº;c¿ËR¤2
|eÀõ­{�
Œ§3Z€'’ÑM7­uuV×ó�aÞf]ÏÊÆÜ2Á-sz1
`-àÕ¦
,d¢ªX0Å*b�KèòMP%2L ,©)ÿ#šV‘Ôe±iM
–¶¾5¦m]GñZÓœ ­e�kNP¦×µÖ¯xm#‹×²þ"råîÈÊֵε²eE¬[kº»¶¯M,ZkלÈõ®‹,c÷–Ò~6°oík_qGYÆâõ±q5,#^›[Í¢L²³•+mÏZÚÔšµ²„Å-j�«WåÂv¸Ìýko{[ÚÒ®õ¬9F
@ˆ½”èÈG?ÂÛ(EíÃ’ÀÄ%^Ó”|–ˆPDo1±‰@x0HO


láûepˆ�Â=p&à€o ¢lèÄ�	-x£X‡8¨JéL\¥{0…ö�	Sèa	„§Mq†Kô�,!9D#r¢‰),`Ñdh„7ÑàLì�ÕoaC#´`Q…ôÁ¢}ØD
4h"Ófu&2ÁˆC脾¸ƒÉŽ$˜cÞð
šØ‚¡vJ]$C�¶à
L$@
˜ø©“…C l�õ^pê
2l·'þà
tÔHv¸h"Å'|ÒJz6ÿ>é
!i‘.©ƒ6)“>©“&i’
”Vi”©’^©–Zi–Ó–~©•zi¿ì•ÊP‡É•(Ë©ì¹ÌAOùø‘ªŠsœ©íÌ MJxR©|º¿œ©ñ)ìXÏë°Ðz2T¢Ò'Š\ŠôÐÒ ¾ŽwÞiå�¢ixdŒ?<ê+j0íÏ¢BñdM}†�·j0Ý©]‰ß$ÔuвœEÕ†øA&â©–P	røR}Ë‹ºÈ{¤“ÒzúGÜ	
‘‰§TJù”Š} êwé28­ÉPÐÞP+
“ÿ-ô|LÄNÒy.Q…¬zœÉºâÌýP+<¼hê†É¹>̪¤¹kÀxN�dß@@iŒén­§ÚƒÍ¾+ÄJÀ.˜®±ð̦4C
XG®
7¹,I1áÁi0Kº™ÆÍãΚ,eª¤x
ŽBp8uKcÎ¥D‹H•É´¨ÿQ¢=¤¸­!d0P×£1áÄ$HÁ²Gͦ:‘âJ¡/á‘	ONàœH¢´ˆÑ¢½Œöb
̈0àK�ÿþ%¬x‘¦¾�_*¼HraÀùBf¤)sfÂ�0cÆÔwôbJ”°ˆƒéÐ"<˜ðØ©cçRí®·qãîhQn߸{ûùý{÷î®Åo÷¹Ô;÷næáG÷�<PŸLÕ]Ò]]»tìϱ7J¾<9oï�„çN¼{ðòÆ››÷îü<ôë]××//~;ýçkƒÃ¶î|ë¾®lC0»ø°+.?áà#ð6í´+®«»°ºüÔ°«E�-€8ʈ‹O¬U\1E]dÿÑE*Pl±ÆiT1Çy|‘GeœñG!�²È#�rÇ[¤‹%“,2JodòÅ ­„É-§|rJ.o¼ÒG(¡ÓJ$Q4“G(±rM/ÓÄQË9¹”ÑI/ÛLÒÄ,ÛlQ
,4Ñ„;c
)¤¨"Ñ*…‚ÑG!�TÒI)­ÔÒK1ÍTÓIåtÓOA
UÔQI-R(¬èTÒNS5ÕÕPY…B
TU}5T4ä�ÕÔ�ƒ0É0áKØ¿„}¬Øc�MÙe•m–Ùg��Úi¥­–Úk­ÍÛmµí–Ûo½
ÜqÅ-—\hO[¤Ž
yå…^|ùÝÿÑ{óÅW_�	Øà‚>Xá„	†8àƒïõ·âŠ÷�â�#8ã�?¾¸_�ùíWdIîøä•£˜Âå—aŽyŠ(T)ŠH£f1êøÁÐ)Z6b‘"ŽBŒ
2`WŒ$àuùD¢e>ÔàŽÇÖØcDÉF˜e‹KÞׯ:	À,28Š'ÜmBï&òæÛow
ÿ[ð¾÷ö»p½	ß;qÄg¼ñÅ
?<ñÉ%¯¼ïÀ1\sÈ9o<òÂw<òÌIלñÒQÿ\ñÕS·`¾Ý�wÞ(
z0�<Ì%Tˆ	ðƒá÷WÀ
P„t¡ýxB:p‚9D C
ð…1œ¡—,Ú�0´ŸÁ	M„Sx�"½
°a
)�¢áu¸„jØ ÏFX°¡�ðÀˆØÄæ8-$#ìPÿ¬:Tk¨çŠV³Ì•­dý”©ÅjêR�Õ¤+¨ÈêQ±®«µªLÝ*a®êTdª`}LX!ÃU¾uªÝúéZÏjV·ª¨™a+³ŠÊ	<p‚Â3BÄ01VSìaÛ0†#Œam0‚ï+ØÁN–²•µìe1›YÍn–³�õìgAZÑŽ–´¥5íiQ›ZÕ®ö³‚’C@Á€D­¡ímo{‰F
c
ß@Š7Øà‰E|£pÀÃÒÐ
¤‰!ÞXCö�†@
‰xïH
Ž1pž C&¼a=
8bl°ŽvÆ!Ot›Ð	41opƒ'x Å"° Šo™Èl ñ8â" X^f£+:Q—5xc9‡ØŠÅÐ	E§!
å8*Öp	oh¢~`C Pñ�#{Ã
 Ã¥=q†LLÃ
eA
(qG)æŠ)Í_Ð Ž:¨á”á†Ò€Š=PÂÂ5ÊP6|œ
®øBĉ:l˜ÕǾßsôa
ßÄ×=�s\bšÈÄ<�MrŒáž€CõÙ@è5PZŒ�DÐ@Ä€hÃ6
ê+Ì`º�
¾.¾a
ÐËö ü`Ná	Î`èÏÿØ€öÀ¡¶Jâ`Ä
*Æà¾AR�6á½AåÌ¡
¦áìŒ
Ø (°èàÐ`Ò Å.¡	Æ�8¡DŒ2ö .ÔÀŠŽRá
RaÈÀ<�˲¢Ó`2�óþŽò"
%óz­3J£2
1~�¦J£3ì0ב/:�/’+ü@
�‹
öB�3L°Àá8CPN�^K‘B
0zo¡D¾Þ€ìÀ ùBa!!ÂàFa4Š‘zï½CÁÚ‘ûgåAÅ�
Œð0Ž-ôTÒX¯%-ãñ,£ñ&)A2j²×à×Î04Úp¶r2Do/~r4ˆ¥Ù$4 Ïo+Ï¯ò4r’ò@1£0!
ö‡
å5�6C]\aä@² Pú
Œ
j¦ÔÀ¾áÂBˆ\!¶o
0Aû|E˜ô°)P°@4�ÿjÕ˾Ží`
Ü€à fj†
È
ÆÒ#
L�j†ÔáZ7ÁdZƒG�Höh²Æ7í6ÇLcSÊUΕ3b³¾Ä`–3
`�IÙó̓¦n’Ä`ÔÀÔ
ÂÁ°àÑ°@:ÐÈ€+0O�8ÓÈÿš t“²Ë÷·AÅÔ (X¢

ZC<Á¢àV¾aø>L
~ùÀü—3eš °201Xê±{Ã×Âá„ÐàÒ.Áú
�
¬Sˆ
e:¡øØàN[#Om9ˆÒOIã&³�,ë‡
0£¾ÜOÜï/”Ñ#X	ÃW(AsÏp/èU³ [#]ú"¾âk/fÓs{÷ÐÐ`XÊs‰‘

¶
Hh¯n¸{¹°2ô~¯�cÞVä
À"ZH!qá@¿�ð­WXÔát6Ñ  sû>ÁFáÍTA
–·@ˆÙÀGrÒ=A
º
ßó?_ï•¡ð?àq_òϾï5ÿ:¿ò
€ñï!õ
ßøÿ>ó‘ÿò{¿ñ‹ß‚Áò%ŸöÿÞ_ô•§
½·TEôT¤é‡ìxçÜŽÙ!‡V[-R§cSI¢e›}—ñf˜g÷\²ÈK°¡¤‚)›Ã
+ä�‚ÊöÓ�ŽCÿqØb(=d¤=ÌtGT3¦‘Òz×Æf�iCiTîiÁƒ"IÔjÛ‘F}rØÞH÷€Ô�B±E¯¾‘†ÔÑ@Ùv�µÇ×Þ¶ñEJ�BÝEº�Dl1”Œ=ÿ2Ôg3Á´‘@Fá¦ï»'´�|
¬ÒBѾÉàxï@À8tñ=Êd«½‘ÖÌŸÅ"ý‹rHêƶò@é¡D¡
)ÃÓ$	‡CFI,±JänkÐ"�PˆƒÑu®tÑËòE™;’tÒm\Ò¾Ñ
ÆÖDNßëîi#eD‘Û!73vtèv×L
Íè;ñ»uGü-]tÙFWÎ~Æ,’¹ÁŒC׫UÎÅt™¸–ÿÀtå6G¤QÅ"!f±Î8Ú#x½îNäÛ„ÓMî@l§íw!=9µõY9ÈfGyIÒiäÑJ«{$µà–Gd¶
`$e›ÞØ?yMGÏѹý••=ÏmH‘£(C+ë’h
x�¯\	1‹¹¤ÔYÎPÁÎh¤w0{ˆÆ)¡�hòÇ }$m"‘
èc 
h&Û¨E ”ùÇ&Q·Â£ €”QÆ
•¢Å’°q}caIF$
[¼ªrªˆÑ/W±MÓ
`-…u’Tƒ"#òÈ¥¬q†»ÚT=¦ÖÌM‡?ëkNÛ–/›5C0bÓ
)r�\„)ÑÚŠ(ï±*¡œäh �!Ò@��eå-¿ !ÇFÕž»ìq�ÚyQU¨Ub’œªISø±>¬mê-[™Ó‰¢Á
iI&º>ErL$
R¬µr•ƒóã�BT<ܘ){Q@Óå?­ècºER*Y)æ�Âù´À	‘c”_7‡í±ì#°±ÝP�ÃmÿñC"ÕOËh\X1Éœ‰C
4ìA[X#¦Œ	ßS¢ö¾ÿ=#|�üßßøǾñŸ|ãÿñÎüñï|ç3bøÓþñƒ¿üïooùÅ÷ý%”üó×üÅWÿó™üò'Ÿüׯÿ÷·�üêÛùà‡ù©,ÿ}ÖgÊ·å§|í—~Ì}Œp~x}Áç}}Ô÷µç~	È-ñ€è€÷'�Þ'~â'€8‚ø×€!Ø€'¸€ê�È��°�Ð@ê& Ò�
ñÀƒ¼$nû0”p	—ÀŠpŠ@	�À„”€}e°›
�€	„
šÀuà	ž€	epyl{ž°‘œð
u§	u€	’·؇h
XÀ
a
[ 	)
z‹ð
x¢¨ç	,ŠS𘥷5šÉ™µw‡€¡€	.¡	—ðz!Z$º°pÜ“¢p·®pZК€¢pW‡ðzµ'yªÀlX 
¦`¢ª€¯‹®€š£À¤Nº5`ðz’W{°øxh°O
¾ç
ñÇ RZ”Ф˜P‡ðš‡°©‰	¡ z®Wr`h`�ê
uÀœÚç
Rz©‹@
‹@¨
Z°¢˜@cðz
ˆ™èÿ
e@
4:})Š	® Åç®p¢Y€¤@
ž�¢·eÀ	— š˜
[ 
}P°ç¤Ûó
[à•Ìv‰pyÊlh
’
dÊ ®ð
žÀ¹§	ªÀyª •p±àT`
¦
g 
2tÛ
ˆ	yugy—P 	S
gÐ	°�à	týI�
Y0zu

F0
c X°

�¬l°	lp	ê
Ë
Œ€{‹À	0Èk€
m¹'û
WŒ³ß`j€	0ê 	1
{­ÇžI¿Ü‘ÚzàðÂÜ`‘eÀž°	P¶Þ@˜Þ°ê0—ÐŒÁØŸSÀ
Ó` ›` c0
Ý` œð	j`¤ð‡
€Ý ®dÀÁæ
Q`¡PzRJÌ“úyƒz>j˜Ð
Ø
h€
Xgð
›Ð#ÜgÀ�°Â"Ìÿ»©{Ë}0~BXwxp
eÖâX�â ¯)ƒ”`‹à	AH¸§™{uç	ºÊA|za}›ª™š€ÄÜ”±•�¥Yðyj`@Íuð
·{p{ŒI
“JÍœŠ§r€‡ ªc€	f y’WÙkÊ¡íÖ¾¼£ÃŒ›W|g¥rð‡Ýà¿}j½-	¡ ¡Ð—g�÷	u÷	Œ€̦¥)Ú‘Õ:ea- É â°fÐ
•‡ÿßu°Q
�ÊçÄl°�°»ˆ
u šf 
9ݚнŒؘ°Ó‡ð
Ÿ—©G	¦P—€Ø™'Œ¨Wz¦—¡?Šà ¢W­¤«v7¨îº£Ü·¬¯`–eª¨žP™ y3ýሠ	a�0è
�
ª€}¦
±ŸŒU½~Ë€@Ìl›{‰ªä»l
~°Ðkª:žÉ©ê°h,1ºl€æй™Ë:î	³g¢Ä÷»žÀ®¨—܉ž¢®g¡â°¬ˆº›ChÇÏ]Çå—–Í9ˆSVÞŠ0©ÿŠšØœOIµ)ê¬è“¦“6ëè�Q‹ÁÇŠ‰H�å)‹ NëÈ9eŸè¦ŽXùY�ïw�™È“ÂŒß9�ß	ëÇþ�ŠÈ–8¼=çW€“h�¶~	dN“^£DÍ
0‘dÛ³…{„°
X’x�´ø|h§ñ)•­Ž�;¹ñ2	€*Ùí±}Ü)~Ü)‰¸i›Õiëµ÷{
x›Ì‰”¾ž.™ò¢îó;i�›^îiì#™Œ¼x�ÅØñÒ÷ì
Èÿ|fùé¿©–ØØl£èŸ+›œî°=܇lMó÷Œ}ØPi€Ê‰µ_h '{
ýÙ	¦¼ð£|Ì´›»šðR
jp‘À‚	䯚Ç�
™[ßð
g
Ì€2c¦?ÿ
„ÇÂ	;5
ÿ+nÂÕTóÐÅc„qFû«ñE_¼‘F{”qGƒÜqH!‹”G"[T’Ç�dÒC"›”rF(!¼JBLëÏŸÎÁçK|úó2U؇9«TíÁ{

<þ°É¬Ù³’G\é@ª¦¨Ü”—;ÏÖms�ý[ŠÄzÖÁ¦¦N\ÿ-U
4¼ô]“ÅPƒÙ®ìÌv+@¦ €>f&¨dV¬d92¿ÒSx¦iG¥êáÆm1P	jóNS©9ÙR7Â1�¦Fã"ý<R|[³Só$pÈÏ´	•Ò,±ÆD3�C¢°«Ð<.šª$wíoœ�t¬–ì{\	ç�P½m“¾^h×£±šñûâó¶Z6îHã»Ûß°æQË…ZfFÿ¤/"û£¦@sœ
mCë}žFFBê’ÇÊá2d˜™-óÏs´N”§Wˆo|ëX¤„É ýî¸þ5Üj>™®
=²¬¼gxýmÕ¨.CXëu7±ýø@À~cI“!{
€5ØC‹T¢xŒ§x¹¥‹¡x	¤ 	— Íª°Í–ÀMÙ¼ÍØDÅ•èŃ	70€^øL£¤‡bˆI�M²\ÊÐÜÊ�\ʯJ­ÜÉ«”ËbÿpKzPNœ\˨lÌbèθ´L¾Íbp‡ôüL¯”Îê<O¸¬å¼JÈ$Ïö|O÷4ÏüœÌýÊbÏ®tL�„K"„C8Ç;…²ã
 
†
Ë)E%[pËcOv€6ÀƒÀp‹—�E»Œì[‹¦³‹°èH•Ø‰�œV¬¨Hkå¼É¨ƒ”p…R·tÉzxUeU—TF K±TK˜t‡SUWx%Ô1MWxUך”Ó5UUzðÌì¼ÊzýW€…IU�É€-XeÒa¨sUWcPÆ%Ô‚]×5�Xx…NŠeR
@ÕwHXà‡a 
X[jŒ€é5UÛõÅ—üZžÔÕÚ%†U†ÇíI�©0eš\
°X»5Š³@Û«àx¼`…Öž8¿Eèƒ,�‡whIOM˜Ruݵá—MX·%h‡È
F�ÉÚ¦
Ì“	´èŠÇÀM¨%ÚÉ(V	´óôÀÇ–üßîäÉE•
øÚÊ\£Œ€Îä‡[ˆ€¼¤ÜT×w¸…
˜:!†îŒ
#„¹€à£d¦dUvHX€Îæ5~K¯åZ:QHU…ÞzÎZ<¾ÛZ¸ãs­Eõã~uW^èÎ(nÉqÓŵES„=T`eUÖ’:˜èؽàX´kŒH½Ú¡è‹M„œaJ–Ð7}KÍôß…åI€KöL‡êÉFJ.FcTõɇ}i]åÉKÏ~˱TF˜íÉ„ÕÕ˜í̆•X.׉ÝÉC
Íž´]‰aˆ½ÊT–mµ4YÙžã'^ÙÝNãÅL×Uí–K0fdc(ê©•
Ä‹f°<YÓ.S†<HÆÿ\ÈÆmÿ¥i±ìcå¾NHk¤´ìêL×ÈNʼÄZ
€ëî
Y|ïd.Ú
É­ðcžÉ¼˜ÍžF`…& MØ
ÈbMf R}Ê?vNº|ð®dSºQ³üJ·ð–¤N<]W^ÅP
ŸðûŒK
ÏðËÄpw €_ėmP¿ä
¿`Š¦‹UÌÍ
žVpŸòÀЋ“˜F¨pÀ‚N>H®
8È„|Gƒ>€ƒM¸„@€ƒE„>ÀƒÇƒK@ø„G=…ox<¨<€<`ƒˆ¯x=x‰Ïx‹ßøŒ—ø‚¯ƒ:¸6€Œ_�‡xŠOù‰ÿ_y•oy–yŠ‡xƒ§xƒ·<°ƒK�xˆG½>¸„‚ïy6Èù�Ç çx£—x„?ø„ǃE`ú¤G=‘0ø½{x„ß88ƒÿ÷œ?ú�Oúˆ'yŒ÷†ˆ÷„K O8ƒS؃Eð5à‘g‘€oHÍ{¿÷„oz¼¯ƒžïƒ�ÿ`Ÿïû½‡Áÿz®Gùœgø@˜x“¯ƒ‹'øªØ»½ÓŠï; –X9Ôs9ÔË|Îç|ÍßüÏÇ|Íw9Ò}Ï/ýÎ}ÓýÎÇ|Ö}LðLà„ ‚1ƒ)1Þ×}18ß~á×}%
,x‘¢C‰5
ܨÏâƈ/ò³râʈ/[–ü¸1ãÎ�ö8M™1hÈ›;cÿö¬š3ëÕ®K6=9ñeÁ•WGžÝçôçF­9ç¶l¹víC’�>Äz¶îß»…cÎÝÜstÚ´/+¯=|9ó>‰PwV{¹ðײ£#ÎÞHý¢ÃÙCWL¼}êÅ~%â>œq|Åž}Û÷zŒ·&uÔÑM
\ èÀB0‚tÿdÁ
R0	F
N0Š¤Ïø× Œ‰d$'AÉ»¨Å.‚1Œ[¼ØIȈ-š1�h\cÙxÆ6Âñ�r$É¿èE0Ú‘ŽcÌ£ûØE5Æ�rdÅÈG?†ñ�ˆ#!‰G=žd$’¤ãÄ
X Ã%`„
`b
+Ù=q

2ƒ°P# 
—TÈÚpI8¤

¦#[šŠF4²�·lKÛwËF!ñ‚÷¼áýázËÆ^ôº¾íeï{é+ß÷Z½ê5ïØ.6’±Õ½ö5[S$_õx¾ì-o‚÷‹_þM
]°|Çû]’tͽPðyxòÖWM
`ˆÐ!	¨
^‚`B1LÁ‹(‚>Ù…&4
$ŒƒâP:ÿD�!Zù³&ôAˆb ƒÊàÙ,Ô¡	EÈ›Âæ^”8¾ë¥ï…¬eñJ
˜†oÓ@ŒaÿÐnqë�&¦)8J0ÎrŽ3Þâlç9Ëy¦žéÜç¼ýù΂4¡mè9+Ïu–ó¢­ç8?š�
,À¨Ó#Ä%ö€
2ÂgÈÞ¶E‰PP"ŒÞö�']iEËYÓvNµ£ÿ<êK:Õ⦦޶‹E°Õcòž7½ë}¤�Õ;ÿßöÖw¾ÁÆïyûûßwoöïñ;à	8Ãå�o‡[hkúV8Å
N¦°ÑÛ#ÍݸGð"#,”!
F PŽ‹Ð*SäÁqpÜ$œ!
HØxbR 6�
¯Å@n-4A#òø’6¾q…g¬ßk8Ä~ð¯�hÒÛúÙŒš…EQ
€Nð°Ö¸u
Z{¢ÊLHPìaNT˜Ÿàu¯GAíd_;ÝÙn÷³¿]€À¼{¾…³Û]í�Š{×ñŠcI‰}ð8^;0ö¯7ìcOûØ#_wÈ÷}ìUÐzä-�ö¹“ý#Š_<èËwÇçýì}_½ÛÙnø»w=ì—ÿ2;í÷~©¾Kxò· Ë]¾ò½÷Þê.·½Ë7Ï{Ó×Þìiß»Ü/…'ÜR‰_ùÚ7¿uHmþòÌO”õ	Ÿûíû]€Z�Z·ú­Àh•Z,]„ú»µÕ÷»?þðŸÿJå_úãßþæ_¿þû_Íü ýù_ÿ
`
d at VGABÇAdB"äB*dÿCjGC2dDB¤A¤>>$fTdFjd>NdDnäGþ£@Ï
�t‚,i¨’LÏ�'¨C*ùÖô8iJæ
JŠ«�œä¸ž«¹–+¹êÎá λêO‡¦ëX«»Æ«½âk½êë½ê+»º»â¨I
l»lî¬ÁìÁ¬ÿî\cdB
À>œ­dJr&pƒ*	©*áAx‚|f¨7@ªœ>)BÍ>ÃÍ&ÀÌiÎ’�:�Ò3à

¯í¦îÝÔ�ï*lî¶nóÊ®óº.ôJïóºÃ2ƒJÓ' È	 %ÆöÃÅf,ǺÀÜ
&„¬‰*BJ–ìÝàAÊ®ªš@àä}ÂÓÊé¯r‚Ìöè4¨!(ÔB¨¬ÌÒéÔl,‚kb‚
ãÁÎ^’7`kp¢
%,%°ÁôpBwm
°åÅú?øÃ?pò>ˆ
#<²o
2ô¼{‹/µírèJíâ´‹Bø‰5#àG~çù˜Bw�41Bÿ(Di)Š&{øÁ H²@Yb(B:­dĈu†&®ÎùxBë>L<š#œƒ2ÞhwpB„&‚b{
"ÈÁ*„ËÁÂ%p)|-&�³c‚¬$‚¤$)@�‚)ì
Ÿ%úƒ&B¢!ˆul�Bjz9ÞÄcµ¤±f·&xªRt)­cçJšo—w9œÁÔ>Íyî;9qJ#H˜+B%„�"(B(8ŒÊÃYüÀüÁ3‚�hØ�‰*6ÔM›yâeô…û;;º™ˆ†;�ª8‹/N®#ÞœOãï" /¾�¬¤ç³ã&jâ%ÎNR“ÙËèê,ò‰þMêË;;¦ñÿêN쵡d;& Y='‚Žè+åK’¾Õ+‡&˜s¹«nœÅ�îÛxµé‹$k„ˆ8Á›ŠíØú5‚b6ƒ¾¬f/Bx{öUúApÓ²˜N)¸w,ìex³î˜
ÔOA;@ TkÛÚRP@7lB7<{
°©û¥KŒÀB™
E“M¼!¤
<(ã”ÝH­-ŒÔ·΀¥c‹0Ãå¬Ø*œDM4qCŽ_s’á
råG_ò$�2HÃnæò&
£WºÏiÍù®ŒTª2èsÜ¡UÖ/�‰�7€Aà Ä›iqÒ�Ú/YÛY	!
uO@/‡‚Éc°�
ö
`

p€AüxÃZCá<!7T`�(Ã}ÖpŠ¤=(BxŠ
t’¡¨qh!”ÀCÕ¸r5JLCÉ©Ã%n´>W‰ÇIÓx
G%áF°"Â`q‚ÝX
÷4G¯DX ˆÅªB‘Kp¥$‚C7)Brãœxå%ð�Ài¬-}ÈÄ�ð�M4â:½|Àñ,h"—ØÃ}¾V†oüýC&‚õ2ñ¡Tp@£“Ü¥¦Ð�{Ýpƒ
¢=hΠ$ã°KHp˜•Üx2̨.XH…ð#/<<²ÄáÒt¤œAgØC8°ðÏYÍÈá êš Í·™BÿH‚4;ˆ(2˜cB‰Ò°†r
,˜CBâ„,"	JÔÁlrJ&4ч2Da
!+Ò�Å
#2!Õ*„!ÑÄ!°°
¢6eˆLg˸Ãû:›ªBCb$¥ºÉÓJˆfÞ-ØØ‚”ìðHA
8
.:‚±Ùºlûd*#FÁoJ�Sþ10¤
3oˆxÎÒ(AdŽÛR/9$q*ÆÖÌ¢ >oD!Ð)@q>®jì"ÿã:¸cˆþ¦2á*ªðüÆø¨¢+1:'ó´à4EL§"Ý� •F
5!ÑÀ<­ ,'ÆÀ"dj£ HDf�V±Ù‚Qìn਑Àä�#äTá0z	­¦æ×æ(pÎÐ1ä8o"#B*Ø"¹ÂAÁ;!:›&ÄIM
͂˺£jêÏ+ÍI
˜ÇVÊ
`œ(7<¡;è
%¾ŠPÆÀ$૾
„Pâ$`¡	Ì¡®é¼Ná�’ï
K.iìð
Ó�2ð³1“Ô2ÿ0�l±Ëo2)Q2'232ÇÎä8S4G34Eó
7s1S2Q“1¹Â03ó) ó4ßí
£†0m11m’6¯ƒ4{“17s0GÓ3a“1	I<v#Lî
‘BLªFª&D�
A
|­°@ÔF§Ð!º
© ¤¾
€Èá‰V,5`‡�ȉºAfÎâ`féaªÒàmTâ�B¬�šNÈ,`m ÄIï�üˆ9)‘9™3C
%Vn˜tƒ/XÎÖm.…�Ö`à†
¼
‹ŠjR.¡å‚$Dàf/È Qj¦�
…œ¥ ’¢}xQ§˜	!6¡¤Ø@Ê`\å^ˆÉFÒhf%¤â
ÒR<Àao@“ÒPР̬@C!ªü¸Œ¯q÷ݶÿìÙ.µq]:¦í1só17�°És#s!×s+WîpCÕr5·qP1Kò•qó1ƒvÚºvm×3wìs?“uyWtw“wiwuGsU7m1iC÷0Yt‡wv™t—×w�׋y§7z‹7rõjrRÞp’¯A\Oä+ªÆ%™¿ÂaƒHfã“lÌ^á òѶ`*8AMð@fÎB_xÏÀ"(ÁÆø× *ÂøwD¶
¡ža�!

Ú¸ŽÛ˜©¡�ûŽåX!
á


Á�
Áò@Ž	�áø@ô¢©ŽÀ
Ä Æa£

à!F V½7¶d½¥,ýy=
Ü7VÁÃ#
ÓAòÝŠ�<8dãiÁ3¥=ÌÐÅ�@ÛÙz«±}Ç—µ05ƒ”¢Uô‹±ùÊxܽ´&DÒ–:®@Íb‹�€èš›V�ÿ5ŽË£³ÐÎ;_3÷ÆdN»®Èë³ÂÖ›Ö2Š.Ko³5‚ú)E0ñÒ³kª,N
»¬¾ÊKÐ"—4ºÜ2÷¤³�?ÿló�>úä£ÏtéPåêLœ¶
qA°‚K�@ÊdK¨å­v£2Œ3�ìX5åÐóŠëš5Se§LdÐÀóåtÍõj÷’ÑAÍ�ÇÓÖ|ï³5[sÖŸ¶AsV‘|¢
}s´YGË/´QsêvÛ¿>ªÞNgÍ÷À°
�¶á£’\¢šXÓåOÄ1=HÉmÍîæ§I %qÝ)ÁÉ͵Ô<Ù³Ó
÷›-´8ÝË£æ8ÿ\.Öòb~ιmkíÿ®ûŽ/ïAË»®±¢ªJê×þzÍwÔëê×é´C­ùw¹™äª>÷¼ŒAS³ûÒwÁŠ}Ðêýîýeíìóø]ë¦h+¿9=»ñud­ÝÞS%ãWkåÔö³ÉÌ®\qÜÍx5´Ú-bŸ�èZU£ÒM�xc*ܹF‹ø�`)�œ±Î“¡xhMK�ÛäÀ•–!˜³OnƽV¤J³[ÍNs›¥X+H
M‚l’!­ªtˆúÑRRC¨!)JC–†f°"=¤“°˜
€F‚î‘“¤g6E¯Ñê+i²È27¥Ò!d6<¡Ê–bš‘bN¥ôÿ
B¼¢“5.Ž.õQÀûF%—@Ä-&�X3°C£'ùd^t	’“­ èD�ó "íE«s0<]É¡xš*c•$#�¹ªKkE�
™&b%™GTÅÊÌÁsKAy©d5Š­ƒ%äƒ62–åy°˜™‰Yõªä̯-Q{W®ÁÀ“ 7µˆG%ȵõ�4�!­ˆŠ˜4¨ròBm)<æ!
¶Î$0Ɉ[>+7JI=™æL]¢¨�L9hDVTÒ‚-p2�5ÓeözÒ[Y˳é]
Š"ÛžZ5d«ùóŸwaøDX©)“uv¬/àqôªœJà‰•� AHÏ8Þô¤)b•1ñ‘ÿéVžÎß¹âE¿=…ÿ“Ï�*BËöÎ_®ë"L‚y¬Ásà�’Ó†èê¿äŠ¯càHž×]²òEzà‚dëW«aADQ8©ž¹ŒÉüú%+žúöè�
m
F¾¨µ««Íí†ã¶¹Ñ¦>h‰ûp7C¶ÂŸÍ6U—–ÉuÁÀ÷ƾ‹Ënp9àù·Ô’Þðw¯hïb8Bj_à(F£ånå’ùÕ/gLm¶±J<Z
ÜæÊW³HÆì£5l~ùŽÃî笘øŽ~¡^™n6¬}¼aŒ39�HÖ¯
]k
|žâXç5ÿŽ_æ«:ïé¨c™Ëɹª\®À7†ÜÜ@wÙí§&¾Éçj,Ÿàššµ¡fˆJ>%7œ
�´oª,RnYs†…"3ãÕO±<‘n½…FØã\64Eø€�8��ãV�˜�èoÿѤÕefse0+Of(è¡OÇGÌ 
t5ú�y/áB¡Å„yÊb
�U:²±i %ÐF¹Hò!ô
¦fJà�ú¥ƒà1:�ú¦ÿ…À„ð#Š¥„úÖ ¤€€¨K�JpªK`ª6z£Ì:§)*¢Û
¢…Z¨(®!*®©š¢5Z®ƒ@®(
®ãÚ®éê®ê
¯æZ®6:¯õú®øJ®ß*¯èz£6úôz£ìZ¯”p‰Ð
@—Ð{�°ð
˜€	—À¡0vp	žà	”à~Á—	�à{ø{—p	ë9ª@	lЕ{@	”€¦ 	‡Pš€h hÐa@	�p{³D
®P+;²”€
hpJ{”�	‹ ±Œ€	Œ°´I› Ë�PµT{”2Ô\¹µ[›µ[;µSK›Çq	´I¶ë{ÿÇÑŒ`¶[ÛµkkµaK›R·e›	ZÛ·[«	çè{ZÛ•Z·�K¶};±|KµjÛ¶´©	!¶ ‹¶N[·‹�	X˶h·(¶�A[‹	šA‡ë·!kºZK¶ˆ;·c‹µ¬›º~‹º‚;»ªk¹–»ºkë�·‹µ®»¶¯K»¿{»¦Ë™Ð¿
‡ 
up
Y 	[`7Ûß�	u�	®€}ð³}P¤`±°7{Qû´]ù½´	¾†·˜€·†ÁÿOKÁ<ÁS;±f·¬·
,µO›ÁlÁ ü½&ÌÁœ·Lµ.ÌÁ€;ÂxÁyëÂ!<Á<ÁßûÁ�ËÂlÂ;l¶8ü´›ËÂŒÄ]‰Ä/\ÃÇQÄœÃÌÁ1ÜÄ+¬·ܵ-lÃ/ŒÄ¡{Å3ÌÄK|Â\ëÁ]Ì°
gg²›À	¥PŒ /k¸PkÆÜÃ&2:̵F\†[¶¼ÁeK¸´µpÁÿf|··K<̱LÌUÌÁ%ì9>ì˜ðÄzË*„;±¼¬Å¹ŒÅüË=L›ü½7œÂ"LÆAÍ#ÜÍèµ-²ëÌÂG¬ÌS‹Î%ÃAÎäœË1L˼LÂÑËRëÄó<иœŽå<ņkÆq›	~àº	»�`è 
ÔÀíÀÍø°(`éH

ŒÀÀ߸
¸C̹j
ÁâŒÄx·f�ËNüÄ&LÂh¸“½Õ¿ÜÞbmΖýÎ
LØÄÜÅa­ÂœýÕœ�ÐLÜÍ
îßNÄ=¬Ù	®×õýÓMÕÿíÃÌtø¬ß
;Éxà¯�³MÛÓ±#p�°Ç
 Ð†«¹¬	›0ÜÜ€Óð†LÞÓ€ÀÔÞà
dðÒÜà
j0ÜÞ�ÛœÀ
=
à-5›ÁU]¶S«Þ¼á*®ßÁŒÍŠØ_½ÁhK ]¶Ú¬ÁÅLÐdØxŽâpûç£
ÏaýÙ/|Åh-ØõœÖ¡½áå\µٜÞrûÂ\
ßh®Åý,ÁOìÞìãzmÎ~Í=êz½Îhíéq}Ð*~¶�ݳ+
ë�l
u0xà
•Œip	ÞÀ—°²¤ÌâPœ Ý
,�æ
Q‹åól²–»òû
f 	®°”±'{ô{€ªphð
”,µC»ÂŽ	uÍ‹°²‹à
Ç¡È5¸ªµRkÞo¶~±N¿ÿ�ØþØò½îbé¿¸ +µálÕ¡íÙfŽîȸ6ŒÁ
ÍÕ˜€¹…ËÕB<òr]ægŸÕ¼Äy×ãÍêNæá+êƒßáw½ÕU¾-¾%lÞ‡�ŽËìÁ¢]µVLú�º3Ìö¶Lâ[Ýïëùõ-º|àù½á
À	¯ÏÃŒôÌ	ºmàŠ€[k²ý{¹‡²f XÐô¯ 	”€ЯWÐôh°¯°áuð
Uð²âPšPO[W¯	YpÞ‹\yþªÐ³-K	4+³è¨
YÍVõœ Ûßý7þâÿô
ðÝâWFˆ†‚¼d®LŸKÿ}ú,bÓ
W(aÃ6\sE“>D»„/MœÔ¤‘DÄDÅ
Ç4Ñp}L5àX@6
}c
ÝX8`"®Š¥f"ª BSá5u¨
f
<h¤cÀÄG$6“ö¨F<œÀÿë–.rÙê|´ÅEŒ B=
_ZM_/–¾ˆ]„°GEÍ@ãƒX±˜ñ"žXÕ
=�=𾤃ƒñ4	Ö6\¢ð�CƒPvb­êóàÖoà¸	î!þ—
èDG¦�å)tÈ&Aƒ+ª:#¢
hµ‹0…Ýr£o„Ÿ®ñPÏñM�ÀÃS`†•ÀD5^Q
]<R5˜
C(`ã
3°7ÓÚC±‹�­¬•C
qA;Ò„Lw°=|�`ƒºÁM¨[Tø†‡ØP‡o 
Q0‡O
¤<s¨¡×éR7t¼ÉP‚�h„—;„†=T¬�½„È¡ÿá�l0TòÑ�™~½eíƨ± Ž
Ë€þ2|H®ž@ƒo¸„oøÓQž¢ò9oð:A?™Ð„+hKaƒ¤`*¹[„bC”1ÐéÈÓa£QC¿�À§²Nð
,ø±Œ¸�IQ	[Q
¡Ð„W §äÁ„W‘‰½¸NŒ-p¨H±èWû
š>;Pƒqy”‘P‡(Ào(À¸¿NPÜ
™ðK±üQˆYÉp�9¨'6ø†��$;Jø�K8ƒ�’/Äs™È„ã™pÚ¬8à;©°´`F 
*‚Šœè"UY
�‘�Ý�ÿ1ûŠ¤ó$
‹è‰§
5¨U�:1¹‘ ©˜q
昉6d§X„-艘¨È‰bû „-¸”Ÿ:Aƒ-h”CH„dÌÅ݉•X‹‹,0‹R̲H
SˆOx…, …‚À‹OÀ“{4…£pÑPG[t….“�MNxm¼¹¯à’‡‰‘0ÃTHF	æX”Zã0˜yù‰�«
O ™8
:	eTŽÚxªPàM¸„Ë@R¸ˆ[

…ÀÇÃ`´ã@?ÝÀÿÇC@§JX=8„J8SØ‚XPŽ�Q…G»¤ûˆ‘¢ƒ� ˆ¡“ß՘	¿"�ô™˜.R
Ñ£MË¢7‹áàÆÁ–A3èE™~ɧ¨™0ÿÈ„h	“¤ÙƒF¸aªžx…A�
°qh
L(¨@uàFq$‰œ”„ ‰É�9º°˜"ôA¼H,m”±Ø”±ÄbÍÄÚ	Ø|M±hMÙÕ”Íß¼KØ,JI�Ý´"àÔÍÕÎò@ÎŽŠŒ‘±ÞLνÒmìœûMçÔÆÜ$Nî|MíÜ+ð¬æDNá\N+bKŒhŽäì°h�#Ø”ž»”Ê«lÿ“é†
TƒÙµØ6

‡[ª¦–
€q(°fRTú¥›*1‚ñŽ&

Y
öœN¯¥4ììÎ�IÖóå[óÌWøuÏè¤_ŽLV¼°QóL�%b¨M^ž"æ…
ø�‹.å^r­Ö+.uÛ`µË ®4ñŒS`Í>s_ºUÚo-Ö_�“ V_aýÎ�aÖé¥Òâ´‹L,bŽ“ˆ³÷ˆ• �äÜ3˜‘Qšàoð—0ì-
L¨%>¨zª§jòƒj2èK„K0¥­ã�6j#†®&újÙòChh†>¨[ÅE¥ BH­"ƒNr¦žQT@ð�–Ë„ïI†î6¥yœ3è„Äyš	¢IÐ¥	
ZT9šþHЈZèzòÿƒMP†¶¦>hƒ^ê§Þhƒn¹©^j¥™ê…nê£Î꣦ê§^è®æ豆j­®§­þê³Þh±æj³N­®ê¶&묎k¯>ë´–ë·¶ë¨Fj²¶ë¿>j´†j…Ök¥1l«n9¼챞êÆîJ€M€yð‡Êö}ø}¨lÍžm˜}ЇtЇ{ð‡
÷p~ð‡v(
lfOYD˜!æ„ÈóçN‰A�jԧТ@“êTéS¦P�F…jµ*S©M�6EêUëW¬Y‘‚-ö+Ù³]µ2Z¤‰ÐE‰úT Û÷Ïy÷±Ð7ñ`Ïœöl¾§ÌgÉI'ÂãÙ³±Df
B8ùÞ<Ç=JFÓr½�Ë<KlÜÌ¿Ê“Sû„g™²aƒþèMlf[°SܺwkÞºû7pݽqÏüxpÇÅ‘3oÿîÛ9ôèÒyüÒ¢LpýÁŒ÷!‡*^¼`ÁBE6þœ
ecª’ÚÓH#™×eô¼Û¦=€5
¢‚Tªù)`„yûR‚ÊyëïˆÄ�ŸLœÆ—=dòe=Fli©“MŒ˜Ì4·Ü­Í(�6Ò_ð@·~|Pɧêä Ê–
wX
¿¼À–Aƒ¼ØƘÁƲ¿	
ŭȇ9)À©÷àµWH3ì­~dÿH\M¬›ÃnË­G at g+63¹Ž8ZF´�d�
ă‘@(mD
`ÐäE8ÍgüQä¹þ7»üÕ�•šôG0Ô€Eì`ÑQÎvãÄ	­N
Ø[%õ^r°‘É%³!ZEü¡€‚ÜÍzd¬Ù=èAÌÍ¡Î…D¡‰+²(fHÍb0D`Ã
¢‚Œ†J.”ÑT6ÿÎîѸå:×·ºH$u5Ù€ž×¼æInôø£Ô f±âYÌ2
ý4×ÈÔ‹0uœÒ-ÖdSÏ*¸—+“¼x»s½„5BôäädJBlú/¥é·H
�gæÎá$‘A†Ó„�â;̽ÞCÓþØ1îÚÉhpXl†OﯢE'MôæÍ
)À ½fÌQ•†%A†ý@TÍäŠì	î<—ËZo¼‡ÂÜÏhÒN$„ïÐÌeÆ뀄BÀžžˆÏûÄÙ٥†B©Já@FEü�°øŒËý ÄPÖ«ˆÍ¢Ù‡=5CBQm¬.q‹ÎQ½±Ôÿ8�ì•^Al�úPj ÓŒ�Ï
„{PWZÎF¼›=€OlpKÝÁ”@‘Ê
 ßü<DMD$`R‰XÍÕDÒÌNôÎÈÕVÁ•`d%ÄíÅH‹<#Ñž¥Á[|¨I£X	%¶[®èÈcµü„M=TÛN@½ÔUÅå”Ød´[iI—‹èËË@�ž¸ˆN†ÿhËdàÛdäZŽ}}YÅtmŒÈðDx�D�Íšia_«‘„·€•"¾V¯
`n­„pmÈ¡™`jÜÒ‰<žcXäÌ,":ΘwµMyUO>ÂãƒÉHr<S Ñ‰˜pE~d³ì‹ƺ¤=
--- NEW FILE ---
GIF89a9«
ð


!&$+*,,2
0-
333:	=;&*,436>G?DA@LYPZK`Qghl
œ¡�¢
¤¨«¥
¨©±°¦§©±µµ%„„$…Š$Š…#ŠŒ*„…*„Š*ˆ†*ŠŒ%Š’#“‹&œŽ —‘$“›$˜’"››)“”)–š+�œ2‚ƒ0ŽŽ=…�0‰‘6—˜$£�0£”#£¢%«®, ¤,¨¦(±§/·µ6§¨F„‚A�ŸK�«~¬ª{¶¶¹Ä�«´ˆ¸º”·º ®·¡º¼‹½Á–½Â£½ÂŒÁ½™Ã¿¡Â¿ŒÊÊ�ÎÑ�ÐÍŒÒÒ”ÌÍ—ÎГÐΗÒÓ�ÙâœáÜ‹ëê�ãâ—íò–ñõ¦Ê˨ËÐ¥ÑΧÙÙ²ÉÌ´ÍÒ±Ñ͵ÙÛ©Ýá¯ÞðºÝã±ßö¨áÝ·àÞ¬æç¬çñ¬ðì¬óò´åæ¸íñ·ñí¹óóÀÇÍÂÙÜßÝÎÚÞØÂÝâÔÜäÄàÞ×áÙÄçéÅìñÃñîÆööÓçêÔìòÑñîÔùûàÝÚâãÜèéæêìñçúýóìéóïðöðî÷÷ù
°ž}@ÀîßÀƒ€cÎ-‰nñ’‚çÏcÃf­›úlÙÔ±ßþÛÀîÕxWÿçNxméµiÇÆî½<õð|Ï–Ïû7}àíÇëïž|õ3h"…ƒ`ñÅ…¨QÉs4]l„w
uûý¦k÷u×߆ý! Àr$qHM_¢Å¨(a
t,®÷€
J.ž˜Šî™ñr£
LÚ§o0·Þ°æºÓ
`
ÌÛM9Ò�;¹�_üÁîX;�6Ü\.½‹’ƒ-³0Ï2µzcªêÚà†L;)%ÓO4Ít•‹H‘‡àXºùælžLú›oÚ79Ýr¬mòF3h§4õ‰[°j†�êT6n„ƒØD¶@&(`Ê6¦AXÙ	Ò°”Ù`5¿8ÅIlW[Äè�
±Å	
SŽÆ´¥?iP[ÚR�|A}é”IËÂðÓ¡¨O%êH;JSšnE(ç4'PIZÒ¡ò4ª'ýB–š–ò„3éËfB̺M›ä«W5§UÃ0@´

߸¢ÜÚô�k,ËÒ¨4‚G�hÔ#
 »8u
o 젇ͺ�¹v
 “G¹´Q
Dc×P‡
ì3Ë;þðij£NïgŸÙÚOw.®‰ìo’å~x·^ívœ»ã#/Ž¸‹Ýðˆ÷†åï>ùÎg‘ïj²{á+?úÇëŠ|/ÝÛÝŽÉ2žôq4ýÚU/yÚ7þó‹{ÞËûµƒ¾‡�‡üšþ{Ï¿^S4|}ðçî&ÆŸ^øχâð�ïyÂW_ø¶/›
4
»T*ä&-¤KBYP}²)ó0ïÐ'ü³/€,Ô4‚¥Fš¤)}âŽn¢ß�
ÊÐD™�Üó“ös÷Ò'É€C
¤Ü°FÂR¤2�´A¤
2Ô'†ØB
	Ë
t”
,4ö˜Û3©Õdw˜Ø0
Ó,ìÐ
v²9C�R8×@•è†ƒŸƒâÖÀ
S/Ób5U3/ëpùÙ
õ

ŽðB3ä (¨Ù�ÙðÍ25mBŠ‰Ñ•ÒÑôÑäœ
`œ€C‰
ð
P•ç‰
n
 
xçÍ›8oä¼Më�l6lËÄ�“†àš6q¼|p,Þ2näÄÁCˆ0�À‚$0
rI ¨àxÄÉ©iÄ™j­f2©?µ¾ì/Ó"óK2D3ÍþÒoM-Ù„Ó͹䄲¤Ð
³Ì3Ý\“N´²qP¤ÐºS͸ÿèDTÏñ“-?ÛŒÌÌ=5zôLHç|³BoÆ`�TD/Àòz
Éäh,Dý8l¿1į¼í¤ÌB
Ì:û4ûÏV+ÛìÓ_7z²æð²u2íÀ±Ð#íæó•@cÿ›6Àü¢¥k×bÜHXkýCÖWd{%—Ûgõ;–ZÊÔ�UÛrÇÍëÜÀ¶­³À[7Töºdo¥ÌÙu÷åwÞcé]k›÷Ø«�ÃÁ
k΀0T5QV
	V7³ÇÄù&ÙêþCq¿¾Î{°X‚¡;ØÅzI>°c”Ç3ðÄçN¶Ô?Wa�YfPi~ÙæšsÆy¾–y>ïç™…ÐdöìehõêÛ5Í×ãЛnÿº9€ŽTcU�-¾9MZ¯	›q–ÃôM6¥TÑ£×®7h
Ç›dÊIkšfÈ‘­dà
[™oši&œeV|ÝeÂ
^øpœáheÒ:>-l2[LŒDZøf
�œßÒiœl g:á]_yàcÓçÓš.­æ’jæ©ø�Gj¤ß›
‡9Ž\ÿHü°›ïaÃ|jqFZúò<þÁoxjQFÿŒ1�äu®Çó`C’ÿϵÙˆÜ2¦¿iL‡9à@Þ4ÊÑÀàycßx�2Æ¡=Œ4cxI‘aë–a at K…£DÞð$hüqäy±ûápÆg¦p$ƒuÌŠË8l÷‘q¸®ÉȈZœŽb€ãwðÈ˱CäÅî}_l†2V˜þñï7mdã�çº0õå…s¤ŸG¼÷@EÁQ?<\Î5 
Ïìeÿó†åð!Ä@¬D_€ÌH ¸
¨u¤WGéÈíص™©ÈWˆÆ1D)Œcã¤,¥)‡¡Jc$ÃÈH1�!ËY&CËÀÅ-‘ò¯
©P€°þÓ
nε¬l+0ørN�{Uà’C¶ÄhïzÑ{Ûô’½¶�F
,¯aò¸R[dª²&g0¼e-¨ñH6¾¡ƒzð#úðG í Ðf¨¡è¤å�
p0‹i#¤ó–§3�.tˆÓSŸðĸKwÚÓ‰Ç8¢�€ 2öìX
B‚V$(`Ç7½²S‚ðD˜Ú(j¬�¹Y¯�££òhª4;�OÛØõÂ$&�m7G5[Òyâ92‚
A.šhÁs¼jgF.ÆÛ_àœÑ>™×ˆ§Èà
ÄÀÔÀ
äÀôÀû³�nPáºN*.ÿ(7RŒS99‘©–ȘnY�sÃ

*‚ªªô
€ià(sª&Ôh5£š*v0€ì‹(’B&%±A>}Ò
Â`�kP,̉^¨©9¦Óº£

zP¡TûAÑR’nˆBÿ $)‰B+D�k
›€
�ðˆãˆ*‡+Š
±¹ê ”þ°Å뙎¦ø†ÛŠ‰
Ú”dèE_”ÅÙˆœPŽz
µˆ�Lâ=VÄïrº!#pX£�y::Ú#ÍÄ1�P„ºøŒñ18Á2í G¶èÃÉ©ÇïøÇα¾ùCÁqDHHC7ù˜ÁÐ,	€Õcÿ‹™D²l¤Ò{Ç`¼È˜q™õÉ”©	¬¨ X&
«f¢w¨†¢ú'c"Ý 	ݘÞ0Bw§ƒò5¡z‡iÀÂi ‡V£JÂðªÓR­!‡kH)»‚
YûAÞðBÑ-€†u¢
kŠ©€XD¦â³Búj5w
óÌÀŽ0~¬ÄÇ(ÄP	�„±��t0WÉŒÍ8ÁNÂGç0˜,/ÌEò¸0Ì´L�¨ÌʲÏtA‹È�Ï»��!MýøÌ–é¤Ï¬ÁúèCpÈ»6;�QY�ÓPÂqÁÿÆèD©�ˆHv¡/
Á
ª˜ªŽºç”Å¢o(#�wH#Ú¹Þp
Jù”/�
’`ŽMé0&Sq(‡’¨"bŽÚ‹ix‡‘P:ü
àH¤Ò„FªDŠo(‡g̈RÜ! í£Ãçô†rPr‹i0 l	¤ÈŽ]5â�ø”µŒèH
öD5‚O[4MÓÚ€¢iÛ”lØŠ�ð.Šd‹È‰†ð×!‡
„ØÉžõŠ êÙ§zª^jK �*ž-¦
Öˆ¾Îàòà`–ûªÃAY”þøà~”N.aVàáö–a6`žá¶áæá:¡ábgaÈaK#b9ù†á±ÒééÕ$ÅÉØ6ñÄØÈGòƒÔ«R
€ÿjB€>Ud!!‡X5ž´PP‰81iðž§p
<»�Û¨‰às®õkª¢ÛÉ�ìó=,‰5úB4r@��"èÃ�=b–¢|
xh
˜F2q0	Ø@4Ø:m"ìã
x JlÒJ(¶+A’rˆ=x¸i‘q3€³gŠƒg|¥ö¹ºÓgÃ;k|FkWZë|~g€hT’ëQk‚h·Æëv®gwŽç¶v»²Ž†	¹‹ùšZæL“b0ØȬÉÄx¶P†m0ÍŒ¸ŒlPŽo؆lØLD—¼Àñ:h(/1Ã-°ëc
�Іkp€¿
ª9
w…ÏøjùWøÛˆI(†嫉‘z˜&[Œô@´Ûˆ�šø'­Ð=Ò)«qÓÜq#'Ž¼n¥Á“VŽ›;‚
Åäæm™·ŒÚh»¦MÁ@lârëOœ´zËıl9îÚ¸‘îžÀ­%·iï®Í§í¥8or+‡Ñ¸Œâ’"Íè-hƤK3~sZµ©S¬Y�&tÓ¨Y¿†
»õìS§SÑjeëöíV¨iÑ2½
÷.^¥Låf­Êt¯Y¾TÙÿ®œW©Z¸†ÅrÍæ.€ÜÅm{#'”7vä„ñóÅs0_:f¬öÛ_½qÕîåÊ5â®Ü
ЭÛS‹7µµ<xÐo¡â‚'ÕæmZÂ�âVÞ<Ø�`KÄ«£6S›MnónÃ[Š$*ðàeÜÚ{&Ï2qv–ÚÇ«7}¨ÚóAqb&Zð2¶fã°%Ŷ_?Þ`SÙ€qÙ•‘2–yó
FÕ�Ó6å(£Ÿ~]
Èß8ÍHæš[…öaVa­õTkÒmU
žÖ\“q¸•Y‰iU–‰c½ˆ–_‘…xXdÚøZR:ˆ-b·×läÜf@~€
hŸ�%a¦Yã‡äL“Àÿ5ÝX“�A]r0õˆ�NÓh
�s›oT«G5{{Eu³ìY„T37uÃæx·‰}{â؉õXo
WvFÍiÓͤóŠ€6„>užRA}­6àPi˜”ؼQmÕÞŒÇl[ê�Zß×{“×6ß\
(.¯"’‡[ÜOÁ)ßÞŠn…·�€GÞð�›f4�%
-±[(FŒ£Tn¡¼:Äx�2RÇ(˜ìª<¤Œ wÈ!Tç¼óg¢õLÚR‚eÒöóhR’6}öÕ÷ìöÞ�ö<õÖƒ_½øÛ�ß½ùákO>ûß»Ï=ÿ÷è·o?ýëã/ýüëן½üö§>Òì�gý`ù@ÿéo� ü
x=¾/~ü£àÿÄ÷À"ЂL_8A†Pƒ#a%x>¦P„+DaïÇÂ*†
4á+HÃÎð†ÖƒÒ	
سÑ0JßëÞAƒCó1ðyK<¢úœÈD(&‘ˆS´^µ÷D,V{U„·F,ŠQ‡d¼â¥øE3ª�MÔ¢ó×Æ5fQ‰q|£×(G8ê�VìcÿèÆ@zq�],ãóhH&’ŽÏ{’hL†Ÿm`pD,`�¸1ëk7A†oh“$@qc%	»ˆ7¤
‚häÎ)3ÿqÜ€G€�øÆ7’1¬e¥9Ü�=¼¤Ì,YÆ©„"œ¸”'+úŠÇÁþU;¶,
**Ú›n”ùË s6÷9K�ÀÙr„cË
|�ƒnoˆk½åù68Þ%žï:ð½ïuÈòÀŠtÁ„صÇVJ2^‚�I°”žyç}ÿ
ˆu°„Ën––¿­IKjîÆ8
¦<ΡŽy ¿õˆ»¸‹
zcítòöÒŒL¢ç�tÒ“œ¤|(
Ñ3Éo>ôyÆüå+¿òЧ|ò­Oýé7OúÞï~÷§/þí;ßy�?ø‘?ùï'Ÿñ_0Cûyò3?ûô¿ÿøó�ÿê—¿ÿù?ÿUOÏøœ_ôqŸäàùyßñiŸõ=ßó}_õ%`åUžóýÐñQÒùüL ÈŸøD þ!`RŸõ= ýE_úIÞz ãu øpÏg<-ž ­•ÂÐö,B
!;áž¼C6(ÃœÂÑ™
¥Oû0Ð
j 
‘ü=äUãö¼ ãmÁ ¦�
PZÑá$®"1z¢
cóqb&žã:^Å!.–ÿâR#¢þä‘ûÌ_
V^*^ÉáÏ„c
úã#©¢"Þ£7c.Š"9é£AFb*$CrP8b M$qÐF>R$¢�@2’"�côXÏ%ŠÚ)¢¢H’õ�"~$0úcö"=®U%B¤DžÑJ#Ú ÏHbÕ$BvQEã.rb<ž£ø ‘&
RPÚãÖ£:äOÎãGRbSb$@î"ÿ0åHFÒIc,úŒI"¥
I£'ê¢ád-îäNêaV 
*š†ªa\ª¬þH`ˆê§Ú꤫®²F«†Œ¢NLñèH±öβ.ªÆ8è`ÜÅͨ�΄FEj�Š¾…�Ø…\°hŒVÎÂÄ8À1D/Ã1ƒ0»²ÿ«0$ƒ0 ƒ»2Ø+2$1è+2ô«¿ƒ¿&ýúk¿â+Áö뾃Á¬¿Úk2àëìÄæ+ÁC¿
,Á,ÀlÂê«Çì¾rl¾ZlÀÆ+É
¬Çî+¾¬Å¢lÇìÄJ¬½.ìÁò+̢콒¬ÌR,Î:,2´¬ÎNlËþ,ÅmÐŽìņlÊJ¬Î~l¾ÆëÅ"ìÒ"C1ÄlÃ^­ÕNìÌf-ÅìÆ"Ã×J¬ÓþkÍžlȬÍö+Àâk¢-È¢íÙŽ¬À-ζ«ÝÚ­1C/œk¶¤Ë|ÒU–�>ê’pFõa¤gè©VÄX³¨ËŒÔ…Y�˜.i
_Ã
çLÄ/öžá¯0›@J$�4Ãåªk2$C-GC
HT ¤<²ñJÁˆv�•€¸ƒoÙMe4®QÁƒeØe(WŸ’’eäDEÇ€E4¹€Ã€ÄD941ºà
6ü/Í2ÐÆ1_t °DMcCQÕ2È‹SR
gƒ1é‹:—g½=!¨ü
9Ìe¤³(óXÉKL+´¾|8ÄP“§4n Je–1ÌEpRnø47Läì‡Dãɳå“Gp¨E04SsCØìgeÄ€ÅP6O�
7ä´W„o	Š(=„CäD ¤Y±ÜD< ÿÃqTÆàìµ^ŠJ#†–ì¨,À…9ͬ1üBÞÞ2ßÒèÐœÈBE*Îèò‘óÐêŒI�7dÃ7lƒÌC>ðC?øq·>ÁY߈8ÈŽk<ÈIÅ…©ƒá@Gµô†ä¤�«\ÇÞtðñFoxwÚxZK¤Í©Ì‡w«Ç縇z¯7{G‡8\y|÷Æu›8Øwoàw±±„}Û7|ë·yôwKø{Ów�ß÷�¸|›Çó·ƒ#ø~#ø|/øzÏ·;„΀Ç÷ƒg8„O¸ƒÏ÷{;ÆSxƒG¸‚sxƒ{8„ø‰'8~SøŠ?8�Ã8ŠCø‰«¸Ëø�Ÿ·�s¸}ã	L¨ÿC
0K2 Û~Ø“¢ð
Ø4C8èÇ8¬K:W‡2WÆ4ìSHX3øSF¤Ju¼¾È•J»t<
®Á8SL/¾ÒÂeXšfà°g›bÿ®¬m€3뱤ڪè$ÿزðÀø"p'˜ÄQfœdÄ)‡/ìJÒ�¥Øt²¡q¼);!¿còÉtî¥�"Qm(¯ËÑ®¬‹º!¬
CNãV-Að¶ìK0¸´s
ré5ˆ
Úd -ŒŠpÿ¾¡JXê(ê5´qªC]ceÚpª²œ:,¦êKªI�ª6Þ�Ô¬:u«[VRÇqÕ¨fCÜrêYÑ*¬lœUqkýªâ¾W³ÎU­rë\Ý
×·Žµ®îÈëXËj×mì®…]«^éÚÖ¶®�½ëa¯ºXÆJÖ¬võ+[ÝÊÖ¾æ²b}ë_kØ»ŽvLŠì^CKÖËú¯ví«Z�J×±Â5¬�…ki7+×Ãvö²|mos»ÙÊFã
NE�žÐ$˜–h8MiUhê‡æaL=MM`4C]S†$»Õm©N�ƒ&’Êe6ã�Kr�«]’öf&½ÉImÒÝôzCJ9+½‚Þ¹ÿ¸·5ñ%/|Iyßíª³K^Òo—œÄÞ’Ò÷Àâ-°@ýËʘ¬—Â�™ÐI¼íÔH`aJhJK«HeHòåˆ=½r¡ÓŒR»F׳wÆVMvk\§ßؾ;öq†eüãœy¾u±‘YìS$7XÇDÎèób¼d²p;Ä�Ê,£ûüòr'Íy2WÈ‘
à"ƘÆ1Ðœf5¯™ÍhŽF›ág9Ï™Îu¶ó�ñœg9¿yÎ|>†Ÿõìæ4:Ð…6ô¡�hEÛÙÏ„f³£éÜhEKãÌÑÀZd'ïR!Å;ž²\•§Lw”�1È©é›ê%Y,çÈ
õm”ïÊØâd™–ª¢8�]S8@®¨ÅmdKŠÖZ5°¹qTãø
Ú4êÁ�ï‘ã�g¤ãt€£E@@~)w÷ÆÄDwc#ÓÀ
Œá¸í”‹ˆårG3Æ¡�ŽÈÇ©ñ@QªÚW�*q'UFG²'¢ŽÏO>ÉãD)¾i ‰Bùü’
‚ãkÜÞpÇ1´ñµ|§ÏãFªŠ^r àˆÞ¾†�’‘«îQçê®<�KL8�6Ã…‚ÿ 0¥E¡.£O#P9Ê!
5
n,*ª
À\·¹‡
QéSÖ
ÅRæ§W€°aQ@ÆXeþè
(
EŒÉú¨‰ÏA
ÇHI#Š§�GÄÿV�ÄÀË1¾AÚáî
ö�úÁ¸Qx Çzd~ ÌŽÁÖ†
>O’Á’AÙ‘‰!Ðä‘kmvMÖä‘��ù
­á›¯ùÈ3œ°P
zÌ‚S�ƒ)è ÔŒ£õPÊ¡¾¬‚bLä�Ib¸�*¥�¡~âJzT˜º
�á 
a¸¡âg«rE8Žá]:Np¤¡hTE\°�[Ia®U`0ÎÛÄaà¡xƇ[‘ïš°ãA.B®akŽ|’¡\ºGòà¡;áÁ�ÿV¥_Çájˆð¶‹ÁH¯5¼,Õš¬cJfS#Áj‚zðDz\‚F÷qY-r!wrëDE'wLPô•6
Tˢìf	9®¢”JV4Ê1ҋʺ§Zu´o%h®áº“v !VEýê�p¤!«†Ã(ãa¤
>JÇR¸¡`VißCENnéŽÎEX
Äek`hämU¤akà(l£è'”u¼í'°*
Óo!ö�ºl7döÇN‰Fþ)3yÈä+7¤¬Ç(wËN
8ð©öF£¾òäcwB€Eÿ_¢£¤Ã/dje“#Äd”¢*ƒF]�ÓW@¦!
†åžÅ¸ázUä'°�z�jrå'ÀgHê!>À‡:®in‡kË�¢Á~dEµãšÄG;¸¡Ž�Œ|¡…CÎçq¤†:®¡Ú§è®ZäaÈA$Iú,eÞc&;n8´#�‘Ö‘Ü
hÞåZß%d€FJGàÁsfwx¶\J¬tû'ÎC�
øœ2
0R,¤4Ö5Ì'¼¬…-è/(*2÷d=y”ÿi&nT,8•ö΢q5�7Ð$xüi ÒŽB<Ù<Fâw
öšty©£w$:¬Eû¨@ NåÚø‹|ÃÇqg:`¶(†|ÈGä”|Âu<0´úq¶#Ë‹\GµÔôÄ°x:BËù.ò(‘> #®õ“a–'|/BVL5¾œÌ#/ò–\Ê‘<Êt‚õ|Ïù¼Ïý¼IÇ�ñC•ìáÔ¤®Ûd¦n<ÄøºU�"Æ:ª`?C#·I´¤¼˜ÉŠ¿ ¬¿
‰{¾(ÄÛ=28¬ÛØa¦~9p+ðý¡
Ø–ÎÖV2"7�DÍþìGt×Êž×оíÝ~í9/7ÿÑìmhÖÁƒÀO’äèì$Ä#ªÖG½Eζ,Úýv"@˜AlWÔI7È0ºG-¶�ïåˆÔÊÒŸdÖý!jHµ#û²3¨“
?m½AE´×0Ôì;îß¾õ]?7Õ¾õWß4éqÖ¢AôÈ"»N™ì·%Bö0C­ÑkOÓ6í¸*‚ŽpO÷~ÈŒæ´ùÝ™Ÿùqˆ/¤ßù­¿ù£¿NÏúë”ûßôG e^‡ƒz!
R

(|‚2
Ÿž“òY)�ÿ•w0Ñ@–b¹Õšc qCŽ7‰…NNX†Y­aÔŠYm§Î&Ø6?äÃ?þK¬?úèp
7Ó´j[mÛvª`¢ÿ	àÎ4´™UÖnÍì†Íne5CcÞB«Ìn[™µc¹}ÓŒ2߀¶-nb%6N6Þdc¯8Ø<KÖºè6ó�2
æoƒ\árÅÁrÐ…n‹Ÿ!nèMQ"¹Á*pˆ«"œ™lÀÁ,Úˆ1¬ ¸XåDÿ)‚cNäeÃ
³lŠw3`

+KÇÉÒn®„–U˜?®ÑT©«V!ãÉ~&s{.«*A6
Š­ªÌáŽé‡ÀAð•Û€\cöØW¾=ƒËü «$b½)ÖÛbW¶¦‘�¢xcýŠõ¥
 |´#Ç4Ê�.o8ã—*ŒL•è�Vé�U“ÝdèWHž
‰]¹_Q¹H1¡.U‚M£«^u± PŒ,biPÈâ°�µƒy¼…>(–Ô
Æaÿ‘Q˜6Z²µ-r¹®¢j±zÖEBÓU#\áv_˜*QJÓ‚¨<e(»›?[¦2”7ayáÊÂRÆÍ0¥Ü"#¸²Ä ÑU•é!áÀp«Î WWYÝ«&ýÇ8qaC"K™ÈJ°,„\ƒ+Á€5âa�šÀã
)
ÌŸw·
I³ÐTŒ¬åaöhUÞ0‚à
ë}}Ö_ã¬yck
(€�ø€X�øm(oø�‚Øn xn"x‚$˜‚&øyyÕ€x�˜�.˜(ƒHƒ88�,¸98‚;X‚@¸‚BØ‚n:˜u�£Xàe0	°C9Á
Ú�
9Aã@;‚q]]Ñ
õ 
ÞàS²&Öã„LAfEÝà
AƆ9AHĆñ°°€0XðY 	�ñÀV‘åâp
Ã5Ó RFáZ"!"•9
dÝ
àu š]pð1qY±a‹¤¦Õ€eÚÃŒ…Hˆ‘Ǩ†GdñphvÓòHŒùŽrhŒ!éŽÂh-Õ¢
å°@eðŠ
à
Öù-F~&
X¤;¹%D•äAt8ÿ
àp™|³Läl¨T¶Q?ýÑÔ–¨ _`’€
°aØ:Ë£,#FÑ – R¾*‡×š×:ñÀ<ÚOÿ)Tzs7 	c
šÝ€
Úcd‘:ØãQP>2!QîÐ
ê
Pçy§³ e®>æ
Ôr]f„Dœ6

 ŒW&
9e(•Dä@	
à“žƒeqƒ=â€

ÿIÁP
‹Ô9Êæüˆ×
Ï:ßœÍÝôÍmÒìx
ñk
3à	„�‚Z €±-}P
ÍÎ=Íë‹á,Ô
=ÎqcŠÚ IMÅÄ@
L0[ðÿwîWv«§QÐàSð‰°x`€¶N×z„“I@	
P?Ê°
D¥‹Âh
EqMÒðïHFõpÆ
t¤‚A‡“Eá
°™NÇËÉPt˜
ÙZí}ì7ÜØö ~`SðXð’y\mÚƧ}¸ÙÕ-Ù°Wo¦'{ºÇ|£]+‚Rà‚ð ‡0~ _ðƒ#8S
XÜ–‡ûÿwn'¯öÖóíwým+Ý„^s÷ôp9GôäVèµïx¥Ú	Žà¸Oý«‡öò'qÑ?oñÞRoåk®ÿ‚ÓI¿mÙoÙ×~¾$F ƒ}úø1ø%Ì—/eÀ�AØð¡À‹3ú	CpàÇ‹?bôø0ŒÉ‘KšÓ$Ȇ1f<ùòdÉ–)ej̉Q#Í�>}²$	RèKœ5W¦	Æ¡Í�.OŠtY´¨J¨AGV}ºó¤Ó•"‡Ê”*uæWšLK"uhçÚ0i–�k’ªU¬GçÚ,rf_®J£.;°¤×›QÓr]*éÉ@7ã2ôSLƒS5oÞüÓ.çš EOÝRæ‹ÏCª“íY£OMÎÜÊeÙ�L)Ö¥F˜1�œ,[mî©ÇñJ®Q/F§uy÷=zð'[ÿ´^½*�ksªpèÄ/gI5o[ÚâÑߘ˜<ʾrW</Ç¿çµoÍ1v`·d›Ì¿í´sŽ½ÞÀêí£œª
l½]+N¬õ(|«ÙTʱ»Œ{°¸µòk�9Ú&쯫Ú$»ê<äí«éb‹±;_ìî,3ı/ìhji¦èì¬ö„‹G•E˜ê�Â9ŠŽ'²*T¯Å²�\É#Ýê‚é>ÁÒ
QÇú”\L ˆ8š«'ÇÈ2’)+tïºïš$+¿ý0\PÌ(dR¶£
w98m
°IH[„É[ýž4`ê^;ð,;
U(¢ðõlA¯rÑ®ñø²c‹¡ûéÂÐft¸Ï3CͺBUwÂ}=öµ7‚�ƒkáVat:mæôPçM–V*Unö¡Eëš“Øn¯lÝŸEÞöSwý]Jød,oXÅ=Êz™«˜µiíÓ‰éê⯬^¥•R¸ã–{nÿºë¶ûî»-Á{o¾íÖ»oÀ|pÂ7üpÄÿ;qÆï{qÃ!w|r¼%¯œòÉ#‰Ä½×€›’I–˜
•/´$;¬¼QÝmTÇ›l¼y=ö×e·=›ÚqW]wØs÷}÷ÜW�ÝvÛgÿ½wà“w]yÜ_§öÙ—G~zây·þøë•Ç&zì»gÞûé³ÿøå�ÿ{ôÏWŸøêÁ¿yâ±¾øõÝ·?ý÷í7zØo÷Ÿ{éÝOzùK_ûð¼Ýyc{
4ßõœ÷¼øP‚ê#`ÿ¸Á
Õ]puäÇ
ä …@D&@Y]	½ñ
–)dá
YøBº†ªCá½!ÃÚÐÿ…8´a}øÃòP…@"WWD#‰3¬¡�˜D(FqˆR<¢êvøÃ%RQ‹0l¢³¸Å‘¯ã8.hFqhã
RŽ‹”Þê
iCE*2†U„áiGq2….ÄãÃøÃLÎñ‹VL¡$õ¨BLž2‘�td+óFJ®ò’SäS)Ê~c…Ü /»¡F:t&0)D¡M)».JñuM,"GIËzrˆÌŒeIIÊzR†Ï¼¦3W×EkÒ°›”Ôæ&ÇÆ+–3‡Ùd¢uy;“œçÿla,M˜ÎOÞsža¬!;i¹ÍJ3Ÿè$èeØO}´ 
�á

®Œh/ãç¯#G7ržW^N£âÜ(Ǿ‹#Úâ€G×�-�zLƒâѣýarwÜ܈:¸§q€
]°ÝP|“á^–ããP²ÇAóf”CbÞ†j±±u€¿®,oÆ8ØMw¸{ÃåáXÆŒœ�qˆÃÇÀ¹á»C|:·ú4†ío2’ëˈÇëŽqvp`ÿcÒÉÀô0Xéh
»iÿ¨‡¦”HËNpHn¨h¨Gw°é“­"m
h6*„È*|C¼A¹µB
ˆ[º}C¼ÅÛfcÛ½ÕÄœË[¶¥ÂÀÍ[ÂÕ[¿Í[ºMܺ]\ƽÁŵÛÇ�ܹ•AɀɅ\̵BÊÝ\Í­Û¹•\Î
ÝÆí\Æ]Éí\»MÝÓMÝ	D]ÕU\Õu\Ù-ݸå\Ë5ÝÆ}]Î�\ÒE]×¥[ÝõÝÕ^È%ÞÓå]Ñ¥\ä�Üá½[
P
æ'*ÛafgÞ"!ÊéšRg�þé^.fš†æ�~fP›¨rv�zƒ)d²§Nú¤î}�­b£y!ãOÊ¢dâ&†Ê^íM;wEüª;­»¶æ*¾’³1
=ÐÏ,½^#6t¾}ƒ ²=p=¶:;0j<j­¹Ú>ix‡Y«¸ÚK†wÈ!M…¶qȶk1{ìYcʨhpÓ¦ü£´[†Y»ÖžLl@×#¿{ʆ“ÛlGJ*¤nm×~mØŽmÙ*qÈâ»(£-¢	;¢'õ Ö�Ž/衦Â%£–#–¾Dæ¼­‹D—S­‹Å8±}=éS­ìÌ~ÿ‡L?r8;nH;rH»³Š¶Uúì¨|½´£fºã7
Î;J6jƒ`’õ)ó…-i;°mµ=ƒÍÙŸu©ðB†xOãk¬x¨…ÿ7•-TÝ;¸ã$¶5E)P›m§rµC꣪pWcmÏp ÂpR*$wZ^.%=r¡ìì^Ù15mAÉ.f%顶3J2_n0€´°f€
�‡lø%
hȹfë†w€†
À€lMžÓ9°xˆh0€x@!4ÅÎ4
؆ºìö½BõÊ×¼ÍÖšE7)u8Í$5Oz6ZP9xi;Uœ…ÖqØáoÂyHŸ7Ì9•ÜPIM'�€Ï
G™[ß}×]ˆÜ‰H܉xô
g‰¿aãN
d\
> E6®ª¢N¬®hš¬‹ž©’¥€ú‘§Uªtè8Ê4#(góy&Ô¦¬¢ô6Ë.4¡oý±eq‰×]uxQ¤S¶�5釓íù!%v1òŠÝ�7Zä]ÜPdÀ–Ýt£%8Ë€97`N¨$¾YjKॕ†¤’ýf	¦Á‚N9µ”NBßqTi*N9ñà�Àú"‰$2õ$Ž_ïËÐÆ“#²7ñ0<0É%ó×Ʊ7M=½ÄSÓ4Ó¨lÕÌGlpÐ~E˜Œ;âHCÿV­	ÚF–sÅƉ�[s¬-g#“3g=ÉTDkgè	XNÆâdCŽ~ÅÈ Ä>Oع:a†ÙB[›ì”¢mfU_uWQ—��²2mÁ ‰Ä
;ë=ùEb‡1fß2Úëm�û,Ž;
Øh�
ÆÑ�,ÃÖXÿ`í@Ži$ äè†4ŽnÐîtÝ(GÇâ‘…	@*
û_ŠAî󡨃""ÀRFžf)*“äÀ㸣jˆ’„„ÄÀaPE\B§`êRÛqHµ`Z6Ë#iÆBØ©i`ä'Ç	ÁÁò@�d%!´G4’��ßÄ$‡‚ç…P/ÈR‘*³@tu(™Ôipñ‚ Þæ„ ê‹K!;Ê9ŽŠCQ é­B–Ñ0$}½“9AJ4bàc«ÄQÍh{ÂÐÎqžë�&Y/f3Ñ„æS/Åh<vµ%Å·M•—hÜ"Ì·Ê�͹ 7™EÿÒMWâ€h¼C

Î:ÐJTy»ý5ð×J._ãzCÿýI(7qj•þ]å¦kð¿PQ¨##„	Š1mE1qÞ€$Jh€Íyˆ
žäËyÍ^�<àz‘Q«xÛã
h6(–8!5Ξ4îb‚²#;h}(�þ§‚Þç7fÇ….èƒèY`:î§8†¨~è}ˬœc>‡À´—|I&~ �°¡%ºŠ=ªhœ¸[ˆä&!F`dˆ»qS�
)�i‘©‘¾á‘f¡’2i“Ž¡oþDŽòŸŠNÈOd‹Q„çê%}5‘ÒŒAbgÿ6íD€ÌŠR
\ŒŸ@vE’zß’ “¶)•¾éœÂi�ÞW‡°©wÈi‡€Gž†›’ǘä!ˆlÊú©ÇxúãaØ—˜V¡™¶ßo¦ˆp8Ù1,K<XŽ’ù
x!æftj§’
b’ͨ‚ÙT¨rjªæÖ§ò‰ª†j«nF©nª©¾*­Îª­Æj®âê«êª«žª¬þ*«æVª*«‚*¯Ö*°"&«îª²ªª¨–j²öj¬B+µ¶jµþE©.+¬fë´"+°âê¶þª§rê°ö*ªZ«­bkªºƒ¹Òj%ë³ò‰¨Z«®š+½6ë´¢k¾J«©Š+­ö+¸nê¹^+ŸH«;¬Ì²Ãÿ;`F‘œ‹šÒL¶ôÅí#|Ëa€
{X¦qúKŠbfPFf¸P4CÉ–¬1Ê¢¬É²ìɦ¬1À¬Ë¶ìÌҬ˪,ËÞlÌ®,ÍælÊÖìÏÖìÎíÐÞìК¬Ð¶lÑâ¬Ì®lÏ"íÒ>­Ï­ÒíÌRmÐJ­Ñ^mÕÊlÒú¬ÓVmÓríØ’mÙš­×š-Ø>-ÉFƒfTF¤^ þå›zl Å2Œž'í™2ùh%ffÎÆ•ì0Úm2C2 ƒâ&ËJC®8ÌGÐRÌKGlØ7
Â.Ã߉N¬­La!ƒÍÀt*1O,"_<à‘DaÅC5DŠ¡Ä7¸C4ðÕ@D+vƒ±a‰‘ƒ6ÜY7äò¼¸CM,ƒÆ˜ŒÂ°‹�e�‘ƒ0 �YDPD7¨Ã�bÕQlKœ;ŒVI
Õ0 8cƒq‘˜_,Q¥—QÒÈZ<,ÃÂÒ”¼p½pÃHýÓžÅ2˜ÿÈ̲C5ßöWÉÖÜjɉC5œ.-
†6LOH`”$=®ó^ôš��Mؼà6ÄgŠË"Ï\ƒq™œ8T3H�ƒ
íLE\ä)rÎŒŒDIs7LV9$�è´ëfÃâþ1®[£u�Ï97q™”(j‚ÞÓÜ“HÉÅš[£öíÆ�ù°:¤Ã=Ü>ìÃ>äƒ>ÔÀ-™ZHÊì–Û…#„z¨ÒÉÏ5ÞÏÙýÝë½ÝóýÝSÅÍ©¨)‹’‰ž©íýáJßã½T\žâû=âJ�ì½ãCþþæ	 pEP�Cˆ‘PD*¯þZŒMÞO$Ÿ]å©…ãiŠºH¾P<þÿÎñ=ì›ÅëË>íßþ�ä¾î;~ïû=¿LEìû~ïËþïû›ñ'HÂ$;îb¼;ÀN®©± —À”‡¸A&WCI—Öè©|ÈÃ>�}?ˆ¿?�¿?ì
ÖÄ‘ƒ¯›;cäÄqƒw¬›5zÑâ
{wM\¹iîÄiÛÛ¸
F0YvíÚ‘%ëŽìûwïÛ»sþ¼øð齫_ÿ^½ùíó“#?þ|zðûù÷ßßÞ¿
*È#c�!æᅠᯊ<Ú˜ãŽ=ÿŽÈɆBƘ‘+ïã”7N¢a bæc†a™c–]Žèf™užù˜ë¬Câ�Jb,ufèæœ�¶Èåa²®±ë²+Yåª;Vúe�lfš ¥±¶l™c»k¤Sþ:ëŽrFûëd¤q
põTÜGÇÍÌ3»œ7µ|íÅW¶Pù-tÒÁÁi&àÒä€
Eh%ºPŠ"t¡x;è*
ŠÐ2VT£«D¤ÀÚÕ®†jt¢'�(C3Q�²”¡U(D+ªÒ�>Ô¡3UiDišS�®T¢(uèK

Q>¦Í©LšQ¡B4†›Ò&›qJ>G3£!“¿àu(x¡ÿÉ`å½HÙœ:Šé_Ú$s“ÆD•&‡ G=rÁ€
‡J~±µ_Þ­”áÄkVT�»é¥ÔY¿èŽ
�	…“éÿL°½1f
{2ØØç8”�ÂSÙ&ÎëÝ® �#§q…¹P§ÍwÝnm
ÚÝ â¢Øœ6¯¹Ð…‚ó	'÷>G¾©D”¼æ]ÉŠ6¯éï¨"eå¬j²†ÖL=b2¡@ã|šP5€5•£`
ç
ÝŒü£Îü]l̹n•ºS�	¾©Ë|R5a]lÚÔïJ­µ¼êöcsŠ€ËNˆ׸Æ9`"m 

4ªÍ�HÆAˆ¸�ÖJÇp!Äaº6Ì$Í6Je[zèp�¥8ËÃà‹%

q%Ê8eŸ�X~(oD#*Fcô`PÞ&… @M»Èð60L
‘­“AVŒŽtlãTŽ
*°×P(ØL%Ô:±ªŠY~­&´N4x¥‚�ÙvåÄÁV2ØÈaíÍ+3¦¡¸ÎÚâ�XZè´áW´®Ü!úNSlÃÀÀaWÆA`¥©íÅÄÑf¥VÆ
‹º±ÌØUºQ9ŽÍYŽ�Ä<Hk‘ßج�q»:¯ÝVÑÌt1Ýò¨?lªzQC04îKV/ÝD_ÂÅÀbQcð�Ðp—(Àq†¢¯�Í—²BP³zGêaB”ÿrBV²t®
&„âÌi×p¥æÀ—þiæÜaDÎAÌ

•2à?å”
'c·
®aV´A
°Éqj)5§¡ÀR.¼Î[
º¬±+áç2¾Dñ‹º
	QÏVÿ¯�úò,ë,0	�ECO6鄪‰Ò‰ùrG*î›`ØaC`‚I]ëµPãµ,Ä
`Aê2ÔÈ�ÙbŠS¬À&7œë“ò ^n”6ßÔrݘo>0H‡‘n´»àx]²8Qê&àÎjKP4—ÕíNŽyºÐxy—™nLÃŒ‡9™‹ù—ÏxÝ”9š}Yš	ÊÏ
Aµ¹›uyš-(œ›ùš§ÿ9—ËÙœéò½Y™MÏ›™CÀÀšíÌQÞù–íF­â��—ùŠJ^[ð”ÆhSp¬v¬ZTÌíñÜJs¡ËŠëlòš�6$š‘ûø$Z¢'­$Ú,š£+º2ù¢7:7ù£s㤿Á.#£1z£iâ5”[ú¥;ÚØHš»r¤-¤mÚ§y3Ùbˆ¨_š¥k¤'Ú¨iZ£mú¨5º©9ú¤¡zª™Úªaº¤Áh¢³ú©¥z©o:¦hz¨
,¦Sšª‘¬Å:¦Ç:¤Ûz¬Áa¤áZ¤“¤5Z¥oÚ¦ïú¬¡:¯A-®ÕÚ­=ú®óÚ¤w¥Ñº©�:±µº¦ÁA¨CÿÏË*hp"ˆŽF‘oR/­,‚6	ÞÚÍŽÌLÂHÒŒÍP>L[µ›cµ7¯ªX;½TÛÝZ{¨O_Û´·sÛ¶¥µ›¾h»Rv;[p[¸k¹y;¹'å·s[¶1ã¹™{\¢ÛR„ÛºaÛØî&¹2D[²›#Ê~�:5ò@õö•M0!åÌ´Óˆ)0
ÀÌ0côl¹€îD¤¢#
b$€>1c1†>#zF"€éÝ"Õ™é•Þ/œ~è‰
볞1ŽA º

Zð‚Ì ÿ§¼2�ƒ|`¨@jP€áAXÂþ`£ý©ÆØ'ŸÛu¨>>é²ø­kY«tÕñƒ¶¾‘¹+%c>H¢\àƒü@@‚”ñ
³ÜŽ9ÛÒŽ¼ÂW
D#Mðè†4â

wHãG�F<¾XÆ£eÚ86ÌH¦iÔÃñ˜ã¡¦W�cˆãÿ�ó›^ŽÁ&ý�� Š‡g”&l/ƨûBEÈ69R?â@¤Ž´a£4¹°sŠ$ûxCB^iY…ùM*mhÃUºR•„ÙÜ*µU˜=¥2•{Råo²ñ"oIJ0ÀÔV.ƒ9KŸì)—ÂAf2…sKŸ“•¾t¦.¥y»`R³šÌ„æ4µyÍÔió™Ñüf6»)Knú‰€‹|SÄv(;e!NŸ¸ÁŽNgt¥›Žv>ÄMVÖ‹›³Ü4 �«ÔäÜÀJ
Lƒâ°Æ
ŽÂZÄ
åHÉà%Á'Ò@<~øOiE„˜–™¦#wGÀ…'‡òg­7z
ÂϦ4+Ëvy—"e½Ñ„Ó TD‡ÜQt¢u$Êp$ñã
ÂPNò#"ÖxÆ”TÆà
B’4òj²Fè7þIF‚
ÙPŒ©Œ­F’ÿBØ"+h�
Öa­ö‹Eè‹MøNaxE6”�‡9ˆ‡ŒûNA™iˆQOŽ6X¦#iNPoö‚6è�úh
ðE‘\9òtøUÃØy<ih^	”ÂØ}¦oN	Pòñ
¼Ø‹>‰y´Øƒ,ÂOÄá‚›wVwaï©-Xhˆ~²…�F�£7©MïvEeVCÿú¸-Á¡’yzyÖ@–ô
@,>Ê�™F��ø,ÓHµ’†Ú=R¼‚!Î(b
�:/ž 
Éúhj|5d(¹§!î"" ¹‚"¶V�@ÜÖAî�#å`fŠ’À…´Œ?õÒ€
c´3²l§ÖAº{ð@#à 
1À"âŒÛ[x¡i%µk4lX¤*vÏl'²y
Œÿ#‚_mîPð
P”DŽ2='­BqÒ
ﵺ÷ìfÖˆ�&ü^^8yƒÞŒÅç
{
C½š:&™ÈIf.cê9g
#Ë*9Âr#?´8ä
´qÑ›näŠ*&iâ1àqÎœÆ�6µ�‡§çŠÓ�ÃGA#óJS¡k@C‘0´ å€rš	G·²K�iÆ™F›8§Ùï)˜žJÈ¡NÏ‚ª*ÏÂ&©î\Ò¦!ê¤
uOÅJ5¦�ê&
q¦9ð©X/ü”¬r¦Á†œI‹Ô
VÝìFÿœkºa–Ynš
0¿0å
#�.hJã„Ú›)ž �K®c
`‡5®�
ktƒM E=xâ8Ç}#fž„Õ
ä ‘1TBgKCcT’¥
uì.
`ÐJ
h7b4ãՉà
¨§ÁwzÑÔ™|á
f¨±i8€è¤ëØ
®@o¸D
9ØF™¨ùU‰«¥ÃP78ûžÆWvXDZØ ËäݹŒgÒ‹¼q½´žÝsýìÉu
¨
<À�˜‚18ø‰èzÄñEUÜ">´˜˜�(x0ÄC$Âa„	 ÓªS$DSL1…@ �Bgð
ц
mÚ½åÛ¾õÛ¿ÜÀÜÁ%\0è>*RoÍQM%ÜÆuÜÇÕÆEZ=RȵÜËÝ[pª\Ìå\Î-kZoºV—›A‚„´Ò³áRÊ=	�uÝ’Ð.c)Œêâ´Y¡‡

©žƒx£˜�¶ÜžëÕ¶lö5ˆ]Ž8’6!©ž
IìŸÖÒf‹igT©'9&fmúE†*w_†‹–Y~šälÝj%ë®:gçr_rƽªh­~è­#yVEå±Q�uÝ–_™ZnŒÊ† U
w»Š]FÕÄ[¨ìÇ:EhphC2XRŒkÚ¨®�!®k¢Â�N¨-a(/f¤¯ª‹©¥#¢Û£ÇúRëbÍ�yâ^²Ö8ï½X¢šÍý·1À

œ4CVM­Ý_æ™—°:UZqµ%Îì°©‚Åÿ;+gÔÑ¡{+3¶1µ±]é¢Pq¦Úç‹Òš4oØC}b{ø´ûíáž®&>vkËZj¿tî\!¶Ÿø1’CÜ×½&‰h°^�R]°Õ&â»íŠÙÒ.é©g˜_jSŽ)¯_,c«ëk²ªÊ¬véÒ­#r­­¥¡w+8¼Ô­6EsòY÷úªkçè³ÌD�õ˜×Mÿ}©Ëû¶Âü~ÿ8Ž»þýqš;9�¹ÖJÝ{
DD
ÞŽOpékÄ/Œ¡�n|cÉ02”Áe�#ç¨G9±�zì#ÛXÇ2øqŽuÜã™G@¾q�y|d!áÈHºq’‰¤$&3YI?.ò’’,CîÈÉ=’¡“…$í€IHZ’‘�ŒcA)IOž’–†T%,ßØÊMâñ�µÔ¤ q	ÌXªò•³„å.YYJD•Š¼¤/™Ë`RšÏ¤¤3ãÍd"’�vøæÉ0….¨!SZM Nÿ¨
ì\g;ßÏy³žî¤ç=í)Ïv泟òüç<
ªO~Ÿì<¨A:Ð…úS¡
e¨@*Ñ}NÔ¡½hB
Q‹t£ŨG+R�Þ“¤Õ¨HKÊÑ�š”£(=)AGºÒ”^4
@€ø©
V®uìY‹ØÅêµ±o,[
U²–±•åª7ºÁ
¬rc³ÞH†8°q€4ÿ"[x–@Šª
odÃíVcËÚ׺¶¨ØÀªl]‹ÛÚ궶[íímc+Žlжµ¾µín{ÛÚw¸¾Ýmk‰ËZÝÒö¸º…mr‘kÝåæ–»Ó¥îw»›]àòֻʯyµ+ÞèÒö¼ÛE/|ßËÜÛb¶äu¯x™;Ûé
—º¡å¯zgëÜþæ·Àå�¯�ñ;]öø¸²•mt÷«àóbW¾n®}Ó{ßÐr¸¨Æ�°u#,ÝO8À%¾¯‰µë
n€ƒÞh1Œ±áŽì!!�PPj½�Uq|ã¨=6*�½±
÷xÇÞøqQ‡Y$CöÈIÖ±“ŸÙ&9²D†2•�ä'sÙÇÿGl�¿Ñä-{9ËWÞ2VÅìe #YÈ‘ýñ�˼æ8µÈV.ê–{g#W9ÊxnsQí\g-ãÙÍXf«™›g¶ÒyÍnl‘{,æH_ùÏ_´“—ÜgD·YɃ¶4”‰é;[yÇ�.µ¥ÕÌæ;™Ç£5¬CMhY›™Ñ«¾4®Ù*è@w™×µ‡8ÈQT³XÚ
ï†QYÌ
r´¸�Ãßøƒ`CYØ´.4Ëwld0ëX懶9–ùló`çæ:¯9Ðg~óC‡šæ7v̇ó¡ÏéB:Ñ�>åB=èU¯zÒ}þbšïè7ÇÔŸ~ó®Ç|æ\ÿùÕ¥®u0ƒ=èf»ØÑu²3ÝêXvzÛËNuµ�}ïk‡;Ö_÷ºÞì5Ïû¦Õ.Ž¼#^ì�—ûÚe]qÍ’£³Ý0
:Ùée °)à§e z fß
vß~Ã	º^·QZ	zðé^¸=œÒm[¢5ÛÈqÃåÉ�tQDHŸä)áì媩ޑ^¸™ F›»ÍßìñÆÑ^ǹáÒ¡B µµÞçaÚ籡ùÿm\ìÉŸ½ÉáZY›õ!"¢*bÀõ[ì�  Î`)bQ�\¨m–8laÞHAädQ"!Þ™ž°±\ŸÍàçaÕÎ�] žÍ`•…ÑUá$Ê"ÕÍ"+æ"½�Þ—)�ÑÙ_Õ¹bùMœ,ZÜ”5¢•aÔ%žŽµÝ+&#©áâ4*c0þߎµ�2*ãÒýâ-†›4¾œËM]3¾âÅ‘£àå¢ÌY·õ!1V"ØõXgUÞåÕÁQ˜ÉüÕ3š#ÄQ°mÃ?–¢@d@
d7d"B¤B"dB6äB>$°AäA6$CN¤A:$CbäB–¢Db$GRdD†dG>dfi$EnäIÿŠ¤I¦äFN$JºdJf¤JÂdGª$AÞ$G*äHš¤EÞ$MÎdE®äC‚\MeI¤HeIòäEBdP¢$NŽäQÊ$P"$–mƒ6˜bÅmÛ�¹Ø¡a⺈Oø¡>ÊÚÞáVŠÃ88
ƒ1{²g{ƒ|Î'}Ö§}Þç}Â'~î'~ê'}ú'"þç€Æg}("h�.è|"(|:h~Ƨ~*h‚6¨….¨€Úg†^èƒÊg‡Êç†(ƒŽ(ƒRh„¨‰z¨ˆ^èˆ
¨‹®è‡è„C2$Ã1 CzÖå1À8¬–#Néq–%²æ•OTÄŸ³•åšÕ@¦e6€64S�C3P)•&8X)•N—ŽU—vé–z©˜~©˜–)™NÖX�©šžéš¶)›¾©˜†)œÎéXÉ©›6CšÒižÞ)�ÿö)Ÿþ)šú)˜š) Vé�ªi¡v)¡ú©¡Ži &*¢¾Ø–†)nEi
«²«²6ë‚9kô¹á‡±²Ž[µþ*´ZÙµR«µ²U2Ã0 ç0¼j«F¸ƒämê>6Œa™´uƒ&òN'FŸËU¢¦U¡À¡c
@4Øè1C�&ÀÁ
C9ƒ8tV<x–ŽM7,9�ƒ4,ƒ½ºØ4ÄÃ4,Ã8(ChI9`6, 7”ÃÃ.C°ÿMƒ7”žÈ’C<Dƒ
8�Ã1ÄÃäŠÃ5ă6°-
€$ÛâÙf¡,ÆíÅ.Ü‚ÃÁîo1,�ÎçyFC
‹q°é/Go"œeÜ)GœeŽ©'	\F®¹–!‡œc„riv$gnº‘Rnšq‘›e¾,gØâIFCdÀÁ�vĨ@!ÿ—ÈF-›ñfšqÄ)œc°‰f›r¦‰›eü$&#qÜA®�<Ò�
êÆpš!GœiºìFÁ/#åF§d¾ô†e¼‡ÏeÂ
'Ámš™¦-¥œÔ›Ló¼4#°È<©Nrê‡Êx¤
MÙ„HB	"èK¹ü,µÀ(‘
Rœq¤’ÓŒ°„k™_ƒTÖEa|,'¹ÈYÒLlêÑsœn<ÍvÇa³´OþJ%0#oà§G�
äÈ)AÅvHm´©-àdfÅfoâ9ÒT
Sþ4lfÓnüÜNr*çwœä’xÈ‘ÆÉdP6Tc5v &süw€4Xq"žÆ mÿ=®íEl° ÀþdÐE
“¾C=Z°A+”0Œ	™D·À\õófvÒig|ðÉ'ô™§‡in@¿ñoio¶ÑÐòèFc�A†oc
ï©{¢!¡ªÇlb.�+ÿ|�0âH)Jƒ>¶˜]'9?JÎoží›)ÙB“®}'}¢

%„¨6Ê0°Ö?êÆ›X”Kä#·ûèÇní ”ArvÚ€r*¨c½ðZ/ÂÜÑ
u�—ÓiF˜:Ôáiw<×ÓÚðô9ºqv¤zÕªfµ6Ø�éT_ºÓŽá4yÓê[—úÖ½öõ¯q
ìRocÓ¼6ˆmlLwÙ›Ö±�M^]›×¥®v³—í`o›¼ãØ4´Ÿíìq�ÜÊ·¶³�nc�û×ʶ6·Óÿmêc{ÚÆV6¼ÑÍísË›Ùøî·6œÍïm»ØáþµG�MÁÙ?q“sÒô[þ(·§uPž­VÊ/ðòK®õF.¿á}Œ\³DôÈw°Ä*qr»LC08Èa€¢0êaŽИ]~#
¥×ZRî�j–¯ˆ{,gï�™Ç,ôœ)�éK_úrmu©O�êU·úÕ±žu­o�ë]÷ú×ÿ³§qX£(GË?> »Á(â"¼î¼ZR¦öm©lø7~à„h=è
v ƒ! `ÞXFh‰û¶C

b9àá*à5ã%ªAÎa$¬�F‚è�;,@‡êa< Íb
µÁÿ
5¥‡â´

§Á
Çá ááÅ­"- 
ã!’Â5àšË\ÎNÀôp1³ sëðPò1é°Y²£U’ó&S
‰DÞ!ß °jALêáv,Læ,¯¡	ÇíÞáKâ�JòäðêÁÿšsOBÈ9'ÅêAj$SÊÁâáa<"È�CXPKƒ*¹tR¢ázê¡$ŒÁøÄÿLåÁ¦!üÊ¡ZÅFˆïÑ–Á9÷ãðü�2!Õ#uR)µR£®½S³Ð®EÜÑOí@dAè`µäÎ$;õêÐ�¸dDLF�~qõà$#\O?ÿ”ætâZ¦@\EKôή@Œ$WFJ¾%`ÎnMmG4¦G°áÙ´áX™u*¯…*±
SüÄ_š•C¦Aø"e*ÿkC¬ðñés–¡Z÷cÖtOLQdMŽ*-p\SÔRíUï5Wt3-UD:ÉáÍ’æÿÛoU5ñi@ÅÎp4–Ï.dcd—šÆ¯ÿT•Â
/]5%¨2a?EàXê¤Yfª%gZ2#ä¢J1 N€è~îpµKâD«åö{«79¯zQ4ΰ—{=4{»W{á02­ŽòÄ×{ÃCÖ×|Ë7~É—|ÙήWiš5
U¦!
S¥/i#x¦O¸V
åu܆Ó
"H¤!
Ï2Ód3e@¢¡°
U¸”¨òผs1DB9=æK(ÿêKcé+eº
.¤áÏàÅ
™±Y  Ü Ü�|F Ö“5ök€'úE9|Ã=ü³ãwíD<“6Ò}á÷¶õ˜q!’E•f~¹W¢MœóúÃ% ÚŸ	ú€ýc�¿—�ݱÑDCD5¤G©”9�a¤±OÕ5ñ°@ 9ÇHˆ4„è´ÿ¼ô´ðG˜:¼tNÙÆ#Ž�'{DôTȦ4I6† –‰²³Á,8l!råVÆ!„�e?ÊtVæââ�LøcQÅÁL™·G"Æ9 øTÂâáâ!UÄÕH#&”
ã�N¿ÄHëAÊ¥áҥႧ2
÷[¨ÒÔM½æ&tqë|Åß8%6ëNzŽ“üD#õ°õpµMš“æåà¤×jôÌD—¼´í·|IÇW|`J9DU¨•hŒÄ9#f*PÊšhxdœì„�ó¶AZydbÓTBÀdVüÅ?¦
S»óhD<wKVJ 2CuËKO¤UZ•aÿ¢aC’–`<‚OÒ{My•Yõ‹O¼kRÆaØÕ[¹½ÜëôŸ!Cv›³ÞWÆaü~ßVÉz�Éw@Ô¶š`/�²Áv¸.Ú¡3>ÆU\3aœávw Ÿ¦ÎV	ç1D•Ü
q³Ç0rçëµ³þ¶è>
Iõ‘ùwê˜}“Æ’Ÿœ6œÓ\'¦
¸6äÜÍg	õiw)SX7d}Ïöhãð„]Á
UÔ$Y¥¤ÁˆFOnöÝ×ôìä5S*ýƒQ
…P¥²C~7ï½�a´5\ù#»à|[u¢ÁRß[t³A]ÿKC®jSüë&“±£Nå¥NÉa½ ùC×›C]óó/1¡9ÿÿëRßé«NoÑSK?`¯
‚ÃæM¶ƒ6|8P`Ć½‘£HÜÄ�9V§±cÂoIùåGˆ,=¶¬¸
eK™
i¶¬‰³¡É›yRüf"H—DEzCirhGp5ŠÛùP"Ó£#ƒfÌÉRÛ
g…Þ@Nµ$OÄk–þy³�QöqWÎ7”)DŽ€ß&&"p¶’äu·×�{gP•æùŸ¢Œ>zãm1qŠÌZ*YâÐMYÜ€3\DgõÔU¶‘ÂwíÑ"f‰ßÀ\ÛÐ4ñ4ƒÑUºÖl³ÎÜ7Ž2Ø”³Ì…C+cÜN4Në{#5Ï£ŸÎµa¾:ÐêD+s,Fzâ4:’aùÂ…=»NídWä]öؾ?U8y
±Luÿj”A?MËö•$TçgåË�þïÝ.Ô³�iÕítkv4œqë‚
†¾ÅåoÕ1˜Ÿ¬-DU‡q‡3ÎâÇ+T•J`ó	fz¹š<�qÞx‘7’q2E¨!§SH3šQq,#~Þ@ÐÈA™Æu¦EÓ˜Í@•m-«WÇ0Ï2Äq‘Šˆ°1öáÊ°ñ¹ix«tL|ÈNÆb=l��zŽFBç1#NPâˆóÒ°ý]HG[S³(Ž–±f(䙟ã„,éY…nò« †ðÃ8¦¥Q5úB
“�	)ΧÁ�[#
EÑù®vŒ`#á†;²q�x~žÏô—óÎC"Ʊò–ÒH
Di¸CK-Íà¡�µ’C܈O)ÄÉŠÓ0À;7`ÜUï˜<œú"iÀƒfä Ç
ƒZx¬Òb««Ø1P¦¼„l
©ð ì;p
x°Šª¬L_”8n¬u—/¢™¢¦±Èx
8‹Ç
«ÞÐTÝ8G
�wlX¬ô€F<�áh
€Úˆ3m0\¯NÃ×@ù±ë‘HwX
ÝÐ< ‘Ènàù
€¾Œ9
ÏÀGݺ˜pÔÛ‹Ý°*6”A™xÄZ3M€¡e�Ä�ÛŸfjZÝòn¼
pÖ"Ckái
yœÖzüâ~×`ZÒpT¾f
@f	èVóÀpf‹#`WÑð[Øpp
p
a`Ì£ƒ'¶|
Á/YèEWÃ<ËH]‡E~pn#ªgLbuŠDS/
ÑTÇb!	5ÃWNõ}­ù•õ}zfXJÄ-Tñ0'¡ä
­3ËÂ@žÃQÆ�*Ñ�BüU^M×
’™WQ9J7b!I{âðžæQCÌãõpÍùTA¤
p
ê 
•¹Wñ`Û1•¹/Ñà
ÚÙW?ecßGÇPúUßw_^$zv%bÒðP“åPPƒ;ïÿù4Ì	26’ÂIhXsÇ c×@m×àŸ£SC›I3RÓëu5,*ZqbÝå
•É2×t`¸¤–h’wG‘
±V%g¢4Qe1F¦(3Â.ä+E?jùOÒ³'ï�—Áó
 f¯54”a1¸“FW“ÉpJGD,f1™rË5¡¨�ó„'ôt(„žÅÉEqÊ ^(ótÄG”B�c>1
BÃc,A<ñ9
Q>Z¦
	Ñ°Š3çÑ2<f`Ä5ã0‘åCž{¶ªÄs©ã1æV±—¬ÃbBé�²8(c2994´Ç<Ê€tv�±:@”FäÀEˆ94æÿ
aPÃ<ç¢æ¡£¸z“vÇ™qßÚ2Û ¨Áªð3b¡ó„çÁ2¯*­*…�tAÄB,ÃEM
5ã
œœ\1
p‰#WrÅ/#i?£«-„c©Q zÆ©ñT …×u¸s‡•–=dRi
—rÙ79ù�A%" yq
›Â<4Ó\ea¬ÑZ·d6&…_C"›$R3
Ë DCsM541³³:Á¬S`ÁC�qBGásÄ34S>"„\;‘�2ð#4€ªA£-s;µS:çO56ó´Ñ©³Η;à ¸ÿ…;;4ãp”a¬àù5-
CˆÙBƒ+4z5¸5ä
Ä¥Yr&9b?Òÿ\,ŃCT1–›eÁ èk'”É謈ôAÍà\ŧ_ú²y'/†r>/â?5ë(+Åd;;'à|¶"Ó 
«¸Q/v.ni
ç­[7uü|™fêUªF—=j´iÃo]nËÕìÒ¢dÏ~�¨T"Ú³p¹’M;·aݳbáÖåk·oÙ½výš<øî`¼}N\¸±ã¼hÿ6^¼˜±á£•	–;qk`Í“Ë"¦K”rƽ§Å�F\óß¹¡[‹nØ”-9‰¶#û­hSqPåX¥Z<˜/ǪíÊümX¶_ÊcÛ|º7ß»óþìÚ[õŒ_£Ã][oX¿n�¿ýÚ}l{¢ðË÷~?ÿ®üÍv�G·¿\{÷ýüóŽ©øÀÂ�º¢üFA
ÝR‹:ÏZ[½ú23°ì¶qëü"ÿ7äŽBî¾ì­µóŒDÀªsîA!+�Bgš
ÇFíÀË-¼¥pKê)†«0Â(Î�µÓ0I‰XÔ±¹Ã먰ª=,¥c;°øsÈK±¶ürÌ(¥4ñÂ'ÃóL2Í,“LuC3I0Ól‹É5ñÜqO>ßt³Í9ÃóN6]S:ÔÎ:£¬N¼>ÅtqÌö¶r±Ã3+õ†›Õ„;ÎäŒ$.+í'NÓ´´ÁŒ¦#±¨ëèã²=
«L+ú¶ÁKOAÕ$SÎ>´W^
%Xc	OÑ2í,VX@�5QÚaÍ£–Í›º(Q±tË3X¦H‚6Ä4Ÿ·Üd¹�ÿtµüÄÉfÕnÉ\ŠÜ<%rÈäHõ�Ïkÿ,”]è&‘X¯.ô`ƒ�ê7á„Ñ%xa†ýt.bŠ}­8Ù‹3ÖXPˆ7fxbýö…ðKnô+J¸«À ®ª©D”9L¹t™ÖßÆ|ñ¾ÑT�Ñe�¦ØÜž/ºàH	E¸âŽ…zç¤ý¥ÓO§£nê^¯UŠ,ðXœ(©º¾‚*�O�ûT9Ô8œÈlö8¾Љa¬¸ViÑæ×Q…•®Öâ£Ý\˜Ñ�!n´hª±%:ob¿M»ï ›Æc£“vðB�C\
¼’·¢—v‚\9ߪH]�Jž§ü5¯&çkòiCDZHéÆ®u¨‡&÷é;[Wÿ×ÐÙ¯=õLÇ]ÙÞsÞv)å„=p¾ýûxà­
þvÖ•Ña�'þù7¯÷6ø£ÇÅ>Ru5}Ì许¡·¬ÊíÅ·HQ[FmÙ2#°×¢²Ç]ÇÁ&ò¥÷Í©
­èG1šP”Ú”¥.uèBšQ Þ§•èLu
Ô–Öô§)íhCyšÓc§Ç0jM�ŠÔ“c¦
F2ü9ÓªU¤+UiêѤ~´ØàE4 Á@ýK>:ªYp‚ä‡ãà‹ežcš^J•"NŠ(ùLF2*Œ¯&±‹ÕjO
*Ψ
¤ËðÆ2°�“”ãFiÆRªô�ÏL߇2lŽq€ƒ²à
·A±	q•AŽd�£ñuÇlÅ
ýiã×ÍÈÆ4V£ãÔV¶)³Å
‡:;�ËÆxÖ>ˆÈ!n`Ã|%#‡“—Â_ppcÝg7®Á¡n¬&¶ß	ïŽËÁæfäÚ¿HÆF9âqŒhԃĖÕìK°±�RÄ]Ɉ‡6fYõÅÆ»3Ò`ckã'è�‡7’á�m”ã“žŠ;ªýkóŽcá$nÜÁ•™Üs5ý-qpÛÕ\w(ñŠÈc=rp$Cäî-7ZŒ�i”cäÄÇ4~{v— FÈuìo�ܵæýF2Þ��hô¤î¸ÿx8tŽ
෕Ŧo¸Æ±ŒÕàvµ½QQf=Ÿß:–¸™uxCíý]nS2‘8¦3ýwLþÒ
ùI
Al¸†­Û i ¹j£»’siP
§x°´qx·¢ð¹	t‡e¸Ö¢—_{‡ÕødH`ø¨h˜ªÑ[©�¢*£ŠÃËÅ9yŠ�PQÈûÿpÃa˜G©™
0
0
��ô#GÈ5ó9?
£8²˜x¹½Û¶†(™çŒIˆ
¸ëÙ	'£€s�‡�|A`i€t„L’‡-*BlkG¦´zÀôK|¤†nˆ†y€!
5

5
w ÆjèzøHk�€ åKy<Gç3¶•äP|„Á‡¤Pm Æ‡dE
•v@?E?§ì†jÀÇj8‡s FzàBtdzY†x@ò£
"!�‘¹®—�–öø­ÛA˜Iñ�ÎS†€Ê³ÆÂ3Rt¬€Â…®šâSM
EY€k(9ŽŒÿ©‡:eV(„T0ÝMlØ�VhpÖÁ|
»í¾n0
P�¿J=Ñ	ôR¦TBº­z Íî+¾9=”mp>_•u�‡hHIzˆª46²eÓk°:¥V6í†5M
t\FˆÙO}
z
ò“J´U±í¾}|
€
àUmµÕH¡|Š/pØc˜€
”Ž¿¤h­x .ÿàÓ]›Ñ—Sô0Ÿq(@Þ“Znè-qÀ§Š9¬Ä=ÝÃ’ólÛk¥ä¶GÌ6ù“jnpNQ·¢
”@¥ß
ºe
Ó¥DïµìMá”	í\Ë4àkÊ’¹j£ä;éÒžìØúÀw«jŠØ‰ÿÙÜP¯míVá’yùó
LL
Üú†~Ó•m�	kº®ohþ¥æôöoü6ojÖï—q¿ïÇñÏqOp‹Jò~ñ_¨ü�©ÐsñÏñjŽñ�ñ¯ï‰"ªGp¯Úqü.¬§Nìæªë6ÅÝSj–º V’WäàÖŽ˜V/ᾇt¸‡{Ø9ÏæÖ8ñÝK¥ÁÙ
l€h¨:£ªb@¬8;Ædx³7k¬B�³8û…é-†l®^IO†b˜tK¿tKßDb8ôEGb(a,¬y•W,/òRrL¯^d
ʵ¢8†Q¼xP­ï¨iÀáÞÊjàŠ¯9²çZ[põO÷ôMïuc¼ôpoõq÷tqwb õr×tclwFßtMGõBGõ¢uP/÷ê½õ_—tF§tVŸuVõ|?øI÷wL§u\÷t�×tbœ÷8CÆAt°)°Êøl†ô®2/ï,¬ù³éî�y9lq!ª /Ù +Ù
yÀ‡äÞ‡~˜yð}ø
w°¦
Šî_YŠÔr€Pvˆîý™ñø
$��q Œ8�_#õcz©¯˜Ɔzð…0Ìø�‹k§ Ãæÿ«_íV’G¡8éÓŸqXÆ
VI'á†y™¯ù~¨ùšï
w€K{JÁ¨n
ìoFÐqÄôJœð¾[ÜïÀûæÛ/¾Ó²È"ŒðÁ	ák±½øndLq
ÈFÜ¡Õ
#½á’dCKiÓUGoáñŽR#‰ØèG.¡dŽkü#!ÆläçR9 ’Xä¢F°E3R‘òCIq
?ŒtŸIh%FCR”¢%)ÝWÊS¢’GâÇ5 ˜®oˆ–±Ü#T¦*olƒGõ{IL,w k•‘�Œƒ
º¦ØGO½Ï4»
Ò�’ôž(åè1¦aŒ_
7ê' Êmñ&]äÏû¸Ç6zQ]
:�—ÞçŽäÐ�U‘!�”Ld{æU·ê¼gZÕe;Yá6¸¬šµ`)›X»ù;‚•-®3[Ýf7»±3e	C˜]÷Z¸p–“cwý×]XŠHc!Ò84¶&ÎÇBÖ°ŒM`÷*±„Ïxú
œEôêW¾n¯šýlá"‹‘ÂŽó¯åì`[kÚÍ:챚-­aŒ\8À¦95æ'=•-0Z±Ñÿš–å*ç™1˜¦\îSØXKdöT h m`»âÈ.wµáŽEuã»ê8‡6¬k]u¨£¼é%¯6Ø‹]ö¦WèU¯|ëßîâ7¿úÝ/ûk_ôºc¾è0�làX¾VðzÝqø½×y¬Ž
®o7ÊË`¿Â>‡…elãôÞ8Ç:Þ±€c¼à
û˜Ç<2�#ì]q¼#�¢"
ùŸb™äŠ“#.Mt\æ².¹dd–~bÙeYÊ
àèHƒÀÒMÙ`®š},ÚÉ
æÄ‚ür‘DçS–�éœÞg
ßîYà šú‘98Ê;À4˜6�H²x™ç¤à~ •s¡J!)U)�¤*ÊäLÒdMÚ¤”ˆƒ¹%	šÒN!�*Eù åÄÿÛ•µ	ŠÈU½!WÖ±
G
“Šà'Q¢Ë
Z3„'²
P�‰Ãÿ•6Œ§Š”ƒ™ 
á+‘ˆÙY7$
�`ƒåiº9€KÖàˆ¾µO›aKCš\£¥ŽÆyƒœ!P¥0âÉÃÑ
ß4‡

s¨(5³./ê1eè’¤Q¥ æ’µp&Ë’µm¦2V³ðvà¥1`”}53ˆ�*ÿ§ûÑ6ü.•¼Ož©õ1˜g&o<(è1tƒ¹JCxÖÃúh1„aÃÑ"!ïÄÆ•\¦qhˆÃ28l�âCrŽ
ÝR`
ê°�uVêÏ4\@Õ>œîyK}‚¼
­aãŒÈ8˜¼>.K³Ï5
iÉ~.éö‘{W.IµRŽ¬RÓ¤‰²®
šˆ09y¶Ù8P’¥ß+„㈠y¦•·YÄ…k&ªˆ;¨H�îúHp·RçtˆC•3ˆ y¹+çtN‡Ñ±¬ÙNcÙ±×0–OcÈ
qusçð�Ϊ0ó4n¬sqñ
†»ŠÈÿ…0ÄV­7ÃÛT”Ú1�Z‚7Ã1tœ7lZS‘(÷—»pê~ù‘i#¤ò=‡Vž’/tƒ(ž9â—²Šª*•ìD%íìœs;ê²f½
¯¼£Îo\ƒF7¼¶èúy66°FÔ¿ƒ6À0ÄÃe¼6¤I4Lgý%
®%
ÏCù¼ŠÑ<-«¥>•ÊOÿEQ+¯
X6	›ãŽà¡®éà˜}=ɯ’¼
2›i¤ŒI
mœ@m\I›
Pw8"mÈæ6´A€1è�ih,–
7ÜQëP¤a52 ¤*¦ÄC
h<H¤i`@,£@JÈ!
¹ÈqoSjR™ÊÔN-•q•|Y&×T°	JÙøRŸÆÆƨ,ÅJ¹Rb©8U±ª©…ºŠeâb†�Æwô@F<Žd�ƒIG%F9èúÂe0é…Í@HWš
°r äZ4B¨ç
òÑvt£
q$%Ñš‘Š„3ÆD«)ƒ–| Å°•îhbÒñf&{Ù�œí(gÞj1U29�òø+EÞ¼.K1d»kº�×màA¦´/d�h9sêà¡£'‡Ë:ªï
©rœ‡4ƒ€óøcNRtg�pdG! j[è/ΨVÐ	ÊGˆÜAPK7¨G±œwm;aè[íQÑ“÷5ìvû†Å>v»ö…ìe'[ÙÍf¶³©ýlk'Û×~Hµ¡eoC«p*zˆ´�Mîe_[ÙÄ>Z^v"a—…)MyŠŽÆš˜Æ€aUg�Ù:uI²…8m•t0šÒ
eAáN38Â-eÿ=|áox7’¥
u8
ãN;Ã!~p‰<ã!ùÅI®ðŽ/|ØêèÆÅ?Îqh�æ/GøƾpƒWä6øÎAnòž‹è/9Æ¡¥r–c| ×jƇt }â�šÂ�ž¬ˆkcã8ŸøÖwîô®;]ç?7¹×}îr²Ÿíi;Ï×.öŒGÜí^¿ºÓ>âŽ�Ð’n€¡ê¥pU2¦8„Dt(«dÂ�ªIå-P€úSfšâ æS³mŠiç-4§èÚdn«§"Ï,q…0“äç'y%®òƒáL†m[
’3wñ·Ûã‡H÷(!òC®ŠU¹ô›È;zU§ÇA¾ÿOÆ€é=nç{8­ÑxZ�/}ë_¿-½¿K¢Ú©Áp€W¹¼¥Š<~ðªÒ÷e"%+Á­��¡ÒX—bL

¬‡„
á°Ê_*ÿüÏ-ª9\B£¤¦.øÌ,À*ö6C‘ð
%D…O®§
°¸Jëÿ<Ï+˜Ä*<PÌ.ÃAÐ
QoClÄzÑ„ùV,pdÑõà-¹Aìúïoñ‹&ªgOâÐn&	©¯üÈV&gØ`2
ï‘jìßïúÚ
òÆ-‰¦ø¼�ÁZåòÆBíq�ê‘÷xOõøqùöúêB‡¦ø¥Á¥I�ô
òIÏ‘ïS’ù°O²Qîq?LQK(Œ¨.Ò ÿíñÔTäÂr"?o%°d‹Šf0¶è)Æ(VfRÄL²&)2$ѦV8Ì!?oÃV'iÒªÈÄRŠ¨â(Obm°dGœ½¢™b‘)Æ®ñ•±*¬ñ?Ò ³Ê�TÂøÄRôÐŽêöGFdeøÞFï§-éH‹Îò÷(%-ÓÒOÆr.ݲ.ïòÑR.öÒPöŽ0_ñõÔf,G‘-ç-«0·¯/s¯H-ÈÈQØ’ø“,�Ïý.S/5ólÚ’-Üoñôh3ËÈ/Ó2.OS+2s+:“,¿h4G3„Æ!'S’l

gT£%FÇfFSâ„|ðF»*PP+Ÿ"F/…Ô‹ô‘Ô*zTGaôHIPIutI™G3ÑHO"J¯tI›Ô%†´K©tK¿ÔÝ¢bHe±-¼ô™MOPJw0K�´KôHiTJÿÙôGÁ”K±"G…4¥tMw”LôKQ›!²–Ä×*/'Œ¹ï	
çT
¯‘$C8Ýbóž2cÄ÷†�Sû�ûp¿T{°IµMÐIKõTG°U;°U•UŸ"UiÕIUVQUT5±m5QsÕWƒUW{õUkÕW]õU[¯¬ÏMÍ”�UX;ÕU‘uT;uVo•°�CxR"³„ZÉ'ñR£02(unJr}T]Å@E2&š,êáF˜…Þèm_Nñ^½Í´*g×üEÙöUE,m_
Ö`�íMË`mÇ_ÚÌa	v`ÙPañÕÒŠÍמŒa}-b/6c
6Êÿ*VÊš
b1v`
öb¶×6¶Íü•dMeáŒÙ¶aýµdQÖcñua7¶rHÖb‹mfmveïh-ÍdK¶c#Vb¶_!Vew-boöiVj%öeû5ióf³Öhvfñõc»íeVlÿUfVŸò"<b	/ÃßÄÐóêíp€SÆ‚Ó&Ùï-C¶ÁHà®!¢¡þ—p×pqWq—q×qr#WrW&wp£ar+×r¡
s1ws?tCWtG—tK—t£
þön

¬¬6ƒÔ­¦ˆÏ^ÌTÊqR¯2]/…�l…Ââ‚Bß2* ’!ŽÁ„áxÿ�Ay——y›×yŸz£Wz�Œ¡z­{³7y—y‘w{™Wª7|›÷z§·{¿×ˆ���Ð×z‘
~á—x��~éwì·~‹�Š!~‹Á‘�~÷×ê—~xÙ·Œ¡x8â7~øü7‚“¡æ—x+x€F”a€é—x“á~ëW�ã÷à—€‰·ƒ�w~	¸~?øƒX�×€EXˆa„!|?‡—ap8„Á)XáW†‘¡x•—}Õ·|™·z—8z›X{§·yÇWŠ©XŠ—÷z½Wyµ‰³ŠÁwŠ¡÷|½w~£a
³ÃÀâžÇ/wÉo'n„‚ñZüÇq•ûX¤uXw÷±o¥
K£ÿPÚ3H‰Še[ö8p"%ô"
J´¨Q à¼�Ãvm€Nq“…Êí&Ô›Uʼn”ãç‹0a¼~	Œ�R½}»Iιqå”­õ–�n6mã¶mSVnÜ´i>ÓÝv[
¬Þ4r0—a«wLâ»

¢½s'.^õiÐÜÁ«L+¹iôt.+§M€mêÆE'N\¹cãhƒ�6Ó¼3Ž4ÉÄ#Î4õ�7ÜáõÎ4ñ�Ï4
7&÷yð­o€Û‡?ü¡o×Ê\…¸Í†ÐHâ1 ±ÄÄ8Q1P|b§HÅ*ZñŠUL¥¨E,z±‹I£Ÿ¨Å2F‘‰Ñ8FÓÈD4Ç�Š##Ó¤ÄðâÀ˜�
›9£Æè6z¡Æ@B½PÆÓxŒi
²Ç
dIÉhlr›ÄÆ	HhD“˜œc ‰É5b²’„\¤q0É‹O¦ò”‹QãmZÿ	Ç]â²רeiÒ¸JcÒ•»Tä+}ÃÄ9Êñ™ºå3�	&.±’�if£ÍÆÈñš‰Á¦4uÙFnŽS›ª„æ8!EMp¢SŽÍØÄv•¹”-tkIJ™ò‡•Eme…b
¨W|ò�qŒ£Là8Þæ1¸|ðÃýØ¡>ô
„w­®tEá\<`
à
R
Œ´!õè
P€
:
OC
°ˆ8®ñmh¨êFÜŽB“Z =!bJÕߥ
id °`×
rwm˜ýb—F‚¥q�ªÞ]CÁÆ
¤qP6Kƒª0†[d$ù‰¤ú´±ƒÿINFO/la+v¥Jµ|2¢Ôïõ�r=‰÷­Ÿ„w(·ßɼr¿{�À¾'¤'½ëcozÓÿõP>ì|Oüå/¿ù§�>óŸ?}×£þø©>õ‹}éw?ø©o=6܀ܒssFÓÙþ¹g·Å	ýCÓÏ·–—Ód	èÆJÒ?ˆ(€ïp

PŠ
Б(„£#yh

™]å!ä0RPy(Šîp-s0Q�ÙhÌHDÍÙ•¦ÃœC
�«U†RY�SÉtKÙqI¦•ày�j¹@`8žÚ	dè
äH/‹–žÔ©­…&¥6îP;wæ	–MG–Ü9'–�Á¹�þä!e²Oâ!àÐ
@g ZszaBà C at G¡
9Z¡+9j1f‰&Dœ¸‚ýa¡æ¡Ú zBÔ¢›s8"4&Ôö#Ü&.òç�†…Èõ�ð)BXø–:QaR±‰²Z?g�ÿyOâx•Cº—BAÿm$gs³ŸÙ¹@Œ‚•ÿi¥Añ�BÑ–«uQrˆ�!œx¶6lr—o7Pª˜#Žò—-¶�jòÙ!"ê
Ë€osv¢uó/Ù¢¢iˆ¡iò¡2ĉÊ¡å¡î€Ü0Ëb#¨&¨Ê
ÎÀ
õb&ö²Ot{úh=Qqõ•]ã23ñ`ñ€iФjIªO9ªÓÙœL‰¤³:Ôf‡cº�¶z–S–:Ú¦B$«oJ¬5m~é,¦·šžZi&x¶&nms¥O1D‰(Z¡f2˜ÜŠ‡
34'§)¢œÙR/±ƒ:	Ts‘ө꘨³�þÁ!ÓC¦I*—ß"g‚ÿ/”'â°õ‚6E�
C
ò‘0Ç0gÁš9E§èižÝ8eÓ°Qj:JÊ(b:Òi­.Ç—ÞY¬?á¥#«R*‡T:W•ôøÙ 
rÖ¡µYQD
êÜPmaàQJ‹"âR¦4§aV=â 
iÑ
Ö”›•SxÕrfàR™ÌOÝÞÕÉaÙí¦¾ü«KŒQõ�ÿ–
”9ëi³ù™ÞkÝÂ\]Õ^z²Ü¹©ô—Š®P	.1Á.á ñbe ´¢¡ê"à’ã¥ùj�Šs¨Oj¡M9y*ŸPVÔ´½±ŽøBqh“ c³¡|¾¡
JO d½Ó£-ƒÃlïBÖ«sB°cs&AÂ-•]…[ï2.ã†�>±p9ÍÄZ6ÕÍ£Â*¬$üê}IÕϨ²Jn¬]�Ü~.®ìºð's´Ähú´P~þÖ-LÍá˜%	
ðÅe/‾xš=2.`ˆ
¦Q§wÀ&¬¥±@Çw°«æÞiäÿAЛf¼
 ž¥'+—}–žjØaNX¬±FžŽd¢‹®×T¬Çn¤�'ÅnÝ©‘<wv…GG®‘fœz”)Çᤰ‰Ç–rÚƒˆ"w áŠÃwJ2&žq´
`„â1æ‚h®IÑÍf² _wÞAKœx~)@±IM³mH]TÒDW³ì2¾&ós2qpMoÇ‚ŒÖÅ…,/ÄNó«Ò¶³UðÃåÒF
ÓÃ)Zæ-ëÆ9:ªlx¢ŠåîxGå	x'ñÑeòèš=VŽ͸£�Æ#¤Þ¸f#Brd…”—�•FAÂ8î8¥§m°YØ0@½±<}O•Œ$óHˆ
--- NEW FILE ---
GIF89ax

ð
‹‡‹Š
š™ŒŠŽ�‘�‘Œ�‘“˜™•š™““—˜›–››› �¤ ›	££¢¢¤¨ª¬¡ &†‰"Ž‘%�Œ(“–4‹Œ5��5”•#¤¤Dœ�zµ·zåç�~u�}d¹rF¹~X·~bÜ\ÓXÊcÜd	ÛiÞpÌh%Ëm2Ìp*Ëu8Ûl%Ûo0Ùr)Ùs1è\
ç^ø]
èkçpýf
ôjýq	øsæm#år$åz6õx$ó|4ÆzIÅ}RÚzC‡ƒv�Šmœˆy›�|¯ƒ\·�Nµ€Y¬…j¡‡y¥�}²„d¶�p·�qÞ�<í�)êƒ8ü�'ö†8Ç€NÆ€T؃GÙ‰UÊ’oÛ–iØ™véˆGä‰Ué’Wö‹Dû”KûšVê—eáœrúœfþ¢Zÿ³\éªý§hý¬tÿµjþ¸xÿÄ{ŠŒ‚Š“Š‡˜“”�ƒ‘�…Ž¨Ÿ„»¼—ªª—¶¦–¿¾«›Ž¡¥—³©Ÿ¦¬¨”¿Â•Â¿ªÑ¾¿Ã´‹ÆÇ�ÎÓ‰ÛÛ™ÈÉ›ÎÒœÑÍ›ÖÖ�Üä™Þâ�âÞŒèéŽñëŒõõ—ëí–íñ•ðí“ññ¥ËË¥ÍÒ£ÒΧÙÙµÈγÎÕµÚιÝÛªÞá¹Ýá©âݶáݬçç¦ìñ¬ðí¦ôö²åç¹íñ·ðí¹óóØ´œÚ¼¨ï±‚þº…ý¼“ö¾£ÍÀ°ØŶÿljþÊ—ÿÐŒÿÒšëìéË·íѼþË¥÷Ì´þÔ¨ý×¹ÿâ¬ÿà´ÅÌÅÄØÌÂÜØÙËÂÕÖÔÁßâÃãÝÔôßÃèêÅíñÁñîÆõöÑïïÕôëÔùúèÎÁëÕÅéÞÑûÚÄôÝÑéã×þãÉþëÕþòÛçëäìóêéøòôîäüòçøøòÿ
MéÒ§N£*•ÚtªÕªX‹feªµ+ׯP¯z
»•ìXªgÅ‚E»V­Ù¶e£æ ŒØ±a)ñª<óf1cÁnl3pà¿>#˜¥_ÁCy2áÇ…/'μù²äÎœ53�ø³hÓ�Q{&=tkÖªmj~)ófÎ`1‹C¼Û/K•¹�ÿNœøð•Ç‹#W¹\8såГK>ݹuãÌm+K)€Ø°cÆsÿc–7ï÷açÑCŸ^/ú»éïŸÿ¾~|ûðׯ¿»Ÿ½üXøÕ×ßzöÝçß�íµG‚¸ ƒ*!|
J˜ …¦4˜a9é†]rÄ1Ün"†Xâ‰(¦¨âŠ,¶è"ŠÇQV]ç¸ÞIä\bÉs ÑFnФ�nY¤‘Byä’L¶1¤’tD©$“K¶!å‘tÌA‡•RÎÑ—W2åHv)%”a*™	–YŠ¹¤™Z’ùd›r™$’E:™g^~i¥›o²i§�wjèš[~9‡tHЉ>ûü2LŒ*R*ãM–ª„Š¶¥´)‰Ÿzʨ£Šê¡n¥¢zj¨ª’ºjª›Šÿˆ©J&u¨W1èüò†süqE`+ì°Äkì±`p
†V@�ÅЖ!ÅP|¡²ÄŠ‘-Ú‚Ñ…Ý&+n°á+°ÚK.ºÂ*«l·À*K¬¼Â¦Ëí°Ú–ë-×`ã/6_„+†²]pa0úb«p±ôûÅ=ùø³�0™nGܧ1çש¼e—L¬²~ÌÓÆ-©´1f!{¬²É·¼òJS

í»±QÜã�Ä(=Gb¦¿}ã¬#÷\Š¶‘,b¦Ñ'ïüô+5V¢o ³¬ªŒ%

7<,êŸÓÍ·Ó×TòE°_l-=ØDÑÅ�Kš5¬ð-„•Á
¬š7qq…!
�°F8”&Ai´Í‘(¹Ä ¶ØMv~X°Æ ˆj$Mià˜Ÿ7œö….P
Iãßý°u.Ô�ƒÝàÂ@¹Éoo+¬ÄÿÜÕ-÷µ‹}ÅÂĈ‡½‘(E#sÌožÈœMù&EÊ+¥>¶"ŸÜÆ%Û[Þo¤ç©•ýF|¿¹:̇¾4¨‰pŒcû�#2la]Û¼PGr!¬€É!²Ô5, ­/Xî:¤±ìˆDyÑˈŒ–ý‘~ÐFÆóo
CÁü(†Ýå_Áƒ ¹Å…:–ΗÁ‚B°…/ŒAXÀú!ßu/d"L}ô]$Çu¬_’Óœ
›d%‹g"Å
D«$#Ë,%Ïw¦ìy”ŠY;?yÿ¢U>ïb"B#xn¥Ž_\‚G~¸‚"åÈP$JísáÀºÐ…+X£lô°ÆÂ
U¸(>´ŽjTãÕhš5®1‰1t

ߨ‡<¾!QBΫ¡PUX–�|üƒ�££?)ÃÅef"Óžñ´*Ö“}ìdüTY§ðy"W©
8wQ%·1&]ž“LªÈXÆôdVd˜MïøÇ%"`vÓéR{ˆÔÁÝÍY;O	·Ô¨Ž5'U
*WÕ™!õ¬MvëS§:Õ˜ÂMW1å‰�fBötö’#Œuà
 ØwÔ!€s
<qkÇÀr®@Øk<¡Ç
* >@
ÐdÄi}Q>4c3
‡QEû�"R[:fU¦d#㇡”1ÛÓ"lè[vxƒ½q‡a€â@
¤ß°?C:ô0ö
è•5˜¥ZZƒÖiŒÆ†…ö’ñH=ÃÑU ƒb•¢"xx[¨¦i…ˆœBVšäb¿Ù"$£edê�2A4Ê5ô@4Š¤øÐ
Ú€Ûp‡J÷ ÷ÿ`4>ºSj4�Z¨>ú§‘z¨Û0`:ú
Ú�e©p%³Búa\¦Ú¦lšªÆ…¢Y…ª«
¢`f)Çqlù$J¾…2ê"›âŽ¼±�fôeÙƒcg"ª¢lÄ:¦¿Jiõ†Á1É@
³–Ë´NK¸(v§ˆVF7&³ì8ѦbºiÒt÷°¨;eÚÓºaä›0Ù´|øIQ+«{2¯;°F½ªK¶ŽK æ¸jUl¶k·É;»v‹¼Ê»¬3Ö›&ã=$#ˆbD¸úº½IÏS½¼û)ÿ¶‚¨»¦‘i$ã{" ;†"‘iî›}"¿í›ÊI¿ð{iòû¾7r¿õ›¿ö+¿ý‹¿óë¿,À�À<dú;À‘ÀìÀü{¿,ÁÿËÀ	À\À*bÁlÀ¼ÀÅ€s²©s°)Â;u©™Â(¼Â*ÜÂ,üÂ.Ã0<Ã2\Ã4|Ã6Ü™:t;¬™D§Ã#šC›3GĈyÄFœÄE¼ÄHÌÄJÜÄPüÄRìÄTÅUt?ÌÃg7ÅVÜÄ ÉÃ'›>Üs6¬tE‡Ãh\Æi¼ÆjÜÆlüÆnÇ(¼s-¼uˆYuF‡š0œÇ6wÆwœ˜dÈDœ™H÷ņ¼Ä„LÂ?ÿwtœYÈ‹\švÜÇzLÈsÃ6Ç€¼Å—¬ÂF\ÉŽ)Ç Ç¢ʤüÆWg˜‡	8
F©±ÿPpÞ¶
ý<—Ѧ Ø
À€¼`
xQ
6ÓdB&*/*J3–Ù˜½ÙšÝÙœýÙžÚ =Ú¢]Ú¤}Ú¦�Ú¨½ÚªÝÚ¬ýÚ®Û°=Û²]Û´�Ù0f#î+dûZglºg¨ê¯°j¢Ã�¸(HÜÂ�ÜÇmÜQ†ÜË]ÜЭÜÍÍÜÎ=ÝÑýÜÒ]ÝÚMÝÜ}ÝÍÿm7ƒvac=V<6S¦æ=)æM²É¹mwÄ1)ÉsiçÍé]3$eù]ßÈ!ß^¹gõýß~æß1!ßý�{^ààÎß
>	à~àÎà>à¹A²wç†ð{µ/#f_µl#R¶$>â&~1%Žâ'.â*Þâ,þâ!¾·)
Wãm}¥–XÈ雾ì¡ã=þãê
äB®ã
DhðàÀ.b"„QbÁ0Åä¢åL™(_ÆhØpâH‚I–c2%F–+]ª<y˽|þö+–S§NcÉröÖsgNŸC�
ZT§Ò£@…&¦ì(R©Sw
]Z+P¦KƒéüšSYÒ©€u¦Ø¥Lsþ`©SnË„.Ž4˜7%oô¶Ñû&Í6oß¾yƒ¶§K—2×°E³æ­°áÉâbÁîÞfkà
w»ç­Ñ0]ž`ÛVø/_"
™ÿ7Àá õ
æKßmßèYçÍ%/w#„IWbr¹3ýùëG¬+ÒœÁ”†5úµ¨R¦P±ò„:«Ò§ØÉ+[lûα߭zÕÚt}Öb
‘3‰$’3$Ç·±p9�DŒ2îynŸdŽ‘ï'ðÞ+ʺb°Û©«ùœ*ʽ)‰R¯ºé~‚ê=«ºò2¼,w²¯K±„Aç6îd�¸’Ä3É3 ‰ìšIÎ è"‚îCЈÿ
ÃPˆ½HÑ�MT FÔÑG%…TRM-ÍsÀ‹Â
 `Ÿ†IÖbõ’ª`‚uRYå”_63f˜YΩ`›i®9g™WŽÙe�wòùgžožùg¢…æg¥‘Þ9¿bóÛù*ŸÿÜÖd2‡âr>ù˜²Ò˜¡°œjj]±Š×óŒ@ºd ŽÏë¬|í	ªu”	o˜c˜—X”	ÌùþfÙm)ã‹ú`©/f˜Z†ºÅªaŒq;ª ÈD|¨X–Ižab9&–¨“Á)'§oYÁ„N?ÁJÁt^?Áu×c½v`ǽvÝi¯�öØ×=xáM �x㋽xäƒ_¾wçy7^÷æs¾zà‡ç}úäMà
âŠÒJŸÀ’a~Ke2
2eƒàÅ9Z
³ÃÀ€à9tQ
ë 3xÑŠdÀcTÇ0Ρž¶¢»`âSi'2ã´É†2VÑŽv
Cç8
‰


X;h`€ðØ…Û¡@ÒI[;ðÀs$u
ëxŠÛr,/1ùs¬ã»
ÿ†¢Ž³��ñ–ƒI>²ˆ›Úb«Áœ8–b	½¨˜•�Sy;rs½0i°a;³‘ÀÚ›ÔG¤@.ñ+¶b1©=<ôŠ:d=’¹9�A8¼áR;;Tê[ÄŸ¸@†éš%LðHð ½T[éš[ÁĬ²ÜÅT	ÀÝ#7´êE3鎗“Ä
£ìˆBO”ÅL¼%4ÅX¢:V!ÆÑËÂÐñ)­ð,cL´Ši”;]¼÷)ºœ£œY:7,é½
=ϵÐOz{8¨
¥Ð8Nã„LÚ<N
•Ò�Ò*UO}·1C¤€h—]
ž`v¶à
Æ`Þàþ`
v\üxœü
›Ê®ÏYÄLÇöD†Ã–½®a&>NG±‹–âUb ‡M¸MЄ7à�7°$~ƒ%NbþHâ'Vb(–â(Vb'^â#†b&¾â-Öâ)>b+Nâ*æâ).â"~ÿ3Nâ">b*.ã3^b%vã6†c%nc3†ã:Öb-Æã<Þã0¦ã8~ã0îã%.â'¶"΄LpƒD¶LèSø…½ú¿SökÈãÅäLóÈB”�–"K†ýÈ:°?À‚/@åTVåTö‚VFåÖXeU†eT&ƒ3 ƒ[¾åV&/ ƒ/håYþ‚2Xå[ŽåUÖ
_Fe+ æ_æå/Èå]žåfîfNe2°eîˆaîå^væmîfj¦ehveU~fd†eavfXÎf/@çXgV.fw†å^ç(8å5ø†xŽ“åÜ’ÆKŽÅsSÆ�DÜ‚V\ƒÞÛá+ï
i<9	/ÀŒph<nØeï>ŒHîDYŒ1Ø‚1XŸvì‚ŸH¿	9¼ÂÔ¦@™)¾ÿ#dG_¼Â<%s,·‰Ù½ÄI†µh‹·Àé'ˆ.¨ÇÀÙŽ[¯„Ï�J°k¨Jƒv¿†—�ù!ì'8ƒI¨›Ÿ„™_	�è‚3@Ièykˆ†H@„/¸ñ�ˆ-xó{W„- l…XŒ2HI€Œ—�†IH„ææ=àykð�'	1ûš¯†JÈk—.E�>�yIP>¨ú”P”�&øæj�t»ë^ˆ\EÓ�À©ó¿´:;
ì˜ñ0Èþ^`ÑxŒq¶p·ð‡
…ŧ¾t9¥V¾ÒÅwñ‘�’b™íLXõ—†õð�õðOéN¡ýŠ†•¨ð’èiCqô¹húÍßmƒ§‹ÝoiÎ?	„OÛ‰'q…/PˆdÅŠ	80Y0cÉ
lÈ°!Ĉ
#R,ø�"D
À
3HØ¥Lsü`	æ$Ê”*W²DÉ…åË—'eά	&æÍ•&SŠQ¹³%Ð�4UÆäÂå‹5oà¼UûÒ²'P0;¡æ\Ù¥åДY«V•éÕeT•Xîùó·�ØÅ�‹­5¬b0�ÊÞTxÑb0e

´‹Qâ¿{÷ÿâe›¶î]ˆÔÈñX±aêÈ…Y2,æ•4qnë9*=аaóm�"hI£:£Œ˜.Š$Aóf�t5IˆÈ<9)¦L%Ûà å)	ÛµIzº¼çil•ÊŒaÞE�#J×H_“´&
““c*ݾF©P!IÖ®y©z5ìf­\‡Æ×ü™(˜±e÷¡ƒŒ‘1E
%T�€Ñ5˜Z‡– A®…ÐEmñ—`ˆ5èׄzá¥×„9&PG¡’H\ÆYN(ª˜"W™}Ö™NeXÎ7áD³†g,Â
=ßGFZŒ±…[�qE Ò|ó�mWp×tCO7ܘaÅ<öÈÍÿW}�M8Û„ƒ
QDâM�ÝR�h%a@ÉM=÷tƒ�@nñŒø݇՟õe6V>fóßA
† „.Š`…Š
& FÆÄ¡aXÌ\�6Ø×ak
°Ñ@ÃXZÌ9¿\âÆ&þä"¬±Ê
Æh.i
ud˜ÁÍ’ôàúE%à,é�!W8áM7KbcÅIWÌØ#6_xa…5K2Ù^€™¬5W\

7SzSÈ]ˆ!ÆQ]„a®ÕÞúÅ{³Ê;¯TO‚aîU„*)¨fªÐZZˆ „þ¶õ¥’&ü—„›6úW2
#tð€�šÖd–X‡‰ñÒû±¼a Õë7Õ¢ÿ7Ð,wïÕðÊd8ÞÐ3³¯Xxµ¶Zc³³'{…œ[(Õ
8ÕDá…h(â�7ÜØú
¯ØPRFP ËäÎ7ƒ¼õ¼d�eV2þ%©bœá£	"ÌPÁm‘€˜Ô(]nÊ Û?zq©†ñB–½Ê5ဂQš=ZcF †[uo‹‚E“ÇðÁT8æ-…A>eýLˆDa1>¬6E¤\º„‘í/Ü¡ò±Ù´¯ÞÐÅ –Œ0ÀhòI
XР�ƒ¯‹HÄþcºŠÈu³‹ÝÙ !d.ÐD’—�¨nl3¬C4"»Cºè9þÁ}ð£ˆF<"“¨Ä%2±‰NDâ>–Å'R±ŠIœ¢³¨Å-r‘û ¢;øáŽec'L[é B:�íBxé×ëZ(¾îa.\AØ8�Qu¤#}1†2ŒŒc#t†,$"‡‘HE2r‘‰|d##	ÉIF22‰Œ#iÉ…n“�”¤&ÒÇBj²”že&¹IˆD²’ ÿ¼d)UËQÒr•±ˆ*#C�e$CÅ›¤B:	Il`l¼c
g71¶³��Z[^¤Ç†Äí-
ÂÖµ1§+ô0•Òº$ª¢~	Æ2˜‘^$ƒe\È2èrªf†31è„L`¸J¶‡ÒRÑ'ÿ!’U^0#ÈpÅF1bÈaÀô´ …-nq‹YÌB¯}½.p±×ZìÕ¯‚,.fAØ¿ÊB¯²ÀE-hÙÇÎB²=l_gqXÉ–�½«-<‹É’6´xµÅhñzZ\ –´“ígm�ÚÙª¯¬íjg{[Ú†¶·£}íniØÐ~Vµ¨ý-hm!‹W2¡¡XcÎÑN²Å!aäB„€

eô¹—Êèˆü%Ãúé‚ø1“b˜NX©…1ØÂ
|
†à
š`¶`¦ ¸‰›š ‚
Ø,C‘±MK5
¿1Ù=)ˆüÿßØ1,3ÄB,èý
„+pJ,¼Å14Z.ŶÂ/AÔ2Ã�
ƒ+ÀC,tÄ2d§DœC,¸Â9M!2€)•Õ2¸Ã*ƒ+X“ ™Ñ�˜‘©pJ*ÈE*øaé´3¤¡¥há2”áþ™J,°E$*ŒPý”1\b]"&ƒ©@†¥|bu�¢(†¢©Œ¢)†"*ž¢*¦"+®¢+¶",¾¢,¢+",¤B[É£$ÄÃhÄQÓêEa`�-„ù “	];¬‚:DÙë‘œ0˜\îÉ/ÀB1¬Ó’ÙSZT”2áëU7rãHE
À-†8ÞE‘M VWĬÞ'c¤
’>J	-™K-Lc$Õ¢ø`Ã
%9¦$QÒÐ]š&bôNê#!DP‰Uf–J-(_Eç-ÈV-Ô‚,ØBdUçuZg-ôVhuçvZ'v*—la§d‘gvš§vŽ'wb§,tçiIVd�gxn'zŠgwf'~Þçvžg‚'vîg}Ò§{ÊÖŠ§wþ§qáÕu’–,¼&JŠ#u5’C-xc“é—(ƒà Ù!/ØáTÑÐ
@ØYA€UFdèlVÄ�AF
ØB1,ØuR‚å�t…M'£éu㜙Ü:�Â_À9
ÜÂ…jí`„Û’�¥
ÄèdPUiƒxÿä&~
Ô	C”E™:Ã94±?1G±Oq£ì2¤<€ß5BËÔ	yfØTÔ1ˆq8bTØ*Ÿ1I�1jƒ•·ñGE†ä‚©(á
ïÅSh¿õ&¡.ÔPòp
µÑF…
P)Tïq	UÌéŒÛ4™Y	€8Ä>$K7àC�$ËÌ|Ã=|C�|r(ƒ²'“²(—r�ÐL*£2*ÓÌ6Ѓ<
oò¤4ð¬1³¬
€<ØÉ=dÃ,
5´0ÎQÿŽÕD¼�o>Š0ëÒú21
q&Ü‹ûeÎùgÂ}0�æÛ§½Rî=S:¦ÞŸÑfj&dö=6§¬ûfÜ>¿?{ÿº}Ý\Ñ•¶*ÊRÿþß4cú½æG&æ'}æ3µåo~Pfþç_>è·½c֯꫾éƒfç‡~ç³¾æ˾蓾á—>g¾c@ÏATžá;’žŸ“Õ,K:ò'|A°ÓÿJ*K.¿ózô7?ÀU¿ò'?öo?ó‡ñÍ¿ÿö_÷Sÿù:ö»ÔúK?òs¿ó·òï1ñËÿó—#ü#¿ýÀ
L€
À
NÁ.)¤i?4NÆ;iÌó¹Åb*OV0æ€\~!†˜a–q¥cŠIF™e-¦˜c$-†QI)­´ÒL%e4™H?Õ4™dŒÙrÎ#³·ÓN½ãËI0ºÀCu)mã0·ûT•ÕV<�ÕSØç|	'�-ácP 
»Ì•k-5›NeÝüÕÑç¬ÆÓ‘•Ù÷‘þÏ–þ”¾zéë§
þ?ãÏþ‘5±<ˆsêÏpÜ#&�N)VóÎTàxÀ&¨A0H`°% AHàAŠ0„,áMHB¦�…(tá	a¸ÂÊ0†-¬ámHCæ�‡8ôá
�¸Ã
1ˆ=,â�HD%&‘‰Htâ�8€€Š â¯X€
h‹]ôâÁF1Ž‘Œe4ãјF5®‘�mtãáG9–Q
˜Ã4f1‘ILes™Å””·F…2I�*T�"5©I7lŽJ›~3¥*OIMp†“œ«ç6ÇiÎr¦“�èt'6Û	ÏwžSžõ¤ç=×9Ï|ÚsŸøTç?ãéÏ€ö“ 
TŸr)¨`úÒOùÑš‘¤Mazә攧/Õé{ŠÿSŸu§C5ªP‘ZÔ¤õ¨Ju*S—úS©ªO�jS«šÕ«F•ª[µjWÁŠU¯j5¦£*†
”ÇH©¥)e_J#™¾ô¥5
ÊNÓ¤6u©-]ŒZ\zÔ˜žÔ©IýêMÇÚÿÕ¨¥¬e}i\ÛzÖ½Öu­i}k^ï:ؾ¶±ÕHÅV´º¦½n–µÌÞPM;¿Ô–vµ±}mm[›ÛÙîö¶ó«Üjš4ÂÓ¼¨6•aìJWšSí&î­	k^ËÞÄ¥”®ß=oLë›Ýò>¿ÿ
ðû[à'øÁy�ê»vJrÊh”ÃégÃA¾¿ä¸�AÑCÖyÓT¦@>)‘<à
ù¾GžòM‹<å˜b9ÈWóM¯\å5¯yÌ[>s›ëç'ßù¤pòÿ|è=çyÎ�NôN½Uè5Æ‘D•mB‹Ê›ÕÜqžm\d¬oÝÇ\×z×Áþu±_=ìdOr¥úüÌ'w¹pÉÿØÅ/~1Žq
ã
‰°×P
Ô@	º
— 
‰0ð°��å
º
ǦòÙ'®0ÓÚ¢m[ëROÏ
Ú$
•\
ÊÀ¼!B+D6°Áô
°
°
Âaî!À
6¯ac¹;µ3ºÁjó!ðAB¿�rö¬�˜Ó]ÿ·1
€2=ýË=ù”1«Îа`Õt®JñõI»Ìî‘,öM_q¯d4ª4ì 
LÓn¥qwÒ ”ºAdEÀ¡¢€&5B½
®ÀÎÀbEÖ¬à+
j?Ê@¼@xÖÁ¾@ÜÖaG�>7$Á ¬�JáΠ° ¸áª¡Yst£á°À
!¾ás­¡HÉ
¨À|¹¡¾“K%¶A;ôá\î‘öèJùtÇÄío»K»ê³‘˜NM•2µøš>eq'x/ôIòƒÿ-2„{Ò&�ñ:·¸
¨À.£àˆ³Ç€î�Bç68·}a·,£À¸óºA°`¸3ÁvjÛ—
žÑ
¤4|­¡!Ÿ xvQ)¡
žawûÀ,·€vÛVj_ÓÀø¢·
°!|å–Lò¥WJ'”Ê
¶Sêá,ômå–n÷GYR§1�KØ÷
€
´€�Ò€%%媢(sáôêfйkMã’0.T†«7X!/sMòt#Ê ½4†Q¢ CKÖ¬á”U
(!~¿�º
\“7H» ‚·Œ�˜ž¸„#A†'T"JU:´ÿxö¬¡¶ '¿Òˆ_r}Íؾ`‘shCÖ�½
ìò¢ 
¾`½ yQ×
’TQéA•c×8³“¡ñ
\­

&Rȵ‰½�¬
r
úrAø¯E8„CÒD¡ZdÁŒÁõ˜ºšødO™±Á•£•ž ®aˆ½¡Ê€GŸ@"�zG6Nv]E¹Ãà ¶"ÔvMõù@¨7dE¸
]sthi{t™z;4Wyð’øàX«WQû¡/—SEÉq°û8�
9¢)ž}Ìãþ“º³oãzºôTN
‹º¦
_ýÕp8Ó·JÆ�Ð�a)—P:�¿àì2ä;® °À&Û¼à
È zŸ
èÛ
Ð`²�sÊ`¥Ë@´À/ÙòC£à
¬À
Ì ”	œ¹»@r¶¢ACÕ9ÿC4È€®€¿õ€”7·àÈÀÈÀCÓ˜I™ ÊÀ.ù€7ITÆEü¶
¶ ’´H)’	Î@Å·

fHC°°(DÁcØB!Á@©-„Ám[Ø‚šH.ìp¢;Lä):Ñ!ÿ”Ríì�>:Q·yÔ¡‰TèC;ŠÑ”îŸ,µ§K[úP‘vá	YÀ‡©öAŒ/zs‹�M9¦š•ñE8â¦;ù²4þt;êifN–ŒÆ@º)ªÍR‡Aüg«\íªW¿
Ö°Šu¬[ǤbÖ{4­f=«TºÚV·¾µ)0�IYÑ
׶âU®s5�}dbW<†Ã¬qkaÉŠØÄV*Þð?þ�S‹½Ê©Aªßæ¸Ùͤþ´s™Uœ+
˜¿j†î2SÕMAx!Œ_`¢æø‡?ú
ÛØÊv¶´­­mo‹ÛÜêv·±Õo{ûÛØ¾ýmq‡ëÛáw¹ºEî>ŠëZ@öÿèøE3Ô�lš—ìÜnjĸ‹qñG:•Õh«è¿^öVÆ"Æ1šUÊ삺ä@:ÈAŒûæ—À
�,xx}çJÌ ¼Àðà
²Bv›Qtxv¸`EuX"h#H‚%H‚&ˆ‚+h‚*ø�/X‚Çp2Hƒ·°‚¶
‘�6eÏöŠ�Ñ‹þÇî•SÉ0
ê0
A��ã2Ö¨µ°ï$ ŽU	�! mižã‰Žm¹žèyžï9žì	ò9�âxžò9Žì‰Ÿî™žøYÿžä©Ÿó	 ÿÙžóyŸŸç‰ üéžßè�æé éY�ê) ë	Y	=HUØò“ŠÁŠåTTäÇ2°
�äXª *ÿüø�›º©æ™ª©ºž°Ê©¡úž™�)«îh�¡«û˜©ó˜ŽŽ=`¶�{·{
‘ŠHbh—1@<y¢¹
h¦ÐÃ0®“é­
�¸¥»P
}v$ìÐ
€¶c+™ŠIšç
€
�ÉÐÿ¤”i’Ê 
<š}–{VD—ÇP¥‹”šªZ) èùÃóŸBŒ»EÜ
VÄ@¬ÄIŸCŒÄOœÄ?ìÄNLÄUüÄâxÄT\ÄV<Å[¼Ä^<ÄÀÔ‹ƒ}f#˜6“xwK9o¯Gwͺ1ÃÀ± £®�iÊÀ«0¼°
ÁšÔȼ
ò¼@®püü™ÓùÇËÐ
°€thÆp±àg›æΕ
¥üÏY–±¬pÑ|ÆbćFù®
lÂ3=š Ó5�Ó9­Ó;ÍÓ=íÓ?
ÔA-ÔCMÔE­Ó€
I²!èq¤%µ�¦ÿ^¡$~À,€®ðÇXÍ¿Ñ·ÌÀ*ýk
ËËà‡Æxd=†
=†6.y�dísù×ÐòÌÐ~fdÍ/-xÍdd­°`b´£ás_x×~¸"4œ×®p×AGzn‡€Ô‡8(U4Ìk—‡Ù™­Ù›
o9¬¯€’N–?›æg”gµüÂÐk$‹¥q˜ÇZl}Áøás¾ˆ+£$^ÍÇÙuY|&£½ñçfœq½¨a
82ü{‘<éÜÏ}‘~÷ÜÓMÝÕmÝ×�ÝÙ­ÝÛ]ÝjÜ{ËÞ¸ÁÆç,¾Ȥi’&©w
‘ÁP
àîp¦6r�–½àœ5ZÆpÜç÷dHà˜ô{hrþ*3)#<qx‡1<Ê°I~“FFÖ·—Ý„½lTmîSA6^tÞzp^æ!#æH~ºÜ}DrãŒ{²|…8ÎƆÑa^ÀÉ¢
à_6jiä ¦ …ä�‘|�†wM2Ë7ÎÉR‘¸Œ{õƒÿèyÎåæ­yÑDÞ“%iĸ?lNá˜È¹whëš÷mà�ê·¾n*ó½‹ØÀ¾*�<ìË-ì¼bìÄÎ+ÝÆë´Þ{ÑÉ#íÑîwnà�æZFÚ²±à
Ã

»˜
œ~©ë
Õ|Þì$
2LUëÅ×ç,BŒV´ÍÞq¤t›MØ€:2ÜÎôMïÿôs–Û¦]ܯ¡…îw}‹AÝî�
í ¨l¸nA�@ªExù‹=V^Ô$åÕ‡Ë?ÿYà›Æ‘+¢„@£Îh0H}.„{Ï÷}ï÷ø�/øƒOøAˆ>hÆ»} O{âá�Õà½e�¶�˜ÐÈàJ˜©tÆã‹J¨IšÁŒ³B|&g#snd.M»�+»Q<°±¿* ±Ÿ·Ÿ0pû+€û·ß)`û¼ßû·¯ûÃÏû¿û¸¿<0ÆÃ?ü0üÌüΟûÔ_üÇOý¸¯û¶¯üÙoýÎÿû½ïÆßûÂ?þÓŸáß<P
D 
–aqG’f´ñ¡Íá_Îÿ"rÇHåNuŒÿ®$k§«X±d“¹*ƬÃe˶‹Y0XË‚m<ÆJ™«�ÊxS¦,/XÁŠ)3ÆËØÁcÉHšIRe1c	®ÜL£J^Q[6¬¡+WË(Êl§lÍ
1D¶@|kÄ8LqEÐü"ŒÅmÑÅM´Q´E„ñÄQäEuTñFcä±EsTK…[zMBÛ €˜Ö|é*œ²¼Ò¤dàË
­äA«]­1UcÚÎòvgºŠímìÔoi´³°…ÍKŠk“-¸78Y
7|`”“T®}’f¿òUÔšKÅÕÄÍADbàÚÆ8Æ£Ri1á+$Á*Þq�yüã	3˜Áð:…\ä#‹KÊQ	H˜1Ù#d\Rn­¤â9fÙ«ëD²jÀ¢%©„YÆÇHM”rÿBÔ¦3'æTmCš¥}ÅÚä–×¥•:_8á¹NÅ’øg?:€´ 	}è@£ËHÊ£@ËÚŸö-Ò“¶
¥-]iL_ZÓ™æô¦=ÍéÜld=•}Íe÷K›ª|°>Òa�ŒsVŸž™DÈ®žPyZ³1ïf=#
Κç|Z:Êy˨ݙø°ÂêÜlKÖÂ8G/8w&
Ö^XûŽyœíÿ„×uÆwoè“*
Ô‰¢›3cÃËó/½s@%[�Y«}#.:1æó»§36ÞÚ$
¾+>英3@Ì2>°�56!é#6d¾á¢£
Á9R<
¬¾Kâµ
¸î;Æ6„>4¶œ°˜K?NTB–\
SÁ:+Ô·°œK
t1Ëãž7Ü$�¼|«-»Eé«H«àž:ú˜0´0Zù=æã5È‹H§TÊÍr5.ÉÍì°ê¸Kyð‡Âܸ’›?´C»×‹½|(LTNÖs¹äüEÔ
TK,ûÅñ<ÅÜlM
BO3Ì[;‡qˆ6{ðÃû{P�P	½?ž¤ÐP¬ć�P=…
‡„ñs³ªIŒ¤H’¼‰{Ó°Y±<•°$ôdϾë-¿A5…<…K¥<'`Ì7‘œ:;Æ�´È­(ËúlÑ{5DQ¯¢¼	»	¥ÏKʯܰaÈrÈÒ,-íR/ýR/%r0t@‡_@.S0=S'Â
_Á!SºÁ‘S�ŒK%+:ÿ”<ìëÇáQtCZĤ�Ú0ÿœ3ÝèÑ>õ™ë¤7Ì™áÚ2D½”FÅ
ûS”Ã_”5œ‚Í[E�)u[O¦„H�ü*KÐ:T¼…EÞÓÔÔJ€¬ÓXÔ7kÅÝ<ËïÛÅ=žãÏ´<‘L¸2lK"õ»Ž\Ò•£½‰:KÃ;tc°IëBÿSÀíìÔ�$¶±4U9ý€ëžÃ<I=ÒÍ”È[aMݼã+P(µ
DýQTå²�¡E=ÖìsH«ìÎ@eR‚|Å=å·fÔÌo%Uv½��ŸÊ±1ƒmqV¦Û±
K°ïû*΋H<‚3¬X_Ä·xåŠ,TÀ{Ýѵ¾ª(Í+s·}É_û?s=Ù›éÍVÿUƼÊ};-w�ÃàB§,S¼Š¤Ó	YØ›: 3K±	ûŽýÚ�yÅM%!.ù,{T¬Å³¬S±úѯÚØ—í=�,C�“>øŒ’µ#íÚí³Y3HïAÔ®õ5ßÔ¼¨Ø«ðOY#Á�uµC]:†õ¾ú”Õè«XÏC …Ë\lXqûÑò4O}ý;iõ0%Ã7
Þ°£7¡|µUE
)¨´ÞÀ+KŽ…[J-ÈÝ0‡ìa[QÛXu¼
CU�fìC1?&©ãÓX$5²6öVSÆ>Ùd¾Îòb™�À¡;;Z‡Uè%ÚäK0¤eh›h‰2 }h‡NZ†~ÍŠ¦h�îh,‹è�é�&i“îh�>i•–h‘ÿÚ•î,5©Žú\�±:›¾iœÎi�ÞižîiŸþi j¡¶º¥j£>j¤Nj¥^j¦¶:ƒ.Šþ‚lA™Ú0@œ²j¬¾j­Îj®Þj¯îj°þj±k²k³.k´>ë­žêyÙª´~kµ†k¹Žkºžk¬
¶®êºÞk°
Úo3'ð5Wó4ó— gŒ?òös
§s
uO 0×ó/ö:oqdóI÷õ
BŒ;_s`òXŸðü¡ög§Œ»0ów nÇõ[wpwq'q°Iñ7§ó8¯vÇsvOuc'ó3op ŸðFïrzÿôjwòjÿô×õvïskwrcçv]çwrOørWx†Oô0ß&' 
_ _Wutÿv÷&ó§÷hÏø#×øŽOöX iÏòŠ (_õÿ×tÃÐõf_x˜ox™�ù€Ÿø/·sh ‚‡r,öÊð÷_tŽgôPwtΰôˆ¿óÌ x‹ïùoø”ù]Ÿø’ö	§ù™ÏúrÇ�� K÷ö&úŸß°už¿ø£‘tWoz'Ÿz”÷y®±ú‚Çq!úwçò6—ónçóy/ú¦9w¬|­Wx¤Ñ±�ˆ

Ð
fÏ¢*}>͹TçO¥HWö¬Ù’¥
®N�í9u,Õ²dÏšM‹v­Ú¶g¯ºtÙ5K¶+6ìX±dÁ’	ó+8á†÷¬ìááÆŽQÆê¶,Oº`‡^f{“hÒ•Q¡­,š³ÔÉ3•ZÿZšig¨Ÿu®6-[óìÚ´oOÆú”®\—�!ðØo.x¹„
à厰
¨óuNX€
ÓJ2Ë@Ý
eT¡R&Yhn&Ô…±möäš·–šë­bh)Ü•W2±ØY1É°Ì_ˆò2 at 2Ù蜲ê4ûÜ_ð(L³¼
ÌÑŽ2ê ƒDË´ßtÂÀÓ*ð[L;œ0£L1Ë0ÃËÆ˸"q;ÃãÊsÉ´1'ð0s̸O¹:o”ûRve~XŠ&gﶕÕiXq¥%­4óK´Ñ´uÿá¬$a2¯Ô‚Œ-SËbK-ÆØ‚õÕQÛ¢
2²ãµ*Æ SK-°Ø"uÙµLͶ,egmõ+Sã"-$x–7©µ�V4¾’é »ôµV*½y_ë¹G3î7ãE�à†"tå�
Ü
--- NEW FILE ---
GIF89a¹
ð

HI
›¡¢š
¤¤'‡‰)™¢!¤ž$©¬U‡ˆh‡‡eŠ�h•—tŠˆv‹‘w’Šx––z�¦w§©ˆ3�FŒU-˜d:°T¬Y'ªc,©f7·d)¸j7ºt;€\D�lQ„xf‚}y–|f´xP®a¼`ÑZÁ\$ÙhÖt-ô\
J´¨Ñ£H“*]Ê´©Ó§GU²d†ŒªÕªT[&{¹•eW­`]~E6våزdêM+v­Y·l߶õÊîÙºtçÊ]‹ö®Þ¸y÷,¸¯ÝÃã¬ø¯áÄ€3Ž¼˜0eÇ•%[öË7³gÌ ;‡¬¹ôgѨIŸV
:™kbX™e5ë:ÙìÙP�Ê–ýRªÊßÈ€_雸ñáÈ‹'?®¼9óçË£;—}ºõêØ©k¿¾=;÷ïÞÃwÿž¼øòèÏ«7Ï>}ûõîãßÿ¾¾|ûôï+Œj1Ü+13oj¡ÅŒmfõçUVÍ
º«àM^aKjŒ‡ ®
,”lðÁ'üâž~Š
_l
lÄØdCO6ØÔJä‡T¬�6Ó¨J�6Øl1"«bFž\xœM!&‡\�ã"R3‰-kƒ1~~ѲŪ’*´ÐxÜaHŪêô!Ä*ìôÓPG-µ‹êò£Ï>Ǩ´Õ@Ý;•Vóî5…Èh9Lc©ôŸÚé ÑFj<õÜt×mw’w˜<¢Ä^lÿ
+Š_ðø·­Ãê=xxøÌa<ÐÙr"­wñM÷=l‹�Gl2Ä´Zn¹Ä—ßmú騧^mºÚÔ³?ÞTµo—É
k¬‚¼
0†1]°ƒ*)�ªK”�adèB6P}ª30LW²?T™…2 º&]´cÞ8†.2éŽ\°£·xF-–¼äá
ùÆîO3Š¡‹ªè¢?ÿa†3˜1ev<
C'w—n^k,Bá(H„Â=0ŠmlæßØF)¶±

,¢¡à€Â{±‹]Ì@áÐ:Ìwá‹tLbÁ$àÆÙ�wXæšø±3Ž�§À@PøÒ‘Ž7/¸Þ¸Å
'
fP
ÝF
)�‹º¸« vÆŠv¶°`À	0×ÞÐvªP
 p
.p�v
&@Ž

ÛøªÀxFÎp
ñˆ@Ž
oùÊpÃÀ!À•–�”ÐYÙ•¸�ƒtak¶3lš$Y¹!<¡kZ’MGdƒP1;dÂ%'ø‚0ˆƒO‚`ÅU’tDµƒ˜nq&…
¯à.³ÆHÚ´C¤U(Eƒ»D“Æ�b(›�YM,±&½yl]qš3YM®ñ%X±š´Ô;=a6ºNœ$œ»vC\#F³!›Ï–T`‚š¾£›^&›\Â�<¡›Çÿ㟞eÓ »	›ÄF_Ql3è)áF×Ußt¿Ùe.�j2!‡D '& 
ú¥’)lp:øžl
 yº§:q§:¡¡VV
²d[qJ
ÿÚE„ZI’Ÿ\"E5�6�H|z�r
‚‚Ewª�z¦}ú¦CtD¸
ÊÁÙ5T3“
õ`1Ÿ«³Z«@s1"c«¸Z«õ@
±Š«"#««r«�s1»š«Æ
«Äz¬Àš¬Àº¬ÃŠ«±º*É*«ô
!î9ª;§x¶A©“y²/FÔGcÄžÂc6žÊH\’ªOU;,áxîà
3£3±ÿ

*õÀ´£´33ß0%Lë´;;´E

¢lj¹Ž™²`ªô‚|+w˱-
˜*l•
‹6“»°Y¨# &*�øYaÏ°f¢�^ë`ô3S´E{¶g».Ð*Ñ;½Ê˳ØKÊÛ¼ÚK½Ò+µÐÿ;3׋½Ü[Ê{½â*è;½Õû¼Ÿr½ð
òèFày®xR*¥RóØHL/\†MÜøÉKIÌe û»t�?�¸Œ!D}j®L°—ûk»c&³Ã¿èú¯,DÃÃC²yë±kìÈÀÂE~˹1üG#;»qú -<»óÚ�˜z»d¨|Èz±¤ÿKÁ6Á ãš;^£˜‹AÈ=¡¹ƒüºÃ„´k¹ËƽËI5Ÿ.a|N…G¶Tµð
Ƞʬ¬S­|<¬¼LÎÔÊ´<K.u˳¬I¶¬ËºìO°¬Ê·Ü¥³¼ÊÀ˯L̯
C‡Õ‹¡ ‹àõ]çU
ðåîìn
¤°
ÖP
«�_úe_ü`ùÞ¹`ÿž
wÑ@
¤¸`n ý0ÿ'
Ú%Œ[sðsæU^Ö°
gï0—_æ5_õu
e§_»`ó`ÿ_Ÿð½pÆPð�ð
“-DÖâDŠ%B”˜‘áƈ5vYqâÇ‹EžD™R¥E“!+–\ɣ̘-SÂ|9’£J’;}ºD	ócК2qE
4©Î™K“6öj³dÀj1c6€³„«BMvt¡2dÉj]íF
=yk«¬‘²VÊýük«ìßïu_ýüÆzõ2Æ—
«"Wj¨\Üq¡‹nlŠHU
’¢$kzÈ+'j¢&cÌ)¨›*êJ¯b”¨ª)�kH§D:RÊ›PÊqJ¿D&ʲ˜‘
FevÌj«®nÔr"²:†!
“J!:ˆÍ4‡u	N£ª©$6Oº(IPÇıF�’T³Ç²*ò–K‡Æý	Çq§l(Ïs¹-Ó«‹´ô–Ü%•z1Ui³­ˆa)ƒüw#~EZ©ˆ¥²I¨¢“
ÒGž•8‚Q4^â&—°ABq[-âX‘Á³&)�yɘ…YÊøŒ¨ˆQÉH&uA‹Z8ã’®0Ë%kQÇZPRT©#á\á#WÌia¥.ÞQÇ‘´+ÎxD”qɲD
—Ùå¶ÈR•af­—KCæÒ’†LbB�}ŠÄäXRG/)ÿì$n¤ñEÅ”ˆLˆ†ÄˆšœÂºÞÎv,„á6I'ÈÆáH[Ý‹
ßU¿ùÁNI.Ò’�ˆ¸}®aC¤×9§à)o%aâòb2b
R`”OcýX3xáv€ §_ë¨/ÊgR•f£ÉÔÍ&ä1“2ÃÿÅrJ�rÈ#øIÌ©6¹'ÇdO†! Mäò¦Ni=qt÷º0F¶	LßgëȵÚÐVI²º3çäÞåÙ½³�
5IPWT+ÅLh‰´Jy²êÒ\‘3g°b
}jä2fO[È2Éy„šm1€1Eo`'
´
ÿn
@@Þ1€
r 
Å>;D¤��I‰l4œ… 5캊¥˜¬”A™=²©4€*“îZššQ"tY!,®°h†V��JFB‚¬zŒ£AÓ;ŠqI<ˆœ4ÿÁÃCÕ
92ˆ6”£gPÈqù‘(ü¬pÔ³'É–l|¨¸#d�8ëç¹#áœCó²˜xÆI®�p¢F6±Åõã9¢
žÁ9kcC>Š‚„Ã*º¶i³¬“ë¥t at CC™�\§³ÇDqœå›.Éœ€Á´�K†ˆTÉ¿[øCCN¤ÀP|3ä	­ÐÖ‹¦j/j at e¹´Â#°B+I2í
¬˜“ñ
ÆÂöÒ��lv€
‹?á+3)VX²¡É«ƒ@ÿ­Ÿº®Â²™«?Ñ…¶j“

²f€
2R°÷

AÐ?¹:–Ê@±™©ŸVðÐ}!š8B™€Ï_hXûLºBgÐG�€'É
ͪíiˆ3¢N
‘€�¢f8Ì
0cUÓ
f‹Zÿ¢Z3µS¸ÕÉ~I7¡?,ššž(>6â˜ç"5Sûelˆ˜ô‘˜¼=dø˜â"­°=˜Ñ1Â¥‰½²Èœ…è®gX¥ŸA0gõ�Ù2b`HˆƒÐÈî2¯­â*#{°vP…W›µM»ºŽ £9��d	ñP„9”éY_…È\ßEÙ
ƒÐ…0Iˆ~�žÉÞßLÓ¡AÅ-Ë�Ï-¶™Iºì
OÃò‘ši%ˆMÒ­V
\‰\ñ53r,šˆEm—Í­’2š!¦Z0#ZEàø]$IĨYxÝWI9j…ðI"}É�	‹bR
É"à,~‚UËc}‡ûZØUq….‡åA¶•×LN¡ÄŠ	Ód‹”«Û™7NÃ"³ ¯=‘£ý¢Š><[Ã…¢™á…ôf½¯î
š¸Õ™¹�™dîH͉¬E’EÖqç 
5Ñ©
LÎ¥»Œ?«0;;ašóË?tĆ’�2z�š°©w솈rÅæ¤NÿF‰bÃl¯+"*±;ÐfMªw 
9†™

$c«aÀd½…
Ȭ
Ó¼»Ôü¡"Pv8úyðNª«™�±W8þõÍ
dCOúôs P\ˆ‡E™”Q«MÖ*uNÁŠŒòN³;1kÍ
\Ú°p^j½;@‘R™Zκ#kЙ¢êÊV†—zÑí“åŒ?ý£Ò°"\h‡
ëñ†Òä+Áúžcxë6ªcèªñáh{E0y
]Hšb(¥	oáæÍgÈ;®€;ÿ„�¡‹”¡Y® qÀR£cزh%£‰ˆ�™e”S‹Ð¨Ÿwh#Ó2zG¹Ý^‹ˆòÂò³”k݆ÈO‰ˆU!#³x02'6™qy
V2K5:㎑–T+C1KÌÌ¡Gº8sQP<%Œo<eej©¥žj*«©îש®ò40«¾z+ª¹ªz©®½¦Š*~¿þ:®ÅæeªI¡
ë+³¯¢å+~µ%m¨—NÛ(¦Îþb0ìèRyä™	éL?â÷wä‚å¸+וŠ¾äãVqeZ”™ˆ
6¤¹>9öa{õ6IT¸%R·ï»âí4$3fµ©éTp90fáÖQW³åÕÚ1ìŒP=ÙÐ32=Ô€rÿ6Ú¤,rÈ*‹¬
ÉÙÔ#r64£Ì2Î(‡|sÍ#«LÏÌ0�L3Ñô¨³6H-³Ë6×LôÓF¯Ì2
ßw'®.ª�b•^“XÑKR`?UÜùêgÉÎ{¿£®:Y¤K)â�4ÝÞy�Ñ.^xùÕ1Nz‚cщ–qÇ”à¶6€,r=õ|C
T
íŽz¾²#©ÉüÈt�‘xü=Õ
&z™Lä…ôS;s¥§>;ÿ�
Ää®àá†%ßëM1ŠñŠcˆ
X÷hÕB�5M‚ÂÿW‹Bö„GPmuTÅÅ–Kê†:J%T]yô’¶ê;ó±k\ó:S—
Sq5¬R5Åö®³ë]#›&ʘdM�uki�A‹FÝ„"Ç“*$5ä#ŠmÇKcÑÎçÚºGÒowF	mxö¦Ó²U©J	íR$%ÕIšu'ɲíL;Ú@éNI»M’I’
Û¶ît%KI¦f{°­>׶ª”¬{ÂÉÞv)•ië_�Ú[$9Ô#Äu.qw›Þ¬â•½õ]L+z©Ky†
†9lcÇåÇ®R0ìüTa]YØO�ipH0\aÿj¾!N0’{¬`,kY/_^s•§üá’Äžq^XÜ‘(ÛYÆ(Ʋˆ«$,ÂìYzNŽñ›×l;!ãø-C.s°|h8;ºÏq™‹r’Kd°ÒÅ3
“¥˜ö„jZI3Œ"™¤(#*­¦HT6¢dȺնžµ¬ÅÒ”UÓÚ#¹†õF‚�™Y›S¼>v¯…]ëX»åÕÉîõª_}ëaCûÖ²^v«ÍËjÿWûׄÙ5aŽMlbߺÕÊ®v·Ã­mº8{×åÞö»©½m¥,ÚêN7¹a
m^/[ØãævR¼ÝT±`߶´™]ì¤Ü$ׇuÃ|-ï†ß[â°67´Žp\[|ÜìN÷µÝqcßú0/¶ÀC>nŠû{ã*�÷aôýk•ûã/‡x¶£½êz«åæ
I%ý`Þ1”áÑÞ–ày¼àUTHX�HR<‡ÈA]Ì�¡–á’áša¦!®¡¦†ÂaÊá‚!Þ¡æ!Öáâaêaâ
"â¢!&â "â"*b!6"$>¢$ú¡#Rb$Zâ$"&n¢&v"#fâ'rb(zb%’â%š"(–b6+¶¢+¾",Æ¢,Î"-Ö¢-Þ".æ¢.î"/ö¢/þ"0†È.ålC1ã%V²-£26#3>£3F#4N£4V#5^£5f#6n£6v#7~£7†#8Ž£8–#9ž£9¦#:®c7&‡¦<NÿD	Ÿ»x=ržÁpÖƤÃ",´A¤�@ž�¤A$B&¤B.$C6¤C>$DF¤DN$EV¤E^$Ff¤Fn$Gv¤G~$H†¤HŽ$I–¤Inä¤�
Í4àA�rÁ}&(}"Ây®gÍ°§‚¶Ì4ÂÂÜ
{(b§Y^%sr§vJ'w’hdb'uŠ%‹vç‹V¦‹Ž&Švæ�Ú¨wâèŽæèQªf=ðÃ>¸¦õaÿ‡
6`Qˆžó”ßÖÕ3
lÀb¬Ä^lÁnlÃz,ÁRìÄf,È:ìÉVlȦlÊ–,Ķ¬Èª,ÊR,̾,Êú«ÉÚ,ÈÂl¿âìÍvìÅf,Çš¬Ï­ÆzlÀ~ìÈ~¬Î.-ÉvìÑ&-ή,Â*¬Ðí¿^­ÎFíÏ>,×~­ÒjmÕf-ÔŽí×N­×¢-ØZmÙ*-ÙZìÖª-Úší1øÂ10ÃÝÖÕFØEzàŽ  ™R+f”ÿ­b|DoøFâ.nG0.G8.B5®ä>®¡Ano\îäFÿ.åj®åN.æn®ær.èv®èŽ®çš.ê~nè:®ê’nëfîç’néÊnì®í¢nèòí†Äîânï*îíæîêVnðÊ®î/êòÆéoé2ïìïæöî릮ï.¯ôVoôbïóbïô2o÷2îñBîÅ®ü1!‘¬È‹�ŸM®–¢…3t
4�˜§yæšrÁ¨iþêØ

¯°
«ð ÀðBÐ0Â
ÓA@Ã÷0B
Fß×�‹>›à>³Iøó(	û>ž¢¡N,¢Hß²G«ƒ2(Ã1À¯d@ÁOüh4›å¦yvA¦Ž4
ø
˜§œç¨
§pÞÁGAàÁLŸ§‚ÄOü!à�OÛ� 0!ôôÿþÁPõu¨B!
<|ý(
Ï�õ7Vó�ó·ðõÏ�ö¼
ö_ÿZsÔÁÔA'ÐA4èp,ñàðùq4À
(±úŸÿüó:ÿWCó?@|X-Zµ:?‘ªFêS¨†IEŒªÔ*‹¥B…Z¥‘£E�5~Tõ1×*Q¹z¡¼µ*Jc%UµDYÌÛ-^¾r+–óÁ
ÔPÁ-´Ð¬ÜFüÐC¹úk®™c1·Üþêÿ°«f¬D[´±­þ¸*]¬Çu$’«‹DÑÄ™0E
¿Š«2VÌå
¾©‡ži§µ‡Úk±ÍVÛm¹íÖÛoÁ
×[{
—þS(eÓ,ÅbðJ§„i롦l
�þ:Vm¦DQ…*òÒop£™Éˆ’”µ@Ž)Kù#T²å”ÊXe†â‚UÇ”­œå)#ÊÌ°r1‡!Ë/M9KSî—¥¤¥`ìR ]xï�=•¡×¯ƒÍš ò¡$k'å”OGØTKùfDR!r=y§o$Eé)iD[ù•7ÙY¼¤ñËxegÅ¢¹¡¡É“9ÛÛ�ë�qŒ		‡K‡26U¦s*Q�ë•Cªœkâ�‘V2g6oFIäíÑŒmaâ+)§=‰QÃ^°â—”Rí)M|"›˜œ+É4š5u•rˆ>ôÑtœ¼ÃéL{ÚÿD�e$Ø #¹¯ŽeQ~.½ÓïÞ¹Ð)²™VôcBË"G£0hœúæ®”ª+ÁÔCî‹Ç—½Iöˆ­
jPŠ,5™ZØ‘ ŒÒØñ¨HTÿ=/‰¨ƒ©$Ï™×yê”OUZa»šÕ½¦3T´©Í
†çnú€¸
¡–0ôàü !�aø`æ ª�ÌŽîæ çNè°AÈŽîðŽïê ïä.:á
 ¡
‘ ªá"OoQ!F�òâ
ª� "Ï‚!>áH!ªáb!8Q!®aHáó¬aJ¡I¡¬aHÏ,¢`ñõváõpÑ%t¡ ¢vâŠÁ‚Q'~£,‚-­ÖG£d,xE©ÿšÑPž1Çš‰¨…õ
Å ‰›<R~Ï¢ñÁ‘·qP|¬œÌUÀ'žŽ$L^!/D�
zð&à¹@kî¶À, q2
,
ï`
5’þ`
Ò¦oè ²ìø ;À!Mrü
à€ïà þPéÀï A;á²ã±
@ò¬á)3Ï0‘²ƒ¡v¡`^ÑzÁ#®¡$Ö’õnñqñ%^Â|‘ÿy1¥ã7€ñ4²ŠØ®¤fˆèÐEh–{˜è£ª'§†dE^G1ͨaF¯@¥ÅˆìªR‹‚…c$å‘ø¨Æ€Ñ(£:ŽŸª¡DFŸ€h2+išøJ2kgxfL×8Ïö'2I§d„*�)EØASh“IØ¡{

8)æyh­+¨yv%ã,ÁJ/\ádÔXtá¦OeÝ
H›!š�žA+º—°a>3Ÿ˦T…JsvyRì,Þ‚-¦‚WŠT i™vz©·z­÷z±7{µw{¹·{§Wh Ö¶M>×[c§Òª4Æ$éÆWDì5Oj­©LpgfÿÕ›ÊW]{Gê2C³‹J]÷…aÜŸ€Ä~‘bÖOÏôc©B0e¬yñ„cF—™Ê3æá(*ã>Þ
ÿšÁ0ºbb+àºD1dXA›CXaXá|¹Â9XaX�m¥Ó´èNfiDJÙz„JÎ<l£-”ÁX!„uA
y~E�)xNÚ	­º‚”CaäÊŽ&˜\9µG˜J^LL]¡:
äbß
4–X†A &ÄÈA;
¤“€€!—›�Z�Fxà)²Ã'²£ŒB;t-ÿŠ�r
Ø!€tÁ.¶7
M‡(`¬jx�)K
ËË‚ŒTå˜|ÞBÂiEߤ6¨b2&=”©/š¡<ìðC•Oჵ5eC8wç�×\eÉûü–›
Rö9šW•÷ƒÿB£zé.€áÈ:’ØP-gªô«jS=Þjuÿƒ:
ØÄPÍ“fjvŸÆK=�§Ù§YE]Ｘ
þQâ¯Èp¹lŒŠÔv;‰:ÐÍ=p¨ž¤ªaé*+ IÌC·€jC3ØÐ$E at HûCBÕI˜Šrø]¨ç‘O›VmGZAUØBÜAœ›ÄÖTÊXÈ¢Û1™m
Ss	J�½: žK„7¶,ff4Ë*¹ÙPE†°3�Øý–·)—CFœ¥»�
ø›W©ýü©xÇ×T_ÿBÅÔÜ؈ä]Ìïg‘ûâad�›Û«ÌÜ�]Ì¥z›‘9Íïý”�Â)ë=[±±[‚ÕÄ5m¦1ûƒ©Gw-’u%âÑ'æQÄ°Ðd,W| �
Ût8Ómr?÷´ÃÑ°Ðœ¢ŒfwLÌ0³{|ÅS¸^Qôx.*›
%w(m­Â~‘d†D^Ûaǹä1óVh~Økì´§gÎÇ�¾Ô]—̈Y}‹Š}çI›&>N@þ’8_Rh böÕ‚&Í‘�¨ã5è¢Ã´XâôÕŒÚEɶ"4B8� »T
ƒ:<ÍV­iœ�I?Ljó-^ ²e?Œ¼a3ˆ[`…xrî­‘Q–ìÐtÜ»e&²ça
XòŽ.Þˆ@uÀØ—_„Ã�3!‚é5@3·4à‹ÎÇŒ32=ÓÎ/
�‹3óŒÞ'@1õ¹ÃL.Ê—Þ
¼ŸÂÌ´+§*…6:_9Bè*
üLž
a
]MºÀxL.ì
}ôº�
³^¢ù *!ã´M”2^‘ŸkI5O÷R…ŽÝ¡Šy43;]1æ¼!ZiˆFÜY +Þ–KUÛYZëµÔIYÑ¢ÙvÂ>ïK ¾W¢è³9É„ º®‘1µ]‡q—‘¬íÊŒŸ¤RGCñaìœ23u:ß ^`±c�"š�ÉA

¢…2Ó —…—0�yM£_‘"4s&|œÑ4!®Ó-BvEÑ"²"c}ªò>M“3M
ׂtèXC¦s²Â…—9ŒX÷Æ{’#B*n±‹‘N	¢#<WQéqD€e!‚¤$å"q•aGòX(-Et.2@Ÿ,Ïf<E’%€+×Â�Zwt±�éa+ &H†B\Gq
£ñ@ÀNx
ó€ÄÕ(Å`ƒ„Ó4ÜwS™Yöã
ˀqǀ1&
h&Ljo8•Uâ
ÂÇ!È`(€E0ª@*G5
žž¸ %ê¢èé¤.*y±az¹É HŠèIœQÃ9M1‘£z¹±¤Ÿx '*à9IÚžF&2ª¢fA¢%�¡
™T1yA

‹|Á8½j‹��‹ÉÁ‹æ
©‘*©“J©‘º¨ŒZ©Žz©›š¨œš©�ÙÀÖð
ú
¯Þ%«½`uHKÉ�BœUz[§pŠ ¦8¦+
Š7JnªE*¢LÊŠÅQï)Š]*«©¦y


,E´çÎM ¾p—È u/F8
Ê‚ÏPQÙòjÆó
5:òÐ+cÐ�Ð	­ÐÍÐ
íÐ
Ñ-Ñ

¦æôË<š¢2š� Ûi¦­ÉÊÎa ëÊêK8ZþÊÉò¤GzJÀ)�£˜7D¾	œ7÷ÿäQÎþ*MPqMN±¯X$ÒÄÕ„±våÖˆÁûÚÕeMf]Õg�Õc½ÕjÍV$Õb­ÖÒóÖXD×s�Õw]ˆQEyíÕpÖ`
ŒAl­‹iMÔX-Ñ×{�Þásäׂ½vÒd×p�R�,RqMr�Öný×�½Ù{¡ÕÝÖT=ÚwÝÖ"´¯Á¬Ö[}§ž½–
Ú§
Úfí?iݯ^ÝÚ¼§cÍÚŸ½£·=Û +ܼ}×]ÍÚ¶-ÙÀ=×r-Ù’
£Ä݇ÍÛcÝÕ‹]Ø©ÍÝ–-×QºÖ�Ú•M}ÍÚÒ#ÈQƒS&ÉÌÊBñ§m
þã)¾†<žã'®ª0~áWÞåM¾âÅFåNà*nà[æHžâ^áN¾ßBþá~,{Vàžæ:ŽåÔSl8Žä[sæc®â®xúýço>膾ªŽ÷
uvÙÌcÌÉÊyq »²×û¾ÄÌŸo:ÊqaÒß«'-ÿ¤(Í�Âñ™š.˧Ì'û¤¾Ô¥L°BÝê&[ëMºé8:°Ÿꜞ¢JÚé¿®¤Â©�ÿ)Ì'{9ۛ뷎 ¡> ½^ëPV˶Ò¬>¿¬Ç½;Ý+Z¦}
Êg�’aP6¤KÊ œØŒ¾sQFßΧ§ÁŠ¶|¦˜çí�©ê¬yì¨ùÊdºyÿš¿±>ëð½£9ÜçÞËA�¾Ð.²«žF-§œž£‰-î?z²î®Ÿ¬ŽÆ\ɾ¥VºÉÁì¿uŠœ«ü¯Dª¥ }�]¤!ñÏð.íÔ®Ò¢Ãq¢‰³ïŸ\y²¹ àËí£.e·,ðzaðk:ž¯i¦*?Ìʾó0¿ÿrú±¨A²«øÒ@šÓ
%<¨Ã	#Œ™bªe+µÒªDøZdñÅ�`t1Fg´QFkÌñF{äñǃôQH ‡4²H$‰TòÈ%“dòI'£lrJ(©”²J,¯ÔÒJ.³ìrK/ÃsL¹*ÌÌaþÚÐÃŒ²ŠèÁ°ÞìJN3Ç*P!fŽ9†EI„‘Dú\dPB5t‘D}ÄÐD]dÑGM´QD…RF+”REÅ´ÐI	åÔSR
uSÿKKÍ”ÒQ#uuUQS}TMkítÖXY•õÓ\c5ôRIkmXS…Ý5X]U•Öd%VT•ÅÕfoå•Z_�]¶×hµ�¶ÒjK½Ül­E¶\qÏíÖÜbÃuuÜSmM·]tßUW^{é55P~ƒ�„œ4jSÁ�³š¨Í‚ùcçCöô\�8À
¢¥@`²¦¤ÿ†€i˜ŽææJï:ã.ˆ«»Ü￳
¼!¯Ž)Æ™�ÒiÄ
7Öø¢/*¯œrʽÈ|óË;×ÜóÌ-}tË9/ýsÌ?WtÔ[OÝtÕ_w½õÕ9—ývÏcŸ÷Ú;Ç]öÞw>øßg'^xàC·�tæ›/=tçY�^tè+Ÿ|zì³ÏÞtî¥×½xØ¿G^wÖÁ'_|ó�7öåÓWÞ÷ñÙ‡ßýÓã§ý}ûS_�yè·¨‡ŸzìãìAXèV‘$o\™ÉX>D'‚U$+¯8“ãÜp†5lazøëù W<í�®z!$aôÂG†0…Ú[áörWÂb/†žÃÃ4°‘�l`Cÿ:ÄF¿ð/|
=Ô"ðp‡&Ñ$Ä!zh
îO‰SÌ_ˆ?*f‘…/D!UèÅ-Jñ‹bãË8ÅžÐüÐ?¸9)d`
Dœ›Ä·¯à)oe¡ A,¹(òO„õë eH=çaŒˆ$ãÙ¼’¤“¤ 9FF†1“.¼ä/÷…ңؠXL¹Ä;1ô`%=zˆ‹qÁ†b-gy‡þá�–=<D!l˜
D¢t[°ƒ!¦�ÃiLãxØ.ƒ8Dl,³‰ˆ8Ä4¸…0ÐE¤fùB³‡¼dæù2YIEÖÏ{&£#ɘHJv±“œÿÜä!çiÏzn0ž˜T§×ØÆ7–E‚w¼÷&ƒæÑ€h¡àAŠñGÉ]²ƒçKçó¼~Þ“3¬d;ŠO4jñ£úÌâGA¹ÊU²‡Ø0ƒJzd£b¥»Ŷ ?3E¼˜�Âe+ÍÆ!~xm°~N©!J`Žì†8äÂäºP±ŸÆt©gó6bš�BpA§8dj(fN+’‹ÕcëZáÇHCvt¤üTâ\áYR‘æ¯]âÿô!Àú %¡‰²@¢ˆ(,„;ŒàbXÁèI+ɨÅ1
¹ˆjQ³›ålg=ûYІV´[ðêJ9:Ò¦”@¬Üÿ�
Ô‹¢´Øð&(µ�Rov�7¼í!*¦Ó˜N,ŠÖäno‹�ë-ñcÅ!4èÒëQ›ÆT%])ZìfW»ÛånwAûzðcûFƒbäŒA¡xd¬cã’P–F
ªìã0xZïæW¿ûåoµhܘªT«°¼êĹÓÂòx¢6lÝ"×zâ$bÌÒËx¬DåaU�ëCü~Á7äíJŸ†_fC§;œ†!’‹]»úWÆ3¦1w·Þ¿¶­'úÐW ø ƒ–!í­SˆÛÈÆ@CÚ üÖXÊS¦r•³«¿%f9z×\î
§±C>ب§Ô$g±ÿle4§YÍi¾±_Ã1"
¡E1qË‘+–ô`G¶ãˆ£Œc4¢‰C.ÆD':ÑvX´¢�èGCºÑ“æB¤+MéKKšÒ–Ž4§1ÝiGZÔš&µ§I�iT£ÚÔ©õ¦C}êV—úÕ¬5­a]kS?Ú¬Šæu¦wÝkLŸ
Ñ_ȸ€‡0HLÙ\p‚±Í&±Dÿ°ªfSô¯=1^[šÚ–îµ±“ý…_o׳^u¹É}nW§[ÖêV5º×ýîv³;Öñ†÷¼í=nyã»Þú6öþ@�ñ’×BêuÌÀ‡0D)E¶ÓAìœ!eÈGO“HG?úa�|äøÈ8Ç5¾qÿŽo<ã×xÉ;.ò�“¼äÿxÊYîr“£Üä+§9ÉSÞqš{\æ/ÏùÉkÞs�ÃçBßùÈaôŸÝç7úÒg®t›?½çQç9Ñ…>ó“óÜæ,7:Èo.ò‘ã\êCçºÓ�.u™Ÿ�é*O{ÓÅ^t�Çüêqw¹ÎÞs”Û=ìu¹ÞÕÞr¶ß�ï�ßûÊó.ö¿ÓÝïC<ØË>xÇÞð}G<ã_y¼Së™'|â'¯ñ}d|zzÅ1”Q%ûØ+�•�X
zp8©~Bp.{ØãŒf0oÊXÆ€‚•ÔŸ+ÂÏ
ñbüß«¨øÊ?>ó“|çùÒ�¾Š ýáWÿúÖÏ>ö—ïý惟?Âß>€ˆŸú¾�¿úßç>XÔ�þð·ÿ+ïýÝÏ}ø?_þ^±ÿüñ_ÿÿ»?õ@ýˆú¬­ÀŠ÷¸�ƒ�Âa½Ãz½�08ø@=�=ßË@
Ü@ì@ü@AL8®p�c@ÅéŠ9R¸�"ÅZ¸ ¸ƒ
‹‰È¿
„�WÑ4D]HÃ%‘ù”�bx…öÈÕÊÿ´PÐÍÑÍO­œOýÑ�›}CíÏ5ÒÐ#}Q�&ÕÏÑ�QýQõÐ
P…ÑåR�Rú0Ò
5Ò*µ½©ReýÐÅÑVp†v
xß	¨€$ˆÖ
&€(Ð
@�kPNxåâèìâ2Ø
Ë@e^¼�K²œ“´”ô�B<]<�êïµjÜ^ª†K„c |Žó:F}³2‚	ˆà±%€#Xƒ†â¸>6Q…_=È€Þ߸¶‚[�a, „;XL.è>`
W_ˆ
=ÇsÚ¯ý2G>6¬7¡j„à³?�êºqKêËÃbP°©É1Ìž\²$ÒÁü¡ÿ.Ì *Lì7ÌÂÞ‚ÅìdãUd7BZ%?èaõÕZíƒÌ,M?øƒÈÖÌÓ¤Í<àƒÕ´VAȃi½M6„i¸V€th� A�
Š6Â:|FSmB…ÔV¬­Z�jÐ6F”MšÈOÑLV«f-å'k+?‘²FªÚÌU4c^#µjÛ¶U«¬íä¹sתn»vÝ2ÖKÔ®^»Ò©2v¬—‚¨Â‰Z
s°Æ+ƒÌÙ`ã6ˆAþn‚^-œ‡¢W4¯„¡ŒX8µß¡Ðƒ,ŒÚ’¤y‰ÏF”Ó’�Â7>òåH{ùÓaîZGÄø‘ˆ?TâôR·#2±ˆá; þª(D$1‹E$†óÒóÇíî-F”"•È„¦2MéDÜ3Rô ¸#j©`T££8>9ðKN «'u†Dfä“^C¼í®/cÆ/žñeLÈé¨%+iÉKb2“šÜ$';éÉJî‚jq…ÚðŸµEŒÇkc
M(CêІBô¡
Õg8
IHÔ¡±s\]âûNª¥¥j7%L·¸¾óz¨�æ])L“»¥èâW»2©xƒ4_¶Þ”¼¼Ìîq·*Hp"˜}<2L"ñeHºt«û,b¿qX
UGL½Mq�'_¤íòv1}”ÊTå•(¬½Äoý°;ÝåÜ(�§ã¯™Æ|<4ÞO¹<õ‹Q}¸]ýI÷­¬c_šOÄÞjª¯Àx쀓XKÚmÙK‹æj
øÿx|^"t=�Í¢jµŒÜ¥c¾éªß&U×ÞÏj’Œé’r‰Î
O0Pƒ[Ô9ƒš§÷ý4ð¦f¶ô‘‹™¯Kx3™šÎå.<–ÛÁ*sW~çÎÐR �¼«éaS¦=}síÊàËP2z`�Åz¶´Ú0­iýYYÚê²N'-fêÚǾV¶°%,c�~uÆÒÖëËvl@¥ÐÊþ³K—-f	[Ú�RC
š…`û`¥ÅQœAL[Ì0<Î{é—J’rN9£YQþ-¡�‰æ™ÑIÉQÁýR&Ü+õH
ÉâíQ�\Iƒ!¡^�âúLPWÍHr¤bz¨¢7!Î+΋+¦â,Ê"¾ ŽÎ¤"œåb-²"+ò+®b-Î"ã¥äUÜnå—é’%ªŽÒß"~qñ¡î)b¹!üÄÙU¹á��Y5.S™,ýÑYn¡Ü‘Ì^úÍE—r	S‘ã”¼Ó &Ï”ÐãíT`Ò\pé™ñ
£=ê5jJ—¥’‘§2$ÁU*Ë-ªmê7ö¤¶Sªîá¨j*7yjNž*Å…êͪ©2j®:Þ¬’6uÜ1¢Y;ú}e\å”ZámÞ¤n5Ét+§¶Õ8écÉO+âa“XO
¶äHŽàJNŽ	9�¯v+·’k¹šë��kºjký¥k»ŠY¶rë9%¦µá4' ªã©EÓ´ÎÎü� +�ÚêœÕUÂUÕ›¹ÏMâˆÿjQzÙ�
Ïa¤
Š„ë¯æª]%W
ùjÛ|ˆ–ÐPa(!qæÈú|ä²êvã0n«�
³° DA Ä L‚BÈ0CÈ0F@„OÃGLCDüpDñƒDHTƒIÔ�5|BKЄL4ñL�B¯BÇ„Oü„cñ5¬B/ø„S¬ÂÿQpq/„±kJ/”±.ôB1ä‚1¨q1€ÅÐh*â�m*UìÃ&mèv.	²U-Wq.¯®ÄžTÚ�¯²YÏãŽ	6¡� 	Å®¬×ö±Åv‰s42ðØ]"G‰Ð¶­Þvn'»m(ë$32(›²(³'K2*×1(�.%;îèº2)³2,¯rŸò,ëÛ_(F
�ð£ð! 0 
èv(h1oqr‡±5
¬öV´„549L¨Ä* €
pZã/4˯ÍSzZO³
ÿ¯
ws7ƒ8§ºb½:÷�<Çs;Çó“p!¤p
;ý	Ÿ0Ôÿ:Bt „¯tWF,„
3q5ôXïnEl‚HlÄmÏÄH<9r[1PÀ4ÜÓ=rkÊ–7·/Š¦L…/ø‚.øý¥ø‚p”…/ÈÊù¬%Sì<_8þ¿¸Ô—<þäÿ‹ÿêåk ÇI>`èÏÞTàu% oîYùýȤÉÙ½zë–™<=2¼³ÿ¥Y·Nš6çq^ÇÇwä›ÂNæ¬ÄU˜kRª-IvÂÆ!ƒ~£Ïé‘‹¸^¹H�
‘!V«!2ˆ_5¬øP!ƆÊÖbÆ0bH‘	S,0‘+Y¶tùfL™096L™Ì#3�
?ÂTióe²ž"S6CI´%³d,?…)´åÒˆ?#öŠ¬'Ô�RyÎLÚ5êÕ�ÀĆJµ*וj#jmkv%Ù’V»ºÅêujÿU tïöÉ—%[‡oÕrì°l_±C3z¸.±½%s�øïØ¡µ~~<Æ
¯)ùN‰ã'~ÿ×ïKÌÀ…·wß6uJb¦›Vïù³óp ÁŸ®W�Ú©™ ’˽«nâÀÇš
ŒÀÀsÉ.ÅöCí¥c‚̦û äË¿Ì<,+Âô*Ì
3¨Ø2¼ÁˆºÊÂ
'ɱ£˜‘ë!�,C0µÐ
é˜c�!m)И¦¦Ü¾jO9™Ì“)5”kñ¯ã¤ÿ,+<�tj†Âø´Ô²ª�’\©¦×ÒM™XbÑ
Ô\“Í6i€Á7Ót“Î:í¼Ï<õÜ“Ï>õ„
d¡…–Çnê®C°ŒQ+·,*À[Ú2HCìé±	í*꿵‚kj½GÁbn%,½
)›LÁ˜rLÌBÃB�UíJŒD#2u&´j
ª!Y{šè³Ë&ñRjè²aJª
]tq&
lÁ™éðÄJ8K_°¸W<ô`(DÍ{ü„c!éùîlW“•;µ•#ͱgfÄ�åà(3"ÔÏw=ÿ¦i[³Šy”¡M�ŒF™el
ÿe”²€¬
Ç™ØÇ)Ú€|蟶3茿ÝÂ2(!l+š
w€RWœ/ZyŒ\ÈãíÞXàæo
¸b„†®À3Ù/Ã_ø"p¶ÁMSß
æ½/¨ãpÉq§R!WÖÇÇâq[%Ü�ô»}jÑPÁÅŠQ˜º1ÉÆóqß…ûYŸ‘D�qm�i[4ä›m¶ Ÿò!�Ë$H‚‘’''äÝIH/©ô€9®.�áÖ‘SgZž!dÉèÂ1üæÒ
žáéŒÂªRCŠ
–áËà
€âÁ1†
oŒn
)ýìˆE€¡ôfXáä�òÞÅ“\ÿABij�”�.ͬl¾Ž¡Z©\Á#¼Ež�è^¡ ¢€àªˆ¢£rát
°LÏn#�€ÁÍš�rg4Öê ¨]ÎP]ZA4ž-¡h,´Dä:*âfeäÖÇWnŒ@äs”ÆD¾¯BÕª�Æ|Ï? 	�šÌw¦æQôP£ôÂRré=.Î/„Éht¤øðBEÈ."QUL8<‘„°Ï!Z0¹ðçTæåA„ħ~Ã$Œ.ÙápaFx¡]Lâ$Nâ5žA¦Pô”€!”î\ˆ‘§E¬¼…æ
è	Kª|鵬Œs^�¿²Ïý®Êø#WIUP¤ÞBK ª&—â
¦&kå"¤Åž¸ð¢Q”rÊD¸ð®kx©^zŒCT
�²§C.E+�&R~†Â$'¼Ì�GY~BºÜѯ�aÎ.\ðæJXá”P
e`ó3/å/ä–´3¢ö®àÂÿ¨$8%ÈÂ2
'zdpæqMŽT"&u"Js€
h@t`
h秥:#ä�¼B&33TB�ТyŒòjRÅ0>õnc‰þ'¢S¥²}ò”
•ùVÈRúð)¼‚�¸3$¾’VcY°¢q´¿f±YfÄ„–HQ"�Zá»ÚÐsõ”ðÆ1ø/FþKì[
”^I”ÄðÀ%!ÈÅ[NI–"Hß*F>¢p!mER�Ì´€TCYfÊ$Â0Û$uh¨N††âäÿ–M4†Mpà
‰�¸A‚As9W4—î�ÁèͳBÖ*‡Òt•gGè-T¦¯¤ÔF'g2iY��úÑ^Š¶BXbŽrvËÅÌÕ|Þ/cM«;
u)•r‘„FKuÿÔŒòÔkv«O‘Rœ“ãŒF.^ñ2*PäŒLmu<b_¦ƒ*&"%îÊ$=""Îw#pâªtf&·g+´—�ÚQiS—åþâ(T‚4AŽ!z¤ J”€ÝUõ¸Žë
Ø€?‚K�‡�*˜À Xõèô~6XqÇÍpÏ^¸Q¢Îqv͵«|¥àÒ{€7&Z¤*
ñ*¢×wú
�âv«s{1ÿ® ÈƒÏÅ‚öhy	Ê4Îc?eâðs(š†ÊTÑxQxzž¯V’¸ÊlöÊfª¦t"j™GGl:ä¦Y€49ÃC9x6€B5Ð8KÖ8�-‹+ÈŽ‘§^€¯U�%|jmÊÄv
Þ!ªÜ…?ñ~KK$
§qšá,éR”rá

0­0ÓŒ.Àð•’K-±S_€ùц\‡¬
;;Ft¹2$·jw�ŸÍØИeÙJ;¬üât�ÌÀzîƒ=��Ì Ç˜˜Q•15£XÈÒþ5¦§¡/qÍR;®„e¸Â0Ñ93•ÑÍ-/ù�~媴c á
Æ	{ô°†	Ká± ÕÚöŒ¦ŒneûÕý˜Ö³Ä	Lj‘{.öE†8*…D<O��
Ä–é§HÅ`ÅèF2Œ†Ñ)åAÀBDŒ‡4dt� Òæ(-v-ÏpE2”QžQÏjåyÚBZ3ð}/|ÈÈ—é°–°‰Ðÿb‘PI*è/ˆô1kþªI€˜ÑÆp¹°_
$bÀŒµ0D!"L2œ1ô,ï0­p†Ô4&ˆ@m è¡›C÷>§Ì£!-sšÆ4„Dêw_ÛZ+^)"ŽIxÖs…2”"ôôE³à#Æb¥#,/<™¯x4
¯ ¶Ã_®’‰	â–Ægœâ•�¬E¥"Å£æ¥dïÙÑ	bGÆJ’ÿ’õÖ&"’ÝPD^\ˆ-›‰O`3@YÅ„Rd<#-&{µ !²Žn³xG•’²MB’ÿ©¨Ï*V±fli˜Ã”$–øâ–ÿy1œÝ¶Æ^}-QU0–áIº"e<*HÊæ!ÑYâ û��p÷£X±�¿P ÝÖØˉ&ŠbéIœ3žÑ£¾€�•£[XyÇ#�¶b“eÜ‹�J™1[&Nce«" ‰hº˜!­˜²em
¢ÿ*]Zß÷±»&n�hBéA0)½¥«)iÅèÔ©%‡Œn˜=JF“
0†€_‹3j3ÂzSLÒV§—[«–Ø
Œ6
tsE­j-öÊ£ßùKcüŠn�±
õ0�æÄŸz&ª>†<Tq¬3@'UUÜ5à
[aí
Š;R‚‹yôéé<)âÇ&"÷³ïHï
n!H$—0W¨…"ŠT2*ç/WÕ
º°PA0
óuUç8,AâQú
™'`ÆtUÁ
Vcxß²{ &!éA×fjQ1#na ð^ÿRà&
7Q™§g³±c1q×Æϵ&¦±ã
¸h¡¨­7Õ0Y×xy
~�’=Ãaÿ~ö¼0cª <J£O†a=3‚Îàm F€1ÎÀF‰?)QGhaŽ’s¢*P©*d™pß-áB9u…i2X¸1œù†]ˆSA!sC3¼x†“r5g‡5AàUUI²©JÅ:57UX.¨rŒ1“¢CyÑúø¬Ð+1Ñ+ !áa7ê÷
RDB¾V®
Èå¢¬@ dÃî�+¬3@!£ad´1‘	²,ÿOA¡ªçqAá›eÓ+
ªFa•у>�‚X‰¢ZÑsR�Ô] #LÐA8½Y y!^¾F6½2öÙ ~6j£=$–#‡KĆ*ô¢li6Å ^ª P'¡%:™�p£UeÓé£1§`R¢ø2CU\Ëi6Å4jõ?â+ÁiRŹ ²N³@0©ô4ï
«žÂ	l
ïpA1™š¡úmT\)cdµ2ô¹d¦
yY¡ã„œ®à§ÊPSφJ3(
õ
„c6Û�/`ƒE3b誅NÿÂóB á36jRÊ+Sš¥¯@ âe™}Ä/3sžI­&wHwÅ1Ó0‚ÔG9—Os›
Ã!"B§#›ã%Q;ÂYI-‘'â*î±7:)RÛñ?­Ð3½jA5:˜áAA€IÑ20Ág
•Ò>C¯õ!Šb!`#Š±Ã+@¡ Ái$’“ä ÿÓ	åFZ¢ê4Í0D'»ˆdùyÁ
<`‹}ø4sx3BF…è䙵J8T¡
¢¨)“K_㵚†ÙÚ¼Îû¼Ï+RÐ{HS-ãÚr뺅ښSå…S×k™`XA/g0C†rá\
S‡çú“´½&w§Ow8ft5Áu2Ò!Ï¢»§)ØÇ�­[Av¨&ìÀ}âÞ co“Ë!ì
í�!ª±tSÿW™qA)‘H1}˜˜:ñå*1YDîG`íÀbªÑÛr¹°{GÖ‚_!�1á,æ)g¶”)±¸Þ Àß5{&!â‘Ê›	qíÀr×iî±Iq8¢(2'Ô%ŽÂ§²b?‚~FbÌà
ÐÈ~~Áz.aqò  €
Ñ9óöS‡Œ‚ĘÏ!

ðÃÐ*1à†IQŒIÑwì¡BT‡?Ã�\j² Ê
&è-s,3¼PÄ‘a]v1HYÒ^a0Ì
EqÿÇRCÊ
øE–"£HG†i„cÁó—ƒW9dKa.®1D1Ž.²Â€ÄG'®ñ½
¦wï€òäÀ Y/~æ!–sV€Ó8„¤Zž0¥…–]^½žõ†á½Ú›HôÜ™
>Îî˽ìEàMðhˆ­ÖJÎý|šÎÛ1ê›Ááãµ0d
á^ðÿñª	ò"?ò!oð$�0í<½	~ò,ßò.à/ó0¿ð)÷ßß«Î
Ó/8_HKÏ%¿óû®rf„†AgÏt³†;ݪôÕµ{åšš
càD‰0#¾)ïG	à]ƒ¾/õ¾ò3�ïPo…ýÎñðìàžïÿžù<Y˜ñÍ‹ÏGÿàò<÷îö¯öb1t?Î\˜½2Ÿ÷Õz÷.ô,¯ó%HNóõþ¼ØjpåeöŸ1çÑ/÷ŽS�ù‘ôß•õco¾Üå1Õë­
šO_X÷.üRÕe†x÷Û¥]ßÅÇZúîù¾¸¿÷¹Oú2x­I�÷Oôòš½WÈõh¿ö]óàù”­ºïál/ø‰t…±yýAëõÍ‹Äg?üîü_ør?øù®û!£ñ”¿õì¥Î™9Zç�ï�ýPûŸ¿ö™/I„oA·†÷:Ìß­
œ:”­Aˆ`!

Zv#͘ƒf¤k˜cP£Yã¢ì–ìXƒpáv}ŒÒffÁ3Ç‚�{WïÏœy	º•É6*ZºŒ%ËåéR¥×Éœ³&†ŠW"Å‘ž13•	€Ø°ˆ›K6ë�²aéœ{ƒî�[ôéÑ©§ƒÎ
;t_Ǭw�Þ›/oÞ­C7_>ݱcëÝo?=ýüðëÇß÷•.?yòÿ½Øåb‡rÚ)© ‰†iª•ÙœÑådRƦ†‚Ð ‡Ä�ehr(™;Æ!ÂZò�¡*Ä°ÂSdñB“ZqÅ]œÑD“Á1GulF¥dn
É$e€*$_¬Q™…4i¨&q<	-�nrÆ¥Y~LL¾*
²šnúr²½¾:Í6Ð~첯£¦bs­ßlËÉ7ŽÃj¨ßºä¯”<ºl¬ÖXÂsO9{«¨2ûtOÐú¬­°9!ûÓ¶¼JúH “˜ag$Œªh5¾þh¤‰~¨]žÑ…�¾á‡žl\…5›Wg•ÕÕZe­•XcÕuÖ^wõ•W`ƒµ×\_öÿ×diµµYdŸÍ
£Æ£®¢È<)ö�[¬
¨¡�W½±n‡Ü\Ý
ÉLö@	Þ„Ô	Ê–CÅø¤6¦
ÕšÔ²†,.h¢§R
$·¢GOª´\ed#
®
Š�µdne–ÏÏ<Tºq
nC	U¨Íù î\î<­û(OIQuZÊBà&sÿžù-ì”\–$7Í!öÌY›kë
V+#F¿3„‡Cq�מQ`ã½
Ô@K@�°½§ ‘Yï»?
š
áXŒW
@%
Ec‰,¤Ð�”=UÓ§�CtT ±¿C%¾Œb�
Îàá
þà&áaNá.aFá>a†áŽa–áÆáÖaæáöaââîá &ââFâ#6b%nâ"Nb(&âÀû¡™K+Ž
ªÁâ-v-.Öâ.ã/ã9ñb2c3ã+>c5Nã,Fã7fc8vã8¦ã9¶ã2®c<¾ã5Þã6Öã?æc@öã@&äA6d9dD.dE>ä<^dGnä>fäI†dJ–äJÆäKÖäDÎdNÞÿäGþäHödOÞÚ5åSFåTVåUfåVvåW†åX–åY¦åZ¶å[Æå\Öå]æå^öå_þå“æa&æb6æcFædVæeNeÂ#<œpæňæš�æ'$Œi®fgÎæÂÛf•ëæúfjžfi¶frÆæq¾fkgsVgt^çtÖfw–çr†gnžçs¦çwÖç{nç|æçxöç€Æç�îg‚hƒ¶g�.è…>h†Nh„öæ~h‡Žh…nè‹žhŒ®hˆgt6k6<ÏðŠ‘&B’&é*4¼),é•Fé•>i•6éK“é—v­š†é™–é–Ži›æé�NéžÆi ¦éŸöi—Îé›Öÿé &j–Fê¦꤆j§^ê¨~j©fêªÆꩶ꡾j­Îê®k®ë£þê±› 	™Þfzfk�v붆ëqÄ@4À
·pP=ˆ‘ˆöP„Gh„Mpƒ384xx‡—ø‰§øŠ·ø‹ÇøŒ×ø�çøŽ÷ø�ù�ù‘'ù’7ù“Gù”Wù•gù–wù—‡ù˜—ù”7ƒM8ƒF P€«Ôd Z€×ÜRÒ
ÇÿÛ~Ÿ(A†öX4hƒ8X5È5Pƒ5À«Çú«×z¬_ƒ®÷ú¯û°û±'û²7û³Gû´Wûµgû¶wû·‡û¸—û¹§ûº·û»Çû¼×û½çû¾÷û²Ï(P1€V‘rp¾4eÀêrÚÑ4È÷Vlå¨�H‡E8ƒ8
T¸áˆ	6¬(pà–0ÚêÕËÇY²�Éj}Df2™É”)Kª™2ÙG”-_²l	¬eMd7Uæܹr¦Éb™1K×茛5["dêô)Ô¨R§FHõ*Ö¬Z·ríêõ+Ø°bµZ+µ Ô²XÑŽUkö-ܸrçÒ­k÷nÔ-õøñ�é(àÀ‚‘•ÌiJÃ&óL¸å± FÝœQŠ×ªD‰bÝ~åÜÕ3WÐ[E“mkzóÙ§¢ïHe�ÚmÙ�w¾pùò¥ ZÒUñÒÕ�Õ÷UàT…O%ž5ò°Æw3äÿüEß}‘S,dM˜‹
³6t±v Ù�5ûûw¦÷”éUjrrå/ÌßúVk¿¹êƒ÷33dŠÙ饥€
˜_SX`‚
.èŸ�:8`ƒFa…
RxŸ~]Ü�Ç_l1â\lqfwÜqâËy±Ôgx’�6Óàñ …Åñ¶–…î‡ßC=öˆã�C^(¤†	"9¡’E&ÉÙƒLBy¡”2Èä•ó=ÝtŽ�×Òu:}t^c^ÒÄ�Nê¥Tž—ÇUL:‰PfƒMò›Žu.‡g‘|¡ŸyúY þÙT Ç
Ê#¢†
ÊTˆØÐ3i6•js)6µuÁ6•fÿ“)Œ;z�Ç4ôrãVK…šã|­Ê\•Žþ†á‚‰Âj(¡�yk¡Áõj'‚‹úª+°YþzœT[êÃOdÊæÞv„%C™e>víz8m7íuá�Dm˜3u;Ø1‘}”Î"n4²†|9º¸›fSzõnŸ¼‰ ±÷ÖI+� ÉûŸ¿VöǪ‘
Ûïo[h“
=ÙPµ}qG2M6õ|
ÆÄVQüâ‰"†ZÖˆ¶Ñ¢ˆ"ˆ"`€
q‹
ÓX
<…
?€¡6 ºòQ+€aQD^ˆÈ°@P†ˆá¾æ5Ÿ
³6ù�I%é)ŒMÌtHDF+&†)F1”‘Îÿ�#]•ùÛ4ã)ÏyÒ3U—j6~é”H]1T_ „§´¡B-V®’»g¦Té¹ZÂ6š¬ek"‰¾Òx«
ƒëjé-¤lD¬	Ñïzy©(&¯ž&=)Jëi•-ЃúØÇ0\ÂŒê¤Ó:àÄß8s¿›²M&7‘I¸¶)˜ê„¤ÇHÄ*328®‘_ü
TïÈŸ©BuQT½jU³ŠÕ­jµ«\ýªWÃ
Ö²$3GìXYV4:J…�g_ݲQ¢BXªr¶ñ =a´R¥»ÍïF-eE.3•>CÄ5‡ DÍ^„9/ÄîZˆX!¨±ÉÊEµQA²jSë%U±’ÿv¬¥=­iS‹ÚÕªÖ´/ÚË>`*SdT§}6qŸ 9&Æ„G¨3ɦ`€ËÈ°M‹s«RªÜå2÷’ÉœT§€·»,"®µœ"(ö»‘â®a­;!©Öº[nÖ“³h at q¼�ðS™z
í&§LÜ–½tX¥jiÞæò·¿þ`Se$†¶@)äýОj…)<åñ­N߇˜’R%FIêN¡ÖžöIaõ0ˆ±â9ƪÄ$>ñˆSlb£8V�‚ëíZ‡�àÝÌY�‘z“'"{îü�	2Ã["âz`˜~¢/vJƇ(ˆ"å¹TªDÝ覡¶†Á”ÿ­C"*ÛFÖŒÃ"^1š[¬f³9Ím^³›ã¼¸Ùqä¥nºVØ~ÛDZf\`RÌ´ü(®–8«&Æ@JôÉÿ2ºÑ�v&[Dó ;<™ã‚J•×lèJ=#`VV…›	ËѦ>µIÕrèÔCÞ J#÷\ŸÀoMή½THñš×çBC’²hT»Ø'ÕÌиr¢Ͻ3F•\†­#¶»ÚÖžg5÷á
sQX[Èxp‚Ëi¶3‘›§¸6Ûw^®•E&ítÃ&Ú`‡�IFö>Ƚ%«ï|óßþÞ÷¿û
ð�¼à
?8Ánð„3|áW8Äñ‡K¼â_ÿÕRD¦oƒ¨
à+Â\Ç™òÑ=�…Nà‚$ºÔ©,T_9¤@²—ÏΠªš™Íos›�_|â>·øÏ{ô¡½èA?:Ñ‘nô¤'Ürv°æK½Ab<ÆlkÛµþîw˜trÏ9L—�qÔG4bÆ»ÚÓ®öµ³½ín;Üã.÷¹Ó½îv¿;Þó®÷½ï}ÓpŸ”6òêvÁ£�s„<’Ùž×Å‹×Ri?üá/y»Óh“‚}ß3¯ùÍs¾óžÿ<èCÿµØCDñÒ¸ÎõøTë¼þcÙÈÝ’b¼�åš
(ÂѾäƒ/¾Ç‡ï÷ñ{—~�/Ëâ>Ž/|ä¿øÄG¾òÿŸŸ|çúůþ²–�ýèH?û͇>÷·¯}¾X_øâÿ~ù»O}òGÿüê¿>û×~øƒüó7üíŸ~÷oŸþÓ×ûå_؃ð ù=ß
à>¼ÔòùžK- ê"`óI`ñ™ŸÆÖÆ–F`ö½NàK_ï-ß‚`
šß	r zß
6 ð¹`ÿ-ðŸýÙÃðyŸ`Âß
ö þýà
ê üáàúà÷!ó¡.!>ŸÆà_Ú B!^!fáòC2aöàú
>”¡<¤C¹ÐMYšà�„á™NÅ!Û¸ûŒ[ÛÔD18C1ä<Àƒ7ÿxC: a ⃠nÛâ!C"n6¢!b: b"Fâ#6â$2"$b#"%V"'bâ'b(&b&v¢%v¢'j"(¢*žâ&ºb'Âb+Nâ,Ž¢#Ê¢(²")ê¢)âb*Þ"/æ¢-î"*–âN¢2:"!n¢'~b F¢$¢*>c5*â4š"!2â2V£&#(â Úâ0^c%öb+R# Fâ1ã4–ã&
"-zc4n£92ã;Þ£$æ£9î£=öc=Σ*ú£@£<â¢Aòã5$BÆ£BÒãAÂc,Žc.º‰yKꉋaTKê™u°qQÇLÝ:½ÂbÿœÞc€Ów°pÍ�KúžµdüpMú‘M®dMΤNâ$OæävÄ$Pö¤NÆdPþÄPædRþ$OåQ%QÞ$SêYa,åM½äJšJVeTªdT~åMr%S*%û˜[SåSN¥Y†¥ ±ä¡[^¥m¥›¹Åe9Íå[ÎOZ¾å]Òe[îe]æ_å]–eO†éÁáJ8ÃL8K¶
¥…Nå†"e‡rh†z(†~åˆ.¥O–¨ˆ~¨S²(X†èY‚¤‰¾ž‹žh‡Ú¨„º¨ŠÂè…‚hcT¨TéŒr(ŠæŽéN"iŠ)ˆ)M)“¦%”®¨zàæL¡Ç`(hM ˜I€›Œ(vh^êYVGKrÝž¥©š®)›¶©›¾)œÆ©œÎ)�Ö©�Þ)žæ©žî)Ÿÿö©ŸWN¸3@èlÊ¥Gn©erdH†_xK!k&¦ëu¦JP*2�„IX*¦^jJhj§vjIxª¦†j`xj¦–꧞*`˜*§®jª¶*P°ª¥Î„¬¢ªªÂ*­¾ê¬¶D­ºê­îj¥êª­Âꦫ®’j°fj¨’ª±*ë¯"+±B+«>ë¯ò*³
kµ:+§Šê²jk³Æê°~k®zk¸Bë¸^ª¹ò*¨Þ깊«º’«¯¢+»¾«¼â*½ºk²Öë´âêéÕ¦ÂcÚ'¤féKÈžM�nÁé×	RH´¦˜.´°©{D(uØŸëÅf,�*†ƒª˜Š¤ÆzlÇÊ¡Ÿ>iŽÿâéÈ2jy¥™WȾ,Ì’¬³2C3pK¸”Ä8uKw(ª´ š–›eþE¸±Ç1¼Â¬¶Gg690ƒ/èÄM
…™j%ah%áZíN¤íV0¨m¹ÄíÜNËÜÎ-mÅM{ÌTRnPÂZy43ÄTåNáELQ®›T-0D†ãZm{¨mÚƒºnÜdm™*C{°ƒ×*í
Åí ú.íÒî1Ðî ¾îç~®Øu­òªØ½.ño¹ÿÐnòz­ØMoÖºí×Z¯×¦غ.ØÆ®÷V®Øjo÷r[çv®ÞCúž/m1ouDÆû¢-óúmûbnü¶‡3¸í –‹ØÅMþ‚o¹ïþ~îõ^/Ú¶oùn/ðF¯Ûæ/þ–ËׂíP°/3Ü„.è­3¸BÌnð›Ú'¯ydÁžìÊ‚^ÇÂz�žÞÝ61
é#H?é2�i¦,Ä�Bä6dŽh	¤ÉCÌ,³ÍAÿØdšAðÌ“ÎAª‰&š:ª±“N?£Yq¦h¤©ÃÏjªùäF«QôQkª!Ek>±FSRHÙÔN5µf•UH
eiJÙf•P´"%ÕUÐ¥—UzéÅ[�Éå–^Ò©µ—]ÌÙ5—^rùÉ™c|áÅn|!'"V^	­˜cr‘ç¥Ô|Âë.„Ü™6¢wŽi‡—aðRêÚbJ
¯kCs%µbØñ¥Y¦\yFvÈQÅwt•g­˜9¦˜at‘˜cÜaç–{syè]¦e‡ÜØzº™fR�c´b‡©w†ñÆc_Ža§¢bXN¢c¼yV\>i,wFÖ—v¼i§�fZ¦–‚ÿ€‘«™àxøžuñÅcžÝy‡dØQå™Ø\¾¯yÈ
¤bÞÉ¥YœÉ!lj�‚w©’}‚w˜²†iç`].êH•wœ!Ø—wâíè%s“:†™¼Ù1·˜yX9æ–®
Ÿ'íÔ
»³«Ø
@ìÜ�<ô,ï?ïÛóËÇÛüóÑÍS/¿Ò侨üc"S§\=o]Ç^��È"'°@‰,¸
	˜€‹Á(’
Ö�h
ª
9DFJ¡
¼³B.0$!I
ƒ¬ä<>	z
 


ðÑ¡ΫC›è7üa
�@B‘D/z9“ÓBñu„r‹b<F1ZñÆ´ð8o
…pQ2òE¡db±w}@±r!”pC+¶EFg’‹¨ùðâåä1D1KvƒŽB)–fë
ƒpL(»Ho
µ’‹Wä‹3á…9ä!
ø¢“Bá…zD×›±$
O~zªP¢ZJä}j
($@Då)R¬Â¥œ‰¨N˜Âmìb�È w±3
e¢0†VjÕßRê·®O�AàR:1¸Ô zr\cäc-·1E¼ø¢´4l|·�´W`Î#(�¨ëæⶮ
n›áéÚ¦C¥$Â;˜òŒZ ÅDðµ/ÿe´BiC(åRùêL‚Ò4ß¾/´}A[aÓv:´õEfïèڀɚ˜´í†k‹±]O+Í°¦y¦�Ĺ˜‚œ

e¬Å`Ç›¾Ã�”0Æpåæ	
Û‰ÇÞIÈôcå„2ž€å¤�;@Nš„,ŸZ"Š
Á`龀ɸ`É‚ÇDL$G¾
Á
ô ÁÎŽLô`1×àJs0	ÁM
áLè
K§, °ì<Ä8¤WËrÈË@¤,ãÒ,áÒFˆuéÈryóìxDF¬{þ€Gú òÀø 2ó
]Ì1‡R¤)O'*yRAÊC
E
äT•2ž¼©vÇ0·#žJ‡Ro.‡¬##8†¨!¤—zµá°!°á¦W{³!®!|ÁáÈ—zÁaz­áz«÷¶á¬A|Ç÷À÷Þ7|¿áæ|Á®
Ô
|ÝWÜÃ7|ë··ÂWØ€»A�¯áè!|Û·Ù÷Ö��ù÷º!ÒÁŒáB¸€AØVáÐ
J¸СX¸„A¸RØ<8f˃U„=X�€i¶f/XðƒuXýÑôȬÖ^A‰�ÁÜ
‰§%à˜©dXAƆÿ<F”<†â”>^¢q$édzC*ê#)ÌB=,Nfknrèâ:ÒÂ7�#9PBuSƒ!”Ãã4*^FÂÂh)"�}¦$åÂ&lö#Ø‚â¸)âf
!÷&2b:‚)¤0òƒØvÖ�y28äb3K)”áÂã^ç60Ã;¸ƒ)ŠÌ’×¢&’Áiæ¥(·7hÁiÂFP¡¦#€Á!C4+8n‚"¤Ë-Ö-#ˆÆ#D‚lTÂ29
!†Ø"Â#²‰
är6yy#$6RÉp*kgvA®wa,Æ>ì+WU(w×qÎy<
éxÁ#u×Ùxcu<èY>Œ×r®5˜ÿ
±£vóû�=µsԉĸÿO㻕ÀíúlÅ#(±c³¨|ÿʯ#¡«ülÊ1‡i?âËÁ|Ë¿|˽œ@V0ÞiÄoLTCœtˆVÙÁñ›Äi¼)á¼Íñ<ÏKNÏ­	ã��ܘu$ð;ÌÃïyÍklRé©Uï|œ½Î?gæ²²R™�	[\—PÆZnOlÇ;\™¤Ã,γûÍkõ*¤ÂÓŸãÄÓúĸ#0ÄÝØÕaÝ�jõ+5UÄ“·¼y¬Ÿ!}<h¿[Œ×ÃÑ÷ܽ׉Øï\Ù•=Ù�y‘½Ùí|Î�Îç›Ãž}Ƙ’ÄÄ+?çÇ-5S×°Æ^lSáy¾ËÐ>öyÅ:ÚqLyïY Oƒ�ÿâuÆ‚r¾;ÖI‡Ö[�ÿßi}ÕuݯãßYÝqnÝ®¥|Â|ØžÏÉÐÁ^ÇÓCÕá»Ù�}Ï3žŸ!ž¾ÑÝâQLÞ=þØá]
";ì‹Q•	ËÛÇfnäq#
]ÎØý<V“ä3ÜÛ
ç¶ÛÆŠ?"|žILÒ×CÔyh¤¢ÚA)Hf‡=˜†YƃïH�¤Þ駞ê«>ë±ÞéwøŽhØê¹>ì§>ê�êwøë·¾ëÅ^퟾“¸þŽä¡p@Â5·=
ü´ßÛt`ž@ ŸC.ÄíIÚ{ÜÚßV×\ä}Ã?•œ9ݼ¼÷»çq|›"~⻣œWçè±ÝuÓûsòûï;ßsT�½çœ½ËÐÒ‹]ÿx]óiÜ+Ï?Ž¼ï·�¼Å™U%<ÆÃcêc½G‚2Ðíj
æI“äG—?‘¥¦Œ™Å‰È>6Kæñ˜�oôªZ½š�^Öl[µzí
ö«Ø°dÇš-‹ö¬Ú´ié
ÿ
ß-ÐÞÅä·NUÚl¨§‰bŒ(
Ô
êŸü|#¨5U¡Šúé§ðM=�~3
=]µ*’]•�¸óÊWE–>�N‰2³�7tš�1­§�›ãÀ––Ñù76’dKÆÓ
U+h…<‰ oTƤ1Gº�Û†J"ˆ"‹7Fõ’PŸ#˜áèM–	5Ò·ž£^E†�‰b<ôU"n•k²Uÿüê!†’n¤eGd΄oÀx†.<Ð�¬¬ìs ËÙÈ…ªdŠê‰_ñ™\k¦Õl\“f£z™Í5)AS‡Ú•ØV²‡³JùÇv¼x›—Š�.Ê-¦ŽLãþY_;.Gƒ¹‘�‚„Z„²d6ëd!GÒJÁ¹‹¶cB¥rD´ÿGôyf]
`‰5¡°ÂŽDì˜`ÄLÅ\›L°®€2›§Q­±¥ØÀ(œ¤¥ý
Ác
±Œ>ʸ†mû…ÛGiË5„)å–ˆ2\ñŽV0Ã13Wwøª’OÊi�Ø˼Ö(ƒÌU$3UW^U»B‘Ëp½
Wu檟
£'!fñãéR†µžc°D¨ÂWƹ³4åµ¾ŒÖ³ÿãV”íHÚ~‹¥ÜòL‰
BhEVm~û®¨ó“‰$Õ(PÚ§F	¢8 ÿŠV^ñOrõÁÅÍí]›Ípj_£¦>—ï¡Aõ–ÂjÈ°Yè¢ó¸…7¼ì`{ØÄ.¶±��ìdÿ+{Ù^Œ2tÑZø<þä³ÿÌä¸OZF~‹%žZ»ß‡J-¡W*u‹ÝÛSI‘&ÜóDUtÇF¬(•‰’Nå�h³¹’Ž÷ÍóI*	‚F�8ò+ª¤Á,Äö87¼²moÇíR³±
âSCHtÖ(KD_[ÏoØoU:Ãý&ëµp´‹�r_èâ+Gy1€
ó˜ãå/—yÌi~s”ÏÜæ.ï¹Ëm.sœýæ3÷¹Î^s¢ýç</úËuá
d8£H±$˜R4_EV§ÞŸ®ÜQ*ΫÓvÜL‚L8¹ž-àIhSx¬?ÊJ–víƒ=Ém*G<ÚT`‘y÷KÔ]ŸooÿY±|ðE¥ÓrM„Äž¶{œ}v‚Ež(Œ‹m¤Þ>Yó×ß	ý0i}šH·ÔÞûµ%SópDq¯à¾—Ëïɾkxª½Õðt��¾n±­p÷‹úo)­›ñuÿ‘Ù×>÷2ZL2t
]·Õ0”1oPIñ�u÷ßáBvÊËË&›•c½-"z‹]hzôÜX-Á¿ðâ¡?Àº}y („a¯@—õüyEHY²ZJshßjú&yŽn·A~gXnVhx&kn“#ö¶M‘‘ÍðÍÀ0wKõQI•KVSòA$‚QV7äRħ‚³�Èà‚'ÿˆƒ!¡'(0Ø‚šÅ0IUƒ*Xu‘ƒI%ÅmS³vK	Æ,HsæG$ܶYbÃ`ý9Ú¡)ÆaÆQ€ýµ6ŽVwÒ¢b«öJ+dr>_rgŒ6I®–a!ÆAw#Zž²”QÔ‡q%om·X,X׆.ÁgõýcnÞ“XíR/ZgS§!×–Tñ
†tXá‚Š.1Š ø‰`£nY—.!TP9’mä¶"ð3>ôOEQ46i…‡Èq�ÖwÆ’
†ˆ“÷6“•-¿ØB4FXtf,—cŸ�R‘üçš$wˆaQF‹�ÄqgÍQqÿˆyFò_§Qô÷hžägURKC607{ó0Åð
Ç€ž¶‰Ò¡øTwÆ_#P½
�I‚]2�_£z	Y�á²úø�™D�I�«¨,@ö�¨hŒîÆuÕ§A²Hén…dmƒX‹Üèb¢6¢ꇅêã€{wv—‘á¸qÉ“’•i&å7ZH5ÙñS˜!Ä(,„‡ëá‡l×H7H‚d$_ÒŠCBB¤—+î‚;˜GöÈÊ •›sÆgœa+vA–ei–a‰–H�0kY|`)–Ç7–mÙ–n—hY—uƒ1X•]·b}™Aã§uxt×_Ĩ‘¡WJr(zùÿÕq—GBí6Ž×è‹p‡‘’spØ&~ˆ[¬…JõC+üÈ"”ÿ—%;5w
g+iHóƅʈyŠuI€†Xü³8Ö~äcÍ!gj¨Å›À(›!CöòƒËA.Zbzr�™SÑx0áœñ(�ÌI�ËI�·O¡Ø9�Ë�ßé�ÝùœÛ·š5Ö…„’
G‡^â~§ø_35‚Á”%jí¹ž
H™åi†ùh§èŸ£–9ÂAb	u#…o|y’ä©@zn†4%õ³Hã¡{g§8‚÷~Ô>Ü÷Ÿ
£#j£2Zƒ6Ê££={E˜K=j„C*b=J£:j£Ij¤*ø¢4¤7º¢Q¥;Š£Fh¥9ú£>Ê¥N*¤\º¥/*¥#Z£Pz£YÚ¥A¥^º¥D„VJ£a
§hJ¥\ʤvJ§ljdrÀ
¬±¬ÀÊ«¾zOËzª¥Ú¬ºšªË
­¶
­µÊ­ÈúªÂÿÚªÕÊÒê©âú©ØzKÂ*­²Š®¼Ú­§ª­­z«Î¯à:«ïš® ª®ÃªªÛ:®£ê¯ÿ*°®¬

싆aç½QO
ÀŒ2èÑ‘%{.=zud´’%›^ë:\¾tñRÞüyôæï”_§Ë—/xäÙâåÎý;ðõïÏ?¾|
4Ð@CL��Bd°ÁB"$B

dB@Ñ°�A
	ÿd�qDKœfÄiÄ hX\qÅ£¹(£†ª±Fš?!¥š�@ÂÑ mrWiéÈ]¬ée•kV1f•›rÚIÊŸz1Æ,yñFK^’òå˜bŽ
ÆK¤œ{jªaØqnM6ÛtóM8ã”sN:ë\;óÔsO>û|O?ôÎ@ç´ÐCýSQ?]Q=%”Ñ<›q€v€
†:ë¤K˜f€±.™ZžÛ®˜ux¢>/ÞÛ‚>/à‹U=ûìëb=ý´°`‚	ŒØb¾YûÛï‹üðøï¿
Pùì`‡5+˜	òƒ€Iˆùâ‚øÃ…
ñL@ð
ÔP·4ÄMü}è"ŠÆZ$¢U
ˆj�³^0Z‘À&2‘{ÅS`"ÁI*°Px0¤J®ñ	•\%F*Å6hÒ&ÕäIRja•r‘1�Y©† ;F.N¦1 R’eÎA##KzR”¦T¥+eiKÑ8Hÿ—ÆT¦3¥iMmzSœÖÔ‘9-é ™
*Q5:Å(ÕT2Ù2&ÒÎv›ì”Öh�ðX!þÀ Pød!ïa^óœp„]eáap‚V9<êÅ
N¸
~*	
z
tUlD7»YYAC˜@*	0ƒÐa�£­A4ÐYUn`
õúÄüW€Œ¶
Ò’Â<É5Á�u ¥PG	#ú\ˆõD'N‚¡9šQ��Ì£E™/XH-ÒÜiÙHôvÿŠ¼']ï
iÞ;–Ší…/!ÙËR˜¾×½ùm©|9y^=Ê.’óµïJé;^B¾üU©€_ºH4‚ªvÕÑž†
€>Ñv.;ãv�\�ª¨ybE¬÷P
]¦ƒ;UÜ	iÐ
Ôø¬4:�ªnÀ�fèq
<ñ	Òòèœ-ּΜ„¤%JZòˆÑ¢!£õ€Mf²Â‰VTº1ì…GƒrŒ^t´£ÿÙå!˜tˆ;Q!rÃ{Ô/OcÊ`WÇÚ¦>5©¬ë‹àžØÖ‹ôïMa½ë0þz¦
vY¨X»ÿPŽ¼V/3>Åo@
#�yàãž-ŒXƒŠ›ÊÁ¢Ò³ªLeì äcÁàa{
;fÀ°bX¶&êÄëxeØŽZ
Ú†�³†kP4pð`Éà€Gp¨Z!Bœ˜Mû‰–[9�j9Fü�‘¹•Y‘’"Úá¢ÿ°H$@Ù¢µÄ"´/´”"¹l˹$)·L$3ªKðJ¯³TEl¤)¬ãEŸK?b´Ž@¨ÃÅ,°®;ÌÙq¶Nº¿'úÄ/B»ôs/'bªU;0°Ä\ºú¢µ.2ÅLTºö“F"
ª²•�1³ÓÆ<ò°cè†ð`•ô(K�ö°báÍüÀüÿàžáD–têy&hYNi’¦jÊ?¸éœÎnñ�p³
‘Ó;½‘9ï,q§:(€)¨†Q€ƒ™D
i †‹h‘�	‰ã§‘¡
’�8’ªJš°Jz‹©¨B\…\P¹.Y9]ØÊì
ËŸjÐT3J‰Pÿ	m¶¤$
}¢Ã$MOÉE±LèƘŠÅX¤:uT@—âuÑÅ¢gKÍŸcºøƒ�Ý£c„Ž²LÍüRª5ÌWÀ£3¯�
FnÄÑa´ÑP1RqŒv0ÇÈT©Ù
K£ÕQFd¸ÙA‰�1êY²;OŒ¤˱ü®�)¨mÚ–i™!šÚ ];"G›ûf @eÐVª”	“W`ÿrœ9±4V±”97
¢cP†·Ug€[ºe†×¢%¢Z›SXCj×\œFÄ\L�EFTLÛ!EÜÒ$ÚÀmL_;?S¼Ø…}0OÄŽ]\”òF[DÀ‡]F	£E^¬\#ÒЀMÚƒÅ:JQz=#�X¿<݆5LÓ͵…ͬ›Ìä¢
3ªƒÝÀÜy

](‹o”ÅÚñ["ª°ží”¼e©eÚï:©¼}ÜiÚéE*�•¢»�K”Òðu™Zx`XñÕ…gP†%êÙëµÛèP™7"»“ª0ö•¼MÒžUß“A†’ù.²ÓÞ÷àø•æÅYƒµQË5Æ1Z]Î}Ýÿ¿D#Ǽ\û»Ü)ªÝ
.¯PöÑZ¼aœb°ÿ
fŠULXkj�\'*QP"¡²dÞ=¿ÃÆÛ±fC†¶Q›=Ù·ŒØ÷ªËªŽsD)t4Àí�lÅVb8l1Bàøb“MÚ09Z¢?)v\ËÛ±ÙµsãY€mím0íÑNmÑ^mˆ�ÓíÕ~mÙ6mÖ>íÒŽmÚ®mÔ~mÕîmÝæmÜþmßÞíáîâ>nãîÓÎ�Vh…o$L¢Öj_¤å&$ÒtE•ºÑÑœ¤§Û`±¯ …aV~` 寎µÕÝàoQºÝA2E;Ú\ÙíܦÞQbž°J"Zstlwu]rü©Ä.Ǧ€¿5¢ï$�£òòo(òïÿ
F©OÌÝ-*“5"³fµJ
ìÖf
FX¡…NH•†Sq¸á†
Nè T2Õ¡‰V%K-+ªeÓn³ý%nñ§_L–ñWgy¥tÐŒ4ígŒ¤ÅXŸ‘(Q6dc0%¤kpý˜cd9)Vå�î
‰—”[ÇXi©&R”í˜TÆ礗²Í¨˜K$!wÞ—EŽ	gF
…ì±×B›k
9Ø2K2Ê´8RFsN	c“&5™L�±Ù'%nBÞ¨%f±ÚÖk\"YÚ¹7®‰c~G–™%aüeù×¹‚¥ÄnKäz¦0mçð‘ÈÔËÒ|þ�öfsývhŸç–*HŸ&7îŠdÖâ̟Ψè+ΰb ÏÊL.,ãŽ*4#ÃèC*ä™}ž©ÙŒW¦*ÙIŒ±+êÒíî×ïlÂÅÈÌAÍà 
0ЀC×_síõÖ>qýõØ[×PvÙ^‹½¶Ùb³MöO^«íSr·íSÜb½·Üf»}¶ßoë]¸às÷ý÷àpÿë½-´
Ûëf—~I}¦ç¡•©—ÑLª$1_ãÛIû^¬î˜•û;1¾²ÆpaMÂÊ°|-¡«ú–‡Çt«§Ã{VizQ&1�=×q¸”»Jfa¥‡VGÎDîJpÓõü²+ÊÜ|L¥ŒÞäLpjn¥ºLÉÖs²[l\ÿùeãfKŒØîÈÀ÷ÑA­ 

gfÑŒf<ãÀˆ\ä\áé'­
«:“E–ì¨ví:Z]¥Ç•<C]ú‘”ŽØò=e´â,}z|Ð2ì�R߃Œû<Ù‘O¦™$˜Š!È™µâ?zÔ¥¸öXÃŒ~´—ézT°Ç(QwD2	«úvÕÄiÑÓ”9L	VS¤—ýâ;uI37ëÒÑ2S±QÑ°$S×dúƒÌwÇT™ãæ�w¿¸€Ó‘…á¢iFrŒ¨…hêtM1CŸ’
³ÿ7�YF2þôfr¬HÏhHB´K
hšEL(ÍÃŒVèâ)c#SB4WÐì‘3RA‰t/(
ÏI»ìˆ2b‰ŒïŒË1¬HÆ3Zñg´Bh¯êÈ `&ËVt³$ƒ
$ûdi‰g´qc‚£PYUÉ4†#mRÚ5»º¿§1©ž4	Õcú¹‘ÔsFFlaHŒø#¦]5�’¤‘;Ï0²r$˜+Q+‘Å#}é>F[˜˜`ñÆ'†É’^S#’–"±jƒ=‹;•Ø<€n´HTÒôˆ15‡2+
\ø&§ÿ†ÿ/ÚA½B
ãÌüñ…NÒ\°¾Àc1ðˆe^ÙE
§ÓÁû¡eÐâŒ/Ù4EŽk±R+‹+Š²3šáçAš6=ì(†C|qÞcäB"™úc3&âíGýBÄx+@ÐŒ[Ì
™¹ŒŽW¥S0­Õ‰yØKH[¾
{@Ù;ÜÅ
õ¥Þo°ƒéÿ�Û?É—ýá_ÏÄÍT
þÄ)1Jp
y„
¦És	¨ŠÅ¤Ç£
+Š�øÀŸ
*Êñ%£;þ
â1R¢/l‡øÈ€2ˆoÙ%jG¡ƒ+P_.X]ÌÑ�
@Ï8�TB PÂÌåÂn
€/�‡zÄ儹Ž@ѨÐÈë6ÌiÔ�ˆ	цýU¹@¦á]Æ‚Ín8Ò;îW;ž]„ùÝZ\AÊ ‰Ý“áI¦È°Þã×�rÜŸ­Ž}„9ÇgEÎh<%¼Ã€øOÔ‚n!C¡ð‘_)êB
•Ìg©t
,Òÿ atµBo¬2|èLÀi
jŒèÐç0Çy*3éc*׌vj¦Á9uI`4Q0UØX5ÑÒGKŒ<vªèLjò kBé¹ÖP¨¨‰¯AOl”@j¢:¡Ëhi^Ö䘣_<¤<Ž—Ò¾±Ûã¹BZ~OÏÐQ¥’zÍ0`�Q	­‘ZªõÈ’¤Êõ‡•ÑR¡

­RDÒ’,5•G•Õ”@ÿébÞÕcŒÒ/4‡3Ä£0mÓ:­i=mÔJíÓbÐÔ>Ê
Þïˆàßæš/ðäf˜ÛªIAÅÔ\U‘OlŠAÆŒ„HH€`=R÷a¡dêB+ÌÃ)
ØÊ
Ü€
…µ”ïXøD!S…WhËÜàÀ<C<ÜC<ˆÃ9”Ã9ÿC9Œ1C0ÄD‚|å„FvÄ}Ƀá�4‰„EOÉŠMg�0¼�«c$áºrN½–p9©¥±”g>o¹R¦ÝzŽc.áÂþ�§
³Àz™Î	“:*[/{`þÐÏAe�Ø-&[GÅ:›ÑoõÒ›¶-yPÏ0¤{$ 0¹I„.ÌÃ1ðHþ“¥àšEJYî¥Õ=
%R+È
ÀÖØ
”o
à@
ñzíx˜G¿±µ¢3óBKX2€“
™@Èv³Hù
4
ì@²èŠP´ô/Øt9|*p·0lr0C90# ™iF¸îÕ.ã‡ã½u¬Ý²‰éè·Úqå½è2Çòƒ‘bªúÀ*FÅyǃ<
	‹»Ä§àW;óð¸c\ð­…p©Sæª]¼”´ÿÔ›ø`¸:r]µéšjÞõ¸ûlá“Å©·ADÉÑ3°Bž°CŽ
ð („‰‘y‰�×JÉܽeGDègkjS)Ã),CFXÙ;´Ã"mס[\Æ7غΩº@áLP"ºó�
0@²ÌÍ
øq—�
GÛŠlôñ¶àcHQ¨À;1P~åS>ÂÃ/üB'
9$f¡OiŽëyÓ}Ï£÷\äk6øóÖ7ruõ¢ç­¥Û½#SŽ*!@r™Â`5é§õáv<¡ã§úÄ{º…íº":ï›w7:
—�•ÌóžƒFöÏ ýIs´­òêQk¼Ã™lHQÖEæÒ§-ª×îÿÕ�hO‘Í„h±Å©G¡ô	tíŇè9µ1Ù<ISC2dÉ4(�Y3`&k6Pà1o
Õ Ø†fŸžM*öàR¢j‹’-ˆZ…t‘òÕzõïÚ†À&M‹÷pà²x{UüØmX³��Óš,²aÇ]É~•œòAb	Sf9ï0
4ÌÞËK3
ÛjÆ¿:"£OÅ¿2ÛJ¾£`DƲ!�ÚqÇ©ˆœ²Ç£vLë Îä‚’4¬¾4rLÅž4’­.?+3+/´‘H¼d4è̃–ÄÒH+¹"j;f˜Q�µ£ì*¾»
³,hfŽAÔTÂEÚÏÿ.íÅ‘ZP	>Ü/ƒÃ¬0!=ýQ2ˆ-“«vgäkÉ3í:·ÔB×ÔL.¶¿­™Ç×Ä>“pAém/�aË2°gsl2ÔÊÚúÊ^ÉcæRl¿×Û´1=—êsëC‹!n³é$ˆÚüì“G¢dW}äÍB]±ÙÉ,߉!g÷3ϧØT¥:NÕgZ32·¦:ff;g™%‚ª'¦<Ë,ã3G»ƒ®zÜ'•Orí’;qÎßZ÷ñσ×w¡õ°USc½•<}Þi§©ü•·.‘ÃYÀÆ>‰/2ãÓ�6E—ôŽ*{ªÖ“‚™¨¨eI`AL”.£90{!f¢š¡¡Ž.ÿ”Ë¡ü„›¹Å†û;Õe¾@õ­Ïlƒ—S�Ä™øÙð}ðÉŠŸ–‡bøϘNRXw£¢¦�b’»þ”®¤iÇxE™Î2B(9¤¶{Û¨Ø9ÚÉ3hl‹£EªÅ9©ƒ;¬ÑÍvˆ%¶ÑÑowJàèB“%
>
‚@ô Ú õÄ!Lu5#TÀ¶´m/ú亢7¬¼ñŒ–à]hö³ç±Ãt„,ã…×AÏqbT¥UDWÖQ“0ÃÍt¶A>.*Ž‚Îënù(8ÉMpœ½Ü˜ÔÝ‘uàZ[]W7<Õ/“BšËØ~Ħþ³\`Ia¨^#¦·!fŽÚüÿÒ{Èu®l*,+Ë´V/ùö.‚�sw‚B`/µÙ>ö¯¥¢Y	C)¿|†!›—ûÆäÎUþNq¥T(oœ$'21[ÖR‹å&<…Éu$#\TÄ÷¿x^›@ZäøÄøOáØ2`÷„(©vD—
êŽnשõ0Æü1žü3ÛdRD†é˜@\�ö>r•Ôp€ì]î¾xPÎÇ�óÊ�q*ꦙÝ[|‰)Ÿ*I@¨Œ0j~TYš%Û„6):�ø‚	Í‘
Fõôè?;*­·••07Øeü÷“~I|ºcbîSsá1“W“³E²˜�ÏŠW3q($LLRêÿ6;˜¶>³³Á3(Ù–º)Óú40©\‘1Ç9BI0–<-×èò5DVç…9mZP[¸¦<ð-ñƒžm.f²*ÆQ­C¥$ÇG3‚fvMl
ÓJÑ"¥œ> ä+D͹sºo]'BIº® é¨l��¦ïŒâÒ9†–·Ì„¤þ(9Ú=:Õ¼ÐåaX´*/‹Ú¬·p¥™ó]²^)5ÊtU«×»ºïQ5Rƒa™®4’ï¹…ÝR^Á$Ö~꽞²�r_×±ñâi¤
9‹BVõ«øƒ¶Æ;Ã
‡8ǯ„Rz�‡Ø£>¦F¤YÈ^"	çÈ`n¡±YžÑáÔV¦)ù4²Ëb¤ÿíG=–å§êF�V$§†~±2ZÁcÍî8‰­ îl?—Ù
o¡™YÛ– "%5Âô!F&‡ó¨˜T\2rnÙ&(g’FÍ`Êó¦,ó�V°ª¥ÑÞ&I[ZÕ
ò]:$So£dä&ÿ4FùJÔKOªÔ¿
Ù2Ãu!2Ž
ÊŠ—Ei�×i(SÑ33ãÍXU^’#£ç!|¢Ö‹àI”VÐøØ¥.Ô�»u%êôÄðf“h¥©,Z\çCÆ3ÞqŠf@¯§xF¯O[úZF=ÎHŽ‡×
ëœG…öîZj¦�Ó4£Ê`E�…£â$>û(îÞv2to#vÀLµ#熸-ÿÓG’]È;\�§ü©xÇ�¬­µyY¦œ—T®Èõ3*~¦>ƒï`…×ü�oõ.¸Âí‚S�®*À¾ÉÈÂÁµ%>Í%¹¹sêœë¡à_ìóJˆ�iŸÙ je¹³Ã€•CÃ
fHG!QFøbÓ9
QF#
—áêe€�ôø§oÿ¨ðÚøÏë$ƒQ0Uð.2ÐóŠ
ugt”JqÙÔd²®î¯ùþï
Ï�Ñ
kÏ
ƒÐ°ƒM‚Q¬Pט!
apÿ¾ígLðš
Ò
òXC˜C”
 ‘¦ÕZç%ë‘-©Sš
�C
›A ÇˆvX}�i9–(;•(‡ùš¡S™á\åa^s.
×d
ÃÒOò	i¶u
Ïô¤–Þ�ÆÍ £ÛòB×ânP™ÁÚs-”£‹¶ø�ÃÈÎ\�ƺèu
RTÂÉÝÄ­ß
*]!l*.Þ,hh–h@צlœ�Æœy
—�5†æ,áÜS1ŠÎcF=ð8-â‹Áñ°#×ÿÀqƒ†|¡G/ÁMÍôR
Qã¥Y=Y0ݽŽ)›åö7hj:†$ÔÆl|`�(ðÎkY[!*uhBÒˆ"EÚ
Äí ¤ážh”¨5σ·öÔ�,¡$uMçRÎXÁlå¿Š0b0l@æbŸXØ�ÞÆs­TëeÜâzƒ!t­ˆ!å±ÔLÍšÁ9�åxtF“žYC9HRU�Aä`ÀµNëòÌOj²m¼¢•(t�†¡ÂmüØ�ˆ^Rð…Ö€�Â×]Ÿá‚±±Cæ·­:ˆ"hFf:æ!Ñ*’d~Uj:öoÜ6·îæ�=9ZŸÝñu UŸ�]×hì�ÿÏv}-RB�¬&Kòdž(Ø
ffÌá§;f;�
ëWŒµóoê«~:ÚÜ‹>îšâˆhJžg¬
IÓzäcœ
gKçãvt®l9ZÍÿšAÖÊ\° ˜
Ó%вbÅ�1s¶°aÌš
cVŒ3d-:ÓÅ
Y³fÅ€9{Ç
ۃ
slWVÀ
/êÊ8péX‚W›!sÕ§²ˆ%^U–�¬E˜k™µšÿ(‘òZ
F�OÏèòŒ3§¼ÅJ3ÿæ2“
S‹.ŸN§Ú3ÉU"Fü	ëßAÿY˜ÌFÏ°¢Œ3®ˆQTȼŒ+Tº`ˆkyD,NTÖêPž‡=¦T‹ÉfWÍn—j)Ó
2¬àĦ3¸ˆ˜§”8µVšlδb�@·1ŠL‡ìíǯj˜N”[¼ë=*�£öé§Í*N•̾y΢Ì,Ó53º¿yëß¾¼æÉÿ¥wê{r�>ë_-:™ÌšÂÈ, 3ÿÙ¼hOÿ�¦ð­¼­V€Œw2‰ÎÝø!0ï°ºã^ÁI$Ñ;’}ä¥ÊT¦ïX2LïÊ®¼£Ä—ŒÌØ•¼Ó3+§ÌWÌàRq�‚¸ÖÇñ�ö«R©%•6NñIDFû²çá/¬YDlåI‹æ̵‹›Llo͵N�f8ÑQF‰´Å?í—oÄ.œ”
3Šþié $
kÑ1
5ÿ¡”Žæ&¢£ÅEIý¢I@íÄN7>/T2"™Ï*”³ÁÈL
ÿJüs—½Ñ„0³êN”µ¬“í¤nâ:ˆ3úu:g
›È0¼Õ£‹$…j‘Ožx¸¬ì%#$¶*áYH¥šlå)&%³P3v³.¥ýÆW	;][8È�ìm\Ë(F2ˆ•'’ññW?4UæôÓŸV kg̾äã[Må"•Áˆ¥Z“ž+.h<cùcýó
WȆ ÿ™9úÿÓ{ñdcc1Þ`€Ö“Ò°iKRb'¾
-áR‡¦rŒš°ãXK}!_¸c.ïðª`ÇCuE¥@“ÉF¢�Þ‚lIÉ-|š�DèyÕÜFš¡£ØéÊ¥TÒ<†1Áxñn%
×xÄŒc°âºÈ…3Ž‘-„ÔUï�É‘¶Tw¨‚5)F+°¨¬µÌE¨2)ß&rÔ1¾`º Fš1�’yK1–ºQ�V“kQÖ k"	0À*àÿ¢¥·8ˆ+ˆRKøÎx…†ÖàRšÿÍ'VÁET†ÁŽ\hŽ¹¨Vª¨«Šò²C5™G.†±^›âäÏ0Zl¸Œ_´•�{GƒÚ‘*ÖØJ!@9pN4¬f�DýšÊšØ
ÖêÊ-˜LÉ
5×$]Ô‚L�³œãüPé9ÊF�BM¹ªÒ¼çQªücÚNšŒ<Åó¡ûƒÔ
‡ñ“#±tâ‰õœWÞ>µ˜Y‰¥Bc
~ùàH´m^GßÑ<!E…øK°&~àvð‚¬ó¸…M9JŽC—¸€.|a’'^I

½Au©˜»ˆµ©sÆ>¾v$邬A8Òm½–X„Ù‡’ÀH¢ž’Žp´©
ÇRAl[‚iñàHÛ!å6éà
¢ElR!7Ìã
a^™…*åÀ¸p
ÅÀjVkRuåvŒÉÇȇFâÆ
s!Ç`ƒÛ…ªºp�ÁÓU�6!xÃ�øóY6Õqw$ƒêiå\;ٯŖ°ƒ8ó
Ä¼ÐÓ6�é—&±]

©

ð}šé'{xSÄUl]™PgAòzÿ’—ö (~ZoÿÆ
!ZnÑ�Þ0g8>B"
ûéYõWuëÅQà	˜n˜bW„îðZð 	›aq¸v˜Õ(�FVßiѧ%å&W®@uˆ»l®ˆqË
FdŠ¹ nd&E×Ë
Ÿe=™Ã„’o{Qxg:ÿjÆù· ‹ùƒ,òt˜am<µK«&|›q¬ðÑ(™BCû—&ç~~[�Ö|Åv(ºÐkyçÈæ~iqög�g�j'ä3è1P÷‡¼4½
´–0—(Hc(�*"&94eÐ[«8q:·pØFå%™!X2QW±$Va‘¿¹^¬0S	Š]ÖŠ…ø&¨U%8µ¦
ÞR»UWÅUα[Ñ
2 Ù;Äœ@yñ_c/gºLˆ!„yU-ÜV^
‡Î1ªÕòñæïP~jX~¢
Ï�¯åU*÷Öj{¯Eþâ!J}øå-ûrÿ+€qî@5A$!à!_1<Í@BÈ%üa.itWΠ^5±xàò&Ì #CB!…jd>u7z1
5µÏ�+Å…Yñ§„uf·¿!X¤QeìÑ![R±…q.�ó–€,I1¹²a
‰5Á54ö1<Ï
_<ƒœ®P}¡
¨à
 ¦©"`ä]>¢aA[êUoÎ
´Ì*”*
qEÁ쇨 òPÐË?Ú³•úwá3(ÿ
LÄQ W4Rö7gØ3aKçz¦Ñ}PÂò�Q„Âä*ÌRëñ šî\,µZ¶RÅt<$	ñf,‘þ¬‡Qa¥!Šq+ªíÃ
(¹‘íOÙ?R²Âñ”Ý3w’½
€ásP¹ô<5MÕ;âuÆGmÓ#)bz&ÁY×Ö´<&ç}BÛaàŒÿ¨r˳1&§Û¡ÍäUŒ�ç]®Pj³‘Ü2}×"¥+ì"ò5B%þ“›BŽäU!Í~*~*„µ’X„Q+m=vµ'aõ
•µa4vÞ¶…&D™_¡Òë¥ÃT|e®¢,(FjÊ�à‹Ø¢J�c8Q-F³O't¶Rå�-:ö'L±¿FAju쥩ˆW]LÂrn1¡b¡«u¥C³§§ëLÞ²ãD76ƒB(Ä*à}-‹ËU¼ŽÄÎQG‘-®@MþµcÇ°'»a)²Ñ
]’c!H1ÙùbI@^"Úqr!V”ÆR´Á쯠i¥Ö*¡ì šÐ=ÿË„Ý"Ú’˜¦×ïÐÝ	¢‡I±µ°Ru:‹í?šä*¶Ç,ãâC{Ã!QÐ`òj;OëC
²Á¸Î¥®„î“ó<)(a9='n¨~fÈÀ»è‘ÊS‚Y‰‚"½Ë’,�(qGÝ”ñGGý1¸
 
RkXpëµk¨ ŸR>].2DÙÙRl$Y(œ{Ža1Ƽ^QÈ°í2Áë?©¿\CC¡³Âg_Ñš¨E
BE}ÄÒ ‘-;‘-8QW\ݹ A«Uä:Ì&€X/„Ø:™*ATäNHÆ6•uaÆÞØoψê–	!MläUŠ$�ivÓÞ'
{AÝ7$q]”±†·îe·±
:΢©�i…ÕØñ%¡·Æ{ˆUª³ËÉb¯)ñœ²è™wNiç>eF¤Ì1^€Cf¾ìbE
²¯¦I:Wä†J_˜à\,êׇ
çŸ~X—
@?’äŒÍÚáaÙM¸{ä°æ}ìsŒÏ6ÞlF0˜aß
‹lX­ÉpbÓÆŽt*\¯Dtanù�vXѽxô‰/CšûèŒ[8�Ýc–eÃŒwIi}�ëÍhì“^
ÄÔ{DÚ@r
Io`Ì1Ëa̲Tú^í�édšÕŸUÁ]ùdªJe+Ù|"U§BP©œöK,�éŸ\Ä®Ûì4¯HB\
++Qb–U=,¤vE[T�VKb“j}¤2ïhÿ.PŒ¢¾~dFŠ[fÐX¡%‡m¦`™A..ØÃ2KŒ‹�^6Ì-!ûeNY`ºItzÊ7ÀPÙÚÖ×½Wú1׌˜k€úô°b
[°„Ò¸VÃ~
§ã6ܳ/A‚k^¿VÅ
;œ-��ÎùŽ¡Þ[h«BÝ›VÍó°õq ñyet!gXÂ÷cÜa*p†oa¤…‚ÂÕž"hbOÊ…¶™ÿ!‘gôF¥ÄÖ
Ë–Ý¡�¯s›±™z¹É£…¥`²9—yr–.ûã¥xs,‰þ8@šÉš¤û™/yv>û|,£þ©ê¥µòéY¿Ô®Âª®WòURUøÏ' NXØÖTcWYu«KvÅj¬|pYm¹5©³O+
¶pŠ»’¤^èLÑf3S‰"Qq9 ‰¯ã˜�Ó‚
^ÒÏAöÐŒG»A‘A¿¡V�ˆ¼˜‡1ûŠv8
!�©Vh™‡ùˆbÐ@ðÿp¦«‹@‘þ*ã0�0%¶À²‡
«1‹
•Ï°«Bjˆ¡”û(¼†p¿âù
Rª@\ˆÔàŒøàS™°¼xÜPYÜ`é¯-˜ Z‹
™¬K{ÞxJ˜a�Š‚˜8ôˆ[{K˜‡	s’ÊГìðˆæÑÃœ1ƒ7ñCW at AwPÓ¸…yx˜Å
=<™)²Ž|‹xBšx†@|ò�Ó:ªaûx!d‹Óz=Ĉ¨VpÉÓ‹wx“yñ©^ò¬øˆMÿªÜ(ð@AðÑWø
_€Ÿv� 
qË™�“Àèy¾ ?쵑ÿ
õC‰Qk‰®Ð‰ñ/’è*Z‹>â³¾“ðÆàÓ•­àF¯ª•¼H†æX¥X“
烫‚ø˜Tk*½Ð´®ðÆ£0�$Ä»ˆÁcè�Á
¥¹�½¸š˜�Ú±q
ŒTd1Ó©ñhÆryWà<­¹%ШHç(ëè>] 	ÐQ�V°ŽUñ9’Üâ�Ú‘@ªÀí
g˜…@Ä��L9ÑSY†…$C�L
.Œ“ABA2KBK‚ Œ9Àxš¿\
NœLÙŒÐ4¥ÔCq†²¨…ø`‘$Ô©ÌŒ¼ÌDf2FÐœKÖ¬¿±ùŠ §ð=¸µt?ܽ@>Ü�‘©*Šl¤+¨lG绉é«íÛNu<	g©¾^YG®P>mœ ™Ϙ Ï�`5ø‰ô!ål*qǤ²µ-rOuŒ‰¬ÚG“xOO#PâÆ�4UÐUЕÀN«jЕÐ	½Çÿ Ð5P…P�È£
5vŠu¬�J‹‰rLÇáËÎqÄÏ«*>ÿ� ì“‘ȾU?	‰oᦵ’Q‘xP­(¿a0¬èƧª>tl HCÇwl>=P­Ð�˜Ã%ÕÐ)eÒY1 uR*•ÐÊEQ–
¯’µÍR·êÎ
5¾üìµJK¡MR*ú¬§W¿˜ÈGLÄŠ0S–ÓVYÐX‘Rè«Ò5TcƒÓn$TŠIÍÎ,ÝP(mÔMåÎ	µTÂTGÕsÕ'u>%Oì+QåóR¶ò•ñ£S
•>I5gyOZ…–pÔ´P­	å»ÓÕ‰øÔFš€µ¹T U¾ý¬(¡<eÑæsS"uÕBuïTÒRÿ-ÒNE¾Vm	PûÔ7ÅT6%Õµ	qEÒ-Å4sÍU-õTjWDeGbªEÍTFýÒOzÍW]ÙµÿìÑï4Çr–þ„>‚�OnU·JÕôÌÐ�	¥!{ÌV™øÑžP
`Ñ&XQ×Y5€$Ó�ÔQ…Gs¤¾œØmÐ-ØFÝŠ‘ðЦ2Ñ~\T
ÙÅUgUѨrš’ÕnÔ4“`SKsG�µ¾xdÏiO÷lÕI+EY¨$ë¤ÇˆuŠC…W
ÔyPp´>ì«+á3ÚVŠX%QãûV—USç[‰˜eÇœ¥T¶åQSuP|]WwušŽÿ}:µ4q�ÛUXm=\^% ü”Ù¿Í[©uÚ
S�ÝW=åQ¢eÔm$Y|e£'ÍÚo«-ÜÕѭU‰ÐÍÓZ�*÷ô¾z:T<�
e
†åØpÏs•ŠœeÜ
ÍFUe]“ÍÝž= ^»ÏÿtZd­YákÚ�MGô4ØÆ] ¬Š—5Ò›]Rì=>®˜ÜnmÜ•]j­T}%ÐTýÏó­ÐÊ>nôFrÚ\ÁOÙ]ÕøU?'mÞf%Wm¬�uOdy‰°x	­Oð„J.­Ø¤ÀÝMÓg!+�\­UÚ¤%Þ�EPäÝ*¨mÇ0ÅÜK;5}ìÕ®²«íR#Rvœ×�5í
–~ÿ=Ø¡]àµU ê�YuÜÕ°%aÉ¥áó¬`Z³]æõOrÕUê=YV	=Sº½aöÄà"ÞÑ&.âôûà¹ÕßP[â¬Ð^Ç-¾õE†øä5š@«ˆ5Ö†[øcˆdh…eh…dpô
£:T¨�W[öeHf–d8
ÿ=ŠM*×dX`˜š˜…g f›hc
tàÿfW“pQš
5ïÔb'vâJ“àEO£ÊŠeÓpD_h±ÛM¾°°W¡ugIÕÖ*P•¥ÑÎ}[f‰¼ø¾§ Úx¤ÝåbV¿àK`0Fš¦„Vè…fè†v臆èˆnè—
媱éã™–i™Îµ725­ÔÊ™†ã"ËŸöé"Ai–~é—¶ `ùÌ¡p˜K¡†éjY:…TÈS³Õ—ð»
¹�¾(b¦…4Ögë´¦5µ
îEÓ´nÏ]âñôa´¦a”Ý•÷„UYÿ1_º6["&OÂ�ÖY‹ß
Èà{[ÀõÓ`5köS
êQÎ$ýW—øÑûPŠ¼¨Œñ0z
÷qzèq wí
ÿñÕÎñ"òñ#q#¯‡p
¿tVÿ�öPmXmlèô�c÷ôОSŸöm'õÑžô\çpR§u!ÏõÏp‡wOuzÀ†Ißðs§w!÷ôZ'÷t×ðJ/õJ÷M¯N§j€t
·
¿M
r7]s¬AÛwêY—*2ÿ!+xÿy‡€ãÙ¶k°¹Ù7Ú±õ{ª‚ï)Û,¯Óõk²ë«r
¦'}¿YûÜuÿç­‡\3¦
ÈÌ0Fû-u
ƒ¡°øé pYÌу©†ìãù=œ7"¸P"¡Œúô1±lzl!H;ö1O
2O‘Âa‚D”–Ä(QÈJ”^R¬UÅ1”aJöú×�€õ
^Ì‘Írœ³,Ýd+@¸*™(­Êu«V Ó€vu¬þ‹Uì2�àŠs¹ñ@Žr“Ór¾3FdEtÿ±‚ͳàȹ'zkŽ¯ã§b�†�lÌ;$WaKŠÅiЃХ”MH5äA8þrÂ|h/
KK®bMV²1w1ËL•N¾�/Ó»Y\8ôôõ¬ $kH
ËÊ"Ñ�@Ì ÇÊ
R³Œ\�b#s%5Ä—§�…},ÒÓ>²‡¯¶Ø	1#�’]°ÄÌ‘…r ™Ñ
2�é¨Qô@
R"r¢µADQ
ƒQ
sD(Âòc+"J–²1
ïI*ƒu[Ì£$Â$iˆ(gØóXI<d�GÕ(EÞðÅjŠ¡b±Ê4ä�Ï·œCœ‡ÎÑ9k¬�¶'Çé°kUy´c…õ92Þ
WãúÿãlÈSÈ`	g‰¨r£GYÓRè´§‰oD)Nïƒ ü8«Xµ8
ºÔ¥ÙýæAïúc1DsŒ
­Ã+"Œ&A’™¾ø%‚•¥,鑬ʫZÅY¶Úl †œc—c3Ë™Ä/~4©‡Mp¢šØ0ceRK§,ÑD¨·†lqÊQˆ$I¤dFhŒqšæ°ª2f”N½PUŸ::�ŠcEÑÊ^ýÒÖÆ*Miƒ9¥]ƒ”¬lM0�ÁáÑÂgo	I½éèìh鬱Vª
á47ŸÙº§‰äA~Ø%,Šzk§´¹míR…Å*éŽÝZpeµQ™2¶´:Ïy\ÇÄ•V
�¢çÿî(Ÿ�¾Gp?¤ �
RèøΖ­Jj1œáŒ\l¤êÐF`÷ªß¿Ìm¿ü…+S"I’u4EÀ{ͯõ¾µŠ$à¨Çœ,¸
vä=±p1|

÷�_ÎÖD—Ã=¯Ë»a¸å$ªÑÐ1´‰ÆÅVv
NHÀiœâ€–sN¡sÄŒÞYàÅζ&Þ8eH(¨XF"ž•ã.x™f4ºpôÉ’a*…ò°…«ô*=è
ªs’žª÷4²\L
-zráÿ'ƒêÁ»0Ð_ƒõ#�ÙÁòŒz‹ñSFÎ.^'«k/ÂÑ‹]4Ó¢æ9|‘i¹·½îtOõ¦3­÷_ûâÒÆ`íß9øÀ§šî›þûß}w_ÜÝð¢¾û0â¾w¹“ƒ·¤»9rÁZrh~Ö¯¦;èç.úºï½ô˜>}¦�áénän<¯ñ®êM{ºöŸv;/†½x¤CT½x…3X±dèâˆn¢˜!w¹Ù.·Þz8ïlUòTYä5—\u’ÒßjZ‡âË	· ‹J<AGOÇYg2_6²Á#GKþý¢âÙ¢ì	�²	H0O¼½Ái|†+œÌ,HR1ClØÆß8Ñÿê>àß4`£M E`Ö\bàõI F �ƒid`&`m<Ã6ÃÉÌÎÏÕ-èÜ;Ć3¸BtðD´ˆíÜ †Y™×my°\ƒ”½h‡ŸaG
‡yäÜnéÂ…9ÚzqI
!KΡÒ=áœ)�a~à–2ÔÂ3,C+ÔF�ôêpQÆ¡Žú×Ó±Ù¯œ!a×mwq\¹FŸ™À­_®ð–it×´ÌŠè@!A ’éPŸuÇi
þ
s0b.^¡/"Ë/>a«ˆ"1â"×ã1a""Ýp9aJ1]Ò%ÎyHÐm]sc^!i`]6b¢qˆâ(:RÔ‚"
öaÒA#(>Ç}ã5ÎÙ"#Õ¢qt8š£j!à”K4þc7Fã´Æ0Ú#3ú¢m`ã;Ê£éУ:‹@&$/Ž"m$qñc7®c
jã?îãA†D$'$‘c«¤7Š#=$&*Ýqa¤J"]"þb9ÞVGr¤>’¢9Ú£ô=d—ýœx
aYže-¶¥SZd-ºe8J%[ÊK^V¡�Cbå8
á]Nå]¾%IA¡bj£aºáBreJ–%eÂ¥7b\£;Jåfb!3fá<V¦djacŠ¦c*æà�¤ežåSÖ¤G®fiZä¾fh²&G¾%.®¥m�|0Ç0<ˆ%þYx‡k°ËAˆ8j]5FNQÚÑÔeÝs6¡t2gÖqNs¦5švVçr.gOðßz}§rî
5f'¬\§y¢ÆuF‹xN§{®§{Ƨ|z×oÀçÑÍgxâ§~î§rògäÈÆz¶3ìjçɆ¼$Òÿ0°\-å„üÜB¨-MèƒFh#Ù’
NhA¨
v(†~(„Ò¼¬ÆˆJ(‰vh‰V¨‰f(…j(ˆªè…†è‡z¨
ÒÕ…f�º×‹z¨�nhŒ¶(�¶(‹öè�N‘Ö¨Ž®h…âèŽÎ(ŒR(¼üf’Z¨�rh�R(‹ú¨‹Z©‹"i�æG•:é•þ¨�ª ”Žè™æGšÂhÕŠi“*©—Z(2¤hŽré˜B)*Ö)ž‚)†Úé„Žè�’)œji�
*œn©‘N©œê’æ)‹æi“*K¡b,—Ñ_K1¬Æ¨èÂz�'˜1Ö�§Ê	§¥Þ(Žú§vºê©.]•êÿáØ‘ã¸'‚XŸ–ÙÔ¬¶ÙíJ#i°ª*xÙj~lݯÆ\¨«°2)~šjQÙçª2+÷õÖ%rß±NÑ„Ð*¯në
RNäÄkC �ê}*+=È0ðÂjèŽFð�¿™½àhÔ«¼ƒ
î‡hØà
Æ+¼ö«¼ºÀú›½Þ+ÁÂëhÌëi
ÑBlÆÚ`Ç-˦¬ÑVíÓv-Ï–-¾ÖÀú«Ñ~-Æ"[ÈâàÛ"l² ÜÚ­íôìÀr­ß,ÖF­¿6íÒ6šÃŠ­ÊV,Т,É^ìËê+ÂrìÌnlت­ÔZ.Â:ìÙÞ`ÚÒËgà1\ð-›�$í²z9
¯íJ/úªo/ùn0êpñ¦/ü0ã/úŽïúš0ñZïön0ô:ð³/K0ÿ&0¯¯ónpôºo
70_ðúîïõÎ0ý–¯ý–0wp°ò0“pó~ïÿRoø.ÕÏ°§oü*ðëïkñù*1ÿþ.ö¢0Ó°
Wø©²®ú²s]ó6C‹­JÁ£!eêCñŸ©~Kvì‡(ß9;3Äa_o`Îô冘­T8ªÙù™s ¢£¨J‘ajœ8w™0ckA+q�Ë4ójýdªúµY蔑-ª3d¾ª0W4vðê<ÓgDÃÊIùset?ó È=45ëó7“Qzps˜%—±Æß®ÊsNWû5ô0º2ë$–õé3³È!M33C¥*>–ÙJ_ôæÜô1ëQ­ê‘Êg®
絶™-Ÿ+<ÇÖdÒóÿH�ªQVÔw1uçÈŽõ%´DÇ4G7M‡4P—ó¯xtûg°´·DŽö•Ñ²TUßòãœQÿõh°u°Œ‘ôQKÌá¡=ÓJÀmóGÅY<cëpžµ{ÂGQ6àt‘JïõtvT0Cël%â°2È­gör¦Ö”[ôFa³u,×U3ô
Èê¼*?ǧó‰8CöD�WRÓ6ãÔó%öu± Î2.ß]TO‡3ÝvÈuöV7÷]R5wè¼dpÈŽN‚‡JÁ´®®
H¢+‚\Ôû-r1ó.ÏvK“YáÀ1qÿÇò}"®X‘Å;ç6øÆzŽ$~÷µ†@óÊn=â9ßC‹ÿ766tˆrjÛ”ÆÝáN§öt5ûIø/oÂá¡FQY¶3K³«¤÷syXëp®ÑB¿Žª¼JÊÙ·MŸ«Oœ.;ÇJQ"9‡–)5a·žñáƒw_v›QhÏ‘`ÃÇUåé¸oWõJº5UæY°^w]ƒTú9ιr£>1ÜgÒ|”×m�7r!ËJÌ¥tàà³p¿ÑR*5WËöz7cm£ã„Ó´){ø©À7pS+é 9sѹÀyÔBƒ4L�Nt55¹4_íDyÇ}ŸDÁ±f?ø�Ǥcxž›6ýÍöâ
}¯È{�kþW—õŠSýÀg¹œÁÇ´£
[Ô}ŒÑÒkþ¡+{d\æ³ýzu¹~‡öèS"w»³‹Ï=yÏ´‰ÙÑÃ<H‘¸–Oþ*–×䃸²Rö’cNU9oŽê$<€÷ý˜c«æ�{iÜu„ëgÁ-½³×`ª÷Ô%^;N³Žâ8 Á}~Vg6Ÿ�õf_ú÷ï*—G@
--- NEW FILE ---
GIF89ax
ð

<!423<@&;C!8d

Jt§Q G‡&-Š´©R§LŸJ�Ju©U¨W§f­Šµ«V¯\¿Š
Kv«Y°gǦ-‹¶­Z·lßÊ�Kw­]¸wçæ­‹·¯^¿|ÿ
Lx¯aÀ‡'.Œ¸±b°¾|‹,ÌWeËÀ(c¶¬YXæÊ“#‹Æ\Ù3èÑ”��>ÍY´iÉœC_N½vkÚ°YÏ&�Ûöîדu�[³kÕ½eGÜ÷òÚÊ�C7Ž»yôêÅoó¶N}{ößÌ¿?ÿOÞ�¸péäµ›wŽž»úðç±Ç÷>ýuúìåçÇß~yøûù÷Þt¦�8ž{	2¸ xíA¨_
묥Öúª­sÒzë®CîÙ0ÃÜË0«”Ög™ýbÙlÂ4ûKi¼•6g¬M+̳Öj—í²Ï"7-eÂXû¬eÏŽkÚµ“MÜ/Ü].¹¦™«º¾¨Kn»Ø«š¼Î¦›»Å¹+n¼¥Í°½ô®–¯»ûÜo½äúòKfÓ³K½ï2ì.iô"°Âw»ñ¹ÿ‹oÈsül³×þâò0¿XLÌ.[z¤²H*ë²Æå:ܱÉ
/,2¿³™ÙÑ›
£¬·°}K²¿ëž¬´fÉ"Ùìd
7LôÄ#Ù/½|Í,/¬›òÓG4Ê
«õ½kÜ6ÚŸ,÷È¿�ð¿lãÿýpÝqëë÷ÏjƒÚÄÍË-dóÙ+½#ŒãÊîÂò•†v-äÒ¢á$ç‘y$蚎y食.:j¤¯>ZëC¾¹ê±Ó>{’®wn»é¸×ÞûíººïÁó^|ê¿?¼ð¨³¾;òÇ;Ÿ<ôË_æ+jd÷"L6‰°1GO€qÅTˆ±Åù觯þúì·ïþûðÇ/ÿüô×oÿýøçŸ>çó~X°° ¿p~XàŸ¬ 1˜ï|\ج À
faÄ ­ Á-øï€ùÃHA+
T¸Â· †Âð‡)¢ÿ‡HÄ"±|Ÿ¬A~Ü£´`V˜e©'YÉŠWU³xE,
ª‹Zôâ–ÀØÅÓ}‘‹dL#×xÆ6Ž‘�otcíPã«Qen‚œ°-pA~¤ IÈBò�ˆL¤"ÉÈF:ò‘�Œ¤$Y…?2�\˜‚‰e4CÔ¨F4¦1
jP#Í@‚µP@V’•le+ýøJXÎò•±¬ùGMrá�³„å/_	È_þјÀ´å/ýØËaÒ2	Íå)Ç †*T¡U(D3šQˆBLð˜ÌœÂ–ÉLVjaœ™´$+q)Ìa
“•Ã¬¤!Á¹Lkn!Í%5¦�ÿ…*X
„(¥2 AY.ó—<&1[ùKtžW˜F4öY/˜˜æÔ‚&¸QAV!€îüg4§Q�idA“¯´Â$WÊÒ–ºô¥0�)$«°&X£ýp9À–$^
µ¥†5R9>פE¥f©ÑŒ+d! Ö�<¦ÑBø�1¤H¹Ùi€Á–ZèB)9…"‚ð 5¼`…) Á¶Ô(DÁ�ÍJ£Q¸B¦
�îÚ
	G D5¨
Êû*ÃcØ‚J/yQàÖ÷”aàß‚{[‹Ò²£Ã´Bì0ˆ?Bј‡t§ë….\¡¨­ªÉÌX&¡”¤l“€ZæB
–SH‚þOZ£¿ð@åÿ)Ñ}N	Æ´¦b!Ëä&;ùɈ\r!i
…jØ#§î€¤Äx¤&]&Ia¤£qf³(¥ŽkËA
Ýõ6·æϵyÿtof]œ_7çÎÕYÍB½³Äô|f+õÙIVR cÇçBçùÐW´•æ\™^Ðm Cò«*¼ʘδ¦¡,L&!=Öfu	q4Œ!»Zè!±MBèá	Ûì¦u͇…1¬Z›…¦]k(ã»ÖLª¹ÙŒ@ì¡õpÆpWË*ä0~„¨¹)ˆ@Ü
ƒw¸Ã ºÉÍBøÁ � ¢�ëfâX «¹Iê"á
w D7»?dA€S°ÂÖ]Ro!Þ±ö7'!Q+údðä9e*€áÒ®îüÀêyC0–®`´ÍmP+ƒºÝÄ‚+uH†;Ì»›×ÿ
Q�n‹oå-ïæ(˜€·šâ /`iBˆóûc ƒ7Mô¢]‘°L$®°DzäŽWe|úÓ=¥Ùzhæòò>Chã(뀣Q9Å&²·ªìžB»“Ô®$¶÷êìp?”Û…4÷ ÕHw§cÜÍ.÷SÉ)Î`WØØш5°aÒ°G=^[kÌcõx|äyÊO¾ò’·¼æ3ÏyÌ{þò ßüçEúΗ~ô¦'½êSÏzÔ»þô°_ýëeOùÚW>ò—¯}îmÿxÇÛ~òŽ¿¼ïyïøàß¾ó¼·}ñç1|Ê7_ùÌç}îwzz@?ù’Ç=䧯ýß[cùØÿ}ÿøÇOþç“_ôåO¾ù3?ùöË>ö­‡ÿìãÿþúÓÿþóÏ¿ü÷oÌwŸø�Gö°MäåÀÄð· 3¡£TMf­Qg¾Ò-b/‘QT‰¦gG•VqÔ�_¢Frt& è�"Gh‚%‚S„‚+¸E‚V�)È2—C)Ë"ƒ6xƒ8˜ƒ:¸ƒ<؃>øƒ@„B8„DX„Dè:躠;Áq9²q5àRT—q1<è·�1 =—S,£…ÖÃ…;H-]Hdƒƒ�1ƒH(„êQƒjÈ…ËÂKÈ2q˜„0Ø56(†f(#uF؇~ø‡€ˆÂ 7H-|(ˆChE7X†…¸2—ÿC6l胑¸ƒÖò.³,•Èƒ™˜ƒ“(ƒ•¸‰�Ø,5Š>˜‰¤ø‰C…Xx‡š8Š”èŠ:hŠ±ˆ‰©H‹yøŠ[8‹¹˜ƒ²¨‹¢È‰³(~Ew©cwňwu¸Ez:e—9¢A·ð
Åp·€�‘uW„�i¶�ÜØ�ÃáÃë „VxA¢�Þ˜ŽêxŽ×$Úˆ�︎mG-·0ÐX�å8$è(ŽÓ�¾à�íui%ù�
y�Ø3É�û¨�é�i�)$ð(‘)�Ä@°0�DBWØ‘WXáx…(x	ÙŽò˜’*¹’£qIµ8Ä ’ƒŽ
9‘'éŽÿ™�(i‘;i“©Ž5¹„q3s™“üè�]�JÉŽI‰”6Ù“L‰w)W,Õh�Oy“>ù”?Ù“;9•Ii•¥q•Ô˜‘úè”Ré•[•)–aÙ”‘A”hi…ev%¹’�§)ÍxŽŸ1
ˆ©€«Pª
1s›¼)˜¾à
¿ eõÿX�¹˜’3,ʲ
À
¾P«@˜¯ó˜�©ŽÑ	�Êù5ØéÒ89¼P©Ðš¾°
¼�
’! Ð,°@–K™Äé˜Ðْù€·
ª›Å›Q‡™VY›Àð
íùSòi—Kš2Zš3Z£›Yù�“ÓZ¦e•9
Ž¹€@RŸ-yBš�ý8ˆ	Ê8¼™Xº€Ãà
ÉŸÛYʲ€Qz-²é˜ª€Öi¡ª°®`”Áò2µi¦¿â§ŸÂ
.S›ʦ…Z¦Óx¨5³õ8ÃR¡½¹
ÐX/î9,V8,	¼ e�*
PZFŽšÑ�‚™
¹€¡êªC,X¹™ãi¥V	„è �
©0®ä:®=P®èš®êj®£°®çj®ë
¯äú®©@¯ñz¯ãÊåj¯úZ®®à
à
[°òz°õš°© ¯çÚ
­
 
{	³à±@®§ð®öj°.[°-›®
/ÿ{³8[¯¯0®±
¯à±€
«p
‹
¨
¯p
Hk±¨
é³ó:°9{¯›
4›
¯
`K ð³+‘ °ãJµÿš
z[¶g‹°û¸8Ë°€
Xk	³ð¶§°³ Û¸—�±n
Q+´©€¸#{	T+
›
›¶k¶«0®B
Cµ©@µ0	½
 Ð
$[´Oû±¯P¾¨Ð
—P±ë[±Ùp
K;²
¯°¿A‹µä±p±¯ ²œ›±!‹
Ü
©µ 0µ¢+·X
¯0	KÁåë´ì;²p	!û¹
´P

ºP	0´¢»¾\û¾ßÛ
´€¸
²P
a輏
í¯âšÇl»Ç4+®«Ç€¼ÇzÛÇ|L®�È…œÈmÿ«È…üÇ{üÈ4û¼·0
`,wüÈèzÈ…ŒÈš¬ÇãªÉ˜Ì½ŸL°‹œ®žlÊ‚<ʄܶz<È�üÊžìÉŽ\®4®“@Ä­`¸ªœÈ›<ʽÜÉ©ÌËèJ
¡ü˘\Ê~KÈûLj˽ìÊ~ÍœìÈÎÜÇíû
£p
¯Ë¶ÓÍäêÁ;
ш»ÆȳÜÈçœÊ­ŒÄãšÎÈì·ÏüÌ„œÉ½ìË«ÌÈÆ|Ï»¼® <
<
Y{Ï ìÌ|ŒÌˆüÉ‹ÏÅìÐó,Ìôlл,ËýüÉ—
לЮ�
 
ÓÜÌyÜШ<®G‹½—Ð
FœÈ ݶ³|Ê麳¡,	“LFmÄõlÈ]³“@Ô¤°³ÖÌËU�
Äü·ÊÏÒüÐøú°„(�Èq�€µf×íG•Æ^t=ÚÚ+t÷}æSÍ
/ +ÿ &°Œž%°(€è‹nˆÎè‹Îè˜n陞é$°éšî阮%Pé+°è(�é—^ꘞê‹^駮é©êªê“^é¤^ê&Ðêžžë* /`³f;èÚ»äê!ðê™^é�¾ë¥.é‰Îì·.ëŸþé) 힎즎êÏ.ëÑNë«îìÏëÖ¾-pì(@¯qN®®
—ð	ý%Ð
¯°½™­Í"­oØ<~VE}掟‚›MÛzç‚¿a—㜯wœæ£
˹N¹²0´E­“à°	´à°±Pú§oµO˼«ï´*{
¼0	O›ºâŠ¹Ï{
N‡©0	*MNí·±ò,°ëõN&0'ÿÀ%À+ âïÜŸáÏý,`-p&€>p®Ö_ýlúþª½=@�îýå?þ±ÿ%áÿ
$L¨0�`
‡%`¼H‘BË14� ƒÄ
	4¸Øi3§Aœ4ýlñòå@-H¼Ã\®¹ÚyK|ÁT.p¸ü9Â�Ê£S�"§v|`À†/¿ª�€¬‰¯0P¤@Ñ•…ÿ‹Ùfó¦…
CÃ
†,ˆ&$Z0a̘¢x±n¸vµ@àjG¹V[à û[”ȪFŽ>?^üxòã9OYêû«¨ñæQ£&­
xô¨Í›÷L
<úÐà̓æ>iÞ�hæ�š
áa�	@?Ÿyï?íyjäP*Š8#%
6Øa�%È…ÓB`…`XYÅ_=Ñ—UVaÔÖ@µ¥ÒÅV}ITXZݶYT
Jä;+âô>bW,�#;ì!û¸G?üÝ‚ÜÛ_*v?ðY%ˆWì�)ÒAš¯„Þ³Ê+¨
†ÈÌ»b£×@{-¬a
Ï8Gª‘*FüãhG“ØÑ�wä+¬8Å$¦B
�•Z沑8\[+k9¿IŽd�Rt_ÙùF¥%jk×H+IXÄ‘\$Ùlà"«©Ç¹“²0
€v˜OêX@œ
^‡ˆ>Û1¤}^`±5”¿Æ~bP‡Qx)B‘Þÿ|=‰Ù	t`xÔ?‘±A­&iÚbÐ…u(†S [Eb¾ˆñòå‹°b¼xóŒ`±UÀ^Æ‹â-ZÃ,®»ÕK˜0]·†ñZG£0t©:¶J¢Cƒ¾R<èk#/�ë"„%l¬‰ÅŠ¥ŠXr•0b°"‚\Ř/…9®\ø° Àˆ“\xØÂa¾`TèTYbÀ|
|µX/�‰�œ	U¦Íº[÷â�Ùï]™�ûÿþ+³àL‡¿xý2xW_È…5žlø²cÌ¿
KNìÙàæ½’+ƒF,³sLÒ˜ûš\ìg¾ÿj\/ê¾�ëvÛ.`Ëu%Cå�xpqܲ/ûþ½Xµa°�YŸ™rn¨Ø¯æ{÷nkÏœ?o?íw¦uëºÕë²›/ÂÕ�Ã[>ŸÙ¾a½Ü»ÿî[Ûô{¢]g]{ ñ’žz«U|æÕׄü݇f·qv:°ÐKF·èBK°¨#
N
3“¹šÀ~¡‹p*džÚÍætŠÉéÎúï/¦Óa³&ï�­‡—“Ý{Þ#µüt-v…#]Å6ĪùpB­Ûß‚BÄ퇇[$¢
å“ÆÔQ‰l䜃X8²ñŒõéOØV3EÖq5a|aÖˆ£EÇ
®‰¯ÛÏsxÈEªŽmBü#ñ˜7ÎÏnm{^–˜HÐø¯AM|$A	»	Æ…ï)äegGK~.�ÿÚäy\ùD=Âñ…l[ái‡D¾Qæ‹ŒducFøÝæ‹ÑsÝuXGÏ!3�V&
®à²`– Æ Î 
Ö 
Þ æ î ö`r
	!!jA€ÿ`
žàê ú þàár�PÁPÁTÁ|àÚ`Òà&a¡áV
l�há&!Z
.አ֡rá	‚ Ž¡†aþ! ¢ â
¢¡!VÁ8�5ÐC?äCþe�EH‡µi
¡Ešì\”gíS^±�'vb8}"?e¢(’)†"(r¢*š"Ei¢Öl"+Š",ÆÒ)®"-¶b)ZÔ3Á•0Ì#¬
à
l�¢1#2&£2Ú Ò!Z
4C5H54Ãx
r
z 	V�45TC3Â`Á€c5LC!Œ�6�B4Äÿã4L8R5Ð#X
ê�2DC:Nƒ8ƒ5Xƒ8f
	Z
¼£4V5XC5*C \
1’Á ‚4Z@Îc!ØA4C3P#=ÀÃ=ŽcÁ9†c3LL
PdJJã=FC3‚t
‚�4Îã4!Lƒ=Vƒ2d�!ŽA (F¤G6!¤c‚  
!¤$AÒã<À<ÌÃ4\�nÁ!Ü�Mn
Núä=ΣL*%èã’AQz¤?Šc3(ƒˆALƒ5HƒO
Â<þ$9ZÁLÁÂ<VCRƒ4Ȥ ”#À#5 at CHÂÃ8®£ã2^&ff¦fÎÿ >åb
Tƒ=ôƒ;¸ƒUÀ‡$¾ÕB™SY	—fÝÅFÅ6}_¼MlÊ&%Ò¦gØælîæl
ýæÕðfnúfng%Þfm
'nÒ&r§nŠs.çqçt§sZgu6§rbgwJçvRçMŒ—5eƒóÅA@
l&{¶§{^¦!Æ tc!ŒAtÁT
\�Lƒ4Tƒ5Âôg4P£54
˜å=&�>:f5ê
 AGÚã=Š�\
!Øã<úÁ 
Ôã<:
XA X<Hƒ4(ƒ¬!öçh¡Ü
A"þÁ4`¥5(ÃPÁˆVƒ3ÀC4 ÿ
a€A4PƒV6C€AO2ä4Ü
`Á4C4Ì£ TáDVVc�^�ƒ6ìg ø�(Á$Á  å=reVA¦‡úA �Ôã=z
꣒A!å44� A3ä<v�PAOd4‚HÁLÁø�¢RÁŽzhœ¨OBC5B
ŒÁ¡f3Ø�„Á’6¤“f(CVjå\Á¤¢ag¾§­Þ*®Ê`­>å„&#æÀ4ÈwxÒ«ÉÍJab¼9p¥u]Ñn¨¦³
›rD+µB«µÞPµb뵶Q¶r붪Q·ÞV0½/èB6dàœAð)檻¾ÿ«»îáΠJ!Ö+
éî+’&�EÖ#F†c4
ZAczäYÆäLÞÁÂ`Ú+¾– Îç¾î¡VÁ!’† d!")ÇZ¬šá½rl€lò'¿Nl¾.*Ëê!î'ÅšàÊ¢ì¾ráSŠì¬®¡ÏfaJ¡€ì!
íS¢á´àrìÊj£Æò«e«ÔN­2’,’v#
&¢5ÔC#–ÃkxŽçè�tЇ-Ò¦/9G-í›C9V°M×]×y(–a¹æVÙPÝZâ£á-¤½-Ýæm-ÉmÜÂíÝþ­àú­Ö
;È-ÈÿÂÒH/,Iç&‹çš‰è.Éèr	éž®é¦né®.ê²®ê¶.ì¾®ìº.íÆníήíæ.îîîíönè‚n²l®ð^`9C\lnþ%¯ñCñöðŽ®™ C9”²t.¡�‹·ôBò~îð
/õ:¯0\`è:oç’¯ø’	ú†D²”C/L/ûêÂæ
¹ð‰ðšÉæ²/þ/ûv/ÿÞïô^`²<òª/¡ØoHÀ/üºõþo²pIúÒERxîð°u�Iû’¡X09°/™¤DøêÂÿrpp
²"—
ÙJ[™�^«ÕŒV#�#ñ_4ˆ%_òìL'{²(àº)ñjòW	SvMR:ÜBìÀ(À‚+Èò+Ð2,¤Â-ßr-§Â.ï².ç2.ó20ÃÂ+¨‚+ó13.#33ç23³/31C34;35'³4/35�B*¸Â(ŒB\Â(¸Â1“39G30¿33;÷ÿò/·ó;»3<ϳ<×s<ßs;¯ó;Oó1g³2ÿ³?g³/7s0«s9¿B9{3837ó5?s?£3/“sAÇó+ðòEÛ3F´>Ó3>K4 at kt/41ç³1»B7£´:CsEkó1wt=«4,LBŒB+L‚7OôA#tJ›39sM�s+ŒóC³ó0Ë´Q'µ/SsI´SôSG5TOµTW5U´Aw3Bs+t5P;4XCôE7õX{´Yk´EsôI#u4�4K4>G5E›3BÓ´MãtC‹õCïµC7õU+3Zÿµ`[u-Ï5Bou*ˆsP“3_wô>4H4`‡ô0öA£ÿô7Ûõ8»Bc¿uKSöUKtd‹6hçò
ÕlS` ºœ¶jß+ðcÄ<c¬‚ˆÕ|‹�Ø-à|¦èüˆÙü/
- @
8¸»Hþ
…Y§*’+,)z꧷rzSâ‰üõß‚
0íÛoÿ'îëÉ~"Ya%N8ÁúÀô�
4à
˜@.��
tà!Áþ•€&h�ÿRàƒ_H}·F. Œð
…BùƒA	VÀJ�…-táaC
u€ÈûÙo
x

ºPØö À3˜¡
[�§JP}\'Jô�K¾„ylŠ̨FnaD€mJžMÐJxÿ0¦ƒ†È|F‰ÒÇ‹ðé~°pztíu°-wÀ°Kd0w‡Ã~\"}´$BÐ�Š�á'}<4CDˆ	çBK<ˆM(ð¡B×r-%b¹äñ¯K‚‡ÖÀ$z.†±P
£d1äÃгð±d+&FÓ§|x�@ˆb3Q‚ЬC0Æ„ßO¹„m­ü¼„¥°L ¦LX
~Ñzº	
ËD}2Ñ
,©rcÄd¤ò,�+1D੧LƦ˜2C¾ÁƒÿLâLÀ/§š0,×Ò/
ó×$¦wPbzqw‘FØ„,Çòün-bŠR/s/QR2kj/]�#Ûr

ըᨡœ¡æaêa¢æa<áÁ<'J<ÉÎs¢ŠTM¢Ð3=©¡¡ès¡¤A�–!àA ¡
§R+ß²uCJ楄püìÒƒ^Š/?’9/ô8ƒÓC�ôD#IC3ü`Ç¥�0„b“-+SI
3E;:³P3}A9‚G*J2ü†ôH“Ôý2$'”K”×ؤ‹„A
J¡D

ꩇ:­¥WÍ>­� âa™ÿÑ×:R5užÕÙš:Ÿí¹*E3 ÉYžõ »›ñù¯Íù�»,ûúœ›ŸËY²ýz±Ý9,µ²ßYœ›¯—‘ÔL_ô8;´×t´HQIÑñ²µ±é´1� ž;,ÓÒ#£“³	•¶É„�ãÏfº¬;
ª	t¸y:Ñ
¨íA;Sz�Á:©áWyÕ:•ÏÒx5Óæ!»Ý:«©{ ¶«ùsV{5Ô�;ù–˜-- ú£p¤¸ú:Ê~5Ôbu¡˜Á¬á
©‘o©ÍâáUŠ°z¦u:¨|¨³ûÐÊšÖú âš Z�¨D…�×

 à•º^\A(èË1_¼R­ëÅ�CZ´ÿÀJ at p@¯aÂ`
kH0€
óuÞ×/_
h
vKJˆZ7êâúx€V_Zû\D&ñ¢VB"ÿ=Ôr¬uB£ñr/çõ"€0èCApDÌ0´
M
huž–¯¼Ã_iƒÞ-?>¤“–ë¬÷‹G¿œÄšN°¼RL© Ã]*ßÁgXRGYˆ[sI¡â;­¤‚ã
R7®âR
áé{Á“Ù˜
Zñ"UFÀÓ§[$À »…Wü÷¦dŽùÔt¼â"Ù–…Ú7³�i%±€…[
ÝÉF9Y
PX¤ÇaÈb
õ"Z+Á!<%TÕ”,H*£È+Vâ‹u¬¢ªXHKbCS`€äpµßMÖq
!½L#ÖšI�ˆ
²�À®š0\á’úÂM©ˆ×Gˆ±œ¹Ie�ªòÊ:/Lc¯
™Š<
˜­Žë¨RÝÔ•l'7‘HÀê#_ñi

Øp8Œ…ðEŸb”DÒ+Ç¡0�\HF³(Š�)Á|x1%éQ¯”9 ØB¦Š[0f^L9J:˜ri¡G^Ê›—
Ñ·ØfñOjý&6¬tç|ÃR6©OˆMCÇ”fâí}öÄl
IŒBš4Y¾ÌD¦ê 	^‰˜ˆ&Ù™Ÿ‡h1
†DÄ#*‘�JöIý€'߈Ì-R1»Èh
H‡+´Â§
õ,Þ‹¹Ç”�ûðAÏâ´�ðMªØ'¦æÉÿ}ÅŒŸñ±reÛYú:>=ñu¿}ª@>·`•zp/Xdyò�ï²á‹ìâö‹”:pr¾Vª/{´W~ÇT}õ[_ÿ|
ØŠ÷cá'wb–fÂòdfy¡‡|göy
8b[#zØ}®G@òÇx{(–xbè}€·GZædH~P–{.¦°'€É"xÈ"�0fzSö€¨d†�"è€eW�¥}݇‚Ræ�0H„Lv‚Eˆ„Øx?„,ƃ<¸�Fè€tw|øß'‚„·„-ø~=3¦aYX|kçvJ˜ekVxœ‡ƒûGS1ƒh†|Ø…”·~Ôç†p§„b˜|zÈ‚†ƒ‘ׄT‘yƒ(…ßç‡ÜG1øwI¨w¨G…N¨…X…Š¸†n¸/$�ë'aqx….(„O舭WˆeŠ'x,òÇÿ/K¶‚(xˆ–˜,%Ø�Åbe^–‰8¦ˆ¦ø€a&ˆ{8{_X€=x„4ƈ�‰Ârv®7†Ä¸Œ'&�%XŒˆ÷`m˜zÀŠLè~ü2f^†Œ¤×‡žˆï—?öŠ�ŽC8cpHbÁX‡/ØŽ¨�“Œÿw€Ž—‹›èŽß¸wòX‚¸(cë…}WbšG�v(�†§vug‹?a¥˜„·Ø5é±’‡‡Åâ‰)¸e渎†.ûøv¹h�#É~@H€œè�„ÈcÉŽCØ~yeg6ƒ«Hyòw7‰“9©“;É“=é“?	”A)”CI”Ei”G‰”I©”KÉ”Mé”O	•Q)•SIÿ•Ui•W‰•Y©•[É•]é•_	–a)–cI–EÉe‰–i©–kÉ–mé–o	—q)—sI—ui—w‰—y9—æÁ—}é—¸ñ—�‰/�é—ƒI˜|i˜‡	‰©˜Œy˜ŽI˜�)˜Š‰˜”i’ù—˜Y˜–¹˜œ	˜œ©™}š•	šž9š—iš©Yš«i™§Ù™¬I™®ù™­©š´	›�Y›±™›¸y›�¹›¾Ù›‘ù›Âœ“Yœ™9œÆi›Ë©›Ç¹™Î)šÉ‰œÐIšÌÉ›Ö	œØIœÌ)1�Eß	Iè”Gã)1ûÓ/ö�å™G%ƒžè$žPÁž+’žïyží1ó©WE5ŸøŸôÉÿŸúéžÿiŸê	Ÿ
¡Š¡
* J¡êŸê¡$
¢š¡:¢z¢*¡,º¢Z¢0ú¢2Ú¢&£š£"Z£:Ú£<Ê¡6º£z¡Bú£D¢HŠ¢3j¤Aê£N
¤Eú¤R¥Iš¢8z¤WJ£Pª¤.Ê¥ZÚ¤TÚ¥Xú¥L:¥Vj¦Uº¤7º¥b
¦gº¦Cú¦jê¥nš¦cÊ¢•�ˆ8�{ê§
¨�*¨ƒJ¨…j¨‡Š¨‰ª¨‹Ê¨�ê¨�
©‘*©“J©•j©�†î'€�ø‹vWŒ�ú‰$ù©˜ªg6ª»Xÿ‰¢š‡òhª«Z’ª:‡¬Zª³šª­«¯j«Rxª»êª&™«’È«·ê«´J…ºÚ« Z«Ä*«ÉʬÅ
¬ÇJªÍº¬Î
«Æ*¬ÈJ­¿Z­Ïz­Ñš­ÊŠ«à:¬Ò®ä:®ßj®Ø:­ëúªPha·øŽ&VŽ:x¬½è‹^ø�ø:…úJ‰è˜¯ÿº¯
�µ'³=‹ªK¸�=Øy©xþ‰Ck´ˆˆ´’ødKK’M[´L‹ÿ�Qû´S;ˆUK´Wë´[Kµ\«µ]¶_+¶Ç‡µI+}^K¶h+´a›¶l»¶cû¶m·Gë¶t;·J[·x{·g›·|»·Š§¶v+·ƒ·…+¸†«·„{¸šj,”Q®ð
¯@½0¹åй�Ù ¹››
åà¹�˹šKŸ»¹åºžkº º�‹º­›ºšKº°ëº³»¥Ë¹¯kº¨+»¹«»©‹»·k»ºËº¼û¹¾k»ÇºÂÛ»½[»Íë¼Ä»»Ã›»Î»¹ä�
Öºßp
Ùð
Ëk¼ª¾à½Ã+½ªû»È;¾Þ;½¨{›Û½½ðºÜËßн“Kå@£Û¹Ç‘ÿ¹ô˺Ò+¼Í¿¿«¼Å˼¨û
�Kl½¸‹¿“¼¾û½áKÀžËÀ¿½ ¹ÖK¹±¾´Ëº[—¹|¿–‹¿'ìºÿk¾È+¾äK¾­»ÂÔ[ÁL¼ÓÛÂèëÂêü¤«Ã<À=LÃåÄÀ[»>¬¼ÀÙ@¹”;¹³@³0΢hð×”ˆW;Šl‰[|°\̧xÆ"‚_lÆ;ÆØXÆh|Æ›Æf»ÆnÜÆ^ÌÆu,ÇËa—‹‰°™ A�epeP�œf€È‰¬È‹ÌÈ�ÜÈypÈ‘ÌÈ‘|ÈŽ\ɉ,É’ŒÉ™lœ<É�LÉŠÌÉ£lÉ lÿʘÜÉ©LÊ�lÊ�,ʪËšüÉ®ìÊŒLÈxPȇ\f@Èe€¿Œˆ,Ë–¬É´ìÈ­œÊ¨LÊÃüÊ´|ÉŠ€ÌËg€ÔÌ׌ÍÙüË…\ȳ|ÌÂŒÌ�ìÉ‹¼Í‹ÜËÝ|È€œË»ìÍËÌÈלËÛ|óÜËßl˾,ÈլϿœÀlÈ̼ÈÆÎâËÊË=Ë¡lÐîÌÊÎÜÌ
ÐàìÐ
Ñ¥<Ñ]ÑÏ|ʺLÈfÀÏx
’ÝÜ»Ã#å¨Nšié¢
$¤“&!0¦pï½f �‡9% hªi�‹.*o +œˆ†¼h¢âŠ#2¢.‚S&šiÄ[."B¨Pm¶ðJщ*À+ÄÀyÌÓ¢6ܬ°be@ªF?þP&»ˆòÂÆ�Ô¢¨)ª€):xäkÆ	*¬˜.¢ê²¸Â�&‹#Ä=¢A)"&”üÂFæž«"&/eóóO@T§+BòÈ-˜¨†ž~ò)§½žš­°@£t2°¬ò³Æ6&/­òú«P£õ®ÿ³Ô:TTWÕ´Õ²XU5ÖWg½Ì,[Q…ªTÍhý
Ö[yõÅÕ_s•ÕT_SE6X`uÅuYg…%VÙ^™5¶Vh'+ëTÄF´6âÀÃŽÛ5÷\tÓu
&+°Èâ¾f@’nšhN¤F™@îÐqAà™ç_æÄ{�šh °‚0†œg¹f¾�a,¼Lxºy¢Q¦™)©±¦F$`òB +ž÷ÆiŠ
¬Ú]ÇŒ[»xwË÷Ùs·
øKc'«ã»ž³å¡Ý½yÝ{‡~Ø链zmÙu³M)FZ²a¤�9Îøb>=W}ö{B»¢÷i*Š7*¨˜‚6/³FRµ*º±(*ª"c !ô ‡2œaʘS3üÐ'.‚eÈÞ %mÌ
]ÿ¨$%éH~¼ÙÂîçCÅÄ=í:Ø„Ž¤$,`�6E©
¶P¦=imÿk/AáÙ°p„Ìå7¬_OöäžÌ)é†[Ð�	�(¿CŠ][SRŸRh8*¶0s0‚É	϶5)¸ÇŠg·fCüÁ�…íraÛ÷F8²OŒ;‚	ÿc�z0¥¼øW¾÷)^PE�²ã©@S)Ítå*°[ÌðÌ’HER¯�œéÞì*I©K"/“]Ùäð:IIã}ÒT¢Ô)‡eÊ΄R•œJ%+QùJBÚÅ”Xá9Á8à

íc}ùK`š�&ôR1s¸'dæ~\J[o¶�$Œá
ø£!üº�…1da`èÂh#@˜±ŒVDf8“™¿	�îHÉÜ’0¹¨µuZ¡�©ÿ9§ÿª¹£srÁ„ßâMz¨“^jAGÿ›'nl"ÄböðP*¬æ2×9Ì=I(™4Lg?SãÂ`fT£±
Bá‡$TcüÈ:zÁG³x%Y„ÜÌô"i*Ìdj,�±ÔK!9¬ÖÉ®¦³ÓiO�çSVuwBíQgTžþT©–‰%ë)•§ðB³8D'¸Áôcô¸G?ºªÕ~ðcý +XÁ:V³Ž­kM+YÕêV¸²õ¬p�k[åúV»Ò¯l½k[ëÊW½úu¯q
l_
[XÄæµ­b
ë_í±�­B¶¬^µÇ=*[Ö¯vU¬ŒåGX÷ÑY²òC´fmi÷±”Ënö³�emÿkW«U±º6¶žõjY%;ÖÊ.E«�-­hY[߮յ“}ll]ËÛãŽÕ²_­­eûñØÏvVºž]mkûØçJ®_í­j»ZÆÖ•¹oåGf¡KVè¢5¬ªeot½;ÛÛ*°ò%,}ÿZßùæ¿û½oë_Áø°öýï`ÕÊXµÊv¬$ÕÇ;ÊábübžÑ
ì"#ªEÒîwvêU†a;æáTS›Ù)cF¼«[m%,\©ìXŒ§xW+–ñgPì,߸Å4ÆñŒucïødžr†‹|âG
9É@>òW‚ÓÃôUÈ+Ë/n
ZÀ‚¨Už"Œ÷J¥ÕòJ™qÿjf4ŸYÍifóšÝÜf8¿YÎq¦óœí\g<ßYÏp†WRá·Œ¥.©ôX~Ñå>ƒ½Ht—ûøè>ú¢'�J¤‡õ=¼@:Ò3§']f`@¨äTyêEªÂ�ÖÌËÌèRß…Ñ°Nô§@“ºQ±:Њ¾4·„1é-§îСfq‰¡òe_ð",}q�¥2iho¹ÒºþcV´òkœòê{½Àt®û8S±úØ‹N$¨Í½gtçYÝéf÷ºÝÝnx»ÛÑd9)¹éÍ‹§ü‚V¾ö©bÐLj.%66d9)D’Â5ý³…
Î)—F\v�Å!>qŒW<ã×xÇ9¾–ÿîUr[²s¸#£ò禦\å+Oùª#Íj˜Çšå3§y,K�Ò¬ð1Ô¥†¹¦óíož[û|ôŒZ(Lt³<šè0ÏùÐ7åt§£JЉ1úS+ŒóÊt�U‹:ÔQzu°?Å`¹Ô�ª
7ÝëiøØ­½ô¯[ÒH‡ùÎ]j”]�zçûÞýÞwÀÿ]ð�'üà
_xÀg†+šf{ÍW^ô³O}.PêÔcíô�ÚåÏ:ô´5Où«gå.¯0­\Nì´[èœ_}Ï)ü׿üÛ¥¢ýË…ŽúÖ'=êÖ†=Š
miݧýѸgúé]ŸôÛ_ø»ßô#kÿúâÏ^öÂOþô‘?|åÿŸø²OÖaŽ'ªÚ�?§Î†q«Tþï¶ÌEò�ñÕúÝyø¿_þñ§ÿü×ðôS½þû·?ÿýßÿûk¿»¸»¼ 
ÀTA<@tA”AÄ1�ûÀì1;
t*dŒôÁ[)�{ÁÌ?òûAlª½ B,Â$<B'4¸ÉX¶Û–F±‘Ã1*ÄBK8šì‘
]¸…axW¸2aC5ô]hC]HÃ7lC8tÃ8|CZ�CZ
ËV
­¬Xa½£ìÙ·Y²5Û�ÕY§[Ÿ�
´åYêdCD
b(P_xÎaaH_(2,ÐaHT€…tÏd£0µUÛ²­
˜uYÙÑبèYZ
�¥[_€6¼
r5Z]x\	}‡v@
 †aPª]ß.É

ÈØc‹X¤“›¤tîB›ê±«n©�ªæúLR{^KWh	5ËE½g±Nö”ÐR¸…k€
Žý×_:åå#êTY‘Í}^àý×ÿ}½å# .¯†
ôu+p]Ò

ÿ\ë¬T;­®�8تU7…M|Èk¢Z¶XI£†¸jXªUï`¦’«|aCš
Wc5<€0Ð�*t«6»W„=A‚Ÿ)>)Üñã‚*z/Â

<¨Bí¿õŽ¼ìÃ$›œJÉ(³œrÀ%ó`rÅ1+m
/Å
3À}°(ÑÕÃb½P~PimŸÛe'ÄI�Í8×Õ9Goeø_¯R$ÞAr7~�åEÉ�ÐÑ’é2
£±p6¬a(k?3Ðv«Úm2°*¤Ðx•H0šÅ¯¨VÈb†±U¤b[!SYÄÊu‹Qx«fÒÊWÅ2Ù¬S‚+_ª„Ö¶6­ø -0Á	LÀ‚à—+È%/{éË_3˜Â&1‹iÌcž`—¼d
-ÿgù‚Ä‹[sÖ$U惔෼%2»éÍo‚3œàdæ	TàLª¬”˒żœuŠjf«ÛÖ+M at K\š Ú'?ûéÏ
“!èA¦	-væëY¯x
T‚ˆ £*©F_ Ò‘J4£)EÁJ[šÑ¸T¥%�iDQ ¨@ïà‡>ôáðã§@êOñ�D´ÒJW´V1°
T ¥`)
`

`cΘÆ<à!
iÀƒÔ€Æ<æ!�y,óšÍlfGK
Òš–ž¥GeçqZÓ–µ¥­<àñ
v9KnæR™
ƒŽ¢š>P
/g™ËØÃ:Þñ1I�ÿ¤BÍòV„SÁÎú–wY�õ”
ìIl7
/Ú®&P‚+cøž¹¼'&p‚´
Þ1pàÏ°ÎÅ.j
\€ÃŽx„z_\wžâ]1±ßû//ë»î}/²�u²N®XÈÜ2Å$_
2yÅõÔ8†= á(€
�= A€ÚÖ¶²§%-ºÑ½îÒ>ÃpF»ßÝnv–ÿÜÌ
dÜØgWˆd®~šÖȇ³0WI›Õ®x1Œä⌰X…dèè§íC²€….h�§XÐb
`ÀŠ`$<wÀx£Ú{ÑC߆|ÀÿÕÅ
Þx:bà¬P…€O`ãmr^ïÿ=å;ïéà?žÀ$x
+X�ž�f!$W»0ÇŸ»YÈÂWÆ¥‚ Q{ž 
)¸rà
4
¬@LUº
 ÀH
´T¾
´€÷É€YnZIÚ¥§áe.½-‰>½€«Ù‚ÿaæ­�Ã.ØÂ.€C-äZ#4ÂBa’A�‚
�îèŒé�êh¤àè
.ÏòÌ0 ÝõÄ°Ø
×EÑ°èßC/”: CÉÙª¼ª¸®0°®ÁîìzÿíÚnëÊ.ë®.í¾Qïâ®î
C7ˆÑ7”×u./°Ü,p×ñÌ{ ƒ0/óÍbøÂ7¨ÝhpÜ@Ã:œBu¨é‚ðfOeÈnóÊní¾nì¢ïùænûöîì¢ÊòÒ‚.d-,/9F :Ì/:ôôò¯þ‚ëö:0, „XØÍ°Ë
Ã%Ë0¸Ãÿ
PWuÉSs2´)W—)=ôCKôDËSU^tEc´<™R"›’[tF‹tH“´Ÿ‚<ÅB%DÀ%8tH¿I“tK·tRÕâC£L'N·ÂLWO?ôLótK£BMËÓP3´O[4RëôE'u)8
ó
±ù—Ûp*œ¯ÄÎàóœyõ9‘æô‘Àñy˜K€Wy?‹��‚p�í¢§¢­
ÏP|8_¯Ï;A(¯/»ÍâzÁc<®,
K û
F¬ŠËÇÌ3:òëûç'ý®
¤HQ
ø?ëñOcQMCäAí/{ϲË
ш±¢ÿÐgD*hjãÒⶅ.‘åq|«]B¨Ö‹ÿ”‚è …2iQZÌâ{ÆÔ….ÐÑ‹iVsš×´&5·‰MmJ“šÓüÆ5ÇIMZŒºøÆ.Ðñ�qºƒ±`-tq‹[è‚´0¦>ãÖÏ}þSü?]¥OXÌÙˆEJAPc“ú”h@úP�þS¢qÃgÜ(šQŠVÔ˜ýèCýYR’ž¥)=iG÷IÑ�ê“¥þ(=ó™O|Ò4n4(G!ŠÒr¸Í'IÚҋʤ;­)NazÔ¢¾Ô¢FEªG	*Ð¥ÚT§øܨRû)Ð6ÿõŸ­iN5ŠÕ®Bu¤/�EPÑ‹YÌ‚³X©«Tš�V0 ßpÇ+
Õ®æt¢Ei`¯ŠUÖt¤ }hb�ZÑÂîÔ¤!õjc¡*ØÁb´£M EõWrô"(Ç_V°Š©#­*f©*Y•Jô¦±•¨aµJÛŒ–°‡-j/²!¶ŽöDÝlXéŠT“—¸DUneM‹Ü¨ºÖ¢õkZwÛ‹bÉ4)auJS|J·ª
ÅêwKX¿Z½EåçuÙê]¨º©Íè{ù™XŒv·¦7e)l—zS®Êt0S{0<tt�îS±{ZÚ>4Ú]ÂÖ[‡*VQŒÍ’#ÿçT'-²Ñ‹Ï~¶Ã±ˆ?Lâ–·¼ÍÆŠYÜbgÆ0Nq†U¬OsØÆ8¦q‡Q|b˜äà°‹y[âçøÆ7N1J;Üä%þ!vò“?+Wrx/ÅØE° %žº8«A`.˜ßÔËy�¹ÁŒTsˆæ#f^¾Íª™›ç47ŠÎ
Æ3/Ýtç8ÛYΈ+3 	½giå9Á¡23›¿|'Dsër¸BWŽ¦–BõÌÅ€E1¼"€mÈãb¡–X—¦òRƒä#SÙHV-êP»ÚÕ§~5«§êTÛZÕ#£õ­u½ëZ÷úÖ¼þõ­»DìY»Õ¿Vö²s-ëdSe ‘ÿ‡ñÐÑ2
Ú—^3œü`íÍžÎ͈3‘rÏÂá\d D`¯½;uà&wêä3ouã.^ânÎcÎÍïx¿¬ß•w¿tïÅèûß	woØ�ntá÷·¼!î`‹|âû^¸Â…YïÚ�ûÜd(oâÞ%—PvRÞòv›{ä'›Ã9în‘—\â0ß8Î÷M/“cEN1O{sûˆ�r*Ê�A¦	#]wD(#QÀ<æ
�£tiõ�†4@�„]�[oÊJL’‹Í#Õh'5ÂTÝ%{H£ØYª)wº{ÌÔl×XÆ(f�y@îШGJ¨aT=$ÐàÿéAj‹¹ÕJ�Ç2:Bù�ù}ò�÷H?*�€Í#j§ܹ
{8C
Ø2<¶Œ�ñzÔó0
ab Á{„KB�ðaÂG¾æ¡
±ÎM÷*MÌD®ûq˜Ê/T¼£ÐÍ3®1ù"ÄÌÖÏTüŠOw*¤Ò@Cˆáð%&Ï#:%dÄ& A
f„|"	`ª$øÁU)z
)øe$†Ñ‹ð_°Hªäf„*€òxÄ»Î÷Á&Ž	`�1%úÿ¡HŒÐI¤±êLÐù�\b)ŠÐ$¶Á¡

†Þç?nñÔ§©å§‰fÛûÒ!“[!Ë+;g‡Ý¿@<�¨Fƒ{< Ÿ†áZaؽ
à×pSøZäfš¢—ëÑaûÀcù0ºèë	ßãÂËÓ�zÀÿVÚ=Œizw¨g/[™Òþ!÷t�»¹Ã­å½¼¦æ=¬"æóIÅ¿wœú{àž`�b¡¼øº-7¤¤{w§IfÛ
M|¿‡’W
ùQ[½ÛwS(Ìt2ý¶/	˜‹,ïóŠcòÌI
³¦B¬y€C2:vR›
ãK+	,ÄË;_‚
“‘O-5—IÄ „Œ#½·Ù@À2ŒuØ+ltg£‹,ÿ�4eÆ(ñ2 at P´¼*-ü­Ã–/“°•‹ÅÜZ´�`_¡#l:bZ7 at xÊêr_I?ñ’JU'«À7´g¢gé`%ߤ£KY“s“lž;ÀÔ´,ta\©�Ôd\׊¦žXvV%ÈÐÒr€H¾¬¢é-ŠÜg¯(¼VXû	ËŸ.ÀfjÃh:Š0íÈrg¤!WJå0“O½ñ¨^Ij½’%/}õÌ«X3	+z’˜_:йÔY;<®”ð-£�4 A(Óã0ºü¶OÿçÁâ§�|~T<½ÃŸ¼ŸôŠ´ƒC“!0ë¤òÎ*(-Ä 1|¾"˜:„]‚3ä/A"WŒ*Ý‚Ð/«4”Ž¨•è1o¢¯ÚF«fÈà-Õ+KX"ŒbF©XKØ"¼ÄESð[üˆq‹_HOTjF+\&"­¢m·ˆ�©„AŒTPЀmÈÑàâ"ð~TPFA°Õ¼g
ó�nâ—V¼bÕ›ß`¤‘0²/‚AùÏ€F“„q’z
ïR3"ÞZCŒS<ïw»AI1€ÑÝ	ç-÷[Å;Rq¿-¨%¯p‡�²’
âð"„h…>F3€Þïÿ~81Ÿ¸0È@Mã€N‚`$�G!a�
Ï`‹¹Å�â‹ï|é¡vƒO	ñç'ô±óR¿˜TPrÙÈ<9šRü.rIˆ†ø;ÐC¸ #Ò2,8¬Ô�Þá‹T0Ñ€
Æ*‚¢¸‚«À0Rš½¢É¤@†éë¢:ãBMÅ’…‰ó�ÐÁ’a0=ê
V­œæïÉJfÞ
€Dp
rrOď

Æ„YøpEH‚`˜q؃^p1h<UÉohi�e¨„5øp9¨ÿW†	v<oi†UynhÆ`X�lÙ�	'—Cpw•Ø`Mx„¦n<Hoõv—
F•eI�¸†gx•ƃ^Ù…éV—ˆ9–ìÆ¡sØ×(·
BN�Ár—.ZÆ=7
´ àX¬‚rØóóç#wá�

 g#å

€M¿€cÃ�hr
Z’!E¡›¯Ðq47
MBAR
¯Ð
�¥W¬`*&2
}ÁŸÐ
îà×3rpžÄÑ~6(€åq�Ø
}„/
 eC›ïq›ãK(w2ÞrÕ“RÅP;lôЗûg¢²¸@{]“>1¥¨RA¤4gtK¹KØQ‡Á˜\(ƒ[ˆ˜pÒ•s™<TI¨§…èæ§i˜<žé˜ëV<˜)„�ù�zY¨b˜˜8™’
˜_؃û£†”*—�Š>ƒ	†EØ—KÈ™…Ê—mI¨®š©T8‚�
'}iE
'˜ö‚ºŠ©¨
ªúfª¶º©ÿš:™5¨–µÊª°j¬¾j˜ÌÚ¬Vy«”ª©ÊÊc4$H–fc„™‰•Þº…Ö„M÷#_ß:«W<7X®ç*„Û”<Œ:—ÃÀÑe…mñÃ'Õê©Ýº™ëæ>¨FQñ¤®\ø¬Åª¯WpUÉ«ÒZ™„ê—¿Ú¨‘Êý„<ÕZ«cØ™¯j±[‰Óš±
$‡znïú°Îj—ûpÂj°Àª?4¨±ÅZ²–9°SI<F©‚qÂ:°‰Ê<woªZ²²Ú±2û²6;´èv–ë¨+•²ôX¦²
¡EÔ­Wx©ê…ü¦°é† ®e*U+³¼j®Ž™°?´¯
‚	û²jˆµV«˜ÿ{—ðF!u)×ZAgý³·°;<†!U
º_˹ƒÚ»'KqÓ´j…m³”»»ùFª¨|»…ah„h¹½šÉ»¢¾�F¹Ó[¶*K°Ý»½µ¼woK¨»Ì
©aX—€Š»ÑËMüƒWë€=˜¾b	«±‹º‰K¿ÙëÀBØ«Fk•Œ+°ÿÕ;¼È¼ókq{¹´ÅË•²z‚S�ÒÂ̾\p'™›o§š»—y•8[Âí‚ý4©¡«¾À{´ÌÃf+Á¾šµ ¼¾G—¢Ê¼7Ä@,™øë½�ù«‡Ùn#»•J+¤{Áï«Â”¹…JøÅì¸Ô«½™©ÃWÜÁ’:<˜Y<Ã;¼	½C¼º
†¸±ªÆÈc¸®koWl¹6ìÃ{†p¹ÃYIp#Ëo‹‰ÀÅ[³ü»Àj³çc±-,Èë+¨“iÆ‹œÈ“lǘ¼?i¼Ä|>'ȘŠÊÄë¹(,ÃÁ
·ÃãÆI¼<¬ìÁ«Äøö–£Û©Æ
ÇXi¸ŸJµ«�YüÄ{ë‚ÿ[¼Ãxì°à¨¿,¶åëp¥{½¼¯ºüG(LÈ»²†ë˜UìÇìv•éªƒ©aËoçª�§¬¬9ü¶Žš¯Ô\½ÃJ±îzq]\…àŒËÔ›ÃÛ<ÇÉ+¾[†AhÏo\¹ðªŒ9q‘«…ÑüÃ~º»×l¬2øÁ!˜Íû¼Ç$«Ã�<ÇbŒÈ@è¼ÂÌØ;ËTHÄ
VÑ
ì¸7™*¼³"ø¿aüÌA{ÐÁìÄ”\oÝÜ·#�© +$!kÁ]Ï3Îb)iE¬Í?,Éœ¬îºÐ•¹ÌÆÈ3¹€<ÔËCϲjÉÛK˜`Ôü€a¹Ë1ª¬Œ¶\
­ßÜÕÞz»zÊzÐ^L²ÿ,ÔVlÀȪf­±4¨…ˆËUR�·ôKš»‚w\Ô6�©̺4K…X-²|¼úo'ÐØŽýØ�Ù’=Ù”]Ù–}Ù˜�Ùš½ÙœÝÙžýÙ Ú¢=Ú¤]Ú¦}Ú¨�Úª½Ú¬ÝÚ®ýÚ°Û²=Û´]Û¶}Û¸�Ûº½Û¼ÝÛ¾ýÛÀÜÂ=ÜÄ]ÜÆ}ÜÈ�ÜʽÜÌÝÜÎ]Ù,pÑýÜÔ]ÝÖ}ÝØ�ÝÚ½ÝÜÝÝÞýÝàÞ˜Ý)€å­(°æ­)ÀÞîÝÞðýÞòßô=ßö]ßø}ßú�ßü½ßþÝß
žà¾àÞàþàá>áÿ^á~ážá¾áÞá þá"â$>â&^â(~â*žâ,¾ßæ�TÃÝ Ý 3^ãÝð
¹@9Nã6þ
6îã9¾ã=Žã@~ã?NäaäAnäJ.äGåOÎäH>ä<¾ä?ÞäI~åP®åV^äY^å:ÎåT.ådæfæ9îåc®æQîäg¾æb>åhçnÎæt.çiŽåznç|þæ[~çsç€þåŽç„Žè‚¾ç]>è‹îç�Îèeé“è‡îè—.éuné‘Né›nè�Îé•ê£Þæ™îé}.êŸnê¡Nê«žç…Îê¥ëŠ~ꪞꮎë²þꉎ魾ëÿºNë¾>ë½®éÁ^ì¨ëÂnìÊŽì·Þì�þìµþëËžìÓNìÑžëÐnë®äóÒ€«Áâ.îS0äNîå>îé^nç~î›Úîë¾îߎîî>ïïnîñ^ïõÎîøîîò¾ïÿžïéðú.ððîï�ðoðý^î
¯ðïð	/ññ
OïOñ�ñïênñ¯ñïñà.ò!Ïñ#O„¯ò)Ïï'OòöÎò//ó%�ò3ïò5óŸñ6Ÿó4ó8ôoò>ô;¿òFÏð7?ô=/ôßôGßòL¯óJ_ôSÿóQ¿ôOOõ oõ[�õUïô<ÏõD/ö8x]›Æ
ÿÀ€ö›öj]¬Ðn/÷q÷r�öu?÷vÏö{¯÷~Ïöyøw�÷t_ø|ï÷‚ø‰ÿ÷„ß÷yø†ÏøŽù�?ùŠù�ßøˆ?ø–/ù›ß÷•ÿù|¿ø™ßù¥/ú§Oúœ�ú«¯ú—ßù¡¿ø±Oùš/ûµOû¦ßú˜¯û°û ïûžïú£¿û¯/ú³ÿû¹_ü¶ŸüÃßûÌüÁOüÍoüÀŸúÒýÖïü¬¯ü¸¿ýÓ¿üÞ�ý¼OýÏ_ýãþÂ/þÜ�üáoþëýÚŸþîÿýÝ/ÿå]îú¿ÿüßÿáÞ0
õiÉ©*£RÕ™•hU–Z�zU
Ö)A_eÍ3›ÖZµlÕ¾…Wî\ºuíÞÅ›Wï^¾}ýþXð`Â…
FœXñbÆ�?†YòdÊ•-_ÆìX˜]·u…užûù®h»¤=ƒ–kš®êШã²Ní.ìײßÒžm[-îÛºÓòÞíÛ,ðßÂËnÜòãÊ™/w}´ôÒÔOOÇ^=ûuíݹ_m=üöñÞ˃oM>½ùõèc«Ï>¾ûÚðëË¿ßôæ´ÿnA³eK4þf[k@¹t3
AÿÚSð,œ¯Á²$\Âü(ÄÐÂÜŒPÃÞ8¼ÐÃà@ÜpB‹#ñC;d1ÄK¬ðEct±F3”qÄmœGu¤ñÆ“KH…ÌÅ‘üQÉ {²¹"�<Ê$‰\ÒÊ&±|ÒÈÑ2�1þÂ|«33�,/åº<PM7ïZ3Î79›³.9ᬓ®;éijO>ÿ´3ϹöÔÏB
ÕSÐ6
M”ÑA�‹ÐF}ÔÑE)½ôPM'Ý´RL#….I=í4SNO%USS
�Ä1�ƒµH׌?b†K­ÀX	æÕ×t].×^w½
X2q6ÿØ_“=Vf…õ•×h‹}vÙiw3Zb±­VÚmËÖÚo‘½Ün©-—Üq�M—Ýuƒ=—Ûvá�w³xÍ­7\o•Ý·Yzßµ7ß{Õå]€õ5¸`yØ]…ñeX`‰#¦øa‚ý
¸bŒ^Øb‡7nø_�Eyâ‘3>™cˆSå’+žÑ¯ÿš™ÆýJÃËßbG˹gžÆhÏ|ºè¡…^�è£�NéV�Îê_¥&�ê�™~먵žšëª½¾zi±›[«Í.ܳÕN×µÝnûÝ°É;뺷¾»ëHuþð¹)ÓúeG¾ÛB›X×Oó-Ä	W\T¸ïïqÇO\ÿ-ȧ¼<˲2g“óÃ'·tÀE7ËsÉ+õÒIßœu_L§œñÐUo�ö×]‡}vÙSß}uÛsç=òØ…×�øà1Ç=ùß•ï½öæo_>úç�÷}zæ�¯{絇Þz鹧~{ä¿ß{óÁ¿¾|ôÉ×¼ûõÏÇ|pèè
œ­aVül3ýÞ¿ÿá~ÉŸ/î׺[Áj@Ä•ÿ¸+&‹_
Pƒ¥?J°Là1h@
J�ƒôà;7
íéN¿™Ñ�z”Ä�eEÝAXðâvà Ëëxaœ%ÉDdbMUÑT!¬þçaYýªW»J¸±F®¬©ŒWÓªU.]u­a%ë[ÏêV«ªµ®l½$^7©W°ÎÕ®[å«X¿f92¡åˆ$�Cb
†@Dd%;YÊVÖ²—Ålf5»YÎvÖ³ŸmhE;ZÆB¶±§E-#¡ZÆ’Öµ¯ÝìjYÙ¬á’5íiqÛØÒB¶¿�l"Vkˆ6è6‘E­o�+ÿÙ54׶“]ƒÖ€ˆãzÖÕm¬Ü Ûåv×»ßoxGëÛd÷±·E„mñˆÜ௠è/
a€¢ð’“
'GyÇU¾ò�£!CÌ?~ò$@�	7g‚˜`ó(0!ÿ
P°CÊYÎr”ŸœáE?ùž@ò¡G
?ÿùÓ_>u0x�éÿ¸@.ò¦wÝë_{ØÅþð',<äQ°ƒ%ð!ö Ç9ÊѨrnpvß‘nØ@½s¸ï¯ÎÞï÷Jñ½ðƒüß
¿¨Åƒ*ñ‡W<â?¹É'®òŒ»¼ð2ϡͯ¨óL”|èemÄ¡4å….²�7Ä
Q¸ÂªÀ-ÔÞö·Ç}îu¿ûÜW�÷µ÷ýïuüáßøZ ~ñ“üà7_øÆ_>ò™|áû>úΗ~ö«¯}ÜWÁû´§=ºÀðk�üÏ/~ö£ŸþÞOŸûÊßýì­@~.Ì>úäÿŸ?þ«0ÿÙ›ÿö´G¿øÀõ3?+è¿Ú«?ùÀîÛ>õ£>Û³ÿ[@-Ø- ‚	@¤½þû>ÿc¿ľl?|¿ö»>÷#@<ALÁÛ³¾ľ´½d@¾$¿æÛ‚$¨zØ~˜;� 0pã·ã€¶ºàœ¸HÂÓ±‹%úÁ',(¼)<ž¹°Âì¡Â&ŒÂ.¬B/äÂ/C¥‰‘vA=t Öƒƒ3`ÙÃÀ„Ã8”Ã9¤Ã:´Ã;ÄÃçó¾=¤û«¿<Ä@TAà›‚BÜCâëäÛ@ûsÁÄ´>ßÀ)Ø?F|C@´¾óó>Û«¿KܾC4ÀGÿÅQ$ÅR4Å9œ@,pj¨‡}ȇ¹ëb™ª§I;Þ¨*\$ÛÈE^ÜÅ6ù$³*%»ÒÅ`D«P:ÆbÆ^ÆeüEP1FºRFd”F_ŒFb´Fg<$ã0¹ (`�¥hƒ98(�=N¾NdD?dGE\GutGwTÇydGz´ÇzÄÇ{ÔÇ|äÇ}ôÇ~ÈÈ€$ÈNô¿)°‚„LHJœAâ»Çx,ÈwŒÈ�HN¬"˜‚-à‚DD¾)ƒ1p'¸ƒ„¬?�¬*཈”G€\I}D¾*Ø‚1È‚,Ø‚ù+Ä.è$H�4¿‰H-°‚-È$È‚1HÁvL at xœA+ ÿ‚-¿AÜÀ}ìIŠÌDŸ¤Ê«´Ê¬ÄÊ­ÔʉDÀ*ÀIä‚+`k¨‡{Èr˜¨ýá(Ô˜—¹©"S*”‘KGÚ˜º¤¤»Ì¼Ô$½<¾%¿¤Ë½$Ì¿,ÌÁ4ÌÄDÌÅ”Ÿ
Y“o¬(Ö›ƒ<ø1 at IF<ÅÌÔÌÍäÌÜóÄÜÂ/@ƒA „f0Íf „@ð2 ”ìÌüLHƒB(„f¨Bƒsœ‚ÙœÓ,£4ɨÄØ„Ä)¸ƒf°jèÍ$°‚)è‚Ò¬†f¸Ï´Hâô@´‚0(kh†Þ¼äItü½*È‚; „Ú¬MšìÄù{ÍötÏ÷ÄÄÄAU´{èÿ‡|pŠŠ`˜Å)áÐ�Â%\œÒKRíÅ-PSaÐ,yÐ'‰PИPµ¨Ð´¸P³ÈвØÐfs<
uÐýPQÒéÐ%ÈI—~Ë⊃<ˆ‚
„Ï¥Ñý½ì>þã*¸ƒ@ˆx †h8M夆j¨/øÃ�ÔH,0@ß-è‚šœEÜÑ>´‚.HH,Ø‚.ƒžô½BdÊÖä‚)àí¿TH„ô>J\Äž¼I*ˆ@ð³(¨j€‡yˆ†/˜ÒÙ#�»¹;8‚Ä¿ Ü‚BÌÁÙ£=+¸œì”ä‚-Kù$Ó„œ=+-Sx$¾MD¾,Ý‚+@ƒf ÿ†P��¤‚1 „i e0‚žÔ„4À„¼,8IÔ¾Ü?…lÒ*¸‚î,Òfp‚úËHúSÄùKH,Ý?HmÍïËÎf€ ­(¸R-Àƒ´ÑjµÖk-@(°z¸Ou˜¨þ˜*§Z“;*œ›q2´ºQ×teW¼YWwm×!”׋Wz…×{�W³×|}sËÕk½×“ÑÄÖ‚5ØGüCÜT]%„:åN= ‚>ä‚#(ÏA0I*8MÚì-m!¥Í1ÈA+èÑÒl†BðÚôÍ
¬‚)¸‚-e(„@„Ú,ÙA
…_"èÔ1„؃=ŽÎ(p4øÑüÅáñã#H0¸‚¶váh cª�SfåÛh€‚"`Ò6ÍæÂ>Ø£$?,ØÝNŽ¥þ,‹p½¯ÀļS6å_~×ÌÀìÌÖìÍæì¿h$i[=jQñŃò5ìÓ¦ÝóÃdéƒÉ$hkîX;=àh°Xò¬†y i}Ææ_+ð|R$¨¿]µ†f�†éÜU#~êÚ³–`( ü�izHÕÞ´nÓT†ÖÜN`vç*ÈÉØîÍH5¿+xèÞ„'èÎf]î“,b!½1ˆÿ‚uR/¸/h �%ÀIž­ ýk®µÙ	l>(°a!…ÚKnˆö‚ê|É) ÒìÍèüãö1øí"®†/èÃ=4¿±äíf`Î+Øcåt&ƒÎíÎèœx êñ°ü‚	¾a¬OÔÆñj�>¥=ú´´ÌO^ÈeÇþ»É‰Ð'ä‹01<rU›¸ôWR2'ß)�r(or+w*¿rÀ¤ìréò	+C0×ò,Çòý,ses3çrüó3ÿò=ä…s¬m×3ÇkÎñ<ÏLÕî¾Ù]\ÐuÜ�<T}î–µaCâi è¨…V,øoö&&­áↇiø‚-ehÿV8MëÿŽZ%À‚çdô ]ܺ�¿iÓ-@=øƒ®}äx€†yP†.…‚i°†ZŸ†0`H-
,•èä`pWX+È‚†}ÛšV;PÝõ§Æpe˜iƒ'¿.� DÕ~þÕwô+(à·•d(È‚0`Ö™n&À‚)øf
k08ÇCMX=ÇxÍÄL‹ô¿M®Ï~p‡ü„Çn‹½{�r
IÂh~¶zÕ×——0~Õ0™·Eš—›˜ßל‡ù™×yœßùšï™ï�•]:(ÿmJÆóŒWú;¼ø7ïB6ÙzƒÃMÎj˜?XÔ-P†y.R>ð?ø÷ž¿'VâÛôXwبMÄÞcBð4àƒ·a¯É;°ÓP5û,°j2B@‚1¨Y4p(Ð÷¥àqv㢅h eÍèþwôÆ‚“m{mW¦}[?Ø‚NeÖ|Æó¶ÓÞt‚û-Ù?ðƒ/p> é®ÆÝ܇V†…ké¾UNuß?ƒ$ƒcGUk؃3øƒØfàÜvQm†@
.ZªÕbô(Ò¤J—2mêô)Ô¨R§R­jõ*T¢VŽjV-Z4jÔ¦Q;-P˜-T´lAÓìØf„à6kÅŠ–"ƒ¼FûZvž3kÖšeáÂÅÊ ²Ôª1ž6ïY\(V¸¨Ù´°b¥�¥ÖÌ˘®d§‘žfm¡$S¸Lñƒylµºw�€Á\mZ!(X�Ü)Ô·ìhÔº'w©7É•+¤ãÿ“E4XÍÒ¢B²åèu£¬‘\.»8Z3Ïq³'=LÄO¡j‹3GË<oð‘ÉTÈR,MÚ¼öÍœP¹ÂwaV„GV3I`A„[œQsZ5
Ö•EU\áZ4ðèWÈGUVzø!ˆ!Š8"R*E^[0a�=÷äSN/5Ä04ZLJáHSJ;6ô£I
íXÐ�mÄ#’3ùR¤/
ɤ“AIÑ“E9ДUi$•RZÙ%–_jé%—c†YfB[tå’b¦Iæš`¶‰&‘pÊhæœqâ™å›gêÙgž5Ý”ä/Â0Y�0½C"nQÆblÁ¡aD‘x)¦™jº©UE
ÿu…`€1†¤v![&jaÅ­v±Er±ŽñªV±EPD¡DPüž4ÖrÅjZŒaÇQ8±ìÊHCV!I¨J¥^!Ƶتei«°‚AƬXXa©\l‘ÅPdqD¶N�vŒŠÅ[pá«Wt1«¹åVQk`d‘ÄZ°PŒQÅÔŽ1¨ØJz]PªeTl!ƾdQhclñê½%Ňa�ÅÆ	“QQ\tñêÈY´j|ĨV`qÄÏ`´{X­7¯†Iü-ךsÁ]¤\3§Yk½5×Yyj”½&Jø„5ôô“�;¼4ÿùË.¸ÍÜ6Ò„cCÃdt(M…&SGxCd·Ÿ9*Éã $í-8á‡~’â�ｸEŽ'	yH’#I9N–'ΣÞ)jgŸn'šM"lÌ
©TXÜ5ë­»þºv†]|‡ªFX.ÍÙÕ®ÅÍ…LS—fb-FÜb†™~a�H÷j‡ÔÍ_+%TƲ+U»õ±WÚ|yþ’;¥þÞ¡a7E»‰Ù¯>=î[ˆËû×4Ó>Tìc<¾ô–VZ²ó¸[Ÿ>õ–r?ŒáN{÷šÌa»2°�OÙP¹Ê5±

Õ0[>Ô¡¶µ¹Í4ú`‘€
¤Ã
NG&Ì\ "ÂÁUoq!âþÿÄ77Í�N%¼ÓKr¤â°†2¼a“*'‘.Žˆ1â…¨C%ÒˆH\"
¡˜C7
î 0Ì1:Ò‹^ ‚
pÀC® OíŽ~F±ÝüΘF3²�j|c×èÆ8ÂqŽv”#ë˜G:òñŽzü#ˈF±™1}lJ
„ „h~GAøÁŒÐQˆ®¯„ÂvFAÖ,€»³YöÐ÷<›Eo‘6›ÂüðÕ¼›�±(÷+åÉD©H>°vDiÞ׺@¿ë“-à×"ý'=ñ
0‚¶
Ö°æÌDÎîdÐõè<AîÑ�}ì&8
éÍq†ó›â,'9Ï©Nÿ6já|åÒ˜§4æ„ž
F5Ñ›�b4&­POBRÉç"gEÆmŽsªÈ?—Â#Ê…Yh!ªÐ�F”¢]œ$ú%�r‰£µèFAÚQ‘~£2òèIIšR“ñŠ'Œ¢Šñ‚‹l¨¡à„+°,Éñ¨¼ Ô¡µ¨F=*R“ªÔ¥2µ©N}*T£*Õ©2õ
Yð)’€„­&a``HXs5°±	W-‚Y³€„k­õ
NÃÀ
T­
w²`
 æ
*à/°³Á"
‚`Πü­BÞà
Š @Tà_CÄ"
&`
B`“À�ªMþb
ú`þ¹ß-#CÅ5ª`)6*zÐúÁ&
ö_Ü|£	r &V"A°ú%JMåŸj#®¢/ÐÂÂ#4¾ŸþÁ"à ó
 
FŠä
]$‘4„KŽF–dJj$¢DL""EÚ�I¦dJö¤ðU¤NVdæ¤J%N
åQ¥QÚ$OÞ$Hr$S*¥MndSbdQR%V&eåTvåQ^XEÌ[�@YŠ¥žÐ›ˆ¥å�Ȥ¶-Hf[¶!TÑåLØeŽà¥^òÍ^Þ%_þ¥_f^æ`
f_&b¦bÖ%a®dDPäæÝWÚä�ØÍSæHB&KÎäJIU"JGÞ¥c:¦H"Î^†æhŠ$Jvfi²æc–fŽ„lrä.€fmF¥ÞôbK„¤å%fcþ¦a§o'q§qҥ茤A†¢]neí!'èæÿ‚„Ý,Dmš¡@\çM	^þ¡u'c‚''ÒWWÄ.I/Ê%y
g‰g¡˜§G §zªaq¾§µgqžáá=â™A5^¢
áˆ�öÍ@ˆ`)hƒÎT‚ „Vh„^(…bè„n¨…f¨‡r¨†æÍ;*؃v(ˆ~¨‰¦¨†ª(Š®¨‹6¨‚mDÈfÞ³…šœ¨‚Êh’!�&èŸà„Î�)0é�0(‰
©�*è‘Zè‘bÉ�ÎÈŒº	D ©ƒ†–Šà“f(–ÂhŒâ„F)“ΉÎÔŽ&_üáÈR£�.h™.	—~hˆÑ¨�Ú(žÞ©žæ)Ÿÿî©Ÿö) þ© j BÉ�6(šÎÉŽ,ê™0ª¢6*¤>ªœ:(”©‡âè†Ê}^œÐW¾à1V£
„’vj5‘˜�!—üèáxªª"‰›êŸ¨Þã©âi'¾*ªN›¬îªlÒ*Žjª'âª
ÕèÞÀá°v[­âá¯þ¡µE¦¶¹Ð}
C¯nÄÞÐçÁT~^ëeë\ŠÐ¡ˆ'·Ž§µ²ç¸Š«}.çã\›!êWá)Isª”tæçjN?aDX²&H¤a¼ÝÍ $§k*+Àn+º,Áv¢¿Bæ�J[Áæ—À.lºb«ÃF¬'æë¼Jì&R¬Z,Á^‘Z¢!F�%I�l»zìIT‚ÿ.ë~EªÂjlA:ªK	(Ë$ÌVÉ�ÖlCX(Âìµ¹Ϫ
ÞT+œ$¬´©	ЪëÉÎM»êì&˜Ëö’Ðl›Ø¬ÔF-ÕN­ÕV-Ö^­Öf-×n­Í>­ÑJ”ØZÔØŽ,�4ž€­º~­Ñ­Ð¾mÐî,ÎÆ-ÛŽmÝ2ÞÜR”ÒÆ-™@-Þr­~Mmàþ­Ûê­—¨-à¦�à*.Ö®f†‰Ð?•Ðä­	¹!J°ë0° 0l®.lîÁvfrB¥è�îFšäé‚&P–îé¦îè¶îêº.ëšd/ƒ:p®.è‚èè.ï¬êήêšnì¯ð/ì/êúnw.ïÄ"er*Š¢ÿ,ŠÛ¨ƒ.À‚:4bïu�½>nò†®÷²®H~¯øzokÚ!Vú+éþîø¾n·�ïøÖ.ï."-èîÖ¯Ûônïá- Ã0¤CðÊ.ñ%T0¾–o
°
'0/°·&ýÞ¯Û ƒ0¤ƒïÝÂ\®ë9çú²¯û‚ïņ¯ýÒïçæîçJ°rò¦àðç
CìANhnð{&ʃ:ìoïÁ‚0 p÷«++Æâ'_Bpý–0¦ƒK°iÆP&ó2¦=±EúÂ+ôž/Ã:üÂ�²ª&Âp‘`¬„±ðD°kLƒî¦Â
À
!<÷Ÿ9ŸtJ¯ó?Ç*Dc4FŸtOCô-u“(µ=ôF§tHÏ3F£ô@{tIÿôQ5fµT‡*=ƒó0ä0:€#&$¢€7û¢?û´S_´T¯ô/–´JCõ\×5]ßµ]ç5^ïµ^÷5Ü,àÿµ`ñ‰Ž
,øÂBiŸvV»t=¯õk»6p7M+£¢ÜZûB²�vbÿ·©l»´t÷jO7[¯5/À)6	›Ú	ÏÞ
‚ŽØÜD5ˬ
C
“Ê�¨�.ÜB
@+å¯W]oÁZ×ë1§©K%°¥.X&QêT™s&ȉ
_Æ»™§Àÿ…�•º"(u,’°RSê+Õh_ߤÂ
Æ‹ØÇbžv­øÖ:a´‰eåK!LÜ>‘Õ˜|¹òž¼†ãŒ¬×¡Êµq5#_ŽœñŠ¿NL»ŠØ¬u´¢–jÔº†R×;\å«,/¯Ã¤~f[\så¸v1
ð¦[¼“ˆ%�VQê „<j�t)fòºra„�Å´¨Šy° À¾Úå�[[§X
Ưrh*bRDh¡WV
˜«X¹Í$+æXÀúe˜Û|Ydz‘v:	]öH‡fW€y�À[R¡¦¬zн¬ðÃÐHZÒ
‹&aº%ª ƒù娈ZåÁ.ÿ	Zí¢“nii£ErK(oSÓ�ƒ˜Ö”ÒÊ ÀŠ‰JHX*"‹(“NÊÈŇú”L§‰ÐåÉîºÃÐ;±ˆ*ÕÔS‰z’¨Q%5«Va�5UVKýEU¢bUÕ[Oå—pÅ•Tˆ-6•Œ%Ùb—]öØd¡�VÚi§u–Ùh­¥6ZWZ l¡ÍöÙd›½VYs©—Ø
8 
Ð
 _;XÚ
‰±1
�…œVÓÞ5

!
©"ªž´ #2q‰7âÕb±ˆX$BW¼ò† W$dA	™gZÐŽV´Ý¹Qi=K« 6´Ÿ]m©XKZÙ*¤³Ý!�h�©à*©5l�fÜÒ†6¶
2lƒR[«Téïú†0hAÑ}#¢sG6Ê�ÖÄ¢¯@GÑZµ¾†¯†[õ
—½¬mUh	$Œ
$ö"œmï}×[‡8†8‹Q
póÛ^è"TÝÙ*:øx
Y|CÃÿ‰ã�t£ ß)-l�üÙdµì%m0`ÑZ„.v)½E/BGZ¸Ct½€E,‰A¯Ó†¢³ÐG…0‹^H¸�ˆnÚ\�Ž�¸VµµJñ›GK …‘8�K„<Û"¿¹(P\È‚Š¢Ñ©MŽ³€è¬ìŽ,ïQ™Ùˆ…Pi!tX¹¼é%mžS\ØäJ±(ó5ÈI;•;S%m¢C
^á
:畯§LB–“ˆ¿¡…c„¡c9m±8p/ÜÿÑŠrˆ.ßèÚÐQ–“è¢^¯È°Õ,�ŽY€
°6ÝŒ>ÔåÌ<6
K¤Ý9KEw	é&

p.¡”�n’

n@'Þ�šI_8JC6I É`„"1ŒvçúVcF�V�~x ”¾e@Oz¬ªi urÀ]€n¡� ¥Þ�£`ùZI~
#w Åú’Åvqúîþ$‰Xƒh€È„0Æ�¶1Y at J‡M
bÔåÁègdꋬ¥ÿ“Ňþ&Ò	Àª&
@j¬F
+Àª„’=¦ÏX”®‹Ì’XÀ‡ˆnLÒ‚MmJeÓmB‡n®æy
"-"EqS5só</…(h6‡T6
…˲lPþâ#È£,¼BCŠ
Ôã1j¤FâËÿ4€
&î"Un�îL5Ã;ä,>�BDóó=E´4]âR„ô1@…It�ÎÖ"?‹"5WUâ“A~!J%Ë€äA‚c£6”²Ä®Rˆá¼N$CD¢QÛlTÐôI|4Dï#Úó"|!<-#8ë*ŽËÔLEå+R£M%d `„nnáFÔƒlLØâÃ`äL$5ÈEˆÞAC\aÌë¼|çAÒaIÅS„A†Á1#ÈÃæÐ4"ÒÂ,:Åc!æÃAääCvÁ7²ôjã¼näFNb´Í>€áBTƒnÐM+d£5U!V61D*ZËÓn¢6a+Te7Öãÿ‚a´mÚaIÀt”Â:×A5BlW£Q^á¼ÎÈ,"(¾ƒ7½!|®2+ë1³±`eÛ±UUX¥FšUë¼êéògf‡¥fk–fo6givgsVg	Égq–gƒVX€¶h…–�z`da«œllÇ
‡6¬ŽÖhmvjm¶j6k‰vk·6¬ˆvzhêj½–gvjÉ6jËVluv|fV|&
¡6m³Öp3—h7kO—tÕöjM—ÿ�jaêfÖýè�|6s×kG·s…¶ýVh¾öy†ÅoÑÖwmWp÷qgq[¡�
Æ„î6l§ödÈt„`cœG€fFgRwÃ
ls7xgvnaXRˆs
7x­pXʧd¢n„	õªv}O·f¡§um6ƒ°K°¶g¿åfQãgy
Rˆ©xŠ-'‹y¸a~Xˆ�xlàØ\œÅo–¥—ÀŠc8‹å8Š×ø�«¸§
Fè‹u¸�«˜X¶ð”°¬²Ï…½è‹!7ˆ¥Øh¼x–8ö�§Å”™ˆÑø’39Œ¤r9YrYRZÀê‰Å†1Ñ«çX„o.…Sx23óŠDö‰TÖƒyŽV8G=@¢C„áå0F„!80DW>Ö˜KT˘§ù„‰èV 9›y.›/äU¬Y¹\¥\EMƒIe]¥³`VÁš—Y,šÙšß„™/Dœß„šË™šñ™T’¹œ£ùIŒù„“¹ÿ�ƒFæÙŸad Ý¹�
º ëyžZƒEEš¥HœC¬š±Ó¡Ý„ŸýyU¤F@Eâk*XešEmU YžŸèŸz¥û¹¥¯™W¸žù9žwÙ™oe¤¯;•9œ_z¤óù¥ÿ¥ëYŸ1D¾¡S‡záEÄÂFšÚ©o¤:Óá
o¾våŸéš«™™Ÿ¡¥ÃŸiš¬Ë•¢—¹�º°/MôZUêÙŸ1û®ÝYÔœC¾a
õüÀœ[¸Áœd\ÁœÁ\ÂY
Â-œÂ%|Á3œÂfLA
_º\³àBV%öĉÓ&A…&wmHæJ^¬@ú
 ëaÌ¢y6ôybÖ…ƒýÑbÎ_ 5Z…)hH‰O£®ÿº¸Ê©¯_¿,Úõ¥‹eƺz}	̸—fà‹4³´K±EºÅ†ýö�®Ô˜4¡
̘0aÀæZœ+ch_£ûšîÛ™å0–£KŸ�ÚWlŒ¿8¿¾}[W
j¨¢z*j©¦žŠjªª®jj¢)ú(&�†–J*«¶ÞŠk®º²ã¡À
(è’>gd °Œ²
…».Ëì¨Í>‹ª¢É=)
MK³m´i¶éµ§iuÞ&§™¤
€Ë-°Ô•¦`°ÃË0ߤs1°sË0«
>L=�.Â€6`«„Æ+1¬`yç ï^¹î¦ÿ|ðÂß»ä'¬�+¬l-fx
 Ka4=—KC¿6À7ÂÀ¢Qj4±Òxÿæ¾Oþðã—�¾æ-´
 
Ú�€„àýA™q0‡
JpRLŽ%]�:ÿwѬªt¥*-)J5—R�žtœœ[çÖ‘ŽqˆãâÈi7ºñ�nôôâàG#(Am%	¡
ÖQŒ"»èó.r±‹nˆÃ‡@D+°{ŠW¼S�m4{²³ ½b©æ¨‡3æQ�<Ò£�õ€†háQ�Ñzö´¦Eíi3K
z@ã±È@µi9ûjÓJCö�
8«Éã‹ÀWp´)�)+`NÎ%|ãž\ðK–Âdñ
G‹úÍE 4qH*úwL;o
€Çª™ÙWr�©Æ£ø›þÇZþoõ¦÷që­mñ3“ôÛ¨‡IÂ6\§„J¸Á:§Ñ&±‘½…lœÙñZñ¾0
ýs	¶4
�


's
´p		
D“
ÿ‚#x	&3)¸‚
ЂÀzõ
;À?
d1;8
°4ñ
ý5Ù±"N=>Y9ý$9ö‰—CN–Š§Š£Š¤xˆèƒŠj¶9§‹¢‹ÅN%¥@ Èá!û

Ž†“‚‡¤°"¨
‰Kýs,JÕ-Ìu2±	ßÿà@²@-—@²Ð�×p	Pˆ2²`	8S™“€›I–0™ð™€™©0	H•h4
²0	
ô
¼`	¸é„
`&Óu.î± Œæ…(0g&p90F>Ì:ÎiyÑ™s¥3vÐtQvfM×”
¥
p“9ɧôôˆ–>|„idIGVéý0”Ð0–Р¨V©j
@ô 

«F–\ùF Gœšc	ôðXo”‹D²W¿±k™±zóœlž
ØIˆ€§d«²Š'Lãaãr}á®0m²°½ð
.Ôú
·@¥y
êÐ
ìàB€±
`¶�Þë
¦
®à@ÞÒ�èÒ
$@S‰…/“pƒ.Ôƒúj‰�8
'3‚(s	·ð
#“
<€T{uƒƒ^R‡Uº£³bŸˆ( ¦C¸žâ§î‘Kšâ‡áÔLådˆ¿ƒÉm¨Èc;<-ÐvŒ¨
‡",�xhhPàq#ú)-ÆÁeX׉Ÿ3ˆ�l>ïÊ/àå 7h$å$§ ¯
|Æd€Ö¶àgò(¾‡ e¿‘kçòþا)}-Ý	>ùXmT–Š•XYª\©ZBYÓNé”�•ÌÐWIÓž*•dÙ}3•8]ZÜZ«šÊГ†
—ºÅ€ŸD€Á—×Ã:¾&€B<«]m�á¹(—¢ÒeíhÇQPC(]ج@ÐŒ
��K×Í8×Ô´*€×ÔNÈã×}
Ø-ØàD؃Í׆ÿ}×…�×}}Ø‹½×Œí׎-Ù�}Ø…MØ�‹vÝŒ(
�ÙÃKb*ÐÛ×{�Ø•mØ‘}Ù�íØ–}Û�-Ø´}Û¼-ܶ}Ù¸Ü�Ý×(СP'>`Mëá#¶¨,Òqe�bO¶h(ª°
!PŒ®íÝs
ÞµÙãíÛÃ
ÜÀ=ܺ½Ûé]Û¼ÝÞç
ß»�<š@*¿¡
rÚ5² ÅA/
¦ý!EÂ?@b.å‰Íy,úÐþ;ÌYQì×ëðwçdMÿæz¸ÐÎÞPÞ ‡p>ÊRP
 p}qTZžuH¨¥YžåGT¾YZNZ\Nå$
Ð0Á àZ†ý7´šá6oI«o3—U}TÝ«s‚4E¾EBÓ‡]Ár
aÐ÷ѾèÄ—6¡{Ï×]qƒŽQ‚þŽžÁè]ñÜ£ôþWÃÅê€ÑFÓgêÓWê´Ð´ð
Ùú
½ ¬^ê¨~êµ>뵎ë±ë­nê·îëº^ëß
_ó¯`&›�î©ŽêÍžë½Þ뼾êÏÞîïí·ìõ®ïÒîîûîï~·®àâR鬜.æ{‚~\á‚'µ«
$zêU€‹
I)\º¢«¦©(¾zUAŽ%št)2¦A°-¿%;s'X³-Ïê$Éõ%Y¸0Åœ´uT««D¾ q¡ÙS”dˆ„#Ç!G8%bÌx±ãÆ‘7ž<òåD•)oÆ1c:eftHc‘#�¾ñÕІ­�‚|u)G9tàHäÈÑ"G½[V�™xgΙ“7âÍ»ø£G72#ª19µ
Ð5<Ò£�S-$±UÒµéկߵæS†¯P¡P@^¼yòàÑ“Çß?¼þ
ª ASy%ϾÆcèÌS`(ÏFC]TK¥h•ªÄ³)-5Mż†zo•IDµU¡:K5•N½Zõ© NÕt5•AŸ
ôVd�Bª*U–ä�—WN™o¾VP)¥”i_öÚV@Ñö5o[Áö[jÇ­öÛsÅíÿÝ׌z…‡%É#� 
6ä¥C^„	±Æ_pÄ‘Å[¬QÅ_„˜Å‚Þ‘Ç®1à†c±Äƒf€[^qDIì�AöEdVFdW)‘ä�[ùC‘_–™å™]Žùf›MFù•k®ya9àXTüXÅ[<î—DŽûýð‘Þê…«–ºc©–±i§K¤º_Ž=üzé§[„zc_JÜ8쎉Ùc``¹%�¢W9ø^_ð
1_ͶZë¿	îÐj_Æû߯NœpÆÓv\mÆC„8íÁ=¤E
_À"
DSÍLØ2·©og*ûÜ
Wf3úL‚XË›ó6'B¹5Ðs
“\Úú:•ýЇ K¡³WÄó�î|$"¢Èº—7Ï…Mº ‡T$ŒÎé°E/¢öbÇ¢�lk'JÑ%&£ÅNaÚ^‡P•„ÈC4iUXôÿrG:*$�Àâ#û˜¦>ÞQ&¸šãMF

r›Ch+jZ§
õ§5=ªÉÇ¿Øq�;I“Qß’«¤‚T¨5™ªJ…ÄÔ@Úqž©¨¢èôU>-.q„Kãe±ý«`h<£Â €K¸ÂNy¢Š¥¨òWÀþÕ¯¥º”`
Û×Ö*|-¬bKXÇ>±�­ŠbuÙŠX\
ç9̓Ýn”‡ûÝ#�xÉEþp}ýÝà†8ÄóÝô£wÜÜNGº»YÎl›/<áXÿù¬¹Më…[ì'{ÌÁnñ±×:á4w¸ÂÙ�sq£}ÙÙn¸³�
Ô?²W4È’DHM³ÊR<HŸ”Á£˜ÿ|€|ä‘}AI3@ýÙÇ�ü‡Ë„œÈßÛýáJ\KƉEJ`äJtÁûÑ~¡IBœ¶JEÜÉ3ò½äÊ´¢ÃUX¡‰Øh i�†y i€j ÇÒ<MÒLÍÒ,ÇÕÇÕlMsLMÕŒMÚ$Gn 
,DdÔÑ\#¸ä@é;ÔæÔ´¡¬ÏKΗd½	5šÄÈñËð‰Å‰Ï­TMÅ´]N
ÊVÍQ¹”оdJaxÊÿY=Oý,À
LÐ�‘ò…
”ŸVì=‚K©ìH@ÄQõ½ŒÉÙU¿Ë5
ÏúÔDßœ˜³™´|ÄÁlÎöKQ_�ÔÈáÑÊ9Tû4‘„ÖñÙEþ„Êã‘ÎÝUr
¬¡óE"­\[•Y_Å[û
Ÿ³ÊŸ|1Ü°λlHW¥Ûýô…ií¡˜ìËb_#Ý\Á¼[ƒäCÇíÑ‘HÍÁ"#ÄÝZÄßü5×™èÕW:}ÓÎì�€ezˆ�‡Î$
,80\½%	w4œ¸#IÄváúª‹rË·w.¬×pݘ�?Ó
�™¥â·ˆ	£Ž9x5¯¾Ð
ƒe:3å¸wÝÚ¼˜%èѪ/£þ«6ð_Ž-ï¾)7i—yukF�Üvó�ê
Ø`Ȭ÷B K˜ìÒ…£§ž—ôìÚÁÛS®ÿXù]½¸-·?~™zgÓÒÙ—XkÄð"[/½àVK MWÚ}ÆÙ6™c‘í'„‹�†¡fõÑW~û	(˜0ס#/«xžs¶
rý=6�m�QÙz¾I
òrŸH‡uŠè0Þl„å$t )˜g@òxáqN6d‘&Ò¦cÆUWnÊXÙ‘›!÷"^mÄÝG(ýÒŽ9•ÒC!Í©’D.�ÄO:‰´§m4Á4“I,c1Eêò,í°#;´Ä‚-ÙLJK¥”^š)¥›j:i6Ÿ‚ª¨ Î’Í5–R:‹;”¦2Ì:­Båy²JÇš/«
d±Öj\zd*9뱩Å
,¬p	û«aÓÎZmjΆhëwÃúúÝ+¼
++'öÊ‹
<´Ñ.íq•Ä&ìÃ-Cm°Ê!ý¼­y&3û®nļ5ÊUó
,ôò­ÏÙ=ð[??­¯Ôݱ- z`¯òÊ_f�L²ºk«¸2Ü_#ëvÒ:þ
oGhšÈÝ�ÿÙ”ç/~ÆçŽ-=®gL9My|õr‹
ò‰O4Ÿɸ¿n/0Œ”Å;ŒHÈ
€�ñ$'8�M
¥0€=»	Ò–¢T¢X-éPû9ЗbU¦6íªQ‰ºN›"TšË¼i9÷	V‹v¦býêCåªÕ¬†5©iõf5‘éуF LÕ+a¿JѼÆT§ÉôkG¡zWÂ’t¡g¥«;ÑéT‡jKÀÆHpÉË;AN&qT|rùÙÈÁ‰%ÄàÓa^ŒUãa«¢EÉ‹î
£¶%Ð(‰HI…XÑŒ}ÿñ….€ËÇ�¤rŠJlPfôÒ»Ö@Ow­�.t“¨ÜÛE7»Ø½�뤫ºé²n»Ú�n*ˆ�EŽ¬C�-H˜zéÞ›ê½ò�/}ëkß_Þ÷½6‰ï|S›_êøW¿ÿµo€\à
#8Áò=°‚ìàCؽ†o„+láO8'§u	œH²’:…Ö¾!vI*VñWÑ‚‹Ú\1‹[ìâÃ8Æ2ž1�klãã8Ç86€
¦à¼}Þ2.Î…uÙ·Õ5¢àG€ÛáežØí Ýá	âÄ/#9\£ÖÙ`3’�6²imu¨�¾iØ3’ èYY»�Öúâ?öb@
á9
$@#“ÃMÞÚɺ]H<Lp
€X�<nZ²@GJ"<<FFEG*€¦‘¡4”$
ؤ=ƒ<Cö-@bdG:_íy$
¼ä«‘aG®äHzä%Jâ3„$<ÿ¥R<"ý‘äÎC<(À<Œ¡:Ã�¤îŸ¤€�!¤I"n%4`%
0ÃV΃G†eñ�e
À0=hÃ#v$=0ÃWÊÃÂSvd
̃=„e<ÐdÇÕ%
Êlƨ0ˆ¨d–(ĵ]iÆÅÄùWæ©;ªY-…–Èj˜‘Ò«Ä…–浩j6œ›i‰Ú¿fi·²Ä0<Î-ø¦óqⱡåq&«€€ÿå©æçO2*«Y@©YÚ>(
©Û}ãœ!,æ˜ ´9)Ëš`Œì¿ãäVÅZÎÂmYœ‚®Å‚V.…+jú™aŽ7îœÌl¼JÂ
S–Ö£¾òÙÈjnVœ0íÀ6Î$ñ>,>þ›i%/‘Ù™éŠnþ뛆&å(&›>ìi.ãǾõR‡éÖ¦ÆR)/²k呩ɦÿïm^ïûVÄ-ôBEÂûuZÑ
ßöq¢¯}œ3HÿÁùAÿ‘ß®9ƒ=¸á° H[΃­
[4@ƒ=L4XC=¼¤Ê±Ú
·žü	Ÿ°ºÞê¡\?à®ÕÃúážJpÇÕC2DÛ“ð#Û{ÚaFÎÃÓúaîž4DCTÈŠ"«=Ãì	›JÃ
šöM¼ño©œÕqµužÁq±¼BOl¯9v¶o/	®i´µàg‰¬á)/´Y.º-\co%+ÿd‡Ù†‡*dbrÉr�"òﲦ¯,â)Ù³)/݉#šRnû—[�
cB7ô�±ÂÞ®’oæ	fB¤÷j£”ʨAã‰'l�Ì	
¬�%#À²˜¦  ˜tâyq– éú. at .t·®.DÿfIw«&»ïåfï—Îëåå.ÆŽtMÛä„›¦&³kÌî«’ák}ñ�I at uRÓhœF/lÑ2•EY8…X u]BEV¤õ¥i…EªõY˵ªªuZÃ5NÅ]ãµX°5Tðõ\×5]«ª]×u\6_#¶\›u[gU¬µ_«õSüuU¬jY—õ`[¶ó5(?œ^9Ô…âÚ1ö(&Ç1Lóžf4¿�lâY÷>7V,h’tk·ÉGS5ó¾ñ<ÂÒ—æ’“þ10‰o¾‘2Sµkê®b.ìø~õúR4DKîNŸ¨æl�ú‰œx›o‹ Ì¢£Ÿ+å‚è/Iµkv5N›æ¿á®X?ÿ!Qç&%c™Ÿ¸,eÞ±ìF.è}÷¼Ê)t¿ìŽÞ–™®ºâˆ¦–—$9Ð9Ì©|Ê,ÐQ©ÐÂ5dƒƒC¸ƒ/x…[ø§ÈB§p
õ‚mJ„[xŠ‘C¨L8¥”øƒƒ8Šsʇ{J‹¯8ˆÏˆ38¥Ð©˜xŠŸ8„ƒøŽ—
�{Ê, J„£
�{ʇ�
¨L
*”ƒª”M1ˆ–šHD/õ·ä"ZìxÀê±ašò–ï¦Sóc—‹[ItP«÷ø†qAsnÅ­«—Sá¡2x³]�,4ä°·èzzÃôâà.ÍŠ¦mH5W/効$�XæzÙp`mª4s¸XËÂæxWÿY ñ"÷tMoDo2 icB뮡¥V�â9»=tz«òã‰ø2XAÏ©Lün¹ývH¼‚/¬Ã.ü1Çø<DJè"19~ÉÈHt±û±û™¹)*ÓD ©nOèâ/@Ô{IØŽêà’´K�ï’õœ¯ƒ)æõÙK7Dy©ÄpNpÇ¡Ûf¦÷	!úr�¦˜•�§«;Rw>nuR7íJrÓwäõ¶iko˜#)Ab DÒ±Àeú™cù2òæd.%ú4öã74MƒùN˜q¸J,Ç�v‚M7Õ‰¨¹õqœa{c´Ä»º·|›å.7’li›9‘rÝM[Þ½ùÉŸ“9wkÿ4ÍNÎp¼‚ñxw¼Å^ˆW³ôLWwïC˜†â˜†”ÿBZë U?™EpÙBDALq™VD™PøÂkÏ›ä¢D$oEÌ›¯§ÖØ»½›Ó#7~Ö¸�[½Fù�h2ÁYîñ.„¸Ç;AÄ= /¼Æ˜‡‘:¢i» ÔÖÎ×›º/�ýlÊcÈó¸æp›ñvŸç÷½Nœy”ÃÄj…ôÄò‰àS¼ÊGãÙ¹=A Ò=“ñÒZü È~Á;:ÝWcݣĬ�~æÒ¶îÿÛn§®8Žý“YáäÏkà“é>ð¼ñaZqð7$#G©Çìò{¿N
 �ùÜ)Ä<:ÿaÊ*=¼í~x�~§Ëì’þñæé6kÕ=ºÑ?Ý�ÖÄMŽ¨¿ @
 K˜Ï^ºøʾ=¾âœÃ²c®<l6_£­*‰~é¡¢ux±	
¡b›‰°``¹í6
s�¡	K¾~�e
Û2�«»V‰õÜbTñ,QÂøãÝT¾ê’Äšüêi
ó,wJIG-ZÖ‰�Iß(ÄÚeƒ06Ó<j[„|!‹•ä‚>ˆÈj>£‹VÈDð†Ð!Œ^@e”�dPrax®É¡,ì’‚„ÿ#©JEbw”Š”°ØI0ä4$­'hSG
g´uô¢>y……ŠÑ£„#°°`gD›
ÈÂk¼PGËÄ&–ìh
*®Pb¥’C“ød't"+0"uuÀÂCÍÁ˜ÁHbaܤ-¾àÖ‚¡Þ¬Q$ÙHùn
D¹%;3	ãT at ROCRäˆ0ÐÑŠÐM*&B¡�hzÁ”µèbT {
B¦‚ÁÔÜDÃXÇ1r>‚!Ä|̹„û¾‘ŠžL‹UWIÒäj€ÃÜÂDJÔ«¢5”T…(ÚÒN¦BB¢æÜ
ÁNkV¤ ��5®|˜öÖQ(
!dQÊ:ÌW^RšUåd#%ÿF™’A&9è�¢³bi‘€tÐB'Jt…€&Àû™ºp%1æ	•ÙÝ"dÔEhñ
Y‰¡«à%¿ô­wÜRYû«VeOyÃ…ÈV‹wôf}“+Þ0À–WÔ&9%ÚLÑ�½Ýe¨á9u?Ÿ¬C÷ë”w¢Çá²7©,Ê ¢%™[¼£$‰ À|Ñ� e'®ÛˆÉЧ¾¡¢ëN¨á�%ytÓèMÕ I-Ô¡¾›™§"¬:ã]¶“Ù�;5y
-@ºøxˆî˜H´02	š0%2!‰�>gâ
±T†Sç�+T
+—£xX¡$9e3<‘:ÿ‚hž±|¥š,¢E/€¶W’…"Ä8Gͱb´b�ßÊ(ÜRS”�PÆ3<Bͪ†�Tu¼‚ÐAÐAÕ'ieF’�œúTS]3W]ë^÷$’;IkÖ84Ž•³xúÆ[‹3„6h4èSÐ�µW¶ü’m‹*\ŠæÁPÌO¬ä@:®%™¶J¡
ì�Ays‘«M¶„­VÐ�7+X{Ò€ÕV$6³Àg^1ŒXбÄa…ßS”
0åÈ
ÜZá~+Þp…säB

\¡ÇÀ%nÖÊäFÅŒÿ:ËÁ

i�†
ÖÿFåu@†`„
$2	šÊ£ÔÂœ "½L`,P'b1~„*4„$Rd>ê£68§»ð
¬-_ÇŒ¢‹±ËLQB	­$Öa
Û¤4œâ1\„YŽŠe¡:'.0æ‹rBG-XrŠö,£¾Ó8óPIG0¤îCô/ƒà†CliWœâŒ<�‡O8Q»ÐuFËÈüнˆ�s<Ê
»Cé:ÇAšÊV=ø	
,æ�’"1LQ@Q´†Gˆb
™H¢:d+"
\OWLŒ·ÀfØ‚Ÿÿ»MtÚiUx

š-Sh"p&‚*9tVÌÀ�` SžYIhLÊân¶ì0e$$oÆ%KA�©ˆáU#£ÏÞkâ"¹Wž �ÐÍÙ`$DŠÏ"- ¢’Ü-(b;Xá"ˆA9Ž9‚dÍÓ�Òô`µÎ!þm¤-Èsìg~)N£9�xŒã:£4Ä– Æç–—žãk‚X[)æ”虆BpñOÚjâåmË@cž”ÞáÂâì ßNTê%L³ÎŠÁSÃv
ÜŒÃ+ðix,ºðy©ðtSÊŠ„´̇Äu|•qÞë¤rFL¶Ó˜„ÌB„Ò€ÿK*$P7{!Êkd‚3|Ï``

}{µvfL&
¦¬4ê®V8EÙ´,ý®!‡¹S<

i
£"
b"~±(X±*ŠcI•¨bHˆLÛâ|”ê‹þÄ3ßa;‚‘À˜SvEÞ:¾ˆfÄr²ã¿ãƒ„�m6LÝ,D�v"5N!'<ؼP餧&*hÝaªJ´¢›õ”hIZ‚P|B.âã,dÂ"%H&Të)%Ýe3F¢$v*dVø^úV‘bÖ½(\É[ÌQJC†½ÂQjŸäM£úkScÌ”h*H…²c?w¥3TÕ*�¤7v at VåÈ|0F9¼ˆ&(îvè‡Êˆ²†ˆå$ÞFøZŸ-EÇ}u£�ÒRÿŠ‚÷Ø$8dm6�SN-…JdˆR„Eøb{JãðûÏ(bEV{ÉE¢EÒ§¨F0‚›ª/0ŶûÞ�á,쨯8Ç’NmÏÝúÅ¥4Pc,ÜF"6éChÁò• zÝZ'Ì•°bÃhÉB×ë]*Yn	v�¬w­Þ	P+Ý­aÂÖÝâER,^êÐÑ’(¬/b·t¥\µnÔ:’$a#F,1Xèv€ôEŒ¤¯u¾`M‰® /W0oÝÂømØG©J‡ÁÚ:1ݨa¯`ùš¨îV*a¾~
ûµê–/©&Õ–j¤Ua¯ÖÁFìÔ»^a½¢5€­W*�ÆBw
1n8RQżr0ÂsVTD7‰Òiåã^—¥óÜI°
fx×
cY‹À|ë\x[!§ñ/:˜Éë¬Â/QÖœliµ¥ÝX¸¹ÿÚ··…&ÑGÕþ2cZZ©÷‘¸u£Þ’V)õÑOz­ŒV·õUlhd¾˜IbR|IÌ¡zF:\P‚Ê‚Z‘‚·{[½$b‚ЉHÍûœUÐ…†OÞ©hÉ¿$¨KÜUs¨æ°©ì‡XZ¥z+Í¥
@
ä.u<Ã
Sh`å_8kÛÔ/œ¥“MÝ<EQ‡Ÿ„AC•±‚¦bK{š#•´ ñcÍaÖsÐD0ä€ie'‰‰³
HŒVà‡ŒßºŽ›H…_R*XÍñ	/˜C
�
øÌvhrŠÞ@+6«‰�ÀŒb¬?E�YšÚVž\fF8t^†Àƒ“”µKMHÌ—/yÊCáˆ%D‘ÍEÉÈ
ap/
^
š¼%–d‹jÖ�Ž
Gº˜D at vÕ…0Òq1†Ï¢fV¬2—=f"ÿ?m“0t
íÐlÇW'í
	`fb{ß
˜KEØz‘¦
y+¿Œ0r9¯
ï
ºðÁ
 =Úƒ€v²†×%·r'wY–HøE9�Ø(=Úi¦d*!~½ ‘©g)‡Œ'L:Ô-êhh\æ‹	 Õ1—
ê Hiø7"�=mBž¡—Á!Ñ£—‘]|¹—Ð~¥	¨Ù~?U¢À5cü‘*±° èà@I+Áêð
Ý�åX.ºiCaÁPî(H*n¹3² |Ô10*xÅ�"ó—

�_Bž2�÷(ÁÀ®ô€²ç0Ôá[zRsÂx�Çe‰Qz1·õ6P#a¡Èš+Æ›L—‹˜Hˆv®F®Ý¤ž ØŠVg_¯(ŸY'œ²˜ŠûOI×bð9Þ9qV¯ädÿ®Üéž÷Å?áʯÜTbn(žÔÉ›ýš?õD‡ƚ퉰‡˜�úCt­(±'6‰ëUu—¨°?GOTw�ÀÙ§ 	€M�}rÿ§g+‘
Ú6lÅÝá&©¦Ðø{†~:#
ïà,¯�+&ª²°‡!~¯ciK1åUž6
Œt
è€
ÛC?¥Ç0W3Œ�»=
@ÿcŒ7uç
ÉdG…MáŽ4FŒrS¦PºÐ=à"†æãq•ñ÷¹å¸a
�„6¶7š*ù¡©+–w÷Áà¤Â}e'ˆ‘jF(
�·×F˜QŒ(2³©‘6ih2
ip¼xè°[ͨg¯u8AT¨h¨A*(áÅ(Á¤+A<ó¡>€±R(á)ah�©0CR$4"�ÇXZ™1H¼
Ìc2æ)7Ji¤2cAÆãáÃ�ƒqC7ÝÒFÄ2uV´Õ7ªud¤c2†=¦&§
8¤
Ó9�œˆ?¼øš›®¸‡%Ö£ý$œ7LbòôÑVs‹b»Äß©ÂõÀÕ”Á{°fÒG<�ÀIĬÒkNoX‰}?ÃÔÒ-L�3훳I¿YtÆÂ
ü`J×NÆaÓûºM?Á
�
	p!®)r!�ÒM½?¼Ü
Ø?}ÙßI°NÝtlÿ�(vM‰=±ÍãsmX`ƒ­œ­ypƉÒm×À#ýMF<Ãœ�®=<ÔÆ)t@�§í­å:Û�ýˆ
ËNµÍu 
�	Òû¥&ëÐ7OñmT@rÛÌ�-2ü®”ÍÔÉ‘!̇tÅÝÜÿÚ®þ”_ýÖA=°ž-N8÷6Æ–,ÅCF#q‡BýÒ³é‰o¡HA×ËýÛê
Öè^µM_r-‹
öu¿�sý‰7=ÚÎI°>Mžã=×Þ]ápØ-åµá<ü‡‹(/Ž¨±º­Ø·XÁ±9%úúÑCÌb
ìÓ“]™íÔÇà=žaÇÂ…ˆÄãt­$]tS]�ÂÙs.ÍÙ×Ãà3$1k5ÉÿqݪÝdbÙÄ=ÛKáƱoQÑí0ëyÄ"N%^ã±Mã×t‹^¼œ{Š:—Üì훕ˆÙÔÉ‹oÃ>³C]ÓS6”YOÍu~˜æÌIÔcç°΋s=µÖÃ
nâ&ŒÔXž8‡Ý(½ÙX]^�¸uØÝÀæéÎMÞùéçÝ}å¿áàæ	Ü\gtF‡ãiÁ°ý:žND\æ=J×›qø#Â*|ánÎÝKíØMtð•‰ýãæÁÒÃÁ츩‹ì©ˆåÄ}Ά;åiˆJ\,>c$ãÞµÝ}ŸŸ.ãDaÑâ'°Îš9‹Fìâ8sÝyÿ‰!&ÞéêÓ¿Î`—,0
!÷ò6ëËÝØbŽ�Lê¹Á àîFÂ-¡.çÚ¤éoŽàŸN(<vAlá
îãP½æï	Ó4v*¾N©Þì:°Êù×ëd`ôñê*?¾Žì¢íÔ”žO›Í^õêˆÝ"ï m‰ûëÁÍM.¿ñ«Ž®UÂù£áióÊ>ïG'�BžO/.ÜÜmO+�Óàj°�hôTmÕ-êž.ì9®ñŸå°	‹ùö¿yóT7NŽþàR¿ÄäNäíM÷f½t%è4Œî².á¾â{ß÷4þë±ò�.òíEö´èêå
›?â‹Õ¸}÷rõ‚­�?]Ò·¸óÆ­ÿà1ÌÄVžÛÄn‹uØ°	¯úoPx¸‡ˆO驈nê§Þìn_òb±ùe%ÞÝÂ÷}ÕIíÛœ&÷ÅY‹ä-éºÞ±+Žß¤ŸÑo>ˆÄŸßg?ÜÃäÕŸÝhŸý»û­�bX�î!�ìŸ4'øñùäÝ_úWa3‡QýßIý#>qôá‹á
tøPâ@†+¤8Q£À‹=&ìÈ1cÄ?B´¨ÑaÅ_#t‰r`Ë‹_’Ä9±æDšW*œ9òdÎ’‡y¼¹1éÄ›Kþêt¨N�
¥>•§Ö¥!óX‘«LÿŒ	Çn%û1¢×‘…±ôÉP«Ò´U˲�Û°§K¹CºÝ‰ucEÂ>Õ9•©À£
ë}KTqJ•Fk¶®F¯IÝ*Æ;Ù®I¡’3ó}HZihÅW
‹ö¨ú5ËÈ	‡Ý2+A×'ek.«¸ë³¢…™ùÛ¬WáAƒï&Ú|qÙ›láR–¨¼öÆž‰S÷¦›};UÁ­ûš>Õ;óÄÈ%F?|´Qß3ã{/?õ*깡ç†_
!¨ZS=Ø+‹)¹ÎƒÍ²íÊ̱˜X›Lªÿ°;ͱÒƒOÓ^b«8Î^{�ÄëBÃ!ÜŒ7¿:﬑bp2°ÂK¼_«M:ã¼ÿ
é8q{P¹Í¤bÍ ‚\T±Â
‰LÐC}DìIÓ‹ÒÊõ¬¢°JÐ^\‘§µ–Ó’¬ónä1­‹„#Í&052	µå̯Å:tÏ@¿“‰ÊötDª»,¥|Í÷ ÓQÇÐjóÃõÒÎmÒÁ¼ddÔ¸�ÜñG2áóÏ*GaìtÉ.ÉóM4«+°¿;Å;TÏ‘’T¹<W<5AC…LÔ;/ÔÑXIL‘¹ûì£ÕW8g¤SDà‚Ì´2Yõûh¯aKªÌO%¥T1CºÍÍ(
•ñÊ©ŒÌÕR/ƒZ’4?så*O:µ�,E¡8¥lÀ^IZ’ÔãºÝŠ^:¡Äo:òè=iÕAÿ-S&Ö6]‚åû”[€�«;¼ºÊK]ØƬôXƒÓ”PÓIJ¸I%þòbH¹Üª3²të3Œ÷ŠZTƒ5cç°üÙȬ¢õÙ^e÷,˜;$ŒtÐÇ8øJ�±�”ºb�—(‡Ü=—UŸÃüMè¤%sM5¸X–ö»‡Ÿbë¶:_îŽvòM¤ßØXMmM‘‡Bxï±K|úAgÃ<õðÁ]n4cqú¶áÓ6^¼rõŸÖ·_µÛ¼?ËpÝáÐV»qsù„éèÍOouɼvc™1ºÊõn
.òzQœlˆ¸fðžÅä1F(³>í“"]´E½)c3^—kfK6â:ÿ»Ç-³Œ±ËcK»KðØD¶JåðÕ6o˜Œydè(ä;å9A*W/ƹÂ7±¹¬•²ßD-fON¤’î½ÎCð2Nü4$ŠýGQšŠÙטö3«qn6UÓ™¾RCÁ¤ˆ
3ÀªÛTPvš[QP([K ajæ!p;ñÒѻ¨oGüû
Ëâ‡%}/A¤› O<¸»]ftEL!™öA�ŽsW¡
ûDw·ÙÁm:^“ µABɦ]eÛa=vÅM=Ɇû) ‘ÄWÅm�fiCIßæÖF:ž0qGš•‚ì’¿Ø V„C	ÍøÃ
Iqd8óTD’A<:|áÌ™½qHR$z“J	Yèâ-/qêŽ{ÊÆÁÍ~;SdxœÈ:Ëù€¼¢�&™Å(¹‘/ñÑì2×:8îoYÊUÚT²¬,òw;
--- NEW FILE ---
GIF89aoP
ð
;A@>UV\bb\ii)VX0]a4a]8hjD/S;)ZE2hO:PXPYbYGuwqZExePisl€O}�c€…}!‰~O€l€~
—˜™ ¡œ
£¢(–•5ž¢*¢�2¨©W‡‰Mž¡M§žH¬«g•—o�¡k žu¬®s¸ÂI½nÁ½^ÎÑuÐÑtÝã}âß~çæ½j2„ZJ‡nX‹wc•{f®yG©}W¹mE½xE¾{P£|gÎUÊ[Ú[×[Ç]#ÉbÚcÚhÙrÊf&Èk5Îq.Êu9Úk$Õk2Úr)×u6è\ç^ö]ó_êd	èhéqûfôhúrøsåk$än0èt'èx4òl#öx(ô{6Æ}KÆ}RÕyCê|DˆŒ{›…mš‡r“•}¬„Y¹€K°…Y£„i¤Šu¨’}´�e²Œx³“|Ù€>÷€é€-ê„:é�>ù‚+ø…7ÿ’=Ç€KÊ‚TØ„JÖˆVÚ’ZÕ‘gé†FæŠTë’Kç”Zò‡FóŠSý•Jû—Wà‹bæ•eçœtø›fñžqÿ¢Eþ¤Yë¢mê¤xï°{ý¨hý«uÿ³jþ·xÿÃzÿÑw†Œƒ…•�Šš““Œ‚›˜‰“œ•�£š”£›‡³µ­šˆ¤¡Œ©¥˜º¢‹·¨–©«£ ±©¢¸´³­¢¸±¥Ž½ÁŠÀ¾¨Ä¹¸Ä»•ÌΉÛâ�ãÞ�çæ¡ÌÍ£ÎѤÓÎ¥ÙÚ»ÌűÏѼÒȳÜÜ©Þà³Ýá¨áÞ³ãݬæç¤ìñ©ñí¤òö³çé¹íð·ðíºòòÂœ‡Ç£ŒÅª•Ç±›Ò¬˜Ô³œÑ¹¥ü·ˆá¼¦ÀͼÚ«ÚÈ´þƉþʘÿÔŠÿÔšçĬè˵êÒ»þÍ¥õ̶ÿÕ§úÖ¸ÿâ�ÿâ±ÁÌÆÅÖËÇÛØÚ×ËÒÝØÈÝâÉãÝÓåÚÄééÄíñËñîÆö÷ÓååÐêñÛòåÔýþöÚÆëáÌíâÒýâËûèÖüóÌüóÛáûýýìãüíôýõäûõó
„(1Ň+^œ˜cC‚ÁŠ…ô$0‘"A,VÌ!Ë’0Uväø‘fD�7mjœi‘çF‚ÆV
LYìWQ™eî¬Ù“éϧ<+J5æÁ«H}juº5gS¯P¹Šõ*0hÖ³hÓª]˶­Û·pãÊ�wÝ+]¹¤é…%-/¬\âráÍE˜°´¿¹.Ü·p^Ç�KŽ<¹2eÂâÄ
Æ‹÷ofÍä2ëú;3àа`eVíYWfÀ®	#Vü·¯b÷7ÖÍ{ñåß�mCÎ;n—´]È“¿Ú•‹œà眡7þ›xïÈ»}[Æìúóè\ã�ÿ.�ú·ëØ…sgßröËìµË‡?ù=îâªnñ*Öë Ëb$4]hà�&h`J0‘ãÉt�Å„Vhá…f¨á†j¨G at R
8Ð\RM5–T‘ÅGÁSL˜ÅOÔ…\l!…ŠZTq‡!6vqD@\aEŒF‘ÅaÄè…„Sd
†‘FT±EXh#ˆGT¡Å…Ya‡*N¨eVaEXÄæSLÑ¢BxÑD1jqÅnZA…Ÿ`LAE"ÞXSØ`c‰Y\á…B\Á&…1Va…‘iNÆšUXée–UÙâxNhÄB´è…™kZqÄ_¶ÿYHT†Є
TH†zH‘E7
ÛfTlÊÅ›Fk‡ÐF+í´j±6ø¤£D 1è–·V¥Ò€ãŠÛ­¹áZ•.¸B©Û.»UÁ“¼äžën¼HÕ»n¾h‘óÉeXÑ&’>KíÁk˜G"™$Z
&�L¹Ç%Øx�7× rE"Öxƒ"{SÍ%ˆX!†7{q	8˜ØXá°ˆ\œ	Åàìq!à`Cˆ+[†TR�5× ˜G–m‚QI8Ö„±Gņ€ÑD"Õ\cM5‰ˆQE–`“‰%(S‚g�„N%yŒMu¢×dòH‰`cÍ!_TãÍ%MxAI5Ø\ÿs
&{hg"æŒ
%yq‡%~3%®^L¢7ß\bÇ„XΉLïQ…TwŒM5ˆSr�ÜÕ@rÅ1ƒ“ñ–€s‰z›Xt"~RB""f`r
$“š™ððÄkØ„7ø¸ƒÕ0¿4?Ì0É4LJÓ4Ì@Õs½@Ç$õu_–õا$¾öÔ›_¾õê³ï~0çgŸ}üés¿>úö¿?ÿýûëß>þ
Ï_V£c¥¡?=Ñe.w°Ó;èPM
X’6/ŸA…_p‡q‹èz¶®Çôè1ZÒÅ¢•$$Ihs„ÇÏ
‘˜›Í-JÀÉŸæ:0¡áÄ£@„XÏ›®’*ÏÛÞJza‹Û®�e�
Da[À“½.T°Q° …-F-zá‹V°àÂê°ð…{¡Ž
‹¢­PÁ‡o¡Ž¡ªã¢…EDQá|ãLjEQÔÁQ|”ø²�ƒŒQ·B§hŒmáOŽ’“>ñ]±
×bêˆb±Ÿ^X¸¶°DùŒXˆBî0Z1YÔ‚ÿpðšS xöؾ3KÞÌ&E$·¸3�q‘gãâñxp/€
O ¶Ø¢ÐñFUàŠZyžü‰²
c‘ÏY°äÌ2VHTá
HØ0v.Ö±`¤ …=ÆÅ©oÑ
·ØÁ¾¨Å‘ƒœÂ%CÂBæ(D�êS�žóÃâ4sЩeQ¨t£Æ´
j‘Ô3»‚¤g©\,¸¼P‡1TP“8ѬŗSxic at y͵¸ŽoÑZ·b�µ�@­q!A/‹¢º€gÝhŸÞ‚£­X�+øcaWÑÈ´…(\a‹bˆ¢Ö`Á9UÐ
Kã:×ãÜö:	Në#ÈFÿˆÄc�€ –ÚF±E�cqI\Ô⿨5Å·‰;Û°·ÀhŒuÜK7ÚZvð9]Aq†¦f�V/.
Q´cè:õ²
�ÐþØÓ³EX ëÔÞÂÌç{+€½Õøx£²<K÷XP	ƒ)0Æ:Rã¨C
0;6€
W,ˆ¾PlŒ/ЊèâïH at +J°Ž½§Bµø»¾c�#Ä¢(�©íÞWëBìq
J°ðv,@�õ':'"ÔµÂOèü)´…ÂQ×#3ÈP™gÉŠt­¢õ©Bl;Ô„üÒ"+ÅýDr[µx›Íû%>‘›ÙÁz£Ñ%ˆÿFzTÙöµytµ½d7Ê�îÉ´²Ѿ€ÿ:Π4õú É>ôÍÒQƒ?þÁçO†UOìwJ7åLàô=Ù%
�¶
h¶
í qÖŸHŠÆP)ÐùÖí@gÆðw„–BÐc)Ð
¾°
Ö
¼8yñ€¶à�¾èmȸP³×Q§X­`í 

�	`‰ð„
†ð¨•
憧ø‹*
p„8Š9CDzâ˜
ñ€Š%Õc7R‚b,@
ôOÀ€Y!K¦„ áŸ*! HÁÃ
¢(@Tx¿”@—DL÷L2a Š=Û4MÔ7Mj¡„rÙMsu¤ÿY¤ha[¶ç=Yq=Z
}h!¥z}j 1Á ÞÎGMÖ# Kú>bJ>ˆG¹tIªÙ£ØuNnJI³à~ÂÀ<B%`�µ/Þ.Õ4¨ö’.iÁP
©¨êª›Ú©³Š©­Zª˜Ú«¤j«°úª£Ú¨€«Äš«¬ª©»ª¬¬
©Äšª`
‚/]ê-ãj®çs®üò>¢ ð
LñZ;¤‡zøÊSË®VÛ)€ˆ-°
º²»ºdxH}}Š»Ç€»µ‹»K§AÕ¦Ø*>SëMD»µTñ´Q{@
ÜÀ3010220ÁLÁœÁLÁ¬ÁüÁÂÂ#,Â$|Â&œÂ%¼ÂÜÁ.ŒÂ,¬Â0<Ã2 Á1b¨àƒÜR½ˆš=…:¹ïR¾>´E²¤­ma®Ö.F»K†Jµ
½K+½äâʨŒ¯õRÊVkÊk1 ª¼Ìêr´

çó½òâÏAë¼þÃú„{ãdX4¤Iü�•æ´Qÿd‚åQ|ÅXíO§Œ %²`" $Ó$
1Iñ'XB $¡½Ü4º0ÁºŠÏøS= îáuâ“Ñ%þá¾>Ók¹"ÞâÜäáÔíâ$NЋ->¨¿qQqzϲíÃ¥<®ÓëÊ^š=æ­.}­ÝæÚÉÉ›^´Gü´)>Ä�MúLÉ
MwÔ%ˆÆ ‡•9žCdv‡G`þ�†xŒç¹
wê&
°e9n, ŠÉç,pæö$ÒÿlÛ¸-¢‹¾²%Ëè¹é�~£”>é–.é¹ýǘ^é™Îéž~霮韾é þè—.êšn£ª³ÌZ*¦DN½t
.ñLãÈݽÅË/
¥b
UkzXEÖ¼`º°y'Pæ`½àv²0D-ÐéóT|/OJ=1 ðú

¶q`F�?2I’âÊ”*O2¼ÈñãÄ….[¾Ä‰2XÌ‘=%~vÐWH…AWÊDJ3gN‘&7ŠìePXŒU«zè€U«U®]½~µŠ¬×c³ží*öìV¶\Û¶ýúv-Z³[ÓÒ½JW­Ú»{ÇòÕÖl^»�çÆ=lx°V±!‚+hqæMž/•âôèSs0¢:º\ú2a奙oÖd‰´s芫+žî)’ôÿNØGYßÎy¹híѵF•
£jÙµŒß–/ñÄ
×MŽ7útåÔ­ÿ­~ýºßäÜç=üsÂU[Œ¬[¢ïÏRSŠli26m¦¨yÎöÉ^4LöO9ëßH>ÏpËï¤þä)Âï6×ÚsP8·®*;«œÓ.Ãð4Ô�¼
£ÎC'4‹9/ÌëÄáPäÐ:™;®ƒó~™H=7ÃíÁ“:Ó±2ßîkÉ7U‚´õDòµ$t¨Á™|²'
qËlÀÏ:ÒHÏDŠ¬˜©2àî8½ÂŠ¹[ä°Ì›C39ÉO:ï´sÍÁTLMí̪±Ç
2*	¼/Á#ÿ‰D5â±ýB›Ò'ül¬(ÒÝ03)KGZí½Ðz;Aß`2·GO⩳ٌF¸¾3®Î±Þ4ó¬ZÛCïäó«[G“ÖY[„×ï®{3.?Ô AëS”§,Ajr#õH«òFk‹”BhOÅ�Òl[³&-éC—!¢Zr\ÛÒeÐ[Šf›�Ý�X�!ƒbç’•«_9L¶D_³¸»8ëôK×€�õN^fÑØû4/¨gw
˜™…ò£Ga×4ÐÆíTTK½ÓÑÕÍ¡�Ü2Êw•ÄQÞOk®f $ÔUÌcw�S:°jí7:±þuN¢WdzÄ4­l_>ÿ‘F®Eÿ�µâ�š�˜Ë¤Õ¶´sC+t?TyU!�­DíÇji–ùä·ã¾ÍÝ%3%MçÈ8ã<ŸÛ,b‡…ŽMª	.×:Îðð^.Ü®ó ”n¥Ö>å˜éN4g—íÞTÞÓÆU”µ)I™sÕÏö¼¤´JY!঒q8ÆĺúqªoÕ•pȹ_�N¼÷é‚ŽsØß›^±eªÜìÔX»W¿’×nÉ5Œ09g—Œ©Ûf•©Þò	õIlÏ¿=F¹Å©Õ†.«~6ÉB±Vý6xæÿïŠýî׿ûð²qÌD@毀	,˜
x at 65�‚à…ˆ‚ÿaÌ"cqT14¦¾›Ø+|3+�ø¾±
‰mióÑ	Í72#9„…ì›L
©·v�|)±T¡~´C‚D耾œ&Á¤1M�ÑÙŸÀü7A.�EŽkÞüæ÷D
>‘Š\¬ ÅèE2®‚Q,ãm'#aÃŒò…@F¸˜Qê(¤ÓRgnèžC�°cpCß¡E>œÉpuQÊØx©¼)ušá^h¢¢^¨b 
Yn‚²E'1ÙÊLŽò–¹¼d&iùK[Ž“ºüå-m¹ËXb2˜½4e0/Í_†ÿB¸<C3¯ÙÊeÎò’�¦/G¹Ê_ær–«\¥-QyK`
{<àXSµq
°Õ­pà¦aÕ	lC9˜†<ÐPS7ÀAÚp
)p™³ô7¡9Îo>ó�ï\æ+®ÍaÎ,AÙ8Aº0jN¤'¤æKúÓ{u�ÝçU—ú/´®t­#2]×:Cö¶·—Wýê<·:ÕÑõ¢‹ÝíÎm{Ðe7õœ¯ëw·{ÞϾw–ö"ŽhOÈûÞoÂÞð‡7ü8<±> ¡V¨‚ª0yÉK>—ÏB.¯yÌo¾óŸ}èC¯Ñ—>Z˜ê#¯y+X
ó¨ŸÂ°0ûÎ_
òœÇBì]ÿú)d!÷Z ½è9ÏùÏ[þòÆï<òMOzÓ¿
³‡¾HOúÞ7_ú½—>ꑯüæ[¿ûÇÏþ"_ýÍO!
TÈÀ@*H!ö²Ï=ô1OþÓ?ùö/=óñzæ÷ÿòV€oÀ‡ràcp£:¹=C¼dÀÌ/cÅ[&ˆ<è³ÀÙ¾ÔÀ
äÀôÀì@)ØJ¨kÀl¨Kx‚"„H€†hk „'H„pà†B l‡j˜„B`+ƒoðJxkè†jX‚#�‚(€¾.¨„oà(8l„&Po@è
khø‚Cðo°h0Ák°Ù¿&xBÿo BðpH0¸p¨†à
.¼„BCøoø†Kh‚A¨†.T‚Jð†B€‚Kàn°†KxÃK°ƒE°oø&Ch(ƒkðn¨.Hx¾øƒ†pðh„Hh"0Dkøƒ>ø†o�„D´Á2Phøhp‚A°ÁE ‚FxEBpkxÅE„B\Ä13H‚Zük ‚ÖsÄ(¤„\(à†p „&`!„>à†!ß›=4Ár4Çs<Ç,hoÐw
�•á9v&þa6î…üÝ	cXã‰PcŽã–
â¡$^Š&¾ˆK=à=¾ˆ 0‰uab_‹
Lµa:ßa¨¹^àÀÔ„Ð_Ö_V
ŽˆPº�ˆˆàtúˆ	,±äTÖà‚0ä�ÀŒé…1Ö`aÀš áˆ�aJ†_†ˆ
.	ð	aùÈã&†â� 
è††ËH\@^V‡YF†_¡Œ™…vÂ…øÝ°[˜e5Ž&ßK½TÒ�Ø^h…$mlÆCÅ\h¹–£Òg¾d¸z:†aÈå^ŽŠóå’¨xXGÁ…*\_ á‡
†Y6âŒÀT!.ÿdbn.�ð͇}#‡…Xð½c.‡5ºß(܇¾T h!6ßX
k&	ªþ�8ÂTu(Ù¨pØ7¢aªÎ–*\––¹êÊ‘:[(_š–á`Þéßðئb†žh�Õ ni¦×AöaÀ¶êŽX·Nä~a›[9•KäAžã.5g®†é´Vhˆ&hLÝézÕ`i�艎
sÞ° ˆÏuº5>.✃ع”^Pc©0ß<fèWŠ©vƒPcAŽgÿŒ™é�°e!áž.h;f!·Ž¹¨Pº–šëˆ˜eŒÛWˆ¹X
¥�;ÓÑàv�€˜ÓÓÍÖb¸h`½ZPuÀfÑNTžˆ@¡‰õ7¢ë/b��,òúí
 R¸Vì°+RˆbQB”^%´JQÂW/QŒùB¯X­ùF³Ø�@T
cëJ´u�ÅS\~£Â°Ð!C‡èÒ§?¯>Ýytè1„ýºk×;x»?_þ¼ùô�½«üÝüzôáå_]_Ÿ¾ü½áï“·ÿ>~1
6µ�®åÕ\6P[Åg`�z“àW^‰E z5„iõEXY÷u¸Ô‚n
3–R±”ÐN;È´Ë
” @>)àÒ

´ŒL’R’¨–“zE¹T\xí9"YfQø§ZF…VYs¨Š¶…–ƒà‰¡{$>ÊàW‘Vµ¨¦xòUÖ0ÈôL/ÂcL/¥Xª«•ê«³cÌ0¸(§Ÿ¤€åja¥K�jÔ01ÐBÃÅÒ0,
É*«ì°È.›¬³³KË4H[-²Ø&+-²ÒB»-±Ï^km¸ãŽûì±ÉÎ@m³ë¦ë.»ï6»,¼ÓB뮽Ն;,·ä2+¯½Ê®‹/½Çê«m¼íÎK­¿´ÈB2Å
)Ô²€*¨°B;%¨ ŠeºX¦B	ê¨SK1¢làJ	¨#»i± sÌÕw˜8â…JÙ\Ûng
IÁè©|�¤‰õäD@¡SÇ282qB
÷Ø=–õªpâYæ6w)Ë¥ìOü_T Ø8¿`Q‰zõÈ9­üg}lÁEiPr#c€Ž,°E1|!¤X´�¾ �?[ñ9[¨ ¶ ÍAê\²w*€d+2*
~Úbi…Z+6jˆB¡ïh–f¼^ ô¡±xh0Z1«XÀ!
t4P%œâ:ЩN>Ô¡
õ9B=*Q}ZT
t€©N�Î4€%©JõA®jÕlµ«Zý*W;V®jU¬^%+ÿZϪV°vÕ¬eM«[ÓÊÖ¹Êu¬k­ë]Ï*V
 àD»X0èd=mêÇAzŸŸØXFm�cækÔuÇ¢Ó@bL§ÝI?ɺÅ}Œ"  >¼±îŸÆ€Ô ‚|¤ÆuñXÀÒfµ×àBŒÑÅ:X £‚¢NE¹UA0|qÈ·cÚk�Y¼F*�€KÑ“ز*�èž©M�Þ&ô¹ö¨§»å�€^ðâÇ»æ�
yÃ;^ô¦·¼ôIOxÑûÝù¶>âuïxó+ÞýŠ7+
Ê
€å«Þýú>û³Ó½‚¹ýY|‘½£=©xÆÅæÑ›I”ßä8¶?%¶�ìãRlÿJ~Öb�þu…Ä&IÁžø¤'Æn8GE¾RM(•âÛŽÅ9¯	ãÐiPu‚š>µJGÕ@O…ŠS¦¹ÉC}rT«”±:«Ñ©ijŠåšJ¹J]ö²OÃüœ/�YÌ:ªO›*f0—¹Í^~Žºç0¿¹Îk¾3�Ѭç5�yÏ}þrží蜺yІ.4žÙŒä_˜ªsì;Õ×>¤„s?jÜÔƒ%7F½Œ‘}™%Ð\ÎGIcú±áßò‚ªƒ®ã¡ëð2\xÐXÿ¤j‚œáù¾SéÍpJa“—Úô\ê›nj“°Ù¤lç.ûØÎ^[³×Tlg'ûmÕnöµÇtíÿl“‰ÛÈÖ’—Bà”¡ ¸C^çö(ÏÃzXeçÎ#h9'Å¿­‡Ž¦&,ãS˜y»;Þ�ãqÂl³ÛØÓ~vÁ.mƒ‰m‡ö°#¦bLÚ&¸XQiĈk˜K�ž´ˆ½(uº@í¬ɹiÙ�•\qï~·¡"O–»çq¶$¶Ú0žs…CULÔÍÒϮ🣉èÚþv˜Œ®&¡wÛÕuú¯1TÊ|²5s•9g®9Ìíšy¢¶_ËE
8¦Ä-&Ã^ƒgZ±3nœcí¥÷"•Š%êWÂ�A’�6¦3;éÓµø³•Îó_ýï=ü–¢«xÃK—ñ~W¶à
/yhSÿgñfŠ|àÁq¥ÆGLu—Ãa3fìÓy\#gmvá{ÚcØ3{ɽsÇzÇPBå0|o¸oÏ–VZvÚ +y¡c󆟶å¹dt¾ÞÛH'¼ÜŒoìäŸ)ºÌ?<°7¯q .�æ›Å_�º.ï·Kqí4=ºtÙQ»%~çWÙ\Äÿ=~£?ŒóÙèµ>8»ƒm:?øµIö9Ô=ÜåMžò-›ØõöõÎ5Ý`Ó!`š, ã±I¸qOPÇQÖÆÌÞ÷•Ñí­ß<•ÚîécUÝÊMP`]ËY„
»1J¨±ž]ˆ úí_RCÀYÙ±íÝš` Ý Ÿÿ5ÿÞà%aVã%Ññ_´áÄQáã^ðM]ç˜WØ›êÅûñ	ÊÌJÍ�6Eɾ¹;yQÜÍ`î%˜	êž}^„OxDÉûƒ¯Q!Á]_™0óQ 6œÏY`&!"B ß9á!ºIâá…TP�‡(Ö_Øa’Æ 7Ážò$Ξ„!aVgÅ þ¥ íñÏ|,
×�"ÀT
œ
"
a#B`2!.bŸ &"™HŸ *]ä¡™Ô"±m`R�÷�Œ„x!º…œ©m…à4Y�(â YLbˆPÖÊX˜7P
’ù­Þw\c¡ŒÊ0LIsÅâØ,bÜ<—Úÿâ,B_!>�›RW/ú¢.–	æI�0¹Q"g¡ZÌ| ë5–š…ü
F§¥á%"9fÑõ¤¢EÖž™Ùcù�ˆTã	Š§Ý³õáÎíœÃ¥dö9J¶$Kª$LždÅͤKÖdÅ!NâdL¾¤ÅÝ$MúdNÒ¤NÚäPîdP®$QeMå±YÕæO�"÷©*曉PZeµ›¥lcVrcëñÅˈÚÚ Z€ÑúŒe6Æa}†F&J6
…‘Ê\“,TYT•Sa‰•$•P=•_6`þåSE‡`¦a&b&a¦a.fbþ¥c2æcJ&eN&aêe`FÕ]RÿÕf.`Zøegæ%i6ÕhVGiR•i¦&j¶¦R…¦iâT”i€_©ž
îà(BØYÞOåh
V¢ÑD¶áùš£pȈÀ :©Œ3r$¦D‰ºudøq@)̃<¼
8À4ƒ<ÈC=ÈC7t'xÚC=”gx~CxÖzÚzFƒ|Cy‚g7tÃw~Cwvƒ}nÃ=ÈÃ7°ç=ôg}nƒFC6(Cx’g6àC=Ì'Fƒ”ç7˜Â2ä€6ÔƒLƒ€Æ'nÃ7DC4ô§wfƒz.èzÚƒ24}–g4ÔÈ(|ægÔyšB4ÜÀ=܃6Ì�3$Cxòg=dC6䀂¢çtÿ'€Š(~|Ž§wF€gÌ`H^ŠÈÜ”z_6Ê)f©)vü ^á”HÒÛB'£N8nV}xV=Eé®%q
çÙýQØ©BPƒ>Ø=àƒ>ÐÃ>ì)=؃=èCŸî>Ø5ôƒ‚ö©>X'?ª Ò=äi F*¡ê©žöi?ÌáÒãz* â=Èè>è©Œê¤ê©¨Žj¥ê£ÚÃ< *=ȃ=ðênê<ä© fª­Ê>Äêžbê¡Îƒ âC9àá
h¤J*¬vª¥¢*£úiªî*§þê¯òª–C)l‚:œŒ•VdX.㛂+ºmˆfÍœ3j]Y¾¥*V"¾ÉÿSºî…Gz¥¦i%Ü5˜q¦_f9ç7yÈ¢ž§9'úpåéU¥!$J'£8H
øa£&®E¼>ã»^ä6¡àWÒÛM¬c¥�왢ÞÉñÞXâräk&Š£¾Yìެ똊äàt½’«UVìüAˆovœu"”R%ÈȞ˞k»Ö,aé ç)ÂLÊð«CjSJˆBò§¡›aÕE¥Ý_[´¢9É
ló„ì'r¡Ð~+à0­¹Aí…hÖCš¢Ã,o¢é®Ø«cÉåúäßšªÌ–Vʤàž8†]ÌŠ)�Ž-*ºåþ«§d¾µœÝŸ̪]ú`È©!nB¬á²ßfy“Ö$ÿ-ý˜l9ÍlÁÞ,íõ‰ú©‘YNÑV˜ŸüÇÜ}­»î&Æ–ßÌ5ä½aÅ•ŸÛ}VÀÈÆ´m4²ébåßùõÅìIˆã
ƒZV¹’ÅÊ•)z0UƒVÍ›µDR¶@ªf�£·J`¦`¡b…‹•(U²LÑ…a-!±d‰2%‹K—)ª4¢e‹,4_N±RÐàOŸE
†Tú3iQ˜L›F…ŠÿéS«N±R5X¥	7|æzýŒì0³ÀȦ-[Lm[·oáÆ•;—n]»wñæÕ»—/[¸¸TI³×Ÿ>|ýø%Ƈ/qcÇ�!G–<™råÅ‹õñ³§/óe{÷'¶g�1éË‹^<¸4¿~¯Q£víºß½ÄªûÙS\˜3¿Åýö¹æ¼™°iàû0#7�o߾Μï{ݸ9?ܽoãÓ�û7cÆŠ#F­o4lÌÐ}—FM˜±êðõM7ÿ5âôéïÝãMX³oĺùAκÌÀCÌ@Ʀs̾ÊlÐÁ™ë'u‚ù嶊ÁÐ/¸6Lk˜º:Æ/é2&.ƒé0QT‹EWÿÆÝ¢±-]”±Foä1ǵv²G²Tl±¯ÓòË/1LÉ'7„ÑÅ`Æ«É+‰D²I(³|ò®-ýò%E_„ñ¥C,�ÌP-ƒñÅD1Û„±Ê·6$L-=‘Ë=É"Î'ýì²C;˦NC½TO¾ðú.DU46µ‹M²Þ4M²æ„ëÒ$ËÌ4ÐISÔ�T¶ÜLsÍ6CmóÒT�ü´Ò´æ,Ë-“,fVHÛjµ-¶jõ“ÍM]´X\¹”Ò­Nû¼M5ç2Åcð4ÕÑ_«UËO_YÝöÏ^ó,KO¹¢ì’JIߺvÊsË-vEqýPݸývÊx9u’C¹æíÿõN}±]—O€éì“SeáR÷ÖH7œ×á·¼-ÔNqß­ØÊh÷%ø`*·vC‰Ë¬kWaiEÖâ~i�øã�í¥˜b”]6¶C^÷,NIÃtweµˆõ2à,M5™,“te
X¸
¯&Ûù±õ.æi«
†kÙ
íÅd¨¥¶\Vg¼Æ™^‡ñ‚‰e�x�3ëaÚ±=ø·o™Ú_¨î%c¨Æ¼�Zq¶Áehé»@ÕD±dè�Z¤r]èú':¬ CÇ@À÷NG–°DïmdûÜ®69¼cxÅ0�:ÞVµIÉ-nÇ
¶‰�Zð¢ÚÄÀ:Z¡Š¬¢p'/ŠQQhñêÈä-â¨>Q°€·0;n¡Ž
Üâ°g+0�P¬Cx‡: ŽuH@ð…:t!�|(@*PA>ØaÐÔ‚0/°ÏW°@�«…
H -]
PÐ4rnŠG+Ê)ÿ
£U-%(A-”HÑ<4£*¨€;A¡ƒ¾ã*
ˆ‡*ÊÐ
àíhE	r	ŒbÄu|á3Q/$P‚¨#‘$,�Ñx±¸ä#2-�=o±^ìs¤)u§.rYŒVH@¦kÅ¥(ìÉ‹8‚sn•
ŠŽ‚‚„HS™›€2Š¢|»Åj«&�¶ym°…*. ä·ª"

^‡8}^_äí6›ÊÐÆ4
¢m–mó,ô[Üín½øÐ1l·4Q†î¿˜œ}ø`ìtÀ†¤;iKŸ¸àê=)ÑR_½8d‡L}j
ÌÔÒËÐØÆÖŠ·¥eÿ|«–µR=¶Ð�kÏ*ìE,XÐ
[0m³±h­ÕŠ¸:a4�Cgke+C7¾ªÁ:[>dvª5¸ºC‚nˆÅ ­»š"?VˆcË¡Õ–†¶X8±—¯&ÓØÄJt�ïÕî&œLmJµhÛ×@$õŠ=´²˜H±Â¨š¡‡&Œ\¿‘-ùŽÅߘ8¶V[-|
7õi�¢ñ
1ÚÁÀE+øöD5aˆÞq!šÁw]ª´œíÝü[]\a�{rÕf2õÙ¨u7éiðnLzmÛ��¡Q¶¢fÃà_´uŽí>j»˜ÇpT/~Èa„e,¿Ðv‹ÄB*Ñ)<,¤z72\‘nR§ÙØŽeèÀ—¢ BýÔÜÿÎy¾¡N)³{Și‰…Œ‹ôµàüE
 Š_ ,H¤×V`¶ÉÓ£¸˜d)àp²
V0
Àù
	,`,(ÁÆçžuuÉËéT24µ„á(DYÈP¿0†Ñ³nŒ9½JM]1©Dû¡ÝíCG†0¬.¿²�½d›”Ÿ&"£ç‹Jª:ô
n¡q»¥‚
wõª
Eü¹³SUï~…ž¶ìÞ�å÷
Ÿ:Ü…·ö›:ê)×?¹ßùÍ/–mÕ˜ÍCt%O6„ÙDDøöÛp!êÄb^ôfx/ÐÆâÐ
Ð÷®åä¢MøÐ/FŽ�×pÍP˜-ÓBø.n꘥ˆDdi|¯
ïŽÿ†´lA™~)m^§œôm†ÈÑvNz ®á{0eê|o�ŠhI@çù•6‰7I-Ü(þ–Ç�¶S|†!¼§{˜æhy¸æt\'ÄsGc‡jŒ®Ÿïv<QH�\ŽA
`L÷®’ŽÁkJ Ñr,Îf	-Š

Dguà5ƒ¡ðÖa¢~§â
¬L€á>ã�8ÊL÷Éæ\kTÀh–¦ˆÌÖ!
šŒpAªjaØá¬
¶ÐÁ‚Z
`*
ÞAž”k
úŠl!±ÇM at U1—i¯t
¨(k^jÞ!
l
¦4•Æ <jÝi©è0
äÊ�T at 1A
x¶¦«ÿ<K<¯œò¡ö)?¯›X‡šT oJ@ïZ!|�´é5“^ê¢ZaïÜ)ÁlF�Ràj(KiþðD!
\Á–jám2œ~Ë£Þ¡hêt!rõ6«ñ°¶òÔ_k�l$`¹Ókö"U¿|áÊÈ 
½/ˆ!2 : ÜY«µZ|Ø<ÀܬÇúŸÉšž3À2 žÓ:­¬Å:®Çz®ÿ;@¬ëú�-

, €¸,ð;±lP‚+Àäõa_ÀUVÂøb"Šã!Å”~	�w2d
쫽úªë­Á‹l²ÇÎ*¬
¿â
,¯ÂÿBK@®ÔÊZm
Ùn‹­´´N;íµÚz›,¸ÌžÛë¸ÆÞš-º&àòK0#úRM©†‡QŸ‡’8Õvù¦Ô_›sZ•½í­”¢¨Z—ç~§J0W�ªŠw·È¯Q
ì1ÁŽ7<°zzRtßääUµâwŒ:L¹¿ÿ[¾9Æo†^'äû•ÚË…­H�(³Ž
)ø²À‚�^È‚
ëô²@>í$`‹
9‡a)éÄ>rÁ#
�@B‰�NÉî¼ÐƒÐ
Q´È(DÑ^ðÿb•Æ
�Š‚£Š…K·aÀÀ—çkŸúH£
a®$^YElªÎœ~$F8Ý©N7ÒSð
_s';¶MrÖŒ#ù‰ <óI”ýÕ‘�œ'E¦ZÁ–ê'ò”˜Nª3Š
F½Ø]1l‘žbÜâí
é_©•Æˆ…
lc´¢$ý›+Œa‹JöÂ+±dA,b
Q´À7FKD1ªô⢭Ž#�^ÐA+IÝz£gBaü"ËýÍYÑè�Y¼Õ"÷­T™Í¼3£DS!$a5•Ù°6[•Át¦3Œ&rgüd–$)Uý#‘yµqc/2ꂶNËñ„Ä1ÿt<SåÙª
cœ´¤K¤`ÓÙisA±§NO¢Üˆ¬ÃÐ`0ÖÑI"CyÁ�T;X�‚^89RЉG¬›¨wT’”0F-
T–@Ö£Â2Òc

h@^Q*$‹v¸¬*uZ/wÔ¤i{ÛÚî··Í™ncGO”ª„îs«ÛÜTšÒ–ÒÍnw³Þô^·½³t<ä-‚®×:Cçh¨.…ÑØ)ÜÿwÛŠQø¨þÑOS�â¦Ñ²?
£Îjqâè7Ý¥"¾EF§
ŒX—Çu+.0j_ØBïh‡ìJ`]QˆbÄ]H…ܼ¹^€/F�€|
2–ŒÂžFÉÔXJb†þóБ–÷=Àò"K¦u–#¢Áë°‡Õ–¶ªU­Æê~÷¼ï}®œ…ûà;Ö‹Ä/¾ñ��üä+¿‹ŒÝÀ]Òš°¾åMŠ‰ˆßC5un"x¼V--÷�¼¶Ooðœ+\ËGcÌïYµtNc ¨€@¡”@;â�	¨c»µhÇÊ%¥ÿ,‡2ù ;£JÐ
ïP¢� ;W-0BÞA�18›w�(ò"(’*%gwvÇ!¡}\…+q‚$’*ˆ‚+˜‚/è‚1Ø‚3È‚5ƒ³$ƒ6˜ƒ7¨ƒ4Xƒ?˜‚@¸‚6¨&ñH³/>Xgˆ�¸upç—}‚×F&¦*¶„�ÅxSH3"ñaÍq¯•a	·
5¸PÈкÐ
µ£k(

 Iê°
 Á;¶�Æ€sÆ` ±¶±PÉ;%�
‡q³uÿMp!‚ö$q(aèë”[79ïQiþ$qâgwî§~Ô‡+RŠ
ƒa“[±))´FRæVuqFö“m
K¡x@ËCNÌ$†8
ƒÁ®Ð/ð-@ŽåŽáÈã(Žá¨Žê˜Žë�â�ì(�ãhŽö8*$
úH¸�Ô6û�`¶�Þ‘Fƒrˆ‘�x�
é�
	‘/R"iD‘I/Ñ�ù�É‘é‘é‘)‰‘þX�#y‘¹�+é,©�-	“+i"ZF#év.1óM¤Šd(ô$iÞ—~C¹`C(Vø„§[,r"Æ‹÷0zÔ	°ÿ²&;íÐ
® 
kµ
·¦éõQÆP±ðj*`ñ@–{E9–S¨Y~Pö"0p—”Ø—…‰œÉ©œËÉœÍÉœâÄÀUOX§Õ›v@ªå1	S:´8hœI0Èh‹?UŠ÷1
Y£bBiFBÆ&)¶
¨ù>å“—}vxú§„Šœ
z¨Ù~¤'OáG;Yg *iW�`x©§Ù“Ô(²ž=!ŒÒ*žpDyqX1(ÄY#c2${J«uʧ’øuvú#Ÿaæz$/Úœèj=ìúŸðê=wŠ—h·Ÿ`Ç«K:™ö1O—Ù¨î·?73Tu(­%š€'¥
­�”ЪqÀ9¤TÊOX=^'˜÷êŸÈé®ÁQ«:ê—‚j«þ™®¨aת„º§+;˜àóJZ‚ѺOª¨ŽZ¡ÈÄi”i	{[Á™³ÍƒGF…¡
S³þŠŠg1`—憪°*®éÿ#­z²ÿ©ªXâ²~«yš±ºjvòz÷
¶á
µë% ¤.hg¬E›”kÙ`{Gñ¤´Vå/Kå¡Q´Èt©8CÄÊ“ÓÇ¥/#‰A#]n7*>îµõ:².Z>Y+§è#¯c룜X®eû=Y+¹A³‰šõA¥>É–!Á¤ˆv¢Ø™Š:ᶾ©¡ÙÚ¬>û³£­zK­LApo;�Ø­¥�m²
¼";«±
®Êi¹²a¹»±ªï£‹I˜ Û%0Ú¼—«¸V{˜T;¹«‘¯óuº•Õ@§ñ±·9%'+0|g»…'©H›U6š¢9è�±ˆ‹=¸
¹ñª²škÿ¼�{‰ü+¹d;¼Öû¿a{µZµ¿‹¶1�{°O¹™´ëTº»0êû«ÓYhÀøTXºRê¾ê†ä^ e™;†›˜çƒ¿óz®ʸÁ‹¹lÀ̪b‹²œ¨¼dëÎ{¹/œ½�ù¹$’„˜šŒºn"¬WQwð‘`ÃèÄ'Õ�‹Ám¾Z‹DIš�3¿NxÛ»ÃÀ´)|nĹÑKÆZ[ÆÌ>Ò»ŸS{Ã3œ²üûµþ;vnL½ˆ¹½ÒAÄ$_JUÿ¯x†¾^*ÈO¹ÅìQ}
C�«“œ*|´}±Íê�bœ£sLÇoÃ<ÀÁ±ÃÝÃKfœ²
|vôÊÿ=•‹¼-ÌÉ�š¯jë¨r"°y÷¡ëë™[C^©ŒüÀG̺€wú³¥ìÉì!¾Pœ)¶™yV¿NÛ{Êe‡«¤ìµ«¶vœÊ«Ü¸";½u<Çùêv|l±4›Á
1ˆœ?’*Ëß÷Çz¢¦¶˜�}DT‡© ±‹…\»º{S¶Ì¾ëm${Æë:Íš,ͺ›Œ¯fûÃÕ‹Æb²²:b®ù:³{ë�{b¬XˆÅã,Zç9¸l°Ž<¾W9‹ÔUœšž†R†”€¤¦ÙiŠ7ô©‘mÇY¼b÷Â}9Ð%[ÀÝ—¯‘µ9,µ[‹¹>|Í	
Ô8-îzÔ
¾ì¾Îé¿ÎëÅžêÃNëÇþëÀîìÎ>ì¯î
/òx!‚´¬á`ÎFÅüÈáÌáÛÙFx’ºÝ团ÁšŠuËß
¡`ö0ópó@ô°
øPõ Û`Ú`õ
ßï÷ ü¾ð	�óø@ïoïÛóõ 
9OðõÞïÔÀï-oÿð
oï
¿ð5�÷~ñUŸóünï÷ÀõÔàðø pípEée¿Y“®Å‹
UëKÕÊÈQ}Vg
7àoîÇí]‚žÝÄ/Ç ð	ô 7ðÌ0
óð9pÉ�þ~Ï0
7À9 ô€Ë@
0
Ûà
Ú€ð

0o@
8`i ðrðïÛ€8ð÷@p`
ÄŸË¿
§�€ÏðÛ�§ý€£0ø7�
¿
§ß
O
Û0ýÙÏõpúÛ
h 
h
–,P¢&—:zS*Óœ½>ªÓtJž¼lÍæ˜ÊM^´nö¢Õ«'oN2|ÚÜ4“w/™©oõüÊë¦Íž9ݲÝmÖ¬p²lݶ1›6¡Þ3f¶iSÇž<SÊì}ë[Ï™œlöœÙ¾koÙ²gÚä­¾»-Ù2¦˜=ÀÇÌÙ¶pÚ(8›³
Ÿ3ÿ¾õ¾}Û6'Zä9˾Ýuv/Ûf϶Oc6ÇÞ³áËkû6Mð�fölGl¯Y²üäYF™îq&šlSæ®»  Ç%�~F‘ Üj$­„‹§²j
Ê-’6ª­—2|ꧣŒ©ª+Y¬	D´rbë+³F\±CšT¤q+_ÄñÇaÔÉ'–fJ¦?21&¹zF˜uÎY‡�vŽ1F,Õ9Ë-Ù1fuz‰Ç*¿¼²�bÔIL6}YL_âQg�x|aG�;³T§�,ßÁÒOuâ”ó�uÞaç@³4æLcpÙsNv|ÉrÊwx‰ôO7ÅL9él‡Ì)ù4ÆDÓ,fQÿvÒTçJ^®üÒK,aÍ’Ê=Á˜c¶ÜsTatrÇ]ü5,¸€ÑHbvØaš‘ÄŸ|1'_…|éÙds²V¤%ÏzÉÅe��Ã�’
W$‰ÑW²°J_hê‘Yzëµ÷¬sѽGœfwÈpqú×_��Ò§£Ú�È•†+%w¿�1ÄrÝê×ƲÄR*ßy›åÊã•zºj©|CÖV'_#þX_cuZò*d=üñ_oƒ
ñª$Kä6Û�TÞ÷f�it‹f`]öJXƒ›U·B¢¢zØf¯¬*šå£J†ög‡)6™X’§¾ð­
É[Þ‰%Þ˜C³Ïxlž‹…éédášeÿ¶·
Æç•Ëæ·(a‰F{b»¡
¸fyÁݺ㩤¦Û¿'Üï¯×¾;f¸Œ<ò¨/|æ®Dìk¶
nûí /¬Zl�ÉZzò¹Ùæ‘àÄÏU¼Cco™ðÑe<6¦±Ž¬=õ¸I7»[Èõ>säIüü­œ9§[÷Ñ{Ï�j|…Þu¨¿þäWry«I/kÍK7ÑééÛ?ù²¤÷1ZêQÌÖðÛl·Í÷â�~§ÂålwnS	»˜v5à™ié‰
;'2Ò].o•S`Yºö>í…-xdk	’*öA{…o{|ÃßM‡»Ö¡­+MY¡Ä¦5@þ‘�uÖ3^àÊw¿~%ÿC,B˜ärøCÞŽ(kIZ‹h×ænCÏÚ!IªµA´­�w1;�—¿m†Ìr
åæ6£
/…4ÜI½˜1³¹e)Dáÿ7¢µˆFdŸÛÊ—Eh‰Ð,]Y
ÃƨG4bÐkúò™‰9C2ƒ'£ï•H%Åoˆ§c ÛðV½ºµ1‰j+Ù´|rÉ�°QiYiä«¸ÈÒÑäe�tcû(IÀ¶2s^¥	‡5:"‰`‡Äe/q„>–p}/ÄåÀÒ¶ÆÝR%D\&ÄpX£ûáf˜ô%*•ùK+ú‘šdäW´™;P–
�jcÔFhLn*«’öÊPè¶Æ7ÛÕqFžÿ“¦
±™Îìmè•{æO’¹ÎzYN“Ä"f5/ÔΔÔòW««c	#WPª.|q„b.7x.ŽY,þh‡ž%ÇìQ']háONe[¢|#Iþ™À½ïyÍó& ÉÓnŽíŽ
å)ù¨Ò4–2•*y)½†&ÇW–óWÝ’ÏŠ4Å›¦�£Û<b$�·8\µ§×lêM%¨Å‘0Óu?Õ±ö	<Œ°�Q
*ÝÎH/�æ‘wœW?—³1®{}_àÄÊ3PjÕ¦+Û%�©Î­vŸ¨SçH`€ä#!ùÅ0€ÉVö²“‰e1KYÏrV³Ÿíìf3Z�D¶$½0‰ÿ/à–_#¶±%]l‹ÁZÖÒŠª­i{KÚÑŠµ¿®oKÜÅ$²†j%›à÷¸Å�®qƒ›Ù`Dv¶aT®rÕâZ×Þ­\$©ny©{ÞÓZWº×%nz‘[Naè˹¤ïIÒzßúZH¿øµo~ù»_ÿ¸¿0�ÿ{`
XÁ6p‚ü9Êf÷#¹mî/x+[#)µæ°é:Ü/¥>7rù‰CÒ¯¶‚ÀØ°‡]âcåÃ5#±\{Ùa<Ö²œñg1k$Ç]3ò…æ‹.Ý6i–��'ûØo9,R.	•[c,Ëø#Ê
F¼*¨–
×õÂ~o}»›%¼r-®uÅlfã¯)ÇW÷qÿ�w\ä ÷xÈI>r“§¼ä+o°.8¡‰4ä
¯?¿ºàû'tá	Nà?õ{ï|ç£>ø@,@Üs‚1à~€]H5ðʼ¢$¤žiBšž´@Ü@
ìÀ
ü@
A¯ OÐ�%¨-À,ÐTALÁ|Á”ÁtA¼AÌAÜÁLÁ,È‚*˜ÔÁ)
Í{’‹{³lÿѦ�›DÌ&ED"�kÄübÄGœÄ‘ƒD“ÄJ¤ÄDÌ – Á5`1tÁ:ÌCR,EÌ‚+ÐD K€D#œCÔ‚,؃LÀ†<ƒ*°‚,PÁ/D„L¸†WÀEìÅc¼A$4Ã-œCtÆgÅ1,ÃQ¤E_,Æ, ,ÈD¨†k8;ðFKPÂ]”EiTÆ3”E34Ç”EÂ*ˆGr¼‚DÀ„Dƒ(J¸†KÈ^üAdÜÂHS,Hƒ4Æ#À†{€\xB+™š#ЛHŠ4³© Rˆ&@f<H�ÄÂ"ƒj‡IƒX‚GØ)°‚G¸„j€†Fÿ!Ôƒ—̃*ƒD¸KH„<˜‚0¸„KØ+ „K D¸„DxÇ%´h¨0Èh€†<ÀC J€H°„=Ø‚xŒ‚ªÄ­¼:|Á,HKJH0J:¤‚0ÈÉK€„- Ã= Ê0Ø |E—¼Ç"ÌÉ<ˆ‚.8K°£¤*p„íX%°o€çû‚JÐÉDø‚Ä+„Ç´„GˆË=€Kð1Ì=ˆG< J¢|Ë:˜‚-8J«„†K¨,¨/¨GL€„:Ã-x„À¼„G
O^*Ï:O¶š£¾™‰q …O¼‚Ž$E-¬Ïv¤N´Ï¼‚Kl¨�ă+¸/€„Bkøk8„&„n‡B(oðIèƒB.0ƒp‡Fphk(„DMD>hø†nx‚CØŽD ‚Eøo˜„E°l „&Ðkà†I at PlÀ„<@Æ-h‚ý†E¨„pð†Cè‚B ÑI�lÑ"€„
ý(ðÍJH‚HØP at pDh€‚D°†pø…„%X„#U%ð†n€' àTG°†àDÁ-ƒKøn„?(;à‚J°kèƒÿGh‚CPÌJPnPÐ'ø‚<å†"•n8„# n€†@n¨Q(PÌCø‚ånh38LðnX‚0õçÑDhI�‡p`„Þô†D ‚<GdFý¤Bü¼Ï_%ÖÌ‚&ÐÎtà…
kÖ»Q’úÅB9%¬²*ÚjÕÖlÅÖXºÖn×oµÖj�˜rÝVo%¥tÅVråÖq5לÀÈ6 +°N{MG+ø'(ƒDH„j
•yz�ú	´¨¯z¤°ú˜�úõl1¨±Ù��2'ò<’b(’ÛrD*ûrª .jÖa»‰+kÖ'º̃@µ!h}6º×.ó´R±2"@ü­àúÓ‘”Hµ’ÐûÂ×
®/)�à¼ë‰!o	û¥©ÃŠ	ÑðŠ¯)S‘Î}xÉ{vÙ0Ð7
Ñ×{Ícü.Ó<r}º÷|Ì|×Ï<Ñÿ.ÍcøbýÙo´H÷ýþ�‰/âoŠ‚}°Y«Ä(Â?�µÜ/—
/‹4±þê?‹Š£{Äo›k-Ï/ÌËý8³þ53‰Óß~äq‰ï¯+î‡}óǼŸý’€—a{Ô¯€ð%ÌW°‚‡,(,Â…BdáÃ…,LcÆŽ	>¤(Q!D�r4‰1âHa?hÌàL_3#¾¬ò¥Æ—39bä¹±"K�C�öì˜'D—Gƒ	sS ÁbT‘*ÊQèV£K»¾Äè4¢Ó©XsN48liѶ�
,séغa_^,økeQ‘:ÑêT—åØ„ýD	.T·,Á’:’¨N³O¡ú’ì7ïäă�j,\¸éç¡s‚ÿ^lgb’�»]Û–¯ÔªçÚv¬67ÖÕ£‹Zt}tªe·wÿ.ù;yòÖ
7oì|ºÂ_C“¬ºièîªËzÿ=4HàamF6ª»hÒöZy«wÉ6ØÍ÷!¥¿µïµíúl¹òFÑf8
–ßz“ýwÙ|d–•W‡AX•PLQØ|Ú÷†x†˜H]9xYg#WŒ‰ï˜–�²$`_+îç[R*™tS{¸¹7˜vÑán
YeYŒ÷©Hd‹0fˆ!…ð)¸AfX€è‰h.*¸Â‚/êÜbL/&3“—Å cb/ǃ‹F¢¸RL+¶c¦‰ÆÓ‹—¸sŒ-¿dÿË0¸óË1¿ óK/·ôÌ™ÇàÒΗ,H°€-Šöbg1“jUg¥r*ZÂFg†yi¢ÇØÙè0ƒ3è1"ù'žÁà²QœŒ¦:S¢‰*d2±îº‘-?õÄh1ñÄ‚¨šuîz©Èú‹u‚ª‰K¥Žƒœtöë1°ÚËž„
ƒŒ-áâòKšíH[æ«uâ²ÁŸ)(Zf/ÈÄBèZ_†‰ç¼¸àBjµ¡~L,¸¨SP©µs˯Æ"p1Ç sKAÛšª¢Á´3pF,„)ì™È<rŸÈg0»ò‹2©UÛºC|.»
ª(.± ç´mÚ9­µm²-…2ª­Ñcÿ̯Z}‰Œ:Òzù©œ¥~§-“b«Q¬^Ú‰5œuŽé¥/–Æ‚Pб¦ŠÌ
7?Ì-ÈœYi<¯­fš3Ñ}2¡¿ÔKo
Ã$;À,´®sÁO¾ Sž­ì:½È@nL
¢$--}
Û4¶˜“ª¹k/Âtm¦1¢´#ìFí½Q-±3°:=Û„·/¸¬Ãï˜l‰tZ0,¤O/,¨°N-	HÀ‚:)H°�+DªB+H�@+§—�
µÜR}®ørÁ`ÞÊ´¢N	È#àJ0|"“Âù·Ô²@òëÔYL,
¾Ô‹´#
½àÿ…ü6
¨ç
;£Õ[`áXW¸FÊN‘*A	ÖÁû]�zðE	. 
[à"
(�EV Šcø"±è hŒ¢¯`vZÁP‚X´£%°à1X 
_´£½ØÀ:Ô±
79/u’
é…©Q´Å-dˆ€V£�*
	 €€ÄE<jQ[Èp‰í0Æ-Š
=/Vk†íÀb+bQ=Ä#
@%&íäŠB&/ΓÀ-ÿ '�ë½1Pò ¨/. M%0Q-ÖV'[s
¥ìE%�[Øo�^b�ø. ÃþÅcz	P
ë°€àÂ|ç“–üÌÙÊ\ 
ª”á4qq>,��Ï#Õ—ÚQÉ4J@
¶èE at 7ÐG€¶b<Ÿ-T€'Qp,–®€[¢ì(®ó%`R~j
â¨
"@¸ÀFà¥öb‡­âŸ(R€LÌ1
Šàù.P‹ôL€?L^;ÂäCþÙ±‹¶hELKP‹,Ń
òáÆZ
]ðÂœéû¡*D¡€¼ê‚®(.ØñL49ÖŒ%�c-”€bÜb
ïPG+6€WvÔbï(Æx¡¾Z `¼ð…Ú±
@€eÙÁ^¤R%À@1ÔaŒ½²CÄ“€]�±
)€Z` Ç·ðE0ûj×·�…9SÀÂZ6 pÅ:¢xO
Äb$ì©i•<à|C
eQŠ§ —+7]YPñ§«@èü�<±o{hQð™Ø+X�Áuaïb´øxÿµz/Öóq¤\¦©E±
ÔRÅà…�ìÝG^(›x  %n/ÐtÍ{Õ°uºkp%pdñ"ÝsÅRðŽw¤àr´¨qŸKJ²ãKº
¬À¦ð‚+hZ
° €1
  Ç©
�°ƒ³üB<ÃꥎÅ8P˜ œçC¶…É/˜H;Jê¨Ã1Ä`1`ت(Ä´ƒ†mK#>LÒ|‰qá‹F ÄZ<Œ‰ IÔ}ˆIÁÔNªÉ	öüDÒhâ$‚
È„‰CèJÀéÊB$�/XÜ!õÂ%ÒW‘ЗÔ2D�ÈDÈÀ˜ÐI¨HŒÁ¤ŠF0‹²Lâ¶$ŠF´!}€L ¤Ê¶
ªJ¢ôIÝž"ßXG18K£üÂ"¦œuÜÂ-æõ‹ šÈÒPÊ^TŠ³¼Ï­T
Xvdªð¢™TÊÖT
0L¥®hNUÜD¥ÔÇÅà
MÐD¶hÍiV
éà
ÿbhŽij„<JKgˆoúæPÄŠi>fV
qRJGŒEJcA 
ËPŠ“\L¶ÄJ˜@¤iÞÊt>mŽNGjÎOÆŠld'BÔæÅ(cÅ|Šn‚b¶lžø£AÄOTf/ð	®Š2‚%I=¤|nʉ´yÞ
.,Äq*£i}žqV‹2â¤GÌæ�òcIœH¢xN¬¤‹­$
€
ÁõE èĘç¨Ê^°„1èûð…yZ¦0HaêKUª'q*çsƉsœl<Äe’}˜'=I[¬	Їâø[)m
°½™ruÑÀŽ€¶&Gæåûl£¢¨U€¦æÉ ÍÊè…Zíæ�’¨Á,„¡è(Ú”gÀ@
׌rv'Á­GmâJ4Þ
Ÿ`&ÎéB”ËqòiÀøæŽ
êɘ¨r"h�¨—ØæP§£ò(t&gt²TÐ玲èQš‹Ÿî(¥Ô*�†è‡r£­Â
4Îi‡šf¡ôŒ¢ŽNoŽÎFH¢|*Š¢¦eúç�^ævdç‡èt
CRª…¢Bè›Ú*®Š0�gÍD+{–&�–Õ8gtr«¦”&«Ê(m’'´
j‡º+®"§sÆÉnžçslEœä¦¢n¨rÖêy¾«n0#4Nôÿ2
Û¦èH¨•_F�B©°(½
GQt'®B„u¼�AÜ^�Šå’Îá6ˆã’ÈAøDÔ×ÖéZì(GTeu2ÄFÈiöím®D\æÿC²(©lÍiæÉQà
Gt¦ïÆ®uPí�¥Zì¦1\@x‰ÔY•~}UÌ!š= ªyJš•
ÿ¤—Èpjv†qÅ$
£¢¨ÁÈ‚ïþ$}«,^¦Qö®ÁÔ‡¦Ê#®lKoʧ²HŸ�×À¨¿îcÌLþàIOÊÉiX)#âÌÄÉ©,kç´B!}kuP—€–1ðÂ,iQ’L,J %Á×-äpz'Ö–Jzò"¶Ð‡$ÃL¨D2¤¶‡Öäɦ4³ÍìEOøçiåà�‰Z§k­Dâ
ßDšÐ‡uâK¿€ÍF®¦g>rr+ÜÐDCtfhÞĵâŠ=ͨ
´À:Ão.WK±˜"›"ž
†%æ0ÜBÌÃh8ŸÓíÙŠ�òIMôBF‰MžN˜`$h^prLJ/øÂ:”áÖØJz£Uxö%U‹-XÅI#
îR¥kÆ"Ö
ƒÿ§Ìï·z&˜ˆä¼(™/ª	Aøv†
ãxvòGçH¨€zfNcn{މˌ
H`Kßg˜œ‰í±&�ô¦À�IΉǶÂj”ÉLüŠÒ8%~L,*
EèÏ›¦¹ôðÊÀ(–ÌIZï!Iò"kãC‚Ô•ÜLíÄ‚jC¥iQJ�ŽÍ ƒ	¨¶î€¢ îL˜ìÐI,ƒíÙ‚MÜL+Lú¬ÞäwØ£ØI€ƒv+`,¼øBxÛ„0ª‰À€Êbç6C0w%æ®0n»D¶ „—ضy’LÒîóæF4¿1jŠpcë¬è³ÄOm˜%=Šõ'7ÈVÌK©
(Môƒ¿éÛœ‹ò°À:Z©€åœô‚
$€@ÅÎ=}Õ5ÝØ£m™Ë
”•/OÝ
�7,yQÒõ¸^Ym¬™K

ÀAhü´“+˜€‰d	2�…;'¤u°
lKÖÝûºów|‰Õs¶ƒ§TË
 Ã½ýÈÂ-\€=-
™.Ì�´)ÙíY£�úXÅ=¬CÙVæ�`ý(Ù-¬C,˜þ윎¦D»¢ÔaX°
äF{!mg1»v°SWK8ÔÙ«—v;I…ì
®Vzn…l9—_‚)&;ÚâlN\KHÀÄ0æ˜bzQ¡RÓ.pe$ñ8ÿšª[>|p¤V˜Q‚[DSÐU[ª¥ÖV8ƒU…ŒN­­6dÔd	­ZøË9ƒ¡•$îzÙ

–Ýè`Û®^j •€ke!áb‰¥ÆqæJ'wK …0EšPJ¸XbKÆ¥»bè¬�¹@#\8ã̤ §âŒë,EY–÷p¹¹•³¬_ŒÔùå\à,ÃZjΣôÜY�^š*¶FCkdIä^^
P€›XPe�
<?ë‚b>æ-䌙ªÖ¡èD@Ñpm§Á½€R×,ÕÁXOÝ
yHÂÒb ¤	gà
bŒp‡)”…Oq‰2b[ƒÈ"K¤¢W8Ež O”a²ÈÆ%‚ð†1ˆÁMXE#Îbx"I8Æ‚Sd£I(ŒÌÀ†F´a†1‹áO..x¡ÔÔb.¸¨Í•zQ'…@á{.Ô¾ÿ¹¬; ’$ø='É"wš”4©Iø;Fh¶çªÛ<éJáCRw–å$×)å«ää1H—³Ñ¦jH²�©„‘¿Úìå6áÃESœDnÞ7Þ &ÛA”v˜ªbx«X悱‚í]	ç¤Ø’0—Jšj¦/HiÍaª£)¨EÅhÓ‹n¥’“úÓfƒšò½ÒÝÆ~ÆF‘A¼‘Ò·8XwZu%u�#Iq‹î\gÐ`�rZV"ßJ£Ä‚UaËt“ß-Ž
`~ÝÆNëR—+MS“Ä8Ø“’„¿^nË
{ŠOcÈ¢“ÝtÝ´TÉ;
®/;´@2ð�®~ÿ@+W?0Öxµ¬]ë¼
±²u«n5+\=Ð
·‚@® ˆ«XëjW¾Úu«fõ@_Í*ÖÈ•«zu«¼Ú×¬µ{=ëX3@Ø·NV¬‹Í+`	‚V­jŬ_GËU¿V®Ÿ­«\ËYË–ö¬[-kB�
£IéåÁ0WQhÕTuÁßÙLÕ in’•CÁ0Lî)õÂèD+\MÚfZ˜£Ò8Ïi0‹…¯9
åt]‡Õdꮀ¤ØMÍï¨B½îoiSßຊ¹c’R×÷ܺ¸Ê`t�.€½õþ&˜â^Âg›…&°¼±8Æ^|Ù@ƒ’Ò¸ÿm¨0°‰?iÒÆJù„¨©ˆQ Y`“�¤<iÁÖ§$û�4mÄ¥Ò]X
Ì'Mk|.•1"¶
"¬™<êTטJ’ö7¥ÿ�jZ›ÚÒ¡Æn’SZkLƒšà+=µ¾¥¥‰¸Ov“ý}qSûB 9­¯¤RŒß˜Jãs]¥Lu¢v¬ R±�@Mó…&$󦞖àÉu.êß8m=×yÚnqƒE[´¢•÷Ò±<ïu3êQ—zÓùüô©Ë[Ûî¾ú¸«næÙÞ›#?u¨:>¡ÏºÓMxù2žö¡»ãoï)“l|ðµ×}¨¾4;Ü÷þs¿ÿÒx?9”¦Ùo`j|£æóEÐÿÑÞö·?¾Óæ|Ïc=­f_úÓ�¶µÉe}´Ýè'Å/^nšvÇã]ç¶F2ãÏŽøË×e/8Àìgo
­
·p¥�¿�
µ…Æ𧈅�
Á�—HŒÄ�„ÄH
y�†a~!LEòœ~ö0ý6ΕÌþDîþ*ÎEðI-C®
�$h:/
2EKK‹ÚÓ;¿<Ãsêf«¬\€ˆaâÑ‘’•0Q9Òÿ¢Ä—Š²ÑŠ2ðÐ&53ÙLî(+*ÿÒ*ÿ2(1n/oCwö‚”Š
•LJ‚”‚˜ää4•LÅ8Í•¬[¦µ2É„
 ÀöjÏDmE‰¯Dwïû˜Oû²Fc´øZÔEkÔFeGqùh4G›ÿ¯EM€K(ÒJ/ÉÜ“ãÒFï&±ýF°N?I�ñ°3Õñ@
Ž)áQ4õ+§2ó´rJ�ò+#m|ä"«ìëËtÈ”L‰ÃJÊ•�ä{:”|:‰N9tÅfpž(FN�d*)-L@N@PàFàH PE at QPQ`QµPO ò'#+5ò.õJ\¥T
ò:•ï8T35B…Fîâã4U¥ðK‚T•UÏU+US7ÕR‡Î|ZÕVWWoõ§l£“
Æ|6u{ºqí¦´k�§”íúNãFSÔ̱+‰®@ûQ@í±KãÕ U|²ÕZÑ3ýs
ÔI†M$€Œ.NÿârM.äBºàÚt]›C&ò¡´;*Ê:7æWò'\W

�}Qµ¨mϪl;ûL<¡n©Þ^‹¶Ir$!÷¶çÊê`Û¶e›Þ¯B at 2Oê¦(¶I.Îx«õX«V“ƒ7†E†	ïј·ÑñRQ?[sz	û@ûóJDa
ŽÓØ­�Ú³+†}ØqÙA ÙŸ½ØÛŠ¶ÚªµB€Ú�Û¡]Û³�Û§½Ù™=Ú¡ý<ÿkÜÏŠÜÏÝÜÓ½ÜË}Û¡§×ýع½ÝåÛßݳ¼½ØÓÙÁJ2±*þÔîyýC	ZàƒW»¡[ºÿPÒóóÄ}WÓO3×.kM�’O¯•ÔâüRõúºÆˆ‹6r©°éŽMç|,¦AèO[ØÆ.ž(]IwZÀ^ ^àb¾^ f¾v>nçi>æço>çeÞèg^çk~æ‡~éy¾æiç‘þ饞ê�Þêc~æƒÞé›~飞æ‹þç{êm¾é�>ì¿^ç³>é×è¿žæÓè«^éãÞë]¡ëÁí¡ÞëÓ>Z¡(gL^iœCxâKØr¯Ûƒù[×·R†ûÿ0Å­vºEø¯3>ËɇKŸÒçqZN>—”m
F×nÃó¥ÉUxâ(8óQ9ÒrȦ½
«K©�:ö…ú©K¨m?¬e¿ªiß´x÷o_öyŸ÷w_öqŸø…?ø“ÿ÷‹¨‹ºöMëø¡ù}?ù‘ßú«ŸùáHÈ|ÀK`okU’§•åY|×1žâ�÷ƒC|('ß�Ò)k,@•ùýÕ¼j?˜8FH@)X põ ]¬c½zÅÂ…k‹b¢VàBö«…ŠcÁ‚
Ë8¬XÆ�=‚æQdF“Á„¡9RX¯ŒÂ`t˜Is¦5sÒ´ SçÍœ?{öº§Ð£ByÿÖ$ŠÔ¦O£M£.5ªÔ&T©V±öÄi
…°_¿€+æ뤯’,Óª]›¶#[�+Ýj4¹ò£I¹,Ñž‰ñ£Ê½o³üû¶n^µGÒUœR¤aÁ€‰WpßÇ�—,ÖªD¼Æj]h×N…D	íK(¡U
dÁ.øBV¢,$¬–ñ®_rû²¬2óÚ˜9?|Ðʼi†æÐk^•ú<zÔê5±c·Î=*Oľ+k—¬_Çi1³UOØxàÄîã§þÖØGâ÷Ñg^¼mpµêUŸ|ö¹§\o
3àXg©°@-¾Ô‚A<¸¨ Š-³€/J ¾äË;t†L;ÿ	©ÓË0í#�{íåI4ª“Ëu§ãŽ<öèã�@rå-´€Å0òÙ• ~ÖØÛdN"¨$dâåQŒm‰„åz\(X“r5Yœ”“Ø$0afå’
ÊBÏeÂ!tP©¥Tª©¥œNºé§�†
) –*j¨€�jª¶Êjª«’zª©´ž
+¬Özk®³öZ믶ºªª¥¬J**¤(3Ì/5n$|q‰™´”�9¥—IŠ9 Fý�7ã¶Q’ù­HJ‰fµØÆfÒn™ž¢lá5Œ1ÿÌâ‚"o«­Œ-°áÂ[1½˜”P¡½ðÆ,·$|íHà¦U.}ᵎ
­´àŠÅ-ˆR1Æ-´P±(‡Œ1È¢”Š('£¬òÉ)¯¬2)³ì²Ì-‹Â‚Í%ç|sÎ8«ì3Í3»|3Ð<›l´ËEã4Ð0½ôÏGÇuÉ7WÝ3Ï)WÝJ;
Ê?}sÛÂðg?ÁÀJ¡S !Æw�eÿ¢PÁ;$p]Hà쀙^¡ŽÔÔ
(»@
$PU8H†ÅP‡Š�ÂÖ(@¢�
Ú±Q`ÄbÀ¨…+úrŒbTNQ‡(ôºOÉÍÉü‹)í”eRónñ( „�Œò"cåíkyÛ�Þ¼²ãyU/ÿ�Ô�‹/šñI­V#c’¿à7¿bÝf6õU¥íZiUkÁ¸Ðq¬y¼JXkU„Ó™Eµ#ƒëø_<B˜aÖµŠ
Nc¬C )Ð2pQ
€pȈ…Øa3v¸"„+øE	PO]

/[àŽ—*�„Ë‘”¾XGgZq
ˆ
*
C. at bQTˆœ8R@€v” ®ÐP0b!PÓ`ˆ$¢¸@ZÕ‡>¸”¦}­3J)2°bl§„ϳ¨­¤i
èËC�ùüû5g‘M€ŽÿLsjÇöZk²…É·…�±çF_Ü‚yydèGjBÀÂWÅlÙÛÚ~Kù’íi7[]AG�hô¿.%ê´p“àºp`ÿ #z[	,`·
¶QÞ(hÊÀùÈo�!ŒÊ‡GÄÈ|å-�ùðh¾óšýæŸåùÌ{¾ó˜O=çGŸzÓ»þõ°�½ìgOûÚÛþö¸Ï}èqúÝ^N>ÆWÄf¯Ç|‚ }ö6‡I׊„ÛÍw-†×-áàÇnÊg³WÃn9“QãÑgŒÞ&ƒÕX¬æo±8Ÿçlñ»büæ|œk©@l±‚:
Ê#úºZ¡þîÆæotÒ)`'-0xÄõvç~æ·x¿
ñ+âx)aDÀ«$<K3¡�ÿ°´�Ø� È�"È#‚ˆ%˜‚¸‚G1]
:ákJâg¥åh Z{´ge4Lu SUm|#g.ÈFgð"apƒ„t¢P€ò—,�
dL(ÑhÌ7·@†åu{FaMØuÆGÖGªt7	F7ÿ4&×6a\âOý‚	`Ô
¶qcÄeNÛeNtÒ
* 
)p3`'p%
Âé$
 A'�Yè�	à&è„Ž‚Øè4pôí`kFö&@y0pŽˆ�y�™�
I‘2$qaVeËB-ýAIh|ºD{¤ŒXÇ|YEMȧ„ȨnQ‡hUÕZ÷%}aW’’á- J�!¸Àp¢Ò�§Vi¾Ð�r35™Žc¾ 
sèAÆ�%
Æà”)�oºP&&
µ@1à
  9‚DYŽ¥j¹�ÿp—>’
"
&mW5@vP‡_
£>ƒ'xãÃJ< ç"¬äRqw(ç¡Œg'ºó'æ·RÿÂÂ@40
¢DB *¢´@eDR¢$º¢*:.J¢ Š¢Dò³ðE2T梕§ê¥W>ú£@¤B:¤DZ¤Fz¤Hš¤Jº¤D:Ç0³À·pòÒeÜYLó3‹ÛW#,GrÓ’ŒsuM¥T™})‰ŸÆô`úƒ„h¹%„ň0
ª!s(
Æ Á0k·±WH”vò†%àöÈ!R#Š;‚ÁE%T1±MAQÍqo™:ÒA Ä
ÆðŽg¡¡F”íÐ�åò â²<Ë#U0Жo)—Ò1K¡+’ªüÚ¯þ*m
£<¨Ô¦t&E¹zaÌšs÷ùEÛ«¼Z`j·Zÿª«’Ð'°J„HRiN¼À¡†
¾àOo‚­ëÀ5Æ€­²± 'HÚx
kÈ¥�‘vÒ•’xiÙõê–4±2°£½3H›´J»´L›A$1OÛ´R;µT[µV{µX‹µQ[µ[‹^û´êƒ´
cT›0HK©Q…rjêðiEÿè
g鋃&Fm¶_úsž]²F¹˜6¸�
³NV’´|È�©ryQ3!Y8�! •W0õ9±²;»³;a6‘av(®
Lr‹)v:ØÍF„
æh%[’ð™žÁ„—¾kU{ÌŠRè0
Ø\añ¶pu’Oq83(RA	rÀ“’—¼'¹¶(u(ÃÀЛ¾©›»)¿É‰›Ê	œ÷»›ù›¿øË¿ï+;ÊEª %'ìS
¥Û"|0W`–«Š9L½Z‡Zeǻǚ¦±Š’{T¬vËG�€õEJÄ&eÎÕ\ÅpÄ–�•§ä7{ñ æ[·b-³± b<Æ1 alÆh\ÆaÆe<kŒÆoÇ3pÆc<Æ2 4PƲÐ
b\Æ~,È€<È1 ȆÈ~œÈ„ŒÈ‹|ÈŽ,2ðÇ‘ÜÈ�È�lÉ„ŒÉŠ¼ÉŒÌÉ—LÉ…ÜÉ <ÊŸ|È3pÊ33ð„y	µ÷“«[„[J°ÔÇ|ÿ•¬»–$d-Ó†up;ZïâOÿ§Å@\|ÅzU9|E8�ç$¬rΣ%Ü·òÑRØ–:Á©>´3�D?›³âœ©‘¨:©s–©£:æü
 �:­Ó
ílQªóˆëŒ:æ<ñ̈EQf)QóìΰôÏÊAQììÏö|Ð
È…|8p¡
¸�+ )pÆÄ•:Å.�ÍeA‰Ñh¿ Èq½³öªÿÅ*Ûì�Wq�'8×™*×r-qý©wÍ{ýÖ(‚x­³[QØ~�–pyùQ¼ÀL8Vxû«ô£¼mÛa±Ìn‡i¬�6´¸Ëê{Ã"c樰�sØ
à
Æpc,à
,pá¬>¬ÅÇÚL‰�(ØöÚÛ¾ýÛÀýÛŽ´m6(’ª¾¿è°ÆÃÿ:uÖ4gâVÖ†[3üF¢@šrb�
Ål[W×%—aØ\:n
×»
ؼ}�ñý©Á}ßA‚ßA¢ˆp‘kK„é½Ü>½’Ö|Ëâ‚M?7·B¬_ªJ·X’ÔRšŽÃ/ûbJÿ¼!«Ñz„îIàWG–ï­ÛóÍסøͤ8Î~Ý#ý‚%nØ‚í‰týâR
ãò½â)~â›Úâ+N㞨ˆÄ­ÌâDãFËZeE6lÜð97oFVK…‘Φܻ4äËû—_F¾¬Ty¸0ªÜã°»ªg`ÊÕ~�Û=Q#Nã@kâBñ³vÍâ	9K6Šp>âƒçpMØúÝÛ²dý}—bŽ¬BœË[2ËnE¼”Ý·„
}[e
ž0WFåŒIÃÀŠEþä0Â(—ŠÑ󼈼ÝæÜ
Î$nq>çID‰©xç„=m^ß-Nç6ŽæòÍâ°ã:®ê“h)ÅÍ-1¬}ÿ(9½ÉÆËç±l;mÍ…ù‘kº‘_î»>8 at k;gm1»RþÃR7¯­Û-(ã(ÎínŽëöýí3Ž{}×v>ß³Îê)>ç¨Þêªnç«Óîx^çºÎ:|žÌ"�®±—
Ä5è¼”îZ‰Nä¿
ûèÑ}gÏ÷YÛåñïâGro{Ôu1R6î�DpîêQAêj.×õª©$Hî$´®�§¾êx¾íàŽ�¯>?~¥…þ¼’íå™Î’ßsØwÜžåmÄa³�°pûµh±sôÈN±[-%|¸Íç�ë'/Ü9>îÐ
ï..î©ÞòxîS?ãü½‘烌@?bú�ƒÿ¼–à?ŒÅÛ‘I’»”@Эô²Û?Ä«ì¹êÞÙ΂qòÑÁæinõ7~ø[Oçù}õƒýí_—�h?¾Q	Å‘ÿ
A¸üdÈéþͶå&uZªì¿,·3Ÿ �á.cMŒ>mZ<gŸÞìjA:ØþÍ‘ØÍ‘#'ò¶Ïø†ëóÞû¾?ïæ^ãyNü\�×aOl¬Ì&Eü�YTíÇÍs¸»ÓmíÒ.D|·cJÔ/
Ÿ.ƒ>àmº¤ƒÛo‰X�ûÞî;"òä\êMáñë/Î"ïþ)ÿ»îÈãxÎ]�þ
>ð?£³8êF1õïèö<ûˆé†.ú4€m¤Ò(ªtkNM1c–õÂÍ‚Ž\u®¹C›Ó}—Þá$È_nÅã¬ê`–%‹ÁƒÑ0K‡„OéCéÓzɧ
—èØÇD|ÿr¯GFÉ@±Á%;e]ÙÒW§VÞ5nÓežYnTÃZ®ô4ß�;‰g¯X%ÎÈ\Æ÷R{�¼ŽëCYÈ™Ôq`ýx‡¸ij‰­Ic™7Øo�%5Þ¡°�Ëpëu™æ\�#}nZÑ”æU¿Ÿe2ǽ紹ÿ�_Z¢ßE®'†Øvžcþ$‰
Ïàj$À‡an#Œ²¡äCÀ„ÅÆr”{•†qPaI{ZŸç¾'>çT(fnƒß×¥®‹,[!UÏhõ3�
3ÈÅ–¥¯Œ—T×Éø²Ÿugo€£^£Ô£«1L�ÁJâ`ŠøÀ@±Ž…qJ‡01qØB!2”*u ‚‰L™ÛìvÉ+ªÅ’˜t]ªÊöȳÓ‘-›Õ3×¥�ùã Ÿ„¡âœT½^�BäyP#½Éœ„i•ËTåî¨ú‘b˜kãÓF“Ô„í[ÔiÊëŒó22j‹ìãÛ¶Òyñl*<ÑØЦ¥NÒŽ>ÅëÓ‘ÿ„Ê÷ü‚7ª�.gG›
]ÓÛEáMEIÝYgØJ:fk²
á¡;Ü•*)?·S-MºŸŸ“"Ç•®Kl-«�t•`åh)¼=Ç•evÓâÍT‡A-ԽĬr˜[—Úê°�h¹M®°;Hó8/Á‹…,<û§ª¥`h^®œ…¬Y®öqˆ¢´Q?KE
ÿ_°Ëü$/{ME[¯ø§­âòzA¸×w¡WÅZ“ˆo;;½3z3Âÿ�Fãô´[þ1SéʳìÈÕr(ëT`@#×S;[P0ÓôÝ/çµvÕ׆m&Lõ®8ÌþÜg2�¹¡†È¡4ë�/öÛuB<ÑÍ“JÝ,¸ª=6¿Ê½l{�jÝ?w0@‘ð§È$®¹†é7¬Å«>ÃøW-›÷ÊV.64×»Ó¥x_x[Hýbéf¤Æ‹Lœ`‘üÚŠ\X¬g"屺IŽ!cÛXŒ[Ÿ8×:ý°l�-×·úÔ]Í·ÚÄäÁñòt˼ᣫ<_ =ÛæÈ55⎛fŠ‡ûÿ¢ã|xrý;1i�”�‘j¹‡$5Ÿó<y.Ñ\,"vo0¼½&_ÊGžI u¢“ëÉõÍu_ûL)q2ˆQ7{¿¥ö<ã_«qh‚‚çƒO0�í̸¥‡wˆøjÒ†³³	%öŒD­¬[v^•Ù^ ZÚ®µ
;ËÆx�Ò2Óë‹�JøP;ì~:…,”Õó&÷æඬ=}KÓ»dç�J¸²ºUpÂaŽï}Žuj˜'#Úp\êˆÕ$y×}cþå�FþâOõV߬ö^5yåç
ɶºXbª‡šÛ¡1À#цI—#z
Bl-� £Ú†€Âeyš¾y3Ôcª-”8?#TJ=ä³çâ-F, mƒ°¸K7±V@d+;jœ>VÄÆk,¼
a'Ü`˜“ô#F_”½¹$×µÝ2GÃb¿› Á"´DOT3'b%?ÂÄ>BAT*ð%áÄ
¹
ÁB¯ƒT…dÈ…¹€H‡TH‚l‹†ŒÈ‰ìžˆl@‹”ÈŽäÈ�ôH‡¤HãX«©(Éš9I·HÉXÉ•¤Š
bÀ¯Z=!û¶<û›Ô#¿I–©	
[*AS
2…EŽššd5n³ÿa°'@Š§È
¥Ð	•P
­ÐO
•PíPuÈPõPýÐ
O]ÑchUc8†a@†XÂ…3SË ËÂÅ	A„ÑÇY‚N	µ¦óBqƒÄâ¬8>š;P“Âg28=,D_
PeHƒ�90]}˜
xƒg À�Q8… †	˜‡z8…78˜€HØ7HƒS˜
 ‡8
Àf˜€Q0{x€gx€S@ƒ…7~ €…QÀ
 ˜‡	(~Àa
`
`U꽇	è`
p€7˜W¨‡gXàgàãÎ�á}†3˜‡Q`&v
`
X…	èc
Ðafx4pƒfXdy…
P
O.ÆL
ׇ`nûÙ÷ý•²’½Þ‚$û±SÞeø….<4Êer{êø�Úñ~Nùµ	ÍépìjˆcÈŒ]‘b ÑaÀa0N‰%ñE“xò`0dr,�ra@\Ør‡øac s*7ª!?¢ˆò^¨òÌrc7†c�ó`À…v¨ó_Ðò*ó!¯QñýŽ*/3¯ò1Ÿó�ò®óÌ0�cðò_�s\¨Q…ßaôÌàó1_ÿ‘^x*ñm‡„pt§lê¹”îT_®¦ò¶¬÷ÍGÿõ³»”Œë^ߪnJùh»#6’õ#òž³u#�ß®ÕÄ7öcGvgä-8£'¤	œªõ´¯žBOëD¥z°Áò‰Á´ö³ž_o6µ6kê¦ñµG mžYÆÀñ¶ÿ}­†j"Åǃ¨[Ê«Ö!®Ž=‘1]–½&Õq
%a”,*T°~Ï¥{_¸�ªœm=xî»»H¬ªé�¯25lq[d'.ì·åà"Õ&„ßÇ
‘öm2)åV°žÚkR':n‚(F4nŠÇÇãT%WGqáTµÉéõ
V¬àA‚*l˜�á†'*4H1Ø°†1BöPá±�/9p#É”;¦dYÑ¥Da##J´R%N‚6OÂT)seΊMFüI±§Ê™:;öDJóéÒ ™J­*uçÔ§0�*…ªÑéÕ¬([âLˆ«×—
ÁrÕ¹–¤Í±j1z´
6"Z«<^eiÖ¯@£A�Út÷n^‘8	C¤š– `Ÿ#GÓ,rRË{³Ö­‹™"Ú»�5�æÈ7sb…Ÿ}Kú"D¬y'ëµÙzbâ�¢7§~M»´iÎÁS÷ÞýUñQÒÆ�ëÅÿÜ5jÎÞѸº:M—]u�üõë³lU/¿X™¹pÈŸÇ„)w´vË6	ƒ—Ø”dãÍeA¯¿x§tàÝeØt±ôßwƒõGÐy*hÝn]}TžCž¤Z×e`~@ux`�íÆ�]éYhbUªÛ‰–X{,BWßc3J5‥›V5×Ö‚¬ÁEau}x!PúéEdC‘1IW�Vu†÷ÑÈa`	µfT’8×S:ƘfD~´¥w>ò—K
jhcIP}™�n%ˆ_ZÏ=ÈÜžEå�öe÷ØœIVæ�"F´Õ�è
Š¤¡¥ÈÒŽù¡é£³AšdiŸ=ÿye’‘H¡aŸ’U[�õ1j!…¶
¥ä’púG[Ÿ5"•KF½¹éAº†ÈÙmL¾—%±/BXž³‚)ds˵*³)¶\¯æ™&C¸ò[B
Å£tF^â®ÉVU^|°š»™¨GÊãi	ËYˆÆEˆ¨¶išûܳŽÊ­ ›Z%)s3•°U€â&0Ed^fàÖi“VBåX©Óû˜©ÉÕ*1t}¦†îÂYùª¯ºòÖ+kM.•{ཫ¦Ž›	ö+«ªr:-Š »qÍyÛ3^é®kbÇË«¡qqí…”RUš’‰"
²ŒÚ–¢¯Ñ'qÅwMQ#›SÕ–ÿ¼NavÝ¥­�2ŽS77GÏîKv”ÑbýjmZBïÑ·§Ö4˸øhVfô�
wT+R''
o{ç*˜ùÆ]#,›Å�˜‘á@Óø§ÕŽâFàŠÊèú±ãWvß�’w4Û©®xJ‰QÇ8¢»7Ìy”¯;¬Ô9;a�ÎUG”å–k¾æêãNø©ÝÙty2§™šÃÉš�º�Þkù\Ò—æ^òŠ?Ùn¬õ‰w-t˜_?›ÁóŽý̘~›4ù– øÙ­zžsœÌ75
6é70q^i¤'íÝ®_'bT¾œ‰Ì|}¡v4ÕÚU(q¦cYÈ�t¢,^Ÿ9ÎJçƒ<¥µpƒ6tMŒz‚ Ô]N(·"•ÄðFCòxç h–ð�jCtúaI$“ñí†GÆRXÄÞ
‘$c³£>c>
--- NEW FILE ---
GIF89a°
ð
tSiF%hK7jV)b[2vJ'wR#wU8{cfd5QWNHT{PyWFihGbG{fGzsXliWl}UzeQ{wm\HsZ`okRlsj|ƒ7R†+|…K\‡PjŒ\r£dp•dz¨ˆ{)„k(‰x'’|7„k5†y6’zS‚XFƒmh‡Wn‹r‰ˆ�’”Œ
<(paÁ�#JœH±¢Å‹3jÜȱ£Ç� CŠI²¤É“(Sª\Éò 8¾Œ£¢Â–8sêÜy0M0fáHÑL;’î$Ó¦;‚D$éÓ¤N«.…:UëÕ®V¹f
+ìÖ²cÏb¥Jv­W±lÕšýš–n\»oÑÞ…›×mÛ¹|ÿÖ
,w°Þ¾€Þ«¸0c¿Ž†Œw±älj)®Ù²çΠ9‹ÞLºñhÓ¥5£^UjÓ×A|ø 2ƒƒ…9ßÔM�·ßÀwï=üwñàÄ“WŽ|¹óæÐ�Kg>ýyõŽpØ�ùqéÒ2\ ÂÿáIþãˆtм„˜"š4íßÐ9Sg`5iêë~9þ¦4¹
à@i<ä_€ÁW¹Q.ø’	
h�‚ZTàD15H!pÐ4Þ†%ôЄýdAüõgÓ†ðÑñÆ„íˆM1éæF�+R$DŽ⥈zFx“@êIH|<2¨ÆKê!©F;ªÇŒøÉÇrô8ä’t`(¤A)’èREYÞš­†<ðÀ#mˆ´å‚¾ÝÉbž|âéçž>Ù' „
¨ž†Šè¢ƒ&ê(£‡6ºk�áCw?€×£—lvº`Mi|±Ï=õÔ£O\|¡�>þÔÃ�:zøÿdÇ:úÔºO�g¬ˆ"êè³�>èHÈgPˆÇ:¿þ3f\S«7…XÐFæ ÛÏ:_Lù†‡àSë"Ìq†»¢“Ï>ûˆÅÊqì¯À’È6èn3ȺÉa¼û¬3mð곎uªá¹ˆ¤ƒî>ß|#Æmø6Ðzjp�Ç ÒxÛÏ>ãH“Èn°1+¿kàá­¾î³|
éÜ«ÈÐ…0ôCŠûàÚ°�yp_ðÛvª¨…
­ê:ø >Öc…mpÃþÜÖ?ÎåÐ’ATG D÷ƶ©£_ÀC8A´atðÞÓ�èO7iCÂAxÌ×A”1§IÍŽ´!y—ÈTxÌd¦‹¯šØ�IAxd ¦…	D!ÒM{j¤'N¡Ç`CHÓv¦¦©ñK
aç“`rÿN‰§&ORÈ9²£u
dBQÄibH9
Q1k²"„”¢1¢h<ÂÑ9O E#DWäN€Ú„Fõ'<:1ˆR´?	é“8Z#ƒIT]¨8щ"ƒ¬aVýpÙøø@l#\
ÅÁ'´:ÍdG‡˜nIHg�ÃöS
÷¹O1‚†<”]èädD!JIÒ‰F´!u4D­ƒnh¢Ó%‘) ã™ßl÷W+�}!FrøQa{ÒQ†<&P}䙥ބ÷ž
Š	äª4#µéC®løMú3 �AÈ*ß:Ö€û,ÉŸ
�%bÓðÓž:ؼþQNé0Ùî®Ãƒ•OS|'Ýì§�"þ/ì
Ñâp¼P×ÈÕ*�è¦
n‹úèñç·yƒKøÆ?þ¬�B¬ÁMZ$Õ=¼°†0qÐUþD 
AÀîéƒsg Ä:üñÆh�
Šh›©¶Ñ….ÈùGCÇ!¼ „Zö,Ór4Ûô¡‡Fup"„>`)
2�!Då9ìð¤~Â'άr>±„%QÏtƒœAù�h(áà¬ò>¶ñ;AÄ
‚ÿt!Í
¤Bšº�Æà£Hš¤=jË`Êà¤É R*¥ÇpÈ VŠ¥Ì`¥ÈÀ¥Èð¥`¦aÚÈ@¦fZ¦ìp¦í°¦lÚî@
kk
sº¦owŠ§àP
î
µ@-j
"p´�¾

%P

¦fÊjJ²fz²ÍÀ¦î ²v
§xÚÚñÀ§}~ÿj³}*‚ƒ:¨†z¨ã€„*´ã€áð¨H´AK©’ª©˜z©˜š©QÛ©åp“ž“Rª·z«#1¡´ZUª˜q¡\› ÍM\ûµµ)¶cV¶ÓäqàG¸@'ЮÌʬíú
Äx«°Æð·¹P¸P”ð
¿*°{›¹¸¾J
ËÇ�°_Z¥OÚ¤k±k¥[ê±^ê¥eš» ›»íÀhZ¦jÚ)Û¦2»²rÈëxz¼Š¼ÜЧà`³Ï맃ê?{¨‰š¨E{´á€ˆJ´IÿK©ø ©Mµ™Ê©çk©3#ª	AA«n[¡¸zf$A ñk÷‹jÛ '‘�ù+«·º¿ó»‹Â!7d&'5-ÂQõ™Í‰œ.qCPi™âIR\SE’5—G¢ž!ñNQ‰Ÿü7ýQ™¥Q»µ™åeÁÌÂñÀ¢É|vò¿+¡µÁy�Îçµ�BÃ,ÃÊÁª8ÑÃ><Äf;Ãk€IÃk¢|â)<Ç) ©y ”©œ5ÁOœy'=…ahà BX˜©› œÁ¶#•Q| Œµ%Ã�›c»JŒÄÇïk
¥SœéP<vÃD|÷(Älo ]…Ã…œ|‡ÿü¾>ù Çc˜µ
ÀÁùs  \U#Y,n°yûô$³“O�s
qþqÆó1[æ<r[""0qãᾺ‘$
¾à>¯Ðàá>á^á~ážá¾à 
 .u@P=¹jRñOŸÉ΀]Èÿmß91«IÄÃÓâòL¡&QÏ5Ìv ×ýàÖ*ç@À3䬄ìÝ=#ƒsmäíMäÈÖ@Ô=lóFìýBvÝÞþ

—Èq§D7]u×}²É®œ<ÈxÙõ*ܤÄ:«\ž¸(£—Zl0ÅK³1Éh‰l1\Æ¥–ZÅ3–Ë +F—Z «e3Š/ÓÅ3b*6F—�KÓ¥4“�M7Ðdc9¸–“É�åß‚S&¹ä˜ƒî˜œqf5Tîª[•»í~&5<£�Ž�½öÜ)/>¦�ŽOžøÿÂq'œÿê°ê·æºkd|pœ%�²ED›CµÓF»C·Õ)gsÎ9猅¢\k^zåÒ»ª½å�Ë^Ÿ’ð{�êûoÅ—\Ü]!k—.…è°	F‡Êê¡‚⼦Ê	â¨qÑ£šH¢ÇGÇó™bZ=%×-¿ÊðµdOŠ/Ú•¼ý[vKßÜ}œ*q²POÒ®ß�<žøÝé�‚Þ˜¤Žj
=(æ‘úh¤éaéÅŸÔ�£ ðÁ{ñ±G?*�äp£z¤¾ß^$„¾—F:®g¤—8š
8
*]O’Ò7 !"0aH
™²#
"Årö‹ŠF`„†õN
\yƒ¬Â;ÿ¤Ääy4	\7"1
ÕûŸKVò†7Ô

G
¡@L(ÆTo%¥«ÈQ\xAÓM_;â^ð'C4¼a|t]é:òÃô1„+CôV
±7“ü}°!¼CGx-f0/êP9ä(m°šµF6v¡
6yHEèw¸¿åkptÜKòb§6„É:IçÔP‘œPŒg "§w�3ìð 	1#	‡Fª¡(t˜£M‰”9$RŒ°£ƒÃKRR$g˜‰"Ï 9œÐ „¤`(eID%‘!ùN,Â9å$
mØÇ>þ‘�~äc˜ù@f2±ñh â�8¡œA,ù¢É¹ÿáÌ›Ü#­9‡—¼Át€C+†
pN!n°¦5ÙÃA62"t¨Ã
X‡ÿ
Ä…
ç	ßP“>”z9Áß ‘kÂÏ UÃ?]ôTtʯrz
lðÖžº†ýÚÁ˜Ãž
»ÕT
i|Ý 1ÀÈ°ÂbÌÞöAw
CbÌœäâW$ÌóˆÎ;�ŽÀX¶n0/–ÝІ„Ðsh\;R�DS¶Và0‘
qò’båFGú3B>rh¢é1GúÈ‘~ó˜/ÝV7ºÈ­.ó‘ûœé\‡9ÐÅ>v²‹ýˆÈ-þX»úIQ%¬b³gKªÏ}Q”âu:=’öÝyÒƒQYåî”9æÝ)/a²9;Vþ¤%x^¼-íé-R6DJ|ç{�ÕÇCíežÔ”OàNjXy‹|–3¢ãyCšh±§eUȼÀ;¼Ùö–òÒ‹ÿ{Ü¿±[à„ÝOL¿®ÏãJá ‹r½™î2¢?ªJ½ý
–4úŸgžë×"|ðá]\Q=^˜Ç
–ÿnz¿	º†(È+Z?ò™|ú­ß•Š¯¥þ}×éàïï|í{veÙ?°ˆ¼ø=§˜<

ÀÏ»ˆ÷KŠÍ)ªã³8q	žâ“@Á� =ÿ3Äq
$A”	vBŠ�€Aù»Š^Š ÒÙ©‹ðB%�º@¼	º@Á!d=#DÂ$üÁ9Ú±@»à‚1ˆ…4Z ‡)�Y-”5YÌHʨŒ„©ΘÍX3üŒÿb8�5üÕPÝ †Ó 
Ý(†eH<œ�e�
eÀÃ<Œ�ÙЙç€è†e˜�Ky

¥¢ÓL€1º)D']²â¨ØJ�ং§Mr+„€2=¤›Útú;Í‚¥¼‚1©x!B‚�0 5pªúÓ´B=:h‰ÿy¡P:
è£>T⨈3ðð9¡èyTpb<2ŠU·‹ˆèI¿V* ‚ˆ#R%x2 :X	B‚ƒ1R‰Š0 ˜  ïYƒøÚ›-OEO'Z½™—
ÝPm�
6PÑl�RÕ¹‘
9C§ëªY
ãgúM-M‹²

\æÜÚ³tZƒÔJ­ˆ
›˜Vl²¦�(ÝÒRæ…µs"lÊ¢Ê>6½žŸÀ¦H:¿ÑqÀ¨à,—@�Š£ˆ\â@ôKŠû»»$ îÉ3 ²ˆ»3*º“_ü‹‘¸XÐóEßôUF4’ñ$œÙ]Ëm­ðLl]B†O­Ús©ôbÚmŠ^Ý´f+°‚¦ààö`º7Jˆ/¬‡›,8,~è^¬ÅZ8Ⱥ‡É*,È2á.¬‡[8Ê*¬¾a6¬‡Káf8!ÎáÅ‚‡ÃêᆇÉR,fâŽá!~a
kº5ˆ:à<p,6,8â'&
c&C at d5xÓ9ƒ0Á‡~ˆe!îåÇbafáÇŠåÞçX6hè^>¬fh…^è~^èÿÃJè‡ög‰Vè‹^a~hƒâÅÒg|
èDB‰!ABfVæ-^fùlÏmækN‹–†ém&Ë.ÎVm5Áàþ«>h¢¾|¢—”A塾’bÀîUé¤VŠ%ODPnÝ žâN¥¦êª¶ê«F—Í‘¦ò#ˆ“P	Ö9Õ¯~½¡ú”øjèkÖQë´NkÕI¢8ê©·&Á¥Xk³~kè©k„
ÕáëÕq뼶ëÀ–ë×S¯fk¸6ë¾FìÅöjÀîëÃþë×ÓUµFk¿ë׫ìǶìÁNlŠ£™8Šðù¦ÓÓ¨f•‰’(í‡ «Ó>mý�'qÖëΦë¿ÆëDìÃÆì¯Öìÿ¶öl±ÖíÆ–l”ÀëžîÅŽ	îëÚ&îÙžë²n¹¦k,îÇžîºæk¯Ækè©lÎ&lëvîÎæíÜfAà>íÌöîØ^ìúlóæîÀ.mä&nÂÆnÈ>‰Ìî
¤6<ýÍ¿�àˆ1cÞ5˜
‰‰cÓDÊ4QEª	€)HZª�øUb•§Z)†¸$‰"oƒ@2½4p’¨éM䃠¤2
¨lšƒjE¨ž˜ˆˆŠ-Eµ$B�?ðA«(2ÓKŠ&ññˆ1B'¶BÐDòSKZnJŸŠà˜2$=eTd<!G�ž7«“¼†¢¨›R¨2’>
$6õR�‚ª¹:¤[r!!�ªD
Rÿ¬ظéÑ)X|-‡
R= ýWºá©©’"J3/Ýc$Ó;7{3!“®ö�µ÷¯;`ƒNB%ƒ’¼'U­öˆìÞ¤4… F‰Z²¤¹*«û1-„Ð1 1ú¤ˆ"
F•?d<Š·&73²Í‘Ù‚ $%oT·:A¾c©:M¤Ï(Ásž‰àñÿ±ŸÊa«w¢Ó…¸·ñ&ÌAë|
X¥œI‰Y·ôFj%Á«ñ øúñÏ3
°šÍ.pG³<°›30yÙ²ƒö¡øbŸê:. at -syÚb.’·ƒÞ"y좂Næ-§6û%
Ÿ
®ìB¯ŸP$6À×
–«Z»Gµº­+gnߣhäÿð-[µ.R«h*Þ=ó·àÛ¬nܤ™£Æ+å?”gÎñùsŽ›‚iÖ¬aã3k›64³bÄ8
5)	ª©Œñbܳzc§Ôª»v�ßpÎ…ÃÕ
íãth«‘sÍ‹)__”®¦�9té¾éC×}œ>rêЩ[—wqÜæ‰k/nÞ<pòÞÏw¯~¹/r`'6Œ8luq]h
ˆ ^ÿÅá^-Ýv…"öTTjø!ˆ!¶›ˆ%šx�#¦¨ÆŠ'~H"R0¢ˆÔy€Ç\´TÔVÐki¤¶†}„áA
©ÙÆ? yÎ184•´ü†I'3OŠˆ@ŠG=è122[¬½-°šE 6�AšTEµ–! #\€§T•yÀ}êCƒ0)¾ K �d\ÀÃ6ÆñÆy,—–úPªQ@êêCåS 2õáÇP¦
zÀh?ÖáÊêdåÙ5 ~Uú}hVs$¯Å ËSêã>YC ¾áêöÕ(2ס‡»ž
Šà΂Oé�Ä÷y�CÔpÿÐup˜‚þÀÇ>б�>p¡6x@Ǩ�nè•À#Kƒ¤º@,´áZ~¬ÎÞ»Száº}PŒ—xâ*ñ|Ío0RV>HÃ;ɤn©$ì
Bp™œ‡@½K(b*%°í0t˜–‰‡Õ%‘ë«Ž!ïº}
áZî¢gfiQ¨ð6óèèI÷!.ŒLÙ•1‘é�}¨ãî›äüR¤[˜‰ºÔ¤>õµL�jT;EÕ­fµŒB)�ØŽ#=fÖÊ@�Û]7…·?ø-!Ä]ã–Ø1D‹”�Øê8 ˆ-lq±'í<žš0K�vÿD(eÿÕ†e‹W9KeÝ
b? ŽÅÓ¦Mg
Ó>X�Ø�>”Ò¦ÙAH\Ô^éÃñÁ©”?`É{¥Þ)]@âe”>tAAÂ5ªÔ>\ÿ@à")õÃØ¢(ÁT?�ŒtíU?x�D(�.Éà Œ”
Sƒ;¨p
»C<€ƒÓ°
Ï°<ÈG8¸C8èp8ü0‡Ã8Œÿƒ1>Œ:ñ'ñ'1:<1“Ç«KqS1¯Ã:”Ã9°EÜRð¶Ö³æ­	µÏÍ$…q]ðÌ˨1‚€šïâÜÎÍñÌé„´Áø‚û¾ïóÚ‚ñúñ-ÐBôJo,°¯û@.hoûîñò22/ÔB.0rùƒ!¿/;$2.,C-ȯ.,2
»+³
ƒ2¿p2»ƒ3Û°4ç°5ƒ8ìp8ÈC1/q84q81:„ƒ?1G±“_ÿ±:¤Ã:”Gyœ_|qäºñ'Å1³VÑä®Ü²Ü$Ñî?ÿ®Þ¶\±´nˆàs°œA
/Tï_¯DO4E_oöj/Fo÷~ïøžoøÖB-¤oùÚo1äoI'ƒ.į.�4ÿÆo
nÍeÛÔ
K¯ §•ÅoøGªìJ­¤Ú-Ù
‘°ùÌÆ	F¼ÔVÆÙs´%ôëFö¶$öµáLa6®-qËWRr6„سÿ\a8nã^­tKE`“¶ÔP‘²ù†Øæ6ÚÞÖnme†nn4i;vˆ
˜8�þÁüA
FÆa…F¦dÚ¡¸™v*ΘbŒ/¦xcŒÛ¡¦�x¨!9“ã9åjâqÇåj\œ™ežÙewÂÁœšwgœ�Ã	:œq†zœ£�FG饗Nu Vçét¢Ngu®.§œsÎa�SO+ÖM`IÖXW›ì²ËLQÖWk5{í±m-VmZÝ8‚—ggùÀ#�
ó
`A
yªQÿ™¦
/ÌG
w<$ðÅ4ðW¿g,á¨Æ4
S™Ît
mXÃMkŠÓ›â¡¦3õiNmšÿS7Ü”
y¹iPkš†6 KQUªR—ZQ.tˆªk¨hN�jS7t
l(*Ò0T¯¢a
nP*Ú`Ö´*j©aU”ZÍ
×·žÁ
tU¼æ4¸¡I|Uƒ^ÍúÔ¥V®ƒÍÓYÓ::4©/ƒrQ=áÙÇt3o[Ñ�²DYÄ
h 1cU(NÉ­ºßå‹l�—½È

y
y˜ƒŒ
ãgNb
j˜Ãü
@púÔ!¥ÂÜ�i®¢áÿÓg8ÃÎàÕ3
h6y©ÐR.@0ghÀŠ}†
ü�q^O}@

�ïÓ¤H`í/BŠÓöªÒZLåèŠ
è€ëªÖ&QGÊÎ�`�SÞðÔ„×T°ðLp¯ö
ü¨ŒÆæ õlíòLƨlPÒàÔ@åþªÕ«Ö¦lÄè
¦Îă

±±Ø
ë
Åê`1±/Î/Ò„‹ŽéÌFÊÌ|p¯î·¨ì
�J(ÍPX£ÅR€ŒÃŽL
Ò±¯�QL)¹KÂxŒÉ4…¹Bå*…,ÇŒK$ƒ,¹FÍƒ±Z˵ÌäDz0-C0ª²ÇB¬G´RRÖ�XäJ\¬Éÿ²ÊTì2&ì+#ƒÇ
çÎëtÁY§r!tºÅ>�appAb�‰‚aA‹Á]€á]ü“@×e^„AA—a\Â%`’á�Ôfgæ%^R5~ÕŽ��ð(^˜
´‡ÿ"”b‰ÞÁ�
¦Ü`†ª§ÒÀ¨føØƪ¬ŽÊ«œm(§¤U xOËV°º,eË»–¤
©í0JŠ²ŒÑxD4³Q ŶB„-Å
ý¢µüO/èXDZ„:ÿ22qċÆ5Kå(�…v¡8Ši‹swWn%dw9v'Y»v÷cí©w
ð'm…
Î!
ü`
&à
øÂùîàøXõì*Ÿ¬
¨@ä^îæ
ƒd±Î:Ÿñí
Ò@
 ÍCN
L£m/#U¯ÿZÑ ­
°ÎÈrÕÒ/£ñ
ÒŠŸ
šžEÎCôâüx¼
ìû®„:Ÿ·J š	å
LÆŽ

r�—
ÿðÇ=v
€f`�(
X½å”o÷l}þPÄÊó¯†mì=kOÓ(ön“í«c÷VY¿6o›]MgÙÅ…ó\Àü£ÙІñ4^T Ò €=�Ó¤�ì£lô¯Ù¯žüƒ±ÒІ"Ýv¨j¸Ã
î°¼_Á6â‚.Ї;�ÈAÿÚ’C
ëÿ´õÆ+,éTqAbX–0ˆ	4Ü:÷ÔÜ]YmTƒÈâÉZq¯éÐÙ[œ4Œ¬�ˆ%��Â7ñÇûŠ¥Hšuñm »&¼¶àØÝ×ì�ñq»@i6ž¡b°‚ñZ»û½o€_�g	Ÿ)©Ê6ĺ+ßë¦\¿¦Â¯±0à=T.D7bßÞOFºá
’×VÇu]ø™¢&Õ¦Q<¿om}²û³
aÔÅA†Íküýü,ÖÐõ¯ÿ@	Ù'?>‰†}Ü£õð>ô�ÿùûCÛX׫æðÿ^Ð|0vŒ}ºö3%£Ô'Ó¥kbH]x€ jAqÔjJE,mp&¥Í÷{¡†}µgP†e;{»W{†7Tµ‡j»ö{¹ö€4ø& öÖA_ õpü ^
glæg†Š¨Uw¨Šš¨ýÖbŽº¨�Ú¨~Ód êGgc~Z}ªÙœõðd … 
õÈÒðÿÜ·‹ô—�^3É‹ÝPdðOPŠÐ
†>XúÐWYŠ>ØžB%|€SȪè ô
\ƒÐ–T¨²
d@·Úmð`x‹þð« ëèžtÀ耉™XfP·H�Bøƒ0ÝØ�Ûp`0­‡ ‹àæ"9Õ�JifðGàó0�ög+v€Íéf€®óà–pYa^Ð�Ô¹qwv—	‹ê@¯‡0ÿ@…ó 
… Kð‡€æp£ëZƒ0³Y……0däpz—8�ü`J �·ÈŽ8Žó‡Ï@| 
xp¬ô·°£Jt¹éÿ
QÉþ𚃀 Õ`d
XIR{ØãzÖÇ}Fªd¸* 8~À“=y‚`•ñéQZOXg`ž™¦ypá)œ~�ƒJåM‹÷4Œù²û€ŠsàS˶·b:l{%“^Pá°�PÖ’xWnHÏ“—ØSä&¿·*×ÁF
„l°"•GÚ‡ƒ³-qt Žb¨¶tH{¼§Ê�G�b7StØÞ4Å•�‘Æjh`P¥Ox ByªÑ£áC¶v.y
¯Ó9„ã\ ]ùÿxmÉ�ìx4vàᮈ\ŠÎâUIb 
/Û“4‰áp+[2×­ƒà
&Ù“°J…ûà‘ÌÒR˜ŒÝ8èp{JÓ¥ÒÛp?êâ*K_‚@î=Zµý çƒ�ô±‚°¤5¹Šø§¨hMeû
Ã%
˜ž÷üáÓÓ&轃þ¼´
©tž£b’^ô‚GèA™\Ö„Ùg°^¿/&ñ諨oÉt÷Dú›§ï_J~þöéaC‡mú¨;ÈÖ4xæÉÕ;5M˜žõÎz9ùZÀ~ªIã¡,B}k–“Æo›KØò[¦"ŠþîQ£¨oŸ‡5�“Š¬j�_¸B¹r´MH³’ý­Ô†Î8o¾qH=�šÿ6aÄÕ£7®äfðáF_Þ|y8çÑSoH¾=ûšðÝÇ/ß~}üïóÓ×ߟÿÿùæSO<8Ö C†K.ù�.
ãç�;ñè§I}ÂÈ
2‹âã­|C‹MÿEdC¨›>Ühè“æ ©¦ô
ÉU¥}@ìF¶„9ƒ�B65è7ÖøFU~¤¹Ã´5YäNPå
­Mßü)D¬p;¬ó�ƒÊ;ðØÆ'}0]£ný‘f�6¶ávDÄ
D|Ìô¢¡µ$61ÜDHá@Öp�3äp’]Œ�6È	é|棟�;½Sušì‡�6Ù¡„ø„#ø®Kã�ÅD‘; Sƒ�âöùâÈ@Ú'4ÐpC}à!ÔuÂ`sFƒôéâµÈœÜ†<¸°b�uáÃ(ÿ5è¸ �‚œd©�Ñ8ƒ°!†LKƒŒq¸ó.Â
O>ÅÍ°qÈ#—|rÊÕƒpŒ.Ùa2Öp°ô6£ctÀÎXrÔÑGDAg¸×ÑðÕ6AduöÑ�m!D4¿†R�?ÎÉv“Ú ¤Â}ôQ¤�ãÕ9'­º‡Ï¬�sÖÑ}ÜWÿF‘@L½�ul[çœ9ÚøC�ò×A‡œ×÷a�ëFÏãœíÕasŽìu7''“x!©³�:¶1ˆ5œ�u ƒ°Š£~Ã(x0ž>Ö¡Ž?¤Áý;Ÿ«Lbº@ Ž}òSÇ"Aˆq�Û€9ñ„%Dlrƒ X¨�pÿ{ëà„@xˆoŒ‚.$\U7$6DI"”_ë^Ǿé
&
�Äí´;"b.ªIÝèð(BÜDGë¸Ð )îÁ†ùh:¤‘!ˆHñv„"¨�o BFáŸî¤À4x¡8Ús:qš|±xº; Ô
gXÄ®‡<üá38Ã(Æp<X,â�XÆ
îð‰ALá	sØÃ+ž1�3âÃ#Æ$61†�lã;XFq�çqá"'YÊ4>±�GŒ÷ÈIV1ˆ·¬cGÙÇ,.±†ÿìb¿É†ò—œão¸Áሰ›§læo™ÅrÎ2„»¼ã‹#_¶1’c<h7£ï G8– š
ÇxíìSçšÔ¤nïYÍêU³ú×y°»MÝjt“
Þèʹƒý0¤;`®ö©Û0ê5ØšÙÒ¾µ¨U}í0àZá{¸Ã¯i�ì]ÓšÙ@õ½Q]ji»à¢
¯[�ëÿU�ÊÙß–õÇÞê_»Z©v6¿á½†W�ûÔ]éw¬Ñ}îl‡»Õ«V¸Âñ`êY«Zæ2?u¬IÎs�;ÛÕV:Ï'¾kl=Õ¤žö¸!nl=Œª+¸¶<ñpë™Ç;ì¾®8´[¢Z£ýãgvÏÇ-+ôüÔÌvx½ìQ“ºå=ïù¯ý®w“sýæ?ÿ5Éó-†„\ïË^»€Â‡€=›T9Ïö¹•­÷W;›ÔxøÚ8J˜Ò½téM_4°Áº×ù¨^gZTï’Õqúy©{ˆºÇŭlè(Öf	)x-5iîóüß÷M¨ÊþaKÓ!îôüÝ}ð"šüégÿ_ûÛç~÷½ÑÐOŽô’þïø¿~ñB笻?(€¯|g’‡:ów,ýù‰|üŸ·ö±¥Ux“¸|Èá=
¤öp¦ÿû'ü/Z">4>‰2Í"óC?<=Ü£@Ì@ɹ@
ü¯ð¿Ò[¨ýAÿ A
=nœ[nH
Ìå‹Ü`0ôå/ÎßœÁ¤b)Ê2¯äAÁ‡h‘úé?éû(/ô½‡è½Æ¡%ýƒæ
<f”=ñ@œßü'â«À
	tnÀ</vVgs¾æ)ÜÈýå¶\ÁÕ=^?‰¤×|¾g.õ×~>½€.Üä#,Ã:Ɇø¨Ž²­	¯‚n�ø’ª!©-¥zçd®%ˆ>èÉ)çZ
.’½åëÁsfgU.éïûÁ´çÏk\ÿÞ×ý¢ÎXÆgy�N|¾i•öÅhôIü=ÊBÚ†@†Xé0ÎÂå=õPh“çºYxŽçæS)1tÃ1S€–e�¡®¬Yú @˜€>°ƒàx;9…K8Vó
„h �
¹�‹

÷¥à�!~Øp
g)Šêß³y ê”÷ìƒ>êƒ€@CG
A:s&¸!¨p¡Â4tè¤a¨f ÄŠåœ9£æLB9nÐÈaó†
6iÖœL¹æÌÊ6([¾T)3&Í™6k⼩3'Ï�;ϸôI³
P¢m„ž$êf$š51Ö‰£¨0
"
ŽBû*?€ºl°Ò2모>Þâ´!Àã‡ðð,
O‰ÈòC®ºZÂ<Ùžjê“ôöJê–
;¬`ŸŠVJ
^Äâ¼à1x\ÿó¢=ò�{ld çÈF�™l`<R0„Aå*[9U—�ap™ËÂ8—É<Œ3ãÌÂPó0Ò|æ3³ão5†1
:ã™uÖ3Ÿûìç?šÜÐs5¨Q�B:ÑÜ8t7ª
ŽjpCÕè8*MipPºšÖ´7:Ýéo€:Ô¡&Ç7È�RŸšÔæ
Gi…
<K
pa£äB¾d	d&>Ë”BÂ�‚b>KÅ�‚	 ¦`bBì%1(´|@.è‚ÿÇ
ADÀDÚaDÊÂÀå¡	è¦	¼‚ËMœNÏñ9á³Ìä+ô@¹œK
@Á4Üœ#ê3Ü\0dÞ0”NNC¸$
öE:—FyyQT‡²¥Š¥Xà­cX�¨Z<Dˆ�ôÂ�íÂ.
ˆ®d)—L)ÕP©Áy=DlÁ”lÀðPý”‚a+p!Xp)\-Ø·†«„-q
xœØ”‚U¹‚ëx•P!Øa±«m˜t••G·eG�ŽY‰#Ÿøj‡õê(…h¿bÀ+ÿ\¬ÀÖÁ¢èÀJ,�€ÇkØ—¹î†~YF¾æVq�E^éWD$„ÇRVf˜¬gøÈ‚ì¹6¬�4k
r؇ž;ÒåÄü+¯Z  «9+Ä",®Ž•ÌvØ0–hÃ4WKÑTsÌÉjǽfØB˜ÅÒ2¾ÆPoImÆj,ÆÇ&^9–€ì쯶l´ìZ‚mkY×[¢•á�­‡«Š– Á ÆdHÔËF`y퀵WÔÖ”Þö­_To1[B€ÊZ„f AB¨%ÊZÎÐ�TVs¤Ô(¡
»n„p†qär¡³•µ×½B-†éVLEƒáÅãV·öTe°®kØÿ_iÄt¨åå:hÄ…ÝKq-s�,q®]n³Ê—l…#bQ˜Zt‡^áms/u°Æm8’4nÔÁ
¯°°°ì¯Kðïô/°
Â>üCûð±! Q8DÈîÖêEzɃE؆MÄleXPñmð^˜çÞ—n¼,RÁ.L=—úvìÿçWAœÁ´‰@¸ÁÌÁàZDœˆ®hÜœqëmA@ñûUB4îÿ.À¸
â‚ñÅnF{y1îWe-…ñT¾B–D

 L2HþøC.¿(éò�
ЀrN¨ÎP‹HãÐè³J&ÏÔÐIýŽ{ÃÊ£öY'ŸtðÉ&lòÉ&›tÍçh±b
�Û°ÇsòŒ*«|ƒ¿Rz% Õ`’Ì“ªD¬ i
.$5$²ÌY7)¸;ì11K­ƒ‹3äÐ(רö¬éÆA›´1&ÇLÕ¸3îU¤=ÃD©¸Ä¸/¹
œµ¸iŸòU‘
-T�¤”Êâ¬-ÎV ¥Ê^Ù
ŽØ6·ÔðY3Ó˜5`p	}VÖA­„ÒÚ3š=	Ø´®=#89ö”ŠÝâàÿ0s€	ðš#USŸt5$8¶µÇ=£å^gÅd²O]é˜NÛQQ�*

%)£²u�lù!Ï„'<
�Ÿ$ã(Ó=ÿê‰2\d”V9™ÀUŠÈIßëÐûF‰ÀîÕ–Ê‘*Õ=8rè†SÕÄ\ùÁ	‰ÆTæ2™Ù̱~1C¦%eô?g^SlÓÄæ6ÅvI…Л2¢É•*¸!7º‘›ÚTž5Ii?Užò—b›#Œ©«zvÏPgŒç.×	­©
DÇè°HÀrsƒUèB[yLµ‘¡`gD)šÍ}jm¢ÛÌh×6ŠÍ}AcéŽPR“�¤'5)IEŠÒ–*�¤NƒNªšÂÔ¦9ÕiÈÀSŸ’�JªMƒ
T¡‚¡¨:êRÁ 04©H
ƒÂ U2„
¨X½êUÁPÕªŠÿáª`
VÇZV³v^(«ZàV´U­^è‚èZW»Þ¯uõ@^ïj/øµ®~ìþúWÁr_°ƒb¿°†ÈyEn¦\ìf‡8¸É-n°ÓAÑÑŽV��EaŒ>ÛÃJrô´ 5¢jY«Ì#~öˆ©m­ñd‹Ñ5Œa´¸…-lqßþ¸Á..nA\\·¸È=îr™ÛÜbàâ¹Ñ•n2ŠQŒdúÖ%u­«‹dèÂÉo2ÈÞe„×ç5†2ÖkŒõãƈ¯2„¡ŒcؾðEÆ2à+ŒcƒÈp;<`døÀ&ð‚
Ìàv<Âí †„ãÑŽxP£ÂÿàÀp5âÁaw¸ñ18H\âpœ8àH1ŠO<»ã@‡‹Ñ1ã�Câ¨1:ÔÁc«£Ç=æ1�ƒLd ¯ãçpƒ/½¦ÁÚ®è´e¥”×ò"+;¹ƒO 7E›ÉozTŸ­¼²‰^äeÚ’Í)úš™—ùZ-¯v¶Í|óI¾pWìÖ¸ø
Ðç£`èfÉ
P€£CAØñ€EÕ£nuj¸ÃÎv´?ÜŽi‹XÚ$v¶W,�{;Üá·¸ËÝw×XÝAþ±»×
är¬£çhCÿÇVÉ{3sß�è“×\[É{ÔÍaÞò$IËÁ„WùšŸO3üò-zÎó/
_(ƒ+x1r«g¼Ï‰öm->`u``ÜêÆ8.îi�‹çBšäÇE-Ä{ô•ãœÖáEEÓKÎ
b,£Ë(Æ2taߣã½×·/×e½u§ßÚû}¾u€ÙÑj¬�ëZ¯׉Ý®O8ý숇*˜ßgX´ÝÙg_;‡ùm¸g›Ä¸-Åì.°Åô
Ñ!ll
Ç!ÆÐmÇoÝÜÍÈÖA�ìyÚçò(Êô¬Fô:pó~ØŒ�@ H„€6pàôm=°›šÉ›ÎÀ	^€äÍ↯öúìhA Aårÿ°÷ˆ« îõ>àr�ë&-.
ö<Ž
¬@
&Â-¬@q¬`^".ü`¬@&ö%”ÃIæ 6‚C^gG!§c+V2¸`(˜Ò
ÀØà=æ@
Tv
ãm0&^r*¨ÀÌe†BjÏÀ.`
æâú@(Š‚ˆ‡”+¢¢<¸4
ÖV&ì@�Ý€9˜f3â�' &ä•~´éòN3VY‹wAK¶*‰4Q$4[55gÕ
ÎÁŽS—q™7syrù8�¹—w™—…Ù8kS˜ƒS˜9$v“bHä@<è´X4æ
ø([úö
²¹BD¦4	yS›ãäc�
ÿó�<89’¤TçNö¤Q]&
68”Iw˜c®“‘ò¤T€…Gý$*øã[2dOà@êà*U
:âe·ÖYB‚úˆ
Ò¹1ˆ¨ˆ^–)¡%8ïâ

Ò G3„ÒâOÀ9„%F
z£‚æD$Û’#;“:eY3‰÷šL³Ì<ÑWù;ÙEa²ÙB(…ê=÷C©»ÅUÜ`Äà
çš®ëÚ®ï¯óZ¯÷š® ÚHdiV›°�·-3%5jΛ™î#1ÿOxQs¶")EÖ@
d@øA¶ùáf»@·a[·d·{›·Û·w»A†[@ˆ[¶äµo›@’;·s;@úA
›º»ººSàÀÒƒÂI£~·2a0%7
<á‡
úìîD$†K‹‡CÒÀ±öA¾ÿ!ú!î¿ïR2ÅLÂIÖ
Ài|$Ø@^@
®  ¥R0ú[-<˜ê\¶ááôÿüõ„Á]ÜáÁé<Î=}Ïe{Ïû,Ñõ<Òk­@> @�†ÏëÝÕæ½\\Áÿ!ÁkMÄži½Ói-Ñá�ÖÞ]Ðå]Ü-üÑñ +U3$�×aÑ#7>«'�Ö%Ê»ÃãÿIÎÎÖË{Ç›üÆ)3lhd�ù%¾ä*ªã8ä`¦†‘ ÝRÔü¾wÞç)…¿kœLn"�‘Û@ì¼@\ÜÎCüÁä@0üµïaê•þÂ/¼ê¯þÂ	\ê/|@p›ê¿B„Ã
$¹9œëÄ‹[hÂ!
Áÿ�ñ£á"¿ñ¿ñÁ,ÿò)ÿ°
:ÿ¶½óC_ô¡á
ÁÒ€ˆ>¥-œãa¹€¾à˱rB34Ãë+'vŸöy
Vö/À÷‡?'n¿ögßr
nßø‘ùŸŸùqŸø§_ø_Ÿ¼Àú% �Ó@ˆ |ð™\™ØŒïÊò>�Çñ¾–=~;çŒ#ûþû´úD'Û‰x`F$„…Z´+¡%h¦V‚ à¨A#G�8pè 4Hç`Ä
Fl¨¦!‹)b|¨1bE�=V4Ñ¢@‰%bÉ’!”å �Çà‰8sê܉Râž@ƒ
Õ	ç'ТC‰ÿ&%jt©R�M�J�ºéΨU›ZuŠ•ªW”]¹RÝúµ¬S²fÓ

{t-S¡hÕÊÚQ¤ÁŸhÔt£†¯A¿€ÿ
î‹Ó/á‡7Eã7¯aÂç„,ñqåÉ—&,YsÞ‚š-ÿ¥zpàÍ|?oþyZµeÉy	j^<tj½«qƒm06nÃ?÷ú”èz¸ðÞ¿‰'�¼\Mð¹AÓh&™ïnÜØ�;ÿíØ·pØÍo7¾Í8fnò¶»7—ÝüùuÝæúýÎ99xÃÅïÚ—oxûúÚцrìÝöÜm
®Zy
éã ¦ºÔIjxZb­iä*�túæ[¯쯿ì°Çæ…¬¯Â*묰È.; ´Ì6lµÇâô,³Üj›m·Ên±ÔJ;í¸Ö‚«\ºå>+î»×²îºÿkŽh¬NÕª«n²Ñº;ï¶ëbï¾Ä–».»Ñò«\Áè~kl·Ðš1Á£[ð»?/´
Ò�9àH at tãdxƆ¼ì
Xî¾0€p
‰gÀ
r(Š� 7Þ‹ä&e%ä
}䂱Ãs²U‰h]bMKD«	…-~Š²Î0Ó6äJ‘1¢‚

hÑ԰†
–¤Ý
ð ‡Zá.¬Àg
Az®p‹l°IÝà‡"R�¶n¨€Væ�
ŒqÃŽ´Xq®�ÐUc6OØÄYÓn±™€Ø0;?L‹
ÄÜÐœS®iXƒv6’:,R!¹Ã
pÃ@…vRaÀ˜CB=�²{ô‰x€µ¶s¦‡¦Â¨g×Tœ
OšƒwµM³9äáˆm˜÷~{ÞôšRYó¦B¦÷·`,Òò�]î
¨”=!mÏF'REEø�Ùù‡Q»AÛþærÍ\Î#NÝ
Xz9×
Pà
ßÕ�[:­XJ¥ÔZC!¥×šùÚšßz¥ZzZQ®_�‹æ
÷‰®ra­Û±“èIu&g³&k
xF}ÁEGà`ÈŨaHV0xš¦v€“uŒoÄa‹øIr"aˆm)tð¥ôz+Ñrw�H¸¶C1ø…´Ã¦å4a3ÇØRNP
ÈÅNF¦…*gzð¯YtF°ø£
¾^ñ½NZ·iA¾KÚ½ú‰¾nq­ê{tû¾â;¿×:ŸeK¿Mú¾ì«¤û«‹ø{¾IÁ·pë½³‚¾¶€Õ¿í˶cû¤ß«ÀÿëWmÁõ)¿_¥ÿáK®Aw¥Œ·g¥z»¤aaÁŒŸ&Ü®'l/¼Â$\Ÿ·øÁ.¬Â(üÀ5œÁq‘Â=
¾lA·î*¥:\¶61¼)œÀÕZïÄÜ¿
ÌÄÓ¶PŒÁ<Á·Rl·SÁ¾ßJ+¬Áú™¶2œ™�:Ãf|ÆhœÆj¼Æóû¨�/ÁÆrüÅÔñ'qXHÊ+zü&yÌÇ{ÜÇ€üÇ‚ìÇ„È…<ȆœÈˆ¼È‡ÜÈŠìÈŒüÈ’É”É–<É—\ɘ¼ÉšÜÉ™üÉœÊžʤ<ʦ,ʨŒ¤d(E
¢süÊÜ»ñ/±°|˸œËº¼Ës#>ñ5ÉËÿÂ&š+^àa
}Ð-Ñ]ÑmнѽÐMÑÍÑÝÑ ]Ò"ÝÐ#�Ò(½Ò­Ò-ÎÌLÎåØüÒÑÅ8ÇÅ;œs9½Ó:ÝÓ@ÍÓBýÓCíÓFÔD�ÔG]ÔH½ÔS‘_ 3� @	¢`Õ–�Õ–ð	\ý	YÝÕZ
Ö_½Õ[íÕaMÖ\­Õh]ÖÿjíÕnmÖcýÖm�Öp½Öi}Ör�×l­×w×{í×}m×uíÖ-Øs�×€=Øt}Ø…MØ�íØŠ�؆ÍבÝØ‹MÙŒýØ—�Ø™]Ùš-Ù�ÝÙ¢�Ù¤ÍÙ¥=Ù¦�Ú¨½Ú¡}Ú­­Ú¯ÍÚ›-Û ýÕum	U}Õ(À
àïˆÓÃÜA²Gà—ð	“Ð	;p̽ËÝÜÎÝÒ=ÝÔ]ÝÖ}ÝØ�ÝÚ½ÝÜÝÝÞýÝàÞâ=Þä]Þæ}Þè�Þê½ÞìÝÞîÍÞA°A0A>àÜ—p
Ê@îÀ
,­ËZºJ@904 6­IA¥Á³ÌÓÀ¬FáÛ1áÿïJá~áná.á^ážáâ$.â!¾á'>â&^â(Îâ*Þâ+ã0>ã/^ã)~ã.Žã2nã9Þã;®ã4ä<þã>äE>äFNäJžäAþ
Ñ^@øPñ0K`X
žåD
l Pp	˜ðdðy&uáS!”æd¼æôÙæv¡ænŽælþæ&z#vA#ªâæ\i¿¤¡æ}çrç>çù7èv'‚öK$�îS-!+<qæt~èpŽèsné{~é—Þž>E+œÞ拾é‡Þè•.¥~ꢞèª>é¬Þè®®ØFàú
ñXƒ�Qñ¹‡)œ †[³·Á£
1ZŸ°3žñ‡.¾YðšdçÙ†
:Ö@d¥»	o�u2å'š)¦(^Ó�ϬõIã™gû!�”¼pÕàˆé�ž.}FKC ôñ�	Mc
cˆ†Á²
ÁM0iñ‚:FT>%�!ˆXÄÒp†0¼MRý¸@fÔ±6„1‡r¡>
ˆ0è�ÊI
D
DÌêÑ�|àáFõCþeÍ	õÃ)«CýBCýéÔß@]Ʊ°Šdê8�é€Â&2‘VMa2mj×´Z¦„�•ñ˜ÇzIKÚÖÖ¶H	ËXHG'¬P‰J·ERq.•,…x
-\ «¦ÿ/p
k[>ˆ«ÐSó‡A Ûùƒsp}8‡?˜¸	h«hñ}@‡oP„Aàñ3—¡¾ÚƒuXCuøƒÝ8³4Àƒsø™|0‡T#‰´x
D
š7 Bÿ}ø†BX ,‡>p9X«•9o˜C²±CBH‹À¸óàC¸£¡<|PAH«4 27©SrX¡Ücª”hîÓ‡Tl ‹(’”èƒíÓsÐ�9@ƒ;„Hä}чmPiÊ	�àà= i|ø™“È©£¼o0ƒoÀ}™ƒ	ü‚Aè†q ¼| ‡; ;(Æ9”†Bxo1>H‹?0‡Ÿá¬ÝP1±ówÜ—„ô€5ð�:(Èb܇q@mðŒyNÁª
:È}@Æ'ð…P§Ñ ; €'@tDì9<L9È¿ã­ø­¦ Øƒ-ë-·P-Ôbÿ­ÒjÊÓrJ¦”ʨ¤J¨Œ’5PÝBµŸDŠ&Ü D‰<dŽÄ³]:5�—3H
L	yñ‰¡9Ð%"
Ûá)jK‡X9í
Ê©'á´%ôœ&´Ï
й¥K¨ÂšR5
圕 ™€œ"™ÎÂLzKžŠŠX¹
¥ƒcBÌžŠ]²	½BÆ5H™7
ÕP.›˜yÁÌP‰ÙºE¼‹Ë�ÎëT5ãÑ—ðÌú�Q*mRšð)�¸B‘ˆëä�
Å>Ÿ¸ŸÂ�ÀƒPÁ|™˜Anƒ‰:x™8&ùã¥	í)™`På4ÝœœP¨HÂ)¡´(©O=
PÒz“)Ü­,=¡
I�‰B‰ÔðÍöÖœàT‹àPÂùõPŠÁ‘U˜0K^½ÔßR‹�P‹’PùS´ø¢éýB¶!¡·´TJí‘W=�[ý‰Ù"“¥XʪlW«|×F=BMSWGµWÛÊ-9)�šPÔÀT at uקŒ×4AŠ±d	(YÂQ­TPÕÕa	4ð¢X5N[QÎ,	È|Îœ€¡~ýP‰%‰ÜÜÕÀ„	*¥R	ÅN=‡­’0퉓yŠ¡OÕè×Á±ÍW%ÕÀŠ!-[ìUÖUK¼mÍÿXBÓá4uÅ;9 ÿR9°ÒÑW‡xÉ0Øì°MHÅ)qÆãÊ{ÝŠ¦�‡VBP¶
7
É)Ê?íŠ5ÛfÔ°85ŠMõ�þ¥U’
	~ÛP4ø‰¦37<@—Ú
ÙƒcNU¥HÀȃs˜Ãu˜æp1ø‡Gê‡Ì‘ [8pƒ	 �9•5˜ˆÉ mŒˆw±ˆâ(Q’�ËÇ»ÚÉH
ì‹
ö•˜Ìé^ˆM™w
�Iò+
i¥ˆ3H.x¦ôƒš²ÑÄ{S–Pf]õO4 ²E€EoAr@>؉:èƒ(Ò—uX=p	9 "ê‹IŠ¨ÆÜ�‰¤Ã;TŽ
UBPr°Ft؆m„>X©¤H‹É©z.²Å`Â;T}
Ûÿ(‰±Ü	8@â[LŽÁXP¨©TNÏm‡�ã“HâŽÐ~¸
í±¤Ò‹~øV0²ª– U	
îÔ#±`ÂØŸJxeð€mð+Ið¡ÀJ­$ƒ‡~UöŒláE›“	)´B,Œm&‡Ÿ‰«qLŽ@Á\“š:ZƒEx+k\‡o
8
�Àÿ%Áé%ºìÐÉà¸ùô“¨Ž«£•‘†Z"6t(„ÃudÌM”†â‡´âküò1¯vITƒ+
—³Ñã"˜iˆíA!gn<¬YI›—,}8#D�>貃6xoø˜‡ßƒA¿¦d™}Ð1X‚ñÉŒaC7ȃ%x®MùïѺ;H™4¨úß«Hᇿ
vÁ,sy.Èn,Èxoü‹Î×+e•	Ù”ªp‡Wƒ<púÒ,#0æèðþ›�PAÌÛÐSž—6À•�ªÐ£¾õû§G?³ŸE˜ö;ˆþ«w&}È
m¹ý0¾�m�#
ùˆ܆~a�Lÿ«@Ø°R¡<S=
òëw¨K –üÔ‰á’FÌÃz/Ÿ‘³f�¾ªú¾yÁ#F]Á‰úúƒçËš‹jèðM“†ïÑžÓ��Þ81z{2nìÎÇ#K®lù2æÌš7sîìy2OÈ;Û�!réÒ2\褱¬ñ˶’.yQ™¶Þ½}a$à‘6/¨<3]ºÂòà_¾jZûôÿ¢.èK7¬Ûtñ¢GL3âøÙ\çåïÞ�rÞ@ö¢ožØ~|ÖØ9„Ïä=rmÒx!)vŸ‡6_æE¼§OŒ]Â_UèØÁ…yýéS[iÁ÷lýp§O!_¤�VPýH“’@ýà6Ïw¬™WÒK�xHM¸ésn,ÒR=Á�ñ
†1
Šàã?ò”ÑAvÆ©u‡Œù•`Â}Ñ…1ÑÑF7<ÂÅN¸�~Û€¤!€ì
²HJ
º”dmdNX¡€Núÿ³Í*­ç=ý´¥�ƒVWHM/i“l-Í3O4zØñTD/uá·½D†ÒHÈ8ft �p¤Žhd‡gø¤‡°B!Ò5¹´ši4è�XøxÁ0VõEŒEFß@bés
RqÐ!­rp ±ÄH[‘QHZ‚3ÆCýèF¨^¬ƒž\ê<TEküÅE ßü&UÜÍó
"^)§†CËaãÐ#�8[F™d«ûÙÊ,»ü2Ì1ÇLÚ§ý xÌíÄcn8çÒKÒ�‡}/ÕöÅ>àNôÒCÊâ£Oó¶3+‘Ó{,$Ò>û¼Q=êÔкÑ`®ý¬ÿQ‡$}Ÿk€uœlØÁ�XëØ!]“Êþsà[$öƒWƒžV×®^%�Iü쳤Áà½ÓÙ0&ñÂcq!�Ò÷<­>\²tN �´`u´¡�XF‹¸O=ô”*XÐéc{Œ$‘?øt
•Àû0Ëy;/'Ay±—eBm›ÒüÌ£KýX/’‚)õ•ÐùãO?óà³MgôJÐKaHgõé^|–Aa�GÑÒñFƒ)Ά�.Æ_,å.;täH×ûÐ3–¿4	}ÁAôA¤9XÁ	Ñœ”›%àIž£Tª‚uô!]{aÎì
Q:%ÐÒE9ô‡\@”:€ÖÅð!ÉÓÇ!.p†ÿ£Ða\ {D¿p!-Ñ
Ü`‡°ø‡€`À�”„+¤ÃFó(ôšÕ&OyZŽ‘<Ô»0 á
DƒÏ>ôà†;¨C¢úÄ’”â92†\ÀCtô
;áÆêÈÃ>=”‚U.$øÈC%×�'°A#\øÃNŒÄÿ„!¦IX0_YM7´¡“I²ƒÐÁ£%œ¡
KV?ÐÁ†pGdHª=«â��ô
>êX%ô½B¨u¨_а“:@<nÈèÌL5\€$áÊ|V’°-é†L׳ÃDXŒ½¨FHÉHLS_
w„¾Óu
ËI�ŽaýÿC| Â¼ü°B¬!'s�C<P	¹ëÉYk¦Æ“¦ŠÃ�%[¥S¦Ç෸ƽL”`Ô�a>:Û!9ÆÔC,Ìß„Aª­„¡ªÃ”�À¶a"ëBçpÃ`vò,7ôÏ%.ñ‚Ö
}˜AhAßÀ€{G5 ¡©4q‰?È@œq0“�µ�Aòó>‚ø'`&ƒÑÉ•ä‹ èú–»¾À…ûÚäbÃG~£A€1�ñÇ Üà†3ˆ�Š.ÜWœ´4l¸%ð(9
U/BŽhC{$÷)ì‰é•V8‘Aˆ¡Йqî+—oô
V&Ä"á6äI#ÿümcád]ì>÷8«wù#ñŠÁx„4λæ
xØG9¤ˆá˜áM¥úÆIA’yôÃ�ðÀ8N¬¢´!+ɳŠ¼0ˆoì#&¯Œà„g{ân‚£åÎ>A…;œ’…g™˜?¼!6Âéi…øæ€^|]=˜Á\’–ÞS’ƒ|a¥>¼1+ìÁ„HD9òà—܆g
ˆxwf]#/(%PXH
Á‡Ùí :QOLº�ßØdˆ{ñ
屘%écÃQÚ`ˆaMŽœþƒ¨q£�aЃ‘X‚ŽA(QÒÝhˆ´±<²�‡1Mmc<ö·˜ãîQ4¿ÿ8Æ-C‡5(÷43 ƒB¿¤²-ˆP‡TS™Êù$Jiøƒ"¾¡VðÙD`Þ‘_>† ùªE_9¸z�ˆƒåQ{îrü†u@%•½ìÇ?ö±
²°æ}àëÇ:bbžA‡¯*L#GLhÜbëI/ˆbºZÆ•B�é!i
>Ìa‡3ø¥×£mˆK5l¦ïvJZUö!4:ð!æMÏ•öq>DÚðpê>±Y	·„@GÓ¿�…‰d\¬Óh©iðícëIÎ%¿€t0Ä!ÿ�Ç÷²�.üAJ…eæ¾'0uÌ'<sNCÖ1’ïQtŠ¨�û@Ž»‹òÇÓÿú ˆ»Ø!\ÁƒÁF"°.|3A‡HU 
@Løï
¡^L¸à}?;Ä?èØÆÎ@wÕ+|àƒ=Åþ¦b;$-xx�ÿíéÃÂð陞È\_Ø�"ŒCÀ8„�8„ßÓåYOßQÛ�PÁœ‘ͼ¤AyaÞ? Ïù…Ã7¨˜s@Å>‚ÐpZ„ õ ‰~ÔŸ
¬A—Å�Åü
ÀÈ` Áè�´Åð�x
æ€Î™ÔÄè[å%€¢Ä�°
ßôœÇCüÆ?ˆCÅÛH•
yg‰2‡³D(XþÞ^´Ï´ˆr¬ç`æVrœ�$&´ŒÜ†îLΠg˜ü^{šé	©L”–ÅQ@ËÒ™i‹
cÚ¢­GÒ¥'vDVÎ-ÝÖ­ÝÎ-„\€'zb*¦­ûà->έ'ZÁÞf%*Òe^xd*TíXáFZßf%ÚÈYBîáz¢†©-ÛþåE6nGì-ænåÞþÉ_~.ä
îÝÒeÚ"È_ætdãZ�ØJÛn®DnVV‡ÝÎäæÒ-æf¥àã²ÇãJ®Ýö-ßö­ÛïéJnGô.ôÿú. Ú->æíÛ.åfoãÚ
á²ñN/ðJ.¢4oøn¯I‘PN®ûtAïÖnûºÏ\€ä¾oåªníþ­ûȯG^/ý¦îö:næ.ïõ¶®úJïþþ%ûf®ý‚A¸ƒÍÃLq�ac\-ÌXðÖf°dÁÀ%”3¼Ã;Ѓ‹pƒpÓC	�0
£°	›p=¼<´ð	Ï°«0	Ÿ0Ç0«°›ð×°
ßðñ;C
Óƒ—pqó°	Æ7±71ã0û0¯ð1
Çp=èpï°
7±Óp/1_1‹q§°¯ð
·°ƒñÇ0³±K±ÿë±�±¯ñ;0±[qsñ_ñÛ1—ñ“ð?q?rCr
ëð 1ÓÏ1ƒð²‡ñ%C2'×ðsñ[ñ
ç1%¿1#_ñ�£-f°f`pÒ2.·ÌN¸%PÃiÊ0Ë<ÈC<ÀC132'30s2ó03a0Ç1Cs4/s2Ï3ÏC0;³2[373ó0ǃ4ws8‹31³0G33³6s;w³<`30�ó/ó4377³5§s03á:§s8s>³38Ãs8ÿs;ÿó>'3> ³1ó;Ÿ³13=Ç30ÇHŒsCÛ3=Ëó/ÿ3443CsDÿ/ôEó³HKsA´As4;7³4«ô1‹4K/sL›³?ó0ß4=;s<˜¦MO³B?s23¡Ló3Ao³;+56·³9ŸôNss=¸C:g4KôKÇóJ;ô</óJ—ó??tEÛ³Bó3R3K�ó8€]Y0†lÚrÕR!\ç2]ó„¥.Tïµ,„²gÃ5Fužèk¢,+¹!`oL¼Ö,½¬ï‰+Éͨ`,Û`Лv�J䘒c°¡ïéLÎ)‡Hqªï‘�›îë؆œ'aOžèÈNF²Z©Ëªö‚¶Å=‹—2[IÕlƒ>6gO
ÓÆgfc6`÷öfûfÍÊv!åvf at vt1GÇÿXöÇ ŒqfâÃ*÷…^*¸i¶[‡vÊ"÷º¤é«ú¦v“\eêjFtÉ)jD½Ê«_G¶q7‡â¶gèQÖ^ðqQ°~¡ò÷~‡!½âu†ÇÊ·q§Oác`wͶ§^ªÎ(hCøx#çhn·„s§²!c×¹V­z‹ªz'whŠÇ‚ow•ÊÌ…g°vkv‹ïQŒ×uÆÍ8�sø�»5ÊØ÷\w·pÝrŽcœÆ)Êܤ~ŒzË)’³æ‘o8q1‡Î|¨^Jx’;¹f”¸j/y‰ß,•³Ì’OymRmÍV¹ƒ[ùcô¸gØ8‹ËÌ�¹›¿¹›£9œÏ9¢ªu:y_ÿw*“{s£·ŸOy•—ø±6­�Öu :åúØ,:”vf«‘qµwË脜ӹ™[úÖ¶ykbzŽ«yÝ·g€:§ó‘¨»†r&V’£¹Ÿß6zwê^¶lt£8ÇȺ¤ëùlÒÑu¹ÊÚzeÔëC…xm;x°cø¸>xr{ze¨Œ²ïy̤—˜ïWkVú¨G{~O;›Óu©ç÷ f;´Çæ�ŸygH»µoà¬F|+¹F�‡r:¶l#ûoî,nAvo¶úª+ør—³ûæo(¿“{OtÀo“náQ…›w\w»z׫_뻿W†pOû¶¹¦G8µêˈûgðø·w;ÖºÌÄ×2f`<�ÿ|¨‹ü¸çO°
fKj¥¢¹»oF|Æ|gëPº¢zhB8~süŽo„ÈÂ|IQ­qú¡ßìÍ&Egßlœž8¢Ûö–3;c Á�#̓|Å߸ɇü]}Õûx.8Æký§Ë¹Ö8¡ž|pAFG�
Œ
t
/糇±^t{
yºÚjœp¾ÊPÃÓ"ë,µÜZË­¹HŒ«œuÊ9‡/5è-¶Ù(s­±£FÒ.“ñÆ×tÜÑÇijF…ôìÇLRIÌrTì‹1vñ
¡ZrÁ…àhù€€> Å8à¾n ‡n)¦L‡2衈4"¦–
ÁÑ*T
-Ä0t0Ô°,?ÄDWG„K.¸Ò¡K�Ïi£/:àX²2$9+²5a
6H_�Hd+­Hc3‹ÍXf'›¶2b™\¶Xl©e6�4žÜ…Zp�€8唓 b8—€\jÌ…ˆsHM† Â×96·;7Îé@ÂN`�Èã;ñÆûÎÏ’fïõ ~&õ\‚©PE뻯&�Ej§¢(Y©‘3�´š¦ªyJA	5TwDõêÂqð1•fññP-Ww~ë­ÿçªu®×9'�Ñ€íµÛ_¹…ÌFk—ŽZê©U#’jj§múêÃèàbŒ^<1wKNr9%-	Ê¥Ý8�q³–äÒ7"‹Ô,Fºêt™È¹Ž2ÊÎ
f:>?z`>�	æᎮø˜“/ÐÇ!F¦áš^š/QEoâiãÏù;ª?—²ô)t
œv|P*O#Œ}B¯l>CTɲ},ž{1ÖYãjëD×QÇè]›œ�Fb�Õv6¨]LX­_–úl-SVIè¯W²û­Á¬×5Ž(£
ªÅ\
jY§b³R](U7Ë]îÒÂ;µèD@:„V+MW,ÒöB™ï5‹yÜš"d ‡˜,ò(y†¹âÖ”EEOŠ­Œ‘Â7£4ÞÈd0ƒ¿
Ø‚èF7º€Ó¿d±¶wá¢%H—,‚‘Ç8}À"ÆÐc-(’cøñ\¨ÈÈ2j!cãoþ:† ÿ¥ed0N¾p‡/àظÊâ&Ç(OÃL©Œ†±‡b�c	}F¨“Ï�°c)ì5 at f©­nuòå¦VÖ©…Ãÿe¢"•Vf–L°€åTdÉ[@ô³Ÿ¹¥r©æ­P”«]­±zÜcÕ|µE0VÑ›å¤±ŠôÅæe��P\§;¯÷†5(¡XÛ&â·+ÝâMçú@.09'Z¸péB1¤ÇúáB†\[0&ÂÇ;)Ž|º ž.hPt
ãaz†åDò¸‘HN=¬tÉ2p‚ÒŽp?'D¡X2]2ÈRSIƒ¸áŽ–Ie˜0Ó!WfV»œ
Qggá—T¡Y“‰È#ã‘®xÅi‰S‹_Ä¢�¬úÔ¡æ�á|VVaS£mF4Ô3�9Ç
;Ü&'Ð#ºÚUÀ[¨Í]
ékºž´%»Ðó¾E)�¹Ê¯
7cøo
³±þÄ'Ãì·ÑH401еÈö p
™1Œfo5C4 at OSõ’cEš/}1FØ/ßQÿúÞð•Q
Ï(ÓñïnP�ï/Ô‘±
kÛF27¥m67£(ir¹�‘(S3]Re²üXä8‘Ó1œ1‹P¡3ýv¥û&ïøŒï11qs2ŠÒ›pñ2²Êªž&Üè0û2Ï
,
aBUÐ]ð
ZD/`òS?ù
>q4Gu4GíS
õÀÿõúbQ·IýveùêŽo/€
Pðö4tLÛu0,q‹ddYj–µijpS1
Ú`

þàÒ`º†ô
ðöB/üµJÿ`Ž†Ô U×À
ÒÀ[ÃÀ¸ nÅTýæH¹`zSûâñH�
ØàØ@/è
 ++w
ì7j÷â[÷Zïàî` 
ÞW
.  
aÀ�¿%
Їaõ@@¥öŒ8Îð 
¸ 
ÚÀ•Ï0
ú`
º–�õð0ÞÕŠµè#¥&/±xi0�ñЀ
¼xßfå¡Vƒü
fû
y_>c
À‚x
ò`R+7
úw
ê—
XÓõxå

0™
Pº
oœ„ÔG¸
Í ­úÒÍ51QõõþÒ‰€²çÖ/ý¢/“,{‘S�O!ë O=“
`/½ï×Íz1™ƒkøY¹†µ}Û{˜Û ‡»½Û·}ÜɽÜÍýÜÑ=ÜkXÜѽÝݽÜÕýÝ×]Þç½Ýã7býÕ‚ñáæáh¶ÿþ½?Ý“fû³
ôa
ûå¸Â·“EA–T?3‡”@»…X;üž¯÷Ï(;;ã1]2Ø¥]å	Óס}ò¢o;	#?ÔOñøBÛ(6î+öPžÿ”!ù{¿ñ»ñ¿¿oQòŸò-ßñ!?óa±ò2ò1“’÷ÜÑùNïú¬RölQÿ_ôv¥P•‘g	{ªûÿìò»ðïvåOIó8|”3HÖklú��¿d
¸é?x€Ø~Ø�¸d™_øƒù¸‹× d™žé›^ù˜øxø¿ß€›¿û±€Xœë\œ5;që¼Îíw�—ßTø8¨¸˜¯¿‹­€1ÙùÕß
Þsf*·™jØ�ö ?*gœjº-Ç ƒ˜-¨ ?ZÖaw&^xamªmŠ±…(¢…Vˆˆõܳ⊗]£p
Z¨`�8ªÏŒ"*øâÿh).×
Â3$�2âhdŽÀ¤Ž‚†xãŒ+z¸àej(Ž|
:d�z"×á�6ZJ¨j|F*£ �êøhf€’fÜe-£ŽÏ…øœ?#.
¤¥�î	ê �ù
¹zZ‘Ø¥è‘&ˆc¯§fÊh²šæ¨#>
禂Ú'?ðzšj¿ƒvÚ¯e
bŒ¤pÏu>;âˆò)cÿÁª¬³¢Ä’Âú࢚šcÀïi*moò³²eàkf¼y`nþÀëðÍ¿¦|á¬ÏJ0
9¼	fN*Œ#b‡s¼xë¬àõàããs³­á’2³ý&
pJίlÕ!
ÍØ·ºyh_Å"àk¼”™*ÇáÚˆw¡}Åï5­R\0[©¯Ô
 Ò„]
äA¼âQf‘|àŒf¹OÀÉ)O@””¨>à+
–PÈ9kì´ÁYz’c$8'�Á­“ÂÓSŽà
‚"ÑÈB7”“ðî6�Ñ�U5:Ü�æ;2§8þp,}×I8’ew£¬<ìIE’
A±œ_ˈô§\±
–@šá¸PžŸäD*GÓ’ŸK½ª:õ,Xͪt¹¹Îz_ì�˜Ä)¶þ`m�bK*˜ÜTG·%
I–­³*ù©O�ˆA¾r�2sf‰•ˆB{õD1^!«sÅ}/aYù£ ­jÁŽ2_èÿ׌�꽋•¥<º¹#áŠR
«Nt,(äȆ½ý$ë�Šå9@^ôtÖÅxÒ~à
s at OQ–fÕxzÓJ„Ñꎣۭ®…ÅÇÕzçaÞ"U¼ÈG»K~OS‰<61
«¿rM�¯|iWWŠ×¿îõ¶ð¼à÷úbX—«·z/hçúTÌŽ…'¥)
Ï¢Áí®Eóä}'jï;ÜáÞu°ßXÿîr?KÙÝ®vÁÏ}ðÊ5JÝÍù£¨Á,�·žØ«"&Ï».亵�Ù˜ÍO÷zäØDÿô`�“iU£š{,~csãØ-7yíçÒq–_¼äïý¾eŽàG�÷h¾á%ã÷åöj9¼\~_ræ'Ÿø&ï	å}’ï¶,÷ëéæ<”Šúù0uéàOòº×4u£{ÈM?­ÁÂêøÃë>GþÇù¦Ü¿Z{OÊý·^T±y­æ|»÷oywÔ¢„w|ø·}}—xõövxÁ€Dq4Gs}bzìçye2~®u�'t\dzŽácÝ'{P·zîw]ùVowñr×€I#bW6ÿa%;×z³g=f!`Ñ6Vp×€ÃW}K³}‘‡|õÇ}ÓÕcÜxa‘{ãóÇ„GÖ•x, â¥cØB~ª§&McF(È…ÞÇchk�ñ=IDó<8}RÈqÚ$p=‚A4Ò"€F±o‡§¨w汅ꑇm×uWèq°w&…„ÿ–ogèdaøMºv>”¸‚™¸~Q•zhh~U‚‰|�‚Wâ0pRRƒ~§çr
·\?ø‘ø|·M(Š€‡‹QhÙ$‡ˆ‡‹¹(ˆéáˆ<ñƒVˆuF¨|³·v*H]K5†Je†ŸHUèÇ=¡ˆnZÕMR#&Ûåkb¤^H%7ÿ�p!�Ö2�º¨„Èçx‚AŒÍ‡µ8nô÷‚ThƒÖçTgvå¶ÍExÄø(�l×
žÜ‰ÄPžäyžÚù§èYžèÉžøiðÙžË`žÇ€Ÿò©ŸùɨôiþéŸÿ	 *Ì ª Ê
:ú ª¡:J
íÀ
ñ@
ñ0ò±Úª¬î`«¶*îòÀ«¹º«*ê«òð«»Ú¢-Ê¢/Š0j£9:5Š£?Šù
ð
ð
µ�âÙžƒzží97�Žê¨†šÆp9À€“ÚŸ”j©Ê€û韜ÊŠ Ìà©:ª¢*ªŠñ ¡©ÚÔ�ªí°
½S
{
û�æy¨{7þ©±w#•»k
Á€²É6Ì°c´»
†5Víð*¡³Ûòì;­š³Ë¿p«RÀl¼Z
S`ÎÈf
FEI¦€œ´€L	Ä`�§ \¾ƒ	ÊF<͸ ÜlIJ�žãL

:
ɼÉö©Ã`ξ�ÇÕ0
™…°ÿÛ¶+¡ÉFÇí
ŠâgÜ¥7%i@œ½p°Éæ¹½ó
¦ÀÁæ\¸°œøZ�VÍÃË6±PµàÕÆ€ÍÈf]-ÔÊÀ	
}7› žæ̨éIë±Ñ\ÎÈV©h�ljß½£¡~Í «ÐÐÈ–
ê²¥ÊØÅ»ØÏf«�Ô³Ô
ÈñIjÎìª!Àxì°�Öº»ÊØ:Æó
ò0Õ~œéfàÚ+Ùð¢Ð`Îá€
ɦ½Éšl€¬Þ€
ø>Î
ì`º
N
É>j£â»¾ß µá»A*­�¬¾#íâçPsÛÒ`(·5Ž¿î$Ó1
íNßÜì#ケÒÓ=\€õ¹àÝ}k§´°Ý|¯µ@ÌÁbÏÁÄ`þá‰ÞÉDìÁÄ°Ã/üÂ
Ëÿ;Ã0ÄŒ8ÐàÀcÇŒ%–ðXC†;†™0‹3bdg‘²aÈÚ!ëHR$µv쨱K¹%Êaí^ʤ6³¦LšÕ¨UÓÉsgÿ5w<�ò×­š7pÕÀ%]º´[¸pÞÆy“JuÜU¬ßÐmåÚÕëVuåªSgŽì:uhÑž=»Îí9¸ŽÚ¤¡«Æî]¼xßäåÛW¯_Àwáì
\Ø/aÃ�'fܸñbÇ‚!ó�ÙòeÌ�gf¼¹¯gÎj@í¸thÆ•1«¾Ë:14v–<)3¦ö˜#¹�äÎ=fLßÁû&x2�º\ðò P%¤�Qò[IuèÒµk�ýH0×;�?^	á=\ßLû0dÞƒ!fþ{ûöÅÐCFÌ’0Â
?O]lSD,”ƺÿÆ7è°/e3%®€Æmêb¢¶ø0» ¡iÚ2$§Ž††1†jJSa
…"Ê+�êê`�Ö˜Êñ‰vác­Ð¸¶ÄéMrœêKÓÉ1Íh¬h[ŒÛôE~

|”¬ظmE)
	Fåh¤gNÙ—
:ÍRì³\ÕÀ§l¡á›t\i ÷87-0u0 ª çÆR9†R_û_ÖL©Âœº±~¬ÄPY‰Ç¯­M•²cÍV›H¹U9έ¤¼ ¢ô(&q

“œ1;æåQc®+_äð†/Ê!žû`s>ÜŒ�|à#ùÈœÿñ�BÂO:C¢¼á­¾J‘#âô³Ë&nõql«å�ú¤1êarƒ·Ä*`(=)¢
Õ\£ljÈæ@…ð	Ôÿ�Ìo˜í·áLïÔ}Ž)a2
ÀÝiX€nx§	-fÈ):Ál˜ÕâœØ?s*Ó›³y‘ö»˜b,�ÎãËp’q²z(faé¡L~Àãàö‰ëA€›Ä…u&
¨Ã:œ?�Ì€|(e¤‚?à‚9
€BA6н�aƒ ÜÎ3&DzM »A?è½3°
@©NÄ+`<»E
CL	€,È#.pƒÛìƒ6 N/€EAÁ~#8b´=°*hƒ¡ì³^̃<êÆ`¼ÿ5€=„
Ñí½ºœ1ä‚\<»:øH9 PŠt.°Æ%
µ+èƒ=Wñ
°ƒÖ£(ÇÊv}P0½KJ
h
hï]Œ€<z\?Ì;ÈT^4ÆÆ‘MX5ÿÚ›xêW„Ë

Ç	È5ûÑt!6háÿ°ï¼wò‘:¨vôLZ{§Ñ¼€;Àƒ>=©+�>0®Í¹Ä'ŵÅ­¿µ©€"¨=ˆRÊÔƒúç´7Q�²ú$iG"
{�"û	{¨#!Î;«|Ë¿ü,6:Áû“ñ4Ø=,ïõ7Ϻi+™r4sI}…É»¬b*Á…�vyôCb�t!tL¿‹Y¹ýwÌ8ƒûBG™Q_ƒQœJ S¤o?*¤Ã߬G˜"”EéȃG?¥âØ#„1fG°=G¾)ë5•âØd;ý9rmÜI˜NûüAûÂ?É÷8g¸�‰¤|ô¾R›¹
K$RiÙ™Cä>uY*€ £F 7iÎx¦Î@5rÿ
¤CçÌŸ/
©‰
ÉP•3îF¥g+ºæ\oÙ�Ö‚T¶§`{kBÙ^zdÒgnOª%A0V7Zi}—áo}V9œ›lÆßž9�”…¦Á¸'¤
¶ˆgoo~Øæy¨-ªésÂK¾!I�(†¦ª‚òÔ!«4u誄²‡á„v¾:«f"ZÖ$ŽSÿîÑf5.Êg‚Åú×)N˜ié)¥{"¢v	â	-o�JYå´>"Š)º:)­­šønä
ØàLâÄ®Npêö£LÓ
&Mîo¥•âûn˜þ±pNdZæ[ ÷1Zè¡4UšS¿eé´¹§»IZ ”…pã”F„ÊZèê¸Çjk…*SÜêxuδҙƒ.Wgêiz!K)1sÅ.=üÓ~'m7bL«mv]ͳéÖà7ºG3Ã3=Xi Å�lžyNÿYš±ž’ú®ÁÛœœ¿WT%K·)ó¥ÉÊäuÍ1­êß‹uWÝ2Ü
cŠ¶Þ2}Çö{OòÝÿ¾½¸»
S†F¨cÃ
÷ÀiOÚR�-Wx²O,¯Ì9P)V¡å�ƒ˜(Ûš¦œi2Ï®ìsÿÔ"à:mnè²bc·óéi/W´á}ß-Ø¢ÓŽ¼ò<‘¼¼ÂÎCßmôÓC;õ¯‚ÞSö×êy®œZ‰dìà¾1{k3ÞY>Ž²çh¯»/¡õÿvO¸‚«–Ô¼¿?�õk.€ØYS‹v'î!ð{	”ß9„<8Yªz
œ ó(ØïMtäÉ€
Q(:&KdF/zÑ$%*´ Õþ#¼¶©MyÂÙ�|^64Õ]®?²+MF¥ø±�pÛÓ]‹X»1‰JÌÐuÒÄ¥ÿ]ÐVO´ z"õ%yÇFùóIì°d¯ÖpjaÎQ	æü‰g;@T^ó„­2©sÜA£Ï•šFUJ]KÜcË
ÇGFMqz�ü#!�(Ä’yt,Û`}©<Y¡ª
\øB¸`‡/¬á“<ÃÖ€‡5Ø¡“¢lC'I)ÊS–•§ääXyRÂr
¦<%h¹†ZÊR•©Ìef©KWv’•¿&)_ÙËc"Ó
È<f.
Òƒ(“!™¦4¥™†6T›Ú„¦Èº	M�IÆ
kà¦3Ë)²3D$èLç:Õ)™• 

lHÃJÎ΃¼s@"iBf8?%’�
MAYåÇBÖ
ÿ¡
­Ì@êÀ…^�`(C/v±^ðÀØ…F;
YxÁi/€Ñ‹`œ”¤(]i0VzÒ^¦(ýL›âtÃøÅN{Êӟꔧ>Ýé/ŠjÔ£þ‚¿ˆÆR•
¥Rƒ©O�jT«JÕ©j#ÚÈêVµºÕ¯~µÚ�F7ºAV²vciMë6¼ÑÖm´õÛ�+]áZW¹nƒyÍ«^Éá×¾òõ¯‚%‡9kŽÃ"6±Š5Ç9ÊÑØÇ:Ö±ç˜,e+kYGÌArÈ;h
!ÚPÍH‘UŸí¬† jÚ…Ž6ˆ)ã	…ÉÁ.Œa¸¸mkK[[Ü·µÕ­m{{‹Ùâ"¸¿ÿnp�‹‹b ÷¸ÅP.r›[b#ÑEn2ˆ!Ýd\»ÚÅ®1¸»ŒdtwÆ0†2ŽA^cüÊ0†x…±^e ãÈ€ï|ã‹fÜúݯ~ÙÁ_ÿ"ÿíð€ÛÁŽv 8Á
¦F<Ü`38Â툇;*\ap¸#àØp<¸!ph8"–Ç8äŽqˆC㘊Ç1t¼8Æ0ž1:jlã«9V�y¬cu¬£Ç<^Ç:&ˆ‡­´¸r$C—¬½Gô8¡ÕÐg“År9LK¤“=Ĺ,¦Q�¤“­|+ê¹<…Ló†à°†Øη¼½­nçì[Û7Ï¿Ýsÿq‹»Üå7ÐÎ-†.¨;ÝìZ׺Û¯v»ëhö®W¼ÊH†x—qK[º¼ö½tzùû_OƒÖo�E-êf(¸Ãx°‚ìêOØÂŽG5>yx⇉Á!â_Ÿx¿>\ìbËøÅâPÇ‹oììëØÆBr‘ÏáO
Rl�5„YjaÈ4ç
ÌMæ\·—·í�”;t›å²!hf¼�ÜLÃŽ
Y9¬ƒc‰�ôl¢Ü!O 
TT¶]%öOâ!¥¹‘"1™)fˆA/l‚/r`@)Ж2`0ô#.¤å/Ãm`rCâEÿa+ƒ.ä0°C,èzµ(žF|À14×æ•£1ü¥Çùâ1”C€�áï!ƒaÆíÝ£`2`eN&"˜efó¹¶Ã4@�<þ]ƃôe˜¬MÒ¡èFnä÷±&ø…¤I¢älÎX³Ùn¶ßס#¾ŸŽÆ_¥P'•
§½[ôÔ�Ú�Úr’�’Ú$ÊÐ_‡¬Á¬ÆÂ)(c.°‚/Ö–Þ%
 B+ˆep� A.¼%1€á0"—.”.~€&ˆ+ÈàZ€h‚,C+hÄtס�×1°Â]€x²!²ÂzÃFLÃ0*
¤B02 ,´‚�¡��ÿ'
¢ÕQ±Ñ˜�éK.¢"¾$LÙ90È‘Jb«€"“ž–‘bÏr.´6i¸±Ìÿ-ë}t9«IÄÁ8�/âÀ¿ÙnÑ‚4r Ð.ÔÂð[	le>à-L&(žÞg@ú™1Ä°aš
ÃF at A
�~ƒ0Ø@~À�-(©­`!¿Á@*ÄÃ~5f†¶,
ƒ1ÃûÆ/üÊïÆÂoKƒ0äoKéoÿÆoþê”0C0èT
°N5LÃFü¢RÃ0<ð¢B°N=pOpW5PC5lðsp5|0‹°6t7hƒ	sC
sCY±p»0{Ã7xCÏ°7ŒC�ƒãÃ:Ä09 ƒñ1q�%19”C7±94ñoJ±oVÛdI–oN–#øÁƒ<¥µæßN^ˆØꤲöÑ'6�¼U-¯'ѸhâØJ«ræ$ÞÄA,‡>
�ñ\Çt PØP‡ÍüÍÜІæX	­�hpÁ@Ä
ÕˆJo4‡
LêÄɶðð¼ÿÇuüðTË
e²82
¥—1
s�pÇ5ƒL (Ž
.Œà ‚Ó­·B

àt3�¼FB£ 7ÜhãŒB¹ˆ)
‚ÚãJ2BíŽPT°‚!Ne{—£
˜@X&PBœ�
CÕ0
ñœd8À«(2¦ŒÉyYÃhÒ
@þ@|=_ïsü÷à¾øÉ_òŸßüå¿ú»Ïð»þá÷¾øÍ_õ¿?óˆ×þãOÿ×ßþ¾�þà�
±Çllm‡lLfB±Z�>e»ê@²$å
gÞ0â0ñ!²
ÿê0úáž¡2ªT>ÐÜÏûþ�à�
¡)DǾPÈNOÞ\ÆÇóãõ¢ÆŽ±	›±CØ D¬ èªíE­¡ž"ãàðä�ÓAñá ÁØ€²>°ó¼Ïü

P¹/q51;Ïý(ÑÑü†ðfðÿê�
�$‰†]†ß\o�.oh%]Ò
¤?fR
/p
‹È
w,aÒ?pÒˆ 
àRq p åÑò2ñ.û¡ßRÏòà

’
eÒN§p%g�Ö‚¬õB²A;¤Péƒ(×€4"<`ª"à˜è"beµ¤’³¡EµR+™Få!ht;½Ôû:o:ÏSÓóðN0³USJ	°óà¡ó`µ")Q.á�¹ÏVu°�29/_9O¿àsŠNˆüM{¬$éôôn&B9“'}Fߘ‘†D²OkOZ“ðZt\SÏ5›ð
>
G
07 ÆÃr˜b’v'
Úà^Ä‘³*9•S¹22¢
è''aŽ,<Ðkã:Ná
÷áRWuWwuÅQQn"ÖÀqV0k×vowsWww·vÀ
ø
a{�{�{
Á�|Ï×Á|
áž
ÞW|Ï×|
}Ëw¥Ô *®&rgPäƒTœ¢í¦Ñ ƒ^æc0êCx�­+�­Å¦��ë£í¸�o+Ù˜�M-w‚Ð$N÷^òqM²AuèO3Pz©ðM«÷g-W3ñMÆ&w=8ßJ˜h\X	_Ox"«¡å
X¸º„€%Ù
->à .>ò7>Æ-Lö¬á†Ê‰7reVÝbˆŠ÷É­˜Š³8Š±8Š;ò‰»Ø‰»Š‡f‹ƒæ@¶8@î­+Òx"´hj66%·Aÿ_¸4YSB=˜eóx…A³ƒkr„«UhjŽ‹×>ðDŠ·ëÁ$éÊíĸK¹T^ð{6ÍLŒ.rd0€˜00“ïÿätàl‘‰‘�K¹�UÖ”SY•W™•ŸW'™p�룓-x“X“íc–oÙ–kY–yù€uy—+D“‹Ž˜å£˜
B€ë㘳˜>–Ù™cò™‘YÈ¢y‚©Y€©™à¤XCPyÇz¹›Ñî>¬Ù˜ñ#™ÇYš-‰?–Y™�ÆœÛYœÏ¹™ãžÃÙ�Ûy�áù�'s[æšå¹šíÙŸ©™@ú�ÿ#Ÿ	š�ñ¹žš¡ÿ¹¡{Ê�
ú?b™>(ºœëƒ¢¹
?2:£ÿ7:AÚ "A:šž;D¤ïã¤5@e¦+R:?H¥¹§`ZhhšA\Bpš>tz>xZé|:¤�h�‡:¨íæñ¨û#©eºéNz©yJ@ºBª8O>ù>†Éy9«‡‰«µº–ù«+x–i¹“±z¬‘
¬ƒ™‡×ZØv٬íãú¬5Y‚çšÚp™"J…‡ƒ×:®7ù­û°ÿ«É:˜õú«ø��¸°W¯«»:«ÿºª#Û­);Ù;—/±×:“Û¯åZ²}™–½z±[´�.³½¹®·š´eʳ	[«ßzÑκ´oÙ^?Û«�m°!{´/¶;µmÙ³{¯E˜ÿóêýÕú‹Å
MrDÙ“�ûàn‘	m²ªQ”›ûºëL»áŒ‚¯
ºÃ»Õ²û®’¼»ÏÛáÊÔpËº¿û¹Í�¹ËÛèæ{íªÛ’¯»¾Ñ›¼ß½Õ{‡ï{²À;À©X²x:¢ÝX›Ü>âû¾·-»­û¶ÈŽÀ™Û»<¼ñ¼|¼ó;¿©ÛÂÏ[ÂÇ{½÷Û“é[¼	-Ãéû»üÃU<ÄÙ{½Gy»ß[½û[Ä)bÃwœºO\Â1<ÇùûÆ+ܼƒü¿3\ÇDºwm»ÅÎì¢üëVMÊ«œá¨<�­\Ë·Ë·âºÜË©̵|̹ÜËÏ|Ê«¼Ì¿\ÊÁ|ÍÏ\ÌÿÙÍÓ\ÎçÜÎïÜìn±èö£½¥Û¹ÉûÏn¨êKÍñüÊ
�ÎÛœÌ}ÎÝÜÎßüÍÃÜì =ѽÒ=Î]Î=Ë7]Ñ;=Ó#]ÓG}ѽœ&³ÕJ¥'VŠt#,^½Pb}ÕÝäÕ�¥ÖaýÖc}¼ÚcÖ{½PðB×G×�}Öe=Ø=,ˆ�Ö‰]ÙaØ5G2V½²�ý×—}Øq=
Ð
WjÒ¶u×ÒÝ{–ï^³Y7Ò93çÌ„
 ²fŽ4.“n„ÿCç�
Ói3 Íh.yŒþ<XÍçÒn¤ÔLGÎ4”5³„ò�Hð<åœAºãèÇäé Q_‡r5”A¦©ó^Ž€<mäf~Ö…öZÚ­Ç‘PÕáTd5UöÍ
6e„\P„e§G¡]‡†yæ‘Ç!ihÀĉöX‹Äu9
©SN
s¦6àÁ
àmþ€>«Áf?ZšÚ8‡1ÒÌ�MKK	ÝàU˜•©Á…·Òu´¶²¢ýL#ìIàUƒ3¢ä
¦Ù—m‚§5ºQ)pÐÌp
±ÁË<#ÉÎ @*,†
~ Ð6G‡‰`
yH¤Ä„‚BTøä4b+å!€ØÒŸ<"
 g`Ãöÿ
ÜÁ±)¹
SU|Y½
0
éÆg@\€Yl0‡òTr&BJ^ tržÓ
€I˜!
‘S¹³BbS8õ
˜I˜é™è€®³cƒè�6r}PhF!.‘¡*cW¡Bÿ'—ó}+”—§B#Aw ðW
º*2fó7€dNd£SåÚE¯2
hà‰´8j`8
KTKSöœ!Ys`"BFct1³êxª®
+VŠr\nð ‹Ãd3&J§Z6‚,…4²hÄN ãr€>øÁƒ3csIÔº8¹÷c°rÉ1

²=Hv4+b+ƒáàenɘó_î¦KÙ³0È}Ae³"Ÿ7«¡ôc)Á=¹D�Ë3@ŸHk!“ŒK+&ù´bu`±{ë=žZŠ€ ¯”•g71LhÛ0Äá¬+0Ú.YѤPºFK
ÿ¥%ˆÈ#AdûQ-]:´Ê‘Ъ
jDšb)¡A.Dø ‘�0�Fe‡Ñ‡<Ñ}!y¢æ�(æqïÒ5ð˜âs•‚Xú1…b+²B'E(·r�p0,±g¯ë”ø1 Ï
"#±½;a+*
‡Ø’…í�È+&Ò笼"9÷xø�øh{ùñ,ƒ¡²,5
,î1ç !ëðÀ<ÁHÂ$\ÁüÀ8â!cÚw/pÒ(;±}wÄBvªB/bAÚƒnnø*ÖA“„U”Ò
³¶[Óøwa’d«j÷_à4†LÈ„¢§Ä\€ÿ^€¬„DQu¼Q6/tVÅ!‘3uÀ§’svñœ!qo at B2
™Â9‘ÂR‘³Ç;\5Q(’\Ó�k€ÿÐÍÞüÍàÜÍ÷÷Ðñàô`ælôÐÎÍ`öêlâP�FIšÿÊú¼Ï"¶Êü¬/³ŒÊ¡üÏø2ÐMÊþ<´½Ïñ¸Ð�Ìb$,F’s¯¿¬5WLÉ á- qBªt§›ÀÆÙ«aŽš>|¢…ò—[h‰ü$ã[Ñá
!ó!âRÑ‘
/˜C»ëÎ@ýÍå\
žàñP`𯳜ÐÝÕ^ýÕù²îxº`-�]Öh�ÖŸÜÐj=+ø¢ãB¥‘0Ÿ-ô(ÔAK¤³ †Ã"Ñ8*”Â3*�(y‹FÐùDB¶—J´IOB�¡‹FVh‹ó9�¢K÷ñX<=5C
ôcÿ)ƒE�\ë0NòÄÑ0Ü|
×ð[ðÚ[€‚	ðÐÐÿPÿpEMÔ ÀÍð
öPÂ` ÔÂà	SÍöÐЀ#Ñm=Ý©ÌÖÔ]xg¢K�ÙB¡KÖ×ÞtaÝ`ÝÝß-Þ@ñŽªa‡@<Ì‹C14&Vt 

@
ù4Q
@=G#L	4*”+œ3†ü¦ ߦŒ‰aÖ0��OP%l
î�6­‘WNäN‹O›ÖbšÑ0§ä§Á)î”Bî4>.ch3R³wZ)VÀk êÐÍ°U�
”/Aû
ÁÅ@�0l¯®	ûR/Âî8»pÁ½þ›­C¾Ð£Ž1Gô�®ÿª;1E_„Ѹè”ÑÄÓZÔGÌtÎ=¾p­¬F!Uä‘¿ŠüqH%GóLCѲ;$K‹r>"�L°Jâ¦|ŒFûÛÐÇÌ´pÉθ°D3µ#ó¸ëîÛ¯74×$m8/,pÎ}ûO¿õ¼¨:äÚTS¯áü´’¿äHûÓ¶Åį6=$ñÁÝv“0Íð#ôÉÚ84P:³»«98õÊÑÞ›²ÓÅÈt°Èû…ÔÉHC¬ËÕ%òT7±ìÒBEÊL·ã1 
--- NEW FILE ---
GIF89asÄ
÷sæl#ào3çt'åw4ón"õv&ô{4Å{KÃ|UÖ|DÙ|S��}�Žoš‹z•�y·ƒM·€]§…h ‰{³‚b´Šqÿƒê‚9÷„8Í€HÖ„HÚ‰VÝ�\Ä”c×’f߯ê‡Gæ‹Vé”Vô‹Eû’Hù˜Väšhïžqúœeÿ¤Lÿ Yÿ²Wë¨yþ§gý«uÿ»kþ·wÿÂzÿÐ�Ž„ˆ’†‡––‘��‘�Ž�•–‡š¡“›¡‡·º�©®“»¼£†�®Ÿš‰¿Á“¿Â�ÇÇ™ÉÊ›ÍјÑÍ›ÖÕšÛäžàÛŠéé‹ôí�ìíœíñ•ðé•ðð¤ÊË¥ÎÒ¦Ò̧ÙÙ´ÊÉ»ÝÛ©ÞáµÝá§âÝ·áÔ²âݲèݼáÕ¼áÝ¥ââ£äë¤éã£êë¬ãä­æè«èå¬èé«éò¬ðì¬ðô²ãã±åé²éå³ëëºãä»åé»éæºëëºìñ¶ðíºóóÌ¡ŽØ´žÆ¿¯Ã¼²Ü·¡ë©†ö¯ƒþ¹†ü¼–ÎǼØÁ¯ÛÉ·ÿljþÊ—ÿÒŒÿÒ™éŬêË·êÒ¼þ̦öͶþÔ¨ýÖ¹ÿà¤þá·ÇÃÀÁÝØÕÍÊÚÙÓÂÝâÁàÖÀàÜÂéêÅíñÂðìÅö÷ÓäëÐïôÕüüìÍÀìÚÉëÝÒöÍÂûÚÄõÜÑáßàæáÎèâÔýâÊþìÖÿóÝéøïèøóÿíãôðæ
æ;øoáÀ„V<†ìÙEŠ Cöê5rÚË_)k¦ÜØlãÌ^;#ö
&óçϛnjI»Qi²’ +KvQlI—Óªn+ZmoÕ»Õž•´:-ñÕ‹!Z~VLYÙ‹£�ž~¸ºbê×­K׎}{öï‡ÆÔÿâµÊ+DcÌp±âDJ”)SšDy¿„þ”%÷óãÏÏ¿ÿ~ÿð
ßXà€&ˆà‚6x ƒ
BÈàƒFXá„fˆá†êçá~òáQÔW¢~'Ö·„‰S�ÈIˆ˜Ä|õÝ7ß{ڇߎ6Þèã�ñÝÈ¢‰ÿE¢~5&1…�ûñè$Š?ò(d”Îh_;Úç!<réå–M~Ùe˜a‚‰`™cž¹`šf¶Éæ›bƉ¦œkÒéåœsFQË-¶dµHz\ !ß�„j衈&ªè¢Œ6êè£�F*餓šä�S(�„6ÝÈ#7EYbPøáŒ5Ô"G§ÝpCÍ÷áÿç{LC
7Ü8ÃÇ1RÑÄÓØê
5Óñ!®²†R8qk§žvs«!O4A…5¸ºŠ„5ÞpsÏ=Ý´ZRh1
7Úh3î’KP±…§ºJHZ(ÑD}â5ÝpúL!t\q/„X£Í=òôû�7…<±D†h³�«OÌ—„P£�«‚à!E$Fñ„­è>Ã|$»–”¶ìòË0Ç,3¡µ”ÔK8d™ÑŃ.9óÏ@-ôÐDCšc}L(Qij¸BA…’GPó�<÷hSEñY®6Öüð„³ÛÄSµ><
Ÿµ1NAÅ؆ëjß
.5N,ÑÄÕpCµÕ$Æÿ÷5ÑVsÅÎR--Ü%fÑö7ÖÄ­ÛÜC
Jܘ„>
ÚÏ‚¬ /¸ÁæoÅpÅ/P
‰uìã„úH¡>öÑŽžð…0Œ¡gHÃÚð†8Ì¡wÈÃúð‡@¢ÿ‡HÄ"ñˆHL¢—ÈÄ&:q‡½èÅItQ’�ô¢"T„ˆ›g‹+F±¼øbÇxE2ŽQ$^4£@¼Å5$�nd£Û˜Æ2vñ*VÄ£-¨x*~q<¼¸…/jAÇ.Ò±�bdcÉÈE:’Œˆ„¤ëHH3Ö±‹„Œ¤
yÉDZ’Œ•L£y!]”ñ�q\#!C©ÊæÁÑ‹xÜb&ïHJ“tÒŠf%+¯ø‹Zèñ”˜œä'÷XËCÖ•†¦I)Ç^ÄÒ”ªÜ¢%c‰I.öÒ•²¼&-¢ÍBZ²ŽÔ”¦óŽiÈcšÓ•zìæ+!IÆp’sœØ<'9�YKužÑ‹«,H©˜ÿÅ*:OÄx^/kf
“¬R©Ð…)øi‹XCƈ…B‰¡‹XpâÄàD*Ô!Q*&ô¦ÈD9ÑÐ=rB¿H…DŠÐŠÖB¢5#F,Š‹X¼T¡í¥K%ºP›Æâœ0Æ1MaSl”Æ`i,L’
¢ƒ¿
ôšâ
‡â’¶-šU¾�Á'ÚÙ€†3à!�×Fœ¸þd-Ÿ;ÿq“çÙ žOshc»ú!_\óG8Å7Î[Ò‹ôg.L~ÏÍË·¼÷}1/àbrÔbð¥4{U1ãLú˜¼
ÀJŠÉ
sTœ#
UÀb
ÂÐa¦_¤Ð
­ Ãp	ÂÀ'zæK"Gd�ɦ
¨à0pI†d(�x‰eß‚!Pm)ˆ‚ ¸‚(ˆ‚'ƒ.8ƒ&¸‚*x‚7He8¨ƒJ–ƒ5 Xm1ø‚0ø	‚öqŽæOÃ\Ÿµp±§p+‡r·÷p±pÁ‡pGx$‡z¹…[Ø[{¦„ˆh_Xh¶‡r¼5z’öZM(Z)×z&A{÷l|ôsvøs�ľÀ̶wS´'wè
³P3‘&‡Á‡ã
lvX‡ˆˆZ	ÿ—t¶@“Æl€††nvy¾'{gÈZ-g
¾�Pš@³0Š¤¸
¤8ˆ¨øR5¥Š>U²PKµT/e¯H‹%Ñw¯8‹W·T¸èŠ¼X3³› ²�²€Y¦¨Àf[?W‡}ÔG5ÓŒšÕYÐØ\Ëx\ÑèKÐtwtϦ\HØhSh…–§Yºx©§{§whs–‰°÷Z‡rmhfc¨…¬×qC–„ê(pá˜�mv†Ë…yü¸„7…�#W�Ž˜bøŽG8Ž™Gg³Å{uæ�q6�]ø[mvéP
å
è�
¹`Sýèq'—‰„{7p¶pI{ðø�J¹”îˆ{n¸†Q•¤7�¢‡‘I�Ø[
Ù{Q‰�½—ŽK	|\Ui[MY�§‘
AÁåg1AfYY‰e9–³×z9�)x–È�Íözf·Àæ
{â
«àL…ùh U†·÷„¾z 7˜ùŽ{w—ø—�v�h™•ÙÉ[kV{˹{vÿyŽ�™{i�Ɇөq]y�œÅ–µÕfœ7žÝÙlZ‰q�‰oø�—x‘X‰žÞùhÍé–é„Xz¼À
°
²°õyŸˆv•àˆy„F‘dÉ•jÉyh6|QH�ß9Zø�Y¨‰m‰Ÿú©–U¨œ¥g‰sY�Äçpeø†%g¤@Z\T‰žŒ†�_9¤zY‘bV—K˜dyžê‰—øyŸp–úh læfÌÕ¢'
G‘U$‰´èwpÚgÙ©„!‰FZ�\W3¹`\·0rщPÙ†V¹�빕)Zrôˆ…‡ÿ–�ê[§·�1jr’æœùŽÙ¤f–ó©zty©Èù¥˜:•‡Yžo)˜…jž‘ÆŽ(
…
Ú•¼§£ØX©Z*¨…8«`iŽI±ŸíXqÖÙpBJ�h¸¥¨êyg™«–ŸîÈ¥d9£ý¬š:…–žÇù«Ï*¦â¨«f¨©[Ù«
Ù¥ô–`X¬ÊžŸ' ÃZ�À:ªõy–
¹­¤¦º‡•T(©ˆú­I«Ò*Ÿóøž¡šp¹:®Ji ‰†UY{kŽ©
¯Súª×Ê®sæ©s‰�Û…ü颣�‰OJzɱÚÊ”bù­y9«ö¯px²ý™�æ
«^Ù|I¯"7¦TH ÑÿJ®
¶§ê‡ÿ¹Ž½×³;zOi°ÿšµƒG£_+©R	žûʵWËphªœEjg¸¥�Q·‚û�gš®
·§®;jŸ\(«VY°ú¨¢#qªr™”€ g™†&çœó餞e±Ó¤‹ë´IZ¯*—Ž gZàé�O{£L*†µzŸ{†f©¹÷Ú…Èj²Ÿ»¬§h
‰´Ç–CZ�9z^	‘%ˤ®Ê�»[µáJ¤ä¸³†{¹Ry�{¸¶š¸¿ÿŠŽ^p‘JµÉ‰¼÷¸ýŠº Êº‡|«†4Û»ºë©w¶µþi¿"‹¶ðûf¡ë—Ãg˜>kŽò­Š:‘軼Xʻ㛵õÚ¾Ï:¯Üú·¦†;Ú·8Ú¸Ó‹²gËz#x
` f�ëqVPWPUàN
½<ÝÐýÐ3@óq/Z@ÞÐ-ÙB
Ô`„
¿ð`¨ÀŠ�8Ð^`B`D`EÀÛ½]xžç|îç~ŽçxÎÛƒþç„èˆÿ~èŠnèŒ^莞è�é�¾è“é”.é˜~éšnéœ^éžžé�êŸ~éEp½{Îç¦nêE`©þê°þꬾçzžê}^ê­ÞÛ³®ë…ë§.ëFpÁ>ì¸îë¾ÞçÈ^ìƾì{~ë¾Îê¾ìµëÁÎì´ÞÛ®þç¾í}®çÙŽçÜí€þí¥>ìâîí½
îæÞíØžîåÎí½�îÚ¾îñÞîóïãîîáÎî¹~ïÄžïþ~îö®îÛ®ç?7HÅ9FªÐ}'
¿ïðñoJñŸñ¯ñ|Çñ¿ñ ßñ!ÿñ"_ò$òoò)�ò?ò+ÿò-¯ò1ÿóAó0ïñ7ò3ooó;¯ó8ôCÏñ=ÿò
ôEïò?ßJÏôFïôK/óQŸôS�òL¿°ÇL|ÈõxFqS¤•E`ÿ°y	Æ{úolñ”([/ë¾½õs®à
×øs³ ˆ‚¸�ÛèŒz/�wÈ÷€ˆ~¿ˆ‚ß÷{¿'|Ä÷~Ÿøˆßø‡¿÷‹�ø‘oø„µ)ë«ÂU†ëª&ìªX|†ù›·Ì®>ºº¼Ú¤Û­™Âú‹¨ü©[òi¥	
 w¸ßVG˜ †Ô<šuMEEHUÕÐ_˜°ûµ@¼¯P@ÖE©�
½�üE™
¾ÿšP—0©°
í 	ÞUŸX^µ`s©0Ã�		€þÀþ8g
ê

 
UÆ`¤l®µê’ÿ1
äˆ]
Ðnò°T¼2ž#6@ò¹aªP	@‡
€*t¬È‘¦j+
T˜0Â@¸é&œLø`&¤gJ¦¦—aé§ÿ§Všê¨­†:k¬·®ºë¨¯îšk°CHÚk­‘v�Ægñ¬JƒÍ™/ªtœ[0œUçun²Õhã.–E»
ï'[ÿ@ÿ	°€`
¨@²!ðTàÿ¸@Rp�
ôßX‚ÿOÀïWŒ“[±î¢·²ˆˆXQBUWR”8^�¥…/:ÖÌ>È«”$Žrr[ÒÝlø¢AåJ‡1<ág9 ËnIúሊ¸£·ýªT’bWð†CåI†·œ´jU-(Vî.´ Å.raR�££0‡9€aT ‚á ,Ò8Ç4ÆÑq´ã+`¡ÇWÌñစÍÑGB²‚¤£9ÊñŠW”£ápd9ÚQ	]ÈB¹ÐDŠ‚´ÃXáêp‰		÷ÆÂ-–ÐV"LVªR™E¶-‘na",�Å;Ž}}ÓbÛBX9!žRWí£¢m©6f}eU£dŸW4%^ÖʘŽËe3ÿB%aöÿ2FTòƒøÔ¶ÍÐ$·XÅ+
{ q…ë[Ó*�|Е
L¼ØÔ©“*aRxEœzî]ä
ÄÀÔÀäÀ
ôÀÁÁ$Á¤‹_hXX„E�I838ƒ3xAIœÁ´Á¼ÁäÁôÁ Â!Â"$Â#4Â$DÂ%TÂ&dÂ'tÂ(„Â)”Â"œÁ0Hƒ”Á„A1ðB1ƒ0¸�3ƒÌA„AœÁÿ4ƒ3tÃ|C!$Ã-”A,C7<ƒ|A2¼
,¬Á=Ã3ìC3ÄÜBÌÁ¤AEƒ4<EP„4LÃF„Á:ÃK4ƒ4ØÂ4¬B*ÅOÅP$ÅQ4ÅRDÅ&”…‘p…W
³öêÏÆkåÖìæné®îËlÊÞíÌŽnX[²;»7³
.‘9ZÑ’^à:©“-¡o[˜o,Q¿ùÎ
ýV‰Uìo­ü‰^¸’‘X�”‹YÀc•ÀcWpp<¦·Qy
‘¢p ©pS¹ð	·ðj
		ª·ŠWÓp÷p'‰Qé(£Šæz5æò›V«=`4›i7:¹µi•$“½+ºlâ5Rzñ$C°w;¼Æ‹"‡ñÌúVªñ€{Ý›ï Á:ªÞ“#¹-¹ð7ñão
3¼Ùó9Ãëq¬Ðu°u †{1ñ‘“ð°c‰Ñ1Z0†VÏu‘Ð…æ	ã±bˆí0m[°udçMN N0â�¯V€LÐNPNˆõYØœYȤUPM(“Ë¡êU(‡€ˆ[ bÎaS€wO
¤¤Ê
:(¡{}lâQךmr¹öœ{±™wíõ¦Ûx“:Gš¤œvúÛz’êöœrí9Ú(vèéê£�:‡|êu‡ÛwÙ™ê^¦³rʨ½~*Z/¼ðÄSN9õbl±ý¢‹&dªcŠ);2¹Ê[<U—1Ä`rdX½Tk‹·àŠ×/·ÔÒ�¹é¡›Þ¹®òn-á‚:,\ÃÊ®½ÖŠÇ[L2Ù«j²æF&%ô§À� p
rÉÂÄP…‚Òá‹L¤ã
=ñãY×�V¸é!íS�[Õ"õ^ÁÏjÆã^ót&0[Í�;„$U­0Ù)Õ\'yãØ—‡>O­!ª`
X`Ì,9„qV@¬`;F±X B
PŠg•b
—xŠø¹?W¶‚Â

Ìæ,ŸyÌ_.3š»¬æ9—ÎoVs–çç:ÛyÍuÞ3˜×|æ=“ЄNsœÉÜ]Û¨¯¼™¬îhQÊÓê¹´¦Ês"Ì|ªÈõ5�½°h“9]ßD‰
’Hžé'�ÖµK6Q§.5õ!‰–ÉAn¯{PÓn#Ù;TKÿ-‘Øåéy¦6
ø6YÉŠ+²Ò†´M´¸-d"í³H05¶�Ūü¶ªÿh_+ÛŒóö¶ÑÅ‹_ð·(Æ&6±Pl¢Éf�¤3Ú?Ld�xoæëTKê¼ô¾î¥c
é>Ê·~A#x«IªHLNW“Ð;/|^)ó”ɘVxyµ“â,â¸ÖLJJUÜ5ÙµY{±¶Ó¥Yå‘;õùlqc\â<rþx¼£=Ç;æ!ôy}èC/zГNô¥+½éLºÓ›n
ªm×ù™úU
.È9N‘ŸN¹J~!�á½]¥ýàP9^Báýu
@Uͧ¹ÔQ˜
ÐlaþY'uÜÚáÊ3–ÿ£hÅ[Ì	cõÍ®_I¡	+¼B _7àÃ=˜>hà6ÈCâbúÞ5ÈC>l"6¬ÞbCíi <\¢E
$fä=¼C>dƒè
dAÆÃAÎ
ÀD9œ‚
ˆÃ<ðƒ;ÈÃ<
\¢ê‘uiNcc‚êxe!±èX¢ßYΗ•Þ(r¨ã„Jªta&£^^ÍÄOê!̽#ß�¥WÂÝ~²)Jaê¨~è”–)“+Æ©hn’&6Š&V—6bžÆÑê—r¥®zÝ•’eÉùT´Â_n+£&’Lz
ºZf§ÚšNžÿj¾õ(ªí�”–妎]°ºjx‘”�jß‚Âè&eŠ‚%þ«‚¦]¶ãÂi®ž_§ò)ú_°�+V^&ù꣞j¯ê'hbiožæ¨eeå9!ÍŒèy°š¾Na6¬o6ªø57Ú*�¶+S!êþ*$­OxØánîÔcÞêÁ~&ôÙ¨h©
iPqjW^¥æ]ôõì6²,ÊžÚ¬²æ˜Õ×ðfÑ̤SÆÍÌg9rO;NŸfjk÷‘RÉB¨˜~j›ò‘ÏÂJ©
!ÍÂ[y!@-Q4>%dª�Ø‚S²êÔ$láe%Ej±RèÙ)Q
)|e0þì•R,áå©!åm…ªjcÆÿ-ÆBåþµª�6ª€‚­hi­Rªi²fáæÊâ9¨³ÞóœmbŸâZèͲd¨}ì½Ò«…m É†k²F,NÖ,¸>Z­Nªá­ÈI(wqè™jš’&¨}
ÞØýîž,ݽ£fô�¬˜^_Ò`¯J‘æSb¡ÊnïÕ"i 
å½.¨=Þh~*�÷U-š¾¨×ÞÝÁq©M�ëo²é{ö)o–©„žîS‚(ÙB\ÖŽ(ù~áûú›ã
íÅ¥«djí±ÒÔj*¦ú
­�f%’F¯õˆÏñþèŸÖÏû.æ}­®²ö®²–á“Ê#ŸâmÆ
LöUJê_£YËÆ*�º£æÞ­Q=«ÿmÿ­Ë6RÁyé8±žqç:/ÛpûB±Žú-毵6UÅ.cßíšî�£ZÍÑFœñjª2Îî¶.­‹â©sˆpêÖ­æ,Ð4œK.°§b1¿U*ÿZ¯¶žG#ýd¹*Š‰ò,•¶¬ªf©Â�°Í|í²*dÞaø�,ñš°Æ6rˆú/�J)ó¦�«aF©n²
iâ]ªÁ¦š÷j׶¦öõŸãê'‹ï.,!®/_£qÆMO
û§¯^q�ãÔR-ûÑíËâì»Îè®=(ÍF!Q°0Ãäân_Þ5*oYþ"Î`-Ouï—±5S
8/mXz&
/oÿ>nÁJÿ)ôfmÆé'ŽÎéÂufQ Ú®]&C3ö–3ƒ&ÏËuñ2é
\®
ž"wì4{ïc¥Éë8.�Ê3øÅÌf×cÆï1ë0V°Ã†iýúñÀÆÛºvéÄ^o’®3†þqë2s+?íÄQe[òñn9ón‹Fsúîô§ö4Oÿ´O5PµP5QµQ'5R/µR75S?µSG5TOµTW5U_µU[õo5WwµW5X‡µX�5Y—µYŸ5Z§µZ¯õV�r
¿µ[Ç5\ϵ\×5]ßµ]ç5^ïµ^÷5_ÿµ_6`¶`6a¶a'6b/¶b˵2f5VG6dO¶dW6e_ÿ¶eg6fo¶fw6g¶g‡6Û²5i—¶iŸ6j§¶j¯6k·¶k›vc3¶lÇ6m϶m×6n߶nç6oï¶o÷6pÿ¶pûõc‹¶qƒ6r·r'7s/·s77t?·tG·â冂Ô0À‚vo7ww·w7x‡·x�7y—·yŸ7z§·z¯7{·7zg7|¿vÏw-Á|Û7~ß·~ã·vï·zg7xß÷v×wÏ>
¸}ÏR8
I¯�Ažh¸è(”-¸Í,äìBÛ4d‹CÜ<Ä0³A$qDÓ:4QDÚ.ŽÅQÿ.ŠÅV
•D$1£‹!ž
]y5Ê×]íØa…-6Øc‰EÖØd™]ÖYe¡m6Úg¥­vÙí¨Hb‹¼s›n¨q#ˆ+ÜJˆÍ@‹èæJm¬)bS šx‰ž¨Â‰¤ÆŠ"©@�¸ÿ7©'ÊZó"¨¹ôžmˆø¡MãŠX.‹*ª(Ân.ÕÆ‹’@HŠä~pâª]›à·_ÇÚ¹“ï%j
'°ÐæÒn¬‰6§8ˆ*ÚÜue”ñÍ—	~í5ùÞ&ò]ÂX£qM:Y¤™>:Wh›VúÖ¨‘–6j«Ÿ®zê¬�–úXª{½zÆ_lá%DÑñˆ/UmÛí·áŽ[nˈV¹‰#¬Ù†Lm~ø±	-¡ø›oºqùRn¦QX¨'òàæ›mïfm¦éCŠ$¨
Hø7ÌÔ¯-Ô©p€hæðÁAí	Õ“Ç<ÈÄ,d°bθ‚ªà…‚5�“ј�…1NB¨CîT8/¤)
íøŽ
CjXA	R at BÁÞÇ�A
…
Y°¦ìT„�‘ÐN›ÈG&k
	¥#5¶À„£PÁ8Y¬ÀA¢AߘÇù¬1«•Q£J0[®B§ÈáÉ	ÏhäònÈ#ÝpÆWœ°P@^A
àä¡6	J�ntH”4"Ä�É!�£%5éI�R6=*!R°Â±”'‚A˜<´B¨�7_RãRàÝïaÿ±Œç@Xè
’à„#Âp™ª 
v0jÌL
E@%ö´1È�\Ð}çÂxÇCnA+à7bjÎNUhÈVmrgt£¡Îpƒ¨1bZ
;Ó=®4V'$A(tjž*�P1<á´«”ËBú-,aá8ÔePšYŽzt€iÓ$I5ZÑ2p«­iÂ�ÐTjh3dU Dïºq‡™]Á{
µ†ê%ˆ3nƒ„XƒÂj¦%á
5Å’5Ä;½�«
@¹Bé܈›Å¢¾•ê<mügW´=œ5�
kñAì@jxC=Ôh† ò
zç{íõî}ÁÛžøÁ'üð‡/~÷
¥p
©°
­ð
±0µp¹°½ðÁ0ÅpÉ°Íð­pfá
ÏaÖ�È!Â
`¡`á_
èpaaõð
±ýP	Qq
1q±Ññ%1)-q/±1q5±3ñû0ùpE±IqQ#ÑYñ[ñ]‘CQm1oñg‘
±wÑÿ0ƒ‹q�q“Q‡‘ÿ—QŸÑñoanaj¡x�lAm¡lácDZ1Ì‘Ê‘Õ×1ÙñÝ1Ûqá‘å±ññõÑù1ûqý1 
r ÿ±ÙqrRòR!R 
òñ±Ò%2 5’ 3’#ÒÏ1$²#2#Gò"KÒ#×ñ$I²%)2"QÒ%W²ná{!'{ÁÈ&€l!€r!Ã1(m�(ƒ(‡2)‹R)�’)�r)¡²)£ò)¥²*©ò*§2+­R+±r+½²+Á’+Åò+ÇR)¡ò)ÏR(‰R-…Ò,—²)á-—Ò'×’(é²-ÿÙ2/R(}2-ÓR*÷Ò/ó/ñÒ.ù²0Û².Û²/ó0ÅR0×ò.¯Ò0
0Í2.³’+)ó2Ýò,1³2�r3=³3ó-ÑÒ*
3yaR�janAxA'µq¿±Ëæ6Áq7{!½‘¹Q5»s³7U3'gS‘s9•³9““w²-£S(§3«7¥³i“:µs;£s'§<©3³q6ͳŸS8�³8‰38}S'Ís½1'‡<³7{S<ó?ïÓ>õ³?ë“?ÿÓ?û³?g³>g³@ý³>
4?ß“<•“Aô=u’7ôÃq7Á‘yS:!'‰sCÿ¿ÑAÔB­³-É37wsD‡77ôCI”CñS(W´<Å3D3T7oS7‰3:M”<ã6ísDk!ESÔA�“8‰4I‘TC¿‘C‡H™DITI?tI�t7¡´E¥ÔD›tG±K“TKY=ÁQV/ù€”ô'ÙMá”8ãtNß´N3T9“OÑsOçó@ˆ~Rþ4PUÕ
Ýþš‚A
äÆŽ•*ÕÒ£Ô§J;Buz5£V�\9NÅõ#Ô«M�nìêÔêV³l±‚�ª•©Ô¬f馥VªZ± ÑVE‹×«V¶rëL®Ý¥_ÿ2vb¯
Æ«¯T‚Gª• 0^ª
©ÿø@*¿`bÌ/šl’JY^‰ôÖF¹€2(™ R‡!pèaˆ"ŽHb‰&žˆbŠ*¦4(oÙ5Hj±ãYmñ%WŽzÙÅ\Œ5¥ãŒúUSWi£\•%abqÍÕ–bk	f–„Aîx��é‘�Sʸ%cZZ©——Dö5XT\u—J0ÁT¦J/™CŠfošâŸ‚·¤ÂË9¤œs:ÔÂK0©¨2L*µØVËm
Pœm ƒä`/¬(\³¶D$œ.<ƒÜK-¾ {‹/ºXzô^ý¬s_¿„\Ó;G]ÈQÝlV?œ—�ͲK"� ‚*�@"¨0BÛ# 
wÜh�7ÝpÛ=·Üx“°wßzÿ]7àwËMxá†N¸Ðr‹�Tb¦ÁWHV½
\ùc§ß˜qå:.l˜_ÞñÀ�S%;”°C\:FÍZºóÏUg­j*«ür‹)ãUmŒ)±tñY
#’d;/
Ï^ÝÂý-ºpß‘÷Üg¼qD¾gýù×›_!/`ÙÞð�õS
1¹ä"‹,ÍSµý½ð�µ
p€, 
ˆÀ*p�‘£—ó¥JÎG÷Z½â·1‰il[ä�í6G¾|5Ê+yq åæ…£0Afr›ó`ê“yIîb¨K˜é¤ä$¥ÄbºÀÖó&¢‹M#=´-h
ZPÄÀD.*’­ªDé„’U½²n‚»KS½¾7ÿN° X
ÛFà�4¶í@£ÛÞG8Š Žr¤ãçhǶá1�{´céøÇ=
ÒmƒÔ#!áØ
xF‚£«¡�*‡¤ŽÑåu\ʘP¸#Òýeb�ËÝs豆É�`«Û")ÖµYÎ-ä»d,éJÆn_�j/xQËðê6·à„1fQ‘çÅâ³ÐÅ‹¡ ZÈb#J”ųL�Y Š¶È…R¬iÍjbÄRAšûröÍ^¤�0Ò&6£	’lj#çDÓ*+¹˜ÂÄ
PÁ·Î5®£˜`ŸüÜ'
ú.~þÓ
¨?JÐ~"´ Z(B
ºÐ†&t¢…¨B-:ÑŒVÿt£åg	\dAi¬_YäW§òNNQL«Ý˜F¿öèG‘Ìà(Oê%¾¤Î„‚	Ì'A¨-2¡E-©lä»ø9šÎ°®¸9_¬Bª°E(S4u¬b««PGòÈÁÓã2‰'bq4\©B×á�)‚…+bp"$"F* Ŀʈ*ÒÂÍ,pc
ÙðÕ剈x‹‘_xJ’±ëClVS8"+\$·¸˜^4Â#X‰†ÜÅ!™àå-ˆHk®}¦vC¨íPkC@ÚrµÖ´zmlWû¡×®¶´Ê­hoÛТ–¶´Í-("Ö¤•ÐqÃÝå¼vIŠ
Œvÿ%RY—EK¶Ò�!ýdR{ÊEîÅuœ,Òs'–Üâ0§¡ƒéÆ>Â=` 
R$
%Q¶žÒýJ+k´fæÒôä¶ðE*Xq€µVxè© eÿ@CŽÏ,§ÂŸiŽrD|­g
'ÒÌÆu@U

§ÁÞç¬Áv¾P
í°
¥ l«À¢Iö^(à dÐY(�OÿTQ*Á2q‚)è*È-hù„‚/(ƒ08./Xƒ78ƒ(è‚,˜‚,¨ƒâòƒ-È‚ïÂ]ï49fVYr&rz¶z:÷8d¢R·g02”B!gR—£f*Ç;ÕÅ0‡n*4%©TAr–fVÈSÔuI¦À
`œUPÅ*×ñs«1(¿¶0 Îc-z˜
¦j¤¡‰u(
Ö–
™�Va
Å´
Æ0U¦P”ˆ‘¤¦¤AX³¢ª"»p(ѧµ’ÅP4¦`�>§vµ 	)yš UÅ�	©	ùKº 	Æ
aä“ÃÔ]e&…ÌrP±	¾ÐœÅF%€6%!•%QÿUi•W‰•Y©•[É•]é•_	–a)–YI´pJwxfx|#ç0'•skQgGérT†E†”Ã^ô¨T�¦�/׊!åŽx¹…GXBgb„;×W%×R±@Á”-»À	<I=ÝÃ	A©®Ð”‚+ð
�V·ÁAIL® ,«`SÕ(ÞG}È?¡¦04i±`‘u<µP¾Ä	·BÆÀ	JT�Æ�““ÉC³AœÀIHhˆa”NHB ! ™°€
pa�
Æm¡NêÄf	2È»�›�» 	ߣ…3'%b‘\à¥[Ѥ]¥åæJ~áŠ`¨—~Ù@5¥E¹g:s‡v„hŠY˜Ì˜ºIÒ‰:yV—Üeftš…V§{iY¨?­”fW§Ž—„Ú5úHS~±¥Î+†È­à
SEaµdª§Šÿª§*b¦ºªªZK"«¸"ª­@«µš	Å ø«ð¢·|\t�•¨ü¸£ìµAÐi¬†Ú¨èȦfȦ„Šh舨jB¢�— ª¡ObJI8¢ñô~ª„Tâ¦Ó9¬Õ5¢Çªq/WTÔggxäj—é^™Ãrù¸]dŠíð'‚ǯýê¯ÿ
°
+°K°‚w
è è°	½ b%å#bØ^§SS¹3�ˆ]]A¯ëc®“�•h®—­ �Uè^e†¬Õê–0E&³%ÏJ­Êê^›¡}ZTãšCMhCŠV”ûqqj˜s* öHsˆ	¬'§¨éÈ¡ÛH1¥ù

š^m\Ë”:·94^×|AõÛËç•rŸs
sÁ=,…˾¬ ë»ÍdL†}›Æž]”ĬÓ)wÿÅÜ
¿¢£´ÃËJ9Q(´žT³÷ØE­íÌôMŽ§=¿Š˜ô(À�ñ½—ë¿Ü»Ò}Iº3¡Žs´Í1)ë­ð

LàÞ²
å
n^k~¿ó
¸Ñœårªåry—û…ãÔ¡gR¯QÀàKßÀ*ËY\Å0eÑ;ÔúÒ`ÞÓœ‹{ÞâŠëØ\~¸Óú¸v
0ˆ¾ÎÏûè�λ�^î�~éÁÂ{îÁïÇ»»8,¶ó
é@
ù#¢�Ž´#¤||êBÍÕòËÅÚP¹)Ý1ÐS»cIxlñKlgTLçáš®C-èÙß"T^tJ$?+´ë»�¥MÍ•»^Ï/¨>Ä]¾šû͉öz‹=VQ5ç£°§™¯ùšÿ
�ÿ
áðùŸ¿ù›/ú¥?ú Ÿù¦�ú«/ú™�
¯
¬
=‹T![*+ê¾DôLÒ^#mJö„4I1áTÏ­ÞÀ”
DLiuñÉ%‹öVeõ”²3XQÝÐÀ]éš±Ù'›
KÒ�U0<
=óËÚk§ý1P$g•Sλ{
:X×ê1?o³KôÖdAòÎ)emïJiGû±LðúUÑ9P§Ë³ÌÊeWíè\a»*ÑU}+Û®¼ÿzur[Ñáy	µ°²AqÜoXŽÍuÐÝ2yÄ�Cò(SÒQÌå•\ ³]^"›¶×r×døç›ï‹j½UUâLC#O=ùèE¡î­ÎŠ‰b÷é÷R>ÏV¡îØß0…4gû8µY]U±ZÿöÈ5L7]S$Zb×,ž5ëÙlOc¤lÕð9ƒŒ�èhûM¹±‹ÒNë~¥7re]}åž.l¶ïÄÓÓR3³_4+O®GW�quÑÌV°y¾ûM?7Üm5_�¬d‹Ç¼W1¼¦öY3/ö8âK‹N­F,Ó퇯6cî@u¼ôšnšx¥ÿÍÑDôȦӲËÇÝÏí«RÕ\S㙯�•÷®sMpÈÀ·Çiˆ­Uu|çÉè@
£Ø¤Æ£˜!©AžêŠç¶ž€É1ºK�½hš‘L4GËí–G#áaÏP™[OÆ)õ!0R*„¦ìä%el“Y“H7À*ÝPÿ5+œ ý÷Á˜)å?í•||Ä%¼�`r+¯¢G8í-Íz
)©êŸdÎÈ4Å­Çp‘3a͆çÆ·u«x\KÏéBµ¿ÄÁ‘êÌPä'Bº•*t�2['9Böí�~ijcõÂÁŒ��,.;˜?F>|•L�gÂÑŸ––ç4OLÛ'çd¸_‰[‹Ù™Å¬¨2©5Žà3eÚè¦AœÏMbô^©2d7þÌŽtŠßÿŽD&@‚Ðy/f-·È;Á-VsD“„°	Ch.Ž²ÿ¤VÒªÏ=Ù,JìQ¥VªÕËtZ	RŽ,Ž?òHtFó{1¼_ÒŒ6¾Dºï‹îä�ÿ¦R¢1µÉwÄÚAÖËLªÓ‚4¢Ð«¦˜²ÙµjpºטªØƆR4H_ûZ± Êö‰2�
–Pˆ;KÕÖ­Š¡¡kFÞƒK•vêb½ÙÔ
Ó.£BF:²¹^
²B±B½IVŠËuÄ�Œ»ÿLÛë)µ\×}îv[GâóK~Ç|¬`ÃeÄ£D™‘„£ágs»Ö¢1±g\•lÂTŠ+7²”€@«³èãW÷$ó©p�r­ŸwPÛí¡ËL)0š9´«²±@³óO@×Í`ìj(Ÿ-SB–´?³TÙ[f½ÖЗ®¾&·"çìS‡GþrB±8ÉøÕ9NáZ—våãÂXþ:TÔd¬‹,æ¢íœI½4�
LR#z£˜)ä^ºm–-ºÀ§”ô¨ý¹Íq»¯FÍb€ìœ:¶G�!'Õ²57ù4w£7CÚéRÙRUåÛ�zY¬£}¶zw$ªgì¤ß�sxSÒl�1jÿŒÆÛ¤
æ@Wò õT�ù&ê ¥üð|e³Øö®8ñòæÏc��ߣ…®FmWQVV¶(çkÔT¸;"û³8†3Ê8Í>ò–ú¸#$d±9bŠ]4àŸö µ¡®�“B-³©ú§mÊ»zML¶t*´F‘õàÓ¦lûlí¶»ßõ=¤Ó5mïgE5Õ3÷ÛZuHk˜+S„C÷…®kqÜXœ®°×ŠÞ÷ÇddÓwÍiçÏwð²=c1¾úã
¥Q²³q¶\.¦Ü­Hˆqæªwª~MšJ›êÚ_·íVìl¿-Ñöö‘V™¹�âùÓl’[Ò½ÇæìrEf7º�'fž—š¯Û¢cC-Sør•íWÜyOm¬¶÷±·-�'”q;TñÓ”“óNÑÇßj~‡#¯›¬³êå\Ú¶j1«cŽ%!³Ž@â/’=Tƒ×¶“­¿Ã¦öÚ-ç Û¢§Ã¸Þ#]jÄq)³¬•;$iÛ7D¢™ì[AT
`²=¨[4w
ª)«J®¸ó9ub¨‚¸Š�Á|{�€
--- NEW FILE ---
GIF89a 
d
	
9|îÜáC¸0¡Á÷	äfOâ?~ú@öóçOž<{96ÅyOfͦNí	š¡B¥N*DÕ©×�N•âÕêÕ)T¥ñ:„
7¯R³y	çÕk¸ð^¯\÷Õª—óWÎaù’N+¬\´²cÏŽ»÷\ºÂ‹ÿïN—»]åÝ©‡Ç®=;öðÞ±{×®¾ýûõëÕ;&¯ž<hþA�=H =Ñ ¨`46Ø 4ÑH#¡4àHN8Ò\¨¡†â\(· †øa9â|C9æh³M�d•JVÅ(ãŒ4Öhã�8æ(#O>�´I)@"


!vD	ÀVJ0ÛU~i%
¼Ø‘Š™C	À®ÐF`zie,ÓÅbf
i¦á+°d§¨¢¹ô‚�.¹Ô^x“Ž§Ë-¹ÜrË¥—jºË-»à‚<êÀcê©î±ÓŽ{õSŸ<üÉÿ#+¬ýýw�Ðü‡k‚&˜ „2á„»a8â€ó
² "묈â�Xδ夃â67¬ÔP:vëí·à†{cDÛšUCF­ FnXa¦Ÿ
g�ŒÅ¿õZ™Æ!³˜9Ë,v
-
Ñ„Zô¢ͨF7ºQ‡N4¢ å¨H5êÑ‘šô¤À$y ‘¤
€~胜æôa?¾Ô\kúLÕôG5±‹ÃMÞm.˜vØ1œV³Mx®skŠ^œ±‡:„/
ÂYÓàÝíÇ|ëë§j:w¾ÜõaŸ‚ØÍ6IØ…ï
ƒøÞ÷šw½nî7Ý»M2˜
9ko[ÝØÿövAnï“Ÿ’Ú)wÌOŽñ*cÜÞGÜH³›¹d¦÷ç5Ý.rƒ¼@ØÀÑ_°�¦g
R   •ß¼èS€‚ÍOžò£ß|R°zÑ«`ô«�ýŠp„áö¸?‚n {Ýï¾�F0‚¿ûâß`ø7ÈAŽ°|å#
78~ÛhÆÝÁŸ	�³wÎýîô"aÑ`ÿP vY€an’€q‘bƒ üÿ0
Ó¢’É’)S™?bÀq
„p
YB
«
¥`¿�
u€
°`&®€
¯€
¿¯0­
ãrÿ"2ª
X½Ñ
ã
®p‰¼ 
fB]õ¢
± vB
…�}@|Ð~ˆ~àzЈà„@øç¤ðüG¤±	¤0€¯a
¤À…À‚€
¨Q
¢À½Á¤ 
è‘ÇAÃH�©0‚Ä�1$8‚Ö±(.™²(‹³x‹º€‹áa3:ÿ£èq;	¿˜*õÐÇÀ®â*í0ŒÇ€”°bõ°„MÉ”P…TÓ b5Æ’�Ò!̲,\Y"ßð•_y"e8æpÖ€J¡dN–ŽlÙ–p󆻵}­Cdk	e8—r¹Baá;Æ4ByËôlnÙlKµTÞRŽv)89¢d�ƒ—õô6Žù—u)˜fqŽ}É;Ísd–I™"äL>7˜oéD2á9° µ…EV¨…Z^%
`
¬Ìj¬Äº¬ÊʬÅú«Hd«¶j::we¥CeH&
J ¿ÅÞŠÅ3®ÆV(¤ü³—²*«‘.A&!™z);A=ˆÓDmóN1mM©6ÂK 
¦µ
bÛ²ïåº
–³
ŽÉ« 
¡ɘœÉ¢°
©°
­PÉ«ð
¡Ü
­à‘¯pʯ 
¬ Ê$¨’°À
°˱0˳L³l±`º¼Ë¼¬)·`¿¬)À¬)  ·P·
Å ÊÌÌÅPÊüÌÏÌÆÐÅ�”ë`IÉÇ`Ì ÍÜÌÍI™”ÈÀÈpÎèŒЀÎë
ÍðÎðüÎÐàóÜÎ
Î�ÏÏ°Ïüì
áàÏþüÈâ
ß@Ð
–ý•æð
ŽdéЭ
è€Ý�
ò~”êƽ:”¯'
½Q
sP'0¿!
³q¨�Æq�X¼
…0­0sàÔ‹\­�
ª`Ì1‡ðÓ¨qÉ1ª�
N]©P1µà
©X©Wm2ã È’¬ ² ó0³ÿ`¹0¦¸2+¸,£+3·H“ä�Ö7¨¥ß;ø“D)4ø!+ü
 Hs+O³×O5„=5†-�‚�Z³ØÐò…`3-'26ã€زÅOŒÙ¾9A‡-Re 2v€$~ �~PcS/v�…€&U²šÐá
¾ðVÀÔc'²P£Í1
õr	—À	£H³P"£	C‚Îí^ýŠÎaå*ø2´Ð‚.h)7™“:³“mMß«”öAŒw-+x=+þ±„Jƒ4OèŒnú`…Wh•Ù[é5ÔÙáˆØ�c‘¶sqáˆÿ¾–ýyH%+
žm'Àq`0$¦MôR$v0…`
Q2†p/†P
¦Íˆvr¦Q­€ãU‚
¯ q`÷"(v‚‰3¼@H^$�®P³ 	ÀÛî 2C~Š$x2ª€2/ùê-“2)8êáÞëÁêÀí¿hsM”Fh„ò�ŒûÁ”Ì°LS¢+„­ ‚m….!Þ�!ˆ�•B"Þ@"	m"‘-†d‰
7p.Wœ™Ú›èèÈN¿”h#9m€ Ú€
n Út0
@‡p‚�}À$…`ÒˆÁ-o@†®0ÿ	†@ÊvÐ
¯`�1i@�¢ 
Ç}�xÊ® 
³
¡¨
óP#¨(³°(ØA2°øÕ,È0X“¶Àõ6£‹ rð°¥r*ìñííAŒEH4úÑæ²Âîâ„B ¼�И w
ú0,Ó¨5þü,ÎRϲà^ù•ßhÜ`hS¾äª~‰ð�ÏŸ!-ðw(À
sêÑšIÇJ
k”äÙ—6Ùò$º5n˪SÙº%+V)×½Nù.XfÕ²|kp=\£‡âÃ6;V+uìÛ’„gi¬æµ€Óvìshªp=SžÜ7åPÒ­[%˜£‰ÿƒ%),)’[w‘$»w§(’#��u´
<–³Êå¥U3w}™ds¦ž÷j¦lúoæÑÈW6Çî<úx?~ì8OãÁ
@‰Ät 8}@„Àq±¸�>º d‘ 
fxb„“<¥
Ê:…/'/³zB¸aî@óëáˆaÚP¤:
ÐGOûö¤çO@
Ň€üôI”
nVÉHÌà(ÁìiOƒY㥸](qPRÜëEƒ�O³H"ë¨HE*.q#H$%‰¡Í€�Ôã£ùGA>Mq8
HPÍ"
À>è€<õC Ç?@[×¼¾Õ¶ùAÔm5‹ÚõÞv­åÝ+]…ÙD½?uUï}»Ø@…ײn…ëiƒ»Y»x²äÅ=ò!;ú>Ö´Ž…ð\ÁëWÛ‘,½sÝï\»aÌ"Xc@liû'À.Š
S8?±å-}9ŒßÁ*vv
Ôž`[Àíà9ÒP@è(dƒ
›Ð"ƒŠÒÑ�� ÓaŒ‘(ÈÀÀª¨ŠÜ"�À‰ª8d®äŠ�8Âx•™‹T‰Æà!î`«-’"!*ÖPÀ£"¡˜ŠŠ„"Ò;À'4@4
´
(�¦ñ¥,4‚j
&0�¦É�`š/üÂ0ìBøB(
ÿ±©
±	Cq¹
+L
¦	Ã#@ÃC…À
<äCPÒ
?Ä
7Dˆ?üC±qxˆD<P
¥<DD„ð%FdD1|ăXPº�?Â�`‚àžG¢ˆ‚ $‚¨H:¥S<ÅØ ˆ�¨ˆ9¥ò‘$I:Ž ¥SÄØ
Å©£ŒÀV,ˆ_|EFzEŽ8

‚Âdܱ&Ü¢”I
@„GHIH„j|„G€„k¼FHÈFnôFo¼ÆHàFKÇH0Gsl„tl„s\GsÄ„Hè„xÄLˆÇNðO¨G{ôL¸GGðGôGHaøapƒ<H„,È_pHƒTÈ_
„<¨ƒØKƒr%
d©*‚2ÐÛ8Ì�Ñ<ðƒ@ˆ=,À‚w•
(€w�
È‚è¼a×Q…YˆÝÚÕSð&Y_¨¯o$VTE]Ô\ÀôNï[PsNëðÄYM]^,Æâòäsxæâ>/Z£c1ŽÿýüÏý$pXPY5ðÀVðôH�t…._y­MÖnÈ
®Â@ËFù«`�0ª�x¾LiíEi?¸ƒEi> íÑƃÂüƒ!�RÅØzýS¨ƒBPö,„%„¦/A(rR8…Ð-^(jجƒ:˜Mל͉ÍXÚ¤SÚ$Ó;YÜŒæã<ΑeÝ‘såëòŽN_Pb\€Y»7çêœóI�óu
^w"\ù%xchÚ§Üoƒu]ˆ F¦Þ€
J˜^�–}è!�Mçä‘&Yä�ºÈb…û
©%ÿ—�u)‡�MÉ_aÍQ9&”Fbèe•d*Ù䃲éšL¾	§…mæ…$‘uº Œz

è“ã1Æ sþ™)Ú˜~úÈetšå(�ƒZJ%¤R>úß”!Rz)¨“b㨥ºHꩦbÚÚ‡»áyrò÷i¡›Jkš¡þ訮¶î9kš�újeúEˆâ—[z¹,˜ÍÞeì{Âù0‚žé�ƒm×f‹m
Ør;Ck§ý
¥/V'
€€ ÐÎ|t
™iÌК9‘<
m«_ÖÿÎ=Ð
OÏGt ±±*/˜ÌõöBm*™ÉiqÑÝÓú‚™íE§ó„!¥=ß´ÚLÆjVŽNH#xµ`-Š‚᧠Â÷½W‹/üß+¿ùÈï=ô¡ÿûèS¿úÖ/¼š}净ùÇo¾ñ¯_ý$LßGؽW��‚_üî?üo
™Ÿ Ju´à’Ø™_´ ›´
ŸôÉÅJ4qfxÜA“I“².‡ÿáá–.U‰�Ž
@¡„̶=\ö��¼YI™ðˆ
Á¶e*…¡å„¡mp‹–a·�áÔ¡RÙ±á1•!¦!·€áÒá‚ávºa¶aâ’Ð
â)m"'Ú†1�K&j'ŽbnŽ+e¢%)Ž"Ô5
à
]&Š]–Ç›YÏÄÜ ° £^rÍ8é sÌÀ

ej6p6WŠhˆZfTMÏèC
^…\eèâìd•ú±¼V&‰ú)s¤f¾°Ó–QçæûHråÂö?ìXj(0`�Œ�tjbÐEHcs
´€k
	H8	h÷
`•…·nx‡�w4Aðñ·…ï^
˜ßùÝÀwö…wg›÷wÿ¶wï_ú�ÙAÈÑÊ
÷WÅ8T³7¹
vÄ×|å•H‡Ï¯PJªl‘ìˆ�IMeç™:‘{-p¨6³•3°–³qæ:¹tp�¾Iˆ�’ïY—¿—’sùÙDœ”;s™G\”hyß09»ŒI@
--- NEW FILE ---
GIF89a�9
ð
Lx°áˆ+NÌx±ãÆ�KŽLy²åʘ/kÎÌy³çΠ?‹Mz´iÀ–��²$‰Ô;sA‹bvaׯ¸OÎÞ*Ð%6qÌ`éÂ¥¸ñãÈ“+_μ¹óçУKŸN½øã׫kÇÎ%ûöïàÃGÿÏî�zyñÐÃ8?�^<{íïÛ7�¿œ¼uùøóëß¼Ë=~ýìCŒOµÕvUmsTX>)ˆ`n†äp}\Á\yïy—ázÎ×á…Ö"rçE6ÜÔÃ
5]¨Ç…Ô¤¸"qÅI
	5ÙlÃ�ŽÜtC�#R\·E7â¨cŽÔP#ÅYPÃ#7‘Dâä6ÛPvR<B�6(RIe6�Ù5ÝøH
4IRIQd¡¥—(f“ä[\±�=õp	
Š;nÍ÷}ш“FR™ä#R$'dqcDrdŽÛt³�ŠÔìQœIr³£¦Ü 
�5:*©Ÿ8fcj$clÆ^@²�©TJÿšä•Ý±7¦ŒÔ|qé#¦Bé¡^t'ì°]<
7÷pM¢ÆYúÅ#_,™d¤<V¹
¢C&)i²}æÚŘNjÚåŠkna©N&«$Qðá긯R‰‹Ý¡
MµÖjZ%�èêX¥aôK(¿h@²§¯ñBäôÝ×ð° z(qÄ‹8±Å/ç€ý£Œ@G)øЃ·ñ&Ð2‰,rD%§œ`ËZQ5PÌ4Ïl³Ë8ËœsÍ;߬óÏ<ísÐD]‚%£ó[odÁßÓPG-]:ª˜MW ¡£6Éþ©ªŽt#.4h0Ë®{l!Æ#Û¨û[H!†�5:)ö6R|»%žÜXÿ¸¶ŽÉB‚Fyh_'E¤;RS�\|᪾�hA\c<Òâ­yf£kd®H�a£¦�xÁx…k	²�ÙÅéîØ¢(jÓ©WÀÎ)74n‘�=öÌpŒ”j¡Þ#|T‘·ƒÞ‰¥Ë5É:‹DzÉ
$ŒK�vÚÌi
�¤;i¸c@²æN"é…ÒóÝ¢ª£×“Íf;©��l‚ã¨y×I¥ŠÛ¸B±d”
GD!
¼ê“å7©{ü(HöªGð¨!†âtaÚ ”¢ 5á�YŠÔ=¶
	@Y'QÜ“š
W(5ÿôã…ÄÆQ¸â”
äA?Á!A„C•
äc&;FËÿŒBÄ•¤d34oÈDÚ4ñhO\¢§E*J±ŠX¼¢£ÈE…”ƒm`Øt!=Œ…hL#w0f5Bl�gÌXãˆF:–1?ñ±£t質ï<Œ|Rê“—ª�oMG�nL¤"«#…nôãþ Æ1Ž!cXdRâ'ÒVÑ“:ÄÈmDÊU‰é F*‰ÁJU²r•æ †9`)ËTÆò–²Ì%.w©Ë^òò—¾&0‡)Ìbó˜ÁL¥2_Ir¬R•Ïle+c)Mf沚؜f+Ÿ9iÎòšÌ\¥-›ÉÊY£šÝÄæ7¿YMqZ“—Ñg:ÓùJwêr™æ 0âéÿÊ|¶S•É°å8µIM~J“žÿt¥=ûéJ…64›ÞLG*»‰ËZf3–ÏÄhF­ÉQ‹Ò¢Ìôg9—yM’"”šÞ´è9Ó±ÏW–e%=݉Ò�Æ“š8-§N¯™Sžî´§@ý©P}JÔ u¨FM*R—JÔV&ã•7¼ÍT~‚E"J$”CL†­Ú�­šì‰ÙäAÄzć�µ gÍÙBJ¹C‡tå­TY\¿
W¹Ú•®s­+^ïª×¾æõ¯GÓëÈbê„­!Xd’!–#…M+W
RØSæp¬JÜÊc{ÊÍ–$Rôì\"Ù³>V´¦t	[oƒXÉV„A=Ä,_²&ÿJÖA)+n‚ÚÞ"Ä«¹-H0
çÁŒ`„!á@šÐ44Í@ÚÑ�p4#dáŒJ;#—δ3¤±égtºÓž–…4D-‹i”Z²˜Eª§1‹V³¢Õ°Žµ7zAëYüâ¶þE/t}ë^ÿb¿Æ.†Áa£›Ä†0RÌ`CΆv2,Ã
C¸†1
ÒP�ØŠèvâ k­†k#8‚!¨wÀ‚'¸‹&m0x1V1Œ4XŒJ¨eFÄx®å»µVeŵÅV›¥CÕHU>�AÁµ‡
²À
.ù’09¯k4I‹³ ‚7ÿikˆk¼ÖÀ–¿Æw»0”¿vx*øl¼�xÃh¦õZ‘Œ?èÍÈY
Ñ2PùzÊðoaaƒW4à@
Ï°
/9
1é’2	k´ˆ“³H“À–k¶˜w½6”Â6”€÷ˆ§‚J¹”WÑYR©2V©YÑxƒÐè2¢¥U·EÀp–„>¨Œ@¤2 �Ê@µW`7ÿ`
"UCÇ`ÇPÌ0ê)·
£÷©”\�2GJ•ÅPXW	VMyU8êœhU�¶Aþ@Dlꄨµ“¥Å
°ÿŠ°k¯»¯+°û¯û°Û°±õÚ°±›°þº°{±‹°«±
² [±k¸@I”TŸ†Å 2ôoZ•�˜Ä¤ò¤?ÿ¥?Q`
 Þªþ¥Ê þ‰2�ZŸÃÈßY`Â

|¸
û$»À ÀÀÝêŸ ¬6<¼Ë QC¬»íIƒ^š•@¡´
¡Ÿc{Ó6ÊÁ€óúÌÐÍÒ<ÍÔ\ÍÖ|ÍØœÍÚ¼ÍÜÜÍÞüÍàÜÍ(;¯¤KC‡•u§›�˜*2]œ§amü6êVI§\I4xʵ0ʼ`Iø\¯¨ùL¥Ë A`íÉCñCe*Áp„1SI¼ ¡¥MÑÿyÐÀ
´}
jÃÿ)¢fËËZqÌp¡+»ºÆ0®û¼�¡+«ÂµÿàÌá|Ó8�Ó:ÍÍãŒ=�ì	¾]õV[ÅzwµŸÂLDƬ¸Õ2ŒGZEt¥j¬øžM*ÊZÅÂR`
XÔ¹[¥Xt[·)3¯

²ì
Rº[AâWm´ÞËÂ�7IÞŠ­óYÑ":Ÿ5.½5dÐf[aÁ¥EÁ 4X±aÏK}„_eC43¬53.ÉKMì3³²Õ 8Ó�òŒEn¸?ðZNððÿ·	¿ðßð +°�+çÒÌÇN´Ʃ=ÊG´ê°Æk/õRä0mh¬Þ î1»¨ãê¶ë9Ÿ±Wß?ÿteû¦Å>éPMãw½¹Ç<ï5þë2Uóð_ô?¸|lô„Kðn.¹iºX:JýöX0cy2ÞŒž´¢™¼^åÉþyÊ#nÕ¬êÐú.*ÆRÀÐÃÆ੡϶à	» »Î¦ÊË�^ ÝÄ 
ϯÛ¿µž¸%KÁ‚«¯—/ðš?ú�¿ù˜Ïà)Å�\çZÉ2)+<§¸Ê¬ò¬ÞJ»$Œ½ì
3ÙO›}˜sñÿF“‰—Ö4YôæìÝ2#ãꣲ©U»n{ü.]åË�?7¯×«
ÐJŒ÷öܳ‰ÆÔ©T&DñµÅõI‘'Î�åmºWï^xS–™@lá±[ÅXÇ4ˆr’áE
¦?d(I˜‹@䥘[8ªeß5yY�"eha
¤Žª·p!…jù©úň‡­3غŒ�曈ôoá™ði1&áÇ„‰È@ø)a¨D%Ƹ3"R
�l’ K€ÆÛ½07½ã±€‡ßí¤’…ƒ`l˜ÆÃýk)ŒH"P!Îâ�¤7‘ˆ\/

Ä@i(Áà
¼æ%oz›*%µ×H	}/BjPôš7I§Ú+¨°EÚX"ë3JüÃ!ePé mlíåÛ“„
¹›)i±H2(
S$Á®]®ƒüYÏŽwœ"OŠÜ“[´µºtå¨{Éߎ’@’Õ+.Øç¢ðhVa©…Œ$W^Èr·¾ß½îB•T+Ý]ªw³ãÿ¬%?éÉÜ4rEþ•ˆZô›c�µ	Q-áx�ÀeÐÂ-ÕñJúŽÂÛŽàÑ?—ñO,%sG�™8µ�JS(-uop
€°qÇ' ��R}#@©Õ6z5ŽV�jUÿ(Ö'¸u¬g�kÝÚG³~u¬ƒ]kV÷šØ´Fu
^í�}¸Ã䀶/ ý
j“ßp‡?&Q‰’�`˜Xî’¢Jð”›ÉÀ™�j®eÌÏj(†ÏZí|‚f¾”ÏK
é!Ù‰BÓP¤‡‰É£¿ÿüÀ-)JQÆàâj?b¡Ÿ'aês__C3·¨Ëßâð.ÒÛ}ïC5LøQ¨><1¥Ž	÷ˆõŽAq�Àd€ÏÜ
YÐjInÕ«Vv�Z�êV¯`øpÇ7òñŠvPûä8ú7^‘`sê
±ÖN7W×,“5¬ábqi0·+�e½^)¤�½ž(šÝ1Ähöq›õVÿåÉü¨¶E¶á
‰!
xQDü;»OJ¡g©­÷`-¯›ºF�ˆ�)<
ŠÁŒ0¢JYÚr"¤J%[.õØÇRôH~Ü—<òCŽ ‰H–Õ@"§ˆH*ÛˆûHÕŠ¤˜8›ƒ€&$̦½«œB¾5ÉŒ9	¢uXÈÌÒCëÇ�P«'ëºcÉ:ï8L�
±r9„€S›¾·ÊÌ6âÌÎ|—™/žÙ¾$5<?g3¿gƒwx?¤óMЄ­¼•j$NJ«WÔˆûà0
$ÅÙ`¡ÿkéˆ�¸–gbÂb�¬Š
	A=^²0ÔÀÇmÉÄ…à¢u ]Ø/é‹Ä<»Åäí”LÉ\Ì1“ª&äÊ$e3¡bœ9âÂ$ôê1#i>æ£(Û®(¯ý/»J1ëc¬©.(?Ô„¶g3?9üèhB69Ïq±T3¡/ĵ¢)�šq([¯)¹/¢‰Ï3L6««Y¬X
vPÔDPókMj{Mnƒ�ß°2l2zˆ•ŠµÓ�Îû3½ƒ“¿Û/41NÄ{*›­ùÈM¡ŸcR¸{Òo«Ûà	|�»+µRá �ßœ£ÜÒ²ò%íu€
M£91ÿúâÏ5íO6uÓ6…Ó7•Ó8¥Sþ„>%ñœêJ5lÍ>m¿÷{Q¸M †2©R3©RÞ‰+•RF=J&-«ªø’vk›;
H”N¼ñ„Ñ�‡	I‡Îû=fê¼S”êqªÃð¼\8�\`‡3!_€¼Q—ûÐþx–IrÔDåR0ýUéU/-E±Cya-× 	„(SI•ðB�"CèB€�2„Ï
à
˜÷#ïtåoFLÜT?ÄMlÆäc=箋åV$+g&s¡3“(ûå'
doÞ,{ö:œ8|–\~ät¦çÚÑ:GôåEFÄ�;PÞ?nVLÚÔ¿ÿ€Ö¤=´ä‡¦èWî
Ëp
[þ³r¡NºùË8á]Þ…�’6i¿ÈZ´9i!䣕Fé˜véÜ»º¹–ljßš“&i’��v¿êþê‘6‡£v!ÎY
c¨žèß„�£¶êþ-é‘vi¿ðé�æêܳi§}éÜë_­Æê“£>êp@¾]PTpþæ™æg~L*Mè�ÎfÅ1hÜ0£}Æèèœ
w.Ä¢$È�æw®ëNÒçÄ�kÌÊëñŒeÁ.»X\gF>`6ăŽd‰ÞçÊ6ìhm�–åz&h¼>7¹{‰Œð›œ‡zà†{à†z
InäĶh—ÿdoç�ŸÑ€»ýÛ?Ž'gþ2xÃ&Dãlt^²ƒ^gÃü0œ—”“Çø·³kcÕìñTlO¹èÎbgL©ù·Ÿw¦ë¬_Ä*÷ä‚Vø¿G|ÒÆ»×ñ¬ksÀoÊ
Ëz/oìÍçüÎ÷üÏýÐýÑ'ýÒ7ýÓGýÔWýÕgýÖwýׇýØ—ýÙ§ýÚ·ýÛÇýÿÜ×}Η®[vÄA‰�ÌÐŒÉ&P!þã7þä~å/þåwþæ‡~ä~é�~æ§þë·þìŸ~í¯þí÷þîìÿ~ñî'ÿó7ÿôõ/ÿõwÿö‡ôù�ö§ÿû·ÿüŸý¯ÿý÷ÿþˆdÄŠ%HÐ`Á�	*Dè°!D†–LFaÄ0v¬H�ÉB’,iò$Ê”*W²léò%̘2gÒ')Ž›&V¤táâ“‹ B{åRô¨Ñ¤H—*mÊô©Ó¨P§J­JõªÕ¬X·jíÊõ«×°`ÇŠ-Kö¬Ù´hתmËö­Û¸pçšES�?æx3F°.™É>ÿ–ôKÒpHÄ ÷-ìøðãÄ‘Onù²dÌ”5[ÎìyóçΠG‹þk:¤9Jlâ�Éæ'ìØ>·È¦=[6Û¸oïæÝ[÷nฅ×îí;øïá\¨mk®�[ólÙ¸q£öhp⿵ÿ¼B�›={ÙÂè¦Íyrã¹·°ßÒe[½zÛ¨}Q_ܾñ.Þ¹=ßÖ?lçx€a|ñ�6ó•~{ü–Å#ÔdÓ\=ÐuCM$�Ô`nÞm3á6W¼ÆálYlÓM7÷PsÅ€¶±Ç ‰Çñ& zªG#Ž7êh\Ž<î˜�½Iq?ýôCŽH4•4ÒaL¦4JN*9%•UZyå“„“ÿr�± ræÕ¨]�A*ç#šfXclç½G]=Òu³
uÒ¡AmRD²Í=ÜÄÙ5}BÉ]Pó]uwºø“Ôt£Í=þIq ŸÕ¥ç6Ø`ÃM6ÌÑY'5:J}ºu	òñ¡ÝÛôG�@ñY!}<E‚⦀Ž:!5Y´™[ÐpZݪ¯íIÝ6°u¡Ç#�@"!7óÌÝO†rÓg¨]x
©—¢§Ù@ò]ü·[£ÝT˜MaÜzOóMWO5–îæ…tñmfo_0ëì¡ðMKMµÌÅ3ßRè&h@
4ÙTØ­OÞI,Ÿ¹ÇvºªhL]¶Ð<Çi¹\ˆ1jÿu?í�è|DÑ9g¯&{Ϻ^lOu,Ê(¦˜i²y¦š¿úôÏk}›©Dò£1Ê$ùô”R–¤%AZR
“Ô i™5–]{íõÕ%…£ZoLq.z‹Â¨6Û?•7£ÛpûÖ¶Üo×÷Úxç
ãÞvëý“‘0‡¡ƒ>‰á¡òQ¸b4‰à‡BþȦŽñHäÔ@ÓȪ[y$bp±Ç³FRxn�ó
Iæ‘<B9{î&É#2ÚÍB#y#ØÑ–8᣷Ž:P^4²;ð®Ÿ÷a4ò0†äî>_$n1ë‡B‚F$¼Voøž’ï±Gà‰‡ž›ãÙkÿˆíÝ7Æðngñüÿàë�aŸ{c4‚8†�4"úl°‡<hpÏ|#Ú‚è'9H°§Ø;4ü‡<ÈN¬ƒÜ÷rã…Õ�Î=qî‰F âc-cî&Ø0Äot\ˆÂž—9Íý¯g;ßÔ–C¹õMotëáÜxøC»épˆxãŽm¾Ð
}ôƒiL	G„A®=fkŒ1ÉH¬§i-$„É¢“ÃE®%ÃN’’acF5.J–YãfàøF7FŽu¤cÙØ<îQ�vÌcݨ’aPÂIhŠ‰¢{¤ˆ‘Š|$$#)ÉIR²’–¼$&3©IG:R‘Ü�ä=BÊM¦’¢ìä(ÉÈU>²“‹ÿlä*¯õIWj2’§¤e+Y©ÈQâR•¯ôe/_IKN6²”¶<f0¹Èks—ºT¦3EéË\‚r˜Òä%+CÉLUò’šÈ,f6…™ËUJ3šÏlæ"±©ÍRr2•µ|'<ã)ÏyÒ’Ü0R‘â‘b(ÃÁ(FØN’5Ęq�&�ã›t5-ÆäŠõâ×"*щ”$TK(Ô0z�r4$ͨGC
Ò‘nT¤%…Ú_RÑ©Q±k-í"D[²R“f0EÉL§”Ó“ìTj‚¼š�áF�N
‹)Ù)NošR€®©J=êD[òR£B•©IUIN³ÚÔ­b•«UýêUW*%ª	5¤ˆÉ©ÿC©J�‚ª„­(e‰[[‚ЧŠ¤¢}ë]ñS“Þ¨EUR
kÒ�ž´°„=ì`KRÄfÔ­DU)Mœú$ºîõ4¥ÒL%;Y¾æSÌ«@Ck%&•µ�+!ãO«A.Õ²Q]­WOЭ½Djd}-nsQÍ’´I<uLi
W¨©q$Ãm­X/ÊYÑÊ„jÇ¥êcßêÚå²t%À
ãºKp
¬ÀË2+°€-çDTZ‘ßN)—Uñ!1]é’PZ“øSb€çfÒ©>CnŽ)Õ
œnê¢néÆjë¢.ìÆ.ËÊ.ì®îëήëæî¬â.éÖ.íÒî춮ðúîïoìúîð&/òªnîÞnó¯ó/ð"oï*¯íê®±
gg©U�‘kjf�.ɹ«Eôl‚.澦2C-lm0Dn§Fjjr¦0À0¬\„À.¬ƒþªÃøñB0
01ÀÁ�0„B”©VWçþÖFm¬1ØÂîÖ®êî0ëR¯ôò.Éb¯õÿï®±ñþðó:ïñ1­Âj
”€-T§×J8–lÍp›ÎÄs�„–‚†g=¦H=¬eu„ *-¼F!3üaƒšÝ;0­1,Ã-À±0Ђ00C-ìÖ2ƒŸ&ƒ.°ÞŽ_½Fêœö«×B04?-²Óü“2ðBjªÙ1œçÃÚ”½ú1;Ð?U®M%çÒ+Ã*<Щ²©jÑðhð¨wr-àp@Ï2-ײ-ß2.ç².ïr¯²l
´@Ô¬‰Bg”ÐéÃÚlUµë“Äø1†0ØÔ"wÖ"×ë&;l¤	Õn.r¤–2HH2%ÓqHìž20l0(Ùƒ7;M×Úÿk2¨#W--0ƒ¿*;ä¦#ã±ÁròG´r1tá7›³Ãž3/Ø-<ô÷¥ªBÛ¨*[”ŽvQùÞ.Œ./W´E_´Èr€/·ì	¸lÈfs‘Fb�UÍ”“\_€Š¯ZùVLœôÆÄ¢ê&Aà-�¦Y+-ÔÂ1î
qõjøónø…#±îF/†?ww8‰_8ó.ˆ£8‹?7ˆŸ8†Çø‰«xǪËâBGtí)R‹÷øÄC¿ÿ4I¤¯$Gj2�C0ä7;,2Fðïþ:¹0¤Ãþê/; fc»q?9MT@ÜšY.Àƒfb-1´ÃîåBÛª\ ?õ�’;
C.„0-ìƒ.à-;TÚ9#(_°°(Pry.¤€Ëº8‡¸‰oŒgøëšz‹Ëxˆ—¸t‹:ñöªË®
;~4öò".\+NäD‘“çNž=Ô§ÏFuMz¨R¦B�"uªTÿêÔ¡)rbÅ5ó¥G¯—µd¹rlÈd.¹®T	%K´k1Âmø–lÜŒg7ëŠKX²t
qeT,²^–%kHw|w°™%I³Lv€Ñe
Ù¹%ƒ.¼SÐ…æLRE˜ÚªR,,¡´O%uû•¥b�méÑHZÓyIMµÒKc-Uß}ù…ÿ5…H
=õÔ#¡ñÞ•ùãÓbÚ`,ñk^&nÓ=¾,Ž2F/ÿ™¶›�ý¥L+Ƹ5‘bð¢hÌ žÊ„A
L04ËX®:ÆcÌN"Å^1ƒ¡å†.ÙÜWRÔ¨Ù,Ê„+äÖÁuG…ÅYÓ³@2§˜-µP.°x`B,"…ˆÄ!‘‰DTâ¡hD(>1ŠS¬¢™˜E$Z±‰GÜ¢³(E*R±‹Z$ã£øE,†ñŠb#ËÇ.:Ñ�\db	JPD<º‡}tœ¯`r-„¬cm‰Ì~ÿvØ,ƒ-Ã=äÌ-�µøgvÇ°“´8“ÉbXP6aà-”q‹eÍ®haF-h¡"�#­ŒSbɧ,•ËbµLZÃXTµ†8ʇ@,c�ˆF6>QŽol#‘™L6²€ŽYÄcÕ¸ÄhƘM¤£‚¸<.kè¢eÓly.¥á'NN{_ rCü�3AS1øâ1À�0Y¥2„Q‹
]ˆÐ…. 3�ȨC-kÏf6#IÇU„ƒ)Œ²5™£Ak3}‘P2˜xPˆ‚ÌAØ¡¦dD¤MB¨0ÔQ�Ž¤££”ð”!€îÆeŽ*FBКjëyåTÔ73vÿŒÿe­_E…ΫŒšT¥.•©?yR§‚”4®"�ÛHÂèSŸC‰$X,ºÐLÒ€�êÂ@.úÂŽŠ
ƒœ©Ë˜Qvcå¡2PzÈ"
¸œnº@61P/ø,Ð2ÊŽXt&BŒ$^,ªÕ‹˜‰2²É¡–êGµ­¦s6'4†1ˆÚTMÎR¶êK[…aY|C”´(†_y�ŒÉ¶õ¡í¾þ…@u…,)A˜òƲÃCmõ7SÄÜ—¨„ §"’Y=oº(ƒ)C?׺*uÓ±\
0ê OÉZ1
dgÆnyŸY†	'S9±ŒÍc¬@uÒ%Šis%åÿ¨tû!Æ.h&Œ]¸§c6q*i{m#л*qܧh�è6ÿ7¼�åŸl¨(½œe¹v.=Í´WÿÉa¯¦­M˜™Üi&•ÛPÇÚÕ¼
öLÇà
^f²Yæ—,Jrð\³KŽv¨ƒæ(p0ÌŒscuìF7ºÙ]àx.Ýá F8‚ÑG|÷òn71̱:x÷»�æ`·½
~ð‚+<áÀÀ79þn{÷áòN÷Åã'CÜÉûf·Áþn�WœÞNx¾�œoz.ä Ç8Ìs™ËàæH‡94NŒ?»§#YmQG*",ÀZèD_ˆ°š[ô1cÆà…1ö´ëX–2‚E`
fDûÈ­ˈÞ9%q¾D.ˬإD1…éúDÃÿFšm2—Xû
#ßÖ³�Ç]îsc|ï!9Ç
ÌîšÏœð„ÏYjü£|âJ"œQg]ŒƒØ—J2D™ìH™zÞãDï0öyQæŽtŠý"ÂÉ_Ö�¢ä½úySËõ­Mòú» „PÂ^H<-èÚ§	‹2vAšíÚ=03<Ö!ådä¢4ÀPÇ.°›`P—1�ÑpÐ@I‹ì³ƒg‡É…eFŒ9Šº©t°%¢ØÉÅl—YPG)\3
ÃØ…CÔ¡Ò¡fÚ¯BþËøva|F¦Ï4ؤý&CB
d;DBä
Ø>Bºâ¢d"£4*j éf*1r!u(ÃIÀóíΉötˆyä¢Id»¢>Ë”ˆç:¼gpŠõX�5Y‘uYÿ•µY‘µ|\ðlF`H ØÁå^A.
w»BuW7z¡×v[7ÄšE�ÂÈÊ»<�/x—ERéÊr…zt&B)|(• 	WŇDWYX«Z B0Í0fÂ%[ÆCR)s‰„ ÇzëBuz©·~¬
…X¤€Û‚{׬L-{¸foÒ#»)}–x5X:=¦ÿBJy©’Ô
L8+á~Áƒ:oK•ã_ªVFN tl'R@nø|¶fRÈ69`kX`'8@¼Ã@e'H,+.ÒøVqj…GEX*]“y•±ò$LðsíF0j„4H[ðÄKbT#ÞI½jµW3Âr²no,¸÷œÞx!Ô¸WÃKƒÂ86�1òx²&k!ý�
�ûX�3‰�5é�9�ûx�¹�9‘9‘
9�ÿx�Ù8âé"ÀØró	ë8ƒÐ¼ÚÎ8öpm7.¢xþwA_Ô�昔óÂØ`¹,ì£!r¯
cfŒI$ŽGiZyÖŠÁ6b„øÂ06/Úîؘÿ'¢"â‰Býø‘/9š%Yšÿ8šù˜šyš©š¯¹"p¥�›Ùrõ‚h´„äØÐÀä‚ø£"ôœS+¼R«›?ožïøE¾ù’ù›ù›1ŸíéŽ/ù›ëÙ››Q!,è`„�-YIÁÉ!ÒÎ;çB�¹v§×u�Fz£4õž0A9º—kµØ¼Ñ£Ez¤½2…vCWMÚ•Ù)=SÚ¢Ô\ˆ£ØÒ¤O{͵¥«4£ÁSIxz�´§§7§Ù‰JÍibKz£a,)Ö§}E©+&\Ê‘£1c·1aÒ%¥/–¤£$aZ”ìÊ‚ÕºÒ©¿—¢úÈb
¬‰ÍEý¤J¢‘]A‚YX
¤Ïó¤ÿ—P«íúÐÆqshšE¡F­Gù¡Õ‚ꊚ7²¤­¹Íb@ìœ@zWïJïúD;¦
[AÚyÀ“cZd®C:¤-¶·<{³áU§!{¨Óú©G›²/–¨%[ÚJ�
úCÚ
…VQ³Uè]ÿÄñ^
‡„a
`Í

K´ä}ÞiÊù¥›fÄ»âP F~�ÐJdïÅÅSaLÏ@!÷J)â
©Ñ¤G›þD5ªÔ©T«Z½Š5«Ö­\»zý
6¬Ø±dËš=‹6­ÚµlÛº}7®Ü¹tëÚk,Y±¼{õòýë7pßÁ€	.Œø°bÃŒ7^ì82äÉ�+K¶Lù²æÌœ1{Þü¹3èÑ¢K‡>MµéÔ¬W»V
»uìײkÓ¾=;·mݸwû~
Õ 2fÆ 
+Œ`ñb·â:^ì9AéÑ¡S¿n=ûtíÕ·{ïûwñṓ?o>ýxõå×»oý{ùñÙÓ¿o?ÿ|ýõ÷ûï ~ÿ	 ÿh`‚*Xà‚6!‚>wË1ÐÝ"L†Æð¥—^yxWˆ"ŽØˆÅ¤óË.åÃb8æcN:Ĥ#£96ÞˆcŽ:îÈc�>þd�BId‘F‰d’J.Éd“N>	e”RNIe•V^‰¥Ž0šÎ/¿³Œ0Ç,W�^™U2£&Tm"ôæ‡kÆÉæœvºy'œyʉgŸzúÉ矂Jh�€:(¢…ÒI§TáHbÉn8A†f˜AF¥šfÊi§ž~
j¨¢ŽJj©¦žŠjªª®Êj«®¾
k¬²ÎJk­¶ÞŠk®ºîÊk¯Ÿ–q†ÍÐÃ�?À�T ¢YšÎ¦	­›ÑÿÂ9í‡Õ²yí³ÒnK-·Öz‹-¸ÚvKî·å†;•9�BAFRp
o¼òÎKo½öÞ‹o¾úîËo¿þþpÀLpÁŒpÂ
/ÌpÃ?qÄû+E=ýàƒ0Ëœ‰Ë·q®i.U;‘HrÉU�ì�9”¨!GW„1ðñÊL/Í÷Úl/Îõê\s¾<Ïû³¼AÏ|ó½b\ñÅ^d‘ÅLKѼAoÁ³Î6óÌG$ÛlM�S�/Ø\MoÔd³
5ЈA6½0†‘œMM$0·-´ÔD3Ü…�Px$^çsWtñE_DóÑYxÆÔcß;ÆÜ�´Ì8ã-tÕbÿï|ïÝœë¶Ï¦—ŽzÑ©ç|ºêøvq?§ƒ®AÂ0‹ÑWAŗɾÿÎìr*³ìrê?_
úêɻκò=;4ó6{±
7Üt“
Hó
Iõõp	ãñJAþâ_|ÁÇ»õvÑÅãL¾‡Ôts7ÙtER,þöúç+.>©=�](ŸÞFµ-�Oh
˜jli_ߘö)ˆ!jŒ³Y¾0…/į7ä`Þh–8¦ñðsë£7ê¡
j
çë‚¿¨‡ùÝ£ze@ƒiVÀ+`AZÐ!½®°µn\O}ðº!½à.<‘fc� ¯/|ÁW`›Ô¾P
Ž�fbÈÂÀàE�P2ìáH½¶‰²uÍcÞòJ‰ÊSªr}±›¶´uÜ¡+*d¢Š,
’\Ò²Q¹ü�/ÉÒ;©/}¸‚ê4·¼ã‘r•ÑƒÞ'Sù<Smsð2›õê‘
3ŒqÐ@â= 1˜E¡‘°^6 q)GP±nøk„ëÑ
h8
h g$ØW…ùÕcÜá=nDB}|˜ßÖ¡=8b‚öß	©ñ=nlhp—®àÎnpÿíXðB# a7fCöËF#
Ðúm#YøbA·¶
GhÁа^C»°F^hØF7H
�A
ÿ­Ôí@t&p‰Ì,µ”J0Ét¦`Je)äUŠy�²’�AEemˆŒÉ:²!¯¹ÌŒ®}¡]üÖW¿ö½í5³�ˆ¯Vok��‚æ²0àmd#Wx'½˜ÓÛÞèY蟼¾	=†5a
³²ÝÀbxD60s²‡1äì^ö’f³Û0#dð˜§-¬«60Äj?“+ø®½í
FÝ~ôCæH†_ŠAŒãH+âM“³›
mjGû—Ì8Úo—…|uó%5­?M(޹ȫþö½Ïýìc?¯Ú®e¨i’‹³W­õ³ZË̱3ë· ›iFõ½ø™×Úûï¯ÿ>ÿ·_û6óbµ¶[Àa0³\€WêC3F:8caÆU6_f¬³lzó6ïGgòÂ�5£€:ó.Dtfgö\ƒ$H�
ôà§{ú°{ºWl²ãŒý ;Ó(�ÕH�×h�Ùˆ�Û¨�ÝÈ�ßè�áŽã(ŽÖXl¡øŒÐ�Ì�Ñ(� ØðÈð�ºŠòØŽóŠïˆŽúèŒçø�Ï(�騎ûh�ýH�9�íŠò�ôèŽ
©�è8‘ÿ¸�ç�²‘I�õ¨�¹‘;©�êH�
.ú�_!¢
A¢ 
™¤©�k‚ž‰Â,ÿÉ—Ïf+
ª óùœ}Y.¥ém
*˜]‘ ÓR¤rÙÓy—–‹MJšv!^ìI.Rj£Uª—SŠ¥VJ¥WºŠKŠ�‡"(ËrŸƒù¤ÊW†ñ	¦ÝGÊ¡dZœõÉ¢J¸Sžlú¥Ô6¦q*K™›Z¦nØž;*¨jže:¤bÊ…'š£^—Çç�W¥¼	Œ]á‹›Y©_ñ
ƒƒ€ˆ~0ÌÚ¬ƒ�ˆ�‰@ͪÖº­×z­ŠÀájŒ0®ãÊŠ …ÀͮήíÊÎàÍà®Î�òŠ¯ùª¯ùúýê¯ÿ
°Ï0
+°¬À
Óp°Ó0¬0
ë°;½±½à
½@±[±{±½
¼ïzóêàÚ®Í@¯÷º®òJ¯ûº¯ÏàýêÒ`½Ï`½Òð«°‹°ß;
Óà
ë
±+±{±ÞÀ¾˾ê;¿#ÛÀà¿)[¿õ›ÿ²*ë¿þ*ë²Ò²r[·[‹³K›µN»µ£(¶R[µr‹´ZKµfûÀT+¶<«ÀÁX‹´¬µKë{l¶h[¶rÂg´&|ÁJ+Áà´œ³1̵4k¶/<Âm»µb[µ*l…
l…0‹Ãœ»@#
ë°ÞðË[­Õ«¾ÛÇ,Ö"KÑ|µ¿pÖf|ÕÌÖf‰!ÌanµØÎæ×´h×òÏàŒ×nY×ë¬×w]Îà6Ïy½Î�Ý]µ”!rµ&U
òßñ*
ï}¯¶¬Ê§ÐÿʯŒÔÓë¯Ó
ýª½«à½nÕ
‹Õ¹ü°Û°Z½Õë%³�Ì¿ á³à%a}ÌIJ®²h­²/;Í,·¤øšs�‹&~âضk9×Ö&Øáâ-nqØä×ðü†mãâæâî,ׄ}—É°·d«…¸#¸Z 3` 
åMÇ
xp¼áz¯ÎPy
›îÓ΀ʌpÿ
Œðé
ŽÒ�õ]½Ó 
þí‹½Ò+½Ò ß´¼½Û;°;Õ;
ëë	î°Ó ±
±ná.ÖËœ"~²'û¿BÌk½>îã(þÎ/®ãÖ®ís½&èÎ<Ž×ºÏ=nÎ×Þí4Ž‹×ží;΋ݬí土X8žÇ‘J\á
_
y0Ü
¿Î݈Pð†ðƒ€Ü‰ ÝŽ Œp+ÉE ÊŸê

q€¯vÚ
I/ß+¯ßL½Ôû
ËÒ°
Ò0
^O˺,Õ¿®àS�àd±Þ°Ä,ÖÉŽÌð̼0r/_ÍÌ|O{×vÊ™~OŸh1|¾
Óà²°þ´öëßõ½^Õc?ö
~öç»ÿÕÖ³
ãULX1ŒoÃÈ1ãG�!E~<6ÒäI”)U®di²dK˜Å^Æ$Y,Y2Œ/o8
ÀÙ)¨š1bäò)ÒP�µ†pêÔ4VJ;“vJoÞ¾¥ÉröLšñgÉŸM“%‹+Y³¤ÏšF}úõÿ^³²ÏúÅ�û/ðÝÃï
_>áAbÕFâÉ-»¨'Æû6ufL¶?dü2Z†?ÿlâïÀ
(Î2ã1Ì`‘
ÝÍ5¨šiÆdY%¹#v‹&¹â”{æQG‡s.:V¤ƒn–N§©n:o®æ;ÿïÀû<òè—aÀ;o¡_„IïVav±UW‡Ø+†‹*œi&erÚ�B�Cš6<æ‹Åo¿’ mIÄbŒQÄ	;ô0Ùc­EvÚŽî»—‹’I'Db
�æFà0š5§6ä7¡ÚiE é:�hZ›
PÖ
�í7µ…Mm¶“[šÿ㌣›îi¤uoQe©Žïë¤+Õ›^
×îÂWÜ<ð
"æ\"†=[y¡¼¾úTªV§Õð£cÁí\Ò»]ôd»ÕP@|–?ŽTý¤C¤ý#m‹)q+²ˆ"_„¹Ø#)ª¸"
�	Æ"0"�.ÂøQx>´
T.šDÈs«ÃÝÇõ9ukX
R�IGÅ+^(wÒ2F0J‚.›¬+Ë€¯!8Šãà¸F9ÎQŽr€ŽzÔ#Ï
pä�{ä ùH<–‚¤ Ñ!ŽG"Ò�…l$8Ð�Èrƒx¼d"3©HP¢á å09T’�½È$*]ùJW†ráF8ÊAJ\ÞÒ–æ�e,‡
Œp
W¯žÍ®kQ¼’ÓÙUž¯S/zåjV&Š$n5odÞûz+¾ñl«”ûÿª øªnBdewÜV©Q�­�,GÚ\åÊ]ˆM/ØAf$6ÏÅ Å2vì!3º—# •0ƒ1ZùØóvùé,¥1Bc(ãÇ ZõE“p�~‰2Œ‹� •¸,±³„çkÞU{ÚÕ5Q5Š[½Þ[Ï:×»Öu¯yýk_ãÖÂαíll_'{×ÆF6°�ÚÐâÂÈtw7�[Ô�ÈÔÅ@£„òj
…V¸`
	Npw¼ç]ï{ç{ßýîwü=ï�¼à
xÄ'^ñ‹g|ã�‚¤à) Ap±éMƒ×[˺ɺ­Ü	aÝB
œœOLÇËZ^X‡]
cÁô¤…ÃäS€ôT�d0”#>eôÊ’�v3†3B†,\Mš¬Ð LÊÔlJ
åP
•M¨üПÑÖ,ÑõP5Q%QMQ%ʵÐÕ„Q¡œQ_Œ<Üì. {§€Zбð´8C§Õã…lGaÈxЄŠ|ˆ5
,c,8'Tïò?˜3�õ3b„¢bÙ
‘ƒŒˆ]€dØ…¸eÀx¬1a–Á‹°@5'
X‡Ò8Ëìe†Ç´ÌxTc$ãÊÿ…eP`L;'ah?FqEßÞ®<[˜¯oÃéÎ=^ã¥9%’8n�²Óâc„Ã	iµŸ†b
äb|F�_]øSâ¯�eØ
õwmϪl€H@³XÇŠñb&,¯ƒ•%& ¯d
y±£ÅŒY°eÁŽy\V옰cÀÔ£µŒ—°‘µn13V¬X2š3oʼ©säΞ>gæt¨3çÏ™5‹îLfì¨Ñ¡3[>Å…kʼnªUQX½šõV«]·zÕ
vkW¬fņåŠv,Ùµjß~}›5Åظl³–•{wo]¾~ÿÞÍ»•„T’Ë„AÕYÓa²t
�l-eé+ãµ
¸�%�Î\>Í¥?%Ï—nôwrüÈ™úçR�ÙÇI�
€ 1½sK2Ê|$]c»
ˉÅ
À.£n.¯cã:
�0¼æ;ñBXdÇ@dÓ�?MK,œÕ«d|É9T`1"UwbIÕ­º~¬šaÖš¥˜#Ÿ¦y‚éúÕ¬¶Žy¥Êé}²Zta7l›Ç¥j”@6ÉXœqfXu€ÿg¼�	CË
¶$k*Ý>)·ªÈ�ñä¨öLçÃùÕ3ÞHïÝ‚
2¸_Æqò2’Þì3ébT:ž
ÃÌ-ÇðÎKEóàLÁXÊ/êœpÓ@ÝrKœûDôM¬çÕãdyõ?u“T,´¸Ì‚ÿ…rÍ&ƒ	˜Ë*›/¦Ì�ËÕ>̆‹ìþz'ß1ÄPÇ9Mä<&Y
ñM1œG=Ÿ0å Ú;aÏÜ&¹b='1ÇÀ¬ ¿Á©O|iY_ø°T8÷Áod¾Â
{¾â¸aE¦YH™žS$–Í%Gz?Á
x¬&b
¦ãÖ�Jâ<¥€k'±ÆÂjbF›ˆÄ!›I�±˜ÍDá磽;^ŽXUœq4% ¼i¬A+éQ1��© 2‘Š\$#éÈGB2’’œ$%+iÉKb2“”4†-¤bd4¯$à ÉÜà„ ½­sx*Nù¤±t$c!Ù‰P‚Ñ<Ý��Œã…1@¥¬…ñìXPL¥µŒ9ì]±‰u¼ÛNÿ>$BR“Òœ&5«™É[࢓Èøä‰tLh±Ð›IÙãæŠ>
)B½¡	
à­›
¤€.`–1hNg}.iÇIê9iâÐì)ÆbÏ©âsÞÊÐS�®‹ŒYX¦d©àED$�ÉL0fÿ0ŠP]‚Z‡0ÖA
è"”
Ài4‚�”´ð‰É‰gD[$¶’ª?Ó-~z)ª±L÷;Îî×Zº¤6µ7SK­jKÛõ¤¶µUéÛnµÒìÄö¶D”íýzûZ×v‡=Z�­qó+ݺֹ˥Ù^”k\±0÷º'hA'�y˜R
M ƒ©@8”fÎDlæhG0æE¢×$¨"[«Í£(C‹ÊPFy
j<c솎§Ú´–Óbÿ‘óŠl•èY"­»ö„³™Ù¢_3”:ƒ)+–Š  ä$Œ ö†[¬Y¡b”¡täKÀÅø+
z“/7�‡éP2r‘‘ÉK‰ÚÐ-:à[€¨6ÄÆB’1T�\�†‡  Â’¯uê0¾,gÃŽ|PÊe–Í(D¦Ýðó=ßòjfñ{t¦;?“Д¦tº
�nGŽ‡á†´vqV©4éÿ 
ë“G•XèÊYŸ(¢°˜ÜS+SUhWb}S2
÷“Qw4eÍÄyÆ0!/`ÂŽZ\V#¼€ÌKÈŽ#æbRI› Ý’ÃDn5‡¹þm.(™´ôÒOì‰1àÆ
& Q„N bØâ�j  ½ÉŠ`nà	:	ži‡pHI€
!HÁèOÐ�y)FIÇ!Æî�„ùÙB	§CB¨ƒè\o,LÐÂÿ¦ÄŸ§|Æù­S1èÎHÉçÙQU
I} Íÿ…Sõ«DÏêI/áÆ …v`f  •P²à!�Á¸Ú:ÉP÷ìÄž€.¤ Þì õ­` j" ²‘0P".ìLžEMŒÀñs�×1™¢ÀQ_f1‹öh%
-jQ°y¥Þ� Ÿã¥„¨ƒÖôHD,Ø�œ
bIbÀLì?ÃÖÔ1 _-,B`:ÏJhŽàŸ>Ñ›=ÛMˆD,À›¨ý©DÓàh(Ã3)CF�ÑH8OKd�1l^¨\`�ii•Wùãüüc@
ä@®Gk±]?„/ÕÄn�ÿÿÉYLa=ß®ƒÖ$<,Øj`Ìî<À¸Sk\LqŽ�Rî/iD;¶Fý„2ÜBBÈLÐcF\ÄRC˜;Ø‚	9OƒðŽû™ÄÄ�²™|0ÆräcO`F)Î@š��
(FÐ¥8Æ;Ìט¡Ö„Õ
D8Mkâ
F
-è;(C,Ã2ÄÂ;Bæ¢,
º
ÒÌS=ƒ:äd)¨Š\Y2@N%…<m�F+d(m$LÁ©¢~GË­€ˆZNœ–]„¥u…§xªØŒ‚[I©É›0ÅÄ™K:øBlOj¨.|ק<‰zäž×Y§_ÚZ¦-.”9Eϵ
ÜPÈPšRÀ!Ç5Ì�P±5Ù‚
ÿ*é„G�¦:™îHëPFã
ë¯+±¢«®Ç7¥¢\òˆ\I•VÏ’´ä)2Å‘%ÓBÙ—jMˆ—^}ÑÂüÆ1èÂ
L^÷ðÂ
ä‚¥æMí3ðFFºˆc4J
bìëÄÅ/¨…Ùÿ
J’`S	tX£äán‡s&¬wîÊ¡‰Ý©âÖ¥5Nì9îä.ìñEnæ¢êWHE³(«©
{QCt“bL‹ÌêcÑœQÊǾÁ⩬!k@÷ðbÒn÷gNU¯œq…ñ (ñ13ñ;ñW('±qWñGñÏéº.¦ÿfÎæñ¢À
ÿwqïrBWkƒqD?±DS´CÃq/3;ô(WtG?´Cgô&ÚæTIç”°ƒã…JK4¢OäIÙ4‰3±I<2U*E43äJŽ
ÅlÑ87ßO˜àÀ
¯dôO:Ï :Ë`&3 *Ù±p¶aƶt°ó¥Ãdà?Ç‘@ô«&/[407±I“uIc@;¤Ã2´£5&F,§ÊRaUÆÄ!#F]÷D,»µž,¢ÆŒ[ç5ÜÝ0CTyïÄøQ‰Ö¡*DÙ
À9äƒ;�ƒ;Ø79à7,з~ûC&T0€©ç¥l2I)ÀMp20k4[ŸQÈÔÑ\ÏLd0(V‡ÄHcÙˆ�ÌNö2DcÔ&hpœFDX&<LY½i.Ø„-Åddãe PF‚FDäNÂ
{siÕìñ±Ÿ'º�å!iÃy§¶!Ä­„;�.½TMyïbä%pûŽc„¦¼´—2T
Ù¨õ3C‚O:D&¤´ƒ@è‚:”w‹”YZ‹£ŒTFE°ˆṦCãõËl˜ø˜‰f~­Æ·®òò˜eˆ“‡º C;
Ô,@³o1hm”€Œ²O•DZ® É�£™{Söz(š•ì~»ƒ\@à79€@„
#Çÿ€ã3À!•œ�B>¤éJëHüFµ.Š†ˆæ½Æ‚h‚¤€w™a,CP…t2 <*„À¡†G²ºžË†ÂC¨¿F.D;¤ì£Òˉ0[ÓˆÈÈ…>ˆ@ÄïPIq;C
xC;8–;­Ã:øB†®€X©@TžÀÀ
°€
Ž¯àâœˤOúؼ'N�Ž|C}Ó¹;¸Â
@˜°«ÉÒ©L¶LØÂeKy=¶Ž˜²§Äà
Ø¥X;]xµE«ÿ0ªG—c¨@º\ì¦òª[Ö0¼\NÓ{º.ë1a`ýª¼kÝ®»ê

†¡§lˆ˜X®”Ȇ&;Ê6’cŽ¹ÜœkN¹D]ôÐEmÔÐHUîPH)UÔREÅtRG/åTÓP%å4Ӝۇ ‚²ÃN ìÈÉ'“JfbÈ!Âé<5ri½û`º>`Ë3É¥‘’ZiÁŠäÕ¥Àh]ïÈŠ„Q¦^”™––_�œì!¡,¼²Úc˜ñ²&5uä–B†>lèJÙÉVEvc“™lgœHÅzÙÁÅË7eJÊb†’ÈÉx©×uÃýÑÃiÑK‚½Éj—Ñ…§xJ�gÿ+™?RƱ
œŸHº“R¤/"éZHRŠµM Hó_*Â?�ÃB!`€“œ€¬Yoj¦Íã,§›…UËHа`8,P*qˆ3Õ¥^«Y½ª0OÀÕDõÿf0#
<öñs S�i}E;5qƒa¤ãOJ€ÀJ¨Þ|J«ËX‹J³a†•©Í+RaNw´£œãH«/ÐÚÜ dˆ€2yŒIN4BžDe²ˆUŒ•#/Uò‰R¨�O
粋��ë'e€0`Ä‹
Ä‚'
aØÑÕ0†ÿ R›K´J¦uø£#ùp}Ež‡ è‘tJ/i¶À˜ÞLŽ
eNT6�ÊÔ. ©¸Y*Êvl3‚ˆ—:™N:ýq	Y‰ç~kû'fѤÝ4EaÁË2Ê–±x(e™Õdb¨ÈF$ÏÚÏ|‘&b`5í%³Å'nw› ìy�ÃI;±N©ŒÜŸÖYQVýñ¬i]k[9T™úeXYÐÝ;ã
Šó¼ÀpøU­*d“¯yǃJùÊUÞòA½¼ÎÍU9¬e½Tæ°`à%ÈDp�;܉²xŽq‘~îr9&cYrZp‘“ 8-[
	Ð
Æ–"‘)…4\b/™ýá_½¤? —�Ô¦ýiRsú·"Úp’Ž~*}å(“}Ì‘Só[ß÷Óm.ÍsýË•Í~eÉa�è>^�}Q °(¯&RŸŸeG;õîÃ�<ß«4y�Ójùb2
Ø#îQÄLŸP
‹ÁŽVÀI}í:°â}"¥ñ‡e\RŒÔ+F2Ý}‘2t1þÇ+Cn|¤£@­ù:ïiØý¶$Üõ`b–„릎Fcäf�À9~êS€.pÀì©>p
;ŽÆÿ‹g¸ƒ*ab¢)
à©X€Gp
’CGp7¨N˜¤ð©H`ËðêYê|­É|Œ¡aá"Ù”Á‘t„oV-%2«J4dnÒ†WìDì‡ûP$&ÏZB†Z¬%.¦'ÂBCJª
ÈVÐ+ÒNäPä'Jdò(E¸NîÆOØá["Í~Šû˜AzâE$FPÄ/Ñ9MÓtEßg%CÐVñÃO~d#8±ù"
(M–a¬M½©1]Ü«áÄO\ð;졦µžëÅ]®«ÁºÉ›«³^ª¯^–¯ž¤Z¿ËÞ¾í»¸Ú¦Q¼¦ûA¬
Å
Á
\Ãñ›«í»ìß=í§Ù>Ô¯Þî?Ù¢Á½×Þ“:ÿñ!Ì¡Ú힦ÿ>§]Üêµ>§¡Ýì«Á:œêYœê]\ªß}ª§úüĹÁº%9ÀeZëÅ=Ô)ÅùÚÞù‹'—j„˜£�{q…X÷‰^l0úþ¼±ÿgè} �»‡
»†kI@\�¹Øwùáë´ÙÙös¾�¤@ö'=Ôü{›ŸûNˆWØô²?é«6xÃƃ¥7
5Éâ—…ø{‹„û¦¡Ýž›>êËVBŒ Œµb×KÀ½zöjãf¯7mÚîesXoÛ=mÕîq{xÏZÄ‹¹e¬qc=ˆ
ë�,i�›Ãˆn\x�ßB•ëuÜÈíÞE�4º¤8TÛÉ—wÿ6ôxÑèņïÍ£ œ°bX³6À»kôúáä¹ñ`Æ{$}jãí"GŽÕ’Æt™­)O¡<í9½	“¡Q¢ò4ZÓx휀r»x1[–ë±bÉKžL¹òäÇŽ/c�Üs2Ϙ-‹],4dcœ³¦N†ÚtãÔ�W#ýZõk×´'³ŽŒ:7eÞ«%ÏÆ<«²Ê½u+÷ÍüwVÜËsC=]têb­7CÇ}}såîX‹k}ž3xò͉.��²øó¶-ãÆÝ»þzÕÉugŸœ?¾äÐêý'Zu¥i|–ÝW›f™5X ƒ
rÙßÐH'­ôÒL7ít·ÝEýôÔ²böX-Tg­õÖ\wíµÎÂ$³Þ-·,vqbSÈÙ1k·í˜Û¥ÁÍöÛtÇ]÷Üvç�÷Þr÷}·ßzÎ÷ß„^øà†'Ž8tµÜ‚ÙÆDîàä_Wnùå˜gžù1ÇCŒcÇó˜2[�©ùé”	#1˳ºêŸSÌëÄ
Zð‚Ì 7ÈÁzðƒ ¡GHšð„(L¡
WÈBb‚˜¸�$@±ÎÑE¨ËfÆ!‰6X"q€ê@Ä:
s™Çl¦1Ÿ)Íd沚̔e6�©LlFS›ßäæ5ÁIMrvÓœãç0Ã9Ísªšå|§7ãÙÎtÖs�ô´&>ÝyOxòSŸþ´'@çùÏmö“ 5è@ѹτ²s¡òdh@JQ,œAþà‡?~‘Žóu¦1õ¡\™&žü˜C€n°Bö°.¸ô¥{x©LgJÓšÚô¦8ÿÍ©NwÊÓžúô§@
ªP‡JÔ¢õ¨HMªR—ÊÔ¦:õ©P�ªTqº…,ÔƒøðG8®Òˆç4æ‰O•ÖcžØ¼«¬["ëY×:/´º•­jm+\Í*׺Æõ®tÅkZóÊ×½¦UB�1‡$ä2taªˆM¬bËØÆ:ö±��¬d'KÙÊU
Ýè?öá:®6HjVúª€FÊ´“²á’W°¬j£ÚR›JA
.miº ØJu[؃F)†ÖrÁ·.
ÃM…KSàÚ´¥È=®„+™âv§¾M.t_†0xáÍ
ªt¹@\ç÷§[ú°ÜèÎÔ¸<�i¶pØ¡÷½>méÿk±‹^.Äô¥õ%ê}ñKÕçæwµ
¢'�	¯µê'eÌÇ»çxÝ�èeÄÇ]¤'{%—€ûõpž¦Û@]ÿ]{Ê—{�À÷†[a0Ó7e��|®G\•æz_ Næzcà[R
¹„éR{Qp†×½Gš”hró ff`™1‘xØØÐÐ
F�š)Q w¾u—ÿ¸
ä	�I
`yg
™×7eY€�“™
„Çïø‡ˆ@ÿS …H
î©’BØ”49“-•Ni¢#ê’VI`6vW©ab uùQ4Aa'–V¸“G£lœrRj cY�”M÷’L¹†%
„+y¢J:†í8g‘Œ&GœŠ€ov•e�€!·
‘0[ãæ‘­5jÐØ„i�*¡x¨Ÿþ¶|Qfn‘@s_ê¡øÕ‘pÙP{'™|H
X€�/ᡪHeþ¦f³eP	ÙµƒaБ‘€i[`�©‰‡ 7gRVS‘x¶õ†‚gss¶Ô¡yH
8áå6|Y6w.htvX&׈„Š‘Tö¦™†¥jp8U‰ÉH¨%‡
	ŽÜE–:^ÏX‹ÿæ&r1˜°¥[ɸŸ«8njFc­éim	¥Úà¡[R	¹‘�§fʆ‰r¿:„zŠ{Š¨ykxƤ!Š¤$ú®SÙ®FXSHX`_wvTÉvœ”Lű¯Z˜…C)(º�@*}0¤:¦Fš¢(š¤òÊ®K:¢9%™
‘
T`T–Ž‘`«5è¬ÿ©†´º
z`S_à•"'\X
ÇR¼GŒX˜iŒ^€ŽÐhdÁ¥I	hx©n›©­ÿ'×H—_-•‡%LJ�zá^¼˜²~˜
h�S hØÀ‡x8g‘
X0iÂI�Ô€­É‡U ‡ž¶Ÿ)—«¡ëÕ²1e»Å“¹™¬I
>¡‘¹©Ú�
Cª§Sö‚иŸ4{j¨º®Û¤î¯+±+nÝ�„ý@ÂV ;:£0ê¢2…í1£"µÎ!¼
”;°Ð;'\Øá@	l °S€t
¶½K%^“Ë
‘�r¡Šñ¸q�`¹v(�R È÷{€«F
¾ûøIŽ‡´öØ©³z�¸7¢jˆ�f¿�Pz’Æ‘%±
+5‹�à•ÍˆÒgzëupú©péeþ¹pÿ\
�%Ýp¯Åh½†ˆ¦m؆·Ê‘Ž‘yJl‘ÑÔ¥áY¿
þ…	âÈ+¸B°D©Õñ�!ÅP½AúßštïöwH•u»ð•Öÿe½ÖhMmj-†o�Öë\b0JW Qà_Ràf0ØÕŽ û‚ãåsp¹™·™«·ÆŸ4
·b‡}f\w=̯…t³µ™“VSÉù`p ¤rä¥`PoÑJz	€V¹Š»epäUÖ45ÌÃL^cà�ô|ª¨Š›9`
qÐ|`ÎEmç•Õä=…é—…TÇÊ�áŒ5‹“UéI_¤žé8¶h� ÏPÖ|whrné²¾TyÞ÷ t:Ç9¨aÁ °ÿÝ!°Y�øJV>)vÄËÉ›±²Ñìž�În4ÑN&5ÊìÐíÏ>b8J½’`	O *%ܪøõ�Ûæ~îèžîê¾îìÞîîþîðïò®ŠõmÙkLïå®îÕ•ïã.Ûã5^õ
—¹]Ø£´[z¹\/ˆ´	ŸîõÎÑm]Ö•Þ凹]îˆ�î³U]ª˜ÞãeݲmðU Ûè¾\ä]ñçžïñÁ¹ïŸòã¾òý.ò´ÅÞoîÏîOïç.Þ¯[³}ï³}î�Ûˆ}ó¹½Ý5¿Æþ>^‘ý齊è^[«8ôå­ó&��å>̺ÜŸõâ½qáÉšU ›ôZµÕò�ÞÿO?òA?îœõ9?ït_÷v÷xŸ÷ª˜fpUöл¡ƒÁ€¤þAWìQ£ü!R�¾“›Â¢Uã×�ø<鯔Ï`–ß„š
Õ‘à`j@
ó`ë>Q`\wú–úª¿ú¬ßú®ÿú°û²?û´_û¯ú¼‹ú¦ÏušÅ5Áû¨�û¸¯Ô®Ï»ú€ú¾úÉÏ»©Ïü¦ßû¬Ÿ„\§ÔÁ/ý»ÏûÍ/ýIHü¿oü­ÿáÉßûºßúÎ�û©OýÂOüJ¨úÃ/þ¹Ÿýæßûèïûšeëö¿ûîüµ?ÿÂ_þñÿ
fÍùàÝÐxùZ¶ìןhÛºýFýwâ`Ù™©›ö§ÛúiÊ”
g^¸>�‘÷YÆLÚàsÔ§
gGø|ü�§›‹¾ûšº}ÙÿžûÆç´
Ä¡Z3Ð@CtñO%ƒ„sJQ•TuÐVC]ÔTA=4ÍQ}êÕEì°K« ìدT´“ÿÊ:¹BUF“}ÖÙK•�¶Ù7«¥VZk—…VÚk§�öÛm±
—YT-�Ô´MtØ!Ÿ¤ÔO¶¦t7]"Ùµ7_}÷¥
M{yå7`�&¸`¨Ð58á~‡xÝ|é…×^>†X^…/VøÑŠ1NxcŽ˜ã�UÔŠ��
åK~÷d–ŸtùÝQe6ä‘CkÆu}\UF_E±­PÝÕÙÞ }F³h©pìÓ]¦…‹Æ¦—–Zª£“ª±««Û
ÙQž9;l�Uƙԛ{¦ѳe–ÔÈ�§…”ÐxÝÜÙÉ2ÓtR°¢–;`�qvdx<î»ÑøUÏ&;I&™Ô»«Æë½ûÿщI¥¼^Ë3ߪrÏ17²çÍCŸãCa,ºhˆ“ÙZ騲~õ«\ͳñ-;åw÷9]Q/G\p²‡¯¹åâa>žxã—GžyÃ�Ï=­Èù^UÎ}Ÿ™ëì¿þaÜÓ.}¨µ«[w�Ùú™rE“*ôÐÉ~yE»ƒŸ[ù›×�Ø}õqÍÞG•Så_ñ
!è¼�M�_�ëܪޖ7ú1lDãÛÄæ¸Å,zùâá‡pX±	¶�„{ÚØ1„½ë„¬zß×bH@NÑqûÿÝÌ §£
nÑŠ\Dàüt¸®
ÍŠR»YŸðõÀMT²Cß�\'»ÉÁ‘�'š]+G3Qsô‚˜òš7HA2y‡dž!Á÷9ú±+‰6ßµWÃtEîp•ËÊøDTF}‘w
Ó ÝHì‘®nÿ¢ɺ7HXQÒ�ôèzæ?P
ðŠD -iIÅå鲊¼lð$é@Y^ÏEs%Iy/ð¡®”À½ŽyÄ"-²š!ƒ�þÒFÄU¾èDßD‘À)ÎpÍœã<g9ѹNu¶“œ„DÕ•Éé.‚ðË"[ÐD1.RŒ.Ôf%ÑG8ñÙðž†3›Ñ®BÐ}Iñ�þl`,ÿUiÏ—‰¨}翸Ñ|ò²‹XÔhHAŠÅèÅr™Bë$>fK�­…v`¼×Ó8Ç¢ÙYltì#?5žö4æðiPy
Tž¢ƒ¨@EêPƒj¦ö”©L%ÆS£
U©V•ªW%FT§JU­R5S«9ÂJŒ¯jÕ¬_EkTËjŽ²¦•¬Y-ë[ÛšU¶ÂU®o%+0Ò
¼Æõ­É°+`¿š¾VC†=l2»Xb$Ö±�}lQ ;YÇC²”ÕÐe1»YÎvÖ³ŸmhE‹Ù®LÖP‰5eL‡’¢®EÇRŸ:ÔÖú´©µ=ªR¯b©SåíOÅZU­
w¬¿å*qÅjÿVµ6÷«Ã}ëpÓ
ؾÞ5­×½«]±;]²
V¯ŠïtÅ«¡Á’×¼à=/z§;Zö^¥½‡-meA«Ù÷Ö×¾÷Åo~K

ž´ðà!˜aÜ~ð‚#L¯;Á6Câ]y›!f8C ÊЇ>â$xò@´8Æ86ÄŠcœˆƒÏØÈq"
qCìØÇŠ¨ø‘“¼d%#Ùãwr3�åf0ÂB¶2#T.æSäÁy8EÌÁ|æ4ƒyÌΰ9Î�1ç9¿yÿ§xžƒ>ô;ûÙèþsž
èAzÓ(ô¢{Ñ‹a$ºê¿è…£1Ý‹LwÝëËÍjVƒ1k¢|•Ö«6»[çU\kwÖsµµ9p
wV¿ÕØ©¾{Zï~vZûí¶ÛÓ.øìºÖkÍ{ªCíëÃËU±Ï=5`5ý

°£
¤Å¬û…]
ÀÏã<×낃ô<Ôã‚/H-ÈÛ;ÈÖSH„4HÛ›=0؃1àƒ/0¾=8¾FpÃ7lC=�ÍŒœCéA84
¡¨Æ	Â…´¸IU¥hU¤XÕ´xÕX�ŠW-ZE
[½Õ ÁÕ\•Õ©èU`EZ
ÖWÝšbÀaHÖ¤¸eH†
ZÕÕpJÚ§õÕ¦
£%'©¥
¬EÖ¢�‘V�U[]UuÇ XËNY`
¨å
hèãÈ&ØæZ–€X„Ý„CÊ}„?
@)ž¦…{€èÄkÐD#0
œ~'•ÞéoîD®&™f§w:îÁdi?¾_á~î—nômd .n›FД’žŽiEæîN”«à�=N

~
ðñ9C€nñ\hOôÄA=mócÖY)wm÷dÅè�í‹ÆÞ¯¼m`Ø…®KËÜз´¶[}s€Áw}Á!$Á‘!âw™A™C%7'xG.d2ïã­
%Vm“�Õ
P„!X„9\a=C
«¬/ŒÅ6rܘ¬ØÇ� GŠy¬$È“$W&S‰²åK’.SƬÉò¦M˜Å–mä‰Ò'Hc1�~dér¦ÎœFmvÙ1Y:
€@–,f
xéR…
AˆÀä
H�{(\`ÁÅ
Qp—!	p.ðÁî¨À9XA`
ãºãÖ˜ÿ0t¡æbÖÅ/3$†Uh„àPÇ$`?hD ”°Ï$Z
ÏûRÀÂÊ(@!
ClfÛÚv…¶
UðmËLf³†¥Ö�«˜Ñ:«Þ@ȹBëAB–‰jxÃdP…›[؆0¶°\{Ø0È(°{؃c¿ðXtF�݃»J!]6`ŠQÀL·»€¡ÿ�wzà�aæY=} �^6ˆ?8âˆðƒ#JVšA<b&s„�§?܉¾$ˆûhÜ!’¯™Ók`]ؤ´ºÐ nuSúèDGhÒ±ÎÑî*î¤Ò•þ{ê4x*U�cªî•ê0z
ŽWÕ˜[u`Xó+ 
iKYÏœÜê*8BHnþð3X¡
òrª¼àqÕª6U­ª ·¤�U¢Alû™ ~{EÌf«XNA¦²Öªà
ƒƒ[ÿ;!G/˜ÀÍôȃþÛKëm†6¤¡
½å

JP>gi§XÅå—v)LI¼óD]ZçWqÑc|ã³Å,ã£úªfu®wý
µfÀÖ·¾"bÛîó³	†5@$áFH�é·Z8X’¶&Ï�2sá?ÚYÇÜyƒÿm.àiQºú¿š¡�|•
@"6´a¢µ•W�û¾
F:¾oŒ“$ƒ<Ù�
ybŒõ'ýè¯ôIò3A‘ÌÕÈÜ,ÃÚŒÕÚ0]DEh.¨M
^�©­Ä£
ˆ€\ö
ˆÌ)ˆÚ`Ë1L„
à>"1@"	ú
	~ŸH #R!&ª�#náf ´l‹iK~ )âG"õ
_Í%ÈÌ­„a‰Èb„Àâ¥	Ë&©¡Ð‚@˜+ÚÕÏUÚEüʦŸ·N¥‘aàÔ VÄ©-`1P ˆp„©0´ß¨á‚
…�rĶß‸_$nK†´Äû1Ë�”c�h.È4zÄ©Õ}D0Àˆ˜È-TàN?váFhá
V˜A
âP	%ƒ2àbðÈ1àBuÄÎ�\äH,Cƒ2(G$
bàÔaXñ¨
�ÚÿÀ
Pa†Ú/’Ð	¹UQpš±¢M*S.HC]µ$!9,!°äÐ0|ÄÃ	Ã-$%Hî—‚Ã]%#ˆ‹1âÃüÑ£nK2<ᯬZ%ý¹ŸT6ÅÚ$Ã-t!/pªár„mað9åFPà¨Ñ%G¨aBžåj!²X%F’H
Ë�X$­ß1¦_f‚¨á-d[>$‡$ _zÄ„¨"(:$4Eš/ÚUÎM/K	1SÏ	ŸóÍb°<ÒÁ¤µÜâ±Ü•Hü�øíUUZ-c4–6J戜å~I&[ý¡®TåfÈU‚$fÞà_rP:Ë>…
]$º£¯ÿèâ®ÍYÎãFüa¯ø^´ofgJ¦t–Èt¢â¯¬�¯¤§²ÐeB6¨•¦-Å
íœR$‡ðŸiÊÄ
µ�§!ÅLœd±ègˆœ£§)§!Ú¢}‚ÄyKBX2üä©1ü
À~¤_†ŒH¢dzà0!%…�ˆÕáˆ#ŠãLŠã¨'ѽ±Ý¢I„ïÑáAäD’ÚUbçî(
B#à$âæ‰çFè¥3:c	b£	"ˆ¢…ä\‚ä'.‹dö"Y9éƒB`óAKL_ƒnDCÒ'�>üáhJ-‰„yfW>“±\˜.‹GÌP<¦߀ rîdk6HBÿ¦!3l/0Cƒ0ÃF0ƒ.‹
]¥
Éå„ö\GÞ&ƒ¢D_îIŒ�bZäq/ì$3牤¦­
�Hý3òœš&HþbÎÙ¢Kž$Â*|B“ò�dQ¬ê“}Îê®bЮâêM²bšnÒfO| D¸#J_„yK�2
ä€Ô‚0N2ð‚¥µ•%Å„â'„:\_œbaƒÌŸG2-Ø^.æf®æv­-ÐhÓÖB§Þk°¶"¬æœEÞœÑþ,éΪ.fZ¥µ©‚Të@6ë�"‘¡êÂVvDG/¬¬¡²C1Ђ
í¼Îì²r¤-p
púÒ/	p
41ý"pÓz⃄2Üq¡Û6ÅEŸ2¨-
;T4†ô.ÿ°CDÌò1(Ã- at tóB>.C.-ðJF$3i$/°ƒ:ð‚ܪ°
wä4ǧ�Z�ïGLX&�š1à(¯³S71T?µTG5U³ó*O5VSõSCµUsu;§¯WkõU�5XKuV;5Z‡²Z—5;¯³Xgõ[Ÿ5Y¯µXkµY�uU»uWGµúÖ5Y»²'–­¬òÍ„ªß�V�5“š.@+¨Ã&çB·”Ÿ:$sZ‚OèU.¬0xË2Lð2è‚
�ðNHïCE:ä0¨Cz’úuŸ,ï‚O|63”ú2 neE0Ãgª
-°ß&mÓÿšó[G7\c5Z÷µ[_wUsõVOµ_w5vÏõwkw;×5uóõWÓo
Às‹è²®šÒä-Šîá¦æņšðµ
-Òn at wD>Ê%æ£
@ƒ9ÄøzRb1x0°CTT´.|89ð9DÅ:ä‚�‡ƒ5fE:Ü81hø¡EÅBä�û¹Þ,'“Æb¦	5-�€‘‹r•K¹’¯ºþy
q
t®`g)À’éñ]1³dƒ=Ÿ³´7¦Mî¯è)1µàÕ	�åG
NÑYh;nJ«œïÞJDæ‚0
ûS<ð˜Ë¥¥
À£_à¸ôÄ_DVÆ928¹ƒ;
C¸×~¤g:ŠoåÕë
lè.`ê†ò",¬ÃŒÿ>|x¬!Ã�~Z™PàŠ'P €,92åÉ–+C¾¬93eÿÉ“9c=ZtdОOŸFmš5æÖžW»~<û±é-NàB&¬âá‹�%<ü¢`„…�'GXÜ÷Å‘�+þ›9Éê%¯“$.�7“Ý,¨Qvƒ
HÀ�,fq~[Ôâ	JÀÅ0r
Í#óÆL‘Š
ÀÅG®3z!k8T⻘SÀx�qðÒÈGHÀæxÇ��CtÔŸ5¤rã3x¸ÿccGRF-Š†9†4DBI9HàC¼ŒèH–å1ƺœZ+aÔBxDš&oB¼aò‹yYÅ‚q‹Q±Ka‰cçY“xÖ„˜²!°KZ0j1LSN¤%Qó�®Ž¥²¼>$¯wÿ­_'ò×¾
v"AÑUõjרÑ5‡t­Ó~øZW¼F¶N�	aðjWÁf6²�m‰g3‹ÙÍŽ6¯¤Ž_XΦ¶%9dmÒÄbuP*Ä ÊñS¯d�=ËɨFXI•}É!¼A&ÀŒ
âc§‹P›zþ!´8i�ë–Î ›jLIb«Z±k%Æ8çÃ’g0õÐô‚.Ü -ÌK<ù2£ùsçáöGœâ†Ò/N¤;lAYÍîõ³f-j+Y·´�­�iùºÙ
Ÿ6´–Ul„ûº`‘ðË-˨TÒDTž¥Æº—H“øûþè¾xBq
Û‚ò¡�.Í)!S£"*!I-Mɤc
ÂÒÆã¾<DÓrI!’•4¢0¢ƒ#4¥¸Ô� (P	Êó,ê3ÒáA?Ó#±?è©bÊWTÑ&
·Ro»¼€K�c#fó·Ô'´bPbV[„d^Cé…”p¶H‹c]¨€b¥“Ê
h�äåXdâL­1
sSÒc'$‚+0¢Ê«ÒÁTf1ê&ºTVž&'ðO*y‰Vå·†Žë(Îãi%<d±KkD¢ÇÄ"˜p at N&1�\›â($Å#Åb6b')„&>¢­pb,–A*†ˆ+³SÿN¦cFvTva%‰Å5ïä¸�Ýò,ÉøŒ–.ï�ãGGÓ¤R™Ïì"H!¥ìúdîa«ƒ_ZŒ¤4Qj@ªL
ÂûFV2on€jò"ÒnË>mz”ìøEN:¥¢£7¸8þâ‘_³ák…p�8àý�MHy¢Lù\L¹”Qy•ó²•Gya™•e¹•YÙk¹_ù–Ky—S¹—sÙ•åç•y™—o¹˜�y–…9˜•Ù˜§h¢Òpáƪbú0,¢Ç!uö!̳•¹qêÊ8
LíúÅh½Œœñåje‘Ñï³0Ж9Ж‘)"ÿ£Èˉ F Z òÒ–�ù—Q™ÿ˜gã—
š–ÒŸz™ÿÙ—�— :—Cyp$š”«¨l¡G.Y\®¤³/¯×^N“asÆ,qYô%v"³`ExqIѪ$È6žH¤gÌ£ô+h=xÿšoÝåŽ_Ó~‹%vR�À=à�©•Z©»t©‘º©Ÿ:
?¢xîÄ#b")”¡.(òkgà_Z¿Ã<¿Ž$¢÷IÊÍIÿIÆøxŸ¶å‰9°x­Vc/göоì_¾89°÷‰×÷Yøcø�W~,z!ˆµÝg"lÕ˜æ�WýæžÜ]‹a˜!`KaF
\¸Šyü2dÈdÇ>–ôh,™Ç“!O¦Y,™±�/Eª„)ó&L˜,YîÙäK•Ê<Þò˜,€dé
m¤Ù�>øâO$%ˆ”c1“’16æ"t9î¤L0ǨÄX„\1ÀÿfB‰L;|¡GV2ÄÌ%¥0Ä“Þ.íðâ0À€À.êx™NSÌìâT|è
£^zä(L1

9�
È£dÊX#J:ù×çƒ@­4 aÅÜrRg÷ak%î6¢‰Nähn•z˜[¦!nˆ!†�6Ú›†ªI
›‰	T‚-ÈÉ%Va6Í@�Åt’¡:õTbÉìÇc|KIù•0Êð"À^p¦Çž/Ĩãœ0ép),xK£_ƒ–DË1ÊcL„‡ýTÝž�ýwƒáòô 4˜’µ0[‡šZ:ꦡ~H£¦fŠÛˆ�Ê–D)�€NбDÙº<þ¹.d7æ(KæéÿÅ;Õ$«fšÙT®íRS{íU,zhNi¥0xy©Ô:äY‰Ö.Sþ‚^zðL)%0ìÂ%9S)#ß¹0E–àMåÒ¨cÅŒMü0M+m6!œ~ú)¾º�Zª½ñ‚˜¡Õórz!½Y׋µ¿÷vmöÕ
|\r
"Æ`2äüº.RY)‰Tem%
K#a´«XYÑ‹ÑÁU`XÂ+
¡;èSÆ.²—ŒXÀCeºX†2¶Œ°–Þœ•(I™Uæé&¢4=òMrò�¡»cñ¾¸¼Š¹0˜³2ã×,H*Ns£bsÍ5=Zhì"�C‘'H	ÅèE~ZKOºP_þH-´œ€é”�´]‡²ßùþR‹e)-ÖQf%uø-ˈOã³ül%)CâÖ2ÿœ˜E‡á(—¥ÌKô?•-]ëRÒ„Và™´ž@­l]«[Û
×·Ê5®t�«]ëŠ×»ê5¯|Ý«_û
Ø¿
6°' A
JÐ\q±£#ÝŽª´˜¨�¢Áˆ
/A"„ñ”D¨g…8Z<¥ˆÇ@T2¢ªŠ©[ɬ-GÆ­ÞÒ¡x„hCkùÄsn†#,À+	»×ßv¸À%®qíºVÃ
7h
‹h[7†m1D#dJÇ([¡`Ñh·�n –ô1!Õt§�áXNC²Äp+ŸÆ°bNRb±æAQ‚�¬„j©.àu7P_íÜu£SŠsrÁ`FP+‰àdTv§m0ƒ|ÿÚK8ÂfpR&,Ô
SX¨îð†1áxÄæ°†KŒa
_Äv0‹QLâ‹Å–Oƒ/|cÇøÄ%N0‚u>^‰±2:dô+Yôœ3o6!’`ŽÑE"]øˆì°¢JÒT
R+Àý†Y¬zôïñÔµ£ÿÌ„bˆ"p0ØáÄçXÆ-†q�âëyÇ=Þ3�ùìaÛÂÚz´§=eÀ2)Ø5$söÖÚú’„¢Ûe­ë9²ÃË‚R¬yÉé<ɧ½ëEÉ8CR¿%Ñb‡ÚÏæ6ç ÜZ&¿¶Õ´D'“K¢9ºëR†:ŒQ´÷­R[A±�½ÖbÿÙií8;ÙÔ6vµ‹íh3;ÚÓ–öµ¿mípo›­ÂͶ·Å
nlõÜçf÷±Y@xûÙoew·…»‚Þ’`Î¥or
ˆ“Ê>V¡#™ì³+f'GdFQè»­Zô%@Ì8JGJÇ9VóI×�—ÅÛEù¾?ñ5°…m\{–Ù,O·ËÑ
ó–Ÿ[æÊ~9³ÑjØ� )à7ZAˆ›âV�︀ÔEkí>F× /Ó¡Ò^	Ñ×¼ÓCäe}
¸{Nì#HTÝ2>Á�©@·È\+Ø�ÔñZiùä�º¨PÔ==»B'§ÇHRh(PQÀRð÷¿÷=ÿ`~¿à�xÄð†W¼EÿøÅK>ò‰wüáøÂ3¾ò“_<ä7_ùÐÞð*ê»ßÍô£ÿ{êUDzʧžõ“7}æA¯yϯM -P•¿§*£¦<2Öè’ÎóîD± éÊ@‘²R”±–WE¢À$hÓ™‚CzxÕIºÿ…iµ»¨&DJŒ'ÔÛ�¸>𥷽æßÿøÁûó‰o¼èïoÿÕß¿þú½îùïx�'€+§æP¶Â]d†O§qØ…EL7w…ô}1ñt–%[QÑ Ç X1�SU§`kv+pbCÏÑ 
rP
²Ähr’OA+¤T++¸k—?B×t½ÿ4[Î71zw@4A™‚"²;²Ç;Aøƒ…‘w„K(MLh!stQÿ‚@
¡C&ƒ
‚R¡Ó…ÎHƒ
*HJ¤W*¥ºOI¥Sê¥Yº¤†§~1Uê©'ž}èi¨“®øæ!šq�é
l
2+ÂÀ&J¥é±Cr¡,J2Ù“$Û"ÕÂêÀD»Â¦Â ££¨‡:•.^Ì(!ÇP‡KBŸNú¥WÊL�š¤�)›LZ5”š I…¤Ú¤ŸI¥PY,¢$¶¡Š¹˜MS…T¡J¡x˜ìr:Cñ«ˆSJbZnúì`•Ô‹é±-È—N�%'Cв9ZK%N7±paæ*W~,ÿu_£fÍW'¼z1
¨}‚â£�YQž…jã)!âLʯ°óFW)´)•¥‰ÓÔ¯új¦¢QTˆ"Ávè£Á9•£x7üq5å9N!ë32l"éñ–œåé€=>'ÑÃìpÁÀDÕâ–0()ð•}ä·i=ÉpüU7$ä£Ù7Kš8!¸@‰dóFÎD´Møºˆ¥š”#¥3«ÚE�Áóž‘1µJçU Š_e�qS¥¡çE=¼¤`
ª±ë¹¦K)`š¤™Ëª°k»§»�‹¥¡»ê×6Þô…2"�fš_IQ»b€J¡¢#³‡†&ÅD@é@Þ!»€¬ù>ë€{¡¢u
JÕ¶{¡D¤´òQ yb¬Æð³nÚ^ðÕB2A'_i´j#5QY*‘-8l’ªŸë»Dú»P»ªœËÀ¥µ¤+yŸÊ
+Á¬«ª
Œº´¼C¨š…u
I³µ«Ù—?Y©‰ú]€ëtYÉtûãž�!+¬Å�cÿë›	ƒP‰ƒu
Æ ƨo&Ü‘$+Ì··@È
<âG®#¶HÒHQ¿›v�éUǸ­¶O&<
]ÂÒ¡ýÿU[é}h¸iˆ-ÅHkš‰…‚Ö Aßö­àCNàM·fAKäIn߶Àà¾âêqÌ}ƒJiÂìµ’ö€	ÈZ&JÃèÕDw`Ao¦¶1±€áðp�P†DÁЖ&¡GEqÂÂ-ÛbçÍx(©‚]vy"ŒŸ°lšÙÅpf‹%qD=ˆ»-\Ö-ŽÊª´èˆÂ÷Þ
šÞ0‘ZÁ€î:ŽL	0 Þ”¢Nê¥NêFɈ_É!ÄX‘}4˜Ì–ê>OѼžÛ£JHtDÝ"ŠŠVé›Sy7ËÆpOEì/nžMw"±^�å’ûôÑ.J…Ay
âI8Ntúÿ‘‰D“Θο+Ä“g%ꨔOûA <‚‘Œ÷sD"zGÀJyî¦Îx¹A0Ë¡˜–éXþ}L³Ü»Ù
�/%_éaÏ:ÕâFÄ±½ä«‘ñ¡Rd?
 ø
≓†2Ê�#¿‡ÒÄe÷‚S Î*·œ²Gô
g[2nq¹.é&‹«¬äÊ“0eê쪵:Ò¤(Nh§™blنŽ�]¬£n„Ê
L$»*F¯`,I
Ò5bÖQ•u ä…�&�„q¶å–Æ—"w“¶_‰Ê+/3˜R—`xtQϤ”ŠC@ᮿþÐ
—Aų'´ãÿŽ»ï
•-b€5€i“
n")‘H±%
S‰]à"?»à[8¬Ë˜p5G†Ø挓
„’€]ìQnT`«ŒtR!$}ìÐE:´¦²Þ°¥7èL7u
›'¥!ŽAÒ‡ ¤Z¨ÍVCœL.ÞÂa$MÌ …CŠ
ź„„(Ù–	Ób?èàÂ%he+³ÃAËY�qRù
	Æò©àˆE°‚Š€d—ÄhéiršN£ô´(Š¦t‚³$J·…ÿø¡Ð?3¥iÿ§5ˆ83L“Ma(C‚ìS5”ÐNIrż…9Â@ª�¦3`(ƒ«Qà1–Q!·(ã0Áh˜Ñ>Z0#7;S‡.ò{H
pL0 ¤›�¨j“�&¯ÚA™ó�¨lªyK‘¬e­—q33ZÍ’FÔ‘­��¡H6¶0ÿ T‘edCæ•Z®2*•å¬e=«Y¯8´uŠefi	Ëýé„ÌluøÀÔî„såËKŠÃ!ÒPˆK[¸¨,.
@Ù¢›ˆ(¯¸Þ³‹Å´FÙ
I¶g1Þ¢%.™GJtŒ¹Š
¥�b©I»c\œÅA
\dÄs²�ë'éR—ß^˹ÙÂ)!®ÉPÑè4¿ƒ¬�ð;̺¼”-2–áƼE¿Š-Õ#YIV—1ÑBÊAˆ.>²•Ü2C¼ª–V2D¢©ŒŸ¿ùç-25ÄOiµhç›Ò`Ä–dðÓÉë,"G0¤Ž¨,$Á(�÷àŒ|z¯º[ú�:Nï©™€
½mNKBÊøO¡½¬À%èÁu¥:¤uTR"É(¡�q¡Üäá0{Ú¡ÌчªÉwl{·‡…Æ—ÿ(N]¨É Ë\UÇÞ†yÆ©¤!2ëøQÑÂfZ¤&|^ÏÆ‚£!sä1¤Ñ’Bˆ¶­Î¨*㌓ᜎ솊ÅÐR-èWB>s*¨ÐjýphúLÓ©M\‡@[žûíR‡î€
qˆŒ°ª®œXÀ�,Ý—…œÀg'I’ÚÂù�ix1ƒÓ4¨Ř@i1㘺Åø!dCô²Ý�˜×^8ǸÍíÛ궱þÍO¦ö	šŸÆ�Ú‰ùErûRKm»Ï¢uoÙdj*Œ}OðJ@ ·À¢'(ÁºSPt™¬À;FOúÒ›žôuG]éO—:Ó«u¬_]ëTŸÿºÔ�~u§‡=ëc·:Ù±~tï� í@Wzч¾\]è+àÀÜ-jÑüîv·;ÜÛ~÷½ß�ï‚<áÕNw #.íö”͇,�ð·YóbFyl
ñL/ÆéÂáTyÌ»°Ýgú<
?¯Ÿ†q‹ Ê�ñ~Eg–Æ>ÌíSÐx
‰8Š“D	
”°<Õ8Ž
ñ�l€ìëÍ(
ȾàôMâ,Nã<NäLNå\NælNç|ÎÞ,�ì“Ná|�x
vØØNîäN}ØÎïÄNð„ð0ŽèË�i¡š7r-*8ù1Ǥ!Òy¡`:d=09š¦•P�ÎSDýLQ鈮ÅBÊó,	,ÃL6™Hm)GÿÛD™J	Ï4‰öQ.	
	f`Ÿ0$2µ¶bh„„Ÿ~
¤*�•�…رAH飌«Kñ„xhf†vˆ•¯ZÈBÒ1„½©“
"û�4UmUWmœÄ!
íà
w•¢~Âß`3L™N]6ÜÑ�O¡…SÁ�eȳ$ØØ©oIZØ•r=…á…´I@а•
ÙÕŠó0Äq]["
xàÕ]^rðUXðÕoð‡IÖð8ؼ¹›HJÁ¿ÒÔ-ȃJŠû­´ ÌbªV^ɧÊ8+I|U/Ž¢‡¹»å(ß¡šâ"ßdØŠ�—�Z×â¨,å5õ¸[ñš(bFÊ°§�R²ß€Ž:€V0ŒÙà(݈Ë­\ÿŽB*Ü`x·
H`éÉ#XQ\´…‡X`#Ž*ö¨`½	@�€
Ú �©‡à?„ò¥¢²Ì¸@‹rÕ„à!„ÈÁÈî9=ÊVË#`ZƒA^ˆ#Èhˆn]	 Ò*¼ #
..s¸ãñE¹ˆ	7þ`ˆ(
^˜éñ
(Ñ"¤9`Ð…up‡(écÊð…}¨ŒYŒXˆ°ø]¢äq
ðJ‘™‰ˆÅ˜�R€\h�¯¢>Õ…�ÿ‘½Ýÿy]JUÜ­a^1UåÝ—1dÖ]ÛU­dÖŽ€‡o¸ÙØá|8ÞàarÈSâð𱉃گ¤Ú/nGZ‹ÇkÚE4JëÇÖÉ…Y›áIƒˆ°i±•ÇP‘Û©êÒ¢óÙ…
W)Ò±–°&
€;Û­
_¶]`fæd®áÝ­ÝU�-Þæ_^fU’´c h.^rø€
X
í€fšý†¸€§�ø
n…ÞXÎ`–ÊìËþTôH 8™@ŒQžä²•í9÷
Ê�¹¤>·
h€«ðme á^­`æeÿØJî;)nã^îáÆurû“&^W

WèU_͇ ö”KtD-Åò¦Þ¶6Ò¶p+�É3ãš#‘`КV
µ!5EôDÚêå˜..küÑS„1‹qâ'wV€D¡³ˆR2žR�¤¡ÿØ
¡ˆÐ%
`3Â[&âŒb ß3Š&A‘¾`0Ê0ŒV¹…
 aô’Ä�Œ·ÚðÀ …Ä #
HŸ4ÉÊ€¢˜×ÂbîYof_wnåîõØ V%fVÝl&^eŸŸxï¶öžMô†zågþº°ž®ëû”>¶ø˜
&X�’oŽ,IÍ(l‘$¦:‹Ó苆·O‰X-Ù¨ð×€Ð5€—°‚ÂŽÝ:&L0
´ÿ
FÍ$”L(á	2XaQ>há„F˜!ƒJ¢†zøa…$‚˜!„(vH¢P)p
C
¥Ó
,�0“
$ÿ”°ÀP¢ !Q2í3£;L9LSNÁ2Õ&À€å—bf-iV`?昶s¤WBFV¹rÖ˜ºha{—»ÞÂKÙµÞ&‰—ºu½«VXÁôe f
)„mÑÖV¶"AÆœËHQºK­U9Žå„ü‘CØÉÈ«–ñKf6“@ÆD-bjz¡ª$Œ`,D?¬›èD²ÿ@��ðrNb2%‰È€;èDvƒ/ê@;#w€ƒ-–q9È�ÛÈF6’q�nT£ë8Æ7Ò�q„£'ʈÇ7Ö�ylãáxÇ.þñ��c÷8ÇôÑ�cãĈOäÀ¡¨Ä%2ÑÉK\‚ ô¤(IAŠ#TbÄÍÔJ¢]¤£SÌÀ…¹ì–[²«‰g‰K`8—ZFÐ�RZ`1È£±bø®QwêÊV!ƒh¼aG-ª„™c$æ"&üÖXJXC¼DQŠ•ÓÜÁu˜,
²JÒ¤#”�h,5ƒ™žNÉ¢ÅXåE­2¿�£G®âW7wêÂ�ùì7!µ0£�N†<=b-‚A´˜Z«g<˜ÅBžÑE- at S�Oth!DQ¬š‰)']ÙEËÍë‰áŒW\p¨—©¥$°‚,akØÃ"6±Š],cëØÇ>6"*™Î^—8×\~sI}	Æf:¯ÏqG/ºñ*Wr·šéF;#˯"M¬ŒŒPlÏ.ÁÒÂ6°®uÝ+9Ë©°‘#�ÿ.q‹kÜãV
HcLPß1W”°ÕÔþ
F+¿Í¡_PR›Ë¢Ð/‰âŽW$ó3aÜBµª%;nÄCkõ…ŸÕ¤tg§CùŒ@Å4«Â¤Û&澕Ýo
{«/ƒ	÷f�<À
0¸Á1ÿƒ�aëäÁÎó ù¼<ãYÉ1£íá3¸*Ö�gLãK·¸ÅøÈD'b¹©	·
%^�® íè	�úѧÞÉ‚	=ƒu`ºÅ.¦1¥)ýbLlâ¦Ê@F£0'`’†÷‡Å\—V
ê•
Ht¬
+Ýê^7»ÛíîwÃ;Þòž7½ë½nÑ„(ÃÂ_¹�’ï¡ì¤5îÈ9òáŽe1¥)ߘŠ
åfyQ0[˜­™›$ +yJO*r0�‘¥Øœu
p@¹©›
 

, at Rìà/20*ÅÂM%ÄÒU\‘­ûøDÙP!|àÕT$ÞY�û„
À�N¾M¶@�ÚL°
.ŸF"fb*æbRÝðÙ`…0d
”@•-Ë7€À|
LËDÔ¨h
§À/È%0„DZæÔf´˵Â*ù†òeéYâÐ1&ÉhR`Fì†(drÀ
TYÂqff¶aŽôhÍ¡E`ê‘eZ ã>FI	
Ì_Ä!o%Šu©9�ÿUl~E“ˆIÆ
™¨¨uÊ™x”2\©±
ˆhÀ§²¥Ã.°G
HÿaÜ$æ"1|ÒÄá¬!k/ŽÃ>TBUÌ3’oÔ½ì×ì$¯¤
£ÆuäÉ�PSΦ0 ÄZ
45âEÿõUа±�í…QÐäÕ,
ôuV´„µŸµ
d©´Ëd;ͽÌ$›p¢Ò4;
?õ„p¾b`³hŠ²ª0eêªH­Û’kɶ¥Óî+ꌣFŠjŒ.F㮮ƣÛî¥À4Co%ñ’º*'µ–‰1–e˜rr)²Xä
0
q[sÝlVÜ_ëUQUj;5÷Ïçì¥)à�û=8&mµ´×dâP|#ní-zMuVŒ_Õøbr9.õãÇBjdÞ<æÔàwÉË×]•5mYÎÝ,NvÊ É­ÙN€™÷V»®U6à•%F¸6Hõ…ܤ…éžžUO>ùzO5e"s¨™ñ5ègcZ°¯ÿœy.´7©¿Úè´
¤Úè‡/b[ܨId:¦²‰¾[Ѐ¡]îA5þøèiM®iæŠúê»ë–\Õ³ï�Aµzí«zò 'Ö­±?��ÛÕÅ«¥&z+®ürF!WôhÀ}¥5nxwN9Ø›•.š_´/'ýN¶a·˜UØ[?÷ìÞƒWõp’ºdøv³Å
4d½kÇú{'w^ðMõ%Ùóçñ>ۦƋ]¼xÅ.çx]µ[ØY´3´¸pB§ö=nÈUîÜû—?給Cn@åé&Ø|>c~D禖)Œ{í«÷J'Ä™¯~ks[²&(¹È]0f
Wõ€…µ6ljµaÞmVBšp€ÿ–SÙ`~V¨ìå
tÑà »÷–Î%f¬[ùZÁ£);,|Ýàl—Aíu¯=á³[ªŒØDÜé	ˆ4\�"©ßj‰»"™¢X;ïÅ+„‚ŸÓîd:áéj@¶2]§²H˜*‘�¹ëÞ­XGÛQ�v•Î`XBµ7ïŠ`¥§+¸±mû#1÷4½
F�œ’)G	ªð~þ‚!åô82Ùæ…©+ã	;¨Á<6’{´É	¨0ö±L€‘å,iYKZ–)–¶Ô¥,q¹K_þ˜²äK•ÀW*É™ÉTæ,s©Ëo5�„¤L¡4÷ˆÂBNs”d<cñ7æA
[¬äÿW(mè"kM–×ìߊþÔÆ;uñ�²ª]
w;—QWŸDÞ&›vÊX‘�{
fƒÀ
(hù]ëLºß÷fÈÁxÚ_1=…«ºª�OìYýˆ�0;5lr¢§ë$f1~-ÏÆÃš
#Ö��çwo)ð÷-áV²7©dzÐ[óæ¶Àtç<´H‡mQ,ØÀæÖ¹ÍunrIíXsÔ£V5aWÜ
Tç6·®îF=`�ÜUß×¹Æun¹1ëç’š×°2�
ô
îyYp®#ÛÒIEq~ÙÎ0¡ß¯æg¤U51Šû/Ÿ©4›ætE¯Ðî,7PÙ¿¢çÚÈm5@�jÀò¶³+æy¯­qsiWCçõ 
ÿ
§Šášä
dŠ¸êËôí/f'ôÜ+oæäpÐl’N�m¾Ô©&LÞvJeŒUÿä'Òâp¨0ÌžÈ0åüûGÐ��ŠÇŠú†ÍJÏpºEs*N΄%�~êÌúéôBPâ@Ï�bƹ4o­ÁëæA		
²üÏ&‚(âL<Qµ ðQ§«¸P§ë×XK‘
aÜkÜüå“ð+Þ¢ˆÍ6Ç
ç�
QOŠOøÿŠÁ¦,¬ùà�‹Ž¥¨Ðɇp'}Dn½DåÜ�Ý‚$Àðk7Ú$Txç–û¸CˆD¦äÖ‘äp#{#”øÐŽ
M?Gkç†ôpŽmâ–Jôè‘B¯ïk=5¬ßœÊ"õ
§’óÃ�“�^ÏMï‰%”�&bÚ

%L½ôl ÎÃôÐï�M?÷d-rû¥E–ªnâ&F?=߃8²KÚäàü†ZæT¬ÐôYþURq&pþ´ZôÅj¼)$)aýõ»p$TH&;-M%hÎÄF¨ÄD�
„ÁØæn4©ï�ÙîAº`
Ô�p´®�/ýŠ°újÔòÎ@P\»1ïâw5ÓÙÒ5s6±‘[q6ý×·Ž0±qëI7ì$Ê‘ÞL¢È
--- NEW FILE ---
GIF89aþ½ð
ñTø¯ɉ(+ª$˜ï¡Ç‘ Köó“¤L�3eêÌÙqàËŸ>ƒ
ÄÒ£Â|üp*Ý©ï&>£&
ÌIÕ¤Ï~MC‚|º´êή`¿ŠõJVé̳3ýíó—Ô_?úø	ôGt®I·1ûÅúÏ­_}oÕ²}û0Iº‡
ûܶpàµ�á>üwrdÅŠŸJ¦ë˜óbÈ�5+fL8.Ö¤¦S£^}ºµj׬_Çõ<[4?Ú·mãÞ­»wáÜ¿=ßn;ümq¶”�+OÎœxsãÏ‘;Ÿ�8¿ëسkßν»÷ïàËÿO¾¼ùóèÓ«_Ͼ}úxüðÕ#:_>ýûöóÏç·¿?>þÿùà€þÍW|ò‡à‚
6˜àƒBè`„NÈO<Ê|Æ£!‡¢‡"^â†&’ˆb‡¦Ø"‹%¸â‰#¾H£‹"渡ŽöÈã�;éc�õÔÃ7óàƒa‘ê3Ï<Æ3?NnèO:·¹�?[^è�:{E)¦@1Ä
œ•D 
y„`AõäÏPù
Æí[ùÜ«XÁü€VóË/Áß’;jdþ¢FX½{†qÃ&1¬ÙÇsÌ™iž60>žŒòmHµeÚS$[LrÁƵvÃmŒp[~wqd7÷ØÏ5Sæ–Ï”íWÑHߌ]?A'åtvÆMÍÚÍæÆ%õÕ”¡üßul¹'öØd—m6z+ÇÇevõÐå6‚(o)·Ûó±5÷–(×íåÜy¯ÿ|7Ý~s)xß\jhø…êwŸ‘ðá3¥—ö`ä”Kn‡ˆG® —‚È”k(øÜN)7Ÿ#n ‰{+h¤†kÃgºè$š._’'vŽøŠ"ˆ»Ü+bΡ’bhx=³›¨¡îÂï¡ñ!&/£†Ph}‡×g�ýöÚ_/f”ºã ‰ƒH"ìôS;Ã(²H#,ˆï<ªSO*Á$7?êð—J*LÂ<Òä(7¹ÊU
ÒAŸ¬åXÖ(€
�@ƒ Ä�œJCr’BW…
(tŠMš¢�Žô0Y
Ò–©mÿDrbšÐrô6xÃinvŠº�v4ua³g€Š™Q‹Òy:*ÒøXð�ˆ€ÄpÇKïñR»É§ïHÇ4P‘Šgp#nJ
«‡ÎRÄ‚`j!r¡‰©b«‚@�¬?�+È&µ¾Õ‘8Œë#{Ò¹ôåX˜rË@Ù’&¿:j"R!ÊLÞzµÄI*w툵J¨«©´I!ï€aN
¶–Öe�'

_+ÙpÍK²&\àa_‚ÚV°µ><U>zhÚpÿ]EZ‰$nùÄ…-Œ\E„+%9â–µ7)û@îs{à.ëˆ=1U¸Èúž%×5#kXÂ>“K’­ú@VDÔ”w3‚�‹zÓ+¬lf-l�Ù%õBfk§‰´N“°âlr-*ËŒÀ$˜Œi
¼D�Qâ“àÁЊ0„'¬à
7ø–0‚)¼áknXÁDÙ‡‡'Œa‘|ØÃТ‚¯ãa/; ^°8±™b	k˜ÅÙ)'2õñ¶uâ˜�?ffvR,Nì€ó:ðqqãf<âiŽØÅׄ26›,eÇ}óÅGN‹ç!/¹ÉI"J˜ÿÓå.cÓCJn±“ÃJ3·ÙÿËjfó’©Ôe-ë£ÌJb°›Í¼çk>qw¶¦”ò%Çy¨ÐˆF3”>wèCú?ˆ~t’Pôº�¢®H
¥ïm¬øàƆ*Ú8ÔaîröÉ\}öÓ¸ù¼ºtJšʬA}(øÔÀε’ž÷<[›xš>^ðz·;ãÉhD"Ú^”†Ml1•ú{Þƒ’¶M-%"ð¥ð€G<xÃ’èãú¸E¦p‹mLàæ0µ¶B—¿†·&|Q¬›ÒY£Dø°†1N±rä*U&�sÕ4”_Qi åØG+r�‹8Ä¡
qpƒêP7Ü¡wØÅ.rqƒ^䩈‹ÿ
˜\¨ac@ÃÏè*4žaŒgÄÜæ3ïj™Û1¶Ðc�
S¼À©ø‡¡�U—Qåã
È9’’f�/^ÿºAÄN‘¯Ó*ëm;DHö’]­_·IÛÉdÁ¹Ûýîb�!ÞÝnw½gî{ÏúÚ¿øÀÏ=íY'‰ÜÁnx´·ÝL„o¼ä
�øÇOþò˜Ï¼æ7ÏùÎ{þó ½èGOúÒ›þôv'H9òQŽk¸¾½pý5Z�cìCŸƒG=ÄÍ¥T£KÕà-hq‹dxƒªºWu<Ľ{„[tðp>L+*�—©Ô¤�HJ!4PA
Tp‚ÿ$¤
[...1391 lines suppressed...]
ÿF±ô
,*±J–»
–­‰Õk`ë:Ò¬nµ¯p½êWÍJÕÇæuª~
k]ÕºKÊÞU—ºÌ%
W£ùØ5žñŒT¸âÆ€«©‘
aC©¨E*ŒQ‹ZàzÕ©NE*Xë`ϺÖÆ@Å3lmëcç:×´¨5²›�ìZKÛ׶–v®§íl;[Ûܶ¶³§íëp#{Ùß®2¼}mn?»ÖÍF·´Ï�îrË;Þã®v´áíîlÇ×ÞÆÿ7´›�r§»ÛÝæ÷¸Ë
íu3›Ýùž÷¶ã�ïkC»Üúv¸¹Ñ}ñƒ|ÜðÖ8Å­íq�ÜÚ'y¾ÕýñŒ§\ã,_¹Ënñ“·åôn¸À1^¼Þ8‡9Ë5^rž×œÛÍN¸´'^¤o»Ö:¯¸Óíýí �|êçy‹¾tŸ‡¼çTy*Žn¤'=´X6ÀNí•ÛìC÷úÆïv¯Ýæ8‡6¼‘n÷°g�ì|OwÂ9¾ó±—üë)§¸Èm~m�—ÝÜ�øÖµNw‚ÏÜí”G62°¾pz7=âAwüä�óÇþñM�¶×1/íXäÚ·žµ®e}k]Çžõƨ½0ÿdOûÚÏšö­w=ïq�ûÝßzøº÷=¿u{Þ»öľ0žÿ|Ö»Bܾ®½®«QwX#øh%>ðÑ
~àÃú˜‡>¾ñŽxÄãøx‡ûûÁuücýñPÇúíïþwøcï¨?üQõ
È€"‚Õ
˜˜þðÿÐ}û€ÿÀÿ
Ÿð‰  Š›Úœš ºy¢ª¡ïi›j¢*¢ìé ë9 "
£ê¥ù¢Ê �>º£=Ê >ÊÂyšÓÙšêן"ª Š¢?¤@
¡ý¡0ê›Ú™Ÿá9¡ú¡%¤]š¡`ê ÿIzœ[ª¤±éš<€VÚ£Gª›â©¥À¹¤Öùš«Iœè™œ˜iœøI§¾‰œ`J£W¤ó™¢¯¹›Â™ž…ڣϘÉó
¥²¹¦³Y�ÿÙ¢†¥SÊ¡"¤µù¤D:£¡ªš¼‰ŸÄ£dª¡2ꢣz›œúŸ9*¨mj¤
›ý÷žÛYô@�¼é›Šj�û)¬äù§¿é§Ù)¬¿9¬g:¬™‰¨tzªx:œ´‰™ø@¬¼Ió0š¥)�y˜ø°ÏP
K³›ù°k³Úê�Þ‰¨ê˜?+~óJ³Þ	³EÛ›"ëœâ·£!«´ò
±ëœ+ªQ´ËŸQ¯A›´T+ªpê´G
µ´pʤËŸbµZ[µXËŸ^‹µj˵G±R«µVûµµ	¶g+¯ß7¯UK¶N›´hÛ´gÛ°]k¸G:µtû´‡û¶üJ¶�»·pÛ¶]+ h«·m»·b˸uÛ·‘{°2û¢8«°6ë·{{¥‚Ë·_›ºpëµ�«¹yëœßW³P«¡»±¬kµÿû´Û¹W»k»Ÿ;º2¯òÚ¶W;» «¼‘;±;k±ÇJ°Ý'»ÂÛ¼K´É;½"Ëž§‰µ2»·Ÿ«½±;³àû}zë½ÃË»òZ·¸ÞK°Å›½Žë¹ß[¸Kµ\+ 8+·9{¶M¶G;º7+»Ž	±
«·¿Ûº€¹¯
¶Ù+~‹;¿»¹ê˶ÌÛ½‹›ý°£'+�ÓÛ›»³!¬³×ۼΊÖÂ{Â!Œ¤J:©#\�§™õ®Ž	ð'™

­ÏõLÑ
ÍÏLMÕ=É…¬±N�Ó&íÏMÊqýÅX�ÑaÌÖñð‚	´AKÌòjÄ­ìÄ?
¯ñ+ïòÊþï Î /âÞŽç2ÏæK]ñ;¿î=oñðOôú>ôñ'¿ì6ŸÈïÂ"ÖÆpãÕ`
ToõU�õW¯õYÏõTŸ&X
&XõaOöHög�öi¯ökÏömïöo÷q/÷sO÷uo÷w�÷y¯÷{Ï÷}ï÷ø�/øƒOø…oø‡�ø‰¯ø‹Ïø�ïø�ù‘/ù“Oùi_õ
--- NEW FILE ---
GIF89aõ4ð


ƒm„y†{'„y7…{<–}@†|{�|‰‡
Œ”•‹
2A²²äË"^‰Q Ë›8sêÜÉsáÊ–(	žìIô#Í�¡Ô\Z´©Ó§
mJµ¸$Ô«X³jÝʵëÕ”kR!hÄI‘"(�<yråZ$mS®•4¥Z·k�Ä…›¯^¶mõ%(å$“)HŠar…‰‘ÂÁ²$¨v¯Ü·—Ùö�«9®]Ïyù¾Ì9°Û R#™ÒÄ#c-žm·ïÝË–ƒÞ~{ÐÈʳR‰­ŠÜ¿	;Ó­¬™®ÝÌ€uožKZ4èèµ›Sß÷zõîx±[ÿÿ}z^îæŃ/�^ûùº˜›oâÄ¢‘&±�ïøýe¸Þ‰öyH gêµR[¡U„jMœtÅMá„^x_Al97Úf§u_ˆ·…xœ‡$¢ˆY‰˜�8âŠ*ºøŒ/†kM¨æÕŽ<öè#O®dAC’ÕÛ‘B"I¤’F&éä’O6Ù�qñ 
j;ýŒÙ¯—n†ê©�+ÿÃi™î,Œ5·.w]f§¢rÜ´ ùz­°ÆÐò
§u²¨Õ�’Zèã.;g¨k’9kœwœ¹Ô«óÎ7
€F;“ŸôÄŽ	È‹òk
(`?7å¯NókG<þG§øq+NúëϤ0’)~
TüÔÁ�p€Zš+T<ÿð&p
K
‹ß
Eh¦ÐIë‡îPF?€Á>uØã€öà¥Î@˜}N
µ
´#êp¹x&f¨#~³:ášÚ1�N)c�ë”;V(?éïríhØ
¿ÕÇN1cc"”»t&ÎOZÐø_»ÔA€=� ì⛜ѿ.�V/S¡�ð…
Ð¥N
 ÿÂPq²æ%iI9rÌëô ;ì�ÁWMn�ìPþ…?ö¥OqbS/�¦?R‹áTÅ)Çö‰0M)á:GJ?UÀ©ÄàJýÈÄ@ÎÑLî�`õ42=àUO|Ü#Ÿ}„º½¡Žï¨AEªQ“ÊÔ¥:µ¨PêS¥U¢Rõª‘Œ}:¢=ª´f"÷¡Xź¡±zµ¬[=+Yתֶšu&)+WYR„¡yC…š(—¸2má4`f2•™dê'D
vg©:l'hl
‘»¢ä%ÿ'¹ÊW>ò–§œå%_ÅÊQÎr•§üå7·ùÌM¾sžëÜ2ºÈe^󖧂ä®H+Rñ	¥+}ä¬h¹Ô§Nõª«"êV—úÉ«õ£SýåP·:Ö³Nö¬�}ì"G{ر¾õ´£âæ/W»ÚËîò´“�æ'o»*>!òTøÝëV?ºÜ¥>wª~î`·{Ëoø°+þêt�üà#ÿøÊS¾êy7yæùÎÓ�èe'zá#rÏ‹ü£§;ãËžzÓw>õhwEë#/ôÄû¼çu÷¹íwŽw“ç«è=Ï{÷‘ã\çH7¾òižüÛ_ïÇg>ô—?óã¿úÊ¿~ñ��üé£ü÷"�Ìÿ>>òTÄ�ìsûîµ^v볢䓟:ÛçouЛÝó³ÏúúåOû»�ü�çz„w{h€�GrgÇzþ·€ÙsÙ{÷'€œw€ø~Vv£—	Xtû§v²Gyë÷�H�ª7u)‡uÁW‚H‚
˜~ÈuŽgügyýGƒ_§€8�û—ƒ7èxÖÇrxyê'vÈ€‰'‚ ¨|ñ7‚†·ƒ+|­—rP¨C‡„=8…E¨
XˆyU…]hzXWã§
§"7
£ð
ç
�ÿ8‡š×‡؇ÉGsu(‰xW‡ƒø~‰ø‡u؈
qˆ‰HrÁss8‹@·
ˆŠP·y?÷w'(s¤X‹�¸t° t¨§…yu«0v‚׆™w�S÷	ĸŠÖhs�X‰Áˆ©¨…¼…‚XŽHç‰�(ˆïÇ‹îH‰íxŠ˜xr¸u)øs­s¶ˆwêhsXˆøh�»xŽ©s¿¸Š	ˆ­ÈŽ�ØŠó˜yïØ�H—‰ŠH‰º8|“è
[...1009 lines suppressed...]
:£¼‹@©ˆb›‚Ùé(©�'
,ä�’J*§0Jiä˜RšN©ð‰Š9— 
98u‚N'aŠéÊfÌ~Ëd¨üæ	FÊ©e¢¤JZ÷¢[8A”ä¤\ŠÝ9‰�´^EÝ¡˜[iÉËV¶UâŽ
Ù�„E¢‚f‘X_¾ð1©nÁ{Y¨p“üj˜$Š6öÅ¢‹ó#�C8)”F”.LJlÿñ¾ç[a½<ò^ O¬ätd|¥pƒúUðÊ#ö[J*]é-As¹¢%,Ÿ ºÜ¸¯Ý@(«|ÙI
®ªÄâÉߪzÂ
*ƒ‰¦AæÍi'âãØ”,a¢'A¤šŠN*ˆ@Ž'£Ärö~ƒ«Bì`B©«
[ÑŠÎí';¯è\êœ÷	KÎRÉñ¦3?
O_Æ{ºÒ)ÏHk¨(Œè
rl¦0˜XÅœ"Š+¹'Z”ŒÅÉh)UŒé
Xì9aK*6ƒŽ4IËdB…(H¸_‘bP¨ƒžÐ±&f©ÔW˜`(`ñŠSeô¦ ›
NS^Eq
­|{0�r0G@Ä@¦Í@$@zBzVNp\*K8üݽ•C%DÀUZShÔØ‘‚l°`P(\OX#9„‚Ä•BÖŠ+ÄÝá]‚Ä…F&ôXh¤Â†C&´DRÐ	þiØØíXÀ�])”ÃP
žLŽ:QÕxå­°B'|DZÂàÿhÐ1UzZ+Øè’mÅŸÍ„¼a��ŠÉäDé¡a爂ZÐÊçÔ¤˜ÈU*@Â|¥,¸§ˆY*ÈÕxu^QŽâ	Þá“ÃyF­8Y ÖŠ8œ‚y1Æ9	Ý�žMÖ
ŸœÂ|�¹mE&”ß””qŠ8,Q+t�…"¤ƒv
…bè¤jèAÎrèTg-�P�¿HÉ/úb‹^c‘V¶äælù¦pS1Œªæ^ô)窞¢øÔft%_ög,ÙÌ#2Û+U¯ã2Y[‘ôuíÏ’ôâuiD°µÍÁh“sV›¨r§wú
[$
T¢Ãk¸Â¹¡gÒIcø™NtC�¾]h4 z†ÿCÐõÙy´,tƒ“Å)Šv܇橗9¤„(­ÈÄ’åé$IË\°Wb¸Á¶{ÉEbÀŬÁìÀþ?òch˜i8„©{:\|îã¼Êk8t¬“qÇá�ëR††¿ÖÙR¦!^9diÜ+­ ]cÈéRŠÊʬLà†)äDǶ,,°F7ì�‰B7|(NìÄ:Ù9,¥9~ìÐú«“½é¿¦a¿¢èÄ+°+,pìËjØ)<…áuÚð‰©-?òŠŽ¦ÓKT*¬Â¡H‹9Àè½¢4,ÝJK¦É$A¬Á^Þ
¬Þö-NØ-\DÄÊa@k.W­ç)ª–,>Ÿ…¸RmŽßêõÿ�+Bn'ëì…ªÆ!ÐlÙރ蚶-È|Sã*.­)kïu.ûShjܯŽ’¶�RÈ(Û÷Ù&êþ¦h)“äZ÷�žµvÆ@(Ø@Üý•Ä
€
¸$Š?^˼`ô»H¦BXËr¨á�B¬�K¯´­Í
}BM·ÇZì4ýN&ï4
5,£4,g2J¤Q?Ù
�ô¼Œ´A\4BltG„tO_KPuQ§´F§4CÂò@°1DSëz|µ!ER|È´ZÇô¸ÌôÚàŽKǵMO¦�¼4‡üÎéF9ûªç	ìíó=XG<t-Õš®nî+îîdfùÖâªsènŸq�ÿ_�Äî«"ã7ç÷µZ`Ó�s2¦OXo[Aç…î:Œ%JDD«vhǵ„upÍŽå"§øµ�í`62N2©s%·ö7ëö;G²þtËoØö¸
k;“÷°«þ¶n:óýn¨�7-�¤_DåRåÚ·�'.x'v19›ãJ¶h{ÓÊ
]®¬ù±¦ÌžQÌ©²fL‹
�Ê<J3åO•ÿ9þ\ySâͤ%©*Õ*0iÒ�¥âœº0«A‰F‰ÚÔÚóéO¡:͆œ¶¤Qº
yž•–kS¥lMÂÜ»U"Ò²UYNÉW’&G–@•ðàÁ»LIÖ¼x™paˆ
YYþœ90渄cæÜ™ð+Æ¡É‚­5µF¼¶=³Î­·I§ºic½\{¦b…v…3ÙWhÏÕ8?ú„5jI©‡óBW{š£Ì¡¤©og¼T<s¿,k?Uèš{ñîÆÅŽíòëÔ ÕÞ½¿5æ[òj¹´^Œ4ïÈ®ªúƃí6›Âºî¥„�@2É\ùÄ¢„.óϽ	KAŸ{(µ«2*ñCëfÿ“
±]|¯³åXN½æàÂïµWÔ±½Ó¾3k¿ÄT…½òzäq®�PTðAø²ú-ÇÅ
Ln£á€kòIÃS�@'ãûo7ø	E«ëRF¥´L’±ðºìHª«ˆËJMUTêÎñ€L&×ÄÊGÛ«ð&04ˆÐÅèrÑ@ü<L-ºA�Ì0¥ÃTP¸*r«4ât¼hQGÉ#ÒéüèHÂý3SOs[´JWƒ³¬°Ð¼ÉÅônƒ*5ª°3×<ƒ-GËJ6¦ÍøT“*·@�’¶ŸZbp¦›ÐÜTÛã’´ÔMMךµK)c²¶�¼mp+WšÄ§e]ÍiH¹àt°Gÿ¬ð‰È´ÁiOŸ¥ò[�ù$1\„æ-¸¨hi�ˆ.†±H]ÕeQ͉óT1R‰G4òS?¡ÒŒà'm5-(IëÒ*á¿”t¨Mˆ�j5†©KSe-Oå4&Ø�‰,³f”¢,8¿Yµ3ЊV=Ԟ؃MEl5J–Õ2“ζap[¶-H}ùÕŒ@âb¤TkÝ\<²lÜ~eH=¹&Ù,©¤F[<SëvxÆÓ=Ð9¸·Î
WZÝE�Û¸“²úE¯ÆjSSêîìTÕL”¼c£+2JË:Å»,Kßî:î�íëlÙÁ#Æu'Ï
,OÇûjÚ¼£urOÎÖ¶1g¬9‚}÷„šü7u…

--- NEW FILE ---
GIF89a—Î
ð
	
<%=AB>GIu\ljnr|nxveaum{w3GF(jh'tm&{u1kg3tn<|{J

G(G4V%[-^0U5L6)e
µ³¦¨²ª¹º"ˆˆ#‹‘&“Œ&–•3‡…4�“7’Š4——%ž¡4�¡)¢›:¢›&§§(§³(±ª6¤£?ª´7±¤»ÈG†ƒA�‘C�†C—™X‰…{¯°‰1¥7�I�T,™d6§MªW$µm5€\BŽkN“yg³yLÐX
×hÒu1î\
�ŠpÊÀ�	»0!©w ß‹€ÿ
%H÷`H¼[®ÌìhsŠ–½z½à…8x¨Â¤9	j©Âä¥]&E�ÐÄK$J”‰-«^M0§Ý&¦Û†”³÷%Ç�KPwÝ*80`ƒ…
Ú­“êE�/«
I
5+n¢‚ÔPH�Œ×Ĩ¡5ÔL³ •T6ˆb†õ`a€ºC€€ºC¤;CšÉb„1^sM8�!EHSÏ.H
(!›
.	cŒfH�‰f‘–iO™1
˜«…GJH*Œ
ZØ ‚>¨N´ÄÔã#µ0Rù ³îðƒfŠÃ*(ä;<êb«Ê.X¢”ïFiM‡¶ÀQ€@;@A�+i…^£ …vê©’ózZ¡•À’øn§!Jª#†ïZˆf„ðÔC>\’Êe=ó`„Hl:¢�†Ž!4øìêNƒ-BÊ,‹ÓÊâ‹ÃÖ£ ›B‹æ±k¶øäˆV&Œá‚
˜âÁÅû¢Ž^ÌâÎÔœ‹¦¶ð4rÅ0º²šD
¸á®Ó|;ö‚Å„ÿ£=aWøs�gëØ1“gJ;âŠÚ#
ÁõHsÏ’ÒðsïoÄM¦ßæœwîùç [7Ð^€F\è¨'ÚL at A†
ˆÏžEö¹¶^‚†5%�gXH€)J˜…(õŽx
]
ë�îmLVÓ�ïÿt
˜M Dó’ã®á¾±¯~¢W58ä¥ÈíVvº`°$ä%uÀ9ÛÝG4½
}QCQ¢5¾�(¦ð‹K”•×7 at tðEŒÍì
�.õëÏãÕ€¬Ö°)Ñ}긆;è%£I
,Ãq÷@ß3H¤ÊúÝÃ�ÐTÐ3æùÿ)w¥ïB Æ3ìÑIw¥R�!J£)‘4ÈOIc–.Z™»ºõ©µo^§üà‹RIÏ^ÉÈK†t4$P?hÀ�DžLUã
@ñCýE”
Šp…!°¡
T¤âò©8EåU‘
U¨âž½çGOzU¼Âó§G½é_ÁúÕÇâôŽžr,ºñhO§ÚÌávuî£ÌåÝûþ÷À¾ðñ=üâÿøÈO~·™­üæ;ÿùÐ�¾ôuýð(¦	M±±ŒF¢(
tƒ™jü’H"‘ˆDм€ˆyûÛ/	@H
Oh¨@…Çp…Wˆ‘y“‡
È€˜‡yœ×y¥§z¦§
ßp†­÷
¬{± 
gæ
z{Ž¶l¤¶mч‡]6}|؇~ø‡€ˆ‚ˆÌ7ˆ†xˆˆ˜ˆÄ6{`}ÿÑÐ
`–f²ð
Ì@öG(°q‡`çW ég7@(ÀN·0~y
^Fg¤ö
QF ®ð
õ¹h¬7i²°
Q¶
¬P:k¯°
m­€ ‡&­  ®@®Ð
ä�¡Qöfj ¯@¢* à¢«P$:k*¡XÆ¡&JŠk"Ú¡YÆ¢}f¢‡v¡:i	l:¢
:¢¯€£Iº‡‰h¡0Úe±Àeê ¯À
*lZ¡½'kJ£¼ö¢º
YÆ
T†¤dê£}f¥Tˆ¯¥KÊ¡0ú¡X&¢*e*¤¥ö¢)º¦åЧR†¥P–£Ä–¥R}ª¤ð	lVÿŠ§¾'!še#Ú£ Z“f©¸F¨z¥‡J¨·V¡zJl¡9jâ°
¡F â0žJ @úfb6i®*eê
åh‰ž´†¢=Zjʪk¢o«Æ©©P–§yÊmKze�ª¨W¶¤cZ¦'ɈP »‰ ¹
ãp²Ð

€
©
〠b¶
of¡ã`ª“¶
j6¡
@q�
°jh±
+f° ¦ÅšjéÊ¡ä0©R–
§Zãºg䦊¤)ªgµzµ:€±²Ú
ûd™§+K E›š�¦§[J®;²½¦³ž–±RƤ–f §údðf]z¨—±¯ 
x›ª�–¬a¶«š¹^Ke÷®¦úzµÊž²@q¶ZqÏÆi£ö¸¶Êµ?«·Vº²"‘e
° 
�6
Ëz¡)e1ûzRë®IËl†Š �JjÞh`6¼ñ+­p³¦€¤‡z³8‹±­`³
à
Ôy¡Ú¡Q:¢tf¨öÚ»¼Kg«ë™»À]æ‘Ÿyµ\«dj°^Û™
’è‘{¶µëh§Ê
Öë­ºGe;¶#\¤k:wº©“†±»›®rËÄ»ÿÔ©®§Ä다†¶n«ÇOF±QöÅïÆžE›°*¤ø¢Ä»
­@¼
NK¥�7œ
Kèj²¸;
瀳ôlT[“±�¯Ð¶Øl½�{ϧJ϶j¹
»ÑØœ°�K®s(%ëÏ躣
åà™±�
º
YLÁ¥‹Î¹+¼]µÛ™ØeYÖep¡ jRM{[¾#J“°ÀѨÌX¿Ê<·âp]Ôâ }¡éЖFgÝÛÔ¶º‡hKg¾»ÂÄ;¬0×�°`²Wû§0Íå«}M�®ä�
M-
°¤"Êzڌߓ8ÓâÍ­3-‰Ö;ÍÃkÓ«ì
§+ë´Ú±B|à«àõìÄÞ[¥å@¾ÙmhVÆ
�³ºM¡PØ�&h\¤°
.¿ô\qèÚ
Yæµ€·+ÚHÀJ+¡v&°Öÿ½=Œ.ÑØz ýÎãàã’]Á£Æ
m]¼ŒºÅ«Õ’�º¥Š
Ù€®«ð¸g³~6¶l.
gR¿h\Kž‹½hãYý9ÿ_mÚ/ñà�òRžÛve0¯ûÆÆý»·üÓÇþÌÿþ¶VhÙÿô_ÿöÿ�ÚQ@­Á›ÊÖÈ
ŒÕm@&WœøŒ2 AV°ÆÉ:ÊJ¬r«Æ¹rUî•ÀUåZ¹"×J «V]³j•kj¬r²ºZkÐÕVƒY§Š‹«,®²Ä½zµÖìÞ®±´Æ‚;¶U¹µäX)•Å*ë^Y«ÌN¬ëWë«ÅZÉ]Öj™+¹ÇvÇ>|蘱YÊzožF�ZõjÖ­]¿†[öÿlÚµm³Î)à	“)?�Hjq Ê�
Hk at bXâÊÁ
Ð>¬8
4Yº	€œXŒCNí
��+W¤Î"±˜¨?
š
Z¶¡YïRŒ*‚žã쯩¦*óÖg-¤ª\�ÖÕ1^y祷^{ïÅ—£œvòÍ'ྃ‹V#û¦
ÒË/´bÑ«QÀ@ôLÒdáТ¢ºª âc%J£Ö²ÝÄ3Ó 
¦¯›»t¢ŒåF³°NÑÈq¥¿VüŠK,	ûðæ!³¥•WöXJª
¬b¥
ÿ»b+3ÓüÊy=†'âŒM¶baš¸¤	¢¬«£ð”-W[)’Kì9×`°«†æL¸F)¹÷H0A� ~EÀæ‹¥*KÅ29q´’–Yƒ&*T¤š�é©
ÛÅç°HÀ]F%X¤#„A;ߨ(³²Mð ŒNN¾Q¼oL¨@KyNè,5…T	# £ rˆE
)Èh‡“hL#IhYò†ŒLäV8±íj“7<$"—>maò‘
éÖ+ÿxIOf²#ÒŠÜ,¢ÊJFŽ$±4e-²H^òò•�ìe1“™Ì�TR-ÏÄä*5†J•
w®ÛËj÷ÔJT’R–ªHT  Ï*³˜žéj²àTJ"Ó’1”.åâ™×ÔÚ3Y%ZQ+Gœ�e“ äˆÏQpÄUœã@ÿÔª)R,ÓR�†	
¸R´tS�qÌUQæÂÔ+µŽ§g
Äj:¶‚5%�@ÉÂgºæ"E4(¡–ô’‹¢´â)‡¹'³æòVŠ™g/y-‡²òŠÆ²Ŷ,%Ùª¢Õ«@e ~µ[_ÖG¢1¥ªjJJˆY
ÄŸ“a›œÓv©Å§SaÔž:”sQK ‘+b¬RÐŽu�¡\InQÞÆT‰k+œ±k×äI˜Ñ•%A`á­í|¥•ÈÒŠž#LX›BOl
‡9Æ�T|åÞŽC
Záƒä˜hÉ5¥vÈXZ2ëªUqâ5ï`
Þ„œ²ûM|j7šéŒJ(œ3\£áÔŸó‰¥Æ‘\Ü€)! B`öÔé© 4,Tª`¨è¼‚¼˜Ý*uð+ÉÂMÑ(È	`áâ74
·Š¶§>C„ñ”—GÇœIhà¸C„ðE=‹)
\ªGó7!„>‡+\°9M¥B-V:Œ`âGÓ�HŽîê3Žø±EB�SKVU¤TÏ°¸óN£8µAÿ Éì™*G)Ü'3
½¨!7[“®“_ù¶r@’jÀú*‡£›ˆêr¸©pŸ‰Ð•-11¦ñ³TÚ•\â&jZˆÜ€Þð
àˆº—ú,Ð`¼ÿ1°�®ø¨�'nÉŠSr›½`¥áØ'¨Ø+3ɘ~J‰1ðÑ®Z
Ç0D‘dÉŠ9Dvé2®�CëúµŒ’–ª!
‹©¸?ÿB2_	4IÄjã$ã¢ŒÒ À¨8s›¿²+àZ¨Ãˆ³ëR•	󋯨�	+!ëăbžé-–š±Bš�(0óDJ�q¸DòÀ1ŠBŒij/¿:œ–Ù“ùð’²øˆ.zb°µ°+ªÊ¨Ñ°�œ©Ÿdá°b¡”21/•JŒrP)¹B•–12sá½(Š¢À-Äȃ *™m‰<J)fs$£²ª.„D‚ "Â�²ÿÉR'¯¸Æ/™‹ÂèÅYA®³HF±�¹€0Û‘Å…ê™tø‹L,ˆ«ÈaÑÃsI�¨@–[ã³/Ä-°=´Š=ëÇ/œZô±§%À.'K¢¡˜×:G#R`IÑ+#³.£zW¸»ƒ@ô¢G]QŒ›”¤þj©ÇI¯”ª*òCO\´­8—”B
#ÇŸ©¢¿�‹”¡œª
ÿºBD0‰}y‚r2Ã�q–â É9k#
Šçä�TŒ’úŠÀ+ѹ\
²ÅÜs,i”ÿ9‡sè¢7b*²Ð
"ú:A‰ž!BŽÉÁì yŽšGË
Ê7éÌY’â»cÀõ´EŒ�s(O3Š±˜ÿ�µO±‹“ñ™Ï[©¡¥Ÿ™
,rœ
BŽùÉŽì(�²885ù˜Nmƒ@O(šŽUH:XصS Ÿ‰A¦ù.¹Q�Ë‘�žYØÈ+⻜€¼™Q=0\:±åȆ6›8
LÕbÒ·JMÑ´^C«»0â�ù	ù�ð$íØœ¢»’6ÕÁR@Èk#
±�Q1:Ç¡�6Zºö°T£€÷àäXŽ#J‘û€ qXAu£­êáã-Ê�nXçô»nø†Å‹…8¦8¹e¿nP…-ž°8¨
2Ž]�Eý¾)ëÿ1-�#Ò	©·R€:~:±ðè툎ÑŽðhÁymÔìмɸ´&„7ROueŠÃù5r “¼i™žéÓã¨"`Ë:G]Ù�ý”`å‹ó}-•býµ œ¢
õT[‘¢¦3 Šð
!nݪíĸÆ‹¦
‹ÅQíñÔ%ëˆC+CEá“ʉVq§¸H«Œ)ªˆ‚FÉ•q¡EàÂ-qÉ
¼É´2“jÑÃY4�Ó
ÿŒ„•½�$Ú¯à=¦]ZâÈŠ€ª+Ä_š¦QFˆ;âB at 28ÎX�€‹Qb“QÂ%�°BˆàÞ‹YKˆ‘_ç-ÞNÃlq�ëe”ù!£/ê
Å]ßà5^RÚˆ:£0›¦ìM¥û$µ�HjJšëí$ñ$�@	9¹š}sÞ
ö%ꦮ`Aßã­^†À¸êªžˆ‰À•“³ùàÂ…lß]¡`ê•ÄÍ–Ö¼ˆÂ¤B‚^üE¥b—¢Šnß®]ê(^Z!•>‰—¼¢ù+á8&
¾àkjÏý(8‹8%O=#Þ!ŸMiQqx	QÃQ§ªcŠ3m…ÿee\ÜCë[`S¼`[¨eŽé„Tú 
•T;ù�àYž»ð2
s5At	�jÍn^׉	
ž—ñýá‘�$®
¬FÖ'FdqBáÔx¥¸t	Jî*•ðäóÍK¾äqâ;(0Î I".àç�ÞîM9Cbå¾!—C¥µ°%éue�œ=Í*e(¦%�æb6f‘àä'>æ��%pŒRf	n
hæˆcª�dŽ	IfæJæb¦æ½
½	f‰keƒ¶ç…fhžlh{®çÿ^	v~hÙ hÖág…~�ÜØ�qv‚�&©éUàŠ&é’6éŽÐhÔˆèv¾èÿíäÚHiÙAö=i�hâzáùhG­�Y>‰˜¾�•öæš¾‰Pê…>êHê�Hj¢ŽdÖXj§å„ð\röéËI{,±5

¨RXgA›ª
©Q
Dô1‰y¨2ʲ3E#C–ˆgùŠãzüàgé
Od©Ñ|IÂ
OÁ•ö²°
–|Ú¬ùCŒä¥ˆvA/j›0jl—Í10Ò˳õ0
£¼zÓÐëÄßä´F°²¹(¦<Ýîá±(¨¼ÆÆÜlŠC§
Ú„HDÉ£pÊf¾‘¨n�¦–ê�héÚ¨j'€Ú9kÊá�äð�*¼¢
PP¡¸ðË Y…»¬øÄÌÖ‰;Þ!Ð*ÍAá¶}{±9>W‹KÚEU"&1?·k÷˜ŽK+�6ÃÑäp»LcœU
¿UXžú:À—‘
sxÂ7_U¢ˆ3îãÖ3ïLrHRM;÷8¢
`ð½­B/ª)L[S¿™ í€S÷¡UGB…Í
õà“Ÿy—îð»)mÓXÈaÍ™±ø�ÆRÚ¤�Å Ü5f6» åð K_Ô�ú¾/§¸Tu¿ú¨”þ¨)Á¶Äòèc;‚Óîiå­ÄêÇšJÑèpF‰3œU¸><K$Á@ÿ¦‰Ñ�£t™�Ž¦pŸ³ãóT=áYYMÕÇ
¡8ì
I$u´�Ó6 Â'õŠÃDâ­X€]ulÇäwègjN¦'í¾l+V˜âZÈÞDꕲ*ŠÃ­
ïUâêVÿUšˆ¼H™¬çùLÒeÝùdhzýü×ÿgÞ|îÿÿY,hð „
2ØM@&Sœ\qe
ž®Å†L2|Òf[n¸
—Û¡Á·Ü+ȵR\,‘F
`|•Zz)¦™jº©|ÿqú)¨•Î*©¥š
,ž‚—‘}LTtÅu£Ñ¨ª8ÈM:í´à‚,%¢Ó!5‰‡8Ù4lI&ùtÓJK•ä$(¥H´Ò•bUŽÌhíR(j+Õ%cMâ£�˜\"—�nMòÈ#ŽXâ&ñö8-³Xbï,¸<ÒW`õšIËb‰
&0b‰YB¦˜j>&™-»@F™fnNÆÅ£Yl§j«i(¶ª
6„þp¯`32ÿpÙ$÷ÊÊDZüM,�6:iy±¤:ê©9ë¼3Ï=«‡3C©ú<twB}4ÒI‡ú9Å‚�ªÚ‰#Cä4Ð�ªFñU
Ðc3ôßs]ËòÛµ-Ps8›�ªqd·ÜÏyú6ßÑ
„sÙn¾öà…®4â‰ïl´B¬(þxÐ�K>¹Òj]_NW$E
+åÄ
,_¿2Nܯ„À8Ž_
÷AiÝÜÕÏ9.K9åUïŠ+¾Ž}õ­ .9®€.8è|O^ö½Oÿ¶Û®ÄRÎ*ÿ…O)ÿøåy?ø±/Ð*ä´"~õÊa¼
Dt³#æ,°
qˆ#
‚×í
`	í]‚{®ð…3¼á8Ä#.ñ‰S¼áS˜˜@÷¢�

¦:L€-^#.ÚâK"&;
"!V	Hö<ÒY@\
 àÈ¡£CB+ºÝ6º'’4XƒÄÞË­g=ƒ!â�:8¤2h¤$.ÃYöã*"!N"
Ä^1Ð\1$žÕ	"UæäE:¤:Ü!§5ОìõÃ/¸":BCC¢ã-ªbU²Ã<gGòÃaÎ"â$’å5bå"€2tcvž^H\B¡ÎèÖ(ŽÒ¨ŽÞèŽÚ¨�æ(�é�ö(�ÿ©�)’©’é’©Â5Á4Aµ—V©•Jœ”º„�

€ˆ0°_0ë¯'0
?p,
“@up[pã/0Ýï	ïo�0·°¿0°
Ïðý:°4
@Ÿ0KpþÚïÇ0Ó/Cÿ°p±
¯p—pcð
±§°
K01ý¦pgñ[±Çpp
Ï
k1—±Ÿ1§±+p@éh
4�@jí•s¬Nͬ
öHÊKÊéŒÊôðí� ÍL¤ˆ�÷´Âÿ¨Ny8Îú<ŠûN9NÕ|W ÎØàñ~åš}]á82›±Y,<Šê@²PÚ¤L�*Sʤ°òÀÑ�B�óœ¥ÄY‚)Ú§Ò‡iÕ.ãòtô²/3uxÎ
²ÂM¨„¯ø
MÔ„"\‚!¬ˆO,BH@´
2ÜFJãF2Šn‡qì†*xâ¤ÀŽ¤PŽ-3O·03ÄODP÷ô�ñ™=
@2G²,xC3!œ…U8‚TE
L¯‚̸L£ÀŒ¤2ý<7t÷¸�ÿ8Qÿ™{]—2Äò¸�ŸJ’{�7¹“?y�Sš5˜‘V‹-ùä`9”o9—wy”­—•¹5‘„§ì´—§¹š«˜r›XÜØÍ`Úšs‡‚¹Ê�)3Ð(Í'„Ö �¤
óÚhÏ@´F-Ÿ[Uw�+tÑ×èÎ2µ2�èÄ�>•GL¡Îüúx€+O›Ý�+d�™ûrµy„ºÿÀÉÔ*z�ñ:±‘ÏøOPÍï˜ywPšŸ/ĬÓ:u´BU…r(Ïzãì‘ñð9¨ˆÃ¨”Ý\ÍðQ£‡+€P�­�¡ßMÓ
ÍUõlǵïNð´B¨¯𨊢gÿÇ„ûzèÎóÔÔOÉ9BX9°B
í
§SG¢ƒÇÕ”Ãó`T=Çþ Ó8:ð´óTU´¹x­{£s™ª8;tûUÙ;¾¯+xʧËÔw$P#w•Um|"'ÎtYYY]ÚìÓ!±NþDÐë$€Ì
é·Ò8øÎ*(ÑÑãÌÍJ7˜ƒ3uC+

–,
ÿÁ*Y¯ÒIl9ñ%¬š«Z1í66èÔ–
Æ
àp+Û˜²ˆc™
k1ØŒ‚¨ÈHrê­Í<t-ª„œÏ9WZ"©ƒR`“-Ø(ìf"Ûí¢V"r…œVç¢sÆyO§Œëæ•Ÿc¥¡rX)'€qÄ	� n‚Cò±
HYŠ²ìÊi¨È6™UTçd 
'®pBU)@’¢<[y¥•¶R£¬Ì.ZHÂWx%oÁ†z¥¦]sHϬ.Z… rLqåIeuˆ2rÆ‹¥&¹b"%«”¥W›S½„{ñGr`)2¬ULÐ.	Ÿ$·•ÔBÄS:cŸÄsÏ”\„ÿL¸‹ðâ×9é‘`ŒÊ—­ñÆI§°Rbp!½4�^/zLÏ"*gOoSóÔ[/jiÜd­Úá¬M
Ïr:mh^¼š9µš~äuŬ$TØX$tÈ.SÞj˜[ÏÁI¢µ]E´…Þrì^ãr:¡»¨µj=òîr¢Õ^“hæ^ßZ׋�òê\}N餰€”…•­ÐìÏÄFc*¶–ŠýQn—£k¸S¡•­Œß­k2Å/œ ÃS&h¡n9èˆ&öv׉Ÿš¼°JRD7I‰{¢”®
V8
k²–ôšBuÎ/uŽiOeÍ–*gj÷ÅånÄéÉ�Sê�拚ȋÒ	ÿÙ[Í&̉…×Ûl¿YwN?çsÊõÅËcW\YhZ¼‹(!­:§Ø/vÛN¨�ã3<åÖ
aV•n«q®œ|Ï­4>Õ/D‘–^:¦¬™�3!‹Ì>’"ñè	c	
¦î¢½¹m.YŒÑËR¬¾È±äbÕZHŠ¼µ7ò/OÈÃS[Ú²šá�NûÐiÆ¿UèEX‡)Ê!'˜
,"«€k`¦jOnD|Õ]Hä
ú	í"Â’ÓɆ5!œXÅ/{²‹5C-YáIBé�NCZd¦†Igü+Ùyðç-pU*m„Å] 4W°°d5rKý¤ó-‰dÐ*P„ͬÿÚ‚¼ñ´Äh@úÔ¨ 	I™àT©JZ?iÑŒ;DO„5€©‡R
(D
O­'%?�ŸÚ¤Œ<Jn
@Êz¾‘+Ö0HbÒ£‰NJÒ
Y
 
¼JHj€K¡¼‰1
Îð•
�Û^Ð�ÛšE„øƒE”|¥šÓ<’o³}KºûÇm‚¨ŠýŠ!£C³)–˜€L*QÍÌ4lM~ª!q,õ+ÐÝ-,G’àÕ£C`d¦–€H-ù·Ü@ìDmL3æsõÇAr‘�ä°^Õ•%Â
á ±<L9‡c*ƒéÿ	M”=AËR²*€n”bðIÎQª–+J�ƒ
pšŸ`aÎîdï×8¬!Ä�£‘[ó´]‰Š²`R’tf=á‹
NÐÚ¾W¼üªHÇJ²!™‘¬ÂG’ÿ†c²‘Î J³uù.šÒä¦XD
»ŸÆb˜  ÑZã"Ì¿
gz ßñamþ!¾ýå"-×qO «‘ܱÁ
0ЕڲáÓª3åûNÎ!éÈ i!�ILÞÔ–¼d*�&ùõ±Ÿ}íoÿÕ3�B•YµnñÔD@ÁóºDcŠ£´dZ!² Ù¥PNSÃHt^4ž„@Ⴒ"¿ä×,GhäãjH!…„EW Ž�Nè La_à'¶�ø‡zc1,mƒÆe
b[bb
,ÖôÆX$äbÐ"1¤( |d[zd–zi=Šb
Gòi´‚g3#NA*˜±C,-TlÂNæEóþÂP…(¬O³8Â#®‚P¢ÊC(ÃËÀ”Új 6(–̱2à‚ÕÑ+ø¦!¨#i°3tG"Ù£•p	–€­Ì‰gFó6 V£­ü©ƒÂu'VZ�
Žf"2©'¼e Râqé‹ Âi²Ñø‡;Â6ì
—*Ì_<ÒC®&|Ï"’ž6ãbb"

ñ«k&Âi ‚‘´b%#kzi¶L%¿QXÒ-(C'2‰‚­È
0J!.*RÖ:㧼cóXs–¤2
ñ4ÿ2b�	&Њ2®äPžJLüÉ0Øâ« >W†$ ÂŸ@Nˆ"<NéŸt„£!}ÄK¼Â)ÛÊ;Öâ;£	&Zâ–˜SXø‡;i&BL˜àä'VO
.4DEdsõ*ÚŠ
œBA
+;­¥/W
,� Ú*
ðL.X«";âèåËcb†fä'è&A âÜ$Ž1ªÂ&=DÇp	{B—¦®¬\5û³§°â<€ê”8
Y|Èa:ãÜjуÕ+üBª]Z!¥bn-2Ðç/~Š#ÇeH>¢+c©§Ì‰ì.ÔŒ­ +ØN>Üæ–d‰ó®"éÊÑ蜉` (;Ôªàÿ–§XË‘óH¢”
$„I¦æ´fÉ/sÊGfpaA"ª†¤ek"™y.9|TI#à$
k÷!Ùî<7(JüÈO#T\£ÜÌU°àƒüC}ªJ–(l$w
ñ ’N{‘o&<eÁïo\ÖŒW"€0oÈYWáH
•œI"
~è�hc"�–hOÔAjÙX!˜œ*›ž$Xj©kÜÄ.?L¤9.?˜IYÿ;V#±Ð­ÜîèŒB#€)GŒ
ÉmÊì€"o†,žDýdBÁ	š	¨"¢m^uz)š#¬ØJm"|–.€†�ÙøGòbkÔ¹2ŽãU}¹ÆreZòâíðÂ_·ööfÚ–Õ9:'+hùbÀ\/³Dzqó¦eÃäfÃ/ü•ŠJ‚%ÆÇÖcf,¢QÒä£ð�JÄL ˆOP̃øtð¦�ðwÃÇqHºuAË6t‚�Æ*j%b|h £<p"'Á/dFi—
±Bk*ƒ7¶ÄEæåéØ%Rjdn玊Âm®íÝf÷«J–øIý¤Aàƒ1tºÏÔHQÄÍaÿÒÅ�°XsðIh4+ëgÞÊ.äÆ⦢cv×Fì‚'%¤È_€DBÒjEvÃUÛ"àW4\̇ŠÅ…!Ž80"tXá…Ø¢ˆCù æ†>Bä@0BD‰ˆÂ@Þ…IæEI�¨  |£$±¨M:¬/s3RÙ±+ç„�ª|¢çI¤´!`bH¬/�>’[\a-èÌ44'Õ*°ßÙ!âytŠ‰<Âe_Ž¢+,Ð
aã[ò"…HÇ_¾¡UÌÊ‹d~¬£~þ­ÜÈÇ*$¤6DX¨eÛ°ibÄq=œF
÷=Ò!éèç"ƒò(E+ëÒ?L‚ј‘M2ÔÒ�ó�5=¨"b•ü#(TX©–Â2<‡!ÄÄ5>'Šö„$nCnÈÌwŌœœÆK�¤GÂ0q¢BøLÖ"ƒt¶{M…C!É�ó°Å)"l2ÙEžÅÕ*J¦—ü‚"`%DPø
8Pž#ÔJ)QP“(þg úÉÒjb
ö�BfD³0&±ââ*®jX�È:§F3|$A†£†^±@pƒv-*ãy XHovÑ*L·e
äB'°CKÿ¤ŠípæÌLë=üâ0.æ´\–®Å'dO3¾*鎅QÃM´§(
o}…ÇÅœÊ!
ùÖIFK3ŠçL
}èøG.pØW$-1Ò¤ÄBì^¨cŠæåÎLœÏ>o'êyùÞ$Z¬=\ò,d/7#.,#¬úy@ˆÒm–=ª�EdÇ®W È„Æaøö*9b)’.¹1SÔ=¢`Í�£):€ÅYv¢A`rÂ#kR©¤Ó,šÆœÜ
•øv!9ˆo]‰sn¬n¢8¹r؉”
¦¨qÚä¨.±JêU_ö‡ª§°òW+�”Z
ç©tÆ
l°Â¦Wë°kÍjžªg•ÊR±ÉVel´ÌÿJ;èzº"æ„PPÖ«,bÁ²À+˜¤Œö
)㔦Ù+ä”fJÝYN,«ÈÒMsã´ÂJ+>µòJ9U–Ns¦D@9¯¼
p¦¤ÓM_*\šZ«äÝ[ö–#În¯‰³Ê9ÝtCZr²€eän䬒\eÞùK9,ÓËòÉÅ­RŽuß	Ôœ,8”ðÉ6ç¶Y)2DN+oir9¤¸f¤,™ÉrÎ+,k¶riâÌ‹AÐ6´ŠZ³¢Ö@¬òÊjͽ’@:,£]/ÌÉõ_Éu¬ôÉ`%]rlîž\ŽÂÞºÝÊÁ'À1,ù¶r¯féPì]Ì{ÝësrËy«´À±�R0ÈëÿÎôÝ8
T\ÇDÛ¼29™¹•Smni¬`”4
pmFj§‘�dT™2Ž£¬
ëÆHñŠnü.
IÚáêÇ»B:0—Í‘™!�s¤p
O`ÙYþÄ-Da0‹Yd*F!ŠQ€blfóšGqŠS¨"r¦³*WàùÎzγ*V‘g='gaßX˜¡m$ûÉ�>Äÿ.z
i±$‘Ϥ+�é
]DìR¥(£©}£„ D@
!	ÿBb“¨ï%|	CÄÚ¿žµ¯%¡ûF‚‹˜u&Fœ‰_‚Ö˜8„$ž½ìI4‚‹X&01‰EtX• @,	0‰c›³pÄ$VÜaHh¢�x%4qcwûØ”F0à�7¸Ð%Q	\à"´pD»;a‹GìÈ0¶…%l�[HÜ´˜¸Äo¡‹[ÜbLÖ¸Ç�q�Cä#y/P�
c \åÈh92Pñrd¨©¨y*dŽçQdCç£Àó+FÑçlä9z†ÑÿõLhÅÇ8Fêa¦Ÿõ¨ƒW½"Ù´Ô¯ŽŸ/FaMJõBÜ¢
i4b €
$@@b¬Þ¯"üPvT Õ{е$l€jì
>(„Þð
Ù`„Ù0„D¨
Ø 
Jè
M(Éð„Jø
Dø
WREø
Fx…I˜„±à…Vˆ…±�
d¸…gè
`†ˆRóâ†j˜…™$‡RRtØ~éÔFw$[¨8|Xeø†t<Qó~�1GRû§ˆ‹HŒèˆ�è$VÇ�–‹¡ ÃÔ!¤ÝÒ-NR#J1‰x]�Šå«Ñ ™Bÿ*�2BÓŠp¢,’‰X—ˆ³h‹·h!‚•Dˆ!€˜”
q
ër20
s<î"
Ä
�3ÿ/%.AH‡”Ø
¿#4°p—1¢cHj¡ØqFÅ

ÅñŽùÒ‡è85¸H˜…)&\Ò†ùt¤ZÇžf‰ú!3}é
[Qœ”� é�€
g
§?B‰ÔÕt
á¥ÒÒ¦«r"˜& y"‹zò§q*�*¨«e¥…J-h"]m[Ý’¦æ‘§žˆ¥S±+‘‡J¨ˆÊ©�ª˜ê©Î%)°5A`šÿ‡j& zªÚ �ª)âÁª¡J«pº©µšZרoÒ¨*·’ˆÜ«¸®ú·J¬Éª¬Ë:ºš-¼²wš³z´È¬×Š­Ùª­nª¨¤ê«´:¬Ûz!á*®åj®çh²uÓõi¼êh#�®nJ®ñJ¯õj¯È$�¹«h]W1¯ñ¯Áe¬÷J°k°[hòRÚ®¨ú­P‚¬;°Û(K±‹±¸¨®‰ñ¬�ª¤øBŠ¸J­°Z‘±'‹²åª«SZª¡Š‚1k[² ³4;³O�³Ã”³Ð²³5r#5´3´6K´Ck´B‹´E›´.Ò³:ë´<û´!qÿ´JKµSkµK‹µU›µW«µ]kMµa¶^±µeëµo*¶Q«¶i˶c»¶nÛ¶o+·qK·pk·s{·u‹·{«·}›·Ë·€ë·�K¸ƒk¸‚‹¸…›¸‡«¸�˸�»¸‘ë¸`»²W°
iRÐŽp
.
Ð@
þé
næø°ëÐÝÐË°ä:
�ÕÕ
O9uTR;5TÿS?=uUU[MõUTceÖYeuÕVZo­uW]{ÍõW\ƒåØa…õÕXb�-vYeKuÂ
Q™àôŠQ=µÖÔk³Åv[m»åö[oÃw\qGíÂ	& 
 ’µÈõHqE’“”d%)yIKf“›Ôd'9ùIO†r’ŽlµI*S¢Ò	M(e ÕÊ+¸r•¯¤å,m)K\Ö2—·Ôe/yùË]S—¦¤Ö† €pÈÃJÖ¨ÆK&F�û8£*ϸÆ}Às$.f1¹ëQcì1”ÿ°Fœ1‘Ó3Ç\ƒØp`B0
x„q�jT©¤öÐÆ)ð@# ùÙó"Š�bXÔ8ÝK
êO#í„)ñOUøCÐÊa´*}ªçK0úzæ)…0=‹„¨2A½¥õœFW`2�kãšý&j¨AP|ÃLÓèÓbÓÖ4ƪ¬yDɪ’a¸Ë¢f!Fž¸X	@c(ÐÌ[ŠáÕ¡dÔ©\M*@áôx°ó
P�
	eaW9ÿ
zþ|Ž²TR1êŽÌb<ԧѨiMÈTÓIƒ†ÛîáŽ�¾õ1^ùŽ<¼‘
MÞ*Í->$'üôÃÞ­lW’[?ÉIBñ?Õ+WøzužVÂà'�…!
§ÊVpÛ0¤Qƒ3¸ë=(ëšô-½Ç.†„Ê„ òÜhu¾É×—ÜU0•e�=+4O⣭p�HѶêÛX%wõ*d0ja€µ+|5Z>ÿÊš�° \D¢=ùZ�y¨B
L+]ÉJZ"ɳ\ò‘“üd&CÙÉQ¦ò”­l…\fYÊXÞ²–«Ìå/{ùÊbó˜»ÿ|æ0£ÙÌifóšÝ\f8“YÎj†ÖPÅ©&¬ò
K˜–‘ýœgtZZœ’V¡MèC:Z‰64¢­hG/úÑ�†t¥)�h@;á”KÂÀP†0„¡Ó`
O(Š€b#ûØÉ&6ª�ýì „�ÖOP¶±­]ll»ÚÕÈžµ§©ýOg[Ü׶vÄ †¸Á
L�Ö¨P…(ˆ¡%àvµ¿ýíb»ÓE¾û­ï}AàG„�zÁÎL˜µY‚"ˆÁH(‚*Nìf#ÁÔÇ=îoÿ�ëàÍwÉÉ]ì�w|ã²Þ6¸[îíj›|Ü)Pu
HMóŽƒ
ç'ç9¶ŸÐ鷺ߥÞwÏ�.np«Á"0>€…EjZÓMp9«ÁmS£|å*çºÌy®jUC»ÖØVvÙ™-p‹ûØFPƒ@:…%0

cø€Â
LÃôBLCtD[|Ä?4ÃLLD
DCRdB^ô¿OLEbLÁý{@3|@rx…p\VÐÁWxqpÃtÄ^äÅüÃGÜA44@`@5À?´@34AÌCôÂH�äÅS,Á0ÂLH@<Å&lBqø†p$X Ç
„B¼HŒÌH�ÜHŽìH�üH�I‘I�Ô¿n
Ø	ȃ$=„ͨ
h�C Ó1¥X5½Ø5mÓ8�Ó4½„7�„K
È×Ε
Öѹ­`Î`uוº(€YÌËzmBøW at X(
Ë}\CH„C`*Í€)U]
�aµ\X„Šm„ʵÜFp–
^-;@)²lª�Då䆓€�vÕ*¬”ÊŽG"ôÛu»º£DÙéV�ÝÀRo®0’DüÂ6ìnÅ2Nº<bX˜`âýIàˆ×¥÷_i¹èhi°å“,¯¤SŽJ�•V¦L7eÄçl䊭+©‰À»2iPnOˆì‘¬H„ÄãÕ5uQÈJ7
Þ<ÿv>ë˜'t»~³ÔO=Ùd^+^a±Ö[;ËÑP8qEØNH‘¡	)ÞCãˆÇuÁB¡…µR¦\�zÄNìñºi‹:}¦—9{5çua2ahš,LÒd–^6ä‘g/Ã¥Tõvo´¥¥Ww�f~d†+vSTPädZâˆ÷Ù™G½ô1È=;‰Žò{ÔÑÓ©,ãÀ8Ž�»Au9v‘uPÝ
)éRÀsÒ¤ëžÙµ¸tνu”¡¸Õ¯Nm:“×òUFom:žg/Y÷~è<݉€Gçxº¿&
”Èpƒ¬0ÊÍ“„·‘ƒË3qDtƒšÌ$^¯hÿM)
å¤t4œuæ(™¥
°B¦"¯
•ÄB®«HºñŠ£e;KZ\�Œ4 X|f2çXÅ94Ö6ž”C'ÄH
RÆÔdéð¤ŒR
¼e‘Ô™¤Kܸ“·ÑeQ¥ƒœM4“ ò¨Q"cÏ$v '!†O2`aÒñ±’ýEd¹ã”tŽ"ϼÎDA<
k®å”(9%~�1Ñ�¸£›ñï#)`Ãÿ‚ÒŠot)
ÈJ=%5>òåDhÓ–ìÅ(qT[€="ÔÁCêƒt§Œh«U]V%w™ê^èAæ9昄pM›
À˜ µ+Ýk:9šNŽâ5é°3bôú%¹r,|bd’Ž\>Ó³Ñd-*¬ÎŸ¬ÓàI*ür †
ÅÎ޹³UA7 ˜ð�°hèFXÁ³tl))Mikü;–ÀM‡¦âW·öÑ(ŒMlRHÚD^rD©0¹HP@¶+פg
¤À³Ìã™
1f$芉HÔ™WD at A|éŸ iÿëLè9µËP’QvÕ‹
óÙÑ�¤Ÿôg )®^
�a½Â
Ã"G‹V4¤ÒQ+
#¯h€ô¬´Š°�÷ÕL7=²YÞ°R’- ‘ÌÂà8)‘-MH›ì§:F)�û)ß
¨OÊ …]ZO]¤àÓÝZ0¤,Ž±¢Eãðˆubñ_ëX+µ.

ţ�$_R
™¸Sà.R"„]E
q,’zÜÐRäc:Ѫy´gÈhª…üw¤`€˜
ª€I–P9KºÓƒ�Ò�v
 &H8±›êH¸D%o”á- ÄoQ´�fò_ž=´«bçÑW�0…±•�_eM¶+‚ž»@¬u¤••3I[¨Òû¬âIÏJ~v�¶«®.鉮vh_£dD<4úkz¢äv„,DGâ ,קx¼ØÅ£3z‹u8�¶ãÔÍ-6ëAÜ’ƒ°l<0©Ø£ì¢ìñÈŒ!ÿ¯K½TgGwí½ç0ã‹š"EûíŽ'E®¿‹gZRs­œ¾bÙiëÔTñ(¾.¤•¾¶~vzÈ°Œ—	=ÄÈ‘d|Å-Kk	®l£¯´½CÇy©X¤Ze«u™9Zyùv[±äj^Ù1ïžÐ
i�Ýu`^vøG^¼ÓÇxÆéˆmH„"�ZE	V}T¥Hþ‰�ÔMPÚZ¸‘ÐyÇŽø’u<Ÿ:^þ‹SìÆ»�Ýa-
ZÕ
yÉ’V�ÌÝJ´iµDgÀxäË\ÍAˆG®KF­ öP[
(c†”Ö %€NZ;
è‚®ee2èƒBh„Rh…ZèØ
$ڙ̀TBlJŒˆRiòEƒH錂� ±áÕn�‰JÉ„ƒ0ZŒRé˜Fùd„nP�|Æ
œCŠK Ç™Äå
R‡Nd—­B6p‹µ�ÏxE:Ò[a¬Þà™ÄW�‘VtÝÁüPþ!Ä–‘]ÐÔr$o2¤´B fG�“ŽìˆB¬D
Ÿï(àR_TÑt~b7–é\�.™)�¢ì^÷AŒµø_£N(»ºë»òçŸÂ«¢&ê¼Úë½âk¾êG=
œ�ØD
sôÔ€äâYB¦c¨ƒêkÿZÖëÂ:ìÃBlÄJìÄRlÅZìÅZ&¿ffÀz
ƺë�zlÈŠìÈ’lÉšìÉ¢lÊêçWùëØpìÀª¡Ê²ŸÌÒlÍÚìÍâlÎêìΖ,¿¶,À®ÂìÈú’¼òìÑ"mÒ*íÒ2mÓ:m;íD0�¤¦]ÎŒÏL=BÞ¡9ášJá
áP7PH‰†ßû莭rÄ‘©j,Ô�±däboöjïöro÷~,fRífÎìµaô”ítO:ˆØUÈb4PP2Ú·—Vq ÚÌÝŸ,À²LIQ€èÄ
‰]Ü2Z‡›½BW¥ä
¼+äÛN5dJŠdÈJŒt…d G,”º‘Kô"%DD…zï“p	›ð	£p^f¨Xm(NÄ=•rKø‘ÆŒBÕªFxŠLADVD…Sq ´$�,J’¼K
ËñÓqÛ1ã–Ý¿Nê“8•8´L°d’KINö‰à�I!J�”-CÍl¶—ñjýT©'
ÍÙòZFaGÞš‘TÈˈIý4f2å…<ÍȽ(H)žÍÄ”»ôÆJZ#'É3ŒÐõ¦v ËÚ‰0Y׸Ÿ+‘ã®ñ2pi
ZµŒÑbÎ/Ù˵S\rÜc¡v<‰>>Ô
,à�=ÆÄš¬ÒdP*¼üÒÕLº‰uû÷oï
ï±€0„3¹‚)´QmºÑKð…t�xWR7|C mS Û"UQé)¯ˆHÚIÀÂÒÐP9`íh΀9ÈÓ7À

ºØ½ëàl«Ë,Ê%ƒ<ÉŸ>à ¦å—7eIýS$,�|WùÒÁó²P§!Ψë'u¦ÿóõI=WMœR
×kýõ!¦Ð‡½Ë„=P�½ÙO½ØI}Û—½Û$Ú··ïxýÛ‹ýaÂýÖSýÕÛ¥ÜG½Ý«}Þæ._‹IÇìÝÏå¡3¨ÏêñX!‡²Ì,—ßÂÌ+B%Tf‡)À^°Íu<¯ò¢ýX¼ÔSŽ;^ë´Žü	ÏŒYý˜ï°
ÿ(v†ô…_INaŸd4T¥Ç_!S9LEi舕Äòï»ÆѹQTSáÕ\Œ1Ç2o°Ns/c1.'Kô†V�ã½PÏÈK’ôñˆR+¸RK]xˆ§g4ößLX6ÿñ(Òä™E,{Ç�,ŸðÊtŒü+fOú½Þ0ÿÀÐÖ
0 at V,q±^•L�@ó+r«®"×Êä*¯Æ±2IQVº…HQ.dc«Ò¯Z‘‹%`U,ãåbu±dºV7ÉùÎXý°«‚¬þv6
/^zU9
Ê‹‹þ-kÕ8µW¥@j rªK'
µã7ñÒï$WLie
YJ㯳Î
*?W\)NÄÞþ®”ÌÈ“å¾átz%3–Â+)?Xˆc,N<y4ÒÚÄG ƒ
«•Vj"YÂ+‡E%m2R'#‰^1–nV™¯¹âV+»ŽÊ	àÏ¥Z"O8IàLjX
 CXƒÚ(Çø(*ˆ¡�dYí$k	¥ø"<T7߀+O@�¼s[([)>–Ä!ö!A{“ΠêÖ+i¢“e…>qÈàœUº1ÉÙˆ^aLFn™+iÞ›üÄ«4q at K2=Ia9G`Ú:ÿ”¨q.ÄèOøÊan5”^A¨<Œ`	ÔŸJ£ÎÛ;u\7C[Q<“}³NdÜÖ!n“U3Ù‡^‹
4Q{"

&¦°3¼>$'�_Ï
h�ŒÀ	@,Ò�#Ò€ñVšG	@šÚÁâeìÀ
3³Ç5`A<üPh¾ÿQ*J̪ÔòF8ƽ¬<ã ¤$e,	*h'™�ûXҤ末ˆó‚_+”ã>Úð�-ü¤¿ðÐd ýå&#²
A)%ŠKpT>s¬ßP€)F˜€Sè+”29È}Œ²á�…9‚Xžõ
 zcJÍÁÀÍœ“
Z…n–p(�2ì‡H	‹ tc¤)¢¥d±…é24(DÍ�¦4ŽX”ò+ŽAŠ(£©¥±ã˜Rë>©xÚnaã€éùg0
?–ŒŒ¶ú!E`¾U@¥H‡:uHDK5rž‘KæwYÛ±oê£R$ɶA`Tç
‘L,QÑÉ~ŒbÈ {*£2ºg(hå0ôD3^ãMð…HL
h’„²l",:"I&d)…B (^LèI¢„;²kEþ„+j£O´!D"z¬	H‚¢%ˆ†´ZB:ƒ4\hkBT˜ccª„ØÅáVÿã£Å¤ä„)ô†�pL~ÄÂÄ,Bd©u|T~ÄAŽG5„ƒ9fhh£äf%@$‡Q2â$L°6L%1H¦o O †rØ…?";r›h©t|‚qÅ
¯a�hˆæ®±‡E–ü"C~ã>Ì� x"wÈj5$±ƃxÌT\HggðÃI(E4T£©N
Î
"LR‚p³Ï3%Z�'ôÒL £3B(âC\ÜgÈ0zPâTfâ1%Pâc#rb»|ÄO'B[ã5è\Þ#ˆ¬Mä0�Ó:úOH
?¨M#R"H§C;Â
O‚X
Ôç0øÓ‹s¹²!Ü‚4\³C‰$TäÆw¨”.:t7ꔘ–T5)Ç#üJ–õE˜D&Ö´6­¬:sF�U?Ò
DUbk8`MlsFÕ<#2 À20<6C$”#Ih§!r4¯þH
dgS¬:BJ8\Jt0°((6é‡"Ã×*¨2qj
D‡€¦Êk
·g džË†e˜9�±ØgâÌ`ÆŒJ¡¼‚ÖžèËu Ѐw^Ζ
Úf=Á¦CZaÖ“*ˆ‚hƒŽŠ5s¥M,¤ÅnF†Š(h)XþH±$‚6kè6î‚6
žëÊá`9Ç$Õî7mËÄ«.Ë|=J-fp­Î‚1Rt¦5³¸_d^–6
7kjcˆÅ%VA6$wl-¨?
t%®¤oÞ¤Whvšna–îlÏVAl'�öV{ù	}¹9˜ÃÛhÙ÷>jÙ¸ündŠ�Roå-MLa‰5Ï5Cë
^ö22c3¥4´c‘D£ŽÐKl:ΡZÑÇLÄ~Ü«¾ÌžQRF•pÆ­„ˆ�™+ at j$•”sGÅ÷z	“Œªäç6M+Å�k'©YÕsà`ªùÊ­ËqÄ¡`Ú,WjyB*å×dÁ©á$,þȃÚnÐè-3Ðç|âÿk—àÌ!ä×7Ö$ÐJŒå‚È°/«ÔàæAæ†)
#hžfã*kgˆL5&iaV¦:̧¥Üm°2(„„Xª?Ö£¨ÛPX§ÚqÍt’èã‘ïv
¤9ºArm®³IB‹Ðä‚-Ø5ªW3ŠÈ;c’6FØDQJ;T9ú§Y	õªoF4(Î�¥‰'l±Än¤Ÿdè¦
íÅö(±.´‹éJV
4OFâª4ÞçAt#ˆ|í‡+Yn
äA‚©€Ö	ö`Ž„²CJ�
)ˆ62±ÄŒ­¦ˆ(Ó¡n[V/Wtʃ+rôE4l¥6nLe¡my¢åkaHó í}ô„ýzÉѽ›Ÿ<I D;ÏÒÇV­®P(>~íX—ADŽ<n¢ˆ
$
ûã�8$¸míÙçÎ5è�[ô]Š£%`5BãÚì´“ÅŠ¶re¼Ja¦ÿé›ãu‡£CˆÅ¢Vˆ90{ñj}…ò‘~Ö”#Æ#Yþ{ˆ28dLªFWžÉÛ‰—,%U¨GÿŽ"2~Ú3ƒú/îñ$úvùèAwUÛa#eh©�ŃÆ
äD,)¤®‘ã¥%¬¤hÖ&èÅÜ,ò¸ªä<Râd‘"Z^n~#$Î
@|åhˆÆã©Æ5¦¡MÌ(e™æ²<*'$ØnG³†WËEÑÖæO
r¢G?<KBDXOD$K•â\p¾C(Ë…h#*µ®â©A¨<¤GéÑù2MPL'Bd£Y‘Rl<È`&G!©¢!Œ<;N"AHï p¼QrR…8¸ÿ³lìÆXXåR«ãŽplAÎY…ÐAS‘í÷Sâ¶÷äc„Bï¤än[¬o¡pÞ‡F<~¥Yü¥<ÖI>7Ë5V
ãÞ¾:�D)5ÿ^õM&_®…ãEÆ@JvÚeß$ß¡	(ˆ÷ðŒ£$‚'x ­ \Ce€d"H&Lòe<hoI§C† Ô…¡‚<f/(d¾Ô�ìy†F·jÆHÂ6l¢ßÆAh"B‡C>9D,Î `�ƒUÖ+‚­b$'KV«†­ÄÉK ,Xé\½j¸QÖFq«XI„%«\CX±6’¼(+V×/7n<‹Õ¸‹¯^4XPÖ8—%I‘3IÎU,…ãVÿ•[Å‘bK’	¾ÚXNf9N­Lž|yó ¸n¯Ê
PÚð(ÄXK«W.V·£±Ò­:×M+Œ­2ÔXÎßV:“6ôû’TÒq"—Be*kÀE¦äÈ)…+‹œËX–K’ëX²\+ª¦Êõ­¬4áfXâ^‘ÒʪlɃ]û,(±›€¶«^u“õͤ8�#É^tu²C<*Ú”¥ÔCY®H¦+¦Ëœˆ/z®X0zEÔ7{GÛÝÃÂr²c\¦GQ—T(±•åoz_M°êòCr¦‘3NN¬¤µTV®|Ö—8
y4Î@à¶ÕD0Ó…º5@N\Ñ¡RPÑK	>DUÿqR”e
øPKf1ö�G‘­’ŽY/¾Ô—+LgÓ*/úÕJBFATG	’’­éÐC@ÕJ‚
J¾BSNm¶[Ä-®à*ûHÛª@"P'qÊ:)&º/‰Ä
g4/šóΕž‹®§sÆÌsž0ËŒ!µ[
´¶âùÜ“©¥úê…š"}éÐXßZ]ÑF«Ù¦µY‡=˜ØdésΞ54—.:¤rÙ/
ú
+Ë�ÚÜ�òx3C9žY4ÌgW‹wžw
8¥+¢•‹Dæzè!¼e%j°
ˆi.5&!EC
€@¡
@
Œ–!¥í!Cb…RZ˜¹Á‚1¯pScBz1‡söAœL’#ˆekƒ¡_Q–s’¢˜�KÄÚKC¢6Ä `
 !\‘
½¤Á@™rF<2r‰çƒ®HG+Õ
¦x†(1	†�¢,Çëi±àÄÿbœ¢|ð"²—û#™¦=Ø•IÐe|xc(Å…`|n­O¢C“HjY¯‡Ë˜ãŠÖ(
Âb7ö®
	WCg‡0*ìÂÒ Â‘„»
9Ë8<ºetÇ'aj2§<%Â"
¥
ܧtöx)±
ç¤~�BS±8$Tœãÿª€
Ö#
"ƒ_ñ
ÿp[‚œQIA$B@$r4G8°6=Sq;
‹ƒØVBCÁAÿátaa
öQ:F©fABR±rA+Ý@‚7!,63c±TØHv³…õÃZ-ÕDÎåWWtJ_XKÙE†"«‘+#�Sqg2wc	!&ó-ãÇTA7²aÀ¡Lqo‰Bj%a9ÑhQ tóA4ò°Ö
Ëçð÷µ™´–˜üÑòÆù·Ž]öx¹w#$Ã	!3 9Ä*y@ž3Ïá,ãÀòa>u‚‡aç²­¡šïa˜!%–Ñr@çÙ¡1$q-
ãçŠYñb‡r±b2ñŸ%&ñŸaaœJè’ÁfÇg
—ÿçà=É "xÆ;ñ›òáä©´Hg¸™kó6`ñ¡7‘¤0ŸÜ‰<xð•Qr¢›‚økaÁ}Ñ #ò åPn¢¹sŽæe ‘6e!>$!BJ/¤Ó
­‡i¦Š
8Z&á›Ó“sב�µòhy

 ìÈá"Yå° A:WfdGq#ŒÑ`S¤âÒb at Zš1A uR7�p!�‰XÓ¥X›ª˜Q5™¿=*VK�Æ+¿Â}§&»’b•a)»²Hº‚X�9Ù ¢Þô,žšRñÔ©¿:¬ÿÄ
JZ84êªê$ª—Ò-d3MÂÊ‹„Œ±j)äÐ$kX0Ñ
ÔêƒêíŪWŒÁH‚%­zIçÖl3V¬Ç:®›•©ð
¯ÑjV/1@�²ŸÏŠ)œô®05¯;°«WK'òz°
›Z÷º!ù*-õŠP”„& …-kI5°»±›¥±k>û±m²Ÿr_˜NE{0’+/a½ð½
ßð
�¹‹«¸Œ¹�Ø€¹ß�
@ȹ‘ß𡄤{Ùàpñ(
„ ‹ºpawóºñ¡ï ²+²ºËO	ë®ýº»V˜»eÔçôâN�]–c&ßP
‡�нҋÒ[½Ö[½Š�‘�ŠÐ½Ù›½�à½ßÛ½’à½å+	蛾ꋾ�
ÇpÃ8|ÃÈ°Ã;|È�
È�©�
Bœ
ª 
B|ÄJŒ
ŽÛį 
O¬¸�ë¸�[Å�kÅ)
„*1î¼^ü«$ûÅ�$ÆdìQÄë°ÕQÀC‚
ÒЀP
0Çt<ÇP
ðk½Û½Ù+½‘нÏ˽ݫ½äk† 	‘p’p	ˆœ¾ð{¾‹Œ¿ðû¾è{‘PÀ
Ë<��˸ÐÁl–@¶Ìÿ¶
?<ÄC¬
ålÄJœ
£ðÄP¬Ä¯�
OœÅS¡
 ;Þð
ÞÐ
Z¸+5eüÏ#«IŒù«½ИÆu|ètUîâ*ñ
ÍЄ Ç 
„
5<ÍÇÐ9ìÃÈàÆ
Î@ÄÈpÄ�ÝØJìÎíœ
GüÄ”
ÅSqŨGÁÙ”ñ.Úw•J¼-Úw•»«²Ðb&#ªÑmÇmŠlÐK½Š
îÌÒŒ
„�ÃÿÜìÃÜΨ0ÄNÎNΑ]Ù"ÞÎ"ÅóœXÜÙo
v„Ú.Ž\ýâ2þÅ«
†iü•&wÄÌ
L¬¸ðüÄ™]ÅœM1œ½]]<ã®þêkë"û®¸«¬W0S at GPa!Ùà‹`ÈÿÓ›Ô{½×ûÇܽâÛÇ,¾å+¾�̾훾ÖýÝ”í�|íûËÈûK¿œÌÉ÷À \ÀÿkÀ˜€	lÀ¼ÀlËš°îìÁ´`	� ïoÌÄÌèÌÇœïÉÌà|Ã2Ü¢€
ÍŸØ<
èlÄ©p
!®Äë¬
ÙP
˜-ñPê�ªð²K,Û1.ë"?ò_…Ð$O\�Rãùª•ƒH,OS”!&#¢2`ÚÚŨ„a` Ë5
¢>vê*06ó|ä)þó¥*ôþS(®Ââïò½rGT¿`g’ô^Â5Úzò^™__MTö`üÙà°9Õÿ•ŒupmÏp9ó6Z?>soQJo+4±ªb+SÅFdÿ÷¦(!øütX*ŸSîò2Ö1#¼aÆ EE¥ø×rÚã´3�…|¿'`SôÜB[Û2›˜~DWICø¡õW&�ú¬ÏUtbëÉq¤òŧŠ6By%³“,Çfy™m±
SxL!¸£‡‘$÷FF#:¢ýßâyÁ�¥-ïü$A.!Ñ †•
xEN–«V¯dÉ‚åð!C�–ƒØ
ÿ–EYåZÉÐñÕª
°Ê½bµ€T¹�
ÆÁê&k€¸‡°È"¥�Ü*²È±ªùãªäX •îá8â4büXòUSY«¦;àÕ¸q@îƒUj&+¥
¬vdÕÖOX&¬:Ëå¸UÝνj+�¸X
¼ŠÅ×TƒU¯Ä½rëU
àœn`¤q¤/
£

«LJ‹»ˆ"Úñ¤R å•rc/Ño Ç&
ÄQô•
&€N8â”ue$ˆ†‹¨œ“bY5ݼí毾L œX@¢)0
.š©¾vL`œËŒè¥û,Š…þ+åœs2,²¡Ž;©ÂˆÞb©®
ˆ[€¸=t#– í©ËkÕ ”=»ÙX (u%Nd‰ë®……/Årg€š®„T.ºº™i•ëJ ¸þr÷ºUº°T
òú0
+³¯ªl
¯KI-j«.¥'�¿×`iÅÊG7rÈe‰ªô°�Xù¨!™¶rS¢
ô<#¢˜à'ƒCßçd7‰�¥8WB�”¬‚´=ˆ/q9z©¼ud2õ™ßkR­�£�üÑüèR–÷yä5N!Ñú€r’²"êSÿ Aê7DíÙN{=d]Å8ÆÐ$‹Œg¬�Oƒ:4¶Ñ�ªóV³zó'Ì.{–Aé>8B\±7~$
M~Až5¼ ߸HF†Q‘�„¤kIJVÒ6q|e·°IÚ¯3¦Q¤”D9‘Ô<²2á±H!'cÊÈtR3¦ô£"yuHÉ€Ò8¬|edPY;иÒi�q¥%9“"²	Ó˜ÇDf2sL‹øJ™Ï„&fâ;:FaH’af4S—ÍZáR›ßg8Ÿ©Fq–Óœç<#&çkzí˜Î<–7]ÏÕÈ�¥
=ï¹O~ö�öôg at Wç­×=«š×ŒÚg
�ŽŽ›%åhJUºR–¶Ô¥/}c¡ I'´“8©Ì&9ššˆÖ¦§¼Ja:T¢Õ¨¦›¤N�ºTiÒ,
4µédbrnæò3?-�j`	M¬2Õ«_kXÅ:ÖÈLÓ	±«iH…Ю«ª˜Q*YW¹ÖÕ®wÅk±Ì
­´zk’S–P9ÒÖض&ZÍ+%ßšXÆ6Ö±�ÍŒL¡ªVË°¸Qêb+CØÆÒ•’œ…lhE;Úºîõ Þ¦,
WÿÐ3¶ä%¢=cKFßÒÑ�†ô£%éIW:Ò—¶t¦1½éGcZÓŸæt¨A=jQ—šÔ§65§QMêT¯Ò¯žˆ(ekZ/dÖ¶®5¡s}k]ãÚ×½6¯…½kbÿzØÆ.v°“}le#ÛÙ͆6³¥½lj?{ÚÖ®v´³}mmcÛÛÝ7·Å½mr{Üæ.w¸Ó}nu£ÛÝí†7»åMÊ�‘c
O€Bž
Z¸˜0÷%Œ¡F0ÒÁ`„½O|ë*7yàx—ã|äF�° …%l�
g� ž‚"ˆáäxǻ˓nóÁ�ýìe|¬¾y¯Üô#÷|ÇÃP‚'Œ!ç]gýàeõ¬¾é Þ ‚‘��ö"�ç7¾qÔ>êÅG>ç?OvÁãüê´ù¤ßGAßAï
º°„" �dàMà«.uòGÝ^?<úOîu–·ðP·=Óå_øù{�`ÿ@‚õ¯0 lÁ	[X‚&x‚žë8®<ú›½ÁÓ:æ;½�»D>çS:¯‹‚(À8è¿%:à‚&½¤s>¦›À4A¥ƒ¾ß#Aæã¼D?õKÀ櫹œƒ¾ÂsAÕ;AT>lÁ”=#ƒ(‚8‚+À·)
UMÜ|‡jÐMÞ´‡zØÎwHM•ÎïQ-QðOè,†kÈNà¬ã€7HÎÈ|pQR´MÕ”M•Mþ¼Ï&}MÓLÒ$¥Ñ}ÐÔ„P�l$Pƒ"XNiÎÛìNÞtMûQ­QÖ¼Ñ)mMRDk€Ç{hHçPƒ& 

€†]„	�€wt~XWœ…Ü"ÕÍ#
V}}‡ì,V{àÞb�W`ǵ‡Ù$€ÙTPœu`œ
DÒÖæ‡PôÐk]ÏŒl†zÀ‡_`ài˜‡4d‡y˜v˜
0DD-M°Ø?®^.¶×êÝÿÅ^%Å�% †µÍ-¶Cv[]tQ?DM•}Qx
jÒªW³vÂDõkÒ±]î-Û6íÛºsóží÷ïÝÁ{/.Ü8ñãÊ“3ÿîùóåÑ›C¯.Ý:oÕW®´6]ú{ëðâÇ“/oþ<úñÜ]“
0ïÞ4ÐGÏ…¹廢ï‚úEéêO'íePGIƒ™<(¸ ‚×Ä•ƒ2=q…Mòäç_~ž5�5Ô¤u”Q<Iƒ�:×H SK€öÓ5Icâ3×èPQ.�4Eáh0-(

H ÎE0éôN;
�!Å
@PJeP·Àwدj.ÑIEÐÄîgR/¹
4K at D”5‚V®9I hëREˆ˜BÿÐ oD at iV&ùâ4¶èÄPJ$a¨y-D‚JOÂyJ~�\SÜ�º§‘Ê„Œ]{Ôaàh
iØO—Á”:B�z¬
²—PB5�¥\Sõšß²¬Q�kÈäK@‚
Ö2"1¦9ƒ1J‚B

;tVi at 0YŠ_ò¦
"ƒÁ&O~Á·ìdAbr�É„|
jØc:!ÊšP÷À#‡õXÆAêÄ“¾„ŒtmVŽJr’IãŽr‹›R”†™þPrOÚÂ*V-äЩ>¤ÁåÎèÏ‹]ˆJ +ÕIcÍX´‚�ò:»%±/`†ÄV2:í*Ëƈ†5â*h5�	¨éßö¦ìÓ,<ÎN6³£ýìfC{ÚÒ®6¶©­íkoÛÚÞÎ6·Ãýínƒ{Üâ.7ºÉ­îs«[oMØÎKij¹š:A¦öŽ)¾ë�ï{ë»ßüþ÷¾îo�|àý~éL™P
äPYž_èÜ´z‚¦0ìÌÿ	®Ö2E�õ%#l|‡3
³—�zQy"ß—ƒðâ+ø–,$Ê3ÐIöQÆýÅÈxñú1p/=‰ÇòóŒ�*åC@¹Æœ¯1�H½¯d{q‰Í訵z^OÈñÇ
PËW0ÆFÒŽˆd_|ÎòEA«0Yóy˜Ñ
ʩ�
¡�`É0K~ÈC8@`

TtX�ä‡S†Q,R)fÜ3¤žÀeëXã¥Ev‰<­E]v"<`ƒx
X
Ká[K5b#>"½!§rârB¢qgs"âsÿ&'sV§s2"u^gtB§uJ'v2Îvf§w†'xv'wjç"º¼iAlL­Mm‡|ÊçÝÌç|Ö'}Ú'~›~öç}úg~þ§€h~N�}^Á±U�œÁ	,
Á	4
|P�`�¨@‡vh•–é“"…®€Ý ‚†é(é
ìDA”Àœ�Á4AÂ2�Á‚A¬µv,Â.l¿&lÈBAµj]Âÿê«´¦,¶’¬ÀB�ÉN+ÉŠ¬ÊÎ칪lA¨Ao‰ÀH�6º«ôìµz+Áj«É‚+Ò’kÊZlÉF�<
Ø+¿VAhA¿VÁ„
Ávl·v«ÉÆl¶†-»ž+µºìÉn«´¾ì×êëÚ²¬,̶­´öëÚv-·²¬Ú
l
Æ-ܦ ßžmÌÚ­¹ÚmÂÖíËÎìÆzlÁ´.
Ĩã2
8N”lÑbÁJ¥­Ìš­Ö™mÍ~®æŽ+È,µ¦¬â*®b�êA”}ÔÐ+D™ôEÙŒ
0É»º«Ê’­Ø®¬ážlàÂìèúkîvnå6�HÁ@Á
/Ü^/Ú‚®„@ЖA
—p«0§ðoð
Ïð³0›p¶¦�¬F‘
�¼B7ñ8ÀBw1'±/17±?1GqÃÂ7xÃ71,ÀB,ÄÂ+dCÃÂ+€q,hq�±“1§q7¨1¯q7˜1“ñ1Â9tC6
;Vì­^f{¥U{ÌW/ToáÆ}›**ºÈR©Ê«Šï)¾
óý¦êào…¿ŠEøðáX�!Ç’%ËÕdÊ–1gÖ¼™ófÿÉ�;êštiÓ§Q§V½šukׯaÇ–=›vmÛ·q¯þœ›woß¿�>œxænž0™âäŠ)`avUÙ›³C!Zx0QÇíØJD¸PQyI‰Ä{<´ˆ=GŒæ=zìhòãJ•,]Ö¿„fÿ›—*±é’žvÂd’Ÿ|JP“)IÊ(£–:ª)¦œ²ÄŸ²
»âê[>q[Œ¹…cŒ9ѵVôå˜^På˜åB/dpÄ1¼v¤k¯½Œ/ľI¬°XSIž‰l²VŠ‹RÊ)©¬ÒÊ+±ÌRK×vÛÒË/ÁSÌÞº 
å˜s"

ºg²o˜!ä�ÿ*�@‚ôˆˆÎ
Z`ˆ»†úè@ÚCO’E$¨³‚E.)/¾‘ mI¤üús©¦˜h
'
n؃%I ùC‡×%ˆáBhnÉRš*½¹æœ–ßéÓô¹(M„N5©Y•Ð©V/ì~«¥�¾åÖ­Œ
±j«K<X­Ùßj/SAF/º¢M[mµ…ô–ZÅØ.$µ¢Is³›Ý̵8ÿ.��
t o7›>�‚Ü’¾ÐÔ¯5
L3¯ˆÆÁÆ°�%Š
üá#è
Ñ(H jb#ëƒf
AP6¨@#(! ÀŽÃ ƒEdâ#-aÉ¥^ Kiêf8ñY%ä“Q…zÔKÊ•r=ìQE{QÁÊUºò4éÂWæ;°n±¢¬ÁhFX3Æ1ÞH¯1‹Y>ºËýζ¿´!FÙP…·äoÅ­€�Õ¥.ËŒÆ]š´à'AJQŽ’”¥´W™ �A5	 wÛÍ7šAˆ�)¬/”˜
LȺC(☣˜"
±…@ÿ�BÔ		aB“
ƒëm��̨£#Oï›ßýö÷¿G\¦}¹¶›œ­*˜ÑœJÄD$>†ÕC§¼›8$0Žq^#y?8Åø"0±Ã�M"º3‰îÉÉ™òÛ‚õ¬��I–¿J	GL•h„Íežó¢8‚(<÷¹%|þˆGXBè³x-1ZéM?ú#<¡4¥Ó¢JûŠX®Oüsë\ïÕYÔ"Š^d�ì¢0{±Ìþ	Tˆ¢F¨
«dùXÿ¡ðÓ>PEp6¸�]’0Jž°Û¯Ñ	5ciÏ
×p6X*Mœ@
¤P•OàÉ
Çt`BA*U`'UÒOcM_a[
~hÅŠ@›
€
ÔC}%wŠk:î<‹M8€ÐaÜS}µe

�`€WqÈ�Æ*“
e6”RÁIÕ�
U±<4&F²Th“,	D¦P,ߨVe‘�ÓJs¯2ü
+ç•õÑP<•ìÝ^�‹
U«Œ#)Û�óZÏvõÊ[¹¢")[5&ÏÀ"øÓKiTÓ„W§ŒwÞ~öS8q…R0}·+aÅ4JÅ!{S9«4‹˜8Š!ö‰WѨÐQ%ãÉUG^®€N7¡$),B	¤9r噢Wç…GQLa¤–r“%E±ˆìj˜Á™•‚îÂÒg_PúrÁÆWn@
ÏWCâÈô³J’
•r�z†Õw%�•ÿZ¹s¤æ�]}”ÑYJ•§à

“Jô¸õ!¦Y¡�{|’½‰&Cê+ˆT%Ìø„mCáÜRš‡8)Ù«\1±Š9B…’Ç)ÈSåPÖý‚·’éqåÉûIWµ
ŸñNÒÿÈôç9 4¯…Ίa‘²!�U1;Û;‹§|â(‘Õ„gŸ
–l
Ó¤L�*d™´‰²¢x�”ida÷ÂZ\@¨¦q”B,f‘Ù+ÛÇ¡Øä?xÚï"S•p
¥€Ö‹NÂI¢
$3xH\ø
¦]'\‘ùJqŠÄßõL€«ØG§2‚:´ðGƒäK=%¶�
Šk…Z at FŸxe#wüKұą©Pï0™oÅgz³DÐ6ö„'JiAŸ^öøåÑÄ'éÙR>R e±§wE
�ÃhS;.Vå<vÃÛ£Ä�Ç�Ud}ÙNd”’è@§Vµ2Ž+²òŠq±â"
s…
W$†aÁ	 ,L±¤©õ„ƒiE|ÊÁ	®ð¤0¦âJÍÜÚ$
émºCr�ÀIdŽÓ8PRr&æ´‚‡Å�•VN¤VY�’*Õj˜cÄœÔ$ÿD>‘2Ro8YµpõŭĬdüʸÿp¢É£{£˜-±,ÁãÚXjžsQ$j�S×* 
xNQE¸ÊQÛ“CVtm#\¹#EÔVôWÙ“`lü–öØua­$™g]O^üŠ�ê"¥p§F€5‹`V‰ìÚG“äÇN&p¯ßV¤¤°¬�#^VÎsMøªßš#•ÑPC±2'ÿÔm*ÏÚ�n
SŸô•£-
}:L1avW8Šá’u.°Ã«p'%öŠáWÈ…iÂ%YŽE7¡zœ>f1oæ"TQ/ÖU_ÁU=‘ ±Pè÷Bî‘5˜GYÓ“y…AΆ:±Óÿ„~Ï÷<7
,³å ezc?¡&Ñ�â�\5g”¦¸#$6!nÓ…ñ‰ñ|r¡vÅ¡?,Œ…$qé£voE�!ÃUcNûÇÉW7¶uJÁ[ãhRÓcä0yŠÓ”Àr•.(xìD-ÅWœBi?ãhjõ[Â	²5èS)(w¨²"ófG15	)'ØcÊ•H•XëwJ
-†65\Qz8F
€G“�!â85#†3ʼnGxfˆÇzÂ…G(¦Ðo1“qE’n1$¸f{bxP•4)k7!P–M�)Ñ;¦
§Ç
Îb6(8\z§;X‘1”ˆPL¸ux#V_WVMàF©;!•yç²%ÿÑ;d<ºga>zä0Ž†cP�!ULŒ¢m�$q.	r,rDøNû7C$�SEl£Ceâ æ7MFtDHò*1ùm¨$P3Ž6á-S?„Q&>…V8F±×L�/£—°`c¡§Wym¨;€÷ &1!@%†Ã“4i8Dò0‰,Ô20×0zùQWÙ„Ódaüw‰»ÿ#zwø¸°æSì¡�52:^BÏ—À";Ñ2ŒÂt)Ó«Q*»#C
„‚{XyØ×
é`c¦c9kÄ„}—üCB!†³DÒo±c8p"•Ša.᣷1G!%$Φ“"E™çò±cD•'C®:ž¢0$QSSrñ6Æ á—ãÑS;g!giamù`6†’ç2=h80y‡’q1è›2”>¯×v݆•¼ƒšLé™m¸› ¹­ž)Ã!¾šÓ;ç‚P«A|Fh­ •áAœŠ;_©;4µž7i!Q!k9!|¡'Ñ“®ÀX�ÓÃ@
°Ù¡²3ŽãI—Áš«°C�æR¢2Ä#ɘ¿Ú2C²VƒhO•5EÓYi˜z*RãÉ¥ ƒGù¶••6�F5ƒq£[ò%ª¡æã¥U’y®ð
‹ ý—y9iS'
¨ã™®+"±.;£oÊx¦†¹¯)®
s‰Q?¿
šr€/I¡ï:²5¦Œ�GF›­Ë™aˆc7ä­F³56Šj%.;¯wJEË­ew´ú˜¦y¦}Ê1|zŸä¹³zILâš³¼³›•‡—ÎÚ{”ÚxÂD›ƒiNjš£;4ù¬cê™0gSK�&¯)ÿÓˆ	
;³Ö(�/
mÇ_ã*"….A�Ô	¬S&1–SÕm«ÚEù¥¥Yª|ä�DÒv.˯¡I¼9z�é *ŠV@ÕQ‹º�Y7º1Ì[v4fºä™šê8Ò¸äSPŠCs/”Ö483wa8ã
!WÓŒ	ê/ß6¾hšsɆsóm³8÷Â¥¡
ÀU!
PB q-%•Î“yÒô§mÁ„Û™�~x’á™Õ;±�­ERójÒtÚH®!
ú\ÖÔ­ÝyŒÝݼÝ|Œ7Ý
ÏnmÖÞLÞß½Ïç�ÞÛÍ7¤j×TR¾S+*‘q‡×¡=ÖMP(ŸæH A?�SÔ
áÀñÊ-ßð-|±ÑÓ;;¦ ƒÛÞ"9cd«Öu:^¡C¸£G…qšü;Ä
”‡¤f�BÛc‘\Å4B ¢;Gÿt€¨Idò"Q%ƒçB'B?ãé#1âÙpÙð{É�
Ó¯GÖë­ÛNžGP.å~¼¨S¾Îâ,Þå¬Þ_½åVžÞ^æÊñ^WÀw}À¹9ßÅ)õñ&™W’•³ç"2ÕŽ
'½B2Ò¢`1Ò
Ñ'Öc©aá�éØ
“=qd/+è
¡Ê{fæc©Uí)¯òÈ~ì+ÏÆÎîò‚ó1Oó4Ÿ
ðe8O@˜r›vÇ ŒªM(Â
¦¡¡è¢`2%$; ¡ò3{Ú¼8!T
$²vs�;ÇÁQ¼8{ÈR69!…뇶s¼"zÙeÂÛÿú)Oi8?ÁwüJ�-ñ€µt·¸fŒRÍ0æNQæ3_óƒ¯Ç-ÿOøy,ø‡¯ø‹Ïø~üP óN—r7WÓäÛ�ø…ßø›Ïù�¿u(ïù¡/ú£OúX=æ‘?ù¤Ò»R~ùqœùÙ]ú±/ûSÞú³oû·�û¹ïUYשâÜs·Bí×-ǺoüÇïòÄÙÈÏüÍïüžßÏeåû ZùÏ�¦Ö�ýÙ?ݵ¯ýÝïýßoúŒú4¢Á¯òí¬üà¯þë/׆Ïþïÿñ?×eå’Asüû4Ÿþòïÿÿ²$XÐàA„	ÂRØÐáCˆ%N¤XÑâEŒ5näØÑãG�!EŽ$YRV·
Qœ\Yé$Ê€Xß
Š3YÓæMœ9uîäÙÓçÿO A…%ZÔèQ¤I•.�ˆR%K–/cÅbˆ°jBW³ÆÈU ×šYŠ•ÅukW‚bÉ:äÚ¶ì[·qá¾eZ×î]¼yõîåÛ×ï_À�#tÚ’¥”
LÜ:IWÄ%B\Í4ùûF7ÚŤW, Wï¢Ð¸šf'�ŒÃIóM"­2ÂÁ‚{’‰œv?‚-Œe1X“~Ó
«ámÒ+˪Z!=ɼ¢{McL9>ÕŠähr¤˜
/ƒ/RdHù×8º'Žq”BFù
t˜7(ªF;9´e2Çic²é^Æô)W̉A«°‘n4&«ÿ¦ñJF×ù�ðbƒ6’.=ÀÉJOEé}ô G+H�x8pz@ž‘HV.
Æb¥h”Ï$]P•J=ó2L:Ho´…ÔÛ0æ;I­JVBÍõ0d9Ú²YXqsP%':ÛѪ͢+sæU¯{å«Oì˜AÙuР—)b[((Þh‡Ò¤dH§VôRbqÍcŸéŠ¯*dŠÝQˆ+̇3É&›d¹Êb	#Ù0ˆ1,ý—P1»ž�L”m¸ü
iV
žÚ5-�!HPcCפ>¤µ©lÝÄz槙�- at Ic™‹æÖ7˜îA*Ë›¬\åšÞÌŠ]«P�@¸�-ÛXá
ðÿj=–‰Ž2�SWÝöU¾ó¥o}›rA<ö*b@¯6¡© †|�(z¥ûÜé „�®<m|#)˄Ȇk	”ÔÃœæ9ÏH5…udaŠç@G-
DCRÂÙŒ&ä<‚ÐÇ9žQ„�5#Ñ@‰m¾
ôƱc|¥‡l5öMf¢()ÙWÎs¦³|-»<¶G¹§ivxШ—©2×y°sâóLGV{¼1feÖªU™¥=’.Á#KMO4ÓùWHhŽ
 ÿ[ñ´j
5¥Ñ
³ã´—CqŒ"ìôÕÅ°˜xÌÓPe[o€åLÍ\ÊÚÀ¯`!½¨mÔ1ãˆÍVdµ-~ŒBe©ÿ‘à+.=!ÛQ‹X„	Ñ=žÆ2„sLÔ`�Ã�DÌ@&VûpÛ+®lj1Ÿ­�Ð�R§†¯t"Û>‰DÁ©OËØ)ÐF–.mŒÖž
L4Ö¾�bºX)ÜþyЇþ���˜¾G‚ÀJ
X$
MÂ5ßh�!Eˆoyò`€~ŠÀÒhš-z¹<�’ë
SP€òC2‘ü
0Y
øs\9’»NK >†¦uQ “1$LY¸˜ˆ$¤
4KmÆü­²Šc¼¦'g:«Ó\.ÔoÒ®³¬MÓü®‘Ȧ«È¦Ö\‹ÉÄ	ߤ!nsˆÝÔÚªÝÎgIÎ÷X.hRÎoZ
,,=)v’
Q¢%uùŒYI!(¹Za:…߀•Ëѱ˜K—Ùø;RXÀÄ(³Á™ú
›È”Ÿ6«öP¤IS¨taÃÇx…ÿÑaÑ
(5íX8cÉÒ(S at GŠ„:áÉÿ€i;¶ãoLŒ	©Ÿ=Á%Rh
LÍÎ
±¦ø:š@µMGµˆâ\Íhꩈ€NEµMÕ²œ -D½ˆGݲ»8š?	LʼnPÝTÝJU½°TOåÔh™–þ¨ÎÓ#�1
1Gñ˜'³ÿ3�ê賩y)Î+3C3œ‡z‘
þ2ºÊ™“}`-×0•@±
Ai8(±Ž23ÙlÝ8Åá(¢rHqÖ¬`�y"=…0òq¹Gyr(…ÓÈ2&QMâw
R°VÈÊSÝ‘I¨j2è(‹ÐY¨p¥Ô
@µ‰¹eŠßtÛiêVFØTô�»‰ý˜UñÙ¶…ø¤"b"
’¡�Õb±ÁƒÒS
4¨*Û1�Aß ö¨Ò©e(d…0wr'±dHÑ‘Ž†#Ž`óŒQ#™µª—‚Ê&a)ÂIRÁ¶Œ
cä
àƒ¬˜‰‘•é 
Ü«»£ÊÝ®ÕT–
�Ä°MÃ
0¹ël6Øz”
’±U€J°
Üää@»
`#µr5©•¢üŠÙ*ŲŒ
²Vp©¤º;Éy¼ßÒªü]��v895èY
ó/é
MŠï½v�±*«Qш±°æÛz¦õÀ™õßY–EÊŒ{õ¡�:éŽÙH²ÿÔº?k-�U•“EˆES•´ûª\¢Y؇’Um[›6³_S¶Kc)oc>y:µÂ�ÛbçÚd³Ô1ò?mq¿¾4é5ÖøìcQi±¡ÿ‰�Ìj…vãp‚ªŠ˜Ñ�zÁ¡—
Ô­1�nYÙŒ¢\læíÈ�ŸÊ
1Þ0$r1÷6‚q
¦Ì|y¾çàE‚Ù
�¡òß%ï×`£q‘N؇çï9&iiÑR¡·˜Å\Õ•r“Uÿýéaª '€×J–¬r®Z,'¬
°VÿTHŽà¸
r9RXŸ3• Ö7Ìf_	ˆ©óûªt°
†1avN)ŒÇ„ð(ß+®ôõJ
�WG™Ê¢W\Á'÷^~–2@:eÿa¶
LZ8öR‚òx7ä”b·hîÕ#¿ÆàCÝ`��f"ùV)`1$ßSRµ2�ê»y8Ô‘8Ârr
G2l+I‘“”HñºÇ
F8ž$äO‹¼×>;„S™‹Õâ+ª\X|è�yÄm)R[Ê+QÔkl§£Þ\Š0
\ 
…Å8�1Ž‘I_¢2@øjB
�®ú·­&ßÎhªz¤>~É8pÒ�@nL.”ßpº“�\E…}�Lˆ2²­tÃTÝè‘窳"ªEYj
Ž�V¥.œÿ¤¬#=”¢þ¯nH®Ë䔫c¥¤"VÙÈ
ÏÄ�gýF-Eó�¼T�,%qéˆÂÜø”�pä�³jILÀAø”E,‚‚	+Zè¡.D(ÁB_�«x12"…–ù²W��#”K´ †¶ÇT‡+aÙQX,5+†)é$	—ä“D²ápdñbHChÉ&áˆ�~TòÒ9RÿôhˆØL-1U§È*_{¬›UÔ5%²Ì*,1éŸh¸e’²”c8¥äkº

}Vé�f¿Þ”ÅgE“HÀ"JO}‰#®ÿÝ*wä¾aQnìÒcz¤Å¤h1|]âF!ùàlta9`_‚6ò¨+ÙèÆ72úÍ~’•s2ÙSth)·\Ì„…lS_6p
E�ú”ó"°˜‹
GvVÎR-‘M»J3–|’ƒ=ÝP
	ÛèœÆT‰cXJÄá

dL¬EV`1
FP(‰S'«T
|ƒ¼\´•�´)‰6s´-äß@�ù©g,HoÄÚTàBkmƒÙã‹šP­˜¤ãÙƒ‰K1”îEmÃγ
’j}T¤y–dÖV7T‘€¾
CLÿŒ#™È’"¬iÔŠ).cd�YaÁàÏȦ½lË­�Ž9à“c—ºÔR¾ÙY „*q“TiÉRKyKq!s¼ìÿù†8Tq¢Šü1ƒ"4F·â†Ä©@F˜4À0º%N�¬ I½–¢m¥>ÕåÓɱ*­i©!
[*ª	«U„Å0\�ÒR�Ö�‰#BÜ!	몒¾Ì¬*gì_T£¸"H´¤åîÒóYö”CDMÏ{¤%˜`jBâŽõ8F³½Û*)	Yò°"‘Cf6€C$Ž6†êo8&«P¨	B&U	UZp„rD딬:Þ3
8˜û¿ÑÕ~ã_ÿ_g$ÕðiII�óM¡Î#GfW!ÎXÄÎ\D„,ì†u€+ؘ�)4
Ó+ @} ET\ŒUŽ,HuÈØRdG
ND(×[ÐKPÆá†B*‹ƒ@c�…>¶Å¿9¦P|¡Ù×ù†ª
Ÿðî\Ô\'¾D:�”ôåN8WŠ”’+”'¨[àHIÁXvÆ�Ô„&J�Ââ$èSPP9à�¸ôÆ4D‹F»¼„øØÃÄM´%J98DÈY}��Ddd3Ê„)øDH<Äâ„H÷19y)iGoÄlÆÂÍ£GpÇ�Äl`Jd™á˜Rg¡õÐ)øLHDÒF„ ^ÄòÅŒþLNˆ„¡D[ÈDøŒ'0ÿ
"mIoŒCñªƒÖGb˜ËûÀ‘FÈ�ÞL´Ðè 	p¬Îh‚RPìí’EÐÝèiëÂXÝùPˆädˆÕ%
j2ìPUNÓc­Ê^p…zdGñÐf�ÈÎ*
óܵ©­Å@ÈoøÙFpı”ˆ§'ôXø¤IðµlÝc6I,'‡¼hº¢÷Pdg]„7Ÿ¢µ:
¶ù¬Ø
«,µIeÅ‚5€T:¨§N¥‹ò¹“✞Œår§]…meÑÜÉ°U¬sÆm5Xб\Xóê\©pèCS²N:~ÊŠâÃV¯º
GnÃWâlÒÇêYÈ«˜NfzŽe9X+a! M›µ^�ÿâÒù�úRj,sN’3Èf+¡nûÊÍT÷V„åd]Exp!OÒ`�[•VíäÉâ(’(

–³’šl¼ÿÓjˆ0‰º’…”�ØÈ«Æî;'�Ršê4–Ðê	¢­’"…;Ýb…;N™*È'µ†Zm&+ŒÉ‘⬿žÊ�?¬,£èr0g5üš
¬®«€ÆÚ\m*iQe5=ç²G îG¦^ûÕQVXs*®×«-GYÒ:‡RöÐeÒ݇HQ(½ô(r¥õ¼q ”05EYLé Ë‘R¬“¡o
yÆaº³Œ-ãiJ,ZÖ�ó°‡9Vyf';ûì¨4ÞƒÐ7Ú‡™œg@ÿ`Ñ*|ÅvVy:²
dÉ‚À€(è<<@€EÁ�, XüÅP²£’øb¡
Y
Z©
¦(Ç)Ä÷
�ÄN'%iR7
Ñ©W`
&ÑIžHáì\›„À#W!ÎOM7¦éÏKÔ–~d0‰IHóô‹kò¥¥ªJ6è—ŽhâDÇ7Vq=íÃ&¸Òù
]`:Y)úÉâ&/ÒI:Þ¤Z/À‹^œD at 3Ù›•7!+	
�Æ°T‹«4õÂœªDª�¯IR�‰xhRÎ i‘/Z†l:LjYp‰P„ŠÛRaâ˜,±CU´LÔ­%¦ÈP’«xħím%SC‹´ye"kY òÚ}@
V¨6¸læÓ>Ä<”È´r-@3QÒÚ#’‡j	ÈñnŒ›Åðð&Ó‰�ìöv§¸)ESóÙQxgg-c2¹E4IU?çtS¦¦»1>B¿Ë½³w
 Mš&b_ÒT7Ö×
Uîé{^!kY_¯¥hIÀJz2•@wñ>O¡ò.¹hµ€f2-Sà"â�‡l:�æZ”2]�^ÿå)
 A˜ó–j•#ÉâDsz”‡.¯¼î$i$iFá+“ô•°û{öìµ›Åô>=éÌ6'‹,®m7˜4ö��˜k�DÈ"“9ˆ½ÏC¿ä”cÂ;Ê•i¡|Lt�Å€5dû$š£ö™– õôZÉ7@Ñ`n at Y¶ó�Iq¹ð�åFàYE�v·›ªV&Íሀ«)ˆ@æS…€�j
ŒoÞ¤ùyê
’fÆtì¦ËbÀ�ª«
Å”åAË›´Iouq5-ݹ¯Ô‚�UD‰&äIÇ…C0&‡…3ã¸q�1]ÐU´â)ªUËÕ(q\®'}âtÚ‡h)æÊm©n°qS§¿ìÈÿŒdñ\�í¼å„”«1o“n`¥!k“ w¹+?Œh„#-ëh�AåoÁäšö¹OLâ¦cµÅ¾xí†"s©/¤\²I*ÜÊ®bá€SºoU0ÃQ^¡…ÔC"šÄ+D¬Ã¢'”'R2N�JË:u6d4ì…Oâ$šÇQˆÈ¬
7~ZÚä´®FãXCŽ¶O"¢«`z«JÞÏ#þ…¼Âˆž
ŽL˜ƒEN,wÄN|B
8¯Ç
ð úve&®©Á€hÿìÏÒ'
#àÓÎc²j£7ìŒPl,ÇêÂ0¨Í b2
cÂ~4(Æ:Ò§^ ѬÆ�?)ÅB 
0	*–Q!«ÓtCDÅ®IÒá§dJ‡ä¢?Ê-
ƒ"Àü,ˆt²�Ä¢C–1ñ”fi‚˜ZªšÌÊLãïZJ*°‡–®ç%\å-Ä5Ò�ó`„z¢C>'.ßâÒŠˆ5ÀËÐð-(5:
cFDcí¶t >8)qFêÄ~ñ4Á(‚ 6’Ï2C…O£Á¢%
$£‹¥_‚è/nf-D˜"èf+úC]Wy5Êp*f&G†OÐ&)®´qt2%0K”¡ÔBaøSÒÇ-	¬ŽcF’$wö°†e!ª‚—0"p
ÕÍ/¢N<…•YÃÿ"ÉB–¿U¬ÆF|‹Æh&ç îwZá*Do¦I´¹I@€×"�(%‹äˆì>ÿ2µNäi„¹Y NÈáú%Bî|¥Q4®40‡bK_£hŽõ„ØSÞ¦?B!†iW™EÄ… ‚È‹‡Åè6ÐhÂ\—	ö`¤;†%J
š�3ùS"švk—ûr3#«7í¦OfäˆurK–z€�qÏ´W™öÈP”Bz¹æV긿ƒ¡úZ]�Çu7ø…¼îdè.%JvYˆ0zsæ6¹ÏvhDc8
»aó°{°µ«±Cƒ…»wpØE™'bˆ"["Ø#„Û�‚F³=²½W´K[´[±‘Ù^ðuq‡-fâO÷Ò´QÛ´q†ûº´C»¶µë²wÛ·s[p{ü~»[·ÿ?</˶™¸[Åou£¸)â/bJ›¶%{R>e78�\"6|›»¶�U»ÈÁdd[mÀ{p®[´{û6#[„ÙãvÊâÂO>{`Ò›´“‚½w[~Gwy3¹®CüÈC²´xñ$î<P5tH‡FÃq~¶�"‚‡H’»m†Ac•™+öì*,OæcÓì»UV‰è¸±;µ7["Η©UZÆCƒ³Ñ;°Ñ‘Å•ûdò›¸#{Åm¼¹U›—fÈwÛ
–8
ÿ0NòAY«ÊÅ*×
r««º%ðª\äXDW�Eðœ€V±V‰ûÆ:�À�âTŠ+ëU¬
›a•(ÀéÜ�Å‘$×*æË�²*Ö�5n[³Ô³kßžûT Ö¹û|©w¡áÅ#M/“½TXîcžWÿ}=w¶ñãÓßÏ¿®~ŸÙàÅ×€P`M®„õZ2ÄÊ8('!,�EÙ*1AÀ
Fä`(€
p‰
0@Œ¯È²d¥�Ã
‰«Œ^L��à|RÍ×ß”T^õ”û]Yå–AÍG^[Z"}RFeR˜9=Éÿ%ÿ釦,jÒeÓ›jÑÙ”�Vá©“žƒ5uöõW7YÙ©&ƒqÎ$ÙL¢1J“8_F†Ö¢BÆ©¢pf8ç±)7)kNŸ¡‚YêL¤6u^ª§êtéXJýWæ\¬î©uîÕj^«¼ÒZ¥®5
ûT~½ÒtW�úUâœ2½Z¥1=™›Oh%J~¨.ùh´è™“+ìͪ°{Û_|âVg.¹¢‚ÕlRcÚU¼b±ê^¤Î:E¯ªæ»Ô¾gõË»£:W¢=…^þu`°A!¼¤·w”šäèhdvéì1wû„ëÇG…<]¾õÞÄ¥Élš+qÊ$GÕqNq±Üÿ«ÍL}	:#ƒ[áÜ´NÅÅ
J
Âõvëk×¾þ
vÁâmÐc/ËüúR?ceªhú!wÈŸòð=|‹¡væ¦Ãšøpw4ã!	¯²Ä~	1bZ
P^öBCëµåˆ
ûaÜŠ¨EÆ�‹Ñc—:±ˆÑ{gã©ŽÅ3ú
GwjLÓM§Á8’zXôèX–Ç®¬+í›#ȸtÄ4Úñ|	ÃêHÁš\o&yìãøIÉJ~P�–ÌdS%IIö¯‰ž+&5Y,…-²z±°ŸLªEÊøiÒ�­”[Ì$I&úØ–òŠ%áhÿy²�òT£ÜOtÖFF>’ZÄ¥.{Ìe:qŒÊôϸn‡Èº.š�l¦3ubJêÕБ«´Ò6÷8ÎÃiI›­ä¥Ê8ÈEu�,'ˆIET>R%Ç4¢øܹx®	›Ûä§%*O·”;¿à:ýWP*•®›nL¥¢`9€6�ê9èE›¦Ñèù³rˆÓ›E7ª“ß%”¤ÜÀÝ‹Wå“'«©TL›ó¥šQ&qÊÕîbÊS™ú´§@ý©PáÉLÁ'GU‰JHrTn)©8!ŠTeB”¦ŽKð2"HKò¤xy(J5jTáU¬N«V}*”´WV²Fë+cÍ	R�zÃÿµŽ5©b}«^Ý
§s¥¯€å«U™ê
¥‚U°‡5ì^É—x1µ­jåëU'Ë-ª
ö®‡�I,δ T…¦C•M=Ú˜1%’5K\åˆÒŽ²OjEiñ¤'€�QO
3bË‘FB’‚I$*qÒDŽ:�èH&™)n�ZQŽŒÉ"H™Y…s/לVl¬2¬H‡
i8š”™[]Y8ÔÈí0s 
å[›†q�sc>÷86~¬Wa”Ä.
1ÿTÖªlÇéZj‘Ñ€±Í	=ÝøÈ”0—>:jG<Â`áÚÌ1I‡)8\
c33Ú¶kôC€Ó¢æh<&¯oŠ¼Û›tŒY´©T>Bã˜^z!IÿLbÒAŠE
™ÃT߉“]Æt$
ç‹#3¯h�–Jú§îµY¨aC§t#V
¹&qÃ-�a h‡5À3R–U7ˆLë&Mƒq+UE-µ-
O¶`p
\WÀ�†	Ð\¨±
¥
Où×… $õÅ!ºg«0ºh…Ý$"ñ#à
Åè
.¡
 ±�(œŒ!�!dß
Ùßàk+çgñˆ¹q´ØRÖÿb°t–Æ(Àmˆ	…1ø£©&ŸpØRS�q¥
ÒgG7‰0'
Gƒ!#rÎxƒ‚˜J*Hi	"Qñu„›1caéš‚jzÆH¡Yr�i̇!x°)çÐ
lƒñN¢kñ†—eG£*
²3õ„[O2dà—ÿÇ�ÿ—¡
¦{QrŸ'IÙ!–
ã
l¾A¹a#?Òƒù'‚
æ ¯NØ�²áåEY-’piå9…æ@!­vp1Xs�ƒÕ(
$”úºÏ•é€Ï™œ÷בÙ�
‡ž'aÉ„Ñ�g)›¥�žùÚ¤|yb؃F8pïÈaÖ
×"|ÉìÕ„„2#ªá¤õu€Xkºy©çà¢
+†X	sÕ÷ie
šµƒªDS˨uÆ"+ÙRígŒv°â#cû8ˆû 'd"æµaH†Qø„€
Ѧ'\±¾,q]†˜GFœ	¥ð¥¤Fÿ¸‘œ‘�‚ÇÕ8Æa¨ê÷·�×Àÿj\_§*¨p1£
wÑ#‘v綟1l¾A¨áy… ù8š
Šh‘èÅ51¼

ДTë]µ¨"Ÿv†zè©äE
é�2
7xƒ7g°À…N8c§§
ÀyDI�\_q‘N)d*
à„V
Oi‘Ö4Œæg6?õÉsôTÿN¡2âO0AÚ™®.SñôîX�:áÛ2ñôUcö™ÇA.ßh¿fòƒ{GJÏ{õts÷x¿÷Ô2Cöd—ƒ0þþ-«#aËõÇG1d‹ñO1hEßC2;*rŽ$�^TÆfM~ÇÌ÷œOIzßù”ÿ×Q÷Ô' ¿&‘úUªªßúÛôD8oOÔ$‚y2Dèáú¸_õ©ï<¹RÓûõR¤ÏÖ)/uE¿ûÀ¿üx©ü¾ÃüÐ1 ±õÞ”—rü·_T ïÞéaZ—c4eù£B½ò*ºRbtýì�>5O—ÒÛþíbû21CM`_{º%á
ÉÝ
ñ�

ÔÐK&�„Ñ?/9”ÐA/©d’J'™$“L'Á¤SJ>¥¤QEͤ’R5	ÕU-©dUW_Å%ÖX-‘[n¥…–[mÑu×[nýµ–[r¹åcŒEÖXc–eÖ˜cŽéåÙc|‰VÚc�ÁöCEüpE½õöUÄ•±[Ï�©c’«Ç(ß…7^y祷^{e™4Xò½·_—ä×´*£`âµ×¤à2&r¦ÿó2yxÍ3ÍT3b‰ãœSN=ï̸Ï9ù”$’DEtdII¦ô¼IN^ôL6-µ’Ogù”UQ)-“OE¥ÄÕV[ÕÄ’ ]Å%è¢WÕÅ]lÅ…[uÙU—[tÑe[¬ÞEê]Œ±åØe•e•^–=ÆYk¥EæÚc(ÄpÃß.ñ[³Q‘\c¬{ƨ¢b¦¿ð
ø_Á'¼ðÇ’4<qÆW¼qÇo,ßlx¶×ž˜
ß»Äñ¦âZ� 	F=ô™xÍ6UOóN9%qócCBvÓP�
ETPHp4ÑA'!€
õÊY®	QÈ\^ZÑ
q¨BÊiÞð&à<Ó�É‘@Äê F'7�Id�ºÓ™Þ4'HdBd‡8Ä$ 8(HDŠc‡Z™Ëª(©?

äPÜÌåÀ‚”\QJRi”V4D•	a,ÿ¦9ÖÒ–·Äe.u¹K^&p˜ÉW7Xc9'Àð%zq9Zi‚Í#@
	E˜©šˆÐC@W�CHâ6¨€6ó°'HøáÚ¬€
ò
»lÓŠÚ¬Üô§ÏL¦
£zÔ·Þõ#¤	å°äš&„!auù]	qxŽîÃ8]üé‚n.¢Ú¡'‹
±_}�õž 	íIL:Óߢ´
 ƒŠ>´e\4µ>hö±�²#,¡Q	L™âšÎê˜Fä ËÁË@A‹GÔ?¥
Ù<q%u‹W¸{½ÿ„ÁüÖ“Á’sÁÅ&Ö˜½+˜‚-
‹ÍY‡jp˜‰A„#4“#,ŠA“5±˜"R5"Z��é$ÚHárŠ²âá"“aBqNé—!C�©žÙ™3\™¡ž)sCJXù¢¡ó
Ÿ]±•DÚ¬Ášž:<¯ÙšfÙ…²I*¤ê¤Cü¤‚¸%ý¢ªA%‰oø¯§˜¹”«ÁLt½Ä³ÒDÇàÄOEÒP«‚q�+€‚Ì©‹ ÔŠfP(‚"E˜µTƒÅX4„n‚Åc#ŽEð&oª¢(Ú�c‹Ž•Á”é€èØŽë ŽF8€/€ï Jø¾O1#ñí‘£óÿ`K`ñxnŸG¸�oäFïyqä?Op�ñaÇ\É•þÐ[
ÕÔÉÝ4�¤Í»X˜¸ŒK»ÎÃ1ÌÛlÁº4Ë�dÉ»ØäÌè$ƒLé\W Nê¤ÈtLJãÎúÎîÏñlÎ’=ÊŒ�ÙøMîÏÎ(ÎÓÀ
ù®²ÊÃhÊÖ’ï$0æìŒ×<°“$ì$Ï
%PÂiÌ=½R4˜ô,ÍÁtÐÃÏ|
PØ\ÅHÊ	•Œ�ó%ÇØÏÑHNÄPÑÈ8É}ÌÅêlI
˜LØÿ��² PâôMÓüMÁÍö,L#ÁÑ
ûRYH‹ÛLY¸Ï®hÊ]ü
~ù¥ðœ5•4MŒöô’¬˜%Æ¡Ï&­P®øO3uK0ýA}ù‹/íк
Ò{VX‡nÈÚ›e…B³bÁJÿT°ˆ¹­Úq8]á
ˆ‘¼l	þV
X….ýVW€nánH‡~X¼•4)Eâ%NPÉ$&ÙhÐiqX…XX
XÐäíí†ØàWX€�MÙPM

xÕrˆLÝYqU\Hå©ÿÈVÜ®X&Uv^¦]J-a˜0ã¦Ú‡�ˬÝUö8ÙE
%fâ°¢[ÅÜÑ—ž´l�Gå»ø‘™
(….‰
dn‰ø†Š
⸠X
¢Uã¨Pc°˜�*~…s


A+Y²`±'«a9V°V¥cµ�`¹X²^-Œ•Ž¬Xå6Ê÷ªÜ*…±R¦s•�œ+…2gÒÿ¬ió&Îœ:wòìéó'РB‡-jgLœ�2mêô)Ô¨R§R­jõ*Ö¬4»	ˆâäÊW'P„„5“£B“¯Ä­:‡­Y™K¾"—paÜX°\‰ke÷¡B³®ônŒKœE¿ƒ]‘³«‘£É…­ÒÕmUwã8
7/d5®Õ8Ó
Æ…EÐ!,Á0í*Nˆ:ðBÀÍŽËýj5¬¾©ÊB©�ã*r
írŒùWÅ’­ÄÁ À€W®AÓœû¢éŸ‡›F+Zòš�[¢D™åLÉr3&zXå‚kd=uIÝ•[}™4ŽCK¥e‘E½2ÜBå¸ò Aÿ†öPjv�CNJ
¹b‡¡eÙqÆÉ"RB1
¨‹-ºø"Œ1Ê8#�M%Õ“‚5ê¸#�=>ÕÍ
eè±0»% çÎêk¸N¥;¹¾Ö;-¾ù
kè½úúû/ÀÑžXQ W“ÊÜ.�ó.ü0ÄKŒU¿·9oÅkÜfµa9á„Á±DTŽ›¬#´'«¼òÃ%³üfÆ/ËÜ㞃¼í7[Õ¤ÑËWµWÌ£úüiÊP¹<3ÒI+MTÑr-ýôŽ5còÈ’þÊcÉG+;´ÆAû«5Ôa‹=6ÙeÓ¤Í!&&�»âÛô¤RqͲ×
×m6Þyë½÷Ó@B‘öÁUÏ4N¿sûöáo~ÞâG5NÕÝ–ò7ß•[>v¬”_¾yMR‡¥ö”6Ú�éã¸rþ"⧫¾:žÿ‘³Nv6<‘êç�Û$¸ãO¥¾Óî f¼xé¯?<ñË6ízñ'ïymíêuŽgﶋ<½†Ïü›Ñ'¿=÷Ý{_6�³«Z°íñrªý£Ø¥¾êšKÿ=üñg…¾ü/ŸJ;ù†Q#ýFÕê¾™˜Ò¿ú°€lØ
óV-æåwæâ^Ý
þn&²JîR(Äš­ "%¶îk.ü!ƒÈA
 ÊƒÎ«¡Nnè%Ê+'#ÔÊyÂD!R±ŠV¼"§¸"¾æ	.LHÜ'Æ^‹f<#—¶@#®m&ÿ¸sÓçE¦±[Pcó¨Ç=.p|2|£,ªv«9:+ŽfÂã©ÈE2’(á‹!è¾8'CZ…�6)£Þ,Lª‘žü$(—gD@Ò«kr%*S©ÊUúä‘~Œ$
íDI8NE“dD¤nX©Ë]¶0vO
OÊ�2�•)S�‘X%¹ÍÀÚµ°4u%?ŸJÂo®
W¸‚¾‚…ôàJ˜Ã
zа@âIèA”À‚‹_œâ§8ÈC.ò‘o|âOÂÆSŽò•«¼å,¹ËKÎqŒÓœã)o9ÎYžó›ë¼ç<ÿ9ÊwtŸÝâF—yÍ1s˜3}éHŸ9Ñ)u¡ÉKèUºÕ©®õ©s=ë]/ºÌÃÞô±;êI‡zÙÓ>öhüâmo;ÛYÐv·Ë}ã+�ûÜñn÷’k<ï}ß;Ýý^÷$Üýï„×;áù>øÀñŒOüã#¯xÁÏ}òvw¼åoøÂ/ó‘÷¼ãA¿yÑw~ó™—üçMŸúÅŸžô”oüèUzÙÇžõ«¯üía_zÛÏž÷µÇ}ï�ÿ{Ý¿òÁ'þåi¿{á/ùš÷}ó�?|éGŸóÅ·~ò¡ýÖ+ÿõo/ù:à†�!< 
--- NEW FILE ---
GIF89a‹
ð
K\±¿¥ BA*|çè“Zêï—È Ó›ð%½
˜cf{ÅxÙ2õÒ[ï—;÷ÌóÏ?ŸŒr+è%“Ìɸ”銚ÅübNÌ—sN
ÓêÎÃÁ^.ªH/„
€d´çhÅpìŽ
¿ù�)—ìÛ¨É@ªÊ‹Yj`gˆAº©Œ‡Ryb�|^8Jö�ÐÓÒµpÚyÔCqPD°|†Ýgõ
íÀ
¥C;ÂcBÀ vÂ`ñ’:Àà´£LÈ„F¤:†6\cAÈ`I¾àBÊ@:7ˆ3£D«�µ`ƒÀ@;k´3&dž´óÊ;½†É$¸ÀiÉ
‘Ê rºpx›ÿ¤
½J±;¯×…· l¿Ã%{„$”DZo‹øD¾ŠØŠ¦å¬NH;l
“Ì
È G™{&§–Å�·P­¿#­ë2 C´PÆæ/ÊÚž™5p3¦™2•†¦˜¬3h¯o—iŸ·–°¦H)…½–ië
4/¿Çêÿ¡…�¦vŸ‚�[¨ˆèÀ Ùë
j§I$)™›T>§ZmçÑP&Åm„’—ñÓ/qâfqÂ�­ /g¾[¸•sz:
ªK^’…§d4~¤D&”½éAh©&F¾Ð
éð›.„›É�µ3Exz¡­�Ž*'9º…½Ö„²éy¼4S„¢(êBv»vÃp‡E“‡SÄ&›øúe·ÀÊ€
	…3‰™‰ép
”÷‹‰c„¬`{K3|J]83ÔciÊàl—¦Di·…45{FÛÀÀð¯ÆIE
Ê
¤8Àׄw„�B»3þ™8&tIq$Á3,<5�¬h„dj„E£
ÊÀf‚›©ƒ‘‰DpúGÿG0ùÿ&GuK�I„jhj:|ìCÔÆG¬Ð5‘Ǿ§Óuw¤Üñ(*¥‹%`
nÛõ
Ý~ÝNã2.Úº µÔâ�LîàÜ}àÛ=C>ÚãPêÉ'0
 ‰€!Quk@èVÿ…*²â^àó`ô�O€!ý@Šðõ€M\`^�"K�7Ra�áÐ*öÀV‚ "órpMõÀŽ,\À+bpÜ°í%ëzÕë¾þëÀìZ’D€L0Ò[}dÞr®8ͳ´ÍUd~¼H0Îþì‹·¼•Ç‹
Ñ?O—
ô˜šD@í§IrOHWW%W¸R-°+O+éÎ!«+­Â!é~Tºb+¨+-‚O±â+jÅ Y²Ge$2Wå~*¯²è	oðû¤-/,	/WTòðÂ^ñì’åp‡¨$w©ˆŠ”úŠ¶d?¬ä>ð;šÖ|’„ÂìsJºëK #ð
9ÿài^Mó5ó^M»ðvIÄ3:ã6EHÏB#4>#7eX4GÓvZ±�ô£ƒ3©ðŒr4JIo·¾PŸ­0“Ì
5Õ›€œ4Œ
š$/
pŒC˜TÇ@
„¢Ã 
;¡ç{
À
í€
&¤9S(
ɽiÂö6§À0§ï9LôDß3ó25b�l°³)Ø9zÔ|twTyÀ¸9Á¬ '–OŸê
l¸Ó©g/)ôÚsûÙ“ûÛ³û¸Ïû¹¯x|Rsɤv°É6²DŠÒl©(ß0²,K_—sªx©ššt¯,KxÖ1ÁíÜÿ×'ùú«”¥àA!EsÍSªí¨<ªÐ;�D(šBîá’¤†–°÷f¤:qývì†9&Kj�
8
©S© )ÙSµÅÒF�:îh·såž.MZµ[�ç¾Fízõÿ츦S×&
;¶lܽ	jL+–öpâ´‰µ�ü·\åÍ	Â-~<.tè—«½µò·Ö§WmÛ-	ò)D�ABE
ò'\X½Y€
*&€þtÃ…Éþ”)´sÄ:¦—a~Qf®V�é>�ê:æPb~€T#�ºðœ^~ɈÅa5¬a�ñ…TUíõB\¤ke/‚D†Ô]CÌ�;
’ŒU�IG¸p…

–dÔ(QA@„!ÿ²¤ˆ ÷ÁN1P‘e¸:qT¸ä§lÈF9òÒt„Ä‚œ‚Je�Q1\Q£áIÁ9
´‚C?!£F„`:XÑ ��頉ʨDŒPðE£"†�Æv¦Ñ|†,Øùb 8tÀ‚¤ph1Ñ
2–TåD…qJV2ïÕQLe‚Ø„3G=æìZ™ËÛ"0ð5J'§BÞ
¶Q+zcƒäøžå<rõÏ8Ù³dóhCGIÆE[”$΄4YšÖ OîR�zâÕ$K¬€]‰Zäᬊ?ˆœãu™K^ê2b´êÔË®¤d„Ž !‡.L’CÊD&¨»EWDf½
ÿ…q(k–T
wôÒPK�A¾ò•7•§ti�¨ä�‡EìaÅÒ–³�Zÿ[
!˜þÊXEÚ†²ÄСX

�ÔHØðÅÓ˜‹^ÆaüÅ_Æb$Æd<ÆdDFØXÆfdF‚Æi”Æh„ƨ˜‹¸»õØ1Vb–BÑ(¬˜�Céšq ‡r‡q@Çr@ÇtLGrpÇx”Çx„Gw\ÇyÄGuÔÇvtÇ\ÐG{äÇrP‡]‡]XGüÇtÜ…�\ÈRàÇ|äÇz”Èw¤Hÿs¬È‰´ÈŒÄÈ�¼ÈŽÔH�äÈ�É�$I�ÄÇ]†”ÌÇ‚dÇtdGƒTGvlG‚ŒÉ`(ƒÄI~DÈx¼GtÜšœIuP‡R H˜TŸlI„ìÉ‚4È›lÊ„lÇr(É‘4Iª´Ê©ÄÊŠÔGƒ”’Ü"‡O¡婤£Jžìf*³$K;2Ëî0¥ãF²sÕ�Â"× †
 Ý€–‘™#é ^ÑÞâÁ´¥e‹—ؾuPˆŽ		‘à™b›

°L”0‡Zˆ™Ò	sÐ…ÍH†qÊ	

?ù8ú"œ"Ô>%TE%©r:ÖrJVdE¯g]Sf…V9¥VHˆ‡:ך,¦b
è`ž˜<úÐ(dµ,Kr¡¤ѱ×H2;ôˆ0ôQ��0
-m„///Éj­
†3B4ú×Ä ‡>x‚Dð
9H‚(ð?�{¨‡zð�=
†Y¢9]®¸CL~-†`Èá
 yŠÿÒªÒ·@[æê`pùàâ
aÒH¡9‹Ã2ÎÏL	§ùO^AŠÏP²P†

`àc
Š¸§–ât

sp&aàO…€ToeðÒ8Q¹
ü)
`¸§r˜
UFè_È—t ’boBùˆ‡ï›‰›HŠß\®”®áÃ!‡Z@«@‡7�
ÿ‚Š …vè�3
ƒ^0lãa`\€ò¢ð#‰—ºÆ5†$¤•©"I
J•Ð�pjŠ‰�‘�NØQ�¨ñ“‹ïÕŸ–NahïZµ§ï¬Š†Ð‘’�À'�P
‰H‡ZØ�u„>Ì°üÁ(Ññ
ëí”tÈ,ÌbÑ‘ÈQ™b¶�d8�ôÔ‘²è˜ÿv¸…>™¥á…tøÌZÐýî|“@AåÝ}_¥×Qúȉq2
^ ŠÇ$ftð"e�Rš‘ïs°n2‡Q|IÃXˆ7©©×	ÍLˆcªŠÃ§§)p
H®¬ä.?atL/éÓŠx;2¥Ð9L=5ŒZTe¥K;±B"0*yxPG®vŒ9N¶[2+9È
ÿHè£KDM¥smÊ1ÖLÊ,Rš7©x!›¥Ã
š+5¹a2š	ÓZv6æ8c1ö)ƒ‹0ëØÂT2�	4ZSÂà‰Ë¡¢ä‘2D³™97RyŒÇDv0ÃØWÌ�0ÇTV+5uŒü™èJ¡!ýX¢a®þ‡[+Ž2ŵÂX°?y(S–X®b 0jÃì�MvdÕ
“ŽBR1öâ¹’"³WÏzKÿ
cŽWé¬Ò026xA
ÉW[}Ä´RÞvÁalqæ)çÛz'g›sÓ�0‚ÿ
ÎEGÂ1T0
Gæü¢f22Òº’9ÔáNYޒΞ0µS˽¾0áM
&cЋYž¸¬©®ÃK‘¸�’é’ñyŒœvÁå½±ÇF«§\Þ}ë­±à~놑FíTW2	úÒÎE·à’e1HÛÀµÿ1Û¬ŒL©‰.¼f…LX~­»5
ªQ.&†b2KvĘ9¤¤s°

ÂŒl•‡1
ƒÞÑçL`]d¤¤UÛVDr‘èuD®8@‰ÞÑC¯4‡*´%
Ú°Ç>Û�ztC‰°‡?ô!�}ô#{8­"‚Ž~„¶±�íkkp$B°u,lû¡}8–Ix=èˆ(�v³óÈm>vËXå2ö¶‹ÅGk«X×R·ºÖ½.v³«Ýír·»Þý.b§;]ð’·¼æ=/z¹«¦£h+™$$ã»ø
ç“õe#~�Ó·LÊׯ›œ³#ÊøV²6w½"sH@�+ŽÀ:ØÙX©�‘Œ¢¸g3@t¯Û{ÌcI°lÇÿ»ì#a¨Gléñ„' Xü°GÒ@�Å:—ıõÇ<ž°ˆp̃´=í<º`{äƒÄõˆCæ
Ž8¨–ôÃ@ìب¡õ°‡=¬[ß6¡ôè?ö¡†3ìcn8<;Þô²¹Ín~3œã,ç9Ó¹ºëõÅÞ `ûf’xÃï·Ãßþ
G�N(=)໺ÑSDʬȲÄÀ
J�ljª"‘¦`”âmhç	Vo²~­k=XWšÏCŒ@¦®c<À.ÖQ;­O ¬

¥JFF±®p‡<EYUòíFž«Ç_ùó·ü­>ýÓÿþòÏýýßþ ÿáß
î,Ë*XÕy¤C mŠ�„ݦ´B°€a£ƒ*hR‚RZ„ÒËÉP–ÈH–xÊù†ÚØ
ÀPa³ˆD:¨ù™2ü¡í†Íß
þÆ¡�‡x$
&,â`ÌÅb$q¦G€‰’
Gxä`ŸùÕÍ¡Ç å/êÜ	c~™à3*#�9£qØ 	¶ŸàÀWÒ$X
ˆ@‚¡9XË�¡ÓÔ„Î ‡w€‡Ï-š|
cn�ÿƒ§!@

F¹Æúè䪀¨Åwø#Öcf0NÅM
Ž-–¦ÇØà.ÖF¢�o4¢µ£�Ý8²`É�£r”xÈeô¨Ê:ºGm Í] oØ\V`$ØÇÔÝG/ À³À„0°B¬ÏïTå
lÍ-° F–�‚HÞ0Ô‚B%`)D:dÆ
PUä¨pÅ*P¥
Ä ƒ€Úã/ìÿDKta+üBôÐÔÆ•Œ‚¬h6ÅÔ¹FC®Gœ=½Q‰~ @Z8˜VCré^Œžäd"+(À0ÜÂcþ+,@©üSÀ(üH`
òÕͺ(l¨.Ô¢ÙÜéÑ(XgùŒ0\K>¡Pg`�,ÀÐéƒ
C'�Ìüa2²¦}q /6g¢zè¥jà-.šJ�hÐCÊV¬$æbÐ$¥%-ªÇº£Ræ&ljü±&Ϻf�e£Èöì6^’Z#Ìæ†c6ØuÀ0à&Ž’"g/Â\1r¥z(ÖmÝÖf…Å/4¦!Æ«N	Ã-°aB°TD¸!WšC:(äÎ}
/œC-„DºLŽ2¸FæQÉú:ù‡¨d¨(C	AžF…Ϙƒì=ËNpÏDè^;ÜWdøÿ‚î­WQ	„,”ä,�

]á^ç°ï0«Œ7ê•ó°ÿ±ßð
‹@¤
¦1�q·qŸ1ËqñÛ1ûðÛ0§ŽðÉôÕ‡nˆ�ðÐmHŠ
Ü•ãqÓ1#wñ9rKò#W²%_2&g²&o2's2%w2(‡r'£Òb_aG}=ÈFp“æáŽE €Ä
?ò'1G²‹2/çñ.÷20³0»ñ‹ñ0ßñ1'ó(ó7ær· 	�#ƈ‡¶F�¡Qà,Ïò
‚±ï28Oq$ñ.73oÞ2süò¯3›ÿó/«3ïðÇóϳ<ç0<›ós|q9÷3?ËñÃ3<§ó
4>´8¯³ô$«³
Ó3;C4As“³spª>S43ô$CôC1G˳?Ÿ3Iïó9sªôB·óH›ô@£39—²¢²pìÄ{Vh‘æÆ
°
H€
¢7(SÆ”9“fM›7qæÔ¹“gOŸ?�:”hQ£õ;6lر_K™2ý•ÿjU«T¡^Õj5ëV¯M¿†íöêX²UÍž-K‚D
¶oI¨p;…‹
h›¶:‡,

œ)½£Ê
pÁœñÇÏJñÂ!w¼qÂñRW>¶è{Ëعô»ë*®5æÆh÷%Ç)¸'T
u³Ý;&0sxIë
~ñEÈa¬Ýó˜idÐO5…Áe
ÀîX¨
À:~AMi �½P†1†¡Œ-¶"a¤\ØV¼5ªo•r å#è†zPƒ.X	-ß2öµ1âM	ãVsh«êÐmCTž•Ñ¦—¹ú(SB:Ò�Ân‡—›bGÀ9·¨`+��"™ÈHît�äê)
’«Â9¸ÐT.l	^Šq£Ãm¬ÿÄ¿Ó	?μ=€¤ lµ#‚Ðe‚ĉ
„"¸A�&oábN‰²i²�0¤áÀgþÂ\�ˆt91M€‚=R²z at B…Vö>„º_G¯›ÝíJvÝo¢èCš£Š§«BC÷ŒšÆdéJŠÿÝD®.B‚
nGíâÌqrï4®+a½´Õǵ1*½”~ižX@Ʀ䔨ÛS%¸"TC?› ž*?pí`‚�\&.ê�b
Û¡|ÁÂ
oˆ†²†¦.=@2v¼â¥˜�-*:À
7øP¨‘С ¸~øtD…÷gRzó‰uaEdx¡®¦fDqGöØSJ,¸Ò³”#îáNYÆ06hÍ{1V£`’{Ê“,\ùTIR•eë(V+TmXÈn.Ìw
uai2%yªStÁRÖ*Ô´ÇØ)Þùd
+y
yZ¼TU–Xµ’‡B¦Gró„
uS1§ý
ã’hÂl÷—
À¢ÂøXKo¹y’Î
Å TLpœšŒp*

9Ãé
0ʸrV¶0zÌ
cž0¬°‰gñ’§*ǤƒKl¹>vÌ
š³Ñe�9
ÆÇÔXÓ
é‹Ì#gZËl'·#€AÀa*̯Èpx
¨ÂšzÇø’)/¿ü¢¢=ÌÊ!€HlÎá|øuN¿·¶’�I©�Ðêº�bˆÂ(FN;º )ȤµIˆƒ¤¸.À`¼k9•ª˜œÀ»F"Ã!€þù"€ê…‰Ž1
e  P†ºšÒQ‹R‘

¾êbn�K.G9—U¸¢•ª�à
0ä=Žô=Ýd4:F%&g1I1Z�‹‚ýÿ®$ÀÀÅi8¨Æh
qYç:áœíýî"Hë"2¾†
e¤£h
R;œNÂSóâ“U°J¸¢­ù"hcu	£áB!Û"V²2‚µR¥+'0€)çLG@–)¾°…xÎñ‹ÃD1/…Åÿ‹b¿%”´Ü	—ÇèæÊnAÍý×ÈicTf©“Ž`•f|Âh\|…¡ŠMG8ˆ1Ú*€º,[ñkÔ�
Y›/Ûžµ'q
$ ãÅÜzKØ<LŠ°÷•JÓp‡¶!Ò1ÊÑ2aȦ]ºkiŽ–�§e
´­HUÎɹ�ZSš»9[¹§Mñ&V¼‰8ssJ\Ä‚ëÓÖ)PT¶òŸ�ÖbÝ¢4çaæç×ÑÜX1ÍO™ÉRHSð�c=Ê(œkœMpñÊ
Û„Ò[à]Å€Ldt$!6eEVT„‚ñw6…c;–ž lrU%!Tu„húÅépA¯�}ÁF¥wˆ“{2Ñ*(˜Ö±:Ûqÿ8¤�“Ýté
[J Š ËæCByŽÈ{™VCÑ
Êp
qgšÇIœöÀ€@û@ô°
qÀô0™ömö0™áÀrö`õÀ
Xp	0ê¡ç¹ö áP6Ú™œIö@¢óà‰0õ0¤óÀ¢[âPôð˜ý0¢#Š¤�É#Z¤ó ¢þ`Ü ›6›=Š¦iª¦kʦmê¦o
§qꦮ)§uj§wŠ§�™§nª¼°‹‡4‰µ�öZÉGHE3tz}IŒ<·lÎרËf[‰êF�ꉶç¢g’çˆSqÀ—N±I
€
h`¾Êï°âz¦{
°
+°K°k°‹°iª¿ƒ|Û±2’Š©‘Ú‰„ªkñ’ŠDªm¾¨±	Z¨Æ§m¹6šºˆ�êVï2¨JÑ
7±:q 0§¦®É¢aPÝPj¦“Ià°i°
ó0™ÚÀ…
„�Þ:à�}ЯÜ0„ ¤Ü 	V@6šYP¯ÓY¤�Û´ƒ+¬„Ë™†+¸…«¸‡»¸‰Ë¸�븑‹¸“Û¸”¹–+¹•«¹—»¹™Ë¹Ÿë¹¡‹¹£Û¹¤º‹Yjýôǵ¨·%z»F© Ël»hC±}¶{©x€D±jÕˆ‘—)T% ‰Bq
zÇuåP€¤fZ¢Ó¥Nj½×‹½Ù«½Û˽Mê¤Þ[Tʽ㫽â˽Tj¾ä‹½æ˾NŠ¾×+¤â+¤×û¾ñ›½é›½M
¾ßÿ¾Þ;¿êÛ¾ê+Àì¾lÀåk½
ü¾Œ¿ìÀÁ,Á<¤²Ùì`Áp„5‰;±”¸k¾¶h²Õº¿„¨„*H$¼|Š¡»[
 
@‚Ý×ÂTÆÅØÁÆÙáÆ`Ì
æAƒäQ)at é TÔ¿ó4°´Ç¨ ¬Ði¸3Z”DÆ�z“èÈF�º(½ÂD
fɆ¿`>€
MQÉN챫ÌÊ­l;'­ ¼ÂŸ´K©¶+Œ.\‰´ëÁ›ÆÅøÈžÈ�Àø»œÆÂh 3!Ó·©nµpe¿9R$Õ|óñîzŽÊC‘ü‹ñ‡~åWºlÚ!bhè 02z’
"ÆmêƬB5³

ºàÁÃ�eä4uÃ9¥;™r±h\’tŸ2¢íWžã"U4 ³:��)ƒ"¿Pwò!§1$!@3$.1à�gQj�…wÔ
$
 »”A„bçà¾"
n¾àÞà>.˯;»CaV˜r
Â,ÌÕº› ÍÌNñh·<.>ÔˆmÅ.•÷.hUC
(÷‡¦ÒëæW,ͨ±=
Ó©âIç•<–*µÐ£¡ä¥Î1-b¤
p
Ò}#7’
`Y¿ø;’a
6r+«ÂwALŒ¼ØÇPë~Lãƒ5X‰êÈàòÃ~£Wëõ‚×´UëË®¾îÈ».ë´e×nâë-ÔnÞú2Âza±Î|ÁÈ�ÈÎhÒˆé +>D 
iõÂ(-:d×3N/¾€Q†nL"Z|#Ü¢hs¶:†¬h	ñG½E]GÃ
†rÚ’E­ßPÓNU‚¾P‘S†±>§ÜKœWZ�1g&áÖ�ÄïÁùÜ1;NÑ„`ÀµúdLddsF’ÔU5YÄsX³ÌÕÄÖ‰,ÕIE]NÈ%ó
Êít9Q—u~áEVI‡—£t‚ð˜:¥„’dÕsH^ K€vpÑn¤(¡&]p
6¸nMÈUÛÂÕ1³`3Ì-‡vXUsÅu2*»L³H¡³ÏhD™à”I† ø†QÔôšÑ5½p-Œ0Òz9FÝt\	j _2À%§pA†9\°è–›ªäE˜
„†•dCaÊ$,"ŠD#ç—ðˆËArt	Ïaì[å¾Ä€yÉ™z	¯@aØÅ`�ÙMÁTÖ

%J
ˆÿ„9@a|aThêÞ%H;tÐ]’y9sRÑ	,
XÇ
{½èr
N2̱‘_œã4ÃXÓSR‚‚
C§P~Ô"–û´"%¢II/Rw›ã°H Ç�Š}º@ÔÝCˆÊnnƒ¡DÿZIÅwz'ŸU½ˆVÍX
‘Šs£F\¨"ÅÉ0Tb…°¢,²—M%‚ø¢©¨Ô0¶uÆý|e,L Uº'•ú€ÄcÇÑ£¬äÓ"¡¨b8€4‡
DèFÚ9Æ/JkŒ«Ê…b‘UË;G9õÅæ/Å£%¬ør4…Ä—gáÝ[¨giiæ2Ô’
¸lÓŽV@™	èÅ|¼U&¹0YÀ›^ð’
CÈL@*è—�d´¢i¹� €!€)£œÐ)’ÁAeÜU¸ÿ(†U€KVˆ,i…2P
FV|o¦P€+\
…øB«€%‹¶Â­¨$(Z)Æ)ÒbzbH|(† èŠ
ƒXEÆ€ñÄÞGÊ`E:X‚-ÕS!ˆ–0˜Žª¸"ñ‘äAç#–
hŽ0z{Û
t׺8bmsnq”UPñ7j-Ff²eÚ¨‚ÜHcß‚‹[´Ã©8Îs|6sîjÄÑ渚Ž9º�9BS±â‘0ÄX ª«×·ë–˜KZ||¾hò˜Æ<ŽK‘‰q˜#;ä0H¶+lSîADÈY`‘�7ƸFËÍb–s;cY9­ˆíeYÿ‹XÈ¢y­æƒÞ‹»;UI6˜Íš1ÏRŒ3…¤Q¨èIÊÇ=(ߪ!„
]	ýÁ».Œ®ªÉâP2bG<P!/“cP€q;Àè
�È?§“ßÙ‰/4�”¤8g¥?ÊX†´éç4G&QÅ9š(DEÑ÷–øÿ>Hï*zâ'´Æ=>ñÿŠg|âôÉ#ΰŒGã§8Ç›H’G$憦!8ñšã›æ‰F”½
Íñ›½Þ†žyÈYŽó–w|ig:È	½r�+ZΘ&g²w䈆~_™ˆkY“ó]ù–·jrÙéÒÔ	@I Eˆ@ a”H
`Cá}è-$!_¨b
Ï
Š”ô–mºÿËò´>€‡¦TU܈CÀx”.Ú!ŒZ
¬–ˆ
]Ì}PÝQíÑýÌEK
õÏ»œÑƒ”Qµ�Q·üL$…Î	åÑ!ÕË&ÅP„¼Ñ}Ï+UÈ'�ÏúÌQû4Ì"-ËeK#íHþ<Ó¼´ÒñdLÇì@bB%w’Vp‰ÙAe0€Ì<ÏhIÒ/ÅÒ½\H÷ìRÃÿôI5u΄4ReS1eT½TÓCePØlO`RR*TJ­ËBÔ“<Ó%R¿,ÓN%SRMÈ�ÔñüÏuÊEMÌ*uUŽ$T„lPùôOQ5ÕI�Ò¥ÑÉŠJÚ|‘´°‰s
�8
®ä€y¤Œ.l×yMWœ…Ò¤E×--WI�ZuÛ¥ýY“R¦�Z–-O¡}ZƒåÙœm[¹¥³-Í}µW›uÚ–eS½åØž
\¾�V lÜ”UÔ¼uÜ…„V¾,O5ÍÜg•Z¦-Ë°\E|�Ï
—ƒ&�ÿ™y’ðŸï}Pÿ<�€x3Ï?ýöÙ›ÇmÞ-†êÍÂEž?}þæÍóÄž=@ôúõ«·�QŽK>öó§r%Ë–._ÂŒ)s&Íš6oâÌ©s'Ïž>ªo˜¯aĆ!V˜QbG�BUz´˜Ò¤H©R•ZëÖªV¹jå*ÖkR°Å¦vûÕëÙ´n×fm;VmY¶hç’½Zõé°$þŽP1âo
$Fœx1€/ÕcVó2 àÌyŽ¼lÛçÏÞ69zè©ÔlïË—yûúñÿÛ÷H5{çí¸dÏ H•ü(ï³h°^� â@ªv‚1¤¸.sžq3/%½}�÷‹²¼_¼~á5ŠÆhyÐîÞ¿ƒ/~<ùòáõýö”˜ã¤N‹ûx>S½HëÃ?ÿ~]þþ÷ÿ—U~Ié·~âW }ý
ø€!€
š( ‡úY(¢ŒBÚ¨¤Fª¨¥‘>:©£uF‚_‡¦‚_#p8ßž¸ ðK/æs@*Âì
®¸kk°ÇöãZ²Àå:›±Í"ˬ®Ò>;m°ÀF›­¶ÛrÛ­·ß‚n¶Êz»ÏiÍ‹ÐAÍ>Kk°ò€/»³"Tí¸Ñb,JÈž–¯¸ÿp·åÜ_TÈ@jU{‹~Øðc+ü°ÃqR[L1űÆóuj¡aŸn8€‡ÿ‚°
¶ ã/
"ü5²†¥>|LQç€L+¿ø’>R0›Œ0ÀÜIÌ/Žñ¥¼ÃvòÏÿøà	æHÆ0nq^ ƒ)æ32xa¤¸ÇHÿ†
	Š
"ãÿ�_òÔ²O1Á^°‚Ìà;8žð‘‚0¤”ö´Ä
GŒ]u×Ɔ«UßÈ1
5�Å-6Ì&É7Ÿ'eÆM1¥Põ´§”5¸N7ƒ¥Ø2)º¬Â\·¡C4¿b$#DÅÝ!/¸\HFÿ
å˜YùQüÕýŒž Œ/–õ’z(Òý	Ùþ¡_þáàÚßûõ üÕgALg݇SITAÌ[Å´I’ù¡±5�\Z�=á¡D¡TM!ƒ˜ÞfU‹µØ§ˆ@ÿ	¼€
(L¥!ýІ©ð
ƒf
›�­�S¤G�XÓ0àÞÆ%^Î!ÞS€Y;
”Àb´~	QÏ5ÈUpØ0
ÄÀ
h`
L�PømàR˜-
„€§Œ@	p1PÅ)¸B2[gâÖD�\ëf„C"ð�=Ô˜Á@¨DFÄ�8„ƒŠ°?ЃhA—´Ä¬H‰Alƒ´Á6pÄ<¤�Ìgˆ�lƒ8̃8pÁ"Hƒ%
=;u&{ñSÃ	ózò¯
Z|rXoˆ‘ç­ÖêõV!ÜRÕÂ|$?sµ±}'¶UÒÈ~¨ärÉ`u{
C;¼J‰ÈL G@=€	G4K=Ô=(	=Äê¶ÿÒñéÚF»R«EäCHïîG$„?ÈBäì<ø5aoF±$‰_#ºüŠAœ.
Kõi£vjãD0x2¤4ñ(GŒAtÿ{dƒluÝnž÷Žn3¬u®m›IÛù²Þ
¯„AK�¬ó:ÓFÖ’6³H÷±`˾Éf,K®vi˵�vowv×F{s+{¿·{Ã÷|Ëw}Ç÷}Ó7~Ûw~ó÷~Û·ÀxKë÷€8m‹8‚¸‚3x‚;ø‚“ö›6]âAÂ’Gšõz~ïn›òoGÕ«fçVC¬Ýty"´c4Æ«^'ÄH[ø�ŒµÙQÐÂ
€»C)
J`€y)
<	›­¶WÅ}y‡W¬úE/È
CY½«n
dö‰”aã¥le÷ þhÖ
ÿ3¾–]^ì@–<0ÎŽÂìWÙÊògb+8A|tôNžƺ×=¶–�ã�ä˜Ð�ôZ"
dŒó$´$Íuut…¬ºÓr2ÊM’"èEÈòûÑÁÆ.vÄ–={¦=r�¥~7}¿¯d�Ý×Ù¦oa’fèÇæcg©Ìx›!À˜€Bà(’XCRüâÿs4rYg<ó¥
¨B¹fµñOz¤-^ c¯»àlÙWŸ{©Zi\	+@ÒŠÆYþÐ\0Œ1Ö+Íõ®ø�*�
“ç=îÁïسC¢Olí/Cœ|5‘­íž¡£uqùTÏ<•ó$§�/
ßÃP¦°%èâ…ŠælE%€]È'|B¯0ÆðoÆfIÛò-—‚	å<mÛxÉ{èî°
,ÿe`¤íÿ Òë±dî
ªl<¨.ˆiö"Ž Ž@Ò!‹x

ôâ¡œ£„Á§Ža§ªdf.èJ‚¦'”�û¥áDJPò+„²â¡ˆ¤l
0ì¼Òû‚
=XÑ
#ð> 0m}X¦-q_nÔ|*’Z²(¦Àî4òÉ:²©%.i›
r o݈²RT‡DuA)×­BÚDHbN�Áø‹DÐD7UaT![4’’!‡º¦BÌáBªÌÿ!·‘$‘ „hAH!0ÔëB²,l<
fzAO>bÞºÒìâcØøê+õÏó…行˜d	Ûrï²íä¦-Ïrî†Ì鲞,QÒóƒ³	yî+ãCÌ"f~ã13ïüÇ4O IdE�€G.tÍ
.ŽÒZ�H(e©Þă†Vç¡�³/öˆM ÿóYók	g2Z�<³±frcNòÄoëb®H‡˜gm{$ÐÄÐ!´…Mˆ¤GªÂCà-Z·üÖ! �ˆbB.wû{—¡Í0Ïr.
V…ÆŽt`‹wH#�uKg5ou”ÿz,b³ƒIùÒ/Ÿ¬úç¯Z-rÚá7LBÃÔó_ zoŒû¼/ºÅ
³ :¬UÉôKó©H*#3*c%tb¹¬ÿl¹$¹ßÒa©Šæ5‚´@qŠANÎ!ç¢�0ä‚©l¡%:Íu>"‘Kc©~‚yòd·VOz­œ§ãf~&L¡ÅŽ
Õ’­T�ÏH!þÂ%ø+Ž4Bš.ŠÖæ$.C͘⢷¤„1ê&üÉN´Xʘ0L†Aˆ�<—B¹læc]b=LâÙi·\Ágtí ™Ç0R!}C?}Nkãm7P™éM
ý8,[SzÃvé�ûrŒaÝ::€LVA8>íG\!€V‚AŒÿá*ºŽ¿œ¢ö^¢F¿z¹$d1†Á鞣ß&Nž%Ó$”ÁÒA2_¢4&¤ÒÁa×ÇV�'†(Ÿúù9‰kkNC‰
]…5"õ'´DVèbEJBÌÿT×fš¨Bƒ¿Š¢/Ìá[P68 ¯/.‚Aœ}q†ˆ¿ »Wm‡Ÿ¦FA®láml×Î
:9‹:>&z&%oBê]�YXÅl�µ—k(@êÊ£(SòÐÞë'Ì
ż9
TáÚA_ç¤ß:§,lo1¤´$Oª*¢Â¤p´Å7ðØ&„7*£È	ãcÞ&ý+&ZaªÓ1ϧH
ËôV‘Þ�ÉIïš³ž_k“ѽpÃ
7Ø
ä\ÂôUu´¯å”—öä í€Þ¿Ž!ó•3´¯»á5‡Ð.•ò¶€™»e@—2V
”á:Æ*Ù
Ñ ‚ªèW¶øT/á™c@*ãOÔÒ1iQg¦™i
 Œ9hÙ‡‹.à‚Ž|`Ó

/\hœÐõ¥#̯õmË˹³—yºèBÔë	 }­*ÿÉ8
X]pèÅ$B®…UÌ#Õ»à8/º/]‚ÃUPÑ/LÆ-ú/}LAÜ$ê¬ä
¢`b8
À[⢌V´Â€¿¨JN¨ÿã‹a¼h$¹Y#ÛeÜBE8@�z˜¥ K%Í陽3`È 
•G´éa¬8À…Ô™
$+)Ké›ÄP2Kë.1)Ú’	™ -ñ\XÑ”qÉ-�
)oz½ï-šßtL…#¹0ÄšŠ-áilå¥(²] Æc	’*\‡‹(ÈÙˆfÅ
€€U £aƒK†
=ÆIm'CE
­/ЋÝê@éPŘV1=“ÌhHçH²Ð�ÐHS6K®E&2sä�q
!H©A<ïfwÚ‚9#WpÌóÜç+ÉHųx
$ƒGbµ\s”ÁD[ò‹ELC8r‹ÊAˆrÁÓxX!›�`	$¬ç	s£î
\ôË0ãU/‚÷òŽ%ÅZä N:D”§^㤹ð08òK¨×ˆr®XÞž¼ÃÔZ5ïK�xZ­(âýÕOÅÉEœþ(£Ó¾_"Y±o@î§@§ÇXÊ Q{X8NÄFÀ
Ñ#ÿBlX2«@.ƒƒ!HÍA
õâ6G8®DEÄa ugôRÁã!çÐ)‡<_Ñ
V’òÁ
ãá{!¢‚Q”’ƒ%	Ñ"f%1 ÁÁ>^Ô0Ño�ÁÇ

sÁ/9öRôÂ�ÁÄã(í
äÒ^Œ®tXB�*è^­Dƒøu	¡Œ	LëX’ßV.C1æxB6v†
‹~b‰Q¾P at C!òá0Ù^æX"øCYâb§ÈŒQÀ0­ƒò!!ʸ0Eá^>i+Û§dŒ«‹E
ŠO™y¦÷C+ÉXXÒ
){±��MÒ"bh‰ÿ…‰)hÅ�š¨(uIS‡‰v9?¨!xá?”Âw$ÀŽ2|gÀ%æ-ïâ&ç’[Ü"'~—ø¿°xˆ¢™AwëWuŸ§×CkìåJ‰Ñ¤P2ýqpü—´æ{’“3#�fq<Q牼yG½ù›ÀÙ›ÄP°é}ƒ
¤‘r8d0µ¶—w-ÛX�M¹gݘ®dRn\v2Ö™«
2
‹%
xØáS·
›ÛøÜ2�Dcá]äI¸@cB
}‘™Å¬w\æ
�V�É@THz ¾ [ãgHu¤±4E¥­žPW2ú$!ýÑW¥ébí¥q<AšTVR“B"��R)2 
s„yJÝA¢Ò@é—™|©x†w(<£³¿�bY.Iq
îç/NÂŒÅqxuç°©�£`ÃFžBª¤
!ä1!ôBR(bƒÚÁN¢OÉÐ@ò±Ž*”ÊC 
=…& £*Z¾Ç^"_ô9`Z.èЀAVj7bQ³²DÛÕ¼gŸ‚	§ˆHR 
•ãE†«¢e(m‹(±zSô3f4¥ªz	œ€)oBJ’¡´¸
RYnbD}£q€$H'PT«í TÃt¸5>ô"QÑ3½a%½P“'8±V=q$Ñ7ÃbN/g—ò]9ƒ·O)5]"¸Ô:+§V³’¨-£ã-!“TÿТ,Û‘ŸsÂ3œ± ß„²±Cõ±2CD¤$<“v¾ç]õU]¥C1Z12m€¤èæ¯É]tÆ�7QÂa›#*Ñg \ra‚©U)�r10
vñÂ!-Ÿ±D
êSñ›¼±-›Q•$,@"&ËÑ;¯C51_£Dàj²$2¶�A�²|t<žÌGŠtH¼7IRÑeUTë 0Z48„ÃŽ¾�Ócõõ2ÙÆØ$B5C9Ç]

Šäß¡aŒÑ)fóÂâÝ#£ð:£³·`œqÂE/­
Uí`3ÿÞò±PØáCë=4¾ðàð©¢áF³µLÜ(*§(Ð
�~:{GçhÚ’mSè'Àb׋œÝÌ‚L×ÆåÛÌý9é’Eé‚.8ã1ÐÆ[2Ÿ3
´V?�L"=?�d÷às�®qO>˜IJ[OqDÄ2¿`¸ƒh…×Q¾Àf]Q‡µ·&mÚR›6ƒÑ”8:Ë!3±å¢$µ0£.!1T4£5î4FíWçÑ$¥fÊß¡ÊáóÛmå貤,lä1Ñèòˆ2ÿó2¤.nRÐŽmf<s鼑£Ê•$ãh8¿Ñ[œ�^âaƸ�¢³’‘Ò­ƒÎNH<Ã9b¥‚¾�f¨q1\}܃h0DÌòᵋ"‘”€„PÈG¼`¥Ð"iä2:‚�! !Vf 'E)qš“2&À⑉øsŽÄ2ãbS7®eW?¾°

à0ÂÑgÏKr c
K±t3�LºKM!A·�
YDúFËg¸Þ§W÷E2L9(à¢rLú�XŠ

üY—tÁ ²#
…GÁ%Ã3cÊ
ß(&p)_^’¡ûCÔt6x‘ÿ
uE’½ÿ<Æ
$‡LÄ©^SñV0^ƒiK6ö¡/aÉŽÝ*vWLaÃN¢›kSØ“Éh¦õjâCšŒqš¬‰R¢¹‹§7WåõN×É
É«P<ÇÖ"O nL�GP�r<Á…
ô臗ö
ẼM`=Þ1ˆ#
[#ýW-æ-\wë›
Vð„…$žBØ�zìAáp;ôÑ�0|A`Q‡špL}ì£eè\›´„FÚýPb F¾òE
y5†ƒ­X`†Šn�å<g:×Ù�&Q$›õÑÏR˜ÁôfE+ÙMÿ
ºÐüÃ߃§õÑÈ*kÃÔ0
f`
y�B‹¥�ŽwÜãyÈ=Î)0áâQ`ÉS^r(\7Bús‘×Üæïƒ�ÀšßÜÿç67ŠÀ‡<ÂFDø0„=Ä<ç_Bv~óœçœ	_T‚ ˜p„ŽïaKXÂÓ?þ„Ÿ—=ä4�º£Nv)‚|	SWúÛ�О÷üç{�:Ïó~³÷Ýï|à/ò>à��(Å-„!�®Ax[…¶7‘²V¤Ès¥Ÿl7'‡±I·U²qc$
žÜ"1‰1‰ulR  
Ë9F‘bÌ4`»Î‰Œ´n �ã.ÿ¹EA€
¯É|(<=I>¾°‰�¸šé;‘Ì#ˆÉàeà…�	Þ�?Ä�Œ_ˆ%¬¸…�êCåÛ@ã3^À¾v��¼š¡è½DÁD4r‡¶¸dÉšŸ�°Ç=¼–	CÀȈÊk4˳¶y7»(=8=�#�
ð
s
­"¹¿
BÇ
bDFf,Cft­¬¡
Ö`)†…;
�Ë
9‰ÙàGÖÐÀ
^À	+´%Ð[È�Ã9]X‡
ÏÜ–nôŸ^G|Íó<rDO
T?óÓk)TE“–p1½)¥(
@8eøIe`…ÆÍ�ô…˜ÿ1Á+\ÿ U²UÏôL_ˆATUˆ„ÈL~€~ü@é+†*¼
âHÄØ
]
ÝŒÊ�¾‹èÝkÀ+5*½ÉÈä\�ÀÝ{]öä…
ž`G8—BÎ#„©t…sÍÕ°ý[lñÌÜ,aSlY_AUpE
¡ÞD¼B4T’TØÔɸBÐE^¸òUŽ=
Ë ~G¸!I
i
Ê&QÞƒ–çÉqú¨ú8JëØŠVÈš0§¬.¼=Kºæ
añ×þ‰ØŒf/Fd—`ÊîßÁ5ˆ"G´
_ ‡
xIˆˆÿÊUèÏíø^

‹�˜)]´ >’üËšé
óe.
c¶€4–º·Æs)…”¼CêB49q=ˆ3Vè:[•øV³µæݵûnIeµÿ’žjd3®iÆOËš·/gÒ:DîØÊÿ~®p¿©@Âö$œpAr+Mµ1V¥ÓX1euà)½hàÉFïRÇxe02�‘wL1+ÅW(205žc°‚R—ÀÎâÃ7›¼ˆoâßT0Œ0Jjå`ÙÉx±št¨aȇør–“¡·ÈZÛ†Ö©ÝÉÐÅspÿ1!J™cGh¡ˆ	Q¤ª•Ê
:^È~�™ct©)"cˆØºš”¡ƒ«ðÓ0
…
|h)+0
Ÿ$ƒ™NI4s‘SzàRK¬3
bôšÏyŒ’@Pñ4Uhü%­H1XÑŠ“|Þ‹iE†)’Ü
ÉC;­¨æA0¤b¬b×@Q)ämà�	FÈî6H
`¤cí˜"}=”Œ°lDß
HhB»o'ÙßåÖÔ‹îhh‡fÓÝúó•<h-|3bÓ?ù¼ü“©e
”¤�V©-1EÔé’·$ ð`ÖATq¤@»�[èÓ Š.(ƒ®­}�Ú. 
rF+¼ž*�Ù¡XÆ̵B®yWB‰J(Iîy•°‚€¬G9
…AÜ…ñ¹—2Ãßņ”U;€2°í”Õœ}1(Fe†-…ryQ:ŒW,$ÃxÃé
@Íhõý•

N¼:Èä‹à2(C7FÌ#•ÅV�G�™¡
]D
™/´ƒ'èÑähâFàQÀPR
z´ƒå‘/@/„ûh‡6½ÝÕ",^ýb†_FgQ‡Í1ß±ÿã1„:Ï]úR->ÏñX‡
/2§#Or´¼/(“¥Ëñ$kñœò"¥ü„òÔ™òûVV#D‘^ÙýÎK<}úYxžÎÛUGë„ŒË�*o˜1³/¨1ÑŽšÂ’ˆ…=Ù—0ìïÕHg�¨ÑU�<åêÒôV¼U
H˜á*°Ü{ÝZçl®M°È7
ÿ&Nôg	NÀdLØ„LÔ�ÆÜÐ%ö¯J„Í�ˆ�±^µÍD\�^]
],4‹Ô[Õ¸…Õ`ÝPãuWiXË*³5
Z”:ŒƒÇð‚:HD9ÿxÌÕÜÚ­Åã‚}ÆÂØO1s1Që%óL#³©r5Ît,"sëítMuOõ1µ[ªò23ERË¢Ëê´N+s"Ë´ÁsMÛ´TWc2ÿ´O«rMctQ'3TßtNsFõ†¹lW“õW_5N�}Ñ4[õW§uQÓµTǵM�u1{Øq�øærµ¤•„A×ƵÅ8ƒ,ÈB,¼‚,ÌB,8¶cÇBbKvbWv,\6fgöeO¶b[öeCöcÏ‚h�¶h_61h¶bgve[öj·¶k'6,È-ÌÂlÏÂkßveÏÂ+Ì‚1Ì*,
,y
¬Kp at 9ºL9‘W9º ¹•S9’‡o‘3Söpy��
¬À“79µ7¹¨×9¶g»¶·ú¶o;–wû	ǹœ@
�û·s;¶�9�‹@™:­z·_{¼gzö”{ø†{p໽—{q�»¿_Z®w»À¼¡üÀ<Â'¼Â/<½3¼Ã?<ÄG|«Ë»Ä¿;ÅGüÅW<Ä»øbÞFe�ÎLÿ‰ @À»9ʧ¼Ê«¼

=÷Ü|÷½Ê+=Í7}l¹yØõü�ã|»Ä|ÕS=Õë|Ë;=ׯ|¸Ã|̃}×�=Ù—½Ù“}3�½Ú¯=Û·=°»ý̧=ÜÏ=Ý»ù�kÏ‹Hü¡˜dô×G„Ä
9�ϽÜ×=â'¾â/~â>ã?>ÊÛzä³½ã;ä;}åc>§«½äϺáoþåƒ>å3¾�¹4Ž]É3ÂŇ"êëGÀ„»™3ýæw¾æ‡~Êg>îï>ïO~ãý퓾èç>ïë¾ñ÷>òyòÇ}Óÿë>äz¢ùø^
ƒ1p(ú�sÙºÀàyá¿ò/¿å‹?ø“¿è˽ó›¿ú¯?û·¿û¯ÿÝûµqdZ#»õõÇZúyijw?ØÑþûÿ?@�8�`Aƒ&T¸�aC‡!F”8‘bE‹1fÔ¸‘cG�S„‘‚„Š’$O¸0Ù0—È
+¶*]:`ÀŽ%[•ìXº
5J´¨b„É�ILz”iS§O¡F•:•jU«W±†\*0iÊ
1cÂt	,Y2
û�?¡,’¢#”oD’³�ĪÐÉ£:ÏH)ÅëÒ/òÊäÐ ã¼LrM=q˦ÿ€<ó %Ô(Ì0¹R±$Ǽré‹
¦˜B[AfP`†±q€P`Œ¡ð(MmÁ
P¡üöL²Í9Aý¯S.ßô/Ë/?z0¹;u³sÕWBµ?7G•�TPëÃÔH�Ü<¨¶Ýt­ÍPá$QW4Cµ½òXíµKôÚós¼å:Xi˜Aer)™apié\\²—
6ˆT¤8="®ÖI‘ŒU¢Ye³o¤+KµÕ^boýðNtaõtß7�/Éß”}V}åT“Á_Ÿ,ò¶M]ÐYˆ#Z·ÖøànBƒÔ-¶`
¥U�¤½ö¥b²…N_~ñe˜dÀ †Z�6Ífv­Ý„ÄY¸SÿcÓò!�_Mvâ¢ÕÓyƒö5¶V9†¶^�bàaNS؉öXªÏ³ðãŸ#>˜âŽÖ=Ž8“LZ®ElO—_Îqù¥GM	0 µžšÏ¨[+8©€A=:_¬A4úÖ¿óðŒšDqñ ‰«ÒiÀ	ß:ÖÀ=îÜq��œÙÑ9Ž°K‹Í¹q\yÝyS×ã¬<ieÑfW‚û%eZñe€_z1Çî_†`;Û€„º¡±4\ó<™÷yÌ›©ü!¡Å6uòíoFUÖVycxjþþ}]{¤ª—ýúž×'ÉÉõòœ´ìÒ
¿¹c¿=¿7ëîÌsVè¿ö®áø‰m)p[îPæ"dÿ°âÈÀ
ˆÂœ
 ŒQ‚ú–/Ò¡‹_�Ãë¸/ÀÈ�
þQ=„‹"ÓH9=Ò�ŒgÜØÃæJV.ÒA+£²–ÖC2%‘ÿ`O{Ø#MºyEEyÖ«eˆ4•AæEO’)lâ€éÈ]’ЖÁ
X˜šè¾ãd9FIAÛJ·ctíŒN2Å(ã�ÀX�9c‘ˆOZžOt‡lØ~ô‰BÃ%r|é±ÒFŒÐÏ=ï`
äå‰t9Ë@ñ—7œãÿªù¸û)h1
èBí˜AgK‡Ç$Écä)0€‹à–Œ…ŠÉMŠ!
Bð•dø¬À<•a`(j¸8ÀNåRì.Î/·¤î=QÛÆÆ•w�p,¨z)꡵ò
q
¢Q+[|I®2–׆|àë.ïx¶}ŸÔö·YÒXÃᡪGYן¢Üµ1#XA €[°Cæ(Ç1Èqerl™[®Ž.àÄ’(¥ñ{?Ûã¡b*’òTa^\¨VJÝFW‡Æ}¶PV2fÞdù‹Ð"Y€™5£}ƒæC§ºxº«[±hÉø)='´‡L@
--- NEW FILE ---
GIF89aŸg
ð
²¦
±µ¥¥ª±²«µ±&‰Š%‹”%”Œ%–—4†ˆ5Š”7–‹5–˜)™¢%¢›&¦¦.«± ±§'¶´5¥§3¬´7¶´M‰‹Mœ£E¥©rŽ�}›¡w �z©ª|ÊÍ~ØØxàßyéê€
Y¼e•hP-Ûµj×¾_ÿ–
Ø5`ÚÆW¾}xöí�/Þ¼}÷øÅ_;†­=xlÈô·ž5ëùWà|ó	ÓÝzÙ¬çàƒ
#á1Õ³_5ó™G!}àYžyç…ç!|×ôן{$¾'^Šùµˆ¢‹ù1¨`ƒzç^Ùx§#Œ ÂØ^ó…¤�Dˆ`‘H&©ä’L6¹ß~Géd’ó!ó¤•À`#e~Ó´çŒ7z“�3K®'6vg�5K¹Þ} öH¤�6¶G#„x®è^�Ø }æYh^‡zÆž¡àuX#yvç^ƒ�Ö(i�%†·ã”þéY ~ðacb¥KvY䧘–j*‘Q>¹å©¬™¨xjÿä†ø!(̪á}9Í6äeóK«À+ì°Ä[ê6× «,6ÓLƒ
5(QÑBLlWM7á!ëLwñPp$–TRI¸â–[É"– kɺ춻®$îzb‰'“Ðë‰'�xÒI'¢ˆòH*“`bo*�¤"J*˜Œ‰Á_R°(£@œÊ(O\Ê(«RŠÆ¦¨2Š*ª˜bÊÇŸòɨ¨‚Š))£âòË0ƒŠÌ߀ã²8ßàŒsÎœØ<NÏàôLNÐà]´,C#
9á,MÎÓLCN8LO]õÔá”SÎ-áܲõ×^{½5:å<ƒÎÙf?óL:kG£N4éDãöÜи
�:Ò¨�4îHÿ
5Ëô-�4ÔP3�áÛP“ì6Œ7î¸ãóPãŒ4Ûpc
5ÒÌ3�5ÛL3å�‡.ú褗nú騧¾Mä�k®97ÔÀ®úì«ocÍ4”ÏÃ
7„w.
7ó$KMâÃSÃì5‡ÃŽ€âHz{;4‰¸”œ»n%Ó‹»%é^ïî÷íÚ[ï½ã×+ðù˜¤ïIúS<
Åü~Å‘lŒÉû˜”’J)cÌ¿ÿ¦Ø˜ÇLqŠ�u쀬0+Vö2–Áìe4›*ÀQ³œM6Ë Ñ6xÁ¢5MNkÚРö4ªE
kTCáÔ´6­Ýb·ˆa£qÞâ5Äa4Ô7¹É-zs›4ÿä6ĽEÃo“\Þ–H¸ËŽrã�§hºá±®pÓ G=÷¸lQñ‹³»F7xáŒyl#wÎ03ºa�itcWÓ€�먹ÈÑ1ŠxL\ä–7<cùñ�€¤ “„-e•¨K¶
P€‚[Å!`
Pˆ# Å(�Ù‰U”Âßø†&ÄQLS`Sš`Ù&\¶	›Íœ/+Nq³	‚cá4*8aÿŽM
P BœàÇı‰ž‰L¢p™&‚†NTˆÃeá¬84~Âƒ33'š‹ƒcjKšÓ"Š4‚ž�ÕèÔdÁYÌ‚}¡5ŠŽY¤£]EÇ3f!呖äïÈrIß�f¼£·°…<‚û/§jp­ÑŒj4ÿËh‡;ÔáÃú"l"P3¢º:g +¶ˆ¥Oë|Ô‡ªmÞ¬��EÃÕ`³béÚ�lt£«»\Q½q
ï\õ(ê<þF¸7r£¹AEÀ߸á©uzqR…‡4î
�Ì6«�Ÿ£Æ.ôÁ:6?Èšg—¡½áƒw~£x豿Öâ¯Ï%먩AkiX£t­GWQËŒÕfË;ÈÊO6Š‡€Î
òÜèN·º§î)YÌbœ5ÉH(<ÁÖòôo·�hP
V„@'@,d‘ôX|è
•
ft r\M~-"'�Ø�ö·‡z»'

T÷L› r02.—
VHa¡@
šd
›°sBe
'fb.±puYT Du
PgQGöBäðB°ˆ¯@6]åwè
€C/ÅeÑð T°Ðê€
ó
°`w
l.Â
Âàú ¾À
0‚VÞ
­g:’áÁ<ÌS­×ÚiHÞê#ã
®Öº«ª*®’­åz®èz®íÚ›Úz¦òº$Õêš"‰<†´+ëJ¯ÍÊ«ù꯬¯»Š¯þê­Ýš®Ñüj­ë®"ɬ�S<ø@
 ;»5ª>âjû#k�k¢²$+²!;²&[²(»²'Û²*ë²)³,û²4+³0ÿ‹²�Æ8ï–,Ç“H‹T“ÕÂØBWî
-}´° I8
€¤ö 9
0
#¼‰«s°ã
nºI°Ði¦›,$Ú"µ‰)Ñå­¹««ÒÊ»
«™LÈšZɇ¼©²©Éžlœ¡ìÆœŒÊ›lÊ�l«­¬Ê‘¼$©œÊ¬|É¥ìÊyœ$áf¦‰\¯¾Ü»�üËÁ¼Â\ÌÄ|ÌÃœÌƬÌȼÌÅ�d,I;{HɾŒ¤ðÛ€D’]° ¹
K±ãz‰ÄÝÐÛ0
»¿<ÖáA»)
*ø'g´´¸n[
Ê€Ô€o,°NÍÌÁŒÉSÒÌVÍ*Ñ[Ë ‰ÖsŒ�<úÕ€M¾¶ü½�Ê£|Ë~”’¾;ØÊ<×[×µ*£!K¤D¢Ù¿êÙûÙ¤=Ú¦�˧=*ƃ¤ÇC¥íÛïk-Ck’Û:
MV`9{»V~åÓ(¢×p±„ã:Ë=P-Z²-½À‡<×"
–UÐö°FcÕŒÃÑÍ°ÑÜ`Òq´Ü¼°À•#UÒ°
�8™³ŽÂÍG»°
âÓ€µXÖÀú�Y­%Ò7N&~æ
 ¬¸]"Б†šsµ‹u-ŽÚ"Ó@Ôlzcôc¨fú'ÁJÙ•C8€•ÒŒêiâa¶×€Vö�#€j&ŒzX
½Ü’,h%¨ÖîS5
õ°F½]Ö® {UFœƒmª™À%‚
{u
Ú0ë9ÂÀ�
¾ð~*�µ.[øqVðÎçœvº©«ë–òVáqÅô¬[W<
€§fÕ~jæ£ÎGÉÓ§~Êi²c8žùl›€N­=ÞËŠ½œ"¨ºß–Ø=^äÿØŠ.É»9ØzÜœ
èÈ.ªÿ½…ìÍ–<½Ä‰æ‚Ä›~Îä5;³NþÉA/ËNÊØÔj¨¼iæ"Ÿ$#KæM²ñ=ï«kí«yª‚|Ø‚¾æ>>äB_ô¾ìñÖ
öõ*öÕJöªjö�ŽÌhŸ¾³£s"®R:“¯]ðû#é\óª#ð^
nÂhÒ#nµwÛmôð÷S:
{K
²5Ý4}-½ÏÉ¥ªà¶
|4¹Î:Ö
¹æª©Ç™m”ë¥;è¾ë&ä²Éå{ ³ðgœáf÷|“­›i˜ÃΗy|Yîšn„éæ9ål.§ä�Cˆ@…†Eíüóí¥‡8�EôPËê±¼°ú²±X›Ë¨¡Ö:Š°%%C�µmë
+Ñ(ûˆK‹’â¨&‘
+©£ÒˆÂQ&šœ,®Ê»Šk²¯²û+ΠN[2MËØ"íÉ>³šlMŒÿÜB24¡0+Œ›>Asm¤‹¬j
(=U”²5k²NÓÐҩЫ6S³/À
¥8/“R#,éÞ®HëÆ(Öe²LLSáÖ3×^²f
jÚrî/g¥5ËÎ¥KØEçŽ3.ÏøâéLÆýÄ+4?÷[Ø0¬É×SöÔ/M´±±î‹oÑcµoC¯JöÌdå½ö¯>Û*IÎk–ô=©¿ž5]oí¬ÖAÊIvä—"s»—Ô¤IO…
Zi©µö¶#²@Õm†Ãœ±åºáňz3*¢1G5åC)ˆ>~¡
ÇíX³è�€yL<d
×4lÈ�
‚Ê$3ã÷ú)PÛ
OHÂ3{ƒ‘iF?Ù@Nr¼Q9˜:ƒA
YÌEβ‰Nä¢llÇ0ªçƒð#uC€ÚQš?é!ÀŽÓ|g§
« zj`-4h~)L®ñÕy~vÏÄôUÞØ
æ�±N:&f¹½T¥,Þ‹`7Íg.¯&o…–jJʧJ7‹Ñ{÷%'×8KJCþ(—e)}mFTæJJÙûPç\”¼;–˜«É3ÝŒj»¾ƒš1¹­Þ;wÿc_I†¡DQæ´Tk­#0�7Yé)Y¶ìk0 ¸ÍÚ>@j
û>¤�ò²´g#-Z=¾6�]øK“<¤Á2uÀl
‰h‰‘;k ¤²ˆGT¥*
H©”=«4´£QÓ½-Ó#G’#OŠ<Êë•:!•W£38ž¡8Íã7«ÅJlH‰Œ_9<Ò+<$
½ÁŠ¤Ôó<c
Rj¤Y<½Ø««Ñ«Å›³cŒ$;³½W_t$ÙñF]D¥ ŠZ³µ'0¾Þ¸¥ûâ褼À†þ‘y
2{°¨�°<PQ	�ܽÞQTD$)\¤IHÃ�ø¤¬ì+Ôy<#ª?“—¤�b�ÁB¤üÄKE>QVcºÅ̹IAcªË“EÅÊ@Š«H<ÆqÔÊ?JO¹4¼Á¾h–àSÇ$€‚$@‚v@™&¬¨‰þ€}ÐLØà~ØФ€s €~؇sàÔÔÌÐDM~àL~XØìÌs8ÍìÔTÍÕ¤MÖÜÍÓôMÿÍlÍÚÔMݬÍÝÄMЬÍÔdM~~0‡Õ\ÍÏäMÍ
M›,û)•Ö“ÊNû»ø<иL”2JÆT´<N¼£LF�,M	¼e¬Àl4µlÏ8<º"5¡j�ÄL.ʦZsk‘L¶¬LgY
ÌÍÎ\RàôMÎMÎ\Í\
ˆÍu€Ò&­€q
 SÍDNÿ~‡‡ÛìLÀÍÓÓs¨
d©IÚ)�Ãì«Ãt;™ä%¼¤E¯tÝœ<ÐJÄUðd¶$V³rƳcÔK•Ëä�#33R‚VR4V¾Ef$P5ŠÐ»ô=ƒ¢xÕRÜhÇ„˜LšETmúQYc3i¨¿}ÕWkxùƒx°~åW}Ux Øú3X}eØ…­¿�…™…
Xÿ��X�=Ø�EØŒU‡‹•?6#ØøûX„µk�?…-ØŠb˜
’�!	x�—]ŒÉ¹$JÕšM�™ÅÙ,K³“³ƒÙÅøY†Ú6šˆü
žUiù²¡Í2ÞAÚ–õ#ŸÕ¦ÚŸ
X�ÏÒI´0‚DL�UYìÖe},a�
œèËê�,¿ê
#bLvÍ
$8¾—BÜß1]ÔÀZ’"+
�ŒÖ-ŠÔmÝÙ¥©Ý©pÝ"Ã!ÿ�|ÝÓ½]Ý•;ÛÍÖ•ÝÝÍ]ÔÅÝã=Þ<¹IäÞ×ýÝ$Þç�^éÕÞÚMÞõ]äíÞ�À^ðåä5ÝðMÞÚý
;ºÞï…Þ÷mÞ©ˆßèå^¾Aߤ¼¯µ¤å1µå²–x³Td•¢T$¼S…3Ë�’šÌÑFí£ð©ÕRnTŒÇ¿½QÏj¬ì=e¼ݼ¶õ
Òr
И\4šÆÞÓ«j5ËýŒ¾ÂJêÈItáh^»  Ý[Ó
Þp­›=×Iú»…¥Ü%fbµTb$nâ(–â)¦â*Έ}ÕRä�Ñá×pž¾Y–rÄP½­O?4ÿOQVQ-Õýe£j­=½Í[iÝ;¬¤DSªFÎ�ϵ}ÑKe½H<ª4&Å¥Vê
GÁ¹Åq¥J`¢+ãQ=EvÔÅóHæÎϱ¼^žœh¡pŸeª–vM‚'0!Ö_Á´ãÄÕ6ÞÈöÞ�b%`o•Û¨êÔu
Ä5Ug=ܾ=ÁåÁ4[䉓»À;IñÛHÖãTb!¼ùžG¦²”áeýek,¬µDÝ›ÊW¦<L2GÃY½,îNb¬48†%9ÛOÒ‰ÅV
³/^ä\\=ÐzÜ.~,dµÛ.[íf½ÔgÆàJÔžöœåbjæ­”aÅš4‘„–Y[×j9PÖµ×5ÿdUg¢õã]]ã_¢T«Œaå9¤`dà
†feùUõDK¿|Ü8vIÃ.Re5Öhžà®Íʱ}3:rŒ€H]EþVÍ�VÐÓÏ5Þg=N–¦Ëc]`PühI¼a|~ÅžÖÔ’°Ü6ѼÒ,µhTÁ*6JaY~KWå»®ôéSBgZ%ëŽ.</³fG^	jZÌ…–Ÿ!}‚ùù�ú	Š[­ÏÀ8éc.½_NÑ)yê2ÞÈH±]Ögæ±³±×ËEåé·eÑL
E+–d—î´t&iÖ¬³\²ÝEs½Ñæ©“dQÖ‰~ȳáÍqµ�à^ZjmEi²5Ç�Nà‘îi®ªzÞÉÿÊ^Æ’\ŒLb«p<åÈò¼Xfe^†êÌ;dŒèÅ›î•ÍÎìRÛéIºÉ½\=(ñŠ†â&ShOŽëPÎ5!v‰làYÌ9éÒiEqæ®L«ÇI«¦
�œ+­Ú%JñfWœí㆒Y5з\E±Ë¶J$»*æP¥¤ó¾@¶eí¾ã]lRÍe2¾óGy.ÐrfÛµ=eºubC‘ÐjÆ´§a
/šoÂ$4e<Ã6l	ö\¸NPŽÌÑÍÙÍEêÆƼ$Oï/ÁÜ.io»Êo"ß“Ò^jGÚëÿfí¿ñÆ·àãIU‰Â–é§6“o<¶FÅç[dNæ¬6ë’6¼µ.pä�îü¦d½€ï hÉoÐîG«êÓ°q¥6W!7ÖK=@VØ{ãÃ+´¶;¯ìà¬Àn`Ví¬ÆÄWë¨.”r•«yÜ	´îKµ†Ü_�J�.E4·žÉ˜uHGîÈjulHè‹x!Í�Qî
QÉwôyfVÓ×·lS^fDªàdq×[ýõo¼«*Ï4ôdê�iDžsõV樜%LgæuŽugî£úFwi§á®ÉiFqFdp]FG£rxç£MðöÌuw¶ÔÂrpwþóaŒÔpW<[´Ȇóÿh^pƒ‡[oÕæxïk?eëÖu8S¼Óq5@à�ìçîlçþˆtõî'Ï�ÝpÇ{ÚÝfœ‚�33ÃkjÖaã!•ËJ*˜”½‰÷êf'¬S¥!ârþ�d{×J¥¼ËÀÍrZguBB,GDÆV­w0Çø#^qªŸFÁK®„ê2'äÆx·‹LäiN·%.–<B�OÂÌxj•Vgç¾=¾nêÅr¼ÊƳUw�&{sì¿ÇIm¶¿FÇjœJVnUÉIÚ~ª"�÷µ“pØèaáûd܈òbÇóÇ2jΨ…û
ÕñZú¿²öQ«4zÇø¿%¦³f”-¯l=§´ŠÏK§ÆÿWr}ËJK&÷püÞ2Ç3ʼ%|Šk�×#×oñBö¬da‹wã
oþýÌH£þãžÆ;?gÊUB*uvžñé'–YEûÒ·þÕWróÉþb¤c‘âòï\g_G"ÔR·ËwLQ–ò™6âÉž4;ˆk¼¶MàAƒlx
›Ã‚	
„qbD‡rÜè±`¶�!n™ñäE†;.̶Ò$ʘ''†Üf¦L‡®Ø3§Á�}„ˆ$Pž:‘Ƥxí¨J¥,…JD(tcR†Ý*64	õéR�_³¤Jt¨Y²@±jÌs"ÄmccŽü	”ª\–1ov-Hu'¶„�Çÿ:åªpƆնe1°ÊšQ;J6XìCÌ>5Öœ{òrΣ^2ÎËô4Ô´‰¥2†lrÄ×WT¬¹©ÒƒØ¦]£fm
äw”†5^ŸŽuÚ�x»¢Dël±êQu6—ë«ár&n¢ª›myÖ¾Và”#IV‚ܲ…«¾BE¨b¤¢£•OB*nˆ�ØÞA
¯ùæ6q
W'�O(¡…
P& 
‘°�
| (ÁÐ!¼`	RÁ
:0‚áà1ABPƒÌ cBÂv„Y™`ÕÂBº0†lˆ9H¢Ð�0,aoøA!Ö„ü
¸Ã¤ü°†=ô O’à ú0ƒ$â
�h@1'K"y˜BÊЊ6#7¨B^‘‹P\ãaXD3ª1Š%táQ"Ç*¾��]Lb÷ÈÅ%â‘ŠB¼#јÈCv‘‘ƒ4£ɨG6N2"ÇU5šQ�nÀî›qæ$œPŠR”P(%*S©ÊU²R•§ÿl%,c)ËYÒ²–¶¼%.s‰ÊWê²—sâ¥/)LW&á”P ˜1…“ÌdS™ÍlåŽðLgS8MåŽI§mn³NÄ�‚6AùMe’’š«S�ª9̉ÑIšìŒfq¢©Mtv³žkÂûF9âÀ/”¼|@
ºÍj¢óÇ<š€Olró »&ÅŠùJpî’¢¬„?KiÌt3¢…ÂÞ—Ïy²ó�Üœ&J�™Ò•6s™¦œæ+£IJuÊR�Õ,gqœ Ó�v”¥£$2�P$(“—µ'R5ºJ£.õœ'¥'T‘ÕRö³œ
&V³ªÕ­rµ—4�%M¿
Kœæ§]=+ÿZÓªÖµ²µ­ne+8�`„%4Ác0‚Ê`ƒ!®Å”Q�€Q( �8FpÂaáw)VšH˜Ba‘ð¾ªNv±DÍÂa›€$œ’
BH‚�`…#ˆv›†íç^Á¹YÉR�°T ê`«S$H�°H�+üNù+ìU
î›H‹9[Ãbô¶F¸Â_[…ÉZ
~Åô$l¥)Øf†ÔN}ìa£€Ñ#\¡¯P0BpM¢Za³QPB …¤wÒ|¥A›�^24a
ÐlÌÐ×¾ô˜Ä‰‚f�Ð0@³ Ũ¢ ù)´	m즠O;%A
Rx‚ˆjÊ÷Já½ÃŽ4­ÿ°„.ÃØð7œÀlØÃþ 7®áoôâÂàF6xƒ
ˆ`#Ç!ñ†‹±á�j£Â
a®8lpÇ°€/h
Û…ýn}ÀÞ%á˜H`¼ðƒ,€
ôf@ „-0€	Lx‚
„àï³3Aå^À²þ!ÿ@
vCó	À<ÔîÝ^5 ß<¼ 
˜ül–2¶�(ÿc;&£1¦£3
£ø›,†Ò»GF½[+N˜ÏáU>ÚÜ»-
821^cƒi£<‚£<¾#=&£AÒ•4Rä1ŠcÇac<˜c;~äD$7£Î‰ã,¤;íÔ±­¡K¾ä–!LÎ$MÖ¤MÚä!‚˜³-b)ñä'±’OÖ’sy¡@ºbq´ä*å*ÁÓQÒ)!¥Rµ’X¡ ý¤Nr“HåT*!eDݤ,Aå,)eN�%+U%U5%&%MeW®YÖQZ%Z¢ÒNz¥]Þ¥Z…'â%_ö¥_þ%`¦`&a¦a&bÒRKBeVÎIB!�p€™6<–ñf^™ffÿ&gn¦gv&h~¦h†&iŽ¦i–&jž¦j¦&k®¦k¶&l¾¦lÆ&mΦmÖ&nÞ¦næ&oî¦oö&pþ¦p'q§q'r§r&'s.§s6't>§tF'uN§u§U7
*Ñ}î§m’*ÑA¬	Š¾~æ�Žh	ÙÄš´NþÕŒþÕèŒêß&MßÉHM£øç0	– Žöx§lÿJ¶©‘&©¿(i‘.©“¾HÙ KÙ é“Riþ%aëd©Xä�Od©ŠeC7l™Æ$…6x0°É	~ZÙÎLƒ5d&©˜‚ª˜ˆ:Q›`CŒþG~h~^Ú�Úç}6{ºÉCTY•áioLÃ¥]š…R(…fh6 _¤FêáϤ֧Eé@¤ègþiòîÉÎø

ž§5dƒþè
ªjþœ*úùE7ÔÇSä—‚N@®iƒxŠ©˜JëĆiô	•6)±«±VH–ê_ëtƒ–Bi–F¦ø£m7Œª:¶f«¶n+·v«³tʉ
„rHŒc&ÁqäÉ€¦HB%´k%,ÿ‚$H‚%LÂ$H$X‚»R‚»V¾î+¾ö«¿ò«%¬'¬$ø�\À¸€(x‚$xĦÄz‚(HlÄ’Â)ØÀT
ÞN¬ÃŽÁ.ºÔj›t_N\D´B$DB"T%è«»NB#@Â"äkÀ&oÀþëÀ6¯ó>oÁ,&LìÄJl'Œ¬'|¬ÈÂP€€Â*”ìË’¬*¤Ê–‚Ë®¬Ì®ìÌ¢ïÌêìÎÆïÐî,Ð
íЭÑmЂCÑ&mÖfmÒ°
@

L³ÌC/èƒ/<À5à^ç*
ÀÿB>ôÏH4¨x¬GþxŸíJƒDÌ©Ê
\$ì�€ŒÂ¬6xB%DB¬vDB*ä
s4‚$<B€(\r*cB(Kr

î2<ƒâæCÑÃ:XÃÑߎ7ƒí1ôNK3lšYêSdC§mƒ=¼´4ì�í9µ:C26870Ã<¸3ÐœQÃSOƒ>x_7P™­O™|±JÈHLš54>à3PYŠuC=pYï!h£mšyCá[½éî7èÿ/H50ƒ=pƒéƘ38CîI3xõ�zCŠáÃÿ­à<tŽÑé<´`7øŸ×û‚Ü/Ý÷FÍð50Z¾)ß÷z|¸ú}þ<ø�uK~„gOøµKE`C5¼
‚¿ë$`#$ÀÆ1Á2±7{»Z»$Ðk'`‚(<Â!\Bõ’ �Âõ‚2Ä,õvÂ*4‚(�»*�Â#€Â)¤{Ŧ@Œ*•Š©R«@™B¥ÉT(SšX¥Zåé”*S7…BÅŠÔªR¡BqBŽ'p#Å¡WR–,p²¾�ûf¥È“/

ðz"á
éÇ¿ì-°�ì 5‚£1_8*l×:Þwç© QˆE$⇘D#*‰Ktb¡ÈD)>1uÕ
Q–‚¶¡0�É	I0ÓŒ�¦ï4ÍU
‘ˆòu�jWÖ F
_ù¢ª�sï}ñ›*±ÿ=j¾Ê£o~
Œ¼Þ6Ÿóðm9Ö»ÔQ÷�µcQvœ*þFWÂÕ�pëea
t¿Þ…ÿÉ©m\Ñ:UÉ„4¥±é«—‹œ±�y 
°1@É�¥5c
@=vLUþM
Õ(*°Û(¯ÚŒíF¸Kòxd�¸#û~ï·è­öª½Þ-Ø2Lú’Ïq/Â^e£Œ±Vbq÷ÿê‹Q‚„ûž/Š<Eó®­ßb¦oæm¡Ä%eÄÁZ
¼~à:ÑùîíÍ1—QaGZ@á毋žÀá nM:‹â\La¨Y„�Í.	q
qQ�8nðw!
-dé¤
›
ƒÇFètßT¡ÊË
Oѱ»€‡ôr2݉ó†§L�s©vçgä4ž
‹`O9—3±
6½­Qy�¹‹Î/ÂØôò<qdŒ
?õX¼s¢lTÅ3U9OPRŠVŽ³DÀTwt“MñV3
½^ýþ%Q‡ŠU“3TãtŸˆ•N}­S'³žh	Dÿ²hΓL’
ô¢‘W1ußJ3¼¨M¦¢ïý†œ˜k8&£‹­åg$c ¬
ãmߥxˆ“ž¾ÖSOª8-u:ÿÙ‘¥
k¶Cˆ�.ñ;æõ¶Dn|‘óqÏiÁR'lUõo‰u:õ–÷”½ÿ
/qpxA¼æo€Áx
“»¤ê}ŒãnRcê‘aê½�³´
XƒèßÑCÜJ20i°ÈH·àÃæ¹ïÿ|Žïvá³>Ë”4Æpºéoom~#{€>Ev£êOãÅýU€¸ã~GcžÌ�I„8bž8¤#~Gqx�“sÃ_ϵLgxþrók9DÒ˜©‘è¡´X4|A<rc0×\9´ƒ8R×°Ãñ5fxï€zƒ“7'~´o;®z;äɈ»‹MºÓM5㶌e±m‹x»[Ï]ÑßVs‚+÷‚›¡	þ�¾¤¥¸üMO»;Ï͆�è›
¢_—¾Õo6Ÿ8}
›?¦
“áNj
b›v�Ú¶
L’X½úD‰–
Õ&ž¤6@êQƒð
õh†%xÒŒö©fÐ…îFÚz� ruDa|¾y¶©AžÂªRCÂdcMt5–:©p¿¹X Œýqw†¶	ÜŒÝGZL¹ÑÇì®=ÿ	쉼˜ÓK§žD²í]zÒX¡¬¨9 ¬’j-¸GUznŠì’hbŒcÍgilã2Ønwƺ+l½Å™(nP¡ÆÊ*I¼†¦S³Q´c�Uý˜ÄFü0
ÜàÝw@†�~| ×WAöo~ ìà=8Àªo…)D!ü¸A
nÐcóp†÷6Ô�ZeG>�[Ø‹¾V;ø´Í;®£Õ¤ÄÓ
H>‰ÐKþõ:‚õ.\ÁÛÐ帶ÿ²çq+1–WN×,Ø™�9h<V÷6�¡fYÖÒ�èì˜D‹ð‹w8ñ‰£�›I%owÛñ† æª_5NU at q_Exä#Š%¡z͹�Mbˆ|§Tšäd-™�NŠ’4�<Ø(OéÉ@ò攚%JP©)Tº2l¤ä£'YyËÕ�*”µ”e+{ùË?–ò•¹ää.�iÊ\SC²T&¨˜iËW“˜Í„wNgnɱm‹,�‡Ž‚Èh²¨4RP‚¸6#øì±xœ£W&³6È-f�#´K—!W"ºý®›€”›ç|÷;öÈtýd›-«sN%Þ±rJDWÁf’Ï	1no®«Q:G'*7ÿN�UÔ§hÙ<…DOzHÀX%·™Ä‡¢&£
bjZ:PIÎ`öj©~�· ˜ÂˆlþÊE‹%Ï2ÆT§˜j(AUÅ¢à¬3 :
ÛFYÑDjÔFoTŽò®™œ8«DgT›æ:§ÇÌ©ô"ÖJc÷I¡®”(R×Nq“`SChPµˆÄ^¡(yý”'!‹ˆÔÖ�®¢“c<�uÏ묓sCâ[	»O±ë=eågñn7Ï¢|ä#N�
5Fš'X	”$N5‡�¹«�»;Œ<º®�¸Ö6mt›‚¬™PÇÝÕmX4êu@ÕÑÝR›`\rÒ©·Ç²s¡ÁW²0k¢okÿUÌ,A¤;âzñ`£sªi\º´‰SaàïaÁ˜7)6QRé-^õ©/Ⱦ”¡Uµî¬¸;EÛÕ6^VËÍEwú–µ½¸›-fáà©ØŸWÓÎ~'×ßRG¹3aMg£ZÑ>!	HBÆrZãøq¨Ôšh<ÅÈßê®XjkÞ¦†XþŽ÷c¯Y'rÓX¦bVCâêbךYñÔ 7‰‰{2Å9cµ¨»Ê'cè
e�ÖL›}ß•6¾ÎÓCÒýiZOó`Ü¥v¢£‘•å«ZßZTvº1oG`¬¥–rÆë­8ƒ‹S„èîÉÐm.Jï©ßÞر
IJ×cDZnm¯V­ÿ	TeCä:Ó.b‘íU(Y/t¥ù§Zî��™|©´•µ›fF³,ÜrIX`ˆ—�!Šj°…“­«Ùí_›È®tªä¦cÖ3뀼ÔyþQ•hŽ½ÀJlž¶ÄîÕ9Éxë�F;ÇS]µÕÔU}js¬¹ÕÖt{ý^cZ•n¦öeÕhYòZÒuÿio¹ãû[‘͆ûVµ¦ýÆr#ûË1.j³»e”guäÆÃ{ø0\i«@�zB2m¨*jËu:�¯vã©Žêï¾kr69ì‘œ�”YÛ5¬bV•­[ä»÷×_Ý88Yîãjoµ°M�liªVë«F6ÊXîš¡9ÃhÅ–ùt÷®é„ÿ]Ç��fœ¶érr¸×í[™£®¾@=Ñ°Á]uô
%ó¦Ë©r£Üî3�ªi0ÇìÖ¡]·WÍsk‹=÷Ð3Ý\».òØÜky�¾4]°±ÜÜ*?¿qW³whUë*_‚ÄC‘^qq÷³àÚú|£™Ï¦O7åqt«¸w(ªH—å+ç:ÓEŒ©/Ç^›TÈ�œä«–ôÆ—y7‡®ñÝ¿ù»“îÌEñ˜#)=1…'á˜>¼µ×ˆÿwê•;‰äP7¶l‚õtž¦6¹Å8èU¶Iã6Á¶|ó¤iä’M©÷y@VUø†uSq‡r§£oÑFG:ö-±76ÇW*.•TüÁ€,âvGV/˜hC<x4yE*lwƒŸÄv9q�G”}Ê'€}tT–rD&‚\úö´×�òWo·;m4‚÷bQpc}×%YÌ%wsÄ`4¥yÍÒ­
xR!xc[¡1µñOz>uE1EkY4wa¶EE�‡d²Åyû6’gnÌGw0„ät×…uWHx(†�˜gÈ€žç{CVy1<Šµm?6_Ÿ#`Qèe{XjH•:æÞ&ÿa×'ŠÆÅ;·U7…};§sJ…WÃEuZ“‚…^üÖ� Â6Êæ‹á’P”‚û†zOrRgqt]”|?ö0¬‘†S‘@Òp/Å6Ù6p˜8b6("Þ5†…HDšx‰t†ŒÇø�?gnß÷
á"£ç+@ˆ°õ`Âwm¤§Sï×8ü¢U†¸k¥j3H_âÇrCè~°Uƒ†(fWƒdAÅ~w(Wv9fjdE»è�hÔUs7^¯W	GLsžè‚‹÷rb5*ÙŠ)Y‘µÓj͘ryå�Ÿ8YZ#ŒGK–g7®Xˆ+yaóP
kHZBâ5xlÛåŽ,ç�"i�­èfu¨ÿ}UY-éV“¤¶F#w“õx.tHs—(Š&ŽVÖ;çQ[ÙVwªøZ4v^aøªG‘?ÙV
ªTW‰¡Jª¿Wª§Šÿª©ªª«Êª­êª¯
«±*�â1¹MP1Gð#O& BÀLÐZÁ\P¬JÐÆZ¬Ë¬Æê¬Ëú¬ÏÚ¬ÁʬÕ­ÐJ­×:­Û$Ùj­ßÊȪê¬Øª­ß:­Òj®ÞÊ­êZ®çú®Jð®ìª¬×j¯Þê¬ò
­JÐúz¯ñÚã
®øz¬Æªëú¯®]€°
¯û°í¬üª¯éÚ°+±{¬ÛJ±Üz°Íªû±óz°;¯	¯ÈZ¯K ¬ë°k­«°Ù²LЯ‹­‹³8;¯±õ:±Û³èJ´áʬ(›³/«­@´Ë´Gë³/Ûÿ­E±ìº®û´B«´3‹´îª²:;³<›´CK¶W{¬
µÑ°ä
¶eÛ¶Vë²?û¶÷
²k‹®O²ýj¬»´oë±T›·þ:¶9›µV+­x˵[+¶&+¸åÚ]ÐBPB¹V𨒄¹™«¹›Ë¹�빟º¡+º£Kº¥kº§‹º©«º«Ëºƒ'=³"
W!ZG𨗋»V�»¶k»?r»Žê»WÑ»°K¼f¼®+º—{¼–6xMл³K1¢%½’”»Ì½
½"ºa’”½Ü«»¡%Z³;»º:½–¶½Ç»½Ö»«ÄK1ºú#§½W
½—û¼Àû¨Ù;»OpP ÿ«#
ð‹¾úK¼î‹¹ÆP`H ú'¾½â+¢Á<ÁL1Pàÿ»¿ZŒ«²+¿™Û½PðÁ!,¿%LÁLÁCx
œ¾¶ë¨¶«¿—;xäû#S ÃB at x¶ÛáÛÃò‹üKÂ
‡«OðÁ),ÁÌÀ¬ÂœÄìÁ¬雿ƒçÂO
œÅ¢¼dÐBÐÍ°l¼Ú«©¼Ëœœ
!´ðA'¼PÃ+ìpC91DA4ñCG<QÅKlqEY”1Fa´ñEg¼QÇkìqGyÔQ="‰ì‡ó¶ðáí˜Ho
¸÷~|òË7ÿ|ôÏÀ|
T˜‚Ÿ¨`*zPƒ‚à`(CM!Tˆƒæh('8!…f´¡%GÁ!r€”á
šÎçµk(

uÅRÜþ6
iP
´ ](BÁ!Žo4—¡Òeè76zÝ“~ô¤á
ᆚ¦õ@�‹
U4ÕUè78Q
î=÷³®@û‹Žvt£¨Ðµ®KÒ“‚T¤)%ÇJOzÒ[¬w½0Í){�ÍÞw@ûÑžvOï{m§6UÛNÍv4  ÁHÃâž5¦!ã wiSÒØ 
¼ÀäDç;ÝI
 û¶§
QˆÿϹ'
„ŒÊ¿ñ3€o1’…�Ú�)"
‡X¸@
–C4˜ñy�
$
Øp¨Œ²®o°Àþ‹?ë‰s8)ëá?ø1

à?‹„NX.$‡æâ„ûá®÷™…ðB1b)„—#�$€MD£Lh©šª©õz‡"`>
pÐøy�M0o5È0ª
KY€}9N©�xKH„XÈïq�€„Jˆá£"pt�K¸?Ÿ
¤€àO¦Ð’&sÜQX…OPOÛ
VX'LÿPï1R0§<0Wõ¬€<
šŠ)åN‡•à
ªt€nö2ÙhØIkª†^ÂZHª%äÁ:
0kà…e
@„R8à„Vè_†rØ¡‡RØ_
$ÀÌ4†%ÅžK'‰w‘uȵ¸â‹,Šô�9Ù8£Ž9Õt#Œ5ºÈãeÛ`£5Z]CMW_�O ñÃ
@¯Ý¨ºÿË�΀4BÍÜ34«Þ
¿º Ñ‹U5ï]ß|L)l<ÁÓS_½õ×cŸ½öÛc“µ	]·Ñþmðê•Þùæ»Îþø飿>uòßþüö×ÿ>ýÜáÏuFeÃ*r™ÈšÔ¤“MI UºàÒ�,ÏÖ`ÿ•P¶±‹
xÍÓ FãìÁ'Ã=Šî�Và×\ƒ¼À<œa'<̓Û˜†ã\%�
H㻨†åvãªú€F¨a9ZÕ£½˜Ç
ó˜àS&1ÿƒ‰Ìg.³˜ÌL¦4³â¬`.YÙ
Ö¼22'=Á([Ï®¡Æ«¼En|ÑÌrF�
ò¬6ö ã-3�Ïñ¢ÞØŠ/¼Q
.eƒ2Ó�—¼t_à%Q½h##·nDÎ
¼Ë]£Èd.ΨÆVꔤD²çS»ØÍc²aÇâ& ’ê7êdgäÞ˜á4ªa�µH4
µLÛX�=nÔŸ!óÅ\d-bù‚.œÖAZú²k\T¢�A7PÃÌòH%z£<j0sÇ-ÜUEšÎÁª/;FVò)ïã˜XÝV
�9ë-ëú,­þ¯vM_¿¥×¬îµ—P©%ÁZ‡ÿÖò„Kc
,cëz“
æ1·õÃQÁrJÖJV¥0&qqSÀ#ay�Õ]rc*Ñíá�«gY^¾Ìþîqü;PÆJËÕ¾/äšô¤‚[îqúÑX•÷’ŠP4¾šç±9ÈwžrëéÕÊÈ˹ôÅp«Ï~¯¤þ,Ùñ§;=êMŸ:È¡.âãiØ�C™,“x„Ë’Ó-Xž–B–J¬LÃpÎX
‚Ò¿™œÄPV`&R XS’P“<‰8M	9UÇfù[^ Ú±�æýÐOØC
Ì1�„¿ [ãŽTË~#øhIyèÒ¿Ñ–©{”�œ¡’ãÜHz°°ù%di"äij’;ºÏÒõÏ®ãZÑϤ,iœ4éÎÿ2Ò#;>؉µ&¼`#›P•‰þ½£u”NF$\ˆE[Ec3ñ³Øc7–ãF<c6=’eUØÉYwRäؽÏ8 at ha/èêh‘9øB/xÃñ�
F
Çs ß<ð‚d¼3”%ÊÙƒ}SªSÚ™|ŒMªXNJÖQ™%Pæ…�ªØƒ?ý�kÉ�
�¬�7К>×ZèY—Øâxƒ0\N¤éÃ.Dš™¨…伇]¤mdŽkù‚>$Õ=ÇZtÉzJÊ<ôWn†DÕ—3øƺô›³Ì”ÿ.2ƒkiƒ”"=<Ê.4@€vbææp.g1†`²€ 6ÎË�í鈙¨ý]Õœä�šÕ$M“-ý¦À9ç=M(ÌÕê	g0dëÐËɦ¢"c–p#>^Gqfjt†�ê�™)©B&ÀÅé›úX¥ºÈ饦àa:Œ½äH�íH­âj�ä*^ç^4¤
=‰›±]�¶Ç[УA•>0ƒ RÃиFWhJÙÃÝâ4CÌ©yÛ;ÑI™üHâ�•öÛÿ8MÜ
T
ÄËäIÎÌ“'bЫØCÖ˜§ãè‰|(W|4Î<<MqCñMN¬Ð‰QµEžÊ@0C@C—ÌPr¿º�áÃØ	Ì°€JÃÀÚ¬9C=t	Þ˜—
5ÔJ¥l�õS6dŽ¥ž§Ð‘/ÔC¬ÜMÚ]›
•ž4Ìo—8bòΓ>°­iŠYΙâ`¶G— À<„&0Ç]$
*&h
Vb-f@Úqæ¦Ù¾fižqJgá’K6É6]C7u]@
Yðà)eV’ÀG=Ǹ¼Œ¢!�ÖªŠòüSÈHÍ(ÑiUCR	Céy‰Bb�<
uÇÿh�>˜ä>]×Gz‰/ðÂn
3ôÄ�e5ØQ=¸'{=%‡>Û´yP)‘=|Ž™qñ–ë�Í�֮˧¼âLУ´K�šV/ôÅòP×ô)Ûx©EéµQß©`´E7üYÿÖ|‘Ìú² Ýda”NÎoÔ\nèÓS
†IA—¢¬…™äSEÝŠF-A1»d
j=Ô‰ÿÕh
0ƒ;àÃØ`—GKµÔs3ÀQƒR�
¦TG†
†



#­Ã5°K]›à‹3õ¹‹¿#Tw>Ú²æ¶GòäwîÊQê¯;�x²éؽ\8ÿ­ÿý¡¸][Ïj÷ÀÒPIŽs�ë®ð.AL¤±.ÜA¸–Öbš·9ÑÝ
+›?|«znò™›eÉK
èñj{Äæ&¬›²A”MÀÏ÷_zù¢�Tfç¢øÝÒ	¾O^L}ÕOµF�­÷Ô[åä�ÒßÔ\}+k¨yl¯ØÜu]:áÅeKSg/5½ßÑ•O6y¶d[Þk=“–·¼B‡ÌµØ¬Ç–ö×Pu‹î骗3hYÿ7öP/ß>qÏnvkËU×Ûb³uŸû×�õÕ}¾™ÖñÆÀ¹fzó£_¨xõ½Ü™Æ+ÛPÚÂ„ %è	Jxû,†�’1ƒiô Ò�Tr¤¯!€%T‹=~�!n$@ ó˜…î!

luáÖ¶ÈÍöDaTÆ*è0ˆ%ÁA*ß•,ò—¿Ø¥d$ÆhÑ€�)m͘º`äŒ#V¨i�42™TÑW|Ñ
ÙP´ •ÄÿImšF5|R
DJI
Nê±€Îcó¨ÅæQj@×hk‡ÆÇŒmuë,L«ã=Å’4=÷4§^³ËT>fú"Õþ¢WÍæÍÒ+[ÙŠcdU<a”–ùéìA!ÐxšÓ~Í/ƒwMaÏ=öÄ_—5P¶„R˜ß2àóŽ'j®8ÓT ¹„Ëp¦–õæ1Õ'»Õª'�°éÞ¹îWÌçIS[¥Š­6cÛºà^ÔY’¥d5;ÊÏ0@mè“ð„ˆVƒ0€³ˆ¨Wš^8C‡Ò°Ç2˜Ñ
fTƒC±‡Žx±
od÷;ŠÒG6æ&#º‰QGÿ[±G—*ÄMÎÃ5{ÚŸê¢kÊÈßf

¡#ñb
#™Vz‡›Þtÿ®ÛûÛ·D{Îîó­möì9ˇ“Á†p¶S-m÷ÎV¸ôB©1߇aÐœß6’šÛ±#JLy)[gBÖÂÞi!\iÕ¤ð
$_LIO
âF„ºÑ‹ÂU¨¿gR8“V.ˆ7QHMs±¢£äB"ÕX™Lzá
ðÅ:‚£Î� ÚÍg‚
ðwf¨  d
‘„®¨°c¢­8Б’0	+‚‘Èr.‚˜
g 
øH•ë|R¯8p‹ŸÎÍ;²�zR±¶†m÷‚ïœãùj»î#÷0c5^q9bgƒ‰N^�©ÏV€« N#Ñê¥]<�8bGô�ö@ñpÅ9x+ö’ÿ‡a-~ÂåÏž’i^®CÝÜ"û"iûÞ-A˜`j¢0ô«B–MQlPoF�àd
i�²"�DÀJr
ÈÄb¦(ÄÆÆð

Ŭ|0)úÍ,0

®tD
‰d
@ÆÆtÄnâ„
§ˆ¨M¡K]ôX�¨±ˆÅÐ"ˆn¢#Z¢
mJ¶$f"îâ¥Kª×-¦„^bƒÐÔ-¾"z-ú. úú£5z÷Ö¸’ÝK_£C·
¹t å–HË_;í›®Ë<’ñجE{ùµª]…š’
VØS^A‰<B‰8Ûò”ÓÜhyÚÐxYÔ±:i€”W*cܸc$™ ÏiAï%‰¯£“�è8³¼3ôØÕ§eÉ_ÊQ—�ÎÀùõóøx20CM…Ÿ ÞXXB(¤fÿÑ
\”�	µ²±ƒñ¼`s帊Kσ+•½åÔ—�ÚœE{íeb[�¾ÙüÎiOù|0
ú¯-…÷±ÅÅ™)Ä>B¤4
+-pï]ó�™\ºùPÙ#}ÝÓö#t6ÙÎí
}®»�C;µë?©Û«þT6|åJ|·ZàÇ•AßzõK®=«•
Fõìsf•Šv’'¬GE§]ǾãB®éW_>‹áÉQ.Pvª‰ëb%뙚u®ËÃV»–��S«öà¡ëŽ;ØL|Âi:¯;¿ã¢/&ûZÖ‚ †Cù‘°ñKŠ ¨ó®
ÏjÁ
	¥‘RòX£’?åŽLb‰c‘3¢¸Y6›	s^yã�—iÉ
7Xš„í�o{9g™†Ù™·žtøáÆg~ç�—Yt�=‡ÚkiÈ× …1Ú§ Ë©é—£�ò'—��Ò¦'uw¹Gè¢ûáæ]u¢ê¶ghöMj¥¥.
XhœþÉjnˆ^–ª©„Éêª\ܶš~‡�§&¥é½y
5–
x¬�&謃C %jñIª)œ¤F†­µÜvë-}ßZ‡í¶á–kî¹èªù«·ä¦ë.z¹¢¶í­ÿÈÕkì]Š{ߪ¯‚¦Ø¡{êÙ]xÄ™[­x†Žš¹òÁ·ÞœÝÕúžµÌ­kirÁ†(p¯Zª§À¦a¾×
«f¬›FÖÚ¥ûjÚj¤ïº|±Å˜úWò~{µìt´&\o®«á…
€HÍ6&¸`‚H ñC„j×6S[Võ{öe¶½Üòv+×
z)\Â
'™ñam„uñŒß.è®<1X6U
!8Ãð�‰g,âÀ.85ë
{KÓ„V$6¬U¬}
TÛÍ&®Å°­=›£ 
Ÿs0G=‰´”oµAñe«�7\Éx˜<@q‡SˆÊ£¤Dh?3ÂÉÿ‹,N'&Ç
‘Ž:lYqF°Åüæw�ª\à Y°Ùu-;ЗµÌV?-&Ñv“_¯RI—¡lo kÜ÷Ä(˜¯iÊ=˜Â™ñ×@:ÑðnXÄ¡"shGÞKohê 
…FJx�ÑŽ{ (
Ê"+@ÊÚ³²—„#<j‹ëd-	³+ö‹/¨ã%w)*Ì¥Žg¢+[œì±q.~„;ç_”Çúñr3<¥™ÃBü<ò“å‚ã2õÉvõk2Û\幂	¼\fÌ›‹‹g´#9›y‹‹‘J•g™¬Ç5qá9澈e9OJ&wˆ
"2i™’²Ô\äÝ:1'PÛ¥.¤/ÿ•7u™>N
Ró¹—†8Š”ˆ'»U»8Y©gÊ…@ÒÄž³ ð#LqB³±a;¦ÐP1ó§>…(.ûùÃZŽ”Zìg\Rˆ:Óqm©"&W%QvêK“
5bü´Y2áØÒ�]í&)·Ó±Òx”r^5+.ƒ1çùìŸÿ*ëROcQ“R,a,eÀ
u°ÊŒFß8Z–›÷l!Êòø§¸Åðs‹íý™MÎê´’þ4�aÅY§³ž
…Y
ϟ
[ÜÖG1 œà~ºA]M.r‹˜žìD¼oIôd¦qŽ3“e4¤5ëYÖ„Ðg(Ä8Wª«[òk<÷ºÕ²¢U�¶ýœÿÄ*K´Q�OŸ*jt8ÏA¶ì«ªô­fÏzE‡RÖP»u—FQ9šBé×qöc½î<úúT=t¬­š8
8»M8“²ãÓÆBc¼Sf±
MpN?–PÀj²…«:êš™M0ÂÓ½#½åä|¨Ù8ŠÇzEëÞôÉÛ�½�®iÌ"�
ᵦ
À„Yb¦–<¨N“š×”Ї,„P2 ñ4¡OÏ»ÜÄJw?IÎ1míd 
¶ÌfFœ�-§Tɘ_ºUrè\³GÓ¨t�s™qñºSVöŽs"ßN;[³³_¾­_ˆX—ÞÂÈùf™GLÄqþ^ãô`+VÓ˜¬^–ŽK!ÿSS!óbðeSûÄÚF3lÐê%órœ3_z³]µ¨˜%ý¼ü±r¯z¡Õ0ce©2è	Û“®JNHK¸žoî�¯í;ÕZ6èu†ëƒl›FÓudlXý{³O#qU™´k·/CݼÄr°0ÞJ­k"Óv¿#=•¸¸ôâ¶Õç!Û�¹Hüpº±è.&”-àM.¶¾ü¶dçô¼bvñÒa¦Œ·
àóÍ�£6~mƒ©Íò
س“–öh;7|Bèe¥5+‰9†2CzˆIf�©a9™…!x9™IÕ…�ši2Áø?Tè2ô‰ƒO˜s0Ç…lx�3·�V˜xž³qŠ"4‘µIX,ÿí§M€ˆh¶ˆ—Æ›ss¡c&ZŸèµŽMi„r3.4Z

l¾©x0vé"c$Êxûd“¥YNžtADÓ–Pô,Y†Uw¢E6×Fé4–ÒÉ™Gšœ>ù6µ£ŽØ_�ù€_Ø^fÙq"ŠzÃÒe�¡ »…É¢{ÖSØù9^Énë‡Zd}ÙgjW>òŽi:›Eè£OŠ`GØõ—”ê–-÷¦M‚ŠS:P'Çx5ê c™Ségï}g}qZf|Ò¥WG˜Ê�›%zÙ_šq5Є!Ô°{ÎÒ‰[6
uædò÷rWê—ëU«Óæ^‰*§f(›&E¥š'CT *Æ�ÿ”#[)t]<ôŸ�Ø„t…tl”I¦}ˆ¡ø+›§ ³
Nà‚aÁy~€Y¨ÆEOÌä\�æ…Hu|öd(†Ø†_<&:ß7›�ú§Hì8D¹§�t‘æ-àq�µ˜«¬‹×auö¡,úRÀy�š;K“S‘©K–øTË2¤TUUâ5“}±8‡¤·šìºƒìI–KJåx¯Ù·bKš§`¦O˜ÊZp‡¡ô?ð¨m§Ù¦Éôoª9uIhóªf˜w™øJ«Â�YdN„˜-Y[…†’t”\¸¹r·ÁP´ªŸôZµyè+-' é"ªcD�ŠE5E/¦5Txµ-HWÿZ^õó¨ùFš‡Y_†…
7¥s÷G£‚{Üù‚LsMë˜.ö}áéùš?i4“�J˜µgŠ…†­úš'øuˆuâÙSMë«á(…D[¥�b1ˆ’˜ç‘‡ƒ©å9¹Ê¯æ)§›ªSpµ««9
×hæªF�Û<­Ì	«›²®
›’¦ë™§Vl¥Êµß:;·[©<Gµ{ª¶ßYåF®Ã‹†ûSSpäc«µS
�Bš‰0øà=š¶ŒÈû_næ„8u®lgŸâ6s(…OËdK{³œš&%Q¾iN8Iò¶0Êô³6zµ=f‹ÙŠ¥ÉzVXئ¡F²¼im;dî˜^˜£;=º§ÿ:;cÃ*´RùNQk2ù¢¶†‘�&{m!D�â!¶ëa<Ç
¼ü˜Á9¹/"Ì—Z
I„´nZ~îYa)‹¦)dX›?Ìxè³q3Š‘ú•’+ËV=ß›=pY¤€’f7kb%G¿˜˜Ç‰¶ham…�t“g¼{¾bãNÔh¬Êšzš¹GÂ~!xø¬¡©´K‰¤ æÛ¥©D¼Àø©µh�èò8}|�&©Å‹Õ˜…Ìn©(†£e�ŒÌŽ�¸Qbã‰*Æ„æ¿ÅŦn¤À*·û<l»¢¹rh—ÁI% +øÄ
â,¾!žáªXQv»¼èbFw:¿›™ÉÐG„ÿ¡‘~k%Ž(Z«wÆfQɤ‹ûk†œ¢'š|2á&�i‘›¬*˜›©hG[À<”Œ«²QhÀ£y‡ÌšƒÁ(´sf¾A«»ò¹€Ã…·è’Õ×£krTƒ²Z¹KH³i¥Îü—
j¾Ò§œ?'È‹„È
΀<y1Å�­áT—è‚Îò–‚k¤8ËŒzÒ^jãËdfi
<}¬,~öVKÅiÎì:èR¡ <AŸ'ÉÞ(?h+7�ʼžQzy-%¼èw7i¹u€%l²
fs4Æ
íÁ狃»¢Š††è	– Uu%l(ûäkv•Íή‰hôHª“X²±¢�Ô|¹ƒ|T{Àˆ¹Íÿ¢òmÐlj;;kΤlÌF5Wvo¹t´<—&ÛÏ;=Îö…šWüµ¿’Ú/ÐxcP‰l9·­ö¹D�žÜ”5øËR^ÈË}é›	ªD¨'$\II8º\%=KImd˜Œ“H׳],”)­¦ÚCœU7ÛÔÇl}Á´œ û¬5-oº””)̱×[ƒJÆ3§R‰}‹Ìõ§‹ýÎ&P«t’�+LÄ]û]m�²
¶üÌ·»Ø™Ã “{1$¥Ü—¡Y?,�£ãÉY\–Y·©‘:)7©íiÇEÛ�Mºµß²‡Š¤u3|ŸŒö0·*eÆ…vÛXÜWðyÓÞq¶>¯”iNÿôiÙnI­ØÙ·4Ì­DwÕ¿ûW¾fÖ8FQf#˜…=»éë„û“ÍÄÇßG
3íá>UÄÊ÷ÏpªÞ†á½Ýu Gp0ÈJ0
�HÄqÿâÁ‹1R<XñáH� 7žüØQ¤É�#YTéR¦B–/[zDY’äMž6Eâä©hÄŒ3Cíx2fNŽFk
Lj”èJ¢A¥îüy•êÐŒK­
]õ)X“1/f¥y”¬Ó�kQŽ�קگlužmKèÜ·tÑêµú7ëV‰	Çõ»3)a¾‰÷Ú�ÉXkÄÅv‹Êµ·ïã´SÕtrÄI¨¡Ÿ ‰âĈ‘#I.Š†ZUölÚµmßÆ�[÷nÞ½}ÿ\øðÝP¶¦ù$$ì†	›´†rÄ Èçg;:¹8Z è&Ï!ByRQ¼À'ÐËwT^Þ!ø‰è·cWˆy’ù™oŸH:‰úúÿä÷·N¯?×`Ší5‚:BN½ý rO½'”;)=…\9ï

@Ò(¬Š9$ôS‰JψÒ��Î	(ÎZqE„¬k»W”;)fÄ.GuÔ‘F'RãѸqtBŠyTÑ8%ƒrGi42É%u¤Ï¿
�P/ª$¤¨	W+’É)…TrFÏ´É0�<RÈ$³{3N7Ét�Ì)U;	EÔ’8?ÿ4PA´OBE4QEe´QGeão 	jm´ûBÃ4Ã5åè>˜*%ÈA
#°ðQ±Ç&»lÝ5;mµ×f»m³¡ó:�Œc‰%ä^Â
#Œ3E*„Pîˆ'¾Ž"Ï$„@‰ĽLm?$ à“Æ)V›"ÿ:,Z³	#ØbïÇ£À¢	#’ø	)nĺ®÷¯ïîºÓ\Š#DƒÜŠ.H7Á8ºÜÄÓüGÍ—¢	–øÚ0�¤`ÍŠ$7Â¨H<ãÂsûÇo,HO.·{B	P¡;Ñ�	˜èB‰ö¡0b
r¡3ö„€…'¨¤EÉ“â —¢Ð,áÀàÆ2¤
îc ´à…8`)X
Mà@T !„Á=�@(Ø„ü aàÂ|Ð……ô"§á$¸w„) Ä0‚FÓƒ`	ìf´š€lÚø{À˜W$רNos%âP/<	(�˜
# Z§u">úâ`
Ä̹$�¤à�‚|‚�ÿ€ˆxL¿œ�ŸðŽdŽþ€Y±’q
ÄìXéZé㈈êM±À	Õ›¨€›“Ž9TÉK¼\‰–ƒ›ÚpËݘ–D‘5Ú€“”Aõ"�Ø,e)Iõ!›ßŒˆÎÌ�þ ê´ËíܵàäÎïÏðÌ	¡Ì� ŒñÜøˆ‘V±•´ˆy�æ¨Îkñ�ŠÿÌìÈ|j×\�°ð
ÐÊDÀüL
Py¦�¶¨A´Y•‡€œùK�ˆŠú˜åPI™
8¹iÌÖ´
´‘•SiŠ
ý”o)QÆ\Ì^
Í[Ð÷HÛ<PÙÁÍÉÌüÑíLÑR=PÜÒ[™EÑTN_ÑNñdR[kÒ'…Ò(}ï\õP)ÅRœN¡ŒÜ@›áú¼Î?É-
Ó_™Ñ,UÓ´¡Ò5uÓ7…Ó8•Ó9-”3½A;¥Ó<ÝÎíMg¹ÏýÓ@ÔAÔB%ÔC5ÔDEÔEUÔFeÔGuÔH…ÔI•ÔJ¥ÔKµÔLÅÔMÕÔNåÔOõÿÔPÕQÕR%ÕS5ÕTEÕUUÕVeÕWuÕX…ÕY•ÕZ¥Õ[µUImOd1ò¼L-ÓüÖ`%Öa5ÖbEÖcUÖdeÖeuÖf…Ög•Öh¥ÖiµÖjÅÖkÕÖlåÖmõÖn×o×p%×q5×rE×sU×te×uu×v…×w•×x¥×yµ×zÅ×{Õ×|%ÖÉ‹òÔÓ€Ø�%Ø‚5؃EØ„õ×2µˆIò ­#mÏŠ¥Ø‹�ØŒµX�ÅØ�õØŽYŽÙ�Ù�%Ù“5Ù”-Ù•EY–UÙ–…Ù—•Y—¥Ù˜­Ù™µÙœÅÙ�½ÙžÕYŸåÙŸÚ %Z 5Ú¡=Ú¢EÿÚ¥UÚ¦MÚ§eZ¨uÚ¨¥Ú©µÚ›Ý�ôÐK„p3ý#˜/™+[ÚÛ³5Û´-Ûµ%Û¶E[¶}[·U[¹…Û¹�Û»µÛ¼­Û½¥Û¾Å[¾ý[¿Õ[ÁÜÁ
ÜÃ5ÜÄ-ÜÅ%ÜÆE\Æ}\ÇU\É…ÜÉ�Ü˵ÜÌ­ÜÍ¥ÜÎÅ\Îý\ÏÕ\ÑÝÑ
ÝÓ5ÝÔ-ÝÕ%ÝÖE]Ö}]×U]Ù…ÝÙ�ÝÛµÛ<ì=a‚‡Ûî`#ˆ‚ø²ƒk€¿Ó- ­åeÞæuÞç…Þè•Þé¥ÞêµÞëÅÞìÕÞíåÞîõÞïßðßñ%ßò5ßóEßôUßõeßöuß÷…ßø•ßù¥ÿßúµßû-ß¿£-Øj€J€"tL#à¨%#ra ½ÚSàfàvà†à–à	¦à
¶àÆàÖà
æàöàáá&á6áFáVáfává†á–á¦á¶a¦†ajJjØÊ4bP‚Ø&ø¬>4=ã°/Jâ%fâ&vâ'†bbŠâ0¤)¶â+Æâ,Öâ-æâ.öâ/ã0ã1&ã26c,®â+£3>c<Jc6†ã8–ã9¦ã:¶ã;Æã<Öã=æã9vc#£k�4Ú©ƒø²ÏÒ&)æ@Im
£cøc'FH#Bâe¾JU.åX"3=«eÞ¥Œ´âdZã0åIždOÖæN^ã^Îâ@Næ¦Ç>fç'^e;^ãx6çnfJÎæNnæ)vA?ò¥h°†‚ÈÚƒJ at V`p匴e‹Ìenþä'FÈI^çU†em^bz¶†Ùˆ»elè]öhiâåŽnbmBàc6ii¶æ”Nibzã«Ìç0ziUfigži•NisVâ,F0Ë=0bhm6èpnç¡fg@’è?Bÿê–nâ�´d‚À²&mØ0¢¦êª¶j-.H/šj1¢†
â‰Dþ¥DÞ³?:¤må?²†/çu!èQηnh?ç$î#¨L¦n°†[£>ºë\Þd„æe¼êÂ>èšçiH£4ªÉ£Œæ%^ç3óft„hëezNæQ~#ÂÈŠfkÌöæœjšžìÁžéfþãýrãgÎl©L#Ae@ÂflæeîlÛ–bŒTædÀHŒ4jšNíšîà&îá6îâFîãVî?¦mb.eà^îèn–¶i•&&ß~l#zd³Ìâ�¶"�´H·Vìƒvæ©>hrVbÐVb†gÃì\–d÷¦ÿg¦¾e‘þæ VìüN£üžb„Ä#dnbl˜î)–k#ïÖînÁvek¦£Ô~f“Æ£ÿÊü^—X²ð]Z—Š—5^æßþí™–â‡î'q÷pè†æGqéfñävqopkþ£gðæ¾i(ñÓ$ä#Ò†Î휮ën&ò r#/r!Oò#Wr$wò&‡r&—ò%§ò'Ÿr+¯ò(Ïò+ob­ö¢×ν
`‚+%bOó"@Ú£êwx†{hx€yh‡9wup‡;Wxh‡tˆ‡tx‡?ÿsuxA'ô</tu at t@ÿsxPôFx°j¸sipJW‡h¸ôK‡‡L�ÿxètL—†h°ti�D7ôMGtRWR¯ô:�†G‡u8—õY‡sk¨õ	£H§uYw]·u[‡t`öyÐõ[¯tkp‡	«õ`G´H�týkv\ÇõàË=hgveG´ê‹ö=köj¾1÷Üûçqg´r�àn`j_à[àã»áwÏ={VànhwvöhÇ÷	S`øª<z
öÑ¥GaŲ½$Jì§Kq?Ñ­[W(¼£ô‚êë×o¨¿ 6…2µ	”áÄ…7™jŠñ¦o‘›úfŠÓåM¨¾qîÌ™§o¡9¡

Ü·Ó©O³nÍZ8Ø°Ã�¦
Ž¶,ÜárË".ܬ޳€>¼Üð[á”,ÿ'pÖs�Ò¡K¯žÐ`Âì:dhQ�:hê¤e”6~#ú�‘º4ª¥û‘ðç·¤_>µy'wÞ|�¿ÿü	è_I>HA8S}
&wúù§Ÿ£ÜYJ)©ŒR¨*¥$ºè)ª¨bÊ£ŽšÂ
¤�¢¢
*™jŠ
+›zÿ*8âl¶8ã°–)¨­‘sÚª½Ñö8¾ýFŽ¬²þvk8åäZ¯¼ÞÂ+:¿ûL9›v
ÞC9�Fê4óÓ6Î|4�4Xi{!·Ün3
7Ò83Ï4
eÍSNu».»íºû.¼ñ²;�CÝ4Ô4Ô\3Ï6Øè+/ÀÎT3QÎ8óí6Ü8E
6Q©"M
<Ì­†PùÛ£`¹%—]vüå—fž	æ™%—\'Ênb²2Ë|öÙç�˜”ò²'€úYè(ªêhΊ6êè)¦4ús¤–bªi§›v*Î7›2Ít§à "j¨®±Ún¶Æ:+­¸ÞÊ+9³�óëØÎݯé˜ÿM±åDƒÎÛ
A$÷BÕDcM4ð,�5}Wƒ÷ß�÷mÍß×0â‰ÇK°¾sÃ05Ü€k¡â•[Î!.ÝØÓ�3Ó�;3›W3:I¥÷û¯¾�ÛÛ”ã"!po·_>;íµÛ~;î¹·ëï=bµM�C
?$J:¹�“×hÓð;@‚%È^fùqôbš\&Élº%Ê$©ÀY&œuZÂf*:ƒ¢¨(ž�¨(©àì~ùð#J袊
}
þùç�
þüû
§<UTHMjß`šjVcppbU©j�lÈÑ›ÞH°‚»ù9Ê16ZÝblËq5�æ°M:ïÈ;B·h4c!-l¡Ýìÿf�fζhÆ<êQCä9)yã–}(ŒjÔcZÒèE7š‘Äỷ¾
¿¬¢}ê#E)H!ËBѲ~ö³ŸþrÉ¿þ
€ô”Ô4L°€Å, kVŪ	vm7¾qp¶þjÔ¹E<dñœVçÑðæ7ÃÉ�>o±†Þ²ÿxÌp5ázÈFÝÑóŒÜò†ä®�Ïk<Ñ�rü!@á(Ð?ú± 5è}Aºmì‚
�
R쩤Р֊O6»™*à—Öµ–¯~Žzk¤$E)_°SŽ
`ÒNcÓœfÊ«XeQU]MU´¢ Øf•X
ŠíÐi,¯fÂn
ä›Ö
§8Y8NÍÖ-Âðì;>+Œw4ÿ£¶°F=vá7‘Vqƒ
ó…=œ¡°µ«aǽò�\40k8`
?˜—àSÍrM¾öÑÉ¥05
#(˜êP¢%¡L¡¨—Bh”
 ¥&…
SdJÚü›°03Å@pˆ
óßöÇ^'_)5|,ô9y�¦2�¨¡]uÉŽCêjX/ÞQ�?˜:SªÒ"b VôÁZZõÈ*¹¦“½)¾ó%(;ù¦—qO[]ßžRa
þ¾ £ ¶ÝKRœ¢AEþ3íJÍ—Ôv𦚦íÅ£Š˜È´Z‡	ùXõÆÃÎŒw®Â&ÙÍk°9ÈI‡l
 ãgë›Ü'À#ÒŒw,ÄÇÑíßÞðÂõ°I)gùÇGîDæ¾^-_)Ê­óÒÝ‹$ó¸-n™��Ç
øù)ÊÊÿQ^|ÜCÚ^#a\ôMG0�
,tóðˆ¸¨Ñ
‚%ü¶î 5òå{Þ5�ø¸É…*Öô%Ó¿þö¿ÿú#
¤IIxÅ[R9Å4hÃ5H€B
€·Å@",Â"T$ø
òT
h€
ð!
ð
@´@í9ÃyÒg-à
ç-4Cq'üæ
ÔÂ+\\
'«d ¹Å+
”["&b9”[8´!
Àƒ0ƒ™4P',ã<4C?ÆÈÖÖŹ5X5ÀC\ãœp‰ÜÄNèmÙ–
’Ïö¶®z3*ÜIûØú,˜¾@`Š•¥xkgrÂx›
ä/*kp¦Ds‚&P
´Š•¤FÓ0�…õ³&b¹±a¼ÆJ9Ä‚ l€�+,†C,”Ã’z[
lÀ„Ã+ØÛ‰!G8ð,‹Dß:Ì‚Ér´Ð
À3ÈC4¼7ÙØÄ’Ù¶Øxì‚P×BÆBu›RCƒ>Àƒ3ÜèÁHC\€4¸ƒP…/dC„¶4ÀCƒïãÅ
À¸Di‹)€RÛQ_‹ÝƒßÖ­4؃0È8“Wƒ3T2¤‹5Dvsu¢Ï2ÄøX/95 ˆ-]`«ÃÞÀ’6\̶X4ÿÙ¸ôã„"€Öíû�Ž�©ÃMLWu¹Ù!EÅG¼_	Cû­”,Gº¤Oº»LWãÔ�ÜòðüŸMAEßlƒ<€&0¡XÅ€"%$D‚h`TÅÖ&¤…XB$`‚%`‚"È@s/
Ä@#Ð:öŒ�(´¡qOB°“«)/n@)„srƒ)€z[¨b‚°*à(Ûu‹U(ÈßU†ª.ô7¯·ÉBA»´±¾@‹B&`$
9°ºÅŠK/´,T4DplU€løØpk9 pÌ”uli
;ˆP9¼<l‹i
º@Ü4”}lÙ53dC/(r6<åÈÑ”&ÏÀ�®¼$�§íÔ"ð�ªf
à€Ax½œZËðÙ=xÑÚ©cV¯Zµ”�Y;{íZ³�—nÛFm
˜:íq±Oñ<1\4u!ÆžC 
r"8>ð¨Ï¯,S(%j¬q¥.
\8‘
PN“!�¤A4
KRq!†<ÿ4Ùä�
)�¡OÒó$õR	C
PÙ$9åL%•TH¹š”RBO9C™*ÄRFÅ”À†oNiq�
”Ë �q¾ä8Ça0„rF§EqPaS2
T`1¯Nÿå£n°ß6\
ŒkMQzF:žñŒ[ÌB"—™¬!�f<£‡©Å3.biäC]çêÀ
Ü
L,"’êñD'>QÉ€BÚ-…!—¦µ­m¢Óœ�x0pQ\
—pƒÛ4qŠS„ââ"h

žaQ at gk
@âd¯ý˜»ùÿH‰�½;=–`÷kiI”�‡�‘<Ò�ÞN at BiñQÏ0±^ë*íjཚ(.ÑðU¨B¢ÈZ*VQŠ­™¢ª Å„X1
U”¨¹*LAqV¨˜›GÉYQ_›Âå%oQ(Z„
Ánp:Üá¾áÌÃ
D
äÌ
¸pŒ¸E_z�ÊQ¤+EýJ·pç–ÂÁŽÒ]‰-®::nÑŽhÜ‚ìïˆF:v'�±ÃãË‹F3laöhHÃ3ÁŠ5šÑ•‡…&ÔèFaœR
¥#a‘™3¸Á�œØƒÓXÍVæq
{8#2/ÉI6|Ñ�¿OƒΰG7¦Á�¥ˆžÖÛ ÌW¿ŠnÿÑnÃ…~Š3¶›­\ÃÕ =7è�±¥£Š÷3°ÑxÊ;SôpÆ[_óÉfô 7œ
_ƒò:é
í§ñ‹…e¾Ÿ/|/4__xô¢¿Fãýnz‘t#õŒÉ6"ãŒz8cµ.36àÿ6ê?b!‘ÅtïÑÐb1ðïÔÁµæ­ßl˶ޭ�†ºÚMß 	=R�àvƨË$
–=¬+iΔ«®&a½–æâRa¾+kH¡V!@
DaâPaHAi¶†kp)BBAã(„åXApZ„MAZäDDçœÉ¾
Ç™˜ðÀœäFÈ)
06ã e(�ö|A'°Aùœ…õzO2Î"ô
¨£|Á¶!ñ€
þÖï_
Hôò¯1΢�óàjÎê5$�&˜A¯þÒ.c$‚èÁñt‚aÌrOóJqp!ñï_êÁHûh¯ÖìÁ‘ÿtoÙ$­‡:ƒ‹²hå±µèéí1ùqý‘‰˜â‹�Í2Àmÿ6Æ­6tƒ7|-�ðA$òh*A,aá"A"/RÁ:ÁRÁä£AFR°ëBá;¡Ê&âãR�%?�>!!>BABÁ>@Ál@!ˆ²>ABaB¡j˜²Qa)iΤòÀ˜¾�æ”�E¢†¬pÀ
cᙾò+¹RP
El-=pˆD¢.²Fà’jdèÒgAÚpð’ì
0s0o‡ìZL Äävì�N¢Á~j�wž¡~ïàÎzA¢�2›Á2ÑöòN$ ¢öþ®0†¬–BhïÞÊ…¼
ÿ|á<+¦A–‘6eS)Hñ,„!†‚öÎB2Ô"-��+J«)~ã,
0´¨ï1„Ára8kOÿøO5ÍQôþ/8DO�E¦ï8q-$6ào1„
üÎï5T³Ö@¢€A¸¡7Ó‚s5‰sȧ´|ãaòOç¡ðÎï?w-øc$
ÇB¦+9¡HiNç8A	Åážô,©T-¹’H<dÿèÎòp°P¬Hda
IÂ/ù2Lÿæ-‰„^átðr/»n ¼.0	0Ÿ¡Å
þ†S5CWCV‘3Q
�Ôâ?±¡1„áXA"ÍZãø°!kÑ>Ÿùô52F"£`4m÷¬“VæøDÏSñVÁY×3‚
5…ÁBUÿãa€ˆ‡,#Ú:cÔðÕ‡˜"_P_uè_¡q_ý5ÿ`
–_¶_ö`¶`Ö`6ava	vb‘È‹b#ÜÊè6ÎH�ò7&r¢,žÂ47#V~Ó)"æ, at j(X¶AÛ1cV#
áXœU˜‰é¹žíùžS£Ûf¶ Ï7ž 	Êmÿ!/c„O–Ó—~Õù’�™ˆyÙz9˜YgÙ3Š÷�
Ò˜yvŸ9¿7�eבÑ—
ZaÏÓ�'š¡_y�§¤‰hi}x€ñØ•�9^Y8lCÙ€[#„Iz%-Ù|:m-Û‚m'—¨Ö�µvv“z‰QŸZ’í¸¨íù¤š©#Ú}#ÙÀ9'Þ‘}E£y�:¬Åz¬˜Y6$à Í7˜` ¡	Z™ÃÜ•Äìˆr¨ÚõVAC…}!Í”"3&B<]ˆÖ®¡¦9Ú1æ“ó¼Á3„ArA&S¹¡õxá±mÈš¢{8qh“)¼
5«…÷ÞÓ”"ÿóì
›³=/ì¡]—vŽcx‰®y©kùbÛ34æ·™gWšk�{¤§ÙŠÞ“!‘;Úªm»w�w5÷mAËÛÀ™!©a€OÒ¸Ú�}:¼Å{¼É;'Èû¼Ñ›ÙÐ;'Öb5¾Û2Ì;Ù¸º5¾›”ß;½}z¾I¿ù»¿Í;¾û;À\¼ß»½
\½ÝùÀå;ÁÕ¾Ÿ­¾<¼
\ÁÃ{¾Ùû¾¼Á™­½%|Á½;Á“‘`¯,¢»W{U<ÅYÜ{WÜÅ[܉¦÷5ö96̘|kã	”€�8#®eY<‡Q?c9fí
Ê�ò”"�/ÃìÁ‚o)2/ó†QòxAÿ<¯5•›3¸¡µ�ükyaËM±YÝ•ªÜñ\•@Ïìáx¡Zh
Í�¯÷*¼QNq5Ï]YóûË!HÉ69)¹·%v·)v1lƒàw�ù•¥�ø‚’[jýù¹úÒY¦KųÜ_©Óyõ¶“!½3bcô�ø,¯Â[ª¥&cÕ¹ÚÕ[_]Öc½¥h]ÖY×g=×a]×k}×�ý×—êÖa½Ø‰ýØ��Õ{ÝÕy=ÙsbÕc]Ø‘½Ù©=Ø}}Ù�=Ú%ÍÖ«]Ú±½Û}}ÛÅ]Ø¿}ÖeýÜÁ½Ü³=ÜË�Ü×ÝØ•ÝÙ³½Ý}ݧ[Š¨�ô¡Ô/©
ýÿß�õX©¾�	¾Ðáž4bÖ5ÄèÆ2	Ž  g9É·!
µ©ÓlQ�2­Š5kÔ«©jý*•)×®d±Šµö©W­k×–ÿ…zÛµµÝ*ÖÝŠ6lÞmnÍæM[Qî5¹rVËvx›´
HãL/ö¸sb5Î4cä<Òès
ì»ðFeo¾l훕¾ýòK,ÀUù‹Õ²]R¥yâN„ÈÄ8“
ÿ¶qdP¯Ød“bÖP³dSÌÔÍ6s°M=@ã5Ë@ƒ
`ê6ÝxÚM.¾¨½ØÜDd7Øܵ‹3öXÃË
ã`

&`%ÉE7ìá�kTCL!œÇÖ²¨nd#‚lsF5¨¡
 °ÕhÔW¼²º®¨nV“+k÷½ªèUš÷ ‚¹¨O�ð]ºÄG¨ì|pä‚Ð"˜k1¥QÛ–]bõ<:6o’O�Ýé>gIìh²`¿ºÿ$%Ïå•Pn2“|$)OéIu¡ò+¤ää(S	®Û1K{Ó:Ð`$º

@G£FªRå7zÌ#
Q¤.�*ã6¬áH¢2©•!k[xŠVh�U­eõÖ±ÈzÆuáj­¨£«]ÓZW¼ÞU©îú$ñèš¼ž®+™‡<&·‰:€5«zØäÇÚX¤B––’�ìd5I„QJC_�fú"vͪp¤Oܺ£ôQ¥–ݤ!õà…5bµºdƒO
µàqa^xcÞ°Iê‰�œêÖžö`L8ê‚8Ðzó¨¦1}0p°XÉ5g&}LÃ'±-ù*‚Û2·4m”=|q]†V°O
	/ìv
_øBžÔ�CU
{˜)h‡úÛuý×
VÉ¥n)ÖZ4Ä
`L½�ý\Wx‹ÿ
ô
Ãrap.–iÙÒN®BýbìÐ�wÒ+7¾zµµ�—D¬`µú9Ø–!`�—IºÂVÖ¯<î±��%زˆ2±‘ã+å˜7W¼~°VåzdÅ«ÃUÉTf+e
¼b&[ùŽXæ«–ózåm^·`­;H¥:û¡$8,	O8ÂúN4¿§`,�NqUª¦�Ày¼ˆ„ÕhRັ»ëNr¾ˆ¢0˜»[`¡÷!Š¢7¢È“Ád@cˆ/W‘ÃpÔ‚<ô5‚A•ì^&±ZEœ
Œlx…Q€bÓ\…02Å!Üà†ª-r³ø
cwÙ \Å^ôU†üY§£ò¢3ȸâ§ÿPFC“2¾êé
9Œ”ÁÃe<¦Šy/¤«çÊ5¼·SżÒqY†é–éíq-æƪ傹³$23é*ï@¶ádk.zÆ‚²�‹¬¹!à8ÁNä&‹«àCÖ7ÃþpƒK<âGøe�œT5|âÿ7Ç?¾qŒW|/xYÑ3 x[$—ú¾j){…nÙÒ@4OPÍ!dÕ›Ë\ç9·¹Ïq>óŸï\è`)³37Ô¡4‡hDonèæ\Úº$Të†5záÒü:ãѸ¥aÅÛ×QÜÆHQÃÑ÷½�‚Ά77(
‘—Ñ®2{6÷¾y#©ÇâB±JžÚÿ2Úp»«Â^÷yDÏ!Ô({fÚ×(2¶ê0€ÖÛ¨"_F2^¤Iö°ïr‘8c5Ó
¥Pÿ45öœ
.vù~mydÍ“nHª¥~	XÀ„9]V‡˜X¦fš¦ij¦;–‹Ó7‹È䢟s9»K7Û;+¦š6	Ó™ž•ÔdMXqš"FiŽlÐ0�+ä;@³¬A„¡ÙêE[£&èè8ó�$�çÐç5f2
Õ#T'Ô`*
*0%�а'Ðt«
¹´Á

°fú;?å¤�<z•)Q‡‘£$ŠR¶aÓÃ"ÚÿËr²‹-x;ãÌßòÕÊÌ.ö›Ê!:ËK}]úáîÛ+yâÆȳÉ=×gåÑŠøk¤ëkåUþ³.F>ÐÈÀéãÀ'2/|6jZŸW&ù�Ù
od�¢Ê‡ñ[Ñäe¶YuÚÀxúÀ°Â§áì^wÎQ#
oÄ›¬Ä5³$ÐE�ÜÑë.l°2ŒÀFðDíÄ„¨Â1
<*µ
»–×
„ðñŠlø11ËŽìà;ãЬ¨†^H’0ª¨†`Ð�âÀo
·¢À¬¡@®È®hÜà ÅˆÆÐÞÀ;k±B“HŒˆ£ŽÄ ú0Ù	EyÄØXÁiè/혶lë¬nk¾±á?
Y¾ãë¾bÓ­Ê€�è�l8 ÛË:±6D®ÒÂ\R5é-HÒ­vã>ßê¯cÛZ&ÿb’û ¾Õ­ÜcžÙú]ì¦ÙKúó7
̆^Њ¬ñžl �2ô9£ Cm˜1>³‡Ì؋ƨ»É Ãc†iÀˆÈ¨°Á(ŒÄ§š*^ȆØpŒÊòˆfxˆ2<I{è4ኪ‡­ðaà3�8˜ñ
Mñ
ßÈÊ:
oØÇqñ娊¯Ø¨0³ˆã�—¤@Ü
­ð“4Š¹ð‹Ì(™ñÈmèmð<{ؼ°ÀÆÐCžf|>ÞF³Ù½ÿf35é>²ÄŶ콱qOr½^Áº9&W‹ËåÊKçã­E\¥î‹µgFCš“¿ô‘lšµð²·,±FZ/ûk.¾ÔßË“ÓFE"GúKpT¥ÉÔƾ‘RC¶Þú�i’¥b¢Ç´¾ô=}þÎÄ7Òƒ?`ëµôK¶ÛœÍØÄ6Öœ½v„éA@êQ@åÀ9Ë°G‰PÄ¡É‹é”™Ù
Ã0	
þ™‡�¬‡e
º‘
€‰Š¨Æ‚Î�ñ¨qlP‰è°‡¢£‡
—Ü�IŒzй
þ¡!f„6�åL+eÙOŒ^cüÒHzÚkk?v³¶ê¢&I
ERÄ»Ä54AÚ)ZhR¦Þó¬õ.‰hä¾Ú›¿Q5)?œ•Ó7MÙ–m_ËP=óu>ˆ%1&øÂÒ¾D5uK(15ZDFÿAK—ÝMþåõ]Òo#¿÷õQ:¹Ù 1M>…SæÛ^Æ$·�m<!@¨Y”
38»ÛæZºÐ«
š
@"³ˆ§z
lx�iè£sY�øÀ‚ʵB·ÂŒ˜ñ¨Œèµk`ðˆ!`hšqi!rá…V»ü¹`¨ŠÔ%ŠÝˆ
…Ù‰Osñ´šl•†Xi8¼*lŵ¦²‡žˆ2C+¡¹hñŒÄåO ¿¸ ñIŠ4Ë�x"R™†ª¹‹Ä
�Ø;�”™œ(Á ˜°Rü¡0…±†‹�	š€�†QÁ+ÿ,Wj-•¯ài§€oÍ}€¯ø1
#X³­lTgäÙ¯òmËÎ
¸÷Jµþt_ï²6ê
EÃ$K3	MX
_¥8Òbþša‹-]·U´“Ĭ^jDÙy�	žfi&/ÙÑìÆjŒÓê“솋¥Sƒe0ÍÞxÛ岩%|þ‘…ULöúDWàË�„MSðãf†½ì
)ZÎ?{”³‰¿oöæ7­CA”Cm”D}§x’”±0ÎH…@ù
¢ébzðô
NÿŸðŠ¾³Qû!’
^¤v�¶i­
`’d)Ó$H†YÍf
g™0‚¾wp–•çRÆU¬bzÒXÑœú[rÀ*F<ðz'spÊ
Ñ[£Ê6+,R¿Â(³MÇŒ%}.ÿ;4ú…|ó•J­ãnò™¤^M'òL0ÌZÖ[ÝÂUÖd`†.ģù¡D6ʹ[Å@…yTRK�	Åi®éf5
§¹UJL
¬‹R×
OÍô‘c¿ß˜ iÏ�5Þ3”ÙÄó0S˜3ø *Ú4

CŠ"·25ån?€Þ¨ò·
È5„ñì‹Vü×NZ毧UMjIìØûw¶Ù�ˆÚÑåƒÂ¤uÇ�(™ÊËeÄ)òPÿfQÁä©5)î¢ô±—ýãÐìH§@-ëçzÆ¥(&ô'5Á2vÑšU-„ ÍJÊh3�æl¥K	ล¨a8ƒFÑÈ$„H0Ÿö‘‰F­ž4NѨšgCÊR$~meSQP"²1‘©)LQ%8UåD	ßL¼%<zìI¬éš/Ì•.B¢G²!˯$'�ÉAÌ@X^c�n@)ËŒQºñÇOq#Zô Å4˜
-ç
&ÔÐÝ>«×¶ÌŒ.
œAvÉÇ>éƒ`F¸
Œv9O]ï³7ÙZi8c
ÕýÁÿöä÷pNÌþÏ»¸…üK~y[Œ`þcP»±Pwy-È]DfÄÍ�ÁQ@A
WÉ\BÔœœX‡¥€Æ·¤Žs0ÓûðÂq°Õ_š/( A”…7Ì]èØC/xj<Ç5èC/8C5Tƒ31¢,Ó2-Ch…–õP ]Õ]l5àॎQpÎå0Ê_\Æ{PîÉ¡ü	×ÁR±Ìƒ/Ôð8CßdZ8€e¬r0ŠôèÃi˜…@8“ô|‹= 
cÐidC«üB7؃ªÑ4¼’3eƒ3 †Ÿ,,ÅÅÛ‘ÝS}F¢f¸Ñ4h^bÌÅaYé½ÇV0˜–®ÅHfDÿD!hl¢IÀ6b#nG6

 Êà¾lT€™#ɼc}T˜¯
›¾ÑK؈ß=‰Ï]¼‘V-ÅSD…W‘eÉXA´`§EŽ=DA�E«XÔKÀ†jlE阺LLXÐàÞø�«<Þ5I3 68£!‹YäÂ4DV7ô¡ô|dôB~Ü fÀe ZC4ŽVLsÐ gTƒÔ}¤m9Î/ôÿ]Lƒ0NŸtÆ¡8CÂÎæð7 Ù]ÊÌ}ŲIž\h…ePÆY%9l˜‡Ñ�bÌX’´ IYàEh¤”ˆ˜ÃƒÐ|bä0Ú]ŠÛÍe\ö‹bÄk`Jb

¹#Áá_3"MfžÇ;Ž�=-�4
£ÀyŸ”$_‚ÍÇdN�UxV­œŽ)A�½IÙ
™”„ÓeõejÌKµ¼Ïý|EðaDS
ÿ„Xlƒ0¨Ä—™E¥YK5TÚ̹Ê~¢NÁ¡ä ÐàAô
ªÄx’FLÎ dÀ
¾§®8Ã¥Ègo\Ê—e^sǹ̠xø†3À‹k<aMÃ/TÃ1à§hœË‚êBæEAàçÓµ‰3À(BNÙ5�/°ÅàÒ!6¨çC ƒ@Ìå5é�s°ŠušÄ.¤JrÀèãtgH€	B)ˆ`Ä\)èyÇXÅLè-œ@
«3ì6ø]ô4^¦&yú�Ydl›`‹}øÂ
6îžræ#å¥M„b7j©s‚ÑwTLØd•VíØšHßøMóáÆÓù�5xCá9C=TC=LÌfýÅqÈ’·ÐNŸtšh¬ CNC=F=ð!Amƒ-l‰‹q°®*í1!Š>Ô¤,Cl9Káù	¥XZ/PÊ$W5<GVdƒÅPCâM�Pø†7tš4YZ¨IÃlÃ.,ÿÓ{ML≆´ö—õE‚Ò
ŽÉ1
×¹´«ßåîÄ<G»ðáã5J­�pµ/p°d5,Ã60ƒß
ð4¨«
kLFe„Ja8ð4
«4ù‚5Ð`Ÿ(é¡°ae|ËXÊg4G7àyRȳ-°ö$V ñQrä‚JkESôÌÄ.-ù$@ÒŽ=ÐÎ{f¥J¦†f¼-‘ÉL‡œçœB�íÙ#t²cjV	
sF¸èÃ.Hƒ>èßÁ¨5XNÒ@#
À,ì6,ÃT†4Ä+5ÜU

«p3 ´ÅàC-ˆw

7Ç5è.
/@ÿ7p0à �©áûKÏ
;ŒÅ £¬n¤Ji×`Ö5pa,ßôæ:ºâ™7v¨¦ëô¦ŠÜð†=zs¬Þ¨°i³ºF.”…
³`.{ͦW�žqƒ5Qš7È2,ú&UÙð†
¯!ŒìiïÝà5´ÁŒd
’<ÜØ^ol¨�V_;B0ìÑ>_x1}ä0„!?ôM#Y€í«}°1Ö_(­�d½Æžöè›r#=õË0
ºÃaµÏ«€ÝÓb‰ª›Üì…7¹OW“%Œc}ǵ•½+ú„¡�®Ntüì°¤†¾ËZè;Ù–6f‹�ñe‘­ÀQääyËȵҙ¤\Ñ.ç# Ç…R?À¬*1Y7j:Ó›©3æåp¹H¹SuÃ+eßÖyL}7G…ë®zÇù\çæ(œTÚÒá8„¹Kžè¹’„oì°³–zS0Ýì›É"ͳEØDR€
<Þ3m<âi'0¥‹áb
N¼Áí0�±d<
·)yršS�P�ôLï@;ÉW)§òŒð£üØ?ÖÁóø<Þñ>ˆLd!yÈ:îq�}¬ã&;ÙÇ;Žr“¥¼ÿŽŸãRÖ2”�Üã sYÊ`¦ò˜å

£°
eo öœì(@ù8®á„Ï
‰lÀõ6.¯ŒÉ�
ÏÁ
л"mí€)W‰�y ýþ¦oHÑÓ.uÐÿXMG6p™8,räküÔ)ÓgÖÎ)}MHz0›`‰ŸŽ™âæJI+$ñ"ðÕf‘ljL$mk¶iîÆM#�«í’ìt¸Kê¨/uÑÅ­œèÎéãÜp'M)>†PÅâmîÄó¸C êæÅž°ÈÔ�
€`(n0
Ò
ì
cI’QÉczêGä&Œ2á³Ô$õ01ÐT4)½t€dÒxÄvnN*«Î	×Cé(‰@*HøŒ—Ê»<
“ôS‡Ö•Ü‘[7³úˆrD•õí|š^„/�U˜”Ôn$Ô)ð¹pVׄqTÏ�Tñk×hGì°SmÀOIM®›V�fgõGiíÜ*WÑöß“C­õÀ¦6•@1DgD>LL>.OÅœç¦é­m˜P“¶á	­,7×�÷ÎAN5) 
c�â
wI‰5\
´Kæ÷AÜ®©Õözs'ü‚å†ç5'	—ä7òõgÍðAÒÁ
‹Þ8úó0„‘QMN;­'µÓš´ѵûеW›ý°µ;1µM;
·c›·m;¶ñ·e;·]Û?‡‘ÿD»¸…»¶‘»5±†'I·q´…û¹�£µ1G+¯Aÿ
좾Q- Ö&¨cœlÝ8Ù\?¶èerîúmã¢ûš…¹�ÛÖY
2ùÖ’tåH$–ê•îv0®;ä¸$Ö¥˜�l	ésÛ€K/cáRKgûŽØ.·(vI§’òv£qDn¶ñ¿ŸM©s¼šví&É°»úÒq•Œá»Õ6`ö5ÿf™ê¥ÅL¸—Qoª5Ì_\׈›‡E1Ò³­î}N§%3ÔK3-`ÔI'�uÓ/Zý—f2Gø[ËÝrÜ/ÅômÙã˯ÌòØÓM­´¸(?\«âŠ%wÁO;ðÜF8Ò*—m 2“<°¹ÅÖHöÉêȶ~?ò8uáËÖ{°Õ4žMÂn¸xÞÃõömr–Çr‰7–p¦_Ý|^zG ™^ÏïŵÍ4c%Ë·s?£À¯œñÆÇ)ßñx!Ï|òÏGï<ôÂ+/ýõÓc¯}öͯ=ßÙ;Oñòáoo~ùÕ£½ù篟~ûÖWϾtê×?¼øŠöç'Zç´ƒ
kœÿßø¦·Yiº»L݃¤Ñ¥†^ñyW^&h´e.t¿‘ ÅfÁÍ
._yƒ?WäˆG€ÏÙѻĥmµMp„“WÌVƒ0–†/¹	`…†$"vÅ&“\kö¸ÛT
†O쾄³œ%aM>Kà
³–´)RñŠXÌ¢·ÈÅ.ú‡�š‹’(È.m›±×VnxD¯™¬l?*—º„öBoŒđ˘v4‘P†GÌß|Æ ön6‰äÈ2„·þp��$WrÌeEÒ‘nk”“»Ü–ÉØìPÜd'#™%8>vÌá]“€¦'$
w?ÔßÈxFÃmP8{[jZÿ¶KLƬ’Ü¢#OCÀ®Ì9ò›Áè·9oIÍCËDR/méÃ`ºÑ_1Ì%KvÇnÎðbˆdéDD¢�a
1¼‘�„—}F‡œ,%kØè6ǀ˒ÆÉßäbäÀE‘ŒJ_,]ÿÕÍ\Æk	«Ø¶œÙ·åÌrq‹£2¿©'Gqt¼�'ChH‘�Gžã·J"ÞE‘Åt‘DS3¹ÈÎL9c�Ï~õI&Uª¡¸¼�1‰	Íž’rrÑ,¨PISS@âqxG*(0ñ¸µ¥–pˆkAœ‡êKþˆ­^\�nª›�fôšÞ¡¥»LˆCŽñR`0«�Úìµ›�2dþÁÒ ãzÖÿ¿©¨€D䆴†Ö£á”§ÚlÝ-ëÕB
ÌAZQ^5UHv®”
üåŠt§XqêÑ…4ǤÙþÕ²³É¡„'N�§<³{b+_9„
lj’e¨-YvLÂÍ°aYÂîòš‹
nÞ„¨-×LI¶Ü’Üg*ËÏúȆ¸uá·«ÏG^L´	-'
«´Ò#ÆK’LEbÓ,¦ †!‡›NÊccQè×plQÜ´Û;1ÙH¦7’EZró5˜É S¬û©®A÷SU§ŽÑr¢tjZÇÛboßT[`ut—ê¶:ôL«kúµÞâ6ôqþëZórO/iê´ÔØFju–&Ü‘ÿ¥øü¬Q„R‡õ§ÿÉ/)‹6ů:­d”ÄàÛ0#a>†ïÒ*<{öÉG¥ „G|G•‘ö½Cì‘¡iÅÇÆͽê(íø®mÖªãu0•óºèªY¼ýùnX&J$·±�¹$éÓzR‡N™ªšüÝ€{ç”nÒÀÛ1(“ìXàÆWÃãÂËÂ׉<Z¡Æ*uö6½G+áÝš‡üUn7Êh†2X�;¢5ö¶õ›Ç:8ºU×›g°-¯eêz³”£/rsÚYóoÁ�9]ƒªWá0N—ÔÒ³¯ñâ­'•¸qI®?Å|5Ø’9¶�*NÉzØ"7YJÿNî*äÞÛ°éÂú7jÔõÿ»Î�–:ó%#œò¢YPNÖqàÖ-„ª
m¥ñÙ³ËVmnµG=ö�TëõR'ÞÎg¤îªcåw7²„¤5�È»$1š ŒuõU‡}×`ó�
?7w!¨r�#z®ø–na§}j
ŽÏ¤Û]ìÃ
yæ0;4·{ÃùÇe,²çÎøF!.ó~{~Ъ×1lk‰·ÊVÊ[�<ÃY¾ê¶¡DyÌ…nÜyêkYã—͈æ˜Öë,n�byŸ¨4E!ZËàDûž¬¦Ðwæ¦Ó’)µ¶K`‰Dk¬k²¹Ž#¤ ç}¶BÏÚ]ÈúäÍòÏ“·ÿ­’¿½îo[¼ey\™vJW\ûÛ5±›ÞðCºY?ä4õèÍZn¸yt¶Ü¼\ŽåYÜú‚µ×û6è�¹Æ›ÇßÞ¸ž›ÑœÈÂ9·„VŽ¾n
ç�‘ìÛµWË{j1|y9ôÅÿãlë)¦kÌ£‰hÚÙŒà³ÔòÙ¡»î7Þfù×›t#رBøÄkê§{3ai´~¦71è´•CF<ZÌGldÑ[På#×æToZÇnÓ�põ1mhsö–z(s(‡rLvw4GXb~gWlH„I#‚Bv~Ló�?ÕqÝ'Ï’e¬&iÖ1÷•H(@î&g÷ÑnÖT¿µQÖÄÿm>We£öaÆæMÿ3li‡FÎá|ƒå%JäR¨S9K$§V´–Xã}…w–‚"Fknøη7f�õáTAÂU¤Ô%øþw[ð‚y1æp¸W$‘1ˆè‚%'ÂjóæHÓ'/d…‡ÿÑ_V6pp¨R
e%m
z]‚QôV6¦‰q§
È4³™žsHz¹{øI`p†›Ênû&‹�Öa+™~­†zþ1eà©wÅx™�	–ĵ1™÷Òô‰ß–Qœ·¡?g‚©Qb'Zj¥$G×wíy�O³7iéœÿs*z†3v	wY£&3ï)–ò‚¬Ã‰´ô�æ5Ú6.E¥X:“†³\?i_Y%?
oÔ‚K“QVtQ˜Ö~‡g†iòJQ´
Jù—½§jë·Š€“]TY�7饊Ñtö÷¥ÊÙI	P'4y‘¹Ÿr©tæH¸ rE�+ø‡(YpDºS ÷•ÚvŠ@šUœ3¨“ùFVy™—õÄpþõ¦DÅ˹’§Zzù�ºzŸË0gbÐ&Qö—’NE–5úY>x#fY…á¥%P&7™y„Bº¡™xXôöo˜ ÍɃM–“4cx<©HÐZ~'díb~åõtšˆÀ–¢˜Lru¢ðuÿDØgâb¤ú( -¢¤Z«IE°À—/%z6è63‘j‘yD:ôˆ¦Rçf�X[Æ2iû!m¶”ªòumvyýÃuœr h„ºEt|'±Pª?m—Ò‰M¯fv¡JŽëµ6é‘3¯jÚœ™Ÿ)ztkFYÙ™®7œR3zš®iâ“È–	â9&ûWÓfzVVq"ìÉ…9:c{	°1hG%}̹�=7¶4›r
6…#WªDv†´± ëtC« 2¦y{(·8ú6s�QöŸEã|¡H£çXhJë¬É
{ê—”â™l胇‰BlZƒÂ
´UÙŠÉùP͵€Ä¸T Ù•CTÿ�”«@w˜°î®‹)·Ý‘£–ö ehqkÒ&(:°À©�æy¯Qó”
ü69Âý±µEdŸôv~‹jI§'/ÉÙ†²n¨µLY5Ó·U=¼»ˆͶÿýZ”¢8a”°÷»Sßû’ub—%Õäm‡U·`,0ŠµH÷Z‡
†î8€»H§kt�ØkhüN{—y¹Í+Àt6±#Ķš²Û•3üí7Õ�Zµ£®mb¡érÆ{«IÂõ›ÕÇ
(‡0\v£jÿ—ÀhTIRdLË¡ig™Ø4`
ü6û/ÆÙTÛdˆMëô›�avµß«A¨£Á´•¥æÐh³’˜ÄI¶p„Œ3Ÿâ'>ûµœò¦lÝò”@ï>Ë€ïª*Låð~Å
Ní)Ü›Ù.Ò判D\$–ïÀBÓÚÿ®òbœÝiŠK{…ØœŽ·¸öU�åa3<Å-ÃìÌOL
¨a© oFìx.[·–3üQ®fºv½B^\Õ,bÄ,=¯>MR¦b¢igk<wmA¦2)#�œ›ëLœgyb6½XmÉã4u�óñ^¸Ó}ûþaM˜‘�R¿š9;WnÒIgçLÛ†·EœH1	”'I˜P-qr½¿mc¯­³ÌÔ
ï-Ç0®9¾t3‰­ìÆ;¶¿XóO@å®òË´ÆzëŠ9 ¼ã¯Bê$Äk8¤J,ͧ©ÀBé³®Š
-ÅžD<ñ¹¦Ðƒí7‰›Ë5¯ÒÿJ°é¼0¥‡´�ÆïbŽG!�,Ê%§œrEkS2'¶8Ä°²+
Ûf¶"ñC³¼2MAŠ®ÈýbS6Ý~›9ÎÀšñ.ã
º	,䘌‹84�cò¯mÚƒH"ù.J	&6ª¦EÝòò‘¶¹øD�H5ßd:/5íÎ,)Çz+­ô^²UþDmÒ571Æà.ƒ5¸­le­;’¤À@?ýÐ7wRq37‘2ê, %ÔMÜ^
Ø5Ž2\ÍKqªA
ôU×+Ÿ”q»i
]öÌN5­Pµ�U5V/{}ö$ñ´+
9¿Ö…1El=#-Wþ®;,' iíp^)ËÓBvéÿ•´ÝÜ„»BPû
«¨õxBô=Eå›/#HQÒo1Ø~m×FÝ"Ó–[½„Lo¥€–�Ú…_³‹¬ù�xL1éOÔZâµZœÓDòÜèêR¸GÔâ•xSV	o¯rÞ´RYe®Õ°¦ù¥;¡mRÚÛ¢ó<9•þ6Ɔ+TÒÏ—yìˆ`ºŽÜùm°áÞªm»y“á�O
PkN±c›ä-“½{f’o„5iƒ
�’4Zhu˜N¤•ò©\éS:-Ù̯
î[õ¬j>Ÿ6§ß�NaÏcèn‡Ö2Ž‹z,sUd3kÑ¡ò°;ì1ˆç6º'Ìðc×™"ÇjYÏ¢2=êúkA½&@ÙF±³õ¢*7åS1¨*cÅQYÐܽ®É“õL¢A˜ÖÐ�2�ýä×áúv·UÒ°ÏuëS‹×»Wy—¨
L_^†ÙÕ¨o{æ…*‘KTi¦*§´“$5“]Ý&¦·6Z
¥®K?”B,’èõªÏÒûÎÊÉWQÿ«dìÊe>ꔉ&áÕåTe$&JúS¾´ëx1æÊ�ɇ>4ŒjÍjÏIŽ¸’H‚Mó|J­q»luíFYÆì í(T
Ã%›I/ÇOeɺø»8*91ƒÂQŒYMe©ÜbðX)™„²÷
é·€äNDuºÚÛî¯kSøÑÿ.V“H¬m¹òÙ[%YÏ nVÓol&`î“¢°Y€«[YÞ/±Iks¥Øܤ*ËpM¦[¶‡Vª)¡Æ6:̨Fá§t�ašŒ‘õÜÁèù»Ìe£Ù
�ÉcÞ‹_áö2“…®XÿXý³ÏÆ9öºîŠ uFN{kwédäÌ®ÌÍ]çK`µ¥í[팖5íAr¾ñ:YÝHÞîÓM&ç€QÍÍe·ö�ð²ö›vŒ`ÆÑù<aE䲤|mª¹¾Žvô©ñJŽ=A	�JÈ
5ëlZÆÄ’õ’PÑmU¯)¯Š­q@©ÉË=ïr<x…ñÉâ˜LeG“ßÊñY–Ôn0ÛW£¹¬#ÔB¤Y‰å™8V@O~a-¥ÆŠ:Oeñ°6ìaA8AúuòÃyçNYt‹Ñ*ùíRa™cÔ4*®¯â ëg§[§(õ+UFŒïwÝ(Ð?%Ä}S´%;XFá½å£õJÒ6ê´
oùŠùÿ™a&×¹¶ñU�ÏëñyóúX¢›Ï:è!£ƒ”ÄB7.WZÔÁ¼gw/4’Ò[nyœ#æÛN¦µnÑS¥…KèñΗæ5„ÇŸ¯ˆ6⪺­’Éÿ�8â,e1ukm2,4nú�ˆÊÆZãsº^¯f掘Q
ñ¹Pl³�mJÞs%ö‰a¦RKžÑ¼GhúØ`á£aÈ1(4
ÄÁ{Õc;úƒ:ÔÝgÖá
ïQߊsljïºwªÖêe£;æ³0{›>üÁ±œ#²½é(ß+—ËæaÀ¹–±B<a=¢!°àŒq<±‹¤�»”{³¬ᢅ;3‘"2òBu§"ÿó5¹«Û)¦OÁ®r.mÛ9Ü˜¬û$b몾ڡì2µ¹¥‚­˜Â�¨%uƒ–A#
žê4qs¦ä•ãy!<0Ó°’Âz·v«/
‹µá?jé3+œ¦ÔÉ¥rïà™58£ ô�³¯c5ø
Á¥«±0‰ÒA­ª"é
£Ð¢ü Âr·Sã6B¹¦'ÿ¬¼
Œ9–4�‰Ívt<ª·¨K®,’ÅÍÙ·ÿè<†SDï»%ZBŽËÌ?Dô'ÍIÍ’ÍC7MÙ£×Ò™›”•"ÁÌtÏÁkKÃÛF13&jÌcÇGÒÍ¢˜Nܬ/¹LºTJµã>‰”¾¢´.k¼<<Œª•,™ùb:Œdº ÿ“Ää‘yÛÌNj­ûQ‰æüOŸRÌl,K ܽ´„�ìxË?¬¤ûÁ¼^C5:McÊ!Ú‹$©v¤¼<<+ú‹8Ê� ‘œÏ‚›!K;¼‹»01ÝŠ0}ž0	S
3,¤Ó5åœ4½¥g‰»2«SáÓ
<e×xS?Ó@'—˜SÎ
Ÿ¾c¡ºyÓ>ýS>©S	¿E•�’ Tê*T3ÍÓFå„dÔÓ@SõpÔ‰šÓEµ8•Ÿ8õT‘¼¥HU¡â0ˆòX™~YÕ’@‰¸»5C	¤	�B�S:õÕA]ÉL�D�Õ\íUBEÕŒb2@­T9¥ÓÑÔð3V;UÍhÖMÿ8\EœOÍS³£ÖTýVLSiíÓ2�(q
Wm=Ó¨¨Ô½Vã"W]Ž‰Žmen}ÖÆè;s¥THêVpMÖjÕo%ØdÝÔi-AíÔÚ,”]5T
#ÓE­	R :•XoýA€…SÇ»XðèØT½Øk=›…8ˆy ¸“Tü¨†y0�CQ52µÃ
1U…EÖ?}íñÓÑŒ|uׄ�›vU×kí•v­Ôåâ™ïj‘‡QÁ‚YçÑSUL²ÓHZá,
‹åXÈêÙ��W—ÕÈ)Ía¥ˆ—©Å½wEÖ]9[^­ÖKM+³Í$«·½q­>i!Z�].Ú°ØõÊSZ{5Ô¿ÿ­ZÖšÙŽ¼šÀ•—„�Z‚ÕÛ@­Wž)‡}» 	×]U›Ä:«MÛrU®côÔÐÐ=¸-܈ÞÌT-óªÓ�5}EXÑÍŒ©]ڤ͞¯i…ʲíÛ±­WðÚ\a…ÚÁ�«›èM}‰Zö$Øí"�@Ôšj
¢cXYÉÿ¼ˆ®$؈K³Ž¦*®a
EŒ¡à)­œ,MÐZ´œì":Mt6F>¶5+­tâ
¹™„BR£L¤a)6 MbÆC2Q+6¾¾_vüÖbXTâ0ÞH�«Ð?Kãi;à	Lã"¾Š7Öâ%•ã÷u+<A§Rc1ö%NAåbAV¦mà’m%‡h¡y�é5I�€dÀÞÔ
½B#˜�DA´$ŠÏ\à€ùdº<RåKFA^b9ðE—	ªß
†äè-¸‘çwo7?Šh$p—oz¦Wu(Èù‘gzz/xŽiáÐ�Jú˜§ÏLw)ðz¡ÿ÷û´/õ ¿úN|vwú··÷«jÀçô»oü¡§ÌE1IÉd—¡è…äöÒb¿—z©—y{?ÉÂÏú›÷|Ã?ý¨Çˆ«ovU§^�7IgùÙ§ýÚ·}’�üÛ×ýÝçýÞ÷ýß7užõÅ—¡³§|¹·ˆ¥�^p§4HùJ?´_x{˜—û·/?H¾æGúÜ—üÈÏ}FùöN¿õÐÿúEIþ\×~ù
”#ƒrä¸Ñ"Öž3wªüÈ3eÇŠW;†½:ÖcÙª‘(Ü8’Š“ˆ'�Ò­k÷.Þ¼z÷òíë÷/àÀ‚Þ»´0âÄŠ3nìø1äÈ’4˜´ æ¹E�kwóÐΛ•}x¢À Iš¨nñõMÌI=šàÒѺK»®»”áåÞa£&NÚõm£A+g]}ü �l[?8›`å“ÀN�áÄ&>’•-{ùÑ¥G„DiÂÄý{&HäÓŸo¿>þûúó3éï¿¿
*Qß}LH`ó%¸`�Èàò·Ÿ‚ÿ
!EFøÀ@[x‘@>¼
bGN,�
(°køQ<œ#½îÈÃnШF.ª
@	αkƯ1�_ Ã>‹	ÏB)ÊQêÅf¤<%*S©Ê!!ÁèÁÎÀ¼%4àB{›šÀ¶¦	Á
Qè�–`„(X!	Xè¥�– „(°	YHˆ	Æð»²�zo{B”�€/,óm¶D[.—pbž.*l³Ú‚¡Á	
	FØQ7“0…‹X�	(HÀ”f3´¨vF`B„€¾�œÂd
�áØ>V’ÛЇ3²±FÆÚ£óà2òE›Õha
Ì“bI¯"&
c
ÚðƒàsB(œ¶ 4@@J`€’¬„tÁ	 ±•ŒÀ
1ô 	&xeíâ?… =àª@4h3
JCŠ½¼A	'È•{€…4
^÷ƒ
¯þ uŠ‹ñ´
8­>ô7�ЀºÝ†æS;�
L`€îðÙ„§^?z.AØ#=*¨bç~µ•@LQ	d2	à#,Äj#!Ñ€|°€1\Y—,óŒDSD�
,ÀSCOÿ4à0À
0ÓT½ÚÁ	��«
ÀÈÇÔ`4

¢#b#
ã]À¡Vƒ@ÊjAÙ±ÅR At	Dö
2@)æQ58âÉ!¢
ÆE´MXŠ,A(ßË(E”€hÁÍIXM,À|ANDBhPÀ¨
4
ŒmÁ–lZDÕŒ$Àö¼
�‰Õö”¨€Ô’C!
Œq“8€§™Î˨ŽD4ÀR™N¥�ÀÐÇ,À¥9ÛQúÀ.AœÄ<%�pA
Їœ»½ÚWÀ6�Ÿ�”£p‘V
[ôÀ
‘–;àƒ4è\Èù\
�%€ A¼RLr€L¥$‡-1ÀÐ’G°E”	X%Tªˆ1€§UÏHSõ˜@àSD½Í•¡�
ÿ¤yÌ -)Ah

(
X¥ñ€
¨�«%@69Ù«IåM•Ù€€|Ž˜tÁ<R9Ã*NÄÐvU=ðÕ@é4øœ=NCè�—3l×ìÂÜ	À°0Ãþ0€5\ÃÿÉ9‰

ÓøHAI„-µ™0Á äFËD�°GèŒ�;‰�ÿMAÏJ½k„ÉÐ`	ü„REG]ÚEô€·nYV© Y¾tpŒ€xP
A‘„HL[J>ý€üA�¼Ó;…
\"
l
•-ÁcZM˜ 
‰�
2!1–ÕV.Oƒ;ÄAK5LC.ˇ;�D÷64Îh¯CG´DCÉ”¼ÄKD…[
f£ö1t60H¶2pjkCn‹¶.üq2`ƒdWöhÃk#Ãnc'1·dgöcÿÂes'E6fkÃ0ØkÃU@Ä‘m„×@
-sŸÃ1Ã50öd붮œwdƒ=¨¶f§6vgö/@vg£v~_62è72àŠ®lö}ó÷m#wÿj¯¶dw¶7 6mçJgïw~ïvj÷e'ƒrç
1ˆ¯hL4‡7	Dw8ˆ‡xdHŠ_ÈIV�„iìhnÇaDwЊiÀxKO0Ÿ€Æip6~û‡‡˜ÇeXÆCÄ	fÜFXøI6F�k8F,�™„A|Í—´¸G¨F—XÇ\
Q0‡�ÒøRˆJŽ¿ÊFÎö©ÆØõ86Îœc‡Z`…�ã…‡„
]ä9�[GŸDw‰ŸºO4SœhI`—„¢WI¤SEBd	™�6
zEüùuP:¡ÇùrPŸ[9£;EPkÄ•àF”‹¸ªOƇ¯º«¿zÿa ù]yŸ¬É1Ó†Š¯dIh9]´t•‡–ÆŠó†¨ã…˜pF]ltŒ'	s8Ç–}UŽ×úa„šÜ„M|MÈtk4ºsÌ
à¬xnû	›É�Õ¬|	épI°gG°ûDW§¹‰kùh4²»aØ;¾ïɇÔÆi¬x—xÇl {¯cGz`#zЫWhop{Nìºrj¿ëzŒ—Ɔð»QÄôËt¾Ã:ÇÿE«w<ȇ|]O]\Æá»·ï»ndû·ïèBüIp8üž˜’‘_ü²çEÀ›y±ûáŸÄ†OðôØaÅ´G§¤:D$EL_9¯{Ç´û¬XÉߎƒG»ü�o¸‡œ
ÿ…=N¶kƆ/×n¬|h€ÆÄ«»›�½Æ{I¸—ÉkÆ·ƒMÄï{i,Š¥«{³[»g0‡�cãÙãz†Å=Ø·I¶oø±Ó«×Ï|²{z|¼È7~Ù;>äG~¡Eµïºf



From shedges at users.sourceforge.net  Thu Jun 23 13:28:29 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 23 Jun 2005 04:28:29 -0700
Subject: [Koha-cvs] CVS: koha-doc/es/sysadmin/templates/imágenes image1.gif,NONE,1.1 image2.gif,NONE,1.1 image3.gif,NONE,1.1
Message-ID: <E1DlPsj-0002Io-6Z@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/es/sysadmin/templates/imágenes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8780/sysadmin/templates/imágenes

Added Files:
	image1.gif image2.gif image3.gif 
Log Message:
Graphics for traduccion.xml

--- NEW FILE ---
GIF87a€Ú
çÿ
…qèР>{
U¨´hΧ u
•"`‹¤`€�³hϪMËVm„µp%¤}köm³ÞJP+7ïY¹vý¦+a°ßÂ+ÖË8qc	Š!'†Y/åÊ—#gÞ̹³çϘA‹Mº´„
2dV}™µÖ®aC–­ºöëÛ¶sã~�:ƒïßÀƒNü5ñ¾‘®|¹óßÈ;x.z†éدkÏŽ�{÷ëºþ‡/}¼ùóèÓ«_Ͼ}yö*Ú·O>~|öñëÏŸ>ýüþy@ŸLxUa¥�TTáDCQ
~… „Xå"ltÈ 5Á�hb‰œxÁ)¦Èb‹(®Ø¢‰|P"‹%jPãŒ5âÈb�iã�:ê¸"�?Ê裋Cyd�Pö¨£”#ì8äUÙ£’Qvéå—=Ž f•d’‰%–bžÙšiŽ)f
¬9fbÒYç�#Щgž|î‰B€*è „šB¡�ÂЂ‰Ê( Œ¢PÃ5 Z)¡•*
æ-lª) ž†*ꨤ–Jª0 jꪬnzC
þ©¾zÃ
2Àê©²ÒzCª2à«®0̺밾ά±ÁÖ@+®ÊÂJ«²¸öZë¬Í.;k´¸
«í¶ÙjÛ­®2!ì³’{¹áÊð¹ä
ñƒ¸7¸Ë®°BÔko½ïæëî¾ù®»î¹çÎÛo¾
ûËïÁìf€H‹ 
†¦PD
v`q
5t0‰l áN¤Ð

$þè5ÏkNÙ‚[öØi”€Zéä‹IZÙå“_–™f�UBéæÜtßp&þœ¤Ýå
œªÞié‹¢Ú{¯Ãкªªòº)ªÅ/*ñÇ'ŸêñÃÆ*-¸ÚòÚ+¸ÑFßëóÁn¿+¶¨î¬«Øo¬±èš,ú®�~·äRà‡qT`€`@
ȃXD„�V©¾R°d,
E¼�È „0iE^Xa½ú`†)@élàR€Ø¥)¹�K`‚Òê7º…É‘�ŒÓ™æ&·IÒMn‹Ã$åÜä�ÈYîr Üäè$—&Ì}r�Ó“ PÙ‚Tþ©OƒÂ¢
A,è¬ŠÐƒ
!XuaÈ0¶"Úëep¼€D%ºC3Œ  MD¨
ÇæÂx‰7¨¨2áE!ôSÃDÍðP"NŽ0€é�ˆ_ØkS½€¦à‡"~À¥~„cJ‹°ÓzU
‰�œp*Ìʧƒ,BnP
>c/”ÙØv(„TàaC=(*ºÖxá}ðiÎ>à­
ASä™üpPšú
fIƒN…�!ðx$€8‚²Rûâ‰$«4Å‘.2¤!áæµÎ>	n Ó<�ÈÒš¶‘Œs䘇¥Æ™INnšþäå'IÊ¡À“nŠnM¹IUÒrr¯LåãnÛJV¶ò•{B%+oË'xw©äÜ-;]ÜÖ¹ØÅ® n‡Ý\>ªvÎÕŸ˜w+ëbÓ—ªúeó~™LçO'YX2ƒ"tà+E :@
68(þħ0€v"¨Ê
kô�èÔ	*X-ó‘ \ÍaÑ’&5¥EÖfAÊÑ9mĨy:Ô0úb§Ûx%/e–�ˆ,ÛÛ¤ÔêÓ&’³�lä™ÇHÂ]òײ•mlïV[Åá–r¼Å“�~Ë'äZ.¸£Ìr[IíQªr¹³#T³©›Ëé7™ÏÕ.t»+KîjªÛXb‰¬�Â&Ô
°áAñ¼'
HDÄË-…iBÉ€P2@"N>ùòÐh�Ý�ð(*Ø<ˆALùS¾«®téF¯b*:áá@n°£ð¸Ö°¡|œÂÆö�Ô´°Lá*ƒ<
5T,Q%€â_æBWDP(¨T¦
NP
2(ER.Å
�cx�WÈ
ê
j û	Ÿº ø	xj¡šúž ÷yŸ
ÚŸ ê ú ûY¡
xˆ`¡ü¹¢j¢ùÉ¢ó© ,ê¡ó™ 6
¡:º£4Š¢óI "êÊ¡A:¤3Š )ú¢+ꢈФÊŸBJŸ9*Ÿ8J¢j¤Mê FÊ¡BZ£YŠŸ��¤*ê£$Ú.j¦hú¢5*£j _¦Š¡)*¦ú¥tš¦
ê¤fÚ¤Uª¢+Š£.Z¦‚Ú£þuº¦gŠ§{*£`Ÿ[šŸAJŸYJ
* ”Š–j˜š©šŠ©ä`䀚ک›:ªžJª¤
ªœÚ©¨Zª¢ºªœúªä ª¦š©±:« Ú©ß€©¨ºª®:«§:ª»¬æЫ·J«ºê«Ãj¬šz©®Šáp©Æªªê�© Šªz«µ:¬–êªä ±*«Ÿz©µÚ©ßê©Ÿ:®¡ê©âº©²z¬ÉÊ©”:­Èê«ÌZ­í
«ºÚ®ÙZªéª«Åº­Új­¥*°Ÿj®äú«³Ú­ÕJ«úªª¤z°Ûj­Û©ê±µÊ«æà­Êz©‹±»°ÛZ±©ª®K­”Z«ð°!˪[þ­ÿš¬×ʯÔ*±2˱%²Çº®ï*³<+«–Ú®Öú³èP©?«°
¶o;­jÛµC[®;°ÖJ·ä$«²«w®í±[°.ë¶
k_«©ÞZ®»ªÙ´ÚÚ³çJ³,ûª¡ÚäJ¶ðš±—Ë·j;­B«±¥Kðð­ß:´©«±ë©®;±êZµ0«¸w‹ª®…«¸—ë¯<k¼«¬²+»õz·[¬™J·¡²ò
¶|þ»©‘k®Ñû¸äݪª+°•«|û½¬*¯Õë¶%ë°øZ¼¦K±îª¢z®äZ¶ÐŠ©�;¸è»¼¾‹»qû·Ò[·Ö[¿Vk°tªd;¸¢šº¡û³ºú
¶‹ºH{¹ß:¶°+ÁcK©±K·f;Á�Û¬±ï`#l¶�;Â{»ðÐÂl»'ÜÂ#»'ì­3,Á&|°ûµ¶ËÁ¨+¶®+Â×+¯)+½EÜÃ&¬±™š².lÃ.ü'ËÄ<´Ü­ÓÊÄ%ÅVl»VœÂ´kÃåÛ­.<•¯%\Ád«Á´kÂ9,µ¦‹ºKŒ´ÖÚÂ?¼ÁIlÇ ºÁ zÄ”jÇE\¹þbÛÂíPÂElglÈä
4,Ãêàï¹ÌÅ=fš	 ê�\±
ÍÐ=¯1lËê@
Ï�ÃÃñúþ]*Æ/ãÐÈ-L±õÀÆ8LÒIÃ,Ñê°›Ã9©�
-ëì}0	ÏàÊ	m
©€ÍÁÌ\²ðP=,ÁAM©£°Â-¬ÐÝZ=�Á"ŒÅñìÐLÇaMÔEìЪªÅU-Ó*ÄdlËvÍÄ0쩶|Ó‚LÄcLÑ=ü3-Ŷ«Ê/|Ö!½×(íÐ"LÓ\\ØCmÌcÓ�Ó?�ÓcÖ?mÖ3ŒÄM¬ÖWŒÓ�}×x=Æp=Á4<Ö’=ÙcœÁ ½×‰­ÎüÈf\Õ³ìÐ"=ÛÉŒÓ-­Ö¬ýÖf­ºb¬×?
»m�ÛnjۨMÔ«�²òÐÓ(lÖ–þlÖ̌ߠŒcü1ûœ
¾ �
³€-,lNП¾Ð¾à5`
aZß ÖÏ +êê�
a÷ܤÛÂT°u~�	Ù0	÷�	ü<|TøíðÐÑâí�`
K�	¾àÔ� Â�ÒªÜ	10?<íàÕvð0ýìÔ×àÔ°û
ˆ@?™ðæ
¶Ôà^Ð
Ï0s*
Ãj
ä`vfàò`æVn�
In*-C ÔSìîÂþn­"žfà¾`�0+Ÿ	wnæã­æÝ,ï@Þõ Âv~ï«ãq�ì«Þéq¯æ|÷tnèíÎìVNÞ�>ÕÏnøo÷m}÷onío�ÖŒó7í£~ï"Ö|Ü7/÷¾=è®þøïê{?éo>Õ²>ù†_øŒnæ—Oçrßéœoø¹NÔto÷høh-Î~êh]ø¢ï÷-<è³/Øq/Ûj-㨿ë´�ûjo÷Âþô�ô"ÜÖ}üÖ~ùv~ûµô“oå‚�ønmåioÏ)`öPøàcæ�“ ™0Ü.v~þí@1ø4	™ äPÿž

WRç3žÉÀ'²ñ°g¨˜Å	yØh)›>Bĉgìȉe*♨˜‚NÅìÄxv‚GŸÛ,´‡:ßz’‡®=ëÒçW>÷t±×^[ä‰9\É«‡D={¥ŽÏa‹Ý“.ž¬õõØž®mîØ=�ýÕÚùT´Xdér¶[ÃÝÉ7íãÉêŒÝ©×\Õ§^kŸÖ]Üpå—\�‰åµ'Ïøü°Y„-ô·]iÕ�í¶Õ¥÷ÚçjµøViùµ±ÜÝn$VžrÅmÑÞ‰Ö^‰‰õÌ×zIÌ[t)Þ¸ÚÏbFØV>õqÍBÜ þu™T�5Þ¶Önñ©vÛoTPÁß¼˜ÅWÅ%3̘¥Ý}àYÊ¨ŸqBŒ®ñ"•®	–D|²ñZl�ܬ^*„ð§l¦¸[Œ©ðC ávšAÁÃ	D ô*S31'�,Ûíu”Äè�/ô¾¦J¨§ð‘NÎ>«*
Ïá�³2AË)Ðñ¸žv<ï’Éõ¦âRb&¡BÖ笩’otÂÃ'ØPÁL/ëÉ£“<¼BÞEÍwD|Låskظܚäs Â²�Ô~ù{ËÕGÑmåÉWçvaÆ[ÍWZn,[÷wŠÞž`-t6X}tÖ‡?Ð÷?þÝ&~åÓýþÄÇ“ø‰L´�ÿÊG,˜ùFQÜ“­‚5¿ž¼¯'ð[Wü¾ÿ9ËósÑå@‘}ˆ€|×yU¾‘EOm$Ñm�æ¢Û8ma»4è0E]ðŒ™r?iÅo7îÛ®¶UÂ¥PGŒó¥®¢ìŠã‰ûœ–Àòjcꪇ
};!†”�‹v\#ÏP:àá‹Y¥¯ß F&DisøB'â«Ç,á‡Q\#ß�G^²
kXãõ01ž¡k¼£NÉÆ,²þ‘�kÀæ�Ç3pa\úaþø_V
‰l˜ã¾0‡=¨2ªb"òƄǨ²á‹g˜C'߀e5Ÿñ
€½cœ¾(æ2f‘MYr¤5Ïx>ú?t¤b™ †;M	�a>Ã’êÈG™
¢Ø#Ö ÙgR±kdcè@Ç,¾IJ—<Ã3ŠšßˆòÈ]QÐìG¹ô7¢~¤4��L>¨(˜¢¯\�<¡ûDŠ«øAs�
Dá
õÈ4Fñ‚
ü_ôö	ÈôA3~cmj ™ØRþísŸi\júÈxþ#}ž4�nMŸx¿"¶�QÝàY¯ˆW�JkŽCåiIɺ“ªFµÄ_N™ÊÄ ºU©•$NáŠ+ìSŸdtãý˜Ê'Vg0lìÒþx#tÎ	NðÂ;vÂÔÕÊ鶷UÇn•*Y at fƒ
¿uBYXºÛ~„¹ÉµÇ>¢ËTéLºtUj «Ýëækµ’º­¾��}l»¢]àvñ§Ý}”4�¸@îNª«Þ¦n·“p†Š0*œªT´Ò-	F1?ÞöÃà½mYp*ÝÜ⪼Òn?×ê–V®�ÍnvuÝ—ªv†+][JSéê³¥/í‡?Ú‹b¸´N±]5ÌÜþ—†Å/êŠAZŸ6¥&>q…qa at Nx¸äå­…Ê{ݵ—¥Ò2_ý[ã'™ÆâÛñnõib€ý÷¦4ñüÙ“T¾Ó­¢\·|^3Ÿ˜ªJ
­™U:dïû@Vj{‹|£_7»è-oKõŒBážØ¥xÞóƒ}ç#ÙïPAMRÑÞ˜Ç#†i ©lèsúÄqæñRéZÝOsÚÏ—¾t�[üéTÓø¿ŒŽñK5]c@–öÒ
ätªU|c	‡ÖÂÓ-퇵<bÔÃÓÂŒ÷ìPc³ÚÓ•.õy
M`·:×­~ñ¥m=TOÿẔæ5¬S=íIߘڛ7[…{ÂÏþ>ûÄ0.u†§
ïr‹øÝ1ö½Sœïr�ÛÝlm鯵
î»[ß?¶¯ŸÍã]GÅ×÷¹+�퀇šà¿w´þnŒg<àç4_j�oü#Æÿ0y?R®rN›Üä%/­Ë÷�o”ÇúNyÍS|s–ß\ç,oyÉWÎrÇå<?qÍ_¬ò”ç[é9�uÉ�¾s¦¿¸é§:§cpŸé'ßyÎuna¡½¥2gúÏÓs’+½í89¿™¾s¶·}ßNç¹Ý«>훓Þ[9Ýós¢¾ç\?»ÊåÞw˜£œßmïúÜ}þî¥#=æVo|Ùït¿+Þéw§¹âg>o©÷þýîüþ:ã+ß÷«Ÿ>ô¬wýÒgþâ·ûïHW}é=ÏuÈÓžð
·½çoãš�=ïû6ýñ›.uÙ“}æOÇ÷Ù›?ûÖ÷ã)ˆ�Ë»~tîwÿèB÷þÑÓþï“ßüçGú¹/õ°«ßýÅ¿ø·ï}ð;þü¢×~øÇþçßþ÷ç?£?«¿ý#¿²Àÿã?É3@
äÀL@úÛ?ä@ä¾³3AžÀä¾rˆ´þÓÁT¿ÜÁþóÁÂ!üÁ $Â#ô>#DÂ%4¿Ô'&„Â(”Â)¤ÂTþÂ*„–º¾ÀÂ.ôÂ/Ã0Ã1$C”[~(Ã4TÃ5dÃ6<:Ùr·8”Ã9¤Ãx¨Ã<ÔÃ:²g“¤Áª:”‡w Ä>¤C|€r`&C3&C44céA„DGôÃ?<DH™=4±Lü1wÄ^Ù²Iä4|ø†e ‘Akø†:܇Vä=\‡k`:/:ä‰YÉÃ[ô·9„—\¬‹]ÜÃ`Æa$Æb4Æc<1Õ
D�k6àHŽ<HkPÈwû0¸¸
昂á‚!¸†e0æáˆ.tÈ�Pà
"ð*(/À‚¹u„!@6‚opÀYø…Qð�DPßèNqPÜ!µç}þRd�ម…:ðç@YYD(^…�(•Î}%|ˆdÝásÐ8�rÀbIPƒ°üV}P‡j¨†2mÍêÒç+}Vïâ	rèÊîÎz�ËÕýi8Xa¶_˜Hè–xq„K¸ap&".#ˆƒK¨‚"(‚l‚ è*È^Ά�¥I…‡A¸…K¸\€^¦aX¸…[HXðqHHÈ„T…QЉVT‡Lðƒµ^kqk®Æ…!Þ	t@ƒ4ˆ4 øɇœ‚îñ,ÞëNPëE¸7†»îê!î	xë[†z†gøÙƾ\héY¶þrPƒ3>±áqÐ…Úu—î”ÖÕÅèî<uHáî,1ëÒš>J
}¸†uøMª‡cxäj0rP1{ WI�„ÒN�zÈE¼Ùm$‡ôõj@{€bu�)“ÓXaoüR©EíSÐE×ò8�q�-ÓbõÊÑ×ýpc2ëyœùí‡nEDq
u„ð�*˜�¢ø™–�Qø�T˜wnþf!¸­<PU؆Ò@�(6ˆ
'ˆ�5¨
'è…¸�ˆƒÀ3€„d€dv`0
À
…÷
ÍŒ«ÌÖ¨áÄLT©A…†3»É�›;¼7½$ŒØT�ÄJzö¬h7‹FJœ(P’ZÕüù«v,VØԄª“w.ç8¿öìÕwêÔ9sBORo]‡õ®½Ãö�&­WÑ=?%I‘�KhHš.X6tè¦Q£l¬/Àh5wì?íLsŒ0Œ3Í4]ÀÒ<4ÕS
LQH¸DLãHDÎ8ÑH�sÉésŽ10Q¸Dz§XØØ7µ�²"+� 
ˆ�É£�ýì³�8þðøÓ<ÓÀ2q¢3$)»¸³c?õø¸ƒ‰£Ë+ÈpO>ù´“Ê4�1È``~äÁ0‘]e¸|ƒE*Bâ
³¡ˆãtíÔ‘Äcì
Y4N?úè³ã?/ÍKN¬±ª“þ&òö�?öТſÄé¢ÕØ
¾´ã/»ðöÎ&¢]sÇÄøq
,Lá‚'qÀT‘Æ	Y™‹l3/Ä‘“
ÎñI¨/LÁ‚Ž¤r‰Ó‰0i\‚F8èàl�|#M”�58‡%N&�<ƒÆ%?7V�8y™™dãÙËÄ×XÐ
^sM. ÝqM'“X3ÈŸa1øLSi•4nóƒâàFË»ùÚƒ�?´Ä¤Kc
��röècÏ9æU³å–õý�
*àsè5ßµ^$&v3ÞÓ
¸�ðHÀPóúëÔ #À
9ÒI'J#»SJ)Á4ÒŒ2ïì®=mÌáX�»JLƒ4Š²"ÿóøÓ<Ä!;€íŽ6Ô`Ä+¦D¥üð´¡Í†“ŠP�
5P”d°ñ1¤	`æ`ƒ
P™Œé
¼ð‡#èPeÃ,™@Ä Ò¦
ÏÈÄLFò'ðp,Vtð
HÑHy
‚;¶�…1lC�xU‘
PIGè¨
'¨�ä`C…7þ!�!˜Ceô‚€€CÈH7~a
ˆàN
‡4š%�Ù¨YÎ*bcÔAŽgˆ
( ! 

@
` `’2‡R °À	ÙXÄ
ÐÀ7ø∾`:ÍÀ†> ƒòh‡/2ñP‰*~ð�r@�bðƒ:¸B6
h£¾Ñ�5db$æ F
�‰g@âºXyÀ(þ1‰<¤–è’OIcاL\c¯<ìt]C
«\%+þØ€^—WÆv˜ãYȧ ¸…V˜§”Í}p&¨`*ƒ2,„"š10<ÁFL`"…X
V€‹26§XÆÚ‡=¤ÑZq0k©ìaÍØ0X
V
¼ÃW…CE‚;äC7•$Dœ
hÁ1pÝ댃¿ÉŽ�¬~ÔUÒ¥‹)ô•*8Ñ‚Ãñ¸EÒey×Pi
ô,�õh[ò^e
Õ´uÃjußëHÃèAs})ˆÂ7”ÝÑH§é!<øŽÈЂ (ƒ�˜D�hÛÉ	×
UBÌNº`ƒ(ì‚Õa eM\.à4øÁðÃŽˆ�òiºÐN±áAÜ?üƒ%øÁÉåÕÜéS 
þÈSßeàÞ`À<@`C
€œ€ñ’ÅCã=Þ8Ã4>×ëXƒHõLA
ôÁ.0$A”ÀÔA%˜Á�•‚ üAV–8ñHñä&lBòÜ-Rƒt.xAÔ@ XÂ(Œ”@˜]ƒ=Ð|ƒwœ_EÌÁ˜*Í
¨Á(mÔNHÎ�"H-HBIšä/`ƒ=	HÊÛúEäÇ(‰ 9Œ1àO(ô$Ýi�/8ÈYQ2 ÖÝ7±

†ÏVlB.\-ÂW
"ÞL’Ã7ÀB.`å³L\F>CƒÕº|ÜîÞÌ¥:Üл¹cÅÑ5tþŒlć Iáùéáùí_h Á3(£Ö)"9àHæÄH¥-L–/òNdÇ4¼å,ò%ÈeÃCzUwì%h�bÕÃ9�v�ö™‘PîÜ,´&#Àè‡Ö©Â=A_uJÏ4äÕ5تíåMuC5ØB5ÌN§=�w)ÏÌ™bÁN•`|Ã'|*èA-XCþD×

<ìƒIìƒ-V: Bè�¬Ü<tgFôpU‘P�%t�ØÂ*x9¸b-4Â|ƒ¹•ï¬P,!¬�zÁ�[§‰�:x	�®ôA“¤TeUÞÒ<C*àL×
hƒ™�˜‚,ä�þP@ªLÑo‚J;<‘m’cŒlˆ¾N*˜AĨ e5õ&10Á À8Áü@	
(Á”
Ä@&
ìlÅ"˜ßH@Фô’ø¤–4ð
ƒŒ™ƒÄŠ­PàB
dÔ‘.Ï2t0Aä
s”q �ðòràƒ3±9�ZaTp	¿Ã3¤
-
��ÜICI¨±ù.GÂD}ç8Ü°=ȃ[±þ=,O¾†U0•„{°‹ƒ¾’37²r s}„Ó±Îe²óð§73_ò»Ü01)G%ûp	ŸðÁN/sÿ°Os׳=»ó£°7³;£0#Žq7±ð;Én}ìfä´_`„ðª³%ñGp
äœ�èƒ�ØÃÿü¼äKl%o$ŒättKä\á¼F˾ì‹F‹4Fã¼ðâÀؾ€t NM—tLã4o´4�éKK`tJ—4LÇ¿> ŽIïÃPÃË>è4âŒtK¨ðÃ4G÷CRûÃS§´Î11K‹´?àÃç\R'µFôPët˜ôTOõÿ”þsQÃôYµEËFŸt;\?è"]¿õÿìKK at X',‡]ct9뜾”sO“õ[·tQ;µ\ëNôRß5\[Ãä�<ðFKHÎ�|ö�6`ËtXGŸtÎ]5V÷ZtUïC¬t]³ñä�µ]ûpg×6V«¶aÇ6P[tTstc—3`cõ»¼õ?çœ><6]¶p§6gŸ°V?µhµ?¤ôh�tm7]5F?µk·µFëôHKÎrßõF¶N—ô%çŒY4K#µR—ñ[Û¶xÛ5{[ô[35mÛHggtGƒµIöáÔuGvÂìÃ7¤@
|Ã5`ÃÚp䃇ÎÚTø5X…þ¯M8|†W8†;x„[øƒ[„ƒ¸ƒ;8„WxŠsøÚ¤¸7tøÚÀxŒ_x‹[¸%M8†w¸Œ×x¹XC‡o8‹Ÿx†CøŠÛ¸wy…£x�'¹�³x‰9Gž¸5„ƒ�+yèt8ˆcƒw€¸‡G¸�GxŠ_ø‡·ø—[¹ˆ/¹‰9„cøš—Kèdù„S¸w€ùŒ'y„ûx˜Zƒ•Ÿx‰‡N˜W¸7¸ù›_¸›;8‰w¹„÷¹7lù’W¸™|»™–7¹ƒo¸žC9˜óy“Ÿ9Œ£8—Kø™¯Í¢9�‡øœ›K†S8‰Ÿ8œ§:…s¸–óy£c¹ŠÓ9—Ó¸�gø¦Çy’‡)‹wx˜úþ™Gù›ÿù §z8¬¸ž[xŸ_ƒ7Ä8±º›3º§ûy°›x¡ƒº±k»ƒ/C
8
Ã…
*R¸n:xI�Šœ@DJ*pA„
'jèÄ,/¨è
sm�F
CZDjX	½SŒ!F)"!Ñ¢¥Î‹
‰E Â(<c íy
˜›þ|@…k€�‹D¤2y÷»æ©eCá¡—�¸F5¥]-EÔ'9æÑÌD
�&
Œ<ï¹5eÞñ]·»Öð£MÒñÉtîaë®2Æé��™bìˆõdñ<æ\ƒ+1›1%b¬�®SSÅ4Ƀ@®kꢎS³ð$®ªÝ²Óal³±¾£«»ìª!™ãŽòÜ�Oá’«	¸BRj´¢×;xØÍ來uÍÚƒJ§EŠ‚ðñš	Ë*íÈ3m�	œa"ןʮ<
`üâ½õ­/�wÌ^bÈ"ÈKf2“q,åÇùÃNo”7œd;ÀþÍ3/ŠþLe*ïÅþ%ô›á<gE+ùÈnž±�GLå=c¸ÈHv1•	Lc-OZÇCq
NtbÔˆXC¨MkY‹zÔµ¦5©M1Š\�:8t`ƒ#xœPÛZÖœ ƒçfÁkNð–˜5©“mêTG›ÑÎõ®ƒ
í`çúÔÉ6ªy}íjc»ÖÕ7ªOmn]‹z×¢Nµ¶k}îqŸÚÔÜFw´gqíuãºÛì5¶sýn[Ç›×7…)ÔÝnn³{ÝWµ¾>êiÿ;ÖÞ&7Ã	~ðiwÛÛñføº-.koÃ[Ú¼æ…,
!ÄÔÒáÖÒNõÂéýìŠÏzÔ²x6±A®þkrw¼ã-ïøÆ#Žïvw›ÛE/µ®'r}Óšâ
Ÿ¹¶¥-îo‹ÛÞ Ov*.žo«#]ÙL¯õÎi½ñd›bì
'û·U�nNT»Ô=Ç7´÷mo�G[ÕÉ{pˆ’SÐã÷à‡ßÿÞ÷~ðcð€Ç?Ÿø¿+¾ï�÷{ãý>øÂ/~ðøhüâøÄñ}÷»?ôÁÎ3Þóˆ/<à/ùÀ“¾ô„ï¼ç5�~
¯üâ¯_ïK/
Í/öf/
µÏï*°ñÚ�]/ü"PöüOaϧOðÏõú!÷^ïÿd�iÐÕ¯ô8ÏâÏþî!û‚ðñø
<m
pÁþAÿa»�¿0
»°º°ÍpÁPÛÏÏ°
ÅpÉ0
Ép¿Ë0
×0³O
¹0Ï°ýøðQ
Q
Ëp
ÍÐ	ÑгïÙð½0#

ÑÓðÑ°
ÿ0íþ�q3±Óð‡°
íðqýñ=1I‘qÙpÿ�dq+±±á´úƒ
Ö
€QTr!ËÐ&¡
�’#ÿ�
²�²'×ÁL�$»�,•Ò'Ë2&U±(kR(O±'Q./r;Ò)�‘…q;²ò)U/±Ò$÷Ð%_r ÷’1å,QÒ#ó*Í�¾á
q�5A!4! ë¡Îaö¼Aœ£
�F,×á¿
ñJs:“3íáÄA4ÏèÁÁ }àÖÁVÓ-i²-…³8�ó8‘s)“s9“Ó)—Ó9™s8£3:‰ó8¹°UŽ*Ù
�
¾aB-}d�L
AÆ!F¼€ÞafÄ€Á
Ä ÒT¢°`
@FFMþ¡$•/&ÁÀÀ+«4TEuT3Ô2=æÓd�õá8Ó!ÿAEÏ¡
Ö¡ðA8¡Ÿ¬²L!hÃz�ˆ¡ü�UÛàŽÁG5
6÷�Ö¡¼
˜¡˜�èÁ,HõZ±5[µu[¥;÷
¨@ò
ò€daÖ
˜!¼!
¿
¾¡ÊÁ	°a
Ö`œ ñá||€˜ ¡h5Èõn•j ¨µ Ž` Laè
–Á^×`°
HƘÀz!–�	Êt˜ Ò‡[a6fCõ2=t‹ê°3;3V5!Vgñ!À‹þ°

<±<3iu´	<³gc ð
G¼
ÔÄgu�÷y¡Wu±óÙ€\éAR£p³u£±
a
¾áô
á–†ÀŽÀþÁ@F¡éA˜a°Aø¡ö@|{
&
–
á@�a™AÖ °�	ø!×!H&
a½a0ÀUHÊ�ö§
¹3z9XkiöCg
ýÁÎÁúÑ<sžÖëôÂÁ°¡Þa‚Éáô¡c·É�™
�Õ¼¡°¡ƒ�øˆ‘8Jûák'—
è

µ´slá#{Ò12¹q0q9—?R11r Oy/‹R ÿaŒYù˜Ÿ´>x‹6øÏ¡ªó$}Òž9š‘ùš±¹’¯A€}%KÙ@ö.²–‹3•?R&ɹ8‰™)³y�-ô’Ù “•ÓBòœÙ¹ží™k{ÑŸüB\–&Ï÷sƒ›yZ8[r¯,Ÿ³2úÚ¡�óŸïf•Ùjv&:£5z£iR/äKÁ€dy˜�IÍÐLý6˜+è€5sà‡ýÎ*ï�{ÊalùLï�Zótšoþqa–
ksZ sº‡:B;o?{ú
uo‘ïžZ™‹( �q‘	�	üîqñ>›™v	T9úZݞú¬Í›—ø•©—\=IKúùx—
ŽÀHÿ�°@þáÀ
vüÇ�<Èkü
z¬éyº‘<ÉaÖ£ûƒŸÿa
À
: ‹1cÇd5qa
°w
�ðÈÐ,Õ	fa\uéA:ÁKÓuäœ ä
r@Pé2v3BMŽ€\ý
:Á|à�S –�W×€|ÀÂ=<ÄM¼Ñþ�ÑMüÑ#	€
Á2† ^‰á|bàÖ`|`Æ?ÝÑ1üÃM½Ã
~Ã
Äõ
A]þóø“dÖÁ¶‹—�xÌ”úÁG~ƒ
DCÒŸäÁèÀW‰¡ö€‹,{ˆA‹‰!!ùb:†¼ÏøáÃA}àÏ>í'ÝÓ-ü€Õ;üp€Õý"=Öñ>Ô=~>!ï=|áIà
ü~ð	?Ôg}™1Zåñ½öÊšX¤·PþY¢Ð ûÁ ��;ïŠ]ò�qðtÚÊp‘^
wðÖ¡#ÇvðFñÚA§ÿYè
	Ïýáq³šöa¾ï)�Æ	~àgœ÷;œ÷ÃÀ
òB
„Ì&†àª-·*
ÀŒ˜Š
À­ þbk©J¡a’�m �$è¡Ç¹ÂÅ«°j%‰DbãØ˵­ ¸*�²
öo²B9iàX~åÑà¢ë¥FÝGoãŽ?yä.­)Ï5N¬ñÓ?¦ø@A
ò|äMk`&žœŒ‚Í)Œ²N
lˆ�Õ2™C'Nü#3NôÔÉ2nz!Ƚ¬ã„¸L’×äAÇk˜‚È,n²a1Cäñ²Ël|“‚T€AG¤Jš©\Yªõw¹ ¤/
¼
C”~³œ÷A--<B�ý¬¬Íæ
Q…õH‘à7fcß!æ§6Aˆ
ž	ÀÛ~·)!fifÃÛo’uª$
•~A$"�¦—µóUü!$%’Ä�‰q.l¦3Ÿ	Í—à¤1ô	P˜¡þ&XN±ÀØ	NLb"ç‰ÁF1„kŒ^±â7A…<ðƒ		cÃ(¨°N”1È
1œð�å³8B9A‡Q€³GÀ‡P1Š~Ô€yð#1j`EbX
}ä:f0ÏG _¥E
¸1Œ\<Ã$ÀC|ÁÚ©�`¡åH!DŽä_ß0?à�Q‰™UÙ³+Ð\&0’¯ˆ¬Î�nK;

f#
  op
k~¤
ÙuVkzÓœO?–áÖu,¬=4Ü!~F2‹aaÂ1þ>
Á§¼Œ+õ!ËVºbk“Ðz"š”&m4ÝÎ…-ùD’¨ÚËé!I¥ÉÛ˜ff•†ªTU6U­¶ìgO›Ú–I’ä—$	DÛIb˳‘}¬cÏ�lêWÑ&íÕ(÷'@ß
ð—×é|ë{ß3�!O¬)–VŸþÕÿøSîÓ~ȃ(þ X~N}¥x…™ ‰�W˜ï&ÏEØ^}H¼9:B-eêWŽk[ž­†5å÷¨á@^%BêÖ�Š„)¼usÂ…ã!=WHN¸®Yð{èD/:Iî%ê¸fÚ"&[:I˜±Žv”xgáÇÍRÂÙŒlcQŸ:=è!’}¤²ÀÍöóòGJŠØ dûýKò”å™[W�E%•û‡hàZŽ”{=÷¸[ã-Ç/ÓÞÂöo¹ƒ:ì’€—iôÈK~ß f|Dô"$ßpO‘uìleÔ†w6Wƒ1^lXÍ–‡½••ƒb¢‡0Í(Æ�IÌþtH6©ð—a/ö]ò†ËÊ�E1ŠŒbK#4NóòaI\#Œ€â~r�šÏ\b�Ë#ÛÒdHSp¯rÎËi.Ìÿz|¿àbþ÷é°†kxãö@7ëäï�ßËë!u?zÁ0µp`
×pyÉ£€T`
ýàF{�ëpßã
_Çlðˆà4	»ó
LЈ tÐT0(<ö
b°½@ô
ë0FG0[t`	œ
ô Þ0Ø	Šˆbà€“`	“PX@½@MbàOÖD{À{Ðýp
bÀz³ðT ÿ€þC€
CïÀªdµYšÓƒ>€Tàå ƒ%¶%JÂDBsa0ˆf4oËÈ®±
Äå(úõhú…$Èῲ…L(xⳄã¢/€¬áU‚0
0‹„÷vjRnÁË`	`0k°Ä0†FŽcI–hB9ÿö&x’ÛÓ³÷áð2í�€²�œ
s"üÐFŽ €•ëD£€(kà>PF¤Cë
N0üÐ2�Ð	¦à`°ŒJb)O• µ¨rjÁq+§H6âšíSs”Ö(i×dÆþ%+TødɨsAh%õc)&uè§
—&teÉ�ÝI
jø‚úRjœÀôP·ÇÃøP×@ 5ËÐÄ€
ß@ÐcdYq
ßð³Ð¦À	÷€
˜Ë0	ç´N£@þ€
ïpDŸ…0
Ó
uñ�…ÐbUÇ…`	ßÀÊ0>pa?�äaèW~á2~
‚}‡°)«‘…/j8Kr¥ldƒ+³BB1ç£LcLÅÆUyC6Šq*z'$Að¯¢㇄%WlQÊ zŽ`žë N÷&–ÞÉ¥]JçÁ&—“9VÁIQþ¹æ
—¦?g¦Wb|c\¡¦bAk;TktúûÀN($N
°
. 
à,Í&öS;
+Š¡Aa�-ı¨«wñA¥r)BÂ,ó3Upq-¹ÚË#Ì
$T)
¶­Á¶€ ‡PK)W¿¦Û!
S‚*÷£R5žq§²
7D5
^9
:`S[ß…ntýp­l�–4È:üp
Y±t½Z®Æ.ƒØÀ	ï„Äà
{�¦0×à³°Ä€‡t€ß`
^P—í0
lÀ¯Î–°c³àŸ™:k°ýý“ÀëlÌã+þ ¯®‚û`
^Õ^9‰¬pa\‹ºHÃAÁAËƶæÕ”ñ²\$8@9ÉA6K¯€JÔÛž·”J³ñµ8P팲” 
 ¤/€=;íq�©11òÂ
ÇcP´»H†'ïP3ãó+óVÑï€W4_uêÁjqHö'¼Æ¦¡¨¥a€Á­�
1Ä f ~ÖˆÁ/Øãš!¼@¤*Ä`ÛIØ BœP±Ã�LSmÉÈ
áΘႥb6Ù‚Uye–[æ8á°`c
|ü¡'D¼ùgf†êg’52%x:°	z
lèXÇG¨øffè Œ5

ƒž
�uÙ7­·®
×	wõzl²Ë6›ªa‹eKŒ<Žëg™rðég–IàúŽf*¤§¬‘…|ÂáGžìèyGž~p¹æ›o–±ûì°º¦SrÈOvNÈ3×|ó^‡Õ™Ã¦œ© &ê)„Rç|uÖ¯[WÊ[—}vڿ³áœúq¨ð5ýô¨ª°Þvk7žlËe3ïxæ›gÞsá¨(î8„�·þz%„{î»×OµØ:–wïË—=ùþ7ÍW}`ZÆ‘à®ik�åÙ·ì×)¼þ5L{->½¥tú0G@&�,
ÎZ˜03ê)P‚uÊŸØ&xA^eX!Z÷A~£á a	MxB¦P…+da]øBÆP†3¤a
ÃñŽväP‡;äa}øC þ0!$b—�²7Õ/ƒKÄ`Úb&¤IøBŠS”".ð�ŠUüâY䢳èE-†QŒbüâÇhÆ3ž±Œid£Û¸
Hà¡r¤c&*ÑF4â1Œ]ãõÈG=öq�yTc* á‹e$R‘‹dd#ùHH:r¸ b%-)Eb¨+l±cb'è9‰Áþ�¨G)á
�RÖ£f°….ŒWÆ2ÆÐÅ,a\æR—¹¬%.]¹Ë^îR˜Áf1�IL`Vâ«ÀÃ/–‰[àá•Ç4f1e	Ìj“–Ù¤¦/·yLf’ã$g9ÍyNtˆ³œêDg;Ï™	s¤•©¤ç)Ki�v°
‰³ðd?1ø6Dàî £B'ü¡�pt‚oüðG;Èð‹nD4Õ h7*:Q‹RT£­hF«Ñ
ŒjÔ£ÝhDEúQ”¦”¤'õ¨E]Z�hèbŽÌ\fZ‰–¢Ô¤#]éE]ºÓ—ö´¤Ñø©JyZR‘õ£AE©.VÑtœRªS¥jUá!ªbÕª[þµj; 
�xàñ’ßâe
K胬lÈ•þüùÖO"Z á�{�X ƒ5þ±JjDT°ƒ%la»TÃ&Ö°ˆýic›XÄ.Õ¶øB4“QYhât±�åìK;ûYІ¶•ÈâúuZ~ùë´Ù×»Z«ÚÔº–_¨=H*øÆŒ¨ jô°†#þaŠ5Á
{=ü°O%ÂU¹æÃSüÚ2J}Pa
SŒr¤ 
/FAúQ¢Nô»ä/wÑ^ö¦÷»0mïyÕ‹ÞøZ4Ƙc4‘]<$ö/yç[_ñÞ×»íu/ELÞ÷‚×½åÕþ¨x+¬Tõv¦ï5é**aV‚©Nµû—¾JÖ1xÅ_GXAFÑk¨
™À-
|½TðKK=<Ÿ°Ófȃ)A3
áø X$!2Ekü†`ÄÆSTÆoXÅP$!oþ˜ÅpÇEM|NTGm¤E]lÇbÄFu4ERÌDQ¤ÅuäDnÄFUÄÄLLÅ~\BG�ô/Xƒ”D…„œ°“ž5hyˆÈu�‡ÃY‡}8œw˜ÈˆÌH‰HÂ9‰I�œHŽôH�üÈŽìHŽÉŒlÉu˜È“ôHÂyI™|É} É™dÉŽ|ÉŠäH�ÜI�ÌÈ—I¢I’\Ÿ„I‹J™4É�É™ŒJ©TÉŸ,I¹ȫ$ÉwØÊ­|J™ÄÈ¥DIŠäÊ°Ë�äJ±ôÈŸlÊ®ŒÉ®œE/ð‚Ó[HºJ4–IÈ“< ƒ´Ľì˾DDàK¿ÌƒÁÌ¿4LÄTÌþA$ÌÄTLÇL‹À”LÅÌÀ,LʤƒÇ„LÊDLÊœLÆŒÌÄìLÎÄLÑ4LÇDLÍôKÂäKÍìLÀôËÉLMՔʹMÆÌ×¼MÞ$MÜŒMÆÜËà¼Í´hÍÅL‹ƒìºº\έñw»u°„QP—N¨Îêô”N˜N霄ìäÎéôÎëä„ì¤NêÌNNØNu!ÏN°„ëôOíÏöÌNûÔÎêLOîôNñ$OïôÏëDOÿLêtëô”î´OåO
�N
H4Ö‚xŠb%ˆau–}@ˆf=Š‚xÖ�(VNBÔ1“QªpÖ
þéš`…
jíƒ@Ö©ˆÖhMÖdMʱVa}u-™e%×xÍÖ‚a-x=Šo(´¢†gL¹Ü]Ø:
cùß*™ÁA~Àª¸iíÖ«�‡{X­ùÖru–cÍ
ìxŠë ” ‡�
zˆ dżYèX~àoÀB
Ù¸@œ�
—¥ÙuÀ†o(ˆˆ,.¹xÉ�¸¬aX¬ù†kÀ…Ù’!WN’ÙªxY¼ˆ6ñ…zˆ—w¸Puè:¸Uå!X°•“üÕuˆu˜0(„1pÚ‚ÁDÈ®¸ØèjYHÜØ«è|À‚ÓY†á(˜Q0…mí‡Nèþ©�*¨�Áfˆw˜Žkp*؃wè&è�r(„wÀ‡<°X\8SèJ;/xÜ�è…N8DÈ›oð¿MN(6P[ *ðèxb¸4«è'¸´~‚ÜõÛª‡Y°‡~°˜…¬U?èZ!
[ê½�æ:Ø„ý‡w0ØYX=‚YÀ‚´ýØï`‚H
f(K(â(z�ÂýŽ¡(„=à«#p_IÉ0°bø†àBÝà0Àl ‡B8NX©af¸«!�–å‡{°,à:Xzp¼X‚X‡ñ*
~À~(08uUþà¼`†lá#€–B0zÈ0X†¨ø6XšBÀ‡^àËNøfXƒu`4„Øah1šŒ\Yp‚�ár0àx
D0ˆæo�œ–Ùu .0
Už*ȃSvÃ<…oÈ“NÈ´`«_6LDHa¢x‡<Xb0,pÄN`«5è–eâ"yþÀ·à]&PEzPEè ›ëhT'f'à„k¨
/(„QX†2Ž
oo`l�J±~ ‚!@0ø“~A'X†Qà„èSp‚¹)*È$¾z‡# ‚B˜
½ìÞŽì8?”ï`“éðyæIðf¸åI(ÌNæ_~â�·í�pð…lˆ
'€ð…­³ÕédžÆ
{s 6(‡ìý‡s–oà„~Ž
M¡ƒ‘•‡[¦K fÈ�^ :P

YPÛ@„N ‡=è¥ÎGÀ,€a$Æ& �ˆfY†�á=]y
b NØÙY¸†}”Bæ':8z@-_íu°†QàDð�!À¿"ˆŽO{ígY'x\S8‚“–ÆÁ‚ÆÆv&
Oˆ�‡zØï©éoUoz°èÕá [¨p—o H:Àø�é`S@„rh‡¢ÉV�ˆ|‰X„è{Aƒy˜²û‡¹×Ö:�¢PwYàkŒ•Öw�‘^˜{œ÷Š¬7
0fþ½Ž¶'û	˜ê!{Œ�™Šy‰Xá	׬7׬‡T°åÝ}¨?Ði�uzÐ÷Šk�+cñ†ì�üuèí‰)ˆr˜„/N}ŸáV‰Õ
ÊÑÛ¨À¿\Ó‘}‚€[¿Ô™ˆíVº]©ÐÜDY_ý¥-�ªð{åçû©ÏØå7‹u€H�ÀØÃ~þN™Ðï~®¸�èñ uùV|%ˆ{�‹–-ûrÛ/‹`µýöŸ[mÕ‹Ò‰ÿÛ°ÿßõy�isС—l€ðEÇK
lzõû§p!ÆBŒ(q"ÅŠ/b̨q#ÇŽ?‚¢<ø®1aãÍQCoôîýó§ðݤQ÷þøûö/¡Bž"J”	Ò'PˆD‹"MJ±�¯oòüÉ„ú×@gñSªu+×®^¿‚
+r¢Bò¾QaómC\l&­[HoO!6ïLqŠ{T,_±ýöö
¬q�/tO
$h¡àÆŽCŽ,Ù"É=gÓ®TH
1töD4D–)Dï
GÜ$ý@•ÝlV:™¥xý¬CŒ9õ`) ŠŒiY¦™’5#Z66ôÝ™oVW˜<GƒäUJ™§ž«a“Gpk®Å�…åhVž•]HëУdŽòè£ÿ¬WDŒ>Ä�,›ö²N¢¹DO/½x£Ð¤ñch…YÑÃL\ü`#Ë…UªÐ§O:Zk¡ÿ0#«,ѳΡ�*Ѥ©Âô�u`6$æbnî­´a‘„Þš™)ôMIj-3Äß”ãþ�¥7.ãÄ$ôDZ¡¸ÿ܃�¢´®ƒÍ:®þë;yŒ2
>Þ0"=å`“Õ¼ÂVz�°”zƒg¼
yC¨°‘¶×7C$Œ.×Qá:ˆŒ‘<yà²W†58‘Ç5btÌ.5\CL�l\ó�ËÙõŽïÐ#[ïxáÅ[7ŽÂ>ü°±ŒÊ^Qï$þSÎÁÕ�y ú
1Т¡�–ºŽ8C¼N©
­3Ä;
åáD~ÀúbÎœùSç€WM[·Ý~A9܃r•Så0�ÄÔ05£ÌôÃ1Ô�"ßn—[…Ô‹c?lø,5ß̲X8bÊ5R[²S?ˆ¤eÊ;ˆ°þñ8b°ÁÆ(÷²0ŽüдF/ßä±yËŒRàBË´î
5ŽêH!£¸ïjæˆ#ôxF²•³F©½€AE?ØÁÄ:t˜’=3XŒÝÓ?Þ¬Q'ŽôÓ]¥sO�%¥s¹Gï0³Ç;Ù÷‚	\êž7¾A¼£Ž°œåèáˆbÉÅ
ëÉ;ÀÐ*à#htXF!81‰e|c
¼«ÝíøÑ¿�AS> Ã¡þB�¶1«-ÖîfÃrÄ<jÂÌzü�*Œ"ýE
:�`Ny?ü1	D¬Aœàı�…=0ÁfËÃœPˆXÂ}²ð‚#èÐŽŒ"Ö@6þfF)&0£bð'¸Gò1Á`8B!Ö0
—
AœØÃ7F
º<ÈÂo– O.û0Ã�`B™
†²ÍÂ'ë:Ay¸l®bF¿"É~܃£€#œ°bt`^°Æ,òp|C×ðÂ7èáN€aü¨
Él©Y Èì˜#Ä0‰™9bXÀE!(é
Æ9
¾ÂÜ"�zaƒÞà—7,&D8ÊN�DU0°�—\ƒ4ýöÇ.ªDCC˜Å$¾…šwÃ0D‰›�p3,"4¡‰ƒ¾á â4�ÊYG/è
ÓŸ¥ÐçB—2%¡‘�†h.\ô©ÉŒAY®ñþ�œŽ
üX
aŠ(O�œxœÕfÁ‰~Ž`0'ƒYtb`°"&�…0Á£˜÷šéˆ(F°tpÄ(ô
ÛY`cœä&Á	)r!úpD,qoC�&í&‘ƒÀ2ÄGĈg8®Ö&…¬Ãß4Å$ŒÛ“ÒíÈòP>¸…ãxò`zþ1	Kàˉ�H?œN°!ÇáøG8¨Ð¿{¬ó½ãóB'f!œYìîkFáDi½ÑH"ÇçY"p
ºL‚�’”Ç+‰±ŽIàâ>�/%P�ÂMnIŠ.¡ÝàDioOÚƒ#°’0ÔÉ5F˜B˜a
þàTˆ�ä5þñ�BÌŠ\è’…#ˆq
otBÞÀF;äºq†š…#¬Af´ÃíXÆ‹+›¿ÔÖ)4~‡5Þñå$„K£èD9–A�o„£ô¸F¥ºœ¾†Üd]:j“¨v‚�p܃ªì1Løz”fÒ‘'·0Oó+.ôJÜ,t´k6!ô Æ;:ýÉcÇO�–ЋBL¡,í„÷ Š<&ñ�~˜§WòZDžÑAÔ‚VœíÅ?.åžh!ÎZ‘¡K]²˜åZ=\ˆ?èáolîà;Yˆ
Ïžüü%;2Ù‘P’ýb‡
šn&ß»B
(¶ô¤ê©2·Ùÿ!�^̉ß
Â+RÙÏü;<)ú¶¯1‹|1ÃJÛ~±Ê‚çåÂoä;üXÆågÑi [d/q‡üÖ=2y‹½ê!Ìr›Õ\’ó=÷w‹‘eTtŸëbdg}Cøñ’d¡«'ÔƒêÙµp±Ååÿ5>ÂÆcpßJüø&­r¶�Ëå 7RºÔõ
K­ƒûÔWob)¢$ß!èB×Qâ˜øC„ú/Á¿óß>öâ»ÜBÜó…ñሢþPß?˜ÞTnèÞNKš$Z 0©@OÃ]ÀžÖ¥Ø;ÈÇ�ÎجÎj1Ð�B/\ˆ��U?,|¨ JPˆ�Y5Dv´3ÌƇ4¬ƒ#|S²õƒ¦Y_›\KôC',Ã;
x
"xPN?<ì|Ã;tÂ;PA›ŒVîÄ�‚¦Ø$@�Ó]›v>x1Œ.üŠã­Î[ƒÇ=ÄvÂ7áNÄ!¥Àsu™@` æIe¤¶œÛøÎ,„ü‚ ?XBñ´ƒ@âÀ„sÐ
?Y‘Œ‚ñ16ÍPâ:0�p‚š‚¸ì�<‰Ë7xþ"tÂ=¬
6Ä8Û;,÷
.¼A©ŒB!tBY4
`¢,OÀ˜B)IfEÊ%í
'´ÃK¼›±ÁúH=t�ü,˜,„Ë´“5Z?˜ÂXB…ØT0-Ãø4cõ8A=zÔ%)D*u
Ô€)ì�)XÚxYBoÉOŽ]Ã1‚%\ü ±\Þ” ⤙$p¸ƒCíM?¼ƒP€0Á7¬Çê
8½äÙŒB7ÅS›•Å:¼ƒ<XB-¦…h†TŒ‚+ÁL4úæ¤f
X‚˜‚dBíÉÐ>^NÂgˆðua3ä€
ÄÀ2lÈ‚IýC!8U«X^þô&ÄÀ™Â߬Aä�)f^­A!¼C×­œ%@G
�š7`APÆ…?(GY€Á5”ÃÂõB½…˜Ù?Ì‚
0Ád£ÑA!à¤U”)ˆâ;Ø<‘)|Jõ�0n&øÃYödÕI`̨Dþƒ#äѵˆA уMôB6"ÑÈ©%TÔR…Õ:Ä
)Ø™YõàÂ$¬
’CX‘äûÄÀ­aäûTvþÃý°�A«8¬
' ãÄÀì�%½CÐ(ª„5–CÔåÀMm6£AëÌMœM
O|šê’ø�”ì.äÀþ¸ËðDY!˜ÞÔLÂÇÕŠ�¦HåR~ÙL™˜(2ÃZŸ`Š
IÕÄ7¥€`ú?
ÍB_‘ÖhšÔm¨7´Ã
÷A8àzp’YQÖ,0¡)8‚,3°A9ø˜Œ€å,Ȉ%0.˜˜Â=xC8Xƒ|SX}ŒÑø?€ÚJ°A8lV…��¦áÂ(LHF•¼êk�¦`âVŸÔ@;¤àZ®CHM~åÕ7|C‚fHQÏ$t
õf?HÐ7HÐ�®Ú”¤�)ø@T)ŠS®ƒ—2䌂X­�=pÂ2øÏØÃ`j�n*æ…AÊø*�.34cÔ9B9Pªóì
?¨&¼^éP�¦ä€öÔÛÔdŠŸÓò¯~ø]ZþP`Õ%›æ•ÖÜëÝê1áEQÎm¦XÑ¥˜Ï�ÛY0•øÖ¡�ÐaðGÅê•ZªüžÏ1ëHT!ÏÉœì]	Ïe,¯ÝHb�]Ï¡ðÔaݶ½žéì•ðƒ…Ú™ÎÎ�œÒPÿ"1‚@-AÞæ½ðÁõ\ä�ÐÝà•Èœ0m Ö!‰hÑ%EÕ!œÛqqFPE¼ƒ´Á�û_ê9Þî †Î)`‘(	AÍÍM&ñ�ÇNÊÈžFìïEP0‰¨Ý~¼çWÌreD![„Ä�ÈÝ âq$OÄ=]!®ÇB$ʯC'”aþá÷I2F(rH¤0FüYlZþ†ò*K‡ß=TÿÃaÂ… @Ð�(�¤�©,:Ê‚<|Ñ+�S|v,íó2§%÷^�`Ë•v€gÄÇ:œSn(ÖäÖ(\Öh'Éd“7È"y�\Ã(g?°Â:³s;»ó;Ãs<Ëó<Ós=Ûó=ãs>ëó>Ãó°ÈCa
ô ©7C4?x�ø�#x‚#x:d‡++Z…L™^I„°?�R/@õð6­è`°H„‡;Dúýx“x‰›ø‰�´ Ì·ŠÂ< œryöT€v€Cñ.ä÷�ãxŽëøW§C at -4¯kRgœÍ
À,+MÌ~rÓ
"ˆAHQ•Âa
C¸ëÁ̆Eaõ|£x˜‹ù˜Ç´xgµ”kÆý2 \ÓøÁí™ÃyœËyJ÷øÌ¥êƒ$÷P#þ åÖË:<¦eÕŽ7ã¹åÀMŒŸ)œ6D"QÔ­6]¬ÐÃ�Œ0ȹa8'ÈÒ"a¸	-Î2è÷Ž‹ú¨“:þY‡÷HówOq2;W›ûƒ�—z¬Ëú¬¯58øxi3±áõ‚žß?Ð�—:�7ÀT'xÃh¬—¶àÆ�öÌ;l²tÂø�””åÔL�â=òC
Bçµú8G[iË(”�#`
[Ò´C‚¦Šà´6`>˜ÂRéˆa™Õ¨TÇ•Ì:ð=øÀ°™oybÿC嘡
:dSPΛ9q
jthçΟAsÕYèQ Rp	„ù´³§Ñ¬Iqj„C�M¬B¹’½	´Q�0c‘õY¶íÑ·nµšÕihÞ³‡æ9løΗ9yâ¢ã%…6½8úuürdÉ“)W¶|sfÍw]Ý›W,h½Ÿ“Ž]ZïiÒ«U·6ý:5lѱi϶�ú6kÙ¸Ï^=
Îá5D{>RaãÍ‘Ã~�ÿ2…Òñò~„ÿùãþH}cÃÆÖ%÷ãÇŒ=ë�9J¯îXé!Ï@×ëmŸ÷=ûÑžm~
Ó 
ÒL;UªX¶”M–Yd�%öÙc¡�VÚj�½vÙh±m–Ú
®!áˆûƉ㒋ìDÓ¥Œ<Ë–Kˆ·ÔºÊ-^¸:݉R
hŸ p0
	wÀq
RM½VñÔî}=É�ChÕ³Ÿ�Elp‘úhXC´þ)M4ý}<;îЇAÄʉ(DžqˆFìa™xD%±‰Ktb¡8Å·Ìk4^ãظd0%„ô¸GÇFƨ'cqÕmÄ‚ÞÔS/
Ð[NXЃ
à?EBÀa×
$M}+8ÃArÆc”LGµ¬õ
£:4ÂWõ½rª`'«G™@w@>ù¸A(Ld #*¡Šõ€¨0(
µÂûò¨méÚ™mx®y	‚¨‘`ŽbaS
ÍŠqrŸ	\X=ñ…¨%ybPè©<�3	Ör³ÐDe-AzïŠ}3g
ÜZÙGÚ.ƒ4umrÓ	køƹHmRÆKžu[ã«h½a$l
%@B5ƱÆNàÍtFl&	 /‚	‚‚axà I
­„%-uQÛeSùdÄgqŽ‹íi£^�gÝ6 s;).
œ«
øÄ@&~Qo`þ(¡pøQ1½›šà]›;€
9ÏçvàŽ'x AnÀÅõ¾îJ‚	 ++îr{0L"nt
6Ú»[nð†K¼ÈåKÎ…d¡è�2ø¡@Î!øAþ�zÁ1¼A^b
±�ÖÁ¼A2ÎÊ1ø
^¢£Üˆ».dA6Ë”PCÐ0ieJe?EfðÀdõâÝÅQ
“l‚7Å_…?8Eï^kÜ�E¾ˆE܈
DCV
\JhdårÏ
kDizkÅôϽRPøìè
€ŽØú	,òá¢â
ô P
æ(ÿ<ïÙò,±þ®Ž¤ è¤`£ÚР
z�SÑÞa"P9T¤$Ê!:Þ!�
�$°z
7bÖ Ìd#úAŽ€Jå5D*•ð(¶P�jæ»|P,ö÷^ÅQêg³œv:kv¬i4¶ªGº"ÓîïŽjÓÜÄÓ|ç´l¯–®PkÄÔâKÓêÂ}€bæòÎàÂ@èÍ\�6
éêi€Âp
��
�	°`Ö¡–aØ
Ad!ÂièÀ$ø�b`F*®Èì3¶Ê÷°§f’J8Nc‹—‹	»P.NÉÑ5¤ÑëeÖæÅ
ÏDä|&mLN†æQ3i䦶p11kŽ†/©èìP0©‘&¤Ñ*(&æÖðìÕ�à±KŸêI$+ªžôãpHçÝð
Ö+«ŽFò7“
qP’d¤o£öÆì*þ›Èl0™g^ºê«Ææ‹–ãd�
F�.-¡Ž`Ä€
¾A˜
®aÖ€¼àpQ>}¦ôáò`°(Ë!Ga<˜’
ÞáØÀF
°€¬PÞª4†ÂmŽI	KH„z"®¬ó·8«Å˜QYÊ‚ÙêÇ3§IãrÃ�´
¾l#öþAäܱ!€'µ6ÓG7#yX�=BÔXDô)
�
Ä€¼à
aa
6p¼`°À˜�VaF
®ŠB0ñ3OèõÜ
6FEO¨†z³7äꚌ	_ÎOó„S at To:[é1@Ì2Ï3cêGǵ2R,¾l¢Cd0ûFø…Î&«�b÷­‘‚@®‚I_Ó ’“ëêì4gÊÞ`=¬
‰I�/)Ðt”þ‡
Á|
iÐ")§ž»ðX®-
Ö`.Y`6Àa’kDe°dyôh“
”YM\
Ç’’¥@„Q\¹`^9T™ÁN£}„F“|µ›Ò';ÃÞ!Œ¡;ÜäíÄ�ßd}ëäM—ÃީܪÄ[â´„Ê3Ûjúò=ÅBô—�¥õ»`ËY1ïЙ¤´g‰o´2¥¦ÙŸ9Ãn!%E7”÷qøs‚Ñ) Nâú“ž
0mª0$/(:
­£¡'®“5fbþ¤€¢Õ¡Ú
IÚ&$.�m}‚?¶í lÜ¡K x�ÚÅšÕ¤!hæ5Vo/úòšDv€Ç‘5,säœó‚÷¨=‹¨Y”„0¡%p?¬´
·GÿÙŸ9�PÃq…¸XÏn|\E.ÎrßV©gÍ^xâr
ò~.©U춥‡ëB¶ŠnòD5<C+€w\Êå›hª<`d�¬	/–f­“åšN#œ1DYáVÒÈzw%F/l§ì¦Oº«åø¨&ó/VÊD.“ĨP«ý‡Œ
Í–H7èX•Þ˜{Üv®µ�€ýfJ¡�
d³«¥)š^…».q|b”~¹5äV*�Qd´Åõ¼É•åºÐŽñzXáÛ½}»XוMª:û´[6n�•y=¼Û¹[Ϻ;¥—H6lLv\ý!’\É—œÉ›ÜÉŸÊ£\ÉÁAÊ«ÜʯüÊÁAË�œÊ™|˱Ì—2YG‚GÍ;ÅÇu÷ZN&©q„Âz&]®­•þ‡nÕ±²™%Ø4¬Íuê3ÜÆéÖ~Ĺݦ'6‘›„÷ÈáDÑËN.Ê];}Ñ­cÒ•C;&½ÒýM]ÓQÓǤÒ?ÓɸÑ9Ô)ÝŠÏ„ÒÅ8ÔãÄŠ¥½®š¹Ãšû�f]H´§pÒ<qØ·š$¯“µ6
˜CYiSŠTz2»€yZ0GT¬§oMHñœ›ç:Ý.lŒ›×·]«ie�ßÑp¹‘Ä5Nµkãòq¤¸[¸Âš	Ó=ÆßfŽ_Ù—mÙÜÙå[»¢|²6x�YÜ~\ÛáÄ¡ÄGL×XàUNXðÙÂÓH�
<zþÛÉ>Š>Öø5v¼¬�=~þW�¾¥z�>öÜ�ô,ˆ;lºì¸!ãöàŽ
lzõcȱ£Ç� CŠIòß¼tàÒ©L©²¥Ë—0[‚cÓ%M”8kâ¼	s&O�6eö*èÌœE�¾LÉ’'ͧé漆h�¼oTØxs$�™

mØ.DïÖó¶Æ‘l¯�)—g6&1b`)$ï_¯<£ò :‚mlßØ|ÛØ‹=Nœ|”£çþ
½u¦ƒéåÃÒ&{T
³f3È’éêÀÌ·’°cËžM[v;_èì�è�X/*0ΪM¼¸ñã"%’Ü
²ŸrÞþ˜s”ø<¡¿ê	û9Ï^ýú¿ëØ	nGX]úAíwoĆÑ:¬Š'	¼cÔ:~—aáÇ�Øy³äa	"ñƒÈ(ÞÐñÍ,Nx11ëüÓ'ŽTxà;ßt²‡,kô"Ä´“‡œÈ#�!bõ
"“\ãÅ;lÈ‚ÄÓÉ$"’hâ£ØÅr@)$r·™ÓvY„‘FC6éä“PF)唳Qe|[	$ò½‡ß?`´ãœ7yìQÈ:bð³þ‘7`0ƒË(ÿQŽ#f.F".†C?�Ñ1ÊÄlt'tÐÁŒotP˜²B‡¦ì�
6…ôóW!f–³L!ˆZ2‰£Ä\³•¤–ŠÜ;ÄäÆ\o¿ÇÆ,_š*무Öj«”ëµ÷ñi'�7ïôCÏ;júóÚwÿ\ƒ±Çö£Ï2嬳N?Øô³.ÞHÈ�7ô|ÃO°þ0Ã?Ìd«>ÄŒš,1}¥ÛO;Ë|ó>ø”ó?ËzŸ<^a?Ä0Cφ·l°A·¡ÑD]”‘yG,ñÄËjåUYeÉ›@í¦ÜsK(rÇ©7PÈ
©‡^zþ\ƒrÅ0)OªºþÄ*pÂÅóÎ<÷ì3Hì¹÷
ñ
ôqz‘ŒlÇÒu§ÝXÔÙlóÓ"ýóÕCY�tI:Ì$Ö`‡-¶Äã„V\-Ä'\ÿD{/·ÚI›?p½ÜÝ”•ô2¹ÝÃvHÌÜÍíØNö3³ÂÝù†ó«„7îøã…ÿô®EÄϽØ˱ol¼‡H9³1\�ÔP?÷ÐS�±LÜs/üЃ_ìÑsOê²ß{Õ‹ËÄ®ºå¶DOî÷À.¼ÎÇ÷óÎüÉÞÏ5Xｿ¿þ�ë±»Ž?âw»AŽy�	׃dÃKÚ=þúì·ŸPÙ§Mn
N8Ñ—ð`ÐáÈ7’
[Èýþ°†˜ †IÁ	p1T�‚!|“@Dýì#ÁÞÝŽ?5ƒ&¸DPáÂÆ(œ@…käb ‚Ê��ú…ªl˜Ä
™áDÈî‚ÞÈŠ)TPƒÀ
ŽèÀÄ€yäá�p.BDðÃ	ôèÄÙ„<¡°bðÂ}.øÕ€
î#Ž?P¥°U)ÎU°
£×ÈÆÉÁçòéÇ7ŽÐ
Ð!Bzާ؀ ~àCpYÞƒ5Üåy$6Ú´Ò	X
1(±ðƒ‡9�%dQ!,8``˜À	/\C†|\þƒ)¾±îaƒ²Èƒ)Ž°C5
•ÞPW0M‘‡u
í
³\	�Wp¼—,¹ŽË|É“0EþBéàG˜¢–
á8¢ôhGQË�f¬ãƒØä€dáÉ<ÈÃ_ÄàijKxayÈC
–A…^x²½›Ö�¢¿:b
k°„#,‹‹ÔN¢¨J×F'á0l
œ ‚#°ð�¿b!ÞX¥47‹äá’,¨iŽÀ‰àS7’G¾ˆ��~ ‚d‰ÖΧ¤‡e÷»àµÕ:³$ÇQ˜ð𼓼ងHBC8¢ (�~|ôò˜Ä2ÖÁ£5õý˜…Vò
—½#‚̇)LÑ‹uÈÂËhéÓ
ýl605bÂ:Q­Y¼c+–Ð74â|D¸Dœ é7äa
|tè'ÃG›‚ì<×™œèónÃçÎìgtPAÀ RÞtB@{~–A6v€½8‚dá÷Š”1°
c‰‡š‚
¦(D(·¢þQYt@µ›�#‘Ï6ªMH/˜0úQCŸr°À«¿Ê–�­#8a
f¤ Ì�…,¥áºÔ(.Ãlh‘Á$ö3è\
MÌ(h™Á†¤/û»‡5oH=º›Ïgµ@pÑ

t
ô€ìáC0
ü‡SNP)à…�!‚A!L
©µ…0	†a
¸`
Yâb
X€SÈ÷†qR?çëÀÎwhÿ0>Ð}tà)`W>ÀG0…
•Òl\UFE¶8iT…Ädnäd­¶``
ü°×�ƒiH,³°¸
Ì�íÐZ
B58ËÀRkÐT55�y°’Z÷£½Ð“PMŽ`¡D“²jÁ'•-ÄöBÜ¥lÅØ’ßÕgìäkòÀ×QT¼¡:þÀíÀò倣P½°ô@d^ÖŒ÷Ð{°È7v±?Éo`ÔŒëP<ôC“1´3“÷ðm%;Ís/`fÑb-®³á@•øQ•`tá0kýpbÒEïpòPTT©ï°“6£“6é‹©²5ÁˆFmç’ˆé>éW4J#5›æWký‘4i
¦ðSr�¶4�þIh¢išù˜”¶i¦)è¡fâñeªùØᘧ™jò0d+iN‰™›àt…´™e¦™³9“FP³k”	h”)ig™³Ùšsç^5jF†Ø0<Öy�Ø™�Ú¹�ÜÙ�Þù�àžâ9žäYžæyžè™žê¹žìÙžôpRB“OÆk
–™äqô “"!2ŒZÎY“»UX˜-Þ8…àJ®S œ€¢	J8X–@ÄР–Ózå8Š�X°÷â²Ð#ê©cXðÇo½à„Q.Ùæcx„
¦¥H.Þàa±ŸA:šï	•
¤®óþ¸�lp§$7¢AP¥R:¥TZ¥Vz¥Xš¥Zº¥\Ú¥^ú¥`¦b:¦dZ¦fz¦^@WW?–ã
¬WeQ�#T�Í(mÿ`Oòð“ͧ¸pöq`Ð	‚
“àÙfOtcXÙR•2M�Ô	ýp#žrK“ù3ç/;‡
©ÃB÷Q•Cǔ͸ÞP�(éË°½CÙÖmT€ªÃ”š33çk-µ^P`\8	Yq/|t
€Q�Äà÷ÁªU†°Š’Ø`/üÀ7Å�ÛR�÷C"å7pú6´ö4mÙvUdD£0t¥JlPOLYªöbOÞP<Þ°®£@DzlÐþ9öäVêÚmgèsLaè…
©R—Ò‰3k jò4{°›°
»°Û°û°±;±[±{±›±»±Ë“­qVŒiv)@?òp¢÷Ryå^ _làbp
9
v*MCi){B ¦P!9ATáiËk+m¯J)1@³³�E1{b° ‚›™~*вgI×@
)þ„
†2”…0I
2# Y*”E]+UTð ²Ô*‹Â	 ú§BGÛ
­ºå°…
U·œ�E©€øp›|ô
Æ{¼È›¼Ê»¼ÌÛ¼Îû¼Ð½Ò;½Ô[½Ö{½Ø›½Ú»½ÜÛ½Ý{
EPmÃN’uäÝ"ŽJ§aÙFøMtp9Àøh	7•wdQØ ��C¹fB7…€
5€|ì…«£²Ax øa
H(µdpþp}EöëŠÒ	œè
JµuXP¨·*0Þ@!ª�
.Ë&°…I�b0
>Ðâ’³¹:þ4že´³À"Ðô@Ëâ'¶9ðˆ`	m%�a
E†4(–@Š’…RÇåm½@•yS�@»²0Y9pS×TÀ}Ì`
^`
58yË€aì
�
(WðÛÈG^Ð1‚{lð€�L’‹+�Ä
LÀÁÄ`lã…è3
û
eQbXåíqIÞÐ(x„‚MÓȯ¤ÅÿºæœÐDÞöJ°�)…wSq–�WŽ  b½PÀk0Í—*– t T�¨yå@Ñár¸ðC"sô
3¥}tÃßÈ7Í
]™åÒÝtÐ.×ÄT
9k�Àw&Ulâ1°;7Ö€†[�Bé³€øÆ”ó
ž�Ž !{Ð	1 .î…S,MnÊ…T×à@þ@Å&`�ï€)8E3‹‚MÚ¤Í`àE0ÇN^åVþäháä5{åïÀghå¼àN>	\nå+òQe^ælp
¤�¼�æpçr>çW^^@xžçD N¾"ÝGç\Îxzžç(çGèUåaÎå¹
ç„<èDÀ¼ÐÕm~\\Ža¾,€¾éœ¾éX²p7ñ",®ÝÕ݆Pé½0‚Å-Ö
®W²í‘ë¦@]³° z¦Ð	ÇâÁ¾‚_h£Ðtr$¨`©<«­Nkø‡©À÷Ï£<Bu’ƒíð
þ€
�ÀBÃ/Ú1ëøÐþ£Þ¬JÑÌ(-ÛXÆ‹mÝÆ“Þ
ßîú0ÆáúË •wúÕÒÀâak‰/�
þ'qÄ„DäpB—N܈ +ì‡~J4© …¬(FïùñCŽrTÉyjü:¼HÁ
^nC�'Ÿ”ûf/Š â)bÄX†
1pñr1îâ…‰QR ¢\¬âÅDZj’<¼|'b¨ø&¯Qz)b§kÀZ¦ˆ¶ˆòr’oT[°ND¾ña¾e…±áÌË’S=Ý4KÇDÅRTņ+‚ˆßz³àšáx
—"ö‰á›¯¾YGÏo:	ì›ò^eƒ7ö:д¸!ªb-¿æ
”Š`å%¬:épM*b¬&†`ãª}T{Ì6yNMíŽU!
×`‚é‘C8Z‘‹?ê"ˆ1‰-ÂÐ�‘¬$[h|ˆ�‡CüQý8	yH’‹4?&Á	/ž1”c„!2|tÂ>úÑ+s¸D”ƒ·\ƒXæ'AIJT²’¦ÒCœQ¼cŽêDœ€'\ ®Y²ØË�àý„%“’×}†S\œF7ï Â5¨…ºP
…Ú	:q
©Ðå�NÈC8FQ„="BL°ß¥øņƒÝD¡2(B÷qЀ-T¡Ð;äqÐÿE¦ëa§pqH1P!Ö«�®RŸŒ‚
f0CºZ0AãÊ6‡ZפÁL</szÓ7é4¨?ÍeÜ
B„;¾�
þäL˜	Þ!ƒêy–ÈŠvÊÁ†=€¡L°D
èPˆNÐ!“PÁf½àlhb ƒ)Ö_0P­½ˆAC°±¹<Ì¢mžõ­EtsÂŒ!b„ü(ÄdÁ0ø ×΃%1ZoŒ¢ŠØà6Ž`
¾¤À.¢žÄàfPÁœ`FLá
oÈÃ
A�yÁ”[‡%š½ŒITEŽ
ÁðrpbóµDè�0Ä à¸
vŽð<¬
¦°˜à/ôb
½X‡7æŠÿþUï€,ØéœQ8£˜N!°ÐF›£ÆœR•„òÌhA…�Ø]6-Âw¢ï›»àxÂûÝñ£ÈDãoxn× là…%ž‰ÏÃC%ð`H
Iø!°Sv¼ø;ã'‘úůžòƒw½êYïwÊŸ~s€ï{ç7ŠT¤b³˜]^xÃ×þö£Xb?|ý>ð³è»ñ=¯xâ7ÅùŽ§>äYÿúÙóÝóƒß"L±¹à_¿)�¿þõCXûØ·¾û§>üeÿÕ;¿ø¹þàÕÎV'4ìaÿèè
”’uX&
'€sYÀbP�˜:`f(‡rÀ�òz ã)„#@/¼BºkøíÀ‚~(S�10�: ‡ ƒ–cƒ~ðC:X†ÀA*‚ à&!›…žÐN¨
kÀ…<d at SÀèq‚~؃NXb˜0®5Á‚=á‰� B œåò‚=˜ë‰0bX“«ClÈ�^؆»‚æP"t8­�È›™þhbÀbÀ¦d”\HFdüÀYÀ…Y at FlúÀkLÆrú@gDFjÌFY€ÆlÆetFj¼Fl2Gq|Fb(nü@=ÜÆi¼FhÌF\Gm¬F{ÄG}lÆÂÉÇ~ÜÆ{dF}¬F´G^8ÈmœÇ…GŒÇfDFƒüGwÄÆ…LGj”ÆgÔÆu\Èl„F‡ŒGŽüÆÂ)klGeäH¤aH}lÇuôH„Èodɘȉ4È{¼É™,HvüG„Ç¡Fµû Š‹¸
;±™~�…ÉÚ”a�ë…yûº‹PDS(/(‡#˜„à„<@¯*¼†B°0È�f›6~è€=X9C<�þI0…Ë:‚BÀÅéK0…EÒuû%­û®Ñ¢‡ôZƒe
~0…¸Ø¢}ébX’kà¡()‡0/N˜ˆÆj60
°3A*í…~p„rè…{è…]iUbÀ6XYLíb�k`Ž£ƒp�N…ð†<X‡Q‡YhG Ì=Q%zè…w¸KÈ:~(K‡•Æ
)Fx¬ÐÁš£‹0Š…ÕYX]؈}Ñ…u´‘X…�Ø‹…ÁXÿ<PõØŒ�X’5Y“uQlX�y�ùX‘i›
5P!„à/ Í
鋽
�ØžuÑ	’¶©YõÐý¼Ï‘Ù5X¢ÝY„pÑüìÙ"9‰~ȬoØY‹ðPeX¡£	Ðå	¨mX"YøÄ;dR7þ‹¨M†s†}°Ð‚K°¸‡Q8ˆ¶Õ„zx[ý‡Qà¯Ë:ѪíZ	ÙáØÅ\QÜ’Æ¥Y
©YÅ}\á‘
5\}еÍ]Ñ’µÜ ]Ê%]°m‘„Ò…!Òÿk‘™Y=Ùº¢‘Ó[=	�]ýY
�݆}ØÝÍÜ9Э-Ñ…Xfè˜ ±ÑÑ]£
ÝŒ`¢‘Xyxa´1½y,ŽHMH„6Ð{ø¸
ß\á%…r(„{8�chðmñ=‡cЄs�Uo`,H™°S‘øÝÿà
ÎØ
>[»K[ú¬¤sxß68†�hƒ&ð^b耓AAÕ"�Ò#‡÷m‚s�ˆD`áD@‡ð¢0°rÈ=™…6â#Fâ$Vâ%fâ“]ݶrݢ附%¡r Yè„]ˆ¡G@¡&ã0c$þQ‰õ‡wÐ×ì5Æ㈶íÞaè‡DxÛ6ð|è–©:oÈ
":‘ahƒarЄúmƒz0,`¸¬
l
p€[B@Ù0Ø#/ø#y˜±ƒÎ˜1ØtúE\¨¹“&ê¢à&i	ùÌ;]Vü¬}¨‡}ð9Nj¡‘‡%ýZ„°Ї­ähæy«µc£6ëþ³Fëß}âÖ5l`,ëkVkðy ÁP]8-"çãt„hÏzÁæ´&l~@aÔÐ~•ÀÛ�MHáÝ] )	@Y¿-ìËÆl´ˆ”nÙIØOÃ)#W£w¡N ‡‰…l¢Y‡BXÀ]ñ*h=‘@,
ßñ!'òþf掋0¬¶"ò‚8Rž!,°
E‚¡¬ù‡„k¢:å"ž	³)¢˜!´æöò!HR|è˜Âò"Gn•È'zЇvˆÄgó;Çs&®of°º*6øE\ýÃUŠ¢æ0*H6¦píxïê~¸Ó<
Ìbn‡»4fS¸ºö‡e°y ¤ün¶wcØ÷nØûžGƒ[úÜ'~67z
G µ�õÛá`„P»ÈíЄ0ÑÔðâŸä›·…hðý½ï{2 èÅÆþñßñ”Ædy7‰wp.	¶ìÉ%‰&ïÚùXòçg{¯î�ï·ƒ)þ¹§ÿÿˆ,hð „
¼†h�þ¼oNØxs„°ß?ŒjdhÐFG’,iò$Ê”*W²,n•®nݪ‹É™<^T8`3‹_Ë B‡-jô(Ò¤J‹bĆѺoLØ|›´ô*Ö¬Z·bí÷2f·hÑbQÂIÇKŠž½:rmëö-ܸrµ:„ø�
E‹s÷òíë—¡¹UÆ¢�«6ö&™³<}ýëø1äÈ’K:…z—ªÕôèñÛÌï½{“G“.­ð¥­h3Ç–%³­Z¶¦gÓ®m[e݈x+þÃçÄÉ(*N&‰q‚HÞíäÊ߆ûeL¦X›_rîì9k9öìÚ'7}ujU�¡5ßûÌy;úô,ý½õÙ´þlÖª¯oÿ>ÒÜ—ygìçÿ? á7 �}“j†Ùd‡ŠY×X�J8aw–a�Ù„àKÕTk8½&}šx"zúMÄŠ-j÷•L
R2`,ö“‹9êXZeßa¸#�´}¥Ú{v|¡‰²¹$“mé·›^ôÐa	=²xs6²dÊ•ÿáIÞ`ÁÌ:²ÐS�)ØäÈ:¦¬ƒÐ:œÄL/MÞ׎`1†8E|ÖÙ)?é:(¡…z(¢‰*º(£�:ú(¤‘Jz¨HU^Uù7JÃå
Ô5ÄȲN?w‰ÁL?bàrÍ5)à‚
?ßôâM?Þ¬#.Ëà²6·ªþÙ[£‘.½éÚ>lÔ€êï,CÏ7£0s®²¼s
߼ㅽÜóÎ7ZzSN?¡.3ê;ØôƒÍ™FÆ!L™Iºû8‡è»/¿ýúû/À
<0Á|0Â	+ìï'
=™—@Þì±êö³Æyäñ�%Žp‚È?`€a	3ÂÆ;œ8‘G9yˆÊÄkÌçÅ2Øx��@½Ð±䮃yp'^Ðs6`,F!b,ÓËÉ…`SC!Ì0�Åß0CÇÞ 2
6køÀDˆÈÂ=l,£ä½}u˜àafÁÆXÛ¥#Þyë½7ß}ûý7à�>8á…~8âzþëqHÃ]*†þ½ƒˆÐœø“‡%ëÑCøàç*¼93k¼F/T`³Ç2Cã…7“X¢´%–ðR­l8²G/Û2Cbô2
'5„1)0C'í€QƒÌP0J?£’m'œ³F!£t2‰œ`#ÆÙÞ¬ñfÝ�¡Fdˆ‰Í]bú{å»0ýõÛ?þùÛß8B³È8!šÑ
ØpB/ö€�oÐA`"葃É9bý( öpóµÃ“¼`�ŽôÃOqBÒvµ†5£e13| «rÐ�xJ£6>öŽÐaå"DæÀe\ø�Y*?¿¼äþ9Бun¦%Âån‚øÄ!¡‡+fq‹XÔ"ÁøE/v1ŒdcÇhÆ5ª±�i|#ãxÆ9²Žtt£ë˜G<Þ1‹‚`œBzô�…'#ß@ÄÖÖŽ5¡†ÄÅí:A©�BGèÅ5°`
‘0¡…°F8ñSŒ;CŸ@¬Qˆ^¬!á`òÀŒB\ã×ð�×¾±;:ÈŠy ƒÎ9´{äÁt#Æ:Äà©…ƒþèبø—&²/´°ŸÞÇ6ine~úû&8Ã)ÎqòëÛ´åC"²"½hæMáð?òàˆe´#ë Ç:ðÁ�k½S8«Õ?Þ!~¬ƒþòàŒËØ’Ï~XcëXƒ,°á�wÜ#ßÀG9JŒoüÃË`†­¾Áo¼Ã¦¼ÎDéá�r”3íà1òpNn¶Å¿ÐŇ„�܈¦q™ÞöT}
Õ�Bý#Q‘jÔ¤µ©L}êR£ZÔ©*•ªN•jU³zU«B•«XÝjVƒÊ¿‚<<™ùOþ1‰µ°Å"éH;¤&Ù(‘²˜â@DÒD„!J$!Fü3�µ6F‰™+6
�JŸÊ%0Æ�Wûú4Ÿ™26)VL*Ró†ÙÍú1³CÕlg9ÚÑ~¶´ž=­hM›ZÔ†¶µ¤eíkW+ÛÖîk¬ñ;GÁÎõ°sþ[xk)Ê2DI�
	q+{•R­"5«‘NƒªC7åv3ªŒêu³˜Ý?bQ»Ýå.Q·+ÞïŽ7¼ä=¯yÓë]õ‚w½îm/|Ëû^ùƽï
«Xé�˲·Å%HrýK] ù£CòªIY¾ Yø
ø*éàWQµ‹Ý	‡—®0†/¬a¥n¶0‡Cüá‹Ä#î°‰ML^›3!¸U�a™wnŠ®eŒ•»uרííªV�Ö!¹È_5²W“ä#3YÉþB꡼AšUÇV^H�›K±#Áð•SÔ—˜Äd>sŠÍœf«¹Íl~s™á|fÍVÕ¼Kþç~ræ=ĦN-n‚c?ñù(Vüc�­¯/.ZÂŒ¾.”-éHSºÑ•†´¥3�éM?ºÓ“Ö´§/jPÒ‰f*w§¼_Bf¦Ð|nÏ–Û7¢Ø¸º(ÞdtP=ëTÍJA
Hèu¯-…0€¶ÉKæªfßàk`/»×[<6´‰|ä¼é!Ï–¶WŸüÙ,¶¸x^g­÷Ì\'Êh:y¨×ƒÂ=”ËFXÑ)D0€L`
@
"Z#Œ ·‚�ôXÎyØÝu[CèÄÄ=
Ê?¬�# 'pB?ôÂøÀ;¼Ãòx
3X¼‰àa˜=x30ƒ)ÐÁ•$P÷	D!Äa! â?ô‚#ìŽþ)|Ã7¸aä­ƒ$rÂßÑÁx=8¬˜Bgì
3?8)Z‚(V‚�š”'Òƒ)Ž"šBÁ$ =H¢ÎÊ]ý?ô 2C(®�­°�)ü'bCÄ:Ð�bñ'ìñD¢7˜"ÿÝÇ�|ÈsÍì�t]G:ài‰Xõ•„…Áê
EœL
¨
`ƒ	#FlM9Ôå˜ø@-Ð
.Œ‚
ÂèÞÇ9äÇ™žÀ£ê‰g
ÝÛáÀ¥ç@ßt‚!Éé—…D.ä@ôÂbùCb9…#ˆ
6l? Â$LÅUžÎ:TJnƒ<ˆ
Ø¥|ä
,ìƒ#€ÁŒ¼Ã,L.L„§:�É6�<Ãœrþ%\Ã,°�÷t°,^N
¯„!rÂq!ÃE¨(¯ƒ¾1�ò³ëÝþ³tF_ÉÄ‹	Ö_	„€—FôøØ\}Ì›d‰€r%¥€¹U^}„±MHD(ÇXG‘•p%µ«jµ€—OëV`ù'Ϙ)G?F4äkLÇš<“ÄÝD/œu]¿˜ÞóâçÁ!À³=›Lݸ

Ý!¼€¼¹
Ì>­ƒ7ãúj/A06¤ª™¬/1<êï”	34Æ=â)þÃmr3”=¨É0"e²«
Ï?`CŽK»0öKõ"=\ƒØX‚)dT9$&6p{—ŒA”!nƨ¯šhbä±ámT±§j9°T/(¬‹‚Ôº<K³——¼C!Ô
O9PÙLÂ7”MúÕ
ð O2¨ �
<0!
$Ð!=Òc C$T°ÀC:(¡	ÔðB
AÃ	�p …JQăLô�E/<�¡"EA„ùd¾í®Ady¾q‚
o‰È:ðb™ÿiÇ‘^z‰‰ŽB"’/ÄXÃ|¨x‡"~‘å1ÀÅy²¬A/Þé$D–éÒš<Ĩ��<<“e’=Ö¸æ/*Â'þb¾a‚™<¨b–#–Éc,† Â‹^®ÉƒŽÀ:ÁÇ›BFù&6&ÁGŒ»¾YŒwp£;©`†Ž<ò�G-µÞaµØO/è@¤R*j æÎ<¬aƒ
XBÕÒQòXfLYNe£QD˜AÄ‹89ŸN,™„Žw&ƒKبa
D8ùD&‘ÇØA7b²¿yé{gcªé¦šô"±ƒŒ<¼€��Yè-ØàƒN¸»tr¨‘ƒNPRBñCQœÑÃj@ôpÁ;&QA	9öxÀ�W&H¡Œg,E14hf+¾¢î.ʨЎ&駟Q†XãžuL‰ŸAñÙþDj8b�ez9BD†�š6fÖéÇ&L¡ç'¼™j�Nz
GJc†Sè�Ç&ÀX£1Ä‚*®�´ˆ†¢‡Še,Á¢îá,ádÒBÔöf�e˜YÆŽ¼õF·êî¤l0ðä*,Q›ŽQè0¥nG¼±lÔBª^'"z†`›¹×ÀÂ’5Lg‹u÷«ª™Ù£îF9Y§î–9�LU×Ásl
�ìQ0TÍA–Q
	}
Gv¢‡l…ï›_ð=/½õÈX#àøz‘ü÷á�üÿ ^Ñþ•®¹a
tæ…86!1¨b+ºX€Hô1™uDùc`CF@
Z°€á¤¦Œ¬#"h¨8Šæþ˜ÊT"Udüs‘ý6„#Eô’‰ÔÑìØsG]=Â#V‹XãuZ´(HšOyÁ<o�+w𹣉J¤zí])ÚW¾¢t¬ Å'>zþA~\Ô¯½(`+ŠSý|ƒ<Ýп~9SaÌ ’õìgéµÌeèa<M™
Nð‚[ÿ¡®¥,#ÌÍÕ.?ZæIT×ue‚§´Ø\åÂDŠe¡‡z%BŒ<D„JÁØèÀ¥°!"y¨
øö
_
a¿ÒÓ5´ûí
Ä|rŸULz°÷uJÚnSòÝe BV¸èÄ;˜¼]v%wÕåÍï“…¸/•eˆxõ~ë8è<|ãVÍõÔ;è�Ž{™ç<½Ì,6K°o›ÛÜ¡8SÜSÖ>P©9âÈ
ÂÓ��VÄåþÌþÇ hÆvª Qk?þu7SgÞ!.GŒÛ�8Õ€lØ�H[è060CVbà„ÙE-yxK‹X˜Å¥Fa�#ë¸F”pñ©<ÀÄ	�
VŸD'8Á%DäÁm¹–Ñ	ÈþX‚çªD$t‘{[¬ç_
>¿cÏ·*õ94ýŠÝ̨øŽ~¼ý@sÕ«Ar–Áƒüˆ¤YF<XLÁ†BÈ‚`
Ã23·L¢³Èƒ#R
Áö`ÖE¼`:ao˜áôÄ ÐþXðÂ¥þÞ¦Ø庸 År`ò`
T :„EÓlÖ&mp�	zAö 
-%2Î<‡¼`ÞᬖÁï�	Ö€
ö àÆL–áM�f¡&a
faÈ Dq+á¦`¦ÆÔ†o9Œa¬j xJªlDX¬z‹‚ºß–Ï·X+š¤oÜ€+µpLœrKúHLšDäÇNŠ¸˜
ˆ�ç
¾¨ô°�
Þ!†@°Ç%
¯Rzš£ö`pÁ	|
Ç	LaŽTÀ,šÅYÞ�*b@è
4úáPŽ YÂçœåʘÀF²œ ˆÂhìÄL¥Ø€ïH&Äàr í†  ­áéa,¡b ˆá)ìòÀ€œÀÐÅXz�
ð!%}€
ò ÚÁÒd�˜
è
k"±S’9ÜcÂ�8£öà†Ätr Ž ð`1+a1í 2‹¦4Œ)Ó³Ò�033Yá6“35Ó3=S33óHs47S4M³3C5Y³5?ó3A³3E36KÓþ5g³617Is5a“7G“7k“6ss7YAƒ‚¬ƒÎ�(ó‘“*bß
zÁç
¡…Ö ÖÀ:9!®¡ÆL]Ê�:b +¾
Z–
ö@q6CèÀü!
áâ4Ž`£Îâ)ˆÂ"¥¥ð�¨,L¡"±sû)"0‡.p¼À˜ÁqÀ þa¦†
èÏ+Øà.¡d™ÁFÁ±!zaTÞR¬aöÀØ –Aö@XØ‘9¡耽fÁëqá¼
š0"¬
Êa,á)ÄÀr
;¡ÑÒ¦: Œe|
HqÉ€4k˜:«2
õ˜j	ŸèŠ?¯ÞjQߧQ³RíÃ(µ`.õ¯+S‰kž>"'-ËL¢z�ŽFÁ*pAVú$f¡:a–aî†-ÊA8¡áVè²\ãêúÆZ°Á	Ä #À`„$Ó¹;ÝèÀá@Ê]À`¸Pf�–ÄÄà¼a&Ž(ˆÁOÖÀóLá>ý�¬á.8a	]N¾uzÁRûáãNÂî‹
ðæ-á$ÂÁ%¨
òË
øÁ%8áÂA´µª,dÁàÝULa¢=‰B"Š¥MX5-ˆ�sÄbèALô!+×`e·'þPÓç=Ø'øuj©¶j­Ö`ʬ@¨ªk¢*BR/j±""�
µ"Òhl-‰kÍ–Íö$¸–ÇÖ
Ê°ÄökË"¯¬˜N´k>ÜÖmÃCoÕ–oÂlÕ6£*o)ê'—l%Á”ænÍViðÖ¢&w±Ü6qå¶<Åà,ÕRÑV»²k¯0Št1Wnl¿ªk,d¡pÁËo«ëþsõÁ“ñ 2Sñjuwwy·w—Ë"0B#šÑ¸Š£J÷x7êx!õŠä²ìª¢¼ÀVz·cS)B°ë¸"+{Q*<’×’ÂîQ_7|;JhH$àªQ™ä±Ìk KŸHWjÅ×}@÷­6vؘä|#š¶ á—~/j}w€	¸€
5kÏï>ŒÀò7¥$µ®Ž«�¡W~ß)¢(‚ñ#zm‰‚õê‚�7Àæ%'ê¾
ž‚w#œq"ѸCÓB£>nèT«†؃æ�½ãkßamÁvU2…ˆ�ø‰¡˜;ÊOHÂêà@eØ"¢@Ùþës€	:Ñ»˜Á)ŠiR";oR#£8�…/¾ 1Eñ„ow‰³­PÕ¸Ží8Š™±†éÁ(€àB"®
TZ·'Á	Î%%‰ÁNœ`†À	
Ške¡~BnÏVz{B„Ft͟䡺|£iZ¢"L,‹Âú
¸¦jú§�º>ò9Ÿ.­¦ë¨ÉnQ÷—ƒš”Ç£|x	}
£$•©¯Z�o:§1úé9¬Ñš¦§øü$íðÁ»¶ã2ôI¸èq¡h‡S¢Dï!“Ö‹-øú>¤+®G‰ŽÓzøžz—øÅ_¦š™»±í¤‹ë#Î˜ÀH³ÌFUTÄ Ï°al²â&pAæ˳Í4”ëbÅ\ØàþNL^¨D_¨zᅬŒpáµ]ç\BToÕÜ&Ë�†Õ´*:ÆA§íÀ¬�¯¸�û™‡úòÂ…¦�åÈÑ:¡pa˘ÀSþá5¦¤éB�nÌè¼À˜£OâF¿�Ýă`VÞ�
ÜîmpAX
\`…˜@w˜
Vzaœ Úå¹?+ÈDzx©_þE£UQÁ)¼’;µ†³ˆ†ÀæøA.¾†¦Õsø¡ò%/úa¬�–!Ü6‹FA(\¡ý�YäVK½!x¬i˜
.@ò›¢)Ž³g£Øv²1–
AgëºÂmÊ�˦äù¬�¼ÊÓþx¨çÃUrN&áþL°@Rê’´p@i3†$àê$ÃÊ�
paC#­«–ÍpΟ‡D%ÉûÍL¡éÖŽL.’
R
Œ=¦×
2ŽkÛ§<!nþ–!C¿9¾áp-\Cbˆ�ã|Œza²HÔܺÛå‡Á�
±­-³�â9~w![«=J"�J}Ãî„:u1* áV¥
{¼b±(*²Ðöx‹)S;ž^ÚYÂ’£³�Ês>èø8©„¶ƒ�È÷¤$˜~j’âwægÁ]'"}[~|#ˤ„>a\
ã!œÒ	5ëÁžó˜xùJ
Æìë*yÕŠ‡Ã>|þḥÜ_´]”Û¾î9ìÛµ>pÞî=«ž:_¢úÚ*�ï	ߦ ÛSߣ\ª¡ç±½§'3ñ%ÿ˜¢Ì�ƒÉ{òIÙ�Ñ#î�iã5?ôß'ÓEZTà\N›þ

‡E¿Ž¥M—=˜›î[¿ö&º¯kÕ¼l¸Ëöë¸Ì¡ÁsZÒ?ÿë}ÿøùã߀FQ½Ö|‘¿Ž¡Ü<(}P‘öŸÿú¿c­«ø®°Š9÷�#½ëƒÉø»¿ülì7Ýüëø¦¥ÿ|p×úÕßü¿]uõr¬¿;»Tªþó¿½ê£ÿ
âŸÀ�<ˆ0¡Â…:|1¢Áp«¢UëV-Z¬HvÈäñ’Â
›YKš<‰2¥Ê•,[º|	3&Blˆ­ûF…Í·IÿúÉë4J±uû}Ë“‘·‡F‰}#v�žÁ~Ľ#¶´`¿QI³:ì׋a¿eReš=‹V&E]ݺþEÓHÉÎ: Eöê—6¯Þ½|ûúý{ö¢=òp²ñæH ¬5LL­Á÷Ï[/NüLa‘e
Ñ7~œ8Ñ£×=G¦èñëÕët¯rÌL½ë­œ@o`&a¡óíß:o–°ý3娗,¥Ø°yÃfŠÙ:zœ,ñóÆ{ižwœ
1û×ËÑÒu…šú&¯9?ÀäË»l·ÊV4Œp;~T!rÖxóôëÛ¿�ß>^š6¿1ÑÉS?ÖPá…ØôÓC ’Ç,ˆàUÈ(“Ô„È2)ŒÂF'yŒr�l\óÍ;ýøƒÍ;Lô3‰)=ɳÇ^8‚O?³Ô0Ø75ÄøÏ$�x11l ’1“‰È$4þ²Žòà’Ä Ò	nbpuͽt2dbùm™‚USÍ8oÅt…ÄÆ]\®Éf›n¾Y�`„†Ø@§��={p²Î²ìÁO?ˆ8Ö3``ƒ?>ÐcJ!ج!Ë=²\'Ï$Ø8QËÔO9ktÂç({ГG/1Ô�#Žà‰
÷€ÁL9œ¬�…ªë|XÃ?†öC�,…ÑËãñ#Æ2ÞpB‡xÁɬ^èé²^FuD|#Í×l¶ÚnËíIûÕt
äO?NìHÅ2H…3.ˆðCª�Ë\ãÅ2^ô3„<£ òN'T€˜?ˬƒÈ``û�5>äQÈ£P±NËþ`á[?yàR¬5^´Óã$y°á”ëÐ�Mò°q “…8AŒþ´³Ž“Ó�E·6¯ÔÏ—ë�IÉfÖ•æ²7MtÑÌÊY˜‡i¬L0áÍ>0Á‰)1á„g²q'ˆþÃÉLôBÈu‡ˆ%í”CÅ(BÿCG'{d½µkÜ$†G˜òªrŒÅ0׫½†�ØäPƒ×XAµÔ`x#FàCˆq�Ñ–7´V[Òrô³µ$]zè¢óÅßMÿ턪?üøƒOŒPÊã�?ë¬#‚ý´S{?÷ô„ûˆúìÞ>üÏÏ7kxÕ=þÜSû(…´S>ïÀþ�ðø,ó
Ëø#�<þøÈè=ü€OOî÷´c?ï_¬?Ÿñƒðè û³V4b¶GÆ@«)ÿþÿ_¤Ñ‰i=!'Â2 ASˆd	k¼�SéÅ(µÀu8‚ˆ�‡Vz¢Àr)¤Ž�
‚DÀË…ãÆÐ\|F0 I>)¬¡
kø­þäuŒ÷èÁ@r¥ t`AøA­àe‰åk §Ö+!&D�Q <’xÃËù뀖[4B‹Ž°A†v™`ψF¢	0'uJˆBžqˆoÚã¨�·-1�–£HÙ3-�
�ˆß::Q–ö«øcFh‰/˜Á”#ѨIÑØÌÓÁóô…ò T1c
ÌðÆ7zÑ�ÓÈÂ9ÆS�,¨@f Q;yb€…k`¦j®
C
®ó�{8þÂå8Mi˜“š^Ì®¦ÀÙÃdªÆ�IQÕªŸ9`=Oj–iîL#±°Ãn4´Êµ†
ÈÉTÐ
&¼ÃN^ .äÁDŒbJC 1ú±ŽX"G˜pÁ�íÕNÃd‘6x¡&ÌpöJ(iIY‘:ô�N0¨y €ÄP“Ixa³“ m…†$†ÜÌU/~t!%GzÌtîv¸¢k¦+áÉŒt œx¢
èPˆìg
Ž8ÂRúÁ6”#5eBr
ñCGi˃S®á1K/s
]:ñŽoxÁ)ºFm–Áy¬áItÀ…ŽFñ�ù0–àY-Œ’ÞbÄÓšË ¯Œå0·‰•*­ š»ŽeŒ§bh‡@Öa0>­
xëð3ˆ1Š wUHâ•£Ú[~Ìt
¸`‚,’g
0ä
ƒ6…c¬ä6ÚQßpÄ=–!`KXâ×°Ž€G1+š.#,bvIæjI­	—zÕͪë?äQ}ðC@|sê‚¾ÿã9ŸQž›åŽÚ½‰þ>Q`86"Táãåˆd8btì~ðúv«?Úq ŽïÇϱY„V³d…ƈþHú9q«{KÍ|'‡øAN�pŽ¶ƒ7)¸@ŽU<H{ÂàuKd‹]l˘8‚¸bRàçä`
ÃF�*äÞ\"ÅG„ï<öd‚vä7ª„Fñ~7\"³\Ï8ªAÉÎ	wä,÷KJ¹GƒTfx‰Í®E3ä‘Ô*9
= Ê”Œ·dÅ	ø@�sl$‘èDt‚�=
ÒëºÓ'AþFlFùaw©Àkî„=
J�÷	~<Ÿ‰*=ˆ?–~æ&×`ÃÏÐ!Ì=D�Ý�»¾±™åD|€—<ü&qA–Âïîo§Â,¨°×Ñõÿh‹í»A�J˜	ÈܺïóÂÊã¢
5ÀZy:Lb{h6?tü�kA\l¨�a 2£gO-"²£8¡ô(‡7ÖñŽˆ¡@N˜ÄQ˜�ƒ^à©NpÂuúq
*8Á×XFýGA5ðR^`
¸ 4³ï°úg$ú²|"dCÐ
ý²øP C�àÕ
Nð0Ã)XÀ€Ì€œàJÓ*ÌÀâçîõyð
¤…þí'‚Îc�¦u}HøÀ	ˆP¶Qx@d`AH„‚ÔO¿‡„2�amT2à
Õ‰V8òÀë€ ‚…C .ˆ`X5l°C0‘Õ1 C°!(Ò	9à.û7	¸°Â"‘>P Ä@WØ6ÆZŽ
GhW43&'S
uœ€5 ”XÙ	ˆ†‡â�PÃ5�Øk`
bð=ò )ˆÀ ^
Sh
là×Ps`ðPþ£*„'ˆ SŽÐ>
/ª"_ü0}¸'�è1r`01ð(ØbâH``^‡%÷àL *@�1°AØ ÄÀ]�83>Àx	%ü15œ ·x¸
Æázë8
géÄ°LJXßàCr
ï0ɱÛy
Ü…*ú°=½ =Pb
°á@üð‹�ðqê3!1³€ :ò‡Fçs
þ°Òƒ
áÐ	´³¦0Òv
Nåð“ð?Gtþï™D� ú 4W)–ÒáÀÄ� ß u©#Âéþ³KY„Q�IuroÔ)ý°ƒG¥á›×At€0foN:EþÖKÔ�€gêPòoô&GèX¥DTœCÓÄ�œ÷›ÎIHJª§nä…àâL¯D.qÔqRÔoM´oB„XÞ0òÐå‚qzs!¨‡*r!·!‡Etoïp
×ðt•ºo�ZDN„–jCí@¤÷v¤Y·§­z®ÖHH„D|*sÓ“;ë€-L7q†gDZ�÷F±^Eו�7I„BU…«Ѭ�G¼‚‡W<Ø`þ,³‘DôPÎgDqoÏZe¨
®Q®awðr劬ñ®ízð?I$«ÿðÏ�œoã¢xêªý:DÁ÷La
JÇ)øÐŽ‚YªS‘)¦ýà(oö}ùµ[
lÀtp
£pÄà5»h¨r;uZñ
AŠ ¸°¥°7	Õúð¢ñ†Ë�e:C°Šˆ^P=1	9�±ï0	3©p(B«ˆ¤þ–:W×Ð	•²Ä�Q2‚tb
´Ç‡*²@@Ëi3û‹R1¤æPªŠ¤þŠ¶K¨%H¤?bpEGWt@fÃóEáõ'UU` ^À_þÂúGøÀh
	`�_G�«6JGòç
{Ç�ð*‚¡Þ{z&œš˜ÞÀ…У‘)Ô�^½àRãò¥cvÙLÀ·Wiœ�•ØÒX�ë€^pyE°F]lÇZÔ0¨w>p7²P‚jF‚�5�;	~ãÆ
C`iÞÀbhxk°�–
)!‰“›ùâdE‚Ž…Ð	¸°=ñ1‘;;¤µ,�`y9Q?›£@\Ò¦õ
>ЂËP9@ê²tÀ¹H;ÑŸ°ˆ«¸Ð
j(¦p
5°ˆÀeºÜ[¦“€X‚•–€T¸à#¿èb`%¾¨õÒ	�°*À/�õ
CÐ	ãùX·…$ï@k�ˆPb€`€�…c—�5dI%€8ÖŸˆ@[ˆ@Ž¯)š³#´ø
R?Ò
ª5X¸ð–B)PÇ­›	dk¶¬ÚÀ­êjÉÕ
1°)ËÂÌà ¶|‹¾` Í
X€TGÜbÕS,bpÆþ	íð‰¸{h¤A5
1C‹– Å2|ˆd7bþ€vI±)À]iâÝ/d�tZĦÀ'åPgÌ€ˆnXÄy€£Ð�Öà$£°‘�P”PÂsLhø˜Z– X®é#¸à":;>D¢g1F;AU`(C€ä܆ò² 4Ö0
‹5
ÞðX–ç|¼L¢.-/kðS%mH;‰¼Ü²bÐ	€
“Ðg†£àyÐ	ßà—X“�à Ö
‰–gôð‡H!{]‘@%Œ9ÅS¢Øà·µ•	©0

à³`	gÛÕ{ʤÙnû	SÌÚpv¾ÑZEŸ-J÷ 2F×a
Œ³hX°£7{Ðþ{ƒkP�Tp%ô¶ËˆÂ„*ë0·…PÁ��ºb6Ø0
ô
TÄ²€œ"^ 8Þð Ñg
Ë�®»½@µPv
ÿŒšú€$ËP4SæUJÇ	�u<ØÀ kV?�QjÔ{€åÀ‰r+å…sA[Ž$­±€ßÀ'òÐ䜢ò€¸l
"t
bX¼12Ù�¸¥/å '…àaEz>í@ê¤Ù�
~€N%Uà^ݧýQfB礱“©¶“©#G÷;”JEÚSo­ô¨·@¸>"Çþëz´œä¨A´þœ÷ì”*oÿF©‘ê£RT.Ù¾,"´íÐNëè¸ëä"ìí°h·Žë‡Jo(Të#榶ž©þéz¥Û©`Ò¶±æ€ÞêIÚu£zî÷ÆqOJ¨n:“Ð¥AÄnDù–°þvG¤Zoz¡oo& ²ŽoÚdªÖºuñÐ:¾
1ÅÆfÌÀ>~?wžyjŽE£�|«žk@ñƒ$²�Q¥Yg�t¡Agê_ð²'Šþq¦HÜ!sžq!Nk@uo’qØÀö¡õ±‹/ž©½²H·o_ïÏ�
PE‘߀æÞÀöPv/¾$D)Ð|}†U*HÄ°cA–€«È!TœÒÑÕ£�{
0ÄoǯfyGÁ!"†�w@øwäÿâÉ
ÿ>Â'ÛëÞ‰Ùƒ�=S½èýûÇ�X
GØzyûVŽ_BfýFMzÇfÔ2o½d­[æd
3l²˜™þbƯ—Dzü˜1“—g¶ý®QÁ"[9ƒ½˜õÂw-Ï;Dœ°á•Ǜ,b©Ì�2
LÞ�bÈo�#0^ò "6™Í²!b³!†(ϨuGz1Y3«PŽ<bÖÝëE§�¥<N¨ ‚¨=6טÑ1¦ñ?G£°�¹çm
'zbÿyc¯!ß<“k8ÉóML/0Ë!šåH–QDbî�d‚Ñ·íb8ía’‡Í»Iѯ�õ¦‚X/NkÖåà4ñ_kYØøo~î)Ä”BÉ
‘þI´O:Ú{oD¼ø¦—B8‰
‘kF™Ì‹ÑRë6:a¨Ÿ=¤Â'À ¬ƒ<¨À†Ž”Ö806÷QÁ6ê,ÃÅ	6ÄÅC*˜É�‰oÄêeG6d“Œ¯;�9íèˆÁ
�€¤žoª
ÀuÈA„/Tøj½ÒTsM6ÛtóM8ã”S-l¶[06¾™¤!fbèÀ
KøY'§Q:…o8)lŒÃK\;"\Dd™<`”‡‰B°CÏ<–!f
zã›=¼©a·or£âüÉ©�QØÀ¥Ÿ~¾…È&qbú¡'†°`oE-™d
S8A’6Êé0ĘÅþ’k:8ÂK¡çCoLAt
0ÀÈo�kÀ8‚
6T�Ç’ÌÀꇊ!|ðŸ<ˆÉ5ºIFñ!†Reùv*ÂÝ£œr±hê›øãÇ~d#NÖa´,°˜dÑ�YÃ/º­af„´5�kÀ¢Yòè¶-·\Gâ&¨XFl8qq”T±ÀŽ2·ÍwLQíÅš!˜ˆ�
'R©g*ŽÂxÌÙª«¯Âšók°Ã{l²ËÞ«¯¿ì0K¡—wpýg&Öá„#/Ø@DžI&9y'*$fYY§4&˜ùuN¼Á›R‡L�˜e¼ˆ{G‘èøgÛSóø,Huþ„™{˜Ayl˜ð†Ÿrœ¨
—Q®Yc1 ½c™o–m�ÊýÅÝ
q�u„Žb­r1AŒ!D��Å;jBGD2ªyä7Ö@‡5àâ^ˆ`Æ7Q`Ã…Àä:"µGÜ#'>K%3aDø€q‚5&Á·^¬¡Ö”ÅãòXŽ_BÓp²àÄ,ö@\¼p,ÌÀÂá˜QÇ-Ãk8�b®i:Ô`ŽÈÃfáx

WßøNÚ±´vHí¸è1žÑPš‰
³øáþE­{]ìfˆH´Ó7°ÐÄ´ÈJ9'"ËxsB^¹•w,ý�ÕXê©^»žH9biïyÍ"7üš×¼ö•oxíº_µ(G¼í••xÕ`¶‰E¿ý½oZ¼Þ›ÌÁã�/CdÅ
;8'?ÄG!2r¢úZ8¾á@hMÃÑ}¨Ckd‚¨×´ûbÇXÆxÉè_jG˜²„8Ác10y-Üc\¥·ÇñeoYLäó"x¿Žï��¬cóö¸ÀKN¯’<_Ÿ…Àí=ò yü_“%X±:Ëx§,b§7Ç
Þ±˜½á‹zXÃ
V±Æ8êÑ:€AºhšqŸýüg@'q‰MT3Zt1Aº¥1ò›þ²ìcøÀ�v¥ÙÜKÙËsyt¦3­eÛ^<ü�®EЫfu«)Zã�âx,kð�Z"ø�·Èc
¸vu¯ûŽ_ø¢@
Ú»ySü@?ÌÒ© †/¦Pƒ>ü"Ø}€D*„ „T¤‚¿0C&ð�Š)ü¢0˜¦�|jü"úÓ—~õ©O
_T_úÙ¿¾õ½?ýìc¿HùÍ_þè[Ÿû¿
è
èH…O|LÈ\Oõ\O÷|Oø„Ïj`ÏÈŒOû„ÌùtÏö„þLcˆIa”I[ÀÏûÐ÷ÌO�O5Ð�†ÅÜÉøb3³ˆÐ�лø_€Îñ
‡DÌa~‡¯âæa¹r�N
NáVaVŸ&á
Žb÷`á&áàná&áfa%a'Æb Qa1c2.c2^/ ‚_r�Hb:¨¤vcõ™ãJzc6žc6¶c7†cŽ¤>þc+~c=î`?v0XƒÒ‹`E¦:o%
6HÁÐÇÐC‡Ðth(“EJ¾dJVJždþ3K6Ys@‡æA-\Áöª!±ÀUvåÁ2êÄ~èDZæÈWf/Uf¯Yæ‡}®"b¸äH~MåH.ee.eR.GS±M6‡o e3PæO&ffî7iÖdO.eI.åPÎ?¸ä†j(m.grnÙ~“gFWtþ<\ðƒÆNz®g{þa{[ì”kµÖwðçk˜„{àE.èV»†B�¶ÀXƒ�e9–k(‡~èˆf¹zx‡~‡z‡®‡‰Ö!¢‚ªÆèM*K0J¯âÈ*K²{(®a†‡Œnu è˜¦èvèh{‡vÈ莞hŽ&Ù”åè�®é“Ûi—Öè¢F‡>˜iþ¢VjxÈ!¢v)™Ö¼I .k=Ñ„ôgDìçzæ[«¾g¯ög˜åSD¼N Km5h´~¶	Ɔ¦†� vhrÐ!uàè†âèšfê‰VÊᵜÀ¡*�Ö*‹‘&üÊ	¹Á0Äö±“^/”Z†Q@Š®ˆvh£jq؇¹v鈞i½æl6hêÍvèÏîlžþéz at j¬!j‰fíÖf9�ΆT�ç¬6Ä~†K¬îS­6Q¯îí­.QÛ†Ëk°„�Nkã–7l(„<HNÁ˜&qðþƒègŽé™žkq“Ïë7è¶î¹î7t8¡kPŠÛƒNØ«‚"†êrËèðk³À…D{o÷þ‹ÜI“MÙ0y†TpkŠÎî”ýïv¦k–ûî˜vGt5ƒÿ&tð…>tîç^gˆVðÊf¹rD?Ènt‡Tð“}úïì–ì˜ÖhëNpÙž½…aˆÃê]ñ¾…8íêÌÆήŽK«®ñ?ÑMÑkè³>n §¹~¨“Bà56çšasÈ1°`_ðæfq¸ä~Ó!tx†<pksPðoOf	ÔÊ	éäé…Wêb:K°f0ßÿ ™`§u‚zZzÀ†˜X7,8‹”*Dg~‡LHc1
ïfnn¨
—ð‡n	o(3ðdOö1‚Ÿau˜r“þ-gèfæÿ¼>Ðd“%kȃ)ðeu‚NÇ’-toærE7kH…ó8Äß[CLQÞæm^nµ‚ñ†Y¬¶Ö\Ÿg7Ñ?DÞžqpf7Ä€.î ¯vV㋽y6`hTð)Èé¦Xª�ƒy/ƒT ]'�
Ï3YΛæÏo¹Q�v µ~Á°Y@„ «� ëL™1¸†Kg�ö¸£Qð‚�¡Úø ó¿IxRg?˜Ûœ­�!Øp/ / tuwH@�®QRßft˜æO!ut ?E•í! Hð'€ùpPpret0Šxÿ†‘]ٹ͆þ�+øY‚x†ø(¾!ˆl‘eæ–·ubÇuÇj\·j–q jD¤ÖD¬VàÖj„äz>µêî²fQkoû?K"yÐö58Ã?,*@tH¨�ÙN…!€„Xa˜gƒTH
Ë…yÏËjP|Åg¡ñÆ*ˆ�"� D…Z¾£]ø ó| bp‚o°�¨b'�'P
ù¹ˆ×‰eÈ„Å_AÛ›H àôLxVà|?ð‚gèƒTàû!XÙnDt0ƒ×_Á> ru\'è߃>°àgPAkPÁק†,gYÅŸ‚N8~
¸ýÙÎ?3x'8á@´ýæ�®ºê±'þöo誮BH„´Öù�ö®ÂzÆíhÿg±6Q€øöîÝ>�×,¥pÀ¦W¿BŒ(q"ÅŠ/b̨q#ÇŽ?‚)r$É’$û-C´çÝ7*lÌø¢f-[6H¿R	�4¥Æ”)¿ÌLIáGÈ/?T¨QK5ØKšÔ²Y{šíY¦^ÖðÉ“çVy“
D4)+>&Ää½Ã5Š�<'£˜ ëÄFL§5T&‰…H¬\Yÿî“÷�Ø$_Pe¦ò•‰Jž©tBÊ‘­F¦"©üx¡öŒZ‡)9R9µ6ó)µ)4³=}æÇŒ5_fœ¨H•‚š˜S¼
2~1Äè⽘Š9N>õYZˆØ«8æê<JŒѨ¾.–ñ&¸ð1zñ.®ñ‹lcbf1@º‘…|ü#ݘÈ0rq0�$Ñ8IE‚r‘_„€äž]Õçâ8ÓV5Ç_é
•ùq•ªˆÀuìƒiŒÓ#2,)3˜Â&I´‡y¹¤£˜3›ÉLH8ó+Ñl¦XÄÂLkN�ˆÕ[™G;úŠi« <º£þ—i:#£æ$ ÉÎk>ó�è”æ<ë)w¶žÎ„æ=ÓÙÎjÒsš�¸ÆÖh)¸
c˜Â¾ð†3Ìá{8Ä1ˆI,â£øÄ*61‹SÜâ»8Æv„�qÁ	›ÒÁA{Ù1�
Ü㯘Æ=2‘‹,ä"WÉJ2�
Üd¯�É;~r!š¼¶(þïËQ>²ƒ®¬ã'/y/BÆò—£¼¶#ƒ™ÇO–&�™©Ô7'uÈmÞ1—÷ÂfkÂ9©Ž²%
b zü%ÑŠ^4£íèGC:Ò’ž4¥+méKc:ÓšÞ4§;íéO+ú¸ÀÅ5Ö
iS/Õ©Ftª³ÂjEïÃw‰Þ‡;ÊYërª:+^
Ap¹èXÓz×¹ö’<rÍhD«:Ùø0vWmìC?úÙ�–6YŠíè\Sû/ôhÇ¡M�K_&ÖºÆ5`ómbûzÛdA+ASNtïƒÖãvw¢	"�Äà˜Uläö�XZéÛßIÓ£À1{~D±,xd«p†Cþ|ßØ0ìÄ+~
‹¿x`'~ñ�wüã„õ8u§«\鮹ŸïtIr�ƒœã"w¹Ì9óŒ‡\æ7wùÍmŽsœ“Üâ=z΋.òŸÖ]®UùrUëôÂbw»?‡®Ë’‚ƒ
:Ý:×»îu¯'�1_;ٻ΋uäa
e_ûM±\¨�írŸû×÷5
0�}ï¸û×Ù
àB'ä”(N`½Ãx�|�"`à5¤à;¬A¸à7˜1ìÝ^€�—àH
°Ay¥ zuÀ2:

.(ŒíŒB¬+Ö€|>¼CP
ŽIh¥Å5èEy1“zÅJnÇ]ˆ�%ì/ð‡ÕÌ(�Z
üÍz!Í)ª…@Œàô¢ÿ-NÄT!â/0�1¦…µ¤… ÈÂ>¼EðÇxyÁ(x�3"
B:�[ 1øÀ>ÔÀ7L<!"Èb’þÚ+¦Å$
¨E
H ª#/²�
ðc£ä@&/ã7

Ê$G¾Cò5äÞy
NBtBÚ™�?F+áÅv°
0Õ(�%¼C'x
­È"HHx½Ã^¼CF²&C
"8Á2á^Ù‡,•"AÄ
°
þ
.mÖ€qâ qò¬…5ŽÂ8Aâø.'ÖeÇvä)®
/€á)fç$œä54d'¸E©­1'/ä24d
¨ä÷åAÜL‚ðâx²
lføaA¾ŠP° a^
1�Úv,C
l/¬ÁÂ-Q%{,ewlh†r¨,uhˆ‚èˆ*‘ˆ–(‰þ!†ª‡C-"NTjÇŠ^�ÒåîÐ¥
LBXƒ¬ä¦}Œt‡dvÚ!ÍV¤@"ÂL‚
òå7`Njpgÿ}E
ÈLÚ”C3ƒGæ˜m‚
tRA�Ž—x„§F
”è¤(¤X‚uªˆ
�ÌÂLAôŸmÒA
T	?¤D\CAø�ß]C
XBäA_\¯¼C ÚÊdvÇ`6K
à@Ž„¾Ã2PHùi_Oì>�Zé
ZªòðO®0l^1¬%.Ï+åÒ@È•ïÈk�:ì­¸þÒòÌŠ@h‡8”“YÏZv	“¶
’îÒZ¦¥É”O%~Sb%ûÑᬄéÆé[Îé
m
Ì'�còÔ2Ø)|�¦
í­^vÂ,PAÄÌÂ`2AŒ‚4æÔ:t0N*dð!B
ÀzPê¼:

haÁЈ¨ñ+lL%Îà;ÄjÎ P4h©™"¯€–	Äqé×OÛ¢•—8ltÒ	Bs_ê[¼Ä+JÉô�ôÀ9Ü> „#oJÇŠ@$4©²½ÈŠ`Ì4KL!6„CÆþë@8(à¼Ý6-bÿŠï[»u\i[ÏuÓ(\+
üÆo\"ÕD%SÚKý/özóŒo[_³’ž?(]ã¨Ë>s{¼•øÒa\)³•"ðñ(%ª/õ"zDT66ø¾ÊVïC±èýhÿv³©ýO€
àvh¹V„[¼•Ó‘¹‘+y’ï‘Ç?pŸ®Ýb;¡ÊØÙ5©™�‰E&¨“:¡L4MAP‰…
¸T�qºy¼yžëùžóyŸ{
ž; qŠ
 ¿9ä@ú9œAqþyŸÇ"¢'úžÛ¹›Oºžºž:Ÿ‹

\£žÛ9žº��:¥'©Ÿº©; ª£úªº«—ú«·:©ƒº“ˆ�ªßyŸOz¥':¶Þ9ˆ:bòz\:¨çú5ò:¥ûæyª7º±z¦{
°+{®Ãú¤S{³Kz¤k»µÃ¹´w;
´×ĵWÄKüÄ�þ3„—Å3ñRü2ôÂ{é¦È
„üÈ£@ÉË@„¼È«üÊ›|É»ü˯üÉŸ|˧|ͯ<´€d€ð|Ïï|Ï{@
¨€
¤
\
ýÓ“}Ô¿=ßÿýÓÿ=,½ÛX
|ÀÓ«€Ü~Ô7>ßË=t@–Ô
%L´hbF�3àÈÑ#Ä
)„hˆ
@	@JQ& ® ¤˜@¸ (ˆpm5°°#]ÌÀÒ¦XŽ«Î\ú�¦–Áɱ«¸’áà°2®…d	ßšû�§&yBN¹¦`˜†ëÞÊjÉ+QÈ@‚ i"þ„0©9Bœt«QK˜ê¢&šWNQdIÈÏI3mr‰
È ã‹>krH•tT¬ðè“Å°»)Ðâ®3*´Õ¬¥–3œ@Se� %<
4¸‘ÿLêc6Hd€–\èsÝ	Àá�7þð"D±¢ xã!
‹!þ¡¥@þÃG˜~°I Æjtá+·Ó§V[H�$~ cFkV•I.QP!“X˜B|èX_a’��|!çdÑB�.ÖRø:°GEÁ°l©d•J»à¼¦À>î>øÁŽ_*±%±2X)œáÞ©2ÕþØ¥™fþÀbµ’2EÑ‘MS2#Pƒïï£g¢‰r—J$×*ó¦™3j­•Äk… }×Aw2ŠºNkój8§¦³G—ªK	å£b
--- NEW FILE ---
GIF87a€nçþ


„„ïP
U3‹´*áéÂDÈŠ A®(â°¤Ãr|X•šF
˜K`¬b²ÚDsS�R™4Ù	Ì“%®Ê<Ñ1GݸiãÊ�;7ŽÚ4—›Ü™†n§Õ’Ï:2ÙÊDÉ
<Ìʵ+'Ñ㊰WÓ¶{ÖEˆ®[…@éBMìÕtl2‰2Ö9\Ò¤µ
œ,.[᪪‹Î¾Çóäɇîß?üðMǘN«Öªà«´i[ÓôYƬ™3çTÂïœÆ‡2vìèéFÆljžTœØì�gN¶ñvS
4@È}&¡£Œ,@ùØ�Dâ$�ÊðhÜ4”€âHd“M/H“�.
<’
/Dq!SL1
†%5ÓM;
§²šN¶˜¦o,Óðc?íʃŽ©ÀÔU/­ÅÚ5¥ð±I)ÈDü‹)¦è±‰ˆ0ÂH0àÈS«¸_¨iÂèœRÃœ 2yâ�eéTG«¢à
°†Çåt£Çt°ò	`�tk¨™ðÈ3_ˆÍ&‰¼×4&òÝ�O=wÈy¬±ô^ØÎâñ×\Pâ%(:k½Š¶£�#f(b†#¯
ëNüz²G|ãeAyÂv‘ªw,Å~Qq¨�¬âÄooñ+ÇÞÊq½PèÊ-n�B Ìâ•.„å‚úž¿‡³d-„Î:‡Þà¿v¤Ã‘ØC.¬ŒXà¢þ¢ˆ…·
cp\ïPÄiH�â×L)«yÌ;âáj
ÃÅBEQÔØDmø >À¦¿P#la‡KäÂB{[#�YÁ±2Qa¨€"©HDÇ2ÔVŽìXÀÅêÆÉHó §q„D¡)IºièáiN«%ðaûˆR�m<RÖŸ„-@#Ð`
Íñ½pÍ)\渆&Ê€ 	-!Bz ¢‘A^þ2\ÀlF at M€š(�)ÚjR
„Ð…gtãz*Y^
µA:)„"¬D]БVC"ªy±ÃDÁˆ.Š"¶HF, ±�b$£Á¨Êœªj(aL곓b0Üq}°22f”WZ=†t„&¤€þmlIAÛi¼Ì1šq—kîGØZaÑlæ`FøÐ
nƒo‰2ÆŠá
[Xbµè†¡Â…Wé¥~iMÇ,À]uWlþðGÌžÇADÑÉ@§È”‚^îÀ
Œç?ü ~Í»Þh]¼8‚Ü!¡,SQ}åà-8.sþBVM

»`‘‹0Ç
mP‚?øb$ˆ«M)ʘ…’«áVÊ£J&†;êÁJ%Ï"Iä\/[cu¨n”bõ0G32
l#ÂhÆþ/NñQ)ˆÀ¤H02p›¡”45DÚ³÷¬!½-à¡xÒ7zj¾?uaˆFt	Š�b¶µˆrBmîç™TJŽQ½@NÌ{40
CÔâP^,ÆJs‹d¨«u¢ÐÑ�nœ£Üw=Gcs®Ü¾CÓ`…£/äÚ*d‚¶øÆ÷8ì1ÆÇÌŒ.©à̈�3>—c­×õº1‰=x£¹ŠE…°‘f^b»Ùåž
ðÀ³1a'Þ
m¬@Â/¸Á�ùÂdË‚”’1dNHRÖúì'1”Aet ÊˆG;ü®äTLœÞÍTº¦�‚{à1£¸A3Ž¡‹iœø· Ä
Þ  £Ø‰¢ž@ÄÓx\c4=a‘±Á>†Êøx‡8ÄñŽw<C.©CTŠP‰qÛ©tš£h_¨Ê‘šÎ‰¦Èí±sød¯pD?¾áŠo
Î
÷–	#(‚ÓPý–[eDn÷cUm%u­ÅVÜà}Ü`pAàršÒ
ªàp·œ�({ck	V;}Ól½5

 eþûg
0
—4á²"P
£ À
=†¦0@R’
Ò	,Pd0ö}ç�dW¦¬¸w­èŠªH;üGË7~‰r7€z¿
�à
0@@	»p¿Ð·p¨@7vb‚ƒ½õ‰"S‘qQÅQ‡FÒÑoïöç@
ÔðÀ@Ž[°vå…6e6’fGžõY¬�
­b1µ‘|ó¢t�†òà)uóß`e �G¯ÂTÇ‚,×3a"v,À„(Ü@
|Â'idÓZG'
‘VÙ¸Ac
‘uA^è1}!uh
Ø€
,5n—@
~d¹`­ þ
F´t1è”dT9Ó¦õ’!úp©0bí€AÖ°v@‚H‰”ýbZíön
¬ 
È€bÈB]å
 ]ñc�x\ÓPr$æye
(@bp��8 à
è
;ð£Q~ð)0c’ï—OQÆŠÕÀŠØþÉŠJv
Ö0´)¡ù—¬Ua
Íp
„`
w`
§€‹Ì8œp
§À‹(pÌHgÍt!f‚ "Ùƒg¨·s’¡6E`B/#C’}�BŽ¢Å
E°âMˆâ?5àZêz"ªi56EHëÐ	ò6þ!O
;xo¹PX„á£{3¦æ€¥µÓo>{fdEуAC9 Xl`§U°D°K‰í¢e4÷“DþFòà¤×AA°	É
£D–¢àÎ`hÐäd¤dM}Qi+‡Z§„"2^Ýñ©åà©Ðc¨Ä1ZÓéq…õ•�eú¨H*¥IDaÐ
C’ÖÐëÙÓ
=r`òf«j(ÝЉÞDM@€b¾=¾äªbA p� ž84p§@1¦€@@)�I à
pœÞJ„¥¤Ãy·ŠÊ��Ü©dÊ€
w…¨JDIXÚ¦°Á9kà
w`
t¢;”°a þŸb@	„#ÀŒ÷¡å°ò`&ò ó1Uz–Ó0F*‡ög¡ðS?õgxдç¸ZC€‚G´9w¨‘síoñè©`
© 1áµò(G(v¨V›µóp
üh@Ã`7: n°Tã�ÆÚªñ�sz»·h;a¦·Hšsî ·y«¶{{¸D«¶‘µ‹»·Y¸‡K}«µŠKƒZË€‘�	G™Cèpµ‘ÛªˆK´Õ¹å§=	o©¹æPî’Æ�²[²›©aZí0¼‰÷ƒ¶�k¤Š
A0¼n€ÃK
‰ë¸í€
¨ 
Ð 
ƒ@{C´ñ
¼{[k
ð	¬j¶ÀúÖ`µÖ«·�‹¤�À
L´¾«¸ëðÊÄáð·ç+º�«µ¼t¾áb¡0Kz@	zp
Ž›ÂçûapžÀ
Ô`z+`9ÇÇþDKe~kñ`í"¹ñ�ÈöÐvP~ìÄ€ÛÑ0×–·›À
çÐÄœÜÉ=ëÉ}ÌÉ~œ·oÊ¡<º�|¸©¼·ö`µp	vË—À«\Ê*œ·�A
 ãÀË.�?ø£{®’¨ û÷VÊLi’‚¼œÈæ
è ÏÐãƒÛ<àÀ`ÏLܳ›aÚ©�H‘µúŒÊ–K´¦pR¼Ý`À�QÓp
”œ(ð²Lø°Rõ õ`Z~œÕWÛÈ«0÷ ÷`b�ÈîÒ¦¼éÄ\-Ò~ûO~¬9§:
C{®E×r½·ýÈvMeY}®N|Zh¬Ö©üO¬¤Öx½·’m׶üzzËJƒÊ"=Ø‚Œ¹ 
¢Æ`‚mËkÍÕªý“‘r?ÀLiÂpØŠ=Ù’íº®Ë̱½ËÀÜ
æÖlÝÈ~ëÇVÉnÀ­Üz{®u=ÆÀ	œà(
0õýî™ÎètþíÞNÝï~ç~<í\Þí€ ‚áÕæN^üàT¦ðoðmÎ.Žqæú@ïhžç�ñ¸åýæñì¦î¬�þ‚˜qòoÞñ!ñ'¯ì~ÎðERç˜qæ�‚gŽñ8ñòc”ñÏò~ñÏÿ�[u.ó7¿“>O$GßÕhþñúÐóS_õ
�ýÑïq¨_÷Ïà/þ—þþ’þÐ/þd¯þîæÿ ñ¯þâ�þêÿÛïþýÿ
ÉZ]¸•#Ò–^ýY‹ç
ÖàB ÿó@Ú¸pv�Ã

ðË
pž,ó–µlØ(3šJŒZr£™¼èE=¹ÑŽŠT¤®Äèñ8êÈ�’ôgé(â>Hʙִ£%µ)NOiÓ–¢T§Õ©IyúQL>í¤E)Mo:Ò µ©Lí©Fs
U§*•¥?­*R“šÕ§Fuª?+aº„g´} ²a¹TéÏZèKˆn˜é@ÂÒÁ=dÂ`
ñ „Dgþ
NÄS›«
šÑŽ\íi’ûŸ5Ö±ÐiŒ“S»E¸¸†§ùp_3üÞJw4&Ã
êÙÏÿ@‰Ø˜Af�.²õ{mü*¸ÆÐ¥Þ#âÓʪ¶²Q¥½5kÃvÛµá
7·P+®;’KÖà6­eK.p¨H³J÷hÑm.s¡{\ä"»Û-"Ö¾Û]íWx¿Í.w‘¶ÜŸ±·¼Æ}¯r½«ÞöÎ7kô•¯oÉ[_¯
÷¹ë‡=\V
Ç—nã…/ë«+—’7ÞÐç°Læ2ƒj¥„=ú—Ap
ShØ4À@É郴ñ�‡Ú–zÀ
sz_’lt¤¹i¨µ9Îøý´§ÇÜf¶9¼ŽÌ4¤-ýèTÓZÔnötsIhÂ	ÿÏÕ®¨+yéK3¦³JN�¼LÒ6LÅBF%(A€ºcÆÿkØ-(†u.´
M�1"
¤>¤1FþEjÁ®	Í¢º<Kê9{Ll«:
ƒ)dÔ÷c¥ØD´||¿j,3ç“À(ÔÍõƒB’œÂfìB³9À‹tÂ04*ô;ë)Áhô¤ì3ôÀëë/¨9?FŠµðº"¼8…£®†‡‹ãü{¾ëÉ&¤$'dB’\ÍÑD 2QYª5@Á“͹£3”ùcü¹Ý4†ÆJ¶ÚZœÌš�™™›ÒL`l÷›P‹1š[›5Ø,GÊjÊO`ÄÇéa—×P•"~˜xP©
fáþàÓÝažßÍ�þàúåÜnà	ÎaØuâù�‚æáü]]8êOʪœp¸pãkÔBcl8c5Nã4‡5nc7~cÔú«Û²ã5þ+8~ã:>¤Û‚c<¦c46ã¿äp°4&ã3¾†t‡:ä@~clBäIvcDÎc;Žã1>ã9>$2æd1Vd5¾Ôã=¾­>fãSnäFžãQ^cÛZelå@vãR6dY¦c[VeT>¤Möe?>åSÎcSîdÔZcV¦c=ædBþä:Fä_cMVe3–å9^åKÆæF.å1®f@þ+bþdLNfc¶äMæc5îåí�ä9öcGsä^Æep°yîc{þNe:~d®æjNdTÖä>ŽåO~RþævÞck¶f]¶æ3Ff_îdcpè`Þf1~ã	狖拶c[þ+F¶ã{fgjvhvÆemiV>hz¶çh.iOæヾ†uˆ02�1…؇¨Ø‡�Îi�è鞌ž&Ž~
êð‡©Þ‹±6j¦î‹©Nj¶v
¢ÞjÇxk¦Þ
�ë}xï ˆ~pk¿Æ	±îˆž–k½æéÂkÂpêçjï ê½�Ꜷk¼®‹•HjÀ¶ìÉf‰£®§Fì¤þ	þ´6곦ë�^ëÆ>ëÂ^	´Þµ¦ŽÍÆjŸÞjÙ.jªXí¢NìÍpëíØëèàë¬@íܾˆ©m¶–Ž³¾Œ«Ö�ÛPÑ
¬ê¶8ìæŒÂ®m°.ç¾í§^‡s�T2
gï׆oÜ�	/Ò自.�ø>ðçíä
_ñiŸvPuB¯rnÇvRÇr?ó¿öoçq"×ö\çõCïôåH÷Ts÷ó:þ¹qfÿ|€
ôΟ$%þ§ûHæfDîZ‡�Òˆ÷0üwíš?k
,&Nc‹5ÅS
FØ?¹ù“
¢X
¦„ þl$+K£U6W¡Ÿÿ€’œBÍ\¦ï5ØS©ú\3þ%@ôewõ€ò¯­
;ü0ÄK|ž˜
c(Ä!1†̘Xà7?/±°,A,"£(Å)Ò&>óÁË®z%Å'R±‹^üâ;¨—‚±Œf<#ãæ?2Ý'�n|#ãÈÁºÐ§Ld”#ó¨Ç=še�
m(D*Q‡R4¢�¨E3ŠÑ�^´£õ(G?*Ò�’¤
æ",ÁO�Fl†d©—È‘	OXbž€ÄLkzӜڧ4í)OwúS¡êÔþ§E
ªQ�:Ô¤U©G]*R£
Õ©>µªN½jS³ÊÔ­JÕªZí*V¹JU¥ÚÔ¦¤X)L¶É¼Ø0­Xú&$šRKÄ•s­ë]åJ¼îU¯tõ+_ÿj×¾V°y-l`ØÅ"–±‡},a!kØÈRv²–Ulc3+YÌnÖ±}]DaÑêÖ»Y±Žmm–ÈaWІÒ‹`­>_{P×–¶³•mkqÛÚêÖ¶¹å-poÜß
·¸Ä=în�›\äúv¹Îm.t{+Ýá>wºÊ…®\IáZÑ¢vVGlkwÕÓ`†2¥°5ïAÑ[Þš¦—½ë=¯{k_õʾömï}ß‹ßýê·¿þõåïýKß
Ï·Àù
0‚	|`ؼ4¥+h!ÁÝð¾j—¼¢ðzGÐrØ®î0ˆ?,â“xÄ&.1ŠO¬â³xÅ.n1Œ_,ãÓxƃ�©kiúà	cøKß}g�o%Pºv°�(rJ�Ìaº"™ÉKV²‘›å$K¹ÊO¶r”¯¬å,s™Ê[ör—�æ)‹Ìf.3šÉ¬f,ŸyÍKÖç^9œcšò8È[²p/í<žñºÖ–òmíŸá<WAûyÐ?-4¢
mè@Zщ&´£#
éI7šÒŒ¾ô¢3ýèJsÓ›ö´¤;mhHØ”½ ¶i�õœ¥mYÕmÑ“jŬã"Ï´µþÖ®>i�k[ï×(õµ®}ëa÷šØÂ.6²�­ì`3›×Ëvv³�
íiK»ÚÆŽöµ©ÝgRÄΞlª]Ýžv‚WÜr
¥œM]j¯{µ?u·ºßýZy·{Þñ¾7»é­o|Ã;ßü¶·¿Þï�œàõ>ø¾^ð…#üß붭Oi
	»ÒÖÖá6÷zþPŒÇ¥1ªe·‡sLñ‘›µäß69ÉO®ò”³å._ùË[ó™Ë¼æ1¿9Íqnóœó|ç>­‘Iýà"·÷â?�K³xôŽóœGævy+Û¹N½¼o®zM¯®u©o�ê]·:×Ãîu±ƒ}ìf/;Ú³NvµŸ�íiÇþ:Ü¿îö¹O½§£<µ]¡¼Ï¥oi­cä{\È;×"Ç×…:¯Ÿ[ÃëZñŽo<äyÆK¾ò”¿<â1¿øÌs~óž¼å;zÍ�~èÿ­«Þ»á”ðâñ£}¸èz°4Ç«-(nA®nÜß~÷¾×=ð{üÜ¿øÄ?>k‡Ÿ|ã/ù¼wþï™ÿüæSúÖ�¾l#nÖošêÙeïÞgïž‹¿-ä µ>oS›z°ìÿ‡Û�Þ%ßþñ¯¿ûï¯ûó?ÿýŸ¿ÿ 
ä@È€RÊ
<
¸€-¥@8€ˆÒ"'JÆhwn¥km¤Œ)’z%ÖõÕRÜ‘þ!l‰’“&i‡YÓƒYìhÀåHæÝLè`)¡¾¤IJ\&l'ÚdŠ†	‘‰u–h¬™Zƒúý®Ý)”Öhx
 ™ÀŽ
l�ôAMÝé¡&*
ePÁ¢"ê£**¤Nª¤êX”Ò_Æ–¡Ráþ¦_Qj¤á¼eª]É€–†j3rŽ©r‚§ÉõT˜rh¡æšš=f­6‘%ÙˆA¤«f�§Z‚!B¦À
HÀ”þ°2¨mý*”š´n'nJ@@+°>ëµZ+¶nk2–Zî¡2B)wf_¸j«¶>#Ôµ#)È€8À–f+N=柱ã;ÚÚ6ÙUº*·…œšæêH@¡¿ödâ¥ëFÝÔ‘‚‡MéI±–±"+Zú(ÂöÁLl¤ß"äÁ ÁÄÞ&tlØUü€@|A$ìÅjìɶ(²¬‡õA|AB—¾Ì^ì0èÅz
\ehìÄfßMõ�|ÁÔÁ,ƒ‚Êj(»
­ÌÞºji.]\‰Ü’îèk#^VæQ!ú	b¿ú+žlO|m©›Ášž®ŸÔYj|�'�.þ”ÆÁà€ô@”lZ¢
`@à€@â@¸
H1nê¦ÿ€
+d€_;
å¶M]r.©lÝñ
€Á¶ÅLz`î‘»ÀBî¸p«`
Büˆó4¢%4F\HÀÀ
‰‹Œ|øà¥`(�k)O
LP)È׈	FŒüÈcСƅ�˜H�øCß–�ÁHƒ™CPøÐÙlˆ
’‚æ2
ó8ÒA*¾0ñFã�Ëx,è‹L!…°rñ;Šº›H)K2Qh@ê<9(Bﺳˆ¼üàŒSÎ9A’‰&ÈÀ‰>:ùìÓO’È!q#]4©†:!¯ºŠ¡kH;Š¼LP¼¥J4”¢¬¼‹t©î2‚j!H
j(R‚<M•ª7>à

¡
)¨þÖuÎ ©[l–ßf-úo»y#WT*À°:­5â;îˆÂW¼~CÝXê¸õ}´ó¬Á!4$�@4±
a1:tÕΚ`2/â¼ÍGßr^Ç´j~Ô‹â-s#Ë­;”»ºÝtÜûïIrYñ˜Á/_Ú¢*N”¡ªŠ×:|«“HQMÉ>Ó(þ6éE�Yc³6?ý
U�iÔ¢’Â?Ae"nÒyŽ‘¼@	RÁG`ÊÞÒÄ�5+	 Á@çOs!”’r4dýluQKÔûg>qðÑ·f˜Ã9‘#"‘+‹©Êr�¸M¬}KáÞÑò®G}J_‰Š˜$B�Qe…gO<þÖ±¦ØºŒ%k»ˆül‡âÙ
Y
:VþØ„³�IÇi‘Ü–ª&¦PXM<ëø�û½å:)Óá½%¾›��…L�?%GŽ™j;Ê3SóšÇ·öYesyô`§�’:*^Í�‘bã츸¬fM…’Àò„S2ùÈ��ñTÎqžòÖ¦Q¥²E§Ì$µœ…Ìxú&ß')†
A~4ä1éTC›h‹ÈtfPö@¼‰Î�8ë¢ÄòF®ÐY²,TT¡ñó�ëîW™`úFi²E~2r—ÐH©¬D‘;ñÓU=ÏTDP¨‡W)Ó¯Ô…OñŒî1ú3a#—È1‚vï™
�“þ õäP‰¶r�ÂÝ
)…|s„z”¢Û"U–%3hJáY
Û¦Ï!ÔL-uåÞæ5À_Í�{БŽ¥œÞÔ›E´æ˜VzËbIˆ}ì$[ÖÂé'’ˆ�¿<j±Œ9Q©E™ñ!äT±* RñhߎõÑ1ù�k><ЯZšÎëŒÕmŒˆôŠ:?F¹p”`¨L—BìÝ�K×c”°Òȹea
oôœŽ¡Ò¤.LYå\ƒÚ›4¨íp+Ô{,õšUÍöD|yÊÉfAëD–ndŒ$¿¼H–Ô%4TÔ•SŒ;¢«já|«$ÙÔ«¾%¶sEàÔ–¨Œ¡Rn@×'þå(¦'*•žšS¡¢:¦\["¨¸‚ZQ馽eųžÛ±DTCÞ’Ô[7oVm&(0>`\cÑŽ_T™‘n[*ëÞ2ùN�QoEfìi;ý* ¤hÊ‹}Cš/3"9Ê-±åTƒ±¦•_F¶MýhYuÉ:a‰Œ“@sêR[´3ðž—ÄqYy¯Zâgn•(20²êCÛš4_TCëu-蔟”1PaàÏœ—ÆsΑl.|ð7µ»9íæR–¥›œÑ ;²ÓÁj!Ëía—È·ú™L·N'*æʧÆPÅeþGUgf‰ò#š$c�í¦_JŠxíÛðC払çp­¬J}«9ßþ¥Më
7Ÿ&ãGÓè^¸½ø;`$²0AìJr‘k”Z¹N²L§ÖõÕµY$ÔæÒ\4E‚1yÄj-DSlj at 2Žµ„NvŒ°ãòX3Vº£’¨Xò‚HEÀº¢ÏY¶jôœ[…3¦^]¤©ì˯EŸŒ?x	s}§¼T§¬<&7„ùs
¬¬¦jì*µªÑÛžÄek[è>æPØ\ÎKC÷¯¢ª£}ÿ‘øºø�°Ö6KµÔÉVì®Je¡6)I¼K.ksô¬¬…:âqÎÛ„µ³ót¹¹�b™vVR²Vi¼áÙd”Ä\fÝ-^Tï)å«.JT(ËqWšlÞ2¾›þh‘ÕMgÇ­%ÿ‚¨.0ªiÁ\j+áq
˜Ð-Ô
²%åg×�o?êtüÖÏ-œFìS»éÝs·\¢Ue&Ù
ÙêúþPÆÅUž�¨9tµ•–i5‡Ù�òºv¯®ÏÑt²K6RØü’È»¼®U~OÔbdM©XJÃÎÀsì âÙ(»úAv¤"F{x!úÙÏçp«èc‘$3"²®]’8í`òLxT	ÙôhÓŽg7w‹&f¡Ö¸º¬›I±fÓ¦ÿ¾‘Õ¶¯f]*)†¹ïEÎo‹ÈRWbŽ1ëƒZn?Ó9ÔïŽ~³U•˹o¾VW›oM_%£ËD�‘©ÈTTÓ¿Í9þWbź$3Ὼ#7I9±›Éåsu¥�>¥¥Š‡ððÌŒZ‹Ž²íg4̽F€öIT8Ìèö*·öE_
d#¢nìÂï˜:+¢:P†x¦XÈ‹,(sÔJ¹T×6èç´ãmzeSn-ž¦#ÂÊ­Ê,k\ˆùˆ´@¥Š|å"¬‹£Fi“Ä…©%Š�­øìƒrpN/ÀIdš*…&gûBPªÈ‹Ýp(Á‡m˜ ,ÿZG›6Êðþ)Š¸
AŒ×öŽlæ‰KÔÐÃÐÄ
—§µúz¦¨iv¯h¦I)Òð@Dåù%©�;øgŽÐJö6.ä¨ËÅ l`æ‰àÖ'_8Â¥êÄ`ü0þÑpöãÈ
�”<ˆS«xp̃$L×,JQŠ²&lyL	ävæ°ƒðJsŽ§;š­SLÏj«"Ff%äô;˜£†J?	È~Í?
ªi°°WLÝà#ͬÑqZ
oF&ÈÐZëÓäñx®›,%ºøO·mÊtnQðþŒÈuÀ+þ)käg
Ðþ®�ƒÐÉP¤OFrDª€NƒI'Ë ñ(—XÊK¾Ñó¶ñ™Vn"
‘Ž�’ÁÌå‰Y²ËùœEƒ:ÆæB	ÃHi â„ìÏøíºð븎íK._æŽ
%f°4'‰L…r*‰ª¨_&	õhèþ|Ð¥´�-ò{̮ݖ’fج¤r*©²*­ò*±2+µr+¹²+½ò+Á2,År,ɲ,©’žÒg"S--½e«ü�àr.õa.í’.ãò.í².óR/ýò/ÿR.íR0
³0
30ñò0ã’0
“1ýÒ1³/S2á2
Ó-©)›	3G´ÎÌ.?b(‡ÅHS4Ïì4õò3µJ´L³5Yó4?4M$H34U³5YÌ3as4=s6Q“qVS4á2$js4‡S7u³4U34q36Q36ys.Ÿ³9i“3)ô8Ñ:58y‚;W?¼Ó6¿ó5‘Ó$Â=Îó<µó¼¼¯-×sþ¢ÔS(€3>ó#=«³'è?í#?ß³p>Pôú½ø3@õ“¢Ô|¶Ð¼tªrsAÏc@T‡4Ü3B-ôB1ZÐŒ 4C=ôCA4(*2DI´DM?±q™œòDY´E]t$FôEetFIT3iôFqC±3Gy´Gß³=³ÓG…tH1ñ?ƒ”H‘4I[.AWTI�ôIÑmB+J©´JÓÍZ‡C­tK¹T³b´KÁ4L
©)»PLÍôLÍçKÑtMÙtfl´Má4N¿eGå´Ní”O€ôNõtOñÃHùôO
u=°±¼š4P
õPWBJ�QµQ7´C5R÷TM%µR
•L-þ5S•R5µSëôM=5Tí”NEµTÛ4OM5U×ÔOUµUÔIËÔUeµJuVm•JõVuÕI9uW}õF1õW…•G{uX�ÕDAõX••EIuY�5DQõY¥õCYuZ­ÕBaõZµ5Bku[½µ?sõ[ÅU;‹u\̓õ\Õu"Ëu]Ýí’õ]å•ûšu^íuISÔªõ^ùUŪµ_
Ö̲5`	¶Ìºµ`6¼Â5av³Úµa!vLóUA#¶bêa-6cË'^5¶cs¨^=6dÁ'ZE¶d¿ç_M6e	g`U¶eiæ`]6f¿eae¶f§cm6gï#]u¶gég}6hþKÙm3…öhïd‘vi‡vݾ�i¡ö<P6j©&X¶j±ö%`6k¹6%h¶kÁÖ$€6l±–gÉölëd-Çg_Ñ6k9¶mÉViá¶kIvnãVm=‹míj¯voÁvkýÖmóU÷oÕv�ô¶p…Öl·jǶqsöm!—iåvr�¶n-—rñ3—o•;—j
7tƒökIWh÷tM–qU·gS·uCVra·f+wv]sm—v7@s×fû¶wevt�WeMwx[öu�·aY7yMy™ae÷y=¶v¥7cq·z§ww{öw¹·c…÷{+¶xÅ×b�·|çuyÑþbÏw}Ý5zÝa©7~özéW~µ÷~Ç÷s)V6|ý·_É7€
¶}	x[Õ÷€ïÕ€ØZá·�ßu~!X]íw‚#8-X€ù·P3x^
¸ƒÍu€Aø\x„‡5�MX\K8…}õ�YX[%ø…§µ‚e†1¸†Cxƒc‡¿õƒyøYEø‡¥u……XUQ¸ˆ—•ˆ‘¸T]x‰‡5†�¸…óõi£øZ§¶Š•Õ{±øX}x‹u5ˆ½xW•8Œ%õˆÉØVÇøŒµ‰Õ¸U¡¸�M•†áØU¯xŽgU‹íXV»8�EŒù¸TÓø�õÔŒÙS¹�?ubyÀh™Ž—sÙˆ§xJ#þ¹S븒;�1YS÷x“×xpµÔ“Mõ�EÙL	¹”•”QLÙx•
õ�]yOå8–õ’iùRuø–3µ“uÙNý¸—õT•�ÙIOy˜åT˜�I[9™Û–™Mgù™áÔ–¥9N5¹šã”—±YLy›Ï™½Xy‡Ã9›™’ËÙ”™‘ÓÙœïä&x·�Ou’·Wž·”ší¹K¯9Ÿ»T›ù™˜ARÿùIÁy ktœ
zUϹžZ™×¹¡¿ù‘㢷4š)Iñù¢ÚZ•œ5Jýù£q´›EºGº¤´˜QGOz¥t™]zF�9¦]Ô¢iZ¦oø¦‰tŸušFþCº§K”¤�šYz¨‡T¥�ºD[:©—¦™Dgú©3Ô¦¥ªsºªe”§±:Dz«T¨½úB—:¬C©ÉÚAÇú¬¹Ï©Õš@£º­”žáš¨ï$oçYsù®•z-QŒ¡õz=Áú¯Éµ¨ûCͺ°13­[ͪê®ÁÖ!²%{²)»²-û²1;³5{³9»³=û³A;´E{´I»´Mû´Q;µU{µY»µ]ûµa;¶e;²×À!¸ ·u{·y»·}û·�;¸…{¸‰»¸�û¸‘;¹•{¹™»¹�û¹¡;º¥{º©»º­ûº±;»µ›¬�£×`a~a¼É»¼Íûþ¼Ñ;½Õ{½Ù»½Ýû½á;¾å{¾é»¾íû¾ñ;¿õ{¿ù»¿ýû¿
<À|À|(�xà�!y±SÚša
`à=U'øA,üÂ1<Ã5|Ã9¼Ã=üÃA<ÄE|ÄI¼ÄMüÄQ<ÅU|ÅY¼Å]üÅa<Æe|Æi¼ÆmœÆíá€
Ná@aÍÝüÍá<Îå|Îé¼ÎíüÎñ<Ïõ|Ïù¼ÏýüÏ
=Ð}Ð	½Ð
ýÐ=Ñ}ѽÑ�nþà�mx Ò-ýÒ1=Ó5}Ó9½Ó=ýÓA=ÔE}ÔI½ÔMýÔQ=ÕU}ÕY½Õ]ýÕa=Öe}Öi½ÖkýxÀ—Ü¡×gû×�=Ø…}؉½Ø�ýØ‘=Ù•}Ùa²×�Ö�=z}Ú©½Ú­ýÚ±=Ûµ}Û¹½Û½ýÛÁ=ÜÅ}ÜɽÜÍýÜÝ
"`ÝÙ½ÝÝ=°
Ýå½×oáÝí�Ý‘`Þõ}ßÉýîýÞ�€ß~à	ÞÜÓÁÚ¡>¤]Û�`<àáÞ¬Aß<Û¹€¼ŒaÛÁáxÀÚ)�Ðýâ>4žÚ

~åY^Û=`
Ä»b~æAæk®þPÀn¡å©ýÀæ…žæm~âÍ	NaßCþÚÓAŒAå»�D^ÜÁ
ü!¬x€Áì[èýA
D?ög
 ñ5?û	^÷%|
~züÝAþü§}
PÀôÁô	áØÜŒ��
¦@üÇᦀÄß’~
nàÖþxkfÈs7º#Æ_0
tG¨ãBȹðh+öí-ý0g¶+`Jç·)y°°²¤pwòŒ‘é
”
k@
¾ !3¤#Q:ð€(Ót„‘ñæ
@hhŒ>·x8!öÈc
'ñŒ˜!k€CHô„…d4S.pŠ‚0fÈÅ-§ À
&ê
'àŒèN:ñ(ôìH1ð‹;gN„€â%áÙú‘¾™F˜“<ê

*f¤þSÊ£\ ¼KæÒG™xpÁšÍ€'œ¤´þÕK=éè`WPX`b(…©I=ÛÙÏŠ6´¤U)hM;ZÔ–ö£�™OŸ 71÷5,Añ¸Gü¶ Ö½…c4"8b�Eª-cÏŒ
0ƒ¼à;xÁö@,e\HS¼Ð
wqT3fð”…\k%wbù–th;ƒ„lû0
KälÔ0º¸ðáÔÌ€/y§;~¡Uw˜Î–iKk:"¶ŽAfþI2"Lj€idLŸk4¢L1Žý‰Ñ{šdi¿j“<šŽS7ìFû‰Ó¤Xâ!kÐ
ZØ8“�
B¸PBkM·ÒµG®›ëÀ®ý,û5œ2ÛëS…‡íÉåu;dˆôçÁ‘eOÈØ#÷:þ‘Ñ
üâȬÚgT»�Àp’kág´N`TÃ…2OS¾?P¨Ý;¨I,u+ßkÏÞQHŸŒ±À œRn<à5ö2à€5"6õ±†7)3ì”�•‚lÏËÛë¾öþ»Ï=ïïûàK÷ÃcÅLiPìÍ.	Çöña¡ìt"Hð@‰4ÕÞ„th"
à
’Â÷÷E°<ðâ‡S
u?W……Σ ì5+3€&àÐÞ�qa
R`È'SÀÔh�ÒQà0JÂà‚§°ÀA	Oˆ
·Ð~D;ã
@ócU±mLÖð„”°§p
·@	
_èA­ó„þä‚
”€r^ˆ2œ°Mä„þRIbÄ	”€

‰cщžá‰£(Š¥Š§È�˜3ö`L
˸'”1Žeh
iåjûòëp†|(v˜1o¸Œ~Äy”�edX†M&‰å(&XÊ
¹X�ÖH‹`—XwDéð…Ö�‡gh1ßH…òðþ„[ñjŸŠ©¨‘É‘Ÿè‘¤ˆŠ	’‰‘ö7×I
â>”1µ•3¢‘câçŒúcD.¶ ³—0²�F”1<™b´(ñÀT6Ù“X( 'YOÓ'=µ³G( €2:3_î¤ œU447À¡½4½t{Ç•�–2–e	Xc‰–f¹Kiy–»D?TÙ6qñ�@—ui—tI	òö“8%“
[ª¥_š¥´@YJ¦ej¦þgŠ¦d*¦cº¦aʦnš¦fÚ¦d


	 ¿°^Ê¥·@!q
¦YÊ
ª�*­Øê¬Ó:© ZªÖzªàÓ0à 5O‚&a¢®ëÊ®íê®ïÚ®¯ïš®a"óŠ¯ù
¯a ®õº®÷ª¯
+°a’®SP°ì
°hb°O°
‹®{þ°«°
[¯;±k±Û¯[±ôJ°ë®ü&"ë®þ
¯&Û®
³9°3«¯Sp
;´{±˱ k´+±«´±KµPû±ë°ëµëj
bàuk<àaëÿ0¶þÀe{¶g+¶k˶më¶k{¶ûð¶sk¶t›¶t¶r‹·e+¶d¶~[¶€;·‚+¶zë†ë¶jû¶€«¸„ë·„Ë·ƒ‹·�˶”»¶–Û·m«¶i»¹û·ÿ
ŒÁ,º|+Â0<¾èë7
L¼/<Âü»¼H¼¿‘kÀžK¾FÜ·¸WlÅýËÁJ<ÂþŒÀ_|ÄEÜÃlÅeÃkܾ<¼ÁbÅýÛÂ=|ÆlÂJ¬Çr¾8|Á¼¾|ÂUÜÅ\¼Å;\Ȉ|È„¼ÈZœÅO¬Â‹Èd{½Áô"7 tìÂ�œÆ›ÜÇNÄp|¿q콟‡<Mü¾[»“Ènœ¿DìÉBŒ¿³LÅ¥ʱ\À­ËÉrÂv\Ä	ìÁ~¬É
œÂ»\ÇiüË,ÜÆO,ÉI<Æ«ÅBÌÇõ+Ë×ÂØ\ËÚlÊ®\¾2ܵ_˽:ìÊ¢ŒÇžÌ̼Ìì›Ê üǃ|ËÞÈ«¼ÀæÍÐüÉô¬ÏF\Ëè¼ÎÃüÇŠœÌë,ÍËlÐ>LÎüþÌ
�ÐC|ÏmÏýÆ
<ÏMÉØ[®Û+»ÏÐm¼Ÿ°º�p
öb
PyÒé 
÷þ°àÀ×Pص
º×
×à½ÐcË ‚Pº½ðË
d«ë®ýû*�¿kêýCA‰`:J7@Ùó÷OÌ‚î
*P�¤”ëóÈ8×»Úµ®t] _ñº×¼úU¯}%#$Þ@
ìÓ¥$,`KØ´^m‹†À�\�Î6V³Ýì`9ûYφV°£eã
@
,"8�@
Œ UÆ‚–´‘µzÀ�¸€w�%íceXà¦Õàì�	
ìZÓú×Ò†ö´ç,l.Pƒ#ìb“~çÐV2í•71ZîY’ûÜëž(ºÝ�Ñ¡±¶
­·FõÐá¥{ïa¦:ñ��Æãù‹W~ó‹¿ü·qå8ÀÂà‚<üx�†°B÷­€Îyö�
T°XIÑï£!ƒt5†©8í[âãÿÂâ�\”.süX0òßè4ž"?,¤>ø+ ?¢šµ3ú,¿yz£8§<à¿TC+@µ
¬-,è¾<ð¿ù#B,,RP-¦7+ª
L»)lÁf² úz+¦<ð‚|çó?4d¾ç;C5LCâ“ÂÄ¡/N³²û2%3Û§>W"#„Ò¯>D)\:)]D?Ä?$D@ÄC¤¨ë¢ˆ*P
@*RHºåéÖr
#�

P¿< 	p
P€ã2Ä€ƒÌ ùË
è
»*DE4D­ÌJ®ÄJ¯Ä«Ñ 6±Í£¯„R¯Þ
p[³ˆ²„�³²èk£·,J8šËY\#»ŒK3ÊË©a„"…éK.* 
2„°E4xG4RGhPʼnLÂt
Æù
¨J� 
Æ¡‚	Í/À€¸¬Õ£‚˜.]2„eÃþ>ÌEì[¦0

�
(
J€&È
¨aÞ.øÄÓô^õPÃ˸Z

H
×
Ú©5ÞGÞ�20
-Ìh΃ýÄ�®¥¼!ƒ„á•
r;Þ¦AÆ?0kœz�Z
š-‚.ì͠Э±XæØÝ<;I&5RBîãXÆå^®åŠºe^nj_æó*½Ó¶ó2gF½·´Z:&i«WfË7L£¤C+Z.¶åù;„ëA+kµFëTàźß<@Åñ£‚•0QÛ*Þ‘®À‚7{fâä�AÝÇþ­5á¡ITnTÕ[„z,Ö˜ÕR
_£	Gï
Ÿð5Š³*í
ÆmçešAØXK0®À
=í�ødþgO˜æ66ÔWE¨l~ÆnMî&|ÇÓ¡¡1Ð)V¿8å"îOg«­ÿD'p”�

ø§i>LÞç¿´«žnäx¢€
Ø.R²mMj‰[ŒvØ5ξdÃ
\å�…MÀÜÏYå 8À€
o
ˆƒKAmtÝ÷<[–ãµ<~€Æo¨úJ4Ô€µ€0´ÈH*� ¥8P€ƒ‘E–¨4d)�	
H/
DçÂF
„p]^–BÅ

SØõ¤©c4ÅÄÔMÐÐUj©þ¸Æ.g­
ú˜«¬³Òº?¶Ð´¨TLåÄ—®Šò˜§�ò*쯌=åÉA¾&;ÓDF˜€&‹dR�?¤`ZX@Ø¢	¦¹€þ…”x±Th$€ëE”&G_äpZXÄô˜N^
¡)÷ðÙ-ÑD§L£!¸À²'q<­¤¾8¤@ŽõÀ�×hH,lB‚Fš!€7Æ– !ƒlú’çÉ];XHoü ÅTŒ‰!=7ˆ·=§é‚~[µS±Ì,åRÕ;Õ²š•p¢1E…ÓP×a\è‘]U«ê^‘þeVb„Ã[«Ó^»íwaQ†é§;k¼¤Óî7ß¹~D±Éè‰2eˆh Á6çÎÓø|uQ½Q½%2�¸šN†C/çN¹éø¼h¼qL™(ZøÑK=wq 1óSØ!¥<F†Ð�á܆¼áyÑ›Ûøâ ®™
¦mЃ^~X´@bŒçƒß_Š2¿ÏÌí'7á_øò
¤èJ—;Àp(5,ÊÜørRîpS81e(õÓ“Wp*¨$ 		È«V”¥+^+¿—KÍ
(•Ä$è@bº^uN’¢J-gY”D�2”úS¦2F˧à2aÙÌ%-C©€)Ót¢:¤	IÎDÂd‘¦Öç’WHÆ+2§CJ¥t‚•<Ϊu¬ŠÝìðéÏre�8ÑK&¢2“¾
æJI:LÅò1GA^îxÒʃ<´/2Ý&bž9Ë–r
`Ì\¥5«i¼R*EQ½L$ç¼¹"ELµJ¨…PO(Ô¬Uc3.©PQëP6§—Bbä�
gýXÆ*¶&Œ�l¦”’Ñt÷�E£1/OGñ%uƒ•‹>_—Ùí7À·»KOƒ+ªƒIWS>^UlÖt~ª®‹Ì_£ÊhÚ�´¨qidP.û¢ÕR‚dfOyç”·Þõ›’ÍYó¢Åû}ê­J}¦Pýˆ”‚jP¶ÉÕiB7EÝP�ž°M©³˜ËQ´êÇY<mT�5È †}…dåèúËÇìl¾I5LV—JÛD”‡Q^—‘ö=ʽ&dJƒMøàF=3sœÃ_•)*azÎ5Ä;Õ«€ÅÒ×}ڱςž•@UTÓGe¹¬4$N“À‚23xHé	+)—)þÉ-÷¡T	hœçÁ£ È-NToƒÅQ•šsu¾”9'\©öÇ�šÛ¢²[ÉN1#™È¬¬3ºÜγ½S
	ŽEªE¥
’{ú}+ýmUÀóïÿ€âNb¬’C|�¬Œþ˜Hà
OÈ€àODA×®ÁDˆ‹	 Á\­ÈuÞ° 
æ웚’uP›íÙÿÕEªøUZš!2â]\—P‘‚n˜ÀãÄAd
¬läÿí)
…	8@‘(“
À‰@„ ÄÙb‹þéÜAžTy^
:†[¾Ç›PÀo2[~a„>€{Pb	"°ÙK|M
`fÖoÎ×Ôáßÿí?•¦iâÎAõI|@0ÒØd€|„Àè¡qxA#ýÙâ@È
$²}LEU¥àKžÒoÚp
Çe«�¬Fjþ�DG¼�	IèPјé²XAô@ F�^‡�€B‰÷Hð$~\'—„Ì‘¸	}ÜèP‰•!¤@tPAØÉ�L�s�
E˜�\
ä@œ�ÄÉ þA@riXèu
‰
†€˜€I,Å6• ‰Ï8@ŠôŽþÇ(@ü£A�s4GlÌ�@ú�®òÜìc`�	Ë
œ‚£–KR�lìr¸À
è4‡H€ü
ÀÝMA¤@éÉ€Œ¤±
ð&aow~{ASó¸ÙBÏ�…£¸�
@Œ�@
4
¨ ¬øã�,-ÙôâÂA�
!Dó¡`Ù§y¾à Cž˜2
„ÀÒGíL„eaʤÈõ¢ÌŠÎþuöüthÑ£I—½NÌ-
Éát4–°�!Ü!pàÐÞ•;€UUÎÄÈÕ¨*jÃÀà%£2Êh‰.
žzÀ…72ªì)÷ Â’

 A¥§*tàK‘
€ƒÐ H@Þˆ
¡
A­ÿš‰"ì2òMÆ7Ôú
ðÒ’7>p`
¡Ô£‚ÏŒŒÈªÍDqÁ”Ë@­³þdÄŽ§O]`®>ÂÉ.-Éë>Rø’±F+ó0‚z ñ)*>HÀ
4ƒ|ó°
î2$a
ãpÒ¼­úxªù,ÆÊ ‰1!‡+ìX S)P	’Ó9èAÉß>È»Å%°bE„h=h‘ºÄÏbC\`¨§“¬ôÉÐCÆ’Lºz�Ò3¡(#ÎÆÝ>4ÔTÓÖ5o¹Ÿ|òuÛѦ¾â�^G�ðfWæ02¤•ã@áÞ3î§d�	
tȤ�Líl=æJRJLP
‡ÛQ’l˜%HôÁ	ø
„à
Pž_fR
à°¹‰ïKS(÷�wY"P2Á*¢(	Ôhyyç" 9ÀÛ%
üÀU|T“„&³ÚÛUv,B,gÂ&Ê]
BRð
)–0B ;ˆ†6*2
?è‰Â9
Ä
E"��{°´† /IopR
À
u$ø�uŸ’¢
ÇÂŒð(Cð	
‹þÃ¥�¬Ì¤XÁTXUˆŠ²A
ˆöÂœ?`ë¸à	R bV÷vLT-ÀhÔ‡nd>eùŠ��Ù	O
.ØŽ~$@�d`Pó2°‡Õx?I�é•p¨A�[-¼z€(Àsf"<EÊaúP”Cõ@ ×Â^_v{
L 
¬[Â¥‘.°ÂxRà·º5ÐÉ$pAóâ²+µ
s�<À+™\€¢“¤Û7õÂÐ1pv[•x
;IIbðˆò ˜,?0ã:0DŽP~éFäCÈZ¦ÿfëèÅ:
Æ#R`ü
pÀVÅ
2bO2çSB@ëÞàW@
â€ÏMð+0Á
ðþz ½ˆ*ÝzMOf]’)ùf£ÖžÉ5¦ékQ\tCd(%(€vx*ò }	*¼ÆV$‚ù.¦�Jè@xÂÇ<sšÑCò –0G}¬Àòf&øD®ò ~cæ-z¢'ºÑUþ(–Ò¤'|Œ]ÊÂGb—€±Ô„h"d…Æ„±w�ãQˆÖ¢­ƒ¨‚*V„­Q-†'€QKšèLœ"ÊBˆ"ž%ÃV’íBc‚�s²7~qÃ0G-©¼*2M&Rõ¯þKm‰ò1Y)ož±ÔÑ?Òñ©ÑCЮÔJ-RàÄÙgV¦ÂÊK�ÃGàQK¸ñåàmQ	)QÅC|,=Æ"ãPYÉ!ê*z¢kÐŽ%}ɘÞC‰PåƒzË´ÇK#¸"
nC=a=“ÅóƒNfBç+·¬„&lI�e÷\²}ÐÎ*¼dþÅ­ÖÑk.*A‡N
ëà€ö2á�j
þu¹õr§K«Õø¼[—¯p¹Â;eeQ×xðmQ·YSQeˆq`û2TÙQ3.#qn¶hµ÷SOVÝ*cG]VG©v_
3
kq.XÈ_ó¬tVî¾dµw'æ—2Ô�wCUF¡6A\M2—i<#Õlç²J]6N÷(eà³÷òf"²W?ÖaݵJ+ikõP½E�u˜ú]ÑÄ_ÏömM¤0�¥wŸ"l0 âGyw¾Ä“·>Xye¥–°6[µ”K­wzÏ'ù2S.C
oÕ%×¥;÷c÷uj‡£nÇ5JY‰{EÕRþÓ)�s_óŠ%sŠÉ÷>TÏ„•Oõ·%þ84ã÷‘Pñ/]22óton�œóL_ÓP¿uRKnpÁøˆ«T†©¸]ÛãP�izj	YÃt’Ù5 ŸÅDkÐU³ñ8‘øMPeϦÖhj4íx2��'©Ë2Tä{UÆ>ç±Bùæ0B‚ß–Š#TzÙ“zyàZ�˜ÏçG÷ÒdM•{Á˜•ë×R±8xkõ@$¸p÷„YMpP³·]{�‡o×=ˆvOÖþ¢Gr¸Sw�ðv<Ñy݃\ùóA	‡O%Ùc�¢‡Ï6L%s"�öæü8_[VÝÈùàÖ( ½ÓRyDVYé‚ù„œŸë›){‡¸w
‹±kò 
—a—®&Í43u\ÝØHƒ3Jþdj{¢

ü ©M?zâE2!C&|a ?Èà„ð…ŠäaÚƒ¸@á(”GF˜@Aß�òäITô`„Ô2 ‘UF=¤ÐƒÔ!„j	=„€
	Qa„
kRžCxQz|0ÒXoqô…z½EÅT`>îDTd`y
pÇ‘FI��G˜05TJ—nB†`�	`±|ÓïZ±tóFÒ–
þêÁÒ0Ð<,ŒÊ ¤3‚Bà”AYâ#1±o”öƒÆ™@mG›[zຉ',£€”cÜ)V`Öq0c„ã9­¤
Û`¡(
À�Øâ‚´ë6£s
ë2`„¼}@
øÁ@ �…R

T0AL(žÅá&°BŒð

Œˆy
aX†0ÖøšÄ�i.ÀB€CÜ4’)À›
�ƒ`zÁ€	*W¢ˆò!4j‘²

 çÓñ‚K"�ØÍ.(
à‚~@²Ìâ/V¨þr`wÄBü$`ªg"Ïo°~YœH\ï
c³�@VäIèƒ*
á®#ªÕ1JLaã¤/›Š’¡Œmˆã1Ž¥$nÉD‹`
xtTH1L_’4—#ªö�þ"•Þ$r
“�¬1ëgY[¸`ƒA&
å�äÁ
r)Áû(~:߀ض
žì
ŸeQ4qå€DñƒX\À^À¼`·`‡šçÀq$ôä!&høBQ>
`H8ñþ©õX
@1Be#æ!á
�KoA

ð>Ã5~þ¼\¶Axx)jl×=�
ã$0˜—K<¤kàA
øÆ\Ó}Ps~ò@.à
[	
4•YVd:²`:m¶W6­3ÖW2a1äá¡,$¯©g—…$u
€¢
CîõuÙ? 
õ‡¥gi-&¬%X�ˆ
%F¡ýƒ–•?”‰þJoÀ^>¥�ˆõ
÷
q¤$6I´‡v“ì	Yj”e[¢a1uÚe*!¤(z5tsÎÅb¢Ò°‡üá	)�€k
3i
„r)uºqWñ¥`š�czV(›²”ñHs4Ïè….Í5^ÑsåáJ=ø
�bq@•ù
	^�cqÐ5&ä½bwôKã!cz72M�i+ñ`	•´!’
'++^€€F08=À�Õ–GñdO£iXBI¦Ter90Í‘bK‰sš²&L7¬@F0þ´ƒ8 at Uj2ÐTà�ƒ?ƒTF‰�ø@Ët:Os‡ZÓ4.p7:zÔ7^ÐŒèeÎV:…C�…Êh��
ꜗ+EÍÕL„ñC–38gè1jw^£@9`8þó!�
N“&|31>E:zdG�tÙ¿=P&yðꃂZó>r¨ë¨@±“—Ñœ89ÀARK¥Ô܉\)@–ƒ§ÉVÔ%\Œ=–�–2€(دá\°GYc8‘J0hPZóV¿8O×W)Ò2.3(‹½à€�´Ì½ÎèÑk}‚±‡y›?àXá»s–ð�/qÅiq�ý)àþT1àLhò)ö6g�òX-ÒËðò)PÙ¡­›¨]qüQaiÂ,A¤�òÖÔê•}ž�Úžý@�ýÖÒºâSœ7ÙhPƒa-î/‘	�íÙ8§Ú‘ÍÃ¥+´=\ÖÙ-¬˜Q1,¹Ú[¢Ûh
âé
Œ-—þ¢z/£Ä’Ë ŽÂÛЭ°”jÏ“LV{p(ó0Z¨!MÄè!ëœÑ‘ÆK2BíJšh5
Ì;š¨´å¾üÒwÂØ¥·5Àá�0×d³M7—cŽ£ÃªB辌¶KlF«‚(*“®l*Iœ$²Š.�µ‘@…›qQ´2¢/C*õÄ/!™DŒñ¨¬\¯£ÀDQ¼ÀtªŸf¯»ôL«2O�üJô.½Ê>�x
4'ù¤Q&¤èËÒGÛӈʣ®ên/\y¤sѶãŒ!½ŠT½dsuqBO³RÒº"wœ/†ˆjtCRµ›µ¢b“Ö¼ÖÞ„—6Ýx‹@Œt‚‹7_þ}÷õ'NŸ4ì¥<	%5-Št×à);DPÃ�<k(õÖz�T,ß
wªQ,Mb£„ª3,ïZ*ŒØ &òìGu-‚�:ĈœÊÄ«4ŠðÄ–\Üñ;�ås¥ÎLrùEoŒ±)¼Æ+ÏZ†ŽìŒ<’ÕUÒ±ì,×¾Ò°²Q¤ÏÄ;Œ<éŒÝDo6/Ð
å›)&

«ÔìîdÄÒÛHÕrð¥»Ü7^1É43œ„Ë;pÁ•cŽP®ý‹[†nÒÐ.ÒîTŠ©¼RŒIĈGBTZ´Lv�¯ÎÖ]+Ю¿N/F§…"ˆÔˆ2±&»s’º¼_YS¨ºÞ:	’e'gj?µ£eyÈJ7%)þAšù”ë&Â^üù©ú;Ï&±lW²rre"ªÎ̪†ÔÒýP:›šò.¯ñæRÁÉÃÊÖ©Ä­¨äbC†Z,©´v™4�\¼ÍyÍDàú7@ʦ_¶˜Ý649¹xF*>‚ˆžÂ+(‘%G6Ú‹ú²v;dÙíq¦‘]XÆ’4ñ(¤?R	Õ(Æv-j~ªÖǾ¾„ÉçfŽ)~è³ÁšÀG at M£Žä|t�«ÌiÒYÚ]Ä(Ô™­BóÊH£ðÔÈ'_£èÞÃuo�)²¡$BžS!%W"4�aî†PÕíA�	Ï·>÷½ÖèS\òR
	7¦2ù8jÒc þ'Ù-í`ÂRDÃÄ„|*.÷q‹^hr–˜ñ…4±E•´EŠ“qA	]j¢ÃºÌ„rô’O¨ä:ENÅ4g|W”B ¹Ve‘¡öš¥5N–GJrJ
W3GM¡§3;*�¢ú¢«ºY¤YEK’zþ‚Ø­Êb‡4Ý¢R§8B¤H¨c·D')¢$M&€‘fÚ8äÚýE/០�ó¿œ	_òÄ'¿ø!‘�-ÞÃZ…æC7°«`©ÙI¬—(þsHÈt[‘^¶Ná(;ª!RiP·LB©E?Ûˆó>Jƺ¨Å�Ô!ÑF¹"‡$…k…A™‡³šAŠ5q&ùteŸþ'
Š "bÖsÜe’9‘ç>›ÉU„ž$Ë¢I´A&{†¸ã´ÒÊAi,쨭¸„‡>
rÔS™Š–�h‹ETÊc>‡³·>þæoj…«›—gº.U¬ËÌ_JÅT�‹�¡áÓGÌ!]¥h U\PãÔƒÆ(nÇH$=Ö:é²Yêl�£v©DÁŽ¥Ž [Zñ¬ç,š)/&s4â¹|v¨Y®®kº3dªàCKY–NËfæh‡&*Ož[‘j»X»ÆTmæZ³R—0ßN/U?û:ãnÌI0ÐԪǚxÆÕ6ÿóã=½;^äÌ5G"¼QÍxÔ§ªæPŒ:ÍR‡ˆ.�þ©�¬ç팖ˆª.(Aj…ÿòÚÂJʇÖO,ä[^þúûCIUŽ¡.�ô#.EIJâ˜ÀyÚúhæ¸RK«È_‹	LN{õÈ£ÎeTenÔYIKÈ¢ÊPPQ|�BmÄïühÇì“Ø1IêÙNR�‰
Ó„v–un i%¯
ù@è#ÊW.s´èœ�U·„5ú\ ×Ê]I
È`±ÁngEUù%dÔ=­Óîr³߶›ËK|ó„;E.>4“]WdÉ.’Ôuº$˪Êb˜îå•œ-~I�ð\\qPyÝÊl‰õSªÑ"àÂŒjÝ<2Žs‡ºZÛc––æþ×$¸*4cJ(/*-Îë�íP$Kd…†)ï|–s³
>áþŽlqèÄ
­Á½L·Ú˜G¼ža®D	æÓC¨Ðí	h®3³ÂìÖ<ê=èBâ4ˆì<ÓólUj^“�ÛýÀÑ0„ãc[Í?uE…Ü™…F]w£ä"�*âI
îŒWm¨U®@YØl¥2²•½s-«×êBϪ	Û§ãÒº¦8ÍÐÍ~kS�«b=l4?f4:eÕD
IÒimÓ¼ã]<±ÃÇÕHÎ)hþ⦪÷]�7›Ž¨k
ñ£<£9°Ð¢˜‹šÖ†s£¢ñ^M¤RÖ)(1B×
©ªÓ8šPaßÖø´pœŽå@ÞqUà‹Ú_ñˆúY;¹»ó×€÷7â%}²ç
Ó•c¨B&TÕQyõʯ»«ªAáSÑ»c‰�¹¡ë6©	§¶ðbùÉ|EðªSÇF§º"å¢Ì
T¶8ÉлÌy1¤+¥Žs6ÞGy%N9¸Ï�?Ur/Ì#™u
@˜é¨i›%œÒù0– ,	qž´4`‚¤Ú)˜‚(®Ñµ˜i‘�²Dá%±Q®={ÄYÁq3$õà8Çš�Ôþ‰£×qÃépº:1j£˜¨�;�j6”ÈCÂó¡<
•™0íŠ3÷5A+œ²ðò@Äæ #’�¡ü ¸Lc-*é&ŸŠž`)‹r:•ƒ1Š°±<¬Ñ	Ïò¬!Ù4ÁpŸEä¸:
T;ºçP*Yl¬§‹±Å
Œ_aDÈI±‰À˜’“þS¤Îº0‹)ŒïHðX7¢ ‹ÕÙ2ä9¥åBKñŽž(¥©°Ò®¾ûÄ‚ÉZ)?åÃD][<YŒ¯5„�?që«ýI=Óó�CGòŠ“2!«#¨±Îr¨ã¼!Hñ Eª" 3±¨"ú�ùªLK
Áº¤µ<£“TT�•�‘)9ÀRoû¾#Z³

c=Ü�¾ÄŠŽ”[jäE4ò"¾j´�ŠË¾Ø&gq»	¸Ýz3@³¾®`Ÿ'#G¾‘À*‹Ê›C â0û!´q
¸XÇ}döH:ÓÒ+²4²[—Gê(è(ŸlÕ´¡8BŨË!¬@˜#ÂÌ��3w1<x”´¬ð4ÌYaI–™<ø¡•ç Ÿ‹+–
-V
�’TJÌ“£Ùº
íÚ ’Ù¦=á�ê'Í‘-ìÁÈé&ˆ³ˆ¥ôü,)˜¡z+5Þô	þ&t¸ÜCa£'18¶ÛIJ8� )®ãÉJ£À‘­"9ד0E5#ÅØü‰Â8&ðEåjN
¢ƒ“ŽøJšÔNbÀÂË»«=¼JŒã/Hò‚똟º¼D
	�§kMJ̻뙖�»¢‰³kÄiSË}›¢ˆØ90ö�ª›¦²Ì›	<Ò,–"½)¢�Bf´¹-Ç5H‡?Q©´…Ó‘5;%ÈÉ‘±°-\¨Áœ¹ô-Mr2c©‰®3#”šK¶3´É3õ1.¾êa‹JÃ$Õ¢ÆÞ!<IÍ	Ø	Ï-9,˜|3Ö¼Nôžfl6Sþc!í`Š@±Ñ«Ò1è ;Á»ÐÊiȟɨŸ1- ¸·*¡´)Ÿlê¸ÜÁ½Æqe¥ºÌ¤/Cr°­ÏëP,sJÔ;T¸š«Hº¤L­‰Ž*‘é8R Îñ΃ÈXCÁEA0^yÆüÒ
1|›�€¡
k›$Á0­%2£Ê£iš`‰Ð 
\Æ›�‹`
û„¯=ù¸XAɹÈZÊSvijDZR`Õþ2’W‹TÆý&Ì­ÉúÈÐó-l©›ÓXL©H×+ûÐ{�Ê©•'ó
Ÿ‡=
WÙƒÄýkv”?²ª,ü¨~Šï„›ð1ÀКSÊ©;$
"çÝ�š’Ÿ0ª|¥AÃ)%µ¤Òx¤ðE9±PXȲ¯Ë4˜$ܽ3"±:äpc#—,•	²�¡^ç‘ýP(£!Ù½È$¥8D}CÍèp¨Êå¡hK£±{>à)¾ŒÄKû
Ýþ3Ùä¹A}JÛõ.-²(2_ÕñŠ}s#ŒÔ&åiÇ�7TáÚÔ€Š#ùW­<Æ]±—#’¢­/)±›ÜÁ¼»à¥ä=Ù=û´ô	á’j7Ðb¡ÇèNÛ‘ÓÒ}¦è^~Ú�
œšÔ
˜«Š•P£‰J꼦;–üèW˜a˜•@?‘�"Œr™¼>™	Û)”Ù&q2¥9MHj)ÙÜRN°Aצ$¶Ú¬]
$æؽã™, at 1fv̪†,$–(â¢Q%«
Öãâ‰äIcÑB¹'4ã[ÍNÑ,I¢òDŽáò �´QidÂðd¡]¾Ä=ŽÀÇ�I�ø(žUÀýr/vþ439¬ËdEF_^GÌíå�‘åVæ]]†;2Zå¡RÌETëï8䲑EÒd-
ÌdoYšò
Fv3æC'ŽidépÚ(ƒÚ?òcªí‡~Øz¦ç}Àg{ÆçzÎçyæç|þg€þg}®ç{h�6h�Þç…&è}ög‡fè….hˆNhˆè†&hƒ¾ç�Nè‡ÎhŠæçŠ.hŽžè�îèˆ~h‰öç�–h…¦h}Öèˆé–h‘ÖhŒh„îg™®h–é‹Vi—f膦é˜Vè›6i¡žç•.Ᶎ閆i–¶è‘î=¦{êãx. ~ù‡~áê®>Çs|
®öj°ëþ®†“±k²þjØ ¯k´në°>ë¸Vëe빆뺎k²Vk¿þëº6뼶k¶l¹öë¶ìÁ¦ë¼kÃæëe{lĦ�¾nìƦlº–k¼Fë³Þl¸ì½îìÐÖlÀ^ŽÅ>íÍmÏž
Ó^l˾ëΞlÇvl¾&í¿†mÌ6 Ç®mÖî~°kÕÃ`CÕjAêmÏÖí¾ÞmäNmÙmÍìæŽíè–íÔîå.mÖ>íëÖnÉ^íê†ní¾îã^ëêNkóömðÞîÕ¦mëFoÕNnÕ–ìñFïãvnÈ^ïÐflø®oõnmškï.oõVìåÞíÜβÛ\׬.îÁ±oþo7Ž¿�ÂÞîïòúoænmÂæðìÆn	Ç�ðqîþo/oïî_qú¶ðÊŽðéOpåæî—o
ÏpĦpéQ¨�À7îývîÉ.r/ëÌp¶íçqÂÆpÝælïFð¯öðÇðùÎqÊl—q½^ïÙNë$ïò*‡ñ»^ë+Gòn(·ï&_óÚžsÆNòöfs
wmçíÄ.íÂÆòÊ®s8)p@§qu%6ccW!ï,oÚÆo³ŽíövoöÞò4ïðæ~ôÏrß6íCÿó)mßsÃFñK—r·ì²¶ñgqI'ôU×qÞžò27ïÄVóWþÏpP·
3ÿî2�òK?ó>ñCÚA
 Fßê÷ï[OŽÿuÂÙqi¯
:§öBók§qc×vL_ñ
÷qwnïõ0!ñŸvjWöXðvoôqϧtgw=2wxÇwâ¸w6Ù÷ZŸð|çd·M€'ø‚7øƒGø„“>$n…wø‡‡øˆ—øÛ|gè÷‰ÇøŒ×ø�çxäpʆïø�ù‘'y�ò�/ù”Wù•gyeÿÐmù˜—ù™§yA¥MBùš×ù�çùžw“w÷ù ú¡'úex©-ú¤Wú¥WùÙ]t¦‡ú¨—ú„真ú«Çú¬×ê>|z­÷ú¯û@Äàþ4	û²7û³÷.zÂj´gû¶wû¼©zû¹§ûº——=>=¹·û½ç{´?y
ìûÀ|¶W{˜üÃGü¬?y½OüÆw|žúÇ—üÉçù¿§üËÇ|™gxÆÏüÎ÷|‡¯ø‹ÿüÑ'}—Çû.ýÔWý‚·üÕwý×gô—ïzاýÚ¯@¨-TηýÝç}¸ŠüÞþà§Ú£þâ7~yrzÝ?þågþgnåoþè—þïÂûdŸþëÇþ,{¤Ïþî÷~ØP{ëÿþñÏþ¸'ÿóÇþßGÿõ7þÖgÿ÷/þŸ}ø§×_üúÇÿÝWÿüçÿÒwÿþˆ,hð „
2lèð!þĈ'R¬hñ"ÆŒ7j\'æ
 ‚˜Ÿ&ÙÒ­k÷.Þ¼zÿ}å)2ÝÔ½‚.lø0G·QyÌEìø1äÈ’Õö
˃ßäÌš7sî,Ó-ÜtŒ=“.mú4ê�•£Níú5ìØw�-û6îܺ•®öyy7ðà‡§]»1ñäÊ—3Ø[*òæÒ§SwM[nõìÚ·Oî-–,÷ðâÇã5Ž�<úôê³z·½þ=üøTC¯»—oÿ>þ“íÁçïïÿÿC´‘€èßs@¸ ƒø]×ZƒJ(Þ~Zxav ÅU†z\o€ø!‰%Z÷QO癸"‹¤µ‡Y‹1Ê8ÙS


--- NEW FILE ---
GIF87a€çÿ


]ö^UCb]YWZ~Vd]*Wd+Š][^5uEã
usw
	Î,¦ë8ëazL91"(AxñàQ
aðB±Ñ(:dí ¶^
E@ãÔ†/\WŽspÅÑàƒ"„`¼WÌc„`ÉÊ’¸s‚0 Ò£€
ZˆT
€ÀFäé5ðÕ ›@¡&c¤/þÐÇ9z1…:
 Õ%=б§`˜µÁðˆÍ<É!t0Q©h:²i�ñwG Tö*5Át`ãé¸`#qˆD˜ê¢»²k;†aB�¸´²ðGBÀ‘
‚ÀÃ¥‘2”ʼnÎrâ,gqÐr1<Ê`npÇÁ\*2_Œ£`¬þ	L|ÑÚŽ‰MŒ	¹ê±®ƒùåÀÍ»P�ŠsQ£ŠÓ€É5h�Š(ä²äêŠKCª9]<¡O¸.ñ؃5ö ziM9stI‹·	Ì^ éR‹p¢_l„£<û‰º¤Ä¥ô/WŽ¡‰Nä"ÉÈ…(~AŠ[ô!
£8Gf «ÀŸ…9ûDZj¹EÓ”ò“Ò°%*4ÇàüºÃP ÑDLjì£Xµ<Ê(|±®®1X—ðhG<,ñ	[ðßØ1õ
'Éú¤·¼‚®[\ꎔ¸øiu8ÁRúQÍkâ§	¨CSþ
p*� ç ‡�Ìs
lÀÉøé�=Êv/
å²ÒÚþâü!(ODŽ¢“8] †6 .uøÉ•¡+ˆ]äCPù8ê(ÚO�þÓÏj²HáQä¯d™ç0†"ª ˆh°ìh~ÙÑ‹WÌ”¦VˆF=8ÝËÒƒ¦`J,p‚F© gpÂ
ú—‘îuEZ0›Ó	êP€ò�"ªP›®ê&qðš
®K~·€°ã
B0ik4ÍOç@ð7)òY›{—”#>û`î°
\FPPbP
–_ä
ÖRIgj}äŽ�]p„×Âçpr-Å	=@H�ˆf¦sö•iY¡X€]ñÕŠqtÓpY·Ç‰š“t‰Ð	† 	Þ
Ü8Ü(
·Ñ1�ÔÀ
�>‡i'׉¯5È0LXsç`	iоÀ‰ÈxYìÐR-•{œävš&
!
Cær05•À	Ñ�ñ`s1aufh†,Àè°‘§i*‡qw6q8q	*ãµ8ŠöÕÑð÷7iB�|
¶Q3ÈRˆ¸bžØm‡}²’}�Ç¡cËÑ–ðq�à�¢C&^h¦iU™e­³R: 
)gü4}ˆÃÖÇ’8dØ"§qj	#²’þá¢fÝ6yÆu‘žÑP~à€ð¯ $VPT•BP
Ð@¥(dЩ9à	î�
Ù`
�
fS
Ôp
4Šñy
Ç•?@—€rüȘkþ­+;Žð]Ùu]2ÐC€XðݵðiBVÉaùå¤S!”ð0k1³4‹ºÐ‰KwžüHo@‰ çð¿@¡¢à

çÙ‰ý™ž-E
äÐŒ~Dö2ÂE}—`û™ž æ¢ÜXv® 
ÚPj;žèðq¨Àb‹†°-˲çðZ¨Àœ*c	}`	”1
u
CBP	•BÀÐ0šë¨†�8Ð
ïôNÝT
pÕ‚6Sùð'6Ó?ÚÐÀÅ@r’‡»é)‹-5
Z ¦àÎàA3@Í
§Pv¢
ÊqךȔû°*GæèƒÉwïÂEÔ L׉UÁØ	eË� 
àØì\„-³Ç¤É´yˆ—`ÒÐ,Ã
ÄÜê*p 	³Ð	�›
?‹°}j°l°žê	/�
-ÑðÇ©L+‰B{{´ú‚85@
�7êÊ
�Sg
"ðÙoƒ<zÐ\`
ƒÀ…ÀJ
�Kµ×
ÇŒ©ÄÍß|œ	^0N 
•cNÐ�Ðþj	 
VÕ\@t@¡s
š~mÎI-Í�ŒÞ¡YÖäSPö`
²ðÁ3ÀÐ ± Öw0h
š¦ÚÖ8å ºš	‘
ÒÐÒ�ˆ'1^8`HCº�'!¢…ZdžÀJ¬`,ƒ(µ¢�¢ì2yp`ÎéÄLÌÄ_ ØPîû
¥ž-/%sµŸTÝ‘øéo½²áÎÄFGÝ%Û6ËÃ:<È�Àò®`ÓÞøþ	OÀy1
líöJ
qÀÜ�{
Ç€q¢Ð	¿ðåp‹�‰€{üÖfÏoþH�t,YôèªlâÆÝÞ„
GÊX&îÛ
ô‰}-òùÖ÷qS
šÖe–õõNïˆ-ò	+mp÷xßi ñPÖwÜÒ>çˆÍ
u–÷m@aÐí fwÜãKáý(ò½`_îPÙÙ¯`
Òîó~õ9~£à"p
=‡N":‡åÆ¡»•H“&RÃŽ[ÔéÔ1rÇâä"%ÍèQ®Y½j¥†ÎŸ¿|áòу¯µKµÕ%/¡Nœ=‡þ«çŸãrôÂAFw±èå¤)Ë!ƒí«Wž('Ïv%÷ׯY‹â$ÆZbÚˆH¯^f}N
?áþµ±µ­ƒΠ-¢œåŒ&:¥�Üz2³Î,G>àºþ/�ø\ð„4É)aD“�M­Âd] F¦ƒ‡%m¬0Ù’WObÛì‹|Y¤õ-†ÿå'9LÛô8¡`
•¦èc­–ƒ+`êÂcSài
Töþ”% Dq›Œa.ÀË
ªQÔ»Þö®·%¨ŸûÑ6ÛbûØûÈsÈ·Ùù°5<È‘	$ !}˜²¶7n^Ç粘vø¬¥!�a¬œåÒx†4ÐÛjq?»¹—Ë©ñj´|C²l¹/‹Þ”ëZ^üBI6NÌcadÖ׆zÉÿÚ¬“dã…Ï0§9ç
u†Ë:ÙŒ*…J
�ÈòÛÖÌ•¶²‹\sêÊø`4‡7¿µ
Ä]L¡ÑÏèÀ‰h�¿×ÒñiV³È‘ö†ÏºqáІ6ŠQ�ćcZ5/¹»#åGð”�†µ¯-6÷Ù�F¸ƒ'ÎñmjþCóÀÓÁâð|€mn‹A»êÛªzîâ�õñ	w>nO{ÕßlݦýÜt¯zz�cÐ@>4zÑd¿õ¼‡þóÃv0°EßùÔ�Oõyïü¹]ú¯÷ö÷£¯{ïëë8Æ1ª�Ž5ßû‹
¾ê³‹íÒ_èÌ”T_þí·øºåÀ?ü@T{¼ñ{¾|ø†ØH&WÛ½ƒI­gh¹UÛ¿ì3@ìã½È+¹Ýc=~ˆ¿çÃôʽë{=LË>?r>€«>ÈB.†‡¬‡}ð½zè¾
äÀðãLówPº[‡~°À
ì½|
µÐ†ÕÐ
åÐõPÍPýÐ

ÑQÍÐ5ÑýP]Q¥Ð-QÑ%'eÑ•Q
µP6ÌÑÒ	õÑ ÕQRUÑ­PÕÐR&}ÑEþQ¥R6LQ(•R!-ÒuR¥Ñ!]RýRÍYX
~_Žà	þß
ö_¾à
àùußóEZü¥àö_«•`>`Fàþµ[áa®àþua–áö`fÝnaâ á–à¦ß^á
‡!Fþá
v`>a"¾aFb'.â
žß(ÞbÜ#6a,Fà%®á)bâæãnß
֡�
�é£-p{¾Z[–l®=æ©Æëþ5ìGp×p'.mFîp�gRÎðTÎæϵåÁÍkgà«MçÈNñWqÀbjV^¹mN&rnþæ¨vgÏp´nq!ÿ\?ð«}å>†ÜàÅe¼åäÌ¥ç¾qx¦g-@è3`ßæ•é—ÆÛඖÛHï3 €3˜w`€Ý^…§YSTZ‡¨w„„6‚ÚŽÇ<ôÚΆu¨�:w^tph#˜‚Lx(€†8
-¨ƒX8
Ð¥ù\lõx† €A¸ï0z39o
`?#ˆ€AÀ^×ÁA[y
@etxúeXyJgÎðã&÷b®fnr®Mg//ww7|d7ÚUl
ëÉÖ\xh çðþ.ßdÃvëËjAvpˆçq½^åÅ'çpžß·Z
"Ptì|-Z$;‡C�2}è”&Hƒ4
*MþI5âR®>·º[§�*ºzS‹vMú”kصLå¢]ÚmÄzë´òu*µ§R¬A·’Eêõë\¼G尿û"M‡MóJ�t¯AÌCÛ>$‹oë_±y5›˜'O²Ž
ê¥Ë¶oVŸZb
ˆpæŸhÔH×µà2¸Ã …- FX…ÏEwŸi¬ƒÎ#k
™Ü‰«�


“…B`„@9	cïV9Â	›§ä8¡}V)r=‘{ænŸëv¼®[�>bZ&‹›Ç~Î%º‹ƒé!å¢Í…Oç€á3(_Mm{TÍ­×ùmP±�"À–í…™äbÙ¸ùžú¦9þYŽƒL”ô_‰û›„ZVû¼ë¨VQ‘.²	úV‡ÂŒ[ʳ?£EíwàIjöA4>ëwPÃ#5‡AQ@‰;žq†ö‰À'ˆ…ªþ²Y¡F˜IN(€À«©ë� àÓ
š¬¢ЂjÐî8á3ýù�§š%‹tàÊF&ÚCj½Ä«`áj ƒuNxOðÒ×—Ë=H9ËÈ�Ò9B¥H‹Hí˜H—ê)Ìs Ú
˜±•FtFü¢õn¤DˆTŒŠ÷Ò²'Î,ŒcXcVÆ~]%->úŒϘ’vmñ.±ÑŠSBý\SÚ#É(ÄYþ%_Îc
ÊÊR/Ù	Ë+/S”?†ššyhàÄ#B)Žã
#h3â™÷dA	OTèB«ØN)#‚VîꡤÄ,³Yˆå3ëXÅ#ŒC�L<"«FD`XVÎèž�¥'1-´€E”ΕGŒr³rff¢‰ÌŠd#”ÙÀà:„‘žó²àå3ð'Žz³��"ÍÅ@Ô<?qN¬»
÷Èø¨�å�;JÊŒZÈŠ•©5È#¨aðÈ.‰&2‡Ü¢»**ËJzñG&:]fæQ •ÅL߃âo•>y¤\ùμ`zq1ñbÏ“ØkLv®$TŸôB’ìD÷8.	jþI\ÚK=´ ˜1Ê0CØ®•‰¡á< Y(?éŠxÏ{\¼*:,V$2Å«A]VÀôG²háBø •ZŸV*¾Ä«
ËŠ±´`Çií*¢v]Å
2³P'Uå+f±)¸›«€…� -—RôäŽÙk^L,Ýc~‚²‹Þ*¥a•Oæ9:1šf,„ß"Ñ#E3˜=âk=×Kô<–zpú#d3j6F, ÅK\}+Ûƪ‹®3
;RR91·`tXã¾4Ò9ïe¶‘œ4	‘uDŵ	r‚M¸¤GhAgÐÂ2RW&fÎ óè®{�Õ²ˆ%a\²ÔM!Âóž78þ€Ù‹'¦
ˆ
EËùwŽ@ú\‡0ºÏ–æ³).íçEkz™îs¥;-êQ'šÔo5©S
jK£ZÕ®¾t«_ÝçO˚ϱþ®5®kýfpp�6ŠGo¸°ßò
»Øû6±µ€ìc+ÛØ^6³�½ß)p�ÚÊNö°‹Ýì)\»ÙȾ6µ¿ýmpW»ÛÒ&ö°Ë‹nô
›Ûénv²Í­lk�;ÚÎv¶·��ï{·ÛÛûöv¸¥�î€ó[ß/x¶
Žoq›ÞðF8±	mq_;Ú×v¹�ípŒ<ߧ8ÂC¾ìŠ|ÜûÆ7Éù
ð{á-�wÉÍÍq†süá
Ï7Î1~òƒçüÞèÝvÍgò”C秷ÏÝmí‡\ÝÇ^¢lŽÔÃÿø‡?²®u«gýê\÷G?¸Žõ­}ìaǺÙÑ.vµ{½ë]GþûØßnõ¸·ìaïÜçv¹ÏÝëco»ß¯v»ƒ=ïl×úß¿Nö­Ç�ñ‹_|Ý!�øÉ»=ò�§üåOöÁo}ð–ÇúÙÝ~y¼+óz�ûÝKïøºƒžõ™o|ã¯öÌÓ^ñ‰'û?Rÿú«Ç¾ó¦}í�øÙÇ>ïZç¼Þ5Ÿx³#÷ÇW}Ö‘ßøæ¿ýö{·}ð÷Þ{ÈÃö×ǽß	_öás7½®
Ö¡Ò÷�÷Ƈ{øÝ/ù·¿þ�‡?þózÞ·þÄçÿþ­�ý
ßß±�ÿÑ_þÍ_ÿÝß
6 ÿù_ß­�>à2`. ûa `ýI`& ^àîßþn`à- *`
– 6`
öß:¤™ÐÊ>Ü Î ¡.¡ê º`>¡NaR¡b`Z¡J¡n¡:`N`VaBàÖ †á
Ž
mH�¨áÆ¡Î!Ö¡Þ!æ¡î!ö¡~aFÝL]þ¡!""&¢"."#6¢#>"$²!̈ÃÝ¡)˜B
à Pá2Ü
#òÞA¢(Ž")–¢)ž"*þC Â8¬_f�p
>Â	L¡?xB,¢?<Ã
b*þ"0£0#16 $ºaûY%`â?˜Bþ:YÃ?€C,¸Ÿ0P%LãÕ9c,PÂ2¸Ÿ)P8T•ÕÙƒ5‚ã?XƒP
Nr
4¦GˆÀ ôÆ?Ôƒ'ä$QŠ%PÀ
¬ß0Ô@Nå.@
ƒÈbUîƒ?
ƒÕÝA
ø8
¨˜f¦ÿA
#­¶b‚Þª,ôƒé*ðC3N
rpÁh�?0€…ú±Úà €×ˆÀ‡¶„MÄ$x%0@ÌP‚Mdå4Vþ+×	Ãp�cΟ)€,fÖfåÔ�ØÚÄ€|(8rÜ�G¶Ü
�'/¤ojì?ÌÃ
(›œ
䎦;Ü£²�äÒ†®èŽ."þk
Þ
4zZ4zâÉš‚°Q‚8xâÐi5vÝÖ>C¦¹c±eƒ'ÄÂ2hÁdÝ ›™ªâ¢¸_Q¢à3dÞ
/¬Â3H'ljÁ2T*Ö�Šo` ób#¥X%<ƒnRB&
€5<B¯a]¦ß :Aõ‘®û¾/üÊaÓª$R 	Š]&Ÿ�Z`ûV«'š¡Ü¹_Ab,¢aø
p
¾]=
’©l"Š
æ!	n1—1¿f°cq¯1w©?mDZϱdB1ß1ç10v±÷±ÿñ"¢1 2!2¾±!'²"/2Ÿ222$G²$ËO²%_r!2&o2'ß1"w2(‡rÛ±(—²)ãp%Ÿ²*¯òûj2+¿2,÷ë'Ç2-ײ«’²-ç².h*ï²/ÿòHº2031§âþ,32's$:2f‚±2?34Ÿ¤ b4W³5ï¡0_³6oó37387r6s8—³9·`/Ÿ³:¯s	3s+j0;dz:{³<×37ã²=çó5§³>÷ó3g³?41Ó³@´/ã³A't.ó³B74,´CGô)´DWt(#´Eg4'3´Fwô$C´G‡ô"S´H—t&»óš´J�4JRóJ¿4!ƒ4LÏ´“4Mßôc´B¿ƒ:ô´Oÿ4PµP5QµQ5R'µR/5S7µ:xqAs´AûÃ/@‚U_5VgµVo5WwµW5X‡µX�5Y—µYCB78´L4.œµ[¿þ5\ǵ\ϵY§uCÛ´@ûC[w‚!е_ÿ5`6`ÛµBëtBWµ!t‚`/6c7vc'öUvBKµA·u_C_gvbo¶fw6g¶g‡6h�¶h—6iŸ¶i§6j¯¶j·öio6Z;38¯µ@ÿ‚fdã¶bë6$ð¶oç6pïvp÷öpÿ¶p7q#·q'7s/·s7t+wt7÷t/wo+¶d4^×voc6lóõg{wxƒ·f‹wy“÷wëvz�·zóµy¯÷y·w_£·{Ó÷|Ë÷{×7~Ûw~ß7{6lÇvCveo¶z8z÷�'øq/ø‚'·ƒ#8„#øƒG8ƒO8ƒþ·…k8…Kø†{¸„[uvGuKÓ¯E·µUgx‡ß¶Š·ø†»øŠ8‹Ë8�8Œß¸|Çxz¿·€6JóDょï6‘¸Žãø‘_·’ù’¹�y�·x“_·oy“9’_8Z;ôvû³^gù}{·˜gø˜‡9˜C9|£¹~«y”·y™—yŒ‹¹ˆËö7xAÿ‚šSy’çö™÷¹…c¸Œë¹Ÿ³9¡ã¸boù]—8T74Šz›;:¤»ø›¯9zOºz¥ƒ9œƒ7nÏù€ÿxFÛö£cú¨—z¤›:©Ÿ:lsö¡�¸@w¹?[6yÛÁl
Ø:®ßº®Ûºôµª§:™Bþ­ïz¯·¹lÁô:’Û
$;ªG¸! A±ßv§÷xBÛ¹@ùª£A
pÀ˜@
¤@p@„»¸sÀ¼
ŸW¸•óù”»;¼·»•[µHA
Œ@
Ä€¸§ÀÔ8nÛ@Ä€²:$4A¹o� —zoÛA½‡@¿7«‹8—+ºE¹¯óµHÀd@
Ø@H

)%90!ˆ¼B� ÉD
!"^3„-·8|€ÇŽ� ¦ŠR@àS‚ÞÐ�Š éðLý, Ô�@‚ L
ìdºu¥—RÙ“Qv2Éå°Ò*å—a&rJ{Ϫh­YoÃNRð!"Œ­& ûÀ„,ru’=Ì ‹�âíw�”â]`Ìœ¨–7ƒÓLB+#
˜@
ƒˆ˜‰#‡bå ¡�“€ˆŠÐ°°‡û@¤7ÈCúRÝ>®(7©’1^cnÜñ±„e¹¹Çþ)¯,fIj¶ 72˜÷3†
`�	-=ϲ²¡€|à¶#HÊ=× ¢û½ˆhp5_:?„¤,|À†�� ‹³9Ô‚!	Ù‡ƒ倡†ív(âÂöŽZzíR#"ƒ·hÇÉdËÑOÉ©$oRý÷áª:’±»²-Ñ”¤€ʦrW¯‚
U„iç*ˆ£0ÆtÂQ©RZö@3Mì;XËÂ
€"Ø
ŒMKcË"5£Œ¡ÉL3Ï–êÖ£UéÍf)À»e m
Tü†7ø`¸^ò�áBf·J�ì~±¼ÊN.Ë]öÊüGXm�ÌžI,�€«2 ®�PóJÇ왲
!\ʼ·0/.q&sRëþ¥¢2o!W2ôQøØ™?++6è5o!jD Mè¥qõ
¹r³wÜ<èN3òÎ9õò©—‚_ÐÕ­>Ê/
¢ÿ/-µ¦uw…µ[çú�»ôåd4Y¿ÿe'Ö".ë­Ñ�4¡Ö†ðAª
ĘRêRÚǦu´§¨þ’“kâ¨Þr;{¾ð$vb侓çwŠ>ó@a§‚2b:N–Øô‘•\Fò$õuPBô„d!8öTr	ð²{žŽ…(÷œu� ±:èXV5ÛÛ~jfA]ç/ö[+èMö&'¾,ªÇ¡u¢_Û^H7|Õ_5%/¾Ó7©W‘^øŒò‘GÏãŽeo1ó®Fâ�œ5rlOë]h7}ߧ~n‰žO¥g}àë(›ßÜ7?Ú·ëËyô‘Þ‘pïüeþûmK\¾ªwÉî[O÷Ô_[à4»‰ßÓxSÅ{ïÎïø­ý›sÇ¿%Ÿ¸îµn>áwùçãouu:®úÒ7FúXnÞ/kþÐË×Ý�bÉíu¤±çQi"·’ÿ#s”ùðÎÔÌO¿Þî
ëMKü�
sçï°‡Pï21á|/�è	�1¨$.؈°µPúæ&?
Ÿï
yèðÆ®kH��ÎuñÃÌÃÏþ'Ñé
ÝÑ�xBº¡íññ1õqù±ýñ
2 r 	² »áš1Õ'Rÿ�'üÁð!"#²'("!r"²"/’#3ò!R#?R#ñÁ9D’"7’"'62%=2"W²#/²$%&9ò$/²P’"Mò%#R'ÿ
'1r(UÒþtr"e2!}`q)2(€ªIÜg*�"}Â*A$Ùn+‡B)‚Õ¨’,„B§¢ò+ÍÒ(¼Ò)Ÿ‘}(ÉáÔR!Ó2fâò-1éò.ñ2/Ç‚!õ²/ýò/“¢)
s0	s0¡±031éÒ.³1Óùò1%s2[P0)ó213ó339³3Á�1=34EÓíØò§Fó4Q³¾,35Y³5-i3]36eó}@s6mó6c&2qs7yS�’ƒe¾­7…s8£6‰ó8‘ó9j39™³9ï«4™Ä9¥s:½b5©ó:±s}”„9Ü2;½ó;}b9Ás<¥S7Éó<›Ó:Ñs=‰Ó8Ùóþ=yS<ás>eÓ<éó>]S=ñs?OÓ=ùó?=S>
t@)Ó>	ô@%S?tAÓ?ôAS@!tBóÒ@)ôBïRA1tC—ÒA9ôCÝQBAtDÑBIôDÛPCQtEÐCYôE…ODatFƒÎDiôF!NEqtG¹ÍEyôG}î7)	耴HÁÍF�4IíKG•´I#ËG�4JwJF¥´J/	I­4K!‰Iµ´KãJ½4LÓ‡JÅ´LKÍ4Mc†KÕ´MOLÝ4N�…Lå´N‹:WÍNõôeØtOýtHàôO:ètP
u8ÐôPõ8„ô*‚sQ!5:5R)*
µR1þ5Õðt.3µS‘¢O=5T‰bREµTâRMÕT5UYTYµTIõUCUeµSWµVgµQ+‹ópµW}"V}•Ri5X!õV‰UXuõQ�UV�uYuX�uP�5ZŸ5Yy•ZUO»[EZ¹UO§õ[ýÔUÅÕO›µ\ëÔ[ÑÕMÃu]å”\ÝUNÏ5^ÕT]éµLÛõ^Ó^õ5Mçµ_ÃÔ^
VKóu`½”_
ÖKÿ5a­T`6Jöa«a%¶J¶b›Ôa1ÖH#vc•”b=VI/6d�TcIvG;öddUöGG¶eoÔdaFSvfi”em–F_6gYTfyöDkögþWg…vEw¶hGÔg‘–CƒviA”h�D�6j1Ti©vB›öj/jµöB§¶kÔjÁA³vl”kÍ–A¿6m	TlÙö?Ëömmåv@׶n÷Ómñ–>ãvoñ“ný?ï6páSo	w=ûöpßp÷=·qÏÓp!<wrÉ“q-—<7s½Sr9÷:+÷s³sE7;7·t§ÓsQ·9Cwu¥“t]·<µ5v·VW¹Œv!´uq9aww‘ót}w8U7xySw‰·7{÷x{x•7‡·ygÓx¡×6“wzm“y­76Ÿ7{YSz¹·5«÷{[{Å5··|EÓ{Ñwþ4Ãw}G“|Ý7 at m—HãWs7µ~׳}ñ—3áw/ó|ýw2Õ7€)S	X€g÷€;w~Ø;¸�Ó€!X1ûw‚€-˜08ƒ	S‚9Ø0øƒ™ƒE¸/7¸„ûÒƒQX/+x…ó’„]˜.O8†ÓZix8[ø†Õ†u¸!g¸‡R…�؇Cxˆg“‡�2ï7‰�؆™¸>‹ø‰Y‰¥¸ŠQˆ±¸D£x‹E“Š½X¯8Œ+Ó‰É8}»øŒ3ŒÕXøƸ�ÇO‹áØürxŽÍ��í¸íÞ8�ãNŽùX3Óø��yáö¸�Î�âêx‘{n�Öáê¡(þ¹’-ù’19“5y“9¹“=ù“A9”Ey”I¹”Mù”Q9•Uy•Y¹•]ù•a9–ey–i¹–ûÁ§úa–áx¹—}ù—�9˜…y˜‰¹˜�ù˜‘9™•y™™¹™�ù™¡9š¥yš©¹š­ùš±9›µy›¹¹›Ÿ
Õ²Aj œÍùœÑ9�Õy�Ù¹�Ýù�á9žåyžé¹žíùžñ9ŸõyŸù¹ŸýùŸ
: z 	º 
ºž
:�`ì¡¡ú¡!:¢%z¢)º¢-ú¢1:£5z£9º£=ú£A:¤Ez¤Iº¤Mú¤Q:¥Uz¥Yº¥]ZŒ †…�Y1ûaÈy;ÅAìÁþêá§�:¨…z¨‰º¨�ú¨‘:©•z©™º©�ú©¡:ª¥zª©ºª­úª±:«µz«¹º«½ú«½„ÁZ`¦±â²Á›Õz­Ùº­Ýú­á:®åz®éº®íš›‡�¬·Ó¡üú¯
;°{°	»°
û°;±{±»±û±!;²%{²)»²-û²1;³5{³9»³=û³ëàÁ†…ða@;µU{µY»µ]ûµa;¶e{¶i»¶S;´`;ƒx»·}û·�;¸…{¸‰»¸�û¸‘;¹•{¹™»¹�û¹¡;ºcÁ¨»º­ûº=
¢{»{{Ð
»Á»ºe�»É»¼¡Ûþ»Ã;¼cÁ¼Ù»½Ýû½ñ¡Qùa蛾ÁÁ¾í[da¿ù[î{þ;ÀñÀ\À
\²¡Àí›—œÀ\ÜÁ
²A
œÁ'¼Á3œÁ%\Ã=¼Ã×
Âñ»ÂA<ÃKüÃM<ÅQ|ÅO¼ÅUœ¾ÑÁ:€
( ÆmüÆq<Â
|¿uœÅ_<Ãc|”ljüÆ�ÀÇÁ‘ÜÅ×
ÃœÄÜəܻÝAÈ
 È±üÈA<bÁÂ| Ü¿—ü˧œÌÍ|ÌÑÖAê;¾ubÎñAÎåüàÎï<
Üal|^Þþ( Ä
V!÷Õ_(ÀÜA 
5ªþé\uÂÀ‚îV�0x#…)ø.ŠÍÔ�¤A«„&Eˆõß…¨tŸàÒ�g²îÄuænJ�G¾â;
€Áà‡ñÕÀ¨ÅàÇg�É|†Q–Á3-dvÀh9„²áÓ�qÊÍ°”¦è Z“Ò£ëd1�[—.�þ)ûfÔr @�¾Ÿ)<:èU¦Jø꜖u•àƒ%
½{¨vìÛ³sw;]øðõ´ÈáŒ?„ìÛ·GWÏ9:vI?s¶ªF¦Lžj´=s€ždòœ;{eRÇpîP@‰;ƒ±�ÏxUƒ,²´ÀŸ'º“‰™P‚˜'îe#Â#™ñÈ3SD°Š;tpÆ3œ¹ó’‚xâCòWÃ
µ'ŽuhT5<rÂBNX–ß~-hV‡ž"
:žxÆ�î­Éf›n¾	gœrÎÉæ:K5•TSA°^{ë #
 …=lr¡ :ÈâXR
Ò‚8«tàÄ0EÖ b
u¨…jÙ
Jêí�ÿ{ôUþ•;ct<CN˜
Â…è�
šÉ–ä¿)O¹rB
P¥ƒÈxâ
ŠcëpÍA^B¹GLÁ	CŠÇØæ„m1°`Ñ›ówÅfq‹X좽ÈÅ/Š1ŒYÔ_R"–‰5(
ˆÀ?ð�
gRIG„ïyЛÝ!	d"ž•#Ñ¡õLèp*G	":„‰þ[ÛÙs€¶¼o©L�“Þ0u�ðøí)Æt at U­:¸5ÍÑwv<”KïÇÚ•Ò «@Q6
0wº'Ž±pc§®
p
tíiæè.x|ékxðr$qJtà+»zFR¾VpôÓ�¿C8¶¤ƒÇþD1iE)LEÏ€SÅ‚�Ò{“QRERÕªuù\Lá‡Rõ²¨‘–»Â³@ºƒ
Hë'WÑ2|`ª©¼í-{ i“‚A³~éáÇ|àL›´çý3HÅŽ�e)�@‡]‘’²a¤•²øX(©ì„ˆâôŽ˜š0MÓÉLŒp`ìy>Z òlØ,>¾»U„èÀ	èXãÜaŠ^d#E:î@تLì˜P=ÖÁ"wø´/�¸™,4"]ú~ÌaõXÃ#“ãŠ8˜#F®‰KŒb«øÄ+N1‹_ìb·‰ohü›§Úè�ÝV±…k]âè2Slho*$ÓH™·þÉ¿ÄÔU×è
Æu7m©”…lR&‹Æû£OãòÅ€oÍʤm¤èZÏz�
“tL³%É
KŠ›» bG[&½ñyÓ1n±§9ýéNƒÔf϶–°ØI&§ýs¼¶…1Å� ±�E¡¬1£zÄ­ 'Œ’ˆsœ-YèUžÈF?'4kYÄâHëxD…VA

P‡VËty"hGxÏÇ…ç�ÀB"(è&¦^+õô£	’

Ž£ú[þ3Ï°Æš¾ã�„wgáßNLÝY�£ø­ª„†²à]°a°îÍg�E €¨îÖÁB†•E
Heߪ`ì…#›&NÚ©Èߘnô
|†‘ú©M¡
žàr{“˘2¡—�\ÀŒ79J� »9$Øþ(tg�h1Iz#áÔ
"pž`7‘’îq!VØxÜVÕ	s×i�Ù‰�Û©�ÝÉ�ßé�z×5aE²�
õ0gé‰)öqïÙjÁ(–ÛRZ¸R&…„C»… «ðž—žö@ ‡êEíÑxPµ&êA¥‰O
zEˆt“„Aˆtê¦�Z«àžzHj îÉxšsêšch'X"õô'à	£á£3*£5J£or‘Ã…\°wP?
¤uà£Aš&A*¤FJ¤?Z¤Hʤu°¤NÚ¤Hú¤JJ¥@zC:¤Fš¥Pz¥Bº1
¤xz§vz¤uê§yʧzÚ§€ú§{Z§€š¤{¥Mê£mj¥UʦNÚ¨Pê¤NГʧŽº¨›*¥bj¦žz¦¡Š¨f:¦œ:ªZš©Ÿ
ªšš¤i²¥‡Z¥˜Ê¤‹B¨µj¨¶:¨·ª«¹Ê«‚ê«�
¬…Ú«œZ¤ÙÀ†â ɬ̺š™°š¦
¯íš!Ô
¯ì*®üz¯ì
°ÿ*°í:°çZ°êz°âj°»­»¯÷ºþ­üŠ°ñÊ°žà­¦ð¬Úª±Îj±úš­«°»°›±Ûº±É’®"[­‹²,K±
k®ô:±ó:²3±Ð
±õš³
Û²û²4û².ë³3K´!k´
[±E‹´5{´	믋³Ú
�—Šµÿ€µYûþÐ[ëµ\‹µþ µaûµcK¶f;¶þ ¶aÛµbë¶]‹¶a»¶e›¶[;·t«µwk·pëµhë¶vÛ·qk¶`{¶Y«¶ý ¶iË·[»¸„˶yÛ¸‘¹“k¸’[¹”û¸—+¸+¸q»¸—«·k;·‰ëµˆ[¸œk¸rË·zë·ý
ÚŒÐ	­ÐÍþФìÊž¬·ËPQëðƒ€w�
‡†µƒ°Â`ÏN`
Xk
ÅŒµFÐOì,'
Xk
ý´\ðËÿ •Ïƒ
�¢jµXwpöPtbýtÓY+d;ýNP¿|ÕYÒVÝON µ”ÐOöŒµ½¡�†
Ñü×0{�Y«{=k{×[‹cЀIÍz½×ø`¶§ÓOKýGÍÒ
mÙ—�Ù™mÍÝË5
»i
ÂÀ
(0Ê .àÍâÀÝJýÖ=ÜV©Ù'Žâ)®â�üÐÞ|·ƒpp»Îþð@Lhÿ ?¯�µPÎÿp5ðîlâõü²Pþp!ýºéöp
ÅM	ˆ;tôF€ÌÙ�Þÿð@å<-�µæ׋¸âðÎÿp©X›
Z°¶
ž�=·cpÐ×pÐ[‹µàˆ0Œ«àÿáX{
( Äít�µ( ÿPÑxñý`+þ@	¼ÜÞ½â¿ìÁ.ì�Í�ßëÙZ+R›4ì¬Fàø×µ"`
bkæÿ
V©·Ç"¶ž
Fðj›
;bžëc«0눠õ
‹p4ç¿P(Pê_-•$Q(Cÿò>áþÑ|¯¾Þ?“ö	eŒ·ækÊ1ƒZ¨ÃŸL,ÛG·²"”pB
+´ðB3ÔPÃu´XE-¶jØç £(�àDaúQ
Öq§† 0ÂËÖ!‚Aìþyj�!¨Á¡"ðĈœXÇw¸èµ}b�`)Éú±ÇÄ"Xæ„XŒ8@"ÇN¤ÄâŒû‡‚Xþ±g�6)°F„XΊ ŽžòGTD¨ž;Îì
*kºµæ­eìAË~êúÇp•¥Ü<Aˆ�‰S|fpþú%	_a²]à‚–ù¯wb&_“ÿA7^E/+—Dqº-W)Á™W3˜ÂQæ™üáÕŸpÚye~¦ç|þiççk~ò9œz”AÈg™ª¾†×‚ùã �ëɼuVžhZ´ÓV{m¶Û~¶Ã¯ÕAY§ÞÊŽD»Ší'Eï®{(¨è†ª:˜
,«JŸÂû§õ¼{õÇ÷ÿ
WÙK`óƒ°f1�ÉÀZS™ËŸ.™99u˜CšÓ¤f5­yMlfS›Ûäf7½ùMp†Sœã$g9ÍyNt¦S�ëd'8ßÑ”_>sr¸€D=íyO|æSŸûäg?ýùO€T %hA
zP„&T¡ehCúP�vM!¦<¡2ˆfT£åhG=úQ�†T¤#Õ§!fQ�dZ´n%iK]úR˜ÆT¦3¥é@'jgª´),­iO}úS U¨15D' 1xzÈvbÔ©¢XÚ‰¢FªS•jU©zU«f«[þÕjW¹úU¯†¬ckYÉzV³¦­kUk[ÙúV·Æ®s•k\

‰›¤¢M-È,QTHüÕ¨‚
,`	{XÃ&v°Š-ìbÛXÈ"ö±’�,c){YËfv²š­ìf=ÛYÐbö³¢
-gI{ZÓ¦v´ª-íj]ÛZØ¢öµ§Å'R
’R¾þ£‚�*$ ZUßòªÁîo©JÜã··Ê.sïê\ä.W¸Ï�nt›[]èf»Û-.w“ë]évW¼ßoxÉ{^ó¦÷ºå]/zÛ«^ê²7¾î�/|­[ß÷æ¿û
®oë™×M¢e©ZÌ­?f1XåÖv@Â
a‡¨Fر¼•þ°dÿúà+·Â�u°„Ka
O¸Âq‰kbã~xÄ)F1ˆU¬á;8Ä…5ÄVlá
'¾1�CŒãûÅ�…D‡Eä#¹Å$î1‹›d%?ÙÇõ¼ëQ“·úQ§~]±¶àÄÀA°ƒv,e$GuÁ[ˆ��俾¡	183šKœf;WÏ{¾ó’Ó\;!D¸kŽ½Lg?›øÁl>3žóìÜG/ÃM ó_£ûd>G:Ó›Ž´�ü_Š
Xnj<¦�ßÌ[HìA
!È@
R`‚V‡ 	>,‚ß|ê_xD
š�á;Ú˜5®9mX[“8Ù´Îõþ±7}kd×ÚÃ…Ä2
AA
¶`ìDb×&ðu¢Y¼lp‡›Ï·.³
20
)8[ÚÑFö´ÓÝég×[ÙöÎq‚
kåÛ*õZRÌ­AxzÝ<`„¾k0�_ãû¹P
ÄRð
„9‹�˜½´Ëª³¸ ð�ø€(7¨Ú‚ ³à€þxBH(@_³
HÇø¶â{ÆpÇ»{0"˜¹°�,Ø¿=xF�Fük
�‚hLǸ°Û6h‚@»{ƒ hh^
û;µ"CPF…$³ƒ9Kǽ³ƒ,ØÇ B‡
q„=CðGð
H
AìF1k‚ˆÈ1d³1«Éà@K«1" 4È/”»ƒe´
ø¾“H"€F2ã0��‚}$Häc¬„7ÃBò3Je¬²";;ò3
´ƒ°ÃÈøÈq,4Ÿ�Ÿʽ+,ã³l´�½[É& KòGXÇ¿²¸™sË›ËuDÇx¨$¿HKþ³¬H�oŒ
(HØ‹Á+[*-S)¿ò/j{ƒ�€h=àÈ*Ã&�€´l‚�€(Á#.�ä€��´€€;�û€‡´�	p½'¤»XÌÕD
�Ñ-�‚`ÍÒË`ÔºÛA½ƒøº³§=ð�	ˆN
=åÎ=N8R!,Ï|
‚”ì½±�Yš›ªäµ»»²¶Ú]IúƒàzŠ>šCµ= úëÂoË‚™ó�=¬ëãI)àÎø°q•ØMì„
¬kþcW"ðL0Hp<H�‚@&¬&HÔ_× gb°Ux3¼ØYpNÃ×¬ÆM�ýYv¾§ËÝäLÕÜ.^½ríçzBb4­ßðò
<ÿºã3õâ»RD_³'Ú
Wñ�N;.²ÿ¤2·û€qÅ\H

�hú¬1ÿ,
\Kf3*4Ž�d¬=`ãšçØ­29΀¿ZúëVcL×;&‚ò„CMþ¶-dCgì[‚˜Cd¹;d‰®¡†dÿ*´N@˜üæÞ²dTÍä.,m¬aÄ›ª	ÔXu5ehþ7<žÆ,ˆ�k“Ñ&˜PVþ«
Mʪ•Qu…ÈV]a£Bƒ0i›Ã'C;_†½`®§%Ðá<f£úVlcå¾eÔzú2Û€…3¬{¢fÓ‚+0ÝBµµ
/>®Õ;��Y<â°
;þìßµ§s.·Ó|€u.¬L�ÙÍ>Þ�€`[�£ßCtj"+´Æ�_i�cØü¼ ÓX�¶1Öß>]°ƒž¹Ph
CTOM1;¨ÛÙ~]»}»à›]aÍ€ðFSçCA<Ø	`£âÂá%é÷-
$H[&
){þI	aÒÊ4·Ø	Ôäƒ
‚1HðÑ	Á–D
6™IÄPH>
"�½A
Å@ž	Ð4ÒMXàRþu�P¸
høø�xKJ1B1u$³øµŽ«à¥W
û8Ö«¯¿¬°Ãæ�?³´U'6X‚	âñÁ!
ª‹|�¬
rÛ‰P1X þ�å™ S�è–ÜIžëÖ|ÒfšAž¦‰1HÛ,L
ÄcZ�I0‚¦�ìáâÙ2äcHL{ w°eTÉ™*E ½áÃÅ&H1�Éò4ÔÅIî뚴⦰„
žÅ°GÇÒ~€%AD¬ù€lå	SHpð>0lB‚2Ë2~ŠÆÌ\¹Dq`–iÙÐ|¬»aËñ[0QDAD¡±pÃ0×™¢ÿäV 9MÀ�ÕB’m©�vÐ6|À
Ô´Ùë[™pqÍCŒNcMPZÊÆÀ�¸#15gŒ»…Ff×Tjã)dñF)ˆÃiu²›Døþva�å†�‚¶ZºI\sÕuW^{ÕC¬ï¿¼ð�;gío,i¤MH!Å…BbGRhn·=2—…æ{”\ZvlæSñdGóÌk^ïœ[4±¤Gn
¸”F¡cZˆ2µGˆYh¯óÍ;¯m8ÑÞr‚)L�S³Ž¬ÐƒÀ‘Ô/-eà_–³ 
üc^š	jÎH;
„³p43�FV[ ` Ê€ªzñdÍ»	S
´!˜˜+ô<,Ü‚y¼À%,<³{ä-usÇrJpJÇ׎|j»=BÏ”2jA/zŸê-±`wÊš(Ÿ¤z~z™ìáS³8-þG„w—Ô:C;ÚÃÂðYŒìW
¨Ãr�±µ­Ö´Z{I±{EÔ¬*wdï�¤náJj$�º°IâÂ�ct¶¬×mTwÝm`ë» U8_›jÕæSßOK—¸ŒÖGë;ÛÕ^«ˆoèéHoÛªA¾±¿³ŠRÛ½Ùµ€Œ­´KnrÆ KÆ64(°;îP2Û“�·^n¿Ú		
L¸…
ÄÁ¦`o¥ß�mŸÓù›y©¡©…ZÓÅ-[³é
¯�_êµùÙ®
�Û™–ñ`ÝÄÛà¦|Ê"HAÐh…ŽAÄ JIø@
A0L[ôKH€ßÄÀ�¨ÆeñH
X at tÄÀdÀÚí�l
DAlÁd@
JKŒ
dÀK @
PŠüÀGjxÅ
WžÅ0K7¶`'øÀ$—ø#{B A
HÀüŒ+²F TˆA
D¨ÇHüŒKÔN¶‡hf€}<À4G4vÑpTÎ˵YûÉšñä¡ýŒQ‹ÙPj¥š²Ù�„™dtÖY"!YǽŸw¿]$ѵR&Š„G¼Fp¨¡ãå\uìÁU¤x†VâB0Å@$õ½Á€
,Gb^¢ÈØIÇ9š€ëd
ÜÄ;N€ÔƒJ¨£¡X„—ôBòDßdS”��ÄâIX at GT‰´`£éÚµ±¡ú­ÝEþÛÏÜY
NHŠ\øIç�Z˜dà!§¤�š
…l™®êªz˜@Ý @rщíT€’#ÇPÏâœãÈJ¢ÅÜFÜèj<R™‘œÈ˜Ä’`œÄÁP­$îÐÅÜÚUgªÉJ•³Ñ!žb,S=•©•ÝF’Ýqjž5ÒZ¦�І?yÖ#
VÔ)-
�Q–W4Ž©´EÆ�£‚†’
©–(mƒj×è$W!0eAK|£[H
Åä[¼§º¾|
i

ŠHÄ‚|€‚p¥¸¥eI
6[�öÄ•¶o¬�°Å‘=VE@ðÛΤôeâ(¨ŒU•0‘Ç#S
D(h¼F
˜
D{Éôh£€tù¦ªn\
;ª<ÀØýLQÊO—XYcÍ4L#3f¡œ¦VÈ–WÝõQÅâ�Swš#T5ûåp˜žMƒùàdÁ6ÆÉ•ñˆùœ£tõgJâdŠìpÍ™,@Ðàƒ\ãÀÕµzì6„À"¸[À
zDá¼q´ÊCÍVþ�ô5ÑFHY9Pj4á…ü¯T²8OIiDÔÄ@èÔÓf †P‘�HÁtHU/Aƒ„è«ÉDZ»}‚xÊSüÙKOÔx¼^¯ŸQòû–÷pórŸC|Ħ>§Åüâ+ÆÆÎnC�®½ãp0¯Zuòä̪�”ÌhÆpÍö.
íÓy°8‹#V?�ŠqìHý Çy4Q‘ç-OÈÌöžÇ)qþç�~PPTëcOçÉL}þöjÆg}&âu¾d5Òu°¸ë“ž³ZÖÍp¥y€×\Yð¯RhìAé-SìËŒx~h,ïc ׾JH`êCú†¡ø<�GÂÜsã[Ÿjœá!óþ2XÁÅ÷½I2þÿÄ?�	Î2d¨BH&dèÐЄV|‘b'‰7NŒaãÍă*„t’F”
#¢tùr#C…$U®äÓ¥J“5]š<é³g”8[þäùò!N‰8uŠifQ”5#Z‚
ÍÑPÕ&ˆ”LùThÏ©UÅjùú5E®5cçî1¶TàQ‰ýýZjh–¸g7ªïÊßss–þZ7‘Y�w,ú|ø÷êG»ç¼>»÷T߸©+¯Û9-g§�×*w­V>ýü¤ãCD‰‹ w¸ˆE0Âtðç²\�Á|P²YÖòÎ>üú«Î5ЬMÃ-,�À‚¶˜#óØêj)“\ÛŒ´¡ÒK±¥½–BÊ´£hÚÈ­qäL.µbBnE® šQCÿdlEÛRê� 
l0pjØÂ>ýüÐ@1ËL?þŠ´hÃÓÞ\‹#‡ì Â>ÑÂè6KT&q³�GÑ6­:-["¯Qöþ´<ŽÄNoº
¿ßê«CüÀ‰Q¹v£.È›)#ˆ&ð!)Ûï¶å,bï¹Û¼ŽÍàJŽ=à*Ü/ÍióKi>ú¦u(Öþ¼½	
,ì°v}þhvýÉ,ÎB­ÃH—eµQ!Y³ÒFqu–¶Ø8loÃb9=×ãÒ¸ÚL;®WY¬3*™Qb—ŽV
U%û;þf]ýx>n‹-´UÓ�Æ1ÎSgº�eEõÃö4YßÜ)ä¯Ûm¡ÄˆÜ�šòÊ-oðÝ‹ä:êÂņÏLNá½kG“áøãÑÒŽëaj×4Y¯ECu3fš9Mª4‡Æëá³7¼k.ãÜݦ“Ñ¢Ðᔟm´†Sþ»³˜�‚ÓåÀ=#Óâo•—=Q—êèÎ�÷¼œüòÍ_Œè°W¦_Ðߢ+ÛøÍÆ4jbÝY�»¥¾ÞÍÙ^µdòbï²0fµíu•‘ì·¿êyÍj3±Òê¼0õOoøÙ
í÷¾CMçcqÚÚê”c+3
ï[©‹Íãþ9s¡ë|1”¡åÞ5!þžw�ãPìlƺµE`tÙ¾Vv¯µÙŠ%z©ðê³Æ]$cS2 çš·­Î)ZÏãµî'8�)�ˆjB¡ïè>°T�fºC£Ñ´&§7õK#ßûGøÌÕ³Þ�é"›¸FíÕíS[šâðõ©~+ml•[¸ÈŸY+ux‹$ç’À�ïj@ÜqÖ×»ñŒŠ�9,à[æ†?fýÏ^É:å='0øRuDd\#3õ½±Ð…BPyÙKIz‰Cœ]ÔÈ8ùeχÃCݼ<cË+	‘~_‘—ÿÜ8½¦)‰Ù¤Ûî|HÈ×ecѧ¹	Mßy�›ÉËÇh@%þNœì#§9³r®Ñ{9ÃaÆçKþ“2CëÆ,ZP\t%èAšP„.Ô¡
e¨AJQ‰Nô¡ÕhC1ÊÑŠbÔ¢�¨HJÑŠj¥-©DOJRˆ2”¥1…)K]S•"´¤&õèCsŠš&¤+µhG[šR£•§8­éFuúQ¡FÔ£¥)Q�šS£ú´
�ä`P¯~•1ýèÇÐÈ:V²þ£¬"ëZÏê�±¢µ­k5ëÐÐ
W±º•­yÕ+^‡öVº¶Õ®j•+_Í:ÖÂö5¯�Ý«?øÁV¸®õ±‚5¬cõúÖÀÎÕ­–…ëc»Y¾6­y=,bÙŠÙ]þ•þ®“EíjUkÖº.¶±]ldG«ZÊ¢¶µ˜=ìaÚ:ÙÚV¶¦•m]Á§³:‚¹ÉU+bv)�æ:72Ï}.q	2ÝËL÷´Y®vc]ÇdW2Ö•.f6ËÝÄœ•ºã¥®ÐÀ‹¾êr¼Û]—z᫘æf·½Ð}í}_û^ó®+—…ñnr	ìË
û·ºè�®`ÉëØÿXA¦kw±Û_æBX¾ä}ltÏë\ÈB–1‚=m~Ãàî®÷A
†î„í+aÿ—¹(vo|eLawXŸâãS�yÜcÿÈA2Ð|®!ÉIVò’™ìU:ÈŽM–ò”©\e+_ù1E†0–¹Üe/Ì3¼S@



From shedges at users.sourceforge.net  Thu Jun 23 13:31:18 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 23 Jun 2005 04:31:18 -0700
Subject: [Koha-cvs] CVS: koha-doc/en/sysadmin/templates/imagesfolder image1.gif,NONE,1.1 image2.gif,NONE,1.1 image3.gif,NONE,1.1
Message-ID: <E1DlPvS-0002is-SV@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/en/sysadmin/templates/imagesfolder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10446/templates/imagesfolder

Added Files:
	image1.gif image2.gif image3.gif 
Log Message:
Graphics for translation.xml

--- NEW FILE ---
GIF87a€ò
çþ
ROH?Ve at VnSQV‹,ˆ:Zo”7;TTQJY`SRnjE{oMJZ`Uc_E]^[FezJetWakc`YRfnŽV/^fgz[W~T�egd†`3;hÖhr:‚bIA…@Žc*“dmio_rzWt†jqsrqouqiZwžŠf�D~ôe‚˜|}|j„‘©w/É…‚z:µ7`‡Ý††„o–p°}G©�H‘‘4sŠÐŒ�‹—‘X›Œjº‡:z”£x”«§|±‡“Ž’�‡œ‡œ{�Æh¯^³ƒ~¥‘\Är»¥Š‘••”É—K�¢²žŸ�¢Ÿ–®˜ž“¥¢¥«S—¨¡‹ª·…£ðhÏf‘©ÃΊÇÄ™’‹ªÚ¨§ž¦§¥× G˜¦Ü–µ’º §Ý£AË¥iº­pÀ¡¹Ú§Y«ªÍ­¯­²­®Ý››½¯�¬²À¶³ªÿ¦)ÿ¥6Ϊ£ÿª*ñ­Bø«=ó®;ú¬3ë¯Lþª4ò¬Jø¯*ü­*ºµ¶ö¯3ô²)µ¸µÂ¶�†Ú�ë³?è³^˜ÖŒ˜ÊÑþ£ä¼TؽvÀ¾µ·Ã½Æ»¿Ã¾¿¿Á¾¨ÄöλÂÏÃœµÃä®×¥Ð¾ÒÖÈ�ºÉÖå¹·ÆÈÆÊÉÀçÈxÌÇÇ¥ÖíÇÅñÁÔ½µÚÕ¬ÜäÍÑÎíΊ¶æ¥ÕÐÐÇÔâñΕÝÍÒÅÕõÙÕÌÛÒäçÒÉóÍÉ×Ù׬øªÝØØùߌõá—÷ݪèâÇßâàçâÍòä§òà½ÕìÎÃîûäáçåäØÃñòðßØèâáøÜÖëâÛÝäùôàççéæþì òéâíêððêèþåáùèáúíÆìîëïîåÑûýïòîóòèìöñúñêñóø÷òðýðôõ÷óÿúÔÿ÷ðîþþÿöýÿüßùûøýýæÿýíýýóÿûùøþÿüþûÿüÿþÿü,
J´¨Q†-&<zNÓ…NÙDmóTêÁ0U™jÝÊ4*Q˜*yŠ»TaA²:žüóK!¶1Ù"œk°.S²`í|áÊ×bп,Kfz¶ïÁ/4	îýÂØ	“ÇLJ`À�¡r†
–3|ج¹ó‡$6“�áåÌ&c �Á‚êÉ©c³~=™uè%pg(¡yôíÍÀƒ—ø-œóçã•?„&¸fã�Ÿ¶Üü
ã¹�ß½»¹oÓÊ�þSV®zEéÕèI¯vݺµë÷í]gp]ÁB‰	´[ϯ�?í× ÕÆh¶­&Ýf%”PA‚›¥÷’AˆÞkðMm³
·	èÛj£¡p�u"¢àÛ$˜·Â‡úæ¢z¶Íö¢‹˜Wã�7ʸn&èã�@úˆ		–ˆ‚2”$�Êå¶d	,<)å�D.Id•>^Y%–S7ãŠ+š@‚˜3ŽfŠazéb	""‰ä3¸)çœtáJ‡1ödŒ4Fcc8AÄEPáÅ^PáÄDŒ1Ä£4Lä…NAD4Aæ4‘AL
«¬­Ž
««X at .¨×F‹_¡ªfAÙ¾{mjï^«± ¦V¬¾Ö†0f´VV«±
ü›Ä™ñÆn>î–s‚:çLdrܽ<³(³æòÑF
ˆ3…ÇD8
`ø#œélKþ	º�
½CµÁ)IH<Ò‘ä´Ä8Å©mL˜d·8o/Š�…ea-*¢4XÅ)ŒAL&ð¤,E"ÌÀpJQw+\Uî`¥ª£©’ÅGe-Y,$Ã`÷0Øy.f§";v:`�.A‹Y	ì`®y¬’,³w’€$FÖsÑÌÇ°Íüês{–ùz7¾ƒMoeÀÛX…R3¾ÔЀzíS�¿63‡é fN˜AÆL“"%é6]£˜ÍÚV ÉDЙ¢
Šîóó¸fMÚ�Ü’³&x¡g«
ŠÌ$]G3	bÂh¤3Z'4&¦<•#ÏÒoDÖþ!�ýpƒÞtÌGIàdPÀI€îPƒ;Ñ@—˜„"4TIà`‰’à…|¾34ØS—žÔ�çt‡G=R=¨6’„}Rh¼”›"æЃ#¥ÁI—ȸ6Ñé¦sZ¢Üì𘹹I¦+(ÜA¾)¨A9A
`Á¤˜ …!È`SN �	0`'LJPsæV°"8éqV®¤¾ŒçHsytgM�¾2‰‰q
5™I"%ùH¥!‹®
¢àÖvó…"Ø
IÓ9’Í–HÐ$q¢(¨À8™`¤€	w%l@„ÉÀñ�–…pâ˜rb
×I6ÛúÊž&iO(-QÛŠ°à"<„1^¨|já¹­W¸$pÌF{èÒ¦íG;t©�$¼CÉÅ.¡œØ”Ä"Ž´Hl
‘‰`<‹P„4pq;‡ŒÓ
ß´Šr¢púJEÙ®`8Þ´ÁH8/Õ	šZð£¢Ê§Uõ›YUÄŠ@âÒ ]ØêOþû0™I·Zo`Àó]ÀHùÖÌp®xö%ž9W—%mk1[�Ðfö+™ñ&±(ààd€o2–Â{j›žÔȘ#}Á‹î“̘Ï
Žp˜
ª0)Ê’Úþ%5‚I5joŸ¶A{�°
æ€Úñ›H‚8N V%ŠÐnì…köpN 

mtU´fUn„8¢`Øp"¨F«flÞÓ8s°jp
‡v[‡$œÔ£ei–cI¤Y•“³&€z·ÎÇpb¬Q8ö
]&U„C]æ*ÀäF6°Z6â46r  X™�Ù˜#‚O¤è[Ž	\jZ\µH"2`™•¹6°øq™y§°˜¦ÙGòPÆæ8ù5€þv2¢rc‹>å?èzËÉŒ3ªrê8‰³~`�Íi¢¿æzV¨^p$t(£µ'‡·G€ÖGNkä~‰~äoT4NsÓƒÞ´h6ˆ~Ïfž×ˆir³�Y)¤:|·ÊŒZ%‘ŽãnLVqŽ:kšZmsã6‰�ÞøŒ¨UµGTè•n®žX‰ªÔzŽZÉmî%7ƒˆq?¨…?\Î7­297z‚z—Æ`'7¢=ê†<zS+Ê¢s]ú@
–6*–
õ¯l¸uI@¥a	Q]¤
'U�‚뵨Tü¿Œpùv‡'p4ÂFIÂ)•<—å_ ü¿;JÀH¦tÍêFv‡$lÃ*̬t—5‘Íj–ŽãFç'Äç'j!,Ä"LYJzÂ'|‡BLYù–Ã,<ÂQŒpÕë_ýå_4 at Y6`N ½Ü+vtÃ)¬_,]NèF›bœÂtøz¶ƒku‚úTc]�ãTf8,`f(,€)þtŒ°‡nx£b¹¸“K°‚ùtÃȃR|ÌFkǃ[)•µ²Pãób
\…Oƒ.P#w0Ê£,
¾ßÍ�ÜìíÚNYŽßø}ß�21 áÎà¾á¾à�"â.âžánâ#žáò=ß(þâ0ãîß÷ÍßÕýÞy�j¶�ÖßÝÅý-ß1€AäZ]ß%›)&@A¾1`C`PþäŽäN´p
½påµP§p
ºÐå_®»Ðå^þå§ 
a¾_>æaÎåºÐ\^½Àæb^æj~
jÎå]¾þ\~çcNæ^.
d.耾çb.æwæu¾æ^Þè�®æ�~è�¾è�.çdæ“îå[>é�^èr€æ_.ºpè»Pêrp
œpé^þç©~
§Þ対ê»0çsîå½€çšÞåWNµpåp¾åÀ.ç·çºP£nì½0êÅ^ì|Žå¹^ì¸þ槰åpÎëpþëqN_çÀ¾íÝÞëËìrÎë½^·`å[N¦`å¼NY^îâ~íµ0ël^ê³Næ\NëXnéÉísžïÿ^r>ð½Pðû¾é·NíüìäžîÀÞ_î·P¦pîOŸñ·0ñâÎñ½^íÁÞðè®ð[®þñŸ
ç~
VŽíïnîoî.o
¿ñ4(Ÿñó· óµ�
Ç ñ<¿ó©`
D_ò2ô/óoåªpñ[~ô(�
· õ?ñHÏñoîîNíÎnæ€îõxþæ	_òV/îé>ò.�îçnåÅ`ò½nåœp
Üp
v_÷wo÷tÏ
u_×à÷~ÿ÷~_÷xŸ÷v�zÏ
ÚP†ïø{¯÷{Ï÷|o÷~¯÷ŽùÑ ù’øƒùÅpùt?ú‡ø¡/ø‚¿ø‚_÷ËÀùá`øœøxÏ
¡ú�úµú��ù—Ÿœ¯ùŽ°ûÐÀ
Р
‰?úˆÏùÌoø‡þ
ÈÏüË?ýÒ/ú’_ù±�÷Š?û‘¿øÃ?ù”ïü•þu
ÙþÂ÷²ÿüv�ü”¯üê/ýÔ/ÿz¯
”Ÿ
ä¿þÜ�
øOþŽOþ
„ˆ�Ûµ‰×,^ƒFÑ FƒÅ8.<öqáÂ�׎C(Ñ`Ä‚G.¼æ0áÀ„"j{è²âE‹¹yô˜ìšPŠyrIrÙF�Ùp¤ÈñXÍ�kÁ|iô"ÕŠ§úœMdWª&_‚åšÕ¢ØklyFi¶ê[ºo†S¨QäX¸s«25�©XŸ|wÎ�Ú÷oá±57Œ
wëNÉ=)lŒÖña¬›9ŽþU©RĬgÊ<kp™ÊÔ¨Ž¦93¶BÔ#k“|X[ïÞÅ3o¿lYZ Ìá´}:4›
µî³ÈS¿Lîú´é„_;¬Mü!·ÑÛY+Ôöñwìé²	]9ÑèTë™7†C‡0Yº	cÖx3tËvõ—�K³»›(Ëž‹ëÀÈëo¾ÞòÒŒ¢ûü+¿ýZŒ"¼|Úðš

Ä«ÃÆû�DÉÂêÀÔÜC°Eê\tñ;·{1FóêéÀÚdœQ¢Ð¼c¨&¡b,źæ;SKiF'Ó›ÉFŸ‚Ò¢Z>Êæ3nÂÁ+>·4ˆË
·¼1¹›O¥r¢ò Óhâr¤·äþò»5ŠÓCïÚL4�”mHÒF¢©I?$ˆJnH,›¶Ì†Ë;ñ„´Í‚44(¾„àsLL?ÌÓR(Ó@Býüº'We•Õ1[…BDc¥õ¹%kW]wuR¤‹	QÒ8ñÂÔLø‚¥sÓRõ'œfK¶Q:ãÄóÕiûä²LõÔhÎCã23Yø4õÔqpŠsRe然Ú3ƒÍÖØkÍ56X=³¥–ËhØ¥sßrÁ|5œrâë0[L·43á2ÅŒjYi)xÙwÁôÐÝ3g¤ÖÉŒS³–c9
¦µc�Ò2®�Evõ.•/žAŽ&\´0YÞôIdy
ù¹�7
·–3›þ��qÚ·K=
~¶Y¡CD§Þsµ�…¹<‡áøš7\h³ævhx
4vœoêExk­	攬nGmn†Ç"øô4ö›…=¼zl‰V˜à¦Ý—ly¹4S›øžxÚqÔ–ø]aÁŽD®ã�<j©;]6á´�];᪗˶åÞzëL»D¼t‡U7ýbÖ}ØvÙ}}^Û£ýºñiË“÷­ïÔ=vØgþP–[ï=ùrxg^`áÇD^Üy%Ƽñ篷~úÐÛ-»TŠšVÌ¡‹¹å˜oÞ�:œsÆçmÞ1óÞ›eßY¢£æ•LLA%ÙZ–qˆCб>.-N|à»Æ7þfÇ
S4ð*Ú
G8D6Ô0CHN’Ë@Å2„þ	Ér,e^\
2�™	-³’ËðZ;Ö1`$@ã@E
´€�,’Ù€$<¬qŒÕ$òbÈ„6€
Ísýò’Ô\Æ;¾øŽp´á
ïHl(Ì·
ð'qH;—ÂH=@ãŸë¸0™Œ7ìá™Ù8×1åùÅlP¡·|Ã3¹1Œ_ÖàÅ&û„ùÌIV2•$Æ"´R‘Bã爥±Êqˆ
¼
‘‹Ã	Ð�R1p‚¤alÖ‚š° BKˆÆ*á£E³íP�OÝSÇ8¢ÑªRŪê¦
ÕØYõ~{,*WwØ´¯ru«|ƒO,u(Ö­åQ¨š#ßÔªCµ"L-ÝVeþU­–J©W5+UõZª¹
±„èä8àQ$ä@
Ùx'Å€5$#T ¬7�pˆ7Ã
mˆe�Ñ,u´�&È+þç$4¶nPCÜð†# !‡ˆÂ¸ñŽvÄ#‘ÔÃ!6;HÞ#
Ç(G-Ž��!,#´n8'Ü`ŠCb²b¸E&¨…#�ï=†Ä5¤‚»jXF*Z;ÚfmPÃ1Q1 "
C0BÚp‚·<Âm‘0é²6
ª0/'‘@ßrè
	bÈ=ÃñŽr¨�
µx†!\ü¶ƒ“n¨A2Ú(ÔB
­m‚h£p‹&ì 	#¬A¨ÀÚþ(âGPC1&«ÛrÀcè{ƒX!1˜‚²“Åå!F`á‹ÂxÆ­=„)ÞЄ#,bÄH@* ŒY,yÅáP+ÑÊÚ#,£ºÖˆ‚y¿a
5·±¦XŽ m¬ƒhJ³ß8JÛ,Þªc~Vc;x«Fyòö«Oœ° 
Í7ø=ñ‰fjÇ8béA~Õk…v4¥
-KDZžžp4=´J­ÐíÍt +Íi"ÚÕ«~ÖüÄu¼cÑ�–ª«	èi’ÚÑôÌ´�S�éT«‘}êš�Áˆìd·C¼š­íì×_Ûz�쓵<]MOkš¸Ð&ömm?A“›Ð¨þqT¿�ixþH“h¥Ý6áXØi«á´h¨Ðmè�5@9FpÚc �G°§6ÄІw”vëÈÆ�-d	ܘ/+¨pˆòºÁÆÖÕB1&úÄl¸Áäb ´¡—‘_ÅÖ`#h¥6Þ
v*v
´5ûë6‹´5‡“&x›À?«¶_“H~4IZ£¾Ž$¶ì#¶>#6;¶—œÉ•4È‹,HqCHEÛÈ‚ä-�I™¬H€\?‡J œÀ‘|"™ô6xøÇb¶wø»c€‡Lhƒ¢c¼P„†( £#‡((‹«…q„-Þó3;ãJ܃=
.©3…²¡ë:1 …¿+Ëêò¸™«»¤C‡xЇÀá´<8£Ã­\„;\1¸Í«HΙó¸[X„c˜Ì“N7¸CëòDÇÜK¾,‡Ê,‡Â[†B:‡rhëj%1ÀƒãâM1€¾„äÇ¥SI‚œÁHÒ7ÞªÐwàKA«5aÌÑLÊ}°µv³µ
=Dx Ñvh·
JåPåÐÀ|‡åËU´=Ñ„„I
=QõQ4ÁôB
$Èv QÝQ=Ä%Ã…¼È
ôþB¾DÑu ÒpãKk{H2Ì]xxÈ,ÍRC›R�‡�Ñ}È´)…¥$Ñ
¥Ñ
�x S ”QÞJRmR·$õÐmÑćDí<„[Ø­^à¢v
-æ#ŸrSˆ”a¨…H¡ˆKd!ƒ˜!ƒ¸…Z¨Žú`@…ch–³<‡y@Õ{hŸ6Û<7X„bð»3D‰p¸Äl`Îá;†lH.’ÔcåmhS §}ðV`P‡{@Ò}OiÂi�½Ýò™p9æL…ZèÖJþ
x8†u@®Ï¹p
ÓEÑ3US¡�R/ÌÚ­mÒ
Ì
UÓÀÛ°EÑ<åZ²Z¤US¤mW¤Ò2½R8EQ0…S¸µÛw°Û´ÝP¸¥[­¥Û°mQ«
ÚÂÅÚwÀT²}¢UÜÅ}ÓC<S}0Z¶]ZÀ½ZfåP0Ý»eZ±µµ¶¥[¥ÅSÍÓþ¥5ÛµÛ½õÜÂ}SÊýÛ9½[±ÝZ¸í­u(†|`ÖrÈÚ5ð·xØK+�+�ÈxPÌeV¢íÒv¥ óÝ*í3u
å}Xfl†âQnä.Z�Æ^ÕUcWÆÚ¨µböåc—žd¬…Û™†é6ö[¤}å˜f_¿åcÅÞ‹æhÃ…ã™Vã}°å5ÎåžniLMä”æfŸþéD~Z6æéCžd¢ŽiÖ½éªÎb¶•i8þê­e¦Îb8Ö[FÑ�~Zøgƒ¦ãÈ­æíyNdì]æp>ã©–é}¨ƒfè¢vi£Æ^¸ÅÔðäXF壮ÑaæÂ>ì,~c†Vi¬½ÚŸ®c…Öìk~ZígÌÆ\þÜõkwÎe£^zž‡º¶æS~Z‡æe�vivÖvÐ`ÉÝ\ÂöÙÓfm£^fÁ$ëê�mµngþYφl¬
[ªÞÜYNé„>c &íw0è�®b®î\Òe�fcEæl6jÃ&dBþiÌ~ç¤[©~ç¾nêòf[£¦dŠj:vä³Íf¡†e÷.ì«ÆÚÒ>Û8fĶë£Õh:®i›ðy
.¼sÎïÁ8a
4!»{T*M ±ÿjŒÓ²·ö�™ �jÂjð$
zŽzð#Z·H4<ˆG}TïzÏhE'n1ŽæÝb­0‡=Àw�îC§zÇè\�‹¡¶Ïþ}w´†,‚A­X�'�nP4¢Z-,DmÎ:(ƒ¢[¨á€&ØA
LÑŽRD�‚g;€13mŒ×0Å5:xÇJ¦l¦ˆBT¡a
mP!·JœË¼U<®#eAŒB-¨ð†&ìan at B&ÆÊ1u¬ƒHЃºj‚
 Á¯ðƒ.^°8ò}C
mð"R ÚA ƒQXD9tòÓ”µƒȘÅ0�aŒYðÖ†»UÚŽOxX¨Hg*qˆ=dŒy|®Þµ„Æc8¸Nu
öÑ–!´#±WË–«F
lpÕÍnuç‘]‚qWp‚XžnõSõçg‚îu[†ßxüì¼þž».uá`ó®Ì¼´kT<Ô»¨ñšW
¾ï¤”s+ÇÅê¼ÚMUÀd·^ý’7„ßůweç¿7¿Õdo~³Þ¿¦M'ê(FpŠq�plÕr(=ªkcä‚tê+ñ.y¾³aütÇ>Ü�Š/¤Bk㓼Œ[
W}îð`a=™�n	tÚ(g¥´‘Œ[ñ÷V¾R�8È<Œjj& Š‹Æ4b‹NcÀF'ZÑŠgD#l^ãÄÔQhÌA¨ÕÀÆ©«±‹æ
"	…‡?
7Ú=Âñþà‡7Æ°Œu ²ç8àq‹4!Á0FX�ÇÕ ãŽå
/ðA^A�üÏ[ËPƒ#‘Ú<ÀiF¨p<x¨ƒ	þ"9zë
xx£ä·=âN6XÃéãª8„"±‡=èÁ·¸Å0†aŠ= £šü½(Ðet¡½èF—uâîxô_/Ýè‰c:Ç~)ôŸ7½èñPú‎õªý£²þ1Ô‡^ô§Wýé·Ë:×·Îõµ=¤GþgÓ8ôuرîx‡Œ¯¡�jÃt¶CvÜ�zt#ÖøÆ9ân8xãØŠP„;ø!y~cŠðUÊ&&cÈÂÝ€‡eê©Ocl4?ÞœßÑPW��«�–;Ô�ŽÍ½¹ÐðG7V‘‡<ƒ¹'C.è�{àÃ^n¶¬Žwä“Æ Å7´±86WóÐÔÇ0d1qh㟖U9ÌÑ
p4C‚H„ÜpŒhãáÀ#:d-+c¸¨F:°¡Tw~,`‚󼟯Î8´A­�Žœ
p”¬,P
9LÜ °‚˜@
9B6ØQÜ•Ã6”QÉ�9�ƒÝ©×¬C8ÄŒÌaTÁ(èL¹�̓ÂyyP>ßÑ©ÛØ‰Ý ¢Ñ©!¢Eµ"²!6"A¢"6%.â%nbÚU]̼?$4|C2ž+¸Bï­B.á¡� �8È:H[ãuƒ5DK+*d™E•ƒ6Ñy†exC>,ˆÝ©ÃÝÝÊ; �þîÑ�îå�´¤Ñ8üX8„<ðCîeA´Þ*|ã*��+œC;DÚ!¶C8äC9,,°
,(4�#­Ù¡m„•ùŠ•Ý‚1ÀÃ8¤‘9Ä308ä4xCG-ƒ5(¤:æ:„ý
Õ©aC:Tdútƒÿ‚óüƒ:vZaµAÔ, Á	œ
Zª¬•Ã4$é4Ã(BéC½ß,�“õ“54O¼ÔC0Äcîä3”3�Â@’‚4HuC* RŽU8„‘8È‚ýáEVd:l)ú Ë8 ¥ò-­Õ„
1HpF¡È­\¹p*¹]»thP“@‘¦º”iÑ H‡:uªR(Õ¤@M}Z4êS¢U½BµŠU©×©e­ž-«6l×µQ—†½:•íÖ¶J¥^Ó
ìU²w¹eÛ[µ4vÅ®=‹­[ž<«ªU[µŠÎ’%=z´è‘«›¶lѸ-+4Æ•«\Š
¥Ãb‚k(Wñ¤Œš²:eNu3¦Z‘5nǶeÓ¦­©¸US.cÆ<¥1htñ^¶êò”UÁ®
ç†î²@]Ù"5ž³ñÓTBK¹,*TÆPy«W¯›;oÝ=_–íXþ R›4‰aÚñÇqà1&`†[†›h„ÒfXØPD‘d¬±æ˜N&�@¦ÙF»hHÄKo¬yC	8PbŒzâ	Ôª¶ÑCŒb²ñæ�1XtQ’9”~ûÊd1ãŽ;\$Ç�²¾yP1m†ã€°|
)<y…¦Ð↕&�H¥nŠiC5’9ÉAnz9EŽ9ª(B”/òÃR,±B¢§B	™i�™™Fg))°è®éå=jZE—Q¢€
‰(ê
,«£öâ‹+¿<S©Õ±fLV•æôëVVceU0V¯ÒjÖ”²"V¬¯tþ½tXa/5ÖÖ_‹MV.]£mÖÖ“®M*[i�å6¨c¬'™çÆ•$ˆ¡§›tˆ!&—Uú #‹$r1Æ3¡’)$	Sí‹Õ"ãµlŠÑ%”2f³­Š]P{CcV,” ¼š`‚É#‹)’àØk¢ŒÆ$6»Æb4΃˜(‰Lé˜V>Æf@ñÅB™æ˜¢PÒ&CŸÃ��>o¼�%Á¦¹‚@˜^Cqêq§x¼1¦UÄК`R³ƒ�^†ä/IÄÒ¾¬‚f™a†B¾zØã”9—ÑN¨!‡YfVà©H$ÔƒíÁ§†ÙqŒ4þø£7vVo(ÐJfþx€L‰B¶*šg„zÅ3¥(ƒtŠ�N®LI	G€Yf $nL	¶dŠ‘#"l¨Â‹9Âð
‹ñžàâ˜d"	#d"Õ£Yfæ¨cÊ*F58Ù£T.üpC�EÜ
TW/™Û\½åvç[¯B_[—‡Z?ýù�rÿü¸è¯ß$ûóO	Gÿûwþµ/YsBŸýˆ”\]£âpòС‹o4†®èF}Úõ®<ô!	…0†8Æ¡�ŸhCcø Ø`B²€½ÑÆ7Ð

?”
až¨ä`!cxã°•PÐ�Ž­ ŽÁà.pÑ.ç|Ã3ŸQ�^@ó“o¸£]ÝPþOŽ¼�’g<ãϘÆ4žA¶@¬!ΨÊÝP2hdjõ�O7¼¡ˆ»	&kèB¬ˆNÀƒB3†,�'BŠ�Ä&´P/„’�mcl�¸B'*ÃD>q%Dc
*‚‘ŒZ aFÚ(Gw�oxc™¸0z±‡&„£g&	G$—ÁŠ?Àb±[D2òt
tD£Ñ@Ç(‡ÁŠ!âj Âvp*¼0LAŒ>¨
)LÓkB]‰„ò“¢£‹PCÜІ6}?	Ê"^�N!axÁ°€8àG@Õ5¼Aå9zÐCÒ,¶á“”q)À ‚2‘à†Zt‚6yIþ
F¢ÅœD!·RQúaÔ-I�E—rQn¨Çq¶cåHÓcѸœñMi“]:Ê°d3YRIOLÇÒR³4E”ŠJ8 3—i}…¦.]Ês*"Ó™n¥/EÑf^¨¢M:¡ƒÐø˜ÐáWT°4®˜L!úP2�
õÇ8ÞŽpÃ=îa…"`
VâÖG9‚ÈŽWÐÐe
]pÚ4Ê�XÃ1ie"†¬¡cÀçë8Ç8€ÚŠV at O³ÈÐnþw{‹d cð
o`ÃÙÆ6"ÕÏY	ƒõ‰a9¼5˜Àj(Æ9~ÙM7ˆ
5pƒ‚¬K¶ƒÌšÕ¯™AKØ4›Y¿5¬‚kÚ5§YÁáˆólǬ`,ÿR³ÀU±™ÿþœY;kV¾o3›Õšf7Íl¦mf]ç:«™Ñ‚f´añÌèÂΙÒrnl¡5›é8WÚÍkl™k\æS[úÑ«N0:Š‘�v¼£P^Ç7r«ÝC×õ‡:Þñx�yÖ퇃Ý`xÀÃåxG×±½úáÔÞÅ9YÏzëÀ>Ö1ëz�cØŽ6:Ô
a·£¹ïðv¸ƒÝŽ|¬#á&v9òQ|¼£˶™×‘ï|±C°ÅÀ£­ŽhÇãçÀ.“±cCÛöGOì¡ÏrckŸx0 �Ž´¶cµö‡1,$‹o|#ù(y>¢1�Nt¢¾Ì‡‚ÕýþyÜá0ŠÁÍktdä•U÷<
v÷ÞMogL+\ç:§¼ï}_l´:ýõÅn}å{_ìx;ÞÄ~½½]ïnwó>ëÎ_=ôQoùÔ“Øð>=±
ž|éÃüËï½ÖÁogwûà¸ûu¯|þàã�îÒg~Ö»ÿl¼£CðF¿é{oý ¯ØŠÁítnòm¤-�ü¡ßü¡oêaH®åÖaoöaêMè­ß�nòÁíZØ!¨!Ø�üÁ(oæAF°@„fØpÞtÎáaÖAâÁ‘.ÛáôA
å­Öæ¡çæ
d�[ŽÌПÐåæ!P|°Þò
õá
‡mà�¿
á�áø
çƒõ�1pÞÁ
Ý!jøAçæMÙp`ÐÛ
á
çÍÛØA¥M×áÞa{PÖ0°Ëa	9ð	Û!ܧ�Ìôað<P(HpÖÔþ�±pˆ0ãæja
…�ùîA
G{Ðíé1ïáƒÍ
)�Õ°S±É0jÄàNÁ00Ø0pÈmÙú0{�Øü°q{0�Q}q=ði«±ƒÐ«Ñ
c0Š=0Iî‘äîÁÛ¡q7í‘ðïhq¹Q�ñÑq[O	²
I®
é� ×q¿‹�ä´qû±Pg3ðÐ
M¯éí÷á�‘ä2«ð9�ɱßAÅq‡ð!Gò#}�ä±ßÁP1òêÍ×!ÖôáþüÿaþA÷¡ï¡åZP©°å|‘‘r)íз°å¶�ø�ïÁp
��+Áð
�ðì©’}°('0—’ŒÒ10àŠ°åR¾m+Ûðó²�r‹r)ç-ðR‘GpÛ�7p—òë�ÿáüÁ+0$c�ë1ï¡)qSq'3=P²‘r07ÐDPóR1C3$wRõA.yÎ3]s2iÙAäRû�’+ws†³Cr7=S‹Ò9	²Éòë1$ï!)­Sˆ’,ý
+mÒ*¹ó’r
ýp)—2;“ò6×0þ4±P
«Òe;9sÄsÍs?õ³:×�,ÿ“×=±²@ó°>×rRÑ5m??6�?Ï3�+­)‰� ”;I“;«1’0í‘@óp@/ôCÏ“ÒDÕ³3ñ“3Ís;Ñó930+T:�r
#sô7ó°(ó¹Ó7�ó=ÿ�(Cr?·Ó<Aô˜´ŸS>u4·�S6?s1‘²ý�óAFoó:?16ÃS1ÿ
‘D'�Bï�.�SAÃ3>S‘èÁJgЮR?s?ATKAÔ
�SÝÎ{1šòP³)³SE�8‰�¶2Á;óOŸþ”?q:=�C±qAåSMAô3ëÑOƒÓ<I3ÙÁ=¹M“Q‡DÑ2<	H‰p0“,9TA³.­³5!•4[°V÷S=q;³ó9/U=•2YT=7Õ3×T)¡õ?ó9ÉÒ:5pPô9­óG/TY׳YñS:ÛP?•’HS´VÉ[›5Y/”Cm´Huô]õ“^´5ÿ³Q´[µUZgH•ò\]±DcUZ'ôW'ó9�Ó59õBó5>´8�QÃ>±qünÜÁ
ãaA±•IW0j¸Ô=9Öâ¡=-ô
D3eó)SSTõ¡�ø!²¼Re“’—s>ÒU:õq2þÿARÔcÛT',/“4	6HÏ8çôD‡US¯Dw:]³I“gñ0$±1)q´0.Õ° CÓJ­tÎ�j7pÙ¨Ô�µDÝ“6oS·S3éÁoúÆ*sºt
�2>gKÔ&tT'µ(osW“´òkë¶Vå’TÑlUÔ嬒GCó/…b²1ò/7\·`¯6_t-’3ƒT`³6Y÷sÏ•s?Ók´>«Ó52$ö[µvCWuVT:	;ý³VW×^§õ=gô@A´:W—>s×m·3U7Y›VCïávP'�c1QjŒÁ`!êÃo0þ'{ðMùႺʺ
K/ñ{Õ�ñð
�!J}ovRC²Ù!Ô%dÁŒ�Üáâ°ôAÜüæ/1‘$SQ)�Q…flûfð\nrëÑoÓ‚qQçÔ1vp>àAeq�4d9¶Eò(…�W=ñ³ÓÔ3esÙ<09P…­Õ¡ß’cá�1³IngÛq'ëñfá÷€y­ßr3z}�Š­ ![1Ö21R„?q4­Pd-u}Ð0¿ÍCó7ð{Ð
ë1'éqs_3/ÒW�Õ!ßÍS�Y1¹1tm÷ueWÍl¹õ1·qs‹þW{í¶\#y�·±.-;á34tùÓlƒ·”Ct;%ôFA”/™‘#yu	Ù(õñiYY“u÷�	².#Ù5_9huY–û±.9ù:™“iñ‘íÓ‹
µaÙd,Ø¤\ÁÈ ¨¹\A�ÝA•q»�ĪÂ*ì@î´ˆ
éL©(ª¹ò€òÀ‚nV�ióf]!ží ª¹‚¡)ÉéÆáFoôŠ�á�üÁÝâ¡ÊA{o÷!à	j 
fmðÞALa2Á£—
�‘#õqî�î}°a¥3¡Ú¡w’XúRA÷–
‹émðšðL¯åþ¤l€zR¡÷2P×
Vz¥‡AØrn8ÑáO±ˆ™�µ!’:´a–_ÚmÝð@ºÁÀÚÈ›ç·Þøí~Ùáºá|
Xd!\2ú‚CPr3šMZé1ØxÞXQöôqɬûpضšÁQc‘
¿üÜ0ÞF²$í;÷p„™O§±«q§w:±ÁqIXËoK²®;{»Ñ´‹ñ Ÿ6²º®mwÖ,5®IR�IR²Q;±q»¶S;²I[-—O¶C¶Õù³U»·Ò÷6»‘CÒ‹!—á5®¡~¥&žW!‰ªa:ä¹>.ЇýA¶ª¸‚�þìàd!²z0Ü:3¦šWá1à…
¡êAçbëõ¤¹‚xí‚r!¬dA(�ÌÊÁÜàÞàÚk‡˜6¥¶Ü
µá�†RÜàF Ãk
€AÁjÍg
Æ€nááTàjÀj`já¤U¼ÄIœô†
!®XaþR¯àÁh‰†á2azüNXA(ðòH|ÚÀ %'pÃaœ`aa`á
Ø+
¨Ìßä÷ÞájáÜÀ:�ŸŠfnn�ÿp‚)˜l¼´lfÁ! NqÔýA7ªY‰.è›W�xMj�ÙÄ!Êê‚"‹>ˆA>È° zÖjMÔ�
Ë/ß!õûþx~Øò]ÎÃmÔi=ßïÑ™oØtÞZ?K?£‰mòˆmÔƒ/ó³Ïý|oî2ºõoÿÑ�ÿ÷�ïýÐý<üLŸÌ†ÿþèOøËï÷Yo÷=_öœ�ò\}þj_öUŸõTßø¸_úSo
Ó˜,‡âÜÕ«'ÎØDWÖæ�ûh<ý;xNk?]·.\íâNåFFgž~xíÊÁ#×ÞFê´Wש3 |bµã­·{‘-¸ÑSéÉ {NøÞ†.H¡‡îÁ×ad%zØ‚:"‡"¾8"Œ'Ö&Ö;׉u�‡-ÊÈ£Œ	ÖæTŽOá×cŒ‚X$�0’¸N1쬓Œ6èN8â2’,ßøãŽJ«¬BÇ}tsÐ81YÔP0Átó1`fa<©ƒ>ëˆÓ�EÍS�?õÓY¬"|xºÂ\.Šº�þ›a’�Qd×ÜâH¥³ã�7H!u—6ýñgÍ AjüaÆf˜�L9á ƒŸ6©8r‹:ç¼SŽ¦°<‹7ïtÔŽTwp:È0ÀdRË5è˜	Oiëp“I*˸s:ð°ò–]ÃhÃß5×ÀÒÂ	¤j6ŒQèq
°¸:õNµì³*³ ‚ˆ°Åf7øÁı¬dcŠ#öÚ›©Sò™&R
Ù˜‚ÊÒÑmð#K0ÖXÓ�1}¢äŠt߬£N•"W‰Î«çœ3Î8Uº7®¶…ܲm¶‰Ür8ï¨Ü~N¡üaÎº':×�³l8ו\eÌ6—¬¡|U®SmXu4µX-¿cþóÈNÛüQÕ¿x:ç¡߯•|HôáÖ7oÊñQm\ÚUW+¬Õž÷«qOˆ·ØPKíTË%c�õÌXÛJµØËÂ7öÉ%çí¸àƒw„9|Oó­6~g=²q¶µõÜ'w®7¬7G\ú¯%gÎ÷é�O½2‚®ÿœ³qëŒã$;ÉX#N6¯BÓÇ Õ¸ãOHŽ>Ì77[ãÊ ÎuC�;ÞѳÊS¸"Î7°†M;1õ±Ðvõðƒ~7afAF0ewS<_:$‘+a.±<àÇ7ªfàáˆ~mj)X«Ò;¼
†„à'Ä1ÌÐ�@UÛˆFÉ–ñ‡6¼á3ßÇ0þ°þ©A°‚®2ˆ7Ø2,NeÂ
,\7´Ñ2Oã
jƒjáŸÆ„Ð0ÞȬÄ
2P	Ž8ÂL0‚(,#ãðÏ«:r�Z¸Á5õBÄ,v3 at VXãÜ(‡8€Ø0üáÁ©×,2•·ptÄȈÁ(w£c¹Óì@vœÃÐ[“MPâv¨#$… ;’3Ž
…neL´M�æ´™1±d83 Ó(Žæl’*Ù²
ÈÈMzrf¥ÑÒÚQ-Ò4’‰Iëä*³v3ã-9Z«eÒliKIÚÌ•«¼™|:È4§¥Œ‘¬Y%‰¹5W¦Ì•’,eÍ·Ë­1q˜¥Ì¥4¯iþ•¹ò:Ä\f
GPŠMkº\Y'‡™ÍrÖŒ™µì¤.‹†IR¶ãÅø˜·Èòª`äa
«¨?üÁ�ÐC Y˜B‚�e]Ãa¸x£¾S
\´Þ˜e8ÊÁ
käÂ�yXEõNò\d!ùÆ7"�UàÂk‚GÅÒ¡28ÄU冣áˆ48â
wAʈ¢Æph—AC8ðš¤`^)¸
íõ“ÕÃp5²GÒ8Qzó£1¬Á(@õ!¹µàt¥;ÞÉXºÆM¨tå]Ê8ÅìÝ-`j]]}�W¸ÌUÖn¥{
#+‹ÀÃ
¯»ƒ_oÁjÜN±vß�ïÞ.8ÅàM.¼ÏMnq¿Ûþ»Þ~î¿ßMm'<¾õÖ/»ýVàl×[Üíöï¹�Ëmr÷6ÁãîÂÞíhO™»·w`£‘�d at cJÞ
Æ*–0ÓV¤ Ú›Bû¬¡¯o¬¶æ6'F†µ—òXƒ(¨ÎÆ8dòá…T#¸�_˜ìÐ’vÃ-^õx]
;²DÊјê1fÑ	<t"ÞˆŠ7€ê­Â¶u'”R4¦±ÙÅzv¨>ÆÝÐ	=èÁme³7–áªhxK�šeó6Láš°/âü&3ÞÝ�=C…f³ђдdƒÍÚ8j
[y×SŒ~fªØ×>êÑ’ýîo_ûäçwøÍ_~ó‡ü€A=ùÏŸ~ìþåýãß~ï—ßýû×?þßÿù€è€ý‡÷7~Ø~ì
h€¸¨
@å[ɲ&e×
Ð=1w0…|«`È
РOS
3cX’ˆ‘„H‹µh‹·ˆ‹¹¨‹»È‹½è‹¿ŒÁ苈¦}DQ>ÔìEÞ
€Bz²<‚ÂÖ�)Cƒy@ÙHÔ!(1tÈV=ä-¼ÀcÔA=$F±ÚPEa<Æ6á&6F²ð‡/ô}ÇÀ
�p›ø€AySˆ„høq¨�Ûð?ÇPU×PÈðu—r}´ˆvþVUÕuüg‰¬ñÙw
®W¢VUíXîwŠí˜‘8‰È
·PÐà-™`’µÖŽ¨GFx`o¸�Ü÷mg‘„±W�­±*^Á}Uå’ˆ(Y@>9‘�6ç
¥wŠ€a
²Ð|®@Ý WYHÆpŠx‹&)Œ_	–¾è•aI–Á8–eg‰–H~í%ì@
‚…1Qy '`b—y 
C—)†¥O�‚�ؘŽd`k˜„×ðlµ
€

²`—tÐ!hB‹±V;–¸@3Gvà
Qƒ|HF‹PÑ „Ù§å ‡´ö“HY”7?€‚‡‰Ù‘•R)_ñmrˆhgþ˜’”è-Ñ@F¹)jÉ
µ �8
™~÷drˆ‰„Ù°³z X‹±yˆ
;¥{
™’»¹hU5‘Á‰®�w³{.¹i*d@>«Ð�’ŽPǃHh
Ép•Ê® ²�
Í#€¾È•kI dÙVŠ ·8 	Ê åwˆ€1ï�&…]M4ßv�ä³y0¸°r±Ç[Þ0Gj¢ä!Ñ@
ö@
9XÜÀÝ�¡*yP-!j…ôÆ@u¹¡ñYý	
|SQÞÃ7Ë€
®çI€�j™F°²„&å
ð€
fàS+Ù†˜è³P—4ÈZþk+Jdt®¢V„“*ÓoÖemSö¦ ,å
Wi�J~ðFkkeo)fd¬êmü\
WïU«—«ÿ·«Ú׫îv«¶Zr¸x\7¬»º\Ó¥¬¼Œ¹ú«¼:«·ø¬án÷¬Âø«H¨¬\„nÅðÖ
çê
¼€å0u‚þ¡ìÐ%Ä ñÚÆàëv²ßñ­Ø…`�OR2WŠþùð$#ã£ãDUc(ÿA
qQUb¯ÑPù@÷ÑÑ0?ãDA£ ba¯1+jsâ"²,.òãP³ý¡Oѳ9£v£ ßsQ>+5H¢ i£þA‘Q$;$ýñõ@4íªñ‡°®°R‡ä*D3ªÆ€v+&Ò33«3¹c!í�BÃø� 5’#5›#Uƒ;;Û.6cb
2bá9ìbuk·*r§q#‘8Â I+¶
R‘Qí¡6bk"
⸺Ã&R6È1!Us0Ÿ›8/Sºïa¹‘ñ+”1 ¿¢$Â$˜Ë$˜3!a âºfþc#‹N
â)ò»ï@$/{€·‰“]slÃ.H$¿âºr65¢¶¿rª»€{ãH¶Qvòü
ù°ñï�<ßáê�¾ü±²ù ¿í°ô
¦�
ÑÂ	ª`áá© 
.�
¾§p
œ-ª`
§pâ© žá¨€
©€
œ0
þáŽâ'Žáªàá/îâ^áÎ	(nâ"Î	ná&Žán
¨�	Ižä,N㦠
(ž	¨€áµ äHîä[žãž	þåžäZnâÞá[®
M®áI-ÞäR.á¦0�F>æEîäe¾æw®åR~áf~
GNçjžçwþç7Þá@^æmîä_Îá\Žä&®åQáµá�~á\Žé™¾çtîè™îéŸNç›ê£Nê¥nêz>ê¢~êpŽé›®ê N椾篞ê«ë]îä†PMÀ’µàëµ@Àþë¾ÞÁîë§pÁ~‡}QìÉþë½P·�ì½p
µÐ©©PºPíÆîìº0ì´ }áë©@îÑÎ’Éì´ÐëÀ~îÇ.ìÑNíÃþëÆîëö^�PXÞí}ñî÷¾î´
þžîoí÷^ïö.íêîî#OîÈ^òоñáîì"?ì+ð¾î/íÆîëŽðñ^ìm`ÕnG°
ü™C9³;'¡o‚”À
êÞ‰S·Ž:|èÖ½{7Ná:ƒ¶{‡.»uêÔ¡C¸îÅwçÎaÔh0ã:tÏ\§G̵{µ^ÐzÇRݹ‡
1*|ˆ‘Ë“!ªûÉQ!Nˆ>‡ê|ˆR(Ê�fTHTèÁ”?§bL
Õ):¥§v}*4§Ó²ÁšìÊ"Ø�IÏ~ͨÖ,Zvþ‘:õÉդΨF7B5:hЈ(›òD›RèÞª~ýÚD,׫ÁÿåKõ®[²‡�λnQ/-îò²û®ÇqãXŸSŒïÛ·›´a‡S+UqJÇn_óĪÐ5ºpF•Kå˜�]¸pÏ1D÷�ãÊ”8™®Ìk´øG©ì®ý�nåôšFßµÛ¸±ør�ÙÕ9ÉüàÔœnÕYkÞ<wë®YN¼uÆq,ÝvCŽ9åVÚˆ£èpJ�'•¼©7�Þûï�pÆ9i9Í;h¤
s¸fœnŠ:\óÔÝUÃ_îymæ´²VGŸ–S¹ø¢¥ö:qüêb-
\�=ÒChâ!˜úêR^ØúåMBusýo?•nDîf¨7ýtÔSçd¹ýk�ã•Q}cÒU÷ݯ:ž½çÌpZÄP—½kLÑ‚Š[àTš£bLÙº¡ÿ’KN¤Êq».SòL¶–Zò„h¥vÆyç=ªûšþb®¹
¥Þ«ÃJ�d8QµUŠ)ÆY¼1ÖÐ[œ†ðëüqK9Fƒ™éXÀ
Š+cþyX£®S»«Õ+[#úVÜÞeéŒãbHÆ;hQƒZø*ÅÐCÜP®åfkU{›ujq¿½­åS‘c€–§Šè�#¤óYÈ1�áÏ:Ú•{¶/#¢.ˆ!;àŒvÁ n‰pükì.xÄ)íP‹M¼bØ Z	©!ÉQ'z!†x¼+9¦Ã"!†Zhƒ{ËPG/T±1h£´HÆ7®A>~cµèE2pr�9~Ã~´¨Å5ŠQ`,£é[-zÁ
h
M EŽ€„ˆá¦hƒ¨°CD�
HØC\
q-Ô@Hh‚v Š&P!
ª0E-b¢‚2+­-h4RÁdñr»Sæ1j9Ù¦W1‡�JSº.íèZM$\fÙfZISoü­`go'2–®:¦þ™ŽåC0ïµ8D[AˆŽ6 a#V�ZÛ�	8ê5n€†:F€¾&pª©ˆ+áé†VBu5�¤!Ä0Z 
7µhC-Ð
Uº®2
zrñ�`Š(¨A
×pÃKÄ`
õ±&X”Ué÷L»ÁMc†;fé°ÂšÝ)[ÒaÇ5MËÙ—˜B’[œ™)µô®í„;tÂg­ƒ�°ºFŒ¯ÑF7¨AT(FR%0‚
 Ab¸ª!´À	`XsÖ¨Á-Š±b=üK
·Á�§i;T§ZšÞáU‡·V—yc¦V-}¿È`/÷ì E‡dy2´žŠŒ|nèE/š`
$(µ‹*þ�ðÂSкÌ5»‡ñì6QXD81X)'ƒ
mPƒ5õp�ˆ;
†
™Ø@1ÒÝ‹´¡
× ·Íã?U'=ÂJgº¬›žº
#ÐC
^€„0,b;�ç¾í(;û_Ä×ÛÊS´1
;
Ž»�a$£ºH¨A`þ�TSèAñ‹¸FOøU~«\ÄÞ_†C¹ Õ³»*FÁƒ#‘™	 m
.-Bëm“[Ä÷vŸ»a­fû*p]FïFÚX‡*@¨q¤xGAÊ9�„ø{z0„Šqe1ì`¹‰?´^M¸Ô³¾O>nèÇ	öÑ«ö§Å[Äg4Î
ÇÍéE|W}êÅMœÍm(MíßÑ�‘zé6eà{ÙßÀX³ñ›’0Z�Ÿ’Š�*š¸‰}¹
èȇØ
-þð�Z‡¢¡2=¡ZX„U*‘Ù/
©ŽEðÀþp·€ÆB¶ù
A3„^x™0¢!Ñ°!-ˆ™›’*þ¨&q™ß8³-YJ¯!\˽Ô;-
* 1›
¨õ£AùR¯—Š-½Ù’‰�½Œj3'š¢—ê!˜©ÃŠs—eÄ1¡©·(¢e�“dRžƒ(')“úÃP©, at T˜÷ cá�#SÑ}€c�m¸†p at 3뀆k‡k�ZD‡>#8õ1
ÑE‚3:EâÂS€(Û�(À2á³E‹ñ#eÜ°S¸Y„h`Fh@¹ЃiœFm8ŸòšÆÛ¸
thEpþ„•ÛèEf\ÆoLGõÙE?JÇóYÆ[\GxÔ™óQÇóYÇv„FYÌÆe„†_$¸lÌGõùÆ�tÇtÄÅ�¬ŽìGw$Ç
æÝ»M\ý­_ñ-cøM\¸e`¶aŽá –a7æã
¾áñ%[@&dA.ä6d">dDäFfd at 6ã²�`G^ä@ŽäD®d²UdέdO¦bL–aâ½[w°¦eà‡ÉÑÈÜúå`
þ]ˆåXþ]dÿÞ4–]#ÛK¾aB6äVäA¶äK–äEÞäadÅådÚ5fM~d>æEvæ
ff`–flîeGþ–fhþ`OÎdp®æL6f
&fH¦Ýqà'î¥Å}Ø�o؃ªe¥s˜e»åZYVcîáfŽ[î]Û~–eÃ�câígø]ã¹}\ÿ¥_®_FfèKŽåoŽh‰Žac¦æ‰¾hC¶h‹~f‰Æ]G¶hn6ç‹þd’ÖfKÞ‡qPÈQ‡TçÅ•\:æÞ†ã¶Üh~Ü:ÎeøEÝ‘îémöéöh næ‘Þh“öi£j¥^j¦nêJ®£e¨m0.Uàm€.``%u at a±Õ´�å³mf°Näç�Û°ÕZ°F\8ß°5_½•dëMf*Îe‡–\¶½]Xvj‰f½®dræc¡Žh�ìþžFk¤öiÂ&j¿äþ
j°U²‚zhi4®[°…h…®ß4Nc^fÛþµcNc¶.àÿe`ÁelYNlÃ=hÂNê¾þæ�îf>ví×®mÛ¾í¥ö‡s¸…a°5�
-U½qêµÇ�CjâPaÂÈ»
´2QÉÖ!-&TìHõo$É’&O¢L©r%Ë–._ÂŒ)s&Íš+þù�«ulݵ^´’©nÏZTÚ¸óW¯[®¦tî¬êÓ§c#ýRãï’T¨-«ÕFM¯J�Þ¡C'Woy`ñ§H-5;vì·¬É7~6ÿ,x0á†_îûçn�–dñhŨ¥åŸºEUÜâÇÏŸ?�âܵÙãN\Œq1âq˜	i›jhqRåN³	w8¬
¹gmì¡C{ö%S³Ì�‘6Hi¥¢".Y¯CÛ(j³lO¦CTT¥2ä.†»e&¨Xû–õ-CË8N¯~=ûö¿«Õ‰[´kº®»vL�!Z^Þˆ£T=Må’Ź€‘dXÃÏ=üÒ†?ê´A…þŠXcJM
ñÄðÍü$CÅQ
�8Œyy‹—MC……·(rDTT׋"	©á¥*÷¨ð4CÒ„¡Q¡ÅШ
z9RZ©¥9ºcŠ\pÚ)nˆq0c´ ?ûÔ�7¹ÓM…ÓM=~�hÍHãcŒ5îh³Ì®ú Z�°Æä¹xÃY=£ý3N1ß|“L2âøu©µ×b‹­f‹iñ#-/Тþ…>ÿ¼“´üðÊ4çìã�;Ì
£N<eíÃÏrÖhã4ßX#ílš
ãO2hþ³\2£íÊÏ7Ë
ë²´Ö+”›Ì(«™=¾IŽ3|û[³i4¦Ý2”[$ÃyÉ+±”É‹›"³g=cÂóZVbG+PÀf`±¥ÓC¸~F·_Ímú˜Ýï9Áä­qilôáÒú¿ü‰2žåÖ¸´ŒÇÔ@NVB_“×.×iÏhèœ\÷¼þ>·��rzãfôòwI3ºr$Ñæ;\÷QÖ‹š-‰è{þ2ÆcN
&ŸôÝL'Ê¢šDe‚\Çÿ
)T’è
oœÄàU2Ù=MÞˆãË©QËz<AöH
ÞRÁ—¦Ž×ÅÍïøÆlf»Ù´K´ø—äfóÍn}#�Y}I=w¸ã~Ü<	ÜvùBÈ­‘êxÙ¶ëÈ2Þo%îäLáªÉ©
Ë|´ºª-{)Úê
¦"D*O]â½czÕ/ù¨g*ÁÑ–Î
Å8ÊduÈX™ tƒˆÔiR}Ë5³"WÜ‚Æ=z™ÞC	˜ƒÔ‘Šž�£ÔRXÂTþ-¨ÀÚˆ]&wä0ÑÐ]Ù¼d“VW~Ôt3SE¿ÄáPËræ~ñZ×ú†$ÂN~ Ñæ?
GÈð¥BRHƒéhRÑ ìIˆÜÌ7RqÚiÖJc´"Ó9’1²«Çm¤#¯j¼ßaµµ5¡äŒLiÏ{2£€gXÄ+űS<æ0¹:†§•Ô±<Ç@æb×8Ú°>¡ÑÀTQnñÖbã؇wpÀ	iÑ‚ÖÇ8fS?ƒ·€-zqhÑâë%–hñ�4Óbɸ…uzÑ°^„Z†Ê2-Ô!ŽT”Y·Èò ·lf` qr&Èä7€A‹áXã²°FRáŽþw
(½Ý\&¨‚6ÐÙDŠ¸-Á!�»­ŸŒ…¨‚¨B½TG<4A2$JÔ@*hÁZÃò„†* -…"œƒ
¤B*ØœZ!¶
AéeB< 	à[&ǶA&ì\”¨AôÂ7$¡høÃjHq•D×äƒ=Lƒ3€Ž0Hƒ3Xâ%Râ%^b%Jƒ0hb'Zb'V¢%z¢&šâ)¢b*ªâ*®b)J"è`¢þ)6(²¢*Râ,:Ã4äCß°Ãÿ¨>éÓ
¡�¬u`1&—•¤U24×µ©
ø©ˆ´èË28È>Xƒâe‚"Ü‚Ö»hƒ˜
©@-4#‘è…çeÕÞA5ž×ôBJ2�*èyÑæy˜ÏWÁÄàpF£õKoá¨Â©žVI‡H¹ÍÝ”Ë2§„I½ƒs|ÃPy_òäƒqnièÍF§}’.%A @ðÀœAtÀÜ$uzéP*/»BWz¥Yâ°OvgZzeN.0[4*§¥CÓðDw¥–B'Ï‚‚
¯PâduíïN‚œj§%ø‚<@�ñ+q"h/Ü.1/5Ë<ñÀx¨døE<˜ŒÈ=hF2ŒÅ‹ªB_¸þëe0Ä@ÈÜë$…ßœÊ9P�6ðÍl`&Kz�aâЕÈË=¨ƒ:„‰höÂæíJ<œÍ�Z³uß0æìŒ&bÎZÓ‘ùØF\±u=\	bñƒÈ(ÓNR`¦;XÃ!ÈèöŽ¼x*gp¢üÝȦÄ>äÔ†mŸú®vZ+&@Â
-À€)¨
áCHÀ,&×,ƒÁB ŸÙèQð™À|ƒ8¨
4�!$'ô…!l@”ðCÈ‚
dÜ-$‡ªiƒ$Q‡ÃÈxó‰œ@Ÿ!dboF&lH@C*ìÀžlÜù‚œ|œ6ÈŽ?ÐCŒ„:¨t4`D(‚kŒxô-ÁÄŠÊ?z\· i¾‘DØÿ2ÖË’‚ÌZ缂î^·
»g‚f°žëMLVÄÀ’Ù îiÁ¼¨‚\õClF»9Ù!B¢(‚84�Œúba2ØÜÐÂÍåœÍÕÀ¨À°^˜

ð
4"ëP„*°vÀ™@k®txb)É”‘Jb¢YJ^>~úF�´åóç-[¸è©Ee�:Œ;¶vývlÙ³i׶}wnÝ»y÷öý{5Fw{ÔXSWK--üöA£BK¿^´þÝ»þ׫4„74i¢j™‘
jR©ÁAEQ2Zßö½;r‹“kкkQÅÉûhªÚ„ÖDœeŽPc*Ôð®‰T1D‹&´èe ª‡
hiB�#i#•=’ÉdC¨h¢
kTÙ£�=ÜQ�
Ô8±
hðkB–þÄñç�!Úð'�hC‘TÚhˆ6iQ
hhéoqh1‚Š[îñ‡fÃÇRF*i’”H*J’H*éÒ.¤øÄK”&ÁDJD 
`­@éÂ+
XP¦J
NÚ`
På+Rì›™<¸Ðu®…
pÀ¡(¿‚#¤„ß(a‰C}å|]VLW‰~‚O‚
ý'%R…ˆbq
 ÄÔh©+ðÁ�„@e&ÊOPXÁ‰�AVv‰w¢m?@ŒÝ"Ã%]±©W0]Ç3f*�š6ƒ¥ÈÔ"N“H�¼áïx}ó®Iª
\Ô#×US	Á[3ª TëV±ê‘ÆOšì¥X»*-¸:ó¯³,YǺ4YXªÝ[*÷€ùÕ¯’r”ÁŒš?¸=ý=fJ“&�©TJ+}Ø؉×T”4×2–xBP°€ ¼øxBQ
³
~RÓ¼îWEöÁæ±�^Ò®,Ó%6I]
ø$ùJl ÁÌáøØ
Ð
°Ë
þ­¤Ï»
Ñqj6f´Àü¡^à昦ŠánAJ
ýxd4ÈnAᘎh¦äz¡ª„ÂPMRaî¡F`(¨„8�G’¡þ!FðnáìN‘i‚âáÆ�læn�PÆ„Ñ€ÔeÔ ¬áˆFTáö¡cüÁ8A`Ôá䪘%â
¸�€&°Õ!šÑ²qÔ
«´ÀRÁÁFìíjG2Rb›úØä1¡ßœ(ƒ%¸fîrB!±…L¨Ä6Áv¸éÀi�&A"yðV¶plÒl.
W"#%LH¥*� Ò
þ½¤�¾©�ü…¸F%ÞNL2_êøÐ�º|Á¦˜�䞯4haúŽ‡’(¯ïÖÄÁÔ Þ¡æjÁ"þ¡¢À†`’a•ÐîÔá²#Øq¢„na
ÂdTá2¡?€¡J a@øC
""E¬áRãha´A!/©@2A
€A Ú`za,‹C,⌀&°
¨à!EÚ@
Äá6DÄ¡	Ô
1ïr@>D8
†@
z�I¼Åd$P£	zá>a2á2!6¤9BEP$s8ANd6à¨Àj ¬¦vØ$k¶�k¡&
Kþ!»†2 at 2k*rrob:»Ä„üq%–­ÁS¥XÂl¼i2À© Ó;ÍS¥J%xÐVn¥›R(Ùh°„ºi"¹¦lºÅV¤‹ºhꦲk»€r›©(”A-
‰â¡)qŽ¸A†Àæ~Ž�”ñ­�ºã AÚ 0„’ �8† ÉÃ@"S´`Cðc¨ CÒä/j hT
‚”
zA0‡`ŽäIT
p@†@šÀ/9A
´À2D† äBÆ:D
2�
Ä 
j L 13!‚ÔÎÁÎ
¾ƒFÅ ›`b`zAÔ€Tþ 2
(¤?$s�
’òRaVD�S/2<U‚&L2ÏrMòv¶P�ºD"ß3MZr$QbLÚ%ØWÒÄ:gÇ<%á"A÷hL¾Ó:¿Igç¹”�$nÇ<GRÙnÅ"+ÃU"ã\êWâA—oäJNxš…§¨¯AŸZƒJZÄ�8–¡&´=¡T .Ñ]J	`TáÕŠÊÕ
þ€A0UaÆáÜáMõE0o¡GÔ`dÃ@öÁ´2´@ háDÜAÞ@
–ab`EÞ
	’MÖk.’$^•›€o†.ã!2–vTò›ö¨ýÙ¸¤WÁVÙ6
$G'¸s>áW¹D#ãVOG%
kl¼³k°kTJ i¢$A ÁøüìãB®{r»ºkå1ZWq�z 4hÁæ´@ja‚t–
Œ‡ á€Á_z!Ôc¾
(oaD
“
d!g¤AšÀèÁÚ@ê•“ ¤	S
ÞA¨ EÏa,ÑHø’
Ž€J¡,ÿ´
!þKSáSg›—3¦	€
¾á=TAúÜà¨@Ä uf.¤
6àOµàTA
TÁY“JÛàô”L`dA]ù£L!.ó=‚ô|ÇAÊ!
CUc2kÂÄ"M2MÈ"qUMèðgG&…!ŸMD<÷ñV¶	!O‡kdP=¹	l÷V…P( ¡:xM̆‚mÕiKWT"Kbã`ŠrRp›á¡O˜µx„rq‡˜ˆ±…50s_ÖaBãçzAc¾A¢_ ágÄÁ’!`€Á–�ñ—–ái’áqk¡»³˜fV³"�°Ø–!
¹¸üACƒþ¡�i!’
êÁ‰Õƒ!ÞÁ�Íz!ÆA>æ(DT
_za>Ä
`VŒ+9
ÜÎÆ¡à¶2^UcÒlÝÖ­°šÉænÛh�ÖùâÄTï3jQØK"� ±9 3[x2J8Kì�4ãÏ„Áœa'K·¥¯Y…˜Ÿ›°gCû¾¥ûÚ"Àïe n¿Ìå¦ÍÅ‚®j
h)dÔ*­8biðO¬üa¨‘-m%#>-�

 

@dG:ís%´ÛvîÖ&8LÄÄUËYœÁpm=Õl–p±Öz„ž-LÒ:'¡6%¾“¥J,ã(Ãœ(á¥:n at E®žK
ú:
AWAÁœ‚F†8¬
 •#³#f­Ì]îKí¦I¾<Z×hJ0�à*‚ú'ÃìGjD­—0¢¦cz�
‹nizÍÕ३Pѽdz·]ü˜~
‚ìÚŽ®]ò¶ðn
”øÊ©¤	·a¬Žé“z
ªb2íþòëªxîÀ–©´q]Ä_˜òG

J¡s†™� :!(Ak 'ÌÆ„W쉚»y5=	j©™¨©‡%î¦0–:ÛmÐê!Ê�Üi$Î-DÂV4.©í	"Ja…[…0%¢ø(W´�W¡Ï¢�ºœÁºÀÁºœ¡¸€»‚²àŸ×ª¨"ô€¦Ä¶ù¡ÃæG©³'ÌÕVã‚4ß]Œ™¦Ž•rmÖŽÎá}.ˆ
¬âjؾU×fÑóo\É.€˜ª€&ù¦ŽòƒIÈØâpâ`k/’^nfb�>
þ&§

á	  
€
Ú“ß¿}îö¨YF�V
ZjXêÓ÷.ž?~.ïý3úïÞ>^ïñÛï×}û¼ºC{Ö¨Ñ{þöuå'v,Ö«qýÅãç¿háºÅŠõë>¬[¿Þóúvëܯ`Yò=lþíK~w1Õúéâ´rÞêÏÝØ—^c–{/Þ¿wþòÉ%	â$ImGšR 

q†*° $"\A\ ?P‡@–T‰Ô

ç³Ö"‰¶ÚZ‰%¿Q'€0Ð
 €–þ ˆ¿ă5¢Zα(®P/�BÜ€¸p.0l
Ôq„w$ƒ
œÐBŽ 
ÒaGXþ%Õ~Ðñ‹¢4äÓ¸x5hAø†
–1‚+Ц[µÒÄCFt<_5L%®#	Jh@=
HXì‚A…eÐâ‡Ø
�ØfxÒÔú,Ap" 
”Drn
‡~-g@Ñp@Ѐz5p
>Lâ�‘Єú Ñ>ꀠ¥x�
Ô*bÀØlÜqˆOÖÖPƒ$'»4�MH… Çš«H¶ni®ìqw
™Ør�R²SBsËØC›ÉOŽ¾…Êhaq„�îP�58a
-¨¢
½xm�kt3A›à&ðñÁ‡Ü†W£˜­ 

}5€�À•J�¥ž
>tA<ˆ „/♇bÓ?Ö
Œb "õRÃ1–�Z”ôÔ/9¹ÈG.r—ìgI�A-Ô�–oì
½¸ÒçþA‹±ÁÜq‚Æ-8
»LXµ“MÅn—aEmع
[Q‡"Fý6²Ýu’m°ÆÛÁhˆíF´°ë!2quV
{H]R’ÛQ[c§‡¹ÅÑ%TŸêO>D0¶fºÒ©}­»…-ÖJ…^˜îÅÉàD2æ
¸Ã‰íŸS×Ü!øNõ‚§­Û2RQ·&¼ƒ
ðpC"@!þ_iæJñÕÄ;me‹f#
ÍÖ
ýF
ßp
z°64cáèŒx™—zInq$…óc· /‚3±ôÈ�€A˜€¢ØhŽVÂrÑ'àh�–a2Ñ']q��yoB	I3wþr'–a%i˜¡Ñ�’1*R$«ÁªÁ&\±&…ñø`´1<“àkÂÅAðÜ6’¹h	OÀ)’€œÀùnljœÁ©œÁ†+ÁF•A…¨=7��|À BÐ|€Š<ðÁ>¨Ù	Bp�ÈmØœ ×�âÙý„>|ðÑ™œâA1hˆ»ræ ã@ë(Wa
z¸Báö qêPÅ`ñ€ú 
è°z08ûw—ºª¬r\!=v´ �9˜ØXŽAº­ù'ob éU¤ãÈ� §«…�xq�Nz™Q&+º�.Á˜-Q£%*¤+3›Wu�™á&™#ÑÊ™WQ™w9¤IZ!•‘Ï%]©BA¨±¥»±þ-‡H1»A"¶H¨ïÔ‡¨>•jíº›¡'_úZ¦¶Ò¨¡·RÖ‰öm 	bj�¹øpæñNå1"{+z	ê“¥‡(–jøkäq<¶`(”T‡²Z at I¦PáðbȨ2­:³4[cŠ3IdQQ¢‰aåH�°IlÂI
>Ú™š2£ÌJ´Œ‰Œ‰¢‰Á˜bÁ¬Q«ÑJ¢ŠbŽ"Z$¹%*™«r�ßEn!@꣬Iœùö€›ñ²+ÁÆ°·!]{¯•p¥Åómh_æBîM|º++±ih<e
_�:z› z~Ê·žg>lx¯+…“rksMºY<{RVþZ¨å
	h©–ž:6´`
¦
™e{d;£}âÄ©ò0”
¤@	¤°ÔÛ¤,P­MÊÒOPÝR¯g	U=ÕT­,€°MýÄY

ý„ÕÊ
Ú$ÖPýzUmÖ-ÅÖL­Mýd!i=Öa�ÕK-ÕK-×UÍg�ÕáG
R-Ög­MyÝR„ ­êp½ï‘
Üà-<¡/ÜËcÒÐP€Õ(ÿȔҙ`4·Öà8âð
©Æ$ÿÐ�¦T5Y‡°·­g™ W&Ð&¤yá9‘,1ð ¬þ×õ0Üÿ@ô0®õ°',Á[1*æë_QäW‘äÂM�R
‹±ýõ0%þèð��ðPäó ù€B�ªRðÀi	Eþåð(æþ™ÃMÜ^‚s^äûÀ	´æŠŠÓjÀ0pÜp
³æÊÖÌã�þº}2€ÖЮûÀ
M`œ@s©ðÆØ�F3;ðJT°i‰Ä”g2ÿ€Vj@Z°LÈ*�é5æáø�`άü°äµ	2{'¿N%AÊ„±�‘)¤AÜh.å>
F
_µéI<­½:i­ð¸ä*�Â
î¬ò£y!íP½
�5Q›0Áþhù0ßåÀèbËæ-îݨCmÅ$å1á�ZAÙl4>ª½�îñ „e±ÜPg‰ÔºÿôªG
9[L[eq%À@3>¾PE­ANkŽbA)[N[žöj¿ölßönÿöp÷r?÷oï¡e_½P$ö™éÃ8J%÷`®Y¬«)ö~ÏIŽiŸ[^™i
[žÜê™üàäŠþaÜõÐ>¤‹ñbgO%æê&»Ž�FCE]!iÑ©™PKª�:¦Pº‹0á
õ´ïŒ‡
«K±1 at Fh'[Ã5\S6[#ü¿_6‡27Àoüs#üËßüÎÿüÐýÒ?ýÔ_ýÖýØÏüÌŸüÈüÄÿûÿü¿ïû¾?7qÒýæïüÀþÍ?üëßþëÏý¶üßüÅÏýö_üâïþÍïûëïÿ
qd%dÉû@‘61%ä£`	g÷»óAqxI”`G¼øÂd¨âíàD
Ä �p@"* ÇBçD:ÖÑŽF2™h¥9÷¤Â‹cÞ¹þ;~ð‰0
$¯x�k¨â†Ø
wü°Ü]ö‰YÜ¢¨O-&ô¸¡‡L<$ª¸ª*¡¹xÚRŠPkäöÁ@”ÑÂñQ…¿V¶Ñ·àF;ö1×ÜcÚ¸7ÙV¾Š,z降5R¶Î�d­}Eì!µqhŒÃ®÷XU2^*O&Ö²K�yhÅϘ^Ö³äÈ7L1Žw̃®Y0v(Ô‹~ÖµÔH(k%Ÿ×ÖÖqûÇ-ôiW%þ#ݤì-m;Ü&ñ£—ZìKi‘
�–¸Ï�6hñ�q(‘®ÉÈ+k¡»]µ�ЇÐÂM¤d3Ô‘n#_%]zýçr×½»ãF-´QÝÆþí#µ”c{ß»_	žcVþ åBêº:Êxw�k-ß»�·¢'„†,ÚCW8%š�vnñM
Nî´/œë>ìª>—¸#oµÆ;X‡–e\Ǥ•5qŒyih
ÉÈ ?j¢…&ÐâÖ�©šm+dQúÁ�&…maîi–Ý\®øzYƒ&¨ÁÜG¨ †‹ÐâŸû²JÔ«ß¹ŒÚÔé­#©½ƒê�˜þ×°¬vÕ¨I¢
ù:ÖyÉ
Z$C
{ÈÄ`:7íž%L¶µÛ¢=’xÎèæ–`¹™ôð’ŒùÝž¬CS¾_ÐñÉ.¿E*êÁ˜o¼cþ0‚±·yÇ'„Ã9Çž[4^ÏV¼yo¡Üé H9¢·Ú€É5h1ò[çúÅ(ßúv'§Í×BÅ�…EÇ;´@¶·[üK¿ù!eÊÏUÕ)¡º=é×ÛÏGQÇt:6
(õ‘ŒC¾W÷•å=ÔÄ?—®ßÝf<
ÁŽÜÕÜ10éN›»j—ž­+–v¨WbpBOé#1þã 7f[ŸÅä‡�~íùÊÿæÓ-�,4¢�k�…¯Þ|ÎO+åì?uLL�\tÌ|£DùŸtýM|l�¬+ZûÜ%ŒY‰’à=’¼ëÙÈ28Ð�»� 9”€¬ì=„À	\‰‰Ä@óþ<辜Á
Ú@¬«ó±�Áéi-Xã}ØWµÒ!1§“‰£L/ðù@�ÀA�¸Z#<�¸¾àj¿ÿ+^R„mrð;�±ƒó½Qƒö«+Òa?)Òa/ÜÂèi.᱄Aç»»x`ßc¯S›#W“0ÜÂ{˜ÂÐYCßkC9ü=P‹@~ˆm›Ÿ³P¿ë­)ÔžÊÛCó‚Âèx?Ïë·Ž‰¸èQÞª+}`?ùŸ¹*0Lô°Õ	Ÿ3Ñ™;TSÀð‹z
Œ@´Ç>¤<
âDÎëÀ£2»Àè­¼+°ˆŒø1¿@„»ñ©8 ¤<²GL”CÊ©I³[�{P‡w8
èQ‡hìAÊ#8«8qc·oø†s8·ãq 8þqøt‡xP1¦ŸsȨK¼\�q@Ëo 0¾ó}@‡³Svx�—d·O#Œo¨wø˼ówpKwÀ-wP‡*AL|;º¢ž“ÊòQÈÚ<܉À=¥¿ô‹ñ‘"Ž¨EØ›#þ›½û3ɧ*»X†ïFYHŽ¸‡qà5
-hÍ„ô:M`@*0„exÃQN8‡Lp6(q‡xpËàŒNë…e¨	l!k6N 0활o
*¸uÈ*€ÐLPƒgû¹­Õ[¨‡Ó¨‡ºx6mð9-þˆTžS<[qà„gK†!¨Õ^�ÉThƒ^Ð4WõD)ã2mø†@=«ò›10v0…PwhP„SH`HV²`KÜ18„5Mqhƒ!(UhV`žÄw€‡
†\-xäT
NKdö‚=0„=1à»%u#Z:Z%.s�”ÓÞ{[Bh`‡–»V`®ÐâôæX5œC8E8EæÌŽ€Ö?5‚ehažä=Ð_kÐ4-à‰œµ‹Ã¥U»Pƒö]™�©£Ê‰°W`hž X5)ž3„�þÙÃ}6*p[Õm‚,S…[ÛLÐ[ø9C0-¸öPƒ`(èJý¹7Ý<mÛ[È‹h#0ò)¡[PƒŒh‚UYâC°(3ógN˜ãÉ»‡[¨�=HbN7¾˜{àgìE!€†6€†o ÌmƒLøÚ«½³;«Už‹0Y]iþϹª·C|3*™ÉVäDІM³†dUÞƒž
5‡Ž>„Øu65À•Þ<­	ÞÀ
¶¸ÏrʺÚ<@<µÈ–ìɦìʶìËÆìÌÖlÌö<Êñ5•$@`0a}htèzp‡`Ø´[h¸(Uq0Ïd�{€†[ð¹?£¶õRv¾4<K†LøØÚ朂†�æ-Sh©ì…K8Y0†X,EKkø‡ÀÊ©‡z¨bÀ
S-û†d€†•Í 
o™²·ëq¸…qaЕ‰H¶üZPb¡÷Q/ÚNÏQwPkІ`oËÄ-
î	]É•oØw¨d
Úì\þ×õ]çõ^×õŠT‡ÀI†oÞóŒçKü‹£úœÎ,¸¹ÚÎ(	ò‡û6ÉLÆBEÒì0†¤G{\Ÿ>Ô¾½µCŒŸ-tV×ò1G/Gûñ̵ÃT­žBÈ´öΰ,ÌtÏŒÂòiÅŽ±ÃM¬¼Sw $¡¾ÓtO|�èañœ+3„Èó20²T‰$�M\¤=ÏMËëì¶�ù�ù‘'ù’7ù“Gù”Wù•gy•'g�×nÈ`›�íDLL¯TuÎ#7&®Ay7Ê”íA(4w…¶`‡W"üwpDÄrŸòÉãV1ç«DªGp¾üyN¤+Ž,Md,Aø¡ÁþªwxÔ
wäBŒŒB¦Ë^	­B
6µô™±—6¥¬žT…;*bÀ|ô01ÄÈ/‹u"œunò@L|°{�yH|Å_üLJüÈ—üɧüÊ·üËÇüÌ×üÍçüËW|Çg|sH.˜†i¨è…
ãyýŽú¼�MÜÎUçDÇ–w3ì@â“LUuö¤sFÉtlIÃÉiFQ¯ÁŽáz®÷0j´®Î™zëêùê8eçS„J§ôýYŸÇnEü”Ðz¼;²Lú¾_J’ÓÄ÷;Ä[ßÄƃB†¼{ãž{ÔÄ �ó“°x£ÅxÚ,ª}Ð|˜a
úèp!þĈ
F¬Èð¡E‹3VÜH‘ãÅ� C2,8q` @
G© ÕëÖ=~2ýí»÷oß?~ûøåÜGsßÎ�2wþª“'Í4iΔéÔ)РCoÎÄ(?=ymÊèOœ2oúãwÏ_Ù®:{õ¹“*Ðœ]™Nûï.Þ»DÙÞ=‹gY±9“*-kÓgÙ›ŠñŽå©©Î«[±fåSîMÄh+oΛWëæÈsA¶Z,Ô´›ÑŠÕêùu^h´´�³™7°´¨´‡×5ìà‡/nü8òäÆõá“WŠ%J–¤G�ª:öìÚ·sïîý;øðâÇ“/o	%P�F½è…J•\šþ÷„2•j–gÐúNçÕÊÕiRˆE—QXi—\BU_}pù„€€õ”‚
õOLøõt—c¢­õ‚ÂeEŸLµ [H¥•‹H=V˜bKfUzuEÕ�H
æYoM[e‹­EUVw©–ÙˆNeÆ"‰^
Wœ6·h£‚ZYC‹nT졇Êyù%˜aŠiÜ>ÌÉã‹%‘H2‰&‘L‰›’H¢	�uÖ)'žv깧&yòù'�~ʧ ƒÞ‰çœ†Ú‰h¢Š*ç¢�Î)‰škÂ	J+5Ü2L*ÞsÏ<>9¶cd¶)¸¡¨z%¨e\±Ø¥Xþ§jd[Y#‘<~Øa�”1þ†Ù‹]þ&¡†¯ñÜ[xÅê£}u
‰Ó†_AØâWÐzvT^Ö{챸©í«6n&~<j-VŠ­Õ-q²Ñf^¸eÙÛocÚ{/¾ùzæÏ<ÎQ"	&—L‚	Á˜¼É¦�O20Ã
ïɦÂ
Ó	ñÚDl°Ã'lñÄs¬q�{òÆ3ŒñÄŠñÂ-/Œr$–3Â0¨Ü‚W>À´‘Š;®"É�6Z4qÈ;™$`½Êv¦*¸y{œµì"+œ`ÄI-¬®ù6Mõk[{†îb_²û¤¾v‡Öµë†©M-SVùÏ•Yn)¬¾uÛ}·ÕûØ#Œ%s^br%•`B©Ë&2Ä.þS¼0Ǭøã�žxá‰KÎ8å-O~yæ•/Ž¸ÉŠ[®1ã�/ñß2�p‹ÍúèƒÎ"1˜0„5ìâDÅ!{à Š"$Ùx?<ñÅ{yµñŒ¯6³Õ晼»ÑkdòÕ[oœNøb‰à�.\‰Ën|0ø�‹/þÂèŸ?Iàã»ïþúí«~Ëñƒ??üé³Ïþýõëÿ¿›Ê×?
S8&´Œ°nls´¬„¥ÝÌ-\*¼!ñt²·4U¢O„�	Là¯aú¢›�X@!,þ‰|[ÆÄ#FQ‰„b•ˆ¾)b±‹ÿSœáņ¡�€Nœ%QZÜ‚ÿЇ)j0„!(‚Õ>Þ¡�Lh�
MhBíC¶™,‡†<$"s˜•BŽ©yï‚^n¤çê%²’÷Ò‡<@a‰GÜO|
ÛÄÄ&06ýÍql„&P)ÊIŒRc*Y)ËSrÌ`¥„e-S)ËU’u²´X,uù·[Ò’”Âœ¥+A·Ë‰Ó–Ž+e�bù7T¢R
¬�,z¡
}¬£T¬qv˜*[Åpƒ"šŒ6

ÄÈF:^w‰o&‰U¨’6˜DÃ"a1€±R TÜ#áV:qò¨”Ä
%q	&““jr%'5ñ‰6pbpRë%J9'7ìor:¬]†±ï­©O‹Dàæ
M�º2±‹ké
öˆ7Á‰•{eÓ&û&Á)vQjE¬j'J0JdÊ%ðy£^~‚6mñˆ5xþ,Òo”TVá9õ�Å©gÖèöàÞëI‰Ñ‡‘¶ZÖ{J×3ú|[ÜhPä
w g¥Ä‰8ÑW†Œ˜reŸ€Ø'8éõ�@l#J׶ZqMl ÚÄ°T–qa…X%5¸Ñ¶�NÐÄ„z]i0¾¬e�T+Á@–RüÊt˜ú}™�5‡	Ú¶§Œ™Éc\³<Ç mH$œ*Œº»B¤×jS–êFõ.Ð}ntU$Ç‘Ï»M$Ú4““¶°0OGZŠù	¡�(�$!å„ÉUNŸÐëF10�"Á{Zl`5šXüfµš°+ 90”íõ°o‚Ä'®Ì¨”–6™«Uþ`$QZúzr¯�ÓóD'U'ðY¢8Èf§.4ñÄ&Œ$äŽ3ÈT"'g‘-tb`ÃÂQ‰81©Z
w•s¬¤@7Xï¤.¥‰s]~f÷ŸÊMµ@ó!�#'™Rók#Þ̇5¬¡¼^( ѧ�6¢‡£¢&zíë9m"Ï;mèÞć.P›½¯d™iZ£Ôî ¢M§oSÛ
k¸B¯ÏÝ>
è‡æêl¿£¤±6êTûØ«ÿ
@ˆHÈõN![”�лWTnB0@§ÖIX¢
8O5!5^¶ˆ
‰Iœ˜$—²¼ZçGÇAÒ¼ˆ•
¢ “ÉÉ$pR^	Öc!”BEÂ8ÖYÊDiÂJ‚zd
!…Þ(	ªÙæa•æm—Æè5XÆÐ	h€ó)@þü‹$ð
h_DÂ'ðA|"¯=�ð
$\
p
P›Ì�ÁÂð@\A‚Âü
(Â=ÜB¨
-DAM´A2Їø„ŠÞBÑ´ÁO
�ˆƒ;P
oA&ˆØ`èC1Ô€¸Ã"ì
;pCà@P!Á$˜@04�´Á!˜çŒ¥RµA0x�¼ƒ×xJMÇ|\d=ˆÃ7œC/Ðg/0|ƒþ?Xƒ;¼Ã2ÐçXñÃ2ˆ§8@ÃP�o0Ò!Ê�Ü(b["Ò>ÈšQaÍ	Ê|‚ÕÅ\Ö%ÄÌd_
x@
¨�"(Â;ˆCÖÆg0 ‚¸n0XCPÆÃ9¨Ã;Œƒ�ª4ÄÓ4ìA2dB*ÜÂhA&‚"‚*|Ã�ªÂÛº¢~ƒ;¤�þ'˜€ãrWZÆK�…\–*ñ̃9La’‰Î%ð"ÙÅ*(é%!|�
Àö€€ó%@�B@@Ì	À/VfÙ­
)ð�À&
¤ÑÄ\çßÉBùÄ9ôä�îã�,hAQ
�–j¨k
­ÜÂ!ÐPþXƒÈB�ºPÜB
ôn2h®ÝBpS7|CMˆ
Z|ƒ˜Â-�Ü‚()Ú¶�
íV¶ÒöŒ8pÂÐ@8÷L*(‚6
d/,C2ðg2ŒüÕúC=oºôíÉÿ'4D*0\¨8XCñªÃˆÆçíóC<8Å7C2ÔÎ…zå9\mwjA�þÞ-…njÏ@ƒ;@æúƒŒ¢äÓjÁ²Õ:€¿5h¨éÓGaȾ'ïk)4è£;Ô„;L¸,ð‘ök
@@ãW/Y<â¬
üöMœ;~î¬Ýû÷oß?ÕA»ÇO›5mãüù7® µeþ’ù[Ö+0kõø
é�qæüóß=qÐÜUôW1æÅ}þ¬}ãw.Y°dЀBKö”Ÿ8ZÉêÝóWÔÂ…ß.nÕ™S­�s&ƒ•6âp^;—n]»wñæÕ»—oÝyæ|QŠ„iÒ$M†	ŽÈC€
¡@
:;°´i“�×< MbT¸Ò£Kš$

$ €
,Œ’i\�ETDËC!ƒÌ0P
#ŒÒH¥Ê´¨ÇKu”Â}ÄœÈÓŸ…ª“KDµ"j,¢Ä
éþA
ÑÚéÑ
rP¡wÂIL3ùi1Ê;•ù¨±c‰ÏSù,Jhž²ÆIF�dþ³kÿÜi(šßt:§?_ÌyŸËœ™ÇBã²I9ã’+k +êB£þþ[ñ±4=K'µF}+®V9ïÜóÏÇzÕYa¤’H®»µVHø}b
îp@�
 @>
œ·3
n06 at Kô
@Xò–"øôÆ·	HdÏ–AˆN%þðeÊGükè
4ÀºY®A
(À- ‚'<2"(€
Ÿÿ)P%$¸	R
8�ƒŠpN ‡)íB1Eaš�U6§¼4Ήƒ¸êUkÜ"sp«¹áolûcòÆ}cþ|NótødëaNGHŸ‘è7$'Q7ëy
ß$@¹Ê5
JgÛé�0ü7S9(;›iÞ&ô¸Côò>Šû¨¨{$£8p± clzÙþËØiöÆwêTg µªîžDg«£u<ÁÄ`âÖÙ%º å1 
â”3>#A\i1ì)ÙÂ�«KLÓÍ:¾À	À~BuŒØx¾¢? GHŸ:
?.š	®ïM`b:×'™'ò‘M2ß–˜ENaJô¡P¡	ÁVŠŒvä&Fïb'ÎA
¨ D�ÔAïÞ�
Ð"Þ!(¾íTáâáâAÖ¡OâÁºbnA2A
’�>�z!Â&XKâ¡·î„Tá(âzÁJpÅäÔaS
iáJÞá8ÁÕaôÚ€
¾�ÍäÔáö Úþ Ü!®Ä&ú„7naë
­ŽI¢Iïhá–azp/¢¢—¡
2�wP°�p"’A
´áì�°SBìÍ.1ÐH8
+êP‡öaA2Pºâ(��#�ºB
†`L@¨À†`doÒM'–�ÝÂÊÝìdöxѬ†¢Þ@�‘¼¬Èþ�­:N@ð%ãôÉßØê˜Ã”–šœQ,!a*ë¯òïžnáÞ*ø†ndtn_„nýp/_ö‰­i­Mß&_ðÉËjåßô¥èv�_ÎÍékå
ë@,¨záÒþa¸`L`TŽ¦qþt¦À’�§Ô@¯"Ô@
 ¡†à"Å!ö@!(ÎAš`>rÜ@
ÆáÚ@
8
´À$ÁÅP
RAŒÀڀġ
´ TAÔ@Ä
¨à�@
Ð!zabp¨ 3a.²
¾ÁáTAZr”DÔ€Taf,Ù�Þ��~R
AÔ@naö %�AR¡
|².ÛÀ$’
ÐRZR'iÁŒ@
A€á"iÁ.Ò"eÐ3Á«².¥Â
´€îA0S
n�j
záz¡
a"!n¡
nÁ&_ÔhÁnóE�àNó&mTRáµ.�`†€®TJo“n,/RàtaE­A”tNIôõ¨À
Ú 	’Á¬�¨0
8¡8'ò"/Ò¢@RÑ3$
µ
�
Ç�Ú€%© v at 7±TNÕ€H“aDÜ�
Gd,R)âígjqmV¢Ýdh:±tnÌÈ�ø¶3ȼïVfÎÇŽûpe2ú’®cçÜÓþúÃ=DdtLüx.ãˆ@½Ó>óÍë³V¶“­îs]�?‹uŠ1ÿþ¨#4’ëç&	Ak…Ìtd°ÃÍ"Aœ‹Xfj
	hÀhÁÃêF‚Ä�„¾HVRK4HSáv²Ió¥t(Ë”
Ûàõ
H•
ÔÁ™–
ntîp~ÕhÝÁ¬¢	Ô ¾á#©0šRAj�€$'Ó&‰”kÇp'cÔ$ähÀJRRÅÁFiAj¶
R¡VÏöA'“A�6,±D™Öh3Áô²kSAo{v8ÛR
¢àÄ
 {¡oÝ!¾Á$zs–áp�dWrtø"ÎA‘ÉP¤µ
|²f™ !â…cxSD±.9!¡A>!vµ! a"r3ÄahA>Ó-pX-|ùÄö-ÔáÜ 
EXr'ù\Ö%<²BoÁzá¬AÈ–Á/ÝÁ%ÔAi�P1#Ý

axÒzö®U
"&ÒGß
¨ #™B*¬á.ù°:¾�”!ðu_Ò¸Ò§‰9c÷HÞaV‚7S"ŽO¢²{�öa*ÞAVþ…{´{aÝÆaSäRÛÌ
yS/-š÷Åž÷™�û."çìMc<‰~QÊø,²¢,²>!Ê$C3Ö°údf2ŽµÊŒÍÖl·¤{´$AºÓ»¥L¼¥[3ª[3èw=Þµ_²[»±;¹‘»ÌðCÐ
ö¶Â;»Õ°ö{¼óû¼×Û“(�Z!€A‚÷KDjÖ|êqâ¦ož¦²ŽF´ÂI”HC yÁ
eÁ%glˆÊGöëÛ~Ã’!æN¿¬fr|hFŽ¨¿~¤('Âå¢çDïKvDf¬!DjÜFê¨o¾®Æ�¢ó.Œ'æn&lBÀ&ª�ARìMb
ÞŽÙrâþ"#­õÝ‚{ËëâoÖ
œAÄ\Ì}�|ÁÆ\|aÍÙ¼ÍÕœÍßÜÌ}aÌ×\ÎÛüÎïüÍáÏÝ|ÏÕ\ÎÉ<Ïõ|Ïá|Ðñ|ÐßÜÐùÜЛaÍ�ÍýÑÛÜ8„¡FájáRá"<äQ2mCR¤¥`(ð.EgÜ&¤,Oh¶Bí"i®mpzf‰6­C8
ÇKÊ :Ø îÈIp(¢x�‡¼HØB-q˜fnBüA>jŠ|ntMh@ÄBH¨ÂcˆðfM£$¼¾g£("R
,fjÐBB6œÄ´+pŽ÷C’WÛnÑ9};ö¸üÝÏ­'ô!è=­ðÁðaì=ðáßþéž
"„v+†**{Ôäç0¤È‘$Kš<‰’dÅ�)C‚DÒŸ?’/ÖLh±¥A…3?æüÉòdÏ�C+ŽôWðÝ!5ËâÑŠA‹Vª}÷‚|y©¿ªû^"Ýç�_×°beÎ,*ö£×®sþâìšµ Q‹ldyW`Z»ÿÉ]I×nÏ v÷^õ«ö¦[£2�ö²kA¤;mŒ©Ö W±y‚­‹çÀšHùÉ„yp¨Ø²CVdëV§ìÈÚhiW¡¿d½†ll#N·ìáÄ‹GÛøËäÇ›[
iÔ¹N�îö¨�¶îé­íTsóËÍó´ÌÕ1“Ÿ9zrî±m3wˆu¡Ûåò…7¼ùœ¯ÍÊ
ßïw
_[
òÇÐOûå„~zù§__÷I'[AÚÔ2Qt%“-yD „~â‡�…èe$7“8‡haM<ÝB‹,óüÃÕUø……žd°™öWd+µuUÿÌÄà‰¨þ‰d’J.iÒKµÝÞ�¼AEpö1‰e– ©åƒ]ž$–:Ö%ãÏS½HE£>÷ôrˆ,ÁYeUpýs'S™ÙY¯±R<Ö$ÃRk_Jh¡†Ž$!…¹…!•9xh¤’NJi„¹³b2î¼X‹*úüƒN&G¨Ð VṌ!œŒÃO<™ aˆ*{ÜR-†
[;a…n-ó”†�þv¸pÅ_L”?˜j¡�;fÖbŠ_½ ÊԳ�YTÜâŽ5†¨Á	'Gì
4mÜÜK*m,E1{ìLo41°©+	ŠqÒJùd³	%­†m¸såÒV_]íwbª‘ŒSPÁøÏ:µ4A¶5î¸sSX÷ÑË7mhzÍ!bˆ‘L&m쎪CÅ9ZÜrÄ-Š4‘Šî̇4ÖŠ/ŽRË&dMħv”Œ_Ž9’f
©ñRÚ¸•TúèÌ©hªH*Uõ?Ëq-î<{È8{4Á'Ëð³4ÉpòŽõhÑÄZ¤B…5ùeÎ|ó	5m9ÔÒzÄšóÖ_¯ì@è©Ó†þ]G¶¸iœŒ5Y
¹Úœ5íŽyÞC•Æ»SÏxØßß¼ãþ9•jî³p€, 
ˆÀ*p�l ÁJp‚¬ SL©a"’
‘îq<µ'5Z©È=âÑ•ª€0„÷P›eF3�âo†—ƒžB¤w¯6ŒÃ/-„¡Ä 
qˆD,¢�ˆÄ$*q‰Ll¢ŸÅ%Ú.ÛRÃ5âQ‹l‡[	a†4$°Œg<1žà2®€1N4l#ÖôWFþEff‡;Æ1Žwèq�|ì£ÿÈ@
r�„,¤!‰ÈD*r‘Œl¤#)HqØñlzǶ´p
vþ<E¨¸…i¶’¬�…F}©
�>¹šÆü#
¡_y5>-jÉ3„-UuË\êr—¼ì¥/	Ì`
s˜Ä,¦1�‰Ìd*s™Ì&'q]Ö‹kêxÊ0d‘
²Ä”7âWÉ94^FŒT›Œ\ŠËt.ŽÔêß½‘Œdcñ¬§=ï‰Ï|êsŸüì§?ÿ	ЀƓž-h?ÿ”ŒeÔ í§Bï黄>´|ö\¨ï"ÚPƒb4žÀhƒ°®QM-zP}ýá\Ã2¾¹Œ ZI
H,¦/*M€<I秨¤Ä%I–Áa•°£Žx¨CëªQ�JÔu(u¨EEªSŸšT¢JþU©T¥êQ«U¨ju«AåªW×Ñu¼ãlW]jW½ŠV«Šzê;ÔÁŽ¸¢Õ¨E­ê:â�Žº6Õ¨{+_ý:Ô¸*5®ì8ÛÙì8I²V°ì
nð­{^븼øÕ/}�Ýôª7fâ½o€Û`
K7º‹8EvM,^N˜ÀÌeï‰Kœ]U„ø¾¯zí[ãüJ÷¹ïõèu<f‚ΪBJ·øÆ>¾�6š‚²"€ÂÓµ‘Š¨˜-Œÿp‡8¸¸ݬî+ïè¬8âñ
b�fs-{ÓYLs&ªXãâÐ4ʈ0s‘XgÖ-ˆN3:S†öz›îx at 2Ü=+‰§ŠZ¾aˆ=èa‹Ðâ­‡F/âg�Ž4¤ý³Lkz‰Þ´¢!méPWÚÑ™µ£'­hOwÚÓ?ëôª9ÍêX{ú‡ˆ´ô ‡DâÑœ^´®5ýëVë¡ÖþĶ±kÝè]ûzÑ‹¸µýjY—zÔ u¤S
éC`ºÖŸŽ¦”�ëL¿ËØÆfô·q}ë^/ºÕ¶Ìt¢G
ëx»›Õ–†v§õP‹=°è¼Å?¾¡…*­ùÍî€F/ á¾*®W¥õÇŒ ½µO{¿‹�BMTŽ&T ‚*¬¡
wè1žé³6´ðq´q%o&8GÞŒ@‹»¹+h³F*L
Ð@G +½Ãê€!Còg/Úpø4rS7tŸQÄ‚-¸@0”þ3ôðôÀtÅÅ,Ñ5Zp—å{‘§uY‡[Gufzß@uì�uÅ—ußÀHè„qåyY×xEˆw['WßPuZ8„’7„NW瀄LH…Tèxe8Tb˜†eȆm(†÷nàŽ&‡n°Å „ž…OWHH…—å…Z(ˆ�8u~è„Ð u¨sèqXn؆Hvs—{OXvy4ZhYÆW|߀„ãåPá
ßpâ°
ËÀ	M€h‡�	Ë`Fbäi¡õ@ƒü`ƒù ’ú�$)’'‰’)©’+É’-é’/	“1Ù’ñ‘_âtrb at T~8wµhˆVz]ø„NhYê0¼g”á0è°”�WuEÈ…V(y“e|§uŸÈvEèTNIu™˜Wç°”l÷{]§TÅ0fà9 –i™ðÒ”è€z×@•sGT¡·UU)VKYb –9ð}éi@‹þE˜‹åxFø{ÃXYŽ‡u¨—vJ¨GJ™‰µHЗ9À–Qp
Ü
¡*¡J¡j¡Š¡êÒ°¡¾à¡êø€F:…$„ö8¼w¡Wþè€r·y¶ç…JU‹ˆ™Wßp
Z¸yVgu”'„EHuR’—Ã8wÐ�•;Zv«×xÔX‡·ÑQ
Šž—˜eWC�À
¦Ð¥€×p×°…€:u‚Ú…f÷wšÈxZù
Å0†‡9u¾cY¦H
¹WuO½ð[Ú¥\Ê¥Q`vºˆ>º�w†UWL¹†AI{_Çvpù£T焈zÀ5›:C+Â	
£\3~Ï$ÂŽÐ�
è÷
ÑEk3†`G8`·�*ª�þâ°'¡ñüø
UÂ	À`7“Ð@ËÁ*žÉ ª
K	 `óP(¥%7éNZšKjªz07z�‘*–ñiY{È“LhTåêxqWuÎEŒ[ø
ÀPUWn ¨`I…œÐ6�Ø„f¸„LÈ”µ ~™È	É0íP˜„5«J¸Å€^j
Z¨rP‰gYÁùˆ‰w”ßðVNû
L
QW³:Œ”ú”Åg«Wô"· 
f!rü`
msŠÐdüàžâÀéWphÃâ°CjññT·€€Åk>š1'Fñ
‘²ÓF f#÷
É ½pY»3ß0â°â€d{â»r8À@}ñp»B^ä!!ËA‘¾
ss‡b1ì¸b
b`/.<Ã/à¦P×Ð}«Bë´°0|µÐ›b@S´½àmn€/ˆ¦{Ð*wh«¦@H°j`‡B»€êÆxÇ…³‡™‘k
\|ÊUbàeªfWTµð. É‘‹ú zê
™
Áœ¹z¸‰s—·T—Ššb&¤J“q¢à;‚/)ãcî3f,
?
•;°H°²¬ñ)H ~ÚHÀ	5p]bÐ8-œ€Íì·E-‹É{€Æn€h{Óm0uÌœH°;`‡5p
1ümZÀ	ÂrQ ¦àT >¼;€À0–r§µ\+·
 í0Y±œ]#P/þ
H`
D¼—{¼Q°ˆ°âA+ÿ¨ª�¯A˵h¥Ž¹��óð”´ ØI핉;PjŒ½M2gÝh-¼4¼)ŒÂÅP¸š(|r'†Ö!»é>¦„6±‘1B8e«µ>úîBN¶<ò’! êÌ«µ%øà}Á|Á÷�ßù­ßûÍßýíßÿ
à,Á˜Pߘð	<À¥%ä
%7$Âð+wçmü
øÖÌz€#Pì€á/@j¦0€ÌÌ	ô93þ¥©(‡Á¬7B«Ša`èpÜb
7ým[LÝKæ™ x†§_72ià;¿–;°[ÅH®×/z0nÐJ�s“ÚhÃ
§o=þxeW�™i¹ó.@õC
pÃaZ�ïµÐiËZ»)~
Mÿ0Èh|ÃǬQ�	rþhQ`”ï éVY™•õ[ïo w-l
i°ñ1¬T°]·ÅQ 
Mß“VTÕ|
V½‰›ÇÐÝa0x”MÃÝ­T‚LRèAúVCñ)ò-Á+	åNû“Pû·oû¹�û»¯û½Ïû¿ïûÁüµ¯í|	›pî¹O	ò`
ž%Â…&Û„”šãÙeò�kÖW¿ãE�F[ë”~ÉÀ\{pÍã�{ ÂßÆÙ5^ÏT}›]Åà´œ
¶Îygn¾�íš�JTç�Øйæ›oÔQ§†’AQÑù†-×ÐyÉÅkVû&m¸ÇDYCÒ�^œÒF�q®QFtL‰B$Ü@R�uØ�ñ=La'Gu,S�—¼díuÎyñ�vœbk$ë$ÓE¿9'O…üfu`ûf¤oÆY'6aôvŽHJvÜ<gÌ×E¦:“Ôñhør«kÆa
H;ô(œqâñòœqD}gCâÉ#nR\­53¿dÔËo@„‘É‘
	É2ÑÙCŒ—h1
Yn	Ž»â‚»g¸i!´Vþ¹Þ´ã':é®õö[êöÙ�z´ËÇ—FÂ#P“KÖu÷]wÛ%P^vëm÷Þzß•_~í]—Þ~Öw<M0/
QV¡Iæ›Wÿl³(Bí%=c\
¦d
òæ¾Tç®ÙÔ1FŸÙtgÄÕ‘Qƒåu$˜WÖ1hCùÚUqè{R‘
m“#ÝS$�r’T7I…&®=j‡TÖøjUFmþ~M$Vá92RvÔq§Pm,7‰ÇU·Fþn=G<ç�ØáÊF÷ô[TظdsœE¸&ž[<¾%n‘{öYŠ)†N;ƒ7Þx‰…ó‡_ž×]ò”DH¨Ÿ^u	ÆúwÜ~Ý
½_W’ﻧW|ð
Ĥ’J�b‰»=»qnÑæ�â1Ô0Š= Â1ˆ�
Z B
	¨ÿЀ	Ã

(†(ˆ��Ô•´àÀ
fЀt`3xA
rP� TàK¸A
š°ƒ D 
7xAŽ°„$á
	8¾�„64á]øÁÒð†A¤ 
A(ÀúP…0day8Dzð†a`b
‰ˆÂC´A
Ë°�ÇhA‹âhìÎþÙVvª•<ÍO9¼ÙqÔøF‰ËÎÎ?ÎU‰ðM‚|bŸ$>ñ	[€‚ 
Jˆgaã©T/�Ê�ç<2�(½	J
pà'°Ë’�`TÙµ¾±Jï•P�Ä#.	B 
Æ`=fo<ä9ßô"ÁàUR
È*

‰0¨f’aÑÓ„bo[ß:âäíÈå.=F…6ÀòÐBh5K�iúc™�½&wú�e:èŒ}íwƒ{œÞR·:½Î�«;¿ßÖ¹ÙÉro³\Ôæ¾;%õ²µºå'‹c[äÇm€AUüã©P'öÐ>sBmL£o‰‹cDÏ—�ÒáMSþ	T؆I 
ýl”ÏòŸÊo)éš O\AØà%FMjòµëÓ|Xñ@|auµÄ~þŠOôè„íÂ
k°Ä€
wp‡z ob‡kRm ¹6ªo[,ì°2ÙBêH©¹+#*!<ŽxJ¸"lB%\¬B;ÂäH#)„�%¬Â’š#9Sƒ'É�/Ò
zsz²C[>3T£æc4¦²…RŠ*ïáxºàI@�
™ž¨
°ùk
Ü¡zH6Ÿò{4K¸ÉøK
^DÓ,n…iˆsˆ…Xp†VàSˆ
Yƒ6c($ãÀ|=%ŽüÉ–8FFoʬr`Wdä°@“Niêð¦Ê\d/Ê3h LÎ`Ëè÷š#÷2NègÚ)~¯Ý�oM^NP�TP…þe¼­ÝºäCH†TÐŽsPUXâÐŽ˜Þƒ[p‡’ówP°uPƒP*Ql—dà N�=E«­Ý8
±Þ­Ã‰
XÊ
[
)}4é»S'Ï"3
f'ä*yŽ2y”'y˜Jy–_y•oyO~y™7ù™¯yî‚ùš·ù™'çˆQ_†v¸†óÒ‡þ|Ї\L>Eï•…Oï#Èô#à‡dP*ˆuCЀl‚6°†;£Xk5Xd Ktnò)ž²C¸Ïä!¨Ú=ȯ·h0‚ª5„En-è…6€ƒ7ðúÇ&uPû{Yà‡
€ê&¨3-(uÝ*Cäѽߘ‡ï
~S•)™–&Z’Ñ"Y0U*EZ†)ú¦òÞºo#ÕˆãgD
•dÉö$s÷Îâ¿}ûV‚
+vìX~þüýÓ§r>_š4mš©Ò¤ºt'Ý­«w¯ÞJ~ñòµ+xoÞ¼�ó5Œ÷oßÄ“4Mº´	òÞOæþÕCKv3çÎdõE‹%­8p̘•tfTZTÚlU©Ù3íÚ¶oãÎ-öëÙ”æJ�"eñâÆ�#O®|þ9óæΟC�.}:uBÄ%ªQ«—ª{ûêä§î›?NŠ²òÛçŽ_GŒë÷©Cyöë¿{ÿ
ºSyÎݹ‹ëùyוEöyõxûôÒ„8ñýã�ø�´Þ=÷¬÷NTÞˆV<áý£Nx¡$ E³éFÖYþÐwÏIóø"É&q5²e�IR—&‘Ô%ÉŒo½õØc=òhc$oáH#‘“èXc�:飑?BÆc“5Ù#”>V‚É#”Hƒ™?ô”fXë<ÓJ3¤•f‹-¥l1Ê®µ¡ŽJ)‰Y§�wêfZúäã)In"I#ŒÝå��*I$‘(Z(¢†BŠä¢�ꨥC2:)¦‘þ^z£¢™rZi¢š6ú¨©Ž~Ji¨‘¦ºé©¢Þˆ#Žz1*	(ÂÔ`
w'š%ß9иƒ–Y�äUƒ(ªxZû¤D_„+UtÒJ^1ûÕWÞã�:ÉLè ³Þ98gE*ηV}
ÆÃì°à®dXÃâ¹Ro_©ÕU;Â@&t)Šä�B>VcŽrɈ©\ÿÉ%E:*×%T"9°¬»J0Ž×%k”[|p¿‘aB‰9úÔ³=ôÐomú”98¤ùâK m¶FÅâÈ«²Î;ÇË+?ú˜CÉÚè8­߈´Â‡^&›.�4¦×Øô$OµÖ_™ÓP+6Ó_K]vÔþ‘í…õÖS�}5Øl—íµÛY‹-5&?Nü–$”d·-þÔ“Y´²¡X‘ºh9ØëˆÔ»O²šñOz`Í–^~ð:ˆ8³ÄÎYŸãž7¸V±“󖞺\é	`²]¥Ì3áøC‰Ó1ÞÅج‚á˜×Ä€á¾awÝN×Ý•äîï·Ûµ;­ó¥0eLnò‰4ùìnë®�ÅŽ.± iššª�RÃ-6ËÉöç£ïÙ|öé#
%˜H¹¨•ˆql#ýˆÍ*ÉÝ÷ïu»þü7o`
R�¬¶±(
)ŽQêš&àç$9BIn´#û¸F:ò�m|c ý8HÙ��xÜãi¥®]Í~K„	zÑZ+„9'çÓɆ°Zœ«œl†¥B‚ÐXšY%¯L¨'^��NôY!±PôÂÎ!ŽD:ëMçò!yØÃøæ0‹Ìc"S˜Â”>˜©Ìa&™Ælæ4£)Íg.Ó˜Ö,&3�©M|@Ó™ÄÔGêÂ(þÐpM͈™ Úô&ò±ÐœòÔ™YfIFJ<‚.z«ãþ(ƒHDF	~v”$"é¤�þÓŸz!¤?ZƒÖÑ¡�ÑA%šÐD6
¡¥h at 7ºÐ>énl
.X‹®1u(éUâ^yÊëífN;œVYÌ—iq²žòÑ“¹X¨ËÎD¦*;KXêCÚN„ñôŒ=Å’²Á‰Ñ+…Co乧h´Â¥9�/l13SÔ
Æ¢íŸ2º$ÜdÉS¨YDªPÃh-þ;mÖ¬Ñú)êÌjÚ¢•p!*agÏ÷³Ð¸ìe¨)ÅjÄOó™6·x2‡%
X—Ō冭9`w|ð�ž¦Ý b©Ðe½–ì:e‘Vž£¥ª’
=Ô(Ö4·ètW½J³û’Õц-Є6™I"Ôµ’K¨F+§MB�¨Fµ�‚ÁÉÞ
Ž•
õ¿X‰Xs,¢�äªoÍ\;âI¥(©‰&lYõ‹QÄ®®÷…WÅ2Qýœ%bñ‚[ â)�¯¦{6FÑÎòƒ­ƒt·½ã™-ìÀªVKÓŒÙÖv|H^j¹ó«B´vZ27‚%H

JX¢8–8%dw‰KäóÊtÙ]ßrcóþè/È[ÌÂrTpJ­/•€”ÿ?"MŒP‘)’$ I¿O�ð7%$Á¯ñûß2ÿ÷Åžñ-*Õþôe<®·…ºœwÕŸ WzÊ)"u,ÂâL¢]»ã²*ZRWÓë]'!Ê«7�ŽqZÊÔ=fÔ—5˜¦¥ÕՋŠ”Qo�èÂ
xÀƒð í?h{Ûƒð¢»eœx˜ 3Ç#sðÅÌJ��©DŒj�‰ÃËåÓ]pû
Ö0—KÜmP’y‘Ñšö‰O at bHWÎØcÅ$Hº
G�‚Ûy ?’Cb
7¸
Üé÷ÒßÀ‘^_GÂo\á�Øû'(‘ùYžQš˜ ød�I©kþ3)så
·Éͦǽ4…/âVXõžŠ«]è†Vh5Tž’ˆ¨×ïLSßµ–ª–]ŠË*Yf¦ {Of«yç¼_œþüîc¼Õ$„P


Hª
"À~®.e

ÆAÂÐ%°H6
€d-s:*%¤gHeÿ�À\
H+¨†- \�RR"ÞZ�Â8£
îŠp%rnþ$X‚|ê

¬XCÊRA0œÃÍjÄ0/4ì�!ðCXõ'
 Ápë;CÂܺjæ-'à3
�%äþd` ç$CÀR
!X4;{
�•à¢4‚ç"·ZB˜(€§¶*`^#ðÁ
¬t%B
MȈàÔ|
™flDK±Ž³4ȱ‹|üTäU{âhö&u…˜Î	—‹á$Î9<i™~yº�Å>¬["BjÀû”›v v«û�ø†k‰­¬s
B
¾s
€ÐE¤ ‡ƒPêÒ`@
|�+•&Ä/«M<űÊ(AŒJD).¸X$Z¨hCœýTܑǪT2Ç’G4©„8L0©„P€
>ު�P
GQ¿ýÄ	õ‘‡’Gˆ¼$,M"¹ØêàƒÇ˜dª‰/>y±0QËIŒÄ8Tà«Öd±Ž~zí±|~m«E�>ù§·§éã€×ËæC%5,LŽg>,µŸþ‹ää’'ëþì¯>T«jÅnqTpåùX‡;,¤­ÏQäßІ;öá’p„�üxÇ2€¡
ÌaÈ zCÈ?’û„päBJÄ„œ#î(�Iò†€ˆ!Ù�‡”%¢E„#êàOGÞ±g9ä#	
[h’Š–SGÄ1Äüà‹übG-Z´…8t‘£¨QT¦®,ž(a‡9*v쉯,eËðÞ'–á'TxÂãÇŒC½�á¥dx‘#žÈGUr, :¤"•Cª=*/€�d$‘7È<²�ï•&6‰±áñ1y™dûèINâïc|,hQ@~èCþù¨…!R!Ž]ûÐÆÔpu¤ÂüP0T1AZ¨�
jøºâ­j…$É�¡G-• D…5dW<’Á	m
‡ˆB'Z£Etb/ AC”ÄcZ6,\E¼¡d¨Âq,è	ù
�=$ão›CãBM¤�k$‚`-XÄh£Ú)Ž¡Å	,²;J�ï�Ñ+$qŠC‹ÁexDª#RZ–#Ý1c)UéL‰	ßÕ´�#)LM:ÒŒýô,GÒ)I
Ô˜
õ,Gµ˜J]ZÓž.•8‘8RT§T¨ÖRÅ©V¡ÚÒHðXɺ‡:F#h!˜þܪÛ?Ô …=!œ  5�Mdrbª -2Ák
æÎwÛÇ;Þq#€3$/Vt!ˆXÄ!¢HÙÂìÈH·ñ¾÷±ÔG|¥A	�cgÑï~Ïb–¯öÀþ­i#hàÿþ7À	ð‚õËà¯Á_•pƒ÷+aÿ^¸Àvª…7Üß{øÀþŽ�
lš~•±€Agiá�s¸¡F`CZ1*^"™ŠXF=Üq5¸mÀ�誅6Ä  p“J–Ñ„¶fâ‡Ø
/›Ð#�DÎ'n‘Œ64�œÐÂÁË6˜ ZPEÔÐVw HoîB’ùdî
ÊBúX‡)r0„1È¢¹×=h±Ea�ò-Ü‘	#Sá8h/¡a]þxËúÐøs/¼«uE´‡°F¦Û
+é}êêèz®Py¨¦IE³ðbÂÇÁ0©
Åðöl¯jˆ¿ðjÒ0§¾pyš§Wba†ÁàŒÁ¬Á‚�è€è@þ
’a2AJKf‹hÁÉ°	ÞÜ�ú$Æ>jkÚlà@
¤ë¬á�Ü!€á–á€!aëz�Óá2îd.²J(#JâæøA®Ð
“!Ô!‚Ánaý�Î
€AzAºAp!³RábKTAR¡Á¿O"Ö¯´Ê‚¡ã!
(¾æAŠr)uH�!ZüïÄa#Z@’!Ρ€èòdHGBH]È…!¦%@NâsX"?‚*\b²‚…&d+²r2ó#njsè…‰ Â!è
sx°‡à3=cS£O�ÒÒ !Aw"–ò
–Š-¾b”FkT¾lGi4`ôEk4æ!GƒþTHc4ÚaH�ôFcH�tG‘ÔI“4G÷AxiÊáLÀàdáEaÔ½bÂ^~(pÔAÄ?ôó†Ô¡Äi…bB?D‰T^´eAy?$s@°…B"”0	äƒ0^´%îÆY/rRBq@‚btꆉº”Eê_„pÿQ Ká’0Ø>ôQµˆ$pªÅ�$FT7@FÕTGdTQHCN•U[õs†ÈUcUVgUS5Uë£T—Œ ºK
–
n
<³qZ8ê&”NsUCÌI­6¤Zì‰$”åÿH»5U÷£>Â+Qwh"ê”@ß„Ju]ŠþtœVuY=ÄO!(@þ”%sÕ7U¼€P`HÔD}­5mDEC^÷…£P,)bBŽt|&x°G4µ'¶X–t„&îÆÄ�—’áPÁ
èˆXgBùD<¤#ÖT­ØÔ#ôCâ“nNVÖX‚(‚D>çNÙ”^Fnrõ[,4s(ô'b%n/Ûå&tv_C4Á˜�^OôR]Óv†V_&ÓØ
q>‡£Õi¯΄ÉÇ �zá)d
nÔIS‹NŠô&nÄT\¦åca"$4¢%ìeœêT?þÔAÉ	/£åPc^N×%nÄ%@0ä? `Åin¿4C×M�È&ÈkÏÈ¡Fôòþ2òõqKÄ�G%b´\3kbJÀki¡jahADp‹&H¤oìE$4È\–¥gÈgÝVœ4P7Bóƒ^زrZ6vÕJspˆG^¨p$>ïň¬IMÈŒôuÉôt†+DT&5}Á×0õ5özbCÙt[Çk+„ûôÁ)R>ÇA¤)45"Ó–Á¬AÅ
Ê
+‘.ïÖ‡nh¾aÏu@&4D$³‚T¡¸¤€
A¦Ån
b%¶B@¬%qÔ!GÞEl	BŠ—‚©¢p†h°z
]¤h"‡AŸ+‹DuS‚4cÁHlAiGáðUòÐþE¢Õ‡}X Üa´`µh¡Ft[æ�©@˜[áÅÌŒÀËÜ᢯°háܪ	–‹�¨èlC¢ú2ÁÿúR¦Â Þ!�X$,(†–e¬â�à`¸0Èu	]ü!†°å¸.ïc3ß!ðés+„�ÖÌBÔòhi/1äÆI\àƒöa�-Ä3!&3>g#Ô®
šNgV!Å5†ã+'•R}¡¶ÀjÀ¢Â7ˆSD¡Ä7–E“Îakß
‰kájáæa¨@6Àza[I$™R�ÈâA€áµ¤QŽÀºäïpÀzA/‡#€aÍ÷
«þŸw L@�¡
8áµbÎìԯϪïc‰ª¯—á¹!
C�
z
¨@[àêv êÚ ‚9DùŒdSù
[¡†ÿñy	wX	›v¨�¹9– ¦´Wu¹FhAâ6`L€Œß`Þ€
š€ªSðœò¤+*šà�ÀŠOh#,(Úà´`–®â4Ή1ë±!¯ð[šš
 Z·ªéŽ ãÜû3lj¿aÓ¨@
Ì�ŽÿnÁÏ�¾Áý�ªñ�Ϊ٬û,.l©@šInM
°¹°œ˜
–á‚줩@ã1Ê°
ná“Å
gþ
·At†ýñU™ ú ­7¹‹<¨Dr9©¡û#–á
8A²²>$(|Q–Á‰‹øÐö
J­
ΊÈL°°ª/ú8Aù¡ÓÞ 	ÖîîŒX
Äáîh[m
×”q
þã·ÏŸÁLˆðàÀ}ýIÔ˜pß>~ ?z„ˆ‘ãŠ\ùïņúReɇ+
zä=�?:y0¢Æþ‡%Mjü‡‘a§	J]è$Ȩ"d¸ÕêK§N)½zuªÙ³hÓª]»–]´V͘�ÇÌ–-AgFÕ¸Ee�:‹lL¸°áÈ+^̸±á•îö¨YöŽVY´h!…hõ¡Ô™~L¹°´@ŒL¯&­ø1­G­8Ž>éù,ÆŸ³!š.¸&Sß­Žm}éXƒ3KÊ<ÚäI™£{ÖFësgE•©ƒ£þ8“ëoÕ\«6uLþ0Æg­¤É�ëË— -£^¨¢ÒFÜÄòøóëßÏ¿¿ÿý	©#4ñôb0´¤ÂTAHM÷Ü‚Îq¦•@ÉQxYÝÓšZ+5äÙUEHÝMUþ9Èào:’l݉$ÑHÛévO%îD?:5˜‡+ª…ZG8q‡Ðh"áHVÿñ·N4±43—\v•’W|ùX’Xf©å–\vIr⢅5ïÔB¥,·T�:Ú|ãŽwR¡–á8Í2îÐT2:QÅ?ï¨ãÏOSu$Î8þœcMž¾#¡»]y�:êŒ6ÎhµÉ¶Ï8çìóÎ;.�#NC©}“ÌL?‰ø�:߀êŽ:©rµ•;îø&)A
¹C§;ö
öÎ8ß´zV¢Fm–°Y“J*´hÃ�5â t�‰^&–Ð=Ñ$ÒŒ“t5ãÞ�¼@}½ÊXí¹è¦«îº
J–L<þ–õr‹*¿½“Jœ¨SÓ‘HmÚË8…yˆ6ísÏ=k¶
ð�G1%o§ƒzZ<û|ÃI2îÜrË7Ó:´Œ*oªáÁ#·dð=·
ù”uÇT-šàZÁzá£!ñÕñeb©ˆÂ:þñŽE´á^À¸›kÝ`Šáí�
ÑÚ‡8¨€§=˜@1PEL^ª–k,B£¸Æ3tþQ]D£f_}²HÞúÚ÷¾l1HÙÔ 
xÁRcL©E÷Ú`
Y¨Œ9©úšûT§1`ü1Š@+Ù:hD!½Ð‚*Œ †&¸ÁfÉ Ï	÷ 
U Nµ;î%¡‘	]‚³ª@B&š
Ìa-ã¦(Æ3�!-haôƒ8åÖ†ðvXs£-ȇgNìÀË]� ¦#´Îp0ÄĬ÷í᪰[úR!‹6$Ï
Gв¢ÙHUVÖI­�¬�dþ_~@ãmʇ>桃%c40FJo…ßZÛº¾%�´±Zà 3ª0È:’ñ�Nµ±,óÆÚè¦oXãËÇÛÄAmk èûP™;¬1ZðõˆAMF©í&hLïû4¬�oˆƒÛîІ8zaíWÑâuÀÐF¯±í`\Íjâ˜É�0&Ïõâ­½–¼ie
ù�ã)+ÆÛ¶-‹eø»½è´ßÝhøcfÀÀD¡M&wX¼‡Ð¨EçºMy8ãâ€F±N³ygæ­“E2 a;`@ãÁZ”6Ð-mtªM5þù»·ý>S$ÜÙ÷G´»b
—AèÖ±#7>µ þ†$C&�-„õ²›�‹	‘éc�™[Ä%VñˆKZ2�ƒ½©9„âQÈRU�«ÄCS¹òŠG؈°ŽueH8OãøA±ÔLëo’ªàÞ’iA¹NIýNRb³ÓhÈñ0ÙQÆ‘ÎxJN8}=’}- †Œ^ñG<”ª“ ð#,VÅfÿ�È[$ô˜òÇ›âQ¹Z5§5¡×ÍMH�ßkÐ瀙Ô�1ñŽZgϾö½ô�êÍ®¦TÊÌ?âA2˜�E"ñ@Ò„r¢¬˜ìü£ù	ð™³�¿Ûh9NÛ
ã‡*¢æ¤(UÁx :8‚FÒ' ó³¤§ɧ6R‘¡þA+ò'Ñj¸"|�±2É¡"^‘*+“*GáÓb0]ºq~CRv×P×€ú@��a1p
cg.Û·ƒ<¨%3!SËÐke” K¤ÂqæB(dAæçò4fñ½AtW0ñ\3-§A…¢!?â„!b$R,¿qHX‚`*
úЂ_2~Yq¦�#¸ˆ„â}ç:1£|u7HA1!$˜C�u/x
í°\‘r;pE×׃˜˜‰ýá2Ån6U9´€+ÊÁÛ
ÒˆCˆ§‘VQ…‚áqIã£È1!F¸¯‘F²þ`ñ%\Ñ$q!ò9r0óP�V¡k¸4Èþ�‡#'°1³�)œa8 b±Â²Â"Šˆuèp?'1:l—ƒÌ§‰îøŽ‡
(�C5µ0„↧â1^´Ñ#Órx/R0ŠW€ã"�L(�¼¸¸w'c#[A!M‘T,Aˆµá…¤q€œáw‘-!�è!˘!&#2z•gÄh!AE$}¤¤»ÈOh2?QX+q·6tÚ€(€È6H8*…}ð˜”J9,! ü¥6Eh²5[A69^¸�Ö!$rø�Má…k¸‹"^Aâþ±Õˆ"6q†6ò#¢a•P
­a‘¹"#©©‚¡‡€ó‘Ò¢€hs!±ŒSñ�㑈ü—‚‰‡zÒø#E1(aQ!ÈuwÐ"�É°ÄŽKÙ™ži:¡vðB%óÒ—ã÷˜÷�Ûq[�†ÿPïp@óµB¶É:ù ÄèïT½Éów«ˆ�²8‡¼÷ww|21~•ò„ûPo!´‡+'H+Çu’–ã—!ã“Á#B+‘|rgÙ ñ&6ƒ½Iw²—‘)´Ùw;#ÁB+Á2Pxkü0¨›<2}ëx‰ŸY Ÿâ Ë@|l'~-¡þ,Ô6þÐw ‚¹m¾'9l4÷0íÀ	&(#¹V“'‰ø«x’³Ùf@ƒB1óV'égæË 
(ª·p)É�EÑp1G&÷Ð*Ã0´à3¸x–yÑBl\ó�Éòsªx-[(›"rnDt×#S1½�DA~´›=y}I¤}÷I¾#?ÓÓ§¥µvÚPF‡�‘À°ŽóEvú§ðˆûE ¾F9
ò½F†VuÙÙ—t:“Ó³B&×µP5G€¼Â9,:~Ö³BÞvpï�qèf
3
j
Zõ
’
ôvòªupТ§ùæþ‡€¢èpò²©€aËð
µ@¤çPO•Df5Öq!V”£
27lêðLz$™ §æ¸TÅ
-œÃ9Á × /U‡©Å
qV-
Ú°² Á 
ÄE@[Å:ΤA©ÓÑDÊR´žëGþo`
?7·`ñpÒú䪶s²ð<Ú�
MÐ5ÐawgÖKþS‹�:Çûjà
D×`¤%©�	|&DÚ Z´”B@ôc™ XÏãLÉ 
<t5æ<j0@öUÅU´G°[ã ¢HÜfïd=n 
ß0>zÉrB{kcŽ—r¼½@Ur”ÍûÆÛ·Ž³kÒkFü ¦^+UrÉ0`š	аnÐà©Ç£™P>4W|¾ÅÃoÀ+%ÔKÀÀUW›	Sö8~Û²T–
ÑóW‹Ô`
@EAßð<½£V¬³ ñ
‡T&={pÁ oÐ=þ£
�C»¥P¾ó´lƒÃjзM°È—4¤$;T@ÍAD\üÔV7ÌZÖ 
Ó3\Ÿ”’A$D´Ayr)¤…ùWkqjA飑QÉ™p|ÐXÞ÷.fÂf¡Èè
/€S‡:†2¹¥�‰È¨·Š%Òa	Yx"œ:ãob~=©ó!pçA6	,}©‡ç…ƒ�¦w-­q‚¸�Â1–Õî€1ÒQ’èi‡aÑA…TJ.w¤ç£ÈÑ�?qŸW‡…T~(è~?i§i<
Ú´¦â‚ÞEÂ7 £yhÂ�&aÙž‡‚FÒˆª±“sh˜’)á[äÓŠñ—ˆÎé¨sç–<²/ˆ‰–ü7‘­˜xø¨"©HØ‚2‰çC1þw*d©…²ˆAn0¨Èèxˆ€gx”Îãcq’YvÚ€Ó—RÈ;.}ªƒƒþìIä‘ÑIñ€ÚÃ�
EÈ‘AB*¡á!L¡4ŽZñÂÈšƒò)-(ò‡eI󄱡)*Ø"Q�9¢º¸…SÞŠ'“ÖØ�J¨„ÝÑ‹)Ò�r0BÒ79‘Rx|_>“°Q€M!mkuÊ
•Òuÿ
Áöõ.ýWgƯx""P_ú�N^ÙÚP)ʾ§Ì®¼¹ŸÿÕ’vî–‘2
'–JqK§Æ�[÷n޽׊TwHMÆZ5hÝ¢õOß5*&‘•TbI*FŒ¤âÏ�
7MvhIFeˆ¡GbþP‰aè›x#†bh!J²aÑÓ]Šö=³s~þýÛj»E›­jÉ+ÙÆ*Ë?d°A'âÇ�º q§¸[nI¥¡u8Qã�aì£�Ÿ{ÚPã�ð¨ÈÄ”#ô¸EÁ´¸E5–9â–CÚ°ŽCšP¤�è|ÂÏ-ÐZâ(Èü(ºíA%”IZZƒ(%Ød£Í¶%¯Ä2K-—’IÂã)®–ÿYg	6°@wbs¥}vÐæœ^ÆšCʱ—6´P¯�L’iB-dá±
*8Ñbœ}D"ª°ÑŒŒŠ>¡ˆ¢´*É Ý2S·$‚&«wšïÃB0'MOE5Uß(ú‡®á*ë8‚Šiþã�TÎI%˜šXU©�&ÔдiãCµPÅGf¦�xš€Æ5¼àZ61m+ɳxêZm•ªTUqÙ@mƉҡ)ê2Ôqß…7Þª$rG8hâùê8U6Úgœ5ÝéeŽ\RÇšdÜi(E¿�æwÜy‡‡þG̬ÑÆu ¡‰@y?ùÈŠ³rÍãQÅ"ËÔ�WfYÜ�½Ìè°0”¬R“ÜAê'�Tê(¾Ã:ct¢xzƶe£�6«É
›,]Pêìlž/��$ûî†\í&ŸdZÊØØ…Z¥È7眪…Ô¹ú½
8PA*â=ÐŒ#j0D&8Á‰e£	†¢…31Uþ4¡’j BÑ!Z(‚
��´b0´ÁQÉ\!á&*ÝÑ¢Õ’D0#œŒ<s_ÿ0Q>�uYƒ
šÙ@6PY¸ƒ½8i,÷dˆ& ¨
À`d ¡dÐB8Z ©‚ÑEhRÁÒ-Ó†# òÉê;�¡5
 {H…´@vaÈU…d/š0¡6ÁFZ Q2¸R¶’x%oM ›PÐ=pÈÈ2D(� ª*"Z؃–qˆ

#I Ü“ÄLÇ΢‡±D®aŠ[`
ã`yÎÐþWí~sØ_ÀÅÎtkV½òëó–(EþJ‚ƒýÍ�kÜ]
	D‹
¶%Dž³áÁO)�(£�
ËÒ‚©¢%ºª{â1
z-‹OKO(b˜…€†að%ÔA²£�Áwx
9¬ó¢ ‡±kxq:h€†^þx˜d`˜DuNh¸…S¬3Š	R/ªúÄÔLÕÔM�c=ø¬?Z8‚Û€
X„pXS˜5
žœ™#8‡­
Œ‹…—
ñ©…Oܦ€Ìžq0C ìL¸†w(NÐáoÈìqf7çìþk÷�• P¡=Ž3GHU8„¾Ücà2.…œ×ùRˆ[ØùŸú ú¡'ú¢ÏyAØ‚ò?ˆ…Dpæà¶q£—ú©§ú¢'ãèî„|@œF™¼
rDTÉd0TÖ áDtƒ¾Õ†bX„Rg
×ajßR•ïVÁ¡á`Ñ)ž&:`¸Úúc0.à‚3ØÂ'üÂ?ƒ3üÄgüÆwüLJ|È¿‚ȧüÈß.¸|ÁÏ|Ì_üʯüÉüÅï|Ï'}Çß‚Â?}Åç=
2LäÐáˆ'F4EÐ"ÅD£4Žj5ª“©bÉzõVØ2`(U¦\é²%L–2_ÊL™,%Îœ+cÒìÉóçÌeÉL&+jô(Ò¢½Š+f*Õ­[PU¥Reõ–U«O©šª…Ý·¯èÎ}…–l-*mÄýkë¯-ܸrçÒ­k÷.Þ¼z÷òíë÷/àÀ‚þËoŸºCj Å£ãV*’%k‰Er“0–ÅDáì™sš(Z´Pþ!mz²eÔT:o¶lyѲlܸ]ã–M6íÛºwßžÍíØìb¾¯i´qßÇxgÓÖœyoß¾…_Óóù3kΗŔ¦ÂÙûeÓ¬W·ÃIg1aº›cú}iø£ãÓŸo_¾éÈ”»ó?}¿>~
øŸh¥¡…{*8Z£�¦†ƒZ¨Á�gÞ)h¡y
º†¶gÞ„jìp{¨Ó?…©¸"‹-ºø"Œ1ÊX×>ÿøãÎj$£Î-�Õ0Ç3ä2è”L1ÑÔrŒJMÕR0LÓTqųL1Ã`yÌ”Sªä%NM-ÃÍ8ï¼#Ž8ãŒ#Ž;hºóM›n¶9Ž;q¾£Îšþlªc¦:íàyg8á´ÓN8gº³§;ïÔyN™†ºÏ¡ê¨Ó&4ËhÓ0µ�TR1·…R—V~ùe•MN¹L‘œÖR‹ª
|<òÉ+¿|Œ)V�ã2êÐRC*Qãð8åŒOËjrCh8ðÀƒæ7dúN8}
*è7áŒ>øè^æ8ç¸h-·hóÎÎ6â¼3Òjä3©õÌF6³‘Ïöq¤ý#EþmQÚÏ£3žð0äÙÿñi™f„jÇûÔ´ŽwœÃO„:Ü;Ê´¾@JPeB‡ûÖ¤¦lèaÚSÓüPˆÃª	Ûó¡ø¶§¦î�*ÃqCxbáÓ¡�Øí•cŠGT}H?"–ɈY¢S(ÆÖ¡ƒ8©pC8l§Æ4Öw´K;°|…vaÁ:Ôñ9Òñwêà¾Øâæ²�†<$!u†£Å¼£G$ªÅ2v¨¢ï‰Þða'‰Ä†°ß@áQôm2„ã8F-†ñÖÅym¹]Xi¼Á…•ü‡Ò2Zê,.°ÔÇ;ž”
t€/„„þ%—I<½„÷Sb�XŽrd#Ç
´ðÖ}¿–åâŠÌk›�Ú@8³­­¸fë[6‡
Tc•:»Ç8¬!

SÌÅ=©ß\²kDr]þƤì9Z—;ÜÀ–DûÏÒÞXw«}ݳGëº!Ãñ�Ev­¾š¬íms›EF]äŽhñSDáIZæg*B2¦¦è�¨ÒƘþXínÐi˜8´ÐrBf)_ûRÙ@g$�:Ž6¨¡
·ØÇ;ê�4þÅã¦XÂÕq]~´)ïˆw™ŠpŠëá“ñx‡Íøñ
5�|“Α¡

vw*у†ÇT‹§DWß][:âæµJ�”7�·çÂïa¸á¾æ0R‘ŠL<\%·
m,%œ°Åû&n�ܘÀ†o?ø¨àr1j‘‰T¼Û­#£M¥²Œ*Þ>øÁ³y·s,õ`,¹»™ØÃhõ¨ã9ÔþŠƒçwÓ¥´¹[DZ&*Ën3¾ñŽ�¥ms¤
Å Ê´éH÷0$A—߃nñª†u**^ªR1Tþ
«eÜ¢5pººéžïbDŽéËxÇ=ÌTðepB
ß a­‘¨<½	{HúÓÅ‘ŠqDeDXÑß¡—Q‹TÔàÞT¹½?–±ƒL‚
jpÜ€¡†=Xã¨å5S§ÚpŒd¸{jÁ¢Ða,5,*OïEþh‘
1"S

ªà·
—Ђ)\�èÁ1DJÜBWhCQàH!‰„DÝÅZ 
¸ÁHq ¬pɪ\Ϫ4ŨTLIëµÞ“,þÍûy`•ô³­–´=Ô†…àÁÑjÑŽ:\[¾Òã=!:Þ9(F24Få5Á¬,Ãþ1¸A
´ÁeèÁ!¤‚ ‚)pÆÝuˆÎS¤ÜLÈ"wl€)dÂe¨ÁH¡Ê©¤Ä1,B*X;Ì<Ô
º�6¥ÌŒa6�xe$’Ð2Ô
5E¤Ä0”˜@Œá,Â" Á
Ô@*
#¦AÔ
2æ!þ°¥HF
CPŠÁ•`ÉŠŠdB–tÉÜ—,B-¬
ŠAŠAh4¦ü�¨ÂL&eNFAr^(6ALV	G¶<ÛêL›êìß}…F~…³9”íß)!¾Ö¾ˆ¤{¾§!e×jÁŽÔÂBÉH½A6r†&fèA5"Á"Èa*䀣~AP
¤a-Œ€)¤Á„l
Çõ¤�I1 Á!¼ÁŒ@PÁ¼Aþ5¢Bzä
0\�©¼Á"¬d�8f-`i]ŠA 
glaWš@âèÁ04§	PéBAä@$RÁPAd<©LÉFäµB[ßñØ�]äß!G&’-|¾*¬L�P\ŽXCcÔ@-`a¨´A¼&W>gORA´ÁjP�
tŸe j„Æ!Ô!„ž ¨

WùÎzf[¬†­ØΈÎL¡Ž¸C˜#®* b*¤&@BEÜ56¨¬�h‡­ë1¸«'Òa
(h
¡ÞÆzš)$ÃÝDLmÌ+xß÷Õˆ=˜llØ8xCšeÃ6ÄÆÃd7Çm„�Ö¸X¹ÏÙ8Ç_¹˜•¨à—þ,ƒÒÙf&´�Ÿ�¾Šnš‚)¼á�†Þ©`Þ2éÓu‰)\ã‚èô‚#èëø�8%@êæ!,‚è
’q1dðqþ‘T¯:\Ã1d1“qk!	àH•+‚ä1— ¾q1NGîbžmn±õ^¯§ùÓi
žE>�é/Ž‰E쨧‘5!l)°!r_ôìƒ}'í}±W/èDñ±¡DQHrò’,‰oR1q Ç2@ƒ¤B×ÀŒüŒ.n¤Õ8¤�aý×ôO„9WZµL8hK©	èâF½Ô°wO¥Øå:Z�QTŠ·„ ¼=r#É%Ÿ\�Á‰ÄæÂ[ܨ#C’· 	q Jâ!¯¹Û溕§Á†mFÉ-,ßD6Gq@ƒHh³;óœ8ßæ:öB83æA­)¨þÎJí´�Ã’'î±éàQ
³êG"²B/ô\8�8äH2 måQ�)
þ¦Q¿Ï"¢7z›¶Ò7}"ÂwÓ£÷!DýÔC=zBÔg½Ö[ýÔ?ýÓ¯ö`ýT}×�½Ù—=ÚŸ½Ùƒ½Ú/=Ó{}"¦½Ü«ýÜo½Ò�¶×Ó½Þ£=Ü—½Ò“ý!ôâØÇ}BàþÞ#þÔ¿6Û#¾ÓŸ}ÜçýÜç½ãÇ}â×½Ô#ÈRœB¯†=�ƒ=DþŽ¶è›¶!0½è÷i¿6è5~é/½Ø‡~Øã£~›Á
d~ÜÉé>îÛ>É#@†pðŸ±'¦bí÷~‡
uÒ8hÕÉNúê¡Éšg*uU,`Å
Q:Ö¬DªŽw„AÿÉ‘®êE¤�zÊHUå™bd¡UA	VEºUGz¨j EÅA}ºþKg
u—˜z‘…ðä"jÊ*¨ªÔ$š2 íãjðéœ
ÆÒ]6È[4u“>Ð…uÐjNP½©º¥#]¨¢/JÓ6oY‹§ñ‹¯š“š¢É¦ÀÞŠ˜ì¼*uÅÑWõ*šºêÖ+m«¾ÚŠ­Æ
Ó’P¤�b´á@JjP4«tthÁ±"5P11ã¥o)‰¨Å*”_M‡+’Š4ª''4ü	Ò[¹ÊLË2ÝOa¹R^u6Y7Ò§»xÙÚQ¾ôí,Áþ³Ø›^ˆ¨¶2)¢NŠ,yŠ”M\ú)Xó”Ø mʦ5’®<‰jºêªRS³J¬ŒÖ:JurF­—X‘[Úœévž
iLAiÚ‰±½´é•ùÃ^H(¤P%r@<'}­¹D´loS·ë./qw”
lHÉì+ôò¦­­Gñ¬Û�“l"˜ŠBdÍÙÞT”\±é†uS]ñmºEmôai›,,7UÑû¥óœ¯gO)8ÄIÅ0�ûŽTŽcªæª®1Žu°z¾
¶£xîô­ìUî½äÂ�{œ®v@
Äd4TÁŸ˜/l’C
0ÕŠÁ
ô€Eö@šàö	Â
´#ZÎÁÄG®a*ƒh�
$,ÜÀ›¦daH
Xolg$¨€=´ƒMž‚Õ’cb®¡ðÄÇÄLA¨ 	d�3 ä:¾¡
N
q8âY4‚`�ùHF;Ô¡
Lq „TÁ
TÁYô@õÚáza’¡œH4KÁÔ 
P¬
La‡î¡ÉÔ€F¤®P$,8ÁÍîŠAÚƒlT"B8Cpjj
	ë¨
��=¾A.bÃjA
�ôa‘O©ài欪¨Fìš
•l¨@êæfE”¬äºèJþÞ««ZtÑË8²J¹ô‹ýþ¾/ç<*áb.«
(bÜ€‘@üéö.Ð
Ü ¢ j�òBÑ
Â!L��À
á"BQçAôÀŽ
ÚàzAþÔ@ær !
8Á|hÁNÁB¨ 
L!Bh!9Á+ãÁ!
ÆLja’!
AzÁ"’á0²‚"×.qŒ†´€=’râ›à,_å�`$üIü$+ªà…_ªOWb,ý\e•ˆ±¹‘»kÝ’ÿšÕ@Mâê^nq¤ºÍÿäïš¬¼º‘–¶QÒR®´’±Íd®ªæJãتú«þbîß.ⲋÙÐïXàEÔ®ìÂîa{à1�@š 'Û`8
€ä@.ðÄhh�/¢b Ñn
	в”Ôá!gPÈ°
Ô@TÁ|jÀ� NoÜ>(
BþR÷@
�
Ô@
’¡Û HXrv G8�
±{ägaÃÀÜ€@w€/y’ÂÀŸþ©p GttòÈS
0Ы’+k¡�^À
Q.r,­ÒTo®A
!U*ärfŒ)‹a~tr	·jS³Ä€'Û 28A3Éð"	îNh�,O~Â`ìí)“Mh�b€Å
§fJSꫵrÕÏØíWþ€nÑH8…•špŠÊƯßÂÓã,éÊ¿ØìÏRIÕ"LT 
v þóÀ-C¤ÌUÀãÐñÖÁÑÁðz�
!@¢à’üñ6Ð}tjàŽ ÃÄô<´´àJIÐnáâðD¯ÁO	&F´`ÞM&•ë�à
òô¢à‡¾PÔ­Ú!
!Ž’
6P.k€PS
b`T`QZ­`.°dÑ!z„Ä`U ¡
Ä€’!0R bèAÊj¡	^1­¢ Ùá´ övå)©@¯Ø�þHC©`¨@Eoa‘@õ"ĹÂaŠq at Ifä- û®n00ÞpùbdÜ2�Jû”s±ðLs…ûØ1BÆÁšŒ…ÕdI–bɳz…Æ2/uݤtKdt5nt‹-¬œ«W�*Ö„Âî‹y¬�K7]éüšSä^ÅÜŠ¥æ~—ÎMžê…ÜD/U°n:ݓ΀éßVË8ÙÑX”Kûtå>¹Ê{¨ÀÚ`R±Èjt¢ v
`(eÀJR}àôà’Á´
ïÆgS½ÇÞ0C{!¡
´�ÉB6HTá!›€›þ²‰01
šÀ$©À‚æ�Æ¡`ЂDÊvà@¾�T”KÃ2F“4
*cÄGðåGJÅ`ð0„!Ñá–á2AóR¡
–Aná9!0-ÈÀ¶cÿs’¡
^€Á|l”?¥lˆ1sBõ`ÀG2Ãਠk9hE9áÌh…2áôP¥`E$Ãg@½‡3)sì�H"Þ`¨(¬‘QEóFÖÀ
Ï~	Ï>N¼¦ê¾.™
˜ÑÁ¹œ+’YófMóD/’3$•7oÆfŒs…ŒtiäN<d—¿e`¤‹™+*ø.Bf,vc©žvW”#Ä–îS
2
R¦Æö’Ajáö �
áRnÙD(Ñ¡¤,×ÖÁÉÐâÜ�
µaL¡:ølâ0C®¡ý§Ÿ¾0&±Pdn!Oô@*a¡†ÆDu”
ZGÅ$Ø©8ÁÚ¾a$ºKaX	‚
BêP¢Uá<Ðä ÝN¢M:§r2AzÁ¨o¡¤Ñ¡dýU˜"úŸÔA0VåT!×ÎÒ+ïá‹I“5îµìJúþleÄàZòz�ä@Gsíĸ%§N!¢“ÁËna;zÙà¥-Ê

‚ípÇìOFrJp3
„v?wÖKµ¤“U¤³òåBˆODιԌV‘Lûˆ–Ôå_„+ómÆÆm…—dóf­uc—`*®Áx±¨6ê_0	›gMäPdÖX÷™)Lê¢{— ÷W(¬åò‰[ý.–¡ÁÞAêjK«.dðʹäDní^©»S¹¦œ;ËÜmNÚ
·Ïá–UìÛ”ƒCËÌ„ÑF:+v%�µ\¤T
EL×DdìÞaßW—ãí¸ÖÊ:É\*ÄÒ¤åÐþäNÒ„AÔ!
|DZó« ©CZ$`|ä´=I at lìÄÜ�ðšê�žf‰�DÖ ·î!ÙPŒ–.°Èí÷ZÌKÔ
yo%LJ„¿ãÉ”y”k²îwâ‹ÃË“ÉÄ á„•Ø© ^×—d¾å¼kÃ,Ó
~9¤4j»mܾA½
-¬*.B�Í°ŠµXzäÄÍmÏËÙr_CÁë¤ÖyËWèå÷°Bö¼—o÷XÚ�ð²yЛyù.äRÏ¡~—Ù{­µ0dBsC¤Û•4lÑjÆ&Mæý;ùop¯¾bñù^¬Á$ÏÛ<]ò^LôÂ]@(̵	wÏ9®¼1=ã5>ÿŽÉ¢ýÓá³Ó‡í¾ÅŠBðÌýÒ��LÍo9}E“^J»S©ºYªæ9~þp1åï�þ‚íVëäV÷Ö蹑;þ–7}ãk=F®DÐj1ãaòáëóAÜÁöaò
Ùà„ò�˜Ö¡Ç1DþüÚáÈ)È©-ßaÞ!lNŒÝØá„œîa<ôžîí>ò~ï¥N�ƉÚ‰•Ò~­øãíÛ~øþñyoœø~ïù¾âAÑ{3Ð^�2íYÉÆø�l,èáÜÁõã�J2ÿîô×aÌm„óYÙö^ì~I̾íùž†Øíí~J„ŸïÏ�*N˜nÈé"Ž\ÌY‚ô­_¥¸_О÷Û^îŸóã¡ÇÕß¾Ë~öù^ö�÷"ºòÕ^êà$ómŒ÷ìÙ2Ÿ•È	C
l²©©¦Mzºf¡M*j›¡nj*¤©Žºé¦w–Ùg+ˆúi•�®9+©–z
ª
¹Zjk°4h*±­žjj§»bêëþ“¼6Zg£În)-—\ª )¶Õ2i-´Òª€¶1Ð
•~k¶+¬kí
/t¯¬�¶û-¼á^Ë®¯¦;,»ýúÛï¿ëöë+»ë\°Á
ó«pÃëÊj­º,0Å
·ÙpÂç;°Ãëλ®
Øb»Á=‰r�@ZÀÉDPB‰A%” Ã6AFásÏ?÷Lƒ<÷Œ4ÒGíDÒ¡ACG+�eÒH7ÝsVÇ)4E
i«8ì«ù¾\¯Iô©¢Ï~éá¢+Þfâs¾úî­¯Ù¶æŠ_Yª
1ØŠl°¼‹j«©3'£‹r%õ‡žÚ¼­€‚¹í’ïRygžžB:
å³n>ë¹¢Ï>ë–¶�þùð<C®ëÖ�1ëå;oåç—_ºÔ‘nT¥+`
pV&T€­óû<@Ë9Îk=óß¾dÐ&ÿi-i/èY
‘vìiMUçóœ÷ÕC¯5©ZÛá
º	N]¢
^ˆªE¥*NϺӳþ§X¥ªQ‡ÚÓžò=¥«PãŠ×¡òô®@U„_
×™*ÂN`ƒ[ÙÀEÈ‚
3P+EÖ	F-«MëØËâBsPœà…9V¯•-­iO[Y·šV«¢`­VµjSQ>³�j�
ŸSG’Eom: Þ
7·²€-lc[YWÈB¹REenQaaSè>·¨Æh.Q¥KÔêÕ¹Ó•v—kTì~ײ¦õ	0ð�š©÷¼3«ÙyI�Þôά½ó­`	*p_"Ýׂx�n6K‚Á 
F@
--- NEW FILE ---
GIF87a€3çþ
oÔ«™¬Œ÷¾M
Ov0ÄÙ×ä7B§ýÊf1#\ÞÂ6´¹e,Uþ­‚Ú9œçC§9�lØ3šø|³ºYjˆM\ùÜ»Û��gÆ»üœV+§ÉOv¶²ÙöÔ'¿ŸµC\ÝK£÷ÔÈ»5º±�p´žÙ8Ç7Ö1ŽtÌ£õˆÇ=ú±�€¼£ ù8È?2�„L¤!‰ÈE:²‘�<¤$9ÉGÞ‹Ô‚‡5HW�Óµ‡ÖHIªa*·¥“÷º”×þæÅ3^
p£Ð9næ·°a‘m`‹ÚÜBG?#V±‰'¬Ÿ*Ñ÷*»ùl–ÊCfùv¶F,j+fÊì]ù¦8ͼMkfFü¢÷ŠØÌ�½²‰Æ뢴 6ÍršóœèL§:×ÉÎvºó�ðŒ§<çIÏzÚóžøþÌg=�ǯr�î(âø¤ê
R
c…�—Ô¤ZÎ~µÍ3"OU°Ú«ÖqŠbÏoiS!ûä§5§¥Òˆôz_ÌVé31‚s¤'¼Y)ºÒ˜õ°v\&,1J>pÆWkþÜ1KÚét{á„f8¥åE[.ÑnàKª—zT¥6•©H…ªS£úÔªRõªSͪT·jU­v•«X«WÃúÕ²’õ¬cM«X×jVµ¶•­heª¦,å�B…ƒúP‡êFy¬÷ÝŽ‹ƒShÐÔ—¾{­qpñ
ÁVEŸ¹òŒ²k^_¹XQ`2�_lÓâ9úöqé‡3mÛ±Æ÷>fòôfº"F�ÊB+®óŠÊ¬f5œM›rx‰9e&NeGF˜ò®¿úŒ±ŒgLãÛøÆ8αŽkl`�e
¬‡:E’hˆðµM›¶Ð…Sðáy->ÛÜÊbj­ðRÀÊ©Ú†™±Ž–Æ}EÞÐ>ÝÅ´&§þßèfË&‡®oÈÜ”Š)üEó½–‡>ÚÕ~%3ù
›^Ü[øä§Ì¢‘Y‰;N´¢ÍèF;úÑ�nçÐà1:RÜõ“ôMB�gÎã­Ð”^”Ù¼®A
G˜:Øøôù�ÉÌš�1¤8‡¸®)3`ÆÎVV-3…Zf´-©Žè÷ØvCl@Â�o+,4ÝY倛ñ¼a
oÔmÉ¥BŸÑx)n­§Rk)Šª«•Þ`G7®Q¢-ÒðŽ·¼çMïzCZ[£{ï‚J’ECõ“-ù´|,Ykù¿ÖpP0�	Р
ÖÇ„yu,ùXŠ^Çr
ÌáŽûZ܆–‚ß™þy¨6¾¹Z\å(°´€öŽhë(
Øwi°�
Z�xìB·Ây±Oãí¾š…¹öµ[ÎoZ¿—Íê`‹§ÑüzG5ºñJZ[
àÝÀ†8f6a£�#>aƒG9TuÐDh
að¡`ÍPŠJPU€2àuŽ uP hÀ©6(�l
hð³¨nàã‰�
§Žáâð‰0
˜?Õ
IPŽÐpé
ç w	å�ƒ(“‹¡›„?—ì
þà~ÑðZ°tí
	
 úŸ: ª 	Z 
º Ê ¡
¡ú :¡ª¡ZŸËä3C
rP™òˆ×–gLWF!féMêà4pB0ÃѦ1Ë�
Mˆà¤0
Áv5Þ€¯Èà
®(
#àá(’h
ÀR(p›ê€
©@
!ø#`�ó
þ¯b)© 
Ž=4
uFB*ð0Ž
h{ÒPëФl 3(‚€
ðú>õ@Z°3y,ï`ŽÍ 1†°‚PÑ
r ×Ðþq)‡›²?`0 â@€Î’³R u06«@´B;´ùtREÃ
î
ûÖË*$Q~UuEÈC-As‰hd5í`OÀW4A*Ñð–2Ž
0	Âv_{U°%»åà
¡0
ñ
Ë€móx±?ÚȒPð>J
†�©:7·¡)g@ {ï—†›’‘X4Jˆ‡½�(½Ð;½Öþ[½Økˆ×«½ÙK½Üû½Þ»fÜs«rÇA
Jð’Ð`“�›ã0| 
ÚPQÞà
€
±k¥*ŒÉãˆ
7§
-ë¸h0-¡z_Õà`
ëpº}Õ*¤
P
åË´ô¥×P44làÓ`eu3ã=gTËÀZ°�Â
^@ÂÈÐÄ€
â
# ·»�ñ˯)Á@<�-[M*#Q›è¤å:
�Y<
2À¦;³¨òẙD»Ñ WY@ŒEÖ

GP@‘à¹â©¬?ÀU0Æe̶PpZÃ#5]ÔÑýÑÒ`4Ò-Ò%MÒ �þÒ&�Ò'ÝÒ,ýÒ+Ó*=Ó.-Ó5MÓ0�Ó6�Ó7ÝÓ<ýÓ;Ô:=Ô>-ÔE=ÔžõbiÓ7p'
s÷•™¶¾dcK`cKØÔm%w<¯µÒp€aP‹© 3Ö�€

l�…ðð—§éuJ艠„6èl ŠÍV¿€€Åîà!ɨÍ3o͸w»XÊ£Ý
Ö†SÞ
¢ˆƒ¹Yµ©´øPQíà¼ËÚےʾD[äF~äH~N¨’1ädýÐõ½�Õ0<U„KâZÞbWÎÑ.ä5¸";l;ÈÂsõƒ22#8›œ35Še"4²mO�
ëÀ
l@gàW²¢Æ4ïs×ðŽ�?¾Û뽬¾ê®Þ½¯®ê°>ë²^ë­NëWTF^d)倡pÞðBdJ
PnÆ´Ô[V>Wí[s3|¿Sy±òéó^FCsËþX¤>À²6²Ò<,Ä>/zì°¨Ý„>ØÊÐÐŒêK§·d^a€�S¼Â4Ý.g´6¡
¸õØIã£$I5y I^¨.äNnÞzzóΧϞܸY3ô'7¡@�bjôRpF�‚ÃV+¸©Y£"ņժOlÝ vã–•Z å|ZËjíš7s>Íb3×�(R¤ã¬U
Ú­êO§G±a‡ÍZâªP½a»–¶lÏnfᵦ÷ðå³’»™þwÜ`¡p£rõêíÚ5¡iËIª6lRÙƒ�]wc¢iy[µ
Õwp²ƒ�‡½<6pÚ»›×=\¸óéÇ‹‡~|¹ò仓çþn»vRåi{Ï®Ž=·ùìÜÕz?v|ÏùçSï­Þ¸ðõîµw÷-¼çÀ«¯¼êÐË·ël¾ÿ˜›í1ÁãFl¼HEš'¸ùçyª‰I	iØj²¥ìâ
/TÔ¢E-T„
-V”F_ô¢E/¼ØŠ-¼¨Š0j|
ƒ¬È«Ð¢Ç·¨"J_„RI*gÔ"Ê+·xÂÇ&“ä’Š$cÜ¢E(Ðh‘
-¤Ð‚
7ŸøRÆ2›ŒþqG7盧LƒÌ±I«@#JÕ¤âwü1H(ºtóŒ4Ïð‘I3}RÇ!ÕÔâ‰-Œ„‘Æ,m|ñÓÍ|ñÈgT1ÈPWô´ÇQGuUÆQC•TÖ#IUFQu5uÖM]5ÕSYU5VTé|UÎ[ƒÍ×[id5Æ]Iå“×R?
ÖJ[[µÖn­­õØpsm±ZjAýÛmU]WÙd‘µ•Îf™÷Ù:aì\t¯eUmý•ÖXoߥÕÙy•…²S/ýc‹DÀ¡"C(¼©Gžu®á#‰™–ɱÏ™,³ŠeF&¹di–IIšfN^¦™‘›q¹ähLYåeRY†å–��™ç™[þ–yæ˜]Žùd—�q¦ä‘“^šè–anFè”Rq†êe˜V9ižQÆùg¡aÎùh Mn籑Ž9éf˜þ:ê”nNg°ÕŽ™ä¹Õ&™î§yæêµÿö»ïžý&Zp°¡~Ùo»üðÂ	zp¢ÿ6pÉûÞò¿zqÄÇüðÊ3gœrÂù>½qÆGÿòÄW½sË—|ïÙgï;tÖ·–½n×mŸœtØY7½ñÊ
ß]s°#_žùÉkýó¦Wšèj¸ÁPÃrú‘‡k
‹¹¾õÅ°ŠD ûHÂõ
‘Š
ô‡
	˜M;Êñƒ-é¤ ›ùD%þ²™?Äà³9Mp–S@œ`[òÍNöQžÝ4f>õ¹O~~òž
üg0û9P‚Ÿ
Yö÷Çþõ/ñÍb#bŽ÷�=›¼zk?e‡’xq('ðÛ†.(‚"¨„o` tø„O at 4K{®ê‡|À9Ð
8%²gH€'Œ&¢Ÿ­**GK>`Höil"*[2m
¸ÞãÂb4Æct½l’‡y­0Īµû¸”@:ö	ÂP‡$0lp@˜»o(‚|†؃x ‡=`†â‹'¨ÀgØ„Oxr˜:At(@�hƒi�‡Èo Gp„PþAk8ƒH„´HëkèÃE¤
uh†P€I�„qˆ‡¬Ò{H‡.è‚m؆o$Ç<T´¨c†M`Ç
„G}°†�„}PHà‰t7²>‰”Èf˜ÄxHšÄu‡Pð€$HŸPhw g
ÂiðDnšôD3ÕCÆ©¤ÊªÔ9n»�¨qF‹ù�‰3ôªæ‹9ð
€	€ìK‡MЃ(=ø†i؃qH‡�,¢w¸KÝ„:
äHe}ÐQÔA¸Ám ‡¸,�stÅPøq˜
8ƒªÂŸR¥þð“Ë
­„m
ü„£ƒ½„Ã.` ÖLÝm¨„@UkPÛ~µu¢3p[pàvI
ÄéÝq!̦!ò-F+%<g°ó#
¢òEçõ^'·ú1?*
õZ't¥Ç{¥gI]y÷„F�¹`E\m$»ÓÍr¦ý¢¬B9<ås?!o2£_¯[Œ¡Ñ!üÉ< BxûqþA#üO²&»?úﺼ7}_ ¦·½–€zAÍ÷c×¼Q�|EÊ! ÿú¹çñ»/1Që-¿¢v
9¤Xþ¸åEN[t£ÝOŸåÕÌF•Ï9è�2C�P 	‘]zù%˜aþ6HJC8ƒÉ”Ñ„Rã>	õC%)ZHÒ͈¹'Ÿ}ú¹ž<ãà4aOM
eÍ^JÙ#�7�È!EmPÈŸ•Zz)¦�íó7TH¸Y=2p&T�
ã?ïX³.QÖB˜xIu9ê©Ëj‘=eJ¨$“Ü)!�Ûu-žR§«¾;ï}fnî™i
훡•9`¹ÇÙ;ó͇©þðÏŸâ·&h´GYP×¥æ<÷Ýÿ¨�VÖ
£ÆˆfÁÞþã£ØÂ�(0�AR²’ñ�ÊÌ*ÏÐZéÇ9H‘‡3$BK�°$*-	Agȹ¢à"§˜‡$ 
·Z’	gTZƒaÖ¸ã~7k´b›08]¼ùœ£˜¹Û»ߪ¡ïìl¡X�¤?Å­¿n#é�Ùý¨Ð¨P8poDáOf<%?odàd|ÛeLƒÑ‹“œ,4Ó[‹	Øá„N"=,9ÌÁòÅAáðÅÏ(ø–ó�ÇdŽ»Þ¶z/Éep¦<?zJŒ”™ëp\å/½úJçíå!½ê(aø¦ÑD»¬ÜF*t˜f­.v“è£æÖ¶ì,x@¨„}ìnÿþHmè#=¬ó|©É0)¢Ñ�nëí~gÈÍ%?µ9›¬×[ß;¶`l¤Â½ü%lŸ¾YÕZ|Ö/8hàm¸
�ÿ|¸%4—ª}NêòÀ
’0[E)>W4ü
ßÈÖÓeH׈ÜRDáÑ}Q}Ð_b	�TtÂq!ÉAP=ÕéáAÝ`T“òܘýÜ/Ñž9©PÑåCj!Wö›²áù_éE…ÃôöaÉÁžhÕŸÄ¡Oȹ\"Ñ5!â{dÜ‹8WÝÜÈÜÎ_ð!
™†ŒbÄ•S!f‘ÍÕ›xÁU¸…ßRè $Š"fi„ÍÈ"M5”R�
^QÁ2HCË4FIæ$ÈLb
FaPN5ePþÊG)
AahˆU cØ	8ø–nTšS×(*ÒPÊUM„E€DX„-Rĵ¸œË-O;Æ#I¹£<º#=ÂcÊÔ£>¾£Bìc?*Æòü£?â#;ò#@¤@"dAæã@Ú#CÞc?>¤CâcBBd)$E–OÅ"éŒbÂÔÍw…Óu” K	Ù`
q):!E˜”OeJíaøù“U!Ô€‹à0ª¡41ØŒ‰‡<ä]9ˆC(tÑmy›¼—UÆ9>åV™Ž[Ƈ3R]Øh¶RVþžpŒÌ¦H78ÉmG–BH£
�!Z¡UWlE¸áa.fS)&b^cB&öL¦e:fe.fdj&f2fgnæf&æeR&i6¦gv…_e>�%阦*ž�
šàÑ,M?´Ã
#0+°Cð'°
«fc5±X0KËoþÄC5PÁtøPA€øTA(Á.É	=PC,�°nÏvmãï1|±$ï‚Rï÷üš1<µ1Ã_³Oõ9ßBŒ°r׶o?6^ow5˯
³sp#C,To„#E%B•v,è�‰ƒo@�w˜ƒ‘Ô4í×þÐ5“VôCŠÇ‚$_y¿výÚº7p#ƒ÷¾×¯oÓò{Þx’#÷ý6¼r›¹$¯ñ
GµUq2¿–çN¦
Öiã¥dAÿJ†lpÓѦ™f6‹µYߦW<y8,ƒ	‹N|(”ysçÏ5úÛ§�›—Tͪ¤¬÷®e’$ج%ÏPyóåÉCW¿ž}{èú¦÷£G-Vkº[ëÞ²ºß,þk§ˆCk—·î³­«¸ˆ)k–Ã̵Êê"Î2üðÂK)ÀjÃ*,©"ŒË1éJ,®a’f Ëò«,c„!�©^@‹ê—óÏ/°šÊë¬õ¢,±¯¤z/Ù\»FÉr“KCÓ–êí/ddlª˜pJ("„ºÒ½-¹ìR:’š‘¥êY§—”�¦žqÜ8ãŒ0Ø€SN6Ð`£Ë;ñÌs½¢Š:*©oóë-¦h,«ßL²¦†°I®f³o)bØšŒµá8Dkµ¸¦ÂKF¨pd0«f“-­
ï
‹S-}m)™ü
¬«˜dô)ÞBÓª0ªhÃÅ*¥Ú*ØO;¬µþþ›
VÚfËÏ0¼1ÇÓˆµX¹§¡’“h9=Á
—'ä
Ç‹fšA©ŸzØé¦}äÙ^yäy§Þ{íWß}ù¥H:}䣦•Ä‘WãÚ¬ÜjÅ0­dI¤íDbjœ%Ò1^x8ßR´Ë
)^0kmQ(oA˜¯Õ4ü™˜ÀžŒô*ÆB[Êâ֠ұöL³ïS¨þxS•6Zi¥ÊDÕp¤p2ˆ¬TÙjÁ*Ò´.óëðÖ®2xż�y2h[†6Õ_¬Ú¬P§†1ÌUÍ…œKÒž)£j¿Œ£ºÛm¿�Ûy.!‚·:tÃn—ï¢ùgœ'Ü�$H Ï{H$�äùóÑ÷é߀ëƒ}µáà‹ÒcÊÚ5²°*™?µ,£´dJW\

d1Ù\Es%rˆ0¶£Ÿ%L4¿(ÏL6#ßÍ&f]ùÏ擬bý­)Äóœ¤lS˜ÒOu¿Vd€³©B0fj
¶´Å0K£œâ){"¯ê„â$àX;Îä�jèCTh¢C&Ò-Tî2}ëCJûøòÛ1-*GÒ²Œ$´ cV4c1¡Ò,þôHqf�XˆT2c䯑%{‹ZxÑÅc@&Zu‰–
÷—aè®6ZMŒÌy•_
f4ˊŧ²jb2Q�¡ß #ZÐFÛ…£zÖ3Ä°jH”ñÏþÔ$bµò’¢�O<À”®n�‰%.ùÎ>Ä¡…f<Ñ!P¬èIûU7?á
@?’‹qãOuT-F\Œ7Ï|ñÄà/tqÐ2l�ª‰‡ÑŠVÎ6O
Þ6{ZM¡ªBrñËpTÂõ”IëŒO
3 5*0¼H�‡&T+=N5F:Ò@*¥1·ÆF3!K�ÉX5Ù5ÎÉCŽ)™gJ”KU«ŽIÔÅ.kx´ Õ‚4zˆË…˜”°•Å“/é Ôህ!
1bU°"´fÌŠ6)´9…ÁðE1T¡‹âf1˜ÚUv¡XÀ"ÅØF™³n
…D’þ5¡Xƒ¹£5k‚h¤c­ˆ….HË\æÆ‚´Õ
F0Zq
Ú±^”ÐXsˆ—Èi°!ì¥>Ýí,´Ò'ˆì
ZXøb¾ð°/X¡”­h
AlÙ‹Œx7Œb¬¨p…/D,²mL.Ye…+^qŠUÀ‚‡Û
¥04?	¤€ªjË¢ò‹W¸ÂÅÅggFeŒéž¯èð+^Ñâ/y9>…-rwZ³C7ÙŒ€
F iF»0¤]jÆF%�¨{QZ2@¹­å•2Â'…uÎþµuõƒÖ
Dð´¢@‡EpBÌï#ËQkÅ+dÄâBÐÁŽIWzX-u•.@áix°RªYh?UIpÄ¢m^ˆ1†%,
ÖbXê1@“fcB‚§‰°l,aÛÙ&‚¬-„;ðX)dÎÂ>tÍ[ÕT�@UÅhcQÆË0¦†Ås•bøgˆZ‰¿”mtå%àVþCE°‚ŸÐŒmý›áíQéÝZjUh å¢0À
è:„pÝÙÑ0?©á
N%ÃPà
pÀC@A"côBUÓË%ta(ñÕ¯¢$¥CÛð(þù°­ì‡<`yh˜øÃT€¬â1/ÄøÌGÒ“L�Á_¤A8
bÜs›ÇHË
 
!Öa±ÈÖ„Á.pƒâá’Âv¼âú*Žè@ û.`Þ`æ€8€
°àÇ
¾`¹ ×Ø‚ra:ŒtA·q—j¦°‹ÌQ­±Äì-ˆ§n@
Zï

�ð€
¡xn.ý

â`�–ªQvA
:<áB,Cúê
ÓP
l²
H U

t¡Œ|!ÚP
¡Xa¦àë°´2 ÷¨®ûà
T]Õ!ªèOüã~j£Ò@
TÀ
 
 V`
�-`A
ZàJÃîãD@@A0–"Àô&S€è�éšräÆŽ LSà`�RX¡¢ 8€ã¸•

ThôÑ"�¨pcâŒ!¢`
h
4ÁÅ`¡å6kYà»�|¯dW �
â DAF!Nà&‡—G©"f˜f€VA02$‹^·^Av�øa/ð o»ï°`á
v 
,ÁLáj’fi6's¬'óG�ª
Žòbð�'}÷ñô×Ñþ!ˆ(LÔe`éz’þÀöa˜v‘÷7>î¦1IØú*ƒi–òŽiˆAÉWRk·`�p�f
a´ñZÎ!à
šA,CzM0Æ’f¬
Ž
Àè@Òn¡LÁT`
@6 
ºz”AHhNwmàBÔ¶ûÄ }ðÂf¸
Y þ…Å€©
àAÌä®a³v8ÑX8uŸyŽÁàû!�ÓV¡"–sÒ.!
n@.`
œæfw\�L£¶��qÀvAZŽ/Ž¡¬… 
�Ü,-ˆ¡Sà÷€¦`Z!á»
 ŠaS’Áà»ûHÀÃ8—

æ—]ªAò“›Û1/A	¦1²©)zÙp
,Á´[$ª—Z�
BÞôT€@l0
r
à
X€€
,!¼2Çor
ìàáˆ{Ü
‚Š³<ˆ0¡Â…:|1¢Ä‰+Nô·O_?z¯ˆÝ2flV²dÆ~�œ’W'<"
.È {ùÓÏ=Ôðb’t$ýòIñJ-pÀGB"S€@”
€U®tÖ^É	0[¹
—Xt­âÇL@*™¸à@Qì
–3²@
,±°rÈ
:	°Àþb<‚"j4Dºð¢+ÅrC
 C)�è@@
cœr
*ÀG \Œ%HÀm¦dpG.ÒE‡Ý-}ZxJ�Ÿ”Ì,"Nxä‘gž¹ënÎ9{úȃ
ËHCE7õÈÃ6Ûö÷_3è�·�±ÉvN{í¶GôàF.¶Ø/Éø.ÝeõV½ˆD¨ÀÁ
®µâ	Dˆ`À
8€N
/ð
,°2è`Jè
D¸Ápp„!p²–TSÄŽðÌÜÁª¢t
_$Ì2#áH~çÅzÝ¢ÁMX±‹{ÙX%†¦ËUºPïÃàÌýPV›ÛØf²heEmJhVÀeÁÈ,ly8©^§:&!	o�!�ËrÈ:–�ÕÔð2è@8•OÁÑ�ŸU�1ÏyÜH¼ô­ïB)¡x-Î$À«çiAÂÍ`Ôê^(-mjik/^¤2;–ÙLkË‹ØÃMPƒ 8

W/€¢
òž¤³N>Y‡O‹ÆÐH¼ez�¸øÝ,¼8‹Z«gÎQ/z1`ÊDíª0n=ï…Ý�øj¿â•JÅšèEXÙMÅXFï*KЄ®·C2‚
�b£§ÿÈÖz¿ÕŒ	Üþ<õ˜�½NÓÌéN¿Ó	7±›]c<ú#tS‹Þi誘¹ö¬��#`xQÓ­X„B €†æ
™ì>ÎQPâô;’Ôê6#
†Œ?¿n!#G’c°†Plfdüj„-µÐ³áNæ,Ž|»rïAžø»\Zó¡‚}ö±@µÝò-y;l4î…ùǀ炀Œ§Œ–8ÀÖpøx‹D‡!Ë7UÁ¢iº2BòÄà5�À‚)‘r–ÀÅ0MÒá�C†؆~@VZXóÔ`“Ç_¼ck#d"rÙÑtº²yš–RáF/¼c„‹á8ÔÖ;!7kb%ƒ^„+ºƒ¼ÂegF„ò7�#÷A¾ónQ
h†
:T°SþZ`¨“gx´gÍ;|T„g pv†y˜ è.Ô –tbKøÂ+™‘RŒÄH醈&A„¾3dÇfRÖñÎÑ5ÜÔ
Ï
J©•Zé‚�·+Šqž(/»gOr!�'t‡¸hŠSËLj؉х8Ù
„¿ð„EƒÍy‚Bwkl·yŒ„c˜ÉÒóSzXoç!ààÍp^säo¨G
7‡ä!;ʨ�UŒ†!:2�²Åºƒ�HŽoGŽœ§n‡(�(nØ!Âv÷…é†+ó‚„‘xªè‰wkK§‹ò‰êH‹¤XŽøx�‡ˆ+g„º§…ÜA	©�·Vþ]:Gn"1¸‘
÷Ð]àU‡m¶�ƒV.¡C-=%~§gæ ²ƒú`,g’1iûÀxÄ°�8’#U÷�#1nÛy³U/þe4A‰/E©th·Ž–‡kÚQ³e at i/ëF´e�G`J·lÛ6[Nɲ<øBnUÉ|R)BQ#y[¶hJw–ÚÖ'õT•TI[$An_i–Áóm>I’‡õTh‰/Ui–U…––!¸Ðløò9o1U†2gû Ò²û±SÚB�â
‚[š8gl^ê�B§„Ž8U¨™¦ƒêpye{z§Ž
§"X–Ù‘žÉŸOZHû€S[�
ÕÐSØ"€I âÀgmƇÁ©­:¥ï{–g||‚m‡#VÕ��(¢l÷4ˆ�Qvlºr+ŽÃš]Ji xZ™Ñ«ÁŠ„
™uÂ_©©§$ššÁø�ÆæˆOslÉ« 7¨pú¬©YZ=H©¨UZ
	®ŠÃ¨z‰
díú¬
×qØv—š£œ©©=Úª´™^
¢z-îPªÕà
Ú…ŒYä®j�ózÙ„¨8r~j¬…Š£ý`s¸©	‹FŸи¦ã†ëõñg¯£¯J«�/©;¬ y·yUÉúµ±¸R¾¡Ýá³[8¢ÃÉ„+岧˜”º�JUÝ!‹ÕõcêÈyËÙ§Ú·IxŽ2‹·¤¸‰üqJ˜„Ĺ8,+��‰y?ëRô�sD¹ÊÒ¤Xk;ú
牀Qj´óÖŸBü,y‡
Zà
§“:€×ã
¤
«°
þ®€W\%æÅ`Vnåå^îgnV\¥æi¾
f•¾çj^t^çvžæyþæw>ç¹Ðçqçg®çr~æ…^fµçuN舎è†þæ�^è�îç^Žèn^èiÞè‰Þç�nçk¾éhÎè”.ê‹è{ŽésNç–Nçkþåxµ
tC7a4¹ª:ÙVÎ,±:ÐØSDjŸ¬£Î@ÔN€Ú 
Ø`ëvg´å±ç€Ïþìó0è0íÒô
ù6ïvÇFöÐþí�
Ÿ
�ù€ßðýÐð_ñ_ñ�ñÏñ?¹ÿñ òÏñ$¯ñÿñïñ#/òò%Ïò$óñ./ò&Oó“[òs”ó6¿ò>oñ)¿ó5ÿó7Ÿò/ñ:Ÿçððmö‘šºñ� i˜
ûÆw¤*µ+9GF­
[@4�¨-õ„Fx¨»�ªú‘äk¿Î‚Ù‚´i¿�m�.axÝU,vO΂÷æ»<
!ùPöÇ8.M*ïc¯å™jH™ÿ
nðõO€ø„F..i¹”�A|.¢¿ùÅr´’¿zß,ÍëYú�ÙÜþ
qúa¬B}.„‘£² ¢HG&›tòÉÎüþù©i$4È8ÇZÔ¢™%+"M6(ÃsL2µšHpN® ðªq#®"!*sN:ë´3&%§TL¿k
E8æÑN²ñ‡aغêQ�tšˆ=FÑån�‹¬S}ÈÆýÉpa£ÁK%�ÄHLŠ¨„‡D!øhô�/Y2“þ£´‘䨧>�i¨’xá)]© #Í1-—¨â‘zÜò•»TšŒ¦4nê1²YGŠ|§K^&3>ÈK“@ôõ=Er䘾Sf5ßC5æ‹—cŠS6ò”cÊÃ@Ö$'uð’2ZÆe)rÊe.}÷Ó”SžÑáÖ)×FþÔ#2�éGÝÊRxò�
ó$¨nYÁNÆÅ5ÿ1H>Úâ6x`(hEmc5�ZÿPÎ2Ò�|äë <p‹¦ô3DÍâø•*iÔ£ð)>ðq
G„Á*åéfh6«ÊE²?@©¤<ú��s
˜
ÍB[(G=àQ´‡¼(\íþØG7ª€
Œ
¦~"­üìƒ× ¾	Î�‰µ»Å‰Dîµ<b‡¶]ó¦—ê•òV¹7‘‡5¢•V¢¬ÃzJÁË7+Y£åf&£Y`Zû!Û»ÍH*2µˆvÍ+“ŸfgëàFhµx¤�\„6祯JhÄ®a}×ýcŒ<"ÙúØ$¢*›
˜„„ä%38Iö¤X[$¬ÎQ%EÒ$q–Ü·`©LÒm1 tyL3kùPÿiÆ·¾»Ž"çnFΩ›< çK.Ð-Š”[TžÑ؃’
Òs8"	 «Í«‘Ô]SkMÊ?˜2�Ò¤Þ˜þ°ákíBÅsô†�Ëšuz´¡ø©#² 
m@[»ñÝ„ªO È¤î0G`P
Ð@ÜÙEž� [œ
›
ÈN¶9¶@ƒlÁ®óV.¹=H´•CÊûȪ˜ÃRÈ
å(,Áy«W5
©Ÿ_fÃ�âß°#	�(2 ,ÎÛgMI-µ*´côý˜p.ƒáòÉY{¨ŒOˆã­™ËSFÜc›ïö0ÁÙSËùã�¦€ò¿Aß-%Q¼&/Kƒ5��ˆ†ZÉôÕú¦™Ò8[”C-
Ýb=»žXp9Nç-]쇕Çk¤U£�G9F”2×^Ö}¨1o—´‘
Xæ»ßZÂb¬¡þ‰WÞÀ¶|ö\‹—«gÉR¤’‰7ìM´º¥½:Ës8r[Ê÷F
üÔ…>‰èò.a½J%r5*Èícî("5‘9ßÖóçè#ÖšSe˳V×­¹w½v^;�üÇðÿ™ÑD2‚쟠7ümj�wmâNdCx±+¥ŸR`¹ìø”¡RbCn…âûm!pÞ®�“ë9òm‡ŒÒ!…õ³¿ƒTêúš¡ÖÍ�2ˆŠÐ§D„ü+(Ù0¤œû®'r�ª«ˆ‡*‡DH«$(}À(`"¿)‹¬‘©vp˜€$¸Ày‚•GJ§$¨ª›uk‹|(G`‚k0A‚Ò°Ï
þ@P%`A*û‡ª)|p3 …´AkŠ%D‘½äCˆìÁ~x�©|€‡r�ƒ�
&`$´¦%YÏ¢‚qè[ˆ„,”‡zÈoP‚��$ ¨.$§Îr†e ˆ‹˜­L‚hˆBŒ!�xh†@„t0‚9LBuÐ*°±ƒ�?éAcÛ
¡,)„iÄCôBDq†�à†ë«?áC?t

‰‡´‡i˜†L¬¦X9
R­zX‡>áAd¾²ÈEòU|¥íq.¾’=¬†“Dùê‡gÉ¥]T&ä	ÛaÄ2T‚Tº ¯ºAÖKÆL*Y‘˜ïÀ1%XA}sÁ‡þú&ÐÃÆQ‚½;8XD…èÁ䘡�ÀˆK2ÇQÂÈ’–![³>Yˆj0šÔ3í›Ç$Hz,£ YcŒYTl8´*+/
¡Šw˜HŠœÈxP‡x¨H�ÜHŽìH�üH�I‘I’,I“<I”LI•\I–lI—|I˜ŒI™œIš¬I›¼IŽŒvxxð‘;„;äGò€¹Ù°ˆJ¤LÊjXJk°†¤|J¨ŒJ©œJª¬J«¼J¬ÌJ­ÜJ®ìJ¯üJ°K±K²,K³<K´LKµ\K¶l˧”†¥ä†±�g;Ú¢ÅatŠyœÇ'è˾¤*ðKÁLÂ,LÃ<LÄLLÅ\LþÆlLÇ|LÈŒLÉœLʬL˼LÌÌLÍÜLÎìLÏüLÐ4Ì-€‚'
P\Mäã
¥Š€G˜^êuH�ÞêÍÞìÅÞí¥^é½^ïÕ^ë
_ðßð�Þïå^õ=ßñEßí]_íå^ô•_ñ¥ßòmßîußû¥_óußüÅßôeßê]ßý­_òåßùu„Dèßø]à
`ë…_
þaýý_.aHX`&`	ÞáæaÖ_ at P`6x‚;väÁhð¸Á­
Óg¨( ÍÁ”â'ˆb+&L+ÎbÒÔâ+®â.öK+†â*€â(ã,öb.Nc)Vc6îË3Æb->L6^ã9®c6L#Ø‚-pã/¶c5Fc?.ã9L=Î@Îâ<Í+Öã=Ö6ã@þc-cÁäâ'c2Žã2®â¾¬‚JÖ‚Cžb-
7ðâæm
/sõÞî0·sBço$Gö]õUcwíB—Wb-òs
6TçN¡ÁƒtHa;w-܈±áÄ’
Ý�+é#E•+ÂŒYP¢Æ†þÙ‰ó’Jšpÿä­³Æ'‰lûÄiiV¯_¾¦ùî�#•ÄšÅ˜ë*V5éÞV®ð¾ä
²¤D¬+Ž¬hðãÂ�®”R¬[¹Ïâ…¨¶*Cx	'i‘ëÍ�w'^½Zð a´g+Âe¨»¯ð¶‹Ç®ÝÍuçέ{8äáË_»r•£×Ö”·Ž�¨®�:¿ï⽫Fo0PÈè-ü·Œâ©äyì8›sIÂv#g
	nH‚«“ü7+uÆ€	–3xF8pÞ4‚——ñ›7Ÿw"Õ¹'<z«BцÆë2¶ãî+ÿ¯VÕb �d‘‡
èRd”…
zèõœ„äÉ°þaå,D—f
�Ö–{Wy¤’gð´s]Y±£ŽDm‘¢tØ
˜i
y5Ø`5Ö¦H9¥ÒÌ>
u
 I$QÍ>æH!M?L9“tWïÀŸ{)žÆAWÂäŽ{_¾|XY6‘{$Íæe^­S¥b3&˜ôÅV§�7Öh–XY^VŒmFç! Õ¹%;W^taQV†^–��ù•I—™2yyè¡aVV¥_!½³LF¸áF¥–ʨ–*rÈqÍU*–¥ækõ©h'u–Ô¦_ižVX_ŸÎåRX„²“
©ªúª«¯®jªª†¢bXynUbBï¬S[mUèþ%­[VöNBÁÞi§Y�=:–¥éŠ•îAï´ã^*
@ñ,ªÍòË*×XÄeˆìÄã«ejaÔ‘H�[YGtuº§DTfY'VžöÚe—^Éiœ”Ù÷%aÜ ±Ýì#;Õð¡„Õüƒ”RKöÓŽ9†ð
‘¶œ‘(t}íÊ[,Ô\}knG¢që+m·î9Qê)BþêWTØ£Íâ²K.¹ìΰ£Ï†kaî)Å^vË J¿g˜ñ±ªï7i¸Uš±Å�ｸݛŠ8µ;.»ö�[óÏ™k“8QÁ(
OX”	íÝï–}4eA§½ùðVaj¹f†æ¦Ö—£5òY¦Ÿ9.ê2ÜЉ4~ô“•
¥HG¢‚4ö±�%ÁÃIð€P0
`ÁÄ9BÛ༸Ô%CÁK‘ªÊ—’·¦—¨D.‰Éir¤.k™Í\9ÐZªT(M}$LñŠ�h¬¥’¶õÉ|aÝ¡„føÐÇ2ÅÃÜ™
Â+
TJe®Díh†
4 Œ²,$hP�Š†+ŠÒN¤~§�ÅkoÞ
ÉØ’ƒD¥}R%”ƒTóš€Aï5 â8Â
lœìýÊP”à}Œƒ
ÍЇ—ÔRÈ
ëP`‚5 ]ÎÈPò|_Ø0éÅ̪!ò;TÙÒfCy^‰V›ä“a€	£Ž¤o+‰ù�Xš"éEÌ.î,}Ö¨Lù±¤-%JÉ£%C	¯KÈú ¦.þò•ÓµE�Ä$IÈ—²�@
Züb�ëPÒ’…™aH¬–ãE2Ž²	&H”£–òÑ;á‘�þh‚/¾”�ˆ
Ç°£‰�È	íþ¾�|ɤ£ÁoŒ0Nv±ˆ8®q
oHÆl~¹Xßà+z†’¡y(;Hq�Ë eåˆF4œÉ�bJq.ªÄï:¢1
Go#ñ" HÑ‘Ïl¿Ÿ$Œ7HÑ�ëTä¬Þ \A„6(¹<1?’2	�
h”þ[^#�0‡8õ¡�ÑzOÒXG*ª¾L­8™ZVÂnPð6,£>¡ëMèg7  ¸]æ…™�1!	ñ È’¢LB
¥Ws‡F`Žô¡“ÏÜ’—¼ ‡S×æŽHÀ2$U"�YDËŽð¹âµ ÑÖK>ÔiTšBÁF´â5±e
ëӹ銡~"�	L"¯H3ÁsŒ‚väc!Ìqm´Eƒ3È/S—ò‹Ðf#4(lÈ™ßfþÖÇ|F‡ÏæAÎq1uÌØ/%øT	Ù
Ÿº¥’Bu‹¶,ÓUDÃl—»lPÃiŽ¯°z�ÅØàÒ»,v­)@3œ×ñšI
°�8
D\ƒTA£l
<Ü! hJ*@
7°ƒ4°A0¢
 ŒÀt„#H# �#lþ6D£PB8°C7Ä¢(¤žAF_S‰ü€SÙ$…ádŽ�`?NuË°
h
@‚7HÄDNã–5ßÈA"(Á„#üÀxÁI>
$¸£9hÙ4B
Dʃ:DLã¸Aµƒ7x
)t$ÈA‰4䥤‚B¤ÂXƒ:4ƒˆ¦p�‹dG­%%
\RÁÁÀ€?¨È©q…‘‘‚„‚@LB*®¢³µ,B�,º
6¸ƒ5 £
)x
êIc„8€ãTÁd

xÀ9h¢A„
à8 €@†
 õh
ê�Aü
�åwþÀ2ª ìL("¥s¢ÁŸVA
xá8 
lAF Æ<^ƒ{8B
àN(
M¸Œº†XojÞ$ˆßêÒ4 at B©œAý^œåd�¼™Ÿ©J'ËÁžÓ
Ìé$A7˜ÜU<\‰(ÁÌKm7Bö/%Ñ÷

$Tzt‘‚Þ’‚•vŸ:\C´bd�Þ±Ã8Xƒ$àÎ8x€(5;$nx
ùd»vÍ434€&N›j" ñïÝÖ“™Û9šàl]ª†¢�¼VEF7·NÙ™ƒ&	¡8n MàƒÍ±5g¡ÆyyÒ¬�:i|Ʊþ€”œ¡À¹3Íc<wëy0ÊÉÔ.S®vŸÐ$üñîW¯‡&•4*àôÉ[W��$”¨æŸq¨hFŸÔÇ÷Qp5uØ�ïœÇÚ�G3o
LÛ�&1S™Ê%Âx’/Öyç�u–!Sq–‰ôS–à›ÙÉèk‰Qvä�l™&‘$
À`
kÔ™d„f¢�„‚T ©¢
R¸qæ‚ß
iã’"[­�õ`J
¬5¹Ûn@ Ü	RñÉ¥­Ò{ÇhHHž€Â6 ¸qÕ0’�äp<Ò�O/„GŽ¢Q'¬¹°ä¸f�zÍt#‰0¬á&•'0¤od#p¡A)7”pƒ›þjØ ¡šÃ&¨&žÅš
iÂÕøŽï1Ê’f/
’À‡shÈ…2€Â ‰vÐè�3�‚ëÄáB4°ƒaè‰R�GØçfbÇ…ž2’X’>îÁæš%�	„ÂÚ‡6D9JRžØS?0„½˜ac?øáР�0\È)ô‚îVHÈ2…ÿBƒÑàÃ`ZcúhFd™+k˜Ã´YÁ�îmŒ{IÓ†âuŒàÔF7RéRªÒYìÙ
¯à1hþ
‚hXÆC
L<�9>ò
ãPÐ:@$ lüCZpýþá�÷)¨ý Lß4©ÇŠãŽH ø€–’Ø'€
ÌÑ+†Å5ÎѯD,W´}TÇ9¶ÚPl÷·‰ ;¤Û±k
‡xcÿå$BÒï©ä'.én=ö¡÷ÃÄþò�‡:â!æwˆy̘ûTIàQ3|ò�©x’;¬!Y$sgBë°qI¢wT€¸F4ñ¤”Hij�õ,8®
‰åJ÷Mã‘È�1	—4C²•­;œÁ‡M
#Å°÷æ“‘Ä×#s?Z�›ºZÌ�¹©ý™)òaëP‡rs	G˜£‘Õ,i±1!q$¢(Ñ-�5�uHãÈŽÐàQpë;#YaãÈÂ
nåÔê)pŠï8Jr®ëÇ)ƒå Ds8¬�¸0àv¥€¤oeýÆä Ïþ0P±gY"åì¯àØð~|ÏòTb­Ìõ”þå	#P$B"=x=*)ýòOýÒM	aS²‰¹§j�ëЮ÷üŽÏv%$®ËšOïH
Ð
ÇBYÄ
(‘e{XÎÔ4ì#A2>V�÷~’))ã$Õ++?²×Aºª
$ΓñSˆÑ$|+î¤�Y|N›*2ðôŽÂ*Eâ¬r�"“F%*R)'Âû´�¯üg@ØGšAßäGßÞíAþ¡!»N§ÔoY’Q}°Q¥YÞ²!‰pôúæÛòíÂÝ‚P$ÓÊÏ�Q/Ñþ°Lñr-½°ÃÚ/­Xbýæ.>HÄ®aQŽE2*ƒz”±ö6Ø€
ø@©Ê¥·R‚-‘¥ò¼á"%
áCþ×.“c¸Ñ2Õo%ÚÈü*�)�¥'£“à$£X@/	£XšRNû.#±P*YÊ2{ZôÎõ'­’ñ2�e›q/ÉÓ|웬3	{3YŒecèŽcÄÒ%�2"³ò"2,…$$R)Yò;ãscªRB,´=“›%$d¦ãVŽ?$ê®Ã4	µq'åO+àÒ;éì++@â$Ä�Ѽa{˜2â~37”eì.l±¼!B
°
D	èͤ þa1	‹~¤
K£AK·”K»´K¥!ÀL›
Lµ´LÃ4K«ÁaÐ4LÕTL±NµtMôKmK³ÔKß”_ÈþTª!š
Qšá
Òfß(}žôeaöIÁdfÁD	t¶eQ6fŸÔfgV_¬
˜`hD_’ÖŠ$fgVf‘¶i£h™Vhƒ–j£öj­vj›VgÓGbö	Pöf{h“vkwV
Œ
S¶
R¡î7–x�4	þ*dÝùÕ¡
܇-T(vLå6µÛÖ­o�öœ:Tê´žS¯_ÞW”«qæ]ç¦ÝèÛ7óµ�ûÞuú”¯ì²ÐñyqpÙ󜄜¾½û÷ðãËŸO!8*ÍF—–wzgO}æµÜ_aÓnàq‡ÖZDõÏU/5%w·”>òœU`Y…õOnÜ-µ”<ãõö›?ö&Þ‡ñă–\5µ�‹+aÔ]VÖx™c�éXß�@)ä�DV6g„Z7ÌåˆjÎü„Ÿ>öæ�‹ÁŃ•Sñ(¸ ].(&…V÷aŽ.Qøþ‰7•—Ø_¹	Ô�UEu‰b—�U8!_
Í5PlÉuQQÆ©§Yl.!Z䢌6êè£Dêƒ�©4#…8�õÇkâLyepWNH”WögžúÐèT†ÆU¦„Ç…ÈTB/™÷Ø‚³J7[�LѵŽa$rj:¥Ú©�žxiÅVS=òHQZ9^g€±W-x�f«í¶Üv‹QªÜ¥ß_ý©†Í>âhå\òLÈQxÅCÎ7Ì<óM<§Æ“9 æå*S´…ÒÌ8`-'"³úŒƒM<û˜Š:ÇÎzfY(†¸

Ð`O:Û|ÂÌ7é ¥p²Íæ6Ö8¡Œ#±A€nõ¡t’Ž³T3Ü`þèa	çíÎ<÷ìs�^�¶L3O€³ÕøçPÍW-wÁ%äT:Ï€
ul“*9Ìòª«îž‘
rò

 ±y,ƒ
$ñsÐ`ÓÐGÎ0 at yˆÃ.‚ë÷Æ�v�b
Ë`G3(àÒ\´,Ýð­„öQªðŽW˜ÛØA÷ µxì¡ÛHÕ*{¤@B³àÃ8þJ‹†´Ããp†3R!‰0`’@�-S%�ô±|xÌåÚ¡Žý²(gH
Ú@0}°®;¦`ΘKå*[y3Oñi3–QW&Í\RÊî«´B¡R™Ùäpc:ÂWÞ.<ƒ!clæ?ÜÛÕh(aIàƒ<0ƒ@èceuפ@‚
E
‚›ãØC˜öè‚ÆWPRƒXÄŸX¡>š!¿V/Ï%^PB?ü‘ˆÛ¦B�Øu¯§¨�wP¶n¨ôlÛ2	7œ�šØPr šüd
4ã¨KÙ¶Ô§NuŠdEË@‡[Ü�s�pÇÌ“ˆöá
“C±ÂøÈaF†¡• �ÓÁ
LQêÐÒ!…-@ï|@
7ô
	
XÃm‹F?Ü¡
P 	õ…�Ò�wÂm ‘tLÕþ†O”ª—Û8{R†zÃ{$Ö«7›Âl!oú`
Ö‘0HÈ/3à7äÁ
¼vØý0¶SÄ!‡,/”ó;Cœ1Üâ¶ìOU�¾ô©>Ú„&£àÆFuýᚧ‡ýEJéG;Üâ�tô“ÞD¨Ã÷f}t!²Ê4h9J°›ìƒ3�D(`©M*,]¡€I`EuEE†gÐ%ã�
Z
.²ìàrpnßpßQlÍð
¦B�¶çEzXUiè"ãpÕl
Í!	²Ü@
r
“Ð÷ž�£Súþ—qIµ''_Ù£2—©yšá!Ñ:°J’‚£�
Ó%ªÙ•.Íp„AvÚxí©¢[b(uquñ.öú“Ïs©Ç"­±y®o1<¶‰¯oñ21¯e
‘ñPù¥`Z°4[³]Á{¯�}7ÁuÛÇ4k1£BB7)³kélÑ!²vq-¸Zžz™²hr6]¨õ‰“Ì"’#+œ±š5۵˓²JýY£^çB!d0)˜PÙ@›	°K+µÂ¥‰:”O31—:’ò±^Û·~KÍø˜O€•ÙÊ…¹«É9ᮺj©“Ñ2Ýù²Õ†šMÛ—Óù·˜›¹"÷þ1O€)ýðþ@K[21‹)á•ó‘@hùŽ«¹°»$qñp¦‘ɳæâ‡ûš‘¨qºòQ#Öf±²[¼Æ
Á{[ ¶à`{]Z 
³³–¾;¯KÎâ¥À{¼ÜÛ½³Q»”™ÞÐ…f»+5Ôé½ê»¾R§ŠT
4±:ý³•P !d¹é˾ú»¿U˜[Z¶OP3ý£­úpQBžü›À
|Jz
)¦A¿£Ú}Q½|Á¼3Õ•ÒJðp‡†k™<Â$\:1Ú¬Tˆd;Áäæ2%üÂ0¼()0]æŸ!,½¹½1¼Ã<¼#.žÛ¼òà¢KÁþö÷®:ÜÃJ¼Ä&
á²Y×BU™ÙůyµLœÅZLà›AO0¾Y)ÁÙEÁJa6X¼ÅhœÆ€k
Z�
 a’
7\±�“Äj|ÇwlÏ•œüQÄ7*‰êÀ‚5x\Ȇ#�q¦i:]Ì4Þúë°[ÐQêpÈ–lɃQ•Ì«œ¡j£ÔÖÒ
¯¹¼Ì˜ë«
¾ðÛeõ€»
"y­"õˆ¢{�×z
Ø|}×�MØ]Ø~]�ü\8ˆØŒ=؉�,‘=ÙŠýØ‚MÙ�þí؇½Ù‚ÝÙ��Ù|mÙ¢
Úž½×˜}ÙŸ�Ú¤=Ú¥]Ù«ÍÙ¬mØ­-Û±�Ù§ýØ·mÚ©ÍÚµ­Ù¾š'Z±�c
T°ÖJ¾Úª»øáÐWÒŒg °[R8
�K¼ë.¡½Ø×íØؽØÛ-ÖiÝÜÍØý¢Ý¾-ÖãÚ‰}ÞÛ�ÞaÞìmÞàMÞÙýÞÝ
Øê­ÞßÝÞ÷=ßî½ÞõíÛô-ßÿÍß¾ßý�ßÞù
ßú�à
n×îßßÎànáÞÞá>-£ä.b]ƶWI+lK´$f/³µ1OÓ›·µÏcÞá�–ñÎ÷�ãnãNã~ãÿBàþ:®ßCîã<näÚäGþßØhá5¾ã5®'^äQäDÎJžäW¾ääÝä~åBnå9Žå[®åH.æUîåãÍåÙ­æÁ}&.	¯fŠG�)ÿ@ÍçÒ‘»�ØÀ<½êµÚ�ß±@“
}ÒZ葃è‡Y莹"ùè�Žî’®è”né•é—nè‰Îé‹nè�Îè–>é“^¹¥þéšžé ´é©žš˜îê Žêèqê TéžÎ2‘.·¯Žë·®ê×[ëºë›nÏ÷Ü©+)?¥Í�‹.ÖX—M�'hIºA{ØYìùœíÄò:¥-éÈî¹ã;ÐÚfur!f+gYþÏôYš,ªíðN‘c79ä»ÜÁ Ëb<nBAíC
¹jûëñ~ðYtrT .àkÜc+
†ûM³¨„"'U�÷Ðñ÷®ø� ïñ$_ò&ò(Ÿò*¿ò,ßò.ÿò0ó2?ó4_ó6ó8Ÿó:¿ó<ßó>ÿó@ô/O÷@áZiì
6|áÀ4!]ü!ƤjK±‚¶Òùpá á�
\ßõÔðõ]öb?öd_öföhŸöj¿ölßönÿöp÷r?÷t_÷v÷xŸ÷z¿÷|ß÷~ÿöápÍA�/sµGÓ
I¢³k:T¤Ú4(º¬9rõèP
§þ�° ˜¯¼À
¬Ä±PÅ
±À
º�¶�	è�zÆú�ËÇ \¿	7r
ùpáp
¾°Ã0ÈpþÉ�þÃ�ë?°þÆ�ñ?ÿò_ÿôÿöŸÿø¿ÿúßÿüÿÿ
¤”ºÆ¶$ªñgœ©x»ÊŸ}ºú*–a˜3ë–cz¹¥—_Ì™d’¹DC$qDÓJkD‡+±Eþ]lqEÑbñEa¼qÆI”GoìñDsüÆ ß²H"u¬É—TÒÇ#�„’È)“¬²È+ŸŒÒJ,�l2K1ÁdrL/¹¤²K#¿LÓLÙüòÅáqa„AÆ›ðIí¾žôAíªx¬ñÂiŽ’mlÄæq´p†AŸ„¬´\Â0C÷>t.OO�ù4TP×ZÔQÝšPTUM]ÕCTY%5UVgm•V[]-ÕÓXoåµÕ]u}µVaa
öÔ\{EØcq•uXgiýÕØf“í5Zf©uÖZk±½UÛbŸWZb—åVUoÉ
7Ôs§MwÜf·
u·˜;ñÎZn	F4þ
	¹ÅUlq§rX¡
µ‡ŽvtOõ(<î‘�xäc]
S©Ò�Y�Óݲ–N6ˆ¼îÄÔLÁgBíÉéYTÖ]cþ¼»Ë��1MÕžöU9¦eͺ١…n¨=Ǹ˜þÂÛœaðÂ�²´Ð-äå=´ƒ¼qÕiÉ|«)âìϨÃl+.φ&·‰Ì³No†âÛ±ŽÅ¾sqyHFÊÑel°>´‚š€ÙÓq«ñBÁZë÷á)úpX{‚û].R¥Pt¾Ë¼:G„Q¾!”uÈÂè\ù˜~û.t,Yå
Ãö˜� ²©¸ÂC‰FJœÃ8äC?7@äNiBl®<|“j\Cn3ìÃkµhbÃ;|’1#!oLÇj,™Ñ8KTBËÃ"w³ŠýðõAy 2Òƒ-Ó“Þè“J
8Œ9h·“ˆ’âµ
Òˆl¦Iˆ´©ˆÿ1!ãJŒH†Z:�û�Z(ÆQ"¯ä¸Il9¥²£
É4V†�Ø��a¤•Ã&Dš+¢²¡¡Ú¿=³ ]Á
9:ø
«f4:Aº[`Äš*³Må`¨LŽÜk
œ@þ;¿¤t)DÁÁ‚3èP5íZÀ©t°DœšyFÀª¨q¡Œ\ þ�$›Ž´ˆ—¹(œËÆú¼ÚH·ä%Z‘›ù8c»G&ü	Çé	Èigh-v¸·§È7*hÑ�Þ ˜Vh½×C‰Œ1ƒ¸Õ‰¼ãÁ½-Û›‡.˜‰6ÐäȈ 9”ñ?¹IJª™x®».£â/
1CœI¼b&štÄ“:fÚ$`ŠÊTJJM1œD[(CÚŸ²øÈþ+ˆ	¡¯N*/R!›’ ÿcµÉ™Ì®Ú©g!;°Ä)Ô$h”—�*°4•¨ü³‘Ãÿ!MÔ1Mêx jˆ
3çù¸ÿP…ƒOåÊQ¤J=À³��S9KµTàªG¥’Ñ*ÛQÛs"’)ÑÊ#ÌËÛ@yn€ÌyëÆd”|C#Õ«X£%çà«P´T„Ïþä8 KBóQø¬6a•;aÒ2\TÂUK�ÖŠK�«¶ø*³!ôÕ¹ê.±0�‹O�B¼ÅçP¿µ
TÖÅ´VŽ–ÔJ^½©á€Ê朋QÑÚÑÙ@™Xµâ¬
¬¯¹‹–[¨„ݘ¹2K/²C†_b‰†³¿ùÐîÕ9øË�O„àö
Y¢ŒÜ IµHâ
š¥9¬‚¨»¢�˜ã¾æRT:Í°Ã\°³ôd)ª?SqF(ÖzÉ:6k=®S ì¸�µ½Ê0ïº(A;\‹;Y¨d›º¥b+ã ÁWùçÞ«a^àcVtâGK«’qFd°³:•5þÒ5,\wºÅeå¯
ÑN96Y%LЪɠÁá›ýÔ‘Í$:fI-Íji‹úfbÕµÑ!ZÒRUý�‡xƒÕ~P2â_}›Ì@yP-ÑËÄ:1›gíYðúQ
ž‡PªæTè°m‡œmê¨2D<ÃëQU†PV&
y
}¨ °«Í
UȺí½a>°”*t”A6#&±,¼•ÝQÆ+Bmû¸¡:¾½CÖ?ÖE”=VK¿:<”¥»O?±Ôu«	9ë�’Vˆ…X(X€…`þÐõ\È…[gÒmÅ£ÃSéíÛ83Rþb9Õº²:jz:snV˜‚°ö;��£‚¿Wº`O+V(U`]à3}JÌî‹+«©TºX¸°v.¬A½ºR�…\ð]Ø·x‰ã¨á£ì¹Ó²ìž5_4ÏW…p×…9#mÇ•©¯4÷Ýò¿õŽû®å›ô¡Bu¼³øŽ7×IG%*]>c]¼HOCR
/²E9œ­xM¯Ña¥tÃ9åí¹éâ>Z�Øi/�·Å¬åØr˜UÕ¼òé1„¼Ì‹zºrÝ"‡AäK[‰K¸ŒAïm>§AñÞá{¦v¶½Xb.rÛܵþ 
­³ V«Þ„í/$´å0¿èœ3SPƒ °"8"¨{"Ð{"@.O†Á�Ò麅.ÀÞš*bC@ímö�Ô[™lÁc…U°
(€
ƒbˆ¸X2;—¸ã0½15@¼×„?S[ö˜‰�l¨ÐÍ…;@
>Ãá;skþ,'ñt©�2Ç¿ÒJÇÞ»epÏà—,A6S¥±µÛ¨÷`æ;æ£Mi+D,eÁÕ™F%UÆsÔ}õ�£Ò¬Ù“nõö¹Ãæ&IþlþÌiiöOß>òöqôOÒ¿ùè…{‹—±_·Œ%3fl˜Ëd-o­tÉòV2œ-åÜé’§1œ)o¶ÌÉ2hÑ›8u¦ì9´iP—+kJ�y4§Ð¨+“mºµ&X£2i¥z‹çJ´Dµ–-:«¦J•A�Îb9ìnJœ<‡µd�

×
ȼsÞ.ºÜ‹.Ä|‡ÉºìöáJƒ#ªGÌ,¡&( zRi “Z©¡ŒJÊ'§>-è¡™"Ýs¥LkJ)Ô’6�©U[¹ä[Ó.U¦gK¾4ùäEOêSeš_r³E3ÒPÑÍ?õ°s͘I43‘δÝÞxÿ#N �ÈIÒ+uêlL2á|µ¥Dþ/ý£Ï</íôã‹ò© ;6z¨ÓAJy¥9+-hÎ,>él0ñ§Õ/¡ÖËŠtàA‡×¶Ã}Ð1"«œâ‹/ŨRŒ·¾²K1¹¬r|.É㛯f¦ùÚ{'â®'Áœ4²°ºÀ’K0ÇŸ²J­±Ü¥Ë+¹íÆJ~¬èþ=òN,¯”‚

|ñBX÷q^÷`
_¼‚ Ì‚1,„ð½h…/”q-v™!ÜkÅ1ŒQ²!/Z­¨N,¼µ
[ˆO#Lžòº‡ŠHh`0	ø¼¢(b”
q>$TVr6)¢ingˆóœÔ*‡9Æ}.þP‘ÚTä~"5Ç=NqH³Š¥¤ò–´ÉB3щל$¥²Mé"UÚ‡<¸¡…T¨
xcG5âf
3QÁnmªÞÊÁxÀ+I,N“§˜d%rBÄÚ-"•³Ã-M‘?ì\TŽ„Ħ	‘*u¡Jm²HJz
Q�bÜ&!9µ¬ª,½áÍdº¬½Ä…ªØ+^A„�
SÃ^qˆ;$swÊ2Æ
FB
c˜‚2½)J¸0–9 €n¢‹dƒ‚Xf:Ó`VÜ%—wà4€�2áþ\˜Â"^NâŸéTƒ :ÁŠ[9oܼf�‰7
J0‚bƒ2Õp‡Eœ$…‚è¦81<XX�Þ<E¸€…Ôï
ìÀ&6/T½s¥VÀC$Ѐ‚­BA
\:WU4?"­ˆLÛEÔ†Uµ†Þ*lóêÄâî%³Éã“¢%(U)$ñÀaÛø�~”#Ž™ã™ì(�~äƒÕ×p+ÀÁbL!œÎ$¤¡´,Et_¡É[bìDbeØ‘äuN|ý“šl
.¢
ͱÇ!šÄD9RëVTBÅ›
»ØA9Ò¤Œ=:>a¨2྅—ƒ^*Šq—]¨"8@
à
ÑŒ‚ЮÅ,Ç
©@8Úô‡@„±u>’�|8ÂÞ…e%È5("W*®-Ò�ö4“!eÅj8RJŽ~›©=Z=䇑…þ€›¸$qˆ®›¿‰å/4g¬
EHéÇbâc_“ÜfÑü+©Lt°‚sõœB­UF½µ
¬€ÌA ‚/Ã�pÁ¼�,Á°Ëà�õøÆJ‰À��àÀè†øÁ+hB8À@ñÀ|A|
ä@‚É$Ø
Šh¼•Y!A:�´
ÍtŠÕHº	
´

U8d,�
ÀJi¦DÂ#`‚+ì¨É˜Ê€äµ€&¬h$üA#d�nÀÄjC&(!»üÁ)D‹)Œ�j€äA#´i›Ê
W‡‘ƒhŽùaÎMlÑ¢¸Y¨„Ȓܧ�Í?
`B.\/À‚ \A
ˆÀT
„@ü…xÆ
äÀÄ,d	Äh|Ð)Œ�
èFG)
u¬
�€“€€‰À
¤
(ØKÐê
��ÁØ
ˆ
„€€Ä@!ØþÜp”zÂ\€bH4üôEë\»/¬ÂO€° õ¬‚, at NîÀè€T/
ì@EÏÁ¨f
Ä,Ì%]bÁÖá€/Œ* œ
°Ë
®�>RNs>cÑ(Îæñšè"^’ðLŠxÊÊ
 
ÆXë^ƒÅèE
¾
ÀD*ÐJ&¨Á&À	˜A‘'ü˜Á
D�¸\BxÀA$€Â!Á%L]·¼B4öÅòÎÆLî.TÆ6c·³’x˽µóãÑdûÓÄ}Þ+³»ê³ûc)壂«<³«j]òàeÈok§p�MÛdÉqoH¼MÜ8ÝX
û¨i~	{0ðB»NR (+u2¤è+}Ÿz¬úV«Ê½«þoÀRRÜ—RÖ\h¯zU¤ˆÎÍ@àç÷4êÈ 
tXré+ljä‚ÐÂ
Ìqhƒ*DÁø`¤€Tß
ð
ÂÃ/
ÉJ<(ø@Ïc
©*ÃÁ)tDä±ÆQ@ºá€À‚;@® A`à‹U¼Œ
»µr¥±dÆŠMy@òƒA!x@	ªÁ¡cA&;˜ð`qB‘`žÆ¸ @€W	‘ÆS«VÁ4Õ`  @B„âÅkØ.dÈ~¥½el[c.ßÆ}ÛÖm]ckß¾Œ«—îݽvé–+—®^¸„çÊ5Ü·¯±_n_ÎZÛ8±á¿‰1¿Åk÷îK½·>;^«÷—çY/o
Cv4ÌpøþþÅÞçOvlúbÇãæ%•´'àb³«Æ'IgúÆQq»_¿Ø±ë=ÿ—�^¸W±ˆ½}¬8ÙãÈqßj»�pëÁƒÛ
Î,¹³fÑu·§�»™=cñuÛooãîœÙêï¼
ûå>ÆòÚk­Íàò/P¦@€
¬pE—aRòņ0`ŒbTC&Uèða@ �Ž¸á€�rð–\â0 €
\èDµaXÉ�Ã
æ8Å– @àÀ‚°Q
TH£]XYņ
@ŒbŠ¡£†
 
(€
ˆÈÁÆt(¥ÒZC^Òðá�HrŒ`Š±‰"` `€¬XE!À�(4)FÎPÀ…AZ!&O®P
Å$@
P Šbv1‹G"°f`X\:K—§�è 
\¢2²FÀÌ`‚‰£
X
–Y
;Ø9VYe‘5�PÁèÀ$èðåÂ]|oÆøSA†è ÅÝ&£�Ï…hå˜Òva$�,Ⱥ‚è(KÓ?Í@EDhá
A:ɸ;†�ÚFdŽT´!˜ìZ[kÕRÚ½ðþ|ŒVb�…‘;†PAsSE°aŠ;2
¥×¬c€óO;|° 
š „^báäŠ*P‘�ðÐ…d<ŽW;ñ�5—�¨gmù™Ôäb2o�çiõ¡™Êü"@	Jf2-©™þÍZ´v	-[(ÓX†A
&ÀyŒeòãžËÌe5-IF1ì%ÚLÌ6þØG¿°q†T4ã7ÿ€‡;†Sœ…%g9ÿ Ílö¥¯^ìdsÉËÞ‚!J
4UDMÔăšc­Ì;Üâ³\bÅä%ˆh"£µãžc�5£‰×ä3~¬ŠöÉ"²ZfÂ/úe?û™kPc@ÿ%^2/81B ‚:Ë0t±D "�K¼f�(�‚’ƒ(|
ŠC,ò¢†-1ÉK\è%¼¸„ü@PCW�`D!&éD➈EY†ŒKLR–¿Ü%:±KD‚ ÈÈ.þ«š—À☠!`‰O Dª`Å"2‘ÊGø!– %ÆÂ(1âºDÄ%N‘	e^‚=ÃËŽŒAVtB’°„e4‰¡ÏN¤r’Ë,Ä"<á	Xtb”„8(t!d삈Ðe&Zñ^°š°¦.Á
]$HŠ]¤4¡öF8¾ÌŒêzxÇšá…]mPw
_ä‚n¹J‰.ôW[X#pÅÐ1ŽЫÀbÒ….isK<è%;B†uyÛúæ¼ù¤ÞlkK½\ƒ¸¬À’HÙ`X˜"¥ÅÐ!Õ‰¥\øâ¶ÃÐïJ3ŒH±cl¤â³ÍHS]?•ãëbËh±AC¬äX¿øU3€Ík^ëþ2ð53‚Ùi0´3zÅpb3¼¡óµ›ÞP
8õ
„A¢@ÍX¶CNC/€íú®ÜòB%X"-KÕ õÖbÚˆf
ë0«��EDâ†*®_¤c_fHv£x8æ°Œa&ü‘úÈckà`fþf†„†ïþn
€ê"AqIhc®èc<k‹
1@ñ3�4Jˆ‚Æpƒðˆ‚
DŽ6Ñ]þèƒt*ƒf7±<FÃZn.±rLiˆyH¡o†²j_(Æ°o`‘Qˆ�C9ô¥›Û¾pè’§dˆ
„ h¦þŒ¨2¨„£ò‹«fÄ2ŒæŵÜO4ŒæÙãgTÑ/�Æ\4r.ŽiZc[Ü£„æMj¶¥ÑDä �Ý&- ºCÕ.ˆÍRo­…@ìÝ-ÛNMÚTcÎBDÔzAÆñÝÚ±X"ì-øǯ�UêëØ«·/-ÞÅ¿vaÝÞN¥Ðo¨¼Ëþ©&ÛRâÑÞaq�x°05Ulg8¯„Ä-1•Šèìr-ë(ªê¯²®�¦¨ëè4-ƒ°&£+«²Ç:+C+qQ©ºrÇ\è[â.uéK^<ãù²ê'Ýj_°�7|£êAfäÐ*ŸÃ†¸Œ«¦£:V
;ÐO.àmâ^r?¶ÇæÃÅ¢:ÿ-
ÏŠNñàج+ÈêÊAî„�„æ.™®�ÐCÉÒ¿òÝvA¢‚³%D�ð4oóRbqJ
äëÞ‚Á¼íÂ4¯gŽAÄì
z3G°Ü$ê[‚§®Ýä¢êB°¡ˆ £»V£8Qï~�;Ò‚ÝF�E+þ0Šh§¤©ªô‹fÔ,¬Ô0´Vc7ÿêN=ã�ð,:Oà&‹ô~Ì<èÊ¥<”¯^ì‰Î,OÃEÇ8(‡¦ !#©¨.!õ�„¬ñŽÎŒÀƒ1]‚'e¨6�(6¬Ï‘
Ä¡9„ãÁO:0nüÔ:‚
ȾE%®ôöö¬éöâÂò-ýDl,Š�èêÑÒƒóX3ê,\௧¨ŠõüC/efõh²íàmxá}ZfðB]\†d¤ÈßÍÎVCºq¨¾2ÞVc23‰Û“í²�eò‰íîñXÔâ‚`«ÔŒ”Eã‚mMñ%ð¨s/8Ñ\´ÜâÅ@þLo¯ Eð‰ne𬥶ãü’qÁô.6í0à+k�‰K�”;:†çBMÄüȺrÓ®zÎhR6h)M™çd&´3ôÇ60Û®MÓ�ÙígÔ„ú,àÐc²’&]²e¿0RϪÊ=-._’ˆËô
`zC¼áäaDÎûæa
Qú,¦:\A®”êån��îì\b!ö0 éOŠa½ô«lÞ¨\ã\
T2ÄØB!c³/"ð¡ñ´f
îÈãþ@mn%RÔn¡`¡l‹Óâ44ëÖáÍ<@Sñîñ
(hW&e.Œû'N-ÒH­
Ñ’ÐX¤NPWƒþcnô×N)º`aEŸQõ¦}ÃJ·;ä.ç¢åÔBõ„á`-;„	w!p!-€
òòP3"™æ?bFÖztN[×ý¼Ÿ8ÆÛø~Š!2FÚ:†õkôRí8-4ðrs%¨Nx3é¿RBÞŒaI2Ó˜/Â4ËZ@Õ
pb÷n>¶MsT¾ŽÇÝvôÂXÏ	§·.,/Uèft,?èȳJp�6úÂlQT¥�Êúa¸Ï¬’r9þÓ¥6œò—
Ô0†Á@Ø=q鈆Zð)8QlÖþÄ®)šX°~y–-Ä-“T6ÂníÔô7‰w+Õ2ÍÇQ!牣+R<&þjyx¾¢¨krta™fÉÖl†L#
“~�yœ0wóÔˆAD$寔¬0íáÞ1Úc·h!.¦®40¤»DŒ°vtwÅ.`+áAˆ…ŠQ
C¨�ò‰ÁVôï‚êBPƒ‘'-DÌ,B/"ób‹…á/ï/Ym×’L4�·"Y°Ð17RŒï.¬?€ñ`Á1”ya”áÈÖ"ձܸ8`ÅcW}M5E�„æ7õˆÁŠOÃNc
Õˆ˜®-;’Ñ©L¨p{�’4iTvÊn3rí‘P" <áá.A5p
^â}€uv¯5/%(�èŒjžæ&ÓCâƒSŸVüþú%º
ûq@î(f?›a“Èâa¤À)˜c|‘†!®ÏÈã#_lâæ*yˆ¡›à€~@@
ÎD<j
¢Í3××2þÒÖÚMDȹÓD»"�ˆÅQ|%z­—¿Tt`Ë*l /¬„ÀN,àCD'ÕöƒõX¢»žð�á­
1ä*ì+ŽeÓÛä®nQŽ7ƒë×vËôXÂ1õ«,\v+Y-:ƒ`!2 at v@
w`ã´
ùgØ“�ecï‰%¹¡
VÇ(AŽ'j,¤È€“�Ý8Ï~K†¿;ƒÈP at f8€–¬â¢¯?mhBx<î1aª!…£¶É¾/øà…7ð:Ÿ�R·¿ŠRÖ�Û1´váu¢`ÀîàÔ¦™LÅ1óä9=¶€Îµ¿bÁj
_[¥f×@íÑù„ôºqV3ˆ!\ÀMð ´¤sþú¶8ï¢.Ar`Äm¡ăÔÑW~CË6
³`åˆÕŽá{–f"Ã*ïõxë"fíT
ÏøÀ”ŠÁZå
?Ë*	ºk¡£„û¡�f
Ûâ™6aaL¾
 Ábá±VóXˆ!NAld
¦òAýÙý 	
"ß[¼véZÈ°ãØd[¹†åK1ç±X6?RœUÙ®]ª0…¨€�…¥Ä6uAü…ú,¬�ÆÆÞÅÛŠØ_À»"òÊEèi€
‘Pku«ì¬Å@m�Ò1@@�/§‚u4]•ãƃ±ãÚd¸Xåa½ŽõúuŒX¬bVË3ŒÅ’-`·6Wmõ;lGcÇŒµ2€
,
ŸfWDk¶â	&�D‚ÉjÁN;2š¿‹±Å¨rÓ0ÄØÂô¹®üK}Áœ‰ûjЈ2¨¬\knß)£è°–
寨½‡±œ¢L#˜äí¹°è2XÌÂ\¬²ÍRK-öb[Ñ«‹18ËKµÄ”ë
M4®(Ó´Ó¦\ßÇ°ä’xv¾
j8D.œ1à€xÊx %fb)­XÄÔpC"á
v DG|r �„‚‚>°/
.è ‰‹h‰1x�‡@
ÚÑ…'1%â0
i(„"¢ÔŠ1è€ØW
a#!Y!¡þ<×\H‰0Kx"ž˜Â
­
³ôh’#ÀáX€
l
è°Y^Áh€
Ñ
[â
*Ø
Ö3
.`
ðj–â
1À8,à.�¡°$X+(a‡ € :f7b0H«D¦KZb§«¦äZÉTKgeQŘȔE´÷ë_iùG'}`ÃÍhFÕw QÎЇ8¨àŒìcýèíP€‚$L€¸ÄI©‹>UIÄK_þÒ{Ñ-â“ŒµdM©ÁW!Tð”ø� ‡Æ°–äÀ®®^
.ÐñÜqâ
 
Bø€à¨
€¤�4òDæ­
 @� b at o¨a«÷'ÿ~�¿}P�
2Mè%
i	v~¶·
–PTV|`Æ
Ã@!ãÃŒ0p
™ào`
ǃ
sPX8À
hR3kÔ
«à0d`	¬��ð
Cf
® ”éÆ_ð.IG jp—p“à yð�€QrBÂ`±`	;™„€	„ð
¯€
Kh�qЈ
…`
0
ˆ@þ
0ˆ;@Gi@~€3V% 
 €0T*@ˆpI�p*P
}¶ppð~ 	œ`+ð°sÐop0”n$`	Å��	
\ð9
°
Sp¶�	qp
{d
4i	>À
XXp þ	 €
pðÊQ0,¯ð.z˜à€±
ið{$f 
í:
3ši> ™âòw±7§@¦öRá9°|)0�@5_@
ÊЮy€
ž‡@}SC©&
x ŸGQ`	–à
˜`KH
«ð.z
°PºðC¡»©ÔpC&
݉‚+Á`‘àbP
�°5Qò*fÑ!¶“¥À˧CËÃ7¥à£&þÑ¥—Cx!„ð¥ ¥ 
ÀÖ#c°QÄOp}€
˜ðÍÚ-…P—'Gf	¥p¹„@tPäÅ™	`¡¶#q	d+
�P–À
ià ùDX
� ´¦0+PëÚ®¢ð®p~>P¥I«
áU´
o�ˆOú¤KР0T/ 	«€À
k©¹3¦–°béÖ½31B
Ö°Ñp
©
¢w6óX²Y“Åw²ŠLñ3àÑfqHh‚¹ú릹m–ð‚
Pä‘áj`	7±¾�¹¿fðo<3ºp¹
¢ÙN
›
—€	7é’y ±C¦
~�Œr”›YhqÀ"Ck$9à‡„rá±�²PË6¥Ð¬W»�µVðG!þºGð
¯€eC¦pã�
³i=b ‰¬°¼€–Pi:ýœyûb\°
Bâ…Ut²Oã
�p€UD …P²ƒ˜oÜ…p­HÃ/…ƒú7ˆÀÏþ\–
?æ
l»/�	4BÁ
¬+½
!É-f0HŠ
 ¤yðBu
¹ Ú-Xðqà‡¦Ñ~A<]”wµzt³êªž?šþ%Rgü¨ù³?ü“'
xQ3Qxq
qP¬5çÌD³
k/0RÀp8Åp@
„pg_©	ª ¸ 
 ðF’Y]Ì
ðÀ	Šj°@ú»/ `F–`
¦ËÀ!*êA½
V€…в4Ũ@6ž'Ãr€À
tÆ‚C`º¿á­�	
 ðŸòrHì
xá
ë¬qàõ±ÒYʇpPÎl¾@Q bhãÄGÍ‘^œ¨À	­ÀŘ´/3…‰ j›(7PN¾Ó
§ Û2å)Á

ß4{U„ ÐC�¸Aí÷Ò5]ãx6£þYã?síYk¢¯â¨çˆÁyrÂû°ÁÎ(ÿ ª³5�úÀ(i—u‘}ÁtÑA}-Ã`Ò\Ù8¨DgÙXҵ´Å,dÝ{ÆÁ7¬-
KËàÖ³¾p÷‰
8 ›cP pmû¡Åãñ
^œn¾ÌÀ6¢´#á¢pâ\¬é w7þÁ °Çú±(Ø	t-wƒÎ»
HàÄÞq„P
Pm
æiP“( €
vrñB–ÌØ-�ÆfÝšeÌdÉ[&UþKöëãJ‘*]Ž¹r²�)“‡ïßÏ}þ€þôWTŸ<ngšI{n_?vÕø$I‚Mß8*Îôõ·õçV}?óÑ÷*1–,Cšüå±$K’&CÎM¹rîÇ_m‘
KvìÖ-b¹èˆ8
f¥/+
Ž`ÂdÉàD¾,±rˆ/c†
;ÖÜ++™,¡–«UsS70ø²ŠX¬U}Þ ÉŸ1ðX‚“Â
ZȤ/…ì
eiA�YhϽ:à‹WPõ¥�¼Ô
àg‰�%
KaŒ0WÉD0
Šâ
2(L
¬PŒåðB!Õ#^‘‹gñ¢SÓ-‚q

;â‘i#VàcBB¼�˜)ÌÈp	X|O	9
2aShB�#
N¡<�ÈñH,A6É�oÁ0"ˆ0€„�€6¹à¼Jñ&Ï
á‹aìb/8‰ª0J‡tù�Ë… h…UL¯FÚ³Ò%L1í
àfHdvŸ
/%Å8BNð‡Ômäi=Æ´ŒÁ¹‚d=Rú 	XÄ‚z>°×^0‡Eþ�ö2
PÜàFûÁ«P
q^¬b8€
L
 PQ°„4í
 Ù)"4�‡,€
Øö	̽
0@
YØú7cU¤�0XÀ	R ƒ1Døª/T<¼ÖJ�3³¿ÌÍ„߈CƒhEJX�c„,
Aü°D\Ë Àƒ
P‘¤
“Í	(¾äI2ÎôX^L‹ZXâ8�¸‚�
þP�°à9àÀˆðÜ
¡
)§øʳW
8×
| ˆ8ó‚ƒq@
‚‰@ÜŽ%(8º°2`u
(Ai€,€Á
†m%P°B

è=üþmùè€) ¾
µ�€‰Mx
-]
ìÓ8,Ë4¥Õ
gp�ÝÙ¥ñ§³€¨ˆŠÆt&AÛšUAã9U<»Ðy¦þæ|¤°A .(„ÿø«N@K
Ÿ¡Š ¹Íf8'ìL~§~`%‰` µéþr¦åH]ˆ:»Qn¨ˆb]µ¸	¹P“”q¦²Í1�eJƒ«ý«PÚ:´˜Õ�ÆÑÁ²XÈåÕJbh!
Ù™žÕ*“¿
æX(èlüRþÁKL ƒ^û¸²£ª¸�æb(#ÈM¬?”ï
‘bPÿˆ`®ˆæ(Xˆæ`(†‹™WNÝ´�‡>‘Õšæ›6i&†9`ø^0éb0jAç_þÜuœÄªæ¨Ò#ù3Ù…¶Â%“¾
äû8‘ŒSèjè8«�ÙCû°¦…>‘“ö+bXUÃ1…Æ©`Y—è«æ�+shBiÅ%Õ‹þhÇyF/
éÒHç·õ´À²+«Â2úê*Z°Á²`EkVð`¸ßþYTŸFTˆ	<‰Ì�(1ÎX¿ôdÈÞc
Š �—ñ‡xhÍP`ŠG.© §«È

ÜŠ}¨ßÖÙ~À*®¿pe´	?å_ꈒ‘½ÈšRÖã£ç��nµ0	V at S"@AÈ?Ql骜�‰àU“ZŽ+æŒ#†·€·–Ç—þe¿Döþ‘cîcc jq¿ç)o¼œ˜
7‰ÌîJÀp^´˜…¶ÈØ4é…2Qoã›±‘ÈcðAà‚#8
/¹
BøÕUÝU4>+;mhLÝvûÃK¾Ç5“ô>í‹ó<8‚‘@‚N�ªë­p¿|‰•ŽªÔæc
Õ0½“ÖV»Ô
y8oÓúØ"Ôn—šåÕªúVó@…ä§ö/ÔˆÒ¥Tá0áÒœ¹¦Æø¢`û‡x¸�xpƒ
©¨Æ(öwȇ>öÁO3¦�zˆŒaò�FÉNŽSÄ)¸¸ŠõJ´‹e6
Fü"þ噾ÀyÙƒJ™2W¼�ë†:äLËh£îQeC$¹‰Ó”d“5�4�
IÚö™œlfJ�˜».sœ±-¨ikáߢ4CÿÝ¥T©LE¨d3bÄ"­h…F´B$F	�	rÚ6½‹­i´K‘1ÄèÁ䊭`ŽÙ~Q‹ ‘lEš”fäR/±Ñ’�´B´]鈹±¤FzR´ÐDäHµ
/(“$9¶ð“F)ÊoV“/Bç(´²�MZ¡=êôŒ'?yp®2šÑì
$7Òʆä¢+‹Üâ“—qH2ÄÈ�–Yé!CJŽöª%©Úq­Z]‰
XÌõ°�&(7‰‘ÒJòþH%æ_µ2^¤NbI©vÉá.©3Ñ«*Ë{1ˆ�
‚G”GzBÁ@ŠÉÃ×pƒ9æ±÷˜gdëHBïŽWÀ+Ø$ä]ð¸*!žXŽy¨´ò)]êB¬ÐÕD†t¶ê
G#iƒÊeº²ª¸ˆž‘^M6´$Ò”0–e£ÍVð"KêÔÂ�-rd°âHΔR£¡qasÈÁx&VÍt0’Ðx(“£ICà›VŽ7QQ"^†c=®Á9æ$'IXÂø¹Ê$ÚL(™é“ºp†0tÙª¦–[¬‘,óòˆÓÒÊ03[0ÒgB'§<å–R’«±x–þÄu§E•Eò×jU+¼|
ï’æ=nï/Á’Š\®vØ"’U^9KH›FÛ±jJuEŠ©h›˜†p3'Å	Ý.J™–¶R'M	rŠmp¼Ðì\™5F,xÁ7æÔd�ر.UŒ¡�‚gaûèÂü�
�5£�ïa‡52¶1ü,ã?ÿ�Gx4HðÁdù(Ð*‚ñ-aQŠyÀ�_Dê˜Ù�2¼(†/|1Ö[¨¦/QÁN.`�76çfÑÙ0RtDâ©ê,QûܶBÙ»²EV¯žV±¨y¼‰|ŽPÅyû,´)Å&;e׿ô’”G킬 °/b¬ý=ÄÅ]©Íg‚ÇOÉþ#Ýí>7ç×ÏPךÑTÍ©	^Î8OÄÆB	#;™“·zæ'­Ð[1tÁá$__Öç’ªô¯»cºe’€£“u¡dMäFÍgœ2
‹ÆÑÁ�p}gH�†¹iÍá�.r¨È¶qòÌU§s‡ E\†;pîÌ*䥗^�à`¶aâtzNÉH©*TQg]Ý)l)áJu%2Ó¤~µwá­°/ìL6ÚÂZ.e“’‹íì#ÛÙ.Ïzý#y€cËÀ†|åA_û:ÔïñŽ¹¡Ðà‚Ά+bñÄl¥g¦ÑwdA«©¶+έ@ \t—Rè2/‡‡ÛþÂlÄ·òxè½¼m/K•H¤¥Ô8§J)V·¶Sd
3ì·|AùJñ\¸$“'£„jhXÖªaBF»P)!ð`ðN¬jR
å‚“Â’¶%ˆxx8Á
^¾xI�óq¡¿#
)CÖ;óZ¥\Žôf"h�ˆ
Š8À
‡P…«‘éÕÐQ®©$e«dV—+ø2Ì„ÜÆ¥¦Cv¾ók�
i7Þ¢x:ÏJI®]PGj7<Bf\ræF–
çÏ|„_[
2(¡IIÙX`EDï,˜�Œ�ÁZʼn‹Æ€
€Â …E“¦Š[,“^x•qXO2E…cÝIþWÁ^ÝØ„wùZ1¤Q,¤Ú0Ä(tµ‘„v1!E€–ùJ)åÌø¤ˆ§eOZÜbxÍQ�DWUDQ (¬‚'ÀÂM,H2„Q
Ñé±ÊÿP
-$�Ì¡M„QNÌÞ
@

þË1´B'Ð�¬À
ÄÀ,ð‚±ƒ �Á8’qÄš|-Ü�GŒÅä9G�$‹÷ÔÈíì¹4Ç\1^N¨2¨„ÀjrÁ*è£‡ŽÄ¢H8 XEØEml¢TX†ÉK^ ‘/ä
’€‹1((C¨‹*¸
7©d0Ü�
@Ü�'\É^ˆ•ÉB’YêÏ8HãE)ñ‚Ö~ oˆ‡ÐvXÓ²ÂÝ؇¤Fà¹ÂL©

˜€Ø
¤@xÂ`´(Œ
¤€¨�-Å'ØÁ�¼wsÂJu ØlÏ�ã
ä@°
ä@Ø
Þƒ-PC
´+dÂÁ…×€,,ȃ*„7¼·ä
Á Yµ”ãÁä·•7%¬‘-¼î…ò3"Œ�Ÿ÷8H£uГRˆ»ÀŸ7–/c-y‚\Á‚óø•§� PMôÂÖ„'p
Àt1'¸À
ü9h(7 3ùBôÌÍ\+\ÂŽ§€òBlºŒ�Pó耀[
*Ð�¡Ë·�ÿZ'Ø
ÌvB 21,Yx×
L)‚“¯
y¢§•‡ÂÔ7lÁµG=ìÃ{ŠŸ?ˆC~0
ùƒ=PA 8C"ðAÔç:À_+, €*€Kp€ 
Øs\0ÀÁ¬
à�%Àí%\Ap€
hÀ
È,"4›S‰°ÏC\(G0+¸yˆ@ À
Ø
ÆA�7¯r­ÂI"“¥4$
ÜÀ³ªh2dÆnѲeC€
‘SÁ!]„銒Ú
° .–ð
güѧê‰G’iØ	Å{ì釞pN�eÈ?Ô„
 Àoò;
oxá08ÀÂ)&KÄàà9>0!„T T
}€R®
ñÄ“UX°Ð
À!å*PM�ae˜_€
æ–µŒ!¦•;N4vP
ðˆCˆ‰e
–ŃîÕXXZ!ɤalZEŒ ‘LYA�Áã†.ã’VR%î–clyuò
N — ~àL|‰Å˜d†I¦y^‚ÉÄ‚‡ DâT9ÎBVa¥1
Þ¨‡<ØÑ�3%
ú0‡©4¦}ìKþ8ã>ú�Žl,¯±Â"1ŠH¼!ƒ lB1„„eYlVèCÈ°�Éq@¾`4G€àà‘ðƒ8@)
V
7À	ò	qÂa
-˜BQz±Ýì"…ð�
Ä’‰&„€bèxu„>€ 1|§ƒ«à;ˆ«,
PÀb x
@&òЈFüá€`
�‰1|
°›.Rå$|\‰JPÌR–šè{t)XôF?êÁŽj¸
Mad“3öQ(þÃÈ4¶Ò>òA�l¬"ü"&©QD¢¹
`@þÄ
D”Ì
V Ä+Pчln
¾¸íkpƒ8d"†ˆ8Â"ª
‰‡¨À²%
FpÊ‘g)0�ˆùƒ¾ø
û"%{A.rÁÈ$ŒušÈ…/(±F¨K«–¼€˜1Ñ0 Cà†ZX»&Ň0x)¬ÌÊ«8€w�Âsðp*£™ÐÄ!¡Æ”n7Èà…'á¸À.�É$Ip�rB°�¢`U°¢¶ÈÁs°8`ÂÜ„ˆ"BŒpµ¦ë]0R  ‚¬Õ…vH„S´â»Êþ¢ ‰S`â
±t1ŒVœ‚W
ŠAjÇBNky`�ð@rÀÎl!ÏЊ]ØÂnÀ¤¾
9~àP`Åx¡$€¡ƒÐâ0dÆà,AIƒaé ß0!2
`rvàDçL�r)+€î�ãæ@A¬î°€à árá¬~aµÎ
paA”e
àäp€L�Äþð�In�nÖ�a\¡ÎŒ
ÍàÔ0Nï
6@@F
à 
TÀt@ìn 
!LaÜÀ
0
©ˆ¡áÞ€!µf�µÌBH0!¶`ˆ�µX
·Äƒð,Æ€
€
ŠÉ(-
„Š�ÒÀ�`ØP	±`&çþ
Èà
HĘĶš²�Ô¬ù\ëIªä‰ªdƤDº¤šá	À¡
b`@(ð²!€¼ó,ÉÁ6b
rm­€`^
a*N¢ý€
"ôgJ"4á
^ÀGÀ
8 †
ü jçè
°¢
`
  5$Ì°Œ!±±?Îþ‹jDÞ€K *O!Äàb¢@ˆ
<lòjâZ7ÑBú µZ+zŠ
:¡ó
„ÙÚ	Ê`�]µ‡ ïRà·èµUî•ŒÈøÕB±
l‰‚öú�ÿ¢hJ$P¬áB
LÄ¡ÐL‚¬7© ˆ¶
©äMŠ³OPa;+i¯–À¦™	R5÷X�Á_–X
Žà·¬@‘n€�þ²›þÛ¯NN
€²“Ίµ'üt
òæ
¿€	¸êto1‚áT`×v`ã
cá:

P‚áf‘R‚wNáyÅæVÁá

Þà
°€”e(¡ÄÎ*qät†Á4�â Ÿ¿
–'q†! m[j†pÈ€£H&Jáôð@@^°ŠŠc‰)Xáü€Í~’³qÁtØ"¿\![ä(щŽ
 4A!&…Û>kS-Á:™¢F,ʘC/Z�&SÃ/¡Òâ
øKØ£g�îÞâ
"fÕÀê8j!tÁb[ëÀ
æ“Õòà
A 
ÀAkËä‹„¬MÔèŒÞäƱ¤(”!×Úü›Ì
z’‡|B›Å£
©ž´a-„‚–ÚXã«¢€×SÃÎl£$Ðü��;·?Ôr ^`è¨"
¦–@^à–`
"øÿ€Dà*ž]yp5 3U£*‘H¬<
 ì¸( `–<‘"õùóÆŠ!¾T
K†²aªš´˜2çO¤Ff` `J.bÉŒíZE¤ÂH
©
ÀðåÏ£Gx�4)ƪXœ‘Lœ‚*k˜°‹·nõ²™£
+ª Â�
,…XñÀ
GvnÁþ$ˆ
wä"*{)¹gÌ1ÄÔ<
�,±©`¨
¸‚&áƒä€­àÅ
Hä#Ü‹uf³Àè*cŒ_ô‚ ¤E+lf¾
 &0�Bp>
,
EªHnpð
UèB®ÈTðÀ
£é‚«×8 V4LãÂ
˜ˆH!¢€8
F¤�-Øœ
€€t`5˜B&‘<`
h€¦…ЋtJÏ/nÑ	<<(�iP+ŽAÑc´âjÈ�
8À
À€
ä 
Œ(kz:Èb诋X_‚€‰¦.»-p�
lЂ¤ÁË|
v–þ@†p`­‰D‚�vÑÁ…V”¢ÁÄD�ÜÞ¶ 8 V
N”¢48Ó�¾h+\Áç
lp‡XŒ±„š„�è@M`u'ˆìN$ä ’¦´^�"ø+=³0F+Aè ´ÛE{aŒbtB؈²Á¥‘p…5Ø¡ºØ©¬ËžXxvØ°®ö


VÄ;`¼
.,œ×4C©*
Áù•W^
Š „*p¡‹1Xú�0'F°Õ]ù`ô‚ºàu:§r8€7 và	¶p.O—Qã5k`	„ þ»¶uì¤
ˆ
b5p³Ö=ÉpI÷`hrö*ž´I³â©€
O ÿ §”JÕ°ã@ÁÂI‡¦úÐð�ó¯0GÓs
«À±p§€
§à	Ápü㯰
«PÉñTÅà
¾Çp‘"P¸
¦Ð
µÑ…«ô)1
_˜…ë¡laÊp
t¸'´
0EÁÅpVå
PÈY8l¦ „É„#ãÆà{˜tx
¹
VÈY(µ¬—‰®@`EG@'¡…¼P…hEqU8„™‡T« „Ãd¹À‰¾�þ2
«�)6ijÐäÄ
NøˆOx‚5ZX¾à
RN„ÈuCª€#·�twSÔˆŒkH‡ÑH4fh_q�?h
PX…(Ùfd¦
œŒ¾
=á	Ö€°Pˆ»1É`[$sE!†xu8ÄW’h	Á%A0C—Îyïq¶ð.“X¿€SøQ‡´Ñ?° $r
®��«À	qSNHC‘)J�sÔ
½�C¨¥«ð
ÛA*E	Åð“ÒˆëÁN à�h¶
Q²Qn§à‰0W]›x
N‰!IɈœø„zÈeŒ· =·Ø– @fE)„°P4ÂÐ	j�
I†þbSÛXn¨g‡6g8¸*vf+ZÐ
ºÂ+©Ôú`T 
pfƒq¦ûÐ<èƒà¤&FqO7è1NæD±™ë�:6¤ŠÀÖ
çRk†
NÃd]ùƒ#Ô5|¬0L7õ‘Ûè›7±el
seu.¢òTeUd
skÃPdÃ6In‚QN¨lè‚.£’‹„%n|É?Öµx½
•
œ» °)š@KÐ#+�ÂGwÃNòt¼ 
/"Wì1Lè‚!ú"þ¬0*#�ekÀ
ñ–e*=e·£uSy»PòÉþ
Ñ	0ÛèŒe�­ðc›"ªd‹Ð
H`	Wƒ†–™’¹I$˜,öJ¡ÐT�+ýP¨ô+Ø ­ä8Xä
+ËbûPK>ˆE*¥c›¨Ãf-Š›��#¯§F3�‰•Ç@3|	yüsúºžù³P¼ oò¨É }	lY¯Æ
·’+ÿð‚ÞÊ¿ž	À•YJÖ°Iý`K°`†€z4„K0A‘ŠH‘"ÌÈG£¯º„ÕÈõ¥¯®W0‹œ…åD_Š<Xá³Â°¯‚eŒ>,NÖÅ»é<ÑGóÇLø¨3ž±¦ÆÛ=­¯Ï¬Æø³œ++N»pÄÃ
²ä©•<ÌhxÁ„Û·%l:iË–l¯³°L6[c6Ûh[ÆX¯Çq‘l6ÊÛHž »�¢]Ã@\_z]ÇÂüËŽlª¯,�¼\¨0i¼¼ìÚR‹:ÑŒÁ[üÐË
Bµf›á{4Ùl4ÄL½óŠ2Žœ9\¯Ê÷ÐÉPQ8LQ;[¯œnV,î¬Iîü´Òyfÿ
.Á»,NÁxàƒ` 
Ús�ÅYßõŠ?ŠÓŒ¼ÔúÃ3Û·b¾·Ú¸¨n¨¯ †:<ÎÇÁÍÑ\ßëyÙŽ¶-{»}i‚+àä4¼ÆÛ¼RNX¬G²6Ž½·œ–a
õ¨È8"¥ïI0`-¸1^Ð ¯„n:îǬg4L½´ã™mÙÆÁ oñï.ÆDÎÍ÷¸ñc¬¾ÌIÅýÈÞΧÞN�
«sÃ`«?±ÚápÍÁ~¼éNæH£··
òI NŒÑ<á*+NÂþa£µ–Ã5�¹ÙÁ%Ç
tøk Å_#"Y2dÈvU<Ö‹VAcÃN:¼“eÅ’‰íÚ³×΄AÓ+ÖÁ‰‡!3¶Pc²…½€õJV«$2\SC"4vìâÈd
³:Dê°!I°+V$:±ëZ…1#.tSá/`À~…<Ê5©L‚½´›%°$ÚVÇŽEL&L±âŠ[’ìŠâÄZ¸ª†�©–dI¯™6$Fo²a;æ
‡ïŸ?Öÿ\»f­Ïß¿xܼ„jöÜ¿~ìªñI’Û>qTœý«¯_½~åäx
-ÂÈ»ÅJf––Zº*,'R±+÷”2È¥¼r+£Ž&š2±D
««	»j¬»ô„AI—^š,’jÙì»´Æ’¨&Ò~Z±½zO¾ónq‘ÄÅ+J¡Œä¬Â“ Ú© ÍB’© Ì¸Z蘫j“§*ñ
ð³+K㯭�hùe*µ´ˆLµ3Ë"³ôê¨ÈB󨧎ÆÓ­�€I¨®ó)!˜~¡Å0°0ºÏ”ÀJR±œäsËÏd`=þ¬>¦ê”¨¿È—ZÌ

¤†:º5Õ^CöÙZ“‡*š‘f‹nþ‘‡l€KÂÆÑBšò駟|òÁ§RfhÆŸ}¨³»[â4<9Z¦Ì¬(G¬nù«*	Âp<ÃBK©—_ dÊQ¶@Üé;‹¢²ÞH1Ȫ·&¢*ª¥ÆÊLW‹¼Ê•"¼@
Õ`òÚ,´Ïˆn‰ð>·.…ÌP±2Šl$i„kE†~)H¥•îM¨G„Òâ1.»‚7"Ñ�Êk$“yŠÓ–HN8Ñ̈rÑ´ïæb¹%¸àÒ•~¬ì{í=›Ç¹®
o!©~‚i¾˜@Uqêµä"¨¼sÝÙ¨{þš¯—’:Ì;�Nøl¯¶[ü£‘ ¼¹ ­‰{Þ—E²¦¸ø-Õi
5«¨)7[é!ÃxÊ9«Ìv†«/Ô%ê	¦Í˜†¨�v46Ù×öYV]{lsf*À	·œß‚«fŸq¨X†·qÇÅg9&ÑFÝ|æ	g•X4c*®¶z"ÒÞŽ8½>:öð"⥨ðÄïñVÄB噧¼"ÊÃÓâ¿Ïì.‚ÁTh*“ˆ™’°�xJ¥;
Ÿ¾Ç¯�¬ê|‹ÃÔw"â]q¥|NéX`n1¼]
Á›S€AZ0D �šA "žLÝK~W›!Æ8ÓSÙ!­Úa´òþ­)Š A’1z™�¥hl33`ùÀw‹xIê_�R§¤B 
ºN+ÙH2¬òm/ab\>hÁŸ£‹ûÙø´±."MŠK±LIZÇ` 	IÂøWÚ†u—”Ĉyû’è%©òÅo-]|�ズïù…<âÑ×›>v cäNw°‰Í?ÞÁ�-¤¢OðrØÑ
laãæxrÄuŽrL"?Ø‚öÁœêhORK‰ÉF"³Œ
ë^;œFxL†åÌ3MñÉ
Q²ù2ô´O6#ŒZ
U“%°‰mñÎ#�6bÍme!zò¥^eq¹Ê͘H25dEZRL¶:ï\(@q(Ɣɟ�&J3ìL†¯îÖ³ž±ÌF€LƼ8’°ÚM
îIà½@uÌ*Ä`QÂä5õuOMIt zZÜñU“‰%"žü$k˜EJSo9츶š¡�â‡9ý8G7~ 
ÑuW¤á¦B«¼�Õ+S"~ÒNÝå ¤y’1)%¤¹¨K¼p-�¾Ã#ùyþe0ôªZc Ck^sKë²¾Žä¥nníâ1ŸFÍ•ÁleB”ÓàÂ"Qª@	-_ÌcVÆ!×b…ih\‘Dô†¢½ˆ÷+¡Lƒ
¢˜,-Ó(1kú¸‡&¸‰
Hâ³"1Žqe(º‘–º ÆÌ0Sù¨xPÅ–�:
#oßl‰@„€Ì+IO’l¶¿·Îd*õŠ�ZÊD¥jŠ›£RHIN‚Œ¹h„¾€ºÇXU¤„-�D\9¢Zhˆ#–|øsh›ˆ‚<˜îÒhøU£îã‹pÜCwý
ï«$µàZ…q«3Œ©T†)•à’t·¹ýˆÁý¬Ûƒñf’°8ú`¼gã.ªªHÑ'ȈSGÆ™R&þ8Öúò`flL¬
‰�Á^w3Q ,/[Æ2q'&‰\*½Îz½“ÛA6r¶—#z=µLÉ{Lúè#uþô‘$¤cƒªT
bFTÃbIŸl–`œ•žŸ
fxQTçªÅ¤¼7À˜Í³¼|wQ0#ဳž|‰2vvH&ŒvŸ­n,ý˜@˜|,}Ôäûþù”ksl<AÈqG7ÜmÁÌú˜2møàŒu„¢yߪŽ/ÜEÍž#C*ˆg¤ì؈­¹ÛåCšòŠ$»™ù(Ó ¾™a»æºËÁ”¡«¡ñ0)b"*âó/3
=«&¾»›-ér•‹)2â'ÔJ'L!Š™=°Ñ1¼i@ÙI‘pJ –ÊÀÀcªîiÀÏÐÀÒ 'Ê Èðƹk®¤¸	.¤‰$ÔÁ}šŸÞë)oª1’±ÿúAL¢:Û"‹ÏШ
ƒiJ§pÚ‘a*"•âŽTÂ��¾ÔþH=Ú:@-´#Ù#
:[ëkˆ
C-•IA»þê’]àc™²pY(¹ÖØÛH…+£v°–+,øSe�¿Qt
|À_€ˆÖ�ˆÃ ½ Â¢¯#±äå±3�™•ùšwâEfãÅ�a�¶�˜þ©E¸#F¦âÃt±Ô·\4¡}iB:ªÅ½h°ú!�ñ:�ÂiDzjÆKy½ ‰•ÿ*’¦<¯\,¶Õi§ ÓÃn$Õ˽	ôÁ¯3ÀÛÁ:4å{‹ ±¯c�nê¼Ì:�’£”ÒEâ³£lB7ŒºÄ‰Â=|= ª”nŒ£zC‚EÖáŽ1J©ì='4FÆ›#(¼(o:þ¹½þîáÈîq#½€…Ôè>×€²Õ%ø“lxiÐ,,lÑqø²Õø‡}x�)“JüWÐÚâ—w’͘-‘„##wúFo”ûÊv´+òÁw2F£F	¬<
L4ò2Á�Ú»[„ÀM’•ïK	Ô®lË9#±tË�âKñˆˆY)N›Ë³lª$L´¸ì½:̬Bˤk´°žR“™Îc"xò=Ѥ̠«LżÌiTBÑŒL¹ôG;4>·lK°ä˜z±�¹ÔÌÏtÐRL²K	T§ #¦�NwÚ)Á|CҼŨGÑ\òA�|ˆ?�ëu
?’ó‚fÐÄÞ8žlÙþãЫe
EØà�^Š^螎HŸKØá;ctÍÌdOGéG½l¶ùdKnDHðš6GiÏ|CÙñülOR»÷TÿÜ$\äK
‚ÀalÏÁì4b�õψ�ϹüK
•NÜ„OÓdÍ
ÝM×4NÌ„	
Ý	ëM<ãdÐU”7<1¾ûË�ÐÖlPû¼PõaM
=NÍQªC‘ã,ÒÉÒM"Qμ©ëkH¨¸SéE䨽B–x JS’–z�wÐ2áÐ/,Ø€?Þ	¹òT
Wœ¡:Q¼ÄÍTPö@Œ¦ÿ’G
¤E4ÅGAU'�SwþjÒMÑ›ÚÓádA;ÝPçlÐ
ÕÅ°šK›ÏϲO>íÁÄÃÅÏTM÷ÑMxÚ1ÎìÇ*ÄÓ½O�QÂtMÓ$TM
P…ÕîøËYeMa
ÄÞ4Mrl6„²:!eÔ
ã˜á”Í?½™U¥¡PS˜£ºSuÏ<¼XÓƬT“BMi[Š…°…pè)O-EìLi qè‡0íNlh¹ga�}
¦©%;ª~õÏ;YX$Ò²xØY“Ø„=X7“³°�;1X„
ý×£úWšØŠ†í×�ýزØØðbX•Ý–…X„­Øþ—…ÙSÁØƸ؂}XñØ™åÙ�]‘–ñÙuY ½ÍX�ÕÙ¢]1*Š�Ø=‰�•
ÚrÚ€ÍY¤Ø©ÑY«5�ƒÙ¢-�Ѳƒ=Ùaù¦
êÖ|Wei
d¥¢Ô
UÓöÓ‚—Ó�Q„¬{hSX¨,Æã´È;“
ËÌòj)÷ÙWï ÑÔYHÝ~+Tè“=²ýTŸ	ÕÅ"JÕÅP“ìÁ{±U$L]TŸÜKQ ™Vt4¢Ã0ïø/2ÉSÓÌS ›ÝÓERÔU7bñÕALò@2¼Ï�Ü—€Ê½
å·–RGLÊEfZ^ÃÜstÃ3a�Ï”&i“�è}ÆeÅþ¦åÀ´ä)l´Ü�Ñ’Ã
Ö_åÐýi¶ÍÑÍi-N…üÈ@â]®ãÇ›:±øÉŠnýÖw}Jð›
PºÄ/;9â	ÓkX?2u¹»Õ|¨ŽW(†¾)À×õ=÷i�\ìÌ_¦ÃdQ´dÏLMËÐ\ÕÀÕl½Å-U„$LjAÉÍœÞã£ËIÅOÊTÔæK*™Aù4©›Ttbœ×ãˆÖå@nV%$¡–DQ	/dõ´–BÂdB
ÄPÓÀ¾k@åÅLl•KÊ$Õ†ôÔþÏ"M_®lIeÔ±N=ÔÇ¥Ð&þËjÐvŒb8¾ÏiÒNb†QË´š8†SH�ؘ
¨”�dþáR/Èĸí�Nd¿.kJäø$}—{ÀWh`
!¼´ìª2DÀÅb¾,UvŒÜ=#5‚G»úšÖm°ÍNb¸Ö\;ùÝŸ´Çl•ÅÈM_}[An
B]̯Ušl®�X âå°Da	åaÍí^7$e<mœ�äåÖQÅlª+*Ç\†ë¼<äbÎÓ4:œÅåAfžÀ¯3©pš]ØÕVë
ß±TT–
H®ÓÑÁµ@\ˆñC¶ò@­	ÝÖ�•k¤ÏpžHþS<]A˜|³
Ñ…Vðã|€Wdá�þuJ}À†3H…òÛ�j	¬à`W—Ïd�Jr‘ä6õ…bˆ]Pi]Pþ]à…—æ…Xh^�V¨i›6œ®imÚ霶é™n…ŸÎim
jbÀi›¦é¢Þi�6jb i£þi^˜é¦†ê ê§&ê¡Vj¦>ê®VêžÎj©æê¢þé£ë¯nê«Ö겆jžÆi±&ë²~ë­ëžÖi«–k¼nk¤æê¥j³&j¾vë©ê›þjÀ®ê®æiÖêœÆê³¾k·¦j³FëÅêÀÞë¿æê§fjÉ&kŸ¦ê¶^ì´ëÁÞkÑ�ÆökÏ>lmRíª^mÞë¢~lÖ¾k¼fëËmÑVjšf–VVX?ƇŸDŠ~�Ú ‚r}‚ié1UJFn¨Ô+x�þèo!—êPTx_ðnïv…ïö…\X…ò^…ïÎòoòVï\ðóöîU ïófoúönöVï÷ïýoüVïóoúpúNïò~o÷öo÷~o
7rû6r—o7ð·qŸð§òoðñr§r.÷ò
7ðp	ÿð
—r)?pò_òúFsôæð3¯ñü¾ð(òÿŽp�o
þ—søîo4‡o?ïð:OóðÿnWp…WPt8ãþ$§ü�RÒèM\×v=ŽQœÎ§tž|¸‡sePjÈTOõT§†VguTwõWwuXoõZ·õW_uZ‡õl`õ^§u^Wu\ÿõY�uY_õlP^—õZ_öVOvjxv_öXv]·õ]§vU¯vc¿vmŸõ\Ovdov\WöavfGwköoÿu_—öoÏõfO÷nös/ölwvW_÷Yß÷mïv]/wlxb·vy·vh?vmwzgwbÏu�·÷kvw§özWø[göˆÇöqÇx`'xe÷x‹7øx¿õ€÷kïwþ€§we7õs
G^ŒèäÃ’-aÒ¤‰òeÍ�7!®D(§Ëž@?‚$y�R…ýêýû§oŸ?}M§6•Ç�J³j[ºýƒÇîŸ$I°é3§Å™S}jýík«/ª¿¸líõ³Çti?¼yóñÍ—÷/àÀ‚.lø0âÄŠ3nìø1äÈ’'S®lù2æÌš7sî¸Ý¾½~ûýþ«÷ômT§Tÿíãæ%”4*àþõcg-ìX}ã¨8[·-ð¨k÷Ù+ÞVõ[¨þ˜®nîü9ôèÒ§S—Jý:öìÚ·OUËý;øðâ³[ß¼¼ùôê׳o?•¹ûñÄýÙc;_Ÿi먽SUwµ™4OÌ&;ÝàæŒ?âlÑÌ[¦Ù§Ü8ùÍ¥rj¡Wž\oY—\Zøa\¨…Èa†k‰(܉û�8¢o(º¸"ˆÊØb‡jxb�ú¶£Œpµâ�
©#�Údˆ;Yd’K#‰9>‰c�T¢Èd‰URÉc”Iz)¥�F
wå–"šI¢‰`F©$šXvÙãšR2™â›8Ye‰þi¶)Õ˜,ʹ!�)Úä•}vHTÞ%¹OS:6êTk^
Û®¡6…ž­¡Æõ,µÍAUk­S•¶lÅúí¬9öªlµ¼Öúí´Éë-·é®&%¯Ú†K,±Ý5WctÄ–·²¶zë¿·«µÑ‹Ü£õ®«®»Ýj+ì¿Ü:ë\ÀýNû/¹ï>G¯j—Ç·ÐRõí½ïvX2³¿½…ì°n±õp½ÝN[¯§ã¶›2º3+¬\}ÂõLo“Õƃ
þ©4#à?ò¬ƒÍ�þŒ£E3ûÔƒmÿŒJ¦9Ed?Þ•ç5­5Î{h¬¸þ–ã¼×J9ëØުɶØg缶Ûá²
·Ûâ†-7Ùy›
wp¿™Jkàj†=8݉òM¶ÚcûÊçâ‘Þvßo~yßÊQ¦Ú{‹Ma»†oŽ9Ý‘÷åvç}¸å£OŽ¸çöù}²àŒ¯
éêœÇÞyäɹ­aTð©ká°U¹–
6”îãÎ¥bU³ÏnhÑ6u?ïH–{¸Ú¼«~Ø��ß󹲉ėºVZiy�Vj^Ùñ÷Õ†¯«øî'ä�‰²_þû±šÿ~ý6”>÷}m~óÕúè=ð!ÌYþ\Õ¯¼G¼dÝÏ€d’ úæ‡"^è�Ïúÿ¤÷¥�QƒR 
S£Âð}€ê£VˆA>Ѓ€
!Š*t¥Ú0|>ò`TB$‚%K}?ôaH¼\Mp‚´PÍJS�ü<…6¤Ñ’üº�•
‘jf¥×4£²ÉK9š—›èIñ/ðð d@Š”
ŽxÌ
S|¶£0–�§aâ‰YB#ú°‰±¢ýD¹“Q‰b”:�ÙÀP6��rô¢%iIãÃ1é”g)�2YÆT34-¤¢H«;¾˜‰±)~É>òAŠ<
R��¶·¾ý-pƒ+\ßr³ZXmÍ‚¸˜´œ6ÍO`ÏÔц@H‚m0ép³«Ýír·»ÞµkTâÁ
¨Ù³µ¶�-o:d�xÜ–�`Æwã+ßùÒ·¾ö­N[ŽçÕ¤¹C§<…ڳ䆪û¸À>0‚ù«¡y¡¦”’dÑÛ©ÑqŠ	¾0†3¬á
«‡-àÀÊÑÌë_ˆ‘Âo„Oq9¬â³¸Åóµ•xÌZÚX
½cÌ‹þð\¬ãó¸Ç¾]‹<ˆ6©..­¹gaçô¦xZ3¹ÉN~2SÛ7Þzʆ5aYøɬOÚÊ^þ2˜Ã¼F¹ÁûE¬‘Lj>q‰¹Ín~³—ãRæPì·6Òpƒbu“^ŒáÎ~þ3 9¼ªÂ†x¹·ÁrY
ilÁõ Pb‘ÝS˜bõÛî~7¬þå
IŦ4¾µž³{°Cì�¼.pXkHÜÔNZ‘›ì¨Ñ‘© 
°¢Ž�S¼âŒ.Û<é- ¶äóؽ)샒çI°!	Ö°8ÊSÞæ·¹hGëÆRÞ
D›Å¡
M(4ÐŒqH"
’†ûÑ�DÐàJàÃW±®öµ#8Tóv°yo­)*€8êè†$ø 	kd›í~ÿ»|Ã
bSŸ;áÈ9¢PÅu$ðŽüvÕ²Z*ˆ£ËÓçó65~ÉEÓ�äC/úPï£å“sÁþø�MÙ¼ŽqÁ†~>úÙÓ>¯r)ú¸)Õ�|â¦	ÂJ[,?Åz\-â¨=ò“_W­“÷¦©Ëê·`sÒü¥ÑHÅ8ì¡üísß©¡â*ò�V}ŽqSÒp$k¦–ãýìaã‡sÏ4‹åäK¯Z¯Ü¯ÿý›G*âq•Õ†Ü±7qÿ BG=€ß~yÑ�¬VŒKŸ% V`¯h]W!ÍîÝÚïe˜† ¾Ca͘yÜê)Û–­ ¶àþÅ…¤MÔÚ?¬Ãµ9M®¹ V`§ŒZVh`×íT¢ÉÞ!ÿÅŠÐT¡¾i™>¡ûiȇeÅ`ÃÔ<ß!þn¡ò½EŒÁ†ßJ–¡ò‘ÙU8ÃÁáÔˆ­›¾áèñѨå6�Æ•eZßÁ¡ž´IJòý©ÔÎbÐ!áU
Ä�„ñ�
æ_f}…ŠkÀ屆
’!bF¦�ùƒéˆ¹¡[ª™
Ã8”dvfp}"½Q�7Ø%�y&jWËÍþŸÒp¤šµÍf¥&mzVˆpÄ8 äQò§-KmçgIÅjÆÌՃ̉•
'söVPJÊ2Ð$,b[sVg¨9Ñ„B¥©eOM u~g^Íeƒœ
¡Vì¡Jž]¡N‘Årzlž²E˜6À"œ4ê+Êz).:˜báZÆ졺�Ñm„]ñQ'ÎêÐpEm¬ëÍm›ò)%î&�ðbÇ*­—Û¢j`9ØäÉJí�F…UäæÁýƒ¥ô&Ìjm‹fåÔÔ"œ5$Í&ÙúhVŠì"ZÙÌ%A5ŒÕ2¼í—:ß­ÕÃê퓶E™
ÈÜÖÆ5
®�çΨ>�Ÿ8„�Bî†R¦k�B5Ìí+bšå>W¯jnjêÑþ £ÒÜÆâfJ»Úœé¶¨à-C5h
Q>¦(ÁÝ^©šÄ.xâ^¡áÔÌ=�ï9‚<дúî^Ê…VÎ-�\ƒ,®4”Å,Ã3ý¦òÖf¿b…3¶�êî+66¼ù–oùƃ¥fom
Ç´Í-Nýé8,C(Ì/ýÖ/)¤B(¨opòQÕÎF=¬Câ&�4)$ÁðTACÁ(°@�þ®/hÒ®óÚÃên3�Z3 at C*DÃ{zð{H§žÿÖXëª4Dƒ5`6˜C9€Ã8À°9˜ÃÓæ[�3Ì-<¬Ã¥,n5„Ô¸07˜Ã×ðÛð
§æjÎØ?$§
w4ðñAîñG¦¢z�3Z
Þ
ŒE3„�4˜qóq÷q$&"
èÁ]ÞGC(,H4tƒ6äñ‡ò(#&ü½6€±�´îG64C7d;$¯ñ,Çe kc3"
òAîb)lA4Tñ;r
‹r1óekð!ÓØ(Š…*£�ø6Ã5\qWóñ]3\JÛÙvoW|…âŽE"7C4hÃ5Ô°8ˆƒ¿‰C0£þ3\6ÈÁÞò	r{
/ó²8°C
—C
w;ðóX:�6¦Â{¯5(îô24‹/6ü²9€ƒAŠC
;ôCÿÃÿ�ÞrÕ­*{Á
·2Hs´=÷¨Hÿ$;‚¢2[ðâ^Ÿ¤”16pHƒ8pôÄôXúƒ¸
ti„qï²4,C7¼08¼ð845
uS²¯ôMt?òGCû²/ot7ür7üôTSõO>EŒ
¥Ô¸CÝ:3AËs5457ìôScCY›õK¶Ê¬IC˱\ô—q7Xƒ7tƒ7l´7Ìõ]ã5L®fð†±ôÚ±<ƒõ\�5X/6c‹$ŸŽŸWîJC"»p3Xƒaþ¶5€74fg¶E­ø:_[“‡µ“vSwÃj³6CÎSÑLô½Í±ƒ³_C7÷5XÃ5TC4ä¶nï#ÕÚrMƒ…ÙIC3´cÃ8·0mks7÷5²ïrÒ)�*o
4t/‡µ7XC\¶x·E–^ÿ5X´nuwòpß66´07@|3ämRÁ2ðµyÕ7yï2e¶X75Lÿw:º%WUrM³î
--- NEW FILE ---
GIF87a€Kçþ

6èàtò‰ó–7v4ÁE4àܲÅ�<rÚ#¯5TÝ3¯IÃÍ5×t3¼`áÛo4ñ˜3Õ�W#4N‡£S×uããBàl#ŠÕôÇ‘q\vF%ÕHc‡d�‡n�É4vw"Šâx3Í–ƒÈ˜ˆôñ„%An¶’IžAF5nãXS¾¤àK	…ZUtÑXþü£�>ü
B³£„%—ü
 [�1�5½|øft2Í4ÞÔâ6ä ¸H]ââ‹16Æ]‚
†Tå¸^24Õ|sàµ
}#dèTS’—‘Ý7dlqˆîÁ¼­#¬#�\Î4Ó
9ÌH(Í.}à"fˆ˜�‡Ã2Ô‹eGZƈ"â4#™4ìhù’|´½å6´\å!¶ ƒ üèRH†ÂÈHu`¸…)j0pAZ
\œÒ¸Xƒ{ò¸€q‘Š0ñaek¬CAR	ǤXÕÀ@šãæ0‡;òR®xtã/ùbU«rñŒlÈÇ¥vµ—^áÉ×ȼs¯€
¬`õê×zm¿Ø‡Ï¡‹ê
m[Ê€Hˆ.%‚€KT£ÁÖbÀÕ‘Óøâd¿åAÚSéè!`
¶.¶dC’iþmÔ—
±M__”²Pwü…Ž †NŒˆ¸ƒ€lñÙæÓŒg0ƒ.3)IM¨
˜t„#
#‘N‘9„†h¤ÎÐ]€ž�†
–²”#r1ŒuÖT:*d]¸Ç­cÜãÊ0&˜!l>#²i@˦«ÝŒã´¶ …#NKE±cž(	•Ù/xlÞá¾P­¬še«&IÄ4–<Þî„-±ÂôC®2Ù+$±0õ³Fþ*uC`D‘	Š†2N¶fº«‰E
3ŸŠÙ\èè‡jlÐ%oˆA“³q:‰Xˆra¨‚S=Ìð\¹@V1Gi)Ö Hé€ÂÀ*SÚ*aH#‰Yzɧ•ã…•ƒcJ…iz¦kº¦y•Ð�ƒõ`/´<H#SIñVa¾50†!™_hþŽpŠ3†‡š§´àB*]I] 7¨…ÄÇ€˜ê�ˆŠŽßÀ
ŽYhE[õ—‡hQ4ZjñŽàB‡§JWLOF	˜p7dšÈàQˆl¡0æ™w>érÔÑ$ãÓ´ù‘øŸ¹™wæW†³õ™úér—ú™±ÒŽÆô
±øC€v–v›ÓtÔ:IŒ°š
€ö4®²F9®Ñèr‘˜®‚³tËú®6I0s2æwlÆ–®Hæº
“¶Ï ¹0	dE”—ÂA
_k¸Ð�¼°¹ <ˆ©—�%Ü�gœÆf\Âl¬}nœ¨mÇhlÆÚ×	Æ€*ç
˜p§fIŒÖPþ`¹Se‰²¸¹‹r‰0Æ�ýŠ§Äкùo‚œñT‰@YqÈÂPl ꬺ Ð°hóårÊ0ýFûÂ/£]€Aº¸K“ËÜΰhy'³Î09u«Y±Àб�#¹¨ÚÉÃ0
Å„w.×ȬZxd0ip» :»t¸<Ê8†
 ÕL€<<•ŠiM§ E/×KÝl·V30óÎð<i:zË‹f»¶$ÎU© Ý=
ªÎ
Ï+#ÊúÜ*
Õ`¿*Á¬2«>öœÏ
ª8
Êâ|¹R—Ì©§Î:Û$Rç ˜ƒZ	ºP†Ðà¿Æðþ¤]ÍóVh–qŠ ý

ö¬W6í ºÜö¼h5ã¿­Ù¿c=êÜ/½&1�òŒz¨ÀÌ�bRxÒÌÀ°ÍÅhzúBLÉ)‘*‰�ɱ<Ë*g©¸9pŸÀl–r)¶P1[ÍÔ@'8	©ëÕ¼±Ü Þ9Ê·¼×ë�ºü×öط؄=؃ݠ¼×#µ¿ðà»pc¼ ’ýua¥KÉ7Ño¸›ÙL ‡¶�Òv=<¨8M"
ÃÀ!U
§[�É™�“‹]%­ ¾Ê¡ˆÍR[‰€ÙZq¢›¥°�kŒŠ?Ö0_xGŒóÕ¯ÇðCÈ'àþâAÀ�A
¶œí¨ÆɽhX6Ÿý
ÑôØÁ™‘�¼h
lÍæYÏØ骳@}ÐXæ K& Z$3
ß·1ÊΗ2÷ç20ãÑòi/ìvÓ£¬Ÿ'½ *Ÿ2{eŸé
jÓÛŒ½.ƒj
®Ë'=2Šj–a}Hp¨'uòù<hb½9tí‡4§�5¤psÀpÉ°�Œº‡Š,Ö:
>)Ÿ>ùþS<	¸€ok�‚.ÅH”–�aáze㌨­³z) %>éòIé¸}é–žéJ¢ÊWâ£Ü	qIaÇê;•“ÓAi`H„?p�ɹö†Æ`J�ɳ2[3Ï5Ž�ê¬ÍÊÈ/»ë{HEuu–·½'lÍUûæ°Þë­ŒU$çZØʼÜ–qêS,ÂP?²‹Åe,ñ[Aa±nÛÎWLM�¨Mz7+Í`Ƴ¿»àgÙªö)â晽gi/‡*
êiç¬݉½ M§.-Ð.
›¡øsþ ÷îr‡ƒêŽ©
1übör]@c/+›¶>™w’Ѳy79¶Ëú®)a˜ì„–R=gÒ.o;XSÐþ�{(mZêíZJ÷(ÆÎçšM·gzMN×^Ž„eÞà®æ‹ÆS¹üy•Ò
ƒ2†©Œ®h
Ð
¸‹tá„–�¡À�c.ÌÉí'T½nûˆ4f5Lg¢DQÄhÑäE�$Jt6TZ5Î=þ½|lš5k‰ÒxùâÏjB„hJÔÚËìD¶„)ËÆ9&·kκæͦì5a¹&ÙBŽX.`Ëmá²5i.aÏ”iš�mÑŒP½ÿ\
r`µñåÅŸ'�Þ«Y¯ä›
þyk»iÏØí’y�³pÞÀŽ¦[ù¢À4`k�<Pû"�ÚªÃ-›o¦IKœ†8û†n˜1ÇjlI£@ÕðHP¶Ù¾pÄ–a,Bè ¡¦ùÆ
“RÊfœiÈ#‹Ü0ÄÙHL„[hI#Äk#meÄa±o¾iH)­Б4¨ ¢ÈDLKÃ+±ìÒ6‹ ±0ÊmˆâæIŠü;†3ΰãŠ6:þÈÌœ ÄS † Ì	šŠ.òÆ›mCŠÆmÄáÇm´Ñ†‘^H!Šj¤	”Ìp¶
Tœn܃‘3
•2úP$˜œò†IgäÑ…œ!ÊI5ýŒqOˆ¾
çɆ֑®>>õŒÈJ­fÐ(¹ÙËOLÈÏ¡mÄê¤!‹ü;ÌÙf,ÌÓ@¿©æ™¢=1=!nä˜á=³=f;N…S?/jhÆkšQ„}õ5ƒŒ1È
d¢À,ÉEj¨É•�mŸ¼T�37CgCeÐåÙòþË,�Æš�½)G?r¼�;×j>”Ék¸!gÝÄ‘[GÁûnÉ'Ï…ÜÂ!§›nòOWrÈaXCoÒù;G°dâõ%¨pÄèa¨IÇ·AÇJ
yÇTð«Yg�oWlutà@µmÈð3áÞÖð'YETÞ9×&š^‚:SWÒ“r&gºA‡[ÎFšg(r(3©Ã`
‡:þg¡mŠìÀùê·Ž´lƒRÇ7¾â‘`üd`+_ùh>u�ÃB8òO¥Ìô$A­c|a¼P%#Þ�I7L
7·
td‹„{¢ˆ
ÙöÂñ=IW[
²Hž$¬€2á±8¨&1Œ€ÚªUÅq�{I#ÏÈFæd–�êHœ�(#h”%óÆßlaš»é-rGBŽåöT
oh�ÝÐ�3Ò¤­p
ô÷2ú=ɯ£œ{à7(øBq C”ÜÛÝ<͹%Ç9°™¦ìa/CÂe9xg8“3„åø^ƒ/A±£
4ܱi;{:©ùäžíU*ª=“7à
¾�’²¢&ý^>�ª@¥Ô}ú¹F=±™@Þ±ò¡¡;ãI#ø
£²Ã…ÙÛ^5ú×þR#jOªH½j>¡šQÞÌ‚¤¤ Ÿô@Á
jtgÔžHc¨ò.›ÛË$]ÙáË>v²¬åø'qæhšåÒÀ°ÆßFÁ~ft•A
ªó~çŽÔCÅ
œ�Ä�µ²ðhE¨t˜CnÈ o}ýF
s„è߉ü‡bÔyð¨,9Ð�Mþo•£•EêFÉ�v«®d¯Q[\©Æc2žÞ=E:Ö¶5¦çØGYºRzWð
®„„êX1×x,ø׿Fg‡!*iA“ÆFÕqš[¼mOãØžßî6¸áÑÍ…;›:UG”)|þ§÷°G<6ëKý–ÃéÀ7¾©ì`oµt
~ K­­Žx(�˜ðé:|�‚ëƒß�çŽrÖ3ÎG‚Álmv0›Çå,ø>Ú±�(Ó³œê8G9ÒÁ�#«<ç³7ãx¶«SÍlôÛí8»õáwt¸Cæ
>ö�¼ê븶ØO½Qv¼žû¸Ç=öAá•®ƒÎ{ µãžÍH£Ñ¤5ß]ÖMjcƒsT«úÀõŸA�è­¢—àõÌæ‘Ó½cX¿í°‡��æ(‡9ÁíhÇÖÉ‘yëÆþÛÚxfhÍ)ÏpuèãÏ·v¢÷Kpwß|ºµN·èy(f#>Ýdî²Ç‘Ju£þY�Æ»hÚÿyõåØ:˜·Np#g<Ã<Þ];þêáKõ¸^3Œ·
�­§šäúeø9òq�vDú䰻Ƶšys<œ¶Á¦:=.(5Üýý<>tà19ë'vx8|3‡þb7³ë2†8±;´³¶	Ä°ÊS�Ã@±ËÀxØ@f»@Ä[¾t³<k½l°u»¹{0¾u(9’“7£"¹#=| A| ¢³‹£;
Ô‡�“·uP=th6ò;;ý3Á™»¨Óv€‡u ;
Óº‘C<{H·ÄËþ}
#9´Jwp½k¬Ê´‡Ð3xø‡¹ëJ”´D—4ÿäÂR$¹³”Å&äÀ†$¹Š‹ÁÌó‡Æ¹Â4K“¬HnÜB«Ü>{�Ãê[=—T<ÁÄkü‡vÀJÅ3²x[Ê­»Cþ¬d¶¤ÄE#32qìÆGܾnŒÁ|ÀL¯\J×ÌËÑtA’34ÌÁ¯tHòûB‘˺lLo¼D†ûK9DÎp\½åäÆÕCÍR,ÆbÜç;ÜlFƒŒ‡¨tÁÈKl4M¬cËÞ¬F­ÃH׋7Â,Ãî¤Æj4Ã\üÎñd½x;Iú¬¾k4HKdÎa´‡spNl¬Æ¼Œ‡PËVÌÍ;$H׬Fí›C—Í•ìÅë\É\¼¹lôG#õ—<PUÐ
ÎiœÇUÔUñ¼Í&ÝR9P
Ê'ÍËklSSÕºx«M^•Æî¤EëÌK>,ÎjeQi4²Ð³|
£m†¥MZþŒPZ¤Å�§�Ü—X]²ÍŸ×mÝÉÍ×õ\Á5\Ô�]¬° õܺuÝ‚€ÆÝ\Êm]¬ÈÇ�ݱ•Û˸Z�Y\Ö%[¶Ý\ eZâ=ZßµŽ�ð]©M\àП¢õÜà \áõÝ«ÍÞm]ÁeÞ²Õ‹„˜]ð=ß‚@Zä-^æÝÞf¸üu_Ü͆à_™ð
ÞýZ¦í�ó[Â%Û�_„(Ú¬0Úä-ßäuÜüià‡ì„‡Ôu†p@<ýù^­UÝëÝ¢Õgð
Ná@a‚vá~á–á>á¾a>á$Há®áV‚¦a$°á$P‚Îa¾áâVþ‚èaHÖaâÖá*ŽbVa®b.náVb.¶á$c)bèâ3Ná).â0Nâ-.ãæáŽbÞá1Fâ¦â0Fbã®ãžc@îâ/Öc*&ä)>d)–c¾c^c7ŽdB>c&cL¶a†äInc%‚:æcGöãGÞäCædLFã5ÖcB®ä@†aJâ>ä&æd$¶d¦ä1žeRÆâ9îä-†cMäTæd)(‡rÀ–‚c°@ÎâF†åî„jÆ„j¾…jî„kÖæNØL
³Ì{S3Üm€ÔíÛ–ÃŒd¶Ð›D8ÅNf»í޻˜×Û®KéÆ°H]Wé¦YrUÖvØÓ;œF9$î¤F/}WcœCÌkRi¤Á=|Ó ¬ËruÇ�ÄLŒäneÌo­´mî^×ü^R¯ÄLÌóÊgÌH‘ÓÎùäî#Q‘›C¯CPÌäCÌûÖi=iäE
?ÙÛ†»uÖJüKwÕÈf4FWYì,Î
Ÿ× ”9iÅo]ÆHÔÊâÄË“õJA­ÄŠü‡ÑSï=-mÌ»m/uÖä.þF—FÌ3rÓœY8�pûÎÕ/•Rx³ÅbÌUtÕp’óleMq‘üyÍͯ“C>TÃ×ÊÉôÊ´,FlFfÃ'�á‡3̆Jð
@ƒÒ¦KëËî4òí´æI•?J‡p‡ƒØ3Eï
Qtkb’n‡E7ˆJÐ*Ú1!LWt&éAù#÷ÁôÚtk­CÙôþ8sØ'Ôa’StoptspŸBZôíê�*õJRuZw³k
wPßG/ú|—ô|ßy‚'x7Ë÷�Ç÷J‡ú›�ôº‡ø
;ˆp8„$ð4¨ƒ3´‡l8!àócüûñÙYÚu§?wK¢&ROtjx)$Hj•þsHtxö„—õ®çûþnp¹E×Eß�÷uM1¡®/±T9‡ ŸwˆŸõpˆ{�waÏ|ªÇû¯x�’ù¦¿ù¯¯û“_úLŸvOGyÛø×ÿôjêsO•ÉvˆGyMivJ÷þ´Ÿü{×÷vOùUGuï¿xS}7ëz——yÜgþdæùJ·}O¿ûûw«·wzwûô¿xæˆp⺉WNÜÁpÃu린a9†Š3Wn"Aq:ìñb¹‹
~Ñ\A�!%šS®¥K…)nd¨òàÆ‘5J,“â C‚$Ø­åÌŒ
*Œ¸ô)Ó¥‡&üh&I—}zÜþªS`K¢1rŒh´¦Æ®›47Ñ FŽ(Áî$»síË…Þĵ;äÄÛ9úþµSVÉ�1öˆ"$Ò›·‹{½¥“¹
!ã—é<…Y9…Û�‚wŽÜ9nŽw¶$º\äkäÄA.Gn5¡2g#Üso¸sÝÎm»,³Fá·Sš“ýrçÝ�Ðuß�M‘ÛtžÑ=®ÝYœ©ô… Ë�óYzälÎçpž^�ܶªAI:tJ27Ô[£Ú\:P¡EY‘dVCcEÓ˜A„ÓsSù$�Qâñum…Óa}×]!é„SB@…dÞDRÕH&dMGžn(!—QZ
}(^þ™çÒƒ6m5PF¥b�˜18RSœéhÒ�5rÆ�@?Ò$]E2ÖÅ„L)y„F‰ÐBNÕtœNr¤”Šøm$æ|a¸f;á,’D9hÈña†!vgSQ†ä˜AäìµSd°Eæ–@{	WÞ6ê¨sAæGjܤ†Ît’ä
oÞDÎ5°ÁÖሠy3Zo•·œi#Ò:²¹vN¨/îäÚtnj„†å]7u#›vëAçáPäpSj8¼™´�¢
59ìˆ"åv«³TŠ'åtÒÞêaF¯BçØ›·š›Ð‚ÚëäŠoÊd›¸ÂòTn·æÕå_t)å‹ì’@µ¢¾ÝN¥éþ½ùb¹Ðm®•›¦^Én¦³iú•D?B8d¶×ŽÙn]ŒåV¦ÆXj÷c©¶¥¥î’¶ñ–_‚¯:øet¼Ù&“­8udY66	scá
Eî À¹•n
ƒÎ`vhšzv¶JLÎê¡—ZØܦµp�¯.¼çu9»þ<ÃÐåo®ý¸.B4zÛ/NÙ,“·-^ü«Ær,ÝAÀƒþüš êèm®�:íÙûèK•8!Ž�ÿðƒÏ0*!£µc‚¢†K)ÐPºùSÕàã
u &rªà9Ð�ŽÓ¨Fb‘ùàmˆ¥5slP�„¢`iÊ£¡Óü)5·ñÈifCÔhpƒ1ŒÛÌà†·Ût0qÊú¡O3¼¸I.‚¤“œ:ÆóÃÍ�fqBÜ!|ªfŽ(V�VF,"rJ£ÅÈUMeËÁ[c†GºÕHìOE䢕¸Ã->[¬câ’õ¸/1uWJj®Æî�‘Œt¬Ëªú蘆Q�¨ËnòxEr%þç�8ì£ä"9ÆÑa¨{O¤äLÖ½FJì�LŒäé
9™½qU«Šd²ÂšÖ$xÓ$ñ6GïA±ZX„"Ç#Ä"rJÙ8DÌÑ?}æ0F³Çn™ZÑ6�I_nxCAuŒÈlz‰m2س•‡(r¦m0õ™n,+2OÐA<¥²Ïä±kyÔ¥µÇ!©cP�įÈH8M‰)ŒÌ""»Ç
tLñ‡ÑÜgç–�òÊ‹µ
Q©¨âÍÆ€9mÒ½ z:Æ´ë#	,™&a&3Þu.‹÷)—Ÿ6z-gbôžÛOÇB¶RªôN•Ð|OQw;–boH
¬µã¡Ä,Â�Ú--š2¡/'p²
'Ô%`©"(�ìek�"ÉršÅ›®x4náÍ1GøÉt©]=ªÇjË°ƒXïZgÉéE…jQ#½4”¦ó)�NÇ™�ZÕ¸UjÇlù¦å÷X\U‘Q}‹!qõV·.ã]%‘zÕˆõºÑ¯eϧ[[JõŽ-×s}Ú$܉·!s�OÈ3§r�•˜þ†àÑ8FÍr$‘fa%šzv¯—âÀN£&èKc(Ã~ÑŠ²Zo´Ã3䀆3Ô�n\f+g›ìL©	NáÄlfÈ=Õè8È,<œe83÷ÙaÍVVe(!Ù`˜7œ‘
N
*Œ3ƒÍ’g#µ„S$Ž›2Ž‘Úrl;Æ0ˆ3[É‚ŽyS%©™Ï|æ4£¹ÍjÖj™ßg9ÓÙ͹«3�ÙŒç=×kªz~óŸçÌçA¯п*G;öÛ?Â0ƒhFûipu`‡š<Ü1…ë)1³ç”$VÇ1
\| „;„#N=æ(—Áºã
p
讚BNŬPÆGPIäF52ÅtVå€Ç�퀉$çTÛØT%îp5ëxŠÙ¥íÍù2èx°9L%”
›ø”62W×þZeâSø¨ÃV–I'ìÐcf'g�Ã6:�„CdCk¶i²J£z;Œ¾¹º‹_j(+I\ôÊW·íÜUï{\Æ×Îä%qé¥ø;bÔñÙÝí¡7�ùÜ’4ó×-ãÉwzÔŸ·º¸}½yc/zпÉ1Š¦x:˜�	!¤•0C
�•—utC:à¾!e©
®ÄAÇ:�„t‚æ8Ë­e`Ü~¨Ä.²‘�cTâ€X&xŽ�]TܘÐE8Ò‘Ž]â˜ðÃ!ìB‘UØ"  tÂ1Ô¥‘Ø/,‚û-Bú½„1ØÁ.`&dýüUB%˜ƒ7t%YþCýB'(ÃŒ� øA#  ¹Í€8Ê9ÃÒÀ/”Ã/ø
&´_'X`%

:C�Á.l§`B'�
AZÄAvØ6rA'ts.ÂsF§ÔU
$
dè€R
Dœ´Ã8A%09Ø� 
&p�H�.?Â
 A%Ü‚ÔÁ?
�ìÂ.¼cþ0`T
fC%
ì3
9lj£¤Ç`¡¦ƒþ…D;X 2tCÚ
 

�ªÈ[—q1|
‹}µi½˜Y¿¼J¸
’dœÁ¬N™T)Ïj¼í?Œ¢£¡AÅAUW<M£1XD=Š8ŒÝ܆:¬èÀ0ƒú…Ã5,10Ì
wÔ§‘�ÈÍ•¬}A—Õ&UR«~*eŒ£»FiK‹‡ô³î¡séÉŒE@œtâYt'
õkÔpOÃb+UëÑ®^£]Û6k]¥h‘.�ËV+X½HñÆ­:öïÒ¦|û*Ý»×íÛ¸sÝ6ËÔjÚÇZ×Þ*7¬ÝÄy7ÿ…Z®Ü¡$áÆØù÷¯³E:tÈiW.9�Å9+¸m·nŒÎÔ
(Î9™åÄ…¨®[qŽæÊ7NZ]¹�Ù¨’nn¡:Þä@.Üfý£8rÁÃy<Rì†Is›F.>t!e þ·]RœXDeä A‡lÒI§œŽê&º‚ÌóÆ™rÚ!'�ôÒ©p o*Ç?fØ¥88ãÂÙóê‡'œðC™l
¤A™sÐI¯¸k,Z°xv‚AFõÊijª#·*¬3®˜ÔË1©¨êlI(»¬²Ï$3’Êźúʲ/›ÜLÌ-™m¯Í4ãê,¸º)+Ê2'“rÍ.å
­ÁµÎš³Î1ùš‹0мj³/Ñø\³ªäJ³JÄl´­»¸4ŠÏ¼¦òÆCsqâ4äØgs”éDˆÐÀ‡œvÚÁÍRK"­ü`ý /ÒÌÈœçÈÑÈuÎyp:;â®�âœê"qnþ
g6K§¢5Ø…Ò3¯ �êÐ6ã�z�Vo‘Â[)ìøH�cB'„Ð!	?¸3')™¦²m¹â,E
¡t¼Ép=�Öã)0qæ]î¸C®TÕS‡âbFÔMBÝ;bBžkš-�˜ù·’…ƒ+IqtÔ!ÇšÍsÒ­h�,²£Jn³eÑœÊH‚Ak–œ£†‹ê°(äP*�C«jí"òf¦òÌ.Û¸ˆ8+¢§9)Žls–­f“<ò©"
íÆD¥ˆ–ª¬�KÞȼ´ZFîMî
ߊ2œ±™08cc Tz–•mèèh¢oV¾3AEK©¡
áF�f¥ˆaAˆ‰pÆ¡	2ð†–!þJ½ä‚-;Iq‰J1Ú
¡2Á	ÚmŒ;¤[82A(+´ªVrH8¦b�8.¤ ò:ÒÓ�crX�9ŒQ	|"Ⱥ iþ²ª„LGy$ëtÊ
Éõt:*]±"™
uH(/Ì(ØzÌa¯kÕë]¤Éøu¸¾!R/Ê£–òžá�aA<iÇA*… |]ÈRƒ i,…›™¤ƒ!ùŠå�lÌD#ðÈ�yì¡õäæ#Ù9àq>¥#&â˜ñJ&�lP²UYSˆB€©�l�UŒ¦éàS­p�xÄ#:•…ÎÖ]0}ˆl•>�É‘Ö	
ZèÑI-’­
œ¯dUþ<[­s.”`í<gDYU¯‡F‡‘¬Š�sX!cò¡«Zà»ÔÓ¬zm²U"5)ƒÇ,.Ä#Æ1¦BèyHˆg<	IÞxøùJéÒ!:ͨ>iºÀcF4kV:wê‘ð-dXehø¦ó¬zúˆ¡—T課³nš¦œÚÇ?üÁŒJ�h
•5¬a›ºÈöU	–},2{ؼþ5´—5íiQ›ZÕ®–µ­uíka[ÙΖ¶µµ­kU׉=rêö

Tƒ5:fTÐ œ`	—¯÷Й
™
ÿHî›�ìÆ¯Ó mÉŽÿJp½Žó�-õ(qì˜qì<-}1Ñ$°Ù\eÏ�1µ‘³q½±S°µQ�ï×PÍ1™OÒ„��0�XÑ^1=¯ô�
5°åp3ðñÊ
#R5òr#½±#o$=r$S#Iò$¯ñLQ	0Ç�T�
¼A	`öøPün1Ѳ1'Q$Ë1NüÆ/î®Ñ$þ1uR°#�Ò÷�"¡ŽïPr*©²*­ò*±2+µ²ô¸E	¼A\�0�³
üq#×lò	“�-Oè¨Q$‰o×~±è¾ñ»Ð-gNõr+ýò/
30s0Õѱ�î”A�Ú*Ì2!-ÓÆÏ!×Ò'Ÿ%
ïìŽÿºÑïp/›’MM¯Ð©‘0Mó4Q35Uó/õ¡+‹Ð�>EƲ­f²&îñ±/mÇq1Ã0#M2·‘73òGn5™³9�ó9¡³-UrÓ
WƒÔªûÓ6©{M'‘-<{í3C�<Ó±ý¼�gpÕ4‘þ4Iq£s>é³>í30W-†°¬ÂÒ`’TjÓ3Ås@óÑÑž¡Ðàà�üôñ(3ýPRŒ
AAñ|³

Êà†í>=ôCA4DEt÷VÍ®Ï2‡5à‘ä`;IÓÔÃ�:

Ì*


ŒÀ†!íì eý ~áVínaèaU³¡*À0ABÅ^¶†aàŽ�ìÀg;A”áàa(ìnáMŽtëÁa¶Í*áv�À¼ÖeGvÛ†¡ná¼
ÀܤQ2
îhà¤
(�ü~Á Æ@Áº÷h üÁì`w‘×ÀiŸ¡}? ” \ëŽh�€°§ä \ýÁ*À
øG	Ø”!d
À„@?ðl” "
Jù¨¡”TÛ<Ø>€Ú
­ ô¹pÕö*@	ü!h@
nÁ
RÕÓð

°Øì Ž
Ñža™o¡z z�ìyv¾ëꀂÿáŽ
ÏnA
bø¡2ÙHy™°úÌ
Î!výÁþLÀ
â
|À´í 	ü€¤™­é»¾kØ0³™Ï:	U}Mˆ‘À@Æ z@”ñaUYnª�]n” °•`ªý�¢ëy‹�Àv¡^º5_àœ`ØᎽ!L¡¡õa�7AÚ
Èn?n᥽ÁÑÚa`‚û"Í*K	®;„EÑ*
À
ý
ü¸Óv!	ÊÜPœ¼
Pë×Óà¡:{Óá”
¸ÀÌéWÿì
UDj·,h6–õ芤þ3.=žF]®æDç½WÙQXQMjQBöÀ#Ý•úÄ“O<L¥óT^ÒNLqÅ_ÛŸ‡øÜ?ÂgrÊ!Õ\�7¢ºí.´)vŸ:Õ˜¢�{itQ
syZå|<(øÀÔ�G,À¡U‡qÒJ/Í´Ò(%QNÇí(ã"Œ2ªJþ짬!Û‚QV#»×Yé/§BÄ©×IiÞVåA<�RB�Ä!ƒöà0WS
dÏgnq—kÓ‚Nxá¶ñ¶q *žCõ¡"c�µ‚
ý\°W౬¶®dº,©�Ù
%Ö��‹®0kGIç¾åBš·�Se½höL°á¶ßŽ{îQ›¢B,Æ4ÓÕ3ç»RíŽ>‘NÖÅLÖ£›^.6¦<*‰)_íÌ�9™R*«·Äü\/pÆÎk)±r	›ºîê¯Ï¾îÞ¤ô۠ƀŒèÈ
íC¼£HÅNyEâÕÜì+ÙMô¾b#ƒéCX”2ÝŽÖR'¥”E|^s‹;‚?%­¬}ì 'VþŽ�õîö Ú‹bÔ­š
%vúÃ	òÄÀ=†kcÝZƦªˆ<%+»é
V4•£®5�; ÓÛÀ>ˆÄ$*QOˆãØ ²D¹Ì/Ø»ñT»¦k/“SÝפ„saê…!AŠy´¶Ä4ªq�zÚ_<n)'ŒËÚÃ2·.‹]üTFø2À }Ž6GbUÿ؈ÈD*2#MT\p†ã¸ä�æ9Ò‰Êùv3;…äQD|,Ij×ÉEŠr”¤Ô?Ü(µ�ðjáŠ
`DW£M–r–´¬¥-=ÔÈŽ	§‘ÙÍ.ž]å•·,¦1�‰Ì� RE¿Û–ðØ2*gÃÙ BHÌþdjs›ÜÜf.åG?‘¥e(²nq+XA>£2Y7ß	Ïx&’w+aÕP¨Ÿé#ù CØ1‰:4‚ÎJ(å‰Ð„*”pó� ÉË(VˆâÐ>P
%È Kø…9ø1˜…Št¤$e=UGgvË)öà†.`P�”à
| È€è±�tþxÃ_­¬eË
Ô‡z’Qìdâ�v �Ĩ„rAЄLd¼¬k_ÏÀ®È„0*‡(¡{<ƒdÐ…î zŒJ>˜l�‹ÜxµcŒ‹èq’àÙUévø…31œ&¤u lr¿ÞcZuE0‘	ÒáÜîevu´‡SsÈðÊw¾kT«Çæç¸n¡'r>"
°ÐFß
I2™?"D³
KxÂÌìé_ÁäŠVÒË="Lá‹w²}I%Ü-²¢WG�0TGãCk¹òã%Œ×ßóô¥:a’±�\±ñb',G
Õ¥6"þ	ÈLnrŸìK(CÝ8Q~à¾òb'kyË´‘­=Q¬œ+…pâ‰/—ÏŒæ‘X880i«
%·c+§yÎt~M‰�qâà¥�``´\�ÿèŽÐX!øÀ¯D!Ò�zÑŒ¦Èx§vOáMÄxRi´¥/ý@1Šõó#è¦è-L‹šÑÔ
*yã(陑�4󹟄F
ë?kL	ðÐ¥¡;m£cÔüE²âXûÌB¦->¥¢”| CN¸E.Ê`�«µÃ®6…ùá
?8¢mþò'oÜ¡”˜Ï@ˆiítÿXãM©žoR—"
£=(Az€—CŒÁ‹êî·„ùŽÄé’þ³�6�¼;�
8àȢǤ KK\ÂïSI*#}äÄãÁ CÌ!±Ò#ÏÈÔÄO.`@i6ʽd�ÆåaÑó†u\ø¸Êo>`/öÝV±1Š�‚Œ@2k„ø�ó¤_VÓî¥ÀŽ�„˜`#È@X\Žr¸Sé\wí£�-éQ}	b Æ"–€Z‚cìºÛÑjß溹-Þ€
i‘0‰àt40ùÛÿŽVÙ6“çd‰;AŒktbéÀ‡Rvqj~ò]ó}‡:GJfyÕ1å?V/ƒ=…cd™éA�ú¨z³Î}\Ý•úØKµÝå%üÚd�{žB™àþ®Ï½ïË*x¬û÷ÄW½ÊŸØz)ù;
>ªIÏüè+tõ„¼ô¯¯Ðbc<óØï¾7™ÎíC3{œ#¡÷Ï¿È×^ŽÒ3Þ†Ü/3£þº³üÇÚÚ·ä„A;2ýÿ¯DÁ·}]Ä7<Ãé
¡¾h›ÃW¡Í�T)Û |ê‹´Gd'Ù– J„±Qc@ž&º‰ŠÙ�^Ç¢y¸—6&Þ`%:£((zDf¬´£š¸z¾rb3 ¢J0 Aº‰\‰mönêòQ*¥Qª¤
­Ñz¬‘!c_W57š(yt|!.'ažBVBÒ�‡êä¥çŠ®éª®ëÊ®íê®ï
¯ñ*¯óz®))ñbö…�ƒ�I
¡£¯Å6bc0RêrÒŠ°	«°Ë°
ë°Èêþ­
„—®UjCó“§Ù`ìEäÐû±Ûû ²÷Á«V$® 
3Yù°-ë²/³1‹°÷:&!6kµ¶8…â!“‡`‡Ê Î
Q‘«¸ãK¾ã›ä+ªÃ:±ê6!MqA¹›½‰óPúP}Þ«uÀƒª¿@¨…:as“0NÑ/Y©+ZkÀŒÀ	¬ÀﺔÊ2ª¡2bÚ‡¥ßûr°oôè`6³WÒAa™´j¹kr1æ#LÂ%lÂ'ŒÂ)¬Â+ÌÂ-ìÂ/Ã.<9»[¬"9_
Wºr#
Õ°¤P¯P
 
µ@
M
¯ð
µ@ÑmÑ�Ñ­ÑÍÑíÑ
Ò!-Ò#MÒ%mÒ=Ñ�Ð-Ñ 0Ñí…ðô,
[x(W!ü$+áçÐæÙPé Y÷\‘Q�¾Pœ
— 	š€
ž€
Y­Õ[ÍÕ]íÕ_
Öa-ÖcMÖemÖg�Öi­Ök�Õ›àÖ› 	› 
sí	P

ýЙŒû@!VqAµg)¹ß«ü<ñ
©à
²`
³à
®à	žÀÙ² ��Ú§­Ú¨Ú­½Ú¯�Ú±­Ú¦
Û§þÝÚ²�Ú´�Û°}Û¦½Û¿]Û¶Û®
ÜÅMܾ]ÛÇÝÙÈ­ÜÉíܹ½ÚÍÚѽܦm
²�
ž
±pݲ§½
¬ þm
¬Ð
Î
×NÛ¬ à
þß
îàáîàÖíÙîÙ´ýß«°

îßþmÚû�ßÞ
¾ßÈýßàÿ­â¾â-îÙømÚ
à.ã>àá9>àžß×=ã9Nãù]á	Þâ,näENãÖmá1þà.ä'¾ãî
›
¤0ï�
LaS!¡xf^þå½o1*ë
Æ]›WfžË£»c‘¾ 	
žßÓ]à7.âÞÙ©�
ý}
{ÎàþàE¾â>¦Ð
3®Û« 
�mä>èÞç#>à¦�çx.
«à
�~䙎ä/nè®á§ðèèC¾à ¾à²0øíá›þß­àêÎ
–®é³èîê…ëýÝç¨ýÙª`
>â×ÍàØ�
µ0ò€¡sm¤+�š$™hp¿„’M¶”‘Ù›PëŽê¿.à§éž
¦­áº>â³@Û>^á¥îä¦=ƒ釮áËíê'Î
í®ß)Þí„~Ý®ÀÙxné~ãŽî/ð*žê² þá
™àíþ�ê
^èôãžMè;Nã2ãïáÿë	Žñòþã2þë×½á®àNñŸ=ñþí
î
Å~ì4³ª›ÃË\;GÁuP¼r˜6Ûæ¨àÙï⦰߭àí|îá%.
Ë=ìîマî Nôûòoöâãîí_èFâž
îß¿à#Îã§~êÿôô>ì|öOïýÝñÂè¦`é®°áÂ^ãˆ?ì®°ÝãPÏ]Yþ`­æí˜S”§c×Îââ>äF?
²p
ŸŽñ±0yÿÙæþôƒ^ò.ÿòþûM_ñ®Þñ°NñN÷>ø^á#¾÷Áü¾
™ øê¿žêoï
±°Ü%®ï%ßôJžò¬¯â­
+´ðB
ãÇ›C’ðFÏôiÇÑh@ƒê(c2}2tñEcdLŸ||A…<õ~ºˆ,½*’‹©‰N‰,¯z˦�̈®O*ɨè2þa©8²®:ê9þPRŠétp>0ÁÜθ¥ÂoG»r:¥£·®ªr>Ÿp“E!ƒª2‰H�.šh©0û¼Š»9"&ä˜â(»ª’"¾H�00}“qRJ+µLŸp4ã̳ÚQ¦ÄOKÍRRK5u¶Ú6Ñs»»zÒîÀí$’%:!ëÂHOœJrNY‘(K�Úé×7•P= ¶Ä	>®šu®ŸÊ¼¯Gý¸ì’©Š†´iQhé‹I@ª¦ó¢W�u69 Ò{ò$­�+� ˜È2h¸�¶sðQ~&<u_~cäÐÃÎþÙ‡œOG+#RûUxa…i´
Y ÚÓj8a¹Â‰7¯FñM¯þŸ‹Hä‚-ÙÜÀŠÊ¦¿’e”XXŽŠ(dí³³J9kŽKÎ÷¸„�Çõ>ñ¹^ž°²Ö�`ÂÞ�2aH¤Olr7VbI’Ý›«¶YÌ�ʪ÷G�CÞmL‰,	•#ü'R†ÓVÛ²Ì6¸SgJ<QÔµë¶;ÃÚ<á	.sZVÈíÀŽK–Tzô’@¹ÊìLSRqü¾ˆâÅÈ·ŒM)Ô§õÄ�êλþƒY½‰ˆãó×ã%n;�h]:Iõ–å’¸L>‰𠀜Å%£8ö\¨š8rè?n	fxù³ÈXÊÞ'ß»›w^°½y{ÄEFCáŸ×~ûÇVP›pC+'®Œ‹¥½þûCÓ,ž¢s:,û¬tEö¼u!ªŒƒë®ýâ5)–À­%]Z¡C²%ñg+H‚I°
«�¤¤-ZÚ»„»?Ñ'=á`zƳ‘òüNAõyMh¯ ¤¢/�:›¤¸÷Â}eÊmœ"Ç3äƺÁP‡0L•[v´–1%äeäҕ҃܉,SÒÕ*,wŸá4IŽK“¼:2$þÌh²JTlf³‚¬J:²IL.–#´`g E*ÔÅ$x+ }$7úטüô§ä¼E-�N¬"Ìme.ÊÁI£–!æíP‘”ÒGô@T˜{(ÖÞ`Z4{äk0úÌ"=Y)‡y¢(þŒš‰žn–f¤YG\I�¨Hìl-*
¹"ýhV·ìñ(´
઀¶ù,Ð\ad–[h©5ܵR …Ê�T"–”(ë-÷i—)T:W|‚ ®�È1‡YLDˆóªÈ–Æ”Êw¶RϽ̆¶OÆC2ÜTaÚqŒÒÍgÓä&QDðÃ.”gA-T#UŠo´È,F1
‡ÞÇ#YINnå›CA	;Ô¬�„�„ìQOªPE(¤cN>�os¢Óïè‘‹$„s'aI(BQ¯€L*P¹
ú±©JwÚˆHø+Oxâ¡
n1ȧßjŒ@:›ß& ‘‡=¼A„$
‹M`´%&) ¹bOèAjxÃ8q¾žðª'ÒÑo!±7è�ƒ@þ…Uv—£fqä>¬5,K\q	7¨AoàDŠœ²ˆB vþà†XÆ�ˆ°„÷€Š*¡Y|ä­‘µ�Tp‚¥€ŽÁ’«©¨ZÜÖ]ÊRÕå]U¼S>Œ?¢7½¸…5aLûéŽJ™Êc¾Bµ(6¦’µM2 qW¡	
PÀ
F
nr-xB•Fq‹q³FÎDmsŽz'¼íîÖqsª6<wc�OÉá·Š¼1Œ[tòücî¡B[>§¾k³Xð„=°
	º

SèA-(€¢€ƒû²RÐ	(€WK
Q´µKЄiL,*2	ÚÒM
Tˆ³8�¨Iøƒ ÊàQÈ4 H�0�(GÂqƒ�`�¢Ô#¸
«<7X:@Ó¤J`�Ã;‚*ˆ„à*´Q
¨Hè¬@;4-Ð


"àƒZtœ)h
ë#€
xÎÛ5¨Ú¸‘SË>Jµ#ŠT°
`¥ÙRà›¼ÇZ
‹c4èY(˜=
€‚0 0
”`@
—+ÕªV™VmÚc#‚ÃD¤8!AÁC
6ô ’U“”£Šj9K–'=,(pD¨¡#ˆ�"Dˆ(¿º�
'¯„ÀÓ
*†L±¸j€
²F
³)àÁnòãvÝjŒ
tœw
`xœ”¢Bã@@*£ŒR£ëþ+¡¬Nz²|³q`Ãá8Zª)Š
«7ND*t·¦\.¹ÒÞí±‡
‹©¥æ1E D
’B�øÃøàWÈ$…ž�Ä
ÁÃ}Åd°Ða šX5
¸@€p"	=\QB*ôÀæ­y‘„ÈÈ·Tx‚ƒˆ„þô0Ox"Eä¡Tà$Qð�‡Mä„+j£²ÍÅ&ý:ך¨HxâxÇiÞ ò 	><’,E*Ìä—s]¢‡c‘YÊø‡=.»$ˆøÅZ”iË™)Þ×3…
ˆdûÑâa´
â2—™áŒg@#DYM5¨a)()]"3™™ÛÎÚ¤š”í.3:a+Ú&'Ôq"›¥Øf6c!¬˜<§m®P",Rfª‚ùE…¨€Å&"—ª6á
… S
a
OµæþÄc&¸èå„�<Ó\P‡:Ä
1h«ÈDÚn“4­B.uqSFÑĸŽÓ°AŠ †(¸ ÜR
+³Ä™ërR8#‡:ÔLʱ	`Ó³—0
K=ï£d*&wNú/â�‰›>Á7ŸÂ¥š1ÚK?ùêZ˜¸MXi›œLÛ„>ôU2£¦š¨ä—½¤)£°}&¨dä¶M�0†9+w5èþ´^Fmj¼kEG‰•‚ì.{qé›�…Ðl⩉%™§Á©ªh›}ã{P»˜¢mq¥	ÙJˆ°@'N8¹
ð*nm¬Á+ÐB-Xb£¶öEÀ¢m››^;ך´Âú³£jU
W¸°U�þÔô–Q<׆sªL2ñ8�P„3¹q¨Ì”«O5õM.‘Ñ+áDWN“º{±ãœ¤ºÞöBYiÔ äÀ@BpQ�ZŒaÒ[Ì(ƒÙk[ŽåD¶û¢	–
nS^Ÿù’jŠS´i:á™reÃ\ÍB~Ì•7ñh„x
 €$à�TA¥€ñ™Œ<ËV/¢HÑÏâ4Rþ"ïÊŠdÓj½I#¯X9¢®©ã¤?ÇV9ë)©žû©
iág/K–±œ„å&âØÎ19žh_�Zè–ï;aLXáÍq¢
U8 p-°¡
ƒŠ"u{Âå¾$Å�ü+sýßv·D®|“ŒãÚ’éÝúÍñ%˜ÿ‚Ãn·u»%p‰E€I­œ·YÅl_ˆãoà–
Ρø·›ØÔ&mû%ª|²´kž›)+°P‡Ê²·ŒZИж9Ñ{“àÀäµAø’Sþyåº�Þ™x­×gæl¾Õœñ9'ÝžnAAÜMŒCêâ´[Fvi´ÛÞëÉh&S®Ï¬ù𼆴ê.ot¬×RSŸÛL®D'Hç\^Cs„3
ðÃÝ”ájò¬Ý(ÿöþ€]§Âм蚧/‘-5ª%Š¼Švj.¸ùÓSæÙ¾IÜM8Û€×é?F¹Äý’«5ž.wF»›×\·ÀÑ“n¹Ï$>Ý?.•à´aŒråf˜¤¸ºÆo_h/uëçÕ÷Õ¡ó·éç»™ù²Þmnj뺕Á.=êÛÿ˜«Ry�
|`¢´ì²¦0dÝ®ûûŸ˜{8
?àÃ<$Cß`œlþEžÞíÝ�) Þ) õœ’QÜÉHf¡”ŽU]Þ±Êï)YH�H=ߊP¨ôL4m_	¢à2 Ž~M u9Ê�“Ä
åé…
Û°ù_›V�†²a
d@ÊTõ ÿYÐ?̃/ŒÄ
îOÄ•Í99•	RÝÃ�Š~
ÔYáÊÉÄ]¡¾Òšà+	Y~ÊÚˆa,…Ênaqd ¶©¡¾Ü¦!^!ÕùÂa©„!î‰àöÌôYMÔ›išú	F<hÍúÎUÙWq•ý!#R"zùÃ
J¤´ur•è…%%â_—YÐŽÂà}Š��äÍ?º!
Þ^*bÝPFSMÍá%pÕ ï}¡4•\š¡]æ$ò­
JJí–ä�TP—J‡�ÅãSÊeI:åᡉ ¶d
Î]\ÄB]øÕ*h) £"áY†üå$òœW¹&#®¤Àƒ?ìÃ;àÙ¢‘‘ÊÒ	¦pºã^J
†`6šÞ` ø™ã&�øí¥tâ$ó‰_
f
6 Š¡gõ¹ãb'ó¤£|éJ†äÐÔI1-cmF™3þÃç	ayÁ'%ZÐnúÂuÀÝäýbîb+þ¾Zt¾!ÁðÏF\âcòÌ­è)Bh.®à„‚T‚¾cáY(+ö"�†!rþ£/öL÷!™p,'ÐÉ<äC³½ç}v—#Ê•ÑßiH¢‹ºß“=ʦÈC2 Ò6•;µY¬'¤è *E‘鑦Ò:	H91©“&©€)'8)è$©•)•Z)èt©‘niP€i*iiO
é‘‚NO™i9ii“ZiÊi“:)›f’¦)‘Z锚)™Â)œn©–©šrSž:©�Æi¡"*žn©€E”jé—*“vi)¤LEõé& B[dK-ÐI>F³Ùh˜Éç|–å²…jÿ
�kìæ2°jþ«ºê«Âj¬Êê¬Òj­Òj2Øj®êê®òê8ðª®âê¯Öª¯þj°²ª±+«^ƒŠâß©‚YCê\$F¤³ž^ªº§=ìC>ȃ<äC·æC=xk¸Šë¸’k¹šë¹¢k¸ÆCº²k»ºë»Âk¼Ê뼞+·zk<à뺢B‚%µ²×X>c}"F1ÙCºFÐùëYIÊW~Y¤ †>ðßÏÉÆýAlÅ^J³2Æ^lÅr¬”EÇ‚¬Æ&
ÒÇzÙW�Wšlf••Íßl–
‹úC:
-˜�j†ž0¥ÄڃϦFl at léõëÑ"þSʦYÙ>Xí}ªå³Q
þqM×–ŒF+Ìʆ?؃Ô6-S‹’­FÊ:›z	 ÈÆíкCn²¨b�Õ¤lÞ"“|ÒçÒ®þ,Äb^jä¨Ã
..‰¬{ÞæèyYåZîåbnæjîærnçzîç‚nèŠîèÚìaLìÏ
í�Tíã~
´Ê(Ì>ÛÀ–m¤-ënÐ2ºà‹¦múîW:[ðÞ¬ðo¯ï/ï/ðþnóoò:¯ò/ô>oó.oôboï"/ö^o÷Bïõj¯ô–®Ý
 =X«1�.ÜÚn×
mXÐ2p5[3±õ+Es(w³”a•KëS¶Öƒ.ÁЀ<@˜A.ˆó8WJ=?ÞÚs{½'Ϧò>{Mûn4¢�?ì­¡ÔÃ<0³ø
%dÀ-PÍÚ2 at StÂê³+cE/M»ìCÒhÏÙl¶ÊÃ:ÃÀ"%È
7�Á|@;gþÀÜ�0¤ÃUuVkuV24¢Æ²åç=`ÈA0��\#?¤%ÃV»õ[S´ë¾ìRGÊÓþ �2˜�<‚zÝÂø\ö`krû’*M¯Flð²=ŒÆ/ì4@ƒ7PÐUWÂ0öec¶ír´R4£ð=x2bàc÷mlprf£vj[mWá`/öl€-1«vmÛvX–ò\wö,ãÃi÷®8¯îm÷páL‡ž?ØÁÀ†'³ô—Í'XwtK7#B+g³HOo$3PÊNww{·æ	t!ŸÉÁø<ð-Ñòƒ:s÷w»÷{GG›òi´:ïmz‹ö=t+
'ãÃ"ØA:4%DtpÃù /xuÿƒ”ÃìWq-c¯­1Œ�xƒÔ�5à3¡[ú‚×øŒ~5ÖÈ×’ƒ8ƒp�ÃþX
Í
ú¥«zw99Üø)ƒ3bˆÃ"T€Øz@	Ô
7¯z¯÷¨¶Ã1Ô§ÍÆÆ>Ô1 Áø€8
¶æÃ5HAÀ3?
+ÿ=؃ù¦Ã?àÃzÁ¶×»}LzÉŸ¹>ØCÔÃÆÚÊvF§úÛóý(‡·Î/Ý·C’ïÖ(xß#~Ë·ÓÛß�«í£<-ïþxâS~Þ
ø¦³E2ua0l;[僾&‹¹ÜÛ_éò­hÐíá‡þê¯6ج�ËÆ5j
¾¶ŽöÞ³~îûkŠï{Ï-,cg^ZB·îܶÒtkÜ	c?l—�/ôí�“~Dj
É'†-}%¶¶·ô{¿³r8A×-<h¬0o×äúS÷ƒwtÚ*.ÛÉg3ú«ÿýþ÷ßå“—ÖÂ0üŸýÖ
]|Æedè®Þ®ÊIðl*ãC}D$F‘Ðð£Œ&¡Izf\’É&�Ìn»Í°ÒŠ«2ÂóP }й	ôÐ;à
m4~�<Í›vhmÇžjéIGIbµÝ–[kÌ� vø›©´ÿþÁ¡‚²ç\tña±Ånå�—^ÜåìœEÁûjŒvÑR×ø‚â©Þ‚
>ø±5ûGŸU…¬Œš†rð\²zBãŒ5vêÞp•Ý¬Â¤ëôܲ¤Ûå”UæhÍ«öQT¸¯*^‚³çâ•uޙ燌½Ñœc–ÕGŽñ
òGb¬:«°ž�~ºçoSeŸk"N¶ŸÃÇ Ò(†ì°1îø*÷-z †þð\¦ÿM[ìþ¸åîVa|Ç…ÕÜ‚xÒ'ž£ÉªyîÀ•ì‡–#âxO3iðÆ´eଆ”GuÕE­ �ßœób5ëÎì®øuöÙ´HL¬±:_�u
¥ÖËÍ»ËÅ	p¤‘Ö[õÖuß}¾Âs$­èƒJ3ío›y?yêêviò›JmŸxöLx¼ñ'�t<ùî½—¬cï7Z@éuŠÇž2¬H§Œ;”ùúûøå�+òýà$®4�òA‡ÿÕÊð¦exÏüX@·X¨72xˆ–çÄ
‘Ò±°‘¥›Û¤(L¨kfùPO�2@É~–[�t¤ÐøPuÕ$þ`öPÆûžñŒí�¶Âbè¹&gT–²‹'Vð
<¬P
Þ5¶ÁMÙ´²É·¦_ÁÇ>î½}P¢u †ê€-á^×PkªƒÝüÂ0ª*W@$CdЃ-d@	· ‡1°Û^AEiuŒ¸Zõ*‚Ø!q.ÉÇ;Q
< 
"˜©n¦Æ§\B!Æ�!¢2
Å‚!j¬
=ê!Ö°•Îð
#bé�
"ãÐçþ0ÛPÓPíùÐÑ!1!q!üp0Ñ Ñ1Ñ
ù
ûðÕ�á°‘5q/±?Qoúæ~A
h *x+øÃ×à
Î
öa_åÕðõ^ïUb`éU_

bA_v^?v4ö`ÿµ^þ÷µcc;Vc#–dKÖd9v_EdY¶cv^¡Áa¡ð5^EV_Ivd
a‡¶e‰¶b
Vb÷5ia6^Yv
aãõb£6b
¡c+Öeý
4ØUƒEëNƒ=[”Áæ1ÔMI•Ä!dÝX9'_
|Béþé—FA]Ó%²öÜH焳`BB'4t]ö懰4<…	&¼ðBÔTO=µ	#3°3ê¨	©¼âðkhO�THÝ6ÔIé!¬ì±#ÊMdsä
L³…	)T-u
VCm‚üdëcsÙEfÌ5ô¡s¢­Qd3t19Ç{„CÝ»¡ÏV}xªê¬#æ!
tbG
€Gý·ÕW›À…=l·s2A÷"”Ž8žéÙž¼˜#eža˜ÛUU£
ÞBŠ5. æ–ìO{z7]ÐCm´ôé‘gÎ"©¡ÁÚ?¯aâ
rÔv›>üس:ù £~ÜBI	Ƽ9îEÓIvûžâþÌ_æš°XåsJÙFÈ
戄DIV¡Ï{“¥®<…(†qœE²ã:ñD4>	Y‘úu+½t,‚Pù�œ´ò‚¬<0Êx<šºq®XðŠ}b0Ð9„‘£KâdÕ°´1m&`€Ð
ð žÙþý3¬
©ª x‹†­Ê×&êñc![åŠ8–õ° B!Ç1ŽáŒcU„¢—±h7øu�†@¹—�æºgTBŸÏBG>×ÂЖNÀÄ(™Øת 	–J’8�a#tQŠg#¬�Q ÆÀÄ"fŠ¤°ùÅ!cÊ9œ±‹cq~‰©ÖD,ø,õ*'c¦¨¹}øƒ°‘
mü!‡2\Kñ؇4öö€Tà
%XÂ.Òá�Ý&�a›NÑÁ�_�aðì O.îÔ_áhGª¼¡Œ
pa–üCØ¥("WrÌÔ_\ŒdĸÀ…lädŸ‰	Û9r’ÁK
ËH
âþº´¥�¤¬l»p
é^\
Ð9JÆ—x7ïq*‡2>`èÂ:cN˜i¥e{Ý­(Bž‹÷�§ñ‚lk›
´þeÇÒ	\ Ù(U(ÍHâÀ‹p‹d€»`8Þp§èrÐ	"¡eTȇ@\¤Ñy™•uà
H 
�	
䯘ñFÆÀ-»ÐL¶dpÈcLSýv”ðÙ0Jèé ~à
ÀË#àËHiæû
�©‡Í]
àe0�`“ÊÐs™·Jù
Ãe§G=ÍÐ`‚™K10~q1ΤI0í%ß“ë‚á5ÉÿP^þ
ÖJµÈÙð“c`’Ú›½MãOÇð
[
¡ÒÊ1öÉ/#�.ã¶A¨[Ð…âj£¡maÁ°½7~ä]X·°º©Ä`ºýr€ 
PͯX	}2K•Švz&Ü é�)‡Ð «&@Ty#G¤ÔW>=
S*’·…ÉΨæ7¦pšé

 `{ˆË%Î4à¹úc02Ö
dU
fÀSˆŒ™Ž
œC)˜!§$
ÆG™¬:§D;ÉÆ™N 9
ñú¢‡+lGqÔ!g¥–rê˜
 –
$¡ÛØ901Eã/Ž
‡9F …–¨£kÎð†õf°@)4C€  � Tmƒqc”�(
�cÐŒΘ•`jˆ
`˜ø€ÅøRþŽ&!�%
BVbŠòÏ ¥):€G'*1IJNR’•èD'0щmØŠÊòÆ:Ž¡ˆ4²©> ‡:È0ƒ1ί¿(X)!ÀÍx
Y9†[\G¬�¬�Ž]¬rKÕ¡„2˜B&Æ/Û¨ÈwÐ�‘_TÒš•Np*¡ŒvT*iÉ‘>Œ 	‡ØÆ.Ð KVúÀÔÚO¢bq£,B€Æ“ÐòG?±®k&�C%|Àʽpk3Üa’
IøÚ/êÀN6à€,$ 
¸`±þlt
ÅÔeD)A�a T–>°Í.^H@8e0€AlsŽkÈ!Ûi’—¸£ŽÛ¨Ï�ì!dúRÈ™ã=Þ¨ƒ²·.ëÑ
‡•&RŽ]
c {2pA
ý’B%Ô!
@Xö±¼J‡{ÐÐ$oüB
¿8Ç3:AÖBL]±Á…
Ú
;òÆ1fË9
IHupã!Œ9J9€‡ÈCv�"ˆ!äwP}ÈÄ8'2K
3žk .q1»†D,²’ltã~qÈJ<sÔ¼çêð³grµ</ÕíÖw+Œ9ÀvNqÄl<(
ùQzrpãÛàÆØxu�f(â
w FîÊ‘Žtd±þYÛ`L³3Ç.BGí~�EüÌî&‘Z1<ñh`º±’á}F° aÏ I®´$íä@ÇÂ
#·ª£Ã!ˆáË9£ŽãXÜ<Eë†Åoce#f‘ÞhªqëqCN\0…9DLߤ¿|F<‚Aûës–a±N8U‹æ¥,6|=^GQXÚ ¹%^æ\E‹Âgí ‡_4@ïj_¼Ôsൄ3»;†½ª˜õÏ%‚�ÛW3¼p°»’´‡¤¦KÞâµþNEšÎféý/ÀËF6èù~…r\W$ô ¤np¬®Ð8ÅX&¯š;?Ó>²R�Äh³Joˆ· žE¸¸êðYþ|ð@¸ï¸(?–p1£™=$㑸âñ(ô1´ø‡#<¿ É뾉PCû¨
Ø…ba¼ŽÁ¹ŽQˆ¾X9�c‰ä«5g*$Ä@¾$–¾8½‰ˆ@î<BRˆ�ñà†y !P‚a¸E‚hoØtÈ?ös<ˆð†8.Ü›¿À0¾°?´;¾`)¿`³¾0Ä䓼àC–b
+âAA0Ä›k0´c
Ä°"–pÊ•„Ûą˽˜áA/D‹ó8–” +<–† ÄÙ[¹±RŒ-ê†õ™Åk1âYÂÀ¾I$†h8éÅó{@Ôc‰,þŠ<ã9¤åé—0–cᾉ ŒE<ž�kFñk’s`½¹)ž#„øgxE¤»EÆs¦¼AÁÀp…;$½S9-¬Â¿p'PˆE4JdF¹Y<ÀHÀâ‘ÁdQ’JH‚r�y£·�Â|Ó7à7|¸+€ƒ«îÉ«G¼> ³>tŒ=$ùŽ–ðz:
Àìë+ñˆ?hÚ§ŒT‰µc?– '#­êY„Cˆ‘ÂÈ8JÜ0ϸ
zJ¥Í#—a�&=Z‰¨`ñØHŽ
:À&¾³¾”¬à@Øa$9*“ÄŒ¬üz(šñ�;�‹•àÊSuø&eø?ðÔŒR–•:õy�þ�Ê}º�Ø{ˆr{¤ë*Š8¤Á@¾f|–Cb–Ž›?´s–‰ˆ&ÂC; ¼ï zÒHÂ\³di¦p §¶\–Â�áIK¤+Œ†èŽÙ§Î¨f¡'ö«ÄØã*Í„�ÎhB뻲ãhÊ#ÉÈ<Ša	§Ë\–p’AÊì £+MíÓ¯z™£
Úùþq
0!!˜ò�è
¬e%¬UŠÑ€Z‚R
Zþ¥uÚ¶uÛ·…Û¸•[¦EZþ¹ ¹ÅÛ¼Õ[£õ�«ýY¿íÙ±ZŸõ�²õ“½…[¶-Û¡õ�·ÜÓpžt¨@rP†E¨{ë�(Ÿ
¡Ùïñ7|°‡�ã‡] ÝÒ5ÝÓEÝÔ-]]@]ÖUÝ×…ÝØ•ÝÙ¥ÝÚµÝVµ]-]ÜÝ…[ ]}-]ß½…[0Ø`ØãUÝVå]ßí„ÓÅÞM]×ÍÝÙu]é•^ؽ^ÚÍÞém]î]ÝÛÝ…ç�ÞíõÞî%Ýê-ß]¸^òßÓ…^Ö…ÞŽMßù}]L@]ûUßóýÝüå_ö%ßVU†Cð
o�9H�ž»Ï·Â7Í͇{ð·š]|xpþ~؇xÀà¾`æàîàVã`ò‰‡qõ2.áá>áÞàFaþF/Ó‡ná~áÞàa×î`œÅ`³a¾Ðí7{è7Íýá�W|ØÙ#¦‡)†â{˜â»ò‡ýAÐòÑ+úx5ˆ¤1æ·}¸‡3þá
ÕÜ3vb Öàæá–c.áÆa^a¾aÎcfá
Nãîc&äbCÎáœP| Ÿ*Fcòaã6>dBÎaâ.SaC>�x8�AÆä7î`6äâKváQ¦aDbHæ·3ö@�ÕY6ÖÙq­dKáöã¾cqý‡Hþ×^öÀ'fãñ9–ÙLbºbb{ça/ÖÜ’ÒÖÈ\3×ïáš½…J°‡áM‡Ë«ì	gq&ç/þsFçtVçtΞr^gq^çNŽç/†gt®ge¦g½ªç¼‚Hw~µyŸ
è…†+;�pžguÞ牎h‹–芾hvžè}®h|æè|éÿ¸ç/þgq]ygŒ^i}¶heng‰–i–>g}Öè�¾é‡žéîé�¾érÎišãzVis†g fiò	©	ŒÁ©y’{“ÿàe
�«làÐQ‚2P††ê¯kšnç ë²kþ•æâÙht]ñ¡�Áæ}ÃY€3·&h†c«³æë¾öë¿öë€#éµìÂ6ìæè¢&i²>ì[ì˜Fìúhæ$H‡�ür¸�i®ƒ1 f€ë²v8„2ðƒop«)Žl¾.jÅÖ«ÔÎ+
1±‘ìÓÎk•¶ëuNȼRi	�
Ñ+3~kñ¸»~k
A^_øghoçóbö†ÇhevqJ÷™§ùš·ù_j´Òñú€jüŒ+˜Á}h2€
Ø’X€%Ø_õW·VH„—u]?èd‡õàˆ—øÖö7b§zmwô«uþxh‡�wp×x
�gÞfhž¾sâþžýÜíüNtlÞú1Þo)n¿nÿ¼ù¿üÀ|¿NwÊ–�~÷ƒ”ƒ1ˆû†·qbï
X‚: »o×nÇFð„œzñ
aOxY‡+
Wë‚–ùnŸ«±x0suxÿ”kJß·)?há¦h'æ¸ëܸ¯ÙÞ¯úDOHlÿV²Ÿ{»¿{ÿs¯gúÁwþç‡~çuï:ÈlÝô—]�»…:0ƒ_ÐCz0x†\øv•ÈÐ%xÓÿâ?wí©k‘¿õn‡î�'yó}Ю¿}¸8~

)¤
åh•ZÓD1™iö¦˜V¤�¨rá@·|T�­ºú*¬±ÂxoJx£Ô\í(ƒ‰qÈýþ£`ì‘WІ'éB-×JÇÚŬ FÆ$è¨tý㬰åóÌ›ý�…dB��¥?w8ðËnôw¡T¤‘*DÆé¸ôh’uèM}F~ušaùcÎ0ê~•�=+ùO<ø®šp²=ò.Å ’Ã…ušVfØdf‘;KDÚÇ%{:^žýƒ>JÚ]IÞ(£LL­%+Ï=ûü3Ð)ñ“Î�éŒQAç8å
ré+A,$X„Û�Ï!\(¡Ä‘ésÌ!NH‘D·xÃÏ-N
±ó£àHG1‡1žr‚
ØÅ>tá
FRB*ÑŽg(¡áÂÔAd¦ãÆàB	(ÑIÐÀ‚ô%4~y†a¢­‘9„*¡ŒN@&z/]àr”Òc#àÂ-À
�(áB@&Ü
2NÄÅ:á€
k\H9èƒ?ˆ^°O8 y!ÚCaˆþø
?$‚àÂd˜-Á>^"p˜ˆ7À1�4áÑ«„d™JàʸEŒ�,‚’·¼æ=á˜xÓB©œcWLóU
	õ.‚àãïzˆ¿r‹ôáŒ÷`†3öá�iƒo£Aœ¡¹œÉ�LÇ?”Q
¤M#ÀÓG9’ |Œ@
Ù@ˆA
Љxìâ�¤
~€‚Uw¡´ð†	Êð�$™KêÊÅzPJ(Nçý5°ƒ-#…„ã(I‘J;bøÞ1É

%Ê>FÕlí·-ÞG7ÂÑ
Ö!„p¬€2ì‘ã^;ØIÊFÊ Ó2ÔÕ6Çe·=´\
2•C6…ˆH%˜
�&fš
ºƒýÈ
¢dT‚t‚Ü�õÇ0ÔA8øÃ…zÃ3tÂ%XKÄ 
œ°È?Õ…ZÔ¦àÅ}´¡µ¶gt†E¨…gLÊÓ~LF$IuN”gP„>ôAŒÌ³æKÂKZ¬Ùžm¬øÃB&T²EgC0,{(„v¬Å˜,„wH+«Äg�ÏÖÉ]ÔÖ4œ´É×klªÈ>GHKv^˱�J”T!<d%a~€_6'akÔÌ»È˳…
œÈ-‰Dák8nÙîLÆ2ËEî«GX¡ÊR„Ö~HÒ†©²ªÎŠ·Âƒ7\ˆ\ðžvêÁøÚ¯ðâÁ6gB‘4(¬>D”Aü‹ßJ
 èmÝÄÞªœHFÀdƒ¿QïÞ’¬ÑbäŸH�þ@ï}pÔÁ!àÌbœ�˜®«Ä}ôêEú­EÝW†I~Ô-z ‰ktˆë’„ô*m‹TMôrHI°·ZëêV¡g”G<¼ý¯O°m؈*”34ÔqDêC1LÃäCÃh*%œ_#ÜBâøZ‰àKv~nøF�..¾´l¾�„b�KÉroAä×HL¯˜¬ˆþ9LëLæ¾oã
Ê�À(Æ÷jnÓŽì›Eï¬Æ	>F‰X”ÔÆD]mbÜHüo¯î‡±×FñìÍß{-¬D
„¿ä: ܤÃãì‘œT”Go¶îŒAÌ*F$�
£F²È{|FÉr®²ÄcŒÏŽIþÃä—um¥îlËFÞ°µÂïÎÎoG<lÖâ1´ÂŒAPIýÆ(ïìVŠÎ$FFZð0²èÐDz,Û„ÚÞˆ74ªC>êûpÈmœÑ:�C¾u�°[­�×
¯ÅãéæZq+ð÷zDÿ0‡
ôæC>˜U”‡_°®¥6.µDÍýöm&ðŸ8îDÑD©‹øÆÉ®^‹¸"0ÇÊs#?Ô3XXÍæÖ-’å±
—mÝ~/çï,ôA‡CÁ²m¦ñ• GIü+9(ÂdÀ<À8Àœ&üÓUà‰ÅnÄè¢Ùîðçê�ÿíµÖqƒ„³sÉ7¿ì“ó8ÿþ­J¸ó
gDÏÒp<ˆ[Æþ¾Lø1Û… ˆÄÁ9‹ßFãs%K†�´Ë¶®4BWõA;•-³­.	/?µäƒ.8A¬Ñ éÂâêm
Gséöl TJÆÆ	5®*§µÐb*ÙÖ´˜¬D;P‰(«DÙ²‰íZÆiŠ¯=JxIßÊ>çí|
Êy°±;SFµ<Ä�„wàóU¶Uwv,—ññ&Þ7›5ßC>\Cã¤gdÙ‹;¨ Ïô ól47sZìδ04KJW²h at 5ã†ÊYø3'•,‡5ïq\¸5õñ5,û‰AS¶¾0öfñdÈM8ö%W¶4Óívþ$õ Š%{6yo-_ð>ˆ¶D>ÔfÐ\=Ôƒ.À€"x•ø¤K·_ìñ5ÛõW8áBžè..é’È\'±?—´€Ol<ð…`€Ä_»ì}D·÷´%£E
?ö3§Js/ 3_°Lƒt¸[÷ã².T˘Uˆ«QßG$—·‹¯B/²¡±â]ɱÂC<ÈÃ5�AFW@dÀ,A.¬5r?öN6†W6©Üq?­ôÞ0b#9J9ž8€¯EÃïOß´hÔ„3g7ã0bëô¨„ëîDe°@ïmZïÇFù‹Ç¹ðb5£.Å>´—Û2ѱI>4ÀÀôå4
HÃyMLõ¦rhìL*Ë9«‹qŒ›1+o
	µ2�˜’X«iMBM„Æx³06;6©›EQÓ¯„Kx	7&G°9ËÆF,7<·º´K0�3$S¨·�cÄöþÃ
>P&XÞ=ö@”º¹Ã/ÒûŒxz¦'ê–-¦ÓƦO;½K0h,�¯qD±o·0Ã0àƒ2ž’�Ã0C¤²a4Cûl$|½?¼Àž·µÿžCêò–Á '„¿ÂCR±ˆvä°C|ÈC<Éì«?§h«ñD‘‚*DÇÏ{ÉÇþ¼ÌÏ|¬T{£^‹zw5ÔBõJÜ];ôu_Ó¼Ð=ÑÓÈÉ/…åå»BDTP1Ë@o¦fyÑO=ÕW½Y¬­ðÜùVÉC±Æ’,_ˆªÕ�=Ù—ýMÜ;s¤üCËEa¤µ&•ÙǽÜǽÄ'Tzç¹røw1Åνßÿ}Ñ=X¬•ò6g9©
s¾éŸ>BW»Ýç|
�Æ^Dõ§£¾ìϾð¢}Ò+ìt>\—D´µSÓ>ð?¢Ö}äoýÅ·ÇÌøÃ7¸ð7¿ó#§çC§C7Š7ÈDøíYì�Ãþ??÷w@A¾¥²¾WËzX�Ò±÷§¿ú”àß~Oç‘Ê­Cœå6B¯mÿúç¿þÓˆê¿Ûþ
@”ù7ðŸ=ƒûÚý²b\�:Ùø”8‘bE‹1fÔ¸‘cG�A†9’dI“'Q¦T¹’eK—/an,×(I:4rÚ3VÉ
4üôÉA3¾{ùòq3fÆJ�[%¸P£W.fU«W±fÕº•kW¯_Á†%éÏÛ¡$ÞnÜ·³çOuÊð‹øo_>yŠ
<8°à
€eè);˜paÇ'V¼˜1Æp4mâ´×îOŸÿ‚¢ñÇ�¾}õæé"ó¡Ç’K(
£G¬qkׯþaÇ–=›vJ}eÏÊ‘³oß9e–Ëè{[Æß?~uÑÍ»¦H
¥\%rÑ댮vuë×±g×¾ÝäãšiÿµsV©‡O Bÿß—|93�Ò@OGo.wû÷ñç׿ëm³hq
ÏLÚ.~üÑ'ž|šAÂ� `�–˜¤8þ0ÌPÃ
9Ìp¦ï$Ë~ÊÌŸäh0ƒ†¿rQ!j:¬ÑÆqÌ1,²þ¯�ß
ÎxPŒ§3üÀ„.䲇LÑQÊ)©¬ÒÊ�¼‹l sœY¤­óÆ8}þÁ§%ر£ŽNø±g-)z¸RÎ9é¬s?ÿrÃIŸI4P Íܼ§þˆ¼
ÇÜ�žl”±ÓÑG!�”±,Á+g¼/ÿ�k }ö)ó|6“ëDìÙLÒSQMUÕ—ðp ñúJ ãð)³(ãDôD2WíÕ×_�½èC-Ã;†D êÐ,"~jí´LãFÝ4Øi©­öQÏJk|ØòI}àÚìD‚ì)ÓQºÇÚuÙm7GJlgÄ/3KoÔo—ÅìÂ{îqÖÝ
X»Vu{Ho‡ÃuÔq	b¶¨ZŽXâ‰]ƒw sºýéôî¸8}ê£Xä‘IþªÕ´8ÍØO{u½Am•«ä™i®™¥a}¬Œ^ŽOD°\}‹ËUf›‰.Úh�°uµ·ƒÑXÙþ¸‚.¨gQ£>Úê«�¶¸ ŒÏÊ"†Å4õß]±.ÛÝŽQ"8Àµú®>ú¤NOêQC¶vêú†n¸n³ù¦2Z\çþ%‹'ÓÙ<õ)äe£–+_v©N°áÎn3£üí[s7ÕñÈ6éäÝ–nû@¡Åõ‡·Ÿå¦§Ý…C^Öuˇ$jóÛk¤=T\-w§g”pP§cM¤Ûß„g~Úq<`Éq•kqÚ}Üãë±Ï^ûí¹ïÞûïÁ_üñÉ/ßüóÑO_ýõÙß~#ˆ‹£›¾½=J<¶ƒÔôsú†„Ç)Þr‡gäí_¼H›¾ex/AdÊî ÈÞÔ)ù˜ þ+hÁÄá
n$!eŽ•©¡´i.í€G:Ž±+X£	uÌ(F¦| )ûP‡:�Rî�‡=ôá�D!‘ˆE4⑘D%.‘‰Mtâ¡E)NqŠùØ¡<äQ,bQ‡ò˜ÇåQÃÒ¯#jã�ob¥¿gýƒã‘B¶P‡,�üxFÀt'C»Ìc[|Ç
HA’�…4ä!™HE.’‘�tä#!IIN’’•´ä%1™ÉAŽc“'ÿHÃN‘Ñ#Z¦Ðc+Ï,G
P\‚¦4(8Á‰RÀ⤠Å8ò�•$x
áÎ~R.7éðd(C%(QÕÐ#êØïö!�w,C9õ„(R1
±‚Õd5k*ÊŠÖ³¦•­ku«ZáÚÖ¸¾U®u¥ë]çšW»ê¯{õk_
ËWÁþu°�%ìa
þ›ØÂ.±ŒUlc!{ײº"­¢Å'4‘ÙOlb¢pÅW7q	R¼C›˜n
Y´B¹Ì]ns¡û\é:—ºÑ­ît­›]ìn÷ºÝÕ®w¹û]ñ†—¼à5ïxÏ[^ô®W½íMï{Ù_÷Æ—¾óµ¯|Í»\YìW¬XÅ'2ñßO¬‚ûe…+B[‹e„ñ$¦äZ½´ `a
WÈBÚÔžvµ«MÙW¯bÛÝÆöµÁýêi»‚Ûäöv¸¿mmu››ÝÜNwºµÝîs«ûÝá–·¹ë½îþq—›ßôF÷¿»-ï|g{ß
w7À	¾î~ãáã.¸À.n…Üß�÷Â^ñ„ß;ãw8Å®ñ�s\ä¿6µý›eäºNô‰Q‹TÀâ§òØGÕ¼‰Ú›¨¶Í›ùÖ>ôa‡1è£w¸Å‰Øñ+,!bòœ¡?!‹Styê]î/·ý{u­û—ÀV·:¾¯~ò¬s�ëÔî7ÖѾu´_ÛÝg;µÕÞõ¶{[íu÷/ÛÍN÷»Ã}ì].û×Ýýö´÷ýêsûÞïw¯»ñqï»áßøÇÿ�ñØv<ÚçîuÁ_ò|·üäŸ÷Ä‹ó”×ûçKzÍ÷�ô…Ïz¹%Îr,þ+wÚÈݲ)RQ
3×cy&)êÖr=´C]e¢O;t—(wLì[ùx:(¦}Š
gƶ0Æþ¯Å°ÐÀ´ðŪpü®ìc,
l½�¿LlW,
§m
åËèÐÅøkñ0÷�ÕPë
±áî	1
‘ü
LMÌ
9a//
Y±Lñ±n»,ÅœkÑZAåöË\
ÌÌæÌÖ$ã¨GâÂgr¢(Î…|çeº©Zþ]êâù�¹NA¹°lÑÂì
­µ°­QkLMlÑX¬ì¯PÆ­ÇñaÌÅ�ÑÜñÍ0£0£°á±×1¯ñéPñÑc̵ð³Ñm0þ§°
ÇÑÄtÌ i‘Ùññ	ÒÀ$òÄ(R!Ïñk GÒ9R'r
É‘#CòÊF2Kr#ñÑ
¬m!—ëIJ�¹
,8¡æ(çþC7x.H„qqJebYà�>è�u˜qa&¢.D¬<
¹fñÔN-Ì’K¹�KQÌ [-¹Nì+±ÒQLå®+oq,Ó2-×R,¹²Ãòá2¹ºñÙr+ϲ,¯ð+ùq.Ë2—-ó2.éÒÙ²»2å+Ó.
S-ÝÒ/çÒ™./R0ëRűõ’,QÌ-1“¹¬q¿^2,“0Ó²ÅS4/Áñ4sþ5!s4qó3g1-³/ù‘6m²0asºt“Ípö<Åx’Ñjñxª�‚2$Œx’Å´@&uÞ,q8ã\ ç^l‡œD<
c
"˱
írSÛÒ×ò/òQS-ßóOsåô‹¿lÐ"ùsåÞs>ÝíSñS>·²?áó/õ3YÌ+QÑÖÓ@÷3>)”BT&׳&³&/´?Íñ&ÿó@-TÅ4s?;”[íC¿’=ETAå2O-C·Ò&×REõ²C-ôEÉ2FåЕë/Q5µ’üÞq
£Ðtoæ!:?â›èBeÀ…8ÊE\òFqìA:HÉW¤’ šeÙ
þ-!·?åð&ÇTÜ,¬Ît²îÐÔÊô5²-e”Ñ“@½QW!NÇ”0½1Åp’	4Õ1
´Mõ´N·/\
­üpER)+¾ÊʳM
ÑD_Œ1ù°Gë1ûÊóCÛs-•¿ÒÊ<
ûQL#qLuTR?
•µMYRP)‹¬^ÍPiSFë4BÙ1eô3÷‹S+qGóÀÈnD¡ÌÎì$Š
×0%Y>l3ø''è‚›ˆZ¨F"Ê…*“áƳüÜt‡5ÞÐ
P
ø@Ø•]ù
­‘ÀöUÅT7s5W.D
]QAdaËMR]a8ö¹�¸†u¿Dadõ€AÛòµNMÍA”¿
$Sˆão°T"¾åwÖÅÃpn œ�Ðl6Ÿ°»l†ële!d®"Á
b
ø`À¤mì­€"sæ^ioÏÄF’þÀ͸Ê3,c�ë¾°¹VLæÊsË8tRUM9×óq¯Œ¸@¯‘g’¹B!$vrKáj¡^A¢nËR·ì\!ÅPÁ
"À
àŒ;7
"
ÛŽ¹Ø
érVÕTAbµ¸Ë¸ÍÍ�÷x‡ûëå˜×v}BÀBàÀ |±×D6Já 
v�-‘OÓÖïnö<sµöZM¹áRàxydARVR;ø¸¤îë°öÀ$A@
`™	
nå0Q9Á07
 
ÁlOËSFïp$Ÿ�ÜV
ÅT!uS
Ú„y>—-QÛFÓÀüµ¿0U)w’3a9Ø_.ÅÙ�Ÿ�ÕLáS	¬�!Ò.A 
rz‘!wåZXîL-€%€™ 
Ôà"AÞ 
b€
øÚþœvvi·¸¶ZÀܸËì¸
åÕ:\NÓ—ÜÌþÀ­
 
À•
Úù[6!,¼ØaáØ+öØy¬À|áJÝ��TM5§r
]¡¾³¬ü³F¡bË=عýì�ݳÌÍ4�y=[ó8?‘Y!�$~VÊÃ-„." XL|Gø¥(ö
*(hþ!q_a·ÃNaÅlѦîºH\l «ÐÊÜÁêfSÌ'«Àx™—UàŒ`þ
ô€Ÿ"7<Ax™N H¡
ˆÀT€ÊŠµÝ`ôoÀ¥oঠ\½§±2,·QQA~ÿVàÂàÀàT`ŽÀ
$á$¡
€`VÀ´€@¡³>ëV€dÊ
À ¥�ÿ6Kô 
Œ€ô�߀@Þ@.
t™È
@€
\°8¡‚ˆ¦O²ZÉ2%KÖªO þ  £˜BZbØX
¤ÊT©b�Å)Ò(7n ´qä�¤MY±2…³!«U¨ˆœè
.È`ƒ‚Ç�wûÔóN2 ˆu«°âJ‡™¢J+§\åŠ&G\€‘
\
àX€œ`DŸ|"Ý,‰æ
,~
 ”@¤!j'œT
BŽ8 
›'aÇ"/½Uâ�¾n@Òo*¥¨‘c¨°r ©›+h!‰(átª—7%6ÝC:5[ËvÝ=(^8�$‘ŽzÞ‘M%ð¡á?uŒñÏ>j—í_þ

(Aç	(j!è‘Š,³Ä"¤P\­@AçŠf|”€TÚ›@`$ÉKu¡(ëÊ&Eð矀`{ŠˆpC¶s@UH‰'¥œ�b
H€¾í	@ Sb èG
}$üS’S˜Oð!

QøL
¤H
(rø'
Ø
Uh�ø
0:Å'$
�a¤Ђˆ$
PIÀœ¤D�‘;ºá5]Š…¡[±
³¢B
wõ–k.å
z¨E-°ˆd$
lZ
@x…;eQàEÒ³³ù¶Á`4õ'�h€¯xp!J
 §Ýɤþ€Bÿ$�“¾
« ø0C\
	}ïƒÅ6…¡£†Sˆ¢"…ý$QŠR@ûPTA!ˆ`&Oë@oUÉjíRÁ¨xôÙž¢ˆ„ŸÁðs¬ß[¡7@ÅCR
	‹
E@5ÞPŠW¼![A
@©¡@1
`À1)È'	!
{ ½:8âGž’
°�Mц°
ήO
ž0X׶}V,0;¡’µ@ðÄ_©re6p\
PÒGE02õx\bÕtäò,
À¤P
Kæ=B¡
Ç(86úQ øpò €ö
âl0fž(
5oCqY¥
¡ H]"
›P&ÅSU~X
�8!
W\ÅC
žPz7|àöc²#G“¢
‰O¦€z\žéeDp&
Ähª
³�
‘0
³ižR
à
¤yã{#„~s	¯±�„ãow¨`71
'²iLô¡Ù\3ò"—P€mb',€uà-0
ˆ6
1yD`S�
Œ©@pÛF<ÔNJḗJG–°ð3œ‚š¯ ˆ-d¥àezxUV
Z1
«‰œP0°ˆ�G =wP §m�	§Pf¦"½é
@#
ýâ¨	-
IÅ
8 {á)'P
ï$
µ þZr(
©€9+0

%�l©P7pmÀ
…�	=À[ï­dY;±	F`Q 
b �¥€
š`˜†TýÆ;[þ»µ!u\
áˆÓ
~"Õrkeˆ‘¯ ·šÀlPF€[ôZ àÇr	§V<P°˜žP:¡9ë&œ å£NP@=œp	±H$0¶@ žFnã$…Y˜Ö‹§—q¹
m�2¡Nç	› 	z0
uF
µP
°
�`ÄiWbð; 
po¹¨(įÚçS~¨	Z MÉ P²#\Z	¥àŸ—P
‘pw¨ð	†˜þÔW
&a6
²KDü”S Pˆ¨EÔtCÀ
ô›kBwq	(Ã-Ü늺ù0Æ;° ·³Ù*™U
,ç¢
:A97—Ï�‡R9’W¢0›p^£æ ï8[þ
n@»Ôwy¯g—@½”2iòŒ-ŒX
.â	ß='UYrt
ߦ}•�Oë»se=žàx±°®Ñ2
6¿£ð3šc/Ýr8`,HUP=¥p´5C€+
k
C¤–ZPd 
±:l:
+ ¯é˜
†<7“÷Å:mÀ87“
ö_¼³!Ÿ0¬ù)
°"î›nD(0 €ŠA©R¹uI�m”ò$ʈ
(È3j§71.HP�‘@‚&xþ˜ÂÉ#'50
ORAå†!˜h”£NY³’åMÀ€/�ÚLeW¦H/
	b4W\Ñ$Ëßn¸„>0ÔK@C<ú’*PSÍC¬œC†DÙD�I=üc“O6Q!
H€ˆONêËP+cê)VšCJTH©êþªÄ¶ÒÇ›C’ðF²þ9G´h@ã}ä(ãŸ}ÚýÇ~èᇱ«ì™×ƲÕw_~ûõw+ÇØÍç�d@é’Äh£m%ᣒZ¸HñõÄ�HôÐã�?øÈcWNÉDQWF1$�@,¤´?
Á˜\Mi
’@ù#�Hº<j–Yš¢O>,þC�?ôÈ£U�ŽZtY—‹EO=dÖãTY\c•ùø$dNöð™M®.
Hš¶P$iºä=\òh­1þã
¡2
âOaÛçŒ5AE3§ŒŠ64ž›þÃ
I.á£ç@ö0¤¢„-Ô“�Áÿh£
>ìv5gSb�´£€üh™1.þ"Y¥âŸ÷¸ÄpÑ3LÄUŽD<Q<‰„7Ä“�ÙÃm=—û2ÀÏN…6é9h="Ũò>Ž6Tïè3<�7%YHN¥¯g±/éåBdÞÃWÊ«=É‹Õ(9�9	�ÈOtµ¸d=ÌÜdI¤,f—�…²æîE+i
KXy¤B«üë+aVÚáŒr­¥-çÒ
¼Þe�¬Ü_ÿ"a	MhÂÅ4æ1‘™Le¨°¤)¦X”xÆO ¨à¡™ðt™¢„Ì#¨Ð„&j'ŠÒ¼âÈ+‘(`

XÀ«xʈºw!X”B‹Pä„Kf‘ÀÙ`¦ªþÈYkÇ	Tp‚}E* ¡‰MÔÈU]DEˆ¨ˆ@Ot�hüß&ôÆ»XxÄÀ2_»˜ŠD)
3¡Ò£˜¿…•§oF£O°r(Š¥AJ��zJSˆô¿"‘>�ÎÈh
!•®9�IÅ(<ñDPü1	4Ï 5Q?‚âQäÏSbÑÈR ‚} q…'4Ë`u‡OT�Kšu™¨åQ�Ë
R*6ADYú­HH‰
÷Bƒ“2HWÔ„Ã7
D扇:DE%Ks	PÔ‘2cä+×ɾPQ‘†ýÑã(p•?Œ²*c¢8Zk
µ|q-m«[Þ¨à?ÚaŒJÁ\èrþV°/Ç€]"Ì×	MzR”
&`û¨Á^!
Aea™©Œeº-hE�!©ÀÕë…” q¯’C
ÍB^7=†„§Š#"J�¨—ŠŠTD!Ï߆b
U<…ŠíAäM£¦S"…*H¥ü"¨ B”†*d!y"¥Gbá�ÐÔH

R
g“‰UÄ4Oô!¨Pg4º9µoWã]…Ú=W„g›SRPqæ2›žÕ)ùg>gÙ0¨è”¯ù3SN¿ÚÊçQbx
•/»gžžú�s«¤«fH 1O5ê^'¡5=Y`²°Uô¤NòºPר£¡&»ZÛ΀Š!ù‰RÙZ�©€E
.þqjS}¥D–!æT ê¯r€E,á"42È9 Á1ø—>ƒ­w±·¤)¥o}O˜BÇ@Æ—Å
¹kSœVa
žaRèWÐàjD­˜
¥[§ræ¦�ûRr•2SÚ"Ð(Dê^S”‚&m4²ÈYê™ÿ’g%®‘—uG§ˆ3\h$�:NåYÍ¡îSBáWñ$rQó0R¹ë2TzssÚm,Sª0Ó8*.TØlÐzÚ Çð¬AiE 73šæäø¶7æ.4“;‹íi†{škØ<¿ª™'C‹Š[eàP„r”àb¶´3ŒiTîø%#¡’�Di d»¤šx3~Vfþ¹éí¹9Ô‚ |÷åny«¢,×¹üáxÉ7+íÂGcDm_T§º_+Ø2&£egÕ­
¶m™eº¬¢ÐöŠÔˆÌÌ&ZD2‰^§™H׶q	{òæpú¥e…QEqžk3h‰HÚíÛ6aøU!Í‚sÉ
Ò¸�$CãŒÄ–�1SîLàñ ±S”Œ!6äS WÛ1Lhf;Ãî0ŽØ3�]6·“B$#}‰(Óv6Èág)
¯Õ¦î†—J¡Ô›ÙH‘ñQ2¾¬ûa‘œ)Âa8Ó
/*Œ3ÑßLëšrïÊÑöÒ*¡5XX+‚þšàx±bŽcœ7]h�oÀþÆ.¬œZÕKgú`ðû˜wø⥘eÃg«çô3¸Ö)¤…2ä0ƒ)å
±
xÕ’KØÎ~Åó²}WÅŽ}¦Îx½#×"ýwÜ^Ê”ªcbV‘¶�¥%½œäs¯Œƒæ;ÇGŽ]„×ðÞw§.Äö}Ýä¾ÎÛ`þ*º]–ã™
ûßP9Ò‡�Í͘fÖºÒþ^kžsÏKHf°Çòîî¹C;ôä2Â8Óø¿å]ÞAñ$½
JäEˆsæ[g–
c~Gí¯ÔÒ¹¥õ%Qo�]øÀ¨F=
j{°å]GÿG©ã;¯¦§_ý\YiK&ž
cþº5¥?­£bçÓÎŒ*ss”þe.Ó±…Q>ߢû¸¢˜*‹Ù>¼
>«*gY9»«$"�¬¼È²{Cš¨Y=Ës…º:
¢«²êA²º’9…é;Ò«5v“<•k=×Û³º*¥è›·Ú¼„q*ÏÈÌiÓkœÅb
!	¸;z†¢0Þc0•›;¬¢×Q;[2¥x²™Â2.Seé?ÀÓ1èC2Ë1z–Y"´Ox@{‹˜¨Éœ/ÊÀ✫z4¯«ïÚ¹~é¹M{†EH
’ƒ1à}¡¡zá‡y!¿õ[DU{:ýz5r»â&ùC›š§F’¿‚¾Ùc¨¦8ÁÏ�1a3ŠŠˆÂ8Îþ
’U˜¥è£ÖS¤xÃF¹ÚcÃÊ0�ð𼼫"
�,‹š«ùŽJ*’Ï[Bû­ßKA—‘½¤6eqk8hü"vëÁ4¤�³ŒÚK˜·ªÊœjz+²4GsŠz㮼Á�u+2¿BÅi,±æ!¡¡Þ…ÿ£¢Ä*í"‘ßÂi[£G�k°»ã­b#ŠkÄC•¦°;»£6#™!œ©«Ò²®dBÓA…‡ÂÃ}Á>Š
—qé´w
5AD—Å€—{@:�BDF|É¥k?—"¨¥R 
Š¦ Ç+1 ÄœId|L£¨GkÈPÁ'èù±
KÁ„ñ˜L¸®Ìñ0yËáÓ2tÜœEq=уCM„¸"‹³z ïê—ð¢ pá4?Ä;8—ADÒ‡�Â
ôƒIç¤/Gd¡ö¹-ª+ÇÔS4Ï*°1Šô53[³´¤'£òº¬ü¯ü›«“EÁê=T
°ã;+ÇT®ð;h»…‹µ*þ
ź£›;6\½0Ò®/š›gó«VÈÙƒ?¬RÐÚ
2ÛLŠÇªIEš©5³.TB3 )6<C,ä’®Õ³­²®ÙÃ8/À•‹¤Î¸œº’»ªÂµHSÇ×¢1¨PÌ�ŠÂÏ»#¢ðÌÊ©¹³IsóB#Yª=M"h#ÁLT¶i©–Þ¼´LI"ï+Éu9:DtÉçÜÒ˜ô(÷ƒD
*£Y„,£,(bËŲ�"u¬L~üºÓÃ=Ô›5mt ;´>}ÑÃp)òÃy
Ä,•Dd/‘ò(táRx-¡è”º!eŽÓ»´5J¤0‹…
TÛŒU\Ô¡¢Tè¢W0'ö´Š-�CSH½·@²VV]šoD#™HM²éâÁ"£û8¸tÌ¥Æj…�ñ5mÛ8œªXZ�H a¶†%½¢øˆ~Š.hL”ïP¹Ìø7Ǻ­�Y`éJA»Å*›;
¥ÙÓ‚ÅþäÒ©ÕÂÄšC0eSG°Š0æ˜;ÎÊ#·¢%¢”Pu“®D¢À’M¥ˆ‘L:³ºT…ÆÄ°ü™T¶›=/l(Ž|Òë‹Rí³(ŒJ4X·ˆÀmIñ5p�WÃÍ™,˜Š?úÃÎÈê·ÛJÒÎaªÈúSÌcKîa”Op¸€à€Ѓ®òS£1Ë«²åAWÈPEËTuÊ`m²Ðû«?­I#\1˽8ÒÌBÚS´Ñè±á9WØà
ÇÆêA�SË
#½[^û·3`œÊP¶¥Ä{c¬à�*=0€
Æ
TpÀ¨	TØ&þ
¾©ˆ„P�d-	e[�“ÙRR´ã3³;òœ&k at fÃ:†‘Šêû—ßô9q�†>4—y)NÂm—x�‹geH-}f»Œy}µúó/›»Ü_üŒ«!V «-ÜÍ3û@uì˜E7HdH^òT$›¼æµ±l<’Š;Mf97MÒÑ8»¡hQÔ¬)ˆq½ÆQÐWu!�K0£½Ì˜(g
91’Bóçá£35óŒ5ÛVÎ⛣>»ÍL›¨
Ò‡v ¾µRˆ‹xȇxØo+Ð
~P‚2†º¾k/�IX;6úËÌG«¿P᣷
Í>ºŸÐD£Ò¡(ê¢aŠšH(1øq0†(¢kzŸ:‚8*Eƒ®¥(‚£kÊ£�
K‚S¾¢à©ÿ¡£A–†Ë¡R¸	`
¨(‚¾JÂU”&>–/Ï°j”&ÿ_NèJÒðñƒH°£ÜÂq^zŸÙJnïá
‡ÊvÄ
è
€¸ÅïØ¿‚"L¨p!ÆBŒ(Q"¿‚ûê½KJ+S²>²
éñ£©�C~”ÅJåÊ�¢ô(`
ˆ

( áŠ#nP¹òäfÀLܤòôJ
ªXÂqA
ÙZ at yJ•ŠSž#!"@p
HðLñê“,SW­:)J“‘  
XÙÃiTVPj€€�pt@‚'ˆü¹ô)°,NœÞ
1�ìâ1¦húô©M™3mFe£þóLÌ
˜‚á#<Ó'N’$Ü0 ˆlÀ¦fù�%+ª¦H¸WŒ-@ Á³¶KŠ ø.1,&ô”`ã
§X³DñaVQ5€ˆ@DžÄË(œ€B
‰ �6`€
ÀÂÂlX$;PÐÕ|80�¨x¢â(�|hRH%­A!8vu0
8�  …*Ä -¸‰iþuœMàŽË’À
 
$&ƒ8€V 
P
Â`w	@Zˆ*Þ# 6€BV 

ØÀˆv”‰ÃF1
OÌA�F
`pƒ$Ž(“
èdžZ0B<0OœM§ÐçëÔ¿’Œ$$fZ…+ð¤»î•P‚"Ô?ÈqŒJô@QŒr?Ü�ª}ä£Äp‚nшƒ̓øJjÒ“NäT©Z•/Ì7+\4}ë³HX’Š@@Ž
�†
 5HbG @µx/QØMqámC“¡µ(ÅRç`„-‚¢«Æ¡€˜$á8ÅtS
|ØALh‚ƒ0�"jøÖÁBp–M°!Ë™e%QŠþRbm ('ô`™ƒ©Œ©pÚ0‡H¼¢(Äͺu ñôFWåŽpRâ—zyb1 €ÅDðWXpÂLOõ
ª\Ʋ汪Wl0Oð¡©mˆD)œTp)À¤+"$·žh†•žðÄ Ø0…9ð�ðÃ	iâ
0 â…6`N@ Ïr¢½lxÐ+Â@\ãˆ�g³A$´Ð
¼ a�D-Ôp‚Ià�ø„($ñÜùpà|h¥&~¸+žhf¯’Pî{E‘
’Ì饲˜…oÕg+‘ؾ8h©üá;à	ïø0&„0äùCyüð‡>ÐQJ9¡:ð�2�†aþ`¥ZÞ2—">òiD#‘•IèÐ1¿ï$Ÿ0­áj¢‰M¼Â;Áâ	HAŠÄ/(DR=ë‰Ùì1óÑÎ4Ñ$	&e
°Á+ at 1KPÐ'ð)‹5}“¦õ*
!†̧
PLí..(Ä$
‰Rà
Ÿ>k‰x^8©ä·îKÉ™jÐ=uïO�
r9 �( a¢hð‡?àè9Á
°ÔJ°„\4Ï]Þ;ßy‡ªŠ°ô¢8Súd«š¶¯/­ø„N‹Eü¹`ÃRf-Ìö܃)À8(¢ îºMLËáP_A]ÇzP€n
í°I@âL]�@¥Lx
°‘Vè„Ãý„Pàà@h€ÐPà“+ PÛ
휴‚'áÔ]\†¯xÂXQ@…ÜüR¤@-ÄË%H‚M^¼Gðß«ø+À‚ìÄ]ä",¼
¬Œ‡&T’q
D:Í&	Q5!Æ|ˆ�/xß%¼Â%€,¶Á‡
@$ôÇÕè@›qH$t¿…�/Â/½ÓO`Ki¡Ûbè{òŸ™¨Ä&Ás1äÀƒ”©+X©&ðÁ‡ÑwˆÂ%ì—q¸@±ÁŠ2þ¤)ˆ
p€Q®(8Zvh
.ß5¦ª°Ê#Êú¼�GÈØúH"+¸L€K
phøFÂèl`¯÷Õ‚ÌÓ+
Çì@ˆ
<Ì1?ÐÃÝ2YÛq[›Tá²Ô^¨)üøLE*Ž¹ÄÌ]!Ot
О(ÀÂ…3A¤À"
,e
p@’*)ˆÀ­•‹¾� LW\€
p£
˜Q¥2j
'@‚	±(¸À_¯ïäu_³¡‚$@	ÿ
¬l,˜½¬í=C@XI”t
<G\ý�è €ü�Ó*‰›¸Á
E2­¦CÀRƒˆBàú€Ñz@@@*X‡
P
„@³	W°`\ˆÀþðD
Hôª9ø¾çâ&`]*´E‘”s`
7öˆD�*£"‹`ËNé¢kãÉUXi…•Xä2Hä1p•/ÑpÁäØ0„Ê´¶¸K6¹HÀQ1d6ô5ØðÒ•‹ºúj­‹†ZE7Myë6Ø(Å–Zè’¬4½Êi$‰t»ËcSì´:Ѐ,2É*«L~ÂýGŸfÍ=ÝtÕÝKþ9-Ÿy’ñï6wK+X|
ŒMßØ(¥IM.Ñ„àKO¨¼ÈNP
EàK`á$•¡¾:哃]åayÅൖR@
…IášþB�@H!¥˜q� ¿
@Ðb“³`;i–VÄÚ*NNX4Yn¬U@™°Â
.¢ �E(÷	æ)ìC†
I·\¥‚þ9’š‹,ŸòU©”ÿYNê0IþqQ’¢ÛLJøÁHŽ0ü¢š,fŠ¯Ï™¹ÉàL\
R,k]ဖ´c�v<ãZh—Ðà.ÆØãö^øq™É,žñ”çgÚõ®Ä+‚«È�lªT›ÝÀf,¯y
¯‚GÝ
Ë@³`‹ÏΗÌbí«ÛƒãÓùé*˜“E+*·‡	(
kg�”åÕ©
+a¥¾ÀæS€6òxa«ÍÕRá!²Àn@‹ÛÞFb5”ÈrRoüÙÕºÂGÊ9E@þÎ4£0Å’TUò©ÃRSUäÌ8Òíb-‹S´¶±@è,^qf0yÈ{RX	ãr8‘“½NM!Êó5ò-*]…Ï«¯ªm4¬ÿÂ�@žú¯¸\³~éò`¼!9DÆ0ἌcüQ.j½Ó•A§=(ã®yþ¸òl`jÞ‘ŒÖìËŸüœ
@q£¯™tÑoUY«OVðL@Ú1Ÿ®žk¬è‚Ñ—Æ;žïœâ¯N5`+
A@:Ä€@GpPźRB«m0Ï|O]±Ÿ‰B
/1‹d§ Ìî#ó
Ó²–¸Ì%µèZmþ³¿k•¡]´½Œ;,£{àã¶ìÜóÌi.šá>0 (Þû:^åA[°—¤l£	>ÝH…†ÿ<ÉÎf¡Š¥Ÿ²¹üª4ÐÐå¯Ð:æ&–Š=Mµ|`틵ãD'Æ"}�æD)^Q‹W ¢xæ‹\Ì_©Ô¥¤•T�µ/sƒøjŒ;»U3ˆG`ñûéDõ%wÃÊm_!ÚjâÖpþ®Æ‚e§`¹’µÅѺèâ†Æd™êtÿµUÚ¼q6vß°â]ŒÏ†Éùµ
ÙT!¥N‰²ã¯I£ê…ÕAÊ+sJýíâ~
ú:º­…XÌ}M5Ѽ®g±¹›ípF%z€­Èaíìíet‹tRK\5ÿøõÒç{®æT"#)/Èó€êÔ¼Ø(ïMÌú&tÙRröÅMùTAò¾Ú¦6 „dHnGqlcƒ$å®DéŒÎH´ÖoÌd
*‚æŽkE¸ëßlã„i£>ωz¤_þï6råw§îj7Ô¤È>ǼÚÂ"ʢɸ͟ނg˜«Ò~ËÈKýMXŒR K«D©ÒnþãîçÂ`ˆŒ˜©|z…(Ší²<kÖ¾‚_š*±@Ì#M±žŒÇ6,ÞâئÊ6TA¾¬–p®ê*É<hÙ�èø
�Þfâ´°)]#2¤ú'åÊà2zKûj+3Â%ÈÏ
q¸ò¡¸@as€N7ÆÌçp06ËѸm©š¬¯Æ
¨6éôf�Úدã|J66+ÇÌ‘hOÊŸ0ÐðTÉ‘4h)ÐáFAؼ_­é€j/ê,¢©_Okƒ
�bn8ÈgΨ�ŽJ±|0lÒg(†mݼ­Rܹmò~¥ÒÚbÜvã±’‰W
ÃŽLP7þl%Ñ©‡„ˆåëÞ1Ø‹w¦‹:k²–Iý@­ï¨I¥â
ùJ‹£˜�ÓeÍÊaZô¡Ž!œÚÉÄIûq\(#ü‘#iÎüð	Ðöé^Ä�ý$Ñ|‡»Œ6Æ_쑼ŽGûe‚�íÑmR8f7rÇm_´ãÿÒ§ÉnïŒBÑÉbXØ‚ßÔ¤mÐ'³&lX*
	³Ç‚N-ÐgQl°˜°Û¬_î+¹f	Á~�Xþ)ɤ.­Ò©T
+-¨Ã¼ŒÐŠË–í©Ž°ŸöBÈ�ÚÊT&e§˼þ…ã¤Îõ~Ѭ«Œ,¿L¥m†Ô0ë¡t‘¹ø)ãTfÐî%?nþ!Ïeµ” µJøG1&ƒ¶¾Åîì2~áàá†!*£#_3¸nn›¢ÝȲÙàð‚Úâx4J7Æm}¨ÌÚÀ'
£í(ù©_cWš‡Oþ¸M»È§¤«¾¯ÈK²‚’Æ:E°¢¬‰øE°¢êÿœkƒ8ëÓZ$u´Œ´¬n£^ÑSq
u…Ðx…¹¾ÈéŽSÃØf pLÃ2讼BlÞ'™(¨çF±(1î)�Q²è
ÒzDìž‹&Á0˜¦l7°”¦H²l8™I…Œ§‘F‘“ú
vÆÑDÙ¦©ÙV/ùV’Á’%3Ïe͸é.¾I¶üAÊà4J“ZÔ)¬@	àA	Êþ`è
6‹TžlË� HçÄ°“ÞÆÑn-ÆêeêkOl¬W:L»TÌ™tø4O¼îÿÊ«z¸�w�í»ÞªïpñÒ°çªK–0FRšîÊ:äÑ0Ÿkºœë™8‹â¶'N¡f©¢ìÑC¶Ì'EëÑÔ‚ßæñ$Ø_Ž§Ñ©ÞŽÂüE,ÌŽ	/N0g¡„.§ ‰/eÃÉM*ŠoÜÚƬ6ËÁ†E˜Ìh/C:«Î©6.÷*«-¬P »¢Ç£nÿnm‰2~*ˬ	›ð¬YðG0Jîœaúg2nIïaò!ôáÌà¬Aê ·Œ”\áÉ]òA1gþ¬†A«¬%¿ÒŸúîÐxò]2gp§fÃ^�
~šÑ"°zô”$9ì¼>¯_�]pšvõ¹Ì-@Ì¥ú¨òtÇòj§pïÈ|p9Çq%ac”V�/p÷*Úîk¼¸ê¨Ð‚ãŽóÖ¨rô*Ïÿz2§ÞÌ‚p·1ýíÆžÊâˆE
•f¡³Ç8ÈÙ͉Î$÷Ž,†ñÖ‚Ðþfbàlö6XÒ';V•Uò
IÏåùdôh41p´1¶å.ð![ÑA„ 2 zà
h€èAÊ•n×Ų5]Y£„¢ªúÓ7ÑÊ/éBÔ�¼�hÜ6Bª�'ý2¹^	ãÝ(èŽÞmþ,øëpËK£öëÂ0./Æ”s—­,øÎ77é,tfQ@ôÝ(Èp#‹ï8MÅxrQ4Š±ÐMðäµEW.o—±ðm0‡Á°qMùßxêØd�LýòoÍ‚L/®ªP	9õâøΧp—y7˜^—tIÈy}%ª—„V—SìòR‰¨©¼V�JÇzcê"þã¨gªÀ@.Ò¬YøÁYõ'¶ø°1p”Hh
*€m ¬ nç¶n¸4Z]ßaHáP&a¾'.,§v Äƒ98.HG„J'.ö¦tLXoD¸v¾JL¸„IÇj‡’6xo–£…c8†÷¦†EHotþ؃Æ„;øƒu8‡98…kX‡f…wøˆ…Ørš8‰sXoBØ„¥¸ƒ{ø‰…x‰{x‹c¸ƒCx9|øƒ¯ø†ã"„ehodÈ‹e˜‰mø‰¥X‰i‡…‰á8…-gŽ¸�)éŠÁ¸„�îP†[�fƒUx†
ù†ù˜’ž…§x…[øŠQØr8Ø‹{“e˜Š+ù‹3Y�))�áæ¤h®Ø{,^æ²ö€ø¬kõG«OlÉé[î)^ÞA” r!r�è�¸
‚‡ÙæNãnÑub¦já–Ù™ÝNëÜNš£Yë¨Ùš«›³9š§ùšÛ›—Ù›Ûnš¹¹šÉ¹œþ»ùœ¡9œÕù›ËYš¡™�³9žå¹�ëY›ÃYžçžëœÛ9žßy�Óùžá™›Ùyœ½YŸñÙŸ
Ú�ù™ ­yŸ÷y›z¢Õyœ	zž!š¢Z¢ïùœ©Ù¢ú£
ú™¡¢ùe‚á¸!ëÐY]kF�
„`ÃF2еt
	ê &A„�NC‰Ù¨÷Â5ï"СÞ¡–a–Aª§šª«Úª¯ª±Z«·š«£š«¿¬»:¬Çš¬ËÚ¬¥:ª½zªÓÚªÇÁ«ß:«©Z­Éš­åú¬ãú®í¯ç¯óºªçš¯óÚ­³®Ýz°»¯Õ:’
®«z±¥šþ–
òá]F·IÈ
œúgœÊÉ]²µ
|0B,±ËÃÞ×oÿýÝ?¦È:… ÃêøFLP” V¸Ã0
B
ü9ð�Dœê¼�,긮81Ÿ~à¡J˜Á·°B®gv#L¡
WH3ý¥J=`J¬dÂÄÃJ FÌЩ¸cM�
‡HÄ"rk‚¬ó³2ˆÁÎ8d¿ø…?Œ1oøÃîðF.paÄ.zñ‹š:ÞtÊ¡L$j†hhMxPô0´àŒpŒ£Å¾‚‘QLaâþ`óˆ,lŽ€¤ YâÂC‘ÏLM�•=ª‘E>ǽSÑ 'IÉJêèE$‡3ƔǠd‘èáG

bÏÐÏ’¨LåI�‘NÙÑjvRÃÎlF•¸Ìe‘8sà
z¬ÒWhY²¸F—ÈL&Ųu¥‘`¡×1RCŠ)óšØÔ^“øK&ꨖ̉¥8·“Íršót¬$ÇÁdK9ñaWêÌ9çIÏ·M°‚ûX'0ƒ¶"„ØCK'³‡¼êIЂB�•íp%;13"¶f”;QŽA'JQ‹ñ²02J”D"F�åùhEGJRo1“:ÎD#XÒ
)x�Ê! ]NIþgJS]mS|úܨ(UÃ�îLEŸ‘iM‡JÔK¥S¡ÏÄjJi�ôøT�÷OQ§JÕ	Ý3FÝ䧊J	+w4¢ðhD%²!Õªšõ¬]a¥=ô‰Æ=Q,Ã0ÃÜáƒ2(BhÍ«^crÑÂ䔟ühã?ò�hÔÁ
}†Ê�ŽSîõ±�=	3í‘ÐCž)Nûà†"*à€< 
 Üõ"KÚÒZä¦"Éh'•}–Hø@”ð
ë�¡u�ˆ­úÖ`l°o/‹šc
×À-­Ñ ÝËͱ²J°—MDQ?¸BN)WU²ÇìjoOÉ®f²vúÙœc“ÓÚඣŠ�ËRŒ
·º¹—fé
­ .¥Òv¼ƒèuÛuuu«¾v4øÀ�UÒA‰FÐëÞ? �Á¦Æ¶‚zДå¢ÃâJ¸Æ7î¤b�¿ùàÆÆðk” î †á¦müåöÄätÔ\lÌ(#PB'n‘�2Pc¹ÆT`Nt·9»ÑΊ‡HÔa'˜€J Ä0” ù2·èX¿Y«Žéþ(ÝëÏðƒ¤Ð‰NT¿ Dêàᬻ½iº>ä@¤M}ÄCŠ
ãNi²ÿþµÚ=4�„˜ÔÈÿ
™þ�«úrªƒ.cÄRJ˜‘�~¸™»úr­šá0±úddˆ:€auP–<q¬E>äÐ3c–(M…\0¦ØjoÉê«!³,3
¿á|ØSk¸ž}µ�LµS;¿Pµ¢}d”m0ÇLÀˆ�µˆÉX‹ÎZ;Û5é0â£‹Ò‡MÖUÛέ=µË=
SÜ4Vw ¬eP܆Èìàº(�µn‹µTÛÑ-Ý6Ì‹u¿NТYë¶ïͶSÛ±òMÞæéàÇ×-Áè¸h v@·Sëcó]àqû¶þö­`úP±lÁd�2c • ʇPá~ᾇ�à
ö1e�Þÿp›”°DìÐ	càH�(âI�â.žBÀáÎö€·‹,¦áL.ò
w¼Ùxä(­'D^äF~äHžäJ¾äGŽ™¹°Ìz•E#d°êP6,²å
¿ðßðÿððNhh0ñÒ¡‹èÂ�ìÙ‹pˆB`ÒAñ2ò/;ñ$_ò&ò(Ÿò*¯òcÐòh0ó._ò-ïò3¿ò8Ÿó:¿ó9oó0ÿò2ÿó<?ôDÏó5?ó7_ôJ¿ôLßôNóGô\àóG_õVõ?õ=þ_õ@ÿô^ÿõL_ó/ód?ö@�ôBöE_AŸõvЋ
=”®À…8ê̸‹ÈÃOADB_|E x«¶3ÂË'ÝÌy&¯ü~l1ÈOëË0Øb{/¯I“¨?'
|2°l²a†Ê*»©’q˜¹2K,»ÌK,­“™1¹,sK2«t†e$2Ë6�§›çTSgÊ<³Ë>ÓÌÌ@ˤrKA¿$TL0%SQoœù-¯:ÛÔ“JKÑ<ÓPBÍÄÔÏAíTÍN/]Tfè,”N½ÚTOÕòÓ,a-þtTNå4Ñ\;ýóLZe¥ÑVs¶×]§ÌfOf
ꦛ6-ÍæÍh“�RÚ7÷œVZfBêæ6gÂióÏS·'YrɱÓA5=SØWy•UTAe×ËQ-VV_§t†Ng”Ñ“K:™ì·àr§l÷Þ]ßíRÞMiÍæ*Ÿ5õÔ~•Áö_q ySe0ž6Û�­å×	“¥H‰$¤0yå”Wn™e•eFùä”�¨ç—s®™å›Múd'iç´N€öé›y^zç¦gVê™wŽ™j�c¶9k—ƒ¶cØv¹9e™¯†yj©Ë.›é¬ÉV»l¶ƒV¹e“ñ:@ÖV›í§Ý®í¾eþÞ:í°iÞ»í±ÿŽÚo«s\kž�NÙ{ŠÞE
–ÇúçÌá6™‹öÄ1†±“xå—ãf¯Å9älÄ]Çûi½Oð×'ë«gÇ™sÈW–
’Œá	Ø¥ÎÛðÂk‡[s¸
?Ûwé›wë¯Ç>ûìýÀž{@é^{ñ³ÿ{@¸÷£|ºcD;¼??~ó¯÷¾üñïÇÿúß_|?üÀÄ丱Ø!ø+üäg?ùÐ�€X­·­ÓŒÁ	û£ß5è@Z¯ƒaû·@
ªŽ4˜˜
B(>L�ã  ˆÀúáö�ÉݨÀ~p…ì¡õ$x¿þ!ZÿÉ/Rø=ôa¯|âǾò-"‚‡Xý"èÁ*¢ïÿ;ßÅÆC”ã….1ÈEb“´QCn‰’Ôh’4æÅ$âx!³LR›n˜#/^놄°­s4+Cp¼#íHG3.��D#$×X—ØIRq<�"]¢s'$÷`Õ.fð‹näQ’Œœ#/)©C^2‘§|d*ëXIÄ£”i„�8ìa�
¢a•qÔ‹,a9ËI
³�"±ä1ߨÊMÓ™Ætd2í¸ÌT³Næp¡'½FŽ_À`},e'ÏÑIs„³ â4gÿèBfí7Ö,ÉršR’ã~±ƒbéH6þ®²•Ê””0ÊOgÓ$ÒÄd@iMp–“Žï<ä>öÑ�nvÂ…è3[ùÏiÊ‘ ­ä-EâÂÓœ£JÂé†NÔ¡™è%æ€i!ÿ¢˜Df’H±Ù#Iü’Ó�ì6wÄb”T‘)—<‘i‰�C¢!Y„œñž8
U1§êL{*)£îT«GýªO�D¬º1¨wìêHI²MLÀàJ
�N¹*WÛ



From hdl at users.sourceforge.net  Wed Jun  1 12:18:36 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 01 Jun 2005 03:18:36 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marctagstructure.tmpl,1.27.2.2,1.27.2.3
Message-ID: <E1DdQJ2-0006c7-Tq@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	marctagstructure.tmpl 
Log Message:
Including Automatical change of display


Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.27.2.2
retrieving revision 1.27.2.3
diff -C2 -r1.27.2.2 -r1.27.2.3
*** marctagstructure.tmpl	31 May 2005 21:06:18 -0000	1.27.2.2
--- marctagstructure.tmpl	1 Jun 2005 10:18:24 -0000	1.27.2.3
***************
*** 116,120 ****
  <div id="bloc25">
  <h2 class="parameters">Select a framework</h2>
! <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<select name="frameworkcode">
  		<option value="">Default</option>
--- 116,120 ----
  <div id="bloc25">
  <h2 class="parameters">Select a framework</h2>
! <form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<select name="frameworkcode">
  		<option value="">Default</option>
***************
*** 126,130 ****
  	<input type="submit" value="OK" class="button">
  	<p>
! 	<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True" checked>
  	</p>
  </form>
--- 126,130 ----
  	<input type="submit" value="OK" class="button">
  	<p>
! 	<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True"  OnChange="javascript:document.f.submit()">
  	</p>
  </form>
***************
*** 143,146 ****
--- 143,147 ----
  		<th>Edit</th>
  		<th>Delete</th>
+ 	<tr>
  	<!-- TMPL_LOOP NAME="loop" -->
  	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
***************
*** 155,160 ****
  	</tr>
  	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td colspan=8>
! 			<table colspan=8>
  			<!-- TMPL_LOOP NAME="subfields" -->
  				<tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
--- 156,164 ----
  	</tr>
  	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td>
! 			&nbsp;
! 		</td>
! 		<td colspan=7 border=0>
! 			<table colspan=8 border=0>
  			<!-- TMPL_LOOP NAME="subfields" -->
  				<tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
***************
*** 164,175 ****
  					</td>
  					<td>
! 						Tab :<!-- TMPL_VAR NAME="tab" -->,
! 						<!-- TMPL_IF NAME="kohafield" -->Koha field : <!-- TMPL_VAR NAME="kohafield" -->, <!--/TMPL_IF -->
! 						<!-- TMPL_IF NAME="repeatable" -->Repeatable, <!-- TMPL_ELSE -->Not repeatable,<!-- /TMPL_IF -->
! 						<!-- TMPL_IF NAME="mandatory" -->Mandatory, <!-- TMPL_ELSE -->Not mandatory,<!-- /TMPL_IF -->
! 						<!-- TMPL_IF NAME="seealso" -->see also : <!-- TMPL_VAR NAME="seealso" -->,<!-- /TMPL_IF -->
! 						<!-- TMPL_IF NAME="authorised_value" --> Auth value :<!-- TMPL_VAR NAME="authorised_value" -->,<!-- /TMPL_IF -->
! 						<!-- TMPL_IF NAME="authtypecode" --> Authority :<!-- TMPL_VAR NAME="authtypecode" -->,<!-- /TMPL_IF -->
! 						<!-- TMPL_IF NAME="value_builder" -->Plugin :<!-- TMPL_VAR NAME="value_builder" -->,<!-- /TMPL_IF -->
  					</td>
  					<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
--- 168,193 ----
  					</td>
  					<td>
! 						<!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="repeatable" -->repeatable<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="mandatory" -->Mandatory<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="seealso" -->See<!-- TMPL_ELSE -->&nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="authorised_value" --><!-- TMPL_VAR NAME="authorised_value" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="value_builder" --><!-- TMPL_VAR NAME="value_builder" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						Tab:<!-- TMPL_VAR NAME="tab" -->
  					</td>
  					<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
***************
*** 192,195 ****
--- 210,214 ----
  		<th>Edit</th>
  		<th>Delete</th>
+ 	</tr>
  	<!-- TMPL_LOOP NAME="loop" -->
  	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
***************
*** 223,226 ****
--- 242,250 ----
  <!--/TMPL_IF -->
  	</form>
+ <script language="javascript" type="text/javascript">
+ 	function ChangeDisplay(checkbox) {
+ 		window.
+ 	}
+ </script>
  </div>
  <!-- /TMPL_IF -->




From btoumi at users.sourceforge.net  Wed Jun  1 14:11:40 2005
From: btoumi at users.sourceforge.net (btoumi)
Date: Wed, 01 Jun 2005 05:11:40 -0700
Subject: [Koha-cvs] CVS: koha - Imported sources
Message-ID: <E1DdS4S-0005Yt-53@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21365

Log Message:
import de derniere version cvs

Status:

Vendor Tag:	INITIAL_IMPORT_VENDOR_TAG
Release Tags:	INITIAL_IMPORT_RELEASE_TAG
		

No conflicts created by this import


***** Bogus filespec: -
***** Bogus filespec: Imported
***** Bogus filespec: sources



From btoumi at users.sourceforge.net  Wed Jun  1 14:18:16 2005
From: btoumi at users.sourceforge.net (btoumi)
Date: Wed, 01 Jun 2005 05:18:16 -0700
Subject: [Koha-cvs] CVS: koha - Imported sources
Message-ID: <E1DdSAq-0007BJ-Nd@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27573

Log Message:
test

Status:

Vendor Tag:	INITIAL_IMPORT_VENDOR_TAG
Release Tags:	INITIAL_IMPORT_RELEASE_TAG
		

No conflicts created by this import


***** Bogus filespec: -
***** Bogus filespec: Imported
***** Bogus filespec: sources



From btoumi at users.sourceforge.net  Wed Jun  1 14:37:07 2005
From: btoumi at users.sourceforge.net (btoumi)
Date: Wed, 01 Jun 2005 05:37:07 -0700
Subject: [Koha-cvs] CVS: koha - Imported sources
Message-ID: <E1DdST5-0001ki-7k@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6692

Log Message:
test

Status:

Vendor Tag:	INITIAL_IMPORT_VENDOR_TAG
Release Tags:	INITIAL_IMPORT_RELEASE_TAG
		

No conflicts created by this import


***** Bogus filespec: -
***** Bogus filespec: Imported
***** Bogus filespec: sources



From tipaul at users.sourceforge.net  Wed Jun  1 14:51:04 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 01 Jun 2005 05:51:04 -0700
Subject: [Koha-cvs] CVS: koha/C4 AuthoritiesMarc.pm,1.16,1.17
Message-ID: <E1DdSga-0003XG-FJ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13572/C4

Modified Files:
	AuthoritiesMarc.pm 
Log Message:
some fixes & improvements for dictionnary search in librarian interface

Index: AuthoritiesMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/AuthoritiesMarc.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** AuthoritiesMarc.pm	4 May 2005 15:43:43 -0000	1.16
--- AuthoritiesMarc.pm	1 Jun 2005 12:51:02 -0000	1.17
***************
*** 65,73 ****
  	# the marclist may contain "mainentry". In this case, search the tag_to_report, that depends on
  	# the authtypecode. Then, search on $a of this tag_to_report
  	for (my $i=0;$i<$#{$tags};$i++) {
  		if (@$tags[$i] eq "mainentry") {
- 			my $sth = $dbh->prepare("select auth_tag_to_report from auth_types where authtypecode=?");
- 			$sth->execute($authtypecode);
- 			my ($tag_to_report) = $sth->fetchrow;
  			@$tags[$i] = $tag_to_report."a";
  		}
--- 65,76 ----
[...1010 lines suppressed...]
- #
- # Revision 1.6  2004/08/18 16:00:24  tipaul
- # fixes for authorities management
- #
- # Revision 1.5  2004/07/05 13:37:22  doxulting
- # First step for working authorities
- #
- # Revision 1.4  2004/06/22 11:35:37  tipaul
- # removing % at the beginning of a string to avoid loooonnnngggg searchs
- #
- # Revision 1.3  2004/06/17 08:02:13  tipaul
- # merging tag & subfield in auth_word for better perfs
- #
- # Revision 1.2  2004/06/10 08:29:01  tipaul
- # MARC authority management (continued)
- #
- # Revision 1.1  2004/06/07 07:35:01  tipaul
- # MARC authority management package
- #
--- 968,969 ----




From tipaul at users.sourceforge.net  Wed Jun  1 14:51:04 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 01 Jun 2005 05:51:04 -0700
Subject: [Koha-cvs] CVS: koha/search.marc dictionary.pl,1.5,1.6
Message-ID: <E1DdSga-0003XT-L0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13572/search.marc

Modified Files:
	dictionary.pl 
Log Message:
some fixes & improvements for dictionnary search in librarian interface

Index: dictionary.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.marc/dictionary.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** dictionary.pl	4 May 2005 12:46:27 -0000	1.5
--- dictionary.pl	1 Jun 2005 12:51:02 -0000	1.6
***************
*** 31,34 ****
--- 31,52 ----
  use HTML::Template;
  
+ =head1 NAME
+ 
+ dictionnary.pl : script to search in biblio & authority an existing value
+ 
+ =head1 SYNOPSIS
+ 
+ useful when the user want to search a term before running a query. For example, to see if "computer" is used in the database
+ 
+ The parameter "marclist" tells which field is searched (title, author, subject, but could be anything else)
+ 
+ This script searches in both biblios & authority
+ * in biblio, the script search in all marc fields related to what the user is looking for (for example, if the dictionnary is used on "author", the script searches in biblio.author, but also in additional authors & any MARC field related to author (through the "seealso" MARC constraint)
+ * in authority, the script search everywhere. Thus, the accepted & rejected forms are found.
+ 
+ The script shows all results & the user can choose what he want, that is copied into search form.
+ 
+ =cut
+ 
  my $input = new CGI;
  my $field =$input->param('marclist');
***************
*** 39,45 ****
  #my $kohafield = $input->param('kohafield');
  my @search = $input->param('search');
! warn " ".$search[0];
  my $index = $input->param('index');
! warn " index: ".$index;
  my $op=$input->param('op');
  if (($search[0]) and not ($op eq 'do_search')){
--- 57,63 ----
  #my $kohafield = $input->param('kohafield');
  my @search = $input->param('search');
! # warn " ".$search[0];
  my $index = $input->param('index');
! # warn " index: ".$index;
  my $op=$input->param('op');
  if (($search[0]) and not ($op eq 'do_search')){
***************
*** 64,75 ****
  
  if ($op eq "do_search") {
! 	($template, $loggedinuser, $cookie)
! 			= get_template_and_user({template_name => "search.marc/dictionary.tmpl",
! 					query => $input,
! 					type => $type,
! 					authnotrequired => 0,
! 					flagsrequired => {catalogue => 1},
! 					debug => 1,
! 					});
  	my $sth=$dbh->prepare("Select distinct tagfield,tagsubfield from marc_subfield_structure where kohafield = ?");
  	$sth->execute("$field");
--- 82,88 ----
  
  if ($op eq "do_search") {
! 	#
! 	# searching in biblio
! 	#
  	my $sth=$dbh->prepare("Select distinct tagfield,tagsubfield from marc_subfield_structure where kohafield = ?");
  	$sth->execute("$field");
***************
*** 85,96 ****
  
  	findseealso($dbh,\@tags);
- #	select distinct m1.bibid from biblio,biblioitems,marc_biblio,marc_word as m1 where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and (m1.word  like 'Paul' and m1.tagsubfield in ('200f','710a','711a','712a','701a','702a','700a')) order by biblio.title
- 
  
  	my @results, my $total;
! # 	my ($results,$total) = catalogsearch($dbh,\@tags ,\@and_or,
! # 										\@excluding, \@operator,  \@value,
! # 										$startfrom*$resultsperpage, $resultsperpage,$orderby);
! 	my $strsth="select distinct subfieldvalue, count(marc_subfield_table.bibid) from marc_subfield_table,marc_word where marc_word.word like ? and marc_subfield_table.bibid=marc_word.bibid and marc_word.tagsubfield in ";
  	my $listtags="(";
  	foreach my $tag (@tags){
--- 98,104 ----
  
  	findseealso($dbh,\@tags);
  
  	my @results, my $total;
! 	my $strsth="select distinct subfieldvalue, count(marc_subfield_table.bibid) from marc_subfield_table,marc_word where marc_word.word like ? and marc_subfield_table.bibid=marc_word.bibid and marc_subfield_table.tagorder=marc_word.tagorder and marc_word.tagsubfield in ";
  	my $listtags="(";
  	foreach my $tag (@tags){
***************
*** 99,107 ****
  	$listtags =~s/,$/)/;
  	$strsth .= $listtags." and marc_word.tagsubfield=marc_subfield_table.tag+marc_subfield_table.subfieldcode group by subfieldvalue ";
! 	warn "".$strsth;
  	my $value = uc($search[0]);
  	$value=~s/\*/%/g;
  	$value.= "%" if not($value=~m/%/);
! 	warn " texte : ".$value;
  
  	$sth=$dbh->prepare($strsth);
--- 107,115 ----
  	$listtags =~s/,$/)/;
  	$strsth .= $listtags." and marc_word.tagsubfield=marc_subfield_table.tag+marc_subfield_table.subfieldcode group by subfieldvalue ";
! # 	warn "search in biblio : ".$strsth;
  	my $value = uc($search[0]);
  	$value=~s/\*/%/g;
  	$value.= "%" if not($value=~m/%/);
! # 	warn " texte : ".$value;
  
  	$sth=$dbh->prepare($strsth);
***************
*** 110,114 ****
  	my @catresults;
  	while (my ($value,$ctresults)=$sth->fetchrow) {
! 		warn "countresults : ".$ctresults;
  		push @catresults,{value=> $value, 
  						  even=>($total-$startfrom*$resultsperpage)%2,
--- 118,122 ----
  	my @catresults;
  	while (my ($value,$ctresults)=$sth->fetchrow) {
! # 		warn "countresults : ".$ctresults;
  		push @catresults,{value=> $value, 
  						  even=>($total-$startfrom*$resultsperpage)%2,
***************
*** 129,136 ****
  	$strsth=~s/ OR$/)/;
  	my $strsth = $strsth." and authtypecode is not NULL";
! 	warn $strsth;
  	my $sth=$dbh->prepare($strsth);
  	$sth->execute;
  	
  	my @authresults;
  	my $authnbresults;
--- 137,147 ----
  	$strsth=~s/ OR$/)/;
  	my $strsth = $strsth." and authtypecode is not NULL";
! # 	warn $strsth;
  	my $sth=$dbh->prepare($strsth);
  	$sth->execute;
  	
+ 	#
+ 	# searching in authorities
+ 	#
  	my @authresults;
  	my $authnbresults;
***************
*** 142,146 ****
  #		warn "auth : $authtypecode nbauthresults : $nbresults";
  	}
!  	
  	($template, $loggedinuser, $cookie)
  		= get_template_and_user({template_name => "search.marc/dictionary.tmpl",
--- 153,160 ----
  #		warn "auth : $authtypecode nbauthresults : $nbresults";
  	}
! 	
! 	# 
! 	# OK, filling the template with authorities & biblio entries found.
! 	#
  	($template, $loggedinuser, $cookie)
  		= get_template_and_user({template_name => "search.marc/dictionary.tmpl",
***************
*** 148,152 ****
  				type => $type,
  				authnotrequired => 0,
- 				flagsrequired => {borrowers => 1},
  				flagsrequired => {catalogue => 1},
  				debug => 1,
--- 162,165 ----




From tipaul at users.sourceforge.net  Wed Jun  1 14:51:04 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 01 Jun 2005 05:51:04 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/search.marc dictionary.tmpl,1.4,1.5 search.tmpl,1.24,1.25
Message-ID: <E1DdSga-0003XR-Jy@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	dictionary.tmpl search.tmpl 
Log Message:
some fixes & improvements for dictionnary search in librarian interface

Index: dictionary.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/dictionary.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** dictionary.tmpl	4 May 2005 12:46:28 -0000	1.4
--- dictionary.tmpl	1 Jun 2005 12:51:02 -0000	1.5
***************
*** 53,59 ****
  
  <!-- TMPL_IF Name=search -->
! 	<div class="bloc100">
! 		<h2 class="catalogue">Dictionary Search results</h2>
! 		<!-- TMPL_IF NAME="authresult" -->
  		<div id="resultnumber">
  			<p><!-- TMPL_IF NAME="displayprev" --> 
--- 53,59 ----
  
  <!-- TMPL_IF Name=search -->
! 	<div class="bloc25">
! 	<h2 class="catalogue">Dictionary Search results</h2>
! 	<!-- TMPL_IF NAME="authresult" -->
  		<div id="resultnumber">
  			<p><!-- TMPL_IF NAME="displayprev" --> 
***************
*** 84,97 ****
  				<tr>
  					<th class="catalogue">Summary</th>
! 					<th class="catalogue">Used</th>
  					<th class="catalogue">Select</th>
  				</tr>
  				<!-- TMPL_LOOP NAME="authresult" -->
  					<tr>
! 						<td><!-- TMPL_VAR NAME="summary" --></td>
! 						<td>
! 							<a href="../search.marc/search.pl?type=intranet&amp;op=do_search&amp;marclist=<!-- TMPL_VAR NAME="biblio_fields" -->&amp;operator==&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;and_or=and&amp;excluding=" class="button catalogue"><!-- TMPL_VAR NAME="used" --> biblio(s)
! 						<td><img src="/images/arrow.gif" width="32" hspace="0" vspace="0" border="0">
  						</td>
  						</td>
  					</tr>
--- 84,113 ----
  				<tr>
  					<th class="catalogue">Summary</th>
! 					<th class="catalogue">Used in</th>
  					<th class="catalogue">Select</th>
  				</tr>
  				<!-- TMPL_LOOP NAME="authresult" -->
  					<tr>
! 						<!-- TMPL_IF NAME="even" -->
! 							<td class="hilighted">
! 						<!-- TMPL_ELSE -->
! 							<td>
! 						<!-- /TMPL_IF -->
! 							<!-- TMPL_VAR NAME="summary" -->
  						</td>
+ 						<!-- TMPL_IF NAME="even" -->
+ 							<td class="hilighted">
+ 						<!-- TMPL_ELSE -->
+ 							<td>
+ 						<!-- /TMPL_IF -->
+ 							<!-- TMPL_VAR NAME="used" --> biblio(s)
+ 						</td>
+ 						<!-- TMPL_IF NAME="even" -->
+ 							<td class="hilighted">
+ 						<!-- TMPL_ELSE -->
+ 							<td>
+ 						<!-- /TMPL_IF -->
+ 							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)" class="button catalogue">select</a>
+ 							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)" class="button catalogue">sel&amp;close</a>
  						</td>
  					</tr>
***************
*** 101,106 ****
  		<!-- TMPL_ELSE -->
  			<h3 class="catalogue">No results in Authorities</h3>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF Name=catresult -->	
  		<div id="resultnumber">
  			<p class="resultcount">
--- 117,124 ----
  		<!-- TMPL_ELSE -->
  			<h3 class="catalogue">No results in Authorities</h3>
! 	<!-- /TMPL_IF -->
! 		
! 		
! 	<!-- TMPL_IF Name=catresult -->	
  		<div id="resultnumber">
  			<p class="resultcount">
***************
*** 114,133 ****
  				<tr>
  					<th class="catalogue">Summary</th>
! 					<th class="catalogue">Biblio Count</th>
  					<th class="catalogue">Select</th>
  				</tr>
  				<!-- TMPL_LOOP NAME="catresult" -->
  				<tr>
! 					<td<!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
  								<!-- TMPL_IF name="MARC_ON" -->
! 									<a class="transparent resultlist" href="search.pl?type=<!-- TMPL_VAR NAME="type" ESCAPE="URL" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE="URL" -->&amp;operator=contains&amp;op=do_search&amp;and_or=and&amp;value='<!-- TMPL_VAR Name=value ESCAPE="URL" -->'&amp;excluding="><!-- TMPL_VAR NAME="value" --></a>
  								<!-- TMPL_ELSE -->
! 									<a class="transparent resultlist" href="search.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="value" --></a>				<!-- /TMPL_IF -->
  					</td>
  					<td align="center" <!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
! 						<!-- TMPL_VAR NAME="count" -->
  					</td>
  					<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
! 							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->)" class="button catalogue">Select</a>
  					</td>
  				</tr>
--- 132,157 ----
  				<tr>
  					<th class="catalogue">Summary</th>
! 					<th class="catalogue">Used in</th>
  					<th class="catalogue">Select</th>
  				</tr>
  				<!-- TMPL_LOOP NAME="catresult" -->
  				<tr>
! 					<!-- TMPL_IF NAME="even" -->
! 					<td class="hilighted">
! 					<!-- TMPL_ELSE -->
! 					<td>
! 					<!-- /TMPL_IF -->
  								<!-- TMPL_IF name="MARC_ON" -->
! 									<!-- TMPL_VAR NAME="value" -->
  								<!-- TMPL_ELSE -->
! 									<!-- TMPL_VAR NAME="value" -->
! 								<!-- /TMPL_IF -->
  					</td>
  					<td align="center" <!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
! 						<!-- TMPL_VAR NAME="count" --> biblio(s)
  					</td>
  					<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
! 							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)" class="button catalogue">Select</a>
! 							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)" class="button catalogue">Sel&amp;close</a>
  					</td>
  				</tr>
***************
*** 156,171 ****
  			</p>
  		</div>
! <script language="JavaScript" type="text/javascript">
! function SelectEntry(myentry, myindex){
! 	if (opener.document.f.value[myindex].value!=""){ 
! 		opener.document.f.value[myindex].value=opener.document.f.value[myindex].value+" "+myentry
! 	} else {
! 		opener.document.f.value[myindex].value=myentry
  	}
! }
! </script>
  	</div>
  <!-- /TMPL_IF -->
- <!-- /TMPL_IF -->
  </div>
  </body>
--- 180,199 ----
  			</p>
  		</div>
! 	<!-- /TMPL_IF -->
! 	<script language="JavaScript" type="text/javascript">
! 	function SelectEntry(myentry, myindex, wclose){
! 		if (opener.document.f.value[myindex].value!=""){ 
! 			opener.document.f.value[myindex].value=opener.document.f.value[myindex].value+" "+myentry
! 		} else {
! 			opener.document.f.value[myindex].value=myentry
! 		}
! 		if (wclose == 1) {
! 	// 	alert("closing")
! 			self.close();
! 		}
  	}
! 	</script>
  	</div>
  <!-- /TMPL_IF -->
  </div>
  </body>

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** search.tmpl	4 May 2005 12:52:34 -0000	1.24
--- search.tmpl	1 Jun 2005 12:51:02 -0000	1.25
***************
*** 17,21 ****
  			<input type="hidden" name="op" value="do_search">
  			<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
! 			<label class="label100" for="keyword">Any word</label>
  			<input type="hidden" name="marclist" value="">
  			<input type="hidden" name="and_or" value="and">
--- 17,21 ----
  			<input type="hidden" name="op" value="do_search">
  			<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
! 			<label for="keyword">Any word</label>
  			<input type="hidden" name="marclist" value="">
  			<input type="hidden" name="and_or" value="and">
***************
*** 25,29 ****
  		</p>
  		<p>
! 			<label class="label100" for="title">Title</label>
  			<input type="hidden" name="marclist" value="biblio.title">
  			<input type="hidden" name="and_or" value="and">
--- 25,29 ----
  		</p>
  		<p>
! 			<label for="title">Title</label>
  			<input type="hidden" name="marclist" value="biblio.title">
  			<input type="hidden" name="and_or" value="and">
***************
*** 31,50 ****
  			<input type="hidden" name="operator" value="contains">
  			<input type="text" name="value" id="title" onchange="sql_update()" size="35">
! 			<a href="javascript:Dopop('dictionary.pl?marclist=biblio.title&amp;type=intranet&amp;index=1',1)">
! 				<img src="/intranet-tmpl/default/en/includes/addressbook_section.png" width=12 height=12 alt="dict">
  			</a>
  		</p>
  		<p>
! 			<label class="label100" for="author">Author</label> <input type="hidden" name="marclist" value="biblio.author">
  			<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" id="author" onchange="sql_update()" size="35">
! 			<a href="javascript:Dopop('dictionary.pl?marclist=biblio.author&amp;type=intranet&amp;index=2',2)">
! 				<img src="/intranet-tmpl/default/en/includes/addressbook_section.png" width=12 height=12 alt="dict">
  			</a>
  		</p>
  		<p>
! 			<label class="label100" for="subject">Subject</label>
  			<input type="hidden" name="marclist" value="bibliosubject.subject">
  			<input type="hidden" name="and_or" value="and">
--- 31,50 ----
  			<input type="hidden" name="operator" value="contains">
  			<input type="text" name="value" id="title" onchange="sql_update()" size="35">
! 			<a href="javascript:Dopop('dictionary.pl?marclist=biblio.title&amp;type=intranet&amp;index=1',1)" class="button catalogue">
! 				...
  			</a>
  		</p>
  		<p>
! 			<label for="author">Author</label> <input type="hidden" name="marclist" value="biblio.author">
  			<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" id="author" onchange="sql_update()" size="35">
! 			<a href="javascript:Dopop('dictionary.pl?marclist=biblio.author&amp;type=intranet&amp;index=2',2)" class="button catalogue">
! 				...
  			</a>
  		</p>
  		<p>
! 			<label for="subject">Subject</label>
  			<input type="hidden" name="marclist" value="bibliosubject.subject">
  			<input type="hidden" name="and_or" value="and">
***************
*** 52,61 ****
  			<input type="hidden" name="operator" value="contains">  
  			<input type="text" name="value" id="subject" onchange="sql_update()" size="35">
! 			<a href="javascript:Dopop('dictionary.pl?marclist=bibliosubject.subject&amp;type=intranet&amp;index=3',3)">
! 				<img src="/intranet-tmpl/default/en/includes/addressbook_section.png" width=12 height=12 alt="dict">
  			</a>
  		</p>
  		<p>
! 			<label class="label100" for="itemtype">Item Type</label>
  			<input type="hidden" name="marclist" value="biblioitems.itemtype">
  			<input type="hidden" name="and_or" value="and">
--- 52,61 ----
  			<input type="hidden" name="operator" value="contains">  
  			<input type="text" name="value" id="subject" onchange="sql_update()" size="35">
! 			<a href="javascript:Dopop('dictionary.pl?marclist=bibliosubject.subject&amp;type=intranet&amp;index=3',3)" class="button catalogue">
! 				...
  			</a>
  		</p>
  		<p>
! 			<label for="itemtype">Item Type</label>
  			<input type="hidden" name="marclist" value="biblioitems.itemtype">
  			<input type="hidden" name="and_or" value="and">
***************
*** 65,69 ****
  		</p>
  		<p>
! 				<label class="label100" for="branch">Branch</label>
  				<input type="hidden" name="marclist" value="items.holdingbranch">
  				<input type="hidden" name="and_or" value="and">
--- 65,69 ----
  		</p>
  		<p>
! 				<label for="branch">Branch</label>
  				<input type="hidden" name="marclist" value="items.holdingbranch">
  				<input type="hidden" name="and_or" value="and">
***************
*** 76,80 ****
  		<h2 class="catalogue">Other options</h2>
  		<p>
! 				<label class="label100" for="barcode">Item barcode</label>
  				<input type="hidden" name="marclist" value="items.barcode">
  				<input type="hidden" name="and_or" value="and">
--- 76,80 ----
  		<h2 class="catalogue">Other options</h2>
  		<p>
! 				<label for="barcode">Item barcode</label>
  				<input type="hidden" name="marclist" value="items.barcode">
  				<input type="hidden" name="and_or" value="and">
***************
*** 84,88 ****
  		</p>
  		<p>
! 			<label class="label100" for="callno">Call Number</label>
  			<input type="hidden" name="marclist" value="items.itemcallnumber">
  			<input type="hidden" name="and_or" value="and">
--- 84,88 ----
  		</p>
  		<p>
! 			<label for="callno">Call Number</label>
  			<input type="hidden" name="marclist" value="items.itemcallnumber">
  			<input type="hidden" name="and_or" value="and">
***************
*** 92,96 ****
  		</p>
  		<p>
! 			<label class="label100" for="isbn">ISBN</label>
  			<input type="hidden" name="marclist" value="biblioitems.isbn">
  			<input type="hidden" name="and_or" value="and">
--- 92,96 ----
  		</p>
  		<p>
! 			<label for="isbn">ISBN</label>
  			<input type="hidden" name="marclist" value="biblioitems.isbn">
  			<input type="hidden" name="and_or" value="and">
***************
*** 100,104 ****
  		</p>
  		<p>
! 			<label class="label100" for="publisher">Publisher</label>
  			<input type="hidden" name="marclist" value="biblioitems.publishercode">
  			<input type="hidden" name="and_or" value="and">
--- 100,104 ----
  		</p>
  		<p>
! 			<label for="publisher">Publisher</label>
  			<input type="hidden" name="marclist" value="biblioitems.publishercode">
  			<input type="hidden" name="and_or" value="and">
***************
*** 160,164 ****
  		<p>
  			<input type="submit" value="Start search" class="button catalogue">
! 			<a href="/cgi-bin/koha/search.marc/suggest.pl" onclick="PopupSuggestion(); return false;" class="button catalogue">Suggestions</a>
  		</p>
  	</div>
--- 160,164 ----
  		<p>
  			<input type="submit" value="Start search" class="button catalogue">
! 			<a href="/cgi-bin/koha/search.marc/suggest.pl" onclick="PopupSuggestion(); return false;" class="button catalogue">Spelling suggestion</a>
  		</p>
  	</div>
***************
*** 188,192 ****
  function Dopop(link,i) {
  	var searchstring=document.forms[0].value[i].value;
! 	newin=window.open(link+'&amp;search='+searchstring,"popup",'width=550,height=550,toolbar=false,scrollbars=yes');
  }
  
--- 188,192 ----
  function Dopop(link,i) {
  	var searchstring=document.forms[0].value[i].value;
! 	newin=window.open(link+'&amp;search='+searchstring,"popup",'width=700,height=550,toolbar=false,scrollbars=yes');
  }
  




From btoumi at users.sourceforge.net  Wed Jun  1 15:16:01 2005
From: btoumi at users.sourceforge.net (btoumi)
Date: Wed, 01 Jun 2005 06:16:01 -0700
Subject: [Koha-cvs] CVS: koha - Imported sources
Message-ID: <E1DdT4j-0006kH-AH@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25891

Log Message:
koha cvs

Status:

Vendor Tag:	INITIAL_IMPORT_VENDOR_TAG
Release Tags:	INITIAL_IMPORT_RELEASE_TAG
		

No conflicts created by this import


***** Bogus filespec: -
***** Bogus filespec: Imported
***** Bogus filespec: sources



From hdl at users.sourceforge.net  Wed Jun  1 15:22:09 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 01 Jun 2005 06:22:09 -0700
Subject: [Koha-cvs] CVS: koha/admin marctagstructure.pl,1.25.2.2,1.25.2.3
Message-ID: <E1DdTAf-0007hG-Jt@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29405/admin

Modified Files:
      Tag: rel_2_2
	marctagstructure.pl 
Log Message:
Bug Fixing : Ugly display 
Non Working Arrows at the bottom of page.

Index: marctagstructure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marctagstructure.pl,v
retrieving revision 1.25.2.2
retrieving revision 1.25.2.3
diff -C2 -r1.25.2.2 -r1.25.2.3
*** marctagstructure.pl	31 May 2005 21:06:18 -0000	1.25.2.2
--- marctagstructure.pl	1 Jun 2005 13:22:07 -0000	1.25.2.3
***************
*** 219,222 ****
--- 219,223 ----
  		 $template->param(searchfield => $searchfield);
  	}
+ 	my $cnt=0;
  	if ($dspchoice) {
  		#here, user only wants used tags/subfields displayed
***************
*** 224,228 ****
  		$searchfield=~ s/\'/\\\'/g;
  		my @data=split(' ',$searchfield);
- 		my $count=@data;
  		my $sth=$dbh->prepare("Select marc_tag_structure.tagfield as mts_tagfield,marc_tag_structure.liblibrarian as mts_liblibrarian,marc_tag_structure.libopac as mts_libopac,marc_tag_structure.repeatable as mts_repeatable,marc_tag_structure.mandatory as mts_mandatory,marc_tag_structure.authorised_value as mts_authorized_value,marc_subfield_structure.* from marc_tag_structure LEFT JOIN marc_subfield_structure ON (marc_tag_structure.tagfield=marc_subfield_structure.tagfield AND marc_tag_structure.frameworkcode=marc_subfield_structure.frameworkcode) where (marc_tag_structure.tagfield >= ? and marc_tag_structure.frameworkcode=?) AND marc_subfield_structure.tab>=0 order by marc_tag_structure.tagfield,marc_subfield_structure.tagsubfield");
  		#could be ordoned by tab
--- 225,228 ----
***************
*** 231,234 ****
--- 231,235 ----
  		while (my $data=$sth->fetchrow_hashref){
  			push(@results,$data);
+ 			$cnt++;
  		}
  		$sth->finish;
***************
*** 238,242 ****
  		my $j=1;
  		my $i=$offset;
! 		while ($i < ($offset+$pagesize<scalar(@results)?$offset+$pagesize:scalar(@results))) {
  			if ($toggle eq 0){
  				$toggle=1;
--- 239,243 ----
  		my $j=1;
  		my $i=$offset;
! 		while ($i < ($offset+$pagesize<$cnt?$offset+$pagesize:$cnt)) {
  			if ($toggle eq 0){
  				$toggle=1;
***************
*** 256,260 ****
  			$j=$i;
  			my @internal_loop = ();
! 			while (($results[$i]->{'tagfield'}==$results[$j]->{'tagfield'}) and ($j< ($offset+$pagesize<scalar(@results)?$offset+$pagesize:scalar(@results)))) {
  				if ($toggle eq 0) {
  					$toggle=1;
--- 257,261 ----
  			$j=$i;
  			my @internal_loop = ();
! 			while (($results[$i]->{'tagfield'}==$results[$j]->{'tagfield'}) and ($j< ($offset+$pagesize<$cnt?$offset+$pagesize:$cnt))) {
  				if ($toggle eq 0) {
  					$toggle=1;
***************
*** 274,278 ****
  				$subfield_data{value_builder}= $results[$j]->{'value_builder'};
  				$subfield_data{toggle}	= $toggle;
! 				warn "tagfield :  ".$results[$j]->{'tagfield'}." tagsubfield :".$results[$j]->{'tagsubfield'};
  				push @internal_loop,\%subfield_data;
  				$j++;
--- 275,279 ----
  				$subfield_data{value_builder}= $results[$j]->{'value_builder'};
  				$subfield_data{toggle}	= $toggle;
! # 				warn "tagfield :  ".$results[$j]->{'tagfield'}." tagsubfield :".$results[$j]->{'tagsubfield'};
  				push @internal_loop,\%subfield_data;
  				$j++;
***************
*** 285,306 ****
  		$template->param(select_display => "True",
  						loop => \@loop_data);
- 		if ($offset>0) {
- 			my $prevpage = $offset-$pagesize;
- 			$template->param(isprevpage => $offset,
- 							prevpage=> $prevpage,
- 							searchfield => $searchfield,
- 							script_name => $script_name,
- 							frameworkcode => $frameworkcode,
- 			);
- 		}
- 		if ($offset+$pagesize<$count) {
- 			my $nextpage =$offset+$pagesize;
- 			$template->param(nextpage =>$nextpage,
- 							searchfield => $searchfield,
- 							script_name => $script_name,
- 							frameworkcode => $frameworkcode,
- 			);
- 		}
- 		
  		#  $sth->execute;
  		$sth->finish;
--- 286,289 ----
***************
*** 309,312 ****
--- 292,296 ----
  		my $env;
  		my ($count,$results)=StringSearch($env,$searchfield,$frameworkcode);
+ 		$cnt = $count;
  		my $toggle=0;
  		my @loop_data = ();
***************
*** 330,350 ****
  		}
  		$template->param(loop => \@loop_data);
! 		if ($offset>0) {
! 			my $prevpage = $offset-$pagesize;
! 			$template->param(isprevpage => $offset,
! 							prevpage=> $prevpage,
! 							searchfield => $searchfield,
! 							script_name => $script_name,
! 							frameworkcode => $frameworkcode,
! 			);
! 		}
! 		if ($offset+$pagesize<$count) {
! 			my $nextpage =$offset+$pagesize;
! 			$template->param(nextpage =>$nextpage,
! 							searchfield => $searchfield,
! 							script_name => $script_name,
! 							frameworkcode => $frameworkcode,
! 			);
! 		}
  	}
  } #---- END $OP eq DEFAULT
--- 314,334 ----
  		}
  		$template->param(loop => \@loop_data);
! 	}
! 	if ($offset>0) {
! 		my $prevpage = $offset-$pagesize;
! 		$template->param(isprevpage => $offset,
! 						prevpage=> $prevpage,
! 						searchfield => $searchfield,
! 						script_name => $script_name,
! 						frameworkcode => $frameworkcode,
! 		);
! 	}
! 	if ($offset+$pagesize<$cnt) {
! 		my $nextpage =$offset+$pagesize;
! 		$template->param(nextpage =>$nextpage,
! 						searchfield => $searchfield,
! 						script_name => $script_name,
! 						frameworkcode => $frameworkcode,
! 		);
  	}
  } #---- END $OP eq DEFAULT




From hdl at users.sourceforge.net  Wed Jun  1 15:22:09 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 01 Jun 2005 06:22:09 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marctagstructure.tmpl,1.27.2.3,1.27.2.4
Message-ID: <E1DdTAf-0007hF-K1@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	marctagstructure.tmpl 
Log Message:
Bug Fixing : Ugly display 
Non Working Arrows at the bottom of page.

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.27.2.3
retrieving revision 1.27.2.4
diff -C2 -r1.27.2.3 -r1.27.2.4
*** marctagstructure.tmpl	1 Jun 2005 10:18:24 -0000	1.27.2.3
--- marctagstructure.tmpl	1 Jun 2005 13:22:07 -0000	1.27.2.4
***************
*** 114,226 ****
  <!-- ------------------------------------------------------------------------ -->
  <!-- TMPL_IF NAME="else" -->
! <div id="bloc25">
! <h2 class="parameters">Select a framework</h2>
! <form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 	<select name="frameworkcode">
! 		<option value="">Default</option>
! 	<!-- TMPL_LOOP NAME="frameworkloop" -->
! 		<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="frameworktext" --></option>
! 	<!-- /TMPL_LOOP -->
! 	</select>
! 	<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 	<input type="submit" value="OK" class="button">
! 	<p>
! 	<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True"  OnChange="javascript:document.f.submit()">
! 	</p>
! </form>
! <b>NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script.</b>
! </div>
! <!-- TMPL_IF NAME="select_display" -->
! <div id="bloc100">
! 	<table>
! 	<tr>
! 		<th>Tag</th>
! 		<th>Lib</th>
! 		<th>Repeatable</th>
! 		<th>Mandatory</th>
! 		<th>Authorised<br />value</th>
! 		<th>Subfields</th>
! 		<th>Edit</th>
! 		<th>Delete</th>
! 	<tr>
! 	<!-- TMPL_LOOP NAME="loop" -->
! 	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
! 		<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
! 		<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 		<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 		<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 		<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 	</tr>
! 	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td>
! 			&nbsp;
! 		</td>
! 		<td colspan=7 border=0>
! 			<table colspan=8 border=0>
! 			<!-- TMPL_LOOP NAME="subfields" -->
! 				<tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
! 					<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
! 					<td>
! 						<!-- TMPL_VAR NAME="liblibrarian" -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="repeatable" -->repeatable<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="mandatory" -->Mandatory<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="seealso" -->See<!-- TMPL_ELSE -->&nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="authorised_value" --><!-- TMPL_VAR NAME="authorised_value" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						<!-- TMPL_IF NAME="value_builder" --><!-- TMPL_VAR NAME="value_builder" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 					</td>
! 					<td>
! 						Tab:<!-- TMPL_VAR NAME="tab" -->
! 					</td>
! 					<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 				</tr>
! 			<!-- /TMPL_LOOP -->
! 			</table>
! 		</td>
! 	</tr>
! 	<!-- /TMPL_LOOP -->
! <!-- TMPL_ELSE -->
! <div id="bloc100">
  	<table>
! 	<tr>
! 		<th>Tag</th>
! 		<th>Lib</th>
! 		<th>Repeatable</th>
! 		<th>Mandatory</th>
! 		<th>Authorised<br />value</th>
! 		<th>Subfields</th>
! 		<th>Edit</th>
! 		<th>Delete</th>
! 	</tr>
! 	<!-- TMPL_LOOP NAME="loop" -->
! 	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
! 		<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
! 		<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 		<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 		<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 		<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 	</tr>
! 	<!-- /TMPL_LOOP -->
  	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<input type="hidden" name="op" value="add_form">
--- 114,215 ----
  <!-- ------------------------------------------------------------------------ -->
  <!-- TMPL_IF NAME="else" -->
! 	<div id="bloc25">
! 	<h2 class="parameters">Select a framework</h2>
! 	<form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 		<select name="frameworkcode">
! 			<option value="">Default</option>
! 		<!-- TMPL_LOOP NAME="frameworkloop" -->
! 			<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="frameworktext" --></option>
! 		<!-- /TMPL_LOOP -->
! 		</select>
! 		<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 		<input type="submit" value="OK" class="button">
! 		<p>
! 		<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True" <!-- TMPL_IF Name="select_display"-->checked<!--/TMPL_IF -->  OnChange="javascript:document.f.submit()">
! 		</p>
! 	</form>
! 	<b>NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script.</b>
! 	</div>
! 	<div id="bloc100">
  	<table>
! 		<tr>
! 			<th>Tag</th>
! 			<th>Lib</th>
! 			<th>Repeatable</th>
! 			<th>Mandatory</th>
! 			<th>Authorised<br />value</th>
! 			<th>Subfields</th>
! 			<th>Edit</th>
! 			<th>Delete</th>
! 		<tr>
! 	<!-- TMPL_IF NAME="select_display" -->
! 		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
! 			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
! 			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
! 			<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 			<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 		</tr>
! 		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 			<td>
! 				&nbsp;
! 			</td>
! 			<td colspan=7 border=0>
! 				<table colspan=8 border=0>
! 				<!-- TMPL_LOOP NAME="subfields" -->
! 					<tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
! 						<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
! 						<td>
! 							<!-- TMPL_VAR NAME="liblibrarian" -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="repeatable" -->repeatable<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="mandatory" -->Mandatory<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="seealso" -->See<!-- TMPL_ELSE -->&nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="authorised_value" --><!-- TMPL_VAR NAME="authorised_value" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="value_builder" --><!-- TMPL_VAR NAME="value_builder" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							Tab:<!-- TMPL_VAR NAME="tab" -->
! 						</td>
! 						<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 					</tr>
! 				<!-- /TMPL_LOOP -->
! 				</table>
! 			</td>
! 		</tr>
! 		<!-- /TMPL_LOOP -->
! 	<!-- TMPL_ELSE -->
! 		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
! 			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
! 			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
! 			<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 			<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 		</tr>
! 		<!-- /TMPL_LOOP -->
! 	<!--/TMPL_IF -->
  	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<input type="hidden" name="op" value="add_form">
***************
*** 231,245 ****
  		<input type="submit" class="button" value="Add Tag" title="Add Tag" alt="Add Tag" >
  		<!-- TMPL_IF NAME="isprevpage" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">
  			<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0">
  			</a>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="nextpage" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">
  				<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0">
  			</a>
  		<!-- /TMPL_IF -->
! <!--/TMPL_IF -->
! 	</form>
  <script language="javascript" type="text/javascript">
  	function ChangeDisplay(checkbox) {
--- 220,233 ----
  		<input type="submit" class="button" value="Add Tag" title="Add Tag" alt="Add Tag" >
  		<!-- TMPL_IF NAME="isprevpage" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">
  			<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0">
  			</a>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="nextpage" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">
  				<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0">
  			</a>
  		<!-- /TMPL_IF -->
! </form>
  <script language="javascript" type="text/javascript">
  	function ChangeDisplay(checkbox) {




From tipaul at users.sourceforge.net  Wed Jun  1 15:52:08 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 01 Jun 2005 06:52:08 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marctagstructure.tmpl,1.27.2.4,1.27.2.5
Message-ID: <E1DdTdg-0003dR-3Z@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	marctagstructure.tmpl 
Log Message:
some graphic improvements

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.27.2.4
retrieving revision 1.27.2.5
diff -C2 -r1.27.2.4 -r1.27.2.5
*** marctagstructure.tmpl	1 Jun 2005 13:22:07 -0000	1.27.2.4
--- marctagstructure.tmpl	1 Jun 2005 13:52:05 -0000	1.27.2.5
***************
*** 145,149 ****
  	<!-- TMPL_IF NAME="select_display" -->
  		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
  			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
  			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
--- 145,149 ----
  	<!-- TMPL_IF NAME="select_display" -->
  		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr class="hilighted">
  			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
  			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
***************
*** 160,198 ****
  			</td>
  			<td colspan=7 border=0>
- 				<table colspan=8 border=0>
  				<!-- TMPL_LOOP NAME="subfields" -->
! 					<tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
! 						<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
! 						<td>
  							<!-- TMPL_VAR NAME="liblibrarian" -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="repeatable" -->repeatable<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="mandatory" -->Mandatory<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="seealso" -->See<!-- TMPL_ELSE -->&nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="authorised_value" --><!-- TMPL_VAR NAME="authorised_value" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							<!-- TMPL_IF NAME="value_builder" --><!-- TMPL_VAR NAME="value_builder" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 						</td>
! 						<td>
! 							Tab:<!-- TMPL_VAR NAME="tab" -->
! 						</td>
! 						<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 					</tr>
  				<!-- /TMPL_LOOP -->
- 				</table>
  			</td>
  		</tr>
--- 160,176 ----
  			</td>
  			<td colspan=7 border=0>
  				<!-- TMPL_LOOP NAME="subfields" -->
! 					<p><label>&nbsp;</label>
! 							Tab:<!-- TMPL_VAR NAME="tab" --> | $<!-- TMPL_VAR NAME="tagsubfield" -->
  							<!-- TMPL_VAR NAME="liblibrarian" -->
! 							<!-- TMPL_IF NAME="kohafield" -->,<!-- TMPL_VAR NAME="kohafield" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 							<!-- TMPL_IF NAME="repeatable" -->, repeatable<!-- /TMPL_IF -->
! 							<!-- TMPL_IF NAME="mandatory" -->, Mandatory<!-- /TMPL_IF -->
! 							<!-- TMPL_IF NAME="seealso" -->, See <!-- TMPL_VAR name="seealso" --><!--/TMPL_IF -->
! 							<!-- TMPL_IF NAME="authorised_value" -->, <!-- TMPL_VAR NAME="authorised_value" --><!--/TMPL_IF -->
! 							<!-- TMPL_IF NAME="authtypecode" -->, <!-- TMPL_VAR NAME="authtypecode" --><!--/TMPL_IF -->
! 							<!-- TMPL_IF NAME="value_builder" -->, <!-- TMPL_VAR NAME="value_builder" --><!--/TMPL_IF -->
! 					</p>
  				<!-- /TMPL_LOOP -->
  			</td>
  		</tr>




From hdl at users.sourceforge.net  Wed Jun  1 16:12:14 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 01 Jun 2005 07:12:14 -0700
Subject: [Koha-cvs] CVS: koha/misc overduenotices.pl,1.1.4.2,1.1.4.3
Message-ID: <E1DdTx8-00065l-0W@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23396/misc

Modified Files:
      Tag: rel_2_2
	overduenotices.pl 
Log Message:
Adding Date to messages.
Adding lists of books borrowed with barcode.

One Bug To Fix : use of uninitialized value.


Index: overduenotices.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/overduenotices.pl,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -C2 -r1.1.4.2 -r1.1.4.3
*** overduenotices.pl	28 Apr 2005 10:07:33 -0000	1.1.4.2
--- overduenotices.pl	1 Jun 2005 14:12:10 -0000	1.1.4.3
***************
*** 74,78 ****
  # The following fields are available :
  # <date> <itemcount> <firstname> <lastname> <address1> <address2> <address3> <city> <postcode>
! my $mailtext = "\n\n\nDear library borrower\n\n\n       <date>\n\n       According to our records, you have <itemcount> items that are at\n       least a week overdue for return to the library or renewal.\n       If you have registered a password with the library, you may use it\n       and your library card to login at http://XXX.org\n       to check the status of your account, or you may call any of our branch\n       Please be advised that all library services will be blocked\n       if items are allowed to go more than 30 days overdue.\n\n       Thank you for using your public libraries.\n\n\n                                             <firstname> <lastname>\n                                             <address1>\n                                             <address2>\n                                             <city>  <postcode>\n\n\n\n\n\n";
  #
  # END OF PARAMETERS
--- 74,79 ----
  # The following fields are available :
  # <date> <itemcount> <firstname> <lastname> <address1> <address2> <address3> <city> <postcode>
! my $mailtext = "\n\n\nDear library borrower\n\n\n       <date>\n\n       According to our records, you have <itemcount> items, the description of which follows, that are at\n       least a week overdue for return to the library or renewal:\n		title		author		barcode\n<titles>\n
!        If you have registered a password with the library, you may use it\n       and your library card to login at http://XXX.org\n       to check the status of your account, or you may call any of our branch\n       Please be advised that all library services will be blocked\n       if items are allowed to go more than 30 days overdue.\n\n       Thank you for using your public libraries.\n\n\n                                             <firstname> <lastname>\n                                             <address1>\n                                             <address2>\n                                             <city>  <postcode>\n\n\n\n\n\n";
  #
  # END OF PARAMETERS
***************
*** 85,89 ****
  
  my $dbh = C4::Context->dbh;
! my $sth = $dbh->prepare ("SELECT count(*), issues.borrowernumber,firstname,surname,streetaddress,physstreet,city,zipcode,emailaddress FROM issues,borrowers,categories WHERE returndate IS NULL AND TO_DAYS(NOW())-TO_DAYS(date_due) BETWEEN 0 and 500 AND issues.borrowernumber=borrowers.borrowernumber and borrowers.categorycode=categories.categorycode and categories.overduenoticerequired=1 group by issues.borrowernumber");
  $sth->execute;
  # 
--- 86,92 ----
  
  my $dbh = C4::Context->dbh;
! my $sth = $dbh->prepare ("SELECT COUNT(*), issues.borrowernumber,firstname,surname,streetaddress,physstreet,city,zipcode,emailaddress FROM issues,borrowers,categories WHERE returndate IS NULL AND TO_DAYS(NOW())-TO_DAYS(date_due) BETWEEN 0 and 500 AND issues.borrowernumber=borrowers.borrowernumber and borrowers.categorycode=categories.categorycode and categories.overduenoticerequired=1 group by issues.borrowernumber");
! my $sth2 = $dbh->prepare("SELECT biblio.title,biblio.author,items.barcode FROM issues,items,biblio WHERE items.itemnumber=issues.itemnumber and biblio.biblionumber=items.biblionumber AND issues.borrowernumber=? AND returndate IS NULL AND TO_DAYS(NOW())-TO_DAYS(date_due) BETWEEN 0 and 500");
! 
  $sth->execute;
  # 
***************
*** 92,95 ****
--- 95,99 ----
  my $count = 0;   # to keep track of how many notices are printed
  my $e_count = 0;   # and e-mailed
+ my $date=localtime;
  my ($itemcount,$borrnum,$firstname,$lastname,$address1,$address2,$city,$postcode,$email);
  
***************
*** 103,107 ****
  		$notice =~ s/\<city\>/$city/g;
  		$notice =~ s/\<postcode\>/$postcode/g;
! 	
  	# if not using e-mail notices, comment out the following lines
  		if ($email) {   # or you might check for borrowers.preferredcont 
--- 107,120 ----
  		$notice =~ s/\<city\>/$city/g;
  		$notice =~ s/\<postcode\>/$postcode/g;
! 		$notice =~ s/\<date\>/$date/g;
! 
! 		$sth2->execute($borrnum);
! 		my $titles;
! 		my ($title, $author, $barcode);
! 		while (($title, $author, $barcode) = $sth2->fetchrow){
! 			$titles .= "		$title	$author	$barcode\n";
! 		}
! 		$notice =~ s/\<titles\>/$titles/g;
! 		$sth2->finish;
  	# if not using e-mail notices, comment out the following lines
  		if ($email) {   # or you might check for borrowers.preferredcont 




From hdl at users.sourceforge.net  Wed Jun  1 16:29:38 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 01 Jun 2005 07:29:38 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marctagstructure.tmpl,1.27.2.5,1.27.2.6
Message-ID: <E1DdUDy-0008Rb-OW@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	marctagstructure.tmpl 
Log Message:
Minor display changes

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.27.2.5
retrieving revision 1.27.2.6
diff -C2 -r1.27.2.5 -r1.27.2.6
*** marctagstructure.tmpl	1 Jun 2005 13:52:05 -0000	1.27.2.5
--- marctagstructure.tmpl	1 Jun 2005 14:29:21 -0000	1.27.2.6
***************
*** 163,174 ****
  					<p><label>&nbsp;</label>
  							Tab:<!-- TMPL_VAR NAME="tab" --> | $<!-- TMPL_VAR NAME="tagsubfield" -->
! 							<!-- TMPL_VAR NAME="liblibrarian" -->
! 							<!-- TMPL_IF NAME="kohafield" -->,<!-- TMPL_VAR NAME="kohafield" --><!-- TMPL_ELSE --> &nbsp;<!--/TMPL_IF -->
! 							<!-- TMPL_IF NAME="repeatable" -->, repeatable<!-- /TMPL_IF -->
! 							<!-- TMPL_IF NAME="mandatory" -->, Mandatory<!-- /TMPL_IF -->
! 							<!-- TMPL_IF NAME="seealso" -->, See <!-- TMPL_VAR name="seealso" --><!--/TMPL_IF -->
! 							<!-- TMPL_IF NAME="authorised_value" -->, <!-- TMPL_VAR NAME="authorised_value" --><!--/TMPL_IF -->
! 							<!-- TMPL_IF NAME="authtypecode" -->, <!-- TMPL_VAR NAME="authtypecode" --><!--/TMPL_IF -->
! 							<!-- TMPL_IF NAME="value_builder" -->, <!-- TMPL_VAR NAME="value_builder" --><!--/TMPL_IF -->
  					</p>
  				<!-- /TMPL_LOOP -->
--- 163,167 ----
  					<p><label>&nbsp;</label>
  							Tab:<!-- TMPL_VAR NAME="tab" --> | $<!-- TMPL_VAR NAME="tagsubfield" -->
! 							<!-- TMPL_VAR NAME="liblibrarian" --> <!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!--/TMPL_IF --><!-- TMPL_IF NAME="repeatable" -->, repeatable<!-- /TMPL_IF --><!-- TMPL_IF NAME="mandatory" -->, Mandatory<!-- /TMPL_IF --><!-- TMPL_IF NAME="seealso" -->, See <!-- TMPL_VAR name="seealso" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authorised_value" -->, <!-- TMPL_VAR NAME="authorised_value" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authtypecode" -->, <!-- TMPL_VAR NAME="authtypecode" --><!--/TMPL_IF --><!-- TMPL_IF NAME="value_builder" -->, <!-- TMPL_VAR NAME="value_builder" --><!--/TMPL_IF -->
  					</p>
  				<!-- /TMPL_LOOP -->




From tipaul at users.sourceforge.net  Wed Jun  1 17:54:44 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 01 Jun 2005 08:54:44 -0700
Subject: [Koha-cvs] CVS: koha/misc overduenotices.pl,1.1.4.3,1.1.4.4
Message-ID: <E1DdVYK-0002g1-Dm@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10232/misc

Modified Files:
      Tag: rel_2_2
	overduenotices.pl 
Log Message:
fixing "warning use of uninitialized value in concatenation..."

Index: overduenotices.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/overduenotices.pl,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -C2 -r1.1.4.3 -r1.1.4.4
*** overduenotices.pl	1 Jun 2005 14:12:10 -0000	1.1.4.3
--- overduenotices.pl	1 Jun 2005 15:54:42 -0000	1.1.4.4
***************
*** 110,117 ****
  
  		$sth2->execute($borrnum);
! 		my $titles;
  		my ($title, $author, $barcode);
  		while (($title, $author, $barcode) = $sth2->fetchrow){
! 			$titles .= "		$title	$author	$barcode\n";
  		}
  		$notice =~ s/\<titles\>/$titles/g;
--- 110,117 ----
  
  		$sth2->execute($borrnum);
! 		my $titles="";
  		my ($title, $author, $barcode);
  		while (($title, $author, $barcode) = $sth2->fetchrow){
! 			$titles .= "		".($title?$title:"")."	".($author?$author:"")."	".($barcode?$barcode:"")."\n";
  		}
  		$notice =~ s/\<titles\>/$titles/g;
***************
*** 149,153 ****
  		$notice .= <ODUES>;
  		if ($nomail) {
! 			print "TO => $email\n";
  			print "FROM => $from\n";
  			print "SUBJECT => Koha overdue\n";
--- 149,153 ----
  		$notice .= <ODUES>;
  		if ($nomail) {
! 			print "TO => $email\n" if $email;
  			print "FROM => $from\n";
  			print "SUBJECT => Koha overdue\n";




From tipaul at users.sourceforge.net  Wed Jun  1 20:47:41 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 01 Jun 2005 11:47:41 -0700
Subject: [Koha-cvs] CVS: koha/misc build_marc_Tword.pl,1.1,1.2
Message-ID: <E1DdYFh-0003CN-QO@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12257/misc

Modified Files:
	build_marc_Tword.pl 
Log Message:
new version, doing tag by tag. Should be slower, but requires a lot less memory

Index: build_marc_Tword.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/build_marc_Tword.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** build_marc_Tword.pl	27 May 2005 09:30:24 -0000	1.1
--- build_marc_Tword.pl	1 Jun 2005 18:47:38 -0000	1.2
***************
*** 55,124 ****
  
  # parse every line
! my $query="SELECT biblio.biblionumber,tag,subfieldcode,subfieldvalue,biblio.title FROM marc_subfield_table left join marc_biblio on marc_biblio.bibid=marc_subfield_table.bibid left join biblio on marc_biblio.biblionumber=biblio.biblionumber";
  my $sth=$dbh->prepare($query);
  
! print "******** SELECTING \n";
! $sth->execute;
! print "******** DONE \n";
! $|=1; # flushes output
! 
! my $sthT=$dbh->prepare("select usedin from marc_Tword where tagsubfield=? and word=?");
! my $updateT=$dbh->prepare("update marc_Tword set usedin=? where tagsubfield=? and word=?");
! my $insertT=$dbh->prepare("insert into marc_Tword (tagsubfield,word,usedin) values (?,?,?)");
! my $i=0;
! my $timeneeded;
! # 1st version, slower, but less RAM consumming
! # while (my ($biblionumber, $tag, $subfieldcode, $subfieldvalue, $title) = $sth->fetchrow) {
! # 	next if $ignore_list{"$tag.$subfieldcode"};
! #     $subfieldvalue =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g;
! # 	# remove useless chars in the title.
! #     $title =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g;
! #     my @words = split / /, $subfieldvalue;
! # 	# and retrieve the reversed entry
! # 	foreach my $word (@words) {
! # 		$sthT->execute($tag.$subfieldcode,$word);
! # 		if (my ($usedin) = $sthT->fetchrow) {
! # 			# add the field & save it once again.
! # 			$usedin.=",$biblionumber-$title";
! # 			$updateT->execute($usedin,$tag.$subfieldcode,$word);
! # 		} else {
! # 			$insertT->execute($tag.$subfieldcode,$word,",$title-$biblionumber");
! # 		}
! # 	}
! # 	$timeneeded = gettimeofday - $starttime unless ($i % 100);
! # 	print "$i in $timeneeded s\n" unless ($i % 100);
! # 	print ".";
! # 	$i++;
! # }
! 
! # 2nd version : faster (about 100 times !), bug maybe too much RAM consumming...
! my %largehash;
! print "READING\n";
! while (my ($biblionumber, $tag, $subfieldcode, $subfieldvalue, $title) = $sth->fetchrow) {
! 	next unless $subfieldvalue;
! 	next if $ignore_list{$tag.$subfieldcode};
!     $subfieldvalue =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g;
! 	# remove useless chars in the title.
!     $title =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g;
!     my @words = split / /, $subfieldvalue;
! 	# and retrieve the reversed entry
! 	foreach my $word (@words) {
! 		my $localkey = $tag.$subfieldcode.'|'.uc($word);
! 		$largehash{$localkey}.=",$title-$biblionumber";
  	}
- 	$timeneeded = gettimeofday - $starttime unless ($i % 30000);
- 	print "$i in $timeneeded s\n" unless ($i % 30000);
- 	print "." unless ($i % 500);
- 	$i++;
- }
- $i=0;
- print "WRITING\n";
- foreach my $k (keys %largehash) {
- 	$k =~ /(.*)\|(.*)/;
- 	$insertT->execute($1,$2,$largehash{$k});
- 	$timeneeded = gettimeofday - $starttime unless ($i % 30000);
- 	print "$i in $timeneeded s\n" unless ($i % 30000);
- 	print "." unless ($i % 500);
- 	$i++;
  }
  
--- 55,126 ----
  
  # parse every line
! my $query="SELECT biblio.biblionumber,tag,subfieldcode,subfieldvalue,biblio.title FROM marc_subfield_table left join marc_biblio on marc_biblio.bibid=marc_subfield_table.bibid left join biblio on marc_biblio.biblionumber=biblio.biblionumber and tag=?";
  my $sth=$dbh->prepare($query);
  
! for (my $looptag=0;$looptag<=999;$looptag++) {
! 	print "******** SELECTING ".(sprintf "%03s",$looptag)."\n";
! 	$sth->execute(sprintf "%03s",$looptag);
! 	print "******** DONE \n";
! 	$|=1; # flushes output
! 	
! 	my $sthT=$dbh->prepare("select usedin from marc_Tword where tagsubfield=? and word=?");
! 	my $updateT=$dbh->prepare("update marc_Tword set usedin=? where tagsubfield=? and word=?");
! 	my $insertT=$dbh->prepare("insert into marc_Tword (tagsubfield,word,usedin) values (?,?,?)");
! 	my $i=0;
! 	my $timeneeded;
! 	# 1st version, slower, but less RAM consumming
! 	# while (my ($biblionumber, $tag, $subfieldcode, $subfieldvalue, $title) = $sth->fetchrow) {
! 	# 	next if $ignore_list{"$tag.$subfieldcode"};
! 	#     $subfieldvalue =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g;
! 	# 	# remove useless chars in the title.
! 	#     $title =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g;
! 	#     my @words = split / /, $subfieldvalue;
! 	# 	# and retrieve the reversed entry
! 	# 	foreach my $word (@words) {
! 	# 		$sthT->execute($tag.$subfieldcode,$word);
! 	# 		if (my ($usedin) = $sthT->fetchrow) {
! 	# 			# add the field & save it once again.
! 	# 			$usedin.=",$biblionumber-$title";
! 	# 			$updateT->execute($usedin,$tag.$subfieldcode,$word);
! 	# 		} else {
! 	# 			$insertT->execute($tag.$subfieldcode,$word,",$title-$biblionumber");
! 	# 		}
! 	# 	}
! 	# 	$timeneeded = gettimeofday - $starttime unless ($i % 100);
! 	# 	print "$i in $timeneeded s\n" unless ($i % 100);
! 	# 	print ".";
! 	# 	$i++;
! 	# }
! 	
! 	# 2nd version : faster (about 100 times !), bug maybe too much RAM consumming...
! 	my %largehash;
! 	print "READING\n";
! 	while (my ($biblionumber, $tag, $subfieldcode, $subfieldvalue, $title) = $sth->fetchrow) {
! 		next unless $subfieldvalue;
! 		next if $ignore_list{$tag.$subfieldcode};
! 		$subfieldvalue =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g if $subfieldvalue;
! 		# remove useless chars in the title.
! 		$title =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g if $title;
! 		my @words = split / /, $subfieldvalue;
! 		# and retrieve the reversed entry
! 		foreach my $word (@words) {
! 			my $localkey = $tag.$subfieldcode.'|'.uc($word);
! 			$largehash{$localkey}.=",".substr($title,0,15)."-$biblionumber";
! 		}
! 		$timeneeded = gettimeofday - $starttime unless ($i % 30000);
! 		print "$i in $timeneeded s\n" unless ($i % 30000);
! 		print "." unless ($i % 500);
! 		$i++;
! 	}
! 	$i=0;
! 	print "WRITING\n";
! 	foreach my $k (keys %largehash) {
! 		$k =~ /(.*)\|(.*)/;
! 		$insertT->execute($1,$2,$largehash{$k});
! 		$timeneeded = gettimeofday - $starttime unless ($i % 30000);
! 		print "$i in $timeneeded s\n" unless ($i % 30000);
! 		print "." unless ($i % 500);
! 		$i++;
  	}
  }
  




From tipaul at users.sourceforge.net  Wed Jun  1 20:55:10 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 01 Jun 2005 11:55:10 -0700
Subject: [Koha-cvs] CVS: koha/misc build_marc_Tword.pl,1.2,1.3
Message-ID: <E1DdYMw-0004C7-TL@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16069/misc

Modified Files:
	build_marc_Tword.pl 
Log Message:
new version, doing tag by tag. Should be slower, but requires a lot less memory

Index: build_marc_Tword.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/build_marc_Tword.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** build_marc_Tword.pl	1 Jun 2005 18:47:38 -0000	1.2
--- build_marc_Tword.pl	1 Jun 2005 18:55:08 -0000	1.3
***************
*** 55,59 ****
  
  # parse every line
! my $query="SELECT biblio.biblionumber,tag,subfieldcode,subfieldvalue,biblio.title FROM marc_subfield_table left join marc_biblio on marc_biblio.bibid=marc_subfield_table.bibid left join biblio on marc_biblio.biblionumber=biblio.biblionumber and tag=?";
  my $sth=$dbh->prepare($query);
  
--- 55,59 ----
  
  # parse every line
! my $query="SELECT biblio.biblionumber,tag,subfieldcode,subfieldvalue,biblio.title FROM marc_subfield_table left join marc_biblio on marc_biblio.bibid=marc_subfield_table.bibid left join biblio on marc_biblio.biblionumber=biblio.biblionumber where tag=?";
  my $sth=$dbh->prepare($query);
  
***************
*** 95,99 ****
  	# 2nd version : faster (about 100 times !), bug maybe too much RAM consumming...
  	my %largehash;
! 	print "READING\n";
  	while (my ($biblionumber, $tag, $subfieldcode, $subfieldvalue, $title) = $sth->fetchrow) {
  		next unless $subfieldvalue;
--- 95,101 ----
  	# 2nd version : faster (about 100 times !), bug maybe too much RAM consumming...
  	my %largehash;
! # 	print "READING\n";
! 	$timeneeded = gettimeofday - $starttime unless ($i % 30000);
! 	print "READING $timeneeded s\n";
  	while (my ($biblionumber, $tag, $subfieldcode, $subfieldvalue, $title) = $sth->fetchrow) {
  		next unless $subfieldvalue;




From hdl at users.sourceforge.net  Wed Jun  1 21:55:56 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 01 Jun 2005 12:55:56 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-sendbasket.pl,1.4.2.1,1.4.2.2
Message-ID: <E1DdZJk-0004HK-0I@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16396/opac

Modified Files:
      Tag: rel_2_2
	opac-sendbasket.pl 
Log Message:
Sending basket in OPAC with joined iso2709 biblios 

Index: opac-sendbasket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-sendbasket.pl,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** opac-sendbasket.pl	25 Mar 2005 17:04:28 -0000	1.4.2.1
--- opac-sendbasket.pl	1 Jun 2005 19:55:53 -0000	1.4.2.2
***************
*** 8,11 ****
--- 8,12 ----
  
  use C4::Search;
+ use C4::Biblio;
  use C4::Auth;
  use C4::Interface::CGI::Output;
***************
*** 25,28 ****
--- 26,33 ----
  my $email_add=$query->param('email_add');
  my $email_sender=$query->param('email_sender');
+ my $dbh=C4::Context->dbh;
+ my $sth;
+ $sth=$dbh->prepare("select bibid from marc_biblio where biblionumber=? order by bibid");
+ 
  
  if ($email_add) {
***************
*** 57,60 ****
--- 62,67 ----
  		$dat->{'biblionumber'} = $biblionumber;
  		$dat->{ITEM_RESULTS} = \@items;
+ 		$sth->execute($biblionumber);
+ 		my ($bibid) = $sth->fetchrow;
  		my $record = MARCgetbiblio($dbh,$bibid);
  		$iso2709 .= $record->as_usmarc();




From hdl at users.sourceforge.net  Wed Jun  1 22:05:43 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 01 Jun 2005 13:05:43 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-serial-issues.pl,1.1.2.3,1.1.2.4
Message-ID: <E1DdZTD-0005WW-FV@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21196/opac

Modified Files:
      Tag: rel_2_2
	opac-serial-issues.pl 
Log Message:
FIXING : Bug line 37 missing comma

Index: opac-serial-issues.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-serial-issues.pl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** opac-serial-issues.pl	25 Mar 2005 17:04:28 -0000	1.1.2.3
--- opac-serial-issues.pl	1 Jun 2005 20:05:41 -0000	1.1.2.4
***************
*** 34,38 ****
  $template->param(
  	biblionumber => $query->param('biblionumber'),
! 	subscription_LOOP => $subscriptions
  	suggestion => C4::Context->preference("suggestion"),
  	virtualshelves => C4::Context->preference("virtualshelves"),
--- 34,38 ----
  $template->param(
  	biblionumber => $query->param('biblionumber'),
! 	subscription_LOOP => $subscriptions,
  	suggestion => C4::Context->preference("suggestion"),
  	virtualshelves => C4::Context->preference("virtualshelves"),




From genjimoto at users.sourceforge.net  Wed Jun  1 22:44:07 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 13:44:07 -0700
Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.118,1.119
Message-ID: <E1Dda4N-0002ZF-J3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9798

Modified Files:
	Biblio.pm 
Log Message:
patch from Genji (Waylon R.) to update subjects in MARC tables when systempref has MARC=OFF

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -r1.118 -r1.119
*** Biblio.pm	4 May 2005 15:40:01 -0000	1.118
--- Biblio.pm	1 Jun 2005 20:43:58 -0000	1.119
***************
*** 2057,2060 ****
--- 2057,2072 ----
      my $dbh = C4::Context->dbh;
      my $error = &OLDmodsubject( $dbh, $bibnum, $force, @subject );
+         if ($error eq ''){
+     # When MARC is off, ensures that the MARC biblio table gets updated with new
+     # subjects, of course, it deletes the biblio in marc, and then recreates.
+     # This check is to ensure that no MARC data exists to lose.
+ 
+         if (C4::Context->preference("MARC") eq '0'){
+             my $MARCRecord = &MARCkoha2marcBiblio($dbh,$bibnum);
+             my $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$bibnum);
+             &MARCmodbiblio($dbh,$bibid, $MARCRecord);
+         }
+ 
+     }
      return ($error);
  }    # sub modsubject
***************
*** 2624,2627 ****
--- 2636,2642 ----
  # $Id$
  # $Log$
+ # Revision 1.119  2005/06/01 20:43:58  genjimoto
+ # patch from Genji (Waylon R.) to update subjects in MARC tables when systempref has MARC=OFF
+ #
  # Revision 1.118  2005/05/04 15:40:01  tipaul
  # synch'ing 2.2 and head




From genjimoto at users.sourceforge.net  Wed Jun  1 23:18:43 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 14:18:43 -0700
Subject: [Koha-cvs] CVS: koha/C4 SearchMarc.pm,1.42,1.43
Message-ID: <E1Ddabr-00077c-Dq@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27333

Modified Files:
	SearchMarc.pm 
Log Message:
New Feature: catalogsearch() has a new parameter, $sqlstring. A developer puts into it whatever they want to tack onto the end of the where statement. See usage in opac-search.pl

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** SearchMarc.pm	4 May 2005 15:40:01 -0000	1.42
--- SearchMarc.pm	1 Jun 2005 21:18:39 -0000	1.43
***************
*** 100,104 ****
  }
  
! =head1  my ($count, @results) = catalogsearch($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby);
  
  =head2 $dbh is a link to the DB handler.
--- 100,104 ----
  }
  
! =head1  my ($count, @results) = catalogsearch($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby,$sqlstring);
  
  =head2 $dbh is a link to the DB handler.
***************
*** 147,150 ****
--- 147,154 ----
  (for example title, title DESC,...)
  
+ =head2 $sqlstring
+ 
+ optional argument containing an sql string to be used in the 'where' statement. see usage in opac-search.pl.
+ 
  =head2 RETURNS
  
***************
*** 166,170 ****
  
  sub catalogsearch {
! 	my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby,$desc_or_asc) = @_;
  	# build the sql request. She will look like :
  	# select m1.bibid
--- 170,174 ----
  
  sub catalogsearch {
! 	my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby,$desc_or_asc,$sqlstring) = @_;
  	# build the sql request. She will look like :
  	# select m1.bibid
***************
*** 273,285 ****
  	# Finds the basic results without the NOT requests
  	my ($sql_tables, $sql_where1, $sql_where2) = create_request($dbh,\@normal_tags, \@normal_and_or, \@normal_operator, \@normal_value);
! 
  	$sql_where1 .= "and TO_DAYS( NOW( ) ) - TO_DAYS( biblio.timestamp ) <30" if $orderby =~ "biblio.timestamp";
  	my $sth;
  	if ($sql_where2) {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc");
! 		warn "Q2 : select distinct m1.bibid from biblio,biblioitems,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc term is  @$value";
  	} else {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc");
! 		warn "Q : select distinct m1.bibid from biblio,biblioitems,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc";
  	}
  	$sth->execute();
--- 277,289 ----
  	# Finds the basic results without the NOT requests
  	my ($sql_tables, $sql_where1, $sql_where2) = create_request($dbh,\@normal_tags, \@normal_and_or, \@normal_operator, \@normal_value);
!   $sql_where1 .=" ". $sqlstring;
  	$sql_where1 .= "and TO_DAYS( NOW( ) ) - TO_DAYS( biblio.timestamp ) <30" if $orderby =~ "biblio.timestamp";
  	my $sth;
  	if ($sql_where2) {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc");
! 		warn "Q2 : select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc term is  @$value";
  	} else {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc");
! 		warn "Q : select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc";
  	}
  	$sth->execute();




From genjimoto at users.sourceforge.net  Wed Jun  1 23:35:08 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 14:35:08 -0700
Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.103,1.104
Message-ID: <E1Ddark-0000xv-7W@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/updater
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3674

Modified Files:
	updatedatabase 
Log Message:
New Feature: catalogsearch() has a new parameter, $sqlstring. A developer puts into it whatever they want to tack onto the end of the where statement. See usage in opac-search.pl

Index: updatedatabase
===================================================================
RCS file: /cvsroot/koha/koha/updater/updatedatabase,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -r1.103 -r1.104
*** updatedatabase	4 May 2005 09:04:52 -0000	1.103
--- updatedatabase	1 Jun 2005 21:35:05 -0000	1.104
***************
*** 13,17 ****
  
  # NOTE:  If you do something more than once in here, make it table driven.
! 
  use strict;
  
--- 13,17 ----
  
  # NOTE:  If you do something more than once in here, make it table driven.
! use lib "/usr/koha200pre2/modules";
  use strict;
  
***************
*** 369,372 ****
--- 369,387 ----
  							KEY biblionumber (biblionumber)
  						)",
+     categorytable       => "(categorycode char(5) NOT NULL default '',
+                              description text default '',
+                              itemtypecodes text default '',
+                              PRIMARY KEY (categorycode)
+                             )",
+     subcategorytable       => "(subcategorycode char(5) NOT NULL default '',
+                              description text default '',
+                              itemtypecodes text default '',
+                              PRIMARY KEY (subcategorycode)
+                             )",
+     mediatypetable       => "(mediatypecode char(5) NOT NULL default '',
+                              description text default '',
+                              itemtypecodes text default '',
+                              PRIMARY KEY (mediatypecode)
+                             )",
  );
  
***************
*** 1433,1436 ****
--- 1448,1454 ----
  
  # $Log$
+ # Revision 1.104  2005/06/01 21:35:05  genjimoto
+ # New Feature: catalogsearch() has a new parameter, $sqlstring. A developer puts into it whatever they want to tack onto the end of the where statement. See usage in opac-search.pl
+ #
  # Revision 1.103  2005/05/04 09:04:52  tipaul
  # synch'ing 2.2 and head




From genjimoto at users.sourceforge.net  Wed Jun  1 23:41:05 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 14:41:05 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters admin-home.tmpl,1.35,1.36
Message-ID: <E1DdaxV-0001dZ-MS@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	admin-home.tmpl 
Log Message:
New links to three new table editors: Categorytable, subcategorytable and mediatypetable.

Index: admin-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** admin-home.tmpl	23 Mar 2005 09:26:48 -0000	1.35
--- admin-home.tmpl	1 Jun 2005 21:41:03 -0000	1.36
***************
*** 36,39 ****
--- 36,54 ----
  		</tr>
  
+     <tr>
+       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/itemtypecategory.pl"> Item categories</a></td>
+       <td>Define item categories. (Non-Fiction, Fiction, Non-Fiction and Fiction...)</td>
+     </tr>
+ 
+     <tr>
+       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/itemtypesubcategory.pl"> Item subcategories</a></td>
+       <td>Define item Subcategories. (Junior Fiction, Junior Non fiction.... Adult Fiction.)</td>
+     </tr>
+ 
+     <tr>
+       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/mediatype.pl"> Item mediatypes</a></td>
+       <td>Define item mediatypes. (CD, Video, Book, Game...)</td>
+     </tr>
+ 
  		<tr>
  			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/categorie.pl">Borrower categories</a></td>




From genjimoto at users.sourceforge.net  Thu Jun  2 00:20:19 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 15:20:19 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-searchresults.tmpl,1.22,1.23
Message-ID: <E1DdbZT-0006jl-6p@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac-searchresults.tmpl 
Log Message:
New Feature: Search options sidebar. Feature request of Rachel at katipo.

Index: opac-searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** opac-searchresults.tmpl	4 May 2005 08:58:32 -0000	1.22
--- opac-searchresults.tmpl	1 Jun 2005 22:20:16 -0000	1.23
***************
*** 10,14 ****
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
! 
  <!-- <p class="center"><!-- TMPL_VAR NAME="total" --> results found</p> -->
  	<div id="resultnumber">
--- 10,16 ----
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
! <table width="100%">
! <tr>
! <td width="70%">
  <!-- <p class="center"><!-- TMPL_VAR NAME="total" --> results found</p> -->
  	<div id="resultnumber">
***************
*** 125,128 ****
--- 127,189 ----
  	</table>
  </form>
+ </td>
+ <td width="30%">
+ <!-- fancy writing --> Search options<br>
+ 
+ <!-- TMPL_VAR NAME="searchdesc" -->
+ <br>
+ <!-- TMPL_VAR NAME="total" --> results found.
+ <br>
+ <form name="searchoptions" action="searchoptions.pl" method="get">
+ <input type="hidden" name="nbstatementsori" value="<!-- TMPL_VAR NAME="nbstatements" ESCAPE=HTML-->">
+ <input type="hidden" name="itemtypessearched" value="<!-- TMPL_VAR NAME="itemtypesstring" -->">
+ <input type="hidden" name="orderbyori" value="<!-- TMPL_VAR NAME="orderby" -->">
+ <!-- TMPL_LOOP NAME="searchdata" -->
+ <input type="hidden" name="<!-- TMPL_VAR NAME="term" -->" value="<!-- TMPL_VAR NAME="val" ESCAPE=HTML -->">
+ <!-- /TMPL_LOOP -->
+ <input type="radio" name="searchtype" value="NewSearch"> New Search<br>
+ <input type="radio" name="searchtype" value="SearchWithin" checked> Search Within Results<br>
+ <br>
+ Select a category<br>
+ <input type="checkbox" name="allcategories"> All Categories <br>
+ <!-- TMPL_VAR NAME="categorylist" -->
+ <input type="text" name="keyword"><br>
+ Search using keywords or subject.
+ <input type="submit" value="Quick Search">
+ <br>
+ 
+ Filter by Subcategory<br>
+ <input type="checkbox" name="allsubcategories"> All Subcategories <br>
+ 
+ <select name="subcategorieswanted" size="4" multiple>
+ 
+ <!-- TMPL_VAR NAME="subcategorylist" -->
+ </select><br>
+ 
+ Filter by Media type<br>
+ <input type="checkbox" name="allmediatypes">All Media types<br>
+ <select name="mediatypeswanted" size="4" multiple>
+ <!-- TMPL_VAR NAME="mediatypelist" -->
+ </select><br>
+ 
+ Filter by Item type<br>
+ <input type="checkbox" name="allitemtypes"> All Itemtypes <br>
+ 
+ <select name="itemtypeswanted" size="6" multiple>
+ 
+ <!-- TMPL_VAR NAME="itemtypelist" -->
+ </select><br>
+ 
+ Filter by Branch<br>
+ <input type="checkbox" name="allbranches"> All Branches<br>
+ <select name="brancheswanted" size="6" multiple>
+ <!-- TMPL_VAR NAME="brancheslist" -->
+ </select><br>
+ <input type="checkbox" name="avail"> Only show titles available (Not on loan)<br>
+ <input type="submit" value="Search">
+ </form>
+ </td>
+ </table>
+ 
  	<p class="center">
  		Results <b><i><!-- TMPL_VAR NAME="from" --></i> through <i><!-- TMPL_VAR NAME="to" --></i> of <i><!-- TMPL_VAR NAME="total" --></i></b>




From genjimoto at users.sourceforge.net  Thu Jun  2 01:07:19 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 16:07:19 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-search.pl,1.24,1.25
Message-ID: <E1DdcIx-0004GI-U9@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16344

Modified Files:
	opac-search.pl 
Log Message:
Addition of new table lists: Categorylist, Subcategorylist and Mediatypelist. Renamed classlist to itemtypelist.

Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** opac-search.pl	4 May 2005 09:02:38 -0000	1.24
--- opac-search.pl	1 Jun 2005 23:07:17 -0000	1.25
***************
*** 17,34 ****
  # use C4::Search;
  
- my $classlist='';
  
  my $dbh=C4::Context->dbh;
  my $sth=$dbh->prepare("select description,itemtype from itemtypes order by description");
  $sth->execute;
  while (my ($description,$itemtype) = $sth->fetchrow) {
!     $classlist.="<option value=\"$itemtype\">$description</option>\n";
  }
  
! 
  my $query = new CGI;
  my $op = $query->param("op");
  my $type=$query->param('type');
  
  my $startfrom=$query->param('startfrom');
  $startfrom=0 if(!defined $startfrom);
--- 17,64 ----
  # use C4::Search;
  
  
+ my $itemtypelist;
+ my $brancheslist;
+ my $categorylist;
+ my $subcategorylist;
+ my $mediatypelist;
  my $dbh=C4::Context->dbh;
  my $sth=$dbh->prepare("select description,itemtype from itemtypes order by description");
  $sth->execute;
  while (my ($description,$itemtype) = $sth->fetchrow) {
!     $itemtypelist.="<option value=\"$itemtype\">$description</option>\n";
  }
+ my $sth=$dbh->prepare("select description,subcategorycode from subcategorytable order by description");
+ $sth->execute;
+ while (my ($description,$subcategorycode) = $sth->fetchrow) {
+     $subcategorylist.="<option value=\"$subcategorycode\">$description</option>\n";
+ }
+ my $sth=$dbh->prepare("select description,mediatypecode from mediatypetable order by description");
+ $sth->execute;
+ while (my ($description,$mediatypecode) = $sth->fetchrow) {
+     $mediatypelist.="<option value=\"$mediatypecode\">$description</option>\n";
+ }
+ my $sth=$dbh->prepare("select description,categorycode from categorytable order by description");
+ $sth->execute;
+ while (my ($description,$categorycode) = $sth->fetchrow) {
+     $categorylist .= '<input type="radio" name="categorylist" value="'.$categorycode.'">'.$description.'<br>';
+ }
+ my $sth=$dbh->prepare("select branchname,branchcode from branches order by branchname");
+ $sth->execute;
  
! while (my ($branchname,$branchcode) = $sth->fetchrow) {
!     $brancheslist.="<option value=\"$branchcode\">$branchname</option>\n";
! }
  my $query = new CGI;
  my $op = $query->param("op");
  my $type=$query->param('type');
  
+ my $itemtypesstring=$query->param("itemtypesstring");
+ $itemtypesstring =~s/"//g;
+ my @itemtypes = split ( /\|/, $itemtypesstring);
+ my $branchesstring=$query->param("branchesstring");
+ $branchesstring =~s/"//g;
+ my @branches = split (/\|/, $branchesstring);
+ 
  my $startfrom=$query->param('startfrom');
  $startfrom=0 if(!defined $startfrom);
***************
*** 51,54 ****
--- 81,92 ----
  		}
  	}
+   if ($itemtypesstring ne ''){
+     $searchdesc .= 'filtered by itemtypes ';
+     $searchdesc .= join(" ", at itemtypes)
+   }
+   if ($branchesstring ne ''){
+     $searchdesc .= ' in branches ';
+     $searchdesc .= join(" ", at branches)
+   }
  	$resultsperpage= $query->param('resultsperpage');
  	$resultsperpage = 19 if(!defined $resultsperpage);
***************
*** 71,77 ****
  	}
  	findseealso($dbh,\@tags);
  	my ($results,$total) = catalogsearch($dbh, \@tags,\@and_or,
  										\@excluding, \@operator, \@value,
! 										$startfrom*$resultsperpage, $resultsperpage,$orderby,$desc_or_asc);
  	if ($total ==1) {
  	if (C4::Context->preference("BiblioDefaultView") eq "normal") {
--- 109,145 ----
  	}
  	findseealso($dbh,\@tags);
+     my $sqlstring;
+     if ($itemtypesstring ne ''){
+         $sqlstring = 'and (biblioitems.itemtype IN (';
+         my $itemtypeloop=0;
+         foreach my $itemtype (@itemtypes){
+             if ($itemtype ne ''){
+                 if ($itemtypeloop != 0){
+                     $sqlstring .=','
+                 }
+                 $sqlstring .= '"'.$itemtype.'"';
+                 $itemtypeloop++;
+             }
+         }
+         $sqlstring .= '))'
+     }
+     if ($branchesstring ne ''){
+         $sqlstring .= 'and biblio.biblionumber=items.biblionumber and (items.holdingbranch IN (';
+         my $branchesloop=0;
+         foreach my $branch (@branches){
+             if ($branch ne ''){
+                 if ($branchesloop != 0){
+                     $sqlstring .=','
+                 }
+                 $sqlstring .= '"'.$branch.'"';
+                 $branchesloop++;
+             }
+         }
+         $sqlstring .= '))'
+     }
+ 
  	my ($results,$total) = catalogsearch($dbh, \@tags,\@and_or,
  										\@excluding, \@operator, \@value,
! 										$startfrom*$resultsperpage, $resultsperpage,$orderby,$desc_or_asc,$sqlstring);
  	if ($total ==1) {
  	if (C4::Context->preference("BiblioDefaultView") eq "normal") {
***************
*** 273,276 ****
--- 341,350 ----
  							suggestion => C4::Context->preference("suggestion"),
  							virtualshelves => C4::Context->preference("virtualshelves"),
+                 itemtypelist => $itemtypelist,
+               subcategorylist => $subcategorylist,
+               brancheslist => $brancheslist,
+               categorylist => $categorylist,
+               mediatypelist => $mediatypelist,
+               itemtypesstring => $itemtypesstring,
  							);
  
***************
*** 319,323 ****
  	$sth->finish;
      
! 	$template->param(classlist => $classlist,
  					CGIitemtype => $CGIitemtype,
  					CGIbranch => $CGIbranch,
--- 393,397 ----
  	$sth->finish;
      
! 	$template->param(itemtypelist => $itemtypelist,
  					CGIitemtype => $CGIitemtype,
  					CGIbranch => $CGIbranch,




From genjimoto at users.sourceforge.net  Thu Jun  2 02:48:00 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 17:48:00 -0700
Subject: [Koha-cvs] CVS: koha/opac searchoptions.pl,NONE,1.1
Message-ID: <E1DddsO-0002NV-HI@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9118

Added Files:
	searchoptions.pl 
Log Message:
Processes the Search options sidebar input, and places it into terms and values for opac-search.pl. Also passes along itemtypes to search on, branches to search on, and availablity bool.

--- NEW FILE ---
#!/usr/bin/perl
use strict;
require Exporter;
# Searching within results is done by simply adding on parameters onto the query, being careful to have the requried marclist etc fields.
use C4::Database;
use C4::Interface::CGI::Output;
use C4::Context;
use CGI;
my $query = new CGI;
my $newquery='';
my $allitemtypesbool = $query->param("allitemtypes");
my $allbranchesbool = $query->param("allbranches");
my $allcategoriesbool = $query->param("allcategories");
my $allsubcategoriesbool = $query->param("allsubcategories");
my $allmediatypesbool = $query->param("allmediatypes");
my $nbstatements = $query->param("nbstatementsori");
my $orderby = $query->param("orderbyori");
my @keywords = $query->param("keyword");
my @marclist = $query->param('marclist');
my @and_or = $query->param('and_or');
my @excluding = $query->param('excluding');
my @operator = $query->param('operator');
my @value = $query->param('value');
my $searchtype = $query->param('searchtype');
my $category = $query->param('categorylist');
my @itemtypeswanted = $query->param("itemtypeswanted");
my $itemtypessearched = $query->param("itemtypessearched");
my @mediatypeswanted = $query->param("mediatypeswanted");
my @subcategorieswanted = $query->param("subcategorieswanted");
my @brancheswanted = $query->param("brancheswanted");
my $avail = $query->param("avail");

my $brancheslist;
my $count=0;
my $newquery='';
my $subfoundbool=0;
my $itemtypefoundbool=0;
my $branchfoundbool=0;
my $itemtypeslist;
my $itemtypescatlist;
my $itemtypessubcatlist;
my $mediatypeslist;
$count=0;
my $dbh=C4::Context->dbh;
$newquery='op=do_search&nbstatements='.$nbstatements;
if ($allcategoriesbool eq '' && $category ne ''){

    my $sth=$dbh->prepare("select itemtypecodes from categorytable where categorycode=?");
    $sth->execute($category);
    $itemtypescatlist = $sth->fetchrow .'|';
    $sth->finish;
}
if ($allmediatypesbool eq '' && @mediatypeswanted ne ''){
    foreach my $mediatype (@mediatypeswanted){
        my $sth=$dbh->prepare("select itemtypecodes from mediatypetable where mediatypecode=?");
        $sth->execute($mediatype);
        $mediatypeslist .= $sth->fetchrow.'|';
        $sth->finish;

    }
}
if ($allsubcategoriesbool eq '' && @subcategorieswanted ne ''){
    foreach my $subcategory (@subcategorieswanted){
        my $sth=$dbh->prepare("select itemtypecodes from subcategorytable where subcategorycode=?");
        $sth->execute($subcategory);
        $itemtypessubcatlist .= $sth->fetchrow.'|';
        $sth->finish;

    }
}
if ($allitemtypesbool ne ''){
#warn @itemtypeswanted;
$itemtypeslist .=$itemtypescatlist.$itemtypessubcatlist.$mediatypeslist.$itemtypessearched.join ("|", @itemtypeswanted)
} else {
$itemtypeslist .=$itemtypescatlist.$itemtypessubcatlist.$mediatypeslist.$itemtypessearched
}
#warn $itemtypeslist;
if ($allbranchesbool == 0){
   $brancheslist = join("|", at brancheswanted)
}

if ($searchtype eq 'NewSearch'){

     $newquery .= '&marclist=';
     $newquery .= '&and_or=and';
     $newquery .= '&excluding=';
     $newquery .= '&operator=contains';
     $newquery .= '&value=';
     $newquery .=join(" ", at keywords)
} elsif ($searchtype eq 'SearchWithin'){
    foreach my $marclistitem (@marclist) {
         $newquery .= '&marclist='.$marclist[$count];
         $newquery .= '&and_or='.$and_or[$count];
         $newquery .= '&excluding='.$excluding[$count];
         $newquery .= '&operator=';
         $newquery .= $operator[$count];
         $newquery .= '&value='.$value[$count];
         if ($marclist[$count] eq ''){
             if ($subfoundbool=0){
                $subfoundbool=1;
                $newquery .=" ".join(" ", at keywords)
             }
         }
        $count++;

    }
    if ($subfoundbool == 0 && $query->param('keysub') ne ''){
        $newquery .= '&marclist=&and_or=and&excluding=&operator=contains&value=';
        $newquery .=join(" ", at keywords)
    }
}
$newquery .= '&orderby='.$orderby;
if ($itemtypeslist ne ''){
    $newquery .= '&itemtypesstring="'.$itemtypeslist.'"'
}
if ($brancheslist ne ''){
    $newquery .= '&branchesstring="'.$brancheslist.'"';
}
if ($avail ne ''){
    $newquery .= '&avail=1'
}
print $query->redirect("/cgi-bin/koha/opac-search.pl?$newquery");




From genjimoto at users.sourceforge.net  Thu Jun  2 04:37:34 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 19:37:34 -0700
Subject: [Koha-cvs] CVS: koha/admin mediatype.pl,NONE,1.1
Message-ID: <E1DdfaQ-0000s4-K1@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3308

Added Files:
	mediatype.pl 
Log Message:
script to edit the media type table.

--- NEW FILE ---
#!/usr/bin/perl
# NOTE: 4-character tabs

#script to administer the mediatype table
#modified from the itemtype script written 20/02/2002 by paul.poulain at free.fr
#This script written by waylon at robertson.net.nz at 2nd June, 2005

# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)

# ALGO :
# this script use an $op to know what to do.
# if $op is empty or none of the above values,
#	- the default screen is build (with all records, or filtered datas).
#	- the   user can clic on add, modify or delete record.
# if $op=add_form
#	- if primkey exists, this is a modification,so we read the $primkey record
#	- builds the add/modify form
# if $op=add_validate
#	- the user has just send datas, so we create/modify the record
# if $op=delete_form
#	- we show the record having primkey=$primkey and ask for deletion validation form
# if $op=delete_confirm
#	- we delete the record having primkey=$primkey


# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use CGI;
use C4::Context;
use C4::Output;
use C4::Search;
use C4::Auth;
use C4::Interface::CGI::Output;
use HTML::Template;

sub StringSearch  {
	my ($env,$searchstring,$type)=@_;
	my $dbh = C4::Context->dbh;
	$searchstring=~ s/\'/\\\'/g;
	my @data=split(' ',$searchstring);
	my $count=@data;
	my $sth=$dbh->prepare("Select * from mediatypetable where (description like ?) order by mediatypecode");
	$sth->execute("$data[0]%");
	my @results;
	while (my $data=$sth->fetchrow_hashref){
	push(@results,$data);
	}
	#  $sth->execute;
	$sth->finish;
	return (scalar(@results),\@results);
}

my $input = new CGI;
my $searchfield=$input->param('description');
my $offset=$input->param('offset');
my $script_name="/cgi-bin/koha/admin/mediatype.pl";
my $mediatypecode=$input->param('mediatypecode');
my $pagesize=20;
my $op = $input->param('op');
$searchfield=~ s/\,//g;
my ($template, $borrowernumber, $cookie)
    = get_template_and_user({template_name => "parameters/mediatype.tmpl",
			     query => $input,
			     type => "intranet",
			     authnotrequired => 0,
			     flagsrequired => {parameters => 1, management => 1},
			     debug => 1,
			     });

if ($op) {
$template->param(script_name => $script_name,
						$op              => 1); # we show only the TMPL_VAR names $op
} else {
$template->param(script_name => $script_name,
						else              => 1); # we show only the TMPL_VAR names $op
}
################## ADD_FORM ##################################
# called by default. Used to create form to add or  modify a record
if ($op eq 'add_form') {
	#start the page and read in includes
	#---- if primkey exists, it's a modify action, so read values to modify...
	my $data;
    my $itemtypes;
    my $dbh = C4::Context->dbh;
    my @itemtypesselected;
	if ($mediatypecode) {
    	my $sth=$dbh->prepare("select mediatypecode,description,itemtypecodes from mediatypetable where mediatypecode=?");
		$sth->execute($mediatypecode);
		$data=$sth->fetchrow_hashref;
		$sth->finish;
        @itemtypesselected = split ( /\|/, $data->{'itemtypecodes'} );
	}

    my $sth=$dbh->prepare("select description,itemtype from itemtypes order by description");
    $sth->execute;
    while (my ($description,$itemtype) = $sth->fetchrow) {
        $itemtypes .='<td><input type="checkbox" name="itemtypecodes" value="'.$itemtype.'"';
        if(grep /$itemtype/, at itemtypesselected){
            $itemtypes .=' checked';
        }
        $itemtypes .='>'.$description.'</td>';
    }

	$template->param(mediatypecode => $mediatypecode,
							description => $data->{'description'},
                            itemtypes => $itemtypes
							);
;
													# END $OP eq ADD_FORM
################## ADD_VALIDATE ##################################
# called by add_form, used to insert/modify data in DB
} elsif ($op eq 'add_validate') {
	my $dbh = C4::Context->dbh;
    my @itemtypecodesarray = $input->param('itemtypecodes');
    my $itemtypecodes=join('|', at itemtypecodesarray);
	my $sth=$dbh->prepare("replace mediatypetable (mediatypecode,description,itemtypecodes) values (?,?,?)");
	$sth->execute(
		$input->param('mediatypecode'),$input->param('description'),
		$itemtypecodes
        );
	$sth->finish;
	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=mediatype.pl\"></html>";
	exit;
													# END $OP eq ADD_VALIDATE
################## DELETE_CONFIRM ##################################
# called by default form, used to confirm deletion of data in DB
} elsif ($op eq 'delete_confirm') {
	#start the page and read in includes
	my $dbh = C4::Context->dbh;
	my $sth=$dbh->prepare("select mediatypecode,description,itemtypecodes from mediatypetable where mediatypecode=?");
	$sth->execute($mediatypecode);
	my $data=$sth->fetchrow_hashref;
	$sth->finish;

	$template->param(mediatypecode => $mediatypecode,
							description => $data->{'description'},
							itemtypecodes => $data->{'itemtypecodes'});
													# END $OP eq DELETE_CONFIRM
################## DELETE_CONFIRMED ##################################
# called by delete_confirm, used to effectively confirm deletion of data in DB
} elsif ($op eq 'delete_confirmed') {
	#start the page and read in includes
	my $dbh = C4::Context->dbh;
	my $mediatypecode=uc($input->param('mediatypecode'));
	my $sth=$dbh->prepare("delete from mediatypetable where mediatypecode=?");
	$sth->execute($mediatypecode);
	$sth->finish;
	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=mediatype.pl\"></html>";
	exit;
													# END $OP eq DELETE_CONFIRMED
################## DEFAULT ##################################
} else { # DEFAULT
	my $env;
	my ($count,$results)=StringSearch($env,$searchfield,'web');
	my $toggle=0;
	my @loop_data;
	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
		my %row_data;
		if ($toggle eq 0){
			$toggle=1;
		} else {
			$toggle=0;
		}
		$row_data{toggle} = $toggle;
		$row_data{mediatypecode} = $results->[$i]{mediatypecode};
		$row_data{description} = $results->[$i]{description};
		$row_data{itemtypecodes} = $results->[$i]{itemtypecodes};
		push(@loop_data, \%row_data);
	}
	$template->param(loop => \@loop_data);
	if ($offset>0) {
		my $prevpage = $offset-$pagesize;
		$template->param(previous => "$script_name?offset=".$prevpage);
	}
	if ($offset+$pagesize<$count) {
		my $nextpage =$offset+$pagesize;
		$template->param(next => "$script_name?offset=".$nextpage);
	}
} #---- END $OP eq DEFAULT
output_html_with_http_headers $input, $cookie, $template->output;

# Local Variables:
# tab-width: 4
# End:




From genjimoto at users.sourceforge.net  Thu Jun  2 05:08:25 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 20:08:25 -0700
Subject: [Koha-cvs] CVS: koha/admin itemtypecategory.pl,NONE,1.1
Message-ID: <E1Ddg4H-0004qg-1Y@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18598

Added Files:
	itemtypecategory.pl 
Log Message:
script to edit the category table.

--- NEW FILE ---
#!/usr/bin/perl
# NOTE: 4-character tabs

#script to administer the itemtype categories table
#modified from the itemtype script written 20/02/2002 by paul.poulain at free.fr
#This script written by waylon at robertson.net.nz at 2nd June, 2005
# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)

# ALGO :
# this script use an $op to know what to do.
# if $op is empty or none of the above values,
#	- the default screen is build (with all records, or filtered datas).
#	- the   user can clic on add, modify or delete record.
# if $op=add_form
#	- if primkey exists, this is a modification,so we read the $primkey record
#	- builds the add/modify form
# if $op=add_validate
#	- the user has just send datas, so we create/modify the record
# if $op=delete_form
#	- we show the record having primkey=$primkey and ask for deletion validation form
# if $op=delete_confirm
#	- we delete the record having primkey=$primkey


# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use CGI;
use C4::Context;
use C4::Output;
use C4::Search;
use C4::Auth;
use C4::Interface::CGI::Output;
use HTML::Template;

sub StringSearch  {
	my ($env,$searchstring,$type)=@_;
	my $dbh = C4::Context->dbh;
	$searchstring=~ s/\'/\\\'/g;
	my @data=split(' ',$searchstring);
	my $count=@data;
	my $sth=$dbh->prepare("Select * from categorytable where (description like ?) order by categorycode");
	$sth->execute("$data[0]%");
	my @results;
	while (my $data=$sth->fetchrow_hashref){
	push(@results,$data);
	}
	#  $sth->execute;
	$sth->finish;
	return (scalar(@results),\@results);
}

my $input = new CGI;
my $searchfield=$input->param('description');
my $offset=$input->param('offset');
my $script_name="/cgi-bin/koha/admin/itemtypecategory.pl";
my $categorycode=$input->param('categorycode');
my $pagesize=20;
my $op = $input->param('op');
$searchfield=~ s/\,//g;
my ($template, $borrowernumber, $cookie)
    = get_template_and_user({template_name => "parameters/itemtypecategory.tmpl",
			     query => $input,
			     type => "intranet",
			     authnotrequired => 0,
			     flagsrequired => {parameters => 1, management => 1},
			     debug => 1,
			     });

if ($op) {
$template->param(script_name => $script_name,
						$op              => 1); # we show only the TMPL_VAR names $op
} else {
$template->param(script_name => $script_name,
						else              => 1); # we show only the TMPL_VAR names $op
}
################## ADD_FORM ##################################
# called by default. Used to create form to add or  modify a record
if ($op eq 'add_form') {
	#start the page and read in includes
	#---- if primkey exists, it's a modify action, so read values to modify...
	my $data;
    my $itemtypes;
    my $dbh = C4::Context->dbh;
    my @itemtypesselected;
	if ($categorycode) {
    	my $sth=$dbh->prepare("select categorycode,description,itemtypecodes from categorytable where categorycode=?");
		$sth->execute($categorycode);
		$data=$sth->fetchrow_hashref;
		$sth->finish;
        @itemtypesselected = split ( /\|/, $data->{'itemtypecodes'} );
	}

    my $sth=$dbh->prepare("select description,itemtype from itemtypes order by description");
    $sth->execute;
    while (my ($description,$itemtype) = $sth->fetchrow) {
        $itemtypes .='<td><input type="checkbox" name="itemtypecodes" value="'.$itemtype.'"';
        if(grep /$itemtype/, at itemtypesselected){
            $itemtypes .=' checked';
        }
        $itemtypes .='>'.$description.'</td>';
    }

	$template->param(categorycode => $categorycode,
							description => $data->{'description'},
                            itemtypes => $itemtypes
							);
;
													# END $OP eq ADD_FORM
################## ADD_VALIDATE ##################################
# called by add_form, used to insert/modify data in DB
} elsif ($op eq 'add_validate') {
	my $dbh = C4::Context->dbh;
    my @itemtypecodesarray = $input->param('itemtypecodes');
    my $itemtypecodes=join('|', at itemtypecodesarray);
	my $sth=$dbh->prepare("replace categorytable (categorycode,description,itemtypecodes) values (?,?,?)");
	$sth->execute(
		$input->param('categorycode'),$input->param('description'),
		$itemtypecodes
        );
	$sth->finish;
	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=itemtypecategory.pl\"></html>";
	exit;
													# END $OP eq ADD_VALIDATE
################## DELETE_CONFIRM ##################################
# called by default form, used to confirm deletion of data in DB
} elsif ($op eq 'delete_confirm') {
	#start the page and read in includes
	my $dbh = C4::Context->dbh;
	my $sth=$dbh->prepare("select categorycode,description,itemtypecodes from categorytable where categorycode=?");
	$sth->execute($categorycode);
	my $data=$sth->fetchrow_hashref;
	$sth->finish;

	$template->param(categorycode => $categorycode,
							description => $data->{'description'},
							itemtypecodes => $data->{'itemtypecodes'});
													# END $OP eq DELETE_CONFIRM
################## DELETE_CONFIRMED ##################################
# called by delete_confirm, used to effectively confirm deletion of data in DB
} elsif ($op eq 'delete_confirmed') {
	#start the page and read in includes
	my $dbh = C4::Context->dbh;
	my $itemtype=uc($input->param('categorycode'));
	my $sth=$dbh->prepare("delete from categorytable where categorycode=?");
	$sth->execute($itemtype);
	$sth->finish;
	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=itemtypecategory.pl\"></html>";
	exit;
													# END $OP eq DELETE_CONFIRMED
################## DEFAULT ##################################
} else { # DEFAULT
	my $env;
	my ($count,$results)=StringSearch($env,$searchfield,'web');
	my $toggle=0;
	my @loop_data;
	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
		my %row_data;
		if ($toggle eq 0){
			$toggle=1;
		} else {
			$toggle=0;
		}
		$row_data{toggle} = $toggle;
		$row_data{categorycode} = $results->[$i]{categorycode};
		$row_data{description} = $results->[$i]{description};
		$row_data{itemtypecodes} = $results->[$i]{itemtypecodes};
		push(@loop_data, \%row_data);
	}
	$template->param(loop => \@loop_data);
	if ($offset>0) {
		my $prevpage = $offset-$pagesize;
		$template->param(previous => "$script_name?offset=".$prevpage);
	}
	if ($offset+$pagesize<$count) {
		my $nextpage =$offset+$pagesize;
		$template->param(next => "$script_name?offset=".$nextpage);
	}
} #---- END $OP eq DEFAULT
output_html_with_http_headers $input, $cookie, $template->output;

# Local Variables:
# tab-width: 4
# End:




From genjimoto at users.sourceforge.net  Thu Jun  2 05:31:19 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 20:31:19 -0700
Subject: [Koha-cvs] CVS: koha/admin itemtypesubcategory.pl,NONE,1.1
Message-ID: <E1DdgQR-00084o-0J@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30998

Added Files:
	itemtypesubcategory.pl 
Log Message:
script to edit the item subcategory table.

--- NEW FILE ---
#!/usr/bin/perl
# NOTE: 4-character tabs

#script to administer the itemtype subcategories table
#modified from the itemtype script written 20/02/2002 by paul.poulain at free.fr
#This script written by waylon at robertson.net.nz at 2nd June, 2005
# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)

# ALGO :
# this script use an $op to know what to do.
# if $op is empty or none of the above values,
#	- the default screen is build (with all records, or filtered datas).
#	- the   user can clic on add, modify or delete record.
# if $op=add_form
#	- if primkey exists, this is a modification,so we read the $primkey record
#	- builds the add/modify form
# if $op=add_validate
#	- the user has just send datas, so we create/modify the record
# if $op=delete_form
#	- we show the record having primkey=$primkey and ask for deletion validation form
# if $op=delete_confirm
#	- we delete the record having primkey=$primkey


# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use CGI;
use C4::Context;
use C4::Output;
use C4::Search;
use C4::Auth;
use C4::Interface::CGI::Output;
use HTML::Template;

sub StringSearch  {
	my ($env,$searchstring,$type)=@_;
	my $dbh = C4::Context->dbh;
	$searchstring=~ s/\'/\\\'/g;
	my @data=split(' ',$searchstring);
	my $count=@data;
	my $sth=$dbh->prepare("Select * from subcategorytable where (description like ?) order by subcategorycode");
	$sth->execute("$data[0]%");
	my @results;
	while (my $data=$sth->fetchrow_hashref){
	push(@results,$data);
	}
	#  $sth->execute;
	$sth->finish;
	return (scalar(@results),\@results);
}

my $input = new CGI;
my $searchfield=$input->param('description');
my $offset=$input->param('offset');
my $script_name="/cgi-bin/koha/admin/itemtypesubcategory.pl";
my $subcategorycode=$input->param('subcategorycode');
my $pagesize=20;
my $op = $input->param('op');
$searchfield=~ s/\,//g;
my ($template, $borrowernumber, $cookie)
    = get_template_and_user({template_name => "parameters/itemtypesubcategory.tmpl",
			     query => $input,
			     type => "intranet",
			     authnotrequired => 0,
			     flagsrequired => {parameters => 1, management => 1},
			     debug => 1,
			     });

if ($op) {
$template->param(script_name => $script_name,
						$op              => 1); # we show only the TMPL_VAR names $op
} else {
$template->param(script_name => $script_name,
						else              => 1); # we show only the TMPL_VAR names $op
}
################## ADD_FORM ##################################
# called by default. Used to create form to add or  modify a record
if ($op eq 'add_form') {
	#start the page and read in includes
	#---- if primkey exists, it's a modify action, so read values to modify...
	my $data;
    my $itemtypes;
    my $dbh = C4::Context->dbh;
    my @itemtypesselected;
	if ($subcategorycode) {
    	my $sth=$dbh->prepare("select subcategorycode,description,itemtypecodes from subcategorytable where subcategorycode=?");
		$sth->execute($subcategorycode);
		$data=$sth->fetchrow_hashref;
		$sth->finish;
        @itemtypesselected = split ( /\|/, $data->{'itemtypecodes'} );
	}

    my $sth=$dbh->prepare("select description,itemtype from itemtypes order by description");
    $sth->execute;
    while (my ($description,$itemtype) = $sth->fetchrow) {
        $itemtypes .='<td><input type="checkbox" name="itemtypecodes" value="'.$itemtype.'"';
        if(grep /$itemtype/, at itemtypesselected){
            $itemtypes .=' checked';
        }
        $itemtypes .='>'.$description.'</td>';
    }

	$template->param(subcategorycode => $subcategorycode,
							description => $data->{'description'},
                            itemtypes => $itemtypes
							);
;
													# END $OP eq ADD_FORM
################## ADD_VALIDATE ##################################
# called by add_form, used to insert/modify data in DB
} elsif ($op eq 'add_validate') {
	my $dbh = C4::Context->dbh;
    my @itemtypecodesarray = $input->param('itemtypecodes');
    my $itemtypecodes=join('|', at itemtypecodesarray);
	my $sth=$dbh->prepare("replace subcategorytable (subcategorycode,description,itemtypecodes) values (?,?,?)");
	$sth->execute(
		$input->param('subcategorycode'),$input->param('description'),
		$itemtypecodes
        );
	$sth->finish;
	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=itemtypesubcategory.pl\"></html>";
	exit;
													# END $OP eq ADD_VALIDATE
################## DELETE_CONFIRM ##################################
# called by default form, used to confirm deletion of data in DB
} elsif ($op eq 'delete_confirm') {
	#start the page and read in includes
	my $dbh = C4::Context->dbh;
	my $sth=$dbh->prepare("select subcategorycode,description,itemtypecodes from subcategorytable where subcategorycode=?");
	$sth->execute($subcategorycode);
	my $data=$sth->fetchrow_hashref;
	$sth->finish;

	$template->param(subcategorycode => $subcategorycode,
							description => $data->{'description'},
							itemtypecodes => $data->{'itemtypecodes'});
													# END $OP eq DELETE_CONFIRM
################## DELETE_CONFIRMED ##################################
# called by delete_confirm, used to effectively confirm deletion of data in DB
} elsif ($op eq 'delete_confirmed') {
	#start the page and read in includes
	my $dbh = C4::Context->dbh;
	my $subcategorycode=uc($input->param('subcategorycode'));
	my $sth=$dbh->prepare("delete from subcategorytable where subcategorycode=?");
	$sth->execute($subcategorycode);
	$sth->finish;
	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=itemtypesubcategory.pl\"></html>";
	exit;
													# END $OP eq DELETE_CONFIRMED
################## DEFAULT ##################################
} else { # DEFAULT
	my $env;
	my ($count,$results)=StringSearch($env,$searchfield,'web');
	my $toggle=0;
	my @loop_data;
	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
		my %row_data;
		if ($toggle eq 0){
			$toggle=1;
		} else {
			$toggle=0;
		}
		$row_data{toggle} = $toggle;
		$row_data{subcategorycode} = $results->[$i]{subcategorycode};
		$row_data{description} = $results->[$i]{description};
		$row_data{itemtypecodes} = $results->[$i]{itemtypecodes};
		push(@loop_data, \%row_data);
	}
	$template->param(loop => \@loop_data);
	if ($offset>0) {
		my $prevpage = $offset-$pagesize;
		$template->param(previous => "$script_name?offset=".$prevpage);
	}
	if ($offset+$pagesize<$count) {
		my $nextpage =$offset+$pagesize;
		$template->param(next => "$script_name?offset=".$nextpage);
	}
} #---- END $OP eq DEFAULT
output_html_with_http_headers $input, $cookie, $template->output;

# Local Variables:
# tab-width: 4
# End:




From genjimoto at users.sourceforge.net  Thu Jun  2 05:55:28 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 20:55:28 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters itemtypesubcategory.tmpl,NONE,1.1
Message-ID: <E1Ddgno-0002eG-JD@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	itemtypesubcategory.tmpl 
Log Message:
template to edit the item subcategory table.

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->

<script language="javascript" type="text/javascript">
function _(s) { return s } // dummy function for gettext
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNotNull(f,noalert) {
	if (f.value.length ==0) {
		return false;
	}
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function toUC(f) {
	var x=f.value.toUpperCase();
	f.value=x;
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNum(v,maybenull) {
var n = new Number(v.value);
if (isNaN(n)) {
	return false;
	}
if (maybenull==0 && v.value=='') {
	return false;
}
return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isDate(f) {
	var t = Date.parse(f.value);
	if (isNaN(t)) {
		return false;
	}
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function Check(f) {
	var ok=1;
	var _alertString="";
	var alertString2;
	if (f.subcategorycode.value.length==0) {
		_alertString += "\n- " + _("Subcategorycode missing");
	}
	if (!(isNotNull(window.document.Aform.description,1))) {
		_alertString += "\n- " + _("Description missing");
	}
	if (_alertString.length==0) {
		document.Aform.submit();
	} else {
		alertString2  = _("Form not submitted because of the following problem(s)");
		alertString2 += "\n------------------------------------------------------------------------------------\n";
		alertString2 += _alertString;
		alert(alertString2);
	}
}
</script>
<div id="mainbloc">
<!-- TMPL_IF NAME="add_form" -->
	<!-- TMPL_IF NAME="itemtype" -->
		<h1 class="parameters">Modify Subcategory</h1>
	<!-- TMPL_ELSE -->
		<h1 class="parameters">Add Subcategory</h1>
	<!-- /TMPL_IF -->
	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
		<input type="hidden" name="op" value="add_validate">
		<input type="hidden" name="checked" value="0">
			<!-- TMPL_IF NAME="subcategorycode" -->
				<p><label class="label100">Subcategory Code<label><input type="hidden" name="subcategorycode" value="<!-- TMPL_VAR NAME="subcategorycode" -->"><!-- TMPL_VAR NAME="subcategorycode" --></p>
			<!-- TMPL_ELSE -->
				<p><label class="label100">Subcategory Code<label><input type="text" name="subcategorycode" size="6" maxlength="4" onblur="toUC(this)"></p>
			<!-- /TMPL_IF -->
			<p>
				<label class="label100">Description</label>
				<input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="description" escape=HTML -->">
			</p>
			<p>
				<label class="label100">Itemtypes assigned</label>
                <!-- TMPL_VAR NAME="itemtypes" -->

			</p>

			<p>
				<input type="button" value="OK" class="button" onclick="Check(this.form)">
			</p>
	</form>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirm" -->
		<p><label>Subcategory Code</label><!-- TMPL_VAR NAME="subcategorycode" --></p>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="subcategorycode" value="<!-- TMPL_VAR NAME="subcategorycode" -->">
	<p><label>Description</label><!-- TMPL_VAR NAME="description" --></p>
		<p>CONFIRM DELETION</p>
		<p>
			<input type="submit" value="YES" class="button parameters"></form>
			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO" class="button parameters"></form>
		</p>


<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="else" -->
<h1 class="parameters">Subcategory Admin</h1>
<table>
	<tr>
		<th class="parameters">Code</th>
		<th class="parameters">Description</th>
        <th class="parameters">Itemtype codes</th>
		<th class="parameters">Edit</th>
		<th class="parameters">Delete</th>
	</tr>
	<!-- TMPL_LOOP NAME="loop" -->
		<tr>
			<td><!-- TMPL_VAR NAME="subcategorycode" --></td>
			<td><!-- TMPL_VAR NAME="description" --></td>
			<td><!-- TMPL_VAR NAME="itemtypecodes" --></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&subcategorycode=<!-- TMPL_VAR NAME="subcategorycode" escape="HTML" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&subcategorycode=<!-- TMPL_VAR NAME="subcategorycode" escape="HTML" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
		</tr>
	<!-- /TMPL_LOOP -->
</table>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<input type="hidden" name="op" value="add_form">
	<input type="submit" class="button parameters" value="Add Subcategory" title="Add Subcategory" alt="Add Subcategory" >
	<td width="33%"><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->"><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0"></a><!-- /TMPL_IF --></td>
	<td width="33%"><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->"><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0"></a><!-- /TMPL_IF --></td>
</form>
</div>
<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->




From genjimoto at users.sourceforge.net  Thu Jun  2 05:56:01 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 20:56:01 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters mediatype.tmpl,NONE,1.1
Message-ID: <E1DdgoL-0002hl-7b@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	mediatype.tmpl 
Log Message:
template to edit the mediatype table.

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->

<script language="javascript" type="text/javascript">
function _(s) { return s } // dummy function for gettext
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNotNull(f,noalert) {
	if (f.value.length ==0) {
		return false;
	}
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function toUC(f) {
	var x=f.value.toUpperCase();
	f.value=x;
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNum(v,maybenull) {
var n = new Number(v.value);
if (isNaN(n)) {
	return false;
	}
if (maybenull==0 && v.value=='') {
	return false;
}
return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isDate(f) {
	var t = Date.parse(f.value);
	if (isNaN(t)) {
		return false;
	}
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function Check(f) {
	var ok=1;
	var _alertString="";
	var alertString2;
	if (f.mediatypecode.value.length==0) {
		_alertString += "\n- " + _("mediatypecode missing");
	}
	if (!(isNotNull(window.document.Aform.description,1))) {
		_alertString += "\n- " + _("Description missing");
	}
	if (_alertString.length==0) {
		document.Aform.submit();
	} else {
		alertString2  = _("Form not submitted because of the following problem(s)");
		alertString2 += "\n------------------------------------------------------------------------------------\n";
		alertString2 += _alertString;
		alert(alertString2);
	}
}
</script>
<div id="mainbloc">
<!-- TMPL_IF NAME="add_form" -->
	<!-- TMPL_IF NAME="itemtype" -->
		<h1 class="parameters">Modify mediatype</h1>
	<!-- TMPL_ELSE -->
		<h1 class="parameters">Add mediatype</h1>
	<!-- /TMPL_IF -->
	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
		<input type="hidden" name="op" value="add_validate">
		<input type="hidden" name="checked" value="0">
			<!-- TMPL_IF NAME="mediatypecode" -->
				<p><label class="label100">mediatype Code<label><input type="hidden" name="mediatypecode" value="<!-- TMPL_VAR NAME="mediatypecode" -->"><!-- TMPL_VAR NAME="mediatypecode" --></p>
			<!-- TMPL_ELSE -->
				<p><label class="label100">mediatype Code<label><input type="text" name="mediatypecode" size="6" maxlength="4" onblur="toUC(this)"></p>
			<!-- /TMPL_IF -->
			<p>
				<label class="label100">Description</label>
				<input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="description" escape=HTML -->">
			</p>
			<p>
				<label class="label100">Itemtypes assigned</label>
                <!-- TMPL_VAR NAME="itemtypes" -->

			</p>

			<p>
				<input type="button" value="OK" class="button" onclick="Check(this.form)">
			</p>
	</form>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirm" -->
		<p><label>mediatype Code</label><!-- TMPL_VAR NAME="mediatypecode" --></p>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="mediatypecode" value="<!-- TMPL_VAR NAME="mediatypecode" -->">
	<p><label>Description</label><!-- TMPL_VAR NAME="description" --></p>
		<p>CONFIRM DELETION</p>
		<p>
			<input type="submit" value="YES" class="button parameters"></form>
			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO" class="button parameters"></form>
		</p>


<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="else" -->
<h1 class="parameters">mediatype Admin</h1>
<table>
	<tr>
		<th class="parameters">Code</th>
		<th class="parameters">Description</th>
        <th class="parameters">Itemtype codes</th>
		<th class="parameters">Edit</th>
		<th class="parameters">Delete</th>
	</tr>
	<!-- TMPL_LOOP NAME="loop" -->
		<tr>
			<td><!-- TMPL_VAR NAME="mediatypecode" --></td>
			<td><!-- TMPL_VAR NAME="description" --></td>
			<td><!-- TMPL_VAR NAME="itemtypecodes" --></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&mediatypecode=<!-- TMPL_VAR NAME="mediatypecode" escape="HTML" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&mediatypecode=<!-- TMPL_VAR NAME="mediatypecode" escape="HTML" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
		</tr>
	<!-- /TMPL_LOOP -->
</table>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<input type="hidden" name="op" value="add_form">
	<input type="submit" class="button parameters" value="Add mediatype" title="Add mediatype" alt="Add mediatype" >
	<td width="33%"><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->"><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0"></a><!-- /TMPL_IF --></td>
	<td width="33%"><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->"><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0"></a><!-- /TMPL_IF --></td>
</form>
</div>
<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->




From genjimoto at users.sourceforge.net  Thu Jun  2 05:55:04 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 20:55:04 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters itemtypecategory.tmpl,NONE,1.1
Message-ID: <E1DdgnQ-0002Z0-FS@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	itemtypecategory.tmpl 
Log Message:
template to edit the item category table.

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->

<script language="javascript" type="text/javascript">
function _(s) { return s } // dummy function for gettext
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNotNull(f,noalert) {
	if (f.value.length ==0) {
		return false;
	}
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function toUC(f) {
	var x=f.value.toUpperCase();
	f.value=x;
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNum(v,maybenull) {
var n = new Number(v.value);
if (isNaN(n)) {
	return false;
	}
if (maybenull==0 && v.value=='') {
	return false;
}
return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isDate(f) {
	var t = Date.parse(f.value);
	if (isNaN(t)) {
		return false;
	}
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function Check(f) {
	var ok=1;
	var _alertString="";
	var alertString2;
	if (f.categorycode.value.length==0) {
		_alertString += "\n- " + _("Categorycode missing");
	}
	if (!(isNotNull(window.document.Aform.description,1))) {
		_alertString += "\n- " + _("Description missing");
	}
	if (_alertString.length==0) {
		document.Aform.submit();
	} else {
		alertString2  = _("Form not submitted because of the following problem(s)");
		alertString2 += "\n------------------------------------------------------------------------------------\n";
		alertString2 += _alertString;
		alert(alertString2);
	}
}
</script>
<div id="mainbloc">
<!-- TMPL_IF NAME="add_form" -->
	<!-- TMPL_IF NAME="itemtype" -->
		<h1 class="parameters">Modify Category</h1>
	<!-- TMPL_ELSE -->
		<h1 class="parameters">Add Category</h1>
	<!-- /TMPL_IF -->
	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
		<input type="hidden" name="op" value="add_validate">
		<input type="hidden" name="checked" value="0">
			<!-- TMPL_IF NAME="categorycode" -->
				<p><label class="label100">Category Code<label><input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->"><!-- TMPL_VAR NAME="categorycode" --></p>
			<!-- TMPL_ELSE -->
				<p><label class="label100">Category Code<label><input type="text" name="categorycode" size="6" maxlength="4" onblur="toUC(this)"></p>
			<!-- /TMPL_IF -->
			<p>
				<label class="label100">Description</label>
				<input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="description" escape=HTML -->">
			</p>
			<p>
				<label class="label100">Itemtypes assigned</label>
                <!-- TMPL_VAR NAME="itemtypes" -->

			</p>

			<p>
				<input type="button" value="OK" class="button" onclick="Check(this.form)">
			</p>
	</form>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirm" -->
		<p><label>Category Code</label><!-- TMPL_VAR NAME="categorycode" --></p>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->">
	<p><label>Description</label><!-- TMPL_VAR NAME="description" --></p>
		<p>CONFIRM DELETION</p>
		<p>
			<input type="submit" value="YES" class="button parameters"></form>
			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO" class="button parameters"></form>
		</p>


<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="else" -->
<h1 class="parameters">Category Admin</h1>
<table>
	<tr>
		<th class="parameters">Code</th>
		<th class="parameters">Description</th>
        <th class="parameters">Itemtype codes</th>
		<th class="parameters">Edit</th>
		<th class="parameters">Delete</th>
	</tr>
	<!-- TMPL_LOOP NAME="loop" -->
		<tr>
			<td><!-- TMPL_VAR NAME="categorycode" --></td>
			<td><!-- TMPL_VAR NAME="description" --></td>
			<td><!-- TMPL_VAR NAME="itemtypecodes" --></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&categorycode=<!-- TMPL_VAR NAME="categorycode" escape="HTML" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&categorycode=<!-- TMPL_VAR NAME="categorycode" escape="HTML" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
		</tr>
	<!-- /TMPL_LOOP -->
</table>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<input type="hidden" name="op" value="add_form">
	<input type="submit" class="button parameters" value="Add Category" title="Add Category" alt="Add Category" >
	<td width="33%"><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->"><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0"></a><!-- /TMPL_IF --></td>
	<td width="33%"><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->"><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0"></a><!-- /TMPL_IF --></td>
</form>
</div>
<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->




From genjimoto at users.sourceforge.net  Thu Jun  2 06:36:24 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Wed, 01 Jun 2005 21:36:24 -0700
Subject: [Koha-cvs] CVS: koha/opac searchoptions.pl,1.1,1.2
Message-ID: <E1DdhRQ-0007cU-Mm@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29233

Modified Files:
	searchoptions.pl 
Log Message:
minor bugfix

Index: searchoptions.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/searchoptions.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** searchoptions.pl	2 Jun 2005 00:47:58 -0000	1.1
--- searchoptions.pl	2 Jun 2005 04:36:22 -0000	1.2
***************
*** 34,48 ****
  my $count=0;
  my $newquery='';
! my $subfoundbool=0;
! my $itemtypefoundbool=0;
! my $branchfoundbool=0;
  my $itemtypeslist;
  my $itemtypescatlist;
  my $itemtypessubcatlist;
  my $mediatypeslist;
  $count=0;
  my $dbh=C4::Context->dbh;
  $newquery='op=do_search&nbstatements='.$nbstatements;
! if ($allcategoriesbool eq '' && $category ne ''){
  
      my $sth=$dbh->prepare("select itemtypecodes from categorytable where categorycode=?");
--- 34,47 ----
  my $count=0;
  my $newquery='';
! my $keywordfoundbool=0;
  my $itemtypeslist;
  my $itemtypescatlist;
  my $itemtypessubcatlist;
  my $mediatypeslist;
+ 
  $count=0;
  my $dbh=C4::Context->dbh;
  $newquery='op=do_search&nbstatements='.$nbstatements;
! if ($allcategoriesbool == 0 && $category ne ''){
  
      my $sth=$dbh->prepare("select itemtypecodes from categorytable where categorycode=?");
***************
*** 51,55 ****
      $sth->finish;
  }
! if ($allmediatypesbool eq '' && @mediatypeswanted ne ''){
      foreach my $mediatype (@mediatypeswanted){
          my $sth=$dbh->prepare("select itemtypecodes from mediatypetable where mediatypecode=?");
--- 50,54 ----
      $sth->finish;
  }
! if ($allmediatypesbool == 0 && @mediatypeswanted ne ''){
      foreach my $mediatype (@mediatypeswanted){
          my $sth=$dbh->prepare("select itemtypecodes from mediatypetable where mediatypecode=?");
***************
*** 60,64 ****
      }
  }
! if ($allsubcategoriesbool eq '' && @subcategorieswanted ne ''){
      foreach my $subcategory (@subcategorieswanted){
          my $sth=$dbh->prepare("select itemtypecodes from subcategorytable where subcategorycode=?");
--- 59,63 ----
      }
  }
! if ($allsubcategoriesbool == 0 && @subcategorieswanted ne ''){
      foreach my $subcategory (@subcategorieswanted){
          my $sth=$dbh->prepare("select itemtypecodes from subcategorytable where subcategorycode=?");
***************
*** 69,79 ****
      }
  }
! if ($allitemtypesbool ne ''){
! #warn @itemtypeswanted;
  $itemtypeslist .=$itemtypescatlist.$itemtypessubcatlist.$mediatypeslist.$itemtypessearched.join ("|", @itemtypeswanted)
  } else {
  $itemtypeslist .=$itemtypescatlist.$itemtypessubcatlist.$mediatypeslist.$itemtypessearched
  }
! #warn $itemtypeslist;
  if ($allbranchesbool == 0){
     $brancheslist = join("|", at brancheswanted)
--- 68,78 ----
      }
  }
! if ($allitemtypesbool == 0){
! 
  $itemtypeslist .=$itemtypescatlist.$itemtypessubcatlist.$mediatypeslist.$itemtypessearched.join ("|", @itemtypeswanted)
  } else {
  $itemtypeslist .=$itemtypescatlist.$itemtypessubcatlist.$mediatypeslist.$itemtypessearched
  }
! 
  if ($allbranchesbool == 0){
     $brancheslist = join("|", at brancheswanted)
***************
*** 97,102 ****
           $newquery .= '&value='.$value[$count];
           if ($marclist[$count] eq ''){
!              if ($subfoundbool=0){
!                 $subfoundbool=1;
                  $newquery .=" ".join(" ", at keywords)
               }
--- 96,101 ----
           $newquery .= '&value='.$value[$count];
           if ($marclist[$count] eq ''){
!              if ($keywordfoundbool=0){
!                 $keywordfoundbool=1;
                  $newquery .=" ".join(" ", at keywords)
               }
***************
*** 105,109 ****
  
      }
!     if ($subfoundbool == 0 && $query->param('keysub') ne ''){
          $newquery .= '&marclist=&and_or=and&excluding=&operator=contains&value=';
          $newquery .=join(" ", at keywords)
--- 104,108 ----
  
      }
!     if ($keywordfoundbool == 0 && $query->param('keysub') ne ''){
          $newquery .= '&marclist=&and_or=and&excluding=&operator=contains&value=';
          $newquery .=join(" ", at keywords)




From hdl at users.sourceforge.net  Thu Jun  2 15:03:37 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 02 Jun 2005 06:03:37 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-sendbasket.pl,1.4.2.2,1.4.2.3
Message-ID: <E1DdpMH-0004mE-2H@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18305/opac

Modified Files:
      Tag: rel_2_2
	opac-sendbasket.pl 
Log Message:
Sending e-mail with joined file.
Seems to work OK. But I never received the email. 
May be my postfix configuration.

Index: opac-sendbasket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-sendbasket.pl,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -r1.4.2.2 -r1.4.2.3
*** opac-sendbasket.pl	1 Jun 2005 19:55:53 -0000	1.4.2.2
--- opac-sendbasket.pl	2 Jun 2005 13:03:31 -0000	1.4.2.3
***************
*** 130,133 ****
--- 130,135 ----
  	if (sendmail %mail) {
  	# do something if it works....
+ #		warn " ".$mail{body};
+ #		warn " ".$mail{PJ};
  		warn "Mail sent ok\n";
  		$template->param(SENT => "1");




From genjimoto at users.sourceforge.net  Thu Jun  2 15:29:30 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Thu, 02 Jun 2005 06:29:30 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-search.pl,1.25,1.26
Message-ID: <E1DdplK-0008CR-GY@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31474

Modified Files:
	opac-search.pl 
Log Message:
minor bugfix

Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** opac-search.pl	1 Jun 2005 23:07:17 -0000	1.25
--- opac-search.pl	2 Jun 2005 13:29:28 -0000	1.26
***************
*** 409,410 ****
--- 409,411 ----
  else {
  output_html_with_http_headers $query, $cookie, $template->output;
+ }




From gmccullagh at users.sourceforge.net  Thu Jun  2 15:47:49 2005
From: gmccullagh at users.sourceforge.net (gavin)
Date: Thu, 02 Jun 2005 06:47:49 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-search.pl,1.26,1.27
Message-ID: <E1Ddq33-0002LI-FM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8814

Modified Files:
	opac-search.pl 
Log Message:
just declared $totalResults and added an indent at the end


Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** opac-search.pl	2 Jun 2005 13:29:28 -0000	1.26
--- opac-search.pl	2 Jun 2005 13:47:47 -0000	1.27
***************
*** 23,26 ****
--- 23,29 ----
  my $subcategorylist;
  my $mediatypelist;
+ # added by Gavin 
+ my $totalresults;
+ 
  my $dbh=C4::Context->dbh;
  my $sth=$dbh->prepare("select description,itemtype from itemtypes order by description");
***************
*** 181,186 ****
  #      how this is done
  # 4.
! # 
  $totalresults = $total;
  ## This formats the 'search results' string and populates
  ## the 'OPLIN' variable as well as the 'spellcheck' variable
--- 184,190 ----
  #      how this is done
  # 4.
!  
  $totalresults = $total;
+ 
  ## This formats the 'search results' string and populates
  ## the 'OPLIN' variable as well as the 'spellcheck' variable
***************
*** 408,411 ****
  }
  else {
! output_html_with_http_headers $query, $cookie, $template->output;
  }
--- 412,415 ----
  }
  else {
!   output_html_with_http_headers $query, $cookie, $template->output;
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:16:56 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:16:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_100.tmpl,1.4,1.5
Message-ID: <E1DdrRI-0006D3-V0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23811/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_100.tmpl 
Log Message:
Template for 100a field plugin

Index: unimarc_field_100.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_100.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** unimarc_field_100.tmpl	1 Mar 2005 13:41:02 -0000	1.4
--- unimarc_field_100.tmpl	2 Jun 2005 15:16:54 -0000	1.5
***************
*** 1,652 ****
! <html>
! <head>
! <title>UNIMARC Field 100 builder</title>
! </head>
! <body>
  <form name="f_pop" onSubmit="javascript:report()">
! <table>
! 	<tr>
! 		<td>Date d'enregistrement</td>
! 		<td><input type="text" name="f1" maxlength=8 size=9 value="<!-- TMPL_VAR name="f1" -->"></td>
[...1364 lines suppressed...]
+ 		var jour = now.getDate();
+ 		var annee = now.getYear();
+ 
+ 		mois += 1;
+ 		if (mois < 10) { mois = "0" + mois; }
+ 		
+ 		if (annee < 2000) { annee += 1900; }
+ 		
+ 		var dateString = annee + mois + jour;
+ 		return dateString; 
+ 	}
+ 
+ 	function initForm() {
+ 		if (document.f_pop.f1.value == "") { document.f_pop.f1.value = formeDate(); }
+ 	}
+ 
+ 	initForm();
  </script>
! 
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From hdl at users.sourceforge.net  Thu Jun  2 17:19:37 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 02 Jun 2005 08:19:37 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-serial-issues.tmpl,1.2.2.2,1.2.2.3
Message-ID: <E1DdrTt-0006gF-OF@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-serial-issues.tmpl 
Log Message:
Adding history of received and missing serials to simple information

Index: opac-serial-issues.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C2 -r1.2.2.2 -r1.2.2.3
*** opac-serial-issues.tmpl	4 Mar 2005 16:13:55 -0000	1.2.2.2
--- opac-serial-issues.tmpl	2 Jun 2005 15:19:35 -0000	1.2.2.3
***************
*** 75,78 ****
--- 75,79 ----
  		since <b><!-- TMPl_VAR name="startdate" --></b>
  		</p>
+ <!--TMPL_UNLESS Name=fullinfo -->
  		<p><!-- TMPL_VAR name="notes" --></p>
  	<!-- TMPL_IF name="opacnote" -->
***************
*** 82,85 ****
--- 83,99 ----
  		</p>
  	<!-- /TMPL_IF -->
+ 	<!-- TMPL_IF name="recievedlist" -->
+ 		<p>
+ 		<!-- TMPL_VAR name="recievedlist" -->
+ 			are recieved.
+ 		</p>
+ 	<!--/TMPL_IF -->
+ 	<!-- TMPL_IF name="missinglist" -->
+ 	<p>
+ 			<!-- TMPL_VAR name="missinglist" -->
+ 		are missing.
+ 	</p>
+ 	<!--/TMPL_IF -->
+ <!-- /TMPL_UNLESS -->
  </div>
  <!-- /TMPL_LOOP -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:20:00 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:20:00 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_105.tmpl,1.4,1.5
Message-ID: <E1DdrUG-0006ic-FR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25724/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_105.tmpl 
Log Message:
Template for 105a field plugin

Index: unimarc_field_105.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_105.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** unimarc_field_105.tmpl	1 Mar 2005 13:41:02 -0000	1.4
--- unimarc_field_105.tmpl	2 Jun 2005 15:19:57 -0000	1.5
***************
*** 1,1168 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 105</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Illustration 1:</td>

! 		<td>

[...2179 lines suppressed...]
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:15em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value +document.f_pop.f6.value +document.f_pop.f7.value +document.f_pop.f8.value +document.f_pop.f9.value +document.f_pop.f10.value +document.f_pop.f11.value +document.f_pop.f12.value +document.f_pop.f13.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:20:27 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:20:27 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_106.tmpl,1.2,1.3
Message-ID: <E1DdrUh-0006pQ-L2@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26214/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_106.tmpl 
Log Message:
Template for 106a field plugin

Index: unimarc_field_106.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_106.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_106.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_106.tmpl	2 Jun 2005 15:20:25 -0000	1.3
***************
*** 1,81 ****
! <html>
! <head>
! <title>UNIMARC Field 106 builder</title>
! </head>
! <body>
  <form name="f_pop" onSubmit="javascript:report()">
- <table>
- 	<tr>
- 		<td>Texte presentation physique</td>
- 		<td>
- 			<select name="f1" size="1">
- 	                        <!-- TMPL_IF name="f1 " -->
-                                 <option value=" " SELECTED>Aucun</option>
-                         <!-- TMPL_ELSE -->
-                                 <option value=" ">Aucun</option>
-                         <!-- /TMPL_IF -->
  
! 			<!-- TMPL_IF name="f1r" -->
! 				<option value="r" SELECTED>Impression normale</option>
! 			<!-- TMPL_ELSE -->
! 				<option value="r">Impression normale</option>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="f1b" -->
! 				<option value="d" SELECTED>Impression
! 				en gros caractere</option>
! 			<!-- TMPL_ELSE -->
! 				<option value="d">Impression en gros caractere</option>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="f1e" -->
! 				<option value="e" SELECTED>Journal</option>
! 			<!-- TMPL_ELSE -->
! 				<option value="e">Journal</option>
! 	
! 			<!-- /TMPL_IF -->
  
  
- 			<!-- TMPL_IF name="f1f" -->
- 				<option value="f" SELECTED>Caractere braille et moon</option>
- 			<!-- TMPL_ELSE -->
- 				<option value="f">Caractere braille et moon</option>
- 	
- 			<!-- /TMPL_IF -->
- 			<!-- TMPL_IF name="f1g" -->
- 				<option value="g" SELECTED>Micro-impression</option>
- 			<!-- TMPL_ELSE -->
- 				<option value="g">Micro-impression</option>
- 	
- 			<!-- /TMPL_IF -->
- 			<!-- TMPL_IF name="f1h" -->
- 				<option value="h" SELECTED>Manuscrit</option>
- 			<!-- TMPL_ELSE -->
- 				<option value="h">Manuscrit</option>
- 	
- 			<!-- /TMPL_IF -->
- 			<!-- TMPL_IF name="f1i" -->
- 				<option value="i" SELECTED>Multimedia</option>
- 			<!-- TMPL_ELSE -->
- 				<option value="i">Multimedia</option>
- 	
- 			<!-- /TMPL_IF -->
- 			<!-- TMPL_IF name="f1j" -->
- 				<option value="j" SELECTED>Impression en reduction</option>
- 			<!-- TMPL_ELSE -->
- 				<option value="j">Impression en reduction</option>
- 	
- 			<!-- /TMPL_IF -->
- 			<!-- TMPL_IF name="f1z" -->
- 				<option value="z" SELECTED>Autres formes de presentation</option>
- 			<!-- TMPL_ELSE -->
- 				<option value="z">Autres formes de presentation</option>
- 	
- 			<!-- /TMPL_IF -->
- 			</select>
- 		</td>
- 	</tr>
- 	
- 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>
- </table>
  </form>
  <script>
  	function report() {
--- 1,71 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ cod? 106a</h1>
  <form name="f_pop" onSubmit="javascript:report()">
  
! <p>
! 	<label style="width:15em;">Texte pr?sentation physique</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1r" -->
! 		<option value="r" SELECTED>Impression normale</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="r">Impression normale</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="d" SELECTED>Impression en gros caract?res</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Impression en gros caract?res</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Journal</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Journal</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1f" -->
! 		<option value="f" SELECTED>Caract?res braille et moon</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Caract?res braille et moon</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1g" -->
! 		<option value="g" SELECTED>Micro-impression</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Micro-impression</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1h" -->
! 		<option value="h" SELECTED>Manuscrit</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Manuscrit</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1i" -->
! 		<option value="i" SELECTED>Multim?dia</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="i">Multim?dia</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1j" -->
! 		<option value="j" SELECTED>Impression en r?duction</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="j">Impression en r?duction</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1z" -->
! 		<option value="z" SELECTED>Autres formes de pr?sentation</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autres formes de pr?sentation</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
  
+ <br>
+ <p>
+ 	<label style="width:15em;">&nbsp;</label>
+ 	<input type="submit" value="OK" class="button authority">
+ </p>
  
  </form>
+ </div>
  <script>
  	function report() {
***************
*** 87,90 ****
  	}
  </script>
! </body>
! </html>
--- 77,79 ----
  	}
  </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:20:57 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:20:57 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_110.tmpl,1.2,1.3
Message-ID: <E1DdrVB-0006tk-0f@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26457/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_110.tmpl 
Log Message:
Template for 110a field plugin

Index: unimarc_field_110.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_110.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_110.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_110.tmpl	2 Jun 2005 15:20:54 -0000	1.3
***************
*** 1,662 ****
! <html>
! <head>
! <title>UNIMARC Field 106 builder</title>
! </head>
! <body>
  <form name="f_pop" onSubmit="javascript:report()">
! <table>
! 	<tr>
! 		<td>Type de publication en serie</td>
! 		<td>
[...1137 lines suppressed...]
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
  </form>
+ </div>
  <script>
  	function report() {
***************
*** 674,677 ****
  	}
  </script>
! </body>
! </html>
--- 506,508 ----
  	}
  </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:21:21 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:21:21 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_115a.tmpl,1.2,1.3
Message-ID: <E1DdrVZ-0006zq-1B@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26823/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_115a.tmpl 
Log Message:
Template for 115a field plugin

Index: unimarc_field_115a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_115a.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_115a.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_115a.tmpl	2 Jun 2005 15:21:18 -0000	1.3
***************
*** 1,1309 ****
! <html>
! <head>
! <title>UNIMARC Field 115a builder</title>
! </head>
! <body>
  <form name="f_pop" onSubmit="javascript:report()">
! <table>
! 	<tr>
! 		<td>Type de document</td>
! 		<td>
[...2258 lines suppressed...]
! <br>
! <p>
! 	<label style="width:22em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
  </form>
+ </div>
  <script>
  	function report() {
***************
*** 1317,1320 ****
  	}
  </script>
! </body>
! </html>
--- 976,978 ----
  	}
  </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:22:15 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:22:15 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_116.tmpl,1.2,1.3
Message-ID: <E1DdrWR-00078g-Vv@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27379/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_116.tmpl 
Log Message:
Template for 116a field plugin

Index: unimarc_field_116.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_116.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_116.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_116.tmpl	2 Jun 2005 15:22:13 -0000	1.3
***************
*** 1,1585 ****
! <html>
! <head>
! <title>UNIMARC Field 116 builder</title>
! </head>
! <body>
  <form name="f_pop" onSubmit="javascript:report()">
- <table>
- 	<tr>
- 		<td>Presentation materielle</td>
- 		<td>
[...2938 lines suppressed...]
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
  
  </form>
+ </div>
  <script>
  	function report() {
***************
*** 1589,1592 ****
  	}
  </script>
! </body>
! </html>
--- 1375,1378 ----
  	}
  </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->
! 




From doxulting at users.sourceforge.net  Thu Jun  2 17:22:40 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:22:40 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_117.tmpl,1.2,1.3
Message-ID: <E1DdrWq-0007BJ-O5@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27565/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_117.tmpl 
Log Message:
Template for 117a field plugin

Index: unimarc_field_117.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_117.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_117.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_117.tmpl	2 Jun 2005 15:22:38 -0000	1.3
***************
*** 1,801 ****
! <html>
! <head>
! <title>UNIMARC Field 117 builder</title>
! </head>
! <body>
  <form name="f_pop" onSubmit="javascript:report()">
! <table>
! 	<tr>
! 		<td>Presentation materielle</td>
! 		<td>
[...1503 lines suppressed...]
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
  </form>
+ </div>
  <script>
  	function report() {
***************
*** 805,808 ****
  	}
  </script>
! </body>
! </html>
--- 725,727 ----
  	}
  </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:23:15 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:23:15 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_120.tmpl,1.2,1.3
Message-ID: <E1DdrXP-0007HC-VD@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27907/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_120.tmpl 
Log Message:
Template for 120a field plugin

Index: unimarc_field_120.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_120.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_120.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_120.tmpl	2 Jun 2005 15:23:13 -0000	1.3
***************
*** 1,1340 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 120</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Indicateur de couleur:</td>

! 		<td>

[...2388 lines suppressed...]
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:16em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value +document.f_pop.f6.value +document.f_pop.f7.value +document.f_pop.f8.value +document.f_pop.f9.value +document.f_pop.f10.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:23:40 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:23:40 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_121a.tmpl,1.2,1.3
Message-ID: <E1DdrXo-0007Ki-My@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28143/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_121a.tmpl 
Log Message:
Template for 121a field plugin

Index: unimarc_field_121a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_121a.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_121a.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_121a.tmpl	2 Jun 2005 15:23:38 -0000	1.3
***************
*** 1,411 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 121a</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Dimensions physiques:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Bi-dimensionnel</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Bi-dimensionnel</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Tri-dimensionnel</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Tri-dimensionnel</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr><tr>

! 		<td>Image cartographique originale 1:</td>

! 		<td>

! 			<select name="f2" size="1">

! 			<!-- TMPL_IF name="f2 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2a" -->

! 				<option value="a" SELECTED>Manuelle et

! 				par releve</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Manuelle et par releve</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2b" -->

! 				<option value="b" SELECTED>photographique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Photographique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2c" -->

! 				<option value="c" SELECTED>Par ordinateur</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Par ordinateur</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2d" -->

! 				<option value="d" SELECTED>Par

! 				technique de teledetection active</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Par technique de

! 				teledetection active</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2e" -->

! 				<option value="e" SELECTED>Par

! 				technique de teledetection passive</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Par technique de

! 				teledetection passive</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td>		<td>Image cartographique originale 2:</td>

! 		<td>

! 			<select name="f3" size="1">

! 			<!-- TMPL_IF name="f3 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3a" -->

! 				<option value="a" SELECTED>Manuelle et

! 				par releve</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Manuelle et par releve</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3b" -->

! 				<option value="b" SELECTED>photographique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Photographique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3c" -->

! 				<option value="c" SELECTED>Par ordinateur</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Par ordinateur</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3d" -->

! 				<option value="d" SELECTED>Par

! 				technique de teledetection active</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Par technique de

! 				teledetection active</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3e" -->

! 				<option value="e" SELECTED>Par

! 				technique de teledetection passive</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Par technique de

! 				teledetection passive</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr><tr>

! 		<td>Support physique:</td>

! 		<td>

! 			<select name="f4" size="1">

! 			<!-- TMPL_IF name="f4  " -->

! 				<option value="  " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="  ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4aa" -->

! 				<option value="aa" SELECTED>Papier</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="aa">Papier</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ab" -->

! 				<option value="ab" SELECTED>Bois</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ab">Bois</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ac" -->

! 				<option value="ac" SELECTED>Pierre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ac">Pierre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ad" -->

! 				<option value="ad" SELECTED>Metal</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ad">Metal</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ae" -->

! 				<option value="ae" SELECTED>Materiaux synthetiques</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ae">Materiaux synthetiques</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4af" -->

! 				<option value="af" SELECTED>Peau

! 				(parchemin, velin...)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="af">Peau (parchemin, velin...) </option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ag" -->

! 				<option value="ag" SELECTED>Textile (y

! 				compris les fibres synthetiques)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ag">Textile (y compris

! 				les fibres synthetiques)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ah" -->

! 				<option value="ah" SELECTED>Stockage

! 				sur support magnetique - informatique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ah">Stockage sur

! 				support magnetique - informatique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ai" -->

! 				<option value="ai" SELECTED>Stockage

! 				sur support magnetique - non informatique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ai">Stockage sur

! 				support magnetique - non informatique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4aj" -->

! 				<option value="aj" SELECTED>Papier calque</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="aj">Papier calque</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ak" -->

! 				<option value="ak" SELECTED>Carton</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ak">Carton</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ap" -->

! 				<option value="ap" SELECTED>Platre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ap">Platre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4au" -->

! 				<option value="au" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="au">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4az" -->

! 				<option value="az" SELECTED>Autre

! 				procede non-photographique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="az">Autre procede non-photographique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4ba" -->

! 				<option value="ba" SELECTED>Positif

! 				sur base flexible</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ba">Positif sur base flexible</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4bb" -->

! 				<option value="bb" SELECTED>Negatif

! 				sur base flexible</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bb">Negatif sur base flexible</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4bc" -->

! 				<option value="bc" SELECTED>Positif

! 				sur base rigide</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bc">Positif sur base rigide</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4bd" -->

! 				<option value="bd" SELECTED>Negatif

! 				sur base rigide</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bd">Negatif sur base rigide</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4bz" -->

! 				<option value="bz" SELECTED>Autre

! 				procede photographique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bz">Autre procede photographique</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr><tr>

! 		<td>Mode de realisation technique:</td>

! 		<td>

! 			<select name="f5" size="1">

! 			<!-- TMPL_IF name="f5 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f5a" -->

! 				<option value="a" SELECTED>Manuscrit</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Manuscrit</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f5b" -->

! 				<option value="b" SELECTED>Imprime</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Imprime</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f5c" -->

! 				<option value="c" SELECTED>Photographie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Photographie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f5d" -->

! 				<option value="d" SELECTED>Microphotographie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Microphotographie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f5u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f5y" -->

! 				<option value="y" SELECTED>N'est pas

! 				le produit final</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="y">N'est pas le produit

! 				final</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f5z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td>

! 	</tr><tr>

! 		<td>Forme de reproduction:</td>

! 		<td>

! 			<select name="f6" size="1">

! 			<!-- TMPL_IF name="f6 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6a" -->

! 				<option value="a" SELECTED>Manuscrit</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Manuscrit</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6b" -->

! 				<option value="b" SELECTED>Imprime</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Imprime</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6c" -->

! 				<option value="c" SELECTED>Photographie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Photographie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6d" -->

! 				<option value="d" SELECTED>Impression

! 				par transfert ligne a ligne</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Impression par

! 				transfert ligne a ligne</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6y" -->

! 				<option value="y" SELECTED>Ce n'est

! 				pas une reproduction</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="y">Ce n'est pas une reproduction</option>

! 			<!-- /TMPL_IF -->

! 		</td>

! 	</tr><tr>

! 		<td>Reperes geodesiques:</td>

! 		<td>

! 			<select name="f7" size="1">

! 			<!-- TMPL_IF name="f7 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7a" -->

! 				<option value="a" SELECTED>Pas de repere</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Pas de repere</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7b" -->

! 				<option value="b" SELECTED>Repere mais

! 				sans systeme de coordonnees</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Repere mais sans

! 				systeme de coordonnees</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7c" -->

! 				<option value="c" SELECTED>Repere avec

! 				systeme de coordonnees</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Repere avec systeme

! 				de coordonnees</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7x" -->

! 				<option value="x" SELECTED>Non applicable</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="x">Non applicable</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td>

! 	</tr>

! <tr>

! 		<td>Forme materielle d'edition:</td>

! 		<td>

! 			<select name="f8" size="1">

! 			<!-- TMPL_IF name="f8 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8a" -->

! 				<option value="a" SELECTED>Publication

! 				autonome</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Publication autonome</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8b" -->

! 				<option value="b" SELECTED>En parties

! 				(CAD publie en serie, en periodique...)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">En parties (CAD

! 				publie en serie, en periodique...)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8c" -->

! 				<option value="c" SELECTED>Atlas</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Atlas</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8d" -->

! 				<option value="d" SELECTED>Supplement

! 				separe d'une revue, d'une monographie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Supplement separe

! 				d'une revue, d'une monographie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8e" -->

! 				<option value="e" SELECTED>Reliee dans

! 				une revue, une monographie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Reliee dans une

! 				revue, une monographie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td>

! 	</tr>

! 

! 

! 

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value +document.f_pop.f6.value +document.f_pop.f7.value +document.f_pop.f8.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,378 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ cod? 121a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Dimensions physiques</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Bi-dimensionnel</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Bi-dimensionnel</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Tri-dimensionnel</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Tri-dimensionnel</option>
! 		<!-- /TMPL_IF -->
! 		</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Image cartographique originale 1</label>
! 	<select name="f2" size="1">
! 		<!-- TMPL_IF name="f2 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2a" -->
! 		<option value="a" SELECTED>Manuelle et par relev?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Manuelle et par relev?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2b" -->
! 		<option value="b" SELECTED>Photographique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Photographique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2c" -->
! 		<option value="c" SELECTED>Par ordinateur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Par ordinateur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2d" -->
! 		<option value="d" SELECTED>Par technique de t?l?d?tection active</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Par technique de t?l?d?tection active</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2e" -->
! 		<option value="e" SELECTED>Par technique de t?l?d?tection passive</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Par technique de t?l?d?tection passive</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Image cartographique originale 2</label>
! 	<select name="f3" size="1">
! 		<!-- TMPL_IF name="f3 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3a" -->
! 		<option value="a" SELECTED>Manuelle et par relev?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Manuelle et par relev?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3b" -->
! 		<option value="b" SELECTED>Photographique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Photographique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3c" -->
! 		<option value="c" SELECTED>Par ordinateur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Par ordinateur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3d" -->
! 		<option value="d" SELECTED>Par technique de t?l?d?tection active</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Par technique de t?l?d?tection active</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3e" -->
! 		<option value="e" SELECTED>Par technique de t?l?d?tection passive</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Par technique de t?l?d?tection passive</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Support physique</label>
! 	<select name="f4" size="1">
! 		<!-- TMPL_IF name="f4  " -->
! 		<option value="  " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="  ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Proc?d? non photographique :</option>
! 		<!-- TMPL_IF name="f4aa" -->
! 		<option value="aa" SELECTED>Papier</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="aa">Papier</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4ab" -->
! 		<option value="ab" SELECTED>Bois</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ab">Bois</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4ac" -->
! 		<option value="ac" SELECTED>Pierre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ac">Pierre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4ad" -->
! 		<option value="ad" SELECTED>M?tal</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ad">M?tal</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4ae" -->
! 		<option value="ae" SELECTED>Mat?riaux synth?tiques</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ae">Mat?riaux synth?tiques</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4af" -->
! 		<option value="af" SELECTED>Peau (parchemin, velin...)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="af">Peau (parchemin, velin...) </option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4ag" -->
! 		<option value="ag" SELECTED>Textile (y compris les fibres synth?tiques)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ag">Textile (y compris les fibres synth?tiques)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4ah" -->
! 		<option value="ah" SELECTED>Stockage sur support magn?tique - informatique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ah">Stockage sur support magn?tique - informatique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4ai" -->
! 		<option value="ai" SELECTED>Stockage sur support magn?tique - non informatique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ai">Stockage sur support magn?tique - non informatique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4aj" -->
! 		<option value="aj" SELECTED>Papier calque</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="aj">Papier calque</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4ak" -->
! 		<option value="ak" SELECTED>Carton</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ak">Carton</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4ap" -->
! 		<option value="ap" SELECTED>Pl?tre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ap">Pl?tre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4au" -->
! 		<option value="au" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="au">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4az" -->
! 		<option value="az" SELECTED>Autre proc?d? non-photographique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="az">Autre proc?d? non-photographique</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Proc?d? photographique :</option>
! 		<!-- TMPL_IF name="f4ba" -->
! 		<option value="ba" SELECTED>Positif sur base flexible transparente ou opaque</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ba">Positif sur base flexible transparente ou opaque</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4bb" -->
! 		<option value="bb" SELECTED>N?gatif sur base flexible transparente ou opaque</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bb">N?gatif sur base flexible transparente ou opaque</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4bc" -->
! 		<option value="bc" SELECTED>Positif sur base rigide transparente ou opaque</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bc">Positif sur base rigide transparente ou opaque</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4bd" -->
! 		<option value="bd" SELECTED>N?gatif sur base rigide transparente ou opaque</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bd">N?gatif sur base rigide transparente ou opaque</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4bz" -->
! 		<option value="bz" SELECTED>Autre proc?d? photographique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bz">Autre proc?d? photographique</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Mode de r?alisation technique</label>
! 	<select name="f5" size="1">
! 		<!-- TMPL_IF name="f5 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5a" -->
! 		<option value="a" SELECTED>Manuscrit</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Manuscrit</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5b" -->
! 		<option value="b" SELECTED>Imprim?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Imprim?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5c" -->
! 		<option value="c" SELECTED>Photographie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Photographie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5d" -->
! 		<option value="d" SELECTED>Microphotographie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Microphotographie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5y" -->
! 		<option value="y" SELECTED>N'est pas le produit final</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="y">N'est pas le produit final</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Forme de reproduction</label>
! 	<select name="f6" size="1">
! 		<!-- TMPL_IF name="f6 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6a" -->
! 		<option value="a" SELECTED>Manuscrit</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Manuscrit</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6b" -->
! 		<option value="b" SELECTED>Imprim?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Imprim?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6c" -->
! 		<option value="c" SELECTED>Photographie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Photographie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6d" -->
! 		<option value="d" SELECTED>Impression par transfert ligne a ligne</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Impression par transfert ligne a ligne</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6y" -->
! 		<option value="y" SELECTED>Ce n'est pas une reproduction</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="y">Ce n'est pas une reproduction</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Rep?res g?od?siques:</label>
! 		<select name="f7" size="1">
! 		<!-- TMPL_IF name="f7 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7a" -->
! 		<option value="a" SELECTED>Pas de rep?re</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Pas de rep?re</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7b" -->
! 		<option value="b" SELECTED>Rep?r? mais sans syst?me de coordonn?es</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Rep?r? mais sans syst?me de coordonn?es</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7c" -->
! 		<option value="c" SELECTED>Rep?r? avec systeme de coordonn?es</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Rep?r? avec systeme de coordonn?es</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7x" -->
! 		<option value="x" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="x">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 		</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Forme mat?rielle d'?dition</label>
! 	<select name="f8" size="1">
! 		<!-- TMPL_IF name="f8 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8a" -->
! 		<option value="a" SELECTED>Publication autonome</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Publication autonome</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8b" -->
! 		<option value="b" SELECTED>En parties (c'est-?-dire publi? en s?rie, en p?riodique...)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">En parties (c'est-?-dire publi? en s?rie, en p?riodique...)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8c" -->
! 		<option value="c" SELECTED>Atlas</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Atlas</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8d" -->
! 		<option value="d" SELECTED>Suppl?ment s?par? d'une revue, d'une monographie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Suppl?ment s?par? d'une revue, d'une monographie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8e" -->
! 		<option value="e" SELECTED>Reli? dans une revue, une monographie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Reli? dans une revue, une monographie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value +document.f_pop.f6.value +document.f_pop.f7.value +document.f_pop.f8.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:21:50 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:21:50 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_115b.tmpl,1.2,1.3
Message-ID: <E1DdrW2-00074a-Nx@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27127/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_115b.tmpl 
Log Message:
Template for 115b field plugin

Index: unimarc_field_115b.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_115b.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_115b.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_115b.tmpl	2 Jun 2005 15:21:47 -0000	1.3
***************
*** 1,673 ****
! <html>
! <head>
! <title>UNIMARC Field 115b builder</title>
! </head>
! <body>
  <form name="f_pop" onSubmit="javascript:report()">
! <table>
! 	<tr>
! 		<td>Copie (generation)</td>
! 		<td>
[...1174 lines suppressed...]
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
  </form>
+ </div>
  <script>
  	function report() {
***************
*** 682,685 ****
  	}
  </script>
! </body>
! </html>
--- 529,531 ----
  	}
  </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:24:22 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:24:22 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_122.tmpl,1.2,1.3
Message-ID: <E1DdrYU-0007RZ-Jr@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28606/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_122.tmpl 
Log Message:
Template for 122a field plugin

Index: unimarc_field_122.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_122.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_122.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_122.tmpl	2 Jun 2005 15:24:20 -0000	1.3
***************
*** 1,84 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 122</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Ere code:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>La date

! 				tombe avant l'an 1 du calendrier gregorien</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">La date tombe avant

! 				l'an 1 du calendrier gregorien</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1d" -->

! 				<option value="d" SELECTED>La date

! 				tombe apres l'an 1</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">La date tombe apres

! 				l'an 1</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Spatiale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Spatiale</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! <tr>		<td>Annee:</td>

! 		   <td><input type="text" name="f2" maxlength=4 size=5

! 		   value="<!-- TMPL_VAR name="f2" -->">

! 		</td>

! 

! 		<td>Mois:</td>

! 		         <td><input type="text" name="f3" maxlength=2

! 		         size=3

!                    value="<!-- TMPL_VAR name="f3" -->"></td>

! 		<td>Jour:</td>

! 		         <td><input type="text" name="f4" maxlength=2

! 		         size=3

!                    value="<!-- TMPL_VAR name="f4" -->"></td>

! 

! 		<td>Heure:</td>

! 		         <td><input type="text" name="f5" maxlength=2

! 		         size=3

!                    value="<!-- TMPL_VAR name="f5" -->"></td>

! 

! 		</tr>

! 

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! document.f_pop.f2.value=document.f_pop.f2.value+'    ';

! document.f_pop.f3.value=document.f_pop.f3.value+'  ';

! document.f_pop.f4.value=document.f_pop.f4.value+'  ';

! document.f_pop.f5.value=document.f_pop.f5.value+'  ';

! 

! 

! 

! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,4);

! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);

! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);

! document.f_pop.f5.value=document.f_pop.f5.value.substring(0,2);

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value ;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,77 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ cod? 122a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:15em;">Code ?re</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>La date tombe avant l'an 1 du calendrier gr?gorien</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">La date tombe avant l'an 1 du calendrier gr?gorien</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1d" -->
! 		<option value="d" SELECTED>La date tombe apr?s l'an 1 du calendrier gr?gorien</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">La date tombe apr?s l'an 1 du calendrier gr?gorien</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:15em;">Ann?e</label>
! 	<input type="text" name="f2" maxlength=4 size=5 value="<!-- TMPL_VAR name="f2" -->">
! </p>
! 
! <p>
! 	<label style="width:15em;">Mois</label>
! 	<input type="text" name="f3" maxlength=2 size=3 value="<!-- TMPL_VAR name="f3" -->">
! </p>
! 
! <p>
! 	<label style="width:15em;">Jour</label>
! 	<input type="text" name="f4" maxlength=2 size=3 value="<!-- TMPL_VAR name="f4" -->">
! </p>
! 
! <p>
! 	<label style="width:15em;">Heure</label>
! 	<input type="text" name="f5" maxlength=2 size=3 value="<!-- TMPL_VAR name="f5" -->">
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:15em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! document.f_pop.f2.value=document.f_pop.f2.value+'    ';
! document.f_pop.f3.value=document.f_pop.f3.value+'  ';
! document.f_pop.f4.value=document.f_pop.f4.value+'  ';
! document.f_pop.f5.value=document.f_pop.f5.value+'  ';
! 
! 
! 
! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,4);
! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
! document.f_pop.f5.value=document.f_pop.f5.value.substring(0,2);
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value ;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:24:46 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:24:46 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_123a.tmpl,1.2,1.3
Message-ID: <E1DdrYs-0007Up-Ez@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28769/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_123a.tmpl 
Log Message:
Template for 123a field plugin

Index: unimarc_field_123a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123a.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_123a.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_123a.tmpl	2 Jun 2005 15:24:44 -0000	1.3
***************
*** 1,47 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 123a</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Type d'echelle:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Echelle lineaire</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Echelle lineaire</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Echelle angulaire</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Echelle angulaire</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1z" -->

! 				<option value="z" SELECTED>Autre type d'echelle</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre type d'echelle</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,48 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ cod? 123a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Type d'?chelle</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Echelle lin?aire</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Echelle lin?aire</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Echelle angulaire</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Echelle angulaire</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1z" -->
! 		<option value="z" SELECTED>Autre type d'?chelle</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre type d'?chelle</option>
! 		<!-- /TMPL_IF -->
! 		</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:25:11 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:25:11 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_123d.tmpl,1.2,1.3
Message-ID: <E1DdrZH-0007am-3d@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29137/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_123d.tmpl 
Log Message:
Template for 123d field plugin

Index: unimarc_field_123d.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123d.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_123d.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_123d.tmpl	2 Jun 2005 15:25:08 -0000	1.3
***************
*** 1,79 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 123d</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Hemisphere:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1w" -->

! 				<option value="w" SELECTED>Ouest</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="w">Ouest</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Est</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Est</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1n" -->

! 				<option value="n" SELECTED>Nord</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="n">Nord</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1s" -->

! 				<option value="s" SELECTED>Sud</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="s">Sud</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 

! <tr>          <td>Degres (completer avec des 0):</td>

!                          <td><input type="text" name="f2" maxlength=3

!                          size=4

!                    value="<!-- TMPL_VAR name="f2" -->"></td>

! </tr>

! <tr>          <td>Minutes (completer avec des 0):</td>

!                          <td><input type="text" name="f3" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f3" -->"></td>

! </tr>

! <tr>          <td>Secondes (completer avec des 0):</td>

!                          <td><input type="text" name="f4" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f4" -->"></td>

! </tr>

! 

! 

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! document.f_pop.f2.value=document.f_pop.f2.value+'   ';

! document.f_pop.f3.value=document.f_pop.f3.value+'  ';

! document.f_pop.f4.value=document.f_pop.f4.value+'  ';

! 

! 

! 

! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);

! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);

! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,79 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ cod? 123d</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">H?misph?re</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1w" -->
! 		<option value="w" SELECTED>Ouest</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="w">Ouest</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Est</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Est</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1n" -->
! 		<option value="n" SELECTED>Nord</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Nord</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1s" -->
! 		<option value="s" SELECTED>Sud</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="s">Sud</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>	
! 
! <p>
! 	<label style="width:20em;">Degr?s (compl?ter avec des 0)</label>
! 	<input type="text" name="f2" maxlength=3 size=4 value="<!-- TMPL_VAR name="f2" -->">
! </p>
! 
! <p>
! 	<label style="width:20em;">Minutes (compl?ter avec des 0)</label>
! 	<input type="text" name="f3" maxlength=2 size=3 value="<!-- TMPL_VAR name="f3" -->">
! </p>
! 
! <p>
! 	<label style="width:20em;">Secondes (compl?ter avec des 0)</label>
! 	<input type="text" name="f4" maxlength=2 size=3 value="<!-- TMPL_VAR name="f4" -->">
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! document.f_pop.f2.value=document.f_pop.f2.value+'   ';
! document.f_pop.f3.value=document.f_pop.f3.value+'  ';
! document.f_pop.f4.value=document.f_pop.f4.value+'  ';
! 
! 
! 
! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:25:37 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:25:37 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_123e.tmpl,1.2,1.3
Message-ID: <E1DdrZh-0007eT-2s@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29371/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_123e.tmpl 
Log Message:
Template for 123e field plugin

Index: unimarc_field_123e.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123e.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_123e.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_123e.tmpl	2 Jun 2005 15:25:34 -0000	1.3
***************
*** 1,79 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 123e</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Hemisphere:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1w" -->

! 				<option value="w" SELECTED>Ouest</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="w">Ouest</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Est</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Est</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1n" -->

! 				<option value="n" SELECTED>Nord</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="n">Nord</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1s" -->

! 				<option value="s" SELECTED>Sud</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="s">Sud</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 

! <tr>          <td>Degres (completer avec des 0):</td>

!                          <td><input type="text" name="f2" maxlength=3

!                          size=4

!                    value="<!-- TMPL_VAR name="f2" -->"></td>

! </tr>

! <tr>          <td>Minutes (completer avec des 0):</td>

!                          <td><input type="text" name="f3" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f3" -->"></td>

! </tr>

! <tr>          <td>Secondes (completer avec des 0):</td>

!                          <td><input type="text" name="f4" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f4" -->"></td>

! </tr>

! 

! 

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! document.f_pop.f2.value=document.f_pop.f2.value+'   ';

! document.f_pop.f3.value=document.f_pop.f3.value+'  ';

! document.f_pop.f4.value=document.f_pop.f4.value+'  ';

! 

! 

! 

! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);

! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);

! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,79 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ cod? 123e</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">H?misph?re</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1w" -->
! 		<option value="w" SELECTED>Ouest</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="w">Ouest</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Est</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Est</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1n" -->
! 		<option value="n" SELECTED>Nord</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Nord</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1s" -->
! 		<option value="s" SELECTED>Sud</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="s">Sud</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>	
! 
! <p>
! 	<label style="width:20em;">Degr?s (compl?ter avec des 0)</label>
! 	<input type="text" name="f2" maxlength=3 size=4 value="<!-- TMPL_VAR name="f2" -->">
! </p>
! 
! <p>
! 	<label style="width:20em;">Minutes (compl?ter avec des 0)</label>
! 	<input type="text" name="f3" maxlength=2 size=3 value="<!-- TMPL_VAR name="f3" -->">
! </p>
! 
! <p>
! 	<label style="width:20em;">Secondes (compl?ter avec des 0)</label>
! 	<input type="text" name="f4" maxlength=2 size=3 value="<!-- TMPL_VAR name="f4" -->">
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! document.f_pop.f2.value=document.f_pop.f2.value+'   ';
! document.f_pop.f3.value=document.f_pop.f3.value+'  ';
! document.f_pop.f4.value=document.f_pop.f4.value+'  ';
! 
! 
! 
! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:24:01 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:24:01 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_121b.tmpl,1.2,1.3
Message-ID: <E1DdrY9-0007P6-65@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28425/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_121b.tmpl 
Log Message:
Template for 121b field plugin

Index: unimarc_field_121b.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_121b.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_121b.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_121b.tmpl	2 Jun 2005 15:23:59 -0000	1.3
***************
*** 1,291 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 121b</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Altitude du capteur:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Terrestre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Terrestre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Aerienne</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Aerienne</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Spatiale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Spatiale</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr><tr>

! 		<td>Orientation du capteur :</td>

! 		<td>

! 			<select name="f2" size="1">

! 			<!-- TMPL_IF name="f2 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2a" -->

! 				<option value="a" SELECTED>Oblique faible</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Oblique faible</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2b" -->

! 				<option value="b" SELECTED>Oblique forte</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Oblique forte</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2c" -->

! 				<option value="c" SELECTED>Verticale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Verticale</option>

! 			<!-- /TMPL_IF -->

! 		</td></tr><tr>		<td>Bandes spectrales (nombre

! 		a deux chiffres 01->99 ou xx (ecrire 01 pour 1):</td>

! 		   <td><input type="text" name="f3" maxlength=2 size=3

! 		   value="<!-- TMPL_VAR name="f3" -->">

! 		</td></tr>

! <tr>

! 		<td>Qualite de l'image:</td>

! 		<td>

! 			<select name="f4" size="1">

! 			<!-- TMPL_IF name="f4 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4a" -->

! 				<option value="a" SELECTED>Faible</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Faible</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4b" -->

! 				<option value="b" SELECTED>Acceptable</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Acceptable</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4c" -->

! 				<option value="c" SELECTED>Bonne</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Bonne</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4d" -->

! 				<option value="d" SELECTED>Tres bonne</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Tres bonne</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr><tr>

! 		<td>Couverture nuageuse exprimee en huitieme:</td>

! 		<td>

! 			<select name="f5" size="1">

! 			<!-- TMPL_IF name="f5 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f51" -->

! 				<option value="1" SELECTED>1/8</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="1">1/8</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f52" -->

! 				<option value="2" SELECTED>2/8</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="2">2/8</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f53" -->

! 				<option value="3" SELECTED>3/8</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="3">3/8</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f54" -->

! 				<option value="4" SELECTED>4/8</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="4">4/8</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f55" -->

! 				<option value="5" SELECTED>5/8</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="5">5/8</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f56" -->

! 				<option value="6" SELECTED>6/8</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="6">6/8</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f57" -->

! 				<option value="7" SELECTED>7/8</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="7">7/8</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f58" -->

! 				<option value="8" SELECTED>Couverture totale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="8">Couverture totale</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr><tr>

! 

! 		       <td>Qualite de l'image:</td>

!                 <td>

!                         <select name="f6" size="1">

!                         <!-- TMPL_IF name="f6 " -->

!                                 <option value=" "

!                 SELECTED>Aucun</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value=" ">Aucun</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f6-" -->

!                                 <option value="-"

!                 SELECTED>Inferieure au cm</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="-">Inferieure au cm</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f61" -->

!                                 <option value="1"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="1">1</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f62" -->

!                                 <option value="2"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="2">2</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f63" -->

!                                 <option value="3"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="3">3</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f64" -->

!                                 <option value="4"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="4">4</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f51" -->

!                                 <option value="5"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="5">5</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f66" -->

!                                 <option value="6"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="6">6</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f71" -->

!                                 <option value="7"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="7">7</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f68" -->

!                                 <option value="8"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="8">8</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f69" -->

!                                 <option value="9"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="9">9</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f6+" -->

!                                 <option value="+"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="+">+</option>

!                         <!-- /TMPL_IF -->

!                         <!-- TMPL_IF name="f6x" -->

!                                 <option value="x"

!                 SELECTED>1</option>

!                         <!-- TMPL_ELSE -->

!                                 <option value="x">x</option>

!                         <!-- /TMPL_IF -->

!                         </select>

!                 

! 			<select name="f7" size="1">

! 			<!-- TMPL_IF name="f7 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7c" -->

! 				<option value="c" SELECTED>Centimetres</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Centimetres</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7i" -->

! 				<option value="i" SELECTED>Decimetres</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="i">Decimetres</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7m" -->

! 				<option value="m" SELECTED>Metres</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="m">Metres</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7d" -->

! 				<option value="d" SELECTED>Decametres</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Decametres</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7h" -->

! 				<option value="h" SELECTED>Hectometres</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Hectometres</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7k" -->

! 				<option value="k" SELECTED>Kilometres</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="k">Kilometres</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7x" -->

! 				<option value="x" SELECTED>Non applicable</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="x">Non applicable</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td>

! 	</tr>

! 

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! document.f_pop.f3.value=document.f_pop.f3.value+'  ';

! 

! 

! 

! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value +document.f_pop.f6.value +document.f_pop.f7.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,284 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ cod? 121b</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Altitude du capteur</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Terrestre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Terrestre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>A?rienne</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">A?rienne</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Spatiale</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Spatiale</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Orientation du capteur</label>
! 	<select name="f2" size="1">
! 		<!-- TMPL_IF name="f2 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2a" -->
! 		<option value="a" SELECTED>Oblique faible</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Oblique faible</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2b" -->
! 		<option value="b" SELECTED>Oblique forte</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Oblique forte</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2c" -->
! 		<option value="c" SELECTED>Verticale</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Verticale</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Bandes spectrales</label>
! 	<input type="text" name="f3" maxlength=2 size=3 value="<!-- TMPL_VAR name="f3" -->"> <i>nombre ? deux chiffres 01->99 ou xx (ecrire 01 pour 1)</i>
! </p>
! 
! <p>
! 	<label style="width:20em;">Qualit? de l'image</label>
! 		<select name="f4" size="1">
! 		<!-- TMPL_IF name="f4 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4a" -->
! 		<option value="a" SELECTED>Faible</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Faible</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4b" -->
! 		<option value="b" SELECTED>Acceptable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Acceptable</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4c" -->
! 		<option value="c" SELECTED>Bonne</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Bonne</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4d" -->
! 		<option value="d" SELECTED>Tr?s bonne</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Tr?s bonne</option>
! 		<!-- /TMPL_IF -->
! 		</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Couverture nuageuse exprim?e en huiti?mes</label>
! 		<select name="f5" size="1">
! 		<!-- TMPL_IF name="f5 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f51" -->
! 		<option value="1" SELECTED>1/8</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="1">1/8</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f52" -->
! 		<option value="2" SELECTED>2/8</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="2">2/8</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f53" -->
! 		<option value="3" SELECTED>3/8</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="3">3/8</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f54" -->
! 		<option value="4" SELECTED>4/8</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="4">4/8</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f55" -->
! 		<option value="5" SELECTED>5/8</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="5">5/8</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f56" -->
! 		<option value="6" SELECTED>6/8</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="6">6/8</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f57" -->
! 		<option value="7" SELECTED>7/8</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="7">7/8</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f58" -->
! 		<option value="8" SELECTED>Couverture totale</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="8">Couverture totale</option>
! 		<!-- /TMPL_IF -->
! 		</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Valeur moyenne de la r?solution au sol</label>
! 		<select name="f6" size="1">
! 		<!-- TMPL_IF name="f6 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6-" -->
! 		<option value="-" SELECTED>Inferieure au cm</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="-">Inferieure au cm</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f61" -->
! 		<option value="1" SELECTED>1</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="1">1</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f62" -->
! 		<option value="2" SELECTED>2</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="2">2</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f63" -->
! 		<option value="3" SELECTED>3</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="3">3</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f64" -->
! 		<option value="4" SELECTED>4</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="4">4</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f65" -->
! 		<option value="5" SELECTED>5</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="5">5</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f66" -->
! 		<option value="6" SELECTED>6</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="6">6</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f67" -->
! 		<option value="7" SELECTED>7</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="7">7</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f68" -->
! 		<option value="8" SELECTED>8</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="8">8</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f69" -->
! 		<option value="9" SELECTED>9</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="9">9</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6+" -->
! 		<option value="+" SELECTED>Sup?rieure ? 9 kilom?tres</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="+">Sup?rieure ? 9 kilom?tres</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6x" -->
! 		<option value="x" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="x">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! <p>
! 	<label style="width:20em;">Unit? m?trique</label>
! 	<select name="f7" size="1">
! 		<!-- TMPL_IF name="f7 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7c" -->
! 		<option value="c" SELECTED>Centim?tres</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Centim?tres</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7i" -->
! 		<option value="i" SELECTED>D?cim?tres</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="i">D?cim?tres</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7m" -->
! 		<option value="m" SELECTED>M?tres</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="m">M?tres</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7d" -->
! 		<option value="d" SELECTED>D?cam?tres</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">D?cam?tres</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7h" -->
! 		<option value="h" SELECTED>Hectom?tres</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Hectom?tres</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7k" -->
! 		<option value="k" SELECTED>Kilom?tres</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="k">Kilom?tres</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7x" -->
! 		<option value="x" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="x">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! document.f_pop.f3.value=document.f_pop.f3.value+'  ';
! 
! 
! 
! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value +document.f_pop.f6.value +document.f_pop.f7.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:25:55 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:25:55 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_123f.tmpl,1.2,1.3
Message-ID: <E1DdrZz-0007or-Qv@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29995/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_123f.tmpl 
Log Message:
Template for 123f field plugin

Index: unimarc_field_123f.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123f.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_123f.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_123f.tmpl	2 Jun 2005 15:25:53 -0000	1.3
***************
*** 1,79 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 123f</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Hemisphere:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1w" -->

! 				<option value="w" SELECTED>Ouest</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="w">Ouest</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Est</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Est</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1n" -->

! 				<option value="n" SELECTED>Nord</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="n">Nord</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1s" -->

! 				<option value="s" SELECTED>Sud</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="s">Sud</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 

! <tr>          <td>Degres (completer avec des 0):</td>

!                          <td><input type="text" name="f2" maxlength=3

!                          size=4

!                    value="<!-- TMPL_VAR name="f2" -->"></td>

! </tr>

! <tr>          <td>Minutes (completer avec des 0):</td>

!                          <td><input type="text" name="f3" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f3" -->"></td>

! </tr>

! <tr>          <td>Secondes (completer avec des 0):</td>

!                          <td><input type="text" name="f4" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f4" -->"></td>

! </tr>

! 

! 

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! document.f_pop.f2.value=document.f_pop.f2.value+'   ';

! document.f_pop.f3.value=document.f_pop.f3.value+'  ';

! document.f_pop.f4.value=document.f_pop.f4.value+'  ';

! 

! 

! 

! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);

! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);

! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,79 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ cod? 123f</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">H?misph?re</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1w" -->
! 		<option value="w" SELECTED>Ouest</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="w">Ouest</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Est</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Est</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1n" -->
! 		<option value="n" SELECTED>Nord</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Nord</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1s" -->
! 		<option value="s" SELECTED>Sud</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="s">Sud</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>	
! 
! <p>
! 	<label style="width:20em;">Degr?s (compl?ter avec des 0)</label>
! 	<input type="text" name="f2" maxlength=3 size=4 value="<!-- TMPL_VAR name="f2" -->">
! </p>
! 
! <p>
! 	<label style="width:20em;">Minutes (compl?ter avec des 0)</label>
! 	<input type="text" name="f3" maxlength=2 size=3 value="<!-- TMPL_VAR name="f3" -->">
! </p>
! 
! <p>
! 	<label style="width:20em;">Secondes (compl?ter avec des 0)</label>
! 	<input type="text" name="f4" maxlength=2 size=3 value="<!-- TMPL_VAR name="f4" -->">
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! document.f_pop.f2.value=document.f_pop.f2.value+'   ';
! document.f_pop.f3.value=document.f_pop.f3.value+'  ';
! document.f_pop.f4.value=document.f_pop.f4.value+'  ';
! 
! 
! 
! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:26:19 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:26:19 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_123g.tmpl,1.2,1.3
Message-ID: <E1DdraN-0007rs-Hj@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30203/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_123g.tmpl 
Log Message:
Template for 123g field plugin

Index: unimarc_field_123g.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_123g.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_123g.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_123g.tmpl	2 Jun 2005 15:26:17 -0000	1.3
***************
*** 1,79 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 123g</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Hemisphere:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1w" -->

! 				<option value="w" SELECTED>Ouest</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="w">Ouest</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Est</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Est</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1n" -->

! 				<option value="n" SELECTED>Nord</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="n">Nord</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1s" -->

! 				<option value="s" SELECTED>Sud</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="s">Sud</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 

! <tr>          <td>Degres (completer avec des 0):</td>

!                          <td><input type="text" name="f2" maxlength=3

!                          size=4

!                    value="<!-- TMPL_VAR name="f2" -->"></td>

! </tr>

! <tr>          <td>Minutes (completer avec des 0):</td>

!                          <td><input type="text" name="f3" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f3" -->"></td>

! </tr>

! <tr>          <td>Secondes (completer avec des 0):</td>

!                          <td><input type="text" name="f4" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f4" -->"></td>

! </tr>

! 

! 

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! document.f_pop.f2.value=document.f_pop.f2.value+'   ';

! document.f_pop.f3.value=document.f_pop.f3.value+'  ';

! document.f_pop.f4.value=document.f_pop.f4.value+'  ';

! 

! 

! 

! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);

! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);

! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,79 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ cod? 123g</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">H?misph?re</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1w" -->
! 		<option value="w" SELECTED>Ouest</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="w">Ouest</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Est</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Est</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1n" -->
! 		<option value="n" SELECTED>Nord</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Nord</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1s" -->
! 		<option value="s" SELECTED>Sud</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="s">Sud</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>	
! 
! <p>
! 	<label style="width:20em;">Degr?s (compl?ter avec des 0)</label>
! 	<input type="text" name="f2" maxlength=3 size=4 value="<!-- TMPL_VAR name="f2" -->">
! </p>
! 
! <p>
! 	<label style="width:20em;">Minutes (compl?ter avec des 0)</label>
! 	<input type="text" name="f3" maxlength=2 size=3 value="<!-- TMPL_VAR name="f3" -->">
! </p>
! 
! <p>
! 	<label style="width:20em;">Secondes (compl?ter avec des 0)</label>
! 	<input type="text" name="f4" maxlength=2 size=3 value="<!-- TMPL_VAR name="f4" -->">
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! document.f_pop.f2.value=document.f_pop.f2.value+'   ';
! document.f_pop.f3.value=document.f_pop.f3.value+'  ';
! document.f_pop.f4.value=document.f_pop.f4.value+'  ';
! 
! 
! 
! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
! document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:26:38 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:26:38 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_123i.tmpl,NONE,1.1
Message-ID: <E1Ddrag-0007vS-Pj@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30434/koha-tmpl/intranet-tmpl/default/fr/value_builder

Added Files:
	unimarc_field_123i.tmpl 
Log Message:
Template for 123i field plugin

--- NEW FILE ---
<!-- TMPL_INCLUDE Name="popup-top.inc" -->
<div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
<h1 class="authority">Assistant champ cod? 123i</h1>
<form name="f_pop" onSubmit="javascript:report()">

<p>
	<label style="width:20em;">H?misph?re</label>
	<select name="f1" size="1">
		<!-- TMPL_IF name="f1 " -->
		<option value=" " SELECTED>Aucun</option>
		<!-- TMPL_ELSE -->
		<option value=" ">Aucun</option>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF name="f1w" -->
		<option value="w" SELECTED>Ouest</option>
		<!-- TMPL_ELSE -->
		<option value="w">Ouest</option>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF name="f1e" -->
		<option value="e" SELECTED>Est</option>
		<!-- TMPL_ELSE -->
		<option value="e">Est</option>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF name="f1n" -->
		<option value="n" SELECTED>Nord</option>
		<!-- TMPL_ELSE -->
		<option value="n">Nord</option>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF name="f1s" -->
		<option value="s" SELECTED>Sud</option>
		<!-- TMPL_ELSE -->
		<option value="s">Sud</option>
		<!-- /TMPL_IF -->
	</select>
</p>	

<p>
	<label style="width:20em;">Degr?s (compl?ter avec des 0)</label>
	<input type="text" name="f2" maxlength=3 size=4 value="<!-- TMPL_VAR name="f2" -->">
</p>

<p>
	<label style="width:20em;">Minutes (compl?ter avec des 0)</label>
	<input type="text" name="f3" maxlength=2 size=3 value="<!-- TMPL_VAR name="f3" -->">
</p>

<p>
	<label style="width:20em;">Secondes (compl?ter avec des 0)</label>
	<input type="text" name="f4" maxlength=2 size=3 value="<!-- TMPL_VAR name="f4" -->">
</p>


<br>
<p>
	<label style="width:20em;">&nbsp;</label>
	<input type="submit" value="OK" class="button authority">
</p>

</form>
</div>
<script>
	function report() {
document.f_pop.f2.value=document.f_pop.f2.value+'   ';
document.f_pop.f3.value=document.f_pop.f3.value+'  ';
document.f_pop.f4.value=document.f_pop.f4.value+'  ';



document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);


		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
		self.close();
		return false;
	}
</script>
<!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:26:59 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:26:59 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_123j.tmpl,NONE,1.1
Message-ID: <E1Ddrb1-0007yi-JK@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30653/koha-tmpl/intranet-tmpl/default/fr/value_builder

Added Files:
	unimarc_field_123j.tmpl 
Log Message:
Template for 123j field plugin

--- NEW FILE ---
<!-- TMPL_INCLUDE Name="popup-top.inc" -->
<div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
<h1 class="authority">Assistant champ cod? 123i</h1>
<form name="f_pop" onSubmit="javascript:report()">

<p>
	<label style="width:20em;">H?misph?re</label>
	<select name="f1" size="1">
		<!-- TMPL_IF name="f1 " -->
		<option value=" " SELECTED>Aucun</option>
		<!-- TMPL_ELSE -->
		<option value=" ">Aucun</option>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF name="f1w" -->
		<option value="w" SELECTED>Ouest</option>
		<!-- TMPL_ELSE -->
		<option value="w">Ouest</option>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF name="f1e" -->
		<option value="e" SELECTED>Est</option>
		<!-- TMPL_ELSE -->
		<option value="e">Est</option>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF name="f1n" -->
		<option value="n" SELECTED>Nord</option>
		<!-- TMPL_ELSE -->
		<option value="n">Nord</option>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF name="f1s" -->
		<option value="s" SELECTED>Sud</option>
		<!-- TMPL_ELSE -->
		<option value="s">Sud</option>
		<!-- /TMPL_IF -->
	</select>
</p>	

<p>
	<label style="width:20em;">Degr?s (compl?ter avec des 0)</label>
	<input type="text" name="f2" maxlength=3 size=4 value="<!-- TMPL_VAR name="f2" -->">
</p>

<p>
	<label style="width:20em;">Minutes (compl?ter avec des 0)</label>
	<input type="text" name="f3" maxlength=2 size=3 value="<!-- TMPL_VAR name="f3" -->">
</p>

<p>
	<label style="width:20em;">Secondes (compl?ter avec des 0)</label>
	<input type="text" name="f4" maxlength=2 size=3 value="<!-- TMPL_VAR name="f4" -->">
</p>


<br>
<p>
	<label style="width:20em;">&nbsp;</label>
	<input type="submit" value="OK" class="button authority">
</p>

</form>
</div>
<script>
	function report() {
document.f_pop.f2.value=document.f_pop.f2.value+'   ';
document.f_pop.f3.value=document.f_pop.f3.value+'  ';
document.f_pop.f4.value=document.f_pop.f4.value+'  ';



document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);


		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
		self.close();
		return false;
	}
</script>
<!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:27:22 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:27:22 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_124a.tmpl,1.2,1.3
Message-ID: <E1DdrbO-00082i-Pq@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30874/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_124a.tmpl 
Log Message:
Template for 124a field plugin

Index: unimarc_field_124a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124a.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_124a.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_124a.tmpl	2 Jun 2005 15:27:20 -0000	1.3
***************
*** 1,47 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 124a</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Origine de l'image:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Image non-photographique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Image non-photographique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Image photographique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Image photographique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Image de teledetection</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Image de teledetection</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,49 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ cod? 124a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Origine de l'image</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Image non-photographique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Image non-photographique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Image photographique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Image photographique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Image de t?l?d?tection</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Image de t?l?d?tection</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:27:44 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:27:44 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_124b.tmpl,1.2,1.3
Message-ID: <E1Ddrbk-00085l-JS@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31055/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_124b.tmpl 
Log Message:
Template for 124b field plugin

Index: unimarc_field_124b.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124b.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_124b.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_124b.tmpl	2 Jun 2005 15:27:42 -0000	1.3
***************
*** 1,87 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 124b</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Forme du document cartographique:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Atlas</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Atlas</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Diagramme</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Diagramme</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Globe</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Globe</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1d" -->

! 				<option value="d" SELECTED>Carte</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Carte</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Maquette</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Maquette</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1f" -->

! 				<option value="f" SELECTED>Profil</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Profil</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1g" -->

! 				<option value="g" SELECTED>Image de teledetection</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">Image de teledetection</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1h" -->

! 				<option value="h" SELECTED>Coupe</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Coupe</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1i" -->

! 				<option value="i" SELECTED>Vue</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="i">Vue</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1j" -->

! 				<option value="j" SELECTED>Plan</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="j">Plan</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,90 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ cod? 124b</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Forme du document cartographique</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Atlas</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Atlas</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Diagramme</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Diagramme</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Globe</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Globe</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1d" -->
! 		<option value="d" SELECTED>Carte</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Carte</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Maquette</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Maquette</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1f" -->
! 		<option value="f" SELECTED>Profil</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Profil</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1g" -->
! 		<option value="g" SELECTED>Image de t?l?d?tection</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Image de t?l?d?tection</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1h" -->
! 		<option value="h" SELECTED>Coupe</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Coupe</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1i" -->
! 		<option value="i" SELECTED>Vue</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="i">Vue</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1j" -->
! 		<option value="j" SELECTED>Plan</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="j">Plan</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:28:08 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:28:08 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_124c.tmpl,1.2,1.3
Message-ID: <E1Ddrc8-0008Aj-Uh@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31368/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_124c.tmpl 
Log Message:
Template for 124c field plugin

Index: unimarc_field_124c.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124c.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_124c.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_124c.tmpl	2 Jun 2005 15:28:06 -0000	1.3
***************
*** 1,142 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 124c</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Presentation technique dans le cas d'images photographiques ou non photographiques:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1  " -->

! 				<option value="  " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="  ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1aa" -->

! 				<option value="aa" SELECTED>Anaglyphique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="aa">Anaglyphique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ab" -->

! 				<option value="ab" SELECTED>Polarisee</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ab">Polarisee</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ac" -->

! 				<option value="ac" SELECTED>Planimetrique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ac">Planimetrique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ad" -->

! 				<option value="ad" SELECTED>Carte diagramme</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ad">Carte diagramme</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ae" -->

! 				<option value="ae" SELECTED>Carte par courbes de niveau</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ae">Carte par courbes de niveau</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1af" -->

! 				<option value="af" SELECTED>Carte par points</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="af">Carte par points</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ag" -->

! 				<option value="ag" SELECTED>Carte diagrammatique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ag">Carte diagrammatique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ah" -->

! 				<option value="ah" SELECTED>Choroplethe</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ah">Choroplethe</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ai" -->

! 				<option value="ai" SELECTED>Chorochromatique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ai">Chorochromatique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1aj" -->

! 				<option value="aj" SELECTED>Dasymetrique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="aj">Dasymetrique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ak" -->

! 				<option value="ak" SELECTED>Isoplethe</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ak">Isoplethe</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1am" -->

! 				<option value="am" SELECTED>Anamorphique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="am">Anamorphique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1an" -->

! 				<option value="an" SELECTED>Carte peinte</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="an">Carte peinte</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ao" -->

! 				<option value="ao" SELECTED>Representation des volumes en 2 dimensions</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ao">Representation des volumes en 2 dimensions</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ap" -->

! 				<option value="ap" SELECTED>Carte mentale ou cognitive</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ap">Carte mentale ou cognitive</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1aq" -->

! 				<option value="aq" SELECTED>Vues avec horizon</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="aq">Vues avec horizon</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ar" -->

! 				<option value="ar" SELECTED>Vues sans horizon</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ar">Vues sans horizon</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1as" -->

! 				<option value="as" SELECTED>Infographie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="as">Infographie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1da" -->

! 				<option value="da" SELECTED>Pictocarte</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="da">Pictocarte</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1db" -->

! 				<option value="db" SELECTED>Carte par pointille</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="db">Carte par pointille</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1dc" -->

! 				<option value="dc" SELECTED>Tramee</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="dc">Tramee</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1dd" -->

! 				<option value="dd" SELECTED>Non tramee</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="dd">Non tramee</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,145 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ cod? 124c</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:25em;">Pr?sentation technique dans le cas d'images photographiques ou non photographiques</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1  " -->
! 		<option value="  " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="  ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1aa" -->
! 		<option value="aa" SELECTED>Anaglyphique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="aa">Anaglyphique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ab" -->
! 		<option value="ab" SELECTED>Polaris?e</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ab">Polaris?e</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ac" -->
! 		<option value="ac" SELECTED>Planim?trique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ac">Planim?trique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ad" -->
! 		<option value="ad" SELECTED>Carte diagramme</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ad">Carte diagramme</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ae" -->
! 		<option value="ae" SELECTED>Carte par courbes de niveau</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ae">Carte par courbes de niveau</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1af" -->
! 		<option value="af" SELECTED>Carte par points</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="af">Carte par points</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ag" -->
! 		<option value="ag" SELECTED>Carte diagrammatique (c'est-?-dire cartogramme)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ag">Carte diagrammatique (c'est-?-dire cartogramme)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ah" -->
! 		<option value="ah" SELECTED>Choroplethe</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ah">Choroplethe</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ai" -->
! 		<option value="ai" SELECTED>Chorochromatique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ai">Chorochromatique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1aj" -->
! 		<option value="aj" SELECTED>Dasym?trique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="aj">Dasym?trique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ak" -->
! 		<option value="ak" SELECTED>Isoplethe</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ak">Isoplethe</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1am" -->
! 		<option value="am" SELECTED>Anamorphique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="am">Anamorphique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1an" -->
! 		<option value="an" SELECTED>Carte peinte</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="an">Carte peinte</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ao" -->
! 		<option value="ao" SELECTED>Repr?sentation des volumes en 2 dimensions</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ao">Repr?sentation des volumes en 2 dimensions</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ap" -->
! 		<option value="ap" SELECTED>Carte mentale ou cognitive</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ap">Carte mentale ou cognitive</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1aq" -->
! 		<option value="aq" SELECTED>Vues avec horizon (y compris les vues panoramiques)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="aq">Vues avec horizon (y compris les vues panoramiques)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ar" -->
! 		<option value="ar" SELECTED>Vues sans horizon (y compris les vues panoramiques)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ar">Vues sans horizon (y compris les vues panoramiques)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1as" -->
! 		<option value="as" SELECTED>Infographie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="as">Infographie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1da" -->
! 		<option value="da" SELECTED>Pictocarte</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="da">Pictocarte</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1db" -->
! 		<option value="db" SELECTED>Carte par pointill?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="db">Carte par pointill?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1dc" -->
! 		<option value="dc" SELECTED>Tram?e</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="dc">Tram?e</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1dd" -->
! 		<option value="dd" SELECTED>Non tram?e</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="dd">Non tram?e</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:25em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:28:37 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:28:37 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_124d.tmpl,1.2,1.3
Message-ID: <E1Ddrcb-0008E5-BN@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31558/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_124d.tmpl 
Log Message:
Template for 124d field plugin

Index: unimarc_field_124d.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124d.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_124d.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_124d.tmpl	2 Jun 2005 15:28:35 -0000	1.3
***************
*** 1,47 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 124d</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Position de la base pour les images photographiques ou de teledetection:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Terrestre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Terrestre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Aerienne</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Aerienne</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Spatiale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Spatiale</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,49 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ cod? 124d</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:25em;">Position de la base pour les images photographiques ou de t?l?d?tection</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Terrestre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Terrestre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>A?rienne</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">A?rienne</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Spatiale</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Spatiale</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:25em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:28:56 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:28:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_124e.tmpl,1.2,1.3
Message-ID: <E1Ddrcu-0008Hs-AM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31810/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_124e.tmpl 
Log Message:
Template for 124e field plugin

Index: unimarc_field_124e.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124e.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_124e.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_124e.tmpl	2 Jun 2005 15:28:54 -0000	1.3
***************
*** 1,47 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 124e</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Categorie du satellite pour la teledetection:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Meteorologique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Meteorologique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Exploration terrestre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Exploration terrestre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Observation spatiale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Observation spatiale</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,49 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ cod? 124e</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Cat?gorie du satellite pour la t?l?d?tection</label>
! 		<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>M?t?orologique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">M?t?orologique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Exploration terrestre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Exploration terrestre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Observation spatiale</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Observation spatiale</option>
! 		<!-- /TMPL_IF -->
! 		</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:29:15 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:29:15 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_124f.tmpl,1.2,1.3
Message-ID: <E1DdrdD-0008Lo-CU@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32053/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_124f.tmpl 
Log Message:
Template for 124f field plugin

Index: unimarc_field_124f.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124f.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_124f.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_124f.tmpl	2 Jun 2005 15:29:13 -0000	1.3
***************
*** 1,122 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 124f</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Nom du satellite pour la teledetection:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1  " -->

! 				<option value="  " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="  ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1aa" -->

! 				<option value="aa" SELECTED>Tiros</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="aa">Tiros</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ab" -->

! 				<option value="ab" SELECTED>ATS</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ab">ATS</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ac" -->

! 				<option value="ac" SELECTED>NOAA</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ac">NOAA</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ad" -->

! 				<option value="ad" SELECTED>Nimbus</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ad">Nimbus</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ae" -->

! 				<option value="ae" SELECTED>METEOSAT</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ae">METEOSAT</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ma" -->

! 				<option value="ma" SELECTED>Explorer I</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ma">Explorer I</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1mb" -->

! 				<option value="mb" SELECTED>Explorer II</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="mb">Explorer II</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ga" -->

! 				<option value="ga" SELECTED>ERTS</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ga">ERTS</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gb" -->

! 				<option value="gb" SELECTED>Landsat I</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gb">Landsat I</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gc" -->

! 				<option value="gc" SELECTED>Landsat II</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gc">Landsat II</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gd" -->

! 				<option value="gd" SELECTED>Landsat III</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gd">Landsat III</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ge" -->

! 				<option value="ge" SELECTED>Seasat</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ge">Seasat</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gf" -->

! 				<option value="gf" SELECTED>Skylab</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gf">Skylab</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gg" -->

! 				<option value="gg" SELECTED>Spacelab</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gg">Spacelab</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gk" -->

! 				<option value="gk" SELECTED>Spot 1</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gk">Spot 1</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gl" -->

! 				<option value="gl" SELECTED>Spot 2</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gl">Spot 2</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gm" -->

! 				<option value="gm" SELECTED>Spot 3</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gm">Spot 3</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gz" -->

! 				<option value="gz" SELECTED>Autres codes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gz">Autres codes</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,127 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ cod? 124f</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Nom du satellite pour la t?l?d?tection</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1  " -->
! 		<option value="  " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="  ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- M?t?orologique :</option>
! 		<!-- TMPL_IF name="f1aa" -->
! 		<option value="aa" SELECTED>Tiros</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="aa">Tiros</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ab" -->
! 		<option value="ab" SELECTED>ATS</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ab">ATS</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ac" -->
! 		<option value="ac" SELECTED>NOAA</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ac">NOAA</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ad" -->
! 		<option value="ad" SELECTED>Nimbus</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ad">Nimbus</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ae" -->
! 		<option value="ae" SELECTED>METEOSAT</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ae">METEOSAT</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Exploration spatiale :</option>
! 		<!-- TMPL_IF name="f1ma" -->
! 		<option value="ma" SELECTED>Explorer I</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ma">Explorer I</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1mb" -->
! 		<option value="mb" SELECTED>Explorer II</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="mb">Explorer II</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Exploration terrestre :</option>
! 		<!-- TMPL_IF name="f1ga" -->
! 		<option value="ga" SELECTED>ERTS</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ga">ERTS</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gb" -->
! 		<option value="gb" SELECTED>Landsat I</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gb">Landsat I</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gc" -->
! 		<option value="gc" SELECTED>Landsat II</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gc">Landsat II</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gd" -->
! 		<option value="gd" SELECTED>Landsat III</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gd">Landsat III</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ge" -->
! 		<option value="ge" SELECTED>Seasat</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ge">Seasat</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gf" -->
! 		<option value="gf" SELECTED>Skylab</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gf">Skylab</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gg" -->
! 		<option value="gg" SELECTED>Spacelab</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gg">Spacelab</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gk" -->
! 		<option value="gk" SELECTED>Spot 1</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gk">Spot 1</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gl" -->
! 		<option value="gl" SELECTED>Spot 2</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gl">Spot 2</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gm" -->
! 		<option value="gm" SELECTED>Spot 3</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gm">Spot 3</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gz" -->
! 		<option value="gz" SELECTED>Autres codes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gz">Autres codes</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:29:35 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:29:35 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_124g.tmpl,1.2,1.3
Message-ID: <E1DdrdX-0008OS-Tk@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32240/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_124g.tmpl 
Log Message:
Template for 124g field plugin

Index: unimarc_field_124g.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_124g.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_124g.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_124g.tmpl	2 Jun 2005 15:29:33 -0000	1.3
***************
*** 1,82 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 124g</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Technique d'enregistrement pour les images de teledetection:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1  " -->

! 				<option value="  " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="  ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1aa" -->

! 				<option value="aa" SELECTED>Enregistrement video</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="aa">Enregistrement video</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ab" -->

! 				<option value="ab" SELECTED>Photographie en fausse couleur</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ab">Photographie en fausse couleur</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ac" -->

! 				<option value="ac" SELECTED>Photographie multispectrale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ac">Photographie multispectrale</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ad" -->

! 				<option value="ad" SELECTED>Balayage multispectrale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ad">Balayage multispectrale</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1av" -->

! 				<option value="av" SELECTED>Combinaisons de techniques en faible emission</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="av">Combinaisons de techiques en faible emission</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1da" -->

! 				<option value="da" SELECTED>Balayage par ligne infrarouge</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="da">Balayage par ligne infrarouge</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1dv" -->

! 				<option value="dv" SELECTED>Combinaisons de techniques diverses de detection thermique par infrarouge</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="dv">Combinaisons de techiques diverses de detection thermique par infrarouge</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ga" -->

! 				<option value="ga" SELECTED>Sidelooking Airbone Radar</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ga">Sidelooking Airbone Radar</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gb" -->

! 				<option value="gb" SELECTED>Synthetic Aperture Radar</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gb">Synthetic Aperture Radar</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gc" -->

! 				<option value="gc" SELECTED>Couverture passive par ondes micrometriques</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gc">Couverture passive par onde micrometrique</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,87 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ cod? 124g</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:18em;">Technique d'enregistrement pour les images de t?l?d?tection</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1  " -->
! 		<option value="  " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="  ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Emission faible :</option>
! 		<!-- TMPL_IF name="f1aa" -->
! 		<option value="aa" SELECTED>Enregistrement vid?o</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="aa">Enregistrement vid?o</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ab" -->
! 		<option value="ab" SELECTED>Photographie en fausse couleur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ab">Photographie en fausse couleur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ac" -->
! 		<option value="ac" SELECTED>Photographie multispectrale</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ac">Photographie multispectrale</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ad" -->
! 		<option value="ad" SELECTED>Balayage multispectral</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ad">Balayage multispectral</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1av" -->
! 		<option value="av" SELECTED>Combinaisons de techniques en faible ?mission</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="av">Combinaisons de techiques en faible ?mission</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- D?tection thermique par infrarouge :</option>
! 		<!-- TMPL_IF name="f1da" -->
! 		<option value="da" SELECTED>Balayage par ligne infrarouge</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="da">Balayage par ligne infrarouge</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1dv" -->
! 		<option value="dv" SELECTED>Combinaisons de techniques diverses de d?tection thermique par infrarouge</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="dv">Combinaisons de techiques diverses de d?tection thermique par infrarouge</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Emission d'ondes microm?triques :</option>
! 		<!-- TMPL_IF name="f1ga" -->
! 		<option value="ga" SELECTED>Sidelooking Airbone Radar (SLAR)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ga">Sidelooking Airbone Radar (SLAR)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gb" -->
! 		<option value="gb" SELECTED>Synthetic Aperture Radar (SAR)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gb">Synthetic Aperture Radar (SAR)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gc" -->
! 		<option value="gc" SELECTED>Couverture passive par ondes microm?triques</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gc">Couverture passive par ondes microm?triques</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:18em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:30:07 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:30:07 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_125a.tmpl,1.2,1.3
Message-ID: <E1Ddre3-0008TM-Tf@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32474/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_125a.tmpl 
Log Message:
Template for 125a field plugin

Index: unimarc_field_125a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_125a.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_125a.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_125a.tmpl	2 Jun 2005 15:30:05 -0000	1.3
***************
*** 1,113 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 125a</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Type de partition:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Partition d'orchestre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Partition d'orchestre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Partition miniature ou d'etude</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Partition miniature ou d'etude</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Partition chant, accompagnement reduit pour le piano</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Partition chant, accompagnement reduit pour le piano</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1d" -->

! 				<option value="d" SELECTED>Partition vocale, partition chorale, sans accompagnement</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Partition vocale, partition chorale, sans accompagnement</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Partition condensee, partition de direction a partir du piano</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Partition condensee, partition de direction a partir du piano</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1g" -->

! 				<option value="g" SELECTED>Partition combinee dans laquelle plusieurs voix sont sur la meme portee</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">Partition combinee dans laquelle plusieurs voix sont sur la meme portee</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1m" -->

! 				<option value="m" SELECTED>Formes diverses</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="m">Formes diverses</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1x" -->

! 				<option value="x" SELECTED>Non applicable ce n'est pas une partition</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="x">Non applicable ce n'est pas une partition</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr>

! 		<td>Indicateur de parties:</td>

! 		<td>

! 			<select name="f2" size="1">

! 			<!-- TMPL_IF name="f2 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2a" -->

! 				<option value="a" SELECTED>Parties existantes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Parties existantes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2x" -->

! 				<option value="x" SELECTED>Non applicable</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="x">Non applicable</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2y" -->

! 				<option value="y" SELECTED>Parties inexistantes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="y">Parties inexistantes</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,115 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ cod? 125a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Type de partition</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Partition d'orchestre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Partition d'orchestre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Partition miniature ou d'?tude</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Partition miniature ou d'?tude</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Partition chant, accompagnement r?duit pour le piano</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Partition chant, accompagnement r?duit pour le piano</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1d" -->
! 		<option value="d" SELECTED>Partition vocale, partition chorale, sans accompagnement</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Partition vocale, partition chorale, sans accompagnement</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Partition condens?e, partition de direction ? partir du piano</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Partition condens?e, partition de direction ? partir du piano</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1g" -->
! 		<option value="g" SELECTED>Partition combin?e dans laquelle plusieurs voix sont sur la meme port?e</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Partition combine?e dans laquelle plusieurs voix sont sur la meme port?e</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1m" -->
! 		<option value="m" SELECTED>Formes diverses</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="m">Formes diverses</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1x" -->
! 		<option value="x" SELECTED>Non applicable ce n'est pas une partition</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="x">Non applicable ce n'est pas une partition</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Indicateur de parties</label>
! 	<select name="f2" size="1">
! 		<!-- TMPL_IF name="f2 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2a" -->
! 		<option value="a" SELECTED>Parties existantes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Parties existantes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2x" -->
! 		<option value="x" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="x">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2y" -->
! 		<option value="y" SELECTED>Parties inexistantes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="y">Parties inexistantes</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:30:24 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:30:24 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_125b.tmpl,1.2,1.3
Message-ID: <E1DdreK-00005f-L6@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv311/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_125b.tmpl 
Log Message:
Template for 125b field plugin

Index: unimarc_field_125b.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_125b.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_125b.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_125b.tmpl	2 Jun 2005 15:30:22 -0000	1.3
***************
*** 1,137 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 125b</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Forme du document cartographique:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Poesie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Poesie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Theatre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Theatre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Fiction</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Fiction</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1d" -->

! 				<option value="d" SELECTED>Histoire</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Histoire</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Conferences, discours</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Conferences, discours</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1f" -->

! 				<option value="f" SELECTED>Instructions</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Instructions</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1g" -->

! 				<option value="g" SELECTED>Sons</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">Sons</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1h" -->

! 				<option value="h" SELECTED>Autobiographie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Autobiographie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1i" -->

! 				<option value="i" SELECTED>Biographie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="i">Biographie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1j" -->

! 				<option value="j" SELECTED>Essais</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="j">Essais</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1k" -->

! 				<option value="k" SELECTED>Comptes-rendus</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="k">Comptes-rendus</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1l" -->

! 				<option value="l" SELECTED>Memoires</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="l">Memoires</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1m" -->

! 				<option value="m" SELECTED>Repetition</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="m">Repetition</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1n" -->

! 				<option value="n" SELECTED>Entretiens</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="n">Entretiens</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1o" -->

! 				<option value="o" SELECTED>Textes publicitaires</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="o">Textes publicitaires</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1p" -->

! 				<option value="p" SELECTED>Cours de langues</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="p">Cours de langues</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1q" -->

! 				<option value="q" SELECTED>Actes de colloque</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="q">Actes de colloque</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1r" -->

! 				<option value="r" SELECTED>Comedie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="r">Comedie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1s" -->

! 				<option value="s" SELECTED>Contes populaires</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="s">Contes populaires</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1t" -->

! 				<option value="t" SELECTED>Textes sacres</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="t">Textes sacres</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1z" -->

! 				<option value="z" SELECTED>Autres textes litteraires</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autres textes litteraires</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,139 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ cod? 125b</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Type de texte ?crit</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Po?sie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Po?sie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Th??tre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Th??tre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Fiction</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Fiction</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1d" -->
! 		<option value="d" SELECTED>Histoire</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Histoire</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Conf?rences, discours</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Conf?rences, discours</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1f" -->
! 		<option value="f" SELECTED>Instructions</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Instructions</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1g" -->
! 		<option value="g" SELECTED>Sons</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Sons</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1h" -->
! 		<option value="h" SELECTED>Autobiographie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Autobiographie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1i" -->
! 		<option value="i" SELECTED>Biographie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="i">Biographie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1j" -->
! 		<option value="j" SELECTED>Essais</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="j">Essais</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1k" -->
! 		<option value="k" SELECTED>Comptes-rendus</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="k">Comptes-rendus</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1l" -->
! 		<option value="l" SELECTED>M?moires</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="l">M?moires</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1m" -->
! 		<option value="m" SELECTED>R?p?tition</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="m">R?p?tition</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1n" -->
! 		<option value="n" SELECTED>Entretiens</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Entretiens</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1o" -->
! 		<option value="o" SELECTED>Textes publicitaires</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="o">Textes publicitaires</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1p" -->
! 		<option value="p" SELECTED>Cours de langues</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="p">Cours de langues</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1q" -->
! 		<option value="q" SELECTED>Actes de colloque</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="q">Actes de colloque</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1r" -->
! 		<option value="r" SELECTED>Com?die</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="r">Com?die</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1s" -->
! 		<option value="s" SELECTED>Contes populaires</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="s">Contes populaires</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1t" -->
! 		<option value="t" SELECTED>Textes sacr?s</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="t">Textes sacr?s</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1z" -->
! 		<option value="z" SELECTED>Autres textes litt?raires</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autres textes litt?raires</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:30:48 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:30:48 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_126a.tmpl,1.2,1.3
Message-ID: <E1Ddrei-000086-4U@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv455/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_126a.tmpl 
Log Message:
Template for 126a field plugin

Index: unimarc_field_126a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_126a.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_126a.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_126a.tmpl	2 Jun 2005 15:30:45 -0000	1.3
***************
*** 1,1076 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 126a</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Presentation materielle:</td>

! 		<td>

[...2128 lines suppressed...]
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value+document.f_pop.f10.value+document.f_pop.f11.value+document.f_pop.f12.value+document.f_pop.f13.value+document.f_pop.f14.value+document.f_pop.f15.value ;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:31:06 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:31:06 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_126b.tmpl,1.2,1.3
Message-ID: <E1Ddrf0-0000CH-SE@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv713/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_126b.tmpl 
Log Message:
Template for 126b field plugin

Index: unimarc_field_126b.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_126b.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_126b.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_126b.tmpl	2 Jun 2005 15:31:04 -0000	1.3
***************
*** 1,194 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 126b</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Type de disque, cylindre ou bande magnetique:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Gravure directe</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Gravure directe</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Production industrielle</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Production industrielle</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Bande "Master"</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Bande "Master"</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1d" -->

! 				<option value="d" SELECTED>Bande reproduite a partir du "master"</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Bande reproduite a partir du master</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Disque "pere" (negatif)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Disque "pere" (negatif)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1f" -->

! 				<option value="f" SELECTED>Disque "mere" (positif)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Disque "mere" (positif)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1g" -->

! 				<option value="g" SELECTED>Matrice (negatif)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">Matrice (negatif)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1h" -->

! 				<option value="h" SELECTED>Pressage de test</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Pressage de test</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr>

! 		<td>Type de document:</td>

! 		<td>

! 			<select name="f2" size="1">

! 			<!-- TMPL_IF name="f2 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2x" -->

! 				<option value="x" SELECTED>Non applicable</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="x">Non applicable</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2g" -->

! 				<option value="g" SELECTED>Cire (gravure directe)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">Cire (gravure directe)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2h" -->

! 				<option value="h" SELECTED>Plastique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Plastique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2a" -->

! 				<option value="a" SELECTED>Laque</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Laque</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2b" -->

! 				<option value="b" SELECTED>Metal</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Metal</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2c" -->

! 				<option value="c" SELECTED>Pressage laque</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Pressage laque</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2d" -->

! 				<option value="d" SELECTED>Pressage plastique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Pressage plastique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2e" -->

! 				<option value="e" SELECTED>Metal et plastique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Metal et plastique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2i" -->

! 				<option value="i" SELECTED>Dos papier</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="i">Dos papier</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2j" -->

! 				<option value="j" SELECTED>Acetate</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="j">Acetate</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2k" -->

! 				<option value="k" SELECTED>P.V.C.</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="k">P.V.C.</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2l" -->

! 				<option value="l" SELECTED>Polyester</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="l">Polyester</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr>

! 		<td>Type de gravure:</td>

! 		<td>

! 			<select name="f3" size="1">

! 			<!-- TMPL_IF name="f3 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3a" -->

! 				<option value="a" SELECTED>Gravure laterale ou combinee</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Gravure laterale ou combinee</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3b" -->

! 				<option value="b" SELECTED>Gravure verticale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Gravure verticale</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3u" -->

! 				<option value="u" SELECTED>Gravure inconnue</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Gravure inconnue</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3x" -->

! 				<option value="x" SELECTED>Non applicable</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="x">Non applicable</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value ;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,199 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ cod? 126b</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:22em;">Type de disque, cylindre ou bande magn?tique</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Gravure directe</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Gravure directe</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Production industrielle</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Production industrielle</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Bande "master"</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Bande "master"</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1d" -->
! 		<option value="d" SELECTED>Bande reproduite ? partir du "master"</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Bande reproduite ? partir du "master"</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Disque "p?re" (n?gatif)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Disque "p?re" (n?gatif)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1f" -->
! 		<option value="f" SELECTED>Disque "m?re" (positif)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Disque "m?re" (positif)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1g" -->
! 		<option value="g" SELECTED>Matrice (n?gatif)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Matrice (n?gatif)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1h" -->
! 		<option value="h" SELECTED>Pressage de test</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Pressage de test</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:22em;">Type de document</label>
! 	<select name="f2" size="1">
! 		<!-- TMPL_IF name="f2 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2x" -->
! 		<option value="x" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="x">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Disques :</option>
! 		<!-- TMPL_IF name="f2a" -->
! 		<option value="a" SELECTED>Laque</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Laque</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2b" -->
! 		<option value="b" SELECTED>M?tal</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">M?tal</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2c" -->
! 		<option value="c" SELECTED>Pressage laque</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Pressage laque</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2d" -->
! 		<option value="d" SELECTED>Pressage plastique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Pressage plastique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2e" -->
! 		<option value="e" SELECTED>M?tal et plastique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">M?tal et plastique</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Cylindres :</option>
! 		<!-- TMPL_IF name="f2g" -->
! 		<option value="g" SELECTED>Cire (gravure directe)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Cire (gravure directe)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2h" -->
! 		<option value="h" SELECTED>Plastique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Plastique</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Bandes :</option>
! 		<!-- TMPL_IF name="f2i" -->
! 		<option value="i" SELECTED>Dos papier</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="i">Dos papier</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2j" -->
! 		<option value="j" SELECTED>Ac?tate</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="j">Ac?tate</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2k" -->
! 		<option value="k" SELECTED>P.V.C.</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="k">P.V.C.</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2l" -->
! 		<option value="l" SELECTED>Polyester</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="l">Polyester</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:22em;">Type de gravure</label>
! 	<select name="f3" size="1">
! 		<!-- TMPL_IF name="f3 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3a" -->
! 		<option value="a" SELECTED>Gravure lat?rale ou combin?e</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Gravure lat?rale ou combin?e</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3b" -->
! 		<option value="b" SELECTED>Gravure verticale</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Gravure verticale</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3u" -->
! 		<option value="u" SELECTED>Gravure inconnue</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Gravure inconnue</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3x" -->
! 		<option value="x" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="x">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:22em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value ;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:31:30 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:31:30 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_127.tmpl,1.1,1.2
Message-ID: <E1DdrfO-0000F8-0p@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv890/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_127.tmpl 
Log Message:
Template for 127a field plugin

Index: unimarc_field_127.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_127.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_127.tmpl	24 Nov 2004 16:21:17 -0000	1.1
--- unimarc_field_127.tmpl	2 Jun 2005 15:31:27 -0000	1.2
***************
*** 1,46 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 127</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! <tr>(Completer avec des 0 a gauche)</tr>

! <tr>          <td>Heure:</td>

!                          <td><input type="text" name="f1" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f1" -->"></td>

!           <td>Minutes:</td>

!                          <td><input type="text" name="f2" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f2" -->"></td>

!           <td>Secondes:</td>

!                          <td><input type="text" name="f3" maxlength=2

!                          size=3

!                    value="<!-- TMPL_VAR name="f3" -->"></td>

! </tr>

! 

! 

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! document.f_pop.f1.value=document.f_pop.f1.value+'   ';

! document.f_pop.f2.value=document.f_pop.f2.value+'  ';

! document.f_pop.f3.value=document.f_pop.f3.value+'  ';

! 

! 

! 

! document.f_pop.f1.value=document.f_pop.f1.value.substring(0,2);

! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,2);

! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,45 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ cod? 127a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Dur?e (compl?ter avec des 0 ? gauche)</label>
! 	<label style="width:6em;">Heures</label><input type="text" name="f1" maxlength=2 size=3 value="<!-- TMPL_VAR name="f1" -->">
! </p>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<label style="width:6em;">Minutes</label><input type="text" name="f2" maxlength=2 size=3 value="<!-- TMPL_VAR name="f2" -->">
! </p>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<label style="width:6em;">Secondes</label><input type="text" name="f3" maxlength=2 size=3 value="<!-- TMPL_VAR name="f3" -->">
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! document.f_pop.f1.value=document.f_pop.f1.value+'   ';
! document.f_pop.f2.value=document.f_pop.f2.value+'  ';
! document.f_pop.f3.value=document.f_pop.f3.value+'  ';
! 
! 
! 
! document.f_pop.f1.value=document.f_pop.f1.value.substring(0,2);
! document.f_pop.f2.value=document.f_pop.f2.value.substring(0,2);
! document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:32:52 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:32:52 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_128c.tmpl,1.2,1.3
Message-ID: <E1Ddrgi-0000RV-TD@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1665/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_128c.tmpl 
Log Message:
Template for 128c field plugin

Index: unimarc_field_128c.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_128c.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_128c.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_128c.tmpl	2 Jun 2005 15:32:50 -0000	1.3
***************
*** 1,472 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 128c</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Instruments ou voix dans un ensemble:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1  " -->

! 				<option value="  " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="  ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ba" -->

! 				<option value="ba" SELECTED>Cor</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ba">Cor</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bb" -->

! 				<option value="bb" SELECTED>Trompette</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bb">Trompette</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bc" -->

! 				<option value="bc" SELECTED>Cornet a piston</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bc">Cornet a piston</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bd" -->

! 				<option value="bd" SELECTED>Trombone</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bd">Trombone</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1be" -->

! 				<option value="be" SELECTED>Tuba</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="be">Tuba</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bf" -->

! 				<option value="bf" SELECTED>Saxophone</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bf">Saxophone</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bt" -->

! 				<option value="bt" SELECTED>Ethniques</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bt">Ethniques</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bu" -->

! 				<option value="bu" SELECTED>Non precise (Cuivre)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bu">Non precise (Cuivre)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bz" -->

! 				<option value="bz" SELECTED>Autre cuivre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bz">Autre cuivre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ca" -->

! 				<option value="ca" SELECTED>Mixtes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ca">Mixtes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cb" -->

! 				<option value="cb" SELECTED>Femmes </option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cb">Femmes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cc" -->

! 				<option value="cc" SELECTED>Hommes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cc">Hommes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cd" -->

! 				<option value="cd" SELECTED>Enfants</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cd">Enfants</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ct" -->

! 				<option value="ct" SELECTED>Ethniques</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ct">Ethniques</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cu" -->

! 				<option value="cu" SELECTED>Non precise (Choeurs)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cu">Non precise (Choeurs)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1oa" -->

! 				<option value="oa" SELECTED>Orchestre symphonique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="oa">Orchestre symphonique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ob" -->

! 				<option value="ob" SELECTED>Orchestre de chambre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ob">Orchestre de chambre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1oc" -->

! 				<option value="oc" SELECTED>Orchestres a cordes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="oc">Orchestres a cordes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1od" -->

! 				<option value="od" SELECTED>Fanfare</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="od">Fanfare</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1oe" -->

! 				<option value="oe" SELECTED>Orchestre de danse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="oe">Orchestre de danse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1of" -->

! 				<option value="of" SELECTED>Grand ensemble - orchestre de cuivres</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="of">Grand ensemble - orchestre de cuivres</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ot" -->

! 				<option value="ot" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ot">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ou" -->

! 				<option value="ou" SELECTED>Non precise (orchestre)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ou">Non precise (orchestre)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1oz" -->

! 				<option value="oz" SELECTED>Autre orchestre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="oz">Autre orchestre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pa" -->

! 				<option value="pa" SELECTED>Tympanon</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pa">Tympanon</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pb" -->

! 				<option value="pb" SELECTED>Xylophone</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pb">Xylophone</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pc" -->

! 				<option value="pc" SELECTED>Marimba</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pc">Marimba</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pd" -->

! 				<option value="pd" SELECTED>Tambour, batterie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pd">Tambour, batterie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pt" -->

! 				<option value="pt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pu" -->

! 				<option value="pu" SELECTED>Non precise (percussion)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pu">Non precise (percussion)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pz -->

! 				<option value="pz" SELECTED>Autre percussions</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pz">Autre percussions</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sa" -->

! 				<option value="sa" SELECTED>Violon</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sa">Violon</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sb" -->

! 				<option value="sb" SELECTED>Alto</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sb">Alto</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sc" -->

! 				<option value="sc" SELECTED>Violoncelle</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sc">Violoncelle</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sd" -->

! 				<option value="sd" SELECTED>Contrebasse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sd">Contrebasse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1se" -->

! 				<option value="se" SELECTED>Viole</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="se">Viole</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sf" -->

! 				<option value="sf" SELECTED>Viole d'amour</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sf">Viole d'amour</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sg" -->

! 				<option value="sg" SELECTED>Viole de gambe</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sg">Viole de gambe</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1st" -->

! 				<option value="st" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="st">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1su" -->

! 				<option value="su" SELECTED>Non precise (Corde frottee)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="su">Non precise (Corde frottee)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sz" -->

! 				<option value="sz" SELECTED>Autre (Corde frottee)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sz">Autre (Corde frottee)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1uu" -->

! 				<option value="uu" SELECTED>Non precise (Non precise)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="uu">Non precise (Non precise)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ea" -->

! 				<option value="ea" SELECTED>Synthetiseur</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ea">Synthetiseur</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1eb" -->

! 				<option value="eb" SELECTED>Bande magnetique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="eb">Bande magnetique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ec" -->

! 				<option value="ec" SELECTED>Ordinateur</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ec">Ordinateur</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ed" -->

! 				<option value="ed" SELECTED>Ondes Martenot</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ed">Ondes Martenot</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1eu" -->

! 				<option value="eu" SELECTED>Non precise (Electronique)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="eu">Non precise (Electronique)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ez" -->

! 				<option value="ez" SELECTED>Autre (Electronique)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ez">Autre (Electronique)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ka" -->

! 				<option value="ka" SELECTED>Piano</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ka">Piano</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kb" -->

! 				<option value="kb" SELECTED>Orgue</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kb">Orgue</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kc" -->

! 				<option value="kc" SELECTED>Clavecin</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kc">Clavecin</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kd" -->

! 				<option value="kd" SELECTED>Clavicorde</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kd">Clavicorde</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ke" -->

! 				<option value="ke" SELECTED>Continuo</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ke">Continuo</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kf" -->

! 				<option value="kf" SELECTED>Celesta</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kf">Celesta</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kt" -->

! 				<option value="kt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ku" -->

! 				<option value="ku" SELECTED>Non precise (clavier)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ku">Non precise (clavier)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kz" -->

! 				<option value="kz" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kz">Autre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1va" -->

! 				<option value="va" SELECTED>Soprano</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="va">Soprano</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vb" -->

! 				<option value="vb" SELECTED>Mezzo-soprano</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vb">Mezzo-soprano</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vc" -->

! 				<option value="vc" SELECTED>Alto</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vc">Alto</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vd" -->

! 				<option value="vd" SELECTED>Tenor</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vd">Tenor</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ve" -->

! 				<option value="ve" SELECTED>Baryton</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ve">Baryton</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vf" -->

! 				<option value="vf" SELECTED>Basse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vf">Basse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vg" -->

! 				<option value="vg" SELECTED>Haute contre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vg">Haute contre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vh" -->

! 				<option value="vh" SELECTED>Voix aigues</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vh">Voix aigues</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vi" -->

! 				<option value="vi" SELECTED>Voix medium</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vi">Voix medium</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vj" -->

! 				<option value="vj" SELECTED>Voix graves</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vj">Voix graves</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vt" -->

! 				<option value="vt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vu" -->

! 				<option value="vu" SELECTED>Non precise (Voix precise)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vu">Non precise (Voix precise)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ta" -->

! 				<option value="ta" SELECTED>Harpe</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ta">Harpe</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tb" -->

! 				<option value="tb" SELECTED>Famille de la guitare</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tb">Famille de la guitare</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tc" -->

! 				<option value="tc" SELECTED>Famille du luth</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tc">Famille du luth</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1td" -->

! 				<option value="td" SELECTED>Mandoline</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="td">Mandoline</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tt" -->

! 				<option value="tt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tu" -->

! 				<option value="tu" SELECTED>Non precise (Cordes pincees)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tu">Non precise (Cordes pincees)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tz" -->

! 				<option value="tz" SELECTED>Autre corde pincee</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tz">Autre corde pincee</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wa" -->

! 				<option value="wa" SELECTED>Flute traversiere</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wa">Flute traversiere</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wb" -->

! 				<option value="wb" SELECTED>Hautbois</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wb">Hautbois</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wc" -->

! 				<option value="wc" SELECTED>Clarinette</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wc">Clarinette</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wd" -->

! 				<option value="wd" SELECTED>Basson</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wd">Basson</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1we" -->

! 				<option value="we" SELECTED>Piccolo</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="we">Piccolo</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wf" -->

! 				<option value="wf" SELECTED>Cor anglais</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wf">Cor anglais</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wg" -->

! 				<option value="wg" SELECTED>Clarinette basse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wg">Clarinette basse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wh" -->

! 				<option value="wh" SELECTED>Flute a bec </option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wh">Flute a bec</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wi" -->

! 				<option value="wi" SELECTED>Saxophone</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wi">Saxophone</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wt" -->

! 				<option value="wt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wu" -->

! 				<option value="wu" SELECTED>Non precise</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wu">Non precise</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wz" -->

! 				<option value="wz" SELECTED>Autre bois</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wz">Autre bois</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,493 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ cod? 128c</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:10em;">Instruments ou voix pour solistes</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1  " -->
! 		<option value="  " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="  ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Cuivres :</option>
! 		<!-- TMPL_IF name="f1ba" -->
! 		<option value="ba" SELECTED>Cor</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ba">Cor</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bb" -->
! 		<option value="bb" SELECTED>Trompette</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bb">Trompette</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bc" -->
! 		<option value="bc" SELECTED>Cornet ? piston</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bc">Cornet ? piston</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bd" -->
! 		<option value="bd" SELECTED>Trombone</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bd">Trombone</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1be" -->
! 		<option value="be" SELECTED>Tuba</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="be">Tuba</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bf" -->
! 		<option value="bf" SELECTED>Saxophone</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bf">Saxophone</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bt" -->
! 		<option value="bt" SELECTED>Ethniques</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bt">Ethniques</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bu" -->
! 		<option value="bu" SELECTED>Non pr?cis?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bu">Non pr?cis?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bz" -->
! 		<option value="bz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Choeurs :</option>
! 		<!-- TMPL_IF name="f1ca" -->
! 		<option value="ca" SELECTED>Mixtes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ca">Mixtes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cb" -->
! 		<option value="cb" SELECTED>Femmes </option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cb">Femmes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cc" -->
! 		<option value="cc" SELECTED>Hommes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cc">Hommes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cd" -->
! 		<option value="cd" SELECTED>Enfants</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cd">Enfants</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ct" -->
! 		<option value="ct" SELECTED>Ethniques</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ct">Ethniques</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cu" -->
! 		<option value="cu" SELECTED>Non pr?cis?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cu">Non pr?cis?</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Orchestre :</option>
! 		<!-- TMPL_IF name="f1oa" -->
! 		<option value="oa" SELECTED>Orchestre symphonique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="oa">Orchestre symphonique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ob" -->
! 		<option value="ob" SELECTED>Orchestre de chambre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ob">Orchestre de chambre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1oc" -->
! 		<option value="oc" SELECTED>Orchestres ? cordes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="oc">Orchestres ? cordes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1od" -->
! 		<option value="od" SELECTED>Fanfare</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="od">Fanfare</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1oe" -->
! 		<option value="oe" SELECTED>Orchestre de danse</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="oe">Orchestre de danse</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1of" -->
! 		<option value="of" SELECTED>Grand ensemble - orchestre de cuivres (cuivres doubl?s ou non, avec ou sans percussions)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="of">Grand ensemble - orchestre de cuivres (cuivres doubl?s ou non, avec ou sans percussions)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ot" -->
! 		<option value="ot" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ot">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ou" -->
! 		<option value="ou" SELECTED>Non pr?cis?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ou">Non pr?cis?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1oz" -->
! 		<option value="oz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="oz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Percussions :</option>
! 		<!-- TMPL_IF name="f1pa" -->
! 		<option value="pa" SELECTED>Tympanon</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pa">Tympanon</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pb" -->
! 		<option value="pb" SELECTED>Xylophone</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pb">Xylophone</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pc" -->
! 		<option value="pc" SELECTED>Marimba</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pc">Marimba</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pd" -->
! 		<option value="pd" SELECTED>Tambour, batterie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pd">Tambour, batterie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pt" -->
! 		<option value="pt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pu" -->
! 		<option value="pu" SELECTED>Non pr?cis?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pu">Non pr?cis?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pz -->
! 		<option value="pz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Cordes frott?es :</option>
! 		<!-- TMPL_IF name="f1sa" -->
! 		<option value="sa" SELECTED>Violon</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sa">Violon</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sb" -->
! 		<option value="sb" SELECTED>Alto</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sb">Alto</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sc" -->
! 		<option value="sc" SELECTED>Violoncelle</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sc">Violoncelle</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sd" -->
! 		<option value="sd" SELECTED>Contrebasse</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sd">Contrebasse</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1se" -->
! 		<option value="se" SELECTED>Viole</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="se">Viole</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sf" -->
! 		<option value="sf" SELECTED>Viole d'amour</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sf">Viole d'amour</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sg" -->
! 		<option value="sg" SELECTED>Viole de gambe</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sg">Viole de gambe</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1st" -->
! 		<option value="st" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="st">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1su" -->
! 		<option value="su" SELECTED>Non pr?cis?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="su">Non pr?cis?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sz" -->
! 		<option value="sz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Electronique :</option>
! 		<!-- TMPL_IF name="f1ea" -->
! 		<option value="ea" SELECTED>Synth?tiseur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ea">Synth?tiseur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1eb" -->
! 		<option value="eb" SELECTED>Bande magn?tique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="eb">Bande magn?tique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ec" -->
! 		<option value="ec" SELECTED>Ordinateur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ec">Ordinateur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ed" -->
! 		<option value="ed" SELECTED>Ondes Martenot</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ed">Ondes Martenot</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1eu" -->
! 		<option value="eu" SELECTED>Non pr?cis?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="eu">Non pr?cis?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ez" -->
! 		<option value="ez" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ez">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Claviers :</option>
! 		<!-- TMPL_IF name="f1ka" -->
! 		<option value="ka" SELECTED>Piano</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ka">Piano</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kb" -->
! 		<option value="kb" SELECTED>Orgue</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kb">Orgue</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kc" -->
! 		<option value="kc" SELECTED>Clavecin</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kc">Clavecin</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kd" -->
! 		<option value="kd" SELECTED>Clavicorde</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kd">Clavicorde</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ke" -->
! 		<option value="ke" SELECTED>Continuo</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ke">Continuo</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kf" -->
! 		<option value="kf" SELECTED>C?lesta</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kf">C?lesta</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kt" -->
! 		<option value="kt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ku" -->
! 		<option value="ku" SELECTED>Non pr?cis?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ku">Non pr?cis?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kz" -->
! 		<option value="kz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Voix :</option>
! 		<!-- TMPL_IF name="f1va" -->
! 		<option value="va" SELECTED>Soprano</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="va">Soprano</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vb" -->
! 		<option value="vb" SELECTED>Mezzo-soprano</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vb">Mezzo-soprano</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vc" -->
! 		<option value="vc" SELECTED>Alto</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vc">Alto</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vd" -->
! 		<option value="vd" SELECTED>Tenor</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vd">Tenor</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ve" -->
! 		<option value="ve" SELECTED>Baryton</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ve">Baryton</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vf" -->
! 		<option value="vf" SELECTED>Basse</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vf">Basse</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vg" -->
! 		<option value="vg" SELECTED>Haute contre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vg">Haute contre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vh" -->
! 		<option value="vh" SELECTED>Voix aigu?s</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vh">Voix aigu?s</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vi" -->
! 		<option value="vi" SELECTED>Voix m?dium</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vi">Voix m?dium</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vj" -->
! 		<option value="vj" SELECTED>Voix graves</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vj">Voix graves</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vt" -->
! 		<option value="vt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vu" -->
! 		<option value="vu" SELECTED>Non pr?cis?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vu">Non pr?cis?</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Cordes pinc?es :</option>
! 		<!-- TMPL_IF name="f1ta" -->
! 		<option value="ta" SELECTED>Harpe</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ta">Harpe</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tb" -->
! 		<option value="tb" SELECTED>Famille de la guitare</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tb">Famille de la guitare</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tc" -->
! 		<option value="tc" SELECTED>Famille du luth</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tc">Famille du luth</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1td" -->
! 		<option value="td" SELECTED>Mandoline</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="td">Mandoline</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tt" -->
! 		<option value="tt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tu" -->
! 		<option value="tu" SELECTED>Non pr?cis?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tu">Non pr?cis?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tz" -->
! 		<option value="tz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Bois :</option>
! 		<!-- TMPL_IF name="f1wa" -->
! 		<option value="wa" SELECTED>Fl?te (traversi?re)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wa">Fl?te (traversi?re)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wb" -->
! 		<option value="wb" SELECTED>Hautbois</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wb">Hautbois</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wc" -->
! 		<option value="wc" SELECTED>Clarinette</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wc">Clarinette</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wd" -->
! 		<option value="wd" SELECTED>Basson</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wd">Basson</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1we" -->
! 		<option value="we" SELECTED>Piccolo</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="we">Piccolo</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wf" -->
! 		<option value="wf" SELECTED>Cor anglais</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wf">Cor anglais</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wg" -->
! 		<option value="wg" SELECTED>Clarinette basse</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wg">Clarinette basse</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wh" -->
! 		<option value="wh" SELECTED>Fl?te ? bec </option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wh">Fl?te ? bec</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wi" -->
! 		<option value="wi" SELECTED>Saxophone</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wi">Saxophone</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wt" -->
! 		<option value="wt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wu" -->
! 		<option value="wu" SELECTED>Non pr?cis?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wu">Non pr?cis?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wz" -->
! 		<option value="wz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Non pr?cis? :</option>
! 		<!-- TMPL_IF name="f1uu" -->
! 		<option value="uu" SELECTED>Non pr?cis?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="uu">Non pr?cis?</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! 
! <p>
! 	<label style="width:10em;">Nombre</label>
! 	<input type="text" name="f2" maxlength=2 size=3 value="<!-- TMPL_VAR name="f2" -->"> (sur deux chiffres, compl?ter ?ventuellement avec un 0)
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:10em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 		document.f_pop.f2.value=document.f_pop.f2.value+'  ';
! 		document.f_pop.f2.value=document.f_pop.f2.value.substring(0,2);
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:33:44 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:33:44 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_135a.tmpl,1.2,1.3
Message-ID: <E1DdrhY-0000b2-Ry@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2244/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_135a.tmpl 
Log Message:
Template for 135a field plugin

Index: unimarc_field_135a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_135a.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_135a.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_135a.tmpl	2 Jun 2005 15:33:42 -0000	1.3
***************
*** 1,65 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 135a</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Type de fichier informatique:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Donnees numeriques</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Donnees numeriques</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Programmes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Programmes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Representations</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Representations</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1d" -->

! 				<option value="d" SELECTED>Texte</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Texte</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1v" -->

! 				<option value="v" SELECTED>Combinaison de donnees</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="v">Combinaison de donnees</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,484 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ cod? 135a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Type de fichier informatique</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Donn?es num?riques</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Donn?es num?riques</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Programmes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Programmes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Repr?sentations</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Repr?sentations</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1d" -->
! 		<option value="d" SELECTED>Texte</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Texte</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Donn?es bibliographiques</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Donn?es bibliographiques</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1f" -->
! 		<option value="f" SELECTED>Fonte</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Fonte</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1g" -->
! 		<option value="g" SELECTED>Jeu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Jeu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1h" -->
! 		<option value="h" SELECTED>Son</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Son</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1i" -->
! 		<option value="i" SELECTED>Multim?dia interactif</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="i">Multim?dia interactif</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1j" -->
! 		<option value="j" SELECTED>Syst?me en ligne</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="j">Syst?me en ligne</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1v" -->
! 		<option value="v" SELECTED>Combinaison de donn?es</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="v">Combinaison de donn?es</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Type de support utilis?</label>
! 	<select name="f2" size="1">
! 		<!-- TMPL_IF name="f2 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2a" -->
! 		<option value="a" SELECTED>Bande magn?tique en cartouche</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Bande magn?tique en cartouche</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2b" -->
! 		<option value="b" SELECTED>Puce d'ordinateur en cartouche</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Puce d'ordinateur en cartouche</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2c" -->
! 		<option value="c" SELECTED>Disque optique en cartouche</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Disque optique en cartouche</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2f" -->
! 		<option value="f" SELECTED>Bande magn?tique en cassette</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Bande magn?tique en cassette</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2h" -->
! 		<option value="h" SELECTED>Bande magn?tique pour gros ordinateur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Bande magn?tique pour gros ordinateur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2j" -->
! 		<option value="j" SELECTED>Disquette</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="j">Disquette</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2m" -->
! 		<option value="m" SELECTED>Disque magn?to-optique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="m">Disque magn?to-optique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2o" -->
! 		<option value="o" SELECTED>Disque optique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="o">Disque optique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2r" -->
! 		<option value="r" SELECTED>Syst?me en ligne</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="r">Syst?me en ligne</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Couleur</label>
! 	<select name="f3" size="1">
! 		<!-- TMPL_IF name="f3 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3a" -->
! 		<option value="a" SELECTED>Une couleur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Une couleur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3b" -->
! 		<option value="b" SELECTED>Noir et blanc</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Noir et blanc</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3c" -->
! 		<option value="c" SELECTED>Polychrome</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Polychrome</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3g" -->
! 		<option value="g" SELECTED>Gris</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Gris</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3m" -->
! 		<option value="m" SELECTED>M?lang?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="m">M?lang?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3n" -->
! 		<option value="n" SELECTED>Ne s'applique pas</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Ne s'applique pas</option>
! 		<!-- /TMPL_IF -->		
! 		<!-- TMPL_IF name="f3u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Dimensions</label>
! 	<select name="f4" size="1">
! 		<!-- TMPL_IF name="f4 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4a" -->
! 		<option value="a" SELECTED>3 1/2 in</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">3 1/2 in</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4b" -->
! 		<option value="b" SELECTED>12 in</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">12 in</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4g" -->
! 		<option value="g" SELECTED>4 3/4 in ou 12 cm</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">4 3/4 in ou 12 cm</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4i" -->
! 		<option value="i" SELECTED>1 1/8 x 2 3/8 in</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="i">1 1/8 x 2 3/8 in</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4j" -->
! 		<option value="j" SELECTED>3 7/8 x 2 1/2 in</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="j">3 7/8 x 2 1/2 in</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4n" -->
! 		<option value="n" SELECTED>Ne s'applique pas</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Ne s'applique pas</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4o" -->
! 		<option value="o" SELECTED>5 1/4 in</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="o">5 1/4 in</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4v" -->
! 		<option value="v" SELECTED>8 in</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="v">8 in</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Son</label>
! 	<select name="f5" size="1">
! 		<!-- TMPL_IF name="f5 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5#" -->
! 		<option value="#" SELECTED>Pas de son (silencieux)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="#">Pas de son (silencieux)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5a" -->
! 		<option value="a" SELECTED>Il y a du son sur le support</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Il y a du son sur le support</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f5u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Bits par pixel</label>
! 	<input type="text" name="f6" maxlength=3 size=3 value="<!-- TMPL_VAR name="f6" -->"> (sur trois caract?res)
! </p>
! 
! <p>
! 	<label style="width:20em;">Nombre de formats de fichier</label>
! 	<select name="f7" size="1">
! 		<!-- TMPL_IF name="f7 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7a" -->
! 		<option value="a" SELECTED>Un seul format</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Un seul format</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7m" -->
! 		<option value="m" SELECTED>Formats multiples</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="m">Formats multiples</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Assurance de qualit?</label>
! 	<select name="f8" size="1">
! 		<!-- TMPL_IF name="f8 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8a" -->
! 		<option value="a" SELECTED>Absent</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Absent</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8n" -->
! 		<option value="n" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8p" -->
! 		<option value="p" SELECTED>Pr?sent</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="p">Pr?sent</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Source ou ant?c?dent</label>
! 	<select name="f9" size="1">
! 		<!-- TMPL_IF name="f9 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9a" -->
! 		<option value="a" SELECTED>Fichier reproduit depuis un original</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Fichier reproduit depuis un original</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9b" -->
! 		<option value="b" SELECTED>Fichier reproduit depuis un microfilm</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Fichier reproduit depuis un microfilm</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9c" -->
! 		<option value="c" SELECTED>Fichier reproduit d'apr?s un fichier informatique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Fichier reproduit d'apr?s un fichier informatique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9d" -->
! 		<option value="d" SELECTED>Fichier reproduit d'apr?s un interm?diaire qui n'est pas un microfilm</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Fichier reproduit d'apr?s un interm?diaire qui n'est pas un microfilm</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9m" -->
! 		<option value="m" SELECTED>M?lang?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="m">M?lang?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9n" -->
! 		<option value="n" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Compression</label>
! 	<select name="f10" size="1">
! 		<!-- TMPL_IF name="f10 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f10a" -->
! 		<option value="a" SELECTED>Non comprim?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Non comprim?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f10b" -->
! 		<option value="b" SELECTED>Sans pertes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Sans pertes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f10d" -->
! 		<option value="d" SELECTED>Avec des pertes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Avec des pertes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f10m" -->
! 		<option value="m" SELECTED>M?lang?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="m">M?lang?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f10u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Qualit? du reformatage</label>
! 	<select name="f11" size="1">
! 		<!-- TMPL_IF name="f11" -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f11a" -->
! 		<option value="a" SELECTED>Acc?s</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Acc?s</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f11n" -->
! 		<option value="n" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="n">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f11p" -->
! 		<option value="p" SELECTED>Pr?servation</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="p">Pr?servation</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f11r" -->
! 		<option value="r" SELECTED>Remplacement</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="r">Remplacement</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f11u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 		document.f_pop.f6.value=document.f_pop.f6.value+'   ';
! 		document.f_pop.f6.value=document.f_pop.f6.value.substring(0,3);
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value+document.f_pop.f10.value+document.f_pop.f11.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:34:19 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:34:19 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_140.tmpl,1.2,1.3
Message-ID: <E1Ddri7-0000gD-MB@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2554/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_140.tmpl 
Log Message:
Template for 140a field plugin

Index: unimarc_field_140.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_140.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_140.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_140.tmpl	2 Jun 2005 15:34:17 -0000	1.3
***************
*** 1,1713 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 140</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Illustration dans le texte 1:</td>

! 		<td>

[...3417 lines suppressed...]
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value+document.f_pop.f10.value+document.f_pop.f11.value+document.f_pop.f12.value+document.f_pop.f13.value+document.f_pop.f14.value+document.f_pop.f15.value+document.f_pop.f16.value+document.f_pop.f17.value+document.f_pop.f18.value+document.f_pop.f19.value+document.f_pop.f20.value+document.f_pop.f21.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:34:43 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:34:43 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_141.tmpl,1.2,1.3
Message-ID: <E1DdriV-0000ij-Ja@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2722/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_141.tmpl 
Log Message:
Template for 141a field plugin

Index: unimarc_field_141.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_141.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_141.tmpl	1 Mar 2005 13:41:03 -0000	1.2
--- unimarc_field_141.tmpl	2 Jun 2005 15:34:40 -0000	1.3
***************
*** 1,386 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 141</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Materiau de reliure 1:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Parchemin, velin</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Parchemin, velin</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Cuir</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Cuir</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Bois</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Bois</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1d" -->

! 				<option value="d" SELECTED>Tissus</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Tissus</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Materiau synthetique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Materiau synthetique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1f" -->

! 				<option value="f" SELECTED>Carton</ption>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Carton</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1g" -->

! 				<option value="g" SELECTED>Papier</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">Papier</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1h" -->

! 				<option value="h" SELECTED>Non relie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Non relie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 	</select>

! 		</td></tr>	<tr>

! 		<td>Materiau de reliure 2:</td>

! 		<td>

! 			<select name="f2" size="1">

! 			<!-- TMPL_IF name="f2 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2a" -->

! 				<option value="a" SELECTED>Parchemin, velin</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Parchemin, velin</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2b" -->

! 				<option value="b" SELECTED>Cuir</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Cuir</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2c" -->

! 				<option value="c" SELECTED>Bois</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Bois</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2d" -->

! 				<option value="d" SELECTED>Tissus</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Tissus</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2e" -->

! 				<option value="e" SELECTED>Materiau synthetique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Materiau synthetique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2f" -->

! 				<option value="f" SELECTED>Carton</ption>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Carton</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2g" -->

! 				<option value="g" SELECTED>Papier</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">Papier</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2h" -->

! 				<option value="h" SELECTED>Non relie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Non relie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 	</select>

! 		</td></tr>	<tr>

! 		<td>Materiau de reliure 3:</td>

! 		<td>

! 			<select name="f3" size="1">

! 			<!-- TMPL_IF name="f3 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3a" -->

! 				<option value="a" SELECTED>Parchemin, velin</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Parchemin, velin</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3b" -->

! 				<option value="b" SELECTED>Cuir</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Cuir</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3c" -->

! 				<option value="c" SELECTED>Bois</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Bois</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3d" -->

! 				<option value="d" SELECTED>Tissus</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Tissus</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3e" -->

! 				<option value="e" SELECTED>Materiau synthetique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Materiau synthetique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3f" -->

! 				<option value="f" SELECTED>Carton</ption>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Carton</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3g" -->

! 				<option value="g" SELECTED>Papier</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">Papier</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3h" -->

! 				<option value="h" SELECTED>Non relie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Non relie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 	</select>

! 		</td></tr>

! 		<td>Type de reliure:</td>

! 		<td>

! 			<select name="f4" size="1">

! 			<!-- TMPL_IF name="f4 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4a" -->

! 				<option value="a" SELECTED>Originale</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Originale</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4b" -->

! 				<option value="b" SELECTED>Deuxieme reliure</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Deuxieme reliure</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4c" -->

! 				<option value="c" SELECTED>Reliure moderne</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Reliure moderne</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4d" -->

! 				<option value="d" SELECTED>Restauree, fac simile</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Restauree, fac simile</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4e" -->

! 				<option value="e" SELECTED>Restauree, imitation</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Restauree, imitation</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4f" -->

! 				<option value="f" SELECTED>Reliee avec un autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Reliee avec un autre</ption>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4h" -->

! 				<option value="h" SELECTED>Non relie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Non relie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 		</td></tr>	<tr>

! 		<td>Relie avec:</td>

! 		<td>

! 			<select name="f5" size="1">

! 			<!-- TMPL_IF name="f5 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f50" -->

! 				<option value="0" SELECTED>Relie seul</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="0">Relie seul</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f51" -->

! 				<option value="1" SELECTED>Relie avec d'autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="1">Relie avec d'autre</option>

! 			<!-- /TMPL_IF -->

! 		</td></tr><tr>

! 	<td>Etat de conservation - reliure:</td>

! 		<td>

! 			<select name="f6" size="1">

! 			<!-- TMPL_IF name="f6 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6a" -->

! 				<option value="a" SELECTED>Excellent</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Excellent</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6b" -->

! 				<option value="b" SELECTED>Bon</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Bon</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6c" -->

! 				<option value="c" SELECTED>Usage</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Usage</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6d" -->

! 				<option value="d" SELECTED>Deteriore</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Deteriore</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6e" -->

! 				<option value="e" SELECTED>Dos casse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Dos casse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6f" -->

! 				<option value="f" SELECTED>Pages manquantes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Pages manquantes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! </td></tr><tr>

! 	<td>Etat de conservation - livre 1 :</td>

! 		<td>

! 			<select name="f7" size="1">

! 			<!-- TMPL_IF name="f7 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7a" -->

! 				<option value="a" SELECTED>Excellent</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Excellent</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7b" -->

! 				<option value="b" SELECTED>Bon</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Bon</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7c" -->

! 				<option value="c" SELECTED>Usage</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Usage</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7d" -->

! 				<option value="d" SELECTED>Deteriore</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Deteriore</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7e" -->

! 				<option value="e" SELECTED>Dos casse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Dos casse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7f" -->

! 				<option value="f" SELECTED>Pages manquantes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Pages manquantes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! </td></tr><tr>

! 	<td>Etat de conservation - livre 2 :</td>

! 		<td>

! 			<select name="f8" size="1">

! 			<!-- TMPL_IF name="f8 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8a" -->

! 				<option value="a" SELECTED>Excellent</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Excellent</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8b" -->

! 				<option value="b" SELECTED>Bon</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Bon</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8c" -->

! 				<option value="c" SELECTED>Usage</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Usage</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8d" -->

! 				<option value="d" SELECTED>Deteriore</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Deteriore</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8e" -->

! 				<option value="e" SELECTED>Dos casse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Dos casse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8f" -->

! 				<option value="f" SELECTED>Pages manquantes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Pages manquantes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! </td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,401 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ cod? 141a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Mat?riau de reliure 1</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Parchemin, velin</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Parchemin, velin</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Cuir</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Cuir</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Bois</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Bois</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1d" -->
! 		<option value="d" SELECTED>Tissus</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Tissus</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Mat?riau synth?tique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Mat?riau synth?tique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1f" -->
! 		<option value="f" SELECTED>Carton</ption>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Carton</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1g" -->
! 		<option value="g" SELECTED>Papier</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Papier</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1h" -->
! 		<option value="h" SELECTED>Non reli?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Non reli?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Mat?riau de reliure 2</label>
! 	<select name="f2" size="1">
! 		<!-- TMPL_IF name="f2 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2a" -->
! 		<option value="a" SELECTED>Parchemin, velin</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Parchemin, velin</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2b" -->
! 		<option value="b" SELECTED>Cuir</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Cuir</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2c" -->
! 		<option value="c" SELECTED>Bois</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Bois</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2d" -->
! 		<option value="d" SELECTED>Tissus</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Tissus</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2e" -->
! 		<option value="e" SELECTED>Mat?riau synth?tique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Mat?riau synth?tique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2f" -->
! 		<option value="f" SELECTED>Carton</ption>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Carton</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2g" -->
! 		<option value="g" SELECTED>Papier</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Papier</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2h" -->
! 		<option value="h" SELECTED>Non reli?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Non reli?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Mat?riau de reliure 3</label>
! 	<select name="f3" size="1">
! 		<!-- TMPL_IF name="f3 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3a" -->
! 		<option value="a" SELECTED>Parchemin, velin</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Parchemin, velin</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3b" -->
! 		<option value="b" SELECTED>Cuir</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Cuir</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3c" -->
! 		<option value="c" SELECTED>Bois</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Bois</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3d" -->
! 		<option value="d" SELECTED>Tissus</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Tissus</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3e" -->
! 		<option value="e" SELECTED>Mat?riau synth?tique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Mat?riau synth?tique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3f" -->
! 		<option value="f" SELECTED>Carton</ption>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Carton</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3g" -->
! 		<option value="g" SELECTED>Papier</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Papier</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3h" -->
! 		<option value="h" SELECTED>Non reli?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Non reli?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Type de reliure</label>
! 	<select name="f4" size="1">
! 		<!-- TMPL_IF name="f4 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4a" -->
! 		<option value="a" SELECTED>Originale</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Originale</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4b" -->
! 		<option value="b" SELECTED>Deuxi?me reliure</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Deuxi?me reliure</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4c" -->
! 		<option value="c" SELECTED>Reliure moderne</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Reliure moderne</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4d" -->
! 		<option value="d" SELECTED>Restaur?e, fac-simil?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Restaur?e, fac-simil?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4e" -->
! 		<option value="e" SELECTED>Restaur?e, imitation</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Restaur?e, imitation</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4f" -->
! 		<option value="f" SELECTED>Reli? avec un autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Reli? avec un autre</ption>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4h" -->
! 		<option value="h" SELECTED>Non reli?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Non reli?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Reli? avec</label>
! 	<select name="f5" size="1">
! 		<!-- TMPL_IF name="f5 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f50" -->
! 		<option value="0" SELECTED>Reli? seul</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="0">Reli? seul</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f51" -->
! 		<option value="1" SELECTED>Reli? avec d'autres</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="1">Reli? avec d'autres</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Etat de conservation - reliure</label>
! 	<select name="f6" size="1">
! 		<!-- TMPL_IF name="f6 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6a" -->
! 		<option value="a" SELECTED>Excellent</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Excellent</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6b" -->
! 		<option value="b" SELECTED>Bon</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Bon</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6c" -->
! 		<option value="c" SELECTED>Usag?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Usag?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6d" -->
! 		<option value="d" SELECTED>D?t?rior?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">D?t?rior?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6e" -->
! 		<option value="e" SELECTED>Dos cass?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Dos cass?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6f" -->
! 		<option value="f" SELECTED>Pages manquantes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Pages manquantes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Etat de conservation - livre 1</label>
! 	<select name="f7" size="1">
! 		<!-- TMPL_IF name="f7 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7a" -->
! 		<option value="a" SELECTED>Excellent</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Excellent</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7b" -->
! 		<option value="b" SELECTED>Bon</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Bon</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7c" -->
! 		<option value="c" SELECTED>Usag?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Usag?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7d" -->
! 		<option value="d" SELECTED>D?t?rior?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">D?t?rior?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7e" -->
! 		<option value="e" SELECTED>Dos cass?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Dos cass?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7f" -->
! 		<option value="f" SELECTED>Pages manquantes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Pages manquantes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f7z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Etat de conservation - livre 2</label>
! 	<select name="f8" size="1">
! 		<!-- TMPL_IF name="f8 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8a" -->
! 		<option value="a" SELECTED>Excellent</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Excellent</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8b" -->
! 		<option value="b" SELECTED>Bon</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Bon</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8c" -->
! 		<option value="c" SELECTED>Usag?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Usag?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8d" -->
! 		<option value="d" SELECTED>D?t?rior?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">D?t?rior?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8e" -->
! 		<option value="e" SELECTED>Dos cass?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Dos cass?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8f" -->
! 		<option value="f" SELECTED>Pages manquantes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Pages manquantes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:31:56 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:31:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_128a.tmpl,1.2,1.3
Message-ID: <E1Ddrfo-0000Kz-UM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1271/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_128a.tmpl 
Log Message:
Template for 128a field plugin

Index: unimarc_field_128a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_128a.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_128a.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_128a.tmpl	2 Jun 2005 15:31:54 -0000	1.3
***************
*** 1,382 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 128a</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Forme de la composition:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1  " -->

! 				<option value="  " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="  ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ai" -->

! 				<option value="ai" SELECTED>Airs</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ai">Airs</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1an" -->

! 				<option value="an" SELECTED>Hymnes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="an">Hymnes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ar" -->

! 				<option value="ar" SELECTED>Arias</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ar">Arias</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bt" -->

! 				<option value="bt" SELECTED>Ballets</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bt">Ballets</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bd" -->

! 				<option value="bd" SELECTED>Ballades</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bd">Ballades</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bg" -->

! 				<option value="bg" SELECTED>Bluegrass</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bg">Bluegrass</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bl" -->

! 				<option value="bl" SELECTED>Blues</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bl">Blues</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cb" -->

! 				<option value="cb" SELECTED>Chant (non chretien)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cb">Chant (non chretien)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cc" -->

! 				<option value="cc" SELECTED>Chant (chretien)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cc">Chant (chretien)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cl" -->

! 				<option value="cl" SELECTED>Chorale-prelude</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cl">Chorale-prelude</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cg" -->

! 				<option value="cg" SELECTED>Concerto grosso</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cg">Concerto grosso</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ch" -->

! 				<option value="ch" SELECTED>Chorales</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ch">Chorales</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cn" -->

! 				<option value="cn" SELECTED>Canons</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cn">Canons</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1co" -->

! 				<option value="co" SELECTED>Concertos</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="co">Concertos</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cp" -->

! 				<option value="cp" SELECTED>Chansons (Polyphoniques)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cp">Chansons (Polyphoniques)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cr" -->

! 				<option value="cr" SELECTED>Chant de noel</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cr">Chant de noel</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cs" -->

! 				<option value="cs" SELECTED>Musique aleatoire</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cs">Musique aleatoire</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ct" -->

! 				<option value="ct" SELECTED>Cantates</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ct">Cantates</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cy" -->

! 				<option value="cy" SELECTED>Country music</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cy">Country music</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cz" -->

! 				<option value="cz" SELECTED>Canzones</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cz">Canzones</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1df" -->

! 				<option value="df" SELECTED>Danse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="df">Danse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1dv" -->

! 				<option value="dv" SELECTED>Divertimentos</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="dv">Divertimentos</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1fg" -->

! 				<option value="fg" SELECTED>Fugues</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="fg">Fugues</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1fm" -->

! 				<option value="fm" SELECTED>Musique Folklorique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="fm">Musique Folklorique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ft" -->

! 				<option value="ft" SELECTED>Fantaisies</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ft">Fantaisies</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1gm" -->

! 				<option value="gm" SELECTED>Gospel</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="gm">Gospel</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1hy" -->

! 				<option value="hy" SELECTED>Hymnes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="hy">Hymnes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1in" -->

! 				<option value="in" SELECTED>Intermezzos</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="in">Intermezzos</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1jz" -->

! 				<option value="jz" SELECTED>Jazz</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="jz">Jazz</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1li" -->

! 				<option value="li" SELECTED>Lieder</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="li">Lieder</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1mc" -->

! 				<option value="mc" SELECTED>Comedies musicales,revues</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="mc">Comedies musicales, revues</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1md" -->

! 				<option value="md" SELECTED>Madrigaux</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="md">Madrigaux</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1mi" -->

! 				<option value="mi" SELECTED>Menuets</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="mi">Menuets</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1mr" -->

! 				<option value="mr" SELECTED>Marches</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="mr">Marches</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ms" -->

! 				<option value="ms" SELECTED>Messes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ms">Messes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1mo" -->

! 				<option value="mo" SELECTED>Motets</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="mo">Motets</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1mp" -->

! 				<option value="mp" SELECTED>Bande originale du film</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="mp">Bande originale du film</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1mu" -->

! 				<option value="mu" SELECTED>Formes multiples</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="mu">Formes multiples</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1mz" -->

! 				<option value="mz" SELECTED>Mazurkas</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="mz">Mazurkas</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1nc" -->

! 				<option value="nc" SELECTED>Nocturnes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="nc">Nocturnes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1op" -->

! 				<option value="op" SELECTED>Operas, operettes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="op">Operas, operettes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1or" -->

! 				<option value="or" SELECTED>Oratorios</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="or">Oratorios</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ov" -->

! 				<option value="ov" SELECTED>Ouvertures</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ov">Ouvertures</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pf" -->

! 				<option value="pf" SELECTED>Prelude et fugue</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pf">Prelude et fugue</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pg" -->

! 				<option value="pg" SELECTED>Musique descriptive</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pg">Musique descriptive</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pm" -->

! 				<option value="pm" SELECTED>Passions</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pm">Passions</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1po" -->

! 				<option value="po" SELECTED>Polonaises</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="po">Polonaises</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pp" -->

! 				<option value="pp" SELECTED>Musique populaire</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pp">Musique populaire</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ps" -->

! 				<option value="ps" SELECTED>Passacailles</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ps">Passacailles</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pt" -->

! 				<option value="pt" SELECTED>Chant</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pt">Chant</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pv" -->

! 				<option value="pv" SELECTED>Pavanes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pv">Pavanes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1rc" -->

! 				<option value="rc" SELECTED>Rock</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="rc">Rock</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1rd" -->

! 				<option value="rd" SELECTED>Rondos</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="rd">Rondos</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1rg" -->

! 				<option value="rg" SELECTED>Ragtime</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="rg">Ragtime</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ri" -->

! 				<option value="ri" SELECTED>Ricercari</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ri">Ricercari</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1rp" -->

! 				<option value="rp" SELECTED>Rhapsodies</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="rp">Rhapsodies</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1rq" -->

! 				<option value="rq" SELECTED>Requiem</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="rq">Requiem</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sg" -->

! 				<option value="sg" SELECTED>Chansons, melodies</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sg">Chansons, melodies</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1si" -->

! 				<option value="si" SELECTED>Sinfonias</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="si">Sinfonias</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sn" -->

! 				<option value="sn" SELECTED>Sonates</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sn">Sonates</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sp" -->

! 				<option value="sp" SELECTED>Poemes symphoniques</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sp">Poemes symphoniques</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sq" -->

! 				<option value="sq" SELECTED>Square dance</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sq">Square dance</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1st" -->

! 				<option value="st" SELECTED>Etudes et exercices</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="st">Etudes et exercices</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1su" -->

! 				<option value="su" SELECTED>Suites</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="su">Suites</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sy" -->

! 				<option value="sy" SELECTED>Symphonies</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sy">Symphonies</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tc" -->

! 				<option value="tc" SELECTED>Toccatas</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tc">Toccatas</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ts" -->

! 				<option value="ts" SELECTED>Sonates en trio</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ts">Sonates en trio</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vr" -->

! 				<option value="vr" SELECTED>Variations</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vr">Variations</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wz" -->

! 				<option value="wz" SELECTED>Valses</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wz">Valses</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1zz" -->

! 				<option value="zz" SELECTED>Variations</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="zz">Variations</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,384 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ cod? 128a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Forme de la composition</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1  " -->
! 		<option value="  " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="  ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ai" -->
! 		<option value="ai" SELECTED>Airs</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ai">Airs</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1an" -->
! 		<option value="an" SELECTED>Hymnes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="an">Hymnes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ar" -->
! 		<option value="ar" SELECTED>Arias</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ar">Arias</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bt" -->
! 		<option value="bt" SELECTED>Ballets</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bt">Ballets</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bd" -->
! 		<option value="bd" SELECTED>Ballades</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bd">Ballades</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1mp" -->
! 		<option value="mp" SELECTED>Bande originale de film</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="mp">Bande originale de film</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bg" -->
! 		<option value="bg" SELECTED>Bluegrass</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bg">Bluegrass</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bl" -->
! 		<option value="bl" SELECTED>Blues</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bl">Blues</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ct" -->
! 		<option value="ct" SELECTED>Cantates</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ct">Cantates</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cn" -->
! 		<option value="cn" SELECTED>Canons</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cn">Canons</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cz" -->
! 		<option value="cz" SELECTED>Canzones</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cz">Canzones</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sg" -->
! 		<option value="sg" SELECTED>Chansons, m?lodies</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sg">Chansons, m?lodies</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cp" -->
! 		<option value="cp" SELECTED>Chansons (Polyphoniques)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cp">Chansons (Polyphoniques)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cb" -->
! 		<option value="cb" SELECTED>Chant (non chr?tien)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cb">Chant (non chr?tien)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cc" -->
! 		<option value="cc" SELECTED>Chant (chr?tien)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cc">Chant (chr?tien)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pt" -->
! 		<option value="pt" SELECTED>Chant (plusieurs voix)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pt">Chant (plusieurs voix)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cr" -->
! 		<option value="cr" SELECTED>Chants de No?l</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cr">Chants de No?l</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ch" -->
! 		<option value="ch" SELECTED>Chorales</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ch">Chorales</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1mc" -->
! 		<option value="mc" SELECTED>Com?dies musicales, revues</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="mc">Com?dies musicales, revues</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cg" -->
! 		<option value="cg" SELECTED>Concerto grosso</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cg">Concerto grosso</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1co" -->
! 		<option value="co" SELECTED>Concertos</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="co">Concertos</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cy" -->
! 		<option value="cy" SELECTED>Country music</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cy">Country music</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1df" -->
! 		<option value="df" SELECTED>Danse</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="df">Danse</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1dv" -->
! 		<option value="dv" SELECTED>Divertimentos</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="dv">Divertimentos</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1st" -->
! 		<option value="st" SELECTED>Etudes et exercices</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="st">Etudes et exercices</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1fg" -->
! 		<option value="fg" SELECTED>Fugues</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="fg">Fugues</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ft" -->
! 		<option value="ft" SELECTED>Fantaisies</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ft">Fantaisies</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1mu" -->
! 		<option value="mu" SELECTED>Formes multiples</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="mu">Formes multiples</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1gm" -->
! 		<option value="gm" SELECTED>Gospel</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="gm">Gospel</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1hy" -->
! 		<option value="hy" SELECTED>Hymnes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="hy">Hymnes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1in" -->
! 		<option value="in" SELECTED>Intermezzos</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="in">Intermezzos</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1jz" -->
! 		<option value="jz" SELECTED>Jazz</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="jz">Jazz</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1li" -->
! 		<option value="li" SELECTED>Lieder</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="li">Lieder</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1md" -->
! 		<option value="md" SELECTED>Madrigaux</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="md">Madrigaux</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1mi" -->
! 		<option value="mi" SELECTED>Menuets</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="mi">Menuets</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1mr" -->
! 		<option value="mr" SELECTED>Marches</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="mr">Marches</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ms" -->
! 		<option value="ms" SELECTED>Messes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ms">Messes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1mo" -->
! 		<option value="mo" SELECTED>Motets</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="mo">Motets</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1mz" -->
! 		<option value="mz" SELECTED>Mazurkas</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="mz">Mazurkas</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pg" -->
! 		<option value="pg" SELECTED>Musique descriptive</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pg">Musique descriptive</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cs" -->
! 		<option value="cs" SELECTED>Musique al?atoire</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cs">Musique al?atoire</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1fm" -->
! 		<option value="fm" SELECTED>Musique folklorique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="fm">Musique folklorique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1nc" -->
! 		<option value="nc" SELECTED>Nocturnes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="nc">Nocturnes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1op" -->
! 		<option value="op" SELECTED>Op?ras, op?rettes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="op">Op?ras, op?rettes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1or" -->
! 		<option value="or" SELECTED>Oratorios</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="or">Oratorios</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ov" -->
! 		<option value="ov" SELECTED>Ouvertures</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ov">Ouvertures</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pf" -->
! 		<option value="pf" SELECTED>Pr?lude et fugue</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pf">Pr?lude et fugue</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pm" -->
! 		<option value="pm" SELECTED>Passions</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pm">Passions</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1po" -->
! 		<option value="po" SELECTED>Polonaises</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="po">Polonaises</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pp" -->
! 		<option value="pp" SELECTED>Musique populaire</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pp">Musique populaire</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ps" -->
! 		<option value="ps" SELECTED>Passacailles</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ps">Passacailles</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pv" -->
! 		<option value="pv" SELECTED>Pavanes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pv">Pavanes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sp" -->
! 		<option value="sp" SELECTED>Po?mes symphoniques</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sp">Po?mes symphoniques</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cl" -->
! 		<option value="cl" SELECTED>Pr?lude choral</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cl">Pr?lude choral</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1rg" -->
! 		<option value="rg" SELECTED>Ragtime</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="rg">Ragtime</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1rq" -->
! 		<option value="rq" SELECTED>Requiems</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="rq">Requiems</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1rp" -->
! 		<option value="rp" SELECTED>Rhapsodies</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="rp">Rhapsodies</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ri" -->
! 		<option value="ri" SELECTED>Ricercari</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ri">Ricercari</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1rc" -->
! 		<option value="rc" SELECTED>Rock</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="rc">Rock</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1rd" -->
! 		<option value="rd" SELECTED>Rondos</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="rd">Rondos</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1si" -->
! 		<option value="si" SELECTED>Sinfonias</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="si">Sinfonias</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sn" -->
! 		<option value="sn" SELECTED>Sonates</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sn">Sonates</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ts" -->
! 		<option value="ts" SELECTED>Sonates en trio</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ts">Sonates en trio</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sq" -->
! 		<option value="sq" SELECTED>Square dance</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sq">Square dance</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1su" -->
! 		<option value="su" SELECTED>Suites</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="su">Suites</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sy" -->
! 		<option value="sy" SELECTED>Symphonies</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sy">Symphonies</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tc" -->
! 		<option value="tc" SELECTED>Toccatas</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tc">Toccatas</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wz" -->
! 		<option value="wz" SELECTED>Valses</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wz">Valses</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vr" -->
! 		<option value="vr" SELECTED>Variations</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vr">Variations</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1zz" -->
! 		<option value="zz" SELECTED>Autres</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="zz">Autres</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:32:23 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:32:23 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_128b.tmpl,1.2,1.3
Message-ID: <E1DdrgF-0000MD-9T@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1362/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_128b.tmpl 
Log Message:
Template for 128b field plugin

Index: unimarc_field_128b.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_128b.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_128b.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_128b.tmpl	2 Jun 2005 15:32:21 -0000	1.3
***************
*** 1,472 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 128b</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Instruments ou voix dans un ensemble:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1  " -->

! 				<option value="  " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="  ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ba" -->

! 				<option value="ba" SELECTED>Cor</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ba">Cor</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bb" -->

! 				<option value="bb" SELECTED>Trompette</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bb">Trompette</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bc" -->

! 				<option value="bc" SELECTED>Cornet a piston</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bc">Cornet a piston</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bd" -->

! 				<option value="bd" SELECTED>Trombone</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bd">Trombone</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1be" -->

! 				<option value="be" SELECTED>Tuba</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="be">Tuba</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bf" -->

! 				<option value="bf" SELECTED>Saxophone</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bf">Saxophone</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bt" -->

! 				<option value="bt" SELECTED>Ethniques</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bt">Ethniques</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bu" -->

! 				<option value="bu" SELECTED>Non precise (Cuivre)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bu">Non precise (Cuivre)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1bz" -->

! 				<option value="bz" SELECTED>Autre cuivre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="bz">Autre cuivre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ca" -->

! 				<option value="ca" SELECTED>Mixtes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ca">Mixtes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cb" -->

! 				<option value="cb" SELECTED>Femmes </option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cb">Femmes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cc" -->

! 				<option value="cc" SELECTED>Hommes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cc">Hommes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cd" -->

! 				<option value="cd" SELECTED>Enfants</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cd">Enfants</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ct" -->

! 				<option value="ct" SELECTED>Ethniques</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ct">Ethniques</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1cu" -->

! 				<option value="cu" SELECTED>Non precise (Choeurs)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="cu">Non precise (Choeurs)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1oa" -->

! 				<option value="oa" SELECTED>Orchestre symphonique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="oa">Orchestre symphonique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ob" -->

! 				<option value="ob" SELECTED>Orchestre de chambre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ob">Orchestre de chambre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1oc" -->

! 				<option value="oc" SELECTED>Orchestres a cordes</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="oc">Orchestres a cordes</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1od" -->

! 				<option value="od" SELECTED>Fanfare</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="od">Fanfare</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1oe" -->

! 				<option value="oe" SELECTED>Orchestre de danse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="oe">Orchestre de danse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1of" -->

! 				<option value="of" SELECTED>Grand ensemble - orchestre de cuivres</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="of">Grand ensemble - orchestre de cuivres</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ot" -->

! 				<option value="ot" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ot">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ou" -->

! 				<option value="ou" SELECTED>Non precise (orchestre)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ou">Non precise (orchestre)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1oz" -->

! 				<option value="oz" SELECTED>Autre orchestre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="oz">Autre orchestre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pa" -->

! 				<option value="pa" SELECTED>Tympanon</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pa">Tympanon</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pb" -->

! 				<option value="pb" SELECTED>Xylophone</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pb">Xylophone</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pc" -->

! 				<option value="pc" SELECTED>Marimba</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pc">Marimba</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pd" -->

! 				<option value="pd" SELECTED>Tambour, batterie</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pd">Tambour, batterie</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pt" -->

! 				<option value="pt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pu" -->

! 				<option value="pu" SELECTED>Non precise (percussion)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pu">Non precise (percussion)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1pz -->

! 				<option value="pz" SELECTED>Autre percussions</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="pz">Autre percussions</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sa" -->

! 				<option value="sa" SELECTED>Violon</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sa">Violon</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sb" -->

! 				<option value="sb" SELECTED>Alto</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sb">Alto</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sc" -->

! 				<option value="sc" SELECTED>Violoncelle</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sc">Violoncelle</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sd" -->

! 				<option value="sd" SELECTED>Contrebasse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sd">Contrebasse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1se" -->

! 				<option value="se" SELECTED>Viole</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="se">Viole</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sf" -->

! 				<option value="sf" SELECTED>Viole d'amour</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sf">Viole d'amour</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sg" -->

! 				<option value="sg" SELECTED>Viole de gambe</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sg">Viole de gambe</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1st" -->

! 				<option value="st" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="st">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1su" -->

! 				<option value="su" SELECTED>Non precise (Corde frottee)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="su">Non precise (Corde frottee)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1sz" -->

! 				<option value="sz" SELECTED>Autre (Corde frottee)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="sz">Autre (Corde frottee)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1uu" -->

! 				<option value="uu" SELECTED>Non precise (Non precise)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="uu">Non precise (Non precise)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ea" -->

! 				<option value="ea" SELECTED>Synthetiseur</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ea">Synthetiseur</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1eb" -->

! 				<option value="eb" SELECTED>Bande magnetique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="eb">Bande magnetique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ec" -->

! 				<option value="ec" SELECTED>Ordinateur</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ec">Ordinateur</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ed" -->

! 				<option value="ed" SELECTED>Ondes Martenot</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ed">Ondes Martenot</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1eu" -->

! 				<option value="eu" SELECTED>Non precise (Electronique)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="eu">Non precise (Electronique)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ez" -->

! 				<option value="ez" SELECTED>Autre (Electronique)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ez">Autre (Electronique)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ka" -->

! 				<option value="ka" SELECTED>Piano</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ka">Piano</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kb" -->

! 				<option value="kb" SELECTED>Orgue</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kb">Orgue</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kc" -->

! 				<option value="kc" SELECTED>Clavecin</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kc">Clavecin</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kd" -->

! 				<option value="kd" SELECTED>Clavicorde</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kd">Clavicorde</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ke" -->

! 				<option value="ke" SELECTED>Continuo</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ke">Continuo</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kf" -->

! 				<option value="kf" SELECTED>Celesta</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kf">Celesta</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kt" -->

! 				<option value="kt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ku" -->

! 				<option value="ku" SELECTED>Non precise (clavier)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ku">Non precise (clavier)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1kz" -->

! 				<option value="kz" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="kz">Autre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1va" -->

! 				<option value="va" SELECTED>Soprano</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="va">Soprano</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vb" -->

! 				<option value="vb" SELECTED>Mezzo-soprano</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vb">Mezzo-soprano</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vc" -->

! 				<option value="vc" SELECTED>Alto</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vc">Alto</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vd" -->

! 				<option value="vd" SELECTED>Tenor</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vd">Tenor</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ve" -->

! 				<option value="ve" SELECTED>Baryton</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ve">Baryton</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vf" -->

! 				<option value="vf" SELECTED>Basse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vf">Basse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vg" -->

! 				<option value="vg" SELECTED>Haute contre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vg">Haute contre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vh" -->

! 				<option value="vh" SELECTED>Voix aigues</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vh">Voix aigues</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vi" -->

! 				<option value="vi" SELECTED>Voix medium</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vi">Voix medium</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vj" -->

! 				<option value="vj" SELECTED>Voix graves</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vj">Voix graves</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vt" -->

! 				<option value="vt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1vu" -->

! 				<option value="vu" SELECTED>Non precise (Voix precise)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="vu">Non precise (Voix precise)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1ta" -->

! 				<option value="ta" SELECTED>Harpe</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="ta">Harpe</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tb" -->

! 				<option value="tb" SELECTED>Famille de la guitare</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tb">Famille de la guitare</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tc" -->

! 				<option value="tc" SELECTED>Famille du luth</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tc">Famille du luth</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1td" -->

! 				<option value="td" SELECTED>Mandoline</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="td">Mandoline</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tt" -->

! 				<option value="tt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tu" -->

! 				<option value="tu" SELECTED>Non precise (Cordes pincees)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tu">Non precise (Cordes pincees)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1tz" -->

! 				<option value="tz" SELECTED>Autre corde pincee</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="tz">Autre corde pincee</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wa" -->

! 				<option value="wa" SELECTED>Flute traversiere</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wa">Flute traversiere</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wb" -->

! 				<option value="wb" SELECTED>Hautbois</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wb">Hautbois</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wc" -->

! 				<option value="wc" SELECTED>Clarinette</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wc">Clarinette</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wd" -->

! 				<option value="wd" SELECTED>Basson</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wd">Basson</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1we" -->

! 				<option value="we" SELECTED>Piccolo</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="we">Piccolo</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wf" -->

! 				<option value="wf" SELECTED>Cor anglais</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wf">Cor anglais</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wg" -->

! 				<option value="wg" SELECTED>Clarinette basse</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wg">Clarinette basse</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wh" -->

! 				<option value="wh" SELECTED>Flute a bec </option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wh">Flute a bec</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wi" -->

! 				<option value="wi" SELECTED>Saxophone</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wi">Saxophone</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wt" -->

! 				<option value="wt" SELECTED>Ethnique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wt">Ethnique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wu" -->

! 				<option value="wu" SELECTED>Non precise</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wu">Non precise</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1wz" -->

! 				<option value="wz" SELECTED>Autre bois</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="wz">Autre bois</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,492 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ cod? 128b</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:10em;">Instruments ou voix dans un ensemble</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1  " -->
! 		<option value="  " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="  ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Cuivres :</option>
! 		<!-- TMPL_IF name="f1ba" -->
! 		<option value="ba" SELECTED>Cor</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ba">Cor</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bb" -->
! 		<option value="bb" SELECTED>Trompette</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bb">Trompette</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bc" -->
! 		<option value="bc" SELECTED>Cornet ? piston</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bc">Cornet ? piston</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bd" -->
! 		<option value="bd" SELECTED>Trombone</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bd">Trombone</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1be" -->
! 		<option value="be" SELECTED>Tuba</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="be">Tuba</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bf" -->
! 		<option value="bf" SELECTED>Saxophone</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bf">Saxophone</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bt" -->
! 		<option value="bt" SELECTED>Ethniques</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bt">Ethniques</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bu" -->
! 		<option value="bu" SELECTED>Non pr?cis?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bu">Non pr?cis?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1bz" -->
! 		<option value="bz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="bz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Choeurs :</option>
! 		<!-- TMPL_IF name="f1ca" -->
! 		<option value="ca" SELECTED>Mixtes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ca">Mixtes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cb" -->
! 		<option value="cb" SELECTED>Femmes </option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cb">Femmes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cc" -->
! 		<option value="cc" SELECTED>Hommes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cc">Hommes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cd" -->
! 		<option value="cd" SELECTED>Enfants</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cd">Enfants</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ct" -->
! 		<option value="ct" SELECTED>Ethniques</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ct">Ethniques</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1cu" -->
! 		<option value="cu" SELECTED>Non pr?cis?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="cu">Non pr?cis?</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Orchestre :</option>
! 		<!-- TMPL_IF name="f1oa" -->
! 		<option value="oa" SELECTED>Orchestre symphonique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="oa">Orchestre symphonique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ob" -->
! 		<option value="ob" SELECTED>Orchestre de chambre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ob">Orchestre de chambre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1oc" -->
! 		<option value="oc" SELECTED>Orchestres ? cordes</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="oc">Orchestres ? cordes</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1od" -->
! 		<option value="od" SELECTED>Fanfare</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="od">Fanfare</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1oe" -->
! 		<option value="oe" SELECTED>Orchestre de danse</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="oe">Orchestre de danse</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1of" -->
! 		<option value="of" SELECTED>Grand ensemble - orchestre de cuivres (cuivres doubl?s ou non, avec ou sans percussions)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="of">Grand ensemble - orchestre de cuivres (cuivres doubl?s ou non, avec ou sans percussions)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ot" -->
! 		<option value="ot" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ot">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ou" -->
! 		<option value="ou" SELECTED>Non pr?cis?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ou">Non pr?cis?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1oz" -->
! 		<option value="oz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="oz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Percussions :</option>
! 		<!-- TMPL_IF name="f1pa" -->
! 		<option value="pa" SELECTED>Tympanon</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pa">Tympanon</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pb" -->
! 		<option value="pb" SELECTED>Xylophone</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pb">Xylophone</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pc" -->
! 		<option value="pc" SELECTED>Marimba</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pc">Marimba</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pd" -->
! 		<option value="pd" SELECTED>Tambour, batterie</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pd">Tambour, batterie</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pt" -->
! 		<option value="pt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pu" -->
! 		<option value="pu" SELECTED>Non pr?cis?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pu">Non pr?cis?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1pz -->
! 		<option value="pz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="pz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Cordes frott?es :</option>
! 		<!-- TMPL_IF name="f1sa" -->
! 		<option value="sa" SELECTED>Violon</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sa">Violon</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sb" -->
! 		<option value="sb" SELECTED>Alto</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sb">Alto</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sc" -->
! 		<option value="sc" SELECTED>Violoncelle</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sc">Violoncelle</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sd" -->
! 		<option value="sd" SELECTED>Contrebasse</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sd">Contrebasse</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1se" -->
! 		<option value="se" SELECTED>Viole</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="se">Viole</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sf" -->
! 		<option value="sf" SELECTED>Viole d'amour</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sf">Viole d'amour</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sg" -->
! 		<option value="sg" SELECTED>Viole de gambe</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sg">Viole de gambe</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1st" -->
! 		<option value="st" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="st">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1su" -->
! 		<option value="su" SELECTED>Non pr?cis?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="su">Non pr?cis?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1sz" -->
! 		<option value="sz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="sz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Electronique :</option>
! 		<!-- TMPL_IF name="f1ea" -->
! 		<option value="ea" SELECTED>Synth?tiseur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ea">Synth?tiseur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1eb" -->
! 		<option value="eb" SELECTED>Bande magn?tique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="eb">Bande magn?tique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ec" -->
! 		<option value="ec" SELECTED>Ordinateur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ec">Ordinateur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ed" -->
! 		<option value="ed" SELECTED>Ondes Martenot</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ed">Ondes Martenot</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1eu" -->
! 		<option value="eu" SELECTED>Non pr?cis?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="eu">Non pr?cis?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ez" -->
! 		<option value="ez" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ez">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Claviers :</option>
! 		<!-- TMPL_IF name="f1ka" -->
! 		<option value="ka" SELECTED>Piano</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ka">Piano</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kb" -->
! 		<option value="kb" SELECTED>Orgue</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kb">Orgue</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kc" -->
! 		<option value="kc" SELECTED>Clavecin</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kc">Clavecin</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kd" -->
! 		<option value="kd" SELECTED>Clavicorde</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kd">Clavicorde</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ke" -->
! 		<option value="ke" SELECTED>Continuo</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ke">Continuo</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kf" -->
! 		<option value="kf" SELECTED>C?lesta</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kf">C?lesta</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kt" -->
! 		<option value="kt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ku" -->
! 		<option value="ku" SELECTED>Non pr?cis?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ku">Non pr?cis?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1kz" -->
! 		<option value="kz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="kz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Voix :</option>
! 		<!-- TMPL_IF name="f1va" -->
! 		<option value="va" SELECTED>Soprano</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="va">Soprano</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vb" -->
! 		<option value="vb" SELECTED>Mezzo-soprano</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vb">Mezzo-soprano</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vc" -->
! 		<option value="vc" SELECTED>Alto</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vc">Alto</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vd" -->
! 		<option value="vd" SELECTED>Tenor</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vd">Tenor</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1ve" -->
! 		<option value="ve" SELECTED>Baryton</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ve">Baryton</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vf" -->
! 		<option value="vf" SELECTED>Basse</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vf">Basse</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vg" -->
! 		<option value="vg" SELECTED>Haute contre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vg">Haute contre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vh" -->
! 		<option value="vh" SELECTED>Voix aigu?s</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vh">Voix aigu?s</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vi" -->
! 		<option value="vi" SELECTED>Voix m?dium</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vi">Voix m?dium</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vj" -->
! 		<option value="vj" SELECTED>Voix graves</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vj">Voix graves</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vt" -->
! 		<option value="vt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1vu" -->
! 		<option value="vu" SELECTED>Non pr?cis?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="vu">Non pr?cis?</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Cordes pinc?es :</option>
! 		<!-- TMPL_IF name="f1ta" -->
! 		<option value="ta" SELECTED>Harpe</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="ta">Harpe</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tb" -->
! 		<option value="tb" SELECTED>Famille de la guitare</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tb">Famille de la guitare</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tc" -->
! 		<option value="tc" SELECTED>Famille du luth</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tc">Famille du luth</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1td" -->
! 		<option value="td" SELECTED>Mandoline</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="td">Mandoline</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tt" -->
! 		<option value="tt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tu" -->
! 		<option value="tu" SELECTED>Non pr?cis?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tu">Non pr?cis?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1tz" -->
! 		<option value="tz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="tz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Bois :</option>
! 		<!-- TMPL_IF name="f1wa" -->
! 		<option value="wa" SELECTED>Fl?te (traversi?re)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wa">Fl?te (traversi?re)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wb" -->
! 		<option value="wb" SELECTED>Hautbois</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wb">Hautbois</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wc" -->
! 		<option value="wc" SELECTED>Clarinette</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wc">Clarinette</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wd" -->
! 		<option value="wd" SELECTED>Basson</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wd">Basson</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1we" -->
! 		<option value="we" SELECTED>Piccolo</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="we">Piccolo</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wf" -->
! 		<option value="wf" SELECTED>Cor anglais</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wf">Cor anglais</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wg" -->
! 		<option value="wg" SELECTED>Clarinette basse</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wg">Clarinette basse</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wh" -->
! 		<option value="wh" SELECTED>Fl?te ? bec </option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wh">Fl?te ? bec</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wi" -->
! 		<option value="wi" SELECTED>Saxophone</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wi">Saxophone</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wt" -->
! 		<option value="wt" SELECTED>Ethnique</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wt">Ethnique</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wu" -->
! 		<option value="wu" SELECTED>Non pr?cis?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wu">Non pr?cis?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1wz" -->
! 		<option value="wz" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="wz">Autre</option>
! 		<!-- /TMPL_IF -->
! 		<option value="" style="font-style:italic"> ---------- Non pr?cis? :</option>
! 		<!-- TMPL_IF name="f1uu" -->
! 		<option value="uu" SELECTED>Non pr?cis?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="uu">Non pr?cis?</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:10em;">Nombre</label>
! 	<input type="text" name="f2" maxlength=2 size=3 value="<!-- TMPL_VAR name="f2" -->"> (sur deux chiffres, compl?ter ?ventuellement avec un 0)
! </p>
! 
! 
! <br>
! <p>
! 	<label style="width:10em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 		document.f_pop.f2.value=document.f_pop.f2.value+'  ';
! 		document.f_pop.f2.value=document.f_pop.f2.value.substring(0,2);
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:33:19 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:33:19 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_130.tmpl,1.2,1.3
Message-ID: <E1Ddrh9-0000V4-Np@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1881/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_130.tmpl 
Log Message:
Template for 130a field plugin

Index: unimarc_field_130.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_130.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** unimarc_field_130.tmpl	1 Mar 2005 13:41:02 -0000	1.2
--- unimarc_field_130.tmpl	2 Jun 2005 15:33:17 -0000	1.3
***************
*** 1,376 ****
! <html>

! <head>

! <title>UNIMARC constructeur champ 130</title>

! </head>

! <body>

! <form name="f_pop" onSubmit="javascript:report()">

! <table>

! 	<tr>

! 		<td>Presentation materielle:</td>

! 		<td>

! 			<select name="f1" size="1">

! 			<!-- TMPL_IF name="f1 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1a" -->

! 				<option value="a" SELECTED>Carte a fenetre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Carte a fenetre</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1b" -->

! 				<option value="b" SELECTED>Microfilm en cartouche</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Microfilm en cartouche</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1c" -->

! 				<option value="c" SELECTED>Microfilm en cassette</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Microfilm en cassette</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1d" -->

! 				<option value="d" SELECTED>Microfilm en bobine</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Microfilm en bobine</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1e" -->

! 				<option value="e" SELECTED>Microfiche</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Microfiche</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1f" -->

! 				<option value="f" SELECTED>Microfiche en cassette</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">Microfiche en cassette</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1g" -->

! 				<option value="g" SELECTED>Micro opaque</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">Micro opaque</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1h" -->

! 				<option value="h" SELECTED>Bande microfilm</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">Bande microfilm</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f1z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr>

! 		<td>Polarite:</td>

! 		<td>

! 			<select name="f2" size="1">

! 			<!-- TMPL_IF name="f2 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2a" -->

! 				<option value="a" SELECTED>Positif</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Positif</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2b" -->

! 				<option value="b" SELECTED>Negatif</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Negatif</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2c" -->

! 				<option value="c" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f2d" -->

! 				<option value="d" SELECTED>Plusieurs polarites</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Plusieurs polarites</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr>

! 		<td>Dimensions:</td>

! 		<td>

! 			<select name="f3" size="1">

! 			<!-- TMPL_IF name="f3 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3a" -->

! 				<option value="a" SELECTED>8 mm (microfilm)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">8 mm (microfilm)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3d" -->

! 				<option value="d" SELECTED>16 mm (microfilm)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">16 mm (microfilm)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3f" -->

! 				<option value="f" SELECTED>35 mm (microfilm)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="f">35 mm (microfilm)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3g" -->

! 				<option value="g" SELECTED>70 mm (microfilm)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="g">70 mm (microfilm)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3h" -->

! 				<option value="h" SELECTED>105 mm (microfilm)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="h">105 mm (microfilm)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3l" -->

! 				<option value="l" SELECTED>3 x 5 pouces</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="l">3 x 5 pouces</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3m" -->

! 				<option value="m" SELECTED>4 x 6 pouces</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="m">4 x 6 pouces</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3o" -->

! 				<option value="o" SELECTED>6 x 9 pouces</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="o">6 x 9 pouces</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3p" -->

! 				<option value="p" SELECTED>9 x 19 cm</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="p">9 x 19 cm</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f3z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr>

! 		<td>Rapport de reduction:</td>

! 		<td>

! 			<select name="f4" size="1">

! 			<!-- TMPL_IF name="f4 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4a" -->

! 				<option value="a" SELECTED>Faible reduction</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Faible reduction</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4b" -->

! 				<option value="b" SELECTED>Normale (16x - 30x)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Normale (16x - 30x)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4c" -->

! 				<option value="c" SELECTED>Elevee (31x - 60x)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Elevee (31x - 60x)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4d" -->

! 				<option value="d" SELECTED>Tres elevee (61x - 90x)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Tres elevee (61x - 90x)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4e" -->

! 				<option value="e" SELECTED>Ultra elevee (91x -)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="e">Ultra elevee (91x -)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f4v" -->

! 				<option value="v" SELECTED>Divers</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="v">Divers</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

!     <tr>

!                 <td>Rapport de reduction specifique</td>

!                 <td><input type="text" name="f5" maxlength=3 size=4 

! value="<!-- TMPL_VAR name="f5" -->"></td>

!         </tr>

! 

! 		</td></tr>

! 	<tr>

! 		<td>Couleur:</td>

! 		<td>

! 			<select name="f6" size="1">

! 			<!-- TMPL_IF name="f6 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6a" -->

! 				<option value="a" SELECTED>Monochrome</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Monochrome</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6b" -->

! 				<option value="b" SELECTED>Couleur</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Couleur</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f6v" -->

! 				<option value="v" SELECTED>Divers</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="v">Divers</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr>

! 		<td>Emulsion:</td>

! 		<td>

! 			<select name="f7" size="1">

! 			<!-- TMPL_IF name="f7 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7a" -->

! 				<option value="a" SELECTED>Sel d'argent</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Sel d'argent</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7b" -->

! 				<option value="b" SELECTED>Diazoique</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Diazoique</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7c" -->

! 				<option value="c" SELECTED>Vesiculaire</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Vesiculaire</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7d" -->

! 				<option value="d" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="d">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7u" -->

! 				<option value="u" SELECTED>Emulsions diverses</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Emulsions diverses</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7x" -->

! 				<option value="x" SELECTED>Non applicable</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="x">Non applicable</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f7z" -->

! 				<option value="z" SELECTED>Autre</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="z">Autre</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr>

! 		<td>Generation (copies):</td>

! 		<td>

! 			<select name="f8" size="1">

! 			<!-- TMPL_IF name="f8 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8a" -->

! 				<option value="a" SELECTED>Premiere generation (master)</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Premiere generation (master)</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8b" -->

! 				<option value="b" SELECTED>Tirage</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Tirage</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8c" -->

! 				<option value="c" SELECTED>Copie de service</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="c">Copie de service</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f8v" -->

! 				<option value="v" SELECTED>Generations diverses</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="v">Generations diverses</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr>

! 		<td>Support de film:</td>

! 		<td>

! 			<select name="f9" size="1">

! 			<!-- TMPL_IF name="f9 " -->

! 				<option value=" " SELECTED>Aucun</option>

! 			<!-- TMPL_ELSE -->

! 				<option value=" ">Aucun</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f9a" -->

! 				<option value="a" SELECTED>Support de securite</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="a">Support de securite</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f9b" -->

! 				<option value="b" SELECTED>Il ne s'agit pas d'un support de securite</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="b">Il ne s'agit pas d'un support de securite</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f9u" -->

! 				<option value="u" SELECTED>Inconnu</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="u">Inconnu</option>

! 			<!-- /TMPL_IF -->

! 			<!-- TMPL_IF name="f9x" -->

! 				<option value="x" SELECTED>Non applicable</option>

! 			<!-- TMPL_ELSE -->

! 				<option value="x">Non applicable</option>

! 			<!-- /TMPL_IF -->

! 			</select>

! 		</td></tr>

! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>

! </table>

! </form>

! <script>

! 	function report() {

! 

! 	    document.f_pop.f5.value=document.f_pop.f5.value+'   ';

! 

! 

! 

! 	    document.f_pop.f5.value=document.f_pop.f5.value.substring(0,3);

! 

! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value ;

! 		self.close();

! 		return false;

! 	}

! </script>

! </body>

! </html>

--- 1,376 ----
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc" style="padding-bottom:10px;margin:10px;width:95%;">
! <h1 class="authority">Assistant champ cod? 130a</h1>
! <form name="f_pop" onSubmit="javascript:report()">
! 
! <p>
! 	<label style="width:20em;">Pr?sentation mat?rielle</label>
! 	<select name="f1" size="1">
! 		<!-- TMPL_IF name="f1 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1a" -->
! 		<option value="a" SELECTED>Carte ? fen?tre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Carte ? fen?tre</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1b" -->
! 		<option value="b" SELECTED>Microfilm en cartouche</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Microfilm en cartouche</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1c" -->
! 		<option value="c" SELECTED>Microfilm en cassette</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Microfilm en cassette</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1d" -->
! 		<option value="d" SELECTED>Microfilm en bobine</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Microfilm en bobine</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1e" -->
! 		<option value="e" SELECTED>Microfiche</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Microfiche</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1f" -->
! 		<option value="f" SELECTED>Microfiche en cassette</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">Microfiche en cassette</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1g" -->
! 		<option value="g" SELECTED>Micro opaque</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">Micro opaque</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1h" -->
! 		<option value="h" SELECTED>Bande microfilm</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">Bande microfilm</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f1z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Polarit?</label>
! 	<select name="f2" size="1">
! 		<!-- TMPL_IF name="f2 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2a" -->
! 		<option value="a" SELECTED>Positif</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Positif</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2b" -->
! 		<option value="b" SELECTED>N?gatif</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">N?gatif</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2c" -->
! 		<option value="c" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f2d" -->
! 		<option value="d" SELECTED>Plusieurs polarit?s</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Plusieurs polarit?s</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Dimensions</label>
! 	<select name="f3" size="1">
! 		<!-- TMPL_IF name="f3 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3a" -->
! 		<option value="a" SELECTED>8 mm (microfilm)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">8 mm (microfilm)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3d" -->
! 		<option value="d" SELECTED>16 mm (microfilm)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">16 mm (microfilm)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3f" -->
! 		<option value="f" SELECTED>35 mm (microfilm)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="f">35 mm (microfilm)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3g" -->
! 		<option value="g" SELECTED>70 mm (microfilm)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="g">70 mm (microfilm)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3h" -->
! 		<option value="h" SELECTED>105 mm (microfilm)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="h">105 mm (microfilm)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3l" -->
! 		<option value="l" SELECTED>3x5 pouces (8x13 cm) (microfiche ou micro opaque)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="l">3x5 pouces (8x13 cm) (microfiche ou micro opaque)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3m" -->
! 		<option value="m" SELECTED>4x6 pouces (10x15 cm) (microfiche ou micro opaque)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="m">4x6 pouces (10x15 cm) (microfiche ou micro opaque)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3o" -->
! 		<option value="o" SELECTED>6x9 pouces (16x23 cm) (microfiche ou micro opaque)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="o">6x9 pouces (16x23 cm) (microfiche ou micro opaque)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3p" -->
! 		<option value="p" SELECTED>3 1/4x7 3/8 pouces (9x19 cm) (carte ? fen?tre)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="p">3 1/4x7 3/8 pouces (9x19 cm) (carte ? fen?tre)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f3z" -->
! 		<option value="z" SELECTED>Autre</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="z">Autre</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Rapport de r?duction</label>
! 	<select name="f4" size="1">
! 		<!-- TMPL_IF name="f4 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4a" -->
! 		<option value="a" SELECTED>Faible r?duction</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Faible r?duction</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4b" -->
! 		<option value="b" SELECTED>Normale (16x - 30x)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Normale (16x - 30x)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4c" -->
! 		<option value="c" SELECTED>Elev?e (31x - 60x)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Elev?e (31x - 60x)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4d" -->
! 		<option value="d" SELECTED>Tr?s ?lev?e (61x - 90x)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="d">Tr?s ?lev?e (61x - 90x)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4e" -->
! 		<option value="e" SELECTED>Ultra ?lev?e (91x -)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="e">Ultra ?lev?e (91x -)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f4v" -->
! 		<option value="v" SELECTED>Divers</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="v">Divers</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Rapport de r?duction sp?cifique</label>
! 	<input type="text" name="f5" maxlength=3 size=4 value="<!-- TMPL_VAR name="f5" -->">
! </p>
! 
! <p>
! 	<label style="width:20em;">Couleur</label>
! 	<select name="f6" size="1">
! 		<!-- TMPL_IF name="f6 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6a" -->
! 		<option value="a" SELECTED>Monochrome</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Monochrome</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6b" -->
! 		<option value="b" SELECTED>Couleur</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Couleur</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f6v" -->
! 		<option value="v" SELECTED>Divers</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="v">Divers</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Emulsion</label>
! 	<select name="f7" size="1">
! 			<!-- TMPL_IF name="f7 " -->
! 			<option value=" " SELECTED>Aucun</option>
! 			<!-- TMPL_ELSE -->
! 			<option value=" ">Aucun</option>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="f7a" -->
! 			<option value="a" SELECTED>Sel d'argent</option>
! 			<!-- TMPL_ELSE -->
! 			<option value="a">Sel d'argent</option>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="f7b" -->
! 			<option value="b" SELECTED>Diazo?que</option>
! 			<!-- TMPL_ELSE -->
! 			<option value="b">Diazo?que</option>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="f7c" -->
! 			<option value="c" SELECTED>V?siculaire</option>
! 			<!-- TMPL_ELSE -->
! 			<option value="c">V?siculaire</option>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="f7d" -->
! 			<option value="d" SELECTED>Inconnu</option>
! 			<!-- TMPL_ELSE -->
! 			<option value="d">Inconnu</option>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="f7u" -->
! 			<option value="u" SELECTED>Emulsions diverses</option>
! 			<!-- TMPL_ELSE -->
! 			<option value="u">Emulsions diverses</option>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="f7x" -->
! 			<option value="x" SELECTED>Non applicable</option>
! 			<!-- TMPL_ELSE -->
! 			<option value="x">Non applicable</option>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="f7z" -->
! 			<option value="z" SELECTED>Autre</option>
! 			<!-- TMPL_ELSE -->
! 			<option value="z">Autre</option>
! 			<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">G?n?ration (copies)</label>
! 	<select name="f8" size="1">
! 		<!-- TMPL_IF name="f8 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8a" -->
! 		<option value="a" SELECTED>Premi?re g?n?ration (master)</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Premi?re g?n?ration (master)</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8b" -->
! 		<option value="b" SELECTED>Tirage</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Tirage</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8c" -->
! 		<option value="c" SELECTED>Copie de service</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="c">Copie de service</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f8v" -->
! 		<option value="v" SELECTED>G?n?rations diverses</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="v">G?n?rations diverses</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <p>
! 	<label style="width:20em;">Support de film</label>
! 	<select name="f9" size="1">
! 		<!-- TMPL_IF name="f9 " -->
! 		<option value=" " SELECTED>Aucun</option>
! 		<!-- TMPL_ELSE -->
! 		<option value=" ">Aucun</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9a" -->
! 		<option value="a" SELECTED>Support de s?curit?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="a">Support de s?curit?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9b" -->
! 		<option value="b" SELECTED>Il ne s'agit pas d'un support de s?curit?</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="b">Il ne s'agit pas d'un support de s?curit?</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9u" -->
! 		<option value="u" SELECTED>Inconnu</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="u">Inconnu</option>
! 		<!-- /TMPL_IF -->
! 		<!-- TMPL_IF name="f9x" -->
! 		<option value="x" SELECTED>Non applicable</option>
! 		<!-- TMPL_ELSE -->
! 		<option value="x">Non applicable</option>
! 		<!-- /TMPL_IF -->
! 	</select>
! </p>
! 
! <br>
! <p>
! 	<label style="width:20em;">&nbsp;</label>
! 	<input type="submit" value="OK" class="button authority">
! </p>
! 
! </form>
! </div>
! <script>
! 	function report() {
! 
! 	    document.f_pop.f5.value=document.f_pop.f5.value+'   ';
! 
! 
! 
! 	    document.f_pop.f5.value=document.f_pop.f5.value.substring(0,3);
! 
! 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value ;
! 		self.close();
! 		return false;
! 	}
! </script>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->




From doxulting at users.sourceforge.net  Thu Jun  2 17:37:16 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:37:16 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_100.pl,1.7,1.8
Message-ID: <E1Ddrky-00016y-Fw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4217/value_builder

Modified Files:
	unimarc_field_100.pl 
Log Message:
Plugin for field 100a

Index: unimarc_field_100.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_100.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** unimarc_field_100.pl	7 Jun 2004 10:07:40 -0000	1.7
--- unimarc_field_100.pl	2 Jun 2005 15:37:14 -0000	1.8
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=1000,height=600,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:37:35 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:37:35 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_105.pl,1.1,1.2
Message-ID: <E1DdrlH-0001AU-LV@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4481/value_builder

Modified Files:
	unimarc_field_105.pl 
Log Message:
Plugin for field 105a

Index: unimarc_field_105.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_105.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_105.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_105.pl	2 Jun 2005 15:37:33 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_105.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 105\",'width=1200,height=400,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_105.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 105\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:38:06 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:38:06 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_106.pl,1.1,1.2
Message-ID: <E1Ddrlm-0001DN-LM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4632/value_builder

Modified Files:
	unimarc_field_106.pl 
Log Message:
Plugin for field 106a

Index: unimarc_field_106.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_106.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_106.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_106.pl	2 Jun 2005 15:38:03 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_106.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 106\",'width=500,height=400,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_106.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 106\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:38:26 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:38:26 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_110.pl,1.1,1.2
Message-ID: <E1Ddrm6-0001Hg-1c@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4887/value_builder

Modified Files:
	unimarc_field_110.pl 
Log Message:
Plugin for field 110a

Index: unimarc_field_110.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_110.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_110.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_110.pl	2 Jun 2005 15:38:23 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_110.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 110\",'width=700,height=600,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_110.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 110\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:38:54 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:38:54 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_115a.pl,1.1,1.2
Message-ID: <E1DdrmY-0001K8-6r@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5026/value_builder

Modified Files:
	unimarc_field_115a.pl 
Log Message:
Plugin for field 115a

Index: unimarc_field_115a.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_115a.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_115a.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_115a.pl	2 Jun 2005 15:38:51 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_115a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 115a\",'width=1200,height=600,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_115a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 115a\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:39:35 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:39:35 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_115b.pl,1.1,1.2
Message-ID: <E1DdrnD-0001QH-EP@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5408/value_builder

Modified Files:
	unimarc_field_115b.pl 
Log Message:
Plugin for field 115b

Index: unimarc_field_115b.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_115b.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_115b.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_115b.pl	2 Jun 2005 15:39:33 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_115b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 115b\",'width=1200,height=600,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_115b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 115b\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:40:08 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:40:08 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_116.pl,1.1,1.2
Message-ID: <E1Ddrnk-0001Ws-Na@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5842/value_builder

Modified Files:
	unimarc_field_116.pl 
Log Message:
Plugin for field 116a

Index: unimarc_field_116.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_116.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_116.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_116.pl	2 Jun 2005 15:40:06 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_116.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 116\",'width=1200,height=600,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_116.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 116\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:40:42 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:40:42 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_117.pl,1.1,1.2
Message-ID: <E1DdroI-0001b8-Qk@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6109/value_builder

Modified Files:
	unimarc_field_117.pl 
Log Message:
Plugin for field 117a

Index: unimarc_field_117.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_117.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_117.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_117.pl	2 Jun 2005 15:40:40 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_117.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 117\",'width=600,height=225,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_117.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 117\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:41:01 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:41:01 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_120.pl,1.1,1.2
Message-ID: <E1Ddrob-0001fk-MJ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6387/value_builder

Modified Files:
	unimarc_field_120.pl 
Log Message:
Plugin for field 120a

Index: unimarc_field_120.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_120.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_120.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_120.pl	2 Jun 2005 15:40:59 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_120.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 120\",'width=1200,height=750,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_120.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 120\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:41:23 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:41:23 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_121a.pl,1.1,1.2
Message-ID: <E1Ddrox-0001iU-UD@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6557/value_builder

Modified Files:
	unimarc_field_121a.pl 
Log Message:
Plugin for field 121a

Index: unimarc_field_121a.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_121a.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_121a.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_121a.pl	2 Jun 2005 15:41:20 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_121a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 121a\",'width=1210,height=750,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_121a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 121a\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:41:40 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:41:40 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_121b.pl,1.1,1.2
Message-ID: <E1DdrpE-0001mM-Lq@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6796/value_builder

Modified Files:
	unimarc_field_121b.pl 
Log Message:
Plugin for field 121b

Index: unimarc_field_121b.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_121b.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_121b.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_121b.pl	2 Jun 2005 15:41:38 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_121b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 121b\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_121b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 121b\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:42:11 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:42:11 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_122.pl,1.1,1.2
Message-ID: <E1Ddrpj-0001p7-KX@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6982/value_builder

Modified Files:
	unimarc_field_122.pl 
Log Message:
Plugin for field 122a

Index: unimarc_field_122.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_122.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_122.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_122.pl	2 Jun 2005 15:42:03 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_122.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 122\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_122.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 122\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:42:39 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:42:39 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_123a.pl,1.1,1.2
Message-ID: <E1DdrqB-0001rs-OR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7138/value_builder

Modified Files:
	unimarc_field_123a.pl 
Log Message:
Plugin for field 123a

Index: unimarc_field_123a.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_123a.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_123a.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_123a.pl	2 Jun 2005 15:42:31 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123a\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123a\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:42:56 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:42:56 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_123d.pl,1.1,1.2
Message-ID: <E1DdrqS-0001tf-Ea@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7265/value_builder

Modified Files:
	unimarc_field_123d.pl 
Log Message:
Plugin for field 123d

Index: unimarc_field_123d.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_123d.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_123d.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_123d.pl	2 Jun 2005 15:42:54 -0000	1.2
***************
*** 40,44 ****
  sub plugin_javascript {
  my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
! my $function_name= "123g".(int(rand(100000))+1);
  my $res="
  <script>
--- 40,44 ----
  sub plugin_javascript {
  my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
! my $function_name= "123d".(int(rand(100000))+1);
  my $res="
  <script>
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123g.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123g\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123d.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123d\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }
***************
*** 73,77 ****
  
  my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "value_builder/unimarc_field_123g.tmpl",
  			     query => $input,
  			     type => "intranet",
--- 73,77 ----
  
  my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "value_builder/unimarc_field_123d.tmpl",
  			     query => $input,
  			     type => "intranet",




From doxulting at users.sourceforge.net  Thu Jun  2 17:43:13 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:43:13 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_123e.pl,1.1,1.2
Message-ID: <E1Ddrqj-0001vt-Jg@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7400/value_builder

Modified Files:
	unimarc_field_123e.pl 
Log Message:
Plugin for field 123e

Index: unimarc_field_123e.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_123e.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_123e.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_123e.pl	2 Jun 2005 15:43:11 -0000	1.2
***************
*** 40,44 ****
  sub plugin_javascript {
  my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
! my $function_name= "123g".(int(rand(100000))+1);
  my $res="
  <script>
--- 40,44 ----
  sub plugin_javascript {
  my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
! my $function_name= "123e".(int(rand(100000))+1);
  my $res="
  <script>
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123g.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123g\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123e.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123e\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }
***************
*** 73,77 ****
  
  my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "value_builder/unimarc_field_123g.tmpl",
  			     query => $input,
  			     type => "intranet",
--- 73,77 ----
  
  my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "value_builder/unimarc_field_123e.tmpl",
  			     query => $input,
  			     type => "intranet",




From doxulting at users.sourceforge.net  Thu Jun  2 17:43:30 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:43:30 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_123f.pl,1.1,1.2
Message-ID: <E1Ddrr0-0001xY-MX@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7504/value_builder

Modified Files:
	unimarc_field_123f.pl 
Log Message:
Plugin for field 123f

Index: unimarc_field_123f.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_123f.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_123f.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_123f.pl	2 Jun 2005 15:43:27 -0000	1.2
***************
*** 40,44 ****
  sub plugin_javascript {
  my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
! my $function_name= "123g".(int(rand(100000))+1);
  my $res="
  <script>
--- 40,44 ----
  sub plugin_javascript {
  my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
! my $function_name= "123f".(int(rand(100000))+1);
  my $res="
  <script>
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123g.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123g\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123f.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123f\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }
***************
*** 73,77 ****
  
  my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "value_builder/unimarc_field_123g.tmpl",
  			     query => $input,
  			     type => "intranet",
--- 73,77 ----
  
  my ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "value_builder/unimarc_field_123f.tmpl",
  			     query => $input,
  			     type => "intranet",




From doxulting at users.sourceforge.net  Thu Jun  2 17:43:49 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:43:49 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_123g.pl,1.1,1.2
Message-ID: <E1DdrrJ-0001zg-C2@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7647/value_builder

Modified Files:
	unimarc_field_123g.pl 
Log Message:
Plugin for field 123g

Index: unimarc_field_123g.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_123g.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_123g.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_123g.pl	2 Jun 2005 15:43:47 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123g.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123g\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123g.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123g\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:44:04 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:44:04 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_123i.pl,NONE,1.1
Message-ID: <E1DdrrY-00021s-Hx@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7768/value_builder

Added Files:
	unimarc_field_123i.pl 
Log Message:
Plugin for field 123i

--- NEW FILE ---
#!/usr/bin/perl

# $Id: unimarc_field_123i.pl,v 1.1 2005/06/02 15:44:02 doxulting Exp $

# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use C4::Auth;
use CGI;
use C4::Context;
use HTML::Template;
use C4::Search;
use C4::Output;

=head1

plugin_parameters : other parameters added when the plugin is called by the dopop function

=cut
sub plugin_parameters {
my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
return "";
}

sub plugin_javascript {
my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
my $function_name= "123i".(int(rand(100000))+1);
my $res="
<script>
function Focus$function_name(subfield_managed) {
return 1;
}

function Blur$function_name(subfield_managed) {
	return 1;
}

function Clic$function_name(i) {
	defaultvalue=document.forms[0].field_value[i].value;
	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123i.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123i\",'width=800,height=400,toolbar=false,scrollbars=yes');

}
</script>
";

return ($function_name,$res);
}
sub plugin {
my ($input) = @_;
	my %env;

#	my $input = new CGI;
	my $index= $input->param('index');
	my $result= $input->param('result');


	my $dbh = C4::Context->dbh;

my ($template, $loggedinuser, $cookie)
    = get_template_and_user({template_name => "value_builder/unimarc_field_123i.tmpl",
			     query => $input,
			     type => "intranet",
			     authnotrequired => 0,
			     flagsrequired => {parameters => 1},
			     debug => 1,
			     });
	my $f1 = substr($result,0,1);
	my $f2 = substr($result,1,3);
	my $f3 = substr($result,4,2);
	my $f4 = substr($result,6,2);
	$template->param(index => $index,
			 "f1$f1" => $f1,
			 f2 => $f2,
			 f3 => $f3,
			 f4 => $f4);
	print $input->header(-cookie => $cookie),$template->output;
}

1;




From doxulting at users.sourceforge.net  Thu Jun  2 17:44:31 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:44:31 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_123j.pl,NONE,1.1
Message-ID: <E1Ddrrz-00024s-By@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7947/value_builder

Added Files:
	unimarc_field_123j.pl 
Log Message:
Plugin for field 123j

--- NEW FILE ---
#!/usr/bin/perl

# $Id: unimarc_field_123j.pl,v 1.1 2005/06/02 15:44:29 doxulting Exp $

# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use C4::Auth;
use CGI;
use C4::Context;
use HTML::Template;
use C4::Search;
use C4::Output;

=head1

plugin_parameters : other parameters added when the plugin is called by the dopop function

=cut
sub plugin_parameters {
my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
return "";
}

sub plugin_javascript {
my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
my $function_name= "123j".(int(rand(100000))+1);
my $res="
<script>
function Focus$function_name(subfield_managed) {
return 1;
}

function Blur$function_name(subfield_managed) {
	return 1;
}

function Clic$function_name(i) {
	defaultvalue=document.forms[0].field_value[i].value;
	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123j.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123j\",'width=800,height=400,toolbar=false,scrollbars=yes');

}
</script>
";

return ($function_name,$res);
}
sub plugin {
my ($input) = @_;
	my %env;

#	my $input = new CGI;
	my $index= $input->param('index');
	my $result= $input->param('result');


	my $dbh = C4::Context->dbh;

my ($template, $loggedinuser, $cookie)
    = get_template_and_user({template_name => "value_builder/unimarc_field_123j.tmpl",
			     query => $input,
			     type => "intranet",
			     authnotrequired => 0,
			     flagsrequired => {parameters => 1},
			     debug => 1,
			     });
	my $f1 = substr($result,0,1);
	my $f2 = substr($result,1,3);
	my $f3 = substr($result,4,2);
	my $f4 = substr($result,6,2);
	$template->param(index => $index,
			 "f1$f1" => $f1,
			 f2 => $f2,
			 f3 => $f3,
			 f4 => $f4);
	print $input->header(-cookie => $cookie),$template->output;
}

1;




From doxulting at users.sourceforge.net  Thu Jun  2 17:45:04 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:45:04 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_124.pl,1.1,1.2
Message-ID: <E1DdrsW-00029K-Jo@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8220/value_builder

Modified Files:
	unimarc_field_124.pl 
Log Message:
Plugin for field 124

Index: unimarc_field_124.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_124.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_124.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_124.pl	2 Jun 2005 15:44:51 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=500,height=400,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:45:20 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:45:20 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_124a.pl,1.1,1.2
Message-ID: <E1Ddrsm-0002Cv-Ko@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8447/value_builder

Modified Files:
	unimarc_field_124a.pl 
Log Message:
Plugin for field 124a

Index: unimarc_field_124a.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_124a.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_124a.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_124a.pl	2 Jun 2005 15:45:18 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124a\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124a\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:45:52 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:45:52 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_124b.pl,1.1,1.2
Message-ID: <E1DdrtI-0002Hw-I7@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8671/value_builder

Modified Files:
	unimarc_field_124b.pl 
Log Message:
Plugin for field 124b

Index: unimarc_field_124b.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_124b.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_124b.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_124b.pl	2 Jun 2005 15:45:50 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124b\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124b\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:46:13 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:46:13 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_124c.pl,1.1,1.2
Message-ID: <E1Ddrtd-0002Ka-UO@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8915/value_builder

Modified Files:
	unimarc_field_124c.pl 
Log Message:
Plugin for field 124c

Index: unimarc_field_124c.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_124c.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_124c.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_124c.pl	2 Jun 2005 15:46:11 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124c.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124c\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124c.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124c\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:46:30 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:46:30 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_124d.pl,1.1,1.2
Message-ID: <E1Ddrtu-0002OK-OT@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9148/value_builder

Modified Files:
	unimarc_field_124d.pl 
Log Message:
Plugin for field 124d

Index: unimarc_field_124d.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_124d.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_124d.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_124d.pl	2 Jun 2005 15:46:28 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124d.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124d\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124d.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124d\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:46:51 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:46:51 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_124e.pl,1.1,1.2
Message-ID: <E1DdruF-0002RD-0o@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9327/value_builder

Modified Files:
	unimarc_field_124e.pl 
Log Message:
Plugin for field 124e

Index: unimarc_field_124e.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_124e.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_124e.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_124e.pl	2 Jun 2005 15:46:43 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124e.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124e\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124e.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124e\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:47:08 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:47:08 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_124f.pl,1.1,1.2
Message-ID: <E1DdruW-0002Uv-AP@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9557/value_builder

Modified Files:
	unimarc_field_124f.pl 
Log Message:
Plugin for field 124f

Index: unimarc_field_124f.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_124f.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_124f.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_124f.pl	2 Jun 2005 15:47:06 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124f.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124f\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124f.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124f\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:47:37 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:47:37 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_124g.pl,1.1,1.2
Message-ID: <E1Ddruz-0002ZG-6Z@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9807/value_builder

Modified Files:
	unimarc_field_124g.pl 
Log Message:
Plugin for field 124g

Index: unimarc_field_124g.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_124g.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_124g.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_124g.pl	2 Jun 2005 15:47:26 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124g.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124g\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_124g.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 124g\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:47:53 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:47:53 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_125.pl,1.1,1.2
Message-ID: <E1DdrvF-0002dD-As@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10071/value_builder

Modified Files:
	unimarc_field_125.pl 
Log Message:
Plugin for field 125

Index: unimarc_field_125.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_125.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_125.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_125.pl	2 Jun 2005 15:47:51 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=500,height=400,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:48:18 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:48:18 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_125a.pl,1.1,1.2
Message-ID: <E1Ddrve-0002gA-U6@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10256/value_builder

Modified Files:
	unimarc_field_125a.pl 
Log Message:
Plugin for field 125a

Index: unimarc_field_125a.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_125a.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_125a.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_125a.pl	2 Jun 2005 15:48:14 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_125a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 125a\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_125a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 125a\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:48:38 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:48:38 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_125b.pl,1.1,1.2
Message-ID: <E1Ddrvy-0002kq-L9@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10546/value_builder

Modified Files:
	unimarc_field_125b.pl 
Log Message:
Plugin for field 125b

Index: unimarc_field_125b.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_125b.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_125b.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_125b.pl	2 Jun 2005 15:48:36 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_125b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 125b\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_125b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 125b\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:49:30 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:49:30 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_126b.pl,1.1,1.2
Message-ID: <E1Ddrwo-0002sz-Jq@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11030/value_builder

Modified Files:
	unimarc_field_126b.pl 
Log Message:
Plugin for field 126b

Index: unimarc_field_126b.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_126b.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_126b.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_126b.pl	2 Jun 2005 15:49:28 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_126b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 126b\",'width=1000,height=575,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_126b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 126b\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:49:46 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:49:46 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_127.pl,1.1,1.2
Message-ID: <E1Ddrx4-0002wt-Gg@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11288/value_builder

Modified Files:
	unimarc_field_127.pl 
Log Message:
Plugin for field 127a

Index: unimarc_field_127.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_127.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_127.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_127.pl	2 Jun 2005 15:49:44 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_127.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 127\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_127.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 127\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:50:06 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:50:06 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_128a.pl,1.1,1.2
Message-ID: <E1DdrxO-00031v-U9@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11572/value_builder

Modified Files:
	unimarc_field_128a.pl 
Log Message:
Plugin for field 128a

Index: unimarc_field_128a.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_128a.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_128a.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_128a.pl	2 Jun 2005 15:50:04 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_128a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 128a\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_128a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 128a\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:50:26 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:50:26 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_128b.pl,1.1,1.2
Message-ID: <E1Ddrxi-00033n-1k@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11737/value_builder

Modified Files:
	unimarc_field_128b.pl 
Log Message:
Plugin for field 128b

Index: unimarc_field_128b.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_128b.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_128b.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_128b.pl	2 Jun 2005 15:50:23 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_128b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 128b\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_128b.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 128b\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }
***************
*** 81,86 ****
  			     });
  	my $f1 = substr($result,0,2);
  	$template->param(index => $index,
! 			 "f1$f1" => $f1);
  	print $input->header(-cookie => $cookie),$template->output;
  }
--- 81,88 ----
  			     });
  	my $f1 = substr($result,0,2);
+ 	my $f2 = substr($result,2,2);
  	$template->param(index => $index,
! 			 "f1$f1" => $f1,
! 			f2 => $f2);
  	print $input->header(-cookie => $cookie),$template->output;
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:50:41 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:50:41 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_128c.pl,1.1,1.2
Message-ID: <E1Ddrxx-000376-D9@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11927/value_builder

Modified Files:
	unimarc_field_128c.pl 
Log Message:
Plugin for field 128c

Index: unimarc_field_128c.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_128c.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_128c.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_128c.pl	2 Jun 2005 15:50:39 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_128c.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 128c\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_128c.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 128c\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }
***************
*** 81,86 ****
  			     });
  	my $f1 = substr($result,0,2);
  	$template->param(index => $index,
! 			 "f1$f1" => $f1);
  	print $input->header(-cookie => $cookie),$template->output;
  }
--- 81,88 ----
  			     });
  	my $f1 = substr($result,0,2);
+ 	my $f2 = substr($result,2,2);
  	$template->param(index => $index,
! 			 "f1$f1" => $f1,
! 			f2 => $f2);
  	print $input->header(-cookie => $cookie),$template->output;
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:51:02 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:51:02 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_130.pl,1.1,1.2
Message-ID: <E1DdryI-00039J-Uw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12092/value_builder

Modified Files:
	unimarc_field_130.pl 
Log Message:
Plugin for field 130a

Index: unimarc_field_130.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_130.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_130.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_130.pl	2 Jun 2005 15:50:59 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_130.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 130\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_130.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 130\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:48:56 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:48:56 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_126.pl,1.1,1.2
Message-ID: <E1DdrwG-0002oK-Eh@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10767/value_builder

Modified Files:
	unimarc_field_126.pl 
Log Message:
Plugin for field 126

Index: unimarc_field_126.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_126.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_126.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_126.pl	2 Jun 2005 15:48:54 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=500,height=400,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_100.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 100\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:49:10 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:49:10 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_126a.pl,1.1,1.2
Message-ID: <E1DdrwU-0002qs-5K@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10927/value_builder

Modified Files:
	unimarc_field_126a.pl 
Log Message:
Plugin for field 126a

Index: unimarc_field_126a.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_126a.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_126a.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_126a.pl	2 Jun 2005 15:49:08 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_126a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 126a\",'width=1000,height=575,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_126a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 126a\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:51:36 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:51:36 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_135a.pl,1.1,1.2
Message-ID: <E1Ddryq-0003DU-Kp@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12278/value_builder

Modified Files:
	unimarc_field_135a.pl 
Log Message:
Plugin for field 135a

Index: unimarc_field_135a.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_135a.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_135a.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_135a.pl	2 Jun 2005 15:51:18 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_135a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 135a\",'width=1000,height=375,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_135a.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 135a\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }
***************
*** 84,104 ****
  	my $f3 = substr($result,2,1);
  	my $f4 = substr($result,3,1);
! 	my $f5 = substr($result,4,3);
! 	my $f6 = substr($result,7,1);
  	my $f7 = substr($result,8,1);
  	my $f8 = substr($result,9,1);
  	my $f9 = substr($result,10,1);
  
! 	$template->param(index => $index,
  			 "f1$f1" => $f1,
  			 "f2$f2" => $f2,
  			 "f3$f3" => $f3,
  			 "f4$f4" => $f4,
! 			 "f5" => $f5,
! 			 "f6$f6" => $f6,
  			 "f7$f7" => $f7,
  			 "f8$f8" => $f8,
! 			 "f9$f9" => $f9
! 
  );
  	print $input->header(-cookie => $cookie),$template->output;
--- 84,107 ----
  	my $f3 = substr($result,2,1);
  	my $f4 = substr($result,3,1);
! 	my $f5 = substr($result,4,1);
! 	my $f6 = substr($result,5,3);
  	my $f7 = substr($result,8,1);
  	my $f8 = substr($result,9,1);
  	my $f9 = substr($result,10,1);
+ 	my $f10 = substr($result,11,1);
+ 	my $f11 = substr($result,12,1);
  
! 	$template->param("index" => $index,
  			 "f1$f1" => $f1,
  			 "f2$f2" => $f2,
  			 "f3$f3" => $f3,
  			 "f4$f4" => $f4,
! 			 "f5$f5" => $f5,
! 			 "f6" => $f6,
  			 "f7$f7" => $f7,
  			 "f8$f8" => $f8,
! 			 "f9$f9" => $f9,
! 			 "f10$f10" => $f10,
! 			 "f11$f11" => $f11
  );
  	print $input->header(-cookie => $cookie),$template->output;




From doxulting at users.sourceforge.net  Thu Jun  2 17:51:52 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:51:52 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_140.pl,1.1,1.2
Message-ID: <E1Ddrz6-0003Gz-V3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12548/value_builder

Modified Files:
	unimarc_field_140.pl 
Log Message:
Plugin for field 140a

Index: unimarc_field_140.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_140.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_140.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_140.pl	2 Jun 2005 15:51:50 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_140.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 140\",'width=1000,height=575,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_140.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 140\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From doxulting at users.sourceforge.net  Thu Jun  2 17:52:09 2005
From: doxulting at users.sourceforge.net (doXulting)
Date: Thu, 02 Jun 2005 08:52:09 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_141.pl,1.1,1.2
Message-ID: <E1DdrzN-0003Kx-IX@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12775/value_builder

Modified Files:
	unimarc_field_141.pl 
Log Message:
Plugin for field 141a

Index: unimarc_field_141.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_141.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_141.pl	7 Jun 2004 10:07:40 -0000	1.1
--- unimarc_field_141.pl	2 Jun 2005 15:52:07 -0000	1.2
***************
*** 53,57 ****
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_141.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 141\",'width=1000,height=575,toolbar=false,scrollbars=yes');
  
  }
--- 53,57 ----
  function Clic$function_name(i) {
  	defaultvalue=document.forms[0].field_value[i].value;
! 	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_141.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 141\",'width=800,height=400,toolbar=false,scrollbars=yes');
  
  }




From hdl at users.sourceforge.net  Thu Jun  2 23:04:37 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 02 Jun 2005 14:04:37 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-full-serial-issues.tmpl,NONE,1.1.2.1
Message-ID: <E1Ddwrl-0004dt-Uy@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
      Tag: rel_2_2
	opac-full-serial-issues.tmpl 
Log Message:
Adding full history support to opac serial
Needs fixing

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="opac-top.inc" -->


<!-- TMPL_UNLESS name="popup" -->
<div class="tabbed">
<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>
		<h2 class="catalogue">Subscription information for biblio number : <!-- TMPL_VAR NAME="biblionumber" --> with title : <!-- TMPL_VAR name="bibliotitle" --></h2>

</div>
<!-- /TMPL_UNLESS -->
	<div class="tabs">
	<!-- TMPL_LOOP NAME="years" -->
		<!-- TMPL_IF NAME="year" -->
			<div id="link<!--TMPL_VAR Name="year" -->"><a href="javascript:active(<!-- TMPL_VAR NAME="year" -->)"><!-- TMPL_VAR NAME="year" --></a></div>
		<!-- /TMPL_IF -->
	<!-- /TMPL_LOOP -->
	</div>

	<!-- TMPL_LOOP NAME="years" -->
	<div name="<!-- TMPL_VAR NAME="year" -->XX" id="<!-- TMPL_VAR NAME="year" -->XX" class="tab" style="visibility:visible">
		<table>
			<tr>
				<th> Date
				</th>
				<th> Number
				</th>
				<th> Status
				</th>
			</tr>
			<!-- TMPL_LOOP Name="serials" -->
			<tr>
				<td>
					<!-- TMPL_VAR Name="planneddate" -->
				</td>
				<td>
					<!-- TMPL_VAR Name="serialseq" -->
				</td>
				<td>
					<!-- TMPL_VAR Name="status" -->
				</td>
			</tr>
			<!-- /TMPL_LOOP -->
	</div>
	<!--/TMPL_LOOP -->

<script language="JavaScript" type="text/javascript">
function active(numlayer)
{
	for (i=<!--TMPL_VAR Name="yearmin"-->; i <= <!--TMPL_VAR Name="yearmax"--> ; i++ ) {
		ong = i+"XX";
		link = "link"+i;
		if (numlayer==i) {
			document.getElementById(ong).style.visibility="visible";
		} else {
			document.getElementById(ong).style.visibility="hidden";
		}
	}
}

</script>
</body>
</html>




From hdl at users.sourceforge.net  Thu Jun  2 23:04:37 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 02 Jun 2005 14:04:37 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-serial-issues.pl,1.1.2.4,1.1.2.5
Message-ID: <E1Ddwrl-0004du-Vx@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17766/opac

Modified Files:
      Tag: rel_2_2
	opac-serial-issues.pl 
Log Message:
Adding full history support to opac serial
Needs fixing

Index: opac-serial-issues.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-serial-issues.pl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** opac-serial-issues.pl	1 Jun 2005 20:05:41 -0000	1.1.2.4
--- opac-serial-issues.pl	2 Jun 2005 21:04:35 -0000	1.1.2.5
***************
*** 15,22 ****
--- 15,58 ----
  my $op = $query->param('op');
  my $dbh = C4::Context->dbh;
+ my $selectview = C4::Context->preference("SubscriptionHistory");
+ warn "selectview : ".$selectview;
+ 
  my $sth;
  # my $id;
  my ($template, $loggedinuser, $cookie);
  my $biblionumber = $query->param('biblionumber');
+ if ($selectview eq "full"){
+ my $subscriptions = get_full_subscription_list_from_biblionumber($biblionumber);
+ 
+ my $year;
+ my $yearmin=$subscriptions->[1]{year};
+ warn "yearmin".$yearmin;
+ my $yearmax;
+ my @loopissues;
+ my $yearmax=$subscriptions->[scalar(@$subscriptions)]{year};
+ warn "yearmax".$yearmax;
+ 
+ 
+ ($template, $loggedinuser, $cookie)
+ = get_template_and_user({template_name => "opac-full-serial-issues.tmpl",
+ 				query => $query,
+ 				type => "opac",
+ 				authnotrequired => 1,
+ 				debug => 1,
+ 				});
+ 
+ # replace CR by <br> in librarian note
+ # $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
+ 
+ $template->param(
+ 	biblionumber => $query->param('biblionumber'),
+ 	years => $subscriptions,
+ 	yearmin => $yearmin,
+ 	yearmax =>$yearmax,
+ 	suggestion => C4::Context->preference("suggestion"),
+ 	virtualshelves => C4::Context->preference("virtualshelves"),
+ 	);
+ 
+ } else {
  my $subscriptions = get_subscription_list_from_biblionumber($biblionumber);
  
***************
*** 38,41 ****
  	virtualshelves => C4::Context->preference("virtualshelves"),
  	);
! 
  output_html_with_http_headers $query, $cookie, $template->output;
--- 74,77 ----
  	virtualshelves => C4::Context->preference("virtualshelves"),
  	);
! }
  output_html_with_http_headers $query, $cookie, $template->output;




From hdl at users.sourceforge.net  Thu Jun  2 23:04:38 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 02 Jun 2005 14:04:38 -0700
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.6.2.5,1.6.2.6
Message-ID: <E1Ddwrm-0004e2-Dv@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17766/C4

Modified Files:
      Tag: rel_2_2
	Bull.pm 
Log Message:
Adding full history support to opac serial
Needs fixing

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.6.2.5
retrieving revision 1.6.2.6
diff -C2 -r1.6.2.5 -r1.6.2.6
*** Bull.pm	28 Apr 2005 08:49:40 -0000	1.6.2.5
--- Bull.pm	2 Jun 2005 21:04:35 -0000	1.6.2.6
***************
*** 47,50 ****
--- 47,51 ----
  @EXPORT = qw(&newsubscription &modsubscription &delsubscription &getsubscriptions &getsubscription 
  			&getsubscriptionfrombiblionumber &get_subscription_list_from_biblionumber
+ 			&get_full_subscription_list_from_biblionumber 
  			&modsubscriptionhistory &newissue
  			&getserials &serialchangestatus
***************
*** 167,171 ****
  	my ($biblionumber) = @_;
  	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare('select subscription.*,subscriptionhistory.*,aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle 
  							from subscription 
  							left join subscriptionhistory on subscription.subscriptionid=subscriptionhistory.subscriptionid
--- 168,172 ----
  	my ($biblionumber) = @_;
  	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare('select subscription.*,subscriptionhistory.*,  aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle 
  							from subscription 
  							left join subscriptionhistory on subscription.subscriptionid=subscriptionhistory.subscriptionid
***************
*** 186,189 ****
--- 187,223 ----
  }
  
+ sub get_full_subscription_list_from_biblionumber {
+ 	my ($biblionumber) = @_;
+ 	my $dbh = C4::Context->dbh;
+ 	my $sth = $dbh->prepare('select year(subscription.startdate) as year,subscription.*, aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle 
+ 							from subscription 
+ 							left join aqbudget on subscription.aqbudgetid=aqbudget.aqbudgetid 
+ 							left join aqbooksellers on subscription.aqbooksellerid=aqbooksellers.id 
+ 							left join biblio on biblio.biblionumber=subscription.biblionumber 
+ 							where subscription.biblionumber = ? order by subscription.startdate');
+ 	$sth->execute($biblionumber);
+ 	my @res;
+ 	my $year;
+ 	my @loopissues;
+ 	while (my $subs = $sth->fetchrow_hashref) {
+ 		my $sth2 = $dbh->prepare('select serial.serialseq, serial.planneddate, year(serial.planneddate) as year, serial.status from serial where serial.biblionumber = ? and serial.subscriptionid=? order by serial.planneddate');
+ 		$sth2->execute($biblionumber,$subs->{'subscriptionid'});
+ 		while (my $issues = $sth2->fetchrow_hashref){
+ 				push @loopissues,
+ 					{'planneddate' => $issues->{'planneddate'}, 
+ 					'serialseq' => $issues->{'serialseq'},
+ 					'status' => $issues->{'status'}};
+ # 				warn "planneddate ".$issues->{'planneddate'};
+ # 				warn "serialseq".$issues->{'serialseq'};
+ 		}
+ 		my %cell;
+ 		$cell{'year'}=$subs->{year};
+ 		$cell{'title'}=$subs->{title};
+ 		$cell{'booksellername'}=$subs->{booksellername};
+ 		$cell{'serials'}=\@loopissues;
+ 		push @res,\%cell;
+ 	}
+ 	return \@res;
+ }
  
  sub modsubscription {




From hdl at users.sourceforge.net  Thu Jun  2 23:05:39 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 02 Jun 2005 14:05:39 -0700
Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.100.2.2,1.100.2.3
Message-ID: <E1Ddwsl-0004ki-Fk@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/updater
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18239/updater

Modified Files:
      Tag: rel_2_2
	updatedatabase 
Log Message:
adding variable SubscriptionHistory

Index: updatedatabase
===================================================================
RCS file: /cvsroot/koha/koha/updater/updatedatabase,v
retrieving revision 1.100.2.2
retrieving revision 1.100.2.3
diff -C2 -r1.100.2.2 -r1.100.2.3
*** updatedatabase	29 Mar 2005 15:41:43 -0000	1.100.2.2
--- updatedatabase	2 Jun 2005 21:05:34 -0000	1.100.2.3
***************
*** 848,851 ****
--- 848,862 ----
  	        options		=> ';|tabulation|,|/|\|#'
          },
+         {
+             uniquefieldrequired => 'variable',
+             variable            => 'SubscriptionHistory',
+             value               => ';',
+ 	        forceupdate		=> { 'explanation' => 1,
+ 	    			     'type' => 1,
+ 				     'options' => 1},
+             explanation         => 'Define the information level for serials history in OPAC',
+ 	        type		=> 'Choice',
+ 	        options		=> 'simplified|full'
+         },
      ],
  
***************
*** 1433,1436 ****
--- 1444,1450 ----
  
  # $Log$
+ # Revision 1.100.2.3  2005/06/02 21:05:34  hdl
+ # adding variable SubscriptionHistory
+ #
  # Revision 1.100.2.2  2005/03/29 15:41:43  tipaul
  # * new permissions : management & tools. You now have 2 new permissions :




From genjimoto at users.sourceforge.net  Fri Jun  3 05:51:28 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Thu, 02 Jun 2005 20:51:28 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-search.pl,1.27,1.28
Message-ID: <E1De3DU-0001i3-UN@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6543

Modified Files:
	opac-search.pl 
Log Message:
Search for availablilty feature implemented.

Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** opac-search.pl	2 Jun 2005 13:47:47 -0000	1.27
--- opac-search.pl	3 Jun 2005 03:51:26 -0000	1.28
***************
*** 16,20 ****
  my $firstbiblionumber; # needed for directly sending user to first item
  # use C4::Search;
! 
  
  my $itemtypelist;
--- 16,20 ----
  my $firstbiblionumber; # needed for directly sending user to first item
  # use C4::Search;
! my $totalresults;
  
  my $itemtypelist;
***************
*** 56,60 ****
  my $op = $query->param("op");
  my $type=$query->param('type');
! 
  my $itemtypesstring=$query->param("itemtypesstring");
  $itemtypesstring =~s/"//g;
--- 56,60 ----
  my $op = $query->param("op");
  my $type=$query->param('type');
! my $avail=$query->param('avail');
  my $itemtypesstring=$query->param("itemtypesstring");
  $itemtypesstring =~s/"//g;
***************
*** 141,145 ****
          $sqlstring .= '))'
      }
! 
  	my ($results,$total) = catalogsearch($dbh, \@tags,\@and_or,
  										\@excluding, \@operator, \@value,
--- 141,147 ----
          $sqlstring .= '))'
      }
!   if ($avail){
!     $sqlstring .= "and biblioitems.biblioitemnumber=items.biblioitemnumber and items.itemnumber !=issues.itemnumber and biblio.biblionumber !=reserves.biblionumber and (items.itemlost IS NULL or items.itemlost = 0) and (items.notforloan IS NULL or items.notforloan =0) and (items.wthdrawn IS NULL or items.wthdrawn =0) ";
!   }
  	my ($results,$total) = catalogsearch($dbh, \@tags,\@and_or,
  										\@excluding, \@operator, \@value,




From genjimoto at users.sourceforge.net  Fri Jun  3 05:58:28 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Thu, 02 Jun 2005 20:58:28 -0700
Subject: [Koha-cvs] CVS: koha/C4 SearchMarc.pm,1.43,1.44
Message-ID: <E1De3KG-0002cV-N5@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10028

Modified Files:
	SearchMarc.pm 
Log Message:
Added necessary tables for search for availablity feature into Catalogsearch. Someone needs to speed it up somehow.

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** SearchMarc.pm	1 Jun 2005 21:18:39 -0000	1.43
--- SearchMarc.pm	3 Jun 2005 03:58:26 -0000	1.44
***************
*** 277,289 ****
  	# Finds the basic results without the NOT requests
  	my ($sql_tables, $sql_where1, $sql_where2) = create_request($dbh,\@normal_tags, \@normal_and_or, \@normal_operator, \@normal_value);
!   $sql_where1 .=" ". $sqlstring;
  	$sql_where1 .= "and TO_DAYS( NOW( ) ) - TO_DAYS( biblio.timestamp ) <30" if $orderby =~ "biblio.timestamp";
  	my $sth;
  	if ($sql_where2) {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc");
! 		warn "Q2 : select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc term is  @$value";
  	} else {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc");
! 		warn "Q : select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc";
  	}
  	$sth->execute();
--- 277,289 ----
  	# Finds the basic results without the NOT requests
  	my ($sql_tables, $sql_where1, $sql_where2) = create_request($dbh,\@normal_tags, \@normal_and_or, \@normal_operator, \@normal_value);
!   $sql_where1 .= $sqlstring;
  	$sql_where1 .= "and TO_DAYS( NOW( ) ) - TO_DAYS( biblio.timestamp ) <30" if $orderby =~ "biblio.timestamp";
  	my $sth;
  	if ($sql_where2) {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,issues,reserves,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc");
! 		warn "Q2 : select distinct m1.bibid from biblio,biblioitems,items,issues,reserves,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc term is  @$value";
  	} else {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,issues,reserves,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc");
! 		warn "Q : select distinct m1.bibid from biblio,biblioitems,items,issues,reserves,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc";
  	}
  	$sth->execute();




From genjimoto at users.sourceforge.net  Fri Jun  3 06:15:31 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Thu, 02 Jun 2005 21:15:31 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-search.pl,1.28,1.29
Message-ID: <E1De3al-0004kO-Gm@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18197

Modified Files:
	opac-search.pl 
Log Message:
Added avail into the template parameters

Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** opac-search.pl	3 Jun 2005 03:51:26 -0000	1.28
--- opac-search.pl	3 Jun 2005 04:15:29 -0000	1.29
***************
*** 88,95 ****
--- 88,99 ----
      $searchdesc .= join(" ", at itemtypes)
    }
+ 
    if ($branchesstring ne ''){
      $searchdesc .= ' in branches ';
      $searchdesc .= join(" ", at branches)
    }
+   if ($avail ne ''){
+     $searchdesc .= '. Only available items shown.'
+   }
  	$resultsperpage= $query->param('resultsperpage');
  	$resultsperpage = 19 if(!defined $resultsperpage);
***************
*** 353,356 ****
--- 357,361 ----
                mediatypelist => $mediatypelist,
                itemtypesstring => $itemtypesstring,
+               avail => $avail,
  							);
  




From genjimoto at users.sourceforge.net  Fri Jun  3 06:16:55 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Thu, 02 Jun 2005 21:16:55 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-searchresults.tmpl,1.23,1.24
Message-ID: <E1De3c7-0004uP-V8@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac-searchresults.tmpl 
Log Message:
the avail checkbox now gets checked if the template gets avail in its parameters

Index: opac-searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** opac-searchresults.tmpl	1 Jun 2005 22:20:16 -0000	1.23
--- opac-searchresults.tmpl	3 Jun 2005 04:16:53 -0000	1.24
***************
*** 180,184 ****
  <!-- TMPL_VAR NAME="brancheslist" -->
  </select><br>
! <input type="checkbox" name="avail"> Only show titles available (Not on loan)<br>
  <input type="submit" value="Search">
  </form>
--- 180,188 ----
  <!-- TMPL_VAR NAME="brancheslist" -->
  </select><br>
! 
! <input type="checkbox" name="avail"
! <!-- TMPL_IF NAME="avail" --> checked
! <!-- /TMPL_IF -->
! > Only show titles available (Not on loan)<br>
  <input type="submit" value="Search">
  </form>




From hellen at users.sourceforge.net  Fri Jun  3 13:38:13 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Fri, 03 Jun 2005 04:38:13 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/acqui supplier.tmpl,1.1,1.2
Message-ID: <E1DeAVB-0003io-Vi@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	supplier.tmpl 
Log Message:
translated by hellen

Index: supplier.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui/supplier.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** supplier.tmpl	12 May 2005 19:26:13 -0000	1.1
--- supplier.tmpl	3 Jun 2005 11:38:11 -0000	1.2
***************
*** 18,26 ****
  		</p>
  		<p>
! 			<label>Postal Address</label>
  				<textarea name="company_postal" cols="40" rows="3"><!-- TMPL_VAR NAME="postal" --></textarea>
  		</p>
  		<p>
! 			<label>Physical Address</label>
  			<textarea name="physical" cols="40" rows="4"><!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></textarea>
  		</p>
--- 18,26 ----
  		</p>
  		<p>
! 			<label>Anschrift</label>
  				<textarea name="company_postal" cols="40" rows="3"><!-- TMPL_VAR NAME="postal" --></textarea>
  		</p>
  		<p>
! 			<label>Anschrift 2</label>
  			<textarea name="physical" cols="40" rows="4"><!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></textarea>
  		</p>
***************
*** 51,55 ****
  		</p>
  		<p>
! 			<label>Weiter Rufnummer</label>
  			<input type="text" size="20" name="contact_phone_2" value="<!-- TMPL_VAR NAME="contaltphone" -->">
  		</p>
--- 51,55 ----
  		</p>
  		<p>
! 			<label>Weitere Rufnummer</label>
  			<input type="text" size="20" name="contact_phone_2" value="<!-- TMPL_VAR NAME="contaltphone" -->">
  		</p>
***************
*** 84,88 ****
  		</p>
  		<p>
! 			<label class="label100">List Prices are</label>
  				<select name="list_currency" size="1">
  				<!-- TMPL_LOOP NAME="loop_pricescurrency" -->
--- 84,88 ----
  		</p>
  		<p>
! 			<label class="label100">Listenpreise/label>
  				<select name="list_currency" size="1">
  				<!-- TMPL_LOOP NAME="loop_pricescurrency" -->
***************
*** 100,108 ****
  		</p>
  		<p>
! 			<label class="label100">GST Registered</label>
  				<input type="radio" name="gst" value="1" <!-- TMPL_IF name="gstreg" -->checked<!-- /TMPL_IF -->>Ja <input type="radio" name="gst" value="0" <!-- TMPL_UNLESS name="gstreg" -->checked<!-- /TMPL_UNLESS -->>Nein
  		</p>
  		<p>
! 			<label class="label100">List Item Price Includes GST</label>
  				<input type="radio" name="list_gst" value="1" <!-- TMPL_IF name="listincgst" -->checked<!-- /TMPL_IF -->>Ja <input type="radio" name="list_gst" value="0" <!-- TMPL_UNLESS name="listincgst" -->checked<!-- /TMPL_UNLESS -->>Nein
  		</p>
--- 100,108 ----
  		</p>
  		<p>
! 			<label class="label100">MWST</label>
  				<input type="radio" name="gst" value="1" <!-- TMPL_IF name="gstreg" -->checked<!-- /TMPL_IF -->>Ja <input type="radio" name="gst" value="0" <!-- TMPL_UNLESS name="gstreg" -->checked<!-- /TMPL_UNLESS -->>Nein
  		</p>
  		<p>
! 			<label class="label100">Listenpreis einschl. MWST</label>
  				<input type="radio" name="list_gst" value="1" <!-- TMPL_IF name="listincgst" -->checked<!-- /TMPL_IF -->>Ja <input type="radio" name="list_gst" value="0" <!-- TMPL_UNLESS name="listincgst" -->checked<!-- /TMPL_UNLESS -->>Nein
  		</p>




From hdl at users.sourceforge.net  Fri Jun  3 14:53:10 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 03 Jun 2005 05:53:10 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-serial-issues.pl,1.1.2.5,1.1.2.6
Message-ID: <E1DeBfi-0005tY-B0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22616/opac

Modified Files:
      Tag: rel_2_2
	opac-serial-issues.pl 
Log Message:
Featuring OPAC with Full History Subscription

Index: opac-serial-issues.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-serial-issues.pl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -r1.1.2.5 -r1.1.2.6
*** opac-serial-issues.pl	2 Jun 2005 21:04:35 -0000	1.1.2.5
--- opac-serial-issues.pl	3 Jun 2005 12:53:08 -0000	1.1.2.6
***************
*** 25,35 ****
  my $subscriptions = get_full_subscription_list_from_biblionumber($biblionumber);
  
! my $year;
! my $yearmin=$subscriptions->[1]{year};
! warn "yearmin".$yearmin;
! my $yearmax;
! my @loopissues;
! my $yearmax=$subscriptions->[scalar(@$subscriptions)]{year};
! warn "yearmax".$yearmax;
  
  
--- 25,34 ----
  my $subscriptions = get_full_subscription_list_from_biblionumber($biblionumber);
  
! my $title = $subscriptions->[0]{bibliotitle};
! warn "title ".$title;
! my $yearmin=$subscriptions->[0]{year};
! warn "yearmin ".$yearmin;
! my $yearmax=$subscriptions->[scalar(@$subscriptions)-1]{year};
! warn "yearmax ".$yearmax;
  
  
***************
*** 50,53 ****
--- 49,53 ----
  	yearmin => $yearmin,
  	yearmax =>$yearmax,
+ 	bibliotitle => $title,
  	suggestion => C4::Context->preference("suggestion"),
  	virtualshelves => C4::Context->preference("virtualshelves"),




From hdl at users.sourceforge.net  Fri Jun  3 14:53:10 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 03 Jun 2005 05:53:10 -0700
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.6.2.6,1.6.2.7
Message-ID: <E1DeBfi-0005tk-ME@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22616/C4

Modified Files:
      Tag: rel_2_2
	Bull.pm 
Log Message:
Featuring OPAC with Full History Subscription

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.6.2.6
retrieving revision 1.6.2.7
diff -C2 -r1.6.2.6 -r1.6.2.7
*** Bull.pm	2 Jun 2005 21:04:35 -0000	1.6.2.6
--- Bull.pm	3 Jun 2005 12:53:08 -0000	1.6.2.7
***************
*** 190,220 ****
  	my ($biblionumber) = @_;
  	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare('select year(subscription.startdate) as year,subscription.*, aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle 
! 							from subscription 
  							left join aqbudget on subscription.aqbudgetid=aqbudget.aqbudgetid 
  							left join aqbooksellers on subscription.aqbooksellerid=aqbooksellers.id 
  							left join biblio on biblio.biblionumber=subscription.biblionumber 
! 							where subscription.biblionumber = ? order by subscription.startdate');
  	$sth->execute($biblionumber);
  	my @res;
  	my $year;
  	my @loopissues;
  	while (my $subs = $sth->fetchrow_hashref) {
! 		my $sth2 = $dbh->prepare('select serial.serialseq, serial.planneddate, year(serial.planneddate) as year, serial.status from serial where serial.biblionumber = ? and serial.subscriptionid=? order by serial.planneddate');
! 		$sth2->execute($biblionumber,$subs->{'subscriptionid'});
! 		while (my $issues = $sth2->fetchrow_hashref){
! 				push @loopissues,
! 					{'planneddate' => $issues->{'planneddate'}, 
! 					'serialseq' => $issues->{'serialseq'},
! 					'status' => $issues->{'status'}};
  # 				warn "planneddate ".$issues->{'planneddate'};
  # 				warn "serialseq".$issues->{'serialseq'};
  		}
- 		my %cell;
- 		$cell{'year'}=$subs->{year};
- 		$cell{'title'}=$subs->{title};
- 		$cell{'booksellername'}=$subs->{booksellername};
- 		$cell{'serials'}=\@loopissues;
- 		push @res,\%cell;
  	}
  	return \@res;
--- 190,250 ----
  	my ($biblionumber) = @_;
  	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare('select serial.serialseq, serial.planneddate, serial.status, year(serial.planneddate) as year,subscription.*, aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle 
! 							from serial left join subscription on (serial.subscriptionid=subscription.subscriptionid and subscription.biblionumber=serial.biblionumber)
  							left join aqbudget on subscription.aqbudgetid=aqbudget.aqbudgetid 
  							left join aqbooksellers on subscription.aqbooksellerid=aqbooksellers.id 
  							left join biblio on biblio.biblionumber=subscription.biblionumber 
! 							where subscription.biblionumber = ? order by year,serial.planneddate');
  	$sth->execute($biblionumber);
  	my @res;
  	my $year;
+ 	my $startdate;
+ 	my $aqbooksellername;
+ 	my $bibliotitle;
  	my @loopissues;
+ 	my $first;
  	while (my $subs = $sth->fetchrow_hashref) {
! # 		my $sth2 = $dbh->prepare('select * from serial where serial.biblionumber = ? and serial.subscriptionid=? order by serial.planneddate');
! # 		$sth2->execute($biblionumber,$subs->{'subscriptionid'});
! # 		while (my $issues = $sth2->fetchrow_hashref){
  # 				warn "planneddate ".$issues->{'planneddate'};
  # 				warn "serialseq".$issues->{'serialseq'};
+ # 		}
+ 		if ($year and ($year==$subs->{year})){
+ 			if ($first eq 1){$first=0;}
+ 			my $temp=$res[scalar(@res)-1]->{'serials'};
+ 			push @$temp,
+ 				{'planneddate' => $subs->{'planneddate'}, 
+ 				'serialseq' => $subs->{'serialseq'},
+ 				'status1' => $subs->{'status'}==1,
+ 				'status2' => $subs->{'status'}==2,
+ 				'status3' => $subs->{'status'}==3,
+ 				'status4' => $subs->{'status'}==4,
+ 				};
+ 		}else {
+ 			$year= $subs->{'year'};
+ 			$startdate= $subs->{'startdate'};
+ 			$aqbooksellername= $subs->{'aqbooksellername'};
+ 			$bibliotitle= $subs->{'bibliotitle'};
+ 			$first=1 if (not $year);
+ 			my @temp;
+ 			push @temp,
+ 				{'planneddate' => $subs->{'planneddate'}, 
+ 				'serialseq' => $subs->{'serialseq'},
+ 				'status1' => $subs->{'status'}==1,
+ 				'status2' => $subs->{'status'}==2,
+ 				'status3' => $subs->{'status'}==3,
+ 				'status4' => $subs->{'status'}==4,
+ 				};
+ 			
+ 			push @res,{
+ 				'year'=>$year,
+ 				'startdate'=>$startdate,
+ 				'aqbooksellername'=>$aqbooksellername,
+ 				'bibliotitle'=>$bibliotitle,
+ 				'serials'=>\@temp,
+ 				'first'=>$first 
+ 			};
  		}
  	}
  	return \@res;




From hdl at users.sourceforge.net  Fri Jun  3 14:53:10 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 03 Jun 2005 05:53:10 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-full-serial-issues.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1DeBfi-0005tc-EK@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-full-serial-issues.tmpl 
Log Message:
Featuring OPAC with Full History Subscription

Index: opac-full-serial-issues.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/Attic/opac-full-serial-issues.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac-full-serial-issues.tmpl	2 Jun 2005 21:04:35 -0000	1.1.2.1
--- opac-full-serial-issues.tmpl	3 Jun 2005 12:53:08 -0000	1.1.2.2
***************
*** 3,17 ****
  
  <!-- TMPL_UNLESS name="popup" -->
! <div class="tabbed">
! <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>
- 		<h2 class="catalogue">Subscription information for biblio number : <!-- TMPL_VAR NAME="biblionumber" --> with title : <!-- TMPL_VAR name="bibliotitle" --></h2>
  
  </div>
  <!-- /TMPL_UNLESS -->
! 	<div class="tabs">
  	<!-- TMPL_LOOP NAME="years" -->
  		<!-- TMPL_IF NAME="year" -->
! 			<div id="link<!--TMPL_VAR Name="year" -->"><a href="javascript:active(<!-- TMPL_VAR NAME="year" -->)"><!-- TMPL_VAR NAME="year" --></a></div>
  		<!-- /TMPL_IF -->
  	<!-- /TMPL_LOOP -->
--- 3,16 ----
  
  <!-- TMPL_UNLESS name="popup" -->
! <div class="mainbloc">
! 		<h1 class="catalogue">Subscription information for biblio #<!-- TMPL_VAR NAME="biblionumber" --> with title : <!-- TMPL_VAR name="bibliotitle" --></h1>
  <a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Back to biblio</a>
  
  </div>
  <!-- /TMPL_UNLESS -->
! 	<div class="tabsubs">
  	<!-- TMPL_LOOP NAME="years" -->
  		<!-- TMPL_IF NAME="year" -->
! 			<div id="link<!--TMPL_VAR Name="year" -->" ><a href="javascript:active(<!-- TMPL_VAR NAME="year" -->)"><!-- TMPL_VAR NAME="year" --></a></div>
  		<!-- /TMPL_IF -->
  	<!-- /TMPL_LOOP -->
***************
*** 19,23 ****
  
  	<!-- TMPL_LOOP NAME="years" -->
! 	<div name="<!-- TMPL_VAR NAME="year" -->XX" id="<!-- TMPL_VAR NAME="year" -->XX" class="tab" style="visibility:visible">
  		<table>
  			<tr>
--- 18,22 ----
  
  	<!-- TMPL_LOOP NAME="years" -->
! 	<div name="<!-- TMPL_VAR NAME="year" -->" id="<!-- TMPL_VAR NAME="year" -->" class="tabsub" <!--TMPL_IF Name="first" -->style="visibility:visible"<!--/TMPL_IF -->>
  		<table>
  			<tr>
***************
*** 38,45 ****
  				</td>
  				<td>
! 					<!-- TMPL_VAR Name="status" -->
  				</td>
  			</tr>
  			<!-- /TMPL_LOOP -->
  	</div>
  	<!--/TMPL_LOOP -->
--- 37,48 ----
  				</td>
  				<td>
! 					<!-- TMPL_IF Name="status1" -->Arrived<!-- /TMPL_IF -->
! 					<!-- TMPL_IF Name="status2" -->Waited<!-- /TMPL_IF -->
! 					<!-- TMPL_IF Name="status3" -->Late<!-- /TMPL_IF -->
! 					<!-- TMPL_IF Name="status4" -->Missing<!-- /TMPL_IF -->
  				</td>
  			</tr>
  			<!-- /TMPL_LOOP -->
+ 		</table>
  	</div>
  	<!--/TMPL_LOOP -->
***************
*** 48,53 ****
  function active(numlayer)
  {
! 	for (i=<!--TMPL_VAR Name="yearmin"-->; i <= <!--TMPL_VAR Name="yearmax"--> ; i++ ) {
! 		ong = i+"XX";
  		link = "link"+i;
  		if (numlayer==i) {
--- 51,56 ----
  function active(numlayer)
  {
! 	for (i=<!--TMPL_VAR Name="yearmin"-->; i<=<!--TMPL_VAR Name="yearmax"-->; i++ ) {
! 		ong = i;
  		link = "link"+i;
  		if (numlayer==i) {




From hdl at users.sourceforge.net  Fri Jun  3 15:01:26 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 03 Jun 2005 06:01:26 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.17.2.3,1.17.2.4
Message-ID: <E1DeBni-00074y-6z@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac.css 
Log Message:
adding tabsub for subbscription tabs.

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.17.2.3
retrieving revision 1.17.2.4
diff -C2 -r1.17.2.3 -r1.17.2.4
*** opac.css	18 Mar 2005 09:52:21 -0000	1.17.2.3
--- opac.css	3 Jun 2005 13:01:23 -0000	1.17.2.4
***************
*** 367,370 ****
--- 367,399 ----
  }
  
+ /* for SubscritptionHistory view  */
+ div.tabsubs {
+ 	width:25px;
+ 	position:absolute;
+ 	display:block;
+ 	margin-left:10px;
+ 	margin-top:100px;
+ }
+ 
+ div.tabsubs a {
+ 	display:block;
+ 	font-size: small;
+ 	border: thin solid black;
+ 	margin-right: 2px;
+ 	padding: 15px 30px;
+ 	-moz-border-radius: 5px 0px 0px 5px;
+ }
+ 
+ div.tabsub {
+ 	background-color: #ACE6E6;
+ 	display: block;
+ 	visibility:hidden;
+ 	position:absolute;
+ 	margin-left:72px;
+ 	margin-top:100px;
+ 	margin-right:10%;
+ }
+ 
+ 
  /* for MARC view  */
  div.tabs {




From hdl at users.sourceforge.net  Fri Jun  3 15:27:27 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 03 Jun 2005 06:27:27 -0700
Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.88.2.4,1.88.2.5
Message-ID: <E1DeCCt-0002EM-TQ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8492/misc

Modified Files:
      Tag: rel_2_2
	Install.pm 
Log Message:
Bug Fixing  : PDF::API2 Not mandatory

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.88.2.4
retrieving revision 1.88.2.5
diff -C2 -r1.88.2.4 -r1.88.2.5
*** Install.pm	4 Feb 2005 18:41:42 -0000	1.88.2.4
--- Install.pm	3 Jun 2005 13:27:25 -0000	1.88.2.5
***************
*** 860,865 ****
  	unless (eval {require MARC::Record})     { push @missing,"MARC::Record" };
  	unless (eval {require Mail::Sendmail})   { push @missing,"Mail::Sendmail" };
- 	unless (eval {require PDF::API2})   { push @missing,"PDF::API2" };
  # The following modules are not mandatory, depends on how the library want to use Koha
  	unless (eval {require Net::LDAP})       {
  		if ($#missing>=0) { # only when $#missing >= 0 so this isn't fatal
--- 860,869 ----
  	unless (eval {require MARC::Record})     { push @missing,"MARC::Record" };
  	unless (eval {require Mail::Sendmail})   { push @missing,"Mail::Sendmail" };
  # The following modules are not mandatory, depends on how the library want to use Koha
+ 	unless (eval {require PDF::API2})   { 
+ 			if ($#missing>=0) { # only when $#missing >= 0 so this isn't fatal
+ 				push @missing,"You will need PDF::API2 for barcode generator" 
+ 			}
+ 	}
  	unless (eval {require Net::LDAP})       {
  		if ($#missing>=0) { # only when $#missing >= 0 so this isn't fatal




From gmccullagh at users.sourceforge.net  Fri Jun  3 19:01:55 2005
From: gmccullagh at users.sourceforge.net (gavin)
Date: Fri, 03 Jun 2005 10:01:55 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-search-biblio.pl,NONE,1.1
Message-ID: <E1DeFYR-0004Uw-JB@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15229/opac

Added Files:
	opac-search-biblio.pl 
Log Message:
two new files 
  SearchBiblio.pm forked from SearchMarc.pm
  opac-search-biblio.pl forked from opac-search.pl (just change module)
an attempt at a new search using FULLTEXT indexes.
NB: Boolean won't work without MySQL >v4.0
NNB: Will be slow without indexes added on Biblio table as follows:
  ALTER TABLE biblio ADD FULLTEXT (author,title,unititle,seriestitle);
Only searching on "Any word" field just now. 
more to come.



--- NEW FILE ---
#!/usr/bin/perl
use strict;
require Exporter;

use C4::Auth;
use C4::Interface::CGI::Output;
use C4::Context;
use CGI;
use C4::Database;
use HTML::Template;
use C4::SearchBiblio;
use C4::Acquisition;
use C4::Biblio;
my @spsuggest; # the array for holding suggestions
my $suggest;   # a flag to be set (if there are suggestions it's 1)
my $firstbiblionumber; # needed for directly sending user to first item
# use C4::Search;


my $itemtypelist;
my $brancheslist;
my $categorylist;
my $subcategorylist;
my $mediatypelist;
# added by Gavin 
my $totalresults;

my $dbh=C4::Context->dbh;
my $sth=$dbh->prepare("select description,itemtype from itemtypes order by description");
$sth->execute;
while (my ($description,$itemtype) = $sth->fetchrow) {
    $itemtypelist.="<option value=\"$itemtype\">$description</option>\n";
}
my $sth=$dbh->prepare("select description,subcategorycode from subcategorytable order by description");
$sth->execute;
while (my ($description,$subcategorycode) = $sth->fetchrow) {
    $subcategorylist.="<option value=\"$subcategorycode\">$description</option>\n";
}
my $sth=$dbh->prepare("select description,mediatypecode from mediatypetable order by description");
$sth->execute;
while (my ($description,$mediatypecode) = $sth->fetchrow) {
    $mediatypelist.="<option value=\"$mediatypecode\">$description</option>\n";
}
my $sth=$dbh->prepare("select description,categorycode from categorytable order by description");
$sth->execute;
while (my ($description,$categorycode) = $sth->fetchrow) {
    $categorylist .= '<input type="radio" name="categorylist" value="'.$categorycode.'">'.$description.'<br>';
}
my $sth=$dbh->prepare("select branchname,branchcode from branches order by branchname");
$sth->execute;

while (my ($branchname,$branchcode) = $sth->fetchrow) {
    $brancheslist.="<option value=\"$branchcode\">$branchname</option>\n";
}
my $query = new CGI;
my $op = $query->param("op");
my $type=$query->param('type');

my $itemtypesstring=$query->param("itemtypesstring");
$itemtypesstring =~s/"//g;
my @itemtypes = split ( /\|/, $itemtypesstring);
my $branchesstring=$query->param("branchesstring");
$branchesstring =~s/"//g;
my @branches = split (/\|/, $branchesstring);

my $startfrom=$query->param('startfrom');
$startfrom=0 if(!defined $startfrom);
my ($template, $loggedinuser, $cookie);
my $resultsperpage;
my $searchdesc;

if ($op eq "do_search") {
	my @marclist = $query->param('marclist');
	my @and_or = $query->param('and_or');
	my @excluding = $query->param('excluding');
	my @operator = $query->param('operator');
	my @value = $query->param('value');

	for (my $i=0;$i<=$#marclist;$i++) {
		if ($searchdesc) { # don't put the and_or on the 1st search term
			$searchdesc .= $and_or[$i]." ".$excluding[$i]." ".($marclist[$i]?$marclist[$i]:"*")." ".$operator[$i]." ".$value[$i]." " if ($value[$i]);
		} else {
			$searchdesc = $excluding[$i]." ".($marclist[$i]?$marclist[$i]:"*")." ".$operator[$i]." ".$value[$i]." " if ($value[$i]);
		}
	}
  if ($itemtypesstring ne ''){
    $searchdesc .= 'filtered by itemtypes ';
    $searchdesc .= join(" ", at itemtypes)
  }
  if ($branchesstring ne ''){
    $searchdesc .= ' in branches ';
    $searchdesc .= join(" ", at branches)
  }
	$resultsperpage= $query->param('resultsperpage');
	$resultsperpage = 19 if(!defined $resultsperpage);
	my $orderby = $query->param('orderby');
	my $desc_or_asc = $query->param('desc_or_asc');
	# builds tag and subfield arrays
	my @tags;

	foreach my $marc (@marclist) {
		if ($marc) {
			my ($tag,$subfield) = MARCfind_marc_from_kohafield($dbh,$marc,'');
			if ($tag) {
				push @tags,$dbh->quote("$tag$subfield");
			} else {
				push @tags, $dbh->quote(substr($marc,0,4));
			}
		} else {
			push @tags, "";
		}
	}
	findseealso($dbh,\@tags);
    my $sqlstring;
    if ($itemtypesstring ne ''){
        $sqlstring = 'and (biblioitems.itemtype IN (';
        my $itemtypeloop=0;
        foreach my $itemtype (@itemtypes){
            if ($itemtype ne ''){
                if ($itemtypeloop != 0){
                    $sqlstring .=','
                }
                $sqlstring .= '"'.$itemtype.'"';
                $itemtypeloop++;
            }
        }
        $sqlstring .= '))'
    }
    if ($branchesstring ne ''){
        $sqlstring .= 'and biblio.biblionumber=items.biblionumber and (items.holdingbranch IN (';
        my $branchesloop=0;
        foreach my $branch (@branches){
            if ($branch ne ''){
                if ($branchesloop != 0){
                    $sqlstring .=','
                }
                $sqlstring .= '"'.$branch.'"';
                $branchesloop++;
            }
        }
        $sqlstring .= '))'
    }

	my ($results,$total) = catalogsearch1($dbh, \@tags,\@and_or,
										\@excluding, \@operator, \@value,
										$startfrom*$resultsperpage, $resultsperpage,$orderby,$desc_or_asc,$sqlstring);
	if ($total ==1) {
	if (C4::Context->preference("BiblioDefaultView") eq "normal") {
	     print $query->redirect("/cgi-bin/koha/opac-detail.pl?bib=".@$results[0]->{biblionumber});
	} elsif (C4::Context->preference("BiblioDefaultView") eq "MARC") {
	     print $query->redirect("/cgi-bin/koha/MARCdetail.pl?bib=".@$results[0]->{biblionumber});
	} else {
	     print $query->redirect("/cgi-bin/koha/ISBDdetail.pl?bib=".@$results[0]->{biblionumber});
	}
	exit;
	}
	($template, $loggedinuser, $cookie)
		= get_template_and_user({template_name => "opac-searchresults.tmpl",
				query => $query,
				type => 'opac',
				authnotrequired => 1,
				debug => 1,
				});

	# multi page display gestion
	my $displaynext=0;
	my $displayprev=$startfrom;
	if(($total - (($startfrom+1)*($resultsperpage))) > 0 ){
		$displaynext = 1;
	}

	my @field_data = ();

### Added by JF
## This next does a number of things:
# 1. It allows you to track all the searches made for stats, etc.
# 2. It fixes the 'searchdesc' variable problem by introducing
#         a. 'searchterms' which comes out as 'Keyword: neal stephenson'
#         b. 'phraseorterm' which comes out as 'neal stephenson'
#      both of these are useful for differen purposes ... I use searchterms
#      for display purposes and phraseorterm for passing the search terms
#      to an external source through a url (like a database search)
# 3. It provides the variables necessary for the spellchecking (look below for
#      how this is done
# 4.
 
$totalresults = $total;

## This formats the 'search results' string and populates
## the 'OPLIN' variable as well as the 'spellcheck' variable
## with appropriate values based on the user's search input

my $searchterms; #returned in place of searchdesc for 'results for search'
                 # as a string (can format if need be)

my @spphrases;
my $phraseorterm;
my %searchtypehash = ( # used only for the searchterms string formation
                        # and for spellcheck string
        '0' => 'keyword',
        '1' => 'title',
        '2' => 'author',
        '3' => 'subject',
        '4' => 'series',
        '5' => 'format',
        );

my @searchterm = $query->param('value');

for (my $i=0; $i <= $#searchterm; $i++) {
        my $searchtype = $searchtypehash{$i};
        push @spphrases, $searchterm[$i];
        if ($searchterms) { #don't put and in again
                if ($searchterm[$i]) {
                $phraseorterm.=$searchterm[$i];
                $searchterms.=" AND ".$searchtype." : \'".$searchterm[$i]."\'";
                }
        } else {
                if ($searchterm[$i]) {
                $phraseorterm.=$searchterm[$i];
                $searchterms.=$searchtype.": \'".$searchterm[$i]."\'";
                }
        }
}

# Spellchecck stuff ... needs to use above scheme but must change
# cgi script first
my $phrases = $query->param('value');
#my $searchterms = $query->param('value');
# warn "here is searchterms:".$searchterms;

# FIXME: should be obvious ;-)
#foreach my $phrases (@spphrases) {
$phrases =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\})/ /g;
$phrases =~ s/(\Athe |\Aa |\Aan |)//g;
my $spchkphraseorterm = $phraseorterm;
        $spchkphraseorterm =~ tr/A-Z/a-z/;
        $spchkphraseorterm =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\})/ /g;
        $spchkphraseorterm =~s/(\Aand-or |\Aand\/or |\Aanon |\Aan |\Aa |\Abut |\Aby |\Ade |\Ader |\Adr |\Adu|et |\Afor |\Afrom |\Ain |\Ainto |\Ait |\Amy |\Anot |\Aon |\Aor |\Aper |\Apt |\Aspp |\Ato |\Avs |\Awith |\Athe )/ /g;
        $spchkphraseorterm =~s/( and-or | and\/or | anon | an | a | but | by | de | der | dr | du|et | for | from | in | into | it | my | not | on | or | per | pt | spp | to | vs | with | the )/ /g;
 
        $spchkphraseorterm =~s/  / /g;
my $resultcount = $total;
my $ipaddress = $query->remote_host();
#

if (
#need to create a table to record the search info
#...FIXME: add the script name that creates the table
# 
my $dbhpop=DBI->connect("DBI:mysql:demosuggest:localhost","auth","YourPass")) {

# insert the search info query
my $insertpop = "INSERT INTO phrase_log(phr_phrase,phr_resultcount,phr_ip) VALUES(?,?,?)";

# grab spelling suggestions query
my $getsugg = "SELECT display FROM spellcheck WHERE strcmp(soundex(suggestion), soundex(?)) = 0 order by soundex(suggestion) limit 0,5";

#get spelling suggestions when there are no results
if ($resultcount eq 0) {
        my $sthgetsugg=$dbhpop->prepare($getsugg);
        $sthgetsugg->execute($spchkphraseorterm);
        while (my ($spsuggestion)=$sthgetsugg->fetchrow_array) {
#               warn "==>$spsuggestion";
                #push @spsuggest, +{ spsuggestion => $spsuggestion };
                my %line;
                $line{spsuggestion} = $spsuggestion;
                push @spsuggest,\%line;
                $suggest = 1;
        }
#       warn "==>".$#spsuggest;
        $sthgetsugg->finish;
}
# end of spelling suggestions

my $sthpop=$dbhpop->prepare($insertpop);

#$sthpop->execute($phrases,$resultcount,$ipaddress);
$sthpop->finish;
}
#
### end of tracking stuff  --  jmf at kados dot org
#
$template->param(suggest => $suggest );
$template->param( SPELL_SUGGEST => \@spsuggest );
$template->param( searchterms => $searchterms );
$template->param( phraseorterm => $phraseorterm );
#warn "here's the search terms: ".$searchterms;
#
### end of spelling suggestions
### /Added by JF

	for(my $i = 0 ; $i <= $#marclist ; $i++)
	{
		push @field_data, { term => "marclist", val=>$marclist[$i] };
		push @field_data, { term => "and_or", val=>$and_or[$i] };
		push @field_data, { term => "excluding", val=>$excluding[$i] };
		push @field_data, { term => "operator", val=>$operator[$i] };
		push @field_data, { term => "value", val=>$value[$i] };
	}

	my @numbers = ();

	if ($total>$resultsperpage)
	{
		for (my $i=1; $i<$total/$resultsperpage+1; $i++)
		{
			if ($i<16)
			{
	    		my $highlight=0;
	    		($startfrom==($i-1)) && ($highlight=1);
	    		push @numbers, { number => $i,
					highlight => $highlight ,
					searchdata=> \@field_data,
					startfrom => ($i-1)};
			}
    	}
	}

	my $from = $startfrom*$resultsperpage+1;
	my $to;

 	if($total < (($startfrom+1)*$resultsperpage))
	{
		$to = $total;
	} else {
		$to = (($startfrom+1)*$resultsperpage);
	}
	my $defaultview = 'BiblioDefaultView'.C4::Context->preference('BiblioDefaultView');
	$template->param(results => $results,
							startfrom=> $startfrom,
							displaynext=> $displaynext,
							displayprev=> $displayprev,
							resultsperpage => $resultsperpage,
							orderby => $orderby,
							startfromnext => $startfrom+1,
							startfromprev => $startfrom-1,
							searchdata=>\@field_data,
							total=>$total,
							from=>$from,
							to=>$to,
							numbers=>\@numbers,
							searchdesc=> $searchdesc,
							$defaultview => 1,
							suggestion => C4::Context->preference("suggestion"),
							virtualshelves => C4::Context->preference("virtualshelves"),
                itemtypelist => $itemtypelist,
              subcategorylist => $subcategorylist,
              brancheslist => $brancheslist,
              categorylist => $categorylist,
              mediatypelist => $mediatypelist,
              itemtypesstring => $itemtypesstring,
							);

} else {
	($template, $loggedinuser, $cookie)
		= get_template_and_user({template_name => "opac-search.tmpl",
					query => $query,
					type => "opac",
					authnotrequired => 1,
				});
	
	
	$sth=$dbh->prepare("Select itemtype,description from itemtypes order by description");
	$sth->execute;
	my  @itemtype;
	my %itemtypes;
	push @itemtype, "";
	$itemtypes{''} = "";
	while (my ($value,$lib) = $sth->fetchrow_array) {
		push @itemtype, $value;
		$itemtypes{$value}=$lib;
	}
	
	my $CGIitemtype=CGI::scrolling_list( -name     => 'value',
				-values   => \@itemtype,
				-labels   => \%itemtypes,
				-size     => 1,
				-multiple => 0 );
	$sth->finish;
	
	my @branches;
	my @select_branch;
	my %select_branches;
	my ($count2, at branches)=branches();
	push @select_branch, "";
	$select_branches{''} = "";
	for (my $i=0;$i<$count2;$i++){
		push @select_branch, $branches[$i]->{'branchcode'};#
		$select_branches{$branches[$i]->{'branchcode'}} = $branches[$i]->{'branchname'};
	}
	my $CGIbranch=CGI::scrolling_list( -name     => 'value',
				-values   => \@select_branch,
				-labels   => \%select_branches,
				-size     => 1,
				-multiple => 0 );
	$sth->finish;
    
	$template->param(itemtypelist => $itemtypelist,
					CGIitemtype => $CGIitemtype,
					CGIbranch => $CGIbranch,
					suggestion => C4::Context->preference("suggestion"),
					virtualshelves => C4::Context->preference("virtualshelves"),
	);
}
# ADDED BY JF
if ($totalresults == 1){
    # if its a barcode search by definition we will only have one result.
    # And if we have a result
    # lets jump straight to the detail.pl page
    print $query->redirect("/cgi-bin/koha/opac-detail.pl?bib=$firstbiblionumber");
}
else {
  output_html_with_http_headers $query, $cookie, $template->output;
}




From gmccullagh at users.sourceforge.net  Fri Jun  3 19:01:55 2005
From: gmccullagh at users.sourceforge.net (gavin)
Date: Fri, 03 Jun 2005 10:01:55 -0700
Subject: [Koha-cvs] CVS: koha/C4 SearchBiblio.pm,NONE,1.1
Message-ID: <E1DeFYR-0004Us-Ez@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15229/C4

Added Files:
	SearchBiblio.pm 
Log Message:
two new files 
  SearchBiblio.pm forked from SearchMarc.pm
  opac-search-biblio.pl forked from opac-search.pl (just change module)
an attempt at a new search using FULLTEXT indexes.
NB: Boolean won't work without MySQL >v4.0
NNB: Will be slow without indexes added on Biblio table as follows:
  ALTER TABLE biblio ADD FULLTEXT (author,title,unititle,seriestitle);
Only searching on "Any word" field just now. 
more to come.



--- NEW FILE ---
package C4::SearchBiblio;

# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
require Exporter;
use DBI;
use C4::Context;
use C4::Biblio;
use C4::Date;
use Date::Manip;

use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);

# set the version for version checking
$VERSION = 0.02;

=head1 NAME

C4::Search - Functions for searching the Koha MARC catalog

=head1 FUNCTIONS

This module provides the searching facilities for the Koha MARC catalog

=cut

@ISA = qw(Exporter);
@EXPORT = qw(&catalogsearch1 &catalogsearch &findseealso &findsuggestion &getMARCnotes &getMARCsubjects);

=head1 findsuggestion($dbh,$values);

=head2 $dbh is a link to the DB handler.

use C4::Context;
my $dbh =C4::Context->dbh;

=head2 $values is a word

Searches words with the same soundex, ordered by frequency of use.
Useful to suggest other searches to the users.

=cut

sub findsuggestion {
	my ($dbh,$values) = @_;
	my $sth = $dbh->prepare("SELECT count( * ) AS total, word FROM marc_word WHERE sndx_word = soundex( ? ) AND word <> ? GROUP BY word ORDER BY total DESC");
	my @results;
	for(my $i = 0 ; $i <= $#{$values} ; $i++) {
		if (length(@$values[$i]) >=5) {
			$sth->execute(@$values[$i],@$values[$i]);
			my $resfound = 1;
			my @resline;
			while ((my ($count,$word) = $sth->fetchrow) and $resfound <=10) {
				push @results, "@$values[$i]|$word|$count";
#				$results{@$values[$i]} = \@resline;
				$resfound++;
			}
		}
	}
	return \@results;
}

=head1 findseealso($dbh,$fields);

=head2 $dbh is a link to the DB handler.

use C4::Context;
my $dbh =C4::Context->dbh;

=head2 $fields is a reference to the fields array

This function modify the @$fields array and add related fields to search on.

=cut

sub findseealso {
	my ($dbh, $fields) = @_;
	my $tagslib = MARCgettagslib ($dbh,1);
	for (my $i=0;$i<=$#{$fields};$i++) {
		my ($tag) =substr(@$fields[$i],1,3);
		my ($subfield) =substr(@$fields[$i],4,1);
		@$fields[$i].=','.$tagslib->{$tag}->{$subfield}->{seealso} if ($tagslib->{$tag}->{$subfield}->{seealso});
	}
}

=head1  my ($count, @results) = catalogsearch($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby,$sqlstring);

=head2 $dbh is a link to the DB handler.

use C4::Context;
my $dbh =C4::Context->dbh;

$tags,$and_or, $excluding, $operator, $value are references to array

=head2 $tags

contains the list of tags+subfields (for example : $@tags[0] = '200a')
A field can be a list of fields : '200f','700a','700b','701a','701b'

Example

=head2 $and_or

contains  a list of strings containing and or or. The 1st value is useless.

=head2 $excluding

contains 0 or 1. If 1, then the request is negated.

=head2 $operator

contains contains,=,start,>,>=,<,<= the = and start work on the complete subfield. The contains operator works on every word in the subfield.

examples :
contains home, search home anywhere.
= home, search a string being home.

=head2 $value

contains the value to search
If it contains a * or a %, then the search is partial.

=head2 $offset and $length

returns $length results, beginning at $offset

=head2 $orderby

define the field used to order the request. Any field in the biblio/biblioitem tables can be used. DESC is possible too

(for example title, title DESC,...)

=head2 $sqlstring

optional argument containing an sql string to be used in the 'where' statement. see usage in opac-search.pl.

=head2 RETURNS

returns an array containing hashes. The hash contains all biblio & biblioitems fields and a reference to an item hash. The "item hash contains one line for each callnumber & the number of items related to the callnumber.

=cut

=head2 my $marcnotesarray = &getMARCnotes($dbh,$bibid,$marcflavour);

Returns a reference to an array containing all the notes stored in the MARC database for the given bibid.
$marcflavour ("MARC21" or "UNIMARC") determines which tags are used for retrieving subjects.

=head2 my $marcsubjctsarray = &getMARCsubjects($dbh,$bibid,$marcflavour);

Returns a reference to an array containing all the subjects stored in the MARC database for the given bibid.
$marcflavour ("MARC21" or "UNIMARC") determines which tags are used for retrieving subjects.

=cut

sub catalogsearch1 {
	my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby,$desc_or_asc,$sqlstring) = @_;
#    warn "==================";
#    warn "
#                  db: $dbh,
#                  tags_array: @$tags,
#                  andor_array: @$and_or,
#                  excludes_array: @$excluding, 
#                  operator_array: @$operator, 
#                  value_array: @$value,
#                  start: $offset,
#                  resultsperpage: $length,
#                  orderby: $orderby,
#                  order: $desc_or_asc,  
#                  sqlstring: $sqlstring)\n";
#    warn "==================\n";

    my @cols = ('biblionumber','author','title','unititle','notes','serial','seriestitle',
                'copyrightdate','timestamp','abstract','illus','biblioitemnumber','marc',
                'url','isbn','volumeddesc','classification','publicationyear','pages','number',
                'itemtype','place','issn','size','dewey','publishercode','lccn','volume',
                'subclass', 'volumedate','subtitle','bibid','notforloan',);
                # missing 'CN', 'description', 'odd', 'bn', 'norequests', 'totitem', 
    my @valarray = @$value;
#    warn "@$value\n";
#    warn "$valarray[0]\n";
    my $sql = "
      SELECT biblio.biblionumber, biblio.author, biblio.title, biblio.unititle,
        biblio.notes, biblio.serial, biblio.seriestitle, biblio.copyrightdate,
        biblio.timestamp, biblio.abstract,
        biblioitems.illus, biblioitems.biblioitemnumber, biblioitems.marc,
        biblioitems.url, biblioitems.isbn, biblioitems.volumeddesc,
        biblioitems.classification, biblioitems.publicationyear,
        biblioitems.pages, biblioitems.number, biblioitems.itemtype,
        biblioitems.place, biblioitems.issn, biblioitems.size,
        biblioitems.dewey, biblioitems.publishercode, biblioitems.lccn,
        biblioitems.volume, biblioitems.subclass, biblioitems.volumedate,
        bibliosubtitle.subtitle,
        marc_biblio.bibid,
        items.notforloan, 
        MATCH(biblio.title,biblio.author,biblio.unititle,biblio.seriestitle) 
        AGAINST ('$$value[0]' IN BOOLEAN MODE) as Relevance
      FROM biblio
        LEFT JOIN biblioitems ON biblioitems.biblionumber=biblio.biblionumber
        LEFT JOIN bibliosubtitle ON bibliosubtitle.biblionumber=biblio.biblionumber
        LEFT JOIN marc_biblio ON marc_biblio.biblionumber=biblio.biblionumber
        LEFT JOIN items ON items.biblionumber=biblio.biblionumber
      WHERE MATCH(biblio.title,biblio.author,biblio.unititle,biblio.seriestitle) 
        AGAINST ('$$value[0]' IN BOOLEAN MODE)
      ORDER BY Relevance DESC;";
    warn "$sql\n";
    my $sth = $dbh->prepare($sql);
	$sth->execute;
    my @biblioArray=();
    my $numBooks=0;
    while (my @vals = $sth->fetchrow) {
      my $numcols = $#vals;
      my %biblioEntryHash=();
      for(my $i=0; $i<$numcols; $i++) {
        $biblioEntryHash{$cols[$i]} = $vals[$i];
      }
      $biblioEntryHash{odd} = ((($numBooks+1) % 2) > 0) ? 1 : ""; 
      #FIXME
      $biblioEntryHash{notforloan} = "";
      #warn "\$biblioEntryHash{odd}  = .$biblioEntryHash{odd}.\n";
      push(@biblioArray,\%biblioEntryHash);
      $numBooks++;
    }


# CN: ARRAY(0x89d1540)?  branch + location + callnumber + status
#                       CDI SL (N8KIM) (2) (if several, group them)
# description: ?
# odd: 1 ?
# bn: 501? biblionumber?
# norequests: 0? 
# totitem: 1?

#    my ($res,$numres) = catalogsearch(@_);
#    my @results = @$res;
#    warn "==================\n";
#    warn "\n\tres: @$res:,\n\tnumres: $numres\n";
#    while ( (my ($key, $value) = each(%{$results[0]})) && (my ($key1, $value1) = each(%{$biblioArray[0]})) ) {
#      warn "\t$key => $value\t$key1 => $value1\n";
#    }
#    warn "a. " . $results[0]->{odd} . "\t" . $biblioArray[0]->{odd}. "\n";
#    warn "b. " . $results[1]->{odd} . "\t" . $biblioArray[1]->{odd}. "\n";
#    warn "==================\n";
    #return ($res,$numres);
    return (\@biblioArray,$numBooks);
}

sub catalogsearch {
	my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby,$desc_or_asc,$sqlstring) = @_;
	# build the sql request. She will look like :
	# select m1.bibid
	#		from marc_subfield_table as m1, marc_subfield_table as m2
	#		where m1.bibid=m2.bibid and
	#		(m1.subfieldvalue like "Des%" and m2.subfieldvalue like "27%")

	# last minute stripping out of stuff
	# doesn't work @$value =~ s/\'/ /;
	# @$value = map { $_ =~ s/\'/ /g } @$value;
	
	# "Normal" statements
	my @normal_tags = ();
	my @normal_and_or = ();
	my @normal_operator = ();
	my @normal_value = ();
	# Extracts the NOT statements from the list of statements
	my @not_tags = ();
	my @not_and_or = ();
	my @not_operator = ();
	my @not_value = ();
	my $any_not = 0;
	$orderby = "biblio.title" unless $orderby;
	$desc_or_asc = "ASC" unless $desc_or_asc;
	#last minute stripping out of ' and ,
# paul : quoting, it's done a few lines lated.
# 	foreach $_ (@$value) {
# 		$_=~ s/\'/ /g;
# 		$_=~ s/\,/ /g;
# 	}

# the item.notforloan contains an integer. Every value <>0 means "book unavailable for loan".
# but each library can have it's own table of meaning for each value. Get them
# 1st search if there is a list of authorised values connected to items.notforloan
	my $sth = $dbh->prepare('select authorised_value from marc_subfield_structure where kohafield="items.notforloan"');
	$sth->execute;
	my %notforloanstatus;
	my ($authorised_valuecode) = $sth->fetchrow;
	if ($authorised_valuecode) {
		$sth = $dbh->prepare("select authorised_value,lib from authorised_values where category=?");
		$sth->execute($authorised_valuecode);
		while (my ($authorised_value,$lib) = $sth->fetchrow) {
			$notforloanstatus{$authorised_value} = $lib?$lib:$authorised_value;
		}
	}
	for(my $i = 0 ; $i <= $#{$value} ; $i++)
	{
		# replace * by %
		@$value[$i] =~ s/\*/%/g;
		# remove % at the beginning
		@$value[$i] =~ s/^%//g;
	    @$value[$i] =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g if @$operator[$i] eq "contains";
		if(@$excluding[$i])	# NOT statements
		{
			$any_not = 1;
			if(@$operator[$i] eq "contains")
			{
				foreach my $word (split(/ /, @$value[$i]))	# if operator is contains, splits the words in separate requests
				{
					# remove the "%" for small word (3 letters. (note : the >4 is due to the % at the end)
# 					warn "word : $word";
					$word =~ s/%//g unless length($word)>4;
					unless (C4::Context->stopwords->{uc($word)} or length($word)==1) {	#it's NOT a stopword => use it. Otherwise, ignore
						push @not_tags, @$tags[$i];
						push @not_and_or, "or"; # as request is negated, finds "foo" or "bar" if final request is NOT "foo" and "bar"
						push @not_operator, @$operator[$i];
						push @not_value, $word;
					}
				}
			}
			else
			{
				push @not_tags, @$tags[$i];
				push @not_and_or, "or"; # as request is negated, finds "foo" or "bar" if final request is NOT "foo" and "bar"
				push @not_operator, @$operator[$i];
				push @not_value, @$value[$i];
			}
		}
		else	# NORMAL statements
		{
			if(@$operator[$i] eq "contains") # if operator is contains, splits the words in separate requests
			{
				foreach my $word (split(/ /, @$value[$i]))
				{
					# remove the "%" for small word (3 letters. (note : the >4 is due to the % at the end)
# 					warn "word : $word";
					$word =~ s/%//g unless length($word)>4;
					unless (C4::Context->stopwords->{uc($word)} or length($word)==1) {	#it's NOT a stopword => use it. Otherwise, ignore
						push @normal_tags, @$tags[$i];
						push @normal_and_or, "and";	# assumes "foo" and "bar" if "foo bar" is entered
						push @normal_operator, @$operator[$i];
						push @normal_value, $word;
					}
				}
			}
			else
			{
				push @normal_tags, @$tags[$i];
				push @normal_and_or, @$and_or[$i];
				push @normal_operator, @$operator[$i];
				push @normal_value, @$value[$i];
			}
		}
	}

	# Finds the basic results without the NOT requests
	my ($sql_tables, $sql_where1, $sql_where2) = create_request($dbh,\@normal_tags, \@normal_and_or, \@normal_operator, \@normal_value);
  $sql_where1 .=" ". $sqlstring;
	$sql_where1 .= "and TO_DAYS( NOW( ) ) - TO_DAYS( biblio.timestamp ) <30" if $orderby =~ "biblio.timestamp";
	my $sth;
	if ($sql_where2) {
		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc");
		warn "Q2 : select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc term is  @$value";
	} else {
		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc");
		warn "Q : select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc";
	}
	$sth->execute();
	my @result = ();
        my $subtitle; # Added by JF for Subtitles

	# Processes the NOT if any and there are results
	my ($not_sql_tables, $not_sql_where1, $not_sql_where2);

	if( ($sth->rows) && $any_not )	# some results to tune up and some NOT statements
	{
		($not_sql_tables, $not_sql_where1, $not_sql_where2) = create_request($dbh,\@not_tags, \@not_and_or, \@not_operator, \@not_value);

		my @tmpresult;

		while (my ($bibid) = $sth->fetchrow) {
			push @tmpresult,$bibid;
		}
		my $sth_not;
		warn "NOT : select distinct m1.bibid from $not_sql_tables where $not_sql_where2 and ($not_sql_where1)";
		if ($not_sql_where2) {
			$sth_not = $dbh->prepare("select distinct m1.bibid from $not_sql_tables where $not_sql_where2 and ($not_sql_where1)");
		} else {
			$sth_not = $dbh->prepare("select distinct m1.bibid from $not_sql_tables where $not_sql_where1");
		}
		$sth_not->execute();

		if($sth_not->rows)
		{
			my %not_bibids = ();
			while(my $bibid = $sth_not->fetchrow()) {
				$not_bibids{$bibid} = 1;	# populates the hashtable with the bibids matching the NOT statement
			}

			foreach my $bibid (@tmpresult)
			{
				if(!$not_bibids{$bibid})
				{
					push @result, $bibid;
				}
			}
		}
		$sth_not->finish();
	}
	else	# no NOT statements
	{
		while (my ($bibid) = $sth->fetchrow) {
			push @result,$bibid;
		}
	}

	# we have bibid list. Now, loads title and author from [offset] to [offset]+[length]
	my $counter = $offset;
	# HINT : biblionumber as bn is important. The hash is fills biblionumber with items.biblionumber.
	# so if you dont' has an item, you get a not nice empty value.
	$sth = $dbh->prepare("SELECT biblio.biblionumber as bn,biblio.*, biblioitems.*,marc_biblio.bibid,itemtypes.notforloan,itemtypes.description
							FROM biblio, marc_biblio 
							LEFT JOIN biblioitems on biblio.biblionumber = biblioitems.biblionumber
							LEFT JOIN itemtypes on itemtypes.itemtype=biblioitems.itemtype
							WHERE biblio.biblionumber = marc_biblio.biblionumber AND bibid = ?");
        my $sth_subtitle = $dbh->prepare("SELECT subtitle FROM bibliosubtitle WHERE biblionumber=?"); # Added BY JF for Subtitles
	my @finalresult = ();
	my @CNresults=();
	my $totalitems=0;
	my $oldline;
	my ($oldbibid, $oldauthor, $oldtitle);
	my $sth_itemCN = $dbh->prepare("select items.* from items where biblionumber=?");
	my $sth_issue = $dbh->prepare("select date_due,returndate from issues where itemnumber=?");
	# parse all biblios between start & end.
	while (($counter <= $#result) && ($counter <= ($offset + $length))) {
		# search & parse all items & note itemcallnumber
		$sth->execute($result[$counter]);
		my $continue=1;
		my $line = $sth->fetchrow_hashref;
		my $biblionumber=$line->{bn};
        # Return subtitles first ADDED BY JF
                $sth_subtitle->execute($biblionumber);
                my $subtitle_here.= $sth_subtitle->fetchrow." ";
                chop $subtitle_here;
                $subtitle = $subtitle_here;
#               warn "Here's the Biblionumber ".$biblionumber;
#                warn "and here's the subtitle: ".$subtitle_here;

        # /ADDED BY JF

# 		$continue=0 unless $line->{bn};
# 		my $lastitemnumber;
		$sth_itemCN->execute($biblionumber);
		my @CNresults = ();
		my $notforloan=1; # to see if there is at least 1 item that can be issued
		while (my $item = $sth_itemCN->fetchrow_hashref) {
			# parse the result, putting holdingbranch & itemcallnumber in separate array
			# then all other fields in the main array
			
			# search if item is on loan
			my $date_due;
			$sth_issue->execute($item->{itemnumber});
			while (my $loan = $sth_issue->fetchrow_hashref) {
				if ($loan->{date_due} and !$loan->{returndate}) {
					$date_due = $loan->{date_due};
				}
			}
			# store this item
			my %lineCN;
			$lineCN{holdingbranch} = $item->{holdingbranch};
			$lineCN{itemcallnumber} = $item->{itemcallnumber};
			$lineCN{location} = $item->{location};
			$lineCN{date_due} = format_date($date_due);
			$lineCN{notforloan} = $notforloanstatus{$line->{notforloan}} if ($line->{notforloan}); # setting not forloan if itemtype is not for loan
			$lineCN{notforloan} = $notforloanstatus{$item->{notforloan}} if ($item->{notforloan}); # setting not forloan it this item is not for loan
			$notforloan=0 unless ($item->{notforloan} or $item->{wthdrawn} or $item->{itemlost});
			push @CNresults,\%lineCN;
			$totalitems++;
		}
		# save the biblio in the final array, with item and item issue status
		my %newline;
		%newline = %$line;
		$newline{totitem} = $totalitems;
		# if $totalitems == 0, check if it's being ordered.
		if ($totalitems == 0) {
			my $sth = $dbh->prepare("select count(*) from aqorders where biblionumber=? and datecancellationprinted is NULL");
			$sth->execute($biblionumber);
			my ($ordered) = $sth->fetchrow;
			$newline{onorder} = 1 if $ordered;
		}
		$newline{biblionumber} = $biblionumber;
		$newline{norequests} = 0;
		$newline{norequests} = 1 if ($line->{notforloan}); # itemtype not issuable
		$newline{norequests} = 1 if (!$line->{notforloan} && $notforloan); # itemtype issuable but all items not issuable for instance
                $newline{subtitle} = $subtitle;  # put the subtitle in ADDED BY JF

		my @CNresults2= @CNresults;
		$newline{CN} = \@CNresults2;
		$newline{'even'} = 1 if $#finalresult % 2 == 0;
		$newline{'odd'} = 1 if $#finalresult % 2 == 1;
		$newline{'timestamp'} = format_date($newline{timestamp});
		@CNresults = ();
		push @finalresult, \%newline;
		$totalitems=0;
		$counter++;
	}
	my $nbresults = $#result+1;
	return (\@finalresult, $nbresults);
}

# Creates the SQL Request

sub create_request {
	my ($dbh,$tags, $and_or, $operator, $value) = @_;

	my $sql_tables; # will contain marc_subfield_table as m1,...
	my $sql_where1; # will contain the "true" where
	my $sql_where2 = "("; # will contain m1.bibid=m2.bibid
	my $nb_active=0; # will contain the number of "active" entries. an entry is active if a value is provided.
	my $nb_table=1; # will contain the number of table. ++ on each entry EXCEPT when an OR  is provided.

	my $maxloop=8; # the maximum number of words to avoid a too complex search.
	$maxloop = @$value if @$value<$maxloop;
	
	for(my $i=0; $i<=$maxloop;$i++) {
		if (@$value[$i]) {
			$nb_active++;
			if ($nb_active==1) {
				if (@$operator[$i] eq "start") {
					$sql_tables .= "marc_subfield_table as m$nb_table,";
					$sql_where1 .= "(m1.subfieldvalue like ".$dbh->quote("@$value[$i]%");
					if (@$tags[$i]) {
						$sql_where1 .=" and concat(m1.tag,m1.subfieldcode) in (@$tags[$i])";
					}
					$sql_where1.=")";
				} elsif (@$operator[$i] eq "contains") {
					$sql_tables .= "marc_word as m$nb_table,";
					$sql_where1 .= "(m1.word  like ".$dbh->quote("@$value[$i]");
					if (@$tags[$i]) {
						 $sql_where1 .=" and m1.tagsubfield in (@$tags[$i])";
					}
					$sql_where1.=")";
				} else {
					$sql_tables .= "marc_subfield_table as m$nb_table,";
					$sql_where1 .= "(m1.subfieldvalue @$operator[$i] ".$dbh->quote("@$value[$i]");
					if (@$tags[$i]) {
						 $sql_where1 .=" and concat(m1.tag,m1.subfieldcode) in (@$tags[$i])";
					}
					$sql_where1.=")";
				}
			} else {
				if (@$operator[$i] eq "start") {
					$nb_table++;
					$sql_tables .= "marc_subfield_table as m$nb_table,";
					$sql_where1 .= "@$and_or[$i] (m$nb_table.subfieldvalue like ".$dbh->quote("@$value[$i]%");
					if (@$tags[$i]) {
					 	$sql_where1 .=" and concat(m$nb_table.tag,m$nb_table.subfieldcode) in (@$tags[$i])";
					}
					$sql_where1.=")";
					$sql_where2 .= "m1.bibid=m$nb_table.bibid and ";
				} elsif (@$operator[$i] eq "contains") {
					if (@$and_or[$i] eq 'and') {
						$nb_table++;
						$sql_tables .= "marc_word as m$nb_table,";
						$sql_where1 .= "@$and_or[$i] (m$nb_table.word like ".$dbh->quote("@$value[$i]");
						if (@$tags[$i]) {
							$sql_where1 .=" and m$nb_table.tagsubfield in(@$tags[$i])";
						}
						$sql_where1.=")";
						$sql_where2 .= "m1.bibid=m$nb_table.bibid and ";
					} else {
						$sql_where1 .= "@$and_or[$i] (m$nb_table.word like ".$dbh->quote("@$value[$i]");
						if (@$tags[$i]) {
							$sql_where1 .="  and m$nb_table.tagsubfield in (@$tags[$i])";
						}
						$sql_where1.=")";
						$sql_where2 .= "m1.bibid=m$nb_table.bibid and ";
					}
				} else {
					$nb_table++;
					$sql_tables .= "marc_subfield_table as m$nb_table,";
					$sql_where1 .= "@$and_or[$i] (m$nb_table.subfieldvalue @$operator[$i] ".$dbh->quote(@$value[$i]);
					if (@$tags[$i]) {
					 	$sql_where1 .="  and concat(m$nb_table.tag,m$nb_table.subfieldcode) in (@$tags[$i])";
					}
					$sql_where2 .= "m1.bibid=m$nb_table.bibid and ";
					$sql_where1.=")";
				}
			}
		}
	}

	if($sql_where2 ne "(")	# some datas added to sql_where2, processing
	{
		$sql_where2 = substr($sql_where2, 0, (length($sql_where2)-5)); # deletes the trailing ' and '
		$sql_where2 .= ")";
	}
	else	# no sql_where2 statement, deleting '('
	{
		$sql_where2 = "";
	}
	chop $sql_tables;	# deletes the trailing ','
	return ($sql_tables, $sql_where1, $sql_where2);
}

sub getMARCnotes {
        my ($dbh, $bibid, $marcflavour) = @_;
	my ($mintag, $maxtag);
	if ($marcflavour eq "MARC21") {
	        $mintag = "500";
		$maxtag = "599";
	} else {           # assume unimarc if not marc21
		$mintag = "300";
		$maxtag = "399";
	}

	my $sth=$dbh->prepare("SELECT subfieldvalue,tag FROM marc_subfield_table WHERE bibid=? AND tag BETWEEN ? AND ? ORDER BY tagorder");

	$sth->execute($bibid,$mintag,$maxtag);

	my @marcnotes;
	my $note = "";
	my $tag = "";
	my $marcnote;

	while (my $data=$sth->fetchrow_arrayref) {
		my $value=$data->[0];
		my $thistag=$data->[1];
		if ($value=~/\.$/) {
		        $value=$value . "  ";
		}
		if ($thistag ne $tag && $note ne "") {
		        $marcnote = {marcnote => $note,};
			push @marcnotes, $marcnote;
			$note=$value;
			$tag=$thistag;
		}
		if ($note ne $value) {
		        $note = $note." ".$value;
		}
	}

	if ($note) {
	        $marcnote = {marcnote => $note};
		push @marcnotes, $marcnote;   #load last tag into array
	}

	$sth->finish;
	$dbh->disconnect;

	my $marcnotesarray=\@marcnotes;
	return $marcnotesarray;
}  # end getMARCnotes


sub getMARCsubjects {
    my ($dbh, $bibid, $marcflavour) = @_;
	my ($mintag, $maxtag);
	if ($marcflavour eq "MARC21") {
	        $mintag = "600";
		$maxtag = "699";
	} else {           # assume unimarc if not marc21
		$mintag = "600";
		$maxtag = "619";
	}
	my $sth=$dbh->prepare("SELECT subfieldvalue,subfieldcode FROM marc_subfield_table WHERE bibid=? AND tag BETWEEN ? AND ? ORDER BY tagorder");

	$sth->execute($bibid,$mintag,$maxtag);

	my @marcsubjcts;
	my $subjct = "";
	my $subfield = "";
	my $marcsubjct;

	while (my $data=$sth->fetchrow_arrayref) {
		my $value = $data->[0];
		my $subfield = $data->[1];
		if ($subfield eq "a" && $value ne $subjct) {
		        $marcsubjct = {MARCSUBJCT => $value,};
			push @marcsubjcts, $marcsubjct;
			$subjct = $value;
		}
	}

	$sth->finish;
	$dbh->disconnect;

	my $marcsubjctsarray=\@marcsubjcts;
        return $marcsubjctsarray;
}  #end getMARCsubjects

END { }       # module clean-up code here (global destructor)

1;
__END__

=back

=head1 AUTHOR

Koha Developement team <info at koha.org>

=cut




From hellen at users.sourceforge.net  Sun Jun  5 16:45:20 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sun, 05 Jun 2005 07:45:20 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple addbiblio-nomarc.tmpl,1.1,1.2 addbiblio.tmpl,1.2,1.3 addbooks.tmpl,1.2,1.3 additem-nomarc.tmpl,1.2,1.3 additem.tmpl,1.2,1.3 marcimport.tmpl,1.2,1.3
Message-ID: <E1DewNM-0002qd-0f@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	addbiblio-nomarc.tmpl addbiblio.tmpl addbooks.tmpl 
	additem-nomarc.tmpl additem.tmpl marcimport.tmpl 
Log Message:
translated for 2.2.2 by hellen

Index: addbiblio-nomarc.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/addbiblio-nomarc.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** addbiblio-nomarc.tmpl	12 May 2005 19:26:13 -0000	1.1
--- addbiblio-nomarc.tmpl	5 Jun 2005 14:45:17 -0000	1.2
***************
*** 8,12 ****
  	
  		<!-- TMPL_IF NAME="ERROR" -->
! 			<p class="problem">Please Specify a Title</p>
  		<!-- /TMPL_IF -->
  		
--- 8,12 ----
  	
  		<!-- TMPL_IF NAME="ERROR" -->
! 			<p class="problem">Bitte einen Titel ausw&auml;hlen</p>
  		<!-- /TMPL_IF -->
  		

Index: addbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/addbiblio.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** addbiblio.tmpl	17 May 2005 13:21:35 -0000	1.2
--- addbiblio.tmpl	5 Jun 2005 14:45:17 -0000	1.3
***************
*** 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">Biblionummer : <!-- TMPL_VAR NAME="oldbiblionumber" --></h1>
  	<p>
  		<input type="hidden" name="op" value="addbiblio">

Index: addbooks.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/addbooks.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** addbooks.tmpl	17 May 2005 13:21:35 -0000	1.2
--- addbooks.tmpl	5 Jun 2005 14:45:17 -0000	1.3
***************
*** 13,17 ****
  			<h2 class="catalogue">Um neue bibliografische Daten (und evtl. entsprechende Medien) aufzunehmen, scannen Sie die ISBN/ISSN oder geben Sie sie hier ein.</h2>
  			<p>
! 				<label class="label100" for="title">Title</label>
  				<input type="hidden" name="marclist" value="biblio.title">
  	
--- 13,17 ----
  			<h2 class="catalogue">Um neue bibliografische Daten (und evtl. entsprechende Medien) aufzunehmen, scannen Sie die ISBN/ISSN oder geben Sie sie hier ein.</h2>
  			<p>
! 				<label class="label100" for="title">Titel</label>
  				<input type="hidden" name="marclist" value="biblio.title">
  	
***************
*** 51,55 ****
  		<h2 class="catalogue">Hinweis</h2>
  		<p>Wenn bereits Daten f?r die ISBN in der Datenbank hinterlegt sind, werden diese angezeigt und k&ouml;nnen bearbeitet werden.<br/>
! 			 Wenn Fremddaten f?r die ISBN abgerufen wurden sich im Zwischenspeicher befinden, werden diese ebenfalls angezeigt und dienen als Grundlage f&uuml;r einen neuen Datensatz.<br/>
  			 Anderenfalls wird eine leerer Datensatz angelegt und Sie m&uuml;ssen alle Daten selbst eintragen.</p>
  	</div>
--- 51,55 ----
  		<h2 class="catalogue">Hinweis</h2>
  		<p>Wenn bereits Daten f?r die ISBN in der Datenbank hinterlegt sind, werden diese angezeigt und k&ouml;nnen bearbeitet werden.<br/>
! 			 Wenn Fremddaten f?r die ISBN abgerufen wurden und sich im Zwischenspeicher befinden, werden diese ebenfalls angezeigt und dienen als Grundlage f&uuml;r einen neuen Datensatz.<br/>
  			 Anderenfalls wird eine leerer Datensatz angelegt und Sie m&uuml;ssen alle Daten selbst eintragen.</p>
  	</div>

Index: additem-nomarc.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/additem-nomarc.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** additem-nomarc.tmpl	17 May 2005 13:21:35 -0000	1.2
--- additem-nomarc.tmpl	5 Jun 2005 14:45:17 -0000	1.3
***************
*** 5,9 ****
  		<p>
  		<!-- TMPL_IF NAME="NOBARCODE" -->
! 			<p class="problem">Sie m&uuml;ssen dem Exemplar einen Strichcode zuordnen</p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="NOBIBLIOITEM" -->
--- 5,9 ----
  		<p>
  		<!-- TMPL_IF NAME="NOBARCODE" -->
! 			<p class="problem">Sie m&uuml;ssen dem Exemplar einen Barcode zuordnen</p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="NOBIBLIOITEM" -->
***************
*** 11,15 ****
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="BARCODEINUSE" -->
! 			<p class="problem">Der Strichcode wird bereits verwendet</p>
  		<!-- /TMPL_IF -->
  		<h2 class="catalogue">BIBLIO SATZ <!-- TMPL_VAR NAME="BIBNUM" --></h2>
--- 11,15 ----
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="BARCODEINUSE" -->
! 			<p class="problem">Der Barcode wird bereits verwendet</p>
  		<!-- /TMPL_IF -->
  		<h2 class="catalogue">BIBLIO SATZ <!-- TMPL_VAR NAME="BIBNUM" --></h2>

Index: additem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/additem.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** additem.tmpl	17 May 2005 13:21:35 -0000	1.2
--- additem.tmpl	5 Jun 2005 14:45:17 -0000	1.3
***************
*** 53,57 ****
  	<input type="hidden" name="itemnum" value="<!-- TMPL_VAR NAME="itemnum" -->">
  	<!-- TMPL_IF name="barcode_not_unique" -->
! 		<div id="problem"><b>FEHLER: Strichcode ist bereits vorhanden<b></div>
  	<!-- /TMPL_IF -->
  	<!-- TMPL_IF name="opisadd" -->
--- 53,57 ----
  	<input type="hidden" name="itemnum" value="<!-- TMPL_VAR NAME="itemnum" -->">
  	<!-- TMPL_IF name="barcode_not_unique" -->
! 		<div id="problem"><b>FEHLER: Barcode ist bereits vorhanden<b></div>
  	<!-- /TMPL_IF -->
  	<!-- TMPL_IF name="opisadd" -->
***************
*** 100,106 ****
  		document.f.submit();
  	} else {
! 		alertString2  = _("Form not submitted because of the following problem(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_errors+_("Pflichtfelder leer (sieh fett dargestellte Unterfelder)");
  		alert(alertString2);
  	}
--- 100,106 ----
  		document.f.submit();
  	} else {
! 		alertString2  = _("Formular nicht bearbeitet wegen der folgenden Probleme");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_errors+_("Pflichtfelder leer (siehe fett dargestellte Unterfelder)");
  		alert(alertString2);
  	}

Index: marcimport.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/marcimport.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** marcimport.tmpl	17 May 2005 13:21:35 -0000	1.2
--- marcimport.tmpl	5 Jun 2005 14:45:17 -0000	1.3
***************
*** 46,50 ****
  	</tr>
  	<tr valign="top">
! 		<td>If ISBN is already in the reservoir: </td>
  		<td><input type="radio" name="overwrite_biblio" value="0" checked> Ignorieren, den vorhandenen Satz behalten<br/>
  			<input type="radio" name="overwrite_biblio" value="1">den vorhandenen Satz &uuml;berschreiben</td>
--- 46,50 ----
  	</tr>
  	<tr valign="top">
! 		<td>Wenn die ISBN bereits im Fremddatenpool ist: </td>
  		<td><input type="radio" name="overwrite_biblio" value="0" checked> Ignorieren, den vorhandenen Satz behalten<br/>
  			<input type="radio" name="overwrite_biblio" value="1">den vorhandenen Satz &uuml;berschreiben</td>




From hellen at users.sourceforge.net  Sun Jun  5 20:10:15 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sun, 05 Jun 2005 11:10:15 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/acqui acqui-home.tmpl,1.2,1.3 acquire.tmpl,1.2,1.3 basket.tmpl,1.2,1.3
Message-ID: <E1DezZf-000731-CN@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	acqui-home.tmpl acquire.tmpl basket.tmpl 
Log Message:
translated for 2.2.2 by hellen

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui/acqui-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** acqui-home.tmpl	4 Jun 2005 14:10:26 -0000	1.2
--- acqui-home.tmpl	5 Jun 2005 18:10:12 -0000	1.3
***************
*** 77,81 ****
  		<p>W&auml;hlen Sie dann einen Einkausfkorb aus bzw. legen Sie einen neuen Korb an. Beachten Sie bitte, dass der neue Korb dem angemeldeten Benutzer zugeordnet wird.</p>
  		<p>Sie m&uuml;ssen das zu bestellende Exemplar einem bestehenden Biblio zuordnen, oder erst einen neuen Biblio anlegen.</p>
! 		<p>Um einen Einkaufskorb zu schlie&szlig;en, klicken Sie auf "Einkaufkorb anzeiegn", dann auf "Einkaufskorb best&auml;tigen".</p>
  	</ul>
  </div>
--- 77,81 ----
  		<p>W&auml;hlen Sie dann einen Einkausfkorb aus bzw. legen Sie einen neuen Korb an. Beachten Sie bitte, dass der neue Korb dem angemeldeten Benutzer zugeordnet wird.</p>
  		<p>Sie m&uuml;ssen das zu bestellende Exemplar einem bestehenden Biblio zuordnen, oder erst einen neuen Biblio anlegen.</p>
! 		<p>Um einen Einkaufskorb zu schlie&szlig;en, klicken Sie auf "Einkaufkorb anzeigen", dann auf "Einkaufskorb best&auml;tigen".</p>
  	</ul>
  </div>

Index: acquire.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui/acquire.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** acquire.tmpl	4 Jun 2005 14:10:26 -0000	1.2
--- acquire.tmpl	5 Jun 2005 18:10:13 -0000	1.3
***************
*** 105,109 ****
  			<th class="acquisition">TITEL</th>
  			<th class="acquisition">VERFASSER</th>
! 			<th class="acquisition">Qty</th>
  			<th class="acquisition">Eingegangen</th>
  		</tr>
--- 105,109 ----
  			<th class="acquisition">TITEL</th>
  			<th class="acquisition">VERFASSER</th>
! 			<th class="acquisition">MENGE</th>
  			<th class="acquisition">Eingegangen</th>
  		</tr>

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui/basket.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** basket.tmpl	4 Jun 2005 14:10:26 -0000	1.2
--- basket.tmpl	5 Jun 2005 18:10:13 -0000	1.3
***************
*** 28,33 ****
  				<th class="acquisition">Titel</th>
  				<th class="acquisition">Verfasser</th>
! 				<th class="acquisition">rrp</th>
! 				<th class="acquisition doNotPrint">est</th>
  				<th class="acquisition">Menge</th>
  				<th class="acquisition">Gesamt</th>
--- 28,33 ----
  				<th class="acquisition">Titel</th>
  				<th class="acquisition">Verfasser</th>
! 				<th class="acquisition">EK-Preis</th>
! 				<th class="acquisition doNotPrint">Nettopreis</th>
  				<th class="acquisition">Menge</th>
  				<th class="acquisition">Gesamt</th>




From tipaul at users.sourceforge.net  Mon Jun  6 11:27:46 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 02:27:46 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.17.2.4,1.17.2.5 opac-top.inc,1.8.2.3,1.8.2.4
Message-ID: <E1DfDta-0008Kj-14@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac.css opac-top.inc 
Log Message:
some CSS improvements (opac works better with opera & konqueror now)

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.17.2.4
retrieving revision 1.17.2.5
diff -C2 -r1.17.2.4 -r1.17.2.5
*** opac.css	3 Jun 2005 13:01:23 -0000	1.17.2.4
--- opac.css	6 Jun 2005 09:27:42 -0000	1.17.2.5
***************
*** 91,99 ****
  	font-weight:bold;
  	font-size: 115%;
- 	text-align : center;
  	vertical-align:top;
  	padding: 2px;
  	width:100%;
- 	margin-left:70px;
  }
  
--- 91,97 ----
***************
*** 143,147 ****
  	border:1px solid #000000;
  	border-collapse:collapse;
! 	width:90%;
  }
  /* header */
--- 141,145 ----
  	border:1px solid #000000;
  	border-collapse:collapse;
! 	position:static;
  }
  /* header */
***************
*** 155,165 ****
  	border-bottom:1px solid #000000;
  	border-top:1px solid #000000;
- 	padding:5px;
  }
  /* standard cell */
  td {
  	font-size:10pt;
  	border-left:1px solid #000000;
  	vertical-align:top;
  }
  
--- 153,171 ----
  	border-bottom:1px solid #000000;
  	border-top:1px solid #000000;
  }
  /* standard cell */
+ 
+ tr {
+ 	display:table-row;
+ 	position:static;
+ }
+ 
  td {
  	font-size:10pt;
  	border-left:1px solid #000000;
  	vertical-align:top;
+ 	position:static;
+ /*	position:relative;*/
+ 	display:table-cell;
  }
  
***************
*** 345,350 ****
  
  #menuline {
- 	float:left;
  	display:block;
  }
  
--- 351,356 ----
  
  #menuline {
  	display:block;
+ 	margin-left:100px;
  }
  
***************
*** 358,365 ****
  
  /* a little spacer. should not be used */
- .spacer {
- 	padding-left:20pt;
- 	float:left;
- }
  .basketspacer {
  	padding-left:8pt;
--- 364,367 ----
***************
*** 370,375 ****
  div.tabsubs {
  	width:25px;
- 	position:absolute;
- 	display:block;
  	margin-left:10px;
  	margin-top:100px;
--- 372,375 ----
***************
*** 387,393 ****
  div.tabsub {
  	background-color: #ACE6E6;
- 	display: block;
  	visibility:hidden;
- 	position:absolute;
  	margin-left:72px;
  	margin-top:100px;
--- 387,391 ----
***************
*** 399,406 ****
  div.tabs {
  	width:10px;
- 	position:absolute;
  	display:block;
- 	margin-left:50px;
- 	margin-top:150px;
  }
  
--- 397,401 ----
***************
*** 414,417 ****
--- 409,420 ----
  }
  
+ div.tabbloc {
+ 	position:absolute;
+ 	display:block;
+ 	top:123px;
+ 	left:42px;
+ 	border: 1px solid black;
+ }
+ 
  div.tab {
  	background-color: #ACE6E6;
***************
*** 419,425 ****
  	visibility:hidden;
  	position:absolute;
! 	margin-left:72px;
! 	margin-top:150px;
! 	margin-right:10%;
  }
  
--- 422,426 ----
  	visibility:hidden;
  	position:absolute;
! 	float:left;
  }
  

Index: opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -C2 -r1.8.2.3 -r1.8.2.4
*** opac-top.inc	25 Mar 2005 16:58:23 -0000	1.8.2.3
--- opac-top.inc	6 Jun 2005 09:27:43 -0000	1.8.2.4
***************
*** 31,41 ****
  <body>
  	<!-- MENUS -->
  	<div id="menuline">
- 		<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo" style="float: left" />
  		<div class="SmallLibraryName"><!--TMPL_VAR name="LibraryName"--></div>
- 		<span class="spacer">&nbsp;</span>
- 		<span class="spacer">&nbsp;</span>
  		<a class="menu" href="/cgi-bin/koha/opac-main.pl" title="Koha home page">Home</a>
- 		<span class="spacer">&nbsp;</span>
  		<a class="menu" href="/cgi-bin/koha/opac-search.pl" title="Advanced search">Advanced search</a>
  		<!-- TMPL_IF NAME="loggedinusername" -->
--- 31,38 ----
  <body>
  	<!-- MENUS -->
+ 	<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo"/>
  	<div id="menuline">
  		<div class="SmallLibraryName"><!--TMPL_VAR name="LibraryName"--></div>
  		<a class="menu" href="/cgi-bin/koha/opac-main.pl" title="Koha home page">Home</a>
  		<a class="menu" href="/cgi-bin/koha/opac-search.pl" title="Advanced search">Advanced search</a>
  		<!-- TMPL_IF NAME="loggedinusername" -->
***************
*** 47,53 ****
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_IF -->
- 		<span class="spacer">&nbsp;</span>
  		<a class="menu" href="/cgi-bin/koha/opac-user.pl" title="Member Home page" >Personal page</a>
- 		<span class="spacer">&nbsp;</span>
  		<a class="menu" href="javascript:openBasket()" title="Biblio basket">Biblio basket <span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a>
  	</div>
--- 44,48 ----




From tipaul at users.sourceforge.net  Mon Jun  6 13:41:10 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 04:41:10 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.15.2.10,1.15.2.11
Message-ID: <E1DfFyg-0003UW-JN@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-detail.tmpl 
Log Message:
* changing unititle label
* hidding "number of items" if there is none

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.15.2.10
retrieving revision 1.15.2.11
diff -C2 -r1.15.2.10 -r1.15.2.11
*** opac-detail.tmpl	19 May 2005 22:43:28 -0000	1.15.2.10
--- opac-detail.tmpl	6 Jun 2005 11:41:08 -0000	1.15.2.11
***************
*** 69,73 ****
  				<!-- 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 -->
--- 69,73 ----
  				<!-- 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>




From tipaul at users.sourceforge.net  Mon Jun  6 14:16:09 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 05:16:09 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-full-serial-issues.tmpl,1.1.2.2,1.1.2.3
Message-ID: <E1DfGWX-00005x-AQ@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-full-serial-issues.tmpl 
Log Message:
small css fixes

Index: opac-full-serial-issues.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/Attic/opac-full-serial-issues.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** opac-full-serial-issues.tmpl	3 Jun 2005 12:53:08 -0000	1.1.2.2
--- opac-full-serial-issues.tmpl	6 Jun 2005 12:16:06 -0000	1.1.2.3
***************
*** 3,11 ****
  
  <!-- TMPL_UNLESS name="popup" -->
! <div class="mainbloc">
! 		<h1 class="catalogue">Subscription information for biblio #<!-- TMPL_VAR NAME="biblionumber" --> with title : <!-- TMPL_VAR name="bibliotitle" --></h1>
! <a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Back to biblio</a>
! 
! </div>
  <!-- /TMPL_UNLESS -->
  	<div class="tabsubs">
--- 3,9 ----
  
  <!-- TMPL_UNLESS name="popup" -->
! <div id="mainbloc">
! 	<h1 class="catalogue">Subscription information for biblio #<!-- TMPL_VAR NAME="biblionumber" --> with title : <!-- TMPL_VAR name="bibliotitle" --></h1>
! 	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Back to biblio</a>
  <!-- /TMPL_UNLESS -->
  	<div class="tabsubs">
***************
*** 47,51 ****
  	</div>
  	<!--/TMPL_LOOP -->
! 
  <script language="JavaScript" type="text/javascript">
  function active(numlayer)
--- 45,49 ----
  	</div>
  	<!--/TMPL_LOOP -->
! </div>
  <script language="JavaScript" type="text/javascript">
  function active(numlayer)




From tipaul at users.sourceforge.net  Mon Jun  6 14:38:18 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 05:38:18 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-MARCdetail.tmpl,1.5.2.1,1.5.2.2
Message-ID: <E1DfGry-0003Ww-99@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-MARCdetail.tmpl 
Log Message:
some css changes, for better compliance & look

Index: opac-MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -C2 -r1.5.2.1 -r1.5.2.2
*** opac-MARCdetail.tmpl	10 Mar 2005 15:52:37 -0000	1.5.2.1
--- opac-MARCdetail.tmpl	6 Jun 2005 12:38:16 -0000	1.5.2.2
***************
*** 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,32 ----
  	<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Add to basket</a>
  </div>
! <div id="mainbloc">
  	<div class="tabs">
  		<!-- TMPL_IF name="0XX" -->
***************
*** 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" -->
--- 62,66 ----
  		<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 ****
--- 320,325 ----
  		</table>
  	</div>
+ </div>
+ </div>
  <script language="JavaScript" type="text/javascript">
  function active(numlayer)




From tipaul at users.sourceforge.net  Mon Jun  6 16:03:58 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:03:58 -0700
Subject: [Koha-cvs] CVS: koha/C4 Output.pm,1.51,1.51.2.1
Message-ID: <E1DfICs-0006pI-K0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26202/C4

Modified Files:
      Tag: rel_2_2
	Output.pm 
Log Message:
adding opacsmallimage parameter if applicable

Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.51
retrieving revision 1.51.2.1
diff -C2 -r1.51 -r1.51.2.1
*** Output.pm	3 Jan 2005 10:58:46 -0000	1.51
--- Output.pm	6 Jun 2005 14:03:54 -0000	1.51.2.1
***************
*** 84,87 ****
--- 84,88 ----
  							theme => $theme,
  							opacstylesheet => $opacstylesheet,
+ 							opacsmallimage => C4::Context->preference('opacsmallimage'),
  							lang => $lang);
  




From tipaul at users.sourceforge.net  Mon Jun  6 16:06:16 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:06:16 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.17.2.5,1.17.2.6
Message-ID: <E1DfIF6-000779-TP@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac.css 
Log Message:
improving stylesheet
(adding title & tabs entries + some minor changes)
works fine on opera & konqueror

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.17.2.5
retrieving revision 1.17.2.6
diff -C2 -r1.17.2.5 -r1.17.2.6
*** opac.css	6 Jun 2005 09:27:42 -0000	1.17.2.5
--- opac.css	6 Jun 2005 14:06:14 -0000	1.17.2.6
***************
*** 51,55 ****
  	border-width:0px;
  	text-align:left;
! 	position:absolute;
  }
  
--- 51,58 ----
  	border-width:0px;
  	text-align:left;
! 	display:inline;
! 	float:left;
! 	padding-left:10px;
! 	padding-right:10px;
  }
  
***************
*** 350,353 ****
--- 353,361 ----
  }
  
+ #title {
+ 	display:block;
+ 	margin-left:0px;
+ }
+ 
  #menuline {
  	display:block;




From tipaul at users.sourceforge.net  Mon Jun  6 16:07:29 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:07:29 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac-top.inc,1.8.2.4,1.8.2.5
Message-ID: <E1DfIGH-0007Jx-Vq@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-top.inc 
Log Message:
splitting title in 2 parts :
* title (logo + title)
* menuline (the menuline)
to be able to have a vertical menuline
* adding parameter to have an alternate image as logo

Index: opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -C2 -r1.8.2.4 -r1.8.2.5
*** opac-top.inc	6 Jun 2005 09:27:43 -0000	1.8.2.4
--- opac-top.inc	6 Jun 2005 14:07:27 -0000	1.8.2.5
***************
*** 31,37 ****
  <body>
  	<!-- MENUS -->
! 	<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo"/>
! 	<div id="menuline">
  		<div class="SmallLibraryName"><!--TMPL_VAR name="LibraryName"--></div>
  		<a class="menu" href="/cgi-bin/koha/opac-main.pl" title="Koha home page">Home</a>
  		<a class="menu" href="/cgi-bin/koha/opac-search.pl" title="Advanced search">Advanced search</a>
--- 31,43 ----
  <body>
  	<!-- MENUS -->
! 	<div id="title">
! 		<!-- TMPL_IF name="opacsmallimage" -->
! 			<img src="<!-- TMPL_VAR name="opacsmallimage"-->" height="50" alt="koha logo"/>
! 		<!-- TMPL_ELSE -->
! 			<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo"/>
! 		<!-- /TMPL_IF -->
  		<div class="SmallLibraryName"><!--TMPL_VAR name="LibraryName"--></div>
+ 	</div>
+ 	<div id="menuline">
  		<a class="menu" href="/cgi-bin/koha/opac-main.pl" title="Koha home page">Home</a>
  		<a class="menu" href="/cgi-bin/koha/opac-search.pl" title="Advanced search">Advanced search</a>




From tipaul at users.sourceforge.net  Mon Jun  6 16:08:38 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:08:38 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-main.tmpl,1.16.2.4,1.16.2.5
Message-ID: <E1DfIHO-0007SY-G5@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-main.tmpl 
Log Message:
* adding parameter to have an alternate image as logo

Index: opac-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl,v
retrieving revision 1.16.2.4
retrieving revision 1.16.2.5
diff -C2 -r1.16.2.4 -r1.16.2.5
*** opac-main.tmpl	18 Mar 2005 09:52:06 -0000	1.16.2.4
--- opac-main.tmpl	6 Jun 2005 14:08:35 -0000	1.16.2.5
***************
*** 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>
  




From tipaul at users.sourceforge.net  Mon Jun  6 16:12:17 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:12:17 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-serial-issues.tmpl,1.2.2.3,1.2.2.4
Message-ID: <E1DfIKv-0007xy-Lr@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-serial-issues.tmpl 
Log Message:


Index: opac-serial-issues.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -r1.2.2.3 -r1.2.2.4
*** opac-serial-issues.tmpl	2 Jun 2005 15:19:35 -0000	1.2.2.3
--- opac-serial-issues.tmpl	6 Jun 2005 14:12:14 -0000	1.2.2.4
***************
*** 2,11 ****
  <!--------------------------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>
--- 2,10 ----
  <!--------------------------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>
! 	<!-- 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>
***************
*** 75,100 ****
  		since <b><!-- TMPl_VAR name="startdate" --></b>
  		</p>
! <!--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" -->
! 		<p>
! 		<!-- TMPL_VAR name="recievedlist" -->
! 			are recieved.
! 		</p>
! 	<!--/TMPL_IF -->
! 	<!-- TMPL_IF name="missinglist" -->
! 	<p>
! 			<!-- TMPL_VAR name="missinglist" -->
! 		are missing.
! 	</p>
! 	<!--/TMPL_IF -->
! <!-- /TMPL_UNLESS -->
! </div>
  <!-- /TMPL_LOOP -->
  </div>
--- 74,99 ----
  		since <b><!-- TMPl_VAR name="startdate" --></b>
  		</p>
! 	<!--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>




From tipaul at users.sourceforge.net  Mon Jun  6 16:11:49 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:11:49 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-searchresults.tmpl,1.20.2.3,1.20.2.4
Message-ID: <E1DfIKT-0007vE-Do@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-searchresults.tmpl 
Log Message:
minor change (to fill a table bottom)

Index: opac-searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl,v
retrieving revision 1.20.2.3
retrieving revision 1.20.2.4
diff -C2 -r1.20.2.3 -r1.20.2.4
*** opac-searchresults.tmpl	25 Mar 2005 17:02:34 -0000	1.20.2.3
--- opac-searchresults.tmpl	6 Jun 2005 14:11:47 -0000	1.20.2.4
***************
*** 115,119 ****
  				<!-- /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>
--- 115,119 ----
  				<!-- /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>




From tipaul at users.sourceforge.net  Mon Jun  6 16:13:24 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:13:24 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-user.tmpl,1.8.2.2,1.8.2.3
Message-ID: <E1DfIM0-00086y-KZ@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-user.tmpl 
Log Message:
minor graphic change + library message shown just after login

Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -C2 -r1.8.2.2 -r1.8.2.3
*** opac-user.tmpl	25 Mar 2005 17:02:59 -0000	1.8.2.2
--- opac-user.tmpl	6 Jun 2005 14:13:22 -0000	1.8.2.3
***************
*** 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" -->




From tipaul at users.sourceforge.net  Mon Jun  6 16:14:01 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:14:01 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-userupdate.tmpl,1.5,1.5.2.1
Message-ID: <E1DfIMb-0008Bz-OO@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-userupdate.tmpl 
Log Message:
minor graphic change + library message shown just after login

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.5.2.1
diff -C2 -r1.5 -r1.5.2.1
*** opac-userupdate.tmpl	12 Nov 2004 16:28:10 -0000	1.5
--- opac-userupdate.tmpl	6 Jun 2005 14:13:59 -0000	1.5.2.1
***************
*** 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>




From tipaul at users.sourceforge.net  Mon Jun  6 16:15:10 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:15:10 -0700
Subject: [Koha-cvs] CVS: koha pay.pl,1.9.2.1,1.9.2.2
Message-ID: <E1DfINi-0008MY-8u@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32105

Modified Files:
      Tag: rel_2_2
	pay.pl 
Log Message:
* fixing a bug
* redirecting to patron page, it's more logic

Index: pay.pl
===================================================================
RCS file: /cvsroot/koha/koha/pay.pl,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -r1.9.2.1 -r1.9.2.2
*** pay.pl	16 Feb 2005 19:16:35 -0000	1.9.2.1
--- pay.pl	6 Jun 2005 14:15:08 -0000	1.9.2.2
***************
*** 56,60 ****
  my $check=0;
  for (my $i=0;$i<@names;$i++){
! 	my$temp=$input->param($names[$i]);
  	if ($temp eq 'wo'){
  		$inp{$names[$i]}=$temp;
--- 56,60 ----
  my $check=0;
  for (my $i=0;$i<@names;$i++){
! 	my $temp=$input->param($names[$i]);
  	if ($temp eq 'wo'){
  		$inp{$names[$i]}=$temp;
***************
*** 65,68 ****
--- 65,69 ----
  		$user=~ s/Foxton/F/i;
  		$user=~ s/Shannon/S/i;
+ 		# FIXME : using array +4, +5, +6 is dirty. Should use arrays for each accountline
  		my $amount=$input->param($names[$i+4]);
  		my $bornum=$input->param($names[$i+5]);
***************
*** 146,150 ****
  	}
  	$bornum=$input->param('bornum');
! 	print $input->redirect("/cgi-bin/koha/pay.pl?bornum=$bornum");
  }
  
--- 147,151 ----
  	}
  	$bornum=$input->param('bornum');
! 	print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$bornum");
  }
  




From tipaul at users.sourceforge.net  Mon Jun  6 16:15:57 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:15:57 -0700
Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.100.2.3,1.100.2.4
Message-ID: <E1DfIOT-0008Rc-Q4@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/updater
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32401/updater

Modified Files:
      Tag: rel_2_2
	updatedatabase 
Log Message:
adding 2 systemparameters to define an alternate image as logo in opac (the image on main page & on each top-left page)

Index: updatedatabase
===================================================================
RCS file: /cvsroot/koha/koha/updater/updatedatabase,v
retrieving revision 1.100.2.3
retrieving revision 1.100.2.4
diff -C2 -r1.100.2.3 -r1.100.2.4
*** updatedatabase	2 Jun 2005 21:05:34 -0000	1.100.2.3
--- updatedatabase	6 Jun 2005 14:15:55 -0000	1.100.2.4
***************
*** 819,822 ****
--- 819,840 ----
          {
              uniquefieldrequired => 'variable',
+             variable            => 'opacsmallimage',
+             value               => '',
+ 	    forceupdate		=> { 'explanation' => 1,
+ 	    			     'type' => 1},
+             explanation         => 'Enter a complete URL to an image, will be on top/left instead of the Koha logo',
+ 	    type		=> 'free',
+         },
+         {
+             uniquefieldrequired => 'variable',
+             variable            => 'opaclargeimage',
+             value               => '',
+ 	    forceupdate		=> { 'explanation' => 1,
+ 	    			     'type' => 1},
+             explanation         => 'Enter a complete URL to an image, will be on the main page, instead of the Koha logo',
+ 	    type		=> 'free',
+         },
+         {
+             uniquefieldrequired => 'variable',
              variable            => 'delimiter',
              value               => ';',
***************
*** 1444,1447 ****
--- 1462,1468 ----
  
  # $Log$
+ # Revision 1.100.2.4  2005/06/06 14:15:55  tipaul
+ # adding 2 systemparameters to define an alternate image as logo in opac (the image on main page & on each top-left page)
+ #
  # Revision 1.100.2.3  2005/06/02 21:05:34  hdl
  # adding variable SubscriptionHistory




From tipaul at users.sourceforge.net  Mon Jun  6 16:16:15 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 07:16:15 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-main.pl,1.16,1.16.2.1
Message-ID: <E1DfIOl-0008VP-7O@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32650/opac

Modified Files:
      Tag: rel_2_2
	opac-main.pl 
Log Message:
minor change (to fill a table bottom)

Index: opac-main.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-main.pl,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -C2 -r1.16 -r1.16.2.1
*** opac-main.pl	4 Oct 2004 20:20:25 -0000	1.16
--- opac-main.pl	6 Jun 2005 14:16:13 -0000	1.16.2.1
***************
*** 53,56 ****
--- 53,57 ----
  				languages => \@options,
  				textmessaging => $borrower->{textmessaging},
+ 				opaclargeimage => C4::Context->preference("opaclargeimage"),
  );
  output_html_with_http_headers $input, $cookie, $template->output;




From tipaul at users.sourceforge.net  Mon Jun  6 17:23:38 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 08:23:38 -0700
Subject: [Koha-cvs] CVS: koha/C4 SearchMarc.pm,1.36.2.10,1.36.2.11
Message-ID: <E1DfJRy-0001iU-G9@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6460/C4

Modified Files:
      Tag: rel_2_2
	SearchMarc.pm 
Log Message:
adding a systempref to choose either to show or hide "lost" items. Note that "lost items" can be related to an authorised value list, so does not necessary mean "item definetly lost". Even here, some libraries want to see lost items, and some don't want. This parameter will make everybody happy !

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.36.2.10
retrieving revision 1.36.2.11
diff -C2 -r1.36.2.10 -r1.36.2.11
*** SearchMarc.pm	21 May 2005 03:11:04 -0000	1.36.2.10
--- SearchMarc.pm	6 Jun 2005 15:23:35 -0000	1.36.2.11
***************
*** 274,278 ****
  	my ($sql_tables, $sql_where1, $sql_where2) = create_request($dbh,\@normal_tags, \@normal_and_or, \@normal_operator, \@normal_value);
  
! 	$sql_where1 .= "and TO_DAYS( NOW( ) ) - TO_DAYS( biblio.timestamp ) <30" if $orderby =~ "biblio.timestamp";
  	my $sth;
  	if ($sql_where2) {
--- 274,278 ----
  	my ($sql_tables, $sql_where1, $sql_where2) = create_request($dbh,\@normal_tags, \@normal_and_or, \@normal_operator, \@normal_value);
  
! 	$sql_where1 .= "and TO_DAYS( NOW( ) ) - TO_DAYS( biblio.timestamp ) <300" if $orderby =~ "biblio.timestamp";
  	my $sth;
  	if ($sql_where2) {
***************
*** 336,340 ****
  	# HINT : biblionumber as bn is important. The hash is fills biblionumber with items.biblionumber.
  	# so if you dont' has an item, you get a not nice empty value.
! 	$sth = $dbh->prepare("SELECT biblio.biblionumber as bn,biblio.*, biblioitems.*,marc_biblio.bibid,itemtypes.notforloan,itemtypes.description
  							FROM biblio, marc_biblio 
  							LEFT JOIN biblioitems on biblio.biblionumber = biblioitems.biblionumber
--- 336,340 ----
  	# HINT : biblionumber as bn is important. The hash is fills biblionumber with items.biblionumber.
  	# so if you dont' has an item, you get a not nice empty value.
! 	$sth = $dbh->prepare("SELECT biblio.biblionumber as bn,biblioitems.*,biblio.*, marc_biblio.bibid,itemtypes.notforloan,itemtypes.description
  							FROM biblio, marc_biblio 
  							LEFT JOIN biblioitems on biblio.biblionumber = biblioitems.biblionumber
***************
*** 347,351 ****
  	my $oldline;
  	my ($oldbibid, $oldauthor, $oldtitle);
! 	my $sth_itemCN = $dbh->prepare("select items.* from items where biblionumber=? and (itemlost = 0 or itemlost is NULL)");
  	my $sth_issue = $dbh->prepare("select date_due,returndate from issues where itemnumber=?");
  	# parse all biblios between start & end.
--- 347,356 ----
  	my $oldline;
  	my ($oldbibid, $oldauthor, $oldtitle);
! 	my $sth_itemCN;
! 	if (C4::Context->preference('hidelostitem')) {
! 		$sth_itemCN = $dbh->prepare("select items.* from items where biblionumber=? and (itemlost = 0 or itemlost is NULL)");
! 	} else {
! 		$sth_itemCN = $dbh->prepare("select items.* from items where biblionumber=?");
! 	}
  	my $sth_issue = $dbh->prepare("select date_due,returndate from issues where itemnumber=?");
  	# parse all biblios between start & end.




From tipaul at users.sourceforge.net  Mon Jun  6 17:23:39 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 08:23:39 -0700
Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.100.2.4,1.100.2.5
Message-ID: <E1DfJRz-0001ij-F1@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/updater
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6460/updater

Modified Files:
      Tag: rel_2_2
	updatedatabase 
Log Message:
adding a systempref to choose either to show or hide "lost" items. Note that "lost items" can be related to an authorised value list, so does not necessary mean "item definetly lost". Even here, some libraries want to see lost items, and some don't want. This parameter will make everybody happy !

Index: updatedatabase
===================================================================
RCS file: /cvsroot/koha/koha/updater/updatedatabase,v
retrieving revision 1.100.2.4
retrieving revision 1.100.2.5
diff -C2 -r1.100.2.4 -r1.100.2.5
*** updatedatabase	6 Jun 2005 14:15:55 -0000	1.100.2.4
--- updatedatabase	6 Jun 2005 15:23:36 -0000	1.100.2.5
***************
*** 877,880 ****
--- 877,889 ----
  	        options		=> 'simplified|full'
          },
+         {
+             uniquefieldrequired => 'variable',
+             variable            => 'hidelostitems',
+             value               => 'No',
+ 	    forceupdate		=> { 'explanation' => 1,
+ 	    			     'type' => 1},
+             explanation         => 'show or hide "lost" items in OPAC.',
+ 	    type		=> 'YesNo',
+         },
      ],
  
***************
*** 1462,1465 ****
--- 1471,1477 ----
  
  # $Log$
+ # Revision 1.100.2.5  2005/06/06 15:23:36  tipaul
+ # adding a systempref to choose either to show or hide "lost" items. Note that "lost items" can be related to an authorised value list, so does not necessary mean "item definetly lost". Even here, some libraries want to see lost items, and some don't want. This parameter will make everybody happy !
+ #
  # Revision 1.100.2.4  2005/06/06 14:15:55  tipaul
  # adding 2 systemparameters to define an alternate image as logo in opac (the image on main page & on each top-left page)




From tipaul at users.sourceforge.net  Mon Jun  6 17:47:30 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 08:47:30 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-sendbasket.pl,1.4.2.3,1.4.2.4
Message-ID: <E1DfJp4-0005AV-Pt@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19826/opac

Modified Files:
      Tag: rel_2_2
	opac-sendbasket.pl 
Log Message:
fix to send an iso2709 file as attachment

Index: opac-sendbasket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-sendbasket.pl,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -r1.4.2.3 -r1.4.2.4
*** opac-sendbasket.pl	2 Jun 2005 13:03:31 -0000	1.4.2.3
--- opac-sendbasket.pl	6 Jun 2005 15:47:27 -0000	1.4.2.4
***************
*** 90,101 ****
  
  	my $boundary = "====" . time() . "====";
  	$mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
  
! 	$email_header = encode_qp($email_header);
  
! 	$boundary = "--".$boundary;
  
! 	# Writing mail
! 	$mail{body} = <<END_OF_BODY;
  $boundary
  Content-Type: text/plain; charset="iso-8859-1"
--- 90,131 ----
  
  	my $boundary = "====" . time() . "====";
+ # 	$mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
+ # 
+ # 	$email_header = encode_qp($email_header);
+ # 
+ # 	$boundary = "--".$boundary;
+ # 
+ # 	# Writing mail
+ # 	$mail{body} =
  	$mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
  
! 	my $message = encode_qp( "" );
  
! # $file = $^X; # This is the perl executable
! # 
! # open (F, $file) or die "Cannot read $file: $!";
! # binmode F; undef $/;
! $mail{body} = encode_base64($iso2709);
! # close F;
  
! $boundary = '--'.$boundary;
! $mail{body} = <<END_OF_BODY;
! $boundary
! Content-Type: text/plain; charset="iso-8859-1"
! Content-Transfer-Encoding: quoted-printable
! 
! $message
! $boundary
! Content-Type: application/octet-stream; name="basket"
! Content-Transfer-Encoding: base64
! Content-Disposition: attachment; filename="basket"
! 
! $mail{body}
! $boundary--
! END_OF_BODY
! 
! 
! 
! 	 <<END_OF_BODY;
  $boundary
  Content-Type: text/plain; charset="iso-8859-1"
***************
*** 109,113 ****
  END_OF_BODY
  
! $mail{PJ} = $iso2709;
  #	$mail{body} = <<END_OF_BODY;
  #$boundary
--- 139,143 ----
  END_OF_BODY
  
! $mail{attachment} = $iso2709;
  #	$mail{body} = <<END_OF_BODY;
  #$boundary
***************
*** 132,136 ****
  #		warn " ".$mail{body};
  #		warn " ".$mail{PJ};
- 		warn "Mail sent ok\n";
  		$template->param(SENT => "1");
  		$template->param(email_add => $email_add);
--- 162,165 ----




From hdl at users.sourceforge.net  Mon Jun  6 18:01:15 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 06 Jun 2005 09:01:15 -0700
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.6.2.7,1.6.2.8
Message-ID: <E1DfK2N-0006uJ-PS@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26413/C4

Modified Files:
      Tag: rel_2_2
	Bull.pm 
Log Message:
Fixing Bug : Not on first page when viewing opac-full-serial.tmpl

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.6.2.7
retrieving revision 1.6.2.8
diff -C2 -r1.6.2.7 -r1.6.2.8
*** Bull.pm	3 Jun 2005 12:53:08 -0000	1.6.2.7
--- Bull.pm	6 Jun 2005 16:00:56 -0000	1.6.2.8
***************
*** 223,231 ****
  				};
  		}else {
  			$year= $subs->{'year'};
  			$startdate= $subs->{'startdate'};
  			$aqbooksellername= $subs->{'aqbooksellername'};
  			$bibliotitle= $subs->{'bibliotitle'};
- 			$first=1 if (not $year);
  			my @temp;
  			push @temp,
--- 223,231 ----
  				};
  		}else {
+ 			$first=1 if (not $year);
  			$year= $subs->{'year'};
  			$startdate= $subs->{'startdate'};
  			$aqbooksellername= $subs->{'aqbooksellername'};
  			$bibliotitle= $subs->{'bibliotitle'};
  			my @temp;
  			push @temp,




From tipaul at users.sourceforge.net  Mon Jun  6 18:11:00 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 09:11:00 -0700
Subject: [Koha-cvs] CVS: koha/admin checkmarc.pl,1.6,1.6.2.1
Message-ID: <E1DfKBo-00081p-1o@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30805/admin

Modified Files:
      Tag: rel_2_2
	checkmarc.pl 
Log Message:
adding 2 new checkings for MARC setup :
* only 1 MARC tag must be mapped to item tab
* warning if there is NULL in a frameworkcode

Index: checkmarc.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/checkmarc.pl,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** checkmarc.pl	22 Dec 2003 19:16:58 -0000	1.6
--- checkmarc.pl	6 Jun 2005 16:10:57 -0000	1.6.2.1
***************
*** 77,80 ****
--- 77,81 ----
  my $tab = $res2;
  my $subtotal=0;
+ warn "TAGF : $tagfield";
  while (($res,$res2,$field) = $sth->fetchrow) {
  	# (ignore itemnumber, that must be in -1 tab)
***************
*** 97,100 ****
--- 98,118 ----
  	$total++;
  }
+ 
+ $sth = $dbh->prepare("select distinct tagfield from marc_subfield_structure where tab = 10");
+ $sth->execute;
+ my $totaltags = 0;
+ my $list = "";
+ while (($res2) = $sth->fetchrow) {
+ 	$totaltags++;
+ 	$list.=$res2.",";
+ }
+ if ($totaltags > 1) {
+ 	$template->param(itemtags => $list);
+ 	$total++;
+ } else {
+ 	$template->param(itemtags => 0);
+ }
+ 
+ 
  # checks biblioitems.itemtype must be mapped and use authorised_value=itemtype
  $sth = $dbh->prepare("select tagfield,tab,authorised_value from marc_subfield_structure where kohafield = \"biblioitems.itemtype\"");
***************
*** 146,149 ****
--- 164,189 ----
  }
  
+ $sth = $dbh->prepare("select count(*) from marc_biblio where frameworkcode is NULL");
+ $sth->execute;
+ ($res) = $sth->fetchrow;
+ if ($res) {
+ 	$template->param(frameworknull =>1);
+ 	$total++;
+ }
+ $sth = $dbh->prepare("select count(*) from marc_subfield_structure where frameworkcode is NULL");
+ $sth->execute;
+ ($res) = $sth->fetchrow;
+ if ($res) {
+ 	$template->param(frameworknull =>1);
+ 	$total++;
+ }
+ $sth = $dbh->prepare("select count(*) from marc_tag_structure where frameworkcode is NULL");
+ $sth->execute;
+ ($res) = $sth->fetchrow;
+ if ($res) {
+ 	$template->param(frameworknull =>1);
+ 	$total++;
+ }
+ 
  $template->param(total => $total);
  output_html_with_http_headers $input, $cookie, $template->output;




From tipaul at users.sourceforge.net  Mon Jun  6 18:11:00 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 09:11:00 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters checkmarc.tmpl,1.10,1.10.2.1
Message-ID: <E1DfKBo-00081y-Gy@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	checkmarc.tmpl 
Log Message:
adding 2 new checkings for MARC setup :
* only 1 MARC tag must be mapped to item tab
* warning if there is NULL in a frameworkcode

Index: checkmarc.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -r1.10 -r1.10.2.1
*** checkmarc.tmpl	19 Jul 2004 19:20:29 -0000	1.10
--- checkmarc.tmpl	6 Jun 2005 16:10:57 -0000	1.10.2.1
***************
*** 36,39 ****
--- 36,51 ----
  	<!-- /TMPL_IF -->
  	<!-- -------------------------------------------------------------------------------------------------------- -->
+ 	<!-- TMPL_IF NAME="itemtags" -->
+ 		<tr>
+ 			<td><b>Item tag</b></td>
+ 			<td>There is more than 1 MARC tag related to items tab (10) : <!-- TMPL_VAR name="itemtags" --></td>
+ 		</tr>
+ 	<!-- TMPL_ELSE -->
+ 		<tr>
+ 			<td>OK</td>
+ 			<td><i>Only 1 marc tag mapped to items</i></td>
+ 		</tr>
+ 	<!-- /TMPL_IF -->
+ 	<!-- -------------------------------------------------------------------------------------------------------- -->
  	<!-- TMPL_IF NAME="itemtypes_empty" -->
  		<tr>
***************
*** 117,120 ****
--- 129,147 ----
  	<!-- /TMPL_IF -->
  	<!-- -------------------------------------------------------------------------------------------------------- -->
+ 	<!-- TMPL_IF NAME="frameworknull" -->
+ 		<tr>
+ 			<td><b>framework values</b></td>
+ 			<td>there is a null value in a frameworkcode. Check the following tables<br/>
+ 				<li>select * from marc_subfield_structure where frameworkcode is NULL</li>
+ 				<li>select * from marc_tag_structure where frameworkcode is NULL</li>
+ 				<li>select * from marc_biblio where frameworkcode is NULL</li></td>
+ 		</tr>
+ 	<!-- TMPL_ELSE -->
+ 		<tr>
+ 			<td>OK</td>
+ 			<td><i>no NULL value in frameworkcode</i></td>
+ 		</tr>
+ 	<!-- /TMPL_IF -->
+ 	<!-- -------------------------------------------------------------------------------------------------------- -->
  	<!-- TMPL_IF NAME="total" -->
  		<tr>




From tipaul at users.sourceforge.net  Mon Jun  6 18:32:11 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 09:32:11 -0700
Subject: [Koha-cvs] CVS: koha/acqui recieveorder.pl,1.9.2.1,1.9.2.2
Message-ID: <E1DfKWJ-0001xZ-17@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7492/acqui

Modified Files:
      Tag: rel_2_2
	recieveorder.pl 
Log Message:
The correct parameter is supplierid, not id.

Index: recieveorder.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/recieveorder.pl,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -r1.9.2.1 -r1.9.2.2
*** recieveorder.pl	14 Apr 2005 21:21:08 -0000	1.9.2.1
--- recieveorder.pl	6 Jun 2005 16:32:08 -0000	1.9.2.2
***************
*** 33,37 ****
  
  my $input=new CGI;
! my $supplierid=$input->param('id');
  my ($count, at booksellers)=bookseller($supplierid);
  
--- 33,37 ----
  
  my $input=new CGI;
! my $supplierid=$input->param('supplierid');
  my ($count, at booksellers)=bookseller($supplierid);
  




From tipaul at users.sourceforge.net  Mon Jun  6 18:36:45 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 06 Jun 2005 09:36:45 -0700
Subject: [Koha-cvs] CVS: koha/C4 Acquisition.pm,1.9.2.3,1.9.2.4
Message-ID: <E1DfKaj-0002T5-RW@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9430/C4

Modified Files:
      Tag: rel_2_2
	Acquisition.pm 
Log Message:
specifying table order to have aqorders.notes and not biblio.notes in {notes} field

Index: Acquisition.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -C2 -r1.9.2.3 -r1.9.2.4
*** Acquisition.pm	26 May 2005 09:21:29 -0000	1.9.2.3
--- Acquisition.pm	6 Jun 2005 16:36:43 -0000	1.9.2.4
***************
*** 563,567 ****
  	map { push(@searchterms,"$_%","% $_%") } @data;
  	push(@searchterms,$search,$search,$biblio);
! 	my $sth=$dbh->prepare("Select *,biblio.title from aqorders,biblioitems,biblio,aqbasket
  		where aqorders.biblioitemnumber = biblioitems.biblioitemnumber and
  		aqorders.basketno = aqbasket.basketno
--- 563,567 ----
  	map { push(@searchterms,"$_%","% $_%") } @data;
  	push(@searchterms,$search,$search,$biblio);
! 	my $sth=$dbh->prepare("Select biblio.*,biblioitems.*,aqorders.*,aqbasket.*,biblio.title from aqorders,biblioitems,biblio,aqbasket
  		where aqorders.biblioitemnumber = biblioitems.biblioitemnumber and
  		aqorders.basketno = aqbasket.basketno




From rangi at users.sourceforge.net  Tue Jun  7 01:29:38 2005
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Mon, 06 Jun 2005 16:29:38 -0700
Subject: [Koha-cvs] CVS: koha/C4 Acquisition.pm,1.11,1.12
Message-ID: <E1DfR2I-0007Xf-Jy@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28428

Modified Files:
	Acquisition.pm 
Log Message:
Fix for a bug in full acquisitions basket.pl
Ordernumber not showing


Index: Acquisition.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** Acquisition.pm	4 May 2005 15:39:08 -0000	1.11
--- Acquisition.pm	6 Jun 2005 23:29:36 -0000	1.12
***************
*** 105,109 ****
  	my ($basketno,$supplier,$orderby)=@_;
  	my $dbh = C4::Context->dbh;
! 	my $query="Select *,biblio.title from aqorders,biblio,biblioitems
  	left join aqorderbreakdown on aqorderbreakdown.ordernumber=aqorders.ordernumber
  	where basketno='$basketno'
--- 105,109 ----
  	my ($basketno,$supplier,$orderby)=@_;
  	my $dbh = C4::Context->dbh;
! 	my $query="Select *,biblio.title,aqorders.ordernumber from aqorders,biblio,biblioitems
  	left join aqorderbreakdown on aqorderbreakdown.ordernumber=aqorders.ordernumber
  	where basketno='$basketno'




From tipaul at users.sourceforge.net  Tue Jun  7 12:00:51 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 03:00:51 -0700
Subject: [Koha-cvs] CVS: koha/C4 AuthoritiesMarc.pm,1.17,1.18
Message-ID: <E1Dfat9-0006Mi-Li@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24420/C4

Modified Files:
	AuthoritiesMarc.pm 
Log Message:
adding $b to mainentry (in UNIMARC, for personal names, $a is the surname, $b is the firstname)

Index: AuthoritiesMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/AuthoritiesMarc.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** AuthoritiesMarc.pm	1 Jun 2005 12:51:02 -0000	1.17
--- AuthoritiesMarc.pm	7 Jun 2005 10:00:47 -0000	1.18
***************
*** 184,188 ****
  		$newline{biblio_fields} = $tags_using_authtype;
  		$newline{even} = $counter % 2;
! 		$newline{mainentry} = $record->field($mainentrytag)->subfield('a') if $record->field($mainentrytag);
  		$counter++;
  		push @finalresult, \%newline;
--- 184,188 ----
  		$newline{biblio_fields} = $tags_using_authtype;
  		$newline{even} = $counter % 2;
! 		$newline{mainentry} = $record->field($mainentrytag)->subfield('a')." ".$record->field($mainentrytag)->subfield('b') if $record->field($mainentrytag);
  		$counter++;
  		push @finalresult, \%newline;
***************
*** 922,925 ****
--- 922,928 ----
  # $Id$
  # $Log$
+ # Revision 1.18  2005/06/07 10:00:47  tipaul
+ # adding $b to mainentry (in UNIMARC, for personal names, $a is the surname, $b is the firstname)
+ #
  # Revision 1.17  2005/06/01 12:51:02  tipaul
  # some fixes & improvements for dictionnary search in librarian interface




From tipaul at users.sourceforge.net  Tue Jun  7 12:02:03 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 03:02:03 -0700
Subject: [Koha-cvs] CVS: koha/C4 AuthoritiesMarc.pm,1.9.2.5,1.9.2.6
Message-ID: <E1DfauJ-0006VX-Qi@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24943/C4

Modified Files:
      Tag: rel_2_2
	AuthoritiesMarc.pm 
Log Message:
porting dictionnary search from head to 2.2. there is now a ... facing titles, author & subject, to search in biblio & authorities existing values.

Index: AuthoritiesMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/AuthoritiesMarc.pm,v
retrieving revision 1.9.2.5
retrieving revision 1.9.2.6
diff -C2 -r1.9.2.5 -r1.9.2.6
*** AuthoritiesMarc.pm	31 May 2005 14:50:46 -0000	1.9.2.5
--- AuthoritiesMarc.pm	7 Jun 2005 10:02:00 -0000	1.9.2.6
***************
*** 65,73 ****
  	# the marclist may contain "mainentry". In this case, search the tag_to_report, that depends on
  	# the authtypecode. Then, search on $a of this tag_to_report
  	for (my $i=0;$i<$#{$tags};$i++) {
  		if (@$tags[$i] eq "mainentry") {
- 			my $sth = $dbh->prepare("select auth_tag_to_report from auth_types where authtypecode=?");
- 			$sth->execute($authtypecode);
- 			my ($tag_to_report) = $sth->fetchrow;
  			@$tags[$i] = $tag_to_report."a";
  		}
--- 65,76 ----
  	# the marclist may contain "mainentry". In this case, search the tag_to_report, that depends on
  	# the authtypecode. Then, search on $a of this tag_to_report
+ 	# also store main entry MARC tag, to extract it at end of search
+ 	my $mainentrytag;
+ 	my $sth = $dbh->prepare("select auth_tag_to_report from auth_types where authtypecode=?");
+ 	$sth->execute($authtypecode);
+ 	my ($tag_to_report) = $sth->fetchrow;
+ 	$mainentrytag = $tag_to_report;
  	for (my $i=0;$i<$#{$tags};$i++) {
  		if (@$tags[$i] eq "mainentry") {
  			@$tags[$i] = $tag_to_report."a";
  		}
***************
*** 88,91 ****
--- 91,99 ----
  	for(my $i = 0 ; $i <= $#{$value} ; $i++)
  	{
+ 		# replace * by %
+ 		@$value[$i] =~ s/\*/%/g;
+ 		# remove % at the beginning
+ 		@$value[$i] =~ s/^%//g;
+ 	    @$value[$i] =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g if @$operator[$i] eq "contains";
  		if(@$operator[$i] eq "contains") # if operator is contains, splits the words in separate requests
  		{
***************
*** 175,178 ****
--- 183,188 ----
  		$newline{used} = &AUTHcount_usage($result[$counter]);
  		$newline{biblio_fields} = $tags_using_authtype;
+ 		$newline{even} = $counter % 2;
+ 		$newline{mainentry} = $record->field($mainentrytag)->subfield('a')." ".$record->field($mainentrytag)->subfield('b') if $record->field($mainentrytag);
  		$counter++;
  		push @finalresult, \%newline;
***************
*** 917,920 ****
--- 927,933 ----
  # $Id$
  # $Log$
+ # Revision 1.9.2.6  2005/06/07 10:02:00  tipaul
+ # porting dictionnary search from head to 2.2. there is now a ... facing titles, author & subject, to search in biblio & authorities existing values.
+ #
  # Revision 1.9.2.5  2005/05/31 14:50:46  tipaul
  # fix for authority merging. There was a bug on official installs




From tipaul at users.sourceforge.net  Tue Jun  7 12:02:03 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 03:02:03 -0700
Subject: [Koha-cvs] CVS: koha/search.marc dictionary.pl,NONE,1.6.2.2
Message-ID: <E1DfauJ-0006VU-L7@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24943/search.marc

Added Files:
      Tag: rel_2_2
	dictionary.pl 
Log Message:
porting dictionnary search from head to 2.2. there is now a ... facing titles, author & subject, to search in biblio & authorities existing values.

--- NEW FILE ---
#!/usr/bin/perl


# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Auth;
use CGI;
use C4::Search;
use C4::SearchMarc;
use C4::AuthoritiesMarc;
use C4::Context;
use C4::Biblio;
use HTML::Template;

=head1 NAME

dictionnary.pl : script to search in biblio & authority an existing value

=head1 SYNOPSIS

useful when the user want to search a term before running a query. For example, to see if "computer" is used in the database

The parameter "marclist" tells which field is searched (title, author, subject, but could be anything else)

This script searches in both biblios & authority
* in biblio, the script search in all marc fields related to what the user is looking for (for example, if the dictionnary is used on "author", the script searches in biblio.author, but also in additional authors & any MARC field related to author (through the "seealso" MARC constraint)
* in authority, the script search everywhere. Thus, the accepted & rejected forms are found.

The script shows all results & the user can choose what he want, that is copied into search form.

=cut

my $input = new CGI;
my $field =$input->param('marclist');
#warn "field :$field";
my ($tablename, $kohafield)=split /./,$field;
#my $tablename=$input->param('tablename');
$tablename="biblio" unless ($tablename);
#my $kohafield = $input->param('kohafield');
my @search = $input->param('search');
# warn " ".$search[0];
my $index = $input->param('index');
# warn " index: ".$index;
my $op=$input->param('op');
if (($search[0]) and not ($op eq 'do_search')){
	$op='do_search';
}
my $script_name = 'search.marc/dictionary.pl';
my $query;
my $type=$input->param('type');
#warn " ".$type;

my $dbh = C4::Context->dbh;
my ($template, $loggedinuser, $cookie);

my $env;

my $startfrom=$input->param('startfrom');
$startfrom=0 if(!defined $startfrom);
my $searchdesc;
my $resultsperpage;

#warn "Starting process";

if ($op eq "do_search") {
	#
	# searching in biblio
	#
	my $sth=$dbh->prepare("Select distinct tagfield,tagsubfield from marc_subfield_structure where kohafield = ?");
	$sth->execute("$field");
	my (@tags, @and_or, @operator, @excluding, at value);
	
 	while ((my $tagfield,my $tagsubfield,my $liblibrarian) = $sth->fetchrow) {
 		push @tags, $dbh->quote("$tagfield$tagsubfield");
 	}

	$resultsperpage= $input->param('resultsperpage');
	$resultsperpage = 19 if(!defined $resultsperpage);
	my $orderby = $input->param('orderby');

	findseealso($dbh,\@tags);

	my @results, my $total;
	my $strsth="select distinct subfieldvalue, count(marc_subfield_table.bibid) from marc_subfield_table,marc_word where marc_word.word like ? and marc_subfield_table.bibid=marc_word.bibid and marc_subfield_table.tagorder=marc_word.tagorder and marc_word.tagsubfield in ";
	my $listtags="(";
	foreach my $tag (@tags){
		$listtags .= $tag .",";
	}
	$listtags =~s/,$/)/;
	$strsth .= $listtags." and marc_word.tagsubfield=marc_subfield_table.tag+marc_subfield_table.subfieldcode group by subfieldvalue ";
# 	warn "search in biblio : ".$strsth;
	my $value = uc($search[0]);
	$value=~s/\*/%/g;
	$value.= "%" if not($value=~m/%/);
# 	warn " texte : ".$value;

	$sth=$dbh->prepare($strsth);
	$sth->execute($value);
	my $total;
	my @catresults;
	while (my ($value,$ctresults)=$sth->fetchrow) {
# 		warn "countresults : ".$ctresults;
		push @catresults,{value=> $value, 
						  even=>($total-$startfrom*$resultsperpage)%2,
						  count=>$ctresults
						  } if (($total>=$startfrom*$resultsperpage) and ($total<($startfrom+1)*$resultsperpage));
		$total++;
	}
	

	my $strsth="Select distinct authtypecode from marc_subfield_structure where (";
	foreach my $listtags (@tags){
		my @taglist=split /,/,$listtags;
		foreach my $curtag (@taglist){
			$strsth.="(tagfield='".substr($curtag,1,3)."' AND tagsubfield='".substr($curtag,4,1)."') OR";
		}
	}
	
	$strsth=~s/ OR$/)/;
	my $strsth = $strsth." and authtypecode is not NULL";
# 	warn $strsth;
	my $sth=$dbh->prepare($strsth);
	$sth->execute;
	
	#
	# searching in authorities
	#
	my @authresults;
	my $authnbresults;
	while ((my $authtypecode) = $sth->fetchrow) {
		my ($curauthresults,$nbresults) = authoritysearch($dbh,[''],[''],[''],['contains'],
														\@search,$startfrom*$resultsperpage, $resultsperpage,$authtypecode);
		push @authresults, @$curauthresults;
		$authnbresults+=$nbresults;
#		warn "auth : $authtypecode nbauthresults : $nbresults";
	}
	
	# 
	# OK, filling the template with authorities & biblio entries found.
	#
	($template, $loggedinuser, $cookie)
		= get_template_and_user({template_name => "search.marc/dictionary.tmpl",
				query => $input,
				type => $type,
				authnotrequired => 0,
				flagsrequired => {catalogue => 1},
				debug => 1,
				});

	# multi page display gestion
	my $displaynext=0;
	my $displayprev=$startfrom;
	if(($total - (($startfrom+1)*($resultsperpage))) > 0 ) {
		$displaynext = 1;
	}

	my @field_data = ();

	for(my $i = 0 ; $i <= $#tags ; $i++) {
		push @field_data, { term => "marclist", val=>$tags[$i] };
		push @field_data, { term => "and_or", val=>$and_or[$i] };
		push @field_data, { term => "excluding", val=>$excluding[$i] };
		push @field_data, { term => "operator", val=>$operator[$i] };
		push @field_data, { term => "value", val=>$value[$i] };
	}

	my @numbers = ();

	if ($total>$resultsperpage) {
		for (my $i=1; $i<$total/$resultsperpage+1; $i++) {
			if ($i<16) {
	    		my $highlight=0;
	    		($startfrom==($i-1)) && ($highlight=1);
	    		push @numbers, { number => $i,
					highlight => $highlight ,
					searchdata=> \@field_data,
					startfrom => ($i-1)};
			}
    	}
	}

	my $from = $startfrom*$resultsperpage+1;
	my $to;

 	if($total < (($startfrom+1)*$resultsperpage))
	{
		$to = $total;
	} else {
		$to = (($startfrom+1)*$resultsperpage);
	}
	$template->param(anindex => $input->param('index'));
	$template->param(result => \@results,
					 catresult=> \@catresults,
						search => $search[0],
						marclist =>$field,
						authresult => \@authresults,
						nbresults => $authnbresults,
						startfrom=> $startfrom,
						displaynext=> $displaynext,
						displayprev=> $displayprev,
						resultsperpage => $resultsperpage,
						startfromnext => $startfrom+1,
						startfromprev => $startfrom-1,
						searchdata=>\@field_data,
						total=>$total,
						from=>$from,
						to=>$to,
						numbers=>\@numbers,
						MARC_ON => C4::Context->preference("marc"),
						);

 } else {
 	($template, $loggedinuser, $cookie)
 		= get_template_and_user({template_name => "search.marc/dictionary.tmpl",
 				query => $input,
 				type => $type,
				authnotrequired => 0,
 				flagsrequired => {catalogue => 1},
 				debug => 1,
 				});
#warn "type : $type";
 
 }
$template->param(search => $search[0],
					marclist =>$field,
					type=>$type,
					anindex => $input->param('index'));

# Print the page
output_html_with_http_headers $input, $cookie, $template->output;

# Local Variables:
# tab-width: 4
# End:




From tipaul at users.sourceforge.net  Tue Jun  7 12:02:03 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 03:02:03 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/search.marc dictionary.tmpl,NONE,1.5.2.2 search.tmpl,1.21.2.1,1.21.2.2
Message-ID: <E1DfauJ-0006VW-Q6@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	search.tmpl 
Added Files:
      Tag: rel_2_2
	dictionary.tmpl 
Log Message:
porting dictionnary search from head to 2.2. there is now a ... facing titles, author & subject, to search in biblio & authorities existing values.

--- NEW FILE ---
    <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<title>KOHA: Dictionary</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">

<script language="JavaScript" type="text/javascript">
<!-- Hide from old browsers
function openWindow(targeturl, windowname) {
	newwin =
window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
}
function Help() {
	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
}
// end hiding -->
</script>

<link rel="stylesheet" type="text/css" href="/intranet-tmpl/default/en/includes/common-style.css">
<style type="text/css">
.catalogue {
	background-color:#ad11ad;
	color:#FFFFFF;
	background-image:none;
	text-decoration: normal;
	}
a.catalogue:hover {
	background-color: #ad11ad;
	color: #FFFFFF;
	text-decoration: none;
	}
</style>
</head>

<body>
<div id="mainbloc">
	<h1 class="catalogue">Dictionary Search</h1>
	
	<form name="f" method="post" action="/cgi-bin/koha/search.marc/dictionary.pl">
		<div class="bloc25">
			<h2 class="catalogue">Search on</h2>
			<p>
				<input type="hidden" name="op" value="do_search">
				<label class="label100" for="keyword"></label>
				<input type="hidden" name="marclist" value="<!-- TMPL_VAR Name="marclist" -->">
				<input type="text" name="search" value="<!-- TMPL_VAR Name="search" -->" size="35">
				<input type="submit" value="Start search" class="button catalogue">
				<input type="hidden" name="type" value="<!-- TMPL_VAR Name="type" -->">
				<input type="hidden" name="index" value="<!-- TMPL_VAR Name="anindex" ESCAPE="URL" -->">
			</p>
		</div>
	</form>

<!-- TMPL_IF Name=search -->
	<div class="bloc25">
	<h2 class="catalogue">Dictionary Search results</h2>
	<!-- TMPL_IF NAME="authresult" -->
		<div id="resultnumber">
			<p><!-- TMPL_IF NAME="displayprev" --> 
					<a class="resultnumber" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&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="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
					<!-- /TMPL_IF -->
				<!-- /TMPL_LOOP --> 
				<!-- TMPL_IF NAME="displaynext" -->
					<a class="resultnumber" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">Next&gt;&gt;</a>
				<!-- /TMPL_IF -->
			</p>
			<p class="resultcount">
			<!-- TMPL_IF NAME="nbresults" -->
					Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="nbresults" --><!-- TMPL_ELSE -->No results found.
			<!-- /TMPL_IF -->
			</p>
		</div>
		<div id="resultlist">
			<table>
				<tr>
					<th colspan="3" class="catalogue">Authorities</th>
				</tr>
				<tr>
					<th class="catalogue">Summary</th>
					<th class="catalogue">Used in</th>
					<th class="catalogue">Select</th>
				</tr>
				<!-- TMPL_LOOP NAME="authresult" -->
					<tr>
						<!-- TMPL_IF NAME="even" -->
							<td class="hilighted">
						<!-- TMPL_ELSE -->
							<td>
						<!-- /TMPL_IF -->
							<!-- TMPL_VAR NAME="summary" -->
						</td>
						<!-- TMPL_IF NAME="even" -->
							<td class="hilighted">
						<!-- TMPL_ELSE -->
							<td>
						<!-- /TMPL_IF -->
							<!-- TMPL_VAR NAME="used" --> biblio(s)
						</td>
						<!-- TMPL_IF NAME="even" -->
							<td class="hilighted">
						<!-- TMPL_ELSE -->
							<td>
						<!-- /TMPL_IF -->
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)" class="button catalogue">select</a>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)" class="button catalogue">sel&amp;close</a>
						</td>
					</tr>
				<!-- /TMPL_LOOP -->
			</table>
		</div>
		<!-- TMPL_ELSE -->
			<h3 class="catalogue">No results in Authorities</h3>
	<!-- /TMPL_IF -->
		
		
	<!-- TMPL_IF Name=catresult -->	
		<div id="resultnumber">
			<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>
		<div id="resultlist">
			<table>
				<tr>
					<th class="catalogue">Summary</th>
					<th class="catalogue">Used in</th>
					<th class="catalogue">Select</th>
				</tr>
				<!-- TMPL_LOOP NAME="catresult" -->
				<tr>
					<!-- TMPL_IF NAME="even" -->
					<td class="hilighted">
					<!-- TMPL_ELSE -->
					<td>
					<!-- /TMPL_IF -->
								<!-- TMPL_IF name="MARC_ON" -->
									<!-- TMPL_VAR NAME="value" -->
								<!-- TMPL_ELSE -->
									<!-- TMPL_VAR NAME="value" -->
								<!-- /TMPL_IF -->
					</td>
					<td align="center" <!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
						<!-- TMPL_VAR NAME="count" --> biblio(s)
					</td>
					<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)" class="button catalogue">Select</a>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)" class="button catalogue">Sel&amp;close</a>
					</td>
				</tr>
				<!-- /TMPL_LOOP -->
			</table>
		</div>
		<div id="resultnumber">
			<p><!-- TMPL_IF NAME="displayprev" --> 
					<a class="resultnumber" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&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="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
					<!-- /TMPL_IF -->
				<!-- /TMPL_LOOP --> 
				<!-- TMPL_IF NAME="displaynext" -->
					<a class="resultnumber" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">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>
	<!-- /TMPL_IF -->
	<script language="JavaScript" type="text/javascript">
	function SelectEntry(myentry, myindex, wclose){
		if (opener.document.f.value[myindex].value!=""){ 
			opener.document.f.value[myindex].value=opener.document.f.value[myindex].value+" "+myentry
		} else {
			opener.document.f.value[myindex].value=myentry
		}
		if (wclose == 1) {
	// 	alert("closing")
			self.close();
		}
	}
	</script>
	</div>
<!-- /TMPL_IF -->
</div>
</body>
</html>
Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -C2 -r1.21.2.1 -r1.21.2.2
*** search.tmpl	7 Mar 2005 09:49:07 -0000	1.21.2.1
--- search.tmpl	7 Jun 2005 10:02:01 -0000	1.21.2.2
***************
*** 31,34 ****
--- 31,37 ----
  			<input type="hidden" name="operator" value="contains">
  			<input type="text" name="value" id="title" onchange="sql_update()" size="35">
+ 			<a href="javascript:Dopop('dictionary.pl?marclist=biblio.title&amp;type=intranet&amp;index=1',1)" class="button catalogue">
+ 				...
+ 			</a>
  		</p>
  		<p>
***************
*** 38,41 ****
--- 41,47 ----
  			<input type="hidden" name="operator" value="contains">
  			<input type="text" name="value" id="author" onchange="sql_update()" size="35">
+ 			<a href="javascript:Dopop('dictionary.pl?marclist=biblio.author&amp;type=intranet&amp;index=2',2)" class="button catalogue">
+ 				...
+ 			</a>
  		</p>
  		<p>
***************
*** 46,49 ****
--- 52,58 ----
  			<input type="hidden" name="operator" value="contains">  
  			<input type="text" name="value" id="subject" onchange="sql_update()" size="35">
+ 			<a href="javascript:Dopop('dictionary.pl?marclist=bibliosubject.subject&amp;type=intranet&amp;index=3',3)" class="button catalogue">
+ 				...
+ 			</a>
  		</p>
  		<p>
***************
*** 151,155 ****
  		<p>
  			<input type="submit" value="Start search" class="button catalogue">
! 			<a href="/cgi-bin/koha/search.marc/suggest.pl" onclick="PopupSuggestion(); return false;" class="button catalogue">Suggestions</a>
  		</p>
  	</div>
--- 160,164 ----
  		<p>
  			<input type="submit" value="Start search" class="button catalogue">
! 			<a href="/cgi-bin/koha/search.marc/suggest.pl" onclick="PopupSuggestion(); return false;" class="button catalogue">Spelling suggestion</a>
  		</p>
  	</div>
***************
*** 177,180 ****
--- 186,195 ----
  }
  
+ function Dopop(link,i) {
+ 	var searchstring=document.forms[0].value[i].value;
+ 	newin=window.open(link+'&amp;search='+searchstring,"popup",'width=700,height=550,toolbar=false,scrollbars=yes');
+ }
+ 
+ 
  function PopupSuggestion() {
      var strQuery="";




From tipaul at users.sourceforge.net  Tue Jun  7 12:23:16 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 03:23:16 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-dictionary.pl,NONE,1.1.2.1
Message-ID: <E1DfbEq-0000z6-02@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3722/opac

Added Files:
      Tag: rel_2_2
	opac-dictionary.pl 
Log Message:
porting dictionary search to OPAC

--- NEW FILE ---
#!/usr/bin/perl


# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use C4::Output;
use C4::Interface::CGI::Output;
use C4::Auth;
use CGI;
use C4::Search;
use C4::SearchMarc;
use C4::AuthoritiesMarc;
use C4::Context;
use C4::Biblio;
use HTML::Template;

=head1 NAME

dictionnary.pl : script to search in biblio & authority an existing value

=head1 SYNOPSIS

useful when the user want to search a term before running a query. For example, to see if "computer" is used in the database

The parameter "marclist" tells which field is searched (title, author, subject, but could be anything else)

This script searches in both biblios & authority
* in biblio, the script search in all marc fields related to what the user is looking for (for example, if the dictionnary is used on "author", the script searches in biblio.author, but also in additional authors & any MARC field related to author (through the "seealso" MARC constraint)
* in authority, the script search everywhere. Thus, the accepted & rejected forms are found.

The script shows all results & the user can choose what he want, that is copied into search form.

=cut

my $input = new CGI;
my $field =$input->param('marclist');
#warn "field :$field";
my ($tablename, $kohafield)=split /./,$field;
#my $tablename=$input->param('tablename');
$tablename="biblio" unless ($tablename);
#my $kohafield = $input->param('kohafield');
my @search = $input->param('search');
# warn " ".$search[0];
my $index = $input->param('index');
# warn " index: ".$index;
my $op=$input->param('op');
if (($search[0]) and not ($op eq 'do_search')){
	$op='do_search';
}
my $script_name = 'opac-dictionary.pl';
my $query;
my $type=$input->param('type');
#warn " ".$type;

my $dbh = C4::Context->dbh;
my ($template, $loggedinuser, $cookie);

my $env;

my $startfrom=$input->param('startfrom');
$startfrom=0 if(!defined $startfrom);
my $searchdesc;
my $resultsperpage;

#warn "Starting process";

if ($op eq "do_search") {
	#
	# searching in biblio
	#
	my $sth=$dbh->prepare("Select distinct tagfield,tagsubfield from marc_subfield_structure where kohafield = ?");
	$sth->execute("$field");
	my (@tags, @and_or, @operator, @excluding, at value);
	
 	while ((my $tagfield,my $tagsubfield,my $liblibrarian) = $sth->fetchrow) {
 		push @tags, $dbh->quote("$tagfield$tagsubfield");
 	}

	$resultsperpage= $input->param('resultsperpage');
	$resultsperpage = 19 if(!defined $resultsperpage);
	my $orderby = $input->param('orderby');

	findseealso($dbh,\@tags);

	my @results, my $total;
	my $strsth="select distinct subfieldvalue, count(marc_subfield_table.bibid) from marc_subfield_table,marc_word where marc_word.word like ? and marc_subfield_table.bibid=marc_word.bibid and marc_subfield_table.tagorder=marc_word.tagorder and marc_word.tagsubfield in ";
	my $listtags="(";
	foreach my $tag (@tags){
		$listtags .= $tag .",";
	}
	$listtags =~s/,$/)/;
	$strsth .= $listtags." and marc_word.tagsubfield=marc_subfield_table.tag+marc_subfield_table.subfieldcode group by subfieldvalue ";
# 	warn "search in biblio : ".$strsth;
	my $value = uc($search[0]);
	$value=~s/\*/%/g;
	$value.= "%" if not($value=~m/%/);
# 	warn " texte : ".$value;

	$sth=$dbh->prepare($strsth);
	$sth->execute($value);
	my $total;
	my @catresults;
	while (my ($value,$ctresults)=$sth->fetchrow) {
# 		warn "countresults : ".$ctresults;
		push @catresults,{value=> $value, 
						  even=>($total-$startfrom*$resultsperpage)%2,
						  count=>$ctresults
						  } if (($total>=$startfrom*$resultsperpage) and ($total<($startfrom+1)*$resultsperpage));
		$total++;
	}
	

	my $strsth="Select distinct authtypecode from marc_subfield_structure where (";
	foreach my $listtags (@tags){
		my @taglist=split /,/,$listtags;
		foreach my $curtag (@taglist){
			$strsth.="(tagfield='".substr($curtag,1,3)."' AND tagsubfield='".substr($curtag,4,1)."') OR";
		}
	}
	
	$strsth=~s/ OR$/)/;
	my $strsth = $strsth." and authtypecode is not NULL";
# 	warn $strsth;
	my $sth=$dbh->prepare($strsth);
	$sth->execute;
	
	#
	# searching in authorities
	#
	my @authresults;
	my $authnbresults;
	while ((my $authtypecode) = $sth->fetchrow) {
		my ($curauthresults,$nbresults) = authoritysearch($dbh,[''],[''],[''],['contains'],
														\@search,$startfrom*$resultsperpage, $resultsperpage,$authtypecode);
		push @authresults, @$curauthresults;
		$authnbresults+=$nbresults;
#		warn "auth : $authtypecode nbauthresults : $nbresults";
	}
	
	# 
	# OK, filling the template with authorities & biblio entries found.
	#
	($template, $loggedinuser, $cookie)
		= get_template_and_user({template_name => "opac-dictionary.tmpl",
				query => $input,
				type => 'opac',
				authnotrequired => 1,
				debug => 1,
				});

	# multi page display gestion
	my $displaynext=0;
	my $displayprev=$startfrom;
	if(($total - (($startfrom+1)*($resultsperpage))) > 0 ) {
		$displaynext = 1;
	}

	my @field_data = ();

	for(my $i = 0 ; $i <= $#tags ; $i++) {
		push @field_data, { term => "marclist", val=>$tags[$i] };
		push @field_data, { term => "and_or", val=>$and_or[$i] };
		push @field_data, { term => "excluding", val=>$excluding[$i] };
		push @field_data, { term => "operator", val=>$operator[$i] };
		push @field_data, { term => "value", val=>$value[$i] };
	}

	my @numbers = ();

	if ($total>$resultsperpage) {
		for (my $i=1; $i<$total/$resultsperpage+1; $i++) {
			if ($i<16) {
	    		my $highlight=0;
	    		($startfrom==($i-1)) && ($highlight=1);
	    		push @numbers, { number => $i,
					highlight => $highlight ,
					searchdata=> \@field_data,
					startfrom => ($i-1)};
			}
    	}
	}

	my $from = $startfrom*$resultsperpage+1;
	my $to;

 	if($total < (($startfrom+1)*$resultsperpage))
	{
		$to = $total;
	} else {
		$to = (($startfrom+1)*$resultsperpage);
	}
	$template->param(anindex => $input->param('index'));
	$template->param(result => \@results,
					 catresult=> \@catresults,
						search => $search[0],
						marclist =>$field,
						authresult => \@authresults,
						nbresults => $authnbresults,
						startfrom=> $startfrom,
						displaynext=> $displaynext,
						displayprev=> $displayprev,
						resultsperpage => $resultsperpage,
						startfromnext => $startfrom+1,
						startfromprev => $startfrom-1,
						searchdata=>\@field_data,
						total=>$total,
						from=>$from,
						to=>$to,
						numbers=>\@numbers,
						MARC_ON => C4::Context->preference("marc"),
						);

 } else {
 	($template, $loggedinuser, $cookie)
 		= get_template_and_user({template_name => "opac-dictionary.tmpl",
 				query => $input,
 				type => 'opac',
				authnotrequired => 1,
 				debug => 1,
 				});
#warn "type : $type";
 
 }
$template->param(search => $search[0],
					marclist =>$field,
					type=>$type,
					anindex => $input->param('index'));

# Print the page
output_html_with_http_headers $input, $cookie, $template->output;

# Local Variables:
# tab-width: 4
# End:




From tipaul at users.sourceforge.net  Tue Jun  7 12:23:15 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 03:23:15 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-dictionary.tmpl,NONE,1.1.2.1 opac-search.tmpl,1.11.2.7,1.11.2.8
Message-ID: <E1DfbEp-0000z3-VL@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-search.tmpl 
Added Files:
      Tag: rel_2_2
	opac-dictionary.tmpl 
Log Message:
porting dictionary search to OPAC

--- NEW FILE ---
<!-- TMPL_INCLUDE name="popup-top.inc"-->
<body>
<div id="mainbloc">
	<h1 class="catalogue">Dictionary Search</h1>
	
	<form name="f" method="post" action="opac-dictionary.pl">
		<div class="bloc25">
			<h2 class="catalogue">Search on</h2>
			<p>
				<input type="hidden" name="op" value="do_search">
				<label class="label100" for="keyword"></label>
				<input type="hidden" name="marclist" value="<!-- TMPL_VAR Name="marclist" -->">
				<input type="text" name="search" value="<!-- TMPL_VAR Name="search" -->" size="35">
				<input type="submit" value="Start search" class="button catalogue">
				<input type="hidden" name="type" value="<!-- TMPL_VAR Name="type" -->">
				<input type="hidden" name="index" value="<!-- TMPL_VAR Name="anindex" ESCAPE="URL" -->">
			</p>
		</div>
	</form>

<!-- TMPL_IF Name=search -->
	<div class="bloc25">
	<h2 class="catalogue">Dictionary Search results</h2>
	<!-- TMPL_IF NAME="authresult" -->
		<div id="resultnumber">
			<p><!-- TMPL_IF NAME="displayprev" --> 
					<a class="resultnumber" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&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="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
					<!-- /TMPL_IF -->
				<!-- /TMPL_LOOP --> 
				<!-- TMPL_IF NAME="displaynext" -->
					<a class="resultnumber" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">Next&gt;&gt;</a>
				<!-- /TMPL_IF -->
			</p>
			<p class="resultcount">
			<!-- TMPL_IF NAME="nbresults" -->
					Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="nbresults" --><!-- TMPL_ELSE -->No results found.
			<!-- /TMPL_IF -->
			</p>
		</div>
		<div id="resultlist">
			<table>
				<tr>
					<th colspan="3" class="catalogue">Authorities</th>
				</tr>
				<tr>
					<th class="catalogue">Summary</th>
					<th class="catalogue">Used in</th>
					<th class="catalogue">Select</th>
				</tr>
				<!-- TMPL_LOOP NAME="authresult" -->
					<tr>
						<!-- TMPL_IF NAME="even" -->
							<td class="hilighted">
						<!-- TMPL_ELSE -->
							<td>
						<!-- /TMPL_IF -->
							<!-- TMPL_VAR NAME="summary" -->
						</td>
						<!-- TMPL_IF NAME="even" -->
							<td class="hilighted">
						<!-- TMPL_ELSE -->
							<td>
						<!-- /TMPL_IF -->
							<!-- TMPL_VAR NAME="used" --> biblio(s)
						</td>
						<!-- TMPL_IF NAME="even" -->
							<td class="hilighted">
						<!-- TMPL_ELSE -->
							<td>
						<!-- /TMPL_IF -->
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)" class="button catalogue">select</a>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)" class="button catalogue">sel&amp;close</a>
						</td>
					</tr>
				<!-- /TMPL_LOOP -->
			</table>
		</div>
		<!-- TMPL_ELSE -->
			<h3 class="catalogue">No results in Authorities</h3>
	<!-- /TMPL_IF -->
		
		
	<!-- TMPL_IF Name=catresult -->	
		<div id="resultnumber">
			<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>
		<div id="resultlist">
			<table>
				<tr>
					<th class="catalogue">Summary</th>
					<th class="catalogue">Used in</th>
					<th class="catalogue">Select</th>
				</tr>
				<!-- TMPL_LOOP NAME="catresult" -->
				<tr>
					<!-- TMPL_IF NAME="even" -->
					<td class="hilighted">
					<!-- TMPL_ELSE -->
					<td>
					<!-- /TMPL_IF -->
								<!-- TMPL_IF name="MARC_ON" -->
									<!-- TMPL_VAR NAME="value" -->
								<!-- TMPL_ELSE -->
									<!-- TMPL_VAR NAME="value" -->
								<!-- /TMPL_IF -->
					</td>
					<td align="center" <!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
						<!-- TMPL_VAR NAME="count" --> biblio(s)
					</td>
					<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)" class="button catalogue">Select</a>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)" class="button catalogue">Sel&amp;close</a>
					</td>
				</tr>
				<!-- /TMPL_LOOP -->
			</table>
		</div>
		<div id="resultnumber">
			<p><!-- TMPL_IF NAME="displayprev" --> 
					<a class="resultnumber" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&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="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
					<!-- /TMPL_IF -->
				<!-- /TMPL_LOOP --> 
				<!-- TMPL_IF NAME="displaynext" -->
					<a class="resultnumber" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">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>
	<!-- /TMPL_IF -->
	<script language="JavaScript" type="text/javascript">
	function SelectEntry(myentry, myindex, wclose){
		if (opener.document.f.value[myindex].value!=""){ 
			opener.document.f.value[myindex].value=opener.document.f.value[myindex].value+" "+myentry
		} else {
			opener.document.f.value[myindex].value=myentry
		}
		if (wclose == 1) {
	// 	alert("closing")
			self.close();
		}
	}
	</script>
	</div>
<!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE name="opac-bottom.inc" -->
Index: opac-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl,v
retrieving revision 1.11.2.7
retrieving revision 1.11.2.8
diff -C2 -r1.11.2.7 -r1.11.2.8
*** opac-search.tmpl	31 May 2005 15:15:28 -0000	1.11.2.7
--- opac-search.tmpl	7 Jun 2005 10:23:13 -0000	1.11.2.8
***************
*** 25,28 ****
--- 25,31 ----
  			<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>
***************
*** 32,35 ****
--- 35,41 ----
  			<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>
***************
*** 40,43 ****
--- 46,52 ----
  			<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>
***************
*** 155,158 ****
--- 164,169 ----
  		<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>




From tipaul at users.sourceforge.net  Tue Jun  7 13:03:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 04:03:54 -0700
Subject: [Koha-cvs] CVS: koha/acqui basket.pl,1.24.2.2,1.24.2.3
Message-ID: <E1DfbsA-0006Fz-Mq@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23970/acqui

Modified Files:
      Tag: rel_2_2
	basket.pl 
Log Message:
adding total to calculate rrp & est prices separately

Index: basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/basket.pl,v
retrieving revision 1.24.2.2
retrieving revision 1.24.2.3
diff -C2 -r1.24.2.2 -r1.24.2.3
*** basket.pl	14 Apr 2005 20:31:38 -0000	1.24.2.2
--- basket.pl	7 Jun 2005 11:03:52 -0000	1.24.2.3
***************
*** 56,59 ****
--- 56,61 ----
  my ($count2, at booksellers)=bookseller($booksellerid);
  
+ # get librarian branch...
+ 
  # if new basket, pre-fill infos
  $basket->{creationdate} = "" unless ($basket->{creationdate});
***************
*** 66,69 ****
--- 68,76 ----
  my $grand_total; # $subttotal + $gist
  
+ # my $line_total_est; # total of each line
+ my $sub_total_est; # total of line totals
+ my $gist_est;      # GST
+ my $grand_total_est; # $subttotal + $gist
+ 
  my @books_loop;
  for (my $i=0;$i<$count;$i++){
***************
*** 71,74 ****
--- 78,82 ----
  	$rrp=curconvert($results[$i]->{'currency'},$rrp);
  
+ 	$sub_total_est+=$results[$i]->{'quantity'}*$results[$i]->{'rrp'};
  	$line_total=$results[$i]->{'quantity'}*$results[$i]->{'ecost'};
  	$sub_total+=$line_total;
***************
*** 99,102 ****
--- 107,112 ----
  $gist=sprintf("%.2f",$sub_total*$prefgist);
  $grand_total=$sub_total+$gist;
+ $grand_total_est = $sub_total_est+sprintf("%.2f",$sub_total_est*$prefgist);
+ $gist_est = sprintf("%.2f",$sub_total_est*$prefgist);
  $template->param(basketno => $basketno,
  				creationdate => $basket->{creationdate},
***************
*** 107,110 ****
--- 117,124 ----
  				booksellerid=> $booksellers[0]->{'id'},
  				name => $booksellers[0]->{'name'},
+ 				address1 => $booksellers[0]->{'address1'},
+ 				address2 => $booksellers[0]->{'address2'},
+ 				address3 => $booksellers[0]->{'address3'},
+ 				address4 => $booksellers[0]->{'address4'},
  				entrydate => format_date($results[0]->{'entrydate'}),
  				books_loop => \@books_loop,
***************
*** 113,116 ****
--- 127,133 ----
  				gist => $gist,
  				grand_total =>$grand_total,
+ 				sub_total_est => $sub_total_est,
+ 				gist_est => $gist_est,
+ 				grand_total_est =>$grand_total_est,
  				currency => $booksellers[0]->{'listprice'},
  				);




From tipaul at users.sourceforge.net  Tue Jun  7 13:03:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 04:03:54 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui basket.tmpl,1.15.2.5,1.15.2.6
Message-ID: <E1DfbsA-0006G0-NV@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	basket.tmpl 
Log Message:
adding total to calculate rrp & est prices separately

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.15.2.5
retrieving revision 1.15.2.6
diff -C2 -r1.15.2.5 -r1.15.2.6
*** basket.tmpl	19 May 2005 22:41:07 -0000	1.15.2.5
--- basket.tmpl	7 Jun 2005 11:03:52 -0000	1.15.2.6
***************
*** 32,38 ****
  				<th class="acquisition doNotPrint">Order</th>
  				<th class="acquisition">Publisher<a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=biblioitems.publishercode" class="acquisition doNotPrint">[order]</a></th>
- 				<th class="acquisition">Isbn</th>
  				<th class="acquisition">Title</th>
- 				<th class="acquisition">Author</th>
  				<th class="acquisition">rrp</th>
  				<th class="acquisition doNotPrint">est</th>
--- 32,36 ----
***************
*** 50,60 ****
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
- 					<td><!-- TMPL_VAR NAME="isbn" --></td>
  					<!-- TMPL_IF name="closedate" -->
! 						<td><!-- TMPL_VAR NAME="title" --></td>
  					<!-- TMPL_ELSE -->
! 						<td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
  					<!-- /TMPL_IF -->
- 					<td><!-- TMPL_VAR NAME="author" --></td>
  					<td><!-- TMPL_VAR NAME="rrp" --></td>
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="ecost" --></td>
--- 48,69 ----
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
  					<!-- TMPL_IF name="closedate" -->
! 						<td><p>
! 							<b><!-- TMPL_VAR NAME="title" --></b><br/>
! 								<!-- TMPL_VAR NAME="author" -->
! 								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! 							</p>
! 						</td>
  					<!-- TMPL_ELSE -->
! 						<td>
! 							<p>
! 							<a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a><br/>
! 								<!-- TMPL_VAR NAME="author" -->
! 								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! 							</p>
! 						</td>
  					<!-- /TMPL_IF -->
  					<td><!-- TMPL_VAR NAME="rrp" --></td>
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="ecost" --></td>
***************
*** 76,92 ****
  			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
  			<tr>
! 				<td colspan="4" rowspan=3>
  					&nbsp;
  				</td>
! 				<th colspan="2" class="acquisition">SubTotal</th>
! 				<th class="acquisition"><!-- TMPL_VAR NAME="currency" --><!-- TMPL_VAR NAME="sub_total" --></th>
! 			</tr>
! 			<tr>
! 				<th colspan="2" class="acquisition">GST</th>
! 				<th class="acquisition"><!-- TMPL_VAR NAME="currency" --><!-- TMPL_VAR NAME="gist" --></th>
! 			</tr>
! 			<tr>
! 				<th colspan="2" class="acquisition">TOTAL</th>
! 				<th class="acquisition"><!-- TMPL_VAR NAME="currency" --><!-- TMPL_VAR NAME="grand_total" --></th>
  			</tr>
  		</table>
--- 85,121 ----
  			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
  			<tr>
! 				<td colspan="2" class="acquisition">
  					&nbsp;
  				</td>
! 				<td class="acquisition number">
! 					<p>Sub total</p>
! 					<p>GST</p>
! 					<p>TOTAL (<!-- TMPL_VAR NAME="currency" -->)</p>
! 				</td>
! 				<td class="acquisition number">
! 					<p><!-- TMPL_VAR NAME="sub_total_est" --></p>
! 					<p><!-- TMPL_VAR NAME="gist_est" --></p>
! 					<p><!-- TMPL_VAR NAME="grand_total_est" --></p>
! 				</td>
! 				<td class="acquisition number">
! 					<p><!-- TMPL_VAR NAME="sub_total" --></p>
! 					<p><!-- TMPL_VAR NAME="gist" --></p>
! 					<p><!-- TMPL_VAR NAME="grand_total" --></p>
! 				</td>
! 				<td class="acquisition">
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 				</td>
! 				<td class="acquisition">
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 				</td>
! 				<td class="acquisition">
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 				</td>
  			</tr>
  		</table>




From tipaul at users.sourceforge.net  Tue Jun  7 14:56:39 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 05:56:39 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui basket.tmpl,1.15.2.6,1.15.2.7
Message-ID: <E1DfddH-00051Q-Oa@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	basket.tmpl 
Log Message:
fix for #958 : showing notes in order list screen. The note can be used for whatever the library want, and should be seen here.
The table has been improved :
* title / isbn / author / note are on the same column, as in marc search
* alternate colors working

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.15.2.6
retrieving revision 1.15.2.7
diff -C2 -r1.15.2.6 -r1.15.2.7
*** basket.tmpl	7 Jun 2005 11:03:52 -0000	1.15.2.6
--- basket.tmpl	7 Jun 2005 12:56:37 -0000	1.15.2.7
***************
*** 45,49 ****
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
! 				<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="color" -->">
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
--- 45,53 ----
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
! 				<!-- TMPL_IF name="odd" -->
! 				<tr class="hilighted">
! 				<!-- TMPL_ELSE -->
! 				<tr>
! 				<!-- /TMPL_IF -->
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
***************
*** 53,57 ****
  								<!-- TMPL_VAR NAME="author" -->
  								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
  							</p>
  						</td>
--- 57,61 ----
  								<!-- TMPL_VAR NAME="author" -->
  								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
  							</p>
  						</td>
***************
*** 62,73 ****
  								<!-- TMPL_VAR NAME="author" -->
  								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
  							</p>
  						</td>
  					<!-- /TMPL_IF -->
! 					<td><!-- TMPL_VAR NAME="rrp" --></td>
! 					<td class="doNotPrint"><!-- TMPL_VAR NAME="ecost" --></td>
! 					<td><!-- TMPL_VAR NAME="quantity" --></td>
! 					<td><!-- TMPL_VAR NAME="line_total" --></td>
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="bookfundid" --></td>
  					<!-- TMPL_IF name="active" -->
--- 66,77 ----
  								<!-- TMPL_VAR NAME="author" -->
  								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
  							</p>
  						</td>
  					<!-- /TMPL_IF -->
! 					<td class="number"><!-- TMPL_VAR NAME="rrp" --></td>
! 					<td class="doNotPrint number"><!-- TMPL_VAR NAME="ecost" --></td>
! 					<td class="number"><!-- TMPL_VAR NAME="quantity" --></td>
! 					<td class="number"><!-- TMPL_VAR NAME="line_total" --></td>
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="bookfundid" --></td>
  					<!-- TMPL_IF name="active" -->
***************
*** 104,108 ****
  				</td>
  				<td class="acquisition">
! 					<p>&nbsp;</p>
  					<p>&nbsp;</p>
  					<p>&nbsp;</p>
--- 108,112 ----
  				</td>
  				<td class="acquisition">
! 					<p><!-- TMPL_VAR name="qty_total" --></p>
  					<p>&nbsp;</p>
  					<p>&nbsp;</p>




From tipaul at users.sourceforge.net  Tue Jun  7 14:56:39 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 05:56:39 -0700
Subject: [Koha-cvs] CVS: koha/C4 Acquisition.pm,1.9.2.4,1.9.2.5
Message-ID: <E1DfddH-00051V-Rh@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19188/C4

Modified Files:
      Tag: rel_2_2
	Acquisition.pm 
Log Message:
fix for #958 : showing notes in order list screen. The note can be used for whatever the library want, and should be seen here.
The table has been improved :
* title / isbn / author / note are on the same column, as in marc search
* alternate colors working

Index: Acquisition.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.9.2.4
retrieving revision 1.9.2.5
diff -C2 -r1.9.2.4 -r1.9.2.5
*** Acquisition.pm	6 Jun 2005 16:36:43 -0000	1.9.2.4
--- Acquisition.pm	7 Jun 2005 12:56:37 -0000	1.9.2.5
***************
*** 105,109 ****
  	my ($basketno,$supplier,$orderby)=@_;
  	my $dbh = C4::Context->dbh;
! 	my $query="Select *,biblio.title from aqorders,biblio,biblioitems
  	left join aqorderbreakdown on aqorderbreakdown.ordernumber=aqorders.ordernumber
  	where basketno='$basketno'
--- 105,109 ----
  	my ($basketno,$supplier,$orderby)=@_;
  	my $dbh = C4::Context->dbh;
! 	my $query="Select biblio.*,biblioitems.*,aqorders.*,aqorderbreakdown.*,biblio.title from aqorders,biblio,biblioitems
  	left join aqorderbreakdown on aqorderbreakdown.ordernumber=aqorders.ordernumber
  	where basketno='$basketno'




From tipaul at users.sourceforge.net  Tue Jun  7 14:56:39 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 05:56:39 -0700
Subject: [Koha-cvs] CVS: koha/acqui basket.pl,1.24.2.3,1.24.2.4
Message-ID: <E1DfddH-00051T-R2@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19188/acqui

Modified Files:
      Tag: rel_2_2
	basket.pl 
Log Message:
fix for #958 : showing notes in order list screen. The note can be used for whatever the library want, and should be seen here.
The table has been improved :
* title / isbn / author / note are on the same column, as in marc search
* alternate colors working

Index: basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/basket.pl,v
retrieving revision 1.24.2.3
retrieving revision 1.24.2.4
diff -C2 -r1.24.2.3 -r1.24.2.4
*** basket.pl	7 Jun 2005 11:03:52 -0000	1.24.2.3
--- basket.pl	7 Jun 2005 12:56:36 -0000	1.24.2.4
***************
*** 73,76 ****
--- 73,78 ----
  my $grand_total_est; # $subttotal + $gist
  
+ my $qty_total;
+ 
  my @books_loop;
  for (my $i=0;$i<$count;$i++){
***************
*** 81,90 ****
  	$line_total=$results[$i]->{'quantity'}*$results[$i]->{'ecost'};
  	$sub_total+=$line_total;
  	my %line;
- 	if ($i % 2){
- 		$line{highlight}=1;
- 	} else {
- 		$line{highlight}=0;
- 	}
  	$line{ordernumber} = $results[$i]->{'ordernumber'};
  	$line{publishercode} = $results[$i]->{'publishercode'};
--- 83,88 ----
  	$line_total=$results[$i]->{'quantity'}*$results[$i]->{'ecost'};
  	$sub_total+=$line_total;
+ 	$qty_total += $results[$i]->{'quantity'};
  	my %line;
  	$line{ordernumber} = $results[$i]->{'ordernumber'};
  	$line{publishercode} = $results[$i]->{'publishercode'};
***************
*** 93,96 ****
--- 91,95 ----
  	$line{basketno}=$basketno;
  	$line{title} = $results[$i]->{'title'};
+ 	$line{notes} = $results[$i]->{'notes'};
  	$line{author} = $results[$i]->{'author'};
  	$line{i} = $i;
***************
*** 102,105 ****
--- 101,105 ----
  	$line{biblionumber} = $results[$i]->{'biblionumber'};
  	$line{bookfundid} = $results[$i]->{'bookfundid'};
+ 	$line{odd} = $i %2;
  	push @books_loop, \%line;
  }
***************
*** 131,134 ****
--- 131,135 ----
  				grand_total_est =>$grand_total_est,
  				currency => $booksellers[0]->{'listprice'},
+ 				qty_total => $qty_total,
  				);
  output_html_with_http_headers $query, $cookie, $template->output;




From tipaul at users.sourceforge.net  Tue Jun  7 15:17:41 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 06:17:41 -0700
Subject: [Koha-cvs] CVS: koha/acqui acqui-home.pl,1.3,1.3.2.1
Message-ID: <E1Dfdxd-00088W-SN@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31177/acqui

Modified Files:
      Tag: rel_2_2
	acqui-home.pl 
Log Message:
warn the user if no budget is defined (& prevent creating an order, as it would be buggy)

Index: acqui-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/acqui-home.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** acqui-home.pl	13 Jul 2004 12:53:00 -0000	1.3
--- acqui-home.pl	7 Jun 2005 13:17:38 -0000	1.3.2.1
***************
*** 64,68 ****
  						totspent => sprintf("%.2f",$totspent),
  						totcomtd => sprintf("%.2f",$totcomtd),
! 						totavail => sprintf("%.2f",$totavail));
  
  output_html_with_http_headers $query, $cookie, $template->output;
--- 64,69 ----
  						totspent => sprintf("%.2f",$totspent),
  						totcomtd => sprintf("%.2f",$totcomtd),
! 						totavail => sprintf("%.2f",$totavail),
! 						nobudget => $#results==-1?1:0);
  
  output_html_with_http_headers $query, $cookie, $template->output;




From tipaul at users.sourceforge.net  Tue Jun  7 15:17:41 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 06:17:41 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui acqui-home.tmpl,1.14,1.14.2.1
Message-ID: <E1Dfdxd-00088U-MD@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	acqui-home.tmpl 
Log Message:
warn the user if no budget is defined (& prevent creating an order, as it would be buggy)

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C2 -r1.14 -r1.14.2.1
*** acqui-home.tmpl	19 Oct 2004 12:24:57 -0000	1.14
--- acqui-home.tmpl	7 Jun 2005 13:17:38 -0000	1.14.2.1
***************
*** 5,8 ****
--- 5,11 ----
  <div id="bloc25">
  	<h2 class="acquisition">Start, receive, modify order</h2>
+ 	<!-- TMPL_IF name="nobudget" -->
+ 		<p class="problem">You must define a budget in parameters</p>
+ 	<!-- TMPL_ELSE -->
  		<form action="/cgi-bin/koha/acqui/order.pl" method="post">
  			Supplier name : <input type="text"  size="25"   name="supplier">
***************
*** 10,13 ****
--- 13,17 ----
  		</form>
  	<p>or <a href="histsearch.pl" class="button acquisition">Search order history</a></p>
+ 	<!-- /TMPL_IF -->
  </div>
  
***************
*** 38,43 ****
  <!-- showbudget-->
  <div id="bloc25">
! 	<form action="/cgi-bin/koha/search.pl">
! 		<h2 class="acquisition">budgets and bookfunds</h2>
  		<table class="noborder">
  			<tr>
--- 42,49 ----
  <!-- showbudget-->
  <div id="bloc25">
! 	<h2 class="acquisition">budgets and bookfunds</h2>
! 	<!-- TMPL_IF name="nobudget" -->
! 		<p class="problem">You must define a budget in parameters</p>
! 	<!-- TMPL_ELSE -->
  		<table class="noborder">
  			<tr>
***************
*** 68,72 ****
  		Use your reload button to get the most recent figures. Committed figures are approximate only, as exchange rates will affect the amount actually paid.
  		</p>
! 	</form>
  </div>
  
--- 74,78 ----
  		Use your reload button to get the most recent figures. Committed figures are approximate only, as exchange rates will affect the amount actually paid.
  		</p>
! 	<!-- /TMPL_IF -->
  </div>
  




From tipaul at users.sourceforge.net  Tue Jun  7 16:35:27 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 07 Jun 2005 07:35:27 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue detail.tmpl,1.17.2.5,1.17.2.6
Message-ID: <E1DffAt-0001NM-8O@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	detail.tmpl 
Log Message:
adding issn & not showing total number of items if there are no

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl,v
retrieving revision 1.17.2.5
retrieving revision 1.17.2.6
diff -C2 -r1.17.2.5 -r1.17.2.6
*** detail.tmpl	27 May 2005 10:02:49 -0000	1.17.2.5
--- detail.tmpl	7 Jun 2005 14:35:23 -0000	1.17.2.6
***************
*** 67,70 ****
--- 67,71 ----
  				<!-- 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>
***************
*** 74,78 ****
  				<!-- 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 -->
--- 75,79 ----
  				<!-- 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>




From oleonard at users.sourceforge.net  Tue Jun  7 22:39:31 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 07 Jun 2005 13:39:31 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui acqui-home.tmpl,1.3.2.1,1.3.2.2
Message-ID: <E1DfkrD-0001RV-Mj@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	acqui-home.tmpl 
Log Message:
Synching with default template

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** acqui-home.tmpl	20 Jan 2005 19:31:57 -0000	1.3.2.1
--- acqui-home.tmpl	7 Jun 2005 20:39:28 -0000	1.3.2.2
***************
*** 6,11 ****
  
  <h1>Acquisitions</h1>
! 
! <div class="details"><form action="/cgi-bin/koha/acqui/order.pl" method="post"><table>
  <caption>Start, Recieve, or Modify Any Order</caption>
  <tr>
--- 6,14 ----
  
  <h1>Acquisitions</h1>
! 	<!-- TMPL_IF name="nobudget" -->
! 		<div class="error">You must define a budget in parameters</div>
! 	<!-- TMPL_ELSE -->
! <div class="details">
! <form action="/cgi-bin/koha/acqui/order.pl" method="post"><table>
  <caption>Start, Recieve, or Modify Any Order</caption>
  <tr>
***************
*** 15,19 ****
--- 18,25 ----
  </table>
  <input type="submit" class="submit" value="Search" /></form>
+ <p>	<form action="histsearch.pl" method="get"><input type="submit" class="submit" value="Search Order History" /></form></p>
  </div>
+ <!-- /TMPL_IF -->
+ 
  <div class="details">
  <form action="/cgi-bin/koha/acqui/acquire.pl" method="post"><table>
***************
*** 66,70 ****
  
  <!-- showbudget-->
! 	<div class="table"><table>
  		<caption>Budgets and Bookfunds</caption>
  			<tr>
--- 72,80 ----
  
  <!-- showbudget-->
! 	<div class="table">
! 		<!-- TMPL_IF name="nobudget" -->
! 		<div class="error">You must define a budget in parameters</div>
! 	<!-- TMPL_ELSE -->
! 	<table>
  		<caption>Budgets and Bookfunds</caption>
  			<tr>
***************
*** 93,97 ****
  				</tfoot>
  			</tr>
! 		</table></div>
  <p>		Use your reload button [ctrl + r] to get the most recent figures.
  		Committed figures are approximate only, as exchange rates will affect the amount actually paid.</p>
--- 103,107 ----
  				</tfoot>
  			</tr>
! 		</table><!-- /TMPL_IF --></div>
  <p>		Use your reload button [ctrl + r] to get the most recent figures.
  		Committed figures are approximate only, as exchange rates will affect the amount actually paid.</p>




From oleonard at users.sourceforge.net  Tue Jun  7 22:39:59 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 07 Jun 2005 13:39:59 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui acqui-home.tmpl,1.4,1.5
Message-ID: <E1Dfkrf-0001XO-2Z@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	acqui-home.tmpl 
Log Message:
Synching with default template

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** acqui-home.tmpl	14 Jan 2005 21:08:45 -0000	1.4
--- acqui-home.tmpl	7 Jun 2005 20:39:56 -0000	1.5
***************
*** 6,11 ****
  
  <h1>Acquisitions</h1>
! 
! <div class="details"><form action="/cgi-bin/koha/acqui/order.pl" method="post"><table>
  <caption>Start, Recieve, or Modify Any Order</caption>
  <tr>
--- 6,14 ----
  
  <h1>Acquisitions</h1>
! 	<!-- TMPL_IF name="nobudget" -->
! 		<div class="error">You must define a budget in parameters</div>
! 	<!-- TMPL_ELSE -->
! <div class="details">
! <form action="/cgi-bin/koha/acqui/order.pl" method="post"><table>
  <caption>Start, Recieve, or Modify Any Order</caption>
  <tr>
***************
*** 15,19 ****
--- 18,25 ----
  </table>
  <input type="submit" class="submit" value="Search" /></form>
+ <p>	<form action="histsearch.pl" method="get"><input type="submit" class="submit" value="Search Order History" /></form></p>
  </div>
+ <!-- /TMPL_IF -->
+ 
  <div class="details">
  <form action="/cgi-bin/koha/acqui/acquire.pl" method="post"><table>
***************
*** 66,70 ****
  
  <!-- showbudget-->
! 	<div class="table"><table>
  		<caption>Budgets and Bookfunds</caption>
  			<tr>
--- 72,80 ----
  
  <!-- showbudget-->
! 	<div class="table">
! 		<!-- TMPL_IF name="nobudget" -->
! 		<div class="error">You must define a budget in parameters</div>
! 	<!-- TMPL_ELSE -->
! 	<table>
  		<caption>Budgets and Bookfunds</caption>
  			<tr>
***************
*** 93,97 ****
  				</tfoot>
  			</tr>
! 		</table></div>
  <p>		Use your reload button [ctrl + r] to get the most recent figures.
  		Committed figures are approximate only, as exchange rates will affect the amount actually paid.</p>
--- 103,107 ----
  				</tfoot>
  			</tr>
! 		</table><!-- /TMPL_IF --></div>
  <p>		Use your reload button [ctrl + r] to get the most recent figures.
  		Committed figures are approximate only, as exchange rates will affect the amount actually paid.</p>




From hellen at users.sourceforge.net  Wed Jun  8 13:28:11 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Wed, 08 Jun 2005 04:28:11 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/catalogue catalogue-home.tmpl,1.2,1.3 detail.tmpl,1.2,1.3 ISBDdetail.tmpl,1.2,1.3 MARCdetail.tmpl,1.2,1.3
Message-ID: <E1DfyjD-0008BR-1P@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	catalogue-home.tmpl detail.tmpl ISBDdetail.tmpl 
	MARCdetail.tmpl 
Log Message:
translated by hellen

Index: catalogue-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/catalogue/catalogue-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** catalogue-home.tmpl	17 May 2005 13:21:35 -0000	1.2
--- catalogue-home.tmpl	8 Jun 2005 11:28:08 -0000	1.3
***************
*** 27,37 ****
  			</select></p>
  			
! 					<p><label class="label100">Search Stil:</label><input type="radio" name="ttype" id=" ttype" value="normal" checked>Normal <input type="radio" name="ttype" value="exact">Exakt</p>
  			</div>
  			
  	<div id="bloc25">
! 		<h2 class="catalogue">Strichcode-Suche</h2>
  		<p>
! 		<label class="label100" for="itemnumber">Strichcode:</label><input type="text"  size="25" id="itemnumber" name="itemnumber"></p>
  </div>
  
--- 27,37 ----
  			</select></p>
  			
! 					<p><label class="label100">Suchart:</label><input type="radio" name="ttype" id=" ttype" value="normal" checked>Normal <input type="radio" name="ttype" value="exact">Exakt</p>
  			</div>
  			
  	<div id="bloc25">
! 		<h2 class="catalogue">Barcode-Suche</h2>
  		<p>
! 		<label class="label100" for="itemnumber">Barcode:</label><input type="text"  size="25" id="itemnumber" name="itemnumber"></p>
  </div>
  

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/catalogue/detail.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** detail.tmpl	17 May 2005 13:21:35 -0000	1.2
--- detail.tmpl	8 Jun 2005 11:28:08 -0000	1.3
***************
*** 34,38 ****
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="author" --><label class="label100"><b>Verfasser</b> </label><!-- TMPL_VAR NAME="author" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="additional" --><label class="label100"><b>Additional Author:</b></label><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><label class="label100"><b>Verlag:</b></label><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" --><br />
  				<!-- TMPL_IF name="publicationyear" --><label class="label100"><b>Ort:</b></label><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
--- 34,38 ----
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="author" --><label class="label100"><b>Verfasser</b> </label><!-- TMPL_VAR NAME="author" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="additional" --><label class="label100"><b>Weitere Verfasser:</b></label><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><label class="label100"><b>Verlag:</b></label><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" --><br />
  				<!-- TMPL_IF name="publicationyear" --><label class="label100"><b>Ort:</b></label><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
***************
*** 72,76 ****
  			<th class="catalogue">Entliehen bis</th>
  			<th class="catalogue">Zuletzt gesehen</th>
! 			<th class="catalogue">Strichcode</th>
  			<th class="catalogue">Band</th>
  		</tr>
--- 72,76 ----
  			<th class="catalogue">Entliehen bis</th>
  			<th class="catalogue">Zuletzt gesehen</th>
! 			<th class="catalogue">Barcode</th>
  			<th class="catalogue">Band</th>
  		</tr>
***************
*** 92,96 ****
  				<!-- TMPL_IF NAME="type" -->
  					<td>
! 						<a href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;item=<!-- TMPL_VAR NAME="itemtype" -->">Fix Itemtype</a>
  					</td>
  				<!-- /TMPL_IF -->
--- 92,96 ----
  				<!-- TMPL_IF NAME="type" -->
  					<td>
! 						<a href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;item=<!-- TMPL_VAR NAME="itemtype" -->">Medientyp &auml;ndern</a>
  					</td>
  				<!-- /TMPL_IF -->

Index: ISBDdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/catalogue/ISBDdetail.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ISBDdetail.tmpl	17 May 2005 13:21:35 -0000	1.2
--- ISBDdetail.tmpl	8 Jun 2005 11:28:08 -0000	1.3
***************
*** 4,8 ****
  	<div id="bibliomenu">
  		<h1 class="catalogue">MARC Biblio : <!-- TMPL_VAR NAME="bibid" --></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="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue">  Edit item  </a>   <a href="javascript:confirm_deletion()" class="button catalogue">  delete  </a>  <a href="MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Complete  </a>  <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normal  </a>  <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD  </a>  <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  Add to shelf  </a>  <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  Print  </a>
  		<!-- TMPL_IF name="subscriptionsnumber" -->
  		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
--- 4,8 ----
  	<div id="bibliomenu">
  		<h1 class="catalogue">MARC Biblio : <!-- TMPL_VAR NAME="bibid" --></h1>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Biblio &auml;ndern  </a>  <a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">  Duplizieren  </a>  <a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue">  Exemplar bearbeiten  </a>   <a href="javascript:confirm_deletion()" class="button catalogue">  l&ouml;schen  </a>  <a href="MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Vollanzeige  </a>  <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normal  </a>  <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD  </a>  <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  Zum Regal hinzuf&uuml;gen  </a>  <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  Drucken  </a>
  		<!-- TMPL_IF name="subscriptionsnumber" -->
  		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">

Index: MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/catalogue/MARCdetail.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** MARCdetail.tmpl	17 May 2005 13:21:35 -0000	1.2
--- MARCdetail.tmpl	8 Jun 2005 11:28:08 -0000	1.3
***************
*** 4,8 ****
  	<div class="tabbed">
  		<h1 class="catalogue">Biblionummer : <!-- TMPL_VAR NAME="biblionumber" --></h1>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Biblio bearbeiten  </a>  <a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">  Duplizieren  </a>  <a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue">  Exemplar bearbeiten  </a>   <a href="javascript:confirm_deletion()" class="button catalogue">  L&ouml;schen  </a>  <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Vollanzeige  </a>  <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normalanzeige  </a>  <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD  </a>  <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  zu vituellem Regal hinzuf&uuml;gen  </a>  <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  Drucken  </a>
  		<!-- TMPL_IF name="subscriptionsnumber" -->
  		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
--- 4,8 ----
  	<div class="tabbed">
  		<h1 class="catalogue">Biblionummer : <!-- TMPL_VAR NAME="biblionumber" --></h1>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Biblio bearbeiten  </a>  <a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">  Duplizieren  </a>  <a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue">  Exemplar bearbeiten  </a>   <a href="javascript:confirm_deletion()" class="button catalogue">  L&ouml;schen  </a>  <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Vollanzeige  </a>  <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normalanzeige  </a>  <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD  </a>  <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  zu virtuellem Regal hinzuf&uuml;gen  </a>  <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  Drucken  </a>
  		<!-- TMPL_IF name="subscriptionsnumber" -->
  		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">




From hellen at users.sourceforge.net  Wed Jun  8 13:28:10 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Wed, 08 Jun 2005 04:28:10 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de about.tmpl,1.2,1.3
Message-ID: <E1DfyjC-0008BO-Tu@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	about.tmpl 
Log Message:
translated by hellen

Index: about.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/about.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** about.tmpl	17 May 2005 13:21:34 -0000	1.2
--- about.tmpl	8 Jun 2005 11:28:08 -0000	1.3
***************
*** 48,51 ****
--- 48,52 ----
  					<p>David Strainchamps</p>
  					<p>Dorian Meid (Deutsche &Uuml;bersetzung)</p>
+ 					<p>Friedrich zur Hellen (Deutsche &Uuml;bersetzung)</p>
  					<p>doXulting (Matthieu Branlat) OPAC basket</p>
  					<p>Ed Summers (einigen code und Perl-Module wie MARC::Record)</p>




From hellen at users.sourceforge.net  Wed Jun  8 13:28:10 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Wed, 08 Jun 2005 04:28:10 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple addbooks.tmpl,1.3,1.4 isbnsearch.tmpl,1.2,1.3
Message-ID: <E1DfyjC-0008BM-TB@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	addbooks.tmpl isbnsearch.tmpl 
Log Message:
translated by hellen

Index: addbooks.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/addbooks.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** addbooks.tmpl	5 Jun 2005 14:45:17 -0000	1.3
--- addbooks.tmpl	8 Jun 2005 11:28:08 -0000	1.4
***************
*** 51,55 ****
  		<h2 class="catalogue">Hinweis</h2>
  		<p>Wenn bereits Daten f?r die ISBN in der Datenbank hinterlegt sind, werden diese angezeigt und k&ouml;nnen bearbeitet werden.<br/>
! 			 Wenn Fremddaten f?r die ISBN abgerufen wurden und sich im Zwischenspeicher befinden, werden diese ebenfalls angezeigt und dienen als Grundlage f&uuml;r einen neuen Datensatz.<br/>
  			 Anderenfalls wird eine leerer Datensatz angelegt und Sie m&uuml;ssen alle Daten selbst eintragen.</p>
  	</div>
--- 51,55 ----
  		<h2 class="catalogue">Hinweis</h2>
  		<p>Wenn bereits Daten f?r die ISBN in der Datenbank hinterlegt sind, werden diese angezeigt und k&ouml;nnen bearbeitet werden.<br/>
! 			 Wenn Fremddaten f?r die ISBN abgerufen wurden und sich im Fremddatenpool befinden, werden diese ebenfalls angezeigt und dienen als Grundlage f&uuml;r einen neuen Datensatz.<br/>
  			 Anderenfalls wird eine leerer Datensatz angelegt und Sie m&uuml;ssen alle Daten selbst eintragen.</p>
  	</div>

Index: isbnsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/isbnsearch.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** isbnsearch.tmpl	17 May 2005 13:21:35 -0000	1.2
--- isbnsearch.tmpl	8 Jun 2005 11:28:08 -0000	1.3
***************
*** 62,71 ****
  						<td><a href="additem-nomarc.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Exemplare hinzuf&uuml;gen</a></td>
  						<!-- TMPL_ELSE -->
! 						<td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Bearbeite...</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>
--- 62,71 ----
  						<td><a href="additem-nomarc.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Exemplare hinzuf&uuml;gen</a></td>
  						<!-- TMPL_ELSE -->
! 						<td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Bearbeiten</a></td>
  						<!-- /TMPL_IF -->
  						<!-- TMPL_UNLESS NAME="NOTMARC" -->
  						<td>
  							<a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">
! 								Duplizieren
  							</a>
  						</td>
***************
*** 109,113 ****
  	</div>
  	<div id="bloc25">
! 		<h2 class="catalogue">Bibliografische Daten im Zwischenspeicher</h2>
  		<!-- TMPL_IF name="breeding_loop" -->
  			<table>
--- 109,113 ----
  	</div>
  	<div id="bloc25">
! 		<h2 class="catalogue">Bibliografische Daten im Fremddatenpool</h2>
  		<!-- TMPL_IF name="breeding_loop" -->
  			<table>




From oleonard at users.sourceforge.net  Wed Jun  8 19:03:03 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 10:03:03 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui basket.tmpl,1.2.2.3,1.2.2.4
Message-ID: <E1Dg3xH-0004t7-Ag@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	basket.tmpl 
Log Message:
Synching with default template

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -r1.2.2.3 -r1.2.2.4
*** basket.tmpl	21 Apr 2005 21:39:46 -0000	1.2.2.3
--- basket.tmpl	8 Jun 2005 17:03:00 -0000	1.2.2.4
***************
*** 18,21 ****
--- 18,22 ----
  		</div>
  	<!-- /TMPL_UNLESS -->
+ 	
  	<div class="data">
  	<!-- TMPL_IF name="books_loop" -->
***************
*** 25,39 ****
  				<th scope="col">Order</th>
  				<th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=biblioitems.publishercode">Publisher</a></th>
- 				<th scope="col">ISBN</th>
  				<th scope="col">Title</th>
! 				<th scope="col">Author</th>
! 				<th scope="col">rrp</th>
! 				<th scope="col">est</th>
! 				<th scope="col">Qty</th>
  				<th scope="col">Total</th>
  				<th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=aqorderbreakdown.bookfundid,biblioitems.publishercode">Fund</a></th>
  <!-- TMPL_UNLESS name="closedate" -->
  					<th scope="col">Remove</th>
  				<!-- /TMPL_UNLESS -->
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
--- 26,40 ----
  				<th scope="col">Order</th>
  				<th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=biblioitems.publishercode">Publisher</a></th>
  				<th scope="col">Title</th>
! 				<th scope="col">RRP</th>
! 				<th scope="col">Est.</th>
! 				<th scope="col">Qty.</th>
  				<th scope="col">Total</th>
  				<th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=aqorderbreakdown.bookfundid,biblioitems.publishercode">Fund</a></th>
+ <!-- TMPL_IF name="active" -->
  <!-- TMPL_UNLESS name="closedate" -->
  					<th scope="col">Remove</th>
  				<!-- /TMPL_UNLESS -->
+ 					<!-- /TMPL_IF -->
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
***************
*** 41,47 ****
  							<td><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
! 					<td><!-- TMPL_VAR NAME="isbn" --></td>
! 					<td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
! 					<td><!-- TMPL_VAR NAME="author" --></td>
  					<td><!-- TMPL_VAR NAME="rrp" --></td>
  					<td><!-- TMPL_VAR NAME="ecost" --></td>
--- 42,63 ----
  							<td><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
! <!-- TMPL_IF name="closedate" -->
! 						<td><p>
! 							<b><!-- TMPL_VAR NAME="title" --></b><br/>
! 								<!-- TMPL_VAR NAME="author" -->
! 								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! 							</p>
! 						</td>
! 					<!-- TMPL_ELSE -->
! 						<td>
! 							<p>
! 							<a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a><br/>
! 								<!-- TMPL_VAR NAME="author" -->
! 								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! 							</p>
! 						</td>
! 					<!-- /TMPL_IF -->
  					<td><!-- TMPL_VAR NAME="rrp" --></td>
  					<td><!-- TMPL_VAR NAME="ecost" --></td>
***************
*** 49,52 ****
--- 65,69 ----
  					<td><!-- TMPL_VAR NAME="line_total" --></td>
  					<td><!-- TMPL_VAR NAME="bookfundid" --></td>
+ 					<!-- TMPL_IF name="active" -->
  					<!-- TMPL_UNLESS name="closedate" -->
  					<td>
***************
*** 54,75 ****
  						</td>
  					<!-- /TMPL_UNLESS -->
  				</tr>
  			<!-- /TMPL_LOOP -->
  			
  			<tr>
! 				<td colspan="4" rowspan="3">
! 					&nbsp;<input type="hidden" name="number" value="<!-- TMPL_VAR NAME="count" -->" />
! 			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
! 				</td>
! 				<th colspan="2">SubTotal</th>
! 				<th><!-- TMPL_VAR NAME="currency" --> <!-- TMPL_VAR NAME="sub_total" --></th><td rowspan="3" colspan="4">&nbsp;</td>
  			</tr>
  			<tr>
! 				<th colspan="2">GST</th>
! 				<th><!-- TMPL_VAR NAME="currency" --> <!-- TMPL_VAR NAME="gist" --></th>
  			</tr>
  			<tr>
! 				<th colspan="2">TOTAL</th>
! 				<th><!-- TMPL_VAR NAME="currency" --> <!-- TMPL_VAR NAME="grand_total" --></th>
  			</tr>
  		</table>
--- 71,99 ----
  						</td>
  					<!-- /TMPL_UNLESS -->
+ 						<!-- /TMPL_IF -->
  				</tr>
  			<!-- /TMPL_LOOP -->
  			
  			<tr>
! 				<td colspan="2" rowspan="3">
! <input type="hidden" name="number" value="<!-- TMPL_VAR NAME="count" -->" /><input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />	</td>
! 				<th>SubTotal</th>
! 				<th><!-- TMPL_VAR NAME="sub_total_est" --></th>
! 				<th><!-- TMPL_VAR NAME="sub_total" --></td>
! 				<th><!-- TMPL_VAR name="qty_total" --></th>
! 				<td colspan="2" rowspan="3">&nbsp;</td>
! 				
  			</tr>
  			<tr>
! 				<th>GST</th>
! 				<th><!-- TMPL_VAR NAME="gist_est" --></th>
! 				<th><!-- TMPL_VAR NAME="gist" --></th>
! 				<th>&nbsp;</th>
  			</tr>
  			<tr>
! 				<th>TOTAL  (<!-- TMPL_VAR NAME="currency" -->)</th>
! 				<th><!-- TMPL_VAR NAME="grand_total_est" --></th>
! 				<th><!-- TMPL_VAR NAME="grand_total" --></th>
! 				<th>&nbsp;</th>
  			</tr>
  		</table>




From oleonard at users.sourceforge.net  Wed Jun  8 19:03:52 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 10:03:52 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui basket.tmpl,1.4,1.5
Message-ID: <E1Dg3y4-0004z8-5K@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	basket.tmpl 
Log Message:
Synching with rel_2_2.

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** basket.tmpl	2 May 2005 18:06:45 -0000	1.4
--- basket.tmpl	8 Jun 2005 17:03:49 -0000	1.5
***************
*** 18,21 ****
--- 18,22 ----
  		</div>
  	<!-- /TMPL_UNLESS -->
+ 	
  	<div class="data">
  	<!-- TMPL_IF name="books_loop" -->
***************
*** 25,39 ****
  				<th scope="col">Order</th>
  				<th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=biblioitems.publishercode">Publisher</a></th>
- 				<th scope="col">ISBN</th>
  				<th scope="col">Title</th>
! 				<th scope="col">Author</th>
! 				<th scope="col">rrp</th>
! 				<th scope="col">est</th>
! 				<th scope="col">Qty</th>
  				<th scope="col">Total</th>
  				<th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=aqorderbreakdown.bookfundid,biblioitems.publishercode">Fund</a></th>
  <!-- TMPL_UNLESS name="closedate" -->
  					<th scope="col">Remove</th>
  				<!-- /TMPL_UNLESS -->
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
--- 26,40 ----
  				<th scope="col">Order</th>
  				<th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=biblioitems.publishercode">Publisher</a></th>
  				<th scope="col">Title</th>
! 				<th scope="col">RRP</th>
! 				<th scope="col">Est.</th>
! 				<th scope="col">Qty.</th>
  				<th scope="col">Total</th>
  				<th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=aqorderbreakdown.bookfundid,biblioitems.publishercode">Fund</a></th>
+ <!-- TMPL_IF name="active" -->
  <!-- TMPL_UNLESS name="closedate" -->
  					<th scope="col">Remove</th>
  				<!-- /TMPL_UNLESS -->
+ 					<!-- /TMPL_IF -->
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
***************
*** 41,47 ****
  							<td><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
! 					<td><!-- TMPL_VAR NAME="isbn" --></td>
! 					<td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
! 					<td><!-- TMPL_VAR NAME="author" --></td>
  					<td><!-- TMPL_VAR NAME="rrp" --></td>
  					<td><!-- TMPL_VAR NAME="ecost" --></td>
--- 42,63 ----
  							<td><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
! <!-- TMPL_IF name="closedate" -->
! 						<td><p>
! 							<b><!-- TMPL_VAR NAME="title" --></b><br/>
! 								<!-- TMPL_VAR NAME="author" -->
! 								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! 							</p>
! 						</td>
! 					<!-- TMPL_ELSE -->
! 						<td>
! 							<p>
! 							<a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a><br/>
! 								<!-- TMPL_VAR NAME="author" -->
! 								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! 							</p>
! 						</td>
! 					<!-- /TMPL_IF -->
  					<td><!-- TMPL_VAR NAME="rrp" --></td>
  					<td><!-- TMPL_VAR NAME="ecost" --></td>
***************
*** 49,52 ****
--- 65,69 ----
  					<td><!-- TMPL_VAR NAME="line_total" --></td>
  					<td><!-- TMPL_VAR NAME="bookfundid" --></td>
+ 					<!-- TMPL_IF name="active" -->
  					<!-- TMPL_UNLESS name="closedate" -->
  					<td>
***************
*** 54,75 ****
  						</td>
  					<!-- /TMPL_UNLESS -->
  				</tr>
  			<!-- /TMPL_LOOP -->
  			
  			<tr>
! 				<td colspan="4" rowspan="3">
! 					&nbsp;<input type="hidden" name="number" value="<!-- TMPL_VAR NAME="count" -->" />
! 			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
! 				</td>
! 				<th colspan="2">SubTotal</th>
! 				<th><!-- TMPL_VAR NAME="currency" --> <!-- TMPL_VAR NAME="sub_total" --></th><td rowspan="3" colspan="4">&nbsp;</td>
  			</tr>
  			<tr>
! 				<th colspan="2">GST</th>
! 				<th><!-- TMPL_VAR NAME="currency" --> <!-- TMPL_VAR NAME="gist" --></th>
  			</tr>
  			<tr>
! 				<th colspan="2">TOTAL</th>
! 				<th><!-- TMPL_VAR NAME="currency" --> <!-- TMPL_VAR NAME="grand_total" --></th>
  			</tr>
  		</table>
--- 71,99 ----
  						</td>
  					<!-- /TMPL_UNLESS -->
+ 						<!-- /TMPL_IF -->
  				</tr>
  			<!-- /TMPL_LOOP -->
  			
  			<tr>
! 				<td colspan="2" rowspan="3">
! <input type="hidden" name="number" value="<!-- TMPL_VAR NAME="count" -->" /><input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />	</td>
! 				<th>SubTotal</th>
! 				<th><!-- TMPL_VAR NAME="sub_total_est" --></th>
! 				<th><!-- TMPL_VAR NAME="sub_total" --></td>
! 				<th><!-- TMPL_VAR name="qty_total" --></th>
! 				<td colspan="2" rowspan="3">&nbsp;</td>
! 				
  			</tr>
  			<tr>
! 				<th>GST</th>
! 				<th><!-- TMPL_VAR NAME="gist_est" --></th>
! 				<th><!-- TMPL_VAR NAME="gist" --></th>
! 				<th>&nbsp;</th>
  			</tr>
  			<tr>
! 				<th>TOTAL  (<!-- TMPL_VAR NAME="currency" -->)</th>
! 				<th><!-- TMPL_VAR NAME="grand_total_est" --></th>
! 				<th><!-- TMPL_VAR NAME="grand_total" --></th>
! 				<th>&nbsp;</th>
  			</tr>
  		</table>




From oleonard at users.sourceforge.net  Wed Jun  8 19:14:00 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 10:14:00 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui histsearch.tmpl,1.1.2.2,1.1.2.3
Message-ID: <E1Dg47s-00068d-Ff@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	histsearch.tmpl 
Log Message:
Synching with default template

Index: histsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/histsearch.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** histsearch.tmpl	17 Feb 2005 17:49:40 -0000	1.1.2.2
--- histsearch.tmpl	8 Jun 2005 17:13:55 -0000	1.1.2.3
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions: Order Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions: Order Search<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
***************
*** 23,27 ****
  				<th><input type="text" name="author" value="<!-- TMPL_VAR name="author" -->" /></th>
  				<th><input type="text" name="name" value="<!-- TMPL_VAR name="name" -->" /></th>
! 				<th>&nbsp;</th>
  				<th>&nbsp;</th>
  				<th>&nbsp;</th>
--- 23,83 ----
  				<th><input type="text" name="author" value="<!-- TMPL_VAR name="author" -->" /></th>
  				<th><input type="text" name="name" value="<!-- TMPL_VAR name="name" -->" /></th>
! 				<th>					From <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
! 					<input type="text" readonly="readonly" size="10" id="from" name="fromplacedon" value="<!-- TMPL_VAR name="from_placed_on" -->">
! 					<script language="JavaScript" type="text/javascript">
! 						function validate1(date) {
! 							var day = date.getDate();
! 							var month = date.getMonth() + 1;
! 							var year = date.getFullYear();
! 							var weekDay = date.getDay();
! 							var dayMonth = month + '-' + day;
! 							var dateString = year + '-' + month + '-' + day;
! 							var dateTo = document.getElementById('to').value.split("-");
! 							var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
! 							if (date > limitDate) {
! 								return true;
! 							} else {
! 								return false;
! 							}
! 						}
! 						Calendar.setup(
! 							{
! 								inputField : "from",
! 								ifFormat : "%Y-%m-%d",
! 								button : "openCalendarFrom",
! 								disableFunc : validate1,
! 								dateStatusFunc : validate1
! 							}
! 						);
! 					</script>
! 					To <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" border="0" />
! 					<input readonly="readonly" size="10" id="to" name="toplacedon" value="<!-- TMPL_VAR name="to_placed_on" -->" type="text" />
! 					<script type="text/javascript">
! 						function validate2(date) {
! 							var day = date.getDate();
! 							var month = date.getMonth() + 1;
! 							var year = date.getFullYear();
! 							var weekDay = date.getDay();
! 							var dayMonth = month + '-' + day;
! 							var dateString = year + '-' + month + '-' + day;
! 							var dateFrom = document.getElementById('from').value.split("-");
! 							var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
! 							if (limitDate > date) {
! 								return true;
! 							} else {
! 								return false;
! 							}
! 						}
! 
! 						Calendar.setup(
! 							{
! 								inputField : "to",
! 								ifFormat : "%Y-%m-%d",
! 								button : "openCalendarTo",
! 								disableFunc : validate2,
! 								dateStatusFunc : validate2
! 							}
! 						);
! 					</script></th>
  				<th>&nbsp;</th>
  				<th>&nbsp;</th>




From oleonard at users.sourceforge.net  Wed Jun  8 20:38:24 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 11:38:24 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui histsearch.tmpl,1.3,1.4
Message-ID: <E1Dg5RY-0007Y5-Jv@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	histsearch.tmpl 
Log Message:
Synching with rel_2_2.

Index: histsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/histsearch.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** histsearch.tmpl	17 Feb 2005 17:49:44 -0000	1.3
--- histsearch.tmpl	8 Jun 2005 18:38:19 -0000	1.4
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions: Order Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions: Order Search<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
***************
*** 23,27 ****
  				<th><input type="text" name="author" value="<!-- TMPL_VAR name="author" -->" /></th>
  				<th><input type="text" name="name" value="<!-- TMPL_VAR name="name" -->" /></th>
! 				<th>&nbsp;</th>
  				<th>&nbsp;</th>
  				<th>&nbsp;</th>
--- 23,83 ----
  				<th><input type="text" name="author" value="<!-- TMPL_VAR name="author" -->" /></th>
  				<th><input type="text" name="name" value="<!-- TMPL_VAR name="name" -->" /></th>
! 				<th>					From <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
! 					<input type="text" readonly="readonly" size="10" id="from" name="fromplacedon" value="<!-- TMPL_VAR name="from_placed_on" -->">
! 					<script language="JavaScript" type="text/javascript">
! 						function validate1(date) {
! 							var day = date.getDate();
! 							var month = date.getMonth() + 1;
! 							var year = date.getFullYear();
! 							var weekDay = date.getDay();
! 							var dayMonth = month + '-' + day;
! 							var dateString = year + '-' + month + '-' + day;
! 							var dateTo = document.getElementById('to').value.split("-");
! 							var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
! 							if (date > limitDate) {
! 								return true;
! 							} else {
! 								return false;
! 							}
! 						}
! 						Calendar.setup(
! 							{
! 								inputField : "from",
! 								ifFormat : "%Y-%m-%d",
! 								button : "openCalendarFrom",
! 								disableFunc : validate1,
! 								dateStatusFunc : validate1
! 							}
! 						);
! 					</script>
! 					To <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" border="0" />
! 					<input readonly="readonly" size="10" id="to" name="toplacedon" value="<!-- TMPL_VAR name="to_placed_on" -->" type="text" />
! 					<script type="text/javascript">
! 						function validate2(date) {
! 							var day = date.getDate();
! 							var month = date.getMonth() + 1;
! 							var year = date.getFullYear();
! 							var weekDay = date.getDay();
! 							var dayMonth = month + '-' + day;
! 							var dateString = year + '-' + month + '-' + day;
! 							var dateFrom = document.getElementById('from').value.split("-");
! 							var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
! 							if (limitDate > date) {
! 								return true;
! 							} else {
! 								return false;
! 							}
! 						}
! 
! 						Calendar.setup(
! 							{
! 								inputField : "to",
! 								ifFormat : "%Y-%m-%d",
! 								button : "openCalendarTo",
! 								disableFunc : validate2,
! 								dateStatusFunc : validate2
! 							}
! 						);
! 					</script></th>
  				<th>&nbsp;</th>
  				<th>&nbsp;</th>




From oleonard at users.sourceforge.net  Wed Jun  8 20:39:00 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 11:39:00 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple addbiblio.tmpl,1.4.2.5,1.4.2.6
Message-ID: <E1Dg5S8-0007bo-D4@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	addbiblio.tmpl 
Log Message:
Synching with default template

Index: addbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -C2 -r1.4.2.5 -r1.4.2.6
*** addbiblio.tmpl	25 Apr 2005 22:08:39 -0000	1.4.2.5
--- addbiblio.tmpl	8 Jun 2005 18:38:57 -0000	1.4.2.6
***************
*** 12,16 ****
  
  	<form method="post" name="f" id="f" action="addbiblio.pl">
! <h1><!-- TMPL_IF NAME="oldbiblionumtagfield" -->Edit MARC Record Number <!-- TMPL_VAR name="bibid" --><!-- TMPL_ELSE -->Add MARC Record<!-- /TMPL_IF --></h1>
  
  
--- 12,16 ----
  
  	<form method="post" name="f" id="f" action="addbiblio.pl">
! <h1><!-- TMPL_IF NAME="oldbiblionumtagfield" -->Edit MARC Record Number <!-- TMPL_VAR name="oldbiblionumber" --><!-- TMPL_ELSE -->Add MARC Record<!-- /TMPL_IF --> With Framework : <!--TMPL_VAR Name="framework" --></h1>
  
  
***************
*** 430,436 ****
--- 430,438 ----
  			with(document){
  			document.getElementById(ong).style.visibility="hidden";
+ 			if (document.getElementById(link)) {
  			document.getElementById(link).style.color="#669999";
  			document.getElementById(link).style.backgroundColor="#D8DEB8";
  			}
+ 			}
  		}
  	}
***************
*** 564,567 ****
--- 566,574 ----
  }
  
+ function Changefwk(FwkList) {
+   var fwk = FwkList.options[FwkList.selectedIndex].value;
+   window.location = "addbiblio.pl?oldbiblionumber=<!--TMPL_VAR Name="oldbiblionumber"-->&frameworkcode="+fwk;
+ }
+ 
  function AddField(field) {
  	document.forms[0].op.value = "addfield";




From oleonard at users.sourceforge.net  Wed Jun  8 20:39:09 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 11:39:09 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple addbiblio.tmpl,1.6,1.7
Message-ID: <E1Dg5SH-0007d6-5A@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	addbiblio.tmpl 
Log Message:
Synching with rel_2_2.

Index: addbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** addbiblio.tmpl	2 May 2005 18:11:11 -0000	1.6
--- addbiblio.tmpl	8 Jun 2005 18:39:06 -0000	1.7
***************
*** 12,16 ****
  
  	<form method="post" name="f" id="f" action="addbiblio.pl">
! <h1><!-- TMPL_IF NAME="oldbiblionumtagfield" -->Edit MARC Record Number <!-- TMPL_VAR name="bibid" --><!-- TMPL_ELSE -->Add MARC Record<!-- /TMPL_IF --></h1>
  
  
--- 12,16 ----
  
  	<form method="post" name="f" id="f" action="addbiblio.pl">
! <h1><!-- TMPL_IF NAME="oldbiblionumtagfield" -->Edit MARC Record Number <!-- TMPL_VAR name="oldbiblionumber" --><!-- TMPL_ELSE -->Add MARC Record<!-- /TMPL_IF --> With Framework : <!--TMPL_VAR Name="framework" --></h1>
  
  
***************
*** 430,436 ****
--- 430,438 ----
  			with(document){
  			document.getElementById(ong).style.visibility="hidden";
+ 			if (document.getElementById(link)) {
  			document.getElementById(link).style.color="#669999";
  			document.getElementById(link).style.backgroundColor="#D8DEB8";
  			}
+ 			}
  		}
  	}
***************
*** 564,567 ****
--- 566,574 ----
  }
  
+ function Changefwk(FwkList) {
+   var fwk = FwkList.options[FwkList.selectedIndex].value;
+   window.location = "addbiblio.pl?oldbiblionumber=<!--TMPL_VAR Name="oldbiblionumber"-->&frameworkcode="+fwk;
+ }
+ 
  function AddField(field) {
  	document.forms[0].op.value = "addfield";




From oleonard at users.sourceforge.net  Wed Jun  8 20:47:54 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 11:47:54 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple additem.tmpl,1.3.2.4,1.3.2.5
Message-ID: <E1Dg5ak-00008s-IG@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	additem.tmpl 
Log Message:
Synching with default template

Index: additem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/additem.tmpl,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -C2 -r1.3.2.4 -r1.3.2.5
*** additem.tmpl	25 Apr 2005 16:56:08 -0000	1.3.2.4
--- additem.tmpl	8 Jun 2005 18:47:47 -0000	1.3.2.5
***************
*** 5,11 ****
  <div id="main">
  
! <h1>Edit Items for Bibliographic Record <!-- TMPL_VAR NAME="biblionumber" --></h1>
  
! 		<div class="tabitem"><form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR name="biblionumber" -->"><input type="submit" class="submit" value="Edit Bibliographic Record"></form> <form action="acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" name="op" value="duplicate" /><input type="submit" class="submit" value="Duplicate this Record" /></form></div> <div class="tabitem"><form action="/cgi-bin/koha/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View in Catalog"></form> <form action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View MARC in Catalog"></form>  <form action="/cgi-bin/koha/ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View ISBD in Catalog"></form></div>
  
  	<form method="post" action="additem.pl" name="f">
--- 5,11 ----
  <div id="main">
  
! <h1>Items for <em><!-- TMPL_VAR name="title" --></em> <!-- TMPL_IF NAME="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF --> (Record #<!-- TMPL_VAR NAME="biblionumber" -->)</h1>
  
! 		<div class="tabitem"><form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR name="biblionumber" -->"><input type="submit" class="submit" value="Edit Bibliographic Record"></form></div> <div class="tabitem"><form action="/cgi-bin/koha/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View in Catalog"></form> <form action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View MARC in Catalog"></form>  <form action="/cgi-bin/koha/ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View ISBD in Catalog"></form></div>
  
  	<form method="post" action="additem.pl" name="f">




From oleonard at users.sourceforge.net  Wed Jun  8 20:48:36 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 11:48:36 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple additem.tmpl,1.4,1.5
Message-ID: <E1Dg5bQ-0000DE-FW@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	additem.tmpl 
Log Message:
Synching with rel_2_2.

Index: additem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/additem.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** additem.tmpl	2 May 2005 18:11:12 -0000	1.4
--- additem.tmpl	8 Jun 2005 18:48:34 -0000	1.5
***************
*** 5,11 ****
  <div id="main">
  
! <h1>Edit Items for Bibliographic Record <!-- TMPL_VAR NAME="biblionumber" --></h1>
  
! 		<div class="tabitem"><form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR name="biblionumber" -->"><input type="submit" class="submit" value="Edit Bibliographic Record"></form> <form action="acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" name="op" value="duplicate" /><input type="submit" class="submit" value="Duplicate this Record" /></form></div> <div class="tabitem"><form action="/cgi-bin/koha/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View in Catalog"></form> <form action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View MARC in Catalog"></form>  <form action="/cgi-bin/koha/ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View ISBD in Catalog"></form></div>
  
  	<form method="post" action="additem.pl" name="f">
--- 5,11 ----
  <div id="main">
  
! <h1>Items for <em><!-- TMPL_VAR name="title" --></em> <!-- TMPL_IF NAME="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF --> (Record #<!-- TMPL_VAR NAME="biblionumber" -->)</h1>
  
! 		<div class="tabitem"><form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR name="biblionumber" -->"><input type="submit" class="submit" value="Edit Bibliographic Record"></form></div> <div class="tabitem"><form action="/cgi-bin/koha/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View in Catalog"></form> <form action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View MARC in Catalog"></form>  <form action="/cgi-bin/koha/ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View ISBD in Catalog"></form></div>
  
  	<form method="post" action="additem.pl" name="f">




From oleonard at users.sourceforge.net  Wed Jun  8 21:18:55 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 12:18:55 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/authorities authorities.tmpl,1.2,1.3 detail.tmpl,1.2,1.3
Message-ID: <E1Dg64l-0003dC-Hg@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13911/koha-tmpl/intranet-tmpl/npl/en/authorities

Modified Files:
	authorities.tmpl detail.tmpl 
Log Message:
Synching with rel_2_2.

Index: authorities.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** authorities.tmpl	2 May 2005 18:15:31 -0000	1.2
--- authorities.tmpl	8 Jun 2005 19:18:52 -0000	1.3
***************
*** 9,23 ****
  
  <div class="tabbed">
! 	<form method="post" name="f">
! 	<h1>Authority number <!-- TMPL_VAR NAME="authid" --></h1>
  	<p>
! 		<input type="hidden" name="op" value="add">
! 		<input type="hidden" name="addfield_field">
! 		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
! 		<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->">
  		<!-- TMPL_IF name="authid" -->
! 			<input type="button" value="Save" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- TMPL_ELSE -->
! 			<input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- /TMPL_IF -->
  <!--		<a href="javascript:PopupZ3950()" class="button authority">z3950 search</a> -->
--- 9,27 ----
  
  <div class="tabbed">
! 	<form method="post" action="authorities.pl" name="f">
! 	<!-- TMPL_IF name="authid" -->
! 		<h1>Modify authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
! 	<!-- TMPL_ELSE -->
! 		<h1>Adding authority (<!-- TMPL_VAR name="authtypetext" -->)</h1>
! 	<!-- /TMPL_IF -->
  	<p>
! 		<input type="hidden" name="op" value="add" />
! 		<input type="hidden" name="addfield_field" />
! 		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
! 		<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->" />
  		<!-- TMPL_IF name="authid" -->
! 			<input type="button" value="Save" onClick="Check(this.form)" accesskey="w" class="submit" />
  		<!-- TMPL_ELSE -->
! 			<input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="submit" />
  		<!-- /TMPL_IF -->
  <!--		<a href="javascript:PopupZ3950()" class="button authority">z3950 search</a> -->
***************
*** 25,29 ****
  </div>
  
! <br><br><br><br><br><br><br><br><br><br><br>
  
  <!-- TMPL_LOOP NAME="0XX" -->
--- 29,42 ----
  </div>
  
! <!-- TMPL_IF name="duplicateauthid" -->
! 	<div class="error">
! 		<p>Duplicate suspected with <a href="javascript:openWindow('detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&amp;popup=1', 'Duplicate Authority')"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
! 		<p>You must either :</p>
! 		<ul>
! 			<p><input type="checkbox" value="1" name="confirm_not_duplicate" />confirm it's not a duplicate (and click on <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority"> again)</p>
! 			<p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >original authority</a></p>
! 		</ul>
! 	</div>
! <!-- /TMPL_IF -->
  
  <!-- TMPL_LOOP NAME="0XX" -->
***************
*** 172,177 ****
  
  function AddField(field) {
! 	document.forms[0].op.value = "addfield";
! 	document.forms[0].addfield_field.value=field;
  	document.f.submit();
  }
--- 185,190 ----
  
  function AddField(field) {
! 	document.forms[1].op.value = "addfield";
! 	document.forms[1].addfield_field.value=field;
  	document.f.submit();
  }

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/detail.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** detail.tmpl	2 May 2005 18:15:31 -0000	1.2
--- detail.tmpl	8 Jun 2005 19:18:52 -0000	1.3
***************
*** 8,12 ****
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1>Authority number : <!-- TMPL_VAR NAME="authid" --></h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
--- 8,12 ----
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1>Authority number : <!-- TMPL_VAR NAME="authid" -->  <!-- TMPL_IF NAME="authtypetext" -->(<!-- TMPL_VAR name="authtypetext" -->)<!-- /TMPL_IF --></h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
***************
*** 42,48 ****
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Are you sure you want to delete this biblio?');
  	if (is_confirmed) {
! 		window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";
  	}
  }
--- 42,48 ----
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Are you sure you want to delete this authority?');
  	if (is_confirmed) {
! 		window.location="authorities-home.pl?op=delete&amp;authid=<!-- TMPL_VAR NAME="authid" -->";
  	}
  }




From oleonard at users.sourceforge.net  Wed Jun  8 21:19:43 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 12:19:43 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/authorities authorities.tmpl,1.1.2.1,1.1.2.2 detail.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1Dg65X-0003iv-8o@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14245/koha-tmpl/intranet-tmpl/npl/en/authorities

Modified Files:
      Tag: rel_2_2
	authorities.tmpl detail.tmpl 
Log Message:
Synching with default template

Index: authorities.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** authorities.tmpl	19 Apr 2005 19:13:34 -0000	1.1.2.1
--- authorities.tmpl	8 Jun 2005 19:19:40 -0000	1.1.2.2
***************
*** 9,23 ****
  
  <div class="tabbed">
! 	<form method="post" name="f">
! 	<h1>Authority number <!-- TMPL_VAR NAME="authid" --></h1>
  	<p>
! 		<input type="hidden" name="op" value="add">
! 		<input type="hidden" name="addfield_field">
! 		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
! 		<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->">
  		<!-- TMPL_IF name="authid" -->
! 			<input type="button" value="Save" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- TMPL_ELSE -->
! 			<input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- /TMPL_IF -->
  <!--		<a href="javascript:PopupZ3950()" class="button authority">z3950 search</a> -->
--- 9,27 ----
  
  <div class="tabbed">
! 	<form method="post" action="authorities.pl" name="f">
! 	<!-- TMPL_IF name="authid" -->
! 		<h1>Modify authority #<!-- TMPL_VAR NAME="authid" --> <!-- TMPL_IF NAME="authtypetext" -->(<!-- TMPL_VAR name="authtypetext" -->)<!-- /TMPL_IF --></h1>
! 	<!-- TMPL_ELSE -->
! 		<h1>Adding authority <!-- TMPL_IF NAME="authtypetext" -->(<!-- TMPL_VAR name="authtypetext" -->)<!-- /TMPL_IF --></h1>
! 	<!-- /TMPL_IF -->
  	<p>
! 		<input type="hidden" name="op" value="add" />
! 		<input type="hidden" name="addfield_field" />
! 		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
! 		<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->" />
  		<!-- TMPL_IF name="authid" -->
! 			<input type="button" value="Save" onClick="Check(this.form)" accesskey="w" class="submit" />
  		<!-- TMPL_ELSE -->
! 			<input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="submit" />
  		<!-- /TMPL_IF -->
  <!--		<a href="javascript:PopupZ3950()" class="button authority">z3950 search</a> -->
***************
*** 25,29 ****
  </div>
  
! <br><br><br><br><br><br><br><br><br><br><br>
  
  <!-- TMPL_LOOP NAME="0XX" -->
--- 29,42 ----
  </div>
  
! <!-- TMPL_IF name="duplicateauthid" -->
! 	<div class="error">
! 		<p>Duplicate suspected with <a href="javascript:openWindow('detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&amp;popup=1', 'Duplicate Authority')"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
! 		<p>You must either :</p>
! 		<ul>
! 			<p><input type="checkbox" value="1" name="confirm_not_duplicate" />confirm it's not a duplicate (and click on <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority"> again)</p>
! 			<p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >original authority</a></p>
! 		</ul>
! 	</div>
! <!-- /TMPL_IF -->
  
  <!-- TMPL_LOOP NAME="0XX" -->
***************
*** 172,177 ****
  
  function AddField(field) {
! 	document.forms[0].op.value = "addfield";
! 	document.forms[0].addfield_field.value=field;
  	document.f.submit();
  }
--- 185,190 ----
  
  function AddField(field) {
! 	document.forms[1].op.value = "addfield";
! 	document.forms[1].addfield_field.value=field;
  	document.f.submit();
  }

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/detail.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** detail.tmpl	19 Apr 2005 19:13:34 -0000	1.1.2.1
--- detail.tmpl	8 Jun 2005 19:19:40 -0000	1.1.2.2
***************
*** 8,12 ****
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1>Authority number : <!-- TMPL_VAR NAME="authid" --></h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
--- 8,12 ----
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1>Authority number : <!-- TMPL_VAR NAME="authid" -->  <!-- TMPL_IF NAME="authtypetext" -->(<!-- TMPL_VAR name="authtypetext" -->)<!-- /TMPL_IF --></h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
***************
*** 42,48 ****
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Are you sure you want to delete this biblio?');
  	if (is_confirmed) {
! 		window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";
  	}
  }
--- 42,48 ----
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Are you sure you want to delete this authority?');
  	if (is_confirmed) {
! 		window.location="authorities-home.pl?op=delete&amp;authid=<!-- TMPL_VAR NAME="authid" -->";
  	}
  }




From oleonard at users.sourceforge.net  Wed Jun  8 22:04:47 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:04:47 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/catalogue MARCdetail.tmpl,1.4,1.5
Message-ID: <E1Dg6n9-0001Ih-Ef@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	MARCdetail.tmpl 
Log Message:
Synching with rel_2_2.

Index: MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/MARCdetail.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** MARCdetail.tmpl	2 May 2005 20:22:24 -0000	1.4
--- MARCdetail.tmpl	8 Jun 2005 20:04:44 -0000	1.5
***************
*** 5,15 ****
  
  <div id="main">
! <h2>MARC Record for <em><!-- TMPL_VAR NAME="biblio_title" --><!-- TMPL_IF NAME="biblio_subtitle" -->: <!-- TMPL_VAR NAME="biblio_subtitle" --><!-- /TMPL_IF --></em></h2>
  <div class="tabitem"><form action="/cgi-bin/koha/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" value="intra" name="type" /><input type="submit" class="submit" value="Brief Display" /></form><!-- TMPL_IF NAME="norequests" -->&nbsp;<!-- TMPL_ELSE --> <form action="request.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> <input type="submit" class="submit" value="Place Reserve" /></form>
  		<!-- /TMPL_IF --><form action="/cgi-bin/koha/detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Simple Print View" /></form> <!-- TMPL_IF name="subscriptionid" --><form action="/cgi-bin/koha/bull/subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Subscription" class="submit" /></form>
! <form action="/cgi-bin/koha/bull/serial-issues.pl" method="get"><input type="hidden" name="subscriptionid" value="!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Serial Issues" class="submit" /></form><!-- /TMPL_IF -->  <form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Edit MARC" /></form> <form action="/cgi-bin/koha/acqui.simple/additem.pl" method="get"><input type="hidden" name="bibid" value="<!-- TMPL_VAR name="bibid"-->" /><input type="submit" class="submit" value="Edit Items" /></form> <form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="bibid" value="<!-- TMPL_VAR NAME="bibid" -->" /><input type="submit" class="cancel" value="Delete Record" onclick="confirm_deletion(); return false;" /></form></div>
  
  <!-- TMPL_IF NAME="0XX" -->
! <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="0XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 5,17 ----
  
  <div id="main">
! <h2>MARC Record <em><!-- TMPL_VAR NAME="biblionumber" --></em></h2>
  <div class="tabitem"><form action="/cgi-bin/koha/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" value="intra" name="type" /><input type="submit" class="submit" value="Brief Display" /></form><!-- TMPL_IF NAME="norequests" -->&nbsp;<!-- TMPL_ELSE --> <form action="request.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> <input type="submit" class="submit" value="Place Reserve" /></form>
  		<!-- /TMPL_IF --><form action="/cgi-bin/koha/detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Simple Print View" /></form> <!-- TMPL_IF name="subscriptionid" --><form action="/cgi-bin/koha/bull/subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Subscription" class="submit" /></form>
! <form action="/cgi-bin/koha/bull/serial-issues.pl" method="get"><input type="hidden" name="subscriptionid" value="!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Serial Issues" class="submit" /></form><!-- /TMPL_IF -->  </div>
! 
! <div id="controls"><form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Edit MARC" /></form> <form action="/cgi-bin/koha/acqui.simple/additem.pl" method="get"><input type="hidden" name="bibid" value="<!-- TMPL_VAR name="bibid"-->" /><input type="submit" class="submit" value="Edit Items" /></form> <form name="duplicate"><h4>Duplicate</h4> using <!--TMPL_VAR Name="framework" -->Framework <input type="submit" class="submit" value="Duplicate" onclick="Addbiblio('duplicate'); return false;" /></form> <form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="bibid" value="<!-- TMPL_VAR NAME="bibid" -->" /><input type="submit" class="cancel" value="Delete Record" onclick="confirm_deletion(); return false;" /></form></div>
  
  <!-- TMPL_IF NAME="0XX" -->
! <table class="marc">
  	<!-- TMPL_LOOP NAME="0XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 24,32 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="1XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="1XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 26,34 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="1XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="1XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 41,49 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  	 
  <!-- TMPL_IF NAME="2XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="2XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 43,51 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  	 
  <!-- TMPL_IF NAME="2XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="2XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 58,66 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  	 
  <!-- TMPL_IF NAME="3XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="3XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 60,68 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  	 
  <!-- TMPL_IF NAME="3XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="3XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 75,83 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="4XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="4XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 77,85 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="4XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="4XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 92,100 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="5XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="5XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 94,102 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="5XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="5XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 109,117 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="6XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="6XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 111,119 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="6XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="6XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 126,134 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="7XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="7XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 128,136 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="7XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="7XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 143,152 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  	 
  <!-- TMPL_IF NAME="8XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="8XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 145,154 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  	 
  <!-- TMPL_IF NAME="8XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="8XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 161,169 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="9XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="9XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 163,171 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="9XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="9XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 178,186 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="item_header_loop -->
!     <div class="table"><table>
  		<tr>
  			<!-- TMPL_LOOP NAME="item_header_loop" --><th><!-- TMPL_VAR NAME="header_value" --></th><!-- /TMPL_LOOP -->
--- 180,188 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="item_header_loop -->
!     <table>
  		<tr>
  			<!-- TMPL_LOOP NAME="item_header_loop" --><th><!-- TMPL_VAR NAME="header_value" --></th><!-- /TMPL_LOOP -->
***************
*** 191,195 ****
  			</tr>
  		<!-- /TMPL_LOOP -->
!      </table></div>
  <!-- /TMPL_IF -->
  	 </div>
--- 193,197 ----
  			</tr>
  		<!-- /TMPL_LOOP -->
!      </table>
  <!-- /TMPL_IF -->
  	 </div>
***************
*** 201,204 ****
--- 203,214 ----
  	}
  }
+ 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['duplicate'].Frameworks.options[document.forms['duplicate'].Frameworks.selectedIndex].value;
+   window.location = "acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode="+fwk+"&op="+op; 
+ }
  </script>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file




From oleonard at users.sourceforge.net  Wed Jun  8 22:04:17 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:04:17 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/catalogue MARCdetail.tmpl,1.3.2.1,1.3.2.2
Message-ID: <E1Dg6mf-0001Ep-HX@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	MARCdetail.tmpl 
Log Message:
Synching with default template

Index: MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/MARCdetail.tmpl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** MARCdetail.tmpl	30 Mar 2005 22:51:53 -0000	1.3.2.1
--- MARCdetail.tmpl	8 Jun 2005 20:04:14 -0000	1.3.2.2
***************
*** 5,15 ****
  
  <div id="main">
! <h2>MARC Record for <em><!-- TMPL_VAR NAME="biblio_title" --><!-- TMPL_IF NAME="biblio_subtitle" -->: <!-- TMPL_VAR NAME="biblio_subtitle" --><!-- /TMPL_IF --></em></h2>
  <div class="tabitem"><form action="/cgi-bin/koha/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" value="intra" name="type" /><input type="submit" class="submit" value="Brief Display" /></form><!-- TMPL_IF NAME="norequests" -->&nbsp;<!-- TMPL_ELSE --> <form action="request.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> <input type="submit" class="submit" value="Place Reserve" /></form>
  		<!-- /TMPL_IF --><form action="/cgi-bin/koha/detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Simple Print View" /></form> <!-- TMPL_IF name="subscriptionid" --><form action="/cgi-bin/koha/bull/subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Subscription" class="submit" /></form>
! <form action="/cgi-bin/koha/bull/serial-issues.pl" method="get"><input type="hidden" name="subscriptionid" value="!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Serial Issues" class="submit" /></form><!-- /TMPL_IF -->  <form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Edit MARC" /></form> <form action="/cgi-bin/koha/acqui.simple/additem.pl" method="get"><input type="hidden" name="bibid" value="<!-- TMPL_VAR name="bibid"-->" /><input type="submit" class="submit" value="Edit Items" /></form> <form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="bibid" value="<!-- TMPL_VAR NAME="bibid" -->" /><input type="submit" class="cancel" value="Delete Record" onclick="confirm_deletion(); return false;" /></form></div>
  
  <!-- TMPL_IF NAME="0XX" -->
! <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="0XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 5,17 ----
  
  <div id="main">
! <h2>MARC Record <em><!-- TMPL_VAR NAME="biblionumber" --></em></h2>
  <div class="tabitem"><form action="/cgi-bin/koha/detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" value="intra" name="type" /><input type="submit" class="submit" value="Brief Display" /></form><!-- TMPL_IF NAME="norequests" -->&nbsp;<!-- TMPL_ELSE --> <form action="request.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> <input type="submit" class="submit" value="Place Reserve" /></form>
  		<!-- /TMPL_IF --><form action="/cgi-bin/koha/detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Simple Print View" /></form> <!-- TMPL_IF name="subscriptionid" --><form action="/cgi-bin/koha/bull/subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Subscription" class="submit" /></form>
! <form action="/cgi-bin/koha/bull/serial-issues.pl" method="get"><input type="hidden" name="subscriptionid" value="!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Serial Issues" class="submit" /></form><!-- /TMPL_IF -->  </div>
! 
! <div id="controls"><form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Edit MARC" /></form> <form action="/cgi-bin/koha/acqui.simple/additem.pl" method="get"><input type="hidden" name="bibid" value="<!-- TMPL_VAR name="bibid"-->" /><input type="submit" class="submit" value="Edit Items" /></form> <form name="duplicate"><h4>Duplicate</h4> using <!--TMPL_VAR Name="framework" -->Framework <input type="submit" class="submit" value="Duplicate" onclick="Addbiblio('duplicate'); return false;" /></form> <form action="/cgi-bin/koha/acqui.simple/addbiblio.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="bibid" value="<!-- TMPL_VAR NAME="bibid" -->" /><input type="submit" class="cancel" value="Delete Record" onclick="confirm_deletion(); return false;" /></form></div>
  
  <!-- TMPL_IF NAME="0XX" -->
! <table class="marc">
  	<!-- TMPL_LOOP NAME="0XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 24,32 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="1XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="1XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 26,34 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="1XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="1XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 41,49 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  	 
  <!-- TMPL_IF NAME="2XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="2XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 43,51 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  	 
  <!-- TMPL_IF NAME="2XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="2XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 58,66 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  	 
  <!-- TMPL_IF NAME="3XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="3XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 60,68 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  	 
  <!-- TMPL_IF NAME="3XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="3XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 75,83 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="4XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="4XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 77,85 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="4XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="4XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 92,100 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="5XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="5XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 94,102 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="5XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="5XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 109,117 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="6XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="6XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 111,119 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="6XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="6XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 126,134 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="7XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="7XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 128,136 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="7XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="7XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 143,152 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  	 <!-- /TMPL_IF -->
  
  	 
  <!-- TMPL_IF NAME="8XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="8XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 145,154 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  	 <!-- /TMPL_IF -->
  
  	 
  <!-- TMPL_IF NAME="8XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="8XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 161,169 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="9XX" -->
!     <div class="table"><table class="marc">
  	<!-- TMPL_LOOP NAME="9XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
--- 163,171 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="9XX" -->
!     <table class="marc">
  	<!-- TMPL_LOOP NAME="9XX" -->
  	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
***************
*** 178,186 ****
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table></div>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="item_header_loop -->
!     <div class="table"><table>
  		<tr>
  			<!-- TMPL_LOOP NAME="item_header_loop" --><th><!-- TMPL_VAR NAME="header_value" --></th><!-- /TMPL_LOOP -->
--- 180,188 ----
  	<!-- /TMPL_LOOP -->
  	<!-- /TMPL_LOOP -->
!      </table>
  <!-- /TMPL_IF -->
  
  <!-- TMPL_IF NAME="item_header_loop -->
!     <table>
  		<tr>
  			<!-- TMPL_LOOP NAME="item_header_loop" --><th><!-- TMPL_VAR NAME="header_value" --></th><!-- /TMPL_LOOP -->
***************
*** 191,195 ****
  			</tr>
  		<!-- /TMPL_LOOP -->
!      </table></div>
  <!-- /TMPL_IF -->
  	 </div>
--- 193,197 ----
  			</tr>
  		<!-- /TMPL_LOOP -->
!      </table>
  <!-- /TMPL_IF -->
  	 </div>
***************
*** 201,204 ****
--- 203,214 ----
  	}
  }
+ 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['duplicate'].Frameworks.options[document.forms['duplicate'].Frameworks.selectedIndex].value;
+   window.location = "acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode="+fwk+"&op="+op; 
+ }
  </script>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file




From oleonard at users.sourceforge.net  Wed Jun  8 22:15:02 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:15:02 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/catalogue detail.tmpl,1.4.2.3,1.4.2.4 searchresults.tmpl,1.2,1.2.2.1
Message-ID: <E1Dg6x4-0002V2-Dd@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	detail.tmpl searchresults.tmpl 
Log Message:
Synching with default template

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/detail.tmpl,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -r1.4.2.3 -r1.4.2.4
*** detail.tmpl	16 May 2005 17:49:26 -0000	1.4.2.3
--- detail.tmpl	8 Jun 2005 20:14:59 -0000	1.4.2.4
***************
*** 22,31 ****
  			<!-- TMPL_IF NAME="additional" --><li><b>Additional Author:</b> <!-- TMPL_VAR NAME="additional" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="isbn" --><li><strong>ISBN:</strong> <!-- TMPL_VAR NAME="isbn" --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="seriestitle" --><li><b>Series Title:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- TMPL_IF NAME="volume" --><!-- TMPL_VAR NAME="volume" --><!-- /TMPL_IF --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="subject" --><li><b>Subject:</b> <!-- TMPL_VAR NAME="subject" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="copyrightdate" --><li><b>Copyright:</b> <!-- TMPL_VAR NAME="copyrightdate" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="notes" --><li><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="unititle" --><li><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF name="url" --><li><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a></li><!-- /TMPL_IF -->
  			<!-- Hide from NPL --><!-- TMPL_IF NAME="serial" --><li><b>Serial:</b> <!-- TMPL_VAR NAME="serial" --></li><!-- /TMPL_IF --> <!-- /Hide from NPL -->
  			<li><b>Biblio Record</b> <!-- TMPL_VAR NAME="biblionumber" --></li>
--- 22,33 ----
  			<!-- TMPL_IF NAME="additional" --><li><b>Additional Author:</b> <!-- TMPL_VAR NAME="additional" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="isbn" --><li><strong>ISBN:</strong> <!-- TMPL_VAR NAME="isbn" --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="issn" --><li><strong>ISSN:</strong> <!-- TMPL_VAR NAME="issn" --></li><!-- /TMPL_IF --><!-- TMPL_IF NAME="seriestitle" --><li><b>Series Title:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- TMPL_IF NAME="volume" --><!-- TMPL_VAR NAME="volume" --><!-- /TMPL_IF --></li><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="subjects" --><li><strong>Subject(s):</strong>
! 					<!-- TMPL_LOOP name="subjects" -->
! 						<a href="/cgi-bin/koha/search.pl?type=intra&amp;subjectitems=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP --></li>
! 					<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="copyrightdate" --><li><b>Copyright:</b> <!-- TMPL_VAR NAME="copyrightdate" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="notes" --><li><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="unititle" --><li><b>Alternate Title:</b> <!-- TMPL_VAR NAME="unititle" --></li><!-- /TMPL_IF -->
  			<!-- Hide from NPL --><!-- TMPL_IF NAME="serial" --><li><b>Serial:</b> <!-- TMPL_VAR NAME="serial" --></li><!-- /TMPL_IF --> <!-- /Hide from NPL -->
  			<li><b>Biblio Record</b> <!-- TMPL_VAR NAME="biblionumber" --></li>

Index: searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/searchresults.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** searchresults.tmpl	13 Apr 2004 16:52:55 -0000	1.2
--- searchresults.tmpl	8 Jun 2005 20:15:00 -0000	1.2.2.1
***************
*** 8,12 ****
  	You searched for <span class="ex"><!-- TMPL_VAR NAME="searchdesc" --></span>
  <!-- TMPL_ELSE -->
! 	You did not specify any seach criteria
  <!-- /TMPL_IF -->
  </h3>
--- 8,12 ----
  	You searched for <span class="ex"><!-- TMPL_VAR NAME="searchdesc" --></span>
  <!-- TMPL_ELSE -->
! 	You did not specify any search criteria
  <!-- /TMPL_IF -->
  </h3>




From oleonard at users.sourceforge.net  Wed Jun  8 22:15:29 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:15:29 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/catalogue detail.tmpl,1.5,1.6 searchresults.tmpl,1.2,1.3
Message-ID: <E1Dg6xV-0002Xr-01@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	detail.tmpl searchresults.tmpl 
Log Message:
Synching with rel_2_2.

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/detail.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** detail.tmpl	2 May 2005 20:22:24 -0000	1.5
--- detail.tmpl	8 Jun 2005 20:15:26 -0000	1.6
***************
*** 22,30 ****
  			<!-- TMPL_IF NAME="additional" --><li><b>Additional Author:</b> <!-- TMPL_VAR NAME="additional" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="isbn" --><li><strong>ISBN:</strong> <!-- TMPL_VAR NAME="isbn" --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="seriestitle" --><li><b>Series Title:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- TMPL_IF NAME="volume" --><!-- TMPL_VAR NAME="volume" --><!-- /TMPL_IF --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="subject" --><li><b>Subject:</b> <!-- TMPL_VAR NAME="subject" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="copyrightdate" --><li><b>Copyright:</b> <!-- TMPL_VAR NAME="copyrightdate" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="notes" --><li><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="unititle" --><li><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --></li><!-- /TMPL_IF -->
  			<!-- Hide from NPL --><!-- TMPL_IF NAME="serial" --><li><b>Serial:</b> <!-- TMPL_VAR NAME="serial" --></li><!-- /TMPL_IF --> <!-- /Hide from NPL -->
  			<li><b>Biblio Record</b> <!-- TMPL_VAR NAME="biblionumber" --></li>
--- 22,33 ----
  			<!-- TMPL_IF NAME="additional" --><li><b>Additional Author:</b> <!-- TMPL_VAR NAME="additional" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="isbn" --><li><strong>ISBN:</strong> <!-- TMPL_VAR NAME="isbn" --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="issn" --><li><strong>ISSN:</strong> <!-- TMPL_VAR NAME="issn" --></li><!-- /TMPL_IF --><!-- TMPL_IF NAME="seriestitle" --><li><b>Series Title:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- TMPL_IF NAME="volume" --><!-- TMPL_VAR NAME="volume" --><!-- /TMPL_IF --></li><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="subjects" --><li><strong>Subject(s):</strong>
! 					<!-- TMPL_LOOP name="subjects" -->
! 						<a href="/cgi-bin/koha/search.pl?type=intra&amp;subjectitems=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP --></li>
! 					<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="copyrightdate" --><li><b>Copyright:</b> <!-- TMPL_VAR NAME="copyrightdate" --></li><!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="notes" --><li><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --></li><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="unititle" --><li><b>Alternate Title:</b> <!-- TMPL_VAR NAME="unititle" --></li><!-- /TMPL_IF -->
  			<!-- Hide from NPL --><!-- TMPL_IF NAME="serial" --><li><b>Serial:</b> <!-- TMPL_VAR NAME="serial" --></li><!-- /TMPL_IF --> <!-- /Hide from NPL -->
  			<li><b>Biblio Record</b> <!-- TMPL_VAR NAME="biblionumber" --></li>

Index: searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/searchresults.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** searchresults.tmpl	13 Apr 2004 16:52:55 -0000	1.2
--- searchresults.tmpl	8 Jun 2005 20:15:26 -0000	1.3
***************
*** 8,12 ****
  	You searched for <span class="ex"><!-- TMPL_VAR NAME="searchdesc" --></span>
  <!-- TMPL_ELSE -->
! 	You did not specify any seach criteria
  <!-- /TMPL_IF -->
  </h3>
--- 8,12 ----
  	You searched for <span class="ex"><!-- TMPL_VAR NAME="searchdesc" --></span>
  <!-- TMPL_ELSE -->
! 	You did not specify any search criteria
  <!-- /TMPL_IF -->
  </h3>




From oleonard at users.sourceforge.net  Wed Jun  8 22:36:32 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:36:32 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members memberentry.tmpl,1.3.2.3,1.3.2.4
Message-ID: <E1Dg7Hs-0005Vf-Re@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21096/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
      Tag: rel_2_2
	memberentry.tmpl 
Log Message:
Synching with default template

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/memberentry.tmpl,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -C2 -r1.3.2.3 -r1.3.2.4
*** memberentry.tmpl	7 Apr 2005 17:06:16 -0000	1.3.2.3
--- memberentry.tmpl	8 Jun 2005 20:36:30 -0000	1.3.2.4
***************
*** 46,51 ****
  	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
  		<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
- 		<input type="hidden" name="joining" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
- 		<input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="expiry" -->">
  		<input type="hidden" name="type" value="borrowers">
  		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
--- 46,49 ----
***************
*** 85,105 ****
  
  	<tr><th>Addresses:</th><td colspan="4"><fieldset><legend>Mailing Address</legend><label for="streetaddress"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->><a name="address" id="address">Address:</a> </label><input type="text" id="streetaddress" name="streetaddress" size="25" value="<!-- TMPL_VAR NAME="address" -->"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->>
! <br><label for="city"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF -->><a name="#city" id="#city">City, State:</a></label> <input type="text" id="city" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF -->>
  <br><label for="zipcode">Zip Code:</label> <input type="text" id="zipcode" name="zipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="zipcode" -->"></fieldset>
  
  <fieldset><legend>Street Address (if different)</legend>
! <label for="physstreet">Address:</label><input type="text" id="physstreet" name="physstreet" size="25" value="<!-- TMPL_VAR NAME="physstreet" -->">
! <br><label for="streetcity">City, State: </label><input type="text" id="streetcity" name="streetcity" size="20" value="<!-- TMPL_VAR NAME="streetcity" -->">
! <br><label for="homezipcode">Zip Code:</label><input type="text" id="homezipcode" name="homezipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="homezipcode" -->">
  </fieldset>
  </td></tr>
  
! 	<tr><th><label for="phone">Phone (Home):</label> </th><td colspan="4"><input type="text" id="phone" name="phone" size="20" value="<!-- TMPL_VAR NAME="phone" -->"></td></tr>
! 	<tr><th><label for="phoneday">Phone (Daytime):</label> </th><td colspan="4"><input type="text" id="phoneday" name="phoneday" size="20" value="<!-- TMPL_VAR NAME="phoneday" -->"></td></tr>
! 	<tr><th><label for="faxnumber">Fax: </label></th><td colspan="4"><input type="text" id="faxnumber" name="faxnumber" size="20" value="<!-- TMPL_VAR NAME="faxnumber" -->"></td></tr>
! 	<tr><th><label for="emailaddress">Email :</label> </th><td colspan="4"><input type="text" id="emailaddress" name="emailaddress" size="40" value="<!-- TMPL_VAR NAME="emailaddress" -->"></td></tr>
  			</tr>
  	<tr><th><label for="textmessaging">Patron message:</label><p> (appears in OPAC)</p></th><td colspan="4"><textarea id="textmessaging" name="textmessaging" cols="30" rows="3"><!-- TMPL_VAR NAME="textmessaging" --></textarea></td></tr>
  	<tr><th><label for="borrowernotes">Circulation note:</label> <p>(appears in Circulation)</p> </th><td colspan="4"><textarea id="borrowernotes" name="borrowernotes" cols="30" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td></tr>
  			</table></div>
  
--- 83,118 ----
  
  	<tr><th>Addresses:</th><td colspan="4"><fieldset><legend>Mailing Address</legend><label for="streetaddress"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->><a name="address" id="address">Address:</a> </label><input type="text" id="streetaddress" name="streetaddress" size="25" value="<!-- TMPL_VAR NAME="address" -->"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->>
! <br><label for="city"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF -->><a name="#city" id="#city">City, State:</a></label> <input type="text" id="city" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF --> />
  <br><label for="zipcode">Zip Code:</label> <input type="text" id="zipcode" name="zipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="zipcode" -->"></fieldset>
  
  <fieldset><legend>Street Address (if different)</legend>
! <label for="physstreet">Address:</label><input type="text" id="physstreet" name="physstreet" size="25" value="<!-- TMPL_VAR NAME="physstreet" -->" />
! <br><label for="streetcity">City, State: </label><input type="text" id="streetcity" name="streetcity" size="20" value="<!-- TMPL_VAR NAME="streetcity" -->" />
! <br><label for="homezipcode">Zip Code:</label><input type="text" id="homezipcode" name="homezipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="homezipcode" -->" /> 
  </fieldset>
  </td></tr>
  
! 	<tr><th><label for="phone">Phone (Home):</label> </th><td colspan="4"><input type="text" id="phone" name="phone" size="20" value="<!-- TMPL_VAR NAME="phone" -->" /></td></tr>
! 	<tr><th><label for="phoneday">Phone (Daytime):</label> </th><td colspan="4"><input type="text" id="phoneday" name="phoneday" size="20" value="<!-- TMPL_VAR NAME="phoneday" -->" /></td></tr>
! 	<tr><th><label for="faxnumber">Fax: </label></th><td colspan="4"><input type="text" id="faxnumber" name="faxnumber" size="20" value="<!-- TMPL_VAR NAME="faxnumber" -->" /></td></tr>
! 	<tr><th><label for="emailaddress">Email :</label> </th><td colspan="4"><input type="text" id="emailaddress" name="emailaddress" size="40" value="<!-- TMPL_VAR NAME="emailaddress" -->" /></td></tr>
  			</tr>
  	<tr><th><label for="textmessaging">Patron message:</label><p> (appears in OPAC)</p></th><td colspan="4"><textarea id="textmessaging" name="textmessaging" cols="30" rows="3"><!-- TMPL_VAR NAME="textmessaging" --></textarea></td></tr>
  	<tr><th><label for="borrowernotes">Circulation note:</label> <p>(appears in Circulation)</p> </th><td colspan="4"><textarea id="borrowernotes" name="borrowernotes" cols="30" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td></tr>
+ 
+ 			<tr>
+ 				<!-- TMPL_IF NAME="addAction" -->
+ 					<th>Joining date (leave blank for today): </th>
+ 					<td colspan="4"><input type="text" name="joining" size="12" maxlength="10" value="<!-- TMPL_VAR name="joining" -->" /></td>
+ 				<!-- TMPL_ELSE -->
+ 					<th>Joining date: </th>
+ 					<td colspan="4"><!-- TMPL_VAR name="joining" --></td>
+ 				<!-- /TMPL_IF -->
+ 			</tr>
+ 			<tr>
+ 				<th>Expiry date (leave blank for auto calc): </th>
+ 				<td><input type="text" name="expiry" size="12" maxlength="10" value="<!-- TMPL_VAR name="expiry" -->" /></td>
+ 			</tr>
+ 
  			</table></div>
  




From oleonard at users.sourceforge.net  Wed Jun  8 22:36:34 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:36:34 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members memberentry.tmpl,1.6,1.7
Message-ID: <E1Dg7Hu-0005Vu-6R@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21086/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
	memberentry.tmpl 
Log Message:
Synching with rel_2_2.

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/memberentry.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** memberentry.tmpl	2 May 2005 20:21:12 -0000	1.6
--- memberentry.tmpl	8 Jun 2005 20:36:32 -0000	1.7
***************
*** 46,51 ****
  	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
  		<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
- 		<input type="hidden" name="joining" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
- 		<input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="expiry" -->">
  		<input type="hidden" name="type" value="borrowers">
  		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
--- 46,49 ----
***************
*** 61,65 ****
  	<!-- TMPL_UNLESS name="institution" --><tr><th><label for="title">Salutation:</label></th><td colspan="4"><!-- TMPL_VAR NAME="Mr" -->
  				<select name="title" id="title">
! 					<option <!-- TMPL_VAR NAME="title_selected_ " --> value=" ">No Title</option>
  					<option value="Miss" <!-- TMPL_VAR NAME="title_Miss" -->>Miss</option>
  					<option value="Mrs" <!-- TMPL_VAR NAME="title_Mrs" -->>Mrs</option>
--- 59,63 ----
  	<!-- TMPL_UNLESS name="institution" --><tr><th><label for="title">Salutation:</label></th><td colspan="4"><!-- TMPL_VAR NAME="Mr" -->
  				<select name="title" id="title">
! 					<option <!-- TMPL_VAR NAME="title_selected_ " --> value="">No Title</option>
  					<option value="Miss" <!-- TMPL_VAR NAME="title_Miss" -->>Miss</option>
  					<option value="Mrs" <!-- TMPL_VAR NAME="title_Mrs" -->>Mrs</option>
***************
*** 85,105 ****
  
  	<tr><th>Addresses:</th><td colspan="4"><fieldset><legend>Mailing Address</legend><label for="streetaddress"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->><a name="address" id="address">Address:</a> </label><input type="text" id="streetaddress" name="streetaddress" size="25" value="<!-- TMPL_VAR NAME="address" -->"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->>
! <br><label for="city"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF -->><a name="#city" id="#city">City, State:</a></label> <input type="text" id="city" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF -->>
  <br><label for="zipcode">Zip Code:</label> <input type="text" id="zipcode" name="zipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="zipcode" -->"></fieldset>
  
  <fieldset><legend>Street Address (if different)</legend>
! <label for="physstreet">Address:</label><input type="text" id="physstreet" name="physstreet" size="25" value="<!-- TMPL_VAR NAME="physstreet" -->">
! <br><label for="streetcity">City, State: </label><input type="text" id="streetcity" name="streetcity" size="20" value="<!-- TMPL_VAR NAME="streetcity" -->">
! <br><label for="homezipcode">Zip Code:</label><input type="text" id="homezipcode" name="homezipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="homezipcode" -->">
  </fieldset>
  </td></tr>
  
! 	<tr><th><label for="phone">Phone (Home):</label> </th><td colspan="4"><input type="text" id="phone" name="phone" size="20" value="<!-- TMPL_VAR NAME="phone" -->"></td></tr>
! 	<tr><th><label for="phoneday">Phone (Daytime):</label> </th><td colspan="4"><input type="text" id="phoneday" name="phoneday" size="20" value="<!-- TMPL_VAR NAME="phoneday" -->"></td></tr>
! 	<tr><th><label for="faxnumber">Fax: </label></th><td colspan="4"><input type="text" id="faxnumber" name="faxnumber" size="20" value="<!-- TMPL_VAR NAME="faxnumber" -->"></td></tr>
! 	<tr><th><label for="emailaddress">Email :</label> </th><td colspan="4"><input type="text" id="emailaddress" name="emailaddress" size="40" value="<!-- TMPL_VAR NAME="emailaddress" -->"></td></tr>
  			</tr>
  	<tr><th><label for="textmessaging">Patron message:</label><p> (appears in OPAC)</p></th><td colspan="4"><textarea id="textmessaging" name="textmessaging" cols="30" rows="3"><!-- TMPL_VAR NAME="textmessaging" --></textarea></td></tr>
  	<tr><th><label for="borrowernotes">Circulation note:</label> <p>(appears in Circulation)</p> </th><td colspan="4"><textarea id="borrowernotes" name="borrowernotes" cols="30" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td></tr>
  			</table></div>
  
--- 83,118 ----
  
  	<tr><th>Addresses:</th><td colspan="4"><fieldset><legend>Mailing Address</legend><label for="streetaddress"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->><a name="address" id="address">Address:</a> </label><input type="text" id="streetaddress" name="streetaddress" size="25" value="<!-- TMPL_VAR NAME="address" -->"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->>
! <br><label for="city"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF -->><a name="#city" id="#city">City, State:</a></label> <input type="text" id="city" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF --> />
  <br><label for="zipcode">Zip Code:</label> <input type="text" id="zipcode" name="zipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="zipcode" -->"></fieldset>
  
  <fieldset><legend>Street Address (if different)</legend>
! <label for="physstreet">Address:</label><input type="text" id="physstreet" name="physstreet" size="25" value="<!-- TMPL_VAR NAME="physstreet" -->" />
! <br><label for="streetcity">City, State: </label><input type="text" id="streetcity" name="streetcity" size="20" value="<!-- TMPL_VAR NAME="streetcity" -->" />
! <br><label for="homezipcode">Zip Code:</label><input type="text" id="homezipcode" name="homezipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="homezipcode" -->" /> 
  </fieldset>
  </td></tr>
  
! 	<tr><th><label for="phone">Phone (Home):</label> </th><td colspan="4"><input type="text" id="phone" name="phone" size="20" value="<!-- TMPL_VAR NAME="phone" -->" /></td></tr>
! 	<tr><th><label for="phoneday">Phone (Daytime):</label> </th><td colspan="4"><input type="text" id="phoneday" name="phoneday" size="20" value="<!-- TMPL_VAR NAME="phoneday" -->" /></td></tr>
! 	<tr><th><label for="faxnumber">Fax: </label></th><td colspan="4"><input type="text" id="faxnumber" name="faxnumber" size="20" value="<!-- TMPL_VAR NAME="faxnumber" -->" /></td></tr>
! 	<tr><th><label for="emailaddress">Email :</label> </th><td colspan="4"><input type="text" id="emailaddress" name="emailaddress" size="40" value="<!-- TMPL_VAR NAME="emailaddress" -->" /></td></tr>
  			</tr>
  	<tr><th><label for="textmessaging">Patron message:</label><p> (appears in OPAC)</p></th><td colspan="4"><textarea id="textmessaging" name="textmessaging" cols="30" rows="3"><!-- TMPL_VAR NAME="textmessaging" --></textarea></td></tr>
  	<tr><th><label for="borrowernotes">Circulation note:</label> <p>(appears in Circulation)</p> </th><td colspan="4"><textarea id="borrowernotes" name="borrowernotes" cols="30" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td></tr>
+ 
+ 			<tr>
+ 				<!-- TMPL_IF NAME="addAction" -->
+ 					<th>Joining date (leave blank for today): </th>
+ 					<td colspan="4"><input type="text" name="joining" size="12" maxlength="10" value="<!-- TMPL_VAR name="joining" -->" /></td>
+ 				<!-- TMPL_ELSE -->
+ 					<th>Joining date: </th>
+ 					<td colspan="4"><!-- TMPL_VAR name="joining" --></td>
+ 				<!-- /TMPL_IF -->
+ 			</tr>
+ 			<tr>
+ 				<th>Expiry date (leave blank for auto calc): </th>
+ 				<td><input type="text" name="expiry" size="12" maxlength="10" value="<!-- TMPL_VAR name="expiry" -->" /></td>
+ 			</tr>
+ 
  			</table></div>
  




From oleonard at users.sourceforge.net  Wed Jun  8 22:43:11 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:43:11 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ circulation.tmpl,1.15,1.16
Message-ID: <E1Dg7OJ-0006bM-ED@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25311/koha-tmpl/intranet-tmpl/npl/en/circ

Modified Files:
	circulation.tmpl 
Log Message:
Synching with rel_2_2.

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** circulation.tmpl	3 May 2005 18:32:12 -0000	1.15
--- circulation.tmpl	8 Jun 2005 20:43:07 -0000	1.16
***************
*** 47,50 ****
--- 47,53 ----
  				<li>No more renewals possible</li>
  			<!-- /TMPL_IF -->
+ 			<!-- TMPL_IF NAME="EXPIRED" -->
+ 				<li>Patron's card is expired</li>
+ 			<!-- /TMPL_IF -->
  			</ul>
  		</div>




From oleonard at users.sourceforge.net  Wed Jun  8 22:43:14 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:43:14 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ circulation.tmpl,1.6.2.9,1.6.2.10
Message-ID: <E1Dg7OM-0006bq-Uh@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25358/koha-tmpl/intranet-tmpl/npl/en/circ

Modified Files:
      Tag: rel_2_2
	circulation.tmpl 
Log Message:
Synching with default template

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl,v
retrieving revision 1.6.2.9
retrieving revision 1.6.2.10
diff -C2 -r1.6.2.9 -r1.6.2.10
*** circulation.tmpl	3 May 2005 18:31:34 -0000	1.6.2.9
--- circulation.tmpl	8 Jun 2005 20:43:12 -0000	1.6.2.10
***************
*** 47,50 ****
--- 47,53 ----
  				<li>No more renewals possible</li>
  			<!-- /TMPL_IF -->
+ 			<!-- TMPL_IF NAME="EXPIRED" -->
+ 				<li>Patron's card is expired</li>
+ 			<!-- /TMPL_IF -->
  			</ul>
  		</div>




From oleonard at users.sourceforge.net  Wed Jun  8 22:53:14 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:53:14 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/reports borrowers_out.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1Dg7Y2-0007tK-RU@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30287/koha-tmpl/intranet-tmpl/npl/en/reports

Modified Files:
      Tag: rel_2_2
	borrowers_out.tmpl 
Log Message:
Synching with default template

Index: borrowers_out.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports/borrowers_out.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** borrowers_out.tmpl	21 Apr 2005 19:38:11 -0000	1.1.2.1
--- borrowers_out.tmpl	8 Jun 2005 20:53:12 -0000	1.1.2.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
***************
*** 77,80 ****
--- 77,96 ----
  				<td><input type="text" name="Filter" id="borrowercategory" value="" /></td>
  			</tr>
+ 						<tr class="hilighted">
+ 				<td>&nbsp;</td>
+ 				<td>&nbsp;</td>
+ 				<td><label for="issuessince">Without issues since:</label> </td>
+ 				<td><input size="10" id="to" id="issuessince" name="Filter" value="" type="text" />
+ 						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" />
+ 							<script type="text/javascript">
+ 								Calendar.setup(
+ 									{
+ 										inputField : "to",
+ 										ifFormat : "%Y-%m-%d",
+ 										button : "openCalendarTo",
+ 									}
+ 								);
+ 							</script></td>
+ 			</tr>
  		</tbody>
  	</table>




From oleonard at users.sourceforge.net  Wed Jun  8 22:53:16 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 13:53:16 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/reports borrowers_out.tmpl,1.2,1.3
Message-ID: <E1Dg7Y4-0007ti-8r@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30276/koha-tmpl/intranet-tmpl/npl/en/reports

Modified Files:
	borrowers_out.tmpl 
Log Message:
Synching with rel_2_2.

Index: borrowers_out.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports/borrowers_out.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** borrowers_out.tmpl	2 May 2005 20:08:28 -0000	1.2
--- borrowers_out.tmpl	8 Jun 2005 20:53:14 -0000	1.3
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
***************
*** 77,80 ****
--- 77,96 ----
  				<td><input type="text" name="Filter" id="borrowercategory" value="" /></td>
  			</tr>
+ 						<tr class="hilighted">
+ 				<td>&nbsp;</td>
+ 				<td>&nbsp;</td>
+ 				<td><label for="issuessince">Without issues since:</label> </td>
+ 				<td><input size="10" id="to" id="issuessince" name="Filter" value="" type="text" />
+ 						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" />
+ 							<script type="text/javascript">
+ 								Calendar.setup(
+ 									{
+ 										inputField : "to",
+ 										ifFormat : "%Y-%m-%d",
+ 										button : "openCalendarTo",
+ 									}
+ 								);
+ 							</script></td>
+ 			</tr>
  		</tbody>
  	</table>




From oleonard at users.sourceforge.net  Wed Jun  8 23:22:30 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 14:22:30 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters checkmarc.tmpl,1.2.2.1,1.2.2.2 marctagstructure.tmpl,1.2.2.3,1.2.2.4
Message-ID: <E1Dg80M-0003Nl-OY@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12916/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
      Tag: rel_2_2
	checkmarc.tmpl marctagstructure.tmpl 
Log Message:
Synching with default template

Index: checkmarc.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/checkmarc.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** checkmarc.tmpl	4 Feb 2005 19:24:46 -0000	1.2.2.1
--- checkmarc.tmpl	8 Jun 2005 21:22:22 -0000	1.2.2.2
***************
*** 41,44 ****
--- 41,56 ----
  <!-- /TMPL_IF -->
  <!-- -->
+ 	<!-- TMPL_IF NAME="itemtags" -->
+ 		<tr>
+ 			<td><b>Item tag</b></td>
+ 			<td>There is more than 1 MARC tag related to items tab (10) : <!-- TMPL_VAR name="itemtags" --></td>
+ 		</tr>
+ 	<!-- TMPL_ELSE -->
+ 		<tr>
+ 			<td>OK</td>
+ 			<td><i>Only 1 MARC tag mapped to items</i></td>
+ 		</tr>
+ 	<!-- /TMPL_IF -->
+ 	<!--  -->
  <!-- TMPL_IF name="itemtype" -->
  	<tr>
***************
*** 97,100 ****
--- 109,128 ----
  	</tr>
  <!-- /TMPL_IF -->
+ 
+ 	<!-- TMPL_IF NAME="frameworknull" -->
+ 		<tr>
+ 			<td><b>framework values</b></td>
+ 			<td>there is a null value in a frameworkcode. Check the following tables<br/>
+ 				<li>select * from marc_subfield_structure where frameworkcode is NULL</li>
+ 				<li>select * from marc_tag_structure where frameworkcode is NULL</li>
+ 				<li>select * from marc_biblio where frameworkcode is NULL</li></td>
+ 		</tr>
+ 	<!-- TMPL_ELSE -->
+ 		<tr>
+ 			<td>OK</td>
+ 			<td><i>no NULL value in frameworkcode</i></td>
+ 		</tr>
+ 	<!-- /TMPL_IF -->
+ 
  <!-- -->
  <!-- TMPL_IF name="total" -->

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -r1.2.2.3 -r1.2.2.4
*** marctagstructure.tmpl	30 Mar 2005 19:57:22 -0000	1.2.2.3
--- marctagstructure.tmpl	8 Jun 2005 21:22:28 -0000	1.2.2.4
***************
*** 119,123 ****
  <!-- TMPL_IF NAME="else" -->
  
! <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  <label for="frameworkcode">Select a framework: </label>
  	<select id="frameworkcode" name="frameworkcode">
--- 119,123 ----
  <!-- TMPL_IF NAME="else" -->
  
! <form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  <label for="frameworkcode">Select a framework: </label>
  	<select id="frameworkcode" name="frameworkcode">
***************
*** 130,133 ****
--- 130,136 ----
  	<input type="text" name="searchfield" id="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
  	<input type="submit" value="Search" class="submit">
+ 			<p>
+ 		<label for="select_display">Display only used Tags/Subfields</label> <input type="checkbox" name="select_display" id="select_display" value="True"<!-- TMPL_IF Name="select_display"--> checked="checked"<!--/TMPL_IF -->  onchange="this.form.submit();" />
+ 		</p>
  </form>
  <p class="note">NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script.</p>
***************
*** 143,146 ****
--- 146,176 ----
  		<th>Edit</th>
  		<th>Delete</th>
+ 				<tr>
+ 	<!-- TMPL_IF NAME="select_display" -->
+ 		<!-- TMPL_LOOP NAME="loop" -->
+ 			<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
+ 			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
+ 			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
+ 			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+ 			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+ 			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
+ 			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
+ 			<td><a href="<!-- TMPL_VAR NAME="edit" -->">Edit</a></td>
+ 			<td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
+ 		</tr>
+ 			<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
+ 			<td>
+ 				&nbsp;
+ 			</td>
+ 			<td colspan="7">
+ 				<!-- TMPL_LOOP NAME="subfields" -->
+ 					<p>	Tab:<!-- TMPL_VAR NAME="tab" --> | $<!-- TMPL_VAR NAME="tagsubfield" -->
+ 							<!-- TMPL_VAR NAME="liblibrarian" --> <!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!--/TMPL_IF --><!-- TMPL_IF NAME="repeatable" -->, repeatable<!-- /TMPL_IF --><!-- TMPL_IF NAME="mandatory" -->, Mandatory<!-- /TMPL_IF --><!-- TMPL_IF NAME="seealso" -->, See <!-- TMPL_VAR name="seealso" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authorised_value" -->, <!-- TMPL_VAR NAME="authorised_value" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authtypecode" -->, <!-- TMPL_VAR NAME="authtypecode" --><!--/TMPL_IF --><!-- TMPL_IF NAME="value_builder" -->, <!-- TMPL_VAR NAME="value_builder" --><!--/TMPL_IF -->
+ 					</p>
+ 				<!-- /TMPL_LOOP -->
+ 			</td>
+ 		</tr>
+ 		<!-- /TMPL_LOOP -->
+ 	<!-- TMPL_ELSE -->
  	<!-- TMPL_LOOP NAME="loop" -->
  	<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
***************
*** 155,161 ****
  	</tr>
  	<!-- /TMPL_LOOP -->
  	</table>
  <div id="pages">	<!-- TMPL_IF NAME="isprevpage" -->
! 			<a class="pages" href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">&lt;&lt; Previous</a>
  		<!-- /TMPL_IF --><form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<input type="hidden" name="op" value="add_form">
--- 185,192 ----
  	</tr>
  	<!-- /TMPL_LOOP -->
+ 	<!--/TMPL_IF -->
  	</table>
  <div id="pages">	<!-- TMPL_IF NAME="isprevpage" -->
! 			<a class="pages" href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">&lt;&lt; Previous</a>
  		<!-- /TMPL_IF --><form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<input type="hidden" name="op" value="add_form">
***************
*** 166,171 ****
  	</form>
  		<!-- TMPL_IF NAME="nextpage" -->
! 			<a class="pages" href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">Next &gt;&gt;</a>
  		<!-- /TMPL_IF --></div>
  </div>
  <!-- /TMPL_IF -->
--- 197,207 ----
  	</form>
  		<!-- TMPL_IF NAME="nextpage" -->
! 			<a class="pages" href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">Next &gt;&gt;</a>
  		<!-- /TMPL_IF --></div>
+ 		<script language="javascript" type="text/javascript">
+ 	function ChangeDisplay(checkbox) {
+ 		window.
+ 	}
+ </script>
  </div>
  <!-- /TMPL_IF -->




From oleonard at users.sourceforge.net  Wed Jun  8 23:23:46 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 08 Jun 2005 14:23:46 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters checkmarc.tmpl,1.3,1.4 marctagstructure.tmpl,1.7,1.8
Message-ID: <E1Dg81a-0003b3-2D@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13662/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
	checkmarc.tmpl marctagstructure.tmpl 
Log Message:
Synching with rel_2_2.

Index: checkmarc.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/checkmarc.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** checkmarc.tmpl	4 Feb 2005 19:26:14 -0000	1.3
--- checkmarc.tmpl	8 Jun 2005 21:23:43 -0000	1.4
***************
*** 41,44 ****
--- 41,56 ----
  <!-- /TMPL_IF -->
  <!-- -->
+ 	<!-- TMPL_IF NAME="itemtags" -->
+ 		<tr>
+ 			<td><b>Item tag</b></td>
+ 			<td>There is more than 1 MARC tag related to items tab (10) : <!-- TMPL_VAR name="itemtags" --></td>
+ 		</tr>
+ 	<!-- TMPL_ELSE -->
+ 		<tr>
+ 			<td>OK</td>
+ 			<td><i>Only 1 MARC tag mapped to items</i></td>
+ 		</tr>
+ 	<!-- /TMPL_IF -->
+ 	<!--  -->
  <!-- TMPL_IF name="itemtype" -->
  	<tr>
***************
*** 97,100 ****
--- 109,128 ----
  	</tr>
  <!-- /TMPL_IF -->
+ 
+ 	<!-- TMPL_IF NAME="frameworknull" -->
+ 		<tr>
+ 			<td><b>framework values</b></td>
+ 			<td>there is a null value in a frameworkcode. Check the following tables<br/>
+ 				<li>select * from marc_subfield_structure where frameworkcode is NULL</li>
+ 				<li>select * from marc_tag_structure where frameworkcode is NULL</li>
+ 				<li>select * from marc_biblio where frameworkcode is NULL</li></td>
+ 		</tr>
+ 	<!-- TMPL_ELSE -->
+ 		<tr>
+ 			<td>OK</td>
+ 			<td><i>no NULL value in frameworkcode</i></td>
+ 		</tr>
+ 	<!-- /TMPL_IF -->
+ 
  <!-- -->
  <!-- TMPL_IF name="total" -->

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** marctagstructure.tmpl	2 May 2005 19:56:15 -0000	1.7
--- marctagstructure.tmpl	8 Jun 2005 21:23:43 -0000	1.8
***************
*** 119,123 ****
  <!-- TMPL_IF NAME="else" -->
  
! <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  <label for="frameworkcode">Select a framework: </label>
  	<select id="frameworkcode" name="frameworkcode">
--- 119,123 ----
  <!-- TMPL_IF NAME="else" -->
  
! <form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  <label for="frameworkcode">Select a framework: </label>
  	<select id="frameworkcode" name="frameworkcode">
***************
*** 130,133 ****
--- 130,136 ----
  	<input type="text" name="searchfield" id="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
  	<input type="submit" value="Search" class="submit">
+ 			<p>
+ 		<label for="select_display">Display only used Tags/Subfields</label> <input type="checkbox" name="select_display" id="select_display" value="True"<!-- TMPL_IF Name="select_display"--> checked="checked"<!--/TMPL_IF -->  onchange="this.form.submit();" />
+ 		</p>
  </form>
  <p class="note">NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script.</p>
***************
*** 143,146 ****
--- 146,176 ----
  		<th>Edit</th>
  		<th>Delete</th>
+ 				<tr>
+ 	<!-- TMPL_IF NAME="select_display" -->
+ 		<!-- TMPL_LOOP NAME="loop" -->
+ 			<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
+ 			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
+ 			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
+ 			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+ 			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+ 			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
+ 			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
+ 			<td><a href="<!-- TMPL_VAR NAME="edit" -->">Edit</a></td>
+ 			<td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
+ 		</tr>
+ 			<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
+ 			<td>
+ 				&nbsp;
+ 			</td>
+ 			<td colspan="7">
+ 				<!-- TMPL_LOOP NAME="subfields" -->
+ 					<p>	Tab:<!-- TMPL_VAR NAME="tab" --> | $<!-- TMPL_VAR NAME="tagsubfield" -->
+ 							<!-- TMPL_VAR NAME="liblibrarian" --> <!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!--/TMPL_IF --><!-- TMPL_IF NAME="repeatable" -->, repeatable<!-- /TMPL_IF --><!-- TMPL_IF NAME="mandatory" -->, Mandatory<!-- /TMPL_IF --><!-- TMPL_IF NAME="seealso" -->, See <!-- TMPL_VAR name="seealso" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authorised_value" -->, <!-- TMPL_VAR NAME="authorised_value" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authtypecode" -->, <!-- TMPL_VAR NAME="authtypecode" --><!--/TMPL_IF --><!-- TMPL_IF NAME="value_builder" -->, <!-- TMPL_VAR NAME="value_builder" --><!--/TMPL_IF -->
+ 					</p>
+ 				<!-- /TMPL_LOOP -->
+ 			</td>
+ 		</tr>
+ 		<!-- /TMPL_LOOP -->
+ 	<!-- TMPL_ELSE -->
  	<!-- TMPL_LOOP NAME="loop" -->
  	<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
***************
*** 155,161 ****
  	</tr>
  	<!-- /TMPL_LOOP -->
  	</table>
  <div id="pages">	<!-- TMPL_IF NAME="isprevpage" -->
! 			<a class="pages" href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">&lt;&lt; Previous</a>
  		<!-- /TMPL_IF --><form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<input type="hidden" name="op" value="add_form">
--- 185,192 ----
  	</tr>
  	<!-- /TMPL_LOOP -->
+ 	<!--/TMPL_IF -->
  	</table>
  <div id="pages">	<!-- TMPL_IF NAME="isprevpage" -->
! 			<a class="pages" href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">&lt;&lt; Previous</a>
  		<!-- /TMPL_IF --><form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<input type="hidden" name="op" value="add_form">
***************
*** 166,171 ****
  	</form>
  		<!-- TMPL_IF NAME="nextpage" -->
! 			<a class="pages" href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">Next &gt;&gt;</a>
  		<!-- /TMPL_IF --></div>
  </div>
  <!-- /TMPL_IF -->
--- 197,207 ----
  	</form>
  		<!-- TMPL_IF NAME="nextpage" -->
! 			<a class="pages" href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">Next &gt;&gt;</a>
  		<!-- /TMPL_IF --></div>
+ 		<script language="javascript" type="text/javascript">
+ 	function ChangeDisplay(checkbox) {
+ 		window.
+ 	}
+ </script>
  </div>
  <!-- /TMPL_IF -->




From hellen at users.sourceforge.net  Thu Jun  9 10:37:44 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 09 Jun 2005 01:37:44 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/acqui acqui-home.tmpl,1.3,1.4
Message-ID: <E1DgIXo-0002UP-D5@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	acqui-home.tmpl 
Log Message:
translated by hellen

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui/acqui-home.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** acqui-home.tmpl	5 Jun 2005 18:10:12 -0000	1.3
--- acqui-home.tmpl	9 Jun 2005 08:37:41 -0000	1.4
***************
*** 1,3 ****
--- 1,4 ----
  <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
+ <!-- version 1.14.2.1, Tue Jun 7 13:17:38 200, geaendert 080605 by hellen -->
  <div id="mainbloc">
  
***************
*** 5,8 ****
--- 6,12 ----
  <div id="bloc25">
  	<h2 class="acquisition">Beginnen, Eingangsbearbeitung, &auml;ndern von Bestellungen</h2>
+ 	<!-- TMPL_IF name="nobudget" -->
+   	                 <p class="problem">Sie m&uuml;ssen unter Parameter ein Budget definieren</p>
+   	         <!-- TMPL_ELSE -->
  		<form action="/cgi-bin/koha/acqui/order.pl" method="post">
  			Lieferantenname: <input type="text"  size="25"   name="supplier">
***************
*** 10,13 ****
--- 14,18 ----
  		</form>
  	<p>oder <a href="histsearch.pl" class="button acquisition"> Suche Bestellhistorie</a></p>
+ 	<!-- /TMPL_IF -->
  </div>
  
***************
*** 40,48 ****
  	<form action="/cgi-bin/koha/search.pl">
  		<h2 class="acquisition">Etats und Budgets</h2>
  		<table class="noborder">
  			<tr>
  				<th class="acquisition">Etats</th>
! 				<th class="acquisition">Total</th>
! 				<th class="acquisition">geschenkt</th>
  				<th class="acquisition">Verausgabt</th>
  				<th class="acquisition">Verf&uuml;gbar </th>
--- 45,56 ----
  	<form action="/cgi-bin/koha/search.pl">
  		<h2 class="acquisition">Etats und Budgets</h2>
+ 		<!-- TMPL_IF name="nobudget" -->
+   	                 <p class="problem">Sie m&uuml;sen unter Parameter ein Budget definieren</p>
+   	         <!-- TMPL_ELSE -->
  		<table class="noborder">
  			<tr>
  				<th class="acquisition">Etats</th>
! 				<th class="acquisition">Gesamt</th>
! 				<th class="acquisition">Geschenkt</th>
  				<th class="acquisition">Verausgabt</th>
  				<th class="acquisition">Verf&uuml;gbar </th>
***************
*** 66,72 ****
  		</table>
  		<p>
! Benutzen Sie den "neu laden"-Button des Browsers zur Anzeige der aktuellen Werte. Die angezeigten Werte sind nur ungef&auml;hre Werte, da bei Zahlung eines Betrags der dann aktuelle Wechselkurs berechnet wird.
  		</p>
! 	</form>
  </div>
  
--- 74,80 ----
  		</table>
  		<p>
! Benutzen Sie den "neu laden"-Button des Browsers zur Anzeige der aktuellen Betr&auml;ge. Die angezeigten Werte sind nur ungef&auml;hre Werte, da bei Zahlung eines Betrags der dann aktuelle Wechselkurs berechnet wird.
  		</p>
! 	<!-- /TMPL_IF -->
  </div>
  
***************
*** 74,81 ****
  	<h2 class="acquisition">HILFE Bestellungen</h2>
  	<ul>
! 		<p>Zu Beginn einer Bestellung, eines direkten Kaufs oder Eingabe eines Geschenks, suchen Sie zuerst nach einem Lieferanten. Falls n&ouml;tig, f&uuml;gen Sie einen neuen hinzu.</p>
  		<p>W&auml;hlen Sie dann einen Einkausfkorb aus bzw. legen Sie einen neuen Korb an. Beachten Sie bitte, dass der neue Korb dem angemeldeten Benutzer zugeordnet wird.</p>
  		<p>Sie m&uuml;ssen das zu bestellende Exemplar einem bestehenden Biblio zuordnen, oder erst einen neuen Biblio anlegen.</p>
! 		<p>Um einen Einkaufskorb zu schlie&szlig;en, klicken Sie auf "Einkaufkorb anzeigen", dann auf "Einkaufskorb best&auml;tigen".</p>
  	</ul>
  </div>
--- 82,89 ----
  	<h2 class="acquisition">HILFE Bestellungen</h2>
  	<ul>
! 		<p>Zu Beginn eines Erwerbungsvorgangs, gleichg&uuml;ltig, ob es eine Bestellung, ein direkter Kauf oder ein Geschenk ist, mu&szlig; zuerst ein Lieferant aufgerufen werden. Falls n&ouml;tig, f&uuml;gen Sie einen neuen hinzu.</p>
  		<p>W&auml;hlen Sie dann einen Einkausfkorb aus bzw. legen Sie einen neuen Korb an. Beachten Sie bitte, dass der neue Korb dem angemeldeten Benutzer zugeordnet wird.</p>
  		<p>Sie m&uuml;ssen das zu bestellende Exemplar einem bestehenden Biblio zuordnen, oder erst einen neuen Biblio anlegen.</p>
! 		<p>Um einen Einkaufskorb zu schlie&szlig;en, klicken Sie auf "Einkaufskorb anzeigen", dann auf "Einkaufskorb best&auml;tigen".</p>
  	</ul>
  </div>




From hellen at users.sourceforge.net  Thu Jun  9 10:37:44 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 09 Jun 2005 01:37:44 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/help/admin biblio_framework.tmpl,1.1,1.2
Message-ID: <E1DgIXo-0002Ua-I0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/help/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9482/koha-tmpl/intranet-tmpl/default/de/help/admin

Modified Files:
	biblio_framework.tmpl 
Log Message:
translated by hellen

Index: biblio_framework.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/help/admin/biblio_framework.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** biblio_framework.tmpl	12 May 2005 19:26:15 -0000	1.1
--- biblio_framework.tmpl	9 Jun 2005 08:37:42 -0000	1.2
***************
*** 1,6 ****
  <!-- TMPL_INCLUDE NAME="help-top.inc" -->
  	<h1>Biblio Framework</h1>
! 	<p>biblio frameworks are used to catalogue your biblios.</p>
! 	<p>Unlike Koha 2.0, in this version you can have more than 1 framework to catalogate differently various materials. You can, for example, define 1 framework for monographies, 1 framework for serials, 1 framework for URL...</p>
! 	<p>Once a framework type is created, you can clic on "MARC structure" to define the exact MARC structure. The first time, Koha will ask you to select an existing framework to copy into the new one. Thus, you don't have to define all the MARC structure</p>
! <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
--- 1,6 ----
  <!-- TMPL_INCLUDE NAME="help-top.inc" -->
  	<h1>Biblio Framework</h1>
! 	<p>Biblio Frameworks werden zur Katalogisierung ihrer Biblios ben&ouml;tigt.</p>
! 	<p>Im Gegensatz zu Koha 2.0 kann man mehr als ein Framework f&uuml;r die Katalogisierung unterschiedlicher Materialien definieren. Sie k&ouml;nnen z.B. 1 Framework f&uuml;r Monographien, 1 Framework f&uuml;r Serien, 1 Framework f&uuml;r URL's usw. einrichten.</p>
! 	<p>Ist ein Framework angelegt, klicken sie auf "MARC structure" zur Definition der speziellen MARC-Struktur. Zuerst fragt Koha sie, ob ein bereits existierendes in das neue Framework kopiert werden soll. Dies ist sinnvoll, damit nicht die komplette MARC-Struktur neu angelegt werden mu&szlig;.</p>
! <!-- TMPL_INCLUDE name="help-bottom.inc" -->




From hellen at users.sourceforge.net  Thu Jun  9 10:37:44 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 09 Jun 2005 01:37:44 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/z3950 searchresult.tmpl,1.1,1.2
Message-ID: <E1DgIXo-0002Uj-M1@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/z3950
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9482/koha-tmpl/intranet-tmpl/default/de/z3950

Modified Files:
	searchresult.tmpl 
Log Message:
translated by hellen

Index: searchresult.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/z3950/searchresult.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** searchresult.tmpl	12 May 2005 19:27:06 -0000	1.1
--- searchresult.tmpl	9 Jun 2005 08:37:42 -0000	1.2
***************
*** 47,51 ****
  				<p>Nichts gefunden</p>
  	<!-- /TMPL_IF -->
! 	<!-- TMPL_IF NAME="numberpending" --><h1 class="catalogue">Still <!-- TMPL_VAR NAME="numberpending" --> requests to go</h1><!-- /TMPL_IF -->
  	<script language="javascript" type="text/javascript">
  		function Import(GetThisOne) {
--- 47,51 ----
  				<p>Nichts gefunden</p>
  	<!-- /TMPL_IF -->
! 	<!-- TMPL_IF NAME="numberpending" --><h1 class="catalogue">Noch <!-- TMPL_VAR NAME="numberpending" --> Anfrage(n) zu erledigen</h1><!-- /TMPL_IF -->
  	<script language="javascript" type="text/javascript">
  		function Import(GetThisOne) {




From hellen at users.sourceforge.net  Thu Jun  9 10:37:44 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 09 Jun 2005 01:37:44 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/bookshelves addbookbybiblionumber.tmpl,1.2,1.3 shelves.tmpl,1.2,1.3
Message-ID: <E1DgIXo-0002UZ-H8@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/bookshelves
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9482/koha-tmpl/intranet-tmpl/default/de/bookshelves

Modified Files:
	addbookbybiblionumber.tmpl shelves.tmpl 
Log Message:
translated by hellen

Index: addbookbybiblionumber.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/bookshelves/addbookbybiblionumber.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** addbookbybiblionumber.tmpl	17 May 2005 13:21:35 -0000	1.2
--- addbookbybiblionumber.tmpl	9 Jun 2005 08:37:42 -0000	1.3
***************
*** 7,11 ****
  	<p><label>Verfasser</label><!-- TMPL_VAR NAME="author" --></p>
  	<p><label>Zum virtuellen Regal <!-- TMPL_VAR NAME="CGIbookshelves" --> hinzuf&uuml;gen</label></p>
! 	<p>oder zu einem neuen virtuellem Regal hinzuf&uuml;gen </p>
  	<p><input type="text" name="newbookshelf" maxlength=40 size=40>
  		<select name="category">
--- 7,11 ----
  	<p><label>Verfasser</label><!-- TMPL_VAR NAME="author" --></p>
  	<p><label>Zum virtuellen Regal <!-- TMPL_VAR NAME="CGIbookshelves" --> hinzuf&uuml;gen</label></p>
! 	<p>oder zu einem neuen virtuellen Regal hinzuf&uuml;gen </p>
  	<p><input type="text" name="newbookshelf" maxlength=40 size=40>
  		<select name="category">

Index: shelves.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/bookshelves/shelves.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** shelves.tmpl	17 May 2005 13:21:35 -0000	1.2
--- shelves.tmpl	9 Jun 2005 08:37:42 -0000	1.3
***************
*** 36,40 ****
  	<div id="bloc25">
  		<form>
! 		<h2 class="catalogue">Buch mittels Strichcode hinzuf&uuml;gen</h2>
  			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
  			<input type="hidden" name="modifyshelfcontents" value="1">
--- 36,40 ----
  	<div id="bloc25">
  		<form>
! 		<h2 class="catalogue">Buch mittels Barcode hinzuf&uuml;gen</h2>
  			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
  			<input type="hidden" name="modifyshelfcontents" value="1">
***************
*** 48,52 ****
  	<!-- /TMPL_IF -->
  	<div id="bloc25">
! 		<a href="shelves.pl" class="button catalogue">Shelf-Liste</a>
  	</div>
  <!-- TMPL_ELSE -->
--- 48,52 ----
  	<!-- /TMPL_IF -->
  	<div id="bloc25">
! 		<a href="shelves.pl" class="button catalogue">Regalliste</a>
  	</div>
  <!-- TMPL_ELSE -->
***************
*** 93,97 ****
  					</select>
  				</p>
! 				<p> <li>ein privates Regal wird durch Sie verwaltet und kann nur von Ihnen eingesehen werden</li>
  					<li> Ein &ouml;ffentliches Regal wird durch Sie verwaltet, kann aber von jedermann eingesehen werden.</li>
  					<li> Ein freies Regal kann von jedem Benutzer bearbeitet und betrachtet werden.</li>
--- 93,97 ----
  					</select>
  				</p>
! 				<p> <li>Ein privates Regal wird durch Sie verwaltet und kann nur von Ihnen eingesehen werden</li>
  					<li> Ein &ouml;ffentliches Regal wird durch Sie verwaltet, kann aber von jedermann eingesehen werden.</li>
  					<li> Ein freies Regal kann von jedem Benutzer bearbeitet und betrachtet werden.</li>
***************
*** 165,169 ****
  				</select>
  			</p>
! 				<p> <li>ein privates Regal wird durch Sie verwaltet und kann nur von Ihnen eingesehen werden</li>
  					<li> Ein &ouml;ffentliches Regal wird durch Sie verwaltet, kann aber von jedermann eingesehen werden.</li>
  					<li> Ein freies Regal kann von jedem Benutzer bearbeitet und betrachtet werden.</li>
--- 165,169 ----
  				</select>
  			</p>
! 				<p> <li>Ein privates Regal wird durch Sie verwaltet und kann nur von Ihnen eingesehen werden</li>
  					<li> Ein &ouml;ffentliches Regal wird durch Sie verwaltet, kann aber von jedermann eingesehen werden.</li>
  					<li> Ein freies Regal kann von jedem Benutzer bearbeitet und betrachtet werden.</li>




From hellen at users.sourceforge.net  Thu Jun  9 10:37:44 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 09 Jun 2005 01:37:44 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/help nohelp.tmpl,1.1,1.2
Message-ID: <E1DgIXo-0002Ue-KI@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/help
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9482/koha-tmpl/intranet-tmpl/default/de/help

Modified Files:
	nohelp.tmpl 
Log Message:
translated by hellen

Index: nohelp.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/help/nohelp.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** nohelp.tmpl	12 May 2005 19:26:15 -0000	1.1
--- nohelp.tmpl	9 Jun 2005 08:37:42 -0000	1.2
***************
*** 1,4 ****
  <!-- TMPL_INCLUDE NAME="help-top.inc" -->
  	<h1>Online Hilfe</h1>
! 	<p>Sorry, keine Hilfe f&uuml;r diesen Punkt</p>
! <!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
--- 1,4 ----
  <!-- TMPL_INCLUDE NAME="help-top.inc" -->
  	<h1>Online Hilfe</h1>
! 	<p>Sorry, keine Hilfe f&uuml;r diesen Punkt verf&uuml;gbar</p>
! <!-- TMPL_INCLUDE NAME="help-bottom.inc" -->




From oleonard at users.sourceforge.net  Thu Jun  9 18:19:21 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 09:19:21 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/search.marc dictionary.tmpl,NONE,1.1.2.1 search.tmpl,1.6.2.4,1.6.2.5
Message-ID: <E1DgPkX-0006i8-Ta@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	search.tmpl 
Added Files:
      Tag: rel_2_2
	dictionary.tmpl 
Log Message:
Adding authority search functionality to intranet advanced search page, to synch with default template

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Dictionary Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<div id="main-compact">
	<h1>Dictionary Search</h1>
	<div class="form"><form name="f" method="post" action="/cgi-bin/koha/search.marc/dictionary.pl">
	<input type="hidden" name="op" value="do_search" />
				<label for="keyword">Search for keyword(s): </label>
				<input type="hidden" name="marclist" value="<!-- TMPL_VAR Name="marclist" -->" />
				<input type="text" name="search" value="<!-- TMPL_VAR Name="search" -->" size="35" />
				<input type="submit" value="Start search" class="submit" />
				<input type="hidden" name="type" value="<!-- TMPL_VAR Name="type" -->" />
				<input type="hidden" name="index" value="<!-- TMPL_VAR Name="anindex" ESCAPE="URL" -->" /></form></div>

<!-- TMPL_IF Name=search -->
	<!-- TMPL_IF NAME="authresult" -->
		<div id="pages">
			<!-- TMPL_IF NAME="displayprev" --> 
					<a class="pages" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
				<!-- /TMPL_IF -->
				<!-- TMPL_LOOP NAME="numbers" -->
					<!-- TMPL_IF NAME="highlight" -->
						<span class="current"><!-- TMPL_VAR NAME="number" --></span>
					<!-- TMPL_ELSE --> 
						<a class="pages" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
					<!-- /TMPL_IF -->
				<!-- /TMPL_LOOP --> 
				<!-- TMPL_IF NAME="displaynext" -->
					<a class="pages" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">Next&gt;&gt;</a>
				<!-- /TMPL_IF -->
			</div>
			<div id="results">
			<!-- TMPL_IF NAME="nbresults" -->
					Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="nbresults" --> in Authorities<!-- TMPL_ELSE -->No results found.
			<!-- /TMPL_IF -->
			</div>
		
		<div id="resultlist">
			<table>
				<caption>Authority Results</caption>
				<tr>
					<th>Summary</th>
					<th>Used in</th>
					<th>Select</th>
				</tr>
				<!-- TMPL_LOOP NAME="authresult" -->
					<!-- TMPL_IF NAME="even" --><tr class="hilighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
					<td>
							<!-- TMPL_VAR NAME="summary" -->
						</td>
						<td>
							<!-- TMPL_VAR NAME="used" --> records(s)
						</td>
							<td>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)">Select</a> | 
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)">Sel. &amp; close</a>
						</td>
					</tr>
				<!-- /TMPL_LOOP -->
			</table>
		</div>
		<!-- TMPL_ELSE -->
			<h3>No results in Authorities</h3>
	<!-- /TMPL_IF -->
		
		
	<!-- TMPL_IF Name="catresult" -->
	<h2>Catalog Results</h2>
			<div id="results">
			<!-- TMPL_IF NAME="total" -->
					Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --> in the Catalog<!-- TMPL_ELSE -->No results found.
			<!-- /TMPL_IF -->
		</div>
			<table>
				<tr>
					<th>Summary</th>
					<th>Used in</th>
					<th>Select</th>
				</tr>
				<!-- TMPL_LOOP NAME="catresult" -->
				<!-- TMPL_IF NAME="even" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
				<td>
					<!-- TMPL_IF name="MARC_ON" -->
									<!-- TMPL_VAR NAME="value" -->
								<!-- TMPL_ELSE -->
									<!-- TMPL_VAR NAME="value" -->
								<!-- /TMPL_IF -->
					</td>
					<td>
						<!-- TMPL_VAR NAME="count" --> records(s)
					</td>
					<td>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)">Select</a> | 
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)">Sel. &amp; close</a>
					</td>
				</tr>
				<!-- /TMPL_LOOP -->
			</table>
		<div id="pages">
			<!-- TMPL_IF NAME="displayprev" --> 
					<a class="pages" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
				<!-- /TMPL_IF -->
				<!-- TMPL_LOOP NAME="numbers" -->
					<!-- TMPL_IF NAME="highlight" -->
						<span class="current"><!-- TMPL_VAR NAME="number" --></span>
					<!-- TMPL_ELSE --> 
						<a class="pages" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
					<!-- /TMPL_IF -->
				<!-- /TMPL_LOOP --> 
				<!-- TMPL_IF NAME="displaynext" -->
					<a class="pages" href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">Next&gt;&gt;</a>
				<!-- /TMPL_IF -->
</div>
			<div id="results">
			<!-- TMPL_IF NAME="total" -->
					Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --> in the Catalog<!-- TMPL_ELSE -->No results found.
			<!-- /TMPL_IF -->
			</div>
		
	<!-- /TMPL_IF -->
	<script language="JavaScript" type="text/javascript">
	function SelectEntry(myentry, myindex, wclose){
		if (opener.document.f.value[myindex].value!=""){ 
			opener.document.f.value[myindex].value=opener.document.f.value[myindex].value+" "+myentry
		} else {
			opener.document.f.value[myindex].value=myentry
		}
		if (wclose == 1) {
	// 	alert("closing")
			self.close();
		}
	}
	</script>
	</div>
<!-- /TMPL_IF -->
</div>
</body>
</html>
Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc/search.tmpl,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -C2 -r1.6.2.4 -r1.6.2.5
*** search.tmpl	19 Apr 2005 19:31:16 -0000	1.6.2.4
--- search.tmpl	9 Jun 2005 16:19:19 -0000	1.6.2.5
***************
*** 28,32 ****
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="title" name="value" onchange="sql_update()" size="35" accesskey="t" /></td>
  		</tr>
  		<tr>
--- 28,34 ----
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="title" name="value" onchange="sql_update()" size="35" accesskey="t" />			<a href="javascript:Dopop('dictionary.pl?marclist=biblio.title&amp;type=intranet&amp;index=1',1)" class="button catalogue">
! 				<strong>...</strong>
! 			</a></td>
  		</tr>
  		<tr>
***************
*** 36,40 ****
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="author" name="value" onchange="sql_update()" size="35" accesskey="a" /></td>
  		</tr>
  		<tr>
--- 38,44 ----
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="author" name="value" onchange="sql_update()" size="35" accesskey="a" />			<a href="javascript:Dopop('dictionary.pl?marclist=biblio.author&amp;type=intranet&amp;index=2',2)" class="button catalogue">
! 				<strong>...</strong>
! 			</a></td>
  		</tr>
  		<tr>
***************
*** 44,48 ****
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />  
! 			<input type="text" id="subject" name="value" onchange="sql_update()" size="35" accesskey="s" /></td>
  		</tr>
  <tr><th><label for="seriestitle">Series title</label></th><td>			
--- 48,54 ----
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />  
! 			<input type="text" id="subject" name="value" onchange="sql_update()" size="35" accesskey="s" />			<a href="javascript:Dopop('dictionary.pl?marclist=bibliosubject.subject&amp;type=intranet&amp;index=3',3)" class="button catalogue">
! 				<strong>...</strong>
! 			</a></td>
  		</tr>
  <tr><th><label for="seriestitle">Series title</label></th><td>			
***************
*** 189,192 ****
--- 195,203 ----
  }
  
+ function Dopop(link,i) {
+ 	var searchstring=document.forms[4].value[i].value;
+ 	newin=window.open(link+'&amp;search='+searchstring,"popup",'width=700,height=550,toolbar=false,scrollbars=yes');
+ }
+ 
  function PopupSuggestion() {
      var strQuery="";




From hellen at users.sourceforge.net  Thu Jun  9 19:54:33 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 09 Jun 2005 10:54:33 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple additem.tmpl,1.3,1.4
Message-ID: <E1DgREf-0003J8-Ty@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	additem.tmpl 
Log Message:
translated by hellen

Index: additem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/additem.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** additem.tmpl	5 Jun 2005 14:45:17 -0000	1.3
--- additem.tmpl	9 Jun 2005 17:54:31 -0000	1.4
***************
*** 6,10 ****
  	<div class="tabbed">
  		<h1 class="catalogue">Biblionummer: <!-- TMPL_VAR NAME="biblionumber" --></h1>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Bibliografische daten bearbeiten  </a>
  		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">  Duplizieren  </a>
  		<a href="../MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  MARC  </a>
--- 6,10 ----
  	<div class="tabbed">
  		<h1 class="catalogue">Biblionummer: <!-- TMPL_VAR NAME="biblionumber" --></h1>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Bibliografische Daten bearbeiten  </a>
  		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">  Duplizieren  </a>
  		<a href="../MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  MARC  </a>




From hellen at users.sourceforge.net  Thu Jun  9 19:54:34 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 09 Jun 2005 10:54:34 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/errors 404.tmpl,1.1,1.2
Message-ID: <E1DgREg-0003JJ-8e@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12634/koha-tmpl/intranet-tmpl/default/de/errors

Modified Files:
	404.tmpl 
Log Message:
translated by hellen

Index: 404.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/errors/404.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 404.tmpl	12 May 2005 19:26:14 -0000	1.1
--- 404.tmpl	9 Jun 2005 17:54:32 -0000	1.2
***************
*** 5,11 ****
  <h2>Fehler 404</h2>
  <ul>
! <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>
--- 5,11 ----
  <h2>Fehler 404</h2>
  <ul>
! <li>Dieser Fehler besagt, dass die aufgerufene Seite nicht existiert.</li>	
! <li>Um diesen Fehler zu melden, k&ouml;nnen Sie eine Mail <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">an den Koha Administrator schicken</a>.</li>
! <li>&Uuml;ber das Men&uuml; k&ouml;nnen Sie andere Bereiche von Koha ausw&auml;hlen.</li>
  </ul>
  </div>




From hellen at users.sourceforge.net  Thu Jun  9 19:54:34 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 09 Jun 2005 10:54:34 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/parameters categorie.tmpl,1.1,1.2 issuingrules.tmpl,1.1,1.2
Message-ID: <E1DgREg-0003JY-T6@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12634/koha-tmpl/intranet-tmpl/default/de/parameters

Modified Files:
	categorie.tmpl issuingrules.tmpl 
Log Message:
translated by hellen

Index: categorie.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/categorie.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** categorie.tmpl	12 May 2005 19:26:35 -0000	1.1
--- categorie.tmpl	9 Jun 2005 17:54:32 -0000	1.2
***************
*** 97,101 ****
  			</tr>
  			<tr>
! 				<td>G&uuml;ltigkeitsdauer</td>
  				<td>
  					<input type="text" name="enrolmentperiod" size="3" maxlength="2" value="<!-- TMPL_VAR NAME="enrolmentperiod" -->"> Jahr(e)
--- 97,101 ----
  			</tr>
  			<tr>
! 				<td>G&uuml;ltigkeit</td>
  				<td>
  					<input type="text" name="enrolmentperiod" size="3" maxlength="2" value="<!-- TMPL_VAR NAME="enrolmentperiod" -->"> Jahr(e)
***************
*** 173,178 ****
  			</tr>
  			<tr>
! 				<td>G&uuml;ltigkeitsdauer</td>
! 				<td><!-- TMPL_VAR NAME="enrolmentperiod" --> Jashr(e)</td>
  			</tr>
  			<tr>
--- 173,178 ----
  			</tr>
  			<tr>
! 				<td>G&uuml;ltigkeit</td>
! 				<td><!-- TMPL_VAR NAME="enrolmentperiod" --> Jahr(e)</td>
  			</tr>
  			<tr>
***************
*** 182,186 ****
  			<tr>
  				<td>Mindestalter</td>
! 				<td><!-- TMPL_VAR NAME="dateofbirthrequired" --> Jashr(e)</td>
  			</tr>
  			<tr>
--- 182,186 ----
  			<tr>
  				<td>Mindestalter</td>
! 				<td><!-- TMPL_VAR NAME="dateofbirthrequired" --> Jahr(e)</td>
  			</tr>
  			<tr>
***************
*** 251,258 ****
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Kategorie</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Beschreibung</b></td>
! 				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>G&uuml;ltigkeitsdauer</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Geb&uuml;hr</b></td>
! 				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Obere Altersgrenze</b></td>
! 				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Mindestalter</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>&Uuml;berf&auml;llig</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Vormerkung</b></td>
--- 251,258 ----
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Kategorie</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Beschreibung</b></td>
! 				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>G&uuml;ltigkeit</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Geb&uuml;hr</b></td>
! 				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Max. Alter</b></td>
! 				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Min. Alter</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>&Uuml;berf&auml;llig</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Vormerkung</b></td>

Index: issuingrules.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/issuingrules.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** issuingrules.tmpl	12 May 2005 19:26:35 -0000	1.1
--- issuingrules.tmpl	9 Jun 2005 17:54:32 -0000	1.2
***************
*** 1,8 ****
  <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="parameters">Definition der Ausleihkonditionen f&uuml;r <!-- TMPL_VAR NAME="branch" --></h1>
  	<div id="bloc25">
  		<h2 class="parameters">TIPP f&uuml;r Ausleihen</h2>
! 		<p>Each box needs to be filled with issuelength, maxissues</p>
  		<p> - z.B.: 21,5 = 21 Tage Leihfrist und max. 5 Ausleihen</p>
  		<h2 class="parameters">TIPP f&uuml;r Mahngeb&uuml;hren</h2>
--- 1,8 ----
  <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="parameters">Definition der Ausleihkonditionen <!-- TMPL_VAR NAME="branch" --></h1>
  	<div id="bloc25">
  		<h2 class="parameters">TIPP f&uuml;r Ausleihen</h2>
! 		<p>Jedes Feld mu&szlig; mit Leihfrist und Anzahl der Ausleihen gef&uuml;llt werden</p>
  		<p> - z.B.: 21,5 = 21 Tage Leihfrist und max. 5 Ausleihen</p>
  		<h2 class="parameters">TIPP f&uuml;r Mahngeb&uuml;hren</h2>
***************
*** 17,21 ****
  		<ul>
  			<li>selbe Zweigstelle und selbe Benutzerkategorie, Medientyp *</li>
! 			<li> selbe Zweigstelle und selber Medientyp, Benutzerkategorie *</li>
  			<li>selber Medientyp und Benutzerkategorie, Zweigstelle *</li>
  			<li>&uuml;berall</li>
--- 17,21 ----
  		<ul>
  			<li>selbe Zweigstelle und selbe Benutzerkategorie, Medientyp *</li>
! 			<li>selbe Zweigstelle und selber Medientyp, Benutzerkategorie *</li>
  			<li>selber Medientyp und Benutzerkategorie, Zweigstelle *</li>
  			<li>&uuml;berall</li>




From hellen at users.sourceforge.net  Thu Jun  9 19:54:34 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 09 Jun 2005 10:54:34 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/catalogue MARCdetail.tmpl,1.3,1.4
Message-ID: <E1DgREg-0003JD-4b@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	MARCdetail.tmpl 
Log Message:
translated by hellen

Index: MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/catalogue/MARCdetail.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** MARCdetail.tmpl	8 Jun 2005 11:28:08 -0000	1.3
--- MARCdetail.tmpl	9 Jun 2005 17:54:31 -0000	1.4
***************
*** 363,367 ****
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Are you sure you want to delete this biblio?');
  	if (is_confirmed) {
  		window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";
--- 363,367 ----
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Wollen Sie diesen Biblio wirklich l&ouml;schen?');
  	if (is_confirmed) {
  		window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";




From oleonard at users.sourceforge.net  Thu Jun  9 20:21:42 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 11:21:42 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-dictionary.tmpl,NONE,1.1.2.1 opac-search.tmpl,1.1.2.6,1.1.2.7
Message-ID: <E1DgRew-00073F-9h@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-search.tmpl 
Added Files:
      Tag: rel_2_2
	opac-dictionary.tmpl 
Log Message:
Adding authority search functionality to OPAC advanced search page, to synch with default template

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Dictionary Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

<div id="window">
	<h1>Dictionary Search</h1>
	
	<div class="content-block"><form name="f" method="post" action="opac-dictionary.pl">
				<input type="hidden" name="op" value="do_search" />
				<label for="keyword">Keyword(s): </label>
				<input type="hidden" name="marclist" value="<!-- TMPL_VAR Name="marclist" -->" />
				<input type="text" name="search" value="<!-- TMPL_VAR Name="search" -->" size="20" />
				<input type="submit" value="Start search" class="submit" />
				<input type="hidden" name="type" value="<!-- TMPL_VAR Name="type" -->" />
				<input type="hidden" name="index" value="<!-- TMPL_VAR Name="anindex" ESCAPE="URL" -->" />
	</form></div>

<!-- TMPL_IF Name=search -->
	<!-- TMPL_IF NAME="authresult" -->
		<div class="pages">
			<!-- TMPL_IF NAME="displayprev" --> 
					<a class="nav" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
				<!-- /TMPL_IF -->
				<!-- TMPL_LOOP NAME="numbers" -->
					<!-- TMPL_IF NAME="highlight" -->
						<span class="current"><!-- TMPL_VAR NAME="number" --></span>
					<!-- TMPL_ELSE --> 
						<a class="nav" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
					<!-- /TMPL_IF -->
				<!-- /TMPL_LOOP --> 
				<!-- TMPL_IF NAME="displaynext" -->
					<a class="nav" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">Next&gt;&gt;</a>
				<!-- /TMPL_IF -->
</div>
			<div id="results">
			<!-- TMPL_IF NAME="nbresults" -->
					Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="nbresults" --> in Authorities.<!-- TMPL_ELSE -->No results found in Authorities.
			<!-- /TMPL_IF -->
		</div>

			<table>
				<tr>
					<th colspan="3">Authorities</th>
				</tr>
				<tr>
					<th>Summary</th>
					<th>Used in</th>
					<th>Select</th>
				</tr>
				<!-- TMPL_LOOP NAME="authresult" -->
					<!-- TMPL_IF NAME="even" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
							<td>
							<!-- TMPL_VAR NAME="summary" -->
						</td>
						<td>
							<!-- TMPL_VAR NAME="used" --> record(s)
						</td>
							<td>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)" class="button catalogue">Select</a> | 
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)" class="button catalogue">Sel &amp; close</a>
						</td>
					</tr>
				<!-- /TMPL_LOOP -->
			</table>
		<!-- TMPL_ELSE -->
			<h4>No results in Authorities</h4>
	<!-- /TMPL_IF -->
		
		
	<!-- TMPL_IF Name=catresult -->	
	<h3>Catalog Search Results</h3>
		<div id="results">
			<!-- TMPL_IF NAME="total" -->
					Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --> in the catalog<!-- TMPL_ELSE -->No results found in the catalog.
			<!-- /TMPL_IF -->
		</div>

			<table>
				<tr>
					<th>Summary</th>
					<th>Used in</th>
					<th>Select</th>
				</tr>
				<!-- TMPL_LOOP NAME="catresult" -->
				<!-- TMPL_IF NAME="even" --><tr class="highlight"><!-- TMPL_ELSE --><!-- /TMPL_IF -->
				<td>
							<!-- TMPL_IF name="MARC_ON" -->
									<!-- TMPL_VAR NAME="value" -->
								<!-- TMPL_ELSE -->
									<!-- TMPL_VAR NAME="value" -->
								<!-- /TMPL_IF -->
					</td>
					<td>
						<!-- TMPL_VAR NAME="count" --> record(s)
					</td>
					<td>
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)" class="button catalogue">Select</a> | 
							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)" class="button catalogue">Sel &amp; close</a>
					</td>
				</tr>
				<!-- /TMPL_LOOP -->
			</table>

		<div class="pages">
			<!-- TMPL_IF NAME="displayprev" --> 
					<a class="nav" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
				<!-- /TMPL_IF -->
				<!-- TMPL_LOOP NAME="numbers" -->
					<!-- TMPL_IF NAME="highlight" -->
						<span class="current"><!-- TMPL_VAR NAME="number" --></span>
					<!-- TMPL_ELSE --> 
						<a class="nav" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
					<!-- /TMPL_IF -->
				<!-- /TMPL_LOOP --> 
				<!-- TMPL_IF NAME="displaynext" -->
					<a class="nav" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">Next&gt;&gt;</a>
				<!-- /TMPL_IF -->

			<div id="results">
			<!-- TMPL_IF NAME="total" -->
					Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --> in the catalog.<!-- TMPL_ELSE -->No results found in the catalog.
			<!-- /TMPL_IF -->
		</div>
		
	<!-- /TMPL_IF -->
	<script language="JavaScript" type="text/javascript">
	function SelectEntry(myentry, myindex, wclose){
		if (opener.document.f.value[myindex].value!=""){ 
			opener.document.f.value[myindex].value=opener.document.f.value[myindex].value+" "+myentry
		} else {
			opener.document.f.value[myindex].value=myentry
		}
		if (wclose == 1) {
	// 	alert("closing")
			self.close();
		}
	}
	</script>
<!-- /TMPL_IF -->

</div>

</body>
</html>
Index: opac-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-search.tmpl,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -r1.1.2.6 -r1.1.2.7
*** opac-search.tmpl	21 Apr 2005 20:06:55 -0000	1.1.2.6
--- opac-search.tmpl	9 Jun 2005 18:21:40 -0000	1.1.2.7
***************
*** 51,60 ****
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="title" name="value" /></td></tr>
  <tr><th><label for="author">Author</label></th><td><input type="hidden" name="marclist" value="biblio.author" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="author" name="value" /></td></tr>
  <tr><th><label for="subject">Subject</label></th><td>			
  			<input type="hidden" name="marclist" value="bibliosubject.subject" />
--- 51,60 ----
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="title" name="value" /><a href="javascript:Dopop('opac-dictionary.pl?marclist=biblio.title&amp;type=intranet&amp;index=1',1)"><strong>...</strong></a></td></tr>
  <tr><th><label for="author">Author</label></th><td><input type="hidden" name="marclist" value="biblio.author" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="author" name="value" /><a href="javascript:Dopop('opac-dictionary.pl?marclist=biblio.author&amp;type=intranet&amp;index=2',2)"><strong>...</strong></a></td></tr>
  <tr><th><label for="subject">Subject</label></th><td>			
  			<input type="hidden" name="marclist" value="bibliosubject.subject" />
***************
*** 62,66 ****
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />  
! 			<input type="text" id="subject" name="value" size="35" /></td></tr>
  <tr><th><label for="seriestitle">Series title</label></th><td>			
  			<input type="hidden" name="marclist" value="biblio.seriestitle" />
--- 62,66 ----
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />  
! 			<input type="text" id="subject" name="value" size="35" /><a href="javascript:Dopop('opac-dictionary.pl?marclist=bibliosubject.subject&amp;type=intranet&amp;index=3',3)"><strong>...</strong></a></td></tr>
  <tr><th><label for="seriestitle">Series title</label></th><td>			
  			<input type="hidden" name="marclist" value="biblio.seriestitle" />




From oleonard at users.sourceforge.net  Thu Jun  9 21:21:13 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 12:21:13 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-detail.tmpl,1.1.2.3,1.1.2.4
Message-ID: <E1DgSaX-00072T-7t@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-detail.tmpl 
Log Message:
Bugfix for display problem

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** opac-detail.tmpl	17 Mar 2005 22:19:54 -0000	1.1.2.3
--- opac-detail.tmpl	9 Jun 2005 19:21:10 -0000	1.1.2.4
***************
*** 7,17 ****
  <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
  <div class="details">
! <!-- Display for NPL // <div class="detail-sidebar">
! <!-- TMPL_IF NAME="isbn" --><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn" -->.01.MZZZZZZZ.jpg" alt="Book Cover Image" /><!-- /TMPL_IF -->  //Display for NPL -->
  <div class="operations">
  <ul>
  <!-- TMPL_UNLESS NAME="norequests" --><li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Place Reserve</a></li><!-- /TMPL_UNLESS -->
  <li><a class="detail" href="/cgi-bin/koha/opac-MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">MARC View</a></li>
! <!-- Hide from NPL // <li><a class="isbd" href="/cgi-bin/koha/opac-ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD</a></li> //Hide from NPL -->
  <li><a class="print" href="/cgi-bin/koha/opac-detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Print</a></li>
  <!-- TMPL_IF name="virtualshelves" --><li><a class="shelf" href="/cgi-bin/koha/opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Add to My Book List</a></li><!-- /TMPL_IF -->
--- 7,17 ----
  <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
  <div class="details">
! <div class="detail-sidebar">
! <!-- Display for NPL // <!-- TMPL_IF NAME="isbn" --><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn" -->.01.MZZZZZZZ.jpg" alt="Book Cover Image" /><!-- /TMPL_IF -->  //Display for NPL -->
  <div class="operations">
  <ul>
  <!-- TMPL_UNLESS NAME="norequests" --><li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Place Reserve</a></li><!-- /TMPL_UNLESS -->
  <li><a class="detail" href="/cgi-bin/koha/opac-MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">MARC View</a></li>
! <!-- Hide from NPL --> <li><a class="isbd" href="/cgi-bin/koha/opac-ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD</a></li> <!-- Hide from NPL -->
  <li><a class="print" href="/cgi-bin/koha/opac-detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Print</a></li>
  <!-- TMPL_IF name="virtualshelves" --><li><a class="shelf" href="/cgi-bin/koha/opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Add to My Book List</a></li><!-- /TMPL_IF -->




From oleonard at users.sourceforge.net  Thu Jun  9 21:21:19 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 12:21:19 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-detail.tmpl,1.3,1.4
Message-ID: <E1DgSad-00073Q-Ur@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac-detail.tmpl 
Log Message:
Bugfix for display problem, enabling Amazon cover images

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-detail.tmpl	25 Jan 2005 22:47:21 -0000	1.3
--- opac-detail.tmpl	9 Jun 2005 19:21:17 -0000	1.4
***************
*** 7,22 ****
  <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
  <div class="details">
! <!-- Display for NPL 			<div style="float: right; padding: 5px;">
! <img src="/cgi-bin/koha/imgcheck.pl?image_location=/usr/local/images2/<!-- TMPL_VAR NAME="isbn" -->.jpg" alt="Book Cover Image" />
  </div>
!  /Display for NPL --><h2><!-- TMPL_VAR NAME="title" --></h2>
! <!-- TMPL_IF NAME="author" --><h3 class="author">By <!-- TMPL_VAR NAME="author" --></h3><!-- /TMPL_IF --> 
  
  <table>
! <!-- TMPL_IF NAME="subtitle" --><tr><th>Subtitle: </th><td><!-- TMPL_VAR NAME="subtitle" --></td></tr><!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="abstract" --><tr><th>Format:</th><td><!-- TMPL_VAR NAME="abstract" --></td></tr><!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="copyrightdate" -->
      <tr><th>Copyright:</th><td><!-- TMPL_VAR NAME="copyrightdate" --></td></tr>
  <!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="isbn" -->
  	    <tr><th>ISBN:</th><td><!-- TMPL_VAR NAME="isbn" --></td></tr>
--- 7,38 ----
  <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
  <div class="details">
! <div class="detail-sidebar">
! <!-- Display for NPL // <!-- TMPL_IF NAME="isbn" --><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn" -->.01.MZZZZZZZ.jpg" alt="Book Cover Image" /><!-- /TMPL_IF -->  //Display for NPL -->
! <div class="operations">
! <ul>
! <!-- TMPL_UNLESS NAME="norequests" --><li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Place Reserve</a></li><!-- /TMPL_UNLESS -->
! <li><a class="detail" href="/cgi-bin/koha/opac-MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">MARC View</a></li>
! <!-- Hide from NPL --> <li><a class="isbd" href="/cgi-bin/koha/opac-ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD</a></li> <!-- Hide from NPL -->
! <li><a class="print" href="/cgi-bin/koha/opac-detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Print</a></li>
! <!-- TMPL_IF name="virtualshelves" --><li><a class="shelf" href="/cgi-bin/koha/opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Add to My Book List</a></li><!-- /TMPL_IF -->
! <li><a class="cart" href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Add to My Book Bag</a></li>
! </ul>
  </div>
! <div class="further">
! <h4>Search for this title in:</h4>
! <ul><!-- Display for NPL // <li><a href="http://search3.webfeat.org/cgi-bin/webfeat.dll?Command=Search&BypassSessData=yes&noserial=1&Databases=wf_sirsdiscover,wf_elibrary2_e,wf_ebonline,wf_healthsourceconsumer,wf_masterfileprem,wf_newspapersource&wf_cat=0&Client_ID=oplin&wf_all_years=yes&wf_field1=wf_keyword&wf_term1=<!-- TMPL_VAR NAME="title" -->&rurl=http%3A//www.oplin.org/&wut_code=OH0156">Local Databases (OPLIN)</a></li> //Display for NPL -->
! <li><a href="http://www.google.com/search?q=<!-- TMPL_VAR NAME="title" -->%20england+site:worldcatlibraries.org">Other Libraries(WorldCat)</a></li>
! <li><a href="http://www.scholar.google.com/scholar?q=<!-- TMPL_VAR NAME="title" -->">Other Databases (Google Scholar)</a></li></ul></div>
! </div>
! <h2><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="subtitle" --> <span class="subtitle"><!-- TMPL_VAR NAME="subtitle" --></span><!-- /TMPL_IF --></h2>
! <!-- TMPL_IF NAME="author" --><h3 class="author">By <a href="/cgi-bin/koha/opac-search.pl?marclist=biblio.author&and_or=and&excluding=&operator=contains&value=<!-- TMPL_VAR NAME="author" -->.&resultsperpage=20&orderby=biblio.title&op=do_search"><!-- TMPL_VAR NAME="author" --></a></h3><!-- /TMPL_IF --> 
  
  <table>
! 
  <!-- TMPL_IF NAME="abstract" --><tr><th>Format:</th><td><!-- TMPL_VAR NAME="abstract" --></td></tr><!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="copyrightdate" -->
      <tr><th>Copyright:</th><td><!-- TMPL_VAR NAME="copyrightdate" --></td></tr>
  <!-- /TMPL_IF -->
+ 			<!-- TMPL_IF NAME="seriestitle" --><tr><th>Series Title:</th><td><a href="/cgi-bin/koha/opac-search.pl?marclist=biblio.seriestitle&and_or=and&excluding=&operator=contains&value=<!-- TMPL_VAR NAME="seriestitle" ESCAPE=URL -->.&resultsperpage=20&orderby=biblio.title&op=do_search"><!-- TMPL_VAR NAME="seriestitle" --></a><!-- TMPL_IF NAME="volume" --><!-- TMPL_VAR NAME="volume" --><!-- /TMPL_IF --></td></tr><!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="isbn" -->
  	    <tr><th>ISBN:</th><td><!-- TMPL_VAR NAME="isbn" --></td></tr>
***************
*** 31,38 ****
  	<tr><th>Physical Details: </th><td><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></td></tr>
  <!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="notes" -->
! <tr><th>Notes:</th><td><div class="notes"><!-- TMPL_VAR NAME="notes" --></div></td></tr>
! 	<!-- /TMPL_IF -->
! 	<!-- /TMPL_LOOP -->
  	
  <!-- TMPL_UNLESS NAME="MARCSUBJCTS" -->
--- 47,58 ----
  	<tr><th>Physical Details: </th><td><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></td></tr>
  <!-- /TMPL_IF -->
+ <!-- /TMPL_LOOP -->
+ 
+ <!-- TMPL_UNLESS NAME="MARCNOTES" -->
+ <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
  <!-- TMPL_IF NAME="notes" -->
! <tr><th>Notes:</th><td><div class="notes"><!-- TMPL_VAR NAME="notes" --></div></td></tr><!-- /TMPL_IF -->
! <!-- /TMPL_LOOP -->
! <!-- /TMPL_UNLESS -->
  	
  <!-- TMPL_UNLESS NAME="MARCSUBJCTS" -->
***************
*** 42,47 ****
  <!-- /TMPL_UNLESS -->
  
! <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
!  <tr><th>Record No.:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr> <!-- /TMPL_LOOP -->
  
  <!-- TMPL_IF NAME="MARCNOTES" -->
--- 62,67 ----
  <!-- /TMPL_UNLESS -->
  
! <!-- Hide from NPL --> <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
!  <tr><th>Record No.:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr> <!-- /TMPL_LOOP --> <!-- Hide from NPL -->
  
  <!-- TMPL_IF NAME="MARCNOTES" -->
***************
*** 56,76 ****
  	<!-- /TMPL_IF -->
  </table>
! 
! <!-- TMPL_UNLESS NAME="norequests" -->
!     <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
!     <input type="submit" name="submit"  value="Place Reserve" class="icon reserve" />
!     <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
!     </form>
! <!-- /TMPL_UNLESS -->
! 
! <form class="inline" action="opac-MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon detail" value="MARC View" /></form>
! 
! <form class="inline" action="opac-ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon isbd" value="ISBD" /></form>
! 
! <form class="inline" action="opac-detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon print" value="Print" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form>
! 
! <form class="inline" action="opac-addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="icon shelf" value="Add to Shelf" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form>
! 
! <form class="inline"><input type="submit" class="icon cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
  </div>
  
--- 76,80 ----
  	<!-- /TMPL_IF -->
  </table>
! <br clear="right" />
  </div>
  




From oleonard at users.sourceforge.net  Thu Jun  9 21:41:02 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 12:41:02 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull subscription-renew.tmpl,1.1,1.1.2.1
Message-ID: <E1DgSti-0001T0-OE@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5611/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
      Tag: rel_2_2
	subscription-renew.tmpl 
Log Message:
Fixing to conform with NPL template design

Index: subscription-renew.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-renew.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** subscription-renew.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- subscription-renew.tmpl	9 Jun 2005 19:41:00 -0000	1.1.2.1
***************
*** 1,20 ****
! <!-- TMPL_INCLUDE NAME="main-top-blank.inc" -->
! <div>
  
! <h1>subscription renewal for <!-- TMPL_VAR name="bibliotitle" --></h1>
  
! <form name="f" method="post">
! 	<div>
! 		<input type="hidden" name="op" value="renew">
! 		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
! 		<p><label>start date</label><input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->"></p>
! 		<p>Subscription length :</p>
! 		<p><label>Number of num</label><input type="text" name="numberlength" value="<!-- TMPL_VAR name="numberlength" -->"></p>
! 		<p><label>Number of weeks</label><input type="text" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></p>
! 		<p><label>Number of months</label><input type="text" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></p>
! 		<p>Note for the librarian that will manage your renewal request</p>
! 		<ul><textarea name="note" rows="10" cols="60"></textarea></ul>
! 		<input type="submit" value="Request a renewal" class="submit">
! 	</div>
  </form>
  </div>
--- 1,19 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Subscription Renewal for <!-- TMPL_VAR name="bibliotitle" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <div id="main-compact">
  
! <h1>Subscription Renewal for <!-- TMPL_VAR name="bibliotitle" --></h1>
  
! <form name="f" method="post" action="subscription-renew.pl">
! 	<div class="data">
! 		<table><tr><th><label>Start Date: </label></th><td><input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" /><input type="hidden" name="op" value="renew" /><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /></td></tr></table>	
! 		
! 	<table><caption>Subscription Length:</caption>
! 	<tr><th><label for="numberlength">Number of Issues: </label></th><td><input type="text" name="numberlength" id="numberlength" value="<!-- TMPL_VAR name="numberlength" -->"></td></tr>
! 	<tr><th><label for="weeklength">Number of Weeks: </label></th><td><input type="text" name="weeklength" id="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></td></tr>
! 	<tr><th><label for="monthlength">Number of Months: </label></th><td><input type="text" name="monthlength" id="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></td></tr>
! 	<tr><th><label for="note">Comments for the librarian that will manage your renewal request:</label></th><td><textarea name="note" id="note" rows="3" cols="30"></textarea></td></tr>
! 	</table>
! 	<p><input type="submit" value="Request a renewal" class="submit" /></p>
! </div>
  </form>
  </div>




From oleonard at users.sourceforge.net  Thu Jun  9 21:41:46 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 12:41:46 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull subscription-renew.tmpl,1.1,1.2
Message-ID: <E1DgSuQ-0001aM-Jo@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6075/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
	subscription-renew.tmpl 
Log Message:
Fixing to conform with NPL template design

Index: subscription-renew.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-renew.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** subscription-renew.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- subscription-renew.tmpl	9 Jun 2005 19:41:44 -0000	1.2
***************
*** 1,20 ****
! <!-- TMPL_INCLUDE NAME="main-top-blank.inc" -->
! <div>
  
! <h1>subscription renewal for <!-- TMPL_VAR name="bibliotitle" --></h1>
  
! <form name="f" method="post">
! 	<div>
! 		<input type="hidden" name="op" value="renew">
! 		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
! 		<p><label>start date</label><input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->"></p>
! 		<p>Subscription length :</p>
! 		<p><label>Number of num</label><input type="text" name="numberlength" value="<!-- TMPL_VAR name="numberlength" -->"></p>
! 		<p><label>Number of weeks</label><input type="text" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></p>
! 		<p><label>Number of months</label><input type="text" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></p>
! 		<p>Note for the librarian that will manage your renewal request</p>
! 		<ul><textarea name="note" rows="10" cols="60"></textarea></ul>
! 		<input type="submit" value="Request a renewal" class="submit">
! 	</div>
  </form>
  </div>
--- 1,19 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Subscription Renewal for <!-- TMPL_VAR name="bibliotitle" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <div id="main-compact">
  
! <h1>Subscription Renewal for <!-- TMPL_VAR name="bibliotitle" --></h1>
  
! <form name="f" method="post" action="subscription-renew.pl">
! 	<div class="data">
! 		<table><tr><th><label>Start Date: </label></th><td><input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" /><input type="hidden" name="op" value="renew" /><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /></td></tr></table>	
! 		
! 	<table><caption>Subscription Length:</caption>
! 	<tr><th><label for="numberlength">Number of Issues: </label></th><td><input type="text" name="numberlength" id="numberlength" value="<!-- TMPL_VAR name="numberlength" -->"></td></tr>
! 	<tr><th><label for="weeklength">Number of Weeks: </label></th><td><input type="text" name="weeklength" id="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></td></tr>
! 	<tr><th><label for="monthlength">Number of Months: </label></th><td><input type="text" name="monthlength" id="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></td></tr>
! 	<tr><th><label for="note">Comments for the librarian that will manage your renewal request:</label></th><td><textarea name="note" id="note" rows="3" cols="30"></textarea></td></tr>
! 	</table>
! 	<p><input type="submit" value="Request a renewal" class="submit" /></p>
! </div>
  </form>
  </div>




From oleonard at users.sourceforge.net  Thu Jun  9 23:16:22 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 14:16:22 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-full-serial-issues.tmpl,NONE,1.1.2.1
Message-ID: <E1DgUNy-0007DL-Q2@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
      Tag: rel_2_2
	opac-full-serial-issues.tmpl 
Log Message:
Full view for opac-serials.  Includes tabbed view ported from addbiblio in the intranet, but still haven't figured out how to get the container div to extend to the bottom of the content

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Serials
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!--TMPL_INCLUDE NAME="masthead_adv.inc" -->
<!--TMPL_INCLUDE NAME="navigation.inc" -->



<!-- TMPL_UNLESS name="popup" -->
<div id="main">
	<h2>Subscription information for <em><!-- TMPL_VAR name="bibliotitle" --></em></h2>
	<form action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon brief" value="Normal View" /></form>
<!-- /TMPL_UNLESS -->

	<div class="tabs">
	<!-- TMPL_LOOP NAME="years" -->
		<!-- TMPL_IF NAME="year" -->
			<a href="#" onclick="active(<!-- TMPL_VAR NAME="year" -->); return false;" id="link<!-- TMPL_VAR NAME="year" -->"><!-- TMPL_VAR NAME="year" --></a>
		<!-- /TMPL_IF -->
	<!-- /TMPL_LOOP -->
	</div>

	<!-- TMPL_LOOP NAME="years" -->
	<div name="<!-- TMPL_VAR NAME="year" -->" id="<!-- TMPL_VAR NAME="year" -->" class="tab" <!--TMPL_IF Name="first" -->style="visibility:visible"<!--/TMPL_IF -->>
		<table>
			<caption><!-- TMPL_VAR NAME="year" --> Issues</caption>
			<tr>
				<th> Date
				</th>
				<th> Number
				</th>
				<th> Status
				</th>
			</tr>
			<!-- TMPL_LOOP Name="serials" -->
			<tr>
				<td>
					<!-- TMPL_VAR Name="planneddate" -->
				</td>
				<td>
					<!-- TMPL_VAR Name="serialseq" -->
				</td>
				<td>
					<!-- TMPL_IF Name="status1" -->Arrived<!-- /TMPL_IF -->
					<!-- TMPL_IF Name="status2" -->Waited<!-- /TMPL_IF -->
					<!-- TMPL_IF Name="status3" -->Late<!-- /TMPL_IF -->
					<!-- TMPL_IF Name="status4" -->Missing<!-- /TMPL_IF -->
				</td>
			</tr>
			<!-- /TMPL_LOOP -->
		</table>
	</div>
	<!--/TMPL_LOOP -->
</div>
<script language="JavaScript" type="text/javascript">
function active(numlayer)
{
	for (i=<!--TMPL_VAR Name="yearmin"-->; i<=<!--TMPL_VAR Name="yearmax"-->; i++ ) {
		ong = i;
		link = "link"+i;
		if (numlayer==i) {
			document.getElementById(ong).style.visibility="visible";
			document.getElementById(link).style.color="#000066";
			document.getElementById(link).style.backgroundColor="#FFFFCC";
		} else {
			document.getElementById(ong).style.visibility="hidden";
			if (document.getElementById(link)) {
			document.getElementById(link).style.color="#669999";
			document.getElementById(link).style.backgroundColor="#D8DEB8";
			}
		}
	}
}
<!-- TMPL_LOOP name="years" -->
<!-- TMPL_IF NAME="first" -->
	active(<!-- TMPL_VAR NAME="year" -->);
<!-- /TMPL_IF -->
	<!--/TMPL_LOOP -->
</script>
</body>
</html>




From oleonard at users.sourceforge.net  Thu Jun  9 23:16:56 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 14:16:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-full-serial-issues.tmpl,1.1,1.2
Message-ID: <E1DgUOW-0007Gj-0u@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	opac-full-serial-issues.tmpl 
Log Message:
Full view for opac-serials.  Includes tabbed view ported from addbiblio in the intranet, but still haven't figured out how to get the container div to extend to the bottom of the content





From oleonard at users.sourceforge.net  Thu Jun  9 23:17:34 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 14:17:34 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes marc-editor.css,1.1,1.1.2.1
Message-ID: <E1DgUP8-0007M9-T1@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	marc-editor.css 
Log Message:
Updated to work with full serials display

Index: marc-editor.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/marc-editor.css,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** marc-editor.css	20 Oct 2004 19:15:06 -0000	1.1
--- marc-editor.css	9 Jun 2005 21:17:31 -0000	1.1.2.1
***************
*** 1,41 ****
  div.tabs {
! 	width:10px;
! 	position:absolute;
! 	margin-left:50px;
! 	margin-top:120px;
  }
  
  div.tabs a {
  	display:block;
! 	font-size: small;
! 	border: thin solid black;
! 	margin-right: 2px;
! 	padding: 10px 10px;
! 	-moz-border-radius: 5px 0px 0px 5px;
  }
  
  div.tab {
! 	background-color: #FFFFCC;
  	display: block;
  	visibility:hidden;
! 	position:absolute;
! 
! }
! td {
! 	border:0px;
  }
  
! .MARCtag { /* style for tag definition (700 - Statement of responsability) */
! 	font-weight:bold;
! 	color:#FF6600;
! 	background-color:FFFFFF;
! 	background-image:none;
! 	border-bottom: 1px solid #999900;
! 	margin-right:30%;
  }
  
! .labelsubfield { /* style for each subfield (like : a Publication year), just before the biblio subfield */
! 	float:left;
! 	width: 12em;
! 	margin-left:30px;
  }
--- 1,91 ----
+ div.tabbed {
+ 	/*border : 1px solid red;
+ 	position: absolute;*/
+ 	margin-left:5%;
+ 	width:90%;
+ /*	display:block;*/
+ }
+ 
  div.tabs {
! /*	border : 1px solid aqua;*/
! 	float : left;
! 	margin : 5px 0 0 0;
! /*	position:absolute;
! 	margin-left: .5em;
! 	margin-top:110px;*/
  }
  
  div.tabs a {
  	display:block;
! 	background-color: #D8DEB8;
! 	color: #000066;
! 	font-weight : bold;
! 	text-decoration : none;
! 	border-bottom : 1px solid #999933;
! 	border-left : 1px solid #999933;
! 	border-right : 1px solid #FFFFCC;
! 	border-top : 1px solid #FFFFCC;
! 	margin : 0 0 2px 0;
! 	padding: 10px 5px 10px 5px;
! 	
! }
! 
! div.tabs a:hover {
! 	background-color : #CCFF99;
! 	border-left : 1px solid #000066;
! 	border-bottom : 1px solid #000066;
  }
  
  div.tab {
! 	background-color : #FFFFCC;
! 	border : 1px solid #D8DEB8;
! 	border-top : 1px solid #FFFFCC;
  	display: block;
  	visibility:hidden;
! 	position : absolute;
! 	margin : 5px 0 0 55px;
! 	padding : 3px 3px 3px 10px;
! 	width : 70%;
! 	/*margin-top:110px;*/
  }
  
! /* style for tag definition (e.g. 700 - Statement of responsibility) */
! .MARCtag { 
! 	clear : left;
! 	color : #000000;
! 	background-color : #FFFFCC;
! 	border-top : 7px solid #FFFFCC;
! 	border-bottom : thin solid #CCCC99;
! 	font-weight : bold;
! 	font-size : .8em;
! 	margin-top : 5px;
  }
  
! div.tab p {
! 	margin : 3px;
! }	
! 
! /* style for each subfield (e.g.: Publication year), just before the biblio subfield */
! .labelsubfield { 
! 	background-color : #FFFFE1;
! /*	border : 1px solid red;*/
! 	clear : left;
! 	float : left;
! 	font-size : .8em;
! 	font-weight : normal;
! 	width : 12em;
! 	margin-left : 30px;
! 	display : inline;
  }
+ 
+ #loading {
+ 	position: absolute;
+ 	top: 3em;
+ 	left: 3em;
+ 	padding: 1em;
+ 	mozopacity: 50%;
+ 	background-color: #FFFFFF;
+ 	border: 10px solid #CCCC99;
+ 	font-size: 1.5em;
+ 	z-index: 999;
+ 	}
\ No newline at end of file




From oleonard at users.sourceforge.net  Thu Jun  9 23:17:56 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 14:17:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes marc-editor.css,1.1,1.2
Message-ID: <E1DgUPU-0007PV-6d@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	marc-editor.css 
Log Message:
Updated to work with full serials display

Index: marc-editor.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/marc-editor.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** marc-editor.css	20 Oct 2004 19:15:06 -0000	1.1
--- marc-editor.css	9 Jun 2005 21:17:54 -0000	1.2
***************
*** 1,41 ****
  div.tabs {
! 	width:10px;
! 	position:absolute;
! 	margin-left:50px;
! 	margin-top:120px;
  }
  
  div.tabs a {
  	display:block;
! 	font-size: small;
! 	border: thin solid black;
! 	margin-right: 2px;
! 	padding: 10px 10px;
! 	-moz-border-radius: 5px 0px 0px 5px;
  }
  
  div.tab {
! 	background-color: #FFFFCC;
  	display: block;
  	visibility:hidden;
! 	position:absolute;
! 
! }
! td {
! 	border:0px;
  }
  
! .MARCtag { /* style for tag definition (700 - Statement of responsability) */
! 	font-weight:bold;
! 	color:#FF6600;
! 	background-color:FFFFFF;
! 	background-image:none;
! 	border-bottom: 1px solid #999900;
! 	margin-right:30%;
  }
  
! .labelsubfield { /* style for each subfield (like : a Publication year), just before the biblio subfield */
! 	float:left;
! 	width: 12em;
! 	margin-left:30px;
  }
--- 1,91 ----
+ div.tabbed {
+ 	/*border : 1px solid red;
+ 	position: absolute;*/
+ 	margin-left:5%;
+ 	width:90%;
+ /*	display:block;*/
+ }
+ 
  div.tabs {
! /*	border : 1px solid aqua;*/
! 	float : left;
! 	margin : 5px 0 0 0;
! /*	position:absolute;
! 	margin-left: .5em;
! 	margin-top:110px;*/
  }
  
  div.tabs a {
  	display:block;
! 	background-color: #D8DEB8;
! 	color: #000066;
! 	font-weight : bold;
! 	text-decoration : none;
! 	border-bottom : 1px solid #999933;
! 	border-left : 1px solid #999933;
! 	border-right : 1px solid #FFFFCC;
! 	border-top : 1px solid #FFFFCC;
! 	margin : 0 0 2px 0;
! 	padding: 10px 5px 10px 5px;
! 	
! }
! 
! div.tabs a:hover {
! 	background-color : #CCFF99;
! 	border-left : 1px solid #000066;
! 	border-bottom : 1px solid #000066;
  }
  
  div.tab {
! 	background-color : #FFFFCC;
! 	border : 1px solid #D8DEB8;
! 	border-top : 1px solid #FFFFCC;
  	display: block;
  	visibility:hidden;
! 	position : absolute;
! 	margin : 5px 0 0 55px;
! 	padding : 3px 3px 3px 10px;
! 	width : 70%;
! 	/*margin-top:110px;*/
  }
  
! /* style for tag definition (e.g. 700 - Statement of responsibility) */
! .MARCtag { 
! 	clear : left;
! 	color : #000000;
! 	background-color : #FFFFCC;
! 	border-top : 7px solid #FFFFCC;
! 	border-bottom : thin solid #CCCC99;
! 	font-weight : bold;
! 	font-size : .8em;
! 	margin-top : 5px;
  }
  
! div.tab p {
! 	margin : 3px;
! }	
! 
! /* style for each subfield (e.g.: Publication year), just before the biblio subfield */
! .labelsubfield { 
! 	background-color : #FFFFE1;
! /*	border : 1px solid red;*/
! 	clear : left;
! 	float : left;
! 	font-size : .8em;
! 	font-weight : normal;
! 	width : 12em;
! 	margin-left : 30px;
! 	display : inline;
  }
+ 
+ #loading {
+ 	position: absolute;
+ 	top: 3em;
+ 	left: 3em;
+ 	padding: 1em;
+ 	mozopacity: 50%;
+ 	background-color: #FFFFFF;
+ 	border: 10px solid #CCCC99;
+ 	font-size: 1.5em;
+ 	z-index: 999;
+ 	}
\ No newline at end of file




From oleonard at users.sourceforge.net  Thu Jun  9 23:18:50 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 14:18:50 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes doc-head-close.inc,1.1.2.1,1.1.2.2
Message-ID: <E1DgUQM-0007W1-Gh@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	doc-head-close.inc 
Log Message:
Including marc-editor.css for full serials display

Index: doc-head-close.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/doc-head-close.inc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** doc-head-close.inc	17 Mar 2005 21:36:49 -0000	1.1.2.1
--- doc-head-close.inc	9 Jun 2005 21:18:44 -0000	1.1.2.2
***************
*** 5,8 ****
--- 5,9 ----
  <style type="text/css"> 
  	@import url(<TMPL_VAR NAME="themelang">/includes/opac.css);
+ 	@import url(<TMPL_VAR NAME="themelang">/includes/marc-editor.css);	
  </style>
  <script type="text/javascript" language="javascript" src="<TMPL_VAR NAME="themelang">/includes/script.js"></script>




From oleonard at users.sourceforge.net  Thu Jun  9 23:19:08 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 14:19:08 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes doc-head-close.inc,1.1,1.2
Message-ID: <E1DgUQe-0007XL-SM@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	doc-head-close.inc 
Log Message:
Including marc-editor.css for full serials display

Index: doc-head-close.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/doc-head-close.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** doc-head-close.inc	20 Oct 2004 19:15:06 -0000	1.1
--- doc-head-close.inc	9 Jun 2005 21:19:06 -0000	1.2
***************
*** 2,7 ****
--- 2,9 ----
  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
  <meta http-equiv="Content-Language" content="en-us" />
+ <link rel="shortcut icon" href="<TMPL_VAR NAME="themelang">/includes/favicon.ico" type="image/x-icon" />
  <style type="text/css"> 
  	@import url(<TMPL_VAR NAME="themelang">/includes/opac.css);
+ 	@import url(<TMPL_VAR NAME="themelang">/includes/marc-editor.css);	
  </style>
  <script type="text/javascript" language="javascript" src="<TMPL_VAR NAME="themelang">/includes/script.js"></script>




From oleonard at users.sourceforge.net  Thu Jun  9 23:20:55 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 09 Jun 2005 14:20:55 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes intranet.css,1.5.2.9,1.5.2.10
Message-ID: <E1DgUSN-0007o4-C4@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29940/koha-tmpl/intranet-tmpl/npl/en/includes

Modified Files:
      Tag: rel_2_2
	intranet.css 
Log Message:
Adding 'control box' styles for MARC detail screens

Index: intranet.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/intranet.css,v
retrieving revision 1.5.2.9
retrieving revision 1.5.2.10
diff -C2 -r1.5.2.9 -r1.5.2.10
*** intranet.css	20 Apr 2005 21:30:48 -0000	1.5.2.9
--- intranet.css	9 Jun 2005 21:20:53 -0000	1.5.2.10
***************
*** 624,628 ****
  	margin : 3px 0px 5px 0px;
  	padding : 0px;
! 	width : 95%;
  }
  
--- 624,628 ----
  	margin : 3px 0px 5px 0px;
  	padding : 0px;
! 	width : auto;
  }
  
***************
*** 1229,1231 ****
--- 1229,1244 ----
  .accesskey {
  	text-decoration : underline;
+ }
+ 
+ div#controls {
+ 	float: right;
+ 	margin-left : .7em;
+ 	width : 15%;
+ }
+ 
+ div#controls form {
+ 	background-color : #FFFFCC;
+ 	font-size : 80%;
+ 	margin : .3em 0;
+ 	padding : .3em;
  }
\ No newline at end of file




From hdl at users.sourceforge.net  Fri Jun 10 10:40:11 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 10 Jun 2005 01:40:11 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ selectbranchprinter.tmpl,1.6,1.6.2.1 branchtransfers.tmpl,1.12,1.12.2.1
Message-ID: <E1Dgf3j-0005IV-Ts@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	selectbranchprinter.tmpl branchtransfers.tmpl 
Log Message:
Fixing : css class error on titles.

Index: selectbranchprinter.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/selectbranchprinter.tmpl,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** selectbranchprinter.tmpl	19 Jul 2004 19:58:38 -0000	1.6
--- selectbranchprinter.tmpl	10 Jun 2005 08:40:09 -0000	1.6.2.1
***************
*** 2,6 ****
  
  <div id="mainbloc">
! <h1>Circulation: Select Printer and Branch Settings</h1>
  
  <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
--- 2,6 ----
  
  <div id="mainbloc">
! <h1 class="circulation">Circulation: Select Printer and Branch Settings</h1>
  
  <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
***************
*** 30,34 ****
  <!-- /TMPL_IF --></p>
  <p><input type="hidden" name="setcookies" value="1">
! <input type="submit" value="Submit" type="changesettings" class="button"></p>
  </form>
  
--- 30,34 ----
  <!-- /TMPL_IF --></p>
  <p><input type="hidden" name="setcookies" value="1">
! <input type="submit" value="Submit" type="changesettings" class="button circulation"></p>
  </form>
  

Index: branchtransfers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -r1.12 -r1.12.2.1
*** branchtransfers.tmpl	5 Nov 2004 10:18:24 -0000	1.12
--- branchtransfers.tmpl	10 Jun 2005 08:40:09 -0000	1.12.2.1
***************
*** 1,15 ****
  <!-- TMPL_INCLUDE Name="circulation-top.inc" -->
  <div id="mainbloc">
- <div class="bloc25">
- <a class="button" href="circulation.pl">
- Next Borrower</a>
- <a class="button" href="returns.pl">
- Returns</a>
- </div>
  
! <h1>Circulation: Transfers</h1>
  <b>Branch:</b> <!-- TMPL_VAR NAME="genbrname" --> &nbsp;
  <b>Printer:</b> <!-- TMPL_VAR NAME="genprname" -->
! <a href="selectbranchprinter.pl" class="button">Change Settings</a>
  <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
  <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
--- 1,9 ----
  <!-- TMPL_INCLUDE Name="circulation-top.inc" -->
  <div id="mainbloc">
  
! <h1 class="circulation">Circulation: Transfers</h1>
  <b>Branch:</b> <!-- TMPL_VAR NAME="genbrname" --> &nbsp;
  <b>Printer:</b> <!-- TMPL_VAR NAME="genprname" -->
! <a href="selectbranchprinter.pl" class="button circulation">Change Settings</a>
  <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
  <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
***************
*** 17,21 ****
  <!-- TMPL_IF Name="found" -->
  	<table>
! 	<tr><th>Reserve Found</th></tr>
  	<tr><td>
  	<!-- TMPL_IF Name="reserved" -->
--- 11,15 ----
  <!-- TMPL_IF Name="found" -->
  	<table>
! 	<tr><th class="circulation">Reserve Found</th></tr>
  	<tr><td>
  	<!-- TMPL_IF Name="reserved" -->
***************
*** 38,45 ****
  				<!-- TMPL_IF Name="waiting" --><input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
  					<input type="hidden" name="request" value="KillWaiting">
! 					<input type="submit" value="Cancel" class="button">
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF Name="reserved" --><input type="hidden" name="request" value="SetWaiting">
! 					<input type="submit" value="Waiting" class="button"><!-- /TMPL_IF -->
  			</form></p>
  
--- 32,39 ----
  				<!-- TMPL_IF Name="waiting" --><input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
  					<input type="hidden" name="request" value="KillWaiting">
! 					<input type="submit" value="Cancel" class="button circulation">
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF Name="reserved" --><input type="hidden" name="request" value="SetWaiting">
! 					<input type="submit" value="Waiting" class="button circulation"><!-- /TMPL_IF -->
  			</form></p>
  
***************
*** 58,62 ****
  			<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
  			<input type="hidden" name="request" value="KillReserved">
! 			<input type="submit" value="Cancel" class="button">
  			</form></p>
  		<!-- /TMPL_IF -->
--- 52,56 ----
  			<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
  			<input type="hidden" name="request" value="KillReserved">
! 			<input type="submit" value="Cancel" class="button circulation">
  			</form></p>
  		<!-- /TMPL_IF -->
***************
*** 70,74 ****
  				<input type="hidden" name="tb-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="tobrcd" -->">
  			<!-- /TMPL_LOOP -->
! 			<input type="submit" value="Ignore" class="button">
  			</form></p>
  
--- 64,68 ----
  				<input type="hidden" name="tb-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="tobrcd" -->">
  			<!-- /TMPL_LOOP -->
! 			<input type="submit" value="Ignore" class="button circulation">
  			</form></p>
  
***************
*** 77,81 ****
  <!-- TMPL_ELSE -->
  	<table>
! 	<tr><th>Messages</th></tr>
  	<tr><td>
  	<!-- TMPL_IF Name="reqmessage" -->
--- 71,75 ----
  <!-- TMPL_ELSE -->
  	<table>
! 	<tr><th class="circulation">Messages</th></tr>
  	<tr><td>
  	<!-- TMPL_IF Name="reqmessage" -->
***************
*** 125,130 ****
  		<p>
  		<table border="1" cellpadding="5" cellspacing="0" bgcolor="#dddddd">
! 		<tr><th colspan="6">Transfered Items</th></tr>
! 		<tr><th>Barcode</th><th>Title</th><th>Author</th><th>Type</th><th>From</th><th>To</th></tr>
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td align="center" bgcolor="<!-- TMPL_VAR NAME="color" -->">
--- 119,124 ----
  		<p>
  		<table border="1" cellpadding="5" cellspacing="0" bgcolor="#dddddd">
! 		<tr><th colspan="6" class="circulation">Transfered Items</th></tr>
! 		<tr><th class="circulation">Barcode</th><th class="circulation">Title</th><th class="circulation">Author</th><th class="circulation">Type</th><th class="circulation">From</th><th class="circulation">To</th></tr>
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td align="center" bgcolor="<!-- TMPL_VAR NAME="color" -->">
***************
*** 140,143 ****
--- 134,143 ----
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
+ <div class="bloc25">
+ <a class="button circulation" href="circulation.pl">
+ Next Borrower</a>
+ <a class="button circulation" href="returns.pl">
+ Returns</a>
+ </div>
  
  </div>




From shedges at users.sourceforge.net  Mon Jun 13 12:24:31 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Mon, 13 Jun 2005 03:24:31 -0700
Subject: [Koha-cvs] CVS: koha-doc/fr/opac - New directory
Message-ID: <E1Dhm7L-0003nL-6J@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/fr/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14570/fr/opac

Log Message:
Directory /cvsroot/koha/koha-doc/fr/opac added to the repository





From shedges at users.sourceforge.net  Mon Jun 13 12:25:00 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Mon, 13 Jun 2005 03:25:00 -0700
Subject: [Koha-cvs] CVS: koha-doc/fr/opac/CatKOHAimages - New directory
Message-ID: <E1Dhm7o-0003rp-31@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/fr/opac/CatKOHAimages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14857/fr/opac/CatKOHAimages

Log Message:
Directory /cvsroot/koha/koha-doc/fr/opac/CatKOHAimages added to the repository





From shedges at users.sourceforge.net  Mon Jun 13 12:26:57 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Mon, 13 Jun 2005 03:26:57 -0700
Subject: [Koha-cvs] CVS: koha-doc/fr/opac CatKOHA.xml,NONE,1.1
Message-ID: <E1Dhm9h-000473-QT@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/fr/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15727/fr/opac

Added Files:
	CatKOHA.xml 
Log Message:
Adding Bib. de soc. CNRS opac users guide

--- NEW FILE ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
<article>
  <title>Catalogue KOHA : mode d???emploi</title>

  <articleinfo>
    <pubdate>2005-06-11</pubdate>

    <copyright>
      <year>2005</year>

      <holder>Biblioth??que de sociologie du CNRS, Paris</holder>
    </copyright>

    <legalnotice>
      <para>Document sous licence Gnu-GPL</para>

      <para>This document is related to Koha and is licensed to you under the
      GNU General Public License version 2 or later (<ulink
      url="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</ulink>).</para>

      <para>Koha-related documents may be reproduced and distributed in whole
      or in part, in any medium physical or electronic, as long as this
      copyright notice is retained on all copies.</para>

      <para>You may create a derivative work and distribute it provided that
      you:</para>

      <orderedlist>
        <listitem>
          <para>License the derivative work with this same license, or the
          Linux Documentation Project License (<ulink
          url="http://www.tldp.org/COPYRIGHT.html">http://www.tldp.org/COPYRIGHT.html</ulink>).
          Include a copyright notice and at least a pointer to the license
          used.</para>
        </listitem>

        <listitem>
          <para>Give due credit to previous authors and major
          contributors.</para>
        </listitem>
      </orderedlist>

      <para>Commercial redistribution is allowed and encouraged; however, the
      author would like to be notified of any such distributions.</para>

      <para>No liability for the contents of this document can be accepted.
      Use the concepts, examples and information at your own risk. There may
      be errors and inaccuracies, that could be damaging to your system.
      Proceed with caution, and although this is highly unlikely, the
      author(s) do not take any responsibility.</para>

      <para>All copyrights are held by their by their respective owners,
      unless specifically noted otherwise. Use of a term in this document
      should not be regarded as affecting the validity of any trademark or
      service mark. Naming of particular products or brands should not be seen
      as endorsements.</para>
    </legalnotice>

    <revhistory>
      <revision>
        <revnumber>2.2.2</revnumber>

        <date>2005-06-11</date>

        <revdescription>
          <para>Initial XML markup.</para>
        </revdescription>
      </revision>
    </revhistory>
  </articleinfo>

  <section>
    <title>Le catalogue</title>

    <para>Le catalogue rassemble tous les documents acquis par la
    biblioth??que. Il contient ??galement la liste compl??te des p??riodiques
    disponibles et environ 5000 notices descriptives correspondant ?? des
    articles de p??riodiques (20 revues analys??es).</para>

    <para>Il permet d???effectuer des recherches documentaires ?? partir du fonds
    de la biblioth??que et de conna??tre la disponibilit?? d???un document ??
    emprunter ou ?? consulter.</para>

    <section>
      <title>Page d???accueil et modes d???acc??s</title>

      <para>La catalogue se consulte sur le web : <ulink
      url="http://catalogue.bibliothequedesociologie.cnrs.fr">http://catalogue.bibliothequedesociologie.cnrs.fr</ulink>.
      Il est vivement recommand?? d???utiliser le navigateur Mozilla, disponible
      gratuitement sur Internet.</para>

      <para>Vous avez le choix d???acc??der au catalogue de mani??re anonyme ou en
      vous identifiant (r??serv?? aux lecteurs inscrits ?? la
      biblioth??que).</para>

      <figure>
        <title>Page d???accueil</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image1.gif" />
          </imageobject>
        </mediaobject>
      </figure>

      <para>Vous pouvez modifier la langue de l???interface si vous le souhaitez
      (mais la langue d???indexation des documents est le fran??ais. Seules
      quelques notices ont fait l???objet d???un r??sum?? dans une autre
      langue).</para>
    </section>

    <section>
      <title>Pour s???identifier</title>

      <para>Saisissez votre identifiant (nom de famille en minuscules) et le
      mot de passe fourni au moment de votre inscription (si vous avez oubli??
      votre mot de passe, contactez la biblioth??que).</para>

      <figure>
        <title>Identification</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image2.gif" />
          </imageobject>
        </mediaobject>
      </figure>

      <para>L???acc??s en mode ?? Identifi?? ?? vous permet de consulter vos
      informations personnelles, d???effectuer des suggestions d???achats pour la
      biblioth??que, de vous constituer des ??tag??res virtuelles.</para>

      <warning>
        <para>Attention : pensez ?? vous d??connecter ?? la fin de votre
        consultation.</para>
      </warning>
    </section>
  </section>

  <section>
    <title>M??thode de recherche : quelques conseils</title>

    <itemizedlist>
      <listitem>
        <para>Les recherches peuvent s'effectuer en texte int??gral ou porter
        sur des champs ou des crit??res pr??cis : auteur, titre, ann??e de
        publication, ??diteur ... </para>
      </listitem>

      <listitem>
        <para>Il n'est pas n??cessaire de respecter les combinaisons
        majuscules/minuscules, les signes diacritiques (accent, tr??ma) ...
        </para>
      </listitem>

      <listitem>
        <para>Une recherche est faite sur tous les mots que vous entrez. Les
        mots vides sont ignor??s. Si vous entrez, par exemple "les cadres en
        France" dans le titre, la liste de r??ponses contiendra tous les
        documents avec cadre ET France dans le titre ou le sous-titre. "Les"
        et ?? En ?? seront exclus.</para>
      </listitem>

      <listitem>
        <para>Si vous voulez entrer une partie de mot, mettez une * ou un % ??
        la fin du mot. Par exemple, "urbanis*" donnera "urbanisme" mais aussi
        "urbanistique", ?? urbanisation ??, etc. </para>
      </listitem>
    </itemizedlist>

    <section>
      <title>Deux modes de recherche vous sont propos??s : </title>

      <variablelist>
        <varlistentry>
          <term>Recherche simple</term>

          <listitem>
            <para>Allez sur la page d???accueil et tapez un ou plusieurs termes
            dans la zone de saisie. Cliquez sur OK<figure>
                <title>Recherche simple</title>

                <mediaobject>
                  <imageobject>
                    <imagedata fileref="CatKOHAimages/image3.gif" />
                  </imageobject>
                </mediaobject>
              </figure></para>

            <para>Les termes saisis dans cette zone sont par d??faut reli??s par
            l'op??rateur ET.</para>
          </listitem>
        </varlistentry>

        <varlistentry>
          <term>Recherche avanc??e</term>

          <listitem>
            <para>Cliquez sur Recherche avanc??e<figure>
                <title>Recherche avanc??e</title>

                <mediaobject>
                  <imageobject>
                    <imagedata fileref="CatKOHAimages/image4.gif" />
                  </imageobject>
                </mediaobject>
              </figure></para>

            <para>Tapez un ou plusieurs termes dans la zone "N???importe o??". La
            recherche portera sur tous les ??l??ments de la notice du document.
            Les termes saisis dans cette zone sont par d??faut reli??s par
            l'op??rateur ET.</para>

            <para><emphasis role="bold">ou</emphasis></para>

            <para>Tapez un ou plusieurs termes dans les zones d??di??es aux
            informations souhait??es (auteur, titre, etc.). Entre chaque zone,
            l???op??rateur par d??faut est le ?? ET ??.</para>

            <para>Zone Titre : vous pouvez entrer un titre complet ou partiel.
            La recherche sera faite aussi sur les sous-titres et les autres
            champs relatifs au titre.</para>

            <para>Zone auteur : vous pouvez entrer un nom ou un pr??nom. La
            recherche est aussi faite sur les co-auteurs et les autres champs
            en relation (traducteur, illustrateur...). N'oubliez pas qu'un
            auteur peut concerner un auteur physique (Pierre Bourdieu) ou
            moral (CNRS...).</para>

            <para>Une recherche plus s??lective est possible en pr??cisant : un
            type de document : p??riodiques, article de p??riodiques, th??se,
            rapport, etc.</para>
          </listitem>
        </varlistentry>
      </variablelist>
    </section>
  </section>

  <section>
    <title>Affichage des r??sultats</title>

    <section>
      <title>Affichage sous forme de liste</title>

      <para>Cet affichage vous permet de v??rifier la disponibilit?? des
      documents et leur localisation (Cote)</para>

      <itemizedlist>
        <listitem>
          <para>Cliquez sur le titre pour consulter la notice.</para>
        </listitem>

        <listitem>
          <para>Cochez les notices ?? ajouter dans votre panier.</para>
        </listitem>

        <listitem>
          <para>Cliquez sur ?? r??server ?? pour r??server un document :
          <emphasis>le document ne pourra pas ??tre emprunt?? par un autre
          lecteur.</emphasis> La r??servation s???annule automatiquement au bout
          de 3 semaines ou lorsque vous avez emprunt?? le document. Si le
          document est d??j?? r??serv?? par un autre lecteur, votre demande sera
          mise en file d???attente.</para>

          <note>
            <para>Attention : la r??servation n'est pas une commande. Pour
            obtenir l???ouvrage r??serv??, il faut remplir un formulaire de pr??t
            en salle de lecture.</para>
          </note>
        </listitem>
      </itemizedlist>

      <figure>
        <title>Affichage sous forme de liste</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image5.gif" />
          </imageobject>
        </mediaobject>
      </figure>
    </section>

    <section>
      <title>Format d???affichage SIMPLE</title>

      <para>Vous pouvez ?? rebondir ?? sur les mots cl??s de la notice pour une
      nouvelle recherche</para>

      <figure>
        <title>Format d???affichage SIMPLE</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image6.gif" />
          </imageobject>
        </mediaobject>
      </figure>
    </section>

    <section>
      <title>Format d???affichage ISBD (International Standard Book
      Description)</title>

      <para>Vous pouvez r??cup??rer cette notice dans un traitement de texte en
      effectuant un Copier/Coller</para>

      <figure>
        <title>Format d???affichage ISBD</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image7.gif" />
          </imageobject>
        </mediaobject>
      </figure>
    </section>

    <section>
      <title>Format d???affichage ?? Notice Compl??te ??</title>

      <para>Cliquez sur les onglets (0/1/2/3) pour visualiser les
      informations. L???onglet ?? Items ?? contient les indications relatives aux
      exemplaires (la cote par exemple)</para>

      <figure>
        <title>Notice Compl??te</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image8.gif" />
          </imageobject>
        </mediaobject>
      </figure>
    </section>
  </section>

  <section>
    <title>Informations lecteurs</title>

    <para>Pour consulter vos informations, il faut vous identifier.</para>

    <para>Pour modifier vos coordonn??es, cliquez sur ??mettre ?? jour ?? et
    indiquez quelles sont les donn??es ?? corriger.</para>

    <figure>
      <title>Informations lecteurs</title>

      <mediaobject>
        <imageobject>
          <imagedata fileref="CatKOHAimages/image9.gif" />
        </imageobject>
      </mediaobject>
    </figure>
  </section>

  <section>
    <title>Panier</title>

    <para>Pour se constituer un panier, cochez les notices dans la liste des
    r??sultats et cliquez sur ?? Ajoutez les ??l??ments coch??s au panier ??:
    <figure>
        <title>Ajoutez les ??l??ments coch??s au panier</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image10.gif" />
          </imageobject>
        </mediaobject>
      </figure></para>

    <para>Cliquez sur ?? Panier de notice ?? pour visualisez les notices
    s??lectionn??es<figure>
        <title>Panier de notice</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image11.gif" />
          </imageobject>
        </mediaobject>
      </figure></para>

    <para>Pour visualiser une notice dans un autre format d???affichage, cliquez
    sur le titre du document.</para>

    <para>Vous pouvez imprimer les notices du panier ou les envoyer par
    m??l.<figure>
        <title>Les envoyer par m??l</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image12.gif" />
          </imageobject>
        </mediaobject>
      </figure></para>
  </section>

  <section>
    <title>??tag??res virtuelles</title>

    <para>Cette fonctionnalit?? vous permet de s??lectionner un ensemble de
    documents et de conserver la s??lection d???une session ?? l???autre
    (contrairement au Panier qui dispara??t ?? l???issue de chaque consultation du
    catalogue).</para>

    <para>Pour cr??er ou consulter une ??tag??re virtuelle, il faut vous
    identifier.</para>

    <itemizedlist>
      <listitem>
        <para>Cliquez sur ?? ??tag??res virtuelles ?? ?? partir de la page
        d???accueil, pour consulter les ??tag??res d??j?? cr????es.</para>
      </listitem>

      <listitem>
        <para>Pour cr??er une nouvelle ??tag??re, cliquez sur cr??er une nouvelle
        ??tag??re.</para>
      </listitem>
    </itemizedlist>

    <para>Il existe 3 cat??gories d?????tag??res : </para>

    <orderedlist>
      <listitem>
        <para>Une ??tag??re virtuelle priv??e est g??r??e par vous seul, et ne peut
        ??tre vue que de vous.</para>
      </listitem>

      <listitem>
        <para>Une ??tag??re publique peut ??tre vue par tous, mais g??r??e
        uniquement par vous.</para>
      </listitem>

      <listitem>
        <para>Une ??tag??re libre peut ??tre g??r??e par n'importe quel
        utilisateur.</para>
      </listitem>
    </orderedlist>

    <figure>
      <title>??tag??res virtuelles</title>

      <mediaobject>
        <imageobject>
          <imagedata fileref="CatKOHAimages/image13.gif" />
        </imageobject>
      </mediaobject>
    </figure>

    <para>Lorsque vous consultez le catalogue, vous pouvez s??lectionner une ou
    plusieurs notices ?? ajouter dans l'??tag??re : cliquez sur la notice et
    ensuite sur la fonction ?? Ajouter dans l?????tag??re ??. S??lectionnez l?????tag??re
    dans laquelle vous souhaitez d??poser la notice.</para>
  </section>

  <section>
    <title>Suggestions d???achat</title>

    <para>Cette fonctionnalit?? vous permet de proposer des suggestions
    d???acquisition ?? l?????quipe de la biblioth??que. Vous recevrez automatiquement
    un m??l en r??ponse ?? votre suggestion d???achat.</para>

    <para>Pour consulter vos suggestions, s??lectionnez ?? moi-m??me ?? dans la
    colonne ??Sugg??r?? par ?? et cliquez sur ?? Chercher ?? </para>

    <figure>
      <title>Suggestions d???achat</title>

      <mediaobject>
        <imageobject>
          <imagedata fileref="CatKOHAimages/image14.gif" />
        </imageobject>
      </mediaobject>
    </figure>

    <para>Lorsque vous saisissez une suggestion, remplissez la grille de
    mani??re la plus pr??cise possible. Ajoutez dans la zone ?? Note ?? les
    ??ventuels commentaires que vous auriez ?? formuler.<figure>
        <title>Saisir une nouvelle suggestion</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="CatKOHAimages/image15.gif" />
          </imageobject>
        </mediaobject>
      </figure></para>
  </section>
</article>



From shedges at users.sourceforge.net  Mon Jun 13 12:31:17 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Mon, 13 Jun 2005 03:31:17 -0700
Subject: [Koha-cvs] CVS: koha-doc/fr migrer_ses_donnees.xml,1.2,NONE scripts ligne de commande.xml,1.2,NONE
Message-ID: <E1DhmDt-0004ir-Ld@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/fr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18139/fr

Removed Files:
	migrer_ses_donnees.xml scripts ligne de commande.xml 
Log Message:
Removing duplicate documents that have been moved to subdirectories.

--- migrer_ses_donnees.xml DELETED ---

***** Bogus filespec: scripts
***** Bogus filespec: ligne
***** Bogus filespec: de
--- commande.xml DELETED ---




From shedges at users.sourceforge.net  Mon Jun 13 13:08:53 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Mon, 13 Jun 2005 04:08:53 -0700
Subject: [Koha-cvs] CVS: koha-doc codingguidelines.xml,NONE,1.1
Message-ID: <E1DhmoH-00016o-CR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4193

Added Files:
	codingguidelines.xml 
Log Message:
draft of coding standards and guidelines

--- NEW FILE ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
<article>
  <title>Koha Coding Standards and Guidelines for Contributors</title>

  <section>
    <title>Introduction</title>

    <para>As in other free and open source software projects, Koha contains
    code that has been contributed to the project by many different
    developers. Koha is now a complex piece of software, and we'd like
    continue to improve the overall code standards to make it easier for new
    developers to join the project, and to make existing code easier to
    maintain. These standards and guidelines are intended to give Koha a
    reasonably consistent style throughout the code and to ensure
    maintainability.</para>

    <para>When you commit new code to Koha, please do your best to comply with
    these guidelines -- it will increase the chances of your code become part
    of a stable Koha release. And if you find code in Koha that doesn't comply
    with these guidelines, please feel free to fix it, just as you would
    correct any bug.</para>
  </section>

  <section>
    <title>Code style</title>

    <para>Koha code should conform to the guidelines defined in the <ulink
    url="http://perldoc.perl.org/perlstyle.html">perlstyle</ulink> man page as
    they apply to code details (indenting, etc.). As for the general structure
    of the code, all Koha code must be separated into three types:</para>

    <itemizedlist>
      <listitem>
        <para>the Perl code;</para>
      </listitem>

      <listitem>
        <para>the database (DB) access code; and</para>
      </listitem>

      <listitem>
        <para>the HTML code.</para>
      </listitem>
    </itemizedlist>

    <para>These three code types, as well as the Koha naming conventions, are
    explained in the following sections.</para>

    <section>
      <title>HTML</title>

      <para>All code controlling the "appearance layer" is contained in
      <filename>HTML::Template</filename> files. These files are located in
      the <filename>koha-tmpl</filename> directory in CVS (currently <ulink
      url="http://sourceforge.net/cvs/?group_id=16466">http://sourceforge.net/cvs/?group_id=16466</ulink>).
      They must contain all the code controlling the presentation layer. There
      are at least two good reasons for this:</para>

      <itemizedlist>
        <listitem>
          <para>the look of Koha can be changed by rewriting only the
          templates, changing nothing in the Perl code itself; and</para>
        </listitem>

        <listitem>
          <para>there is a tool to translate templates, so it's the only way
          to localise our preferred ILS.</para>
        </listitem>
      </itemizedlist>

      <para>Almost all the actual Koha presentation pages use templates. Only
      a few exceptions (that can be considered bugs) remain at the time of
      writing.</para>

      <section>
        <title>Templates location</title>

        <para>The <filename>koha-tmpl</filename> directory contains two
        different sub-directories: <filename>opac-tmpl</filename> and
        <filename>intranet-tmpl</filename>. Under those two are the themes
        directories, and one directory for each language -- for example,
        <filename>intranet-tmpl/default/en</filename> for English default
        templates. The templates should be stored in a directory that
        parallels the location of the Perl scripts. For example, the Perl
        scripts located in the <filename>$KOHA/acqui.simple</filename>
        directory should use templates located in
        <filename>$KOHA/koha-tmpl/intranet-tmpl/&lt;theme&gt;/&lt;language&gt;/acqui.simple</filename>.</para>

        <para><emphasis>Exceptions:</emphasis></para>

        <itemizedlist>
          <listitem>
            <para>Scripts located in <filename>$KOHA/admin/</filename> use
            templates located in
            <filename>$KOHA/intranet-tmpl/&lt;theme&gt;/&lt;language&gt;/parameters/</filename></para>
          </listitem>

          <listitem>
            <para>Some scripts in <filename>$KOHA/members/</filename> use
            templates located in
            <filename>$KOHA/intranet-tmpl/&lt;theme&gt;/&lt;language&gt;/</filename></para>
          </listitem>

          <listitem>
            <para>Simple HTML "includes" files for placing standard headers
            and footers on Koha pages are located in
            <filename>$KOHA/intranet-tmpl/&lt;theme&gt;/&lt;language&gt;/includes/</filename></para>
          </listitem>
        </itemizedlist>

        <para>When modifying templates, you should only modify the English one
        manually. All other languages are automatically generated from the
        English templates through a <filename>.po</filename> file and the
        script located in
        <filename>misc/translator/tmpl_process3.pl</filename>.</para>
      </section>

      <section>
        <title>Online help</title>

        <para>The
        <filename>$KOHA/koha-tmpl/&lt;theme&gt;/&lt;language&gt;/help</filename>
        directory contains online help. Under the <filename>help</filename>
        directory is a complete copy of the Koha directory structure, with
        templates using the same name as the "true" templates. These templates
        must contain online help. The <filename>$KOHA/help.pl</filename>
        script is called when the user clicks on "Help," which opens/shows the
        templates in this directory.</para>

        <para>PLEASE write online help when you add features.</para>
      </section>

      <section>
        <title>Template content</title>

        <para>There is usually only one template for a given
        <filename>.pl</filename> file. For example, the template related to
        <filename>circulation/returns.pl</filename> should be
        <filename>circulation/returns.tmpl</filename>.</para>

        <para>If there are different possible behaviours, they should be
        separated by a <varname>TMPL_IF</varname>. For example,
        <filename>$KOHA/koha-tmpl/intranet-tmpl/&lt;theme&gt;/&lt;language&gt;/parameters</filename>
        contains:</para>

        <programlisting>&lt;!-- TMPL_IF name="add_form" --&gt;</programlisting>

        <para>that controls what is shown when the user wants to add something
        (as determined by the Perl script):</para>

        <programlisting>if ($op) {
$template-&gt;param(script_name =&gt; $script_name,
$op              =&gt; 1);  # We show only the TMPL_VAR names $op.
} else {
$template-&gt;param(script_name =&gt; $script_name,
else              =&gt; 1); # We show only the TMPL_VAR names $op.
}</programlisting>

        <para>Note that some scripts use two different templates, depending on
        what the user wants to do. This is sometimes a mistake in Koha design,
        sometimes not. For example, in
        <filename>$KOHA/opac/opac-search.pl</filename>, we can use the
        <filename>opac-search</filename> or
        <filename>opac-searchresults</filename> template, depending on the
        step of the search. Both templates are big, so merging them would not
        be a good idea for maintenance and readability of Koha code.</para>
      </section>
    </section>

    <section>
      <title>DB access</title>

      <para>No database (DB) access routines should ever be included in
      <filename>.pl</filename> files. All DB access routines should be in the
      <filename>C4</filename> directory, in <filename>.pm</filename> modules.
      There is one <filename>.pm</filename> module for each logical "librarian
      activity." For example, everything related to circulation must be in
      <filename>C4/Circulation/Circ2.pm</filename>.</para>

      <para>All inclusion of Perl variables in SQL commands should be done
      through <userinput>prepare()</userinput> statements with
      <userinput>?</userinput> placeholders, and then using
      <userinput>bind()</userinput> and/or <userinput>execute()</userinput>
      calls. This helps with security and other testing.</para>

      <para>The <filename>C4/Context.pm</filename> module contains everything
      related to technical variables (creating a DB handler, getting a
      systempreference, etc.).</para>

      <para>The <filename>C4/Koha.pm</filename> module contains everything
      related to things that are useful everywhere in Koha, such as getting a
      branch list or a branch detail. (At the time of writing, this module
      probably should be improved. Some subroutines, for instance, are located
      in other modules but would be better here.)</para>

      <para><emphasis>Exception:</emphasis> parameters management scripts. For
      historic reasons, and because they don't do anything complex in the
      database, all scripts in <filename>$KOHA/admin/</filename> deal directly
      with the database. This is not really a bug, even if it does seem to
      break the rule. (Think of it as "the exception that proves the
      rule.")</para>
    </section>

    <section>
      <title>Perl scripts</title>

      <para>Perl scripts are the scripts that are run from
      <filename>cgi-bin</filename> (or <filename>mod_perl</filename>). They
      all have (almost) the same behaviour:</para>

      <itemizedlist>
        <listitem>
          <para>read parameters;</para>
        </listitem>

        <listitem>
          <para>open an <filename>HTML::Template</filename> file (that checks
          the user rights to access the page if needed -- if the user doesn't
          have the correct permissions, show a "sorry no access" page and
          end);</para>
        </listitem>

        <listitem>
          <para>depending on the parameters (often, in a
          <varname>$op</varname> variable, but not always), run subroutines
          from a <filename>C4/*.pm</filename> package to do something in the
          database;</para>
        </listitem>

        <listitem>
          <para>using the parameters and the results of the previous
          operations, fill the template; and</para>
        </listitem>

        <listitem>
          <para>send the template to the user.</para>
        </listitem>
      </itemizedlist>

      <para>Some scripts are run on the command line. They all are located in
      the <filename>misc</filename> directory. The <filename>misc</filename>
      directory does not contain any scripts that can be run as
      <filename>cgi-bin</filename>.</para>

      <para>Command line scripts executed without any parameters should return
      a "help" listing of possible parameters and exit without doing
      anything.</para>
    </section>

    <section>
      <title>Naming conventions</title>

      <section>
        <title>Script names</title>

        <para>The script names must be related to what they do, and they must
        be located in a directory that is related to a logical "librarian
        activity". For example, all scripts related to circulation are in
        <filename>$KOHA/circ/</filename>.</para>

        <para><emphasis>Exceptions:</emphasis></para>

        <itemizedlist>
          <listitem>
            <para>The <filename>acqui.simple</filename> directory contains all
            the code for MARC cataloguing. The directory name obviously is not
            related to the "librarian activity," but it's historic.</para>
          </listitem>

          <listitem>
            <para>The <filename>bull</filename> directory is related to
            serials management. Most of the code in this directory was
            developed in France, and "serials management" is "bulletinage" in
            French -- but in general, script and directory names should be in
            English.</para>
          </listitem>

          <listitem>
            <para>Some scripts related to borrowers are still in the
            <filename>$KOHA/</filename> directory (<filename>pay.pl</filename>
            for example).</para>
          </listitem>
        </itemizedlist>
      </section>

      <section>
        <title>Variable names</title>

        <para>Variables can be of three types:</para>

        <itemizedlist>
          <listitem>
            <para>Perl variables;</para>
          </listitem>

          <listitem>
            <para>template variables; or</para>
          </listitem>

          <listitem>
            <para>hash entries from a SQL request.</para>
          </listitem>
        </itemizedlist>

        <para>All three variables should have the same name. For example, if
        you get the field <varname>issuelength</varname> from the
        <filename>issuingrules</filename> table, then you should have a
        <userinput>&lt;!-- TMPL_VAR name="issuelength" --&gt;</userinput> in
        the template, and either a <varname>$issuelength</varname> or
        <varname>$issuingrules-&gt;{'issuelength'}</varname> variable in the
        Perl code.</para>

        <para>Sometimes you must use the same field/variable from two
        different points of view. In this case, use two variable names, with
        something distinctive before the "simple" name. For example if you
        need "librarian name" and "borrower name" from
        <varname>borrowers.surname</varname>, use
        <varname>librariansurname</varname> and
        <varname>borrowersurname</varname>.</para>
      </section>
    </section>
  </section>

  <section>
    <title>Commenting style</title>

    <para>Scripts and modules in Koha are expected to contain clear and
    helpful comments to assist other developers who want to work on the code.
    Despite the availability of external documentation, source code listings
    should be able to stand on their own, because external documentation may
    not adequately describe the details and intent of the developer(s). Please
    make sure you include enough comments to keep your coding intentions
    understandable, and try to follow these guidelines:</para>

    <orderedlist>
      <listitem>
        <para>Please write your comments in English or request
        translation.</para>

        <para>Write in complete sentences, capitalize the first word, and put
        two spaces after the end of each sentence (so that the Emacs sentence
        commands will work).</para>

        <para>Comments should start with a # and a single space.</para>
      </listitem>

      <listitem>
        <para>Comment your code when you do something that someone else may
        not think is "trivial." In other words, comment anything that is not
        readily obvious in the code.</para>
      </listitem>

      <listitem>
        <para>Each Koha file should begin with a block comment
        containing:</para>

        <orderedlist>
          <listitem>
            <para>basic information about the file, such as file name,
            version, date, author:<programlisting># addbiblio.pl, v 1.52.2.6, 2005/05/19, tipaul</programlisting></para>
          </listitem>

          <listitem>
            <para>the standard Koha copyright message:<programlisting># Copyright 2000-2005 Katipo Communications
# Copyright 2005 &lt;author or employer&gt;
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA</programlisting></para>
          </listitem>
        </orderedlist>
      </listitem>

      <listitem>
        <para>All block comments should consist of one or more paragraphs
        built out of complete sentences, and each sentence should end in a
        period.</para>

        <para>Block comments generally apply to some (or all) code that
        follows them, and are indented to the same level as that code. Each
        line of a block comment starts with a # and a single space (unless it
        is indented text inside the comment). Paragraphs inside a block
        comment are separated by a line containing a single #. Block comments
        are best surrounded by a blank line above and below them.</para>
      </listitem>

      <listitem>
        <para>Provide comments at the beginning of every function (unless the
        function is very short and its purpose is obvious) indicating the
        function's purpose, assumptions, and limitations.</para>

        <para>The comments should be a brief introduction to understand why
        the function exists and what it can do. Document how it does it, too,
        if that is not obvious.</para>

        <para>Place a blank line between a function and its description.
        Include information about the sorts of arguments it gets, and what the
        possible values of arguments mean and are used for. Also explain the
        significance of the return value, if there is one.</para>
      </listitem>

      <listitem>
        <para>Use comments on code that consists of loops and logic branches.
        These are key areas that will assist the reader when reading source
        code.</para>
      </listitem>

      <listitem>
        <para>Try to avoid adding comments at the end of a line of code;
        end-line comments make code more difficult to read.</para>

        <para>End-line comments are appropriate, however, when annotating
        variable declarations. In this case, try to align all end-line
        comments at a common tab stop. (End-line comments should be separated
        by at least two spaces from the statement.)</para>
      </listitem>

      <listitem>
        <para>When modifying code, always keep the commenting around it up to
        date.</para>

        <para>Keeping the comments up-to-date when the code changes is a
        priority -- comments that contradict the code are worse than no
        comments! Identify the change with the date and your user name.</para>
      </listitem>

      <listitem>
        <para>Avoid using clutter comments, such as an entire line of
        asterisks. Instead, use white space to separate comments from
        code.</para>

        <para>Avoid the use of superfluous or inappropriate comments, such as
        humorous sidebar remarks.</para>
      </listitem>

      <listitem>
        <para>To prevent recurring problems, always use comments on bug fixes
        and work-around code, especially in this team environment.</para>

        <para>When you want to leave notes about functionalities to be added,
        put <userinput>TODO:</userinput> in front of the actual comments so
        developers can easily search for them.</para>

        <para>When you want to leave notes about bugs to be fixed, put
        <userinput>FIXME:</userinput> in front of the actual comments so
        developers can easily search for them.</para>
      </listitem>
    </orderedlist>

    <para>One other type of comment that developers may overlook is the cvs
    log message added when committing a file, but these comments are also very
    important. The messages should never be omitted and should give enough
    description to let other developers know what you are doing without having
    to read the code itself. In the case of bug fixes, it is also recommended
    that the messages include the bug number and the bug title, as well as a
    brief description of the fix.</para>
  </section>

  <section>
    <title>POD style (in modules)</title>

    <para>Koha modules should be documented with extensive comments written in
    POD ("Plain Old Documentation") format. Instructions for the POD markup
    language can be found in the <ulink
    url="http://perldoc.perl.org/perlpod.html">perlpod</ulink> man
    page.</para>

    <para>POD comments should include as least the following headings:</para>

    <variablelist>
      <varlistentry>
        <term>NAME</term>

        <listitem>
          <para>The name of the module and a very brief description of the
          type of functions contained in the module.</para>
        </listitem>
      </varlistentry>

      <varlistentry>
        <term>SYNOPSIS</term>

        <listitem>
          <para>This may give an example of how to access the module from a
          script, but it may also contain any general discussion of the
          purpose or behavior of the module's functions, and discussion of
          changes made to the module.</para>
        </listitem>
      </varlistentry>

      <varlistentry>
        <term>DESCRIPTION</term>

        <listitem>
          <para>If not included in the SYNOPSIS, a general description of the
          module's purpose should appear here.</para>
        </listitem>
      </varlistentry>

      <varlistentry>
        <term>FUNCTIONS</term>

        <listitem>
          <para>Descriptions of each function in the module, beginning with an
          example of how the function is called and continuing with a
          description of the behavior of the function.</para>
        </listitem>
      </varlistentry>

      <varlistentry>
        <term>AUTHOR</term>

        <listitem>
          <para>This will generally be the "Koha Development Team," but may
          also be an individual developer who has made significant
          contributions to the module. Give a contact e-mail address.</para>
        </listitem>
      </varlistentry>
    </variablelist>

    <para>For two examples, see the POD comments in the
    <filename>Search.pm</filename> module (<userinput>perldoc
    Search.pm</userinput>) and the <filename>Biblio.pm</filename>
    module.</para>
  </section>
</article>



From tipaul at users.sourceforge.net  Mon Jun 13 17:12:21 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 13 Jun 2005 08:12:21 -0700
Subject: [Koha-cvs] CVS: koha/misc/translator/po css_opac_fr_FR.po,1.6.2.4,1.6.2.5 default_intranet_fr_FR.po,1.5.2.5,1.5.2.6
Message-ID: <E1Dhqbt-0002qF-CF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10372/misc/translator/po

Modified Files:
      Tag: rel_2_2
	css_opac_fr_FR.po default_intranet_fr_FR.po 
Log Message:
translation update for 2.2.3 release

Index: css_opac_fr_FR.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/css_opac_fr_FR.po,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -C2 -r1.6.2.4 -r1.6.2.5
*** css_opac_fr_FR.po	31 Mar 2005 07:47:01 -0000	1.6.2.4
--- css_opac_fr_FR.po	13 Jun 2005 15:12:03 -0000	1.6.2.5
***************
*** 9,14 ****
  msgstr ""
  "Project-Id-Version: css_opac_fr_FR\n"
! "POT-Creation-Date: 2005-03-30 15:44+0200\n"
! "PO-Revision-Date: 2005-03-30 16:34+0200\n"
  "Last-Translator: POULAIN <paul at koha-fr.org>\n"
  "Language-Team: fr_FR\n"
--- 9,14 ----
  msgstr ""
  "Project-Id-Version: css_opac_fr_FR\n"
! "POT-Creation-Date: 2005-06-13 14:55+0200\n"
[...2358 lines suppressed...]
  msgid "week"
  msgstr "semaine"
  
! #: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:40
  msgid "year"
  msgstr "ann?e"
--- 2296,2308 ----
  msgstr "vol. %s"
  
! #: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:54
! msgid "wednesday"
! msgstr "mercredi"
! 
! #: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:17
  msgid "week"
  msgstr "semaine"
  
! #: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:41
  msgid "year"
  msgstr "ann?e"

Index: default_intranet_fr_FR.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_fr_FR.po,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -C2 -r1.5.2.5 -r1.5.2.6
*** default_intranet_fr_FR.po	7 Apr 2005 12:02:10 -0000	1.5.2.5
--- default_intranet_fr_FR.po	13 Jun 2005 15:12:13 -0000	1.5.2.6
***************
*** 9,14 ****
  msgstr ""
  "Project-Id-Version: default_intranet_fr_FR\n"
! "POT-Creation-Date: 2005-04-06 14:34+0200\n"
! "PO-Revision-Date: 2005-04-06 14:45+0200\n"
  "Last-Translator: POULAIN <paul at koha-fr.org>\n"
  "Language-Team: fr_FR\n"
--- 9,14 ----
  msgstr ""
  "Project-Id-Version: default_intranet_fr_FR\n"
! "POT-Creation-Date: 2005-06-07 16:19+0200\n"
[...7442 lines suppressed...]
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:144
! #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:140
  msgid "value"
  msgstr "valeur"
***************
*** 13394,13399 ****
  msgstr "semaine"
  
- #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:24
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:25
  msgid "will result in the following issues numbers :"
  msgstr "Donnera les num?ros de parution suivants"
--- 13585,13590 ----
  msgstr "semaine"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:25
+ #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:24
  msgid "will result in the following issues numbers :"
  msgstr "Donnera les num?ros de parution suivants"




From joshferraro at users.sourceforge.net  Tue Jun 14 20:24:25 2005
From: joshferraro at users.sourceforge.net (Joshua Ferraro)
Date: Tue, 14 Jun 2005 11:24:25 -0700
Subject: [Koha-cvs] CVS: koha/misc/sql-datas/english sample_usmarc.readme,NONE,1.1.2.1
Message-ID: <E1DiG5J-0006OS-NQ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/sql-datas/english
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24497

Added Files:
      Tag: rel_2_2
	sample_usmarc.readme 
Log Message:
readme for sample usmarc file.


--- NEW FILE ---
The included sample_usmarc.mrc can be used to demonstrate
import of a set of MARC21 (iso2709) records. The set includes
about 3K records. Note that if you want holdings to work
correctly you'll have to tweak the records to match your
local configuration. To import the records use the 
bulkmarcimport tool in misc/migration_tools/

If you have questions feel free to ask them on the list
or email me directly.

Joshua Ferraro
jmf at liblime dot com




From joshferraro at users.sourceforge.net  Wed Jun 15 01:18:55 2005
From: joshferraro at users.sourceforge.net (Joshua Ferraro)
Date: Tue, 14 Jun 2005 16:18:55 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes favicon.ico,1.1,1.2
Message-ID: <E1DiKgJ-0005GA-DC@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	favicon.ico 
Log Message:
to get rid of pesky log message complaining about favicon.ico






From joshferraro at users.sourceforge.net  Wed Jun 15 01:22:13 2005
From: joshferraro at users.sourceforge.net (Joshua Ferraro)
Date: Tue, 14 Jun 2005 16:22:13 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl favicon.ico,NONE,1.1
Message-ID: <E1DiKjV-0005dL-LM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21595

Added Files:
	favicon.ico 
Log Message:
Getting rid of pesky favicon.ico log message


--- NEW FILE ---


>????

???67789:;???

???010234?5???

???,-./?????

???'()*+??????

???
$

????

?????	?????

????



From hdl at users.sourceforge.net  Wed Jun 15 15:21:25 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 15 Jun 2005 06:21:25 -0700
Subject: [Koha-cvs] CVS: koha/C4 SearchMarc.pm,1.44,1.45
Message-ID: <E1DiXpd-0008Lv-3n@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31993/C4

Modified Files:
	SearchMarc.pm 
Log Message:
Deleting joined tables without condition.
Issues, reserves, items.
Major Bug fixed : Catalogsearch would work no more. 

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** SearchMarc.pm	3 Jun 2005 03:58:26 -0000	1.44
--- SearchMarc.pm	15 Jun 2005 13:21:22 -0000	1.45
***************
*** 281,289 ****
  	my $sth;
  	if ($sql_where2) {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,issues,reserves,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc");
! 		warn "Q2 : select distinct m1.bibid from biblio,biblioitems,items,issues,reserves,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc term is  @$value";
  	} else {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,issues,reserves,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc");
! 		warn "Q : select distinct m1.bibid from biblio,biblioitems,items,issues,reserves,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc";
  	}
  	$sth->execute();
--- 281,289 ----
  	my $sth;
  	if ($sql_where2) {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc");
! 		warn "Q2 : select distinct m1.bibid from biblio,biblioitems,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc term is  @$value";
  	} else {
! 		$sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc");
! 		warn "Q : select distinct m1.bibid from biblio,biblioitems,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc";
  	}
  	$sth->execute();




From hdl at users.sourceforge.net  Wed Jun 15 18:09:46 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 15 Jun 2005 09:09:46 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-MARCdetail.pl,1.6,1.7
Message-ID: <E1DiaSY-000682-F3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23328/opac

Modified Files:
	opac-MARCdetail.pl 
Log Message:
Displaying dashed isbn.

Index: opac-MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-MARCdetail.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** opac-MARCdetail.pl	4 May 2005 09:02:38 -0000	1.6
--- opac-MARCdetail.pl	15 Jun 2005 16:09:42 -0000	1.7
***************
*** 118,121 ****
--- 118,124 ----
  				if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{isurl}) {
  					$subfield_data{marc_value}="<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";
+ 				} elsif ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{kohafield} eq "biblioitems.isbn") {
+ #					warn " tag : ".$tagslib->{$fields[$x_i]->tag()}." subfield :".$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}. "ISBN : ".$subf[$i][1]."PosttraitementISBN :".DisplayISBN($subf[$i][1]);
+ 					$subfield_data{marc_value}=DisplayISBN($subf[$i][1]);
  				} else {
  					if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{authtypecode}) {




From hdl at users.sourceforge.net  Wed Jun 15 18:09:46 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 15 Jun 2005 09:09:46 -0700
Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.119,1.120
Message-ID: <E1DiaSY-000685-Ga@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23328/C4

Modified Files:
	Biblio.pm 
Log Message:
Displaying dashed isbn.

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.119
retrieving revision 1.120
diff -C2 -r1.119 -r1.120
*** Biblio.pm	1 Jun 2005 20:43:58 -0000	1.119
--- Biblio.pm	15 Jun 2005 16:09:43 -0000	1.120
***************
*** 71,74 ****
--- 71,75 ----
    
    &FindDuplicate
+   &DisplayISBN
  );
  
***************
*** 476,479 ****
--- 477,481 ----
      my ( $dbh, $bibid ) = @_;
      my $record = MARC::Record->new();
+ #	warn "". $bidid;
  
      #---- TODO : the leader is missing
***************
*** 2621,2625 ****
  	return;
  }
! 
  END { }    # module clean-up code here (global destructor)
  
--- 2623,2661 ----
  	return;
  }
! sub DisplayISBN {
! 	my ($isbn)=@_;
! 	my $seg1;
! 	if(substr($isbn, 0, 1) <=7) {
! 		$seg1 = substr($isbn, 0, 1);
! 	} elsif(substr($isbn, 0, 2) <= 94) {
! 		$seg1 = substr($isbn, 0, 2);
! 	} elsif(substr($isbn, 0, 3) <= 995) {
! 		$seg1 = substr($isbn, 0, 3);
! 	} elsif(substr($isbn, 0, 4) <= 9989) {
! 		$seg1 = substr($isbn, 0, 4);
! 	} else {
! 		$seg1 = substr($isbn, 0, 5);
! 	}
! 	my $x = substr($isbn, length($seg1));
! 	my $seg2;
! 	if(substr($x, 0, 2) <= 19) {
! # 		if(sTmp2 < 10) sTmp2 = "0" sTmp2;
! 		$seg2 = substr($x, 0, 2);
! 	} elsif(substr($x, 0, 3) <= 699) {
! 		$seg2 = substr($x, 0, 3);
! 	} elsif(substr($x, 0, 4) <= 8399) {
! 		$seg2 = substr($x, 0, 4);
! 	} elsif(substr($x, 0, 5) <= 89999) {
! 		$seg2 = substr($x, 0, 5);
! 	} elsif(substr($x, 0, 6) <= 9499999) {
! 		$seg2 = substr($x, 0, 6);
! 	} else {
! 		$seg2 = substr($x, 0, 7);
! 	}
! 	my $seg3=substr($x,length($seg2));
! 	$seg3=substr($seg3,0,length($seg3)-1) ;
! 	my $seg4 = substr($x, -1, 1);
! 	return "$seg1-$seg2-$seg3-$seg4";
! }
  END { }    # module clean-up code here (global destructor)
  
***************
*** 2636,2639 ****
--- 2672,2678 ----
  # $Id$
  # $Log$
+ # Revision 1.120  2005/06/15 16:09:43  hdl
+ # Displaying dashed isbn.
+ #
  # Revision 1.119  2005/06/01 20:43:58  genjimoto
  # patch from Genji (Waylon R.) to update subjects in MARC tables when systempref has MARC=OFF




From hdl at users.sourceforge.net  Wed Jun 15 18:09:46 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 15 Jun 2005 09:09:46 -0700
Subject: [Koha-cvs] CVS: koha MARCdetail.pl,1.26,1.27
Message-ID: <E1DiaSY-00068B-O3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23328

Modified Files:
	MARCdetail.pl 
Log Message:
Displaying dashed isbn.

Index: MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/MARCdetail.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** MARCdetail.pl	1 Mar 2005 13:40:47 -0000	1.26
--- MARCdetail.pl	15 Jun 2005 16:09:44 -0000	1.27
***************
*** 116,121 ****
--- 116,125 ----
  				$subfield_data{marc_lib}=$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{lib};
  				$subfield_data{link}=$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{link};
+ # 				warn "tag : ".$tagslib->{$fields[$x_i]->tag()}." subfield :".$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}."lien koha? : "$subfield_data{link};
  				if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{isurl}) {
  					$subfield_data{marc_value}="<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";
+ 				} elsif ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{kohafield} eq "biblioitems.isbn") {
+ #					warn " tag : ".$tagslib->{$fields[$x_i]->tag()}." subfield :".$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}. "ISBN : ".$subf[$i][1]."PosttraitementISBN :".DisplayISBN($subf[$i][1]);
+ 					$subfield_data{marc_value}=DisplayISBN($subf[$i][1]);
  				} else {
  					if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{authtypecode}) {




From hdl at users.sourceforge.net  Wed Jun 15 21:55:16 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 15 Jun 2005 12:55:16 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.19,1.20
Message-ID: <E1Didym-0005r5-Qo@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac.css 
Log Message:
Displaying overdues with red font.


Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** opac.css	4 May 2005 08:58:30 -0000	1.19
--- opac.css	15 Jun 2005 19:55:14 -0000	1.20
***************
*** 268,271 ****
--- 268,282 ----
  /* BLOCS */
  
+ #problem {
+ 	color: white;
+ 	font-weight:bold;
+ 	background-color:red;
+ }
+ .problem {
+ 	color: white;
+ 	font-weight:bold;
+ 	background-color:red;
+ }
+ 
  /* the mainbloc : everything is in mainbloc, except menu */
  #mainbloc {




From hdl at users.sourceforge.net  Wed Jun 15 21:55:17 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 15 Jun 2005 12:55:17 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-user.tmpl,1.9,1.10
Message-ID: <E1Didyn-0005rB-0O@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac-user.tmpl 
Log Message:
Displaying overdues with red font.


Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** opac-user.tmpl	4 May 2005 08:58:32 -0000	1.9
--- opac-user.tmpl	15 Jun 2005 19:55:14 -0000	1.10
***************
*** 61,69 ****
  			</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>
--- 61,71 ----
  			</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>
***************
*** 71,85 ****
  						<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>
--- 73,76 ----




From hdl at users.sourceforge.net  Thu Jun 16 17:06:25 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 16 Jun 2005 08:06:25 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes intranet-main.css,1.4,1.4.2.1
Message-ID: <E1Divwn-0008PW-Ar@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	intranet-main.css 
Log Message:
adding rapid links to pages inside

Index: intranet-main.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/intranet-main.css,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** intranet-main.css	30 Jul 2004 14:29:40 -0000	1.4
--- intranet-main.css	16 Jun 2005 15:06:22 -0000	1.4.2.1
***************
*** 55,59 ****
  	text-align:center;
  	background-color:#ad11ad;
! 	color: #FFFFFF;
  	text-decoration: normal;
  	font-weight: bold;
--- 55,59 ----
  	text-align:center;
  	background-color:#ad11ad;
! 	color: #000000;
  	text-decoration: normal;
  	font-weight: bold;
***************
*** 84,87 ****
--- 84,106 ----
  }
  
+ h2 {
+ 	margin-top:0px;
+ 	margin-bottom:4px;
+ 	text-align:center;
+ 	padding:0px;
+ 	font-size:125%;
+ 	padding-left:10px;
+ 	padding-right:10px;
+ 	padding-bottom:3px;
+ 	padding-top:3px;
+ }
+ h2.reports{
+ 	text-align:center;
+ 	background-color: #6b7cbe;
+ 	color: #FFFFFF;
+ 	text-decoration: normal;
+ 	font-weight: bold;
+ }
+ 
  h1.circulation{
  	text-align:center;
***************
*** 92,95 ****
--- 111,123 ----
  }
  
+ h1.authority {
+ 	text-align:center;
+ 	background-color: #6b7cbe;
+ 	color:#000000;
+ 	text-decoration: normal;
+ 	font-weight: bold;
+ 	background-image:none;
+ 	}
+ 
  h1.parameters{
  	text-align:center;
***************
*** 121,125 ****
  	cursor: hand;
  	background-color:#ad11ad;
! 	color:#FFFFFF;
  	font-weight: bold;
  	border:1px solid #000000;
--- 149,153 ----
  	cursor: hand;
  	background-color:#ad11ad;
! 	color:#000000;
  	font-weight: bold;
  	border:1px solid #000000;
***************
*** 127,131 ****
  	}
  
! a.members {
  	font-weight: normal;
  	text-decoration: none;
--- 155,167 ----
  	}
  
! .little {
! 	font-weight: normal;
! 	font-size:10pt;
! 	padding:0px 0px 0px 0px;
! 	text-decoration: none;
! 	line-height:100%;
! 	}
! 
! .members {
  	font-weight: normal;
  	text-decoration: none;
***************
*** 135,139 ****
  	line-height:200%;
  	}
! a.members:hover {
  	background-color: #86c268;
  	border:1px solid #000000;
--- 171,175 ----
  	line-height:200%;
  	}
! .members:hover {
  	background-color: #86c268;
  	border:1px solid #000000;
***************
*** 144,148 ****
  	}
  
! a.acquisition {
  	font-weight: normal;
  	text-decoration: none;
--- 180,200 ----
  	}
  
! a.authority {
! 	font-weight: normal;
! 	text-decoration: none;
! 	cursor: hand;
! 	color:#777777;
! 	font-weight: bold;
! 	line-height:200%;
! 	}
! a.authority:hover {
! 	background-color: #6b7cbe;
! 	border:1px solid #000000;
! 	color: #000000;
! 	text-decoration: none;
! 	font-weight: bold;
! 	}
! 
! .acquisition {
  	font-weight: normal;
  	text-decoration: none;
***************
*** 152,156 ****
  	line-height:200%;
  	}
! a.acquisition:hover {
  	background-color: #ffdf61;
  	border:1px solid #000000;
--- 204,208 ----
  	line-height:200%;
  	}
! .acquisition:hover {
  	background-color: #ffdf61;
  	border:1px solid #000000;
***************
*** 169,172 ****
--- 221,225 ----
  	line-height:200%;
  	}
+ 
  a.reports:hover {
  	background-color: #6b7cbe;
***************
*** 178,182 ****
  	}
  
! a.circulation {
  	font-weight: normal;
  	text-decoration: none;
--- 231,235 ----
  	}
  
! .circulation {
  	font-weight: normal;
  	text-decoration: none;
***************
*** 186,190 ****
  	line-height:200%;
  	}
! a.circulation:hover {
  	background-color: #be6170;
  	border:1px solid #000000;
--- 239,243 ----
  	line-height:200%;
  	}
! .circulation:hover {
  	background-color: #be6170;
  	border:1px solid #000000;
***************
*** 262,263 ****
--- 315,323 ----
  	padding:0px;
  }
+ 
+ #bloc25, .bloc25 {
+ 	float:left;
+ 	border:1px solid #000000;
+ 	margin:0px;
+ 	padding:0px;
+ }




From hdl at users.sourceforge.net  Thu Jun 16 17:06:26 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 16 Jun 2005 08:06:26 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en intranet-main.tmpl,1.25,1.25.2.1
Message-ID: <E1Divwo-0008Pg-1J@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	intranet-main.tmpl 
Log Message:
adding rapid links to pages inside

Index: intranet-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -C2 -r1.25 -r1.25.2.1
*** intranet-main.tmpl	20 Sep 2004 15:25:22 -0000	1.25
--- intranet-main.tmpl	16 Jun 2005 15:06:23 -0000	1.25.2.1
***************
*** 43,46 ****
--- 43,55 ----
  			layer.style.visibility = 'hidden';
  		}
+ 		function addauthority() {
+ 			X = document.forms["f"].authtype.value;
+ 			window.location="/cgi-bin/koha/authorities/authorities.pl?authtypecode="+X;
+ 		}
+ 		function searchauthority() {
+ 			X = document.forms["f"].authtype2.value;
+ 			Y = document.forms["f"].value.value;
+ 			window.location="/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&authtypecode="+X+"&value="+Y+"&marclist=&and_or=and&excluding=&operator=contains";
+ 		}
  	</script>
  	<script language="javascript" type="text/javascript">
***************
*** 115,126 ****
  			<h1 class="acquisition">Acquisitions</h1>
  			Order items, receive orders, set budgets...
  		</div>
  		<div id="Hint4" class="hint">
  			<h1 class="reports">Reports</h1>
  			All the system reports
  		</div>
  		<div id="Hint5" class="hint">
! 			<h1 class="reports">Authorities</h1>
  			Authorities management &amp; searches
  		</div>
  		<div id="Hint6" class="hint">
--- 124,204 ----
  			<h1 class="acquisition">Acquisitions</h1>
  			Order items, receive orders, set budgets...
+ 			<form action="/cgi-bin/koha/acqui/order.pl" method="post">
+ 			Supplier name : <input type="text"  size="25"   name="supplier">
+ 			<input type="submit" class="button acquisition" value="OK">
+ 			</form>
+ 			<p>or <a href="histsearch.pl" class="button acquisition">Search order history</a></p>
+ 			
  		</div>
  		<div id="Hint4" class="hint">
  			<h1 class="reports">Reports</h1>
  			All the system reports
+ 			<div id="bloc25">
+ 			<h2 class="reports">Stats</h2>
+ 			<ul>
+ 			<li>on catalogue
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/inventory.pl">Inventory/Stocktaking</a></p>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalogue by itemtype</a></p>
+ 			<li>on issues
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/stats.pl?time=yesterday">Till Reconcipation:</a> Daily Report (yesterday)</p>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/stats.pl?time=today">Till Reconcipation:</a> Daily Report (today)</p>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/overdue.pl">Overdue items</a></p>
+ 			</ul>
+ 			</div>
+ 			<div id="bloc25">
+ 			<h2 class="reports">Stat wizards</h2>
+ 			<table>
+ 			<tr>
+ 			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions</a></td>
+ 			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/borrowers_stats.pl">Borrowers</a></td>
+ 			</tr>
+ 			<tr>
+ 			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/catalogue_stats.pl">Catalogue</a></td>
+ 			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/issues_stats.pl">Circulation</a></td>
+ 			</tr>
+ 			</table>
+ 			</div>
+ 			<div id="bloc25">
+ 			<h2 class="reports">Top Lists</h2>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/bor_issues_top.pl">Most issuing Borrowers</a></p>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/cat_issues_top.pl">Most issued items</a></p>
+ 			</div>
  		</div>
+ 		
  		<div id="Hint5" class="hint">
! 			<h1 class="authority">Authorities</h1>
  			Authorities management &amp; searches
+ 			<form name="f" >
+ 				<h2 >
+ 					<select name="authtype">
+ 					<!-- TMPL_LOOP NAME="authtypesloop" -->
+ 						<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
+ 							<!-- TMPL_VAR NAME="authtypetext" -->
+ 						</option>
+ 					<!-- /TMPL_LOOP -->
+ 					</select>
+ 					<a href="javascript:addauthority()" class="authority">Add Authority</a>
+ 				</h2>
+ 				<h2>Search 
+ 				<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
+ 				in
+ 					<select name="authtype2">
+ 					<!-- TMPL_LOOP NAME="authtypesloop" -->
+ 						<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
+ 							<!-- TMPL_VAR NAME="authtypetext" -->
+ 						</option>
+ 					<!-- /TMPL_LOOP -->
+ 					</select>
+ 				</h2>
+ 				<input type="hidden" name="marclist" value="">
+ 				<input type="hidden" name="and_or" value="and">
+ 				<input type="hidden" name="excluding" value="">
+ 				<input type="hidden" name="operator" value="contains">
+ 				<input type="hidden" name="op" value="do_search">
+ 				<img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0">
+ 				<a href="javascript:searchauthority()" class="authority">
+ 					Search
+ 				</a>
+ 			</form>
  		</div>
  		<div id="Hint6" class="hint">
***************
*** 133,136 ****
--- 211,230 ----
  			<h1 class="circulation">Circulation</h1>
  			Work at the front desk on Issues and returns using only a barcode reader and a mouse
+ 				<h2 class="circulation">
+ 					Issue
+ 				</h2>
+ 				<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+ 					<p>Enter borrower card number or partial last name <input name="findborrower">
+ 					<input type="submit" value="OK" class="button circulation"></p>
+ 				</form>
+ 				<h2 class="circulation">
+ 					Return
+ 				</h2>
+ 				<form method="post" action="/cgi-bin/koha/circ/returns.pl">
+ 				<p>Enter Book Barcode</p>
+ 				<label class="label20">Item Barcode:</label><input name="barcode" size="10">
+ 				<input type="submit" value="OK" class="button circulation">
+ 				</form>
+ 
  		</div>
  <!-- MAIN MENU -->




From hdl at users.sourceforge.net  Thu Jun 16 17:06:26 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 16 Jun 2005 08:06:26 -0700
Subject: [Koha-cvs] CVS: koha mainpage.pl,1.9,1.9.2.1
Message-ID: <E1Divwo-0008Pi-2E@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32277

Modified Files:
      Tag: rel_2_2
	mainpage.pl 
Log Message:
adding rapid links to pages inside

Index: mainpage.pl
===================================================================
RCS file: /cvsroot/koha/koha/mainpage.pl,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -r1.9 -r1.9.2.1
*** mainpage.pl	22 Dec 2003 14:54:53 -0000	1.9
--- mainpage.pl	16 Jun 2005 15:06:23 -0000	1.9.2.1
***************
*** 8,13 ****
--- 8,24 ----
  use CGI;
  use C4::Auth;
+ use C4::AuthoritiesMarc;
+ use C4::Koha;
  
  my $query = new CGI;
+ my $authtypes = getauthtypes;
+ my @authtypesloop;
+ foreach my $thisauthtype (sort { $authtypes->{$a} <=> $authtypes->{$b} } keys %$authtypes) {
+ 	my %row =(value => $thisauthtype,
+ 				authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
+ 			);
+ 	push @authtypesloop, \%row;
+ }
+ 
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "intranet-main.tmpl",
***************
*** 25,28 ****
--- 36,40 ----
  my $marc_p = C4::Context->boolean_preference("marc");
  $template->param(NOTMARC => !$marc_p);
+ $template->param(authtypesloop => \@authtypesloop);
  
  output_html_with_http_headers $query, $cookie, $template->output;




From tipaul at users.sourceforge.net  Thu Jun 16 17:35:29 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:35:29 -0700
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.6.2.8,1.6.2.9
Message-ID: <E1DiwOv-0003tX-Pz@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14962/C4

Modified Files:
      Tag: rel_2_2
	Bull.pm 
Log Message:
formating dates to user format

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.6.2.8
retrieving revision 1.6.2.9
diff -C2 -r1.6.2.8 -r1.6.2.9
*** Bull.pm	6 Jun 2005 16:00:56 -0000	1.6.2.8
--- Bull.pm	16 Jun 2005 15:35:27 -0000	1.6.2.9
***************
*** 102,105 ****
--- 102,106 ----
  	return @issuelist;
  }
+ 
  sub newsubscription {
  	my ($auser,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber,
***************
*** 141,144 ****
--- 142,146 ----
  	return $subscriptionid;
  }
+ 
  sub getsubscription {
  	my ($subscriptionid) = @_;
***************
*** 179,185 ****
--- 181,194 ----
  	while (my $subs = $sth->fetchrow_hashref) {
  		$subs->{startdate} = format_date($subs->{startdate});
+ 		$subs->{histstartdate} = format_date($subs->{histstartdate});
  		$subs->{opacnote} =~ s/\n/\<br\/\>/g;
  		$subs->{missinglist} =~ s/\n/\<br\/\>/g;
  		$subs->{recievedlist} =~ s/\n/\<br\/\>/g;
+ 		$subs->{"periodicity".$subs->{periodicity}} = 1;
+ 		if ($subs->{enddate} eq '0000-00-00') {
+ 			$subs->{enddate}='';
+ 		} else {
+ 			$subs->{enddate} = format_date($subs->{enddate});
+ 		}
  		push @res,$subs;
  	}
***************
*** 215,219 ****
  			my $temp=$res[scalar(@res)-1]->{'serials'};
  			push @$temp,
! 				{'planneddate' => $subs->{'planneddate'}, 
  				'serialseq' => $subs->{'serialseq'},
  				'status1' => $subs->{'status'}==1,
--- 224,228 ----
  			my $temp=$res[scalar(@res)-1]->{'serials'};
  			push @$temp,
! 				{'planneddate' => format_date($subs->{'planneddate'}), 
  				'serialseq' => $subs->{'serialseq'},
  				'status1' => $subs->{'status'}==1,
***************
*** 225,234 ****
  			$first=1 if (not $year);
  			$year= $subs->{'year'};
! 			$startdate= $subs->{'startdate'};
  			$aqbooksellername= $subs->{'aqbooksellername'};
  			$bibliotitle= $subs->{'bibliotitle'};
  			my @temp;
  			push @temp,
! 				{'planneddate' => $subs->{'planneddate'}, 
  				'serialseq' => $subs->{'serialseq'},
  				'status1' => $subs->{'status'}==1,
--- 234,243 ----
  			$first=1 if (not $year);
  			$year= $subs->{'year'};
! 			$startdate= format_date($subs->{'startdate'});
  			$aqbooksellername= $subs->{'aqbooksellername'};
  			$bibliotitle= $subs->{'bibliotitle'};
  			my @temp;
  			push @temp,
! 				{'planneddate' => format_date($subs->{'planneddate'}), 
  				'serialseq' => $subs->{'serialseq'},
  				'status1' => $subs->{'status'}==1,




From tipaul at users.sourceforge.net  Thu Jun 16 17:37:18 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:37:18 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/circ - New directory
Message-ID: <E1DiwQg-000401-Nd@sc8-pr-cvs1.sourceforge.net>

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

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/help/circ added to the repository
--> Using per-directory sticky tag `rel_2_2'





From tipaul at users.sourceforge.net  Thu Jun 16 17:37:50 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:37:50 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/export - New directory
Message-ID: <E1DiwRC-00041b-Mg@sc8-pr-cvs1.sourceforge.net>

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

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/help/export added to the repository
--> Using per-directory sticky tag `rel_2_2'





From tipaul at users.sourceforge.net  Thu Jun 16 17:38:07 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:38:07 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/import - New directory
Message-ID: <E1DiwRT-00042G-9R@sc8-pr-cvs1.sourceforge.net>

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

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/help/import added to the repository
--> Using per-directory sticky tag `rel_2_2'





From tipaul at users.sourceforge.net  Thu Jun 16 17:38:38 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:38:38 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/export marc.tmpl,NONE,1.1.2.1
Message-ID: <E1DiwRy-00045a-Pw@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
      Tag: rel_2_2
	marc.tmpl 
Log Message:
online help (missing files or cvs problem on my computer)

--- NEW FILE ---
<!-- TMPL_INCLUDE name="help-top.inc" -->
<h1>iso 2709 export</h1>
<p>This is a tool to export your bibliographic records in standard MARC communications format (ISO2709). It exports only the basic bibliographic information with no holdings information other than any holdings information originally loaded into Koha using the bulkmarcimport tool.</p>

<p>You are asked to provide a starting biblio record number and an ending number for the export. If you want to export all of your records, leave the start and end numbers blank.</p>

<p>Records are downloaded to the workstation that requests the export and are saved in a file called "marc.pl."</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->




From tipaul at users.sourceforge.net  Thu Jun 16 17:38:38 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:38:38 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/circ circulation.tmpl,NONE,1.1.2.1 returns.tmpl,NONE,1.1.2.1
Message-ID: <E1DiwRy-00045W-NZ@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
      Tag: rel_2_2
	circulation.tmpl returns.tmpl 
Log Message:
online help (missing files or cvs problem on my computer)

--- NEW FILE ---
<!-- TMPL_INCLUDE name="help-top.inc" -->
<h1>Circulation / Issues help</h1>
<p>Before you begin, it is very important that you take note of the branch and printer settings and change them if necessary. This should only have to be done the first time you do circulations from a workstation, after which a browser cookie will remember the correct settings. If you do circulations under the wrong branch settings (for example, your branch setting is "Suburb," but you are actually working at the "Downtown" branch), then Koha will reset the location of all items scanned to the incorrect branch (Suburb) and the statistical reports will credit all circulations to the wrong branch.</p>

<p>Now start by scanning the borrower's barcode or type in their name to find their account. Once Koha has found the borrower, you will see a new form for scanning or typing the item's identifying number (usually a barcode).</p>

<p>If you wish to have this item and all subsequent items in this transaction to have a date due other than the default date due defined for the item type, use the "Sticky Due Date" to set the date due before scanning the first item.</p>

<p>If the issuing has nothing specific, it will be done immediatly and shown (with other borrower issues) at bottom.</p>
<p>If the issuing is problematic, then another box will appear (in <b>RED</b>) and ask for confirmation if possible. If the issuing is really impossible (for example, the barcode does not exist), then you can't confirm the issue. If it is possible but has something that needs confirmation (like item being issued to another borrower, or borrower having issued too many items), then you must confirm the issuing. If the confirmation means another operation (if item is issued to another borrower, then issuing also means make the return), then it's also done</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE name="help-top.inc" -->
<h1>Circulation / Returns help</h1>
<p>Before you begin, it is very important that you take note of the branch and printer settings and change them if necessary. This should only have to be done the first time you do circulations (or returns) from a workstation, after which a browser cookie will remember the correct settings. If you do returns under the wrong branch settings (for example, your branch setting is "Suburb," but you are actually working at the "Downtown" branch), then Koha will reset the location of all items scanned to the incorrect branch (Suburb).</p>

<p>Now simply scan or type the returned item's identifying number (usually a barcode) in the box provided.</p>

<p>The return is done and if there is something specific for the item or the borrower (like borrower having debts), a red box will warn you</p>
<p>If the item has been requested by someone else, you also are asked to validate the request. If you confirm it, item is changed to a "waiting" status and you should warn the borrower that the item is available</p>
<p>If the item is requested by someone in anothe branch, then you must validate the transfer too</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->




From tipaul at users.sourceforge.net  Thu Jun 16 17:38:38 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:38:38 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/import breeding.tmpl,NONE,1.1.2.1
Message-ID: <E1DiwRy-00045f-Sz@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
      Tag: rel_2_2
	breeding.tmpl 
Log Message:
online help (missing files or cvs problem on my computer)

--- NEW FILE ---
<!-- TMPL_INCLUDE name="help-top.inc" -->
<h1>Import iso2709 file</h1>
<p>This is one of the screens you will see frequently if you are starting from scratch.</p>
<p>It is useful to import a bunch of iso2709 biblios that can be used later for a quick cataloguing</p>
<p>First, you need to browse your computer to find the MARC record that you grabbed for your item. Click on</p>
<p>Choose File to browse.</p>
<p>If you aren't sure if you've already imported a record, keep the radio button set to</p>
<p>Ignore this one, keep the existing one.</p>
<p>You can "name" the import to help you when you need to choose between more than 1 imported biblio (or just want to keep trace on where the biblios comes from)</p>
<p>You can also change char encoding between MARC21 and UNIMARC</p>
<p>You don't need to actually name every import, so you don't need to fill in this box if you don't want to. It is useful for telling imports apart if you've more than one of the same record.</p>
<p><b>IMPORTANT : This tool is NOT intended to import iso2709 in your ACTIVE DB. If you need to migrate datas from another ILS, then you must consider $kohaInstall/scripts/misc/bulkmarcimport.pl</b></p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->




From tipaul at users.sourceforge.net  Thu Jun 16 17:39:53 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:39:53 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/images filefind.png,NONE,1.1.2.1
Message-ID: <E1DiwTB-0004GI-HD@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
      Tag: rel_2_2
	filefind.png 
Log Message:
adding the little glass to CVS

--- NEW FILE ---
?PNG



T}?????
???s????~??????&B%"tttp??E????????.?Q?\P??LmB(?Z?????????E?????;w??'??~?ct:????W,????I?R???1::???r??7xqp_?	??XL?1$$???)???????LO????{y???
??r9w??
J?sss??w???9???|????????8ccc+?t????_??}v??????)?O??
????}???
?(?(??qQ?x?]?`%DG\????*?J
`???j?(????Dx6???X?6???<
?
122??g??
???	@T?N?d???Yj?????	??^??FFF??
?;w?????



From tipaul at users.sourceforge.net  Thu Jun 16 17:41:12 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:41:12 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac-top.inc,1.8.2.5,1.8.2.6
Message-ID: <E1DiwUS-0004VF-7Z@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-top.inc 
Log Message:
changing popup size

Index: opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc,v
retrieving revision 1.8.2.5
retrieving revision 1.8.2.6
diff -C2 -r1.8.2.5 -r1.8.2.6
*** opac-top.inc	6 Jun 2005 14:07:27 -0000	1.8.2.5
--- opac-top.inc	16 Jun 2005 15:41:09 -0000	1.8.2.6
***************
*** 25,29 ****
  	var MSG_NO_RECORD_ADDED = _("No biblio added");
  	function Dopop(link) {
! 		newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
  	}
  	</script>
--- 25,29 ----
  	var MSG_NO_RECORD_ADDED = _("No biblio added");
  	function Dopop(link) {
! 		newin=window.open(link,'popup','width=700,height=500,toolbar=false,scrollbars=yes');
  	}
  	</script>




From tipaul at users.sourceforge.net  Thu Jun 16 17:40:17 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:40:17 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.17.2.6,1.17.2.7
Message-ID: <E1DiwTZ-0004IG-VB@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac.css 
Log Message:
minor changes in css for better IE compliance

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.17.2.6
retrieving revision 1.17.2.7
diff -C2 -r1.17.2.6 -r1.17.2.7
*** opac.css	6 Jun 2005 14:06:14 -0000	1.17.2.6
--- opac.css	16 Jun 2005 15:40:15 -0000	1.17.2.7
***************
*** 169,173 ****
  	vertical-align:top;
  	position:static;
- /*	position:relative;*/
  	display:table-cell;
  }
--- 169,172 ----
***************
*** 379,405 ****
  /* for SubscritptionHistory view  */
  div.tabsubs {
! 	width:25px;
! 	margin-left:10px;
! 	margin-top:100px;
  }
  
  div.tabsubs a {
- 	display:block;
  	font-size: small;
  	border: thin solid black;
  	margin-right: 2px;
! 	padding: 15px 30px;
! 	-moz-border-radius: 5px 0px 0px 5px;
  }
  
  div.tabsub {
  	background-color: #ACE6E6;
  	visibility:hidden;
! 	margin-left:72px;
! 	margin-top:100px;
! 	margin-right:10%;
  }
  
- 
  /* for MARC view  */
  div.tabs {
--- 378,402 ----
  /* for SubscritptionHistory view  */
  div.tabsubs {
! 	margin-left:150px;
! 	position:inline;
  }
  
  div.tabsubs a {
  	font-size: small;
  	border: thin solid black;
  	margin-right: 2px;
! 	padding: 10px 10px;
! 	-moz-border-radius: 5px 5px 0px 0px;
  }
  
  div.tabsub {
  	background-color: #ACE6E6;
+ 	position:absolute;
  	visibility:hidden;
! 	margin-left:150px;
! 	margin-top:0px;
! border:4px;
  }
  
  /* for MARC view  */
  div.tabs {




From tipaul at users.sourceforge.net  Thu Jun 16 17:42:12 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:42:12 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-full-serial-issues.tmpl,1.1.2.3,1.1.2.4
Message-ID: <E1DiwVQ-0004b0-7e@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-full-serial-issues.tmpl 
Log Message:
* css change for better IE compliance
* adding switch from complete to compact history view

Index: opac-full-serial-issues.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/Attic/opac-full-serial-issues.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** opac-full-serial-issues.tmpl	6 Jun 2005 12:16:06 -0000	1.1.2.3
--- opac-full-serial-issues.tmpl	16 Jun 2005 15:42:03 -0000	1.1.2.4
***************
*** 3,7 ****
  
  <!-- TMPL_UNLESS name="popup" -->
- <div id="mainbloc">
  	<h1 class="catalogue">Subscription information for biblio #<!-- TMPL_VAR NAME="biblionumber" --> with title : <!-- TMPL_VAR name="bibliotitle" --></h1>
  	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Back to biblio</a>
--- 3,6 ----
***************
*** 10,16 ****
  	<!-- TMPL_LOOP NAME="years" -->
  		<!-- TMPL_IF NAME="year" -->
! 			<div id="link<!--TMPL_VAR Name="year" -->" ><a href="javascript:active(<!-- TMPL_VAR NAME="year" -->)"><!-- TMPL_VAR NAME="year" --></a></div>
  		<!-- /TMPL_IF -->
  	<!-- /TMPL_LOOP -->
  	</div>
  
--- 9,16 ----
  	<!-- TMPL_LOOP NAME="years" -->
  		<!-- TMPL_IF NAME="year" -->
! 			<a  class="tabsubs" href="javascript:active(<!-- TMPL_VAR NAME="year" -->)"><!-- TMPL_VAR NAME="year" --></a>
  		<!-- /TMPL_IF -->
  	<!-- /TMPL_LOOP -->
+ 	<a class="tabsubs" href="opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->&selectview=small">Compact view</a>
  	</div>
  
***************
*** 45,50 ****
  	</div>
  	<!--/TMPL_LOOP -->
- </div>
  <script language="JavaScript" type="text/javascript">
  function active(numlayer)
  {
--- 45,50 ----
  	</div>
  	<!--/TMPL_LOOP -->
  <script language="JavaScript" type="text/javascript">
+ active(<!-- TMPL_VAR name="yearmin" -->);
  function active(numlayer)
  {




From tipaul at users.sourceforge.net  Thu Jun 16 17:43:46 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:43:46 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-searchresults.tmpl,1.20.2.4,1.20.2.5
Message-ID: <E1DiwWw-0004ud-E1@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-searchresults.tmpl 
Log Message:
changing some html (minor)

Index: opac-searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl,v
retrieving revision 1.20.2.4
retrieving revision 1.20.2.5
diff -C2 -r1.20.2.4 -r1.20.2.5
*** opac-searchresults.tmpl	6 Jun 2005 14:11:47 -0000	1.20.2.4
--- opac-searchresults.tmpl	16 Jun 2005 15:43:44 -0000	1.20.2.5
***************
*** 54,69 ****
  				<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 -->
--- 54,68 ----
  				<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 -->




From tipaul at users.sourceforge.net  Thu Jun 16 17:44:34 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:44:34 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-serial-issues.tmpl,1.2.2.4,1.2.2.5
Message-ID: <E1DiwXi-0004yS-0k@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-serial-issues.tmpl 
Log Message:
proofread & better english & better look

Index: opac-serial-issues.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -C2 -r1.2.2.4 -r1.2.2.5
*** opac-serial-issues.tmpl	6 Jun 2005 14:12:14 -0000	1.2.2.4
--- opac-serial-issues.tmpl	16 Jun 2005 15:44:31 -0000	1.2.2.5
***************
*** 3,11 ****
  <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>
  	<!-- 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" -->
--- 3,13 ----
  <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" -->
***************
*** 43,70 ****
  		<!-- /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 -->
***************
*** 72,77 ****
  			<!-- TMPL_IF name="monthlength" --><!-- TMPL_VAR name="monthlength" --> months<!-- /TMPL_IF -->
  			</b>
- 		since <b><!-- TMPl_VAR name="startdate" --></b>
  		</p>
  	<!--TMPL_UNLESS Name=fullinfo -->
  		<p><!-- TMPL_VAR name="notes" --></p>
--- 71,77 ----
  			<!-- 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>




From tipaul at users.sourceforge.net  Thu Jun 16 17:46:01 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:46:01 -0700
Subject: [Koha-cvs] CVS: koha/misc/migration_tools check_marc_definition.pl,1.1.2.2,1.1.2.3
Message-ID: <E1DiwZ7-00058n-PK@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/migration_tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19752/misc/migration_tools

Modified Files:
      Tag: rel_2_2
	check_marc_definition.pl 
Log Message:
improving script with a new parameter to show all the subfields usage.

Index: check_marc_definition.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/migration_tools/check_marc_definition.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** check_marc_definition.pl	7 Apr 2005 12:00:57 -0000	1.1.2.2
--- check_marc_definition.pl	16 Jun 2005 15:45:59 -0000	1.1.2.3
***************
*** 15,22 ****
  use Getopt::Long;
  my ( $input_marc_file, $number) = ('',0);
! my ($version,$confirm);
  GetOptions(
      'h' => \$version,
      'c' => \$confirm,
  );
  
--- 15,23 ----
  use Getopt::Long;
  my ( $input_marc_file, $number) = ('',0);
! my ($version,$confirm,$all);
  GetOptions(
      'h' => \$version,
      'c' => \$confirm,
+ 	'a' => \$all,
  );
  
***************
*** 26,29 ****
--- 27,32 ----
  It show all fields/subfields that are in the MARC DB but NOT in any tab (= fields used but not visible) Usually, this means you made an error in your MARC editor. Sometimes, this is something normal.
  
+ options
+ \t-a : will show all subfields usages, not only subfields in tab ignore that are used.
  Enter $0 -c to run this script (the -c being here only to "confirm"
  EOF
***************
*** 38,47 ****
  my %tags;
  my $sth2 = $dbh->prepare("select tab,liblibrarian,kohafield from marc_subfield_structure where tagfield=? and tagsubfield=? and frameworkcode=?");
  while (my ($total,$tag,$subfield,$frameworkcode) = $sth->fetchrow) {
  	$sth2->execute($tag,$subfield,$frameworkcode);
  	$tags{$frameworkcode." / ".$tag." / ".$subfield} ++;
  	my ($tab,$liblibrarian,$kohafield) = $sth2->fetchrow;
! 	if ($tab eq -1 && $kohafield ne "biblio.biblionumber" && $kohafield ne "biblioitems.biblioitemnumber" && $kohafield ne "items.itemnumber") {
! 		print "Tab ignore for framework $frameworkcode, $tag\$$subfield - $liblibrarian (used $total times)\n";
  	}
  }
--- 41,57 ----
  my %tags;
  my $sth2 = $dbh->prepare("select tab,liblibrarian,kohafield from marc_subfield_structure where tagfield=? and tagsubfield=? and frameworkcode=?");
+ if ($all) {
+ 	print "framework|tag|subfield|value|used|tab\n";
+ }
  while (my ($total,$tag,$subfield,$frameworkcode) = $sth->fetchrow) {
  	$sth2->execute($tag,$subfield,$frameworkcode);
  	$tags{$frameworkcode." / ".$tag." / ".$subfield} ++;
  	my ($tab,$liblibrarian,$kohafield) = $sth2->fetchrow;
! 	if ($all) {
! 		print $frameworkcode."|".$tag.'|$'.$subfield."|".$liblibrarian."|".$total."|".$tab."\n";
! 	} else {
! 		if ($tab eq -1 && $kohafield ne "biblio.biblionumber" && $kohafield ne "biblioitems.biblioitemnumber" && $kohafield ne "items.itemnumber") {
! 			print "Tab ignore for framework $frameworkcode, $tag\$$subfield - $liblibrarian (used $total times)\n";
! 		}
  	}
  }




From tipaul at users.sourceforge.net  Thu Jun 16 17:47:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:47:54 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-serial-issues.pl,1.1.2.6,1.1.2.7
Message-ID: <E1Diwaw-0005Qk-MA@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20840/opac

Modified Files:
      Tag: rel_2_2
	opac-serial-issues.pl 
Log Message:
switching to complete or standard history view

Index: opac-serial-issues.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-serial-issues.pl,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -r1.1.2.6 -r1.1.2.7
*** opac-serial-issues.pl	3 Jun 2005 12:53:08 -0000	1.1.2.6
--- opac-serial-issues.pl	16 Jun 2005 15:47:52 -0000	1.1.2.7
***************
*** 15,20 ****
  my $op = $query->param('op');
  my $dbh = C4::Context->dbh;
! my $selectview = C4::Context->preference("SubscriptionHistory");
! warn "selectview : ".$selectview;
  
  my $sth;
--- 15,20 ----
  my $op = $query->param('op');
  my $dbh = C4::Context->dbh;
! my $selectview = $query->param('selectview');
! $selectview = C4::Context->preference("SubscriptionHistory") unless $selectview;
  
  my $sth;
***************
*** 23,77 ****
  my $biblionumber = $query->param('biblionumber');
  if ($selectview eq "full"){
! my $subscriptions = get_full_subscription_list_from_biblionumber($biblionumber);
! 
! my $title = $subscriptions->[0]{bibliotitle};
! warn "title ".$title;
! my $yearmin=$subscriptions->[0]{year};
! warn "yearmin ".$yearmin;
! my $yearmax=$subscriptions->[scalar(@$subscriptions)-1]{year};
! warn "yearmax ".$yearmax;
! 
! 
! ($template, $loggedinuser, $cookie)
! = get_template_and_user({template_name => "opac-full-serial-issues.tmpl",
! 				query => $query,
! 				type => "opac",
! 				authnotrequired => 1,
! 				debug => 1,
! 				});
! 
! # replace CR by <br> in librarian note
! # $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
! 
! $template->param(
! 	biblionumber => $query->param('biblionumber'),
! 	years => $subscriptions,
! 	yearmin => $yearmin,
! 	yearmax =>$yearmax,
! 	bibliotitle => $title,
! 	suggestion => C4::Context->preference("suggestion"),
! 	virtualshelves => C4::Context->preference("virtualshelves"),
! 	);
  
  } else {
! my $subscriptions = get_subscription_list_from_biblionumber($biblionumber);
! 
! ($template, $loggedinuser, $cookie)
! = get_template_and_user({template_name => "opac-serial-issues.tmpl",
! 				query => $query,
! 				type => "opac",
! 				authnotrequired => 1,
! 				debug => 1,
! 				});
! 
! # replace CR by <br> in librarian note
! # $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
! 
! $template->param(
! 	biblionumber => $query->param('biblionumber'),
! 	subscription_LOOP => $subscriptions,
! 	suggestion => C4::Context->preference("suggestion"),
! 	virtualshelves => C4::Context->preference("virtualshelves"),
! 	);
  }
  output_html_with_http_headers $query, $cookie, $template->output;
--- 23,77 ----
  my $biblionumber = $query->param('biblionumber');
  if ($selectview eq "full"){
! 	my $subscriptions = get_full_subscription_list_from_biblionumber($biblionumber);
! 	
! 	my $title = $subscriptions->[0]{bibliotitle};
! # 	warn "title ".$title;
! 	my $yearmin=$subscriptions->[0]{year};
! # 	warn "yearmin ".$yearmin;
! 	my $yearmax=$subscriptions->[scalar(@$subscriptions)-1]{year};
! # 	warn "yearmax ".$yearmax;
! 	
! 	
! 	($template, $loggedinuser, $cookie)
! 	= get_template_and_user({template_name => "opac-full-serial-issues.tmpl",
! 					query => $query,
! 					type => "opac",
! 					authnotrequired => 1,
! 					debug => 1,
! 					});
! 	
! 	# replace CR by <br> in librarian note
! 	# $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
! 	
! 	$template->param(
! 		biblionumber => $query->param('biblionumber'),
! 		years => $subscriptions,
! 		yearmin => $yearmin,
! 		yearmax =>$yearmax,
! 		bibliotitle => $title,
! 		suggestion => C4::Context->preference("suggestion"),
! 		virtualshelves => C4::Context->preference("virtualshelves"),
! 		);
  
  } else {
! 	my $subscriptions = get_subscription_list_from_biblionumber($biblionumber);
! 	
! 	($template, $loggedinuser, $cookie)
! 	= get_template_and_user({template_name => "opac-serial-issues.tmpl",
! 					query => $query,
! 					type => "opac",
! 					authnotrequired => 1,
! 					debug => 1,
! 					});
! 	
! 	# replace CR by <br> in librarian note
! 	# $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
! 	
! 	$template->param(
! 		biblionumber => $query->param('biblionumber'),
! 		subscription_LOOP => $subscriptions,
! 		suggestion => C4::Context->preference("suggestion"),
! 		virtualshelves => C4::Context->preference("virtualshelves"),
! 		);
  }
  output_html_with_http_headers $query, $cookie, $template->output;




From tipaul at users.sourceforge.net  Thu Jun 16 17:49:09 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:49:09 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-user.pl,1.14.2.2,1.14.2.3
Message-ID: <E1Diwc9-0005cu-3i@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21579/opac

Modified Files:
      Tag: rel_2_2
	opac-user.pl 
Log Message:
adding opac text messaging to login page.

Index: opac-user.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-user.pl,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -C2 -r1.14.2.2 -r1.14.2.3
*** opac-user.pl	25 Mar 2005 17:04:28 -0000	1.14.2.2
--- opac-user.pl	16 Jun 2005 15:49:05 -0000	1.14.2.3
***************
*** 137,143 ****
  $template->param(WAITING => \@waiting);
  $template->param(waiting_count => $wcount,
! 			     LibraryName => C4::Context->preference("LibraryName"),
! 					suggestion => C4::Context->preference("suggestion"),
! 					virtualshelves => C4::Context->preference("virtualshelves"),
  );
  
--- 137,144 ----
  $template->param(WAITING => \@waiting);
  $template->param(waiting_count => $wcount,
! 				LibraryName => C4::Context->preference("LibraryName"),
! 				suggestion => C4::Context->preference("suggestion"),
! 				virtualshelves => C4::Context->preference("virtualshelves"),
! 				textmessaging => $borr->{textmessaging},
  );
  




From tipaul at users.sourceforge.net  Thu Jun 16 17:49:42 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:49:42 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_123i.pl,NONE,1.1.2.2 unimarc_field_123j.pl,NONE,1.1.2.2 unimarc_field_225a.pl,1.8.2.2,1.8.2.3
Message-ID: <E1Diwcg-0005fE-NE@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21727/value_builder

Modified Files:
      Tag: rel_2_2
	unimarc_field_225a.pl 
Added Files:
      Tag: rel_2_2
	unimarc_field_123i.pl unimarc_field_123j.pl 
Log Message:
missing plugins

--- NEW FILE ---
#!/usr/bin/perl

# $Id: unimarc_field_123i.pl,v 1.1.2.2 2005/06/16 15:49:40 tipaul Exp $

# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use C4::Auth;
use CGI;
use C4::Context;
use HTML::Template;
use C4::Search;
use C4::Output;

=head1

plugin_parameters : other parameters added when the plugin is called by the dopop function

=cut
sub plugin_parameters {
my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
return "";
}

sub plugin_javascript {
my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
my $function_name= "123i".(int(rand(100000))+1);
my $res="
<script>
function Focus$function_name(subfield_managed) {
return 1;
}

function Blur$function_name(subfield_managed) {
	return 1;
}

function Clic$function_name(i) {
	defaultvalue=document.forms[0].field_value[i].value;
	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123i.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123i\",'width=800,height=400,toolbar=false,scrollbars=yes');

}
</script>
";

return ($function_name,$res);
}
sub plugin {
my ($input) = @_;
	my %env;

#	my $input = new CGI;
	my $index= $input->param('index');
	my $result= $input->param('result');


	my $dbh = C4::Context->dbh;

my ($template, $loggedinuser, $cookie)
    = get_template_and_user({template_name => "value_builder/unimarc_field_123i.tmpl",
			     query => $input,
			     type => "intranet",
			     authnotrequired => 0,
			     flagsrequired => {parameters => 1},
			     debug => 1,
			     });
	my $f1 = substr($result,0,1);
	my $f2 = substr($result,1,3);
	my $f3 = substr($result,4,2);
	my $f4 = substr($result,6,2);
	$template->param(index => $index,
			 "f1$f1" => $f1,
			 f2 => $f2,
			 f3 => $f3,
			 f4 => $f4);
	print $input->header(-cookie => $cookie),$template->output;
}

1;

--- NEW FILE ---
#!/usr/bin/perl

# $Id: unimarc_field_123j.pl,v 1.1.2.2 2005/06/16 15:49:40 tipaul Exp $

# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along with
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA  02111-1307 USA

use strict;
use C4::Auth;
use CGI;
use C4::Context;
use HTML::Template;
use C4::Search;
use C4::Output;

=head1

plugin_parameters : other parameters added when the plugin is called by the dopop function

=cut
sub plugin_parameters {
my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
return "";
}

sub plugin_javascript {
my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
my $function_name= "123j".(int(rand(100000))+1);
my $res="
<script>
function Focus$function_name(subfield_managed) {
return 1;
}

function Blur$function_name(subfield_managed) {
	return 1;
}

function Clic$function_name(i) {
	defaultvalue=document.forms[0].field_value[i].value;
	newin=window.open(\"../plugin_launcher.pl?plugin_name=unimarc_field_123j.pl&index=\"+i+\"&result=\"+defaultvalue,\"unimarc field 123j\",'width=800,height=400,toolbar=false,scrollbars=yes');

}
</script>
";

return ($function_name,$res);
}
sub plugin {
my ($input) = @_;
	my %env;

#	my $input = new CGI;
	my $index= $input->param('index');
	my $result= $input->param('result');


	my $dbh = C4::Context->dbh;

my ($template, $loggedinuser, $cookie)
    = get_template_and_user({template_name => "value_builder/unimarc_field_123j.tmpl",
			     query => $input,
			     type => "intranet",
			     authnotrequired => 0,
			     flagsrequired => {parameters => 1},
			     debug => 1,
			     });
	my $f1 = substr($result,0,1);
	my $f2 = substr($result,1,3);
	my $f3 = substr($result,4,2);
	my $f4 = substr($result,6,2);
	$template->param(index => $index,
			 "f1$f1" => $f1,
			 f2 => $f2,
			 f3 => $f3,
			 f4 => $f4);
	print $input->header(-cookie => $cookie),$template->output;
}

1;





From tipaul at users.sourceforge.net  Thu Jun 16 17:51:07 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:51:07 -0700
Subject: [Koha-cvs] CVS: koha/z3950 processz3950queue,1.13.2.1,1.13.2.2
Message-ID: <E1Diwe3-0005mu-98@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/z3950
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22225/z3950

Modified Files:
      Tag: rel_2_2
	processz3950queue 
Log Message:
fix for UNIMARC BNF behaviour (now work as expected)

Index: processz3950queue
===================================================================
RCS file: /cvsroot/koha/koha/z3950/processz3950queue,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -C2 -r1.13.2.1 -r1.13.2.2
*** processz3950queue	30 Mar 2005 09:53:39 -0000	1.13.2.1
--- processz3950queue	16 Jun 2005 15:51:05 -0000	1.13.2.2
***************
*** 281,292 ****
  									for ($i=1; $i<=(($numresults<80) ? ($numresults) : (80)); $i++) {
  										my $rec=$rs->record($i);
!  										my $marcdata;
! 										# use render() or rawdata() depending on the type of the returned record
! 										if (ref($rec) eq "Net::Z3950::Record::USMARC") {
! 											$marcdata = $rec->rawdata();
! 										}
! 										if (ref($rec) eq "Net::Z3950::Record::UNIMARC") {
! 											$marcdata = $rec->rawdata();
! 										}
  										$globalencoding = ref($rec);
   										$result.=$marcdata;
--- 281,285 ----
  									for ($i=1; $i<=(($numresults<80) ? ($numresults) : (80)); $i++) {
  										my $rec=$rs->record($i);
!  										my $marcdata = $rec->rawdata();
  										$globalencoding = ref($rec);
   										$result.=$marcdata;




From tipaul at users.sourceforge.net  Thu Jun 16 17:50:24 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 16 Jun 2005 08:50:24 -0700
Subject: [Koha-cvs] CVS: koha/z3950/server zed-koha-server.pl,1.4,1.4.2.1
Message-ID: <E1DiwdM-0005it-8P@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/z3950/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21986/z3950/server

Modified Files:
      Tag: rel_2_2
	zed-koha-server.pl 
Log Message:
bugfix in SQL query. Now the z3950 server works...

Index: zed-koha-server.pl
===================================================================
RCS file: /cvsroot/koha/koha/z3950/server/zed-koha-server.pl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** zed-koha-server.pl	3 Jun 2004 01:48:19 -0000	1.4
--- zed-koha-server.pl	16 Jun 2005 15:50:22 -0000	1.4.2.1
***************
*** 58,62 ****
  use C4::Biblio;
  use strict;
! my $dbh = C4::Context->dbh;
  my @bib_list;		## Stores the list of biblionumbers in a query 
  			## I should eventually move this to different scope
--- 58,62 ----
  use C4::Biblio;
  use strict;
! # my $dbh = C4::Context->dbh;
  my @bib_list;		## Stores the list of biblionumbers in a query 
  			## I should eventually move this to different scope
***************
*** 86,89 ****
--- 86,90 ----
  sub run_query {		## Run the query and store the biblionumbers: 
  	my ($sql_query, $query, $args) = @_;
+ 		my $dbh = C4::Context->dbh;
         	my $sth_get = $dbh->prepare("$sql_query");
  
***************
*** 145,149 ****
  		print "The query was:\n";        
  		print "$query\n";
! 		my $sql_query = "SELECT marc_biblio.bibid FROM marc_biblio RIGHT JOIN biblio ON marc_biblio.biblionumber = biblio.biblionumber WHERE biblio.isbn LIKE ?";
  		&run_query($sql_query, $query, $args);
  
--- 146,150 ----
  		print "The query was:\n";        
  		print "$query\n";
! 		my $sql_query = "SELECT marc_biblio.bibid FROM marc_biblio RIGHT JOIN biblioitems ON marc_biblio.biblionumber = biblioitems.biblionumber WHERE biblioitems.isbn LIKE ?";
  		&run_query($sql_query, $query, $args);
  
***************
*** 269,392 ****
          $offset -= 1;                   ## because $args->{OFFSET} 1 = record #1
          chomp (my $bibid = $bib_list[$offset]); ## Not sure about this
!                 ## print "the bibid is:$bibid\n";
!                 my $MARCRecord = &MARCgetbiblio($dbh,$bibid);
!                 my $recordstring=$MARCRecord->as_usmarc();
!                 ## print "here is my record: $recordstring\n";
! 
! 		## Troubleshooting:
! 		## use Data::Dumper;
! 		## Dumper $recordstring;
! 		## open (MARC, ">/root/marc.dump");
!                 ## print MARC "$recordstring";
! 		## close MARC;
! 		
! 		## Convert from 852/4 to 952:
! 		## 942a --> 852a  Organization code
! 		## 952b --> 852b  Home branch
! 		## 942k --> 852h  Classification
! 		## 952p --> 852p  Barcode
! 
! my $record = MARC::Record->new_from_usmarc($recordstring);
!     my @fields942 = $record->field('942');
!     my $field842 = $fields942[0];
! 	my ($field952, $sub852a, $sub852k, $sub852b, $sub852p, $sub852h);
!        
! 
! ## while ( my $record = $batch->next() ) {
!   ##  my @fields942 = $record->field('942');
!   ##  my $field842 = $fields942[0];
!   ##     #grab first 942 (only need one, they are same for all items)
!   ##  my $sub852a = ($field842->subfield('a') || '');
!   ##  my $sub852h = ($field842->subfield('k') || '');
! 
!   ##  my @fields952 = $record->field('952');
!   ##  foreach my $field952 (@fields952) {   #get all 952s
!   ##      my $sub852b = ($field952->subfield('b') || '');
!   ##      my $sub852p = ($field952->subfield('p') || '');
! 
! 
! #grab first 942 (only need one, they are same for all items)
! 	unless (! $field952){
! 		$sub852a = ($field952->subfield('a') || '') ;
! }
! 	unless (! $field952){ #->subfield('k')) { 
! 		$sub852k = ($field952->subfield('k') || '') ;
! 
! }
! 
!     my @fields952 = $record->field('952');
!     foreach my $field952 (@fields952) {   #get all 952s
!         
!         unless (! $field952) { #->subfield('b')) { 
! 		$sub852b = ($field952->subfield('b') || '') ;
! } 
!  unless (! $field952) { #->subfield('p')) { 
! 		$sub852p = ($field952->subfield('p') || '') ;
! }
!      #make it one big happy family
!         my $new852 = MARC::Field->new(
!                                       852,'','',
!                                       'a' => $sub852a,
! 				      'b' => $sub852b,
!                                       'h' => $sub852h,
!                                       'p' => $sub852p,
!                                       );
!         $record->append_fields($new852);
! 
! }
! 
! my $recordstringdone = $record->as_usmarc();
! 
  		## Set the REP_FORM
! 		$args->{REP_FORM} = &Net::Z3950::OID::usmarc;
  		
  		## Return the record string to the client 
! 	        $args->{RECORD} = $recordstringdone;
  
  }
  
- # That's all folks!
- # 
- # OLD OLD OLD OLD
- 
- sub fetch_handler_old {
- 	my ($args) = @_;	
- 	# warn "in fetch_handler";	## troubleshooting
- 	my $offset = $args->{OFFSET};
- 	$offset -= 1;			## because $args->{OFFSET} 1 = record #1
- 	chomp (my $bibid = $bib_list[$offset]);	## Not sure about this
-         my $sql_query = "SELECT tag, subfieldcode, subfieldvalue FROM marc_subfield_table where bibid=?";
- 	my $sth_get = $dbh->prepare("$sql_query");
-         $sth_get->execute($bibid);
- 	
- 	## create a MARC::Record object 
-         my $rec = MARC::Record->new();
- 
- 	## create the fields
-         while (my @data=$sth_get->fetchrow_array) {
- 
-         	my $tag = $data[0];
-        		my $subfieldcode = $data[1];
-         	my $subfieldvalue = $data[2];
- 
-         	my $field = MARC::Field->new(
-                 	                          $tag,'','',
-                         	                  $subfieldcode => $subfieldvalue,
-                                 	    );
  
-  	       	$rec->append_fields($field);
- 		
- 		## build the marc string and put into $record         
-         	my $tmp_record = $rec->as_usmarc();
- 		my $reclen = length $tmp_record;
- 		my $baseaddr = "$reclen + dirlen";
- #		set_leader_lengths($reclen,$baseaddr);
- 		my $record = $rec->as_usmarc(); 	
- 		$args->{RECORD} = $record;
- 	}
- 
- }
- 
- 	
  ## This stuff doesn't work yet...I should include boolean searching someday
  ## though
--- 270,287 ----
          $offset -= 1;                   ## because $args->{OFFSET} 1 = record #1
          chomp (my $bibid = $bib_list[$offset]); ## Not sure about this
! 				## print "the bibid is:$bibid\n";
! 				my $dbh = C4::Context->dbh;
! 				my $MARCRecord = &MARCgetbiblio($dbh,$bibid);
! 				$MARCRecord->leader('     nac  22     1u 4500');
  		## Set the REP_FORM
! 		$args->{REP_FORM} = &Net::Z3950::OID::unimarc;
  		
  		## Return the record string to the client 
! 			$args->{RECORD} = $MARCRecord->as_usmarc();
! # 	        $args->{RECORD} = $recordstringdone;
  
  }
  
  
  ## This stuff doesn't work yet...I should include boolean searching someday
  ## though




From hellen at users.sourceforge.net  Thu Jun 16 20:31:32 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 16 Jun 2005 11:31:32 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/bookshelves shelves.tmpl,1.3,1.4
Message-ID: <E1Diz9I-0005uR-As@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/bookshelves
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22530/koha-tmpl/intranet-tmpl/default/de/bookshelves

Modified Files:
	shelves.tmpl 
Log Message:
translated by hellen

Index: shelves.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/bookshelves/shelves.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** shelves.tmpl	9 Jun 2005 08:37:42 -0000	1.3
--- shelves.tmpl	16 Jun 2005 18:31:25 -0000	1.4
***************
*** 11,15 ****
  				<tr colspan="4">
  					<th class="catalogue">l&ouml;schen</th>
! 					<th class="catalogue">Strichcode</th>
  					<th class="catalogue">Titel</th>
  					<th class="catalogue">Verfasser</th>
--- 11,15 ----
  				<tr colspan="4">
  					<th class="catalogue">l&ouml;schen</th>
! 					<th class="catalogue">Barcode</th>
  					<th class="catalogue">Titel</th>
  					<th class="catalogue">Verfasser</th>
***************
*** 28,32 ****
  			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
  			<!-- TMPL_IF name="manageshelf" -->
! 				<input type="submit" value="Ausgew&auml;hlte exemplare l&ouml;schen" class="button catalogue">
  			<!-- /TMPL_IF -->
  		</div>
--- 28,32 ----
  			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
  			<!-- TMPL_IF name="manageshelf" -->
! 				<input type="submit" value="Ausgew&auml;hlte Exemplare l&ouml;schen" class="button catalogue">
  			<!-- /TMPL_IF -->
  		</div>
***************
*** 106,110 ****
  	<!-- TMPL_ELSE -->
  		<div id="bloc25">
! 			<h2 class="catalogue">Shelf-Liste</h2>
  			<table class="small">
  				<tr>
--- 106,110 ----
  	<!-- TMPL_ELSE -->
  		<div id="bloc25">
! 			<h2 class="catalogue">Regalliste</h2>
  			<table class="small">
  				<tr>
***************
*** 145,149 ****
  		</div>
  		<div id="bloc25">
! 			<a href="shelves.pl?shelves=1" class="button catalogue">Virtueles Regal hinzuf&uuml;gen oder l&ouml;schen</a>
  		</div>
  	<!-- /TMPL_IF -->
--- 145,149 ----
  		</div>
  		<div id="bloc25">
! 			<a href="shelves.pl?shelves=1" class="button catalogue">Virtuelles Regal hinzuf&uuml;gen oder l&ouml;schen</a>
  		</div>
  	<!-- /TMPL_IF -->




From hellen at users.sourceforge.net  Thu Jun 16 20:31:32 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Thu, 16 Jun 2005 11:31:32 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/parameters aqbudget.tmpl,1.1,1.2
Message-ID: <E1Diz9I-0005ua-HE@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22530/koha-tmpl/intranet-tmpl/default/de/parameters

Modified Files:
	aqbudget.tmpl 
Log Message:
translated by hellen

Index: aqbudget.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/aqbudget.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** aqbudget.tmpl	12 May 2005 19:26:35 -0000	1.1
--- aqbudget.tmpl	16 Jun 2005 18:31:30 -0000	1.2
***************
*** 107,111 ****
  			</p>
  			<p>
! 				<label class="label100">Name des Etats</label><!-- TMPL_VAR NAME="bookfundname" -->
  			</p>
  		<!-- /TMPL_IF -->
--- 107,111 ----
  			</p>
  			<p>
! 				<label class="label100">Etatname</label><!-- TMPL_VAR NAME="bookfundname" -->
  			</p>
  		<!-- /TMPL_IF -->




From hdl at users.sourceforge.net  Thu Jun 16 21:10:12 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 16 Jun 2005 12:10:12 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bull statecollection.tmpl,1.5,1.6
Message-ID: <E1Dizki-00032s-Tf@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	statecollection.tmpl 
Log Message:
Adding 2 status to serial issues :
	- delete : to delete the current issue
	- not issued : to distinguish missing from not issued serial number.

Index: statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** statecollection.tmpl	4 May 2005 08:52:51 -0000	1.5
--- statecollection.tmpl	16 Jun 2005 19:10:09 -0000	1.6
***************
*** 54,57 ****
--- 54,67 ----
  						<option value="4">Missing</option>
  					<!-- /TMPL_IF -->
+ 					<!--TMPL_IF name="status5" -->
+ 						<option value="5" selected>Not issued</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="5">Not issued</option>
+ 					<!-- /TMPL_IF -->
+ 					<!--TMPL_IF name="status6" -->
+ 						<option value="6" selected>Delete</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="6">Delete</option>
+ 					<!-- /TMPL_IF -->
  				</select>
  			</td>
***************
*** 98,101 ****
--- 108,115 ----
  		<p>Missing issues</p>
  		<p>&nbsp;<textarea name="missinglist" COLS=60 ROWS=2><!-- TMPL_VAR name="missinglist" --></textarea></p>
+ 		<!--TMPL_IF Name="notissuedlist"-->
+ 		<p>Not issued</p>
+ 		<p>&nbsp;<textarea name="notissuedlist" COLS=60 ROWS=2><!-- TMPL_VAR name="notissuedlist" --></textarea></p>
+ 		<!--/TMPL_IF-->
  		<p>Opac's note</p>
  		<p>&nbsp;<textarea name="opacnote" COLS=60 ROWS=5><!-- TMPL_VAR name="opacnote" --></textarea></p>




From hdl at users.sourceforge.net  Thu Jun 16 21:10:15 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 16 Jun 2005 12:10:15 -0700
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.9,1.10
Message-ID: <E1Dizkl-00033Q-Pr@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11586/C4

Modified Files:
	Bull.pm 
Log Message:
Adding 2 status to serial issues :
	- delete : to delete the current issue
	- not issued : to distinguish missing from not issued serial number.

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Bull.pm	4 May 2005 15:40:01 -0000	1.9
--- Bull.pm	16 Jun 2005 19:10:10 -0000	1.10
***************
*** 51,55 ****
  			&Find_Next_Date, &Get_Next_Seq
  			&hassubscriptionexpired &subscriptionexpirationdate &subscriptionrenew
! 			&getSupplierListWithLateIssues &GetLateIssues);
  
  sub getSupplierListWithLateIssues {
--- 51,55 ----
  			&Find_Next_Date, &Get_Next_Seq
  			&hassubscriptionexpired &subscriptionexpirationdate &subscriptionrenew
! 			&getSupplierListWithLateIssues &GetLateIssues &serialdelete);
  
  sub getSupplierListWithLateIssues {
***************
*** 275,279 ****
  	my $dbh = C4::Context->dbh;
  	# status = 2 is "arrived"
! 	my $sth=$dbh->prepare("select serialid,serialseq, status, planneddate from serial where subscriptionid = ? and status <>2 and status <>4");
  	$sth->execute($subscriptionid);
  	my @serials;
--- 275,279 ----
  	my $dbh = C4::Context->dbh;
  	# status = 2 is "arrived"
! 	my $sth=$dbh->prepare("select serialid,serialseq, status, planneddate from serial where subscriptionid = ? and status <>2 and status <>4 and status <>5");
  	$sth->execute($subscriptionid);
  	my @serials;
***************
*** 289,296 ****
  }
  
! sub serialchangestatus {
! 	my ($serialid,$serialseq,$planneddate,$status)=@_;
! # 	warn "($serialid,$serialseq,$planneddate,$status)";
! 	# 1st, get previous status : if we change from "waited" to something else, then we will have to create a new "waited" entry
  	my $dbh = C4::Context->dbh;
  	my $sth = $dbh->prepare("select subscriptionid,status from serial where serialid=?");
--- 289,294 ----
  }
  
! sub serialdelete {
! 	my ($serialid,$serialseq)=@_;
  	my $dbh = C4::Context->dbh;
  	my $sth = $dbh->prepare("select subscriptionid,status from serial where serialid=?");
***************
*** 298,314 ****
  	my ($subscriptionid,$oldstatus) = $sth->fetchrow;
  	# change status & update subscriptionhistory
! 	$sth = $dbh->prepare("update serial set serialseq=?,planneddate=?,status=? where serialid = ?");
! 	$sth->execute($serialseq,$planneddate,$status,$serialid);
  	$sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
  	$sth->execute($subscriptionid);
  	my ($missinglist,$recievedlist) = $sth->fetchrow;
! 	if ($status eq 2) {
! 		$recievedlist .= ",$serialseq";
! 	}
! 	if ($status eq 4) {
! 		$missinglist .= ",$serialseq";
! 	}
  	$sth=$dbh->prepare("update subscriptionhistory set recievedlist=?, missinglist=? where subscriptionid=?");
  	$sth->execute($recievedlist,$missinglist,$subscriptionid);
  	# create new waited entry if needed (ie : was a "waited" and has changed)
  	if ($oldstatus eq 1 && $status ne 1) {
--- 296,336 ----
  	my ($subscriptionid,$oldstatus) = $sth->fetchrow;
  	# change status & update subscriptionhistory
! 	my $sth = $dbh->prepare("delete * from serial  where serialid = ?");
! 	$sth->execute($serialid);
  	$sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
  	$sth->execute($subscriptionid);
  	my ($missinglist,$recievedlist) = $sth->fetchrow;
! 	$recievedlist =~ s/",$serialseq"//;
! 	$missinglist =~ s/",$serialseq"//;
  	$sth=$dbh->prepare("update subscriptionhistory set recievedlist=?, missinglist=? where subscriptionid=?");
  	$sth->execute($recievedlist,$missinglist,$subscriptionid);
+ }
+ 
+ sub serialchangestatus {
+ 	my ($serialid,$serialseq,$planneddate,$status)=@_;
+ # 	warn "($serialid,$serialseq,$planneddate,$status)";
+ 	# 1st, get previous status : if we change from "waited" to something else, then we will have to create a new "waited" entry
+ 	my $dbh = C4::Context->dbh;
+ 	my $sth = $dbh->prepare("select subscriptionid,status from serial where serialid=?");
+ 	$sth->execute($serialid);
+ 	my ($subscriptionid,$oldstatus) = $sth->fetchrow;
+ 	# change status & update subscriptionhistory
+ 	if ($status eq 6){
+ 		delissue($serialseq, $subscriptionid) 
+ 	}else{
+ 		$sth = $dbh->prepare("update serial set serialseq=?,planneddate=?,status=? where serialid = ?");
+ 		$sth->execute($serialseq,$planneddate,$status,$serialid);
+ 		$sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
+ 		$sth->execute($subscriptionid);
+ 		my ($missinglist,$recievedlist) = $sth->fetchrow;
+ 		if ($status eq 2) {
+ 			$recievedlist .= ",$serialseq";
+ 		}
+ 		$missinglist .= ",$serialseq" if ($status eq 4) ;
+ 		$missinglist .= ",not issued $serialseq" if ($status eq 5);
+ 		$sth=$dbh->prepare("update subscriptionhistory set recievedlist=?, missinglist=? where subscriptionid=?");
+ 		$sth->execute($recievedlist,$missinglist,$subscriptionid);
+ 	}
+ 
  	# create new waited entry if needed (ie : was a "waited" and has changed)
  	if ($oldstatus eq 1 && $status ne 1) {
***************
*** 335,338 ****
--- 357,367 ----
  }
  
+ sub delissue {
+ 	my ($serialseq,$subscriptionid) = @_;
+ 	my $dbh = C4::Context->dbh;
+ 	my $sth = $dbh->prepare("delete from serial where serialseq= ? and subscriptionid= ? ");
+ 	$sth->execute($serialseq,$subscriptionid);
+ }
+ 
  sub Get_Next_Date(@) {
  	my ($planneddate,$subscription) = @_;




From tipaul at users.sourceforge.net  Fri Jun 17 14:31:46 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Fri, 17 Jun 2005 05:31:46 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-auth.tmpl,1.3,1.3.2.1 opac-MARCdetail.tmpl,1.5.2.2,1.5.2.3 opac-user.tmpl,1.8.2.3,1.8.2.4
Message-ID: <E1DjG0g-0000bi-Od@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-auth.tmpl opac-MARCdetail.tmpl opac-user.tmpl 
Log Message:
last commits before 2.2.3
* css fixes for better IE compliance
* adding LibraryName parameter in login screen

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.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** opac-auth.tmpl	8 Dec 2004 10:26:32 -0000	1.3
--- opac-auth.tmpl	17 Jun 2005 12:31:44 -0000	1.3.2.1
***************
*** 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-MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -C2 -r1.5.2.2 -r1.5.2.3
*** opac-MARCdetail.tmpl	6 Jun 2005 12:38:16 -0000	1.5.2.2
--- opac-MARCdetail.tmpl	17 Jun 2005 12:31:44 -0000	1.5.2.3
***************
*** 28,32 ****
  	<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Add to basket</a>
  </div>
- <div id="mainbloc">
  	<div class="tabs">
  		<!-- TMPL_IF name="0XX" -->
--- 28,31 ----
***************
*** 321,325 ****
  	</div>
  </div>
- </div>
  <script language="JavaScript" type="text/javascript">
  function active(numlayer)
--- 320,323 ----

Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -C2 -r1.8.2.3 -r1.8.2.4
*** opac-user.tmpl	6 Jun 2005 14:13:22 -0000	1.8.2.3
--- opac-user.tmpl	17 Jun 2005 12:31:44 -0000	1.8.2.4
***************
*** 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" -->
  
--- 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" -->
  




From tipaul at users.sourceforge.net  Fri Jun 17 14:31:46 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Fri, 17 Jun 2005 05:31:46 -0700
Subject: [Koha-cvs] CVS: koha/C4 Auth.pm,1.36.2.2,1.36.2.3
Message-ID: <E1DjG0g-0000bN-Bp@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2234/C4

Modified Files:
      Tag: rel_2_2
	Auth.pm 
Log Message:
last commits before 2.2.3
* css fixes for better IE compliance
* adding LibraryName parameter in login screen

Index: Auth.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Auth.pm,v
retrieving revision 1.36.2.2
retrieving revision 1.36.2.3
diff -C2 -r1.36.2.2 -r1.36.2.3
*** Auth.pm	28 Apr 2005 08:26:39 -0000	1.36.2.2
--- Auth.pm	17 Jun 2005 12:31:43 -0000	1.36.2.3
***************
*** 400,404 ****
  
  	my $self_url = $query->url(-absolute => 1);
! 	$template->param(url => $self_url);
  	$template->param(\%info);
  	$cookie=$query->cookie(-name => 'sessionID',
--- 400,404 ----
  
  	my $self_url = $query->url(-absolute => 1);
! 	$template->param(url => $self_url, LibraryName=> => C4::Context->preference("LibraryName"),);
  	$template->param(\%info);
  	$cookie=$query->cookie(-name => 'sessionID',




From tipaul at users.sourceforge.net  Fri Jun 17 14:31:46 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Fri, 17 Jun 2005 05:31:46 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.17.2.7,1.17.2.8
Message-ID: <E1DjG0g-0000bS-Hb@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac.css 
Log Message:
last commits before 2.2.3
* css fixes for better IE compliance
* adding LibraryName parameter in login screen

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.17.2.7
retrieving revision 1.17.2.8
diff -C2 -r1.17.2.7 -r1.17.2.8
*** opac.css	16 Jun 2005 15:40:15 -0000	1.17.2.7
--- opac.css	17 Jun 2005 12:31:44 -0000	1.17.2.8
***************
*** 401,406 ****
  /* for MARC view  */
  div.tabs {
! 	width:10px;
  	display:block;
  }
  
--- 401,408 ----
  /* for MARC view  */
  div.tabs {
! 	width:15px;
  	display:block;
+ 	margin-top:70px;
+ 	margin-left:40px;
  }
  
***************
*** 417,423 ****
  	position:absolute;
  	display:block;
! 	top:123px;
! 	left:42px;
  	border: 1px solid black;
  }
  
--- 419,427 ----
  	position:absolute;
  	display:block;
! 	top:140px;
! 	left:62px;
! 	margin-right:0px;
  	border: 1px solid black;
+ 	background-color:none;
  }
  
***************
*** 428,431 ****
--- 432,437 ----
  	position:absolute;
  	float:left;
+ 	margin-right:0px;
+ 	background-color:none;
  }
  




From hdl at users.sourceforge.net  Fri Jun 17 15:44:27 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 17 Jun 2005 06:44:27 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.18,1.19
Message-ID: <E1DjH91-0001Hs-9M@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac-detail.tmpl 
Log Message:
Detailing the three latest issues on OPAC for serials

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** opac-detail.tmpl	4 May 2005 08:58:31 -0000	1.18
--- opac-detail.tmpl	17 Jun 2005 13:44:25 -0000	1.19
***************
*** 158,167 ****
  	</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>
--- 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>




From hdl at users.sourceforge.net  Fri Jun 17 15:44:27 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 17 Jun 2005 06:44:27 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-detail.pl,1.18,1.19
Message-ID: <E1DjH91-0001Ho-84@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4905/opac

Modified Files:
	opac-detail.pl 
Log Message:
Detailing the three latest issues on OPAC for serials

Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** opac-detail.pl	4 May 2005 09:02:38 -0000	1.18
--- opac-detail.pl	17 Jun 2005 13:44:25 -0000	1.19
***************
*** 30,34 ****
  my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
  my ($websitecount, @websites)             = &getwebsites($biblionumber);
- my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
  
  $dat->{'count'}=@items;
--- 30,33 ----
***************
*** 67,70 ****
--- 66,83 ----
  my $sitearray=\@websites;
  
+ #coping with subscriptions
+ my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
+ my @subscriptions = getsubscriptions($dat->{title},$dat->{issn},$biblionumber);
+ my @subs;
+ foreach my $subscription (@subscriptions){
+ 	warn "subsid :".$subscription->{subscriptionid};
+ 	my %cell;
+ 	$cell{subscriptionid}= $subscription->{subscriptionid};
+ 	$cell{subscriptionnotes}= $subscription->{notes};
+ 	#get the three latest serials.
+ 	$cell{latestserials}=getlatestserials($subscription->{subscriptionid},3);
+ 	push @subs, \%cell;
+ }
+ 
  $template->param(BIBLIO_RESULTS => $resultsarray,
  				ITEM_RESULTS => $itemsarray,
***************
*** 72,75 ****
--- 85,89 ----
  				SITE_RESULTS => $sitearray,
  				subscriptionsnumber => $subscriptionsnumber,
+ 				subscriptions => \@subs,
  			     LibraryName => C4::Context->preference("LibraryName"),
  				suggestion => C4::Context->preference("suggestion"),
***************
*** 108,111 ****
  output_html_with_http_headers $query, $cookie, $template->output;
  
! output_html_with_http_headers $query, $cookie, $template->output;
  
--- 122,125 ----
  output_html_with_http_headers $query, $cookie, $template->output;
  
! #output_html_with_http_headers $query, $cookie, $template->output;
  




From hdl at users.sourceforge.net  Fri Jun 17 15:44:27 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 17 Jun 2005 06:44:27 -0700
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.10,1.11
Message-ID: <E1DjH91-0001Hw-CM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4905/C4

Modified Files:
	Bull.pm 
Log Message:
Detailing the three latest issues on OPAC for serials

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Bull.pm	16 Jun 2005 19:10:10 -0000	1.10
--- Bull.pm	17 Jun 2005 13:44:25 -0000	1.11
***************
*** 51,55 ****
  			&Find_Next_Date, &Get_Next_Seq
  			&hassubscriptionexpired &subscriptionexpirationdate &subscriptionrenew
! 			&getSupplierListWithLateIssues &GetLateIssues &serialdelete);
  
  sub getSupplierListWithLateIssues {
--- 51,55 ----
  			&Find_Next_Date, &Get_Next_Seq
  			&hassubscriptionexpired &subscriptionexpirationdate &subscriptionrenew
! 			&getSupplierListWithLateIssues &GetLateIssues &serialdelete &getlatestserials);
  
  sub getSupplierListWithLateIssues {
***************
*** 288,291 ****
--- 288,306 ----
  	return ($totalissues, at serials);
  }
+ sub getlatestserials{
+ 	my ($subscriptionid,$limit) =@_;
+ 	my $dbh = C4::Context->dbh;
+ 	# status = 2 is "arrived"
+ 	my $strsth="select serialid,serialseq, status, planneddate from serial where subscriptionid = ? and (status =2 or status=4) order by planneddate DESC LIMIT 0,$limit";
+ 	my $sth=$dbh->prepare($strsth);
+ 	$sth->execute($subscriptionid);
+ 	my @serials;
+ 	while(my $line = $sth->fetchrow_hashref) {
+ 		$line->{"status".$line->{status}} = 1; # fills a "statusX" value, used for template status select list
+ 		$line->{"planneddate"} = format_date($line->{"planneddate"});
+ 		push @serials,$line;
+ 	}
+ 	return \@serials;
+ }
  
  sub serialdelete {
***************
*** 317,321 ****
  	# change status & update subscriptionhistory
  	if ($status eq 6){
! 		delissue($serialseq, $subscriptionid) 
  	}else{
  		$sth = $dbh->prepare("update serial set serialseq=?,planneddate=?,status=? where serialid = ?");
--- 332,336 ----
  	# change status & update subscriptionhistory
  	if ($status eq 6){
! 		delissue($serialseq, $subscriptionid); 
  	}else{
  		$sth = $dbh->prepare("update serial set serialseq=?,planneddate=?,status=? where serialid = ?");




From tipaul at users.sourceforge.net  Fri Jun 17 17:51:56 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Fri, 17 Jun 2005 08:51:56 -0700
Subject: [Koha-cvs] CVS: koha/bull statecollection.pl,1.3.2.3,1.3.2.4
Message-ID: <E1DjJ8O-0002Sp-ME@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9456/bull

Modified Files:
      Tag: rel_2_2
	statecollection.pl 
Log Message:
bugfix : when saving a special issue, "arrived" and "missing" status must be stored in history as well.

Index: statecollection.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/statecollection.pl,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -C2 -r1.3.2.3 -r1.3.2.4
*** statecollection.pl	28 Apr 2005 08:26:38 -0000	1.3.2.3
--- statecollection.pl	17 Jun 2005 15:51:54 -0000	1.3.2.4
***************
*** 39,42 ****
--- 39,43 ----
  			serialchangestatus($serialids[$i],$serialseqs[$i],format_date_in_iso($planneddates[$i]),$status[$i]) unless ($hassubscriptionexpired && $oldstatus == 1);
  		} else {
+ 			# add a special issue
  			if ($serialseqs[$i]) {
  				my $subscription=getsubscription($subscriptionid);




From tipaul at users.sourceforge.net  Fri Jun 17 17:53:37 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Fri, 17 Jun 2005 08:53:37 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-dictionary.pl,1.1.2.1,1.1.2.2
Message-ID: <E1DjJA1-0002ih-6j@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10444/opac

Modified Files:
      Tag: rel_2_2
	opac-dictionary.pl 
Log Message:
special bugfix for HDL : when doing X+Y on 2 fields that can have a numeric value, you will get X+Y as result. What you wanted to do was concat(X,Y), to have 700+9 being 7009 and not 709 ;-)

Index: opac-dictionary.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/Attic/opac-dictionary.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac-dictionary.pl	7 Jun 2005 10:23:13 -0000	1.1.2.1
--- opac-dictionary.pl	17 Jun 2005 15:53:35 -0000	1.1.2.2
***************
*** 106,110 ****
  	}
  	$listtags =~s/,$/)/;
! 	$strsth .= $listtags." and marc_word.tagsubfield=marc_subfield_table.tag+marc_subfield_table.subfieldcode group by subfieldvalue ";
  # 	warn "search in biblio : ".$strsth;
  	my $value = uc($search[0]);
--- 106,110 ----
  	}
  	$listtags =~s/,$/)/;
! 	$strsth .= $listtags." and marc_word.tagsubfield=concat(marc_subfield_table.tag,marc_subfield_table.subfieldcode) group by subfieldvalue ";
  # 	warn "search in biblio : ".$strsth;
  	my $value = uc($search[0]);




From tipaul at users.sourceforge.net  Fri Jun 17 17:53:37 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Fri, 17 Jun 2005 08:53:37 -0700
Subject: [Koha-cvs] CVS: koha/search.marc dictionary.pl,1.6.2.2,1.6.2.3
Message-ID: <E1DjJA1-0002il-9O@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10444/search.marc

Modified Files:
      Tag: rel_2_2
	dictionary.pl 
Log Message:
special bugfix for HDL : when doing X+Y on 2 fields that can have a numeric value, you will get X+Y as result. What you wanted to do was concat(X,Y), to have 700+9 being 7009 and not 709 ;-)

Index: dictionary.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.marc/dictionary.pl,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -C2 -r1.6.2.2 -r1.6.2.3
*** dictionary.pl	7 Jun 2005 10:02:01 -0000	1.6.2.2
--- dictionary.pl	17 Jun 2005 15:53:35 -0000	1.6.2.3
***************
*** 106,110 ****
  	}
  	$listtags =~s/,$/)/;
! 	$strsth .= $listtags." and marc_word.tagsubfield=marc_subfield_table.tag+marc_subfield_table.subfieldcode group by subfieldvalue ";
  # 	warn "search in biblio : ".$strsth;
  	my $value = uc($search[0]);
--- 106,110 ----
  	}
  	$listtags =~s/,$/)/;
! 	$strsth .= $listtags." and marc_word.tagsubfield=concat(marc_subfield_table.tag,marc_subfield_table.subfieldcode) group by subfieldvalue ";
  # 	warn "search in biblio : ".$strsth;
  	my $value = uc($search[0]);




From tipaul at users.sourceforge.net  Fri Jun 17 17:51:56 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Fri, 17 Jun 2005 08:51:56 -0700
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.6.2.9,1.6.2.10
Message-ID: <E1DjJ8O-0002St-PG@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9456/C4

Modified Files:
      Tag: rel_2_2
	Bull.pm 
Log Message:
bugfix : when saving a special issue, "arrived" and "missing" status must be stored in history as well.

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.6.2.9
retrieving revision 1.6.2.10
diff -C2 -r1.6.2.9 -r1.6.2.10
*** Bull.pm	16 Jun 2005 15:35:27 -0000	1.6.2.9
--- Bull.pm	17 Jun 2005 15:51:54 -0000	1.6.2.10
***************
*** 406,409 ****
--- 406,420 ----
  	my $sth = $dbh->prepare("insert into serial (serialseq,subscriptionid,biblionumber,status, planneddate) values (?,?,?,?,?)");
  	$sth->execute($serialseq,$subscriptionid,$biblionumber,$status, $planneddate);
+ 	$sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
+ 	$sth->execute($subscriptionid);
+ 	my ($missinglist,$recievedlist) = $sth->fetchrow;
+ 	if ($status eq 2) {
+ 		$recievedlist .= ",$serialseq";
+ 	}
+ 	if ($status eq 4) {
+ 		$missinglist .= ",$serialseq";
+ 	}
+ 	$sth=$dbh->prepare("update subscriptionhistory set recievedlist=?, missinglist=? where subscriptionid=?");
+ 	$sth->execute($recievedlist,$missinglist,$subscriptionid);
  }
  




From tipaul at users.sourceforge.net  Fri Jun 17 17:54:42 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Fri, 17 Jun 2005 08:54:42 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui basket.tmpl,1.15.2.7,1.15.2.8
Message-ID: <E1DjJB4-0002sN-A7@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	basket.tmpl 
Log Message:
bugfix : some columns where "doNotPrint" style & should not

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.15.2.7
retrieving revision 1.15.2.8
diff -C2 -r1.15.2.7 -r1.15.2.8
*** basket.tmpl	7 Jun 2005 12:56:37 -0000	1.15.2.7
--- basket.tmpl	17 Jun 2005 15:54:40 -0000	1.15.2.8
***************
*** 31,35 ****
  			<tr valign="top" bgcolor="#ffdf61">
  				<th class="acquisition doNotPrint">Order</th>
! 				<th class="acquisition">Publisher<a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=biblioitems.publishercode" class="acquisition doNotPrint">[order]</a></th>
  				<th class="acquisition">Title</th>
  				<th class="acquisition">rrp</th>
--- 31,35 ----
  			<tr valign="top" bgcolor="#ffdf61">
  				<th class="acquisition doNotPrint">Order</th>
! 				<th class="acquisition">Publisher<a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=biblioitems.publishercode" class="acquisition">[order]</a></th>
  				<th class="acquisition">Title</th>
  				<th class="acquisition">rrp</th>
***************
*** 53,62 ****
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
  					<!-- TMPL_IF name="closedate" -->
! 						<td><p>
  							<b><!-- TMPL_VAR NAME="title" --></b><br/>
  								<!-- TMPL_VAR NAME="author" -->
  								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! 							</p>
  						</td>
  					<!-- TMPL_ELSE -->
--- 53,61 ----
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
  					<!-- TMPL_IF name="closedate" -->
! 						<td>
  							<b><!-- TMPL_VAR NAME="title" --></b><br/>
  								<!-- TMPL_VAR NAME="author" -->
  								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --><p class="doNotPrint"><i><!--TMPL_VAR name="notes" --></i></p><!-- /TMPL_IF -->
  						</td>
  					<!-- TMPL_ELSE -->




From hdl at users.sourceforge.net  Fri Jun 17 18:37:03 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 17 Jun 2005 09:37:03 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters systempreferences.tmpl,1.31,1.32
Message-ID: <E1DjJq3-0001CX-49@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	systempreferences.tmpl 
Log Message:
Displaying system preferences by category

Index: systempreferences.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** systempreferences.tmpl	11 Feb 2005 16:52:53 -0000	1.31
--- systempreferences.tmpl	17 Jun 2005 16:37:00 -0000	1.32
***************
*** 137,140 ****
--- 137,176 ----
  	<!-- TMPL_IF NAME="else" -->
  	<h1>System preferences admin</h1>
+ 	<table>
+ 		<tr>
+ 			<td>
+ 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin">Admin
+ 				</a>
+ 			</td>
+ 			<td>
+ 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions">Acquisitions
+ 				</a>
+ 			</td>
+ 			<td>
+ 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities">Authorities
+ 				</a>
+ 			</td>
+ 			<td>
+ 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue">Catalogue
+ 				</a>
+ 			</td>
+ 			<td>
+ 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation">Circulation
+ 				</a>
+ 			</td>
+ 			<td>
+ 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members">Members
+ 				</a>
+ 			</td>
+ 			<td>
+ 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC">OPAC
+ 				</a>
+ 			</td>
+ 			<td>
+ 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=">Others
+ 				</a>
+ 			</td>
+ 		</tr>
+ 	</table>
  	<form action="/cgi-bin/koha/admin/systempreferences.pl" method="post">
  		<input type="text" name="searchfield" value="">




From hdl at users.sourceforge.net  Fri Jun 17 18:37:03 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Fri, 17 Jun 2005 09:37:03 -0700
Subject: [Koha-cvs] CVS: koha/admin systempreferences.pl,1.23,1.24
Message-ID: <E1DjJq3-0001Cc-B6@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4576/admin

Modified Files:
	systempreferences.pl 
Log Message:
Displaying system preferences by category

Index: systempreferences.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** systempreferences.pl	11 Feb 2005 16:24:11 -0000	1.23
--- systempreferences.pl	17 Jun 2005 16:37:01 -0000	1.24
***************
*** 50,53 ****
--- 50,79 ----
  
  
+ my %tabsysprefs;
+ $tabsysprefs{acquisitions}="Acquisitions";
+ $tabsysprefs{gist}="Acquisitions";
+ $tabsysprefs{authoritysep}="Authorities";
+ $tabsysprefs{ISBD}="Catalogue";
+ $tabsysprefs{marc}="Catalogue";
+ $tabsysprefs{marcflavour}="Catalogue";
+ $tabsysprefs{SubscriptionHistory}="Catalogue";
+ $tabsysprefs{maxoutstanding}="Circulation";
+ $tabsysprefs{printcirculationslips}="Circulation";
+ $tabsysprefs{suggestion}="Circulation";
+ $tabsysprefs{automembernum}="Members";
+ $tabsysprefs{noissuescharge}="Circulation";
+ $tabsysprefs{opacthemes}="OPAC";
+ $tabsysprefs{opaclanguages}="OPAC";
+ $tabsysprefs{LibraryName}="OPAC";
+ $tabsysprefs{opacstylesheet}="OPAC";
+ $tabsysprefs{BiblioDefaultView}="OPAC";
+ $tabsysprefs{hidelostitem}="OPAC";
+ $tabsysprefs{KohaAdmin}="Admin";
+ $tabsysprefs{checkdigit}="Admin";
+ $tabsysprefs{dateformat}="Admin";
+ $tabsysprefs{insecure}="Admin";
+ $tabsysprefs{ldapinfos}="Admin";
+ $tabsysprefs{ldapserver}="Admin";
+ 
  sub StringSearch  {
  	my ($env,$searchstring,$type)=@_;
***************
*** 56,71 ****
  	my @data=split(' ',$searchstring);
  	my $count=@data;
- 	my $sth=$dbh->prepare("Select variable,value,explanation,type,options from systempreferences where (variable like ?) order by variable");
- 	$sth->execute("$data[0]%");
  	my @results;
  	my $cnt=0;
! 	while (my $data=$sth->fetchrow_hashref){
! 		push(@results,$data);
! 		$cnt ++;
  	}
- 	$sth->finish;
  	return ($cnt,\@results);
  }
  
  my $input = new CGI;
  my $searchfield=$input->param('searchfield');
--- 82,119 ----
  	my @data=split(' ',$searchstring);
  	my $count=@data;
  	my @results;
  	my $cnt=0;
! 	if ($type){
! 		foreach my $syspref (sort keys %tabsysprefs){
! 			if ($tabsysprefs{$syspref} eq $type){
! 				my $sth=$dbh->prepare("Select variable,value,explanation,type,options from systempreferences where (variable like ?) order by variable");
! 				$sth->execute($syspref);
! 				while (my $data=$sth->fetchrow_hashref){
! 					push(@results,$data);
! 					$cnt ++;
! 				}
! 				$sth->finish;
! 			}
! 		}
! 	}else {
! 		my $strsth ="Select variable,value,explanation,type,options from systempreferences where variable not in (";  
! 		foreach my $syspref (keys %tabsysprefs){
! 			$strsth .= $dbh->quote($syspref).",";
! 		}
! 		$strsth =~ s/,$/) /;
! 		$strsth .= " order by variable";
! 		warn $strsth;
! 		my $sth=$dbh->prepare($strsth);
! 		$sth->execute();
! 		while (my $data=$sth->fetchrow_hashref){
! 			push(@results,$data);
! 			$cnt ++;
! 		}
! 		$sth->finish;
  	}
  	return ($cnt,\@results);
  }
  
+ 
  my $input = new CGI;
  my $searchfield=$input->param('searchfield');
***************
*** 279,295 ****
  ################## DEFAULT ##################################
  } else { # DEFAULT
  	if  ($searchfield ne '') {
  		 $template->param(searchfield => "<p>You Searched for <strong>$searchfield</strong></p>");
  	}
  	my $env;
! 	my ($count,$results)=StringSearch($env,$searchfield,'web');
  	my $toggle=0;
  	my @loop_data = ();
  	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
! 	  	if ($toggle eq 0){
  			$toggle=1;
! 	  	} else {
  			$toggle=0;
! 	  	}
  		my %row_data;  # get a fresh hash for the row data
  		$row_data{variable} = $results->[$i]{'variable'};
--- 327,346 ----
  ################## DEFAULT ##################################
  } else { # DEFAULT
+ 	#Adding tab management for system preferences
+ 	my $tab=$input->param('tab');
+ 	
  	if  ($searchfield ne '') {
  		 $template->param(searchfield => "<p>You Searched for <strong>$searchfield</strong></p>");
  	}
  	my $env;
! 	my ($count,$results)=StringSearch($env,$searchfield,$tab);
  	my $toggle=0;
  	my @loop_data = ();
  	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
! 		if ($toggle eq 0){
  			$toggle=1;
! 		} else {
  			$toggle=0;
! 		}
  		my %row_data;  # get a fresh hash for the row data
  		$row_data{variable} = $results->[$i]{'variable'};




From hellen at users.sourceforge.net  Sat Jun 18 12:33:32 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 18 Jun 2005 03:33:32 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/parameters checkmarc.tmpl,1.1,1.2
Message-ID: <E1Djado-00031x-1R@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11617/koha-tmpl/intranet-tmpl/default/de/parameters

Modified Files:
	checkmarc.tmpl 
Log Message:
translated by hellen

Index: checkmarc.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/checkmarc.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** checkmarc.tmpl	12 May 2005 19:26:35 -0000	1.1
--- checkmarc.tmpl	18 Jun 2005 10:33:29 -0000	1.2
***************
*** 2,10 ****
  
  <div id="mainbloc">
! 	<h1>&uuml;berpr&uuml;fe MARC Setup</h1>
  	<table>
  		<tr>
  			<th>Test</th>
! 			<th>Treffer</th>
  		</tr>
  	<!-- -------------------------------------------------------------------------------------------------------- -->
--- 2,10 ----
  
  <div id="mainbloc">
! 	<h1>&Uuml;berpr&uuml;fung der MARC-Struktur</h1>
  	<table>
  		<tr>
  			<th>Test</th>
! 			<th>Meldung</th>
  		</tr>
  	<!-- -------------------------------------------------------------------------------------------------------- -->
***************
*** 12,16 ****
  		<tr>
  			<td><b>itemnum</b></td>
! 			<td><li>The field itemnum MUST be mapped </li>
  				<li>The correspounding subfield MUST be in with -1 (ignore) tab</td>
  		</tr>
--- 12,16 ----
  		<tr>
  			<td><b>itemnum</b></td>
! 			<td><li>Das Feld itemnum MUSS zugeordnet sein </li>
  				<li>The correspounding subfield MUST be in with -1 (ignore) tab</td>
  		</tr>




From hellen at users.sourceforge.net  Sat Jun 18 12:33:31 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 18 Jun 2005 03:33:31 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/members moremember.tmpl,1.1,1.2
Message-ID: <E1Djadn-00031t-VL@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11617/koha-tmpl/intranet-tmpl/default/de/members

Modified Files:
	moremember.tmpl 
Log Message:
translated by hellen

Index: moremember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/members/moremember.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** moremember.tmpl	12 May 2005 19:26:35 -0000	1.1
--- moremember.tmpl	18 Jun 2005 10:33:29 -0000	1.2
***************
*** 10,14 ****
  		<!-- TMPL_UNLESS name="I" --><label class="label100">Zweitanschrift: </label><!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR NAME="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" --><br>
  		<label class="label100">Tel.: </label><!-- TMPL_VAR NAME="phone" --><br><!-- /TMPL_UNLESS -->
! 		<label class="label100">Phone daytime: </label><!-- TMPL_VAR NAME="phoneday" --><br>
  		<label class="label100">Fax: </label><!-- TMPL_VAR NAME="faxnumber" --><br>
  		<label class="label100">E-mail: </label><a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a><br>
--- 10,14 ----
  		<!-- TMPL_UNLESS name="I" --><label class="label100">Zweitanschrift: </label><!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR NAME="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" --><br>
  		<label class="label100">Tel.: </label><!-- TMPL_VAR NAME="phone" --><br><!-- /TMPL_UNLESS -->
! 		<label class="label100">Tel. tags&uuml;ber: </label><!-- TMPL_VAR NAME="phoneday" --><br>
  		<label class="label100">Fax: </label><!-- TMPL_VAR NAME="faxnumber" --><br>
  		<label class="label100">E-mail: </label><a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a><br>
***************
*** 29,42 ****
  		<!-- /TMPL_UNLESS -->
  		<label class="label100">Kontakt: </label><!-- TMPL_VAR NAME="contactname" --><br>
! 		<label class="label100">Phone: </label><!-- TMPL_VAR NAME="altphone" --><br>
  		<!-- TMPL_UNLESS name="I" -->
! 			<label class="label100">Relationship: </label><!-- TMPL_VAR NAME="altrelationship" --><br>
  		<!-- /TMPL_UNLESS -->
  		<label class="label100">Bemerkung: </label><!-- TMPL_VAR NAME="altnotes" -->
  		<!-- TMPL_IF NAME="sort1" -->
! 			<p><label class="label100">Sort field 1 : </label><!-- TMPL_VAR NAME="sort1" --></p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="sort2" -->
! 			<p><label class="label100">Sort field 2 : </label><!-- TMPL_VAR NAME="sort2" --></p>
  		<!-- /TMPL_IF -->
  		</p>
--- 29,42 ----
  		<!-- /TMPL_UNLESS -->
  		<label class="label100">Kontakt: </label><!-- TMPL_VAR NAME="contactname" --><br>
! 		<label class="label100">Tel: </label><!-- TMPL_VAR NAME="altphone" --><br>
  		<!-- TMPL_UNLESS name="I" -->
! 			<label class="label100">Bezug: </label><!-- TMPL_VAR NAME="altrelationship" --><br>
  		<!-- /TMPL_UNLESS -->
  		<label class="label100">Bemerkung: </label><!-- TMPL_VAR NAME="altnotes" -->
  		<!-- TMPL_IF NAME="sort1" -->
! 			<p><label class="label100">Sortierung 1 : </label><!-- TMPL_VAR NAME="sort1" --></p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="sort2" -->
! 			<p><label class="label100">Sortierung 2 : </label><!-- TMPL_VAR NAME="sort2" --></p>
  		<!-- /TMPL_IF -->
  		</p>
***************
*** 81,89 ****
  	
  <!-- TMPL_IF NAME="flagged" -->	<div class="bloc25">
! 		<h2 class="members">Member Flags</h2>
  		<ul>
! 		<!-- TMPL_IF NAME="debarred" --><li>Member is debarred.</li><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="gonenoaddress" --><li>Member's address is in doubt.</li><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="lost" --><li>Member's card has been reported lost.</li><!-- /TMPL_IF -->
  		</ul>
  	</div><!-- /TMPL_IF -->
--- 81,89 ----
  	
  <!-- TMPL_IF NAME="flagged" -->	<div class="bloc25">
! 		<h2 class="members">Benutzer-Flags</h2>
  		<ul>
! 		<!-- TMPL_IF NAME="debarred" --><li>Benutzer ist gesperrt.</li><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="gonenoaddress" --><li>Benutzeradresse zweifelhaft.</li><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="lost" --><li>Benutzerausweis als verloren gemeldet.</li><!-- /TMPL_IF -->
  		</ul>
  	</div><!-- /TMPL_IF -->




From rangi at users.sourceforge.net  Mon Jun 20 03:01:08 2005
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Sun, 19 Jun 2005 18:01:08 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-sendbasket.pl,1.5,1.6
Message-ID: <E1DkAey-0004Xw-O8@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17237

Modified Files:
	opac-sendbasket.pl 
Log Message:
This simply wasnt working before.
It is now not erroring, not sure if its actually sending mail, working on
that now


Index: opac-sendbasket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-sendbasket.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** opac-sendbasket.pl	4 May 2005 09:02:38 -0000	1.5
--- opac-sendbasket.pl	20 Jun 2005 01:01:06 -0000	1.6
***************
*** 6,94 ****
  use MIME::QuotedPrint;
  use MIME::Base64;
! 
  use C4::Search;
  use C4::Auth;
  use C4::Interface::CGI::Output;
  use HTML::Template;
  
  my $query = new CGI;
  
! my ($template, $borrowernumber, $cookie) 
!     = get_template_and_user({template_name => "opac-sendbasketform.tmpl",
! 			     query => $query,
! 			     type => "opac",
! 			     authnotrequired => 1,
! 			     flagsrequired => {borrow => 1},
! 			 });
! 
! my $bib_list=$query->param('bib_list');
! my $email_add=$query->param('email_add');
! my $email_sender=$query->param('email_sender');
! 
! if ($email_add) {
! 	my $email_from = C4::Context->preference('KohaAdminEmailAddress');
! 
! 	my %mail = (	 To      => $email_add,
! 						 From    => $email_from);
! 
! 	my ($template2, $borrowernumber, $cookie) 
!     = get_template_and_user({template_name => "opac-sendbasket.tmpl",
! 			     query => $query,
! 			     type => "opac",
! 			     authnotrequired => 1,
! 			     flagsrequired => {borrow => 1},
! 			 });
! 
! 	my @bibs = split(/\//, $bib_list);
! 	my @results;
! 	my $iso2709;
! 	foreach my $biblionumber (@bibs) {
! 		$template2->param(biblionumber => $biblionumber);
! 
! 		my $dat = &bibdata($biblionumber);
! 		my ($authorcount, $addauthor) = &addauthor($biblionumber);
! 		my @items                     = &ItemInfo(undef, $biblionumber, 'opac');
! 
! 		$dat->{'additional'}=$addauthor->[0]->{'author'};
! 		for (my $i = 1; $i < $authorcount; $i++) {
! 			$dat->{'additional'} .= "|" . $addauthor->[$i]->{'author'};
! 		}
  
! 		$dat->{'biblionumber'} = $biblionumber;
! 		$dat->{ITEM_RESULTS} = \@items;
! 		my $record = MARCgetbiblio($dbh,$bibid);
! 		$iso2709 .= $record->as_usmarc();
  
! 		push (@results, $dat);
! 	}
! 
! 	my $resultsarray=\@results;
! 	$template2->param(BIBLIO_RESULTS => $resultsarray,
! 					email_sender => $email_sender);
! 
! 	# Getting template result
! 	my $template_res = $template2->output();
! 
! 	# Analysing information and getting mail properties
! 	if ($template_res =~ /<SUBJECT>\n(.*)\n<END_SUBJECT>/s) { $mail{'subject'} = $1; }
! 	else { $mail{'subject'} = "no subject"; }
! 
! 	my $email_header = "";
! 	if ($template_res =~ /<HEADER>\n(.*)\n<END_HEADER>/s) { $email_header = $1; }
! 
! 	my $email_file = "basket.txt";
! 	if ($template_res =~ /<FILENAME>\n(.*)\n<END_FILENAME>/s) { $email_file = $1; }
! 
! 	if ($template_res =~ /<MESSAGE>\n(.*)\n<END_MESSAGE>/s) { $mail{'body'} = $1; }
  
! 	my $boundary = "====" . time() . "====";
! 	$mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
  
! 	$email_header = encode_qp($email_header);
  
! 	$boundary = "--".$boundary;
  
! 	# Writing mail
! 	$mail{body} = <<END_OF_BODY;
  $boundary
  Content-Type: text/plain; charset="iso-8859-1"
--- 6,113 ----
  use MIME::QuotedPrint;
  use MIME::Base64;
! use C4::Context;
  use C4::Search;
  use C4::Auth;
  use C4::Interface::CGI::Output;
+ use C4::Biblio;
  use HTML::Template;
  
  my $query = new CGI;
  
! my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
!     {
!         template_name   => "opac-sendbasketform.tmpl",
!         query           => $query,
!         type            => "opac",
!         authnotrequired => 1,
!         flagsrequired   => { borrow => 1 },
!     }
! );
! 
! my $bib_list     = $query->param('bib_list');
! my $email_add    = $query->param('email_add');
! my $email_sender = $query->param('email_sender');
  
! my $dbh = C4::Context->dbh();
  
! if ($email_add) {
!     my $email_from = C4::Context->preference('KohaAdminEmailAddress');
  
!     my %mail = (
!         To   => $email_add,
!         From => $email_from
!     );
! 
!     my ( $template2, $borrowernumber, $cookie ) = get_template_and_user(
!         {
!             template_name   => "opac-sendbasket.tmpl",
!             query           => $query,
!             type            => "opac",
!             authnotrequired => 1,
!             flagsrequired   => { borrow => 1 },
!         }
!     );
! 
!     my @bibs = split ( /\//, $bib_list );
!     my @results;
!     my $iso2709;
!     foreach my $biblionumber (@bibs) {
!         $template2->param( biblionumber => $biblionumber );
! 
!         my $dat = &bibdata($biblionumber);
!         my ( $authorcount, $addauthor ) = &addauthor($biblionumber);
!         my @items = &ItemInfo( undef, $biblionumber, 'opac' );
! 
!         $dat->{'additional'} = $addauthor->[0]->{'author'};
!         for ( my $i = 1 ; $i < $authorcount ; $i++ ) {
!             $dat->{'additional'} .= "|" . $addauthor->[$i]->{'author'};
!         }
! 
!         $dat->{'biblionumber'} = $biblionumber;
!         $dat->{ITEM_RESULTS} = \@items;
!         my $record = MARCgetbiblio( $dbh, $biblionumber );
!         $iso2709 .= $record->as_usmarc();
! 
!         push ( @results, $dat );
!     }
! 
!     my $resultsarray = \@results;
!     $template2->param(
!         BIBLIO_RESULTS => $resultsarray,
!         email_sender   => $email_sender
!     );
! 
!     # Getting template result
!     my $template_res = $template2->output();
! 
!     # Analysing information and getting mail properties
!     if ( $template_res =~ /<SUBJECT>\n(.*)\n<END_SUBJECT>/s ) {
!         $mail{'subject'} = $1;
!     }
!     else { $mail{'subject'} = "no subject"; }
! 
!     my $email_header = "";
!     if ( $template_res =~ /<HEADER>\n(.*)\n<END_HEADER>/s ) {
!         $email_header = $1;
!     }
! 
!     my $email_file = "basket.txt";
!     if ( $template_res =~ /<FILENAME>\n(.*)\n<END_FILENAME>/s ) {
!         $email_file = $1;
!     }
! 
!     if ( $template_res =~ /<MESSAGE>\n(.*)\n<END_MESSAGE>/s ) {
!         $mail{'body'} = $1;
!     }
! 
!     my $boundary = "====" . time() . "====";
!     $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
  
!     $email_header = encode_qp($email_header);
  
!     $boundary = "--" . $boundary;
  
!     # Writing mail
!     $mail{body} = <<END_OF_BODY;
  $boundary
  Content-Type: text/plain; charset="iso-8859-1"
***************
*** 102,142 ****
  END_OF_BODY
  
! $mail{PJ} = $iso2709;
! #	$mail{body} = <<END_OF_BODY;
! #$boundary
! #Content-Type: text/plain; charset="iso-8859-1"
! #Content-Transfer-Encoding: quoted-printable
! #
! #$email_header
! #
! #$boundary
! #Content-Type: text/plain; name="$email_file"
! #Content-Transfer-Encoding: quoted-printable
! #Content-Disposition: attachment; filename="$email_file"
! #
! #$mail{'body'}
! #
! #$boundary--
! #END_OF_BODY
! 
! 	# Sending mail
! 	if (sendmail %mail) {
! 	# do something if it works....
! 		warn "Mail sent ok\n";
! 		$template->param(SENT => "1");
! 		$template->param(email_add => $email_add);
! 	} else {
! 		# do something if it doesnt work....
! 		warn "Error sending mail: $Mail::Sendmail::error \n";
! 	}
  
! 	output_html_with_http_headers $query, $cookie, $template->output;
  }
  else {
! 	$template->param(bib_list => $bib_list);
! 	$template->param(url => "/cgi-bin/koha/opac-sendbasket.pl",
! 	suggestion => C4::Context->preference("suggestion"),
! 	virtualshelves => C4::Context->preference("virtualshelves"),
! 	);
! 	output_html_with_http_headers $query, $cookie, $template->output;
  }
--- 121,148 ----
  END_OF_BODY
  
!     # Sending mail
!     if ( sendmail %mail ) {
! 
!         # do something if it works....
!         warn "Mail sent ok\n";
!         $template->param( SENT      => "1" );
!         $template->param( email_add => $email_add );
!     }
!     else {
! 
!         # do something if it doesnt work....
!         warn "Error sending mail: $Mail::Sendmail::error \n";
!         warn "$mail{'body'}";
!     }
  
!     output_html_with_http_headers $query, $cookie, $template->output;
  }
  else {
!     $template->param( bib_list => $bib_list );
!     $template->param(
!         url            => "/cgi-bin/koha/opac-sendbasket.pl",
!         suggestion     => C4::Context->preference("suggestion"),
!         virtualshelves => C4::Context->preference("virtualshelves"),
!     );
!     output_html_with_http_headers $query, $cookie, $template->output;
  }




From hdl at users.sourceforge.net  Mon Jun 20 12:14:15 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 20 Jun 2005 03:14:15 -0700
Subject: [Koha-cvs] CVS: koha/acqui histsearch.pl,1.1,1.2
Message-ID: <E1DkJIF-0001xz-0i@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7362/acqui

Modified Files:
	histsearch.pl 
Log Message:
Displaying search results count

Index: histsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/histsearch.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** histsearch.pl	19 Oct 2004 12:24:56 -0000	1.1
--- histsearch.pl	20 Jun 2005 10:14:12 -0000	1.2
***************
*** 24,28 ****
  			     });
  my $order_loop= &histsearch($title,$author,$name);
! $template->param(suggestions_loop => $order_loop,
  				title => $title,
  				author => $author,
--- 24,30 ----
  			     });
  my $order_loop= &histsearch($title,$author,$name);
! 
! $template->param(numresults => scalar(@$order_loop),
! 				suggestions_loop => $order_loop,
  				title => $title,
  				author => $author,




From hdl at users.sourceforge.net  Mon Jun 20 12:14:14 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 20 Jun 2005 03:14:14 -0700
Subject: [Koha-cvs] CVS: koha/members member.pl,1.5,1.6
Message-ID: <E1DkJIE-0001xc-OT@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7362/members

Modified Files:
	member.pl 
Log Message:
Displaying search results count

Index: member.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/member.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** member.pl	7 Mar 2005 08:55:30 -0000	1.5
--- member.pl	20 Jun 2005 10:14:12 -0000	1.6
***************
*** 106,109 ****
--- 106,110 ----
  $template->param( 
  			member          => $member,
+ 			numresults      => $count,
  			resultsloop     => \@resultsdata );
  




From hdl at users.sourceforge.net  Mon Jun 20 12:14:14 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 20 Jun 2005 03:14:14 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui histsearch.tmpl,1.2,1.3
Message-ID: <E1DkJIE-0001xl-Ra@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	histsearch.tmpl 
Log Message:
Displaying search results count

Index: histsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** histsearch.tmpl	1 Mar 2005 13:40:51 -0000	1.2
--- histsearch.tmpl	20 Jun 2005 10:14:12 -0000	1.3
***************
*** 2,5 ****
--- 2,7 ----
  <div id="mainbloc">
  	<h1 class="acquisition">Order search</h1>
+ 	<p class="resultcount"><!-- TMPL_VAR Name ="numresults" --> orders were found.
+ 	 </p>
  	<table>
  		<tr>




From hdl at users.sourceforge.net  Mon Jun 20 12:14:14 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 20 Jun 2005 03:14:14 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members member.tmpl,1.15,1.16 member-quicksearch-results.tmpl,1.1,1.2
Message-ID: <E1DkJIE-0001xj-Qu@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	member.tmpl member-quicksearch-results.tmpl 
Log Message:
Displaying search results count

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** member.tmpl	1 Mar 2005 13:40:54 -0000	1.15
--- member.tmpl	20 Jun 2005 10:14:12 -0000	1.16
***************
*** 18,21 ****
--- 18,23 ----
  <div class="bloc100">
  	<div class="bloctitle">You Searched for <!-- TMPL_VAR NAME="member" --></div>
+ 	<p class="resultcount"><!-- TMPL_VAR Name ="numresults" --> members were found.
+ 	 </p>
  	<table>
  		<tr>

Index: member-quicksearch-results.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** member-quicksearch-results.tmpl	13 Jan 2005 22:41:54 -0000	1.1
--- member-quicksearch-results.tmpl	20 Jun 2005 10:14:12 -0000	1.2
***************
*** 5,8 ****
--- 5,10 ----
  
  <div class="bloc100">
+ 	<p><!-- TMPL_VAR Name ="numresults" --> records match you search.
+ 	 </p>
  	<table>
  		<tr>




From hdl at users.sourceforge.net  Mon Jun 20 12:28:11 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 20 Jun 2005 03:28:11 -0700
Subject: [Koha-cvs] CVS: koha/reports acquisitions_stats.pl,1.5,1.6
Message-ID: <E1DkJVj-0004F9-QR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/reports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16241/reports

Modified Files:
	acquisitions_stats.pl 
Log Message:
Reordering dates with usual order and not alphabetical one

Index: acquisitions_stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/acquisitions_stats.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** acquisitions_stats.pl	4 May 2005 09:02:38 -0000	1.5
--- acquisitions_stats.pl	20 Jun 2005 10:28:09 -0000	1.6
***************
*** 272,296 ****
                                                
  # 1st, loop rows.                             
! 	my $linefield;                               
  	if (($line =~/closedate/) and ($podsp == 1)) {
  		#Display by day
! 		$linefield .="dayname($line)";  
  	} elsif (($line=~/closedate/) and ($podsp == 2)) {
  		#Display by Month
  		$linefield .="monthname($line)";  
  	} elsif (($line=~/closedate/) and ($podsp == 3)) {
  		#Display by Year
  		$linefield .="Year($line)";
  	} elsif (($line =~/received/) and ($rodsp == 1)) {
  		#Display by day
  		$linefield .="dayname($line)";  
  	} elsif (($line=~/received/) and ($rodsp == 2)) {
  		#Display by Month
  		$linefield .="monthname($line)";  
  	} elsif (($line=~/received/) and ($rodsp == 3)) {
  		#Display by Year
  		$linefield .="Year($line)";
  	} else {
  		$linefield .= $line;
  	}  
  	
--- 272,304 ----
                                                
  # 1st, loop rows.                             
! 	my $linefield;
! 	my $lineorder;                               
  	if (($line =~/closedate/) and ($podsp == 1)) {
  		#Display by day
! 		$linefield .="dayname($line)";
! 		$lineorder .="weekday($line)";  
  	} elsif (($line=~/closedate/) and ($podsp == 2)) {
  		#Display by Month
  		$linefield .="monthname($line)";  
+ 		$lineorder .="month($line)";  
  	} elsif (($line=~/closedate/) and ($podsp == 3)) {
  		#Display by Year
  		$linefield .="Year($line)";
+ 		$lineorder .="Year($line)";
  	} elsif (($line =~/received/) and ($rodsp == 1)) {
  		#Display by day
  		$linefield .="dayname($line)";  
+ 		$lineorder .="weekday($line)";  
  	} elsif (($line=~/received/) and ($rodsp == 2)) {
  		#Display by Month
  		$linefield .="monthname($line)";  
+ 		$lineorder .="month($line)";  
  	} elsif (($line=~/received/) and ($rodsp == 3)) {
  		#Display by Year
  		$linefield .="Year($line)";
+ 		$lineorder .="Year($line)";
  	} else {
  		$linefield .= $line;
+ 		$lineorder .= $line;
  	}  
  	
***************
*** 313,317 ****
   	}
  	$strsth .=" group by $linefield";
! 	$strsth .=" order by $linefield";
  	warn "". $strsth;
  	
--- 321,325 ----
   	}
  	$strsth .=" group by $linefield";
! 	$strsth .=" order by $lineorder";
  	warn "". $strsth;
  	
***************
*** 338,361 ****
--- 346,377 ----
  # 2nd, loop cols.
  	my $colfield;
+ 	my $colorder;
  	if (($column =~/closedate/) and ($podsp == 1)) {
  		#Display by day
  		$colfield .="dayname($column)";  
+ 		$colorder .="weekday($column)";  
  	} elsif (($column=~/closedate/) and ($podsp == 2)) {
  		#Display by Month
  		$colfield .="monthname($column)";  
+ 		$colorder .="month($column)";  
  	} elsif (($column=~/closedate/) and ($podsp == 3)) {
  		#Display by Year
  		$colfield .="Year($column)";
+ 		$colorder .="Year($column)";
  	} elsif (($column =~/received/) and ($rodsp == 1)) {
  		#Display by day
  		$colfield .="dayname($column)";  
+ 		$colorder .="weekday($column)";  
  	} elsif (($column=~/received/) and ($rodsp == 2)) {
  		#Display by Month
  		$colfield .="monthname($column)";  
+ 		$colorder .="month($column)";  
  	} elsif (($column=~/received/) and ($rodsp == 3)) {
  		#Display by Year
  		$colfield .="Year($column)";
+ 		$colorder .="Year($column)";
  	} else {
  		$colfield .= $column;
+ 		$colorder .= $column;
  	}  
  	
***************
*** 378,387 ****
   	}
  	$strsth2 .=" group by $colfield";
! 	$strsth2 .=" order by $colfield";
   	warn "". $strsth2;
  	
  	my $sth2 = $dbh->prepare( $strsth2 );
  	if (( @colfilter ) and ($colfilter[1])){
! 		warn "from : ".$colfilter[0]." To  :".$colfilter[1];
  		$sth2->execute("'".$colfilter[0]."'","'".$colfilter[1]."'");
  	} elsif ($colfilter[0]) {
--- 394,403 ----
   	}
  	$strsth2 .=" group by $colfield";
! 	$strsth2 .=" order by $colorder";
   	warn "". $strsth2;
  	
  	my $sth2 = $dbh->prepare( $strsth2 );
  	if (( @colfilter ) and ($colfilter[1])){
! #		warn "from : ".$colfilter[0]." To  :".$colfilter[1];
  		$sth2->execute("'".$colfilter[0]."'","'".$colfilter[1]."'");
  	} elsif ($colfilter[0]) {
***************
*** 439,443 ****
  	@$filters[7]=~ s/\*/%/g if (@$filters[7]);
  	$strcalc .= " AND aqorders.sort2 like '" . @$filters[7] ."'" if ( @$filters[7] );
! 	$strcalc .= " group by $linefield, $colfield order by $linefield,$colfield";
  	warn "". $strcalc;
  	my $dbcalc = $dbh->prepare($strcalc);
--- 455,459 ----
  	@$filters[7]=~ s/\*/%/g if (@$filters[7]);
  	$strcalc .= " AND aqorders.sort2 like '" . @$filters[7] ."'" if ( @$filters[7] );
! 	$strcalc .= " group by $linefield, $colfield order by $lineorder,$colorder";
  	warn "". $strcalc;
  	my $dbcalc = $dbh->prepare($strcalc);




From tipaul at users.sourceforge.net  Mon Jun 20 15:12:14 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 06:12:14 -0700
Subject: [Koha-cvs] CVS: koha/admin systempreferences.pl,1.24,1.25
Message-ID: <E1DkM4U-0001MD-BO@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5189/admin

Modified Files:
	systempreferences.pl 
Log Message:
improving systempref selector :
* showing active tab better
* removing useless filter form
* adding some systemprefs to their correct tab

Index: systempreferences.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** systempreferences.pl	17 Jun 2005 16:37:01 -0000	1.24
--- systempreferences.pl	20 Jun 2005 13:12:11 -0000	1.25
***************
*** 60,64 ****
  $tabsysprefs{maxoutstanding}="Circulation";
  $tabsysprefs{printcirculationslips}="Circulation";
! $tabsysprefs{suggestion}="Circulation";
  $tabsysprefs{automembernum}="Members";
  $tabsysprefs{noissuescharge}="Circulation";
--- 60,64 ----
  $tabsysprefs{maxoutstanding}="Circulation";
  $tabsysprefs{printcirculationslips}="Circulation";
! $tabsysprefs{suggestion}="Acquisitions";
  $tabsysprefs{automembernum}="Members";
  $tabsysprefs{noissuescharge}="Circulation";
***************
*** 75,78 ****
--- 75,81 ----
  $tabsysprefs{ldapinfos}="Admin";
  $tabsysprefs{ldapserver}="Admin";
+ $tabsysprefs{itemcallnumber}="Catalogue";
+ $tabsysprefs{maxreserves}="Circulation";
+ $tabsysprefs{virtualshelves}="OPAC";
  
  sub StringSearch  {
***************
*** 135,142 ****
  if ($op) {
  $template->param(script_name => $script_name,
! 						$op              => 1); # we show only the TMPL_VAR names $op
  } else {
  $template->param(script_name => $script_name,
! 						else              => 1); # we show only the TMPL_VAR names $op
  }
  
--- 138,145 ----
  if ($op) {
  $template->param(script_name => $script_name,
! 						$op              => 1,); # we show only the TMPL_VAR names $op
  } else {
  $template->param(script_name => $script_name,
! 						else              => 1,); # we show only the TMPL_VAR names $op
  }
  
***************
*** 352,356 ****
  		push(@loop_data, \%row_data);
  	}
! 	$template->param(loop => \@loop_data);
  	if ($offset>0) {
  		my $prevpage = $offset-$pagesize;
--- 355,359 ----
  		push(@loop_data, \%row_data);
  	}
! 	$template->param(loop => \@loop_data, $tab => 1);
  	if ($offset>0) {
  		my $prevpage = $offset-$pagesize;




From tipaul at users.sourceforge.net  Mon Jun 20 15:12:14 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 06:12:14 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters systempreferences.tmpl,1.32,1.33
Message-ID: <E1DkM4U-0001MH-Ec@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	systempreferences.tmpl 
Log Message:
improving systempref selector :
* showing active tab better
* removing useless filter form
* adding some systemprefs to their correct tab

Index: systempreferences.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** systempreferences.tmpl	17 Jun 2005 16:37:00 -0000	1.32
--- systempreferences.tmpl	20 Jun 2005 13:12:12 -0000	1.33
***************
*** 140,180 ****
  		<tr>
  			<td>
! 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin">Admin
! 				</a>
  			</td>
  			<td>
! 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions">Acquisitions
! 				</a>
  			</td>
  			<td>
! 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities">Authorities
! 				</a>
  			</td>
  			<td>
! 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue">Catalogue
! 				</a>
  			</td>
  			<td>
! 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation">Circulation
! 				</a>
  			</td>
  			<td>
! 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members">Members
! 				</a>
  			</td>
  			<td>
! 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC">OPAC
! 				</a>
  			</td>
  			<td>
! 				<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=">Others
! 				</a>
  			</td>
  		</tr>
  	</table>
- 	<form action="/cgi-bin/koha/admin/systempreferences.pl" method="post">
- 		<input type="text" name="searchfield" value="">
- 		<input type="reset" name="reset" value="clr">
- 	</form>
  	<!-- TMPL_VAR NAME="searchfield" -->
  	<table border="0" cellspacing="0" cellpadding="2">
--- 140,200 ----
  		<tr>
  			<td>
! 				<!-- TMPL_IF name="Admin" -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin" class="button">Admin</a>
! 				<!-- TMPL_ELSE -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin">Admin</a>
! 				<!-- /TMPL_IF -->
  			</td>
  			<td>
! 				<!-- TMPL_IF name="Acquisitions" -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions" class="button">Acquisitions</a>
! 				<!-- TMPL_ELSE -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions">Acquisitions</a>
! 				<!-- /TMPL_IF -->
  			</td>
  			<td>
! 				<!-- TMPL_IF name="Authorities" -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities" class="button">Authorities</a>
! 				<!-- TMPL_ELSE -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities">Authorities</a>
! 				<!-- /TMPL_IF -->
  			</td>
  			<td>
! 				<!-- TMPL_IF name="Catalogue" -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue" class="button">Catalogue</a>
! 				<!-- TMPL_ELSE -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue">Catalogue</a>
! 				<!-- /TMPL_IF -->
  			</td>
  			<td>
! 				<!-- TMPL_IF name="Circulation" -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation" class="button">Circulation</a>
! 				<!-- TMPL_ELSE -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation">Circulation</a>
! 				<!-- /TMPL_IF -->
  			</td>
  			<td>
! 				<!-- TMPL_IF name="Members" -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members" class="button">Members</a>
! 				<!-- TMPL_ELSE -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members">Members</a>
! 				<!-- /TMPL_IF -->
  			</td>
  			<td>
! 				<!-- TMPL_IF name="OPAC" -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC" class="button">OPAC</a>
! 				<!-- TMPL_ELSE -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC">OPAC</a>
! 				<!-- /TMPL_IF -->
  			</td>
  			<td>
! 				<!-- TMPL_IF name="Others" -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=" class="button">Others</a>
! 				<!-- TMPL_ELSE -->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=">Others</a>
! 				<!-- /TMPL_IF -->
  			</td>
  		</tr>
  	</table>
  	<!-- TMPL_VAR NAME="searchfield" -->
  	<table border="0" cellspacing="0" cellpadding="2">




From tipaul at users.sourceforge.net  Mon Jun 20 15:15:49 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 06:15:49 -0700
Subject: [Koha-cvs] CVS: koha/acqui acqui-home.pl,1.3,1.4 basket.pl,1.25,1.26 histsearch.pl,1.2,1.3
Message-ID: <E1DkM7x-0001o4-TY@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6858/acqui

Modified Files:
	acqui-home.pl basket.pl histsearch.pl 
Log Message:
synch'ing 2.2 and head

Index: acqui-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/acqui-home.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** acqui-home.pl	13 Jul 2004 12:53:00 -0000	1.3
--- acqui-home.pl	20 Jun 2005 13:15:46 -0000	1.4
***************
*** 64,68 ****
  						totspent => sprintf("%.2f",$totspent),
  						totcomtd => sprintf("%.2f",$totcomtd),
! 						totavail => sprintf("%.2f",$totavail));
  
  output_html_with_http_headers $query, $cookie, $template->output;
--- 64,69 ----
  						totspent => sprintf("%.2f",$totspent),
  						totcomtd => sprintf("%.2f",$totcomtd),
! 						totavail => sprintf("%.2f",$totavail),
! 						nobudget => $#results==-1?1:0);
  
  output_html_with_http_headers $query, $cookie, $template->output;

Index: basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/basket.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** basket.pl	4 May 2005 08:45:03 -0000	1.25
--- basket.pl	20 Jun 2005 13:15:46 -0000	1.26
***************
*** 56,59 ****
--- 56,61 ----
  my ($count2, at booksellers)=bookseller($booksellerid);
  
+ # get librarian branch...
+ 
  # if new basket, pre-fill infos
  $basket->{creationdate} = "" unless ($basket->{creationdate});
***************
*** 66,69 ****
--- 68,78 ----
  my $grand_total; # $subttotal + $gist
  
+ # my $line_total_est; # total of each line
+ my $sub_total_est; # total of line totals
+ my $gist_est;      # GST
+ my $grand_total_est; # $subttotal + $gist
+ 
+ my $qty_total;
+ 
  my @books_loop;
  for (my $i=0;$i<$count;$i++){
***************
*** 71,82 ****
  	$rrp=curconvert($results[$i]->{'currency'},$rrp);
  
  	$line_total=$results[$i]->{'quantity'}*$results[$i]->{'ecost'};
  	$sub_total+=$line_total;
  	my %line;
- 	if ($i % 2){
- 		$line{highlight}=1;
- 	} else {
- 		$line{highlight}=0;
- 	}
  	$line{ordernumber} = $results[$i]->{'ordernumber'};
  	$line{publishercode} = $results[$i]->{'publishercode'};
--- 80,88 ----
  	$rrp=curconvert($results[$i]->{'currency'},$rrp);
  
+ 	$sub_total_est+=$results[$i]->{'quantity'}*$results[$i]->{'rrp'};
  	$line_total=$results[$i]->{'quantity'}*$results[$i]->{'ecost'};
  	$sub_total+=$line_total;
+ 	$qty_total += $results[$i]->{'quantity'};
  	my %line;
  	$line{ordernumber} = $results[$i]->{'ordernumber'};
  	$line{publishercode} = $results[$i]->{'publishercode'};
***************
*** 85,88 ****
--- 91,95 ----
  	$line{basketno}=$basketno;
  	$line{title} = $results[$i]->{'title'};
+ 	$line{notes} = $results[$i]->{'notes'};
  	$line{author} = $results[$i]->{'author'};
  	$line{i} = $i;
***************
*** 94,97 ****
--- 101,105 ----
  	$line{biblionumber} = $results[$i]->{'biblionumber'};
  	$line{bookfundid} = $results[$i]->{'bookfundid'};
+ 	$line{odd} = $i %2;
  	push @books_loop, \%line;
  }
***************
*** 99,102 ****
--- 107,112 ----
  $gist=sprintf("%.2f",$sub_total*$prefgist);
  $grand_total=$sub_total+$gist;
+ $grand_total_est = $sub_total_est+sprintf("%.2f",$sub_total_est*$prefgist);
+ $gist_est = sprintf("%.2f",$sub_total_est*$prefgist);
  $template->param(basketno => $basketno,
  				creationdate => $basket->{creationdate},
***************
*** 107,110 ****
--- 117,124 ----
  				booksellerid=> $booksellers[0]->{'id'},
  				name => $booksellers[0]->{'name'},
+ 				address1 => $booksellers[0]->{'address1'},
+ 				address2 => $booksellers[0]->{'address2'},
+ 				address3 => $booksellers[0]->{'address3'},
+ 				address4 => $booksellers[0]->{'address4'},
  				entrydate => format_date($results[0]->{'entrydate'}),
  				books_loop => \@books_loop,
***************
*** 113,117 ****
--- 127,135 ----
  				gist => $gist,
  				grand_total =>$grand_total,
+ 				sub_total_est => $sub_total_est,
+ 				gist_est => $gist_est,
+ 				grand_total_est =>$grand_total_est,
  				currency => $booksellers[0]->{'listprice'},
+ 				qty_total => $qty_total,
  				);
  output_html_with_http_headers $query, $cookie, $template->output;

Index: histsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/histsearch.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** histsearch.pl	20 Jun 2005 10:14:12 -0000	1.2
--- histsearch.pl	20 Jun 2005 13:15:46 -0000	1.3
***************
*** 13,16 ****
--- 13,18 ----
  my $author = $input->param('author');
  my $name = $input->param('name');
+ my $from_placed_on = $input->param('fromplacedon');
+ my $to_placed_on = $input->param('toplacedon');
  
  my $dbh = C4::Context->dbh;
***************
*** 23,33 ****
  			     debug => 1,
  			     });
! my $order_loop= &histsearch($title,$author,$name);
! 
! $template->param(numresults => scalar(@$order_loop),
! 				suggestions_loop => $order_loop,
  				title => $title,
  				author => $author,
  				name => $name,
  );
  output_html_with_http_headers $input, $cookie, $template->output;
--- 25,35 ----
  			     debug => 1,
  			     });
! my $order_loop= &histsearch($title,$author,$name,$from_placed_on,$to_placed_on);
! $template->param(suggestions_loop => $order_loop,
  				title => $title,
  				author => $author,
  				name => $name,
+ 				from_placed_on =>$from_placed_on,
+ 				to_placed_on =>$to_placed_on
  );
  output_html_with_http_headers $input, $cookie, $template->output;




From tipaul at users.sourceforge.net  Mon Jun 20 15:16:13 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 06:16:13 -0700
Subject: [Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.55,1.56 isbnsearch.pl,1.16,1.17
Message-ID: <E1DkM8L-0001s1-0d@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui.simple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7168/acqui.simple

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

Index: addbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/addbiblio.pl,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -r1.55 -r1.56
*** addbiblio.pl	4 May 2005 08:45:22 -0000	1.55
--- addbiblio.pl	20 Jun 2005 13:16:10 -0000	1.56
***************
*** 186,190 ****
  			$cgidir = C4::Context->intranetdir."/value_builder";
  		} 
! 		my $plugin=$cgidir."/".$tagslib->{$tag}->{$subfield}->{'value_builder'};
  		require $plugin;
  		my $extended_param = plugin_parameters($dbh,$rec,$tagslib,$i,$tabloop);
--- 186,190 ----
  			$cgidir = C4::Context->intranetdir."/value_builder";
  		} 
! 		my $plugin=$cgidir."/".$tagslib->{$tag}->{$subfield}->{'value_builder'}; 
  		require $plugin;
  		my $extended_param = plugin_parameters($dbh,$rec,$tagslib,$i,$tabloop);
***************
*** 341,352 ****
  my $dbh = C4::Context->dbh;
  my $bibid;
  if ($oldbiblionumber) {
  	$bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$oldbiblionumber);
  	# find framework type
! 	$frameworkcode = &MARCfind_frameworkcode($dbh,$bibid) if $bibid;
  }else {
  	$bibid = $input->param('bibid');
! 	$frameworkcode = &MARCfind_frameworkcode($dbh,$bibid) if $bibid;
  }
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "acqui.simple/addbiblio.tmpl",
--- 341,355 ----
  my $dbh = C4::Context->dbh;
  my $bibid;
+ 
+ 
  if ($oldbiblionumber) {
  	$bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$oldbiblionumber);
  	# find framework type
! 	$frameworkcode = &MARCfind_frameworkcode($dbh,$bibid) if ($bibid and not ($frameworkcode));
  }else {
  	$bibid = $input->param('bibid');
! 	$frameworkcode = &MARCfind_frameworkcode($dbh,$bibid) if ($bibid and not ($frameworkcode));
  }
+ $frameworkcode='' if ($frameworkcode eq 'Default');
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "acqui.simple/addbiblio.tmpl",
***************
*** 358,361 ****
--- 361,387 ----
  			     });
  
+ #Getting the list of all frameworks
+ my $queryfwk =$dbh->prepare("select frameworktext, frameworkcode from biblio_framework");
+ $queryfwk->execute;
+ my %select_fwk;
+ my @select_fwk;
+ my $curfwk;
+ push @select_fwk,"Default";
+ $select_fwk{"Default"} = "Default";
+ while (my ($description, $fwk) =$queryfwk->fetchrow) {
+ 	push @select_fwk, $fwk;
+ 	$select_fwk{$fwk} = $description;
+ }
+ $curfwk=$frameworkcode;
+ my $framework=CGI::scrolling_list( -name     => 'Frameworks',
+ 			-id => 'Frameworks',
+ 			-default => $curfwk,
+ 			-OnChange => 'Changefwk(this);',
+ 			-values   => \@select_fwk,
+ 			-labels   => \%select_fwk,
+ 			-size     => 1,
+ 			-multiple => 0 );
+ $template->param( framework => $framework);
+ 
  $tagslib = &MARCgettagslib($dbh,1,$frameworkcode);
  my $record=-1;
***************
*** 401,404 ****
--- 427,431 ----
  		my $oldbibitemnum;
  		if ($is_a_modif) {
+ 			NEWmodbiblioframework($dbh,$bibid,$frameworkcode);
  			NEWmodbiblio($dbh,$record,$bibid,$frameworkcode);
  		} else {
***************
*** 435,468 ****
  	my @ind_tag = $input->param('ind_tag');
  	my @indicator = $input->param('indicator');
- 	splice(@tags,$addedfield,0,$tags[$addedfield]);
- 	splice(@subfields,$addedfield,0,$subfields[$addedfield]);
- 	splice(@values,$addedfield,0,$values[$addedfield]);
- 	splice(@ind_tag,$addedfield,0,$ind_tag[$addedfield]);
- 	my %indicators;
- 	for (my $i=0;$i<=$#ind_tag;$i++) {
- 		$indicators{$ind_tag[$i]} = $indicator[$i];
- 	}
- # search the part of the array to duplicate.
- 	my $start=0;
- 	my $end=0;
- 	my $started;
- 	for (my $i=$#tags;$i>0;$i--) {
- 		$end=$i if ($end eq 0 && $tags[$i] == $addedfield);
- 		$start=$i if ($end>0 && $tags[$i] eq $addedfield);
- 		last if ($end>0 && $tags[$i] ne $addedfield);
- 	}
- 	# add an empty line in all arrays. This forces a new field in MARC::Record.
- 	splice(@tags,$end+1,0,'');
- 	splice(@subfields,$end+1,0,'');
- 	splice(@values,$end+1,0,'');
- 	splice(@ind_tag,$end+1,0,'');
- 	splice(@indicator,$end+1,0,'');
- # then duplicate the field.
- 	splice(@tags,$end+2,0, at tags[$start..$end]);
- 	splice(@subfields,$end+2,0, at subfields[$start..$end]);
- 	splice(@values,$end+2,0, at values[$start..$end]);
- 	splice(@ind_tag,$end+2,0, at ind_tag[$start..$end]);
- 	splice(@indicator,$end+2,0, at indicator[$start..$end]);
- 
  	my %indicators;
  	for (my $i=0;$i<=$#ind_tag;$i++) {
--- 462,465 ----
***************
*** 470,473 ****
--- 467,473 ----
  	}
  	my $record = MARChtml2marc($dbh,\@tags,\@subfields,\@values,%indicators);
+ 	# adding an empty field
+ 	my $field = MARC::Field->new("$addedfield",'','','a'=> "");
+ 	$record->append_fields($field);
  	build_tabs ($template, $record, $dbh,$encoding);
  	build_hidden_data;
***************
*** 496,500 ****
  		$oldbiblionumber= "";
  	}
! 
  	build_tabs ($template, $record, $dbh,$encoding);
  	build_hidden_data;
--- 496,500 ----
  		$oldbiblionumber= "";
  	}
!  
  	build_tabs ($template, $record, $dbh,$encoding);
  	build_hidden_data;

Index: isbnsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/isbnsearch.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** isbnsearch.pl	4 May 2005 08:45:33 -0000	1.16
--- isbnsearch.pl	20 Jun 2005 13:16:10 -0000	1.17
***************
*** 125,195 ****
  	}
  
!     if ( $count < ( $offset + $num ) ) {
!         $total = $count;
!     }
!     else {
!         $total = $offset + $num;
!     }    # else
! 
!     my @loop_data = ();
!     my $toggle;
!     for ( my $i = $offset ; $i < $total ; $i++ ) {
!         if ( $i % 2 ) {
!             $toggle = 0;
!         } else {
!             $toggle = 1;
!         }
!         my %row_data;    # get a fresh hash for the row data
!         $row_data{toggle}        = $toggle;
!         $row_data{biblionumber}  = $results[$i]->{'biblionumber'};
!         $row_data{title}         = $results[$i]->{'title'};
!         $row_data{author}        = $results[$i]->{'author'};
!         $row_data{copyrightdate} = $results[$i]->{'copyrightdate'};
! 		$row_data{classification} = $results[$i]->{'classification'};
!         $row_data{NOTMARC}       = !$marc_p;	
!         push ( @loop_data, \%row_data );
!     }
!     $template->param( startfrom => $offset + 1 );
!     ( $offset + $num <= $count )
!       ? ( $template->param( endat => $offset + $num ) )
!       : ( $template->param( endat => $count ) );
!     $template->param( numrecords => $count );
!     my $nextstartfrom = ( $offset + $num < $count ) ? ( $offset + $num ) : (-1);
!     my $prevstartfrom = ( $offset - $num >= 0 ) ? ( $offset - $num ) : (-1);
!     $template->param( nextstartfrom => $nextstartfrom );
!     my $displaynext = 1;
!     my $displayprev = 0;
!     ( $nextstartfrom == -1 ) ? ( $displaynext = 0 ) : ( $displaynext = 1 );
!     ( $prevstartfrom == -1 ) ? ( $displayprev = 0 ) : ( $displayprev = 1 );
!     $template->param( displaynext => $displaynext );
!     $template->param( displayprev => $displayprev );
!     my @numbers = ();
!     my $term;
!     my $value;
! 
!     if ($isbn) {
!         $term  = "isbn";
!         $value = $isbn;
!     }
!     else {
!         $term  = "title";
!         $value = $title;
!     }
!     if ( $count > 10 ) {
!         for ( my $i = 1 ; $i < $count / 10 + 1 ; $i++ ) {
!             if ( $i < 16 ) {
!                 my $highlight = 0;
!                 ( $offset == ( $i - 1 ) * 10 ) && ( $highlight = 1 );
!                 push @numbers,
!                   {
!                     number    => $i,
!                     highlight => $highlight,
!                     term      => $term,
!                     value     => $value,
!                     startfrom => ( $i - 1 ) * 10
!                 };
!             }
!         }
!     }
  
      # fill with books in breeding farm
--- 125,151 ----
  	}
  
! 	my @numbers = ();
! 
! 	if ($total>$resultsperpage) {
! 		for (my $i=1; $i<$total/$resultsperpage+1; $i++) {
! 			if ($i<16) {
! 	    		my $highlight=0;
! 	    		($startfrom==($i-1)) && ($highlight=1);
! 	    		push @numbers, { number => $i,
! 					highlight => $highlight ,
! 					searchdata=> \@field_data,
! 					startfrom => ($i-1)};
! 			}
!     	}
! 	}
! 	my $from = $startfrom*$resultsperpage+1;
! 	my $to;
! 
! 	if($total < (($startfrom+1)*$resultsperpage))
! 	{
! 		$to = $total;
! 	} else {
! 		$to = (($startfrom+1)*$resultsperpage);
! 	}
  
      # fill with books in breeding farm




From tipaul at users.sourceforge.net  Mon Jun 20 15:17:19 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 06:17:19 -0700
Subject: [Koha-cvs] CVS: koha/admin checkmarc.pl,1.6,1.7 itemtypes.pl,1.18,1.19 marctagstructure.pl,1.28,1.29
Message-ID: <E1DkM9P-00022T-Bd@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7703/admin

Modified Files:
	checkmarc.pl itemtypes.pl marctagstructure.pl 
Log Message:
synch'ing 2.2 and head

Index: checkmarc.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/checkmarc.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** checkmarc.pl	22 Dec 2003 19:16:58 -0000	1.6
--- checkmarc.pl	20 Jun 2005 13:17:16 -0000	1.7
***************
*** 77,80 ****
--- 77,81 ----
  my $tab = $res2;
  my $subtotal=0;
+ warn "TAGF : $tagfield";
  while (($res,$res2,$field) = $sth->fetchrow) {
  	# (ignore itemnumber, that must be in -1 tab)
***************
*** 97,100 ****
--- 98,118 ----
  	$total++;
  }
+ 
+ $sth = $dbh->prepare("select distinct tagfield from marc_subfield_structure where tab = 10");
+ $sth->execute;
+ my $totaltags = 0;
+ my $list = "";
+ while (($res2) = $sth->fetchrow) {
+ 	$totaltags++;
+ 	$list.=$res2.",";
+ }
+ if ($totaltags > 1) {
+ 	$template->param(itemtags => $list);
+ 	$total++;
+ } else {
+ 	$template->param(itemtags => 0);
+ }
+ 
+ 
  # checks biblioitems.itemtype must be mapped and use authorised_value=itemtype
  $sth = $dbh->prepare("select tagfield,tab,authorised_value from marc_subfield_structure where kohafield = \"biblioitems.itemtype\"");
***************
*** 146,149 ****
--- 164,189 ----
  }
  
+ $sth = $dbh->prepare("select count(*) from marc_biblio where frameworkcode is NULL");
+ $sth->execute;
+ ($res) = $sth->fetchrow;
+ if ($res) {
+ 	$template->param(frameworknull =>1);
+ 	$total++;
+ }
+ $sth = $dbh->prepare("select count(*) from marc_subfield_structure where frameworkcode is NULL");
+ $sth->execute;
+ ($res) = $sth->fetchrow;
+ if ($res) {
+ 	$template->param(frameworknull =>1);
+ 	$total++;
+ }
+ $sth = $dbh->prepare("select count(*) from marc_tag_structure where frameworkcode is NULL");
+ $sth->execute;
+ ($res) = $sth->fetchrow;
+ if ($res) {
+ 	$template->param(frameworknull =>1);
+ 	$total++;
+ }
+ 
  $template->param(total => $total);
  output_html_with_http_headers $input, $cookie, $template->output;

Index: itemtypes.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/itemtypes.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** itemtypes.pl	23 Mar 2005 09:44:59 -0000	1.18
--- itemtypes.pl	20 Jun 2005 13:17:16 -0000	1.19
***************
*** 177,184 ****
  		}
  		$row_data{toggle} = $toggle;
! 		$row_data{itemtype} = $results->[$i]{'itemtype'};
! 		$row_data{description} = $results->[$i]{'description'};
! 		$row_data{renewalsallowed} = $results->[$i]{'renewalsallowed'};
! 		$row_data{rentalcharge} = sprintf("%.2f",$results->[$i]{'rentalcharge'});
  		push(@loop_data, \%row_data);
  	}
--- 177,185 ----
  		}
  		$row_data{toggle} = $toggle;
! 		$row_data{itemtype} = $results->[$i]{itemtype};
! 		$row_data{description} = $results->[$i]{description};
! 		$row_data{renewalsallowed} = $results->[$i]{renewalsallowed};
! 		$row_data{notforloan} = $results->[$i]{notforloan};
! 		$row_data{rentalcharge} = sprintf("%.2f",$results->[$i]{rentalcharge});
  		push(@loop_data, \%row_data);
  	}

Index: marctagstructure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marctagstructure.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** marctagstructure.pl	1 Mar 2005 13:40:50 -0000	1.28
--- marctagstructure.pl	20 Jun 2005 13:17:17 -0000	1.29
***************
*** 43,46 ****
--- 43,47 ----
  my $offset=$input->param('offset');
  my $op = $input->param('op');
+ my $dspchoice = $input->param('select_display');
  my $pagesize=20;
  
***************
*** 217,243 ****
  		 $template->param(searchfield => $searchfield);
  	}
! 	my $env;
! 	my ($count,$results)=StringSearch($env,$searchfield,$frameworkcode);
! 	my $toggle=0;
! 	my @loop_data = ();
! 	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
! 	  	if ($toggle eq 0){
! 			$toggle=1;
! 	  	} else {
! 			$toggle=0;
! 	  	}
! 		my %row_data;  # get a fresh hash for the row data
! 		$row_data{tagfield} = $results->[$i]{'tagfield'};
! 		$row_data{liblibrarian} = $results->[$i]{'liblibrarian'};
! 		$row_data{repeatable} = $results->[$i]{'repeatable'};
! 		$row_data{mandatory} = $results->[$i]{'mandatory'};
! 		$row_data{authorised_value} = $results->[$i]{'authorised_value'};
! 		$row_data{subfield_link} ="marc_subfields_structure.pl?tagfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
! 		$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
! 		$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
! 		$row_data{toggle} = $toggle;
! 		push(@loop_data, \%row_data);
  	}
- 	$template->param(loop => \@loop_data);
  	if ($offset>0) {
  		my $prevpage = $offset-$pagesize;
--- 218,317 ----
  		 $template->param(searchfield => $searchfield);
  	}
! 	my $cnt=0;
! 	if ($dspchoice) {
! 		#here, user only wants used tags/subfields displayed
! 		my $env;
! 		$searchfield=~ s/\'/\\\'/g;
! 		my @data=split(' ',$searchfield);
! 		my $sth=$dbh->prepare("Select marc_tag_structure.tagfield as mts_tagfield,marc_tag_structure.liblibrarian as mts_liblibrarian,marc_tag_structure.libopac as mts_libopac,marc_tag_structure.repeatable as mts_repeatable,marc_tag_structure.mandatory as mts_mandatory,marc_tag_structure.authorised_value as mts_authorized_value,marc_subfield_structure.* from marc_tag_structure LEFT JOIN marc_subfield_structure ON (marc_tag_structure.tagfield=marc_subfield_structure.tagfield AND marc_tag_structure.frameworkcode=marc_subfield_structure.frameworkcode) where (marc_tag_structure.tagfield >= ? and marc_tag_structure.frameworkcode=?) AND marc_subfield_structure.tab>=0 order by marc_tag_structure.tagfield,marc_subfield_structure.tagsubfield");
! 		#could be ordoned by tab
! 		$sth->execute($data[0], $frameworkcode);
! 		my @results = ();
! 		while (my $data=$sth->fetchrow_hashref){
! 			push(@results,$data);
! 			$cnt++;
! 		}
! 		$sth->finish;
! 		
! 		my $toggle=0;
! 		my @loop_data = ();
! 		my $j=1;
! 		my $i=$offset;
! 		while ($i < ($offset+$pagesize<$cnt?$offset+$pagesize:$cnt)) {
! 			if ($toggle eq 0){
! 				$toggle=1;
! 			} else {
! 				$toggle=0;
! 			}
! 			my %row_data;  # get a fresh hash for the row data
! 			$row_data{tagfield} = $results[$i]->{'mts_tagfield'};
! 			$row_data{liblibrarian} = $results[$i]->{'mts_liblibrarian'};
! 			$row_data{repeatable} = $results[$i]->{'mts_repeatable'};
! 			$row_data{mandatory} = $results[$i]->{'mts_mandatory'};
! 			$row_data{authorised_value} = $results[$i]->{'mts_authorised_value'};
! 			$row_data{subfield_link} ="marc_subfields_structure.pl?op=add_form&tagfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
! 			$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
! 			$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
! 			$row_data{toggle} = $toggle;
! 			$j=$i;
! 			my @internal_loop = ();
! 			while (($results[$i]->{'tagfield'}==$results[$j]->{'tagfield'}) and ($j< ($offset+$pagesize<$cnt?$offset+$pagesize:$cnt))) {
! 				if ($toggle eq 0) {
! 					$toggle=1;
! 				} else {
! 					$toggle=0;
! 				}
! 				my %subfield_data;
! 				$subfield_data{tagsubfield} = $results[$j]->{'tagsubfield'};
! 				$subfield_data{liblibrarian} = $results[$j]->{'liblibrarian'};
! 				$subfield_data{kohafield} = $results[$j]->{'kohafield'};
! 				$subfield_data{repeatable} = $results[$j]->{'repeatable'};
! 				$subfield_data{mandatory} = $results[$j]->{'mandatory'};
! 				$subfield_data{tab} = $results[$j]->{'tab'};
! 				$subfield_data{seealso} = $results[$j]->{'seealso'};
! 				$subfield_data{authorised_value} = $results[$j]->{'authorised_value'};
! 				$subfield_data{authtypecode}= $results[$j]->{'authtypecode'};
! 				$subfield_data{value_builder}= $results[$j]->{'value_builder'};
! 				$subfield_data{toggle}	= $toggle;
! # 				warn "tagfield :  ".$results[$j]->{'tagfield'}." tagsubfield :".$results[$j]->{'tagsubfield'};
! 				push @internal_loop,\%subfield_data;
! 				$j++;
! 			}
! 			$row_data{'subfields'}=\@internal_loop;
! 			push(@loop_data, \%row_data);
! #			undef @internal_loop;
! 			$i=$j;
! 		}
! 		$template->param(select_display => "True",
! 						loop => \@loop_data);
! 		#  $sth->execute;
! 		$sth->finish;
! 	} else {
! 		#here, normal old style : display every tags
! 		my $env;
! 		my ($count,$results)=StringSearch($env,$searchfield,$frameworkcode);
! 		$cnt = $count;
! 		my $toggle=0;
! 		my @loop_data = ();
! 		for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
! 			if ($toggle eq 0){
! 				$toggle=1;
! 			} else {
! 				$toggle=0;
! 			}
! 			my %row_data;  # get a fresh hash for the row data
! 			$row_data{tagfield} = $results->[$i]{'tagfield'};
! 			$row_data{liblibrarian} = $results->[$i]{'liblibrarian'};
! 			$row_data{repeatable} = $results->[$i]{'repeatable'};
! 			$row_data{mandatory} = $results->[$i]{'mandatory'};
! 			$row_data{authorised_value} = $results->[$i]{'authorised_value'};
! 			$row_data{subfield_link} ="marc_subfields_structure.pl?tagfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
! 			$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
! 			$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
! 			$row_data{toggle} = $toggle;
! 			push(@loop_data, \%row_data);
! 		}
! 		$template->param(loop => \@loop_data);
  	}
  	if ($offset>0) {
  		my $prevpage = $offset-$pagesize;
***************
*** 247,253 ****
  						script_name => $script_name,
  						frameworkcode => $frameworkcode,
! 		 );
  	}
! 	if ($offset+$pagesize<$count) {
  		my $nextpage =$offset+$pagesize;
  		$template->param(nextpage =>$nextpage,
--- 321,327 ----
  						script_name => $script_name,
  						frameworkcode => $frameworkcode,
! 		);
  	}
! 	if ($offset+$pagesize<$cnt) {
  		my $nextpage =$offset+$pagesize;
  		$template->param(nextpage =>$nextpage,




From tipaul at users.sourceforge.net  Mon Jun 20 15:17:59 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 06:17:59 -0700
Subject: [Koha-cvs] CVS: koha/authorities authorities-home.pl,1.9,1.10 authorities.pl,1.11,1.12 blinddetail-biblio-search.pl,1.4,1.5 detail.pl,1.2,1.3
Message-ID: <E1DkMA3-0002Bn-CP@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8375/authorities

Modified Files:
	authorities-home.pl authorities.pl 
	blinddetail-biblio-search.pl detail.pl 
Log Message:
synch'ing 2.2 and head

Index: authorities-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/authorities-home.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** authorities-home.pl	1 Mar 2005 13:40:50 -0000	1.9
--- authorities-home.pl	20 Jun 2005 13:17:56 -0000	1.10
***************
*** 88,95 ****
  	my @field_data = ();
  
! 
  	for(my $i = 0 ; $i <= $#marclist ; $i++)
  	{
! 		push @field_data, { term => "marclist", val=>$marclist[$i] };
  		push @field_data, { term => "and_or", val=>$and_or[$i] };
  		push @field_data, { term => "excluding", val=>$excluding[$i] };
--- 88,96 ----
  	my @field_data = ();
  
! 	# we must get parameters once again. Because if there is a mainentry, it has been replaced by something else during the search, thus the links next/previous would not work anymore 
! 	my @marclist_ini = $query->param('marclist');
  	for(my $i = 0 ; $i <= $#marclist ; $i++)
  	{
! 		push @field_data, { term => "marclist", val=>$marclist_ini[$i] };
  		push @field_data, { term => "and_or", val=>$and_or[$i] };
  		push @field_data, { term => "excluding", val=>$excluding[$i] };

Index: authorities.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/authorities.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** authorities.pl	4 May 2005 08:51:07 -0000	1.11
--- authorities.pl	20 Jun 2005 13:17:56 -0000	1.12
***************
*** 240,243 ****
--- 240,244 ----
  				$tag_data{tag} = $tag;
  				$tag_data{tag_lib} = $tagslib->{$tag}->{lib};
+ 				$tag_data{repeatable} = $tagslib->{$tag}->{repeatable};
  				$tag_data{indicator} = $indicator;
  				$tag_data{subfield_loop} = \@subfields_data;
***************
*** 366,404 ****
  	my @ind_tag = $input->param('ind_tag');
  	my @indicator = $input->param('indicator');
- 	splice(@tags,$addedfield,0,$tags[$addedfield]);
- 	splice(@subfields,$addedfield,0,$subfields[$addedfield]);
- 	splice(@values,$addedfield,0,$values[$addedfield]);
- 	splice(@ind_tag,$addedfield,0,$ind_tag[$addedfield]);
  	my %indicators;
  	for (my $i=0;$i<=$#ind_tag;$i++) {
  		$indicators{$ind_tag[$i]} = $indicator[$i];
  	}
! # search the part of the array to duplicate.
! 	my $start=0;
! 	my $end=0;
! 	my $started;
! 	for (my $i=0;$i<=$#tags;$i++) {
! 		$start=$i if ($start eq 0 && $tags[$i] == $addedfield);
! 		$end=$i if ($start>0 && $tags[$i] eq $addedfield);
! 		last if ($start>0 && $tags[$i] ne $addedfield);
! 	}
! # add an empty line in all arrays. This forces a new field in MARC::Record.
! 	splice(@tags,$end+1,0,'');
! 	splice(@subfields,$end+1,0,'');
! 	splice(@values,$end+1,0,'');
! 	splice(@ind_tag,$end+1,0,'');
! 	splice(@indicator,$end+1,0,'');
! # then duplicate the field.
! 	splice(@tags,$end+2,0, at tags[$start..$end]);
! 	splice(@subfields,$end+2,0, at subfields[$start..$end]);
! 	splice(@values,$end+2,0, at values[$start..$end]);
! 	splice(@ind_tag,$end+2,0, at ind_tag[$start..$end]);
! 	splice(@indicator,$end+2,0, at indicator[$start..$end]);
  
- 	my %indicators;
- 	for (my $i=0;$i<=$#ind_tag;$i++) {
- 		$indicators{$ind_tag[$i]} = $indicator[$i];
- 	}
- 	my $record = MARChtml2marc($dbh,\@tags,\@subfields,\@values,%indicators);
  	build_tabs ($template, $record, $dbh,$encoding);
  	build_hidden_data;
--- 367,378 ----
  	my @ind_tag = $input->param('ind_tag');
  	my @indicator = $input->param('indicator');
  	my %indicators;
  	for (my $i=0;$i<=$#ind_tag;$i++) {
  		$indicators{$ind_tag[$i]} = $indicator[$i];
  	}
! 	my $record = AUTHhtml2marc($dbh,\@tags,\@subfields,\@values,%indicators);
! 	my $field = MARC::Field->new("$addedfield",'','','a'=> "");
! 	$record->append_fields($field);
  
  	build_tabs ($template, $record, $dbh,$encoding);
  	build_hidden_data;
***************
*** 418,422 ****
  }
  
! if ($authid) {
  	build_tabs ($template, $record, $dbh,$encoding);
  	build_hidden_data;
--- 392,397 ----
  }
  
! unless ($op) {
! # 	warn "BUILDING";
  	build_tabs ($template, $record, $dbh,$encoding);
  	build_hidden_data;
***************
*** 432,436 ****
  	);
  
! 	my $authtypes = getauthtypes;
  my @authtypesloop;
  foreach my $thisauthtype (keys %$authtypes) {
--- 407,411 ----
  	);
  
! my $authtypes = getauthtypes;
  my @authtypesloop;
  foreach my $thisauthtype (keys %$authtypes) {
***************
*** 443,446 ****
  }
  
! $template->param(authtypesloop => \@authtypesloop);
  output_html_with_http_headers $input, $cookie, $template->output;
--- 418,423 ----
  }
  
! $template->param(authtypesloop => \@authtypesloop,
! 				authtypetext => $authtypes->{$authtypecode}{'authtypetext'},
! 				);
  output_html_with_http_headers $input, $cookie, $template->output;

Index: blinddetail-biblio-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/blinddetail-biblio-search.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** blinddetail-biblio-search.pl	16 Sep 2004 09:45:44 -0000	1.4
--- blinddetail-biblio-search.pl	20 Jun 2005 13:17:56 -0000	1.5
***************
*** 80,84 ****
  my @loop_data =();
  if ($authid) {
- warn "report $authtypecode => ".$auth_type->{auth_tag_to_report}.$record->as_formatted;
  	foreach my $field ($record->field($auth_type->{auth_tag_to_report})) {
  			my @subfields_data;
--- 80,83 ----

Index: detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/detail.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** detail.pl	8 Nov 2004 19:46:11 -0000	1.2
--- detail.pl	20 Jun 2005 13:17:56 -0000	1.3
***************
*** 144,147 ****
--- 144,148 ----
  				count => $count,
  				biblio_fields => $biblio_fields,
+ 				authtypetext => $authtypes->{$authtypecode}{'authtypetext'},
  				authtypesloop => \@authtypesloop);
  output_html_with_http_headers $query, $cookie, $template->output;




From tipaul at users.sourceforge.net  Mon Jun 20 15:18:47 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 06:18:47 -0700
Subject: [Koha-cvs] CVS: koha/bull statecollection.pl,1.4,1.5
Message-ID: <E1DkMAp-0002HI-W3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8739/bull

Modified Files:
	statecollection.pl 
Log Message:
synch'ing 2.2 and head

Index: statecollection.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/statecollection.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** statecollection.pl	1 Mar 2005 13:40:50 -0000	1.4
--- statecollection.pl	20 Jun 2005 13:18:45 -0000	1.5
***************
*** 32,40 ****
  # change status except, if subscription has expired, for the "waited" issue.
  if ($op eq 'serialchangestatus') {
! 	my $sth = $dbh->prepare("select subscriptionid,status from serial where serialid=?");
  	for (my $i=0;$i<=$#serialids;$i++) {
  		$sth->execute($serialids[$i]);
! 		my ($x,$oldstatus) = $sth->fetchrow;
! 		serialchangestatus($serialids[$i],$serialseqs[$i],format_date_in_iso($planneddates[$i]),$status[$i]) unless ($hassubscriptionexpired && $oldstatus == 1);
  	}
  }
--- 32,48 ----
  # change status except, if subscription has expired, for the "waited" issue.
  if ($op eq 'serialchangestatus') {
! 	my $sth = $dbh->prepare("select status from serial where serialid=?");
  	for (my $i=0;$i<=$#serialids;$i++) {
  		$sth->execute($serialids[$i]);
! 		my ($oldstatus) = $sth->fetchrow;
! 		if ($serialids[$i]) {
! 			serialchangestatus($serialids[$i],$serialseqs[$i],format_date_in_iso($planneddates[$i]),$status[$i]) unless ($hassubscriptionexpired && $oldstatus == 1);
! 		} else {
! 			# add a special issue
! 			if ($serialseqs[$i]) {
! 				my $subscription=getsubscription($subscriptionid);
! 				newissue($serialseqs[$i],$subscriptionid,$subscription->{biblionumber},$status[$i], format_date_in_iso($planneddates[$i]));
! 			}
! 		}
  	}
  }




From tipaul at users.sourceforge.net  Mon Jun 20 16:10:05 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:10:05 -0700
Subject: [Koha-cvs] CVS: koha/C4 Accounts2.pm,1.22,1.23 Acquisition.pm,1.12,1.13 AuthoritiesMarc.pm,1.18,1.19 Auth.pm,1.38,1.39 Auth_with_ldap.pm,1.3,1.4 Biblio.pm,1.120,1.121 Bull.pm,1.11,1.12 Context.pm,1.20,1.21 Members.pm,1.7,1.8 Output.pm,1.51,1.52 SearchMarc.pm,1.45,1.46
Message-ID: <E1DkMyT-0000Nz-UD@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1223/C4

Modified Files:
	Accounts2.pm Acquisition.pm AuthoritiesMarc.pm Auth.pm 
	Auth_with_ldap.pm Biblio.pm Bull.pm Context.pm Members.pm 
	Output.pm SearchMarc.pm 
Log Message:
synch'ing 2.2 and head

Index: Accounts2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Accounts2.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** Accounts2.pm	9 Dec 2003 15:03:00 -0000	1.22
--- Accounts2.pm	20 Jun 2005 14:10:00 -0000	1.23
***************
*** 302,310 ****
    }
    if ($itemnum ne ''){
- #FIXME to use ? before uncommenting
- #     my $sth=$dbh->prepare("Select * from items where barcode='$itemnum'");
- #     $sth->execute;
- #     my $data=$sth->fetchrow_hashref;
- #     $sth->finish;
      $desc.=" ".$itemnum;
      my $sth=$dbh->prepare("INSERT INTO	accountlines
--- 302,305 ----
***************
*** 314,318 ****
       $sth->execute($bornum, $accountno, $amount, $desc, $type, $amountleft, $itemnum);
    } else {
-     $desc=$dbh->quote($desc);
      my $sth=$dbh->prepare("INSERT INTO	accountlines
  			(borrowernumber, accountno, date, amount, description, accounttype, amountoutstanding)
--- 309,312 ----

Index: Acquisition.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** Acquisition.pm	6 Jun 2005 23:29:36 -0000	1.12
--- Acquisition.pm	20 Jun 2005 14:10:00 -0000	1.13
***************
*** 105,109 ****
  	my ($basketno,$supplier,$orderby)=@_;
  	my $dbh = C4::Context->dbh;
! 	my $query="Select *,biblio.title,aqorders.ordernumber from aqorders,biblio,biblioitems
  	left join aqorderbreakdown on aqorderbreakdown.ordernumber=aqorders.ordernumber
  	where basketno='$basketno'
--- 105,109 ----
  	my ($basketno,$supplier,$orderby)=@_;
  	my $dbh = C4::Context->dbh;
! 	my $query="Select biblio.*,biblioitems.*,aqorders.*,aqorderbreakdown.*,biblio.title from aqorders,biblio,biblioitems
  	left join aqorderbreakdown on aqorderbreakdown.ordernumber=aqorders.ordernumber
  	where basketno='$basketno'
***************
*** 563,567 ****
  	map { push(@searchterms,"$_%","% $_%") } @data;
  	push(@searchterms,$search,$search,$biblio);
! 	my $sth=$dbh->prepare("Select *,biblio.title from aqorders,biblioitems,biblio,aqbasket
  		where aqorders.biblioitemnumber = biblioitems.biblioitemnumber and
  		aqorders.basketno = aqbasket.basketno
--- 563,567 ----
  	map { push(@searchterms,"$_%","% $_%") } @data;
  	push(@searchterms,$search,$search,$biblio);
! 	my $sth=$dbh->prepare("Select biblio.*,biblioitems.*,aqorders.*,aqbasket.*,biblio.title from aqorders,biblioitems,biblio,aqbasket
  		where aqorders.biblioitemnumber = biblioitems.biblioitemnumber and
  		aqorders.basketno = aqbasket.basketno
***************
*** 598,610 ****
  
  sub histsearch {
! 	my ($title,$author,$name)=@_;
  	my $dbh= C4::Context->dbh;
! 	my $query = "select biblio.title,aqorders.basketno,name,aqbasket.creationdate,aqorders.datereceived, aqorders.quantity, aqorders.ecost
! 							from aqorders,aqbasket,aqbooksellers,biblio 
! 							where aqorders.basketno=aqbasket.basketno and aqbasket.booksellerid=aqbooksellers.id and
! 							biblio.biblionumber=aqorders.biblionumber";
  	$query .= " and biblio.title like ".$dbh->quote("%".$title."%") if $title;
  	$query .= " and biblio.author like ".$dbh->quote("%".$author."%") if $author;
  	$query .= " and name like ".$dbh->quote("%".$name."%") if $name;
  	my $sth = $dbh->prepare($query);
  	$sth->execute;
--- 598,612 ----
  
  sub histsearch {
! 	my ($title,$author,$name,$from_placed_on,$to_placed_on)=@_;
  	my $dbh= C4::Context->dbh;
! 	my $query = "select biblio.title,aqorders.basketno,name,aqbasket.creationdate,aqorders.datereceived, aqorders.quantity, aqorders.ecost from aqorders,aqbasket,aqbooksellers,biblio 
! where aqorders.basketno=aqbasket.basketno and aqbasket.booksellerid=aqbooksellers.id and
! biblio.biblionumber=aqorders.biblionumber";
  	$query .= " and biblio.title like ".$dbh->quote("%".$title."%") if $title;
  	$query .= " and biblio.author like ".$dbh->quote("%".$author."%") if $author;
  	$query .= " and name like ".$dbh->quote("%".$name."%") if $name;
+ 	$query .= " and creationdate >" .$dbh->quote($from_placed_on) if $from_placed_on;
+ 	$query .= " and creationdate<".$dbh->quote($to_placed_on) if $to_placed_on;
+ 	warn "C4:Acquisition : ".$query;
  	my $sth = $dbh->prepare($query);
  	$sth->execute;

Index: AuthoritiesMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/AuthoritiesMarc.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** AuthoritiesMarc.pm	7 Jun 2005 10:00:47 -0000	1.18
--- AuthoritiesMarc.pm	20 Jun 2005 14:10:00 -0000	1.19
***************
*** 667,671 ****
--- 667,673 ----
  			if (@$rtags[$i] <10) {
  				$prevvalue= @$rvalues[$i];
+ 				undef $field;
  			} else {
+ 				undef $prevvalue;
  				$field = MARC::Field->new( (sprintf "%03s",@$rtags[$i]), substr($indicators{@$rtags[$i]},0,1),substr($indicators{@$rtags[$i]},1,1), @$rsubfields[$i] => @$rvalues[$i]);
  			}
***************
*** 675,679 ****
  				$prevvalue=@$rvalues[$i];
  			} else {
! 				if (@$rvalues[$i]) {
  					$field->add_subfields(@$rsubfields[$i] => @$rvalues[$i]);
  				}
--- 677,681 ----
  				$prevvalue=@$rvalues[$i];
  			} else {
! 				if (length(@$rvalues[$i])>0) {
  					$field->add_subfields(@$rsubfields[$i] => @$rvalues[$i]);
  				}
***************
*** 683,688 ****
  	}
  	# the last has not been included inside the loop... do it now !
! 	$record->add_fields($field);
! # 	warn $record->as_formatted;
  	return $record;
  }
--- 685,689 ----
  	}
  	# the last has not been included inside the loop... do it now !
! 	$record->add_fields($field) if $field;
  	return $record;
  }
***************
*** 922,925 ****
--- 923,929 ----
  # $Id$
  # $Log$
+ # Revision 1.19  2005/06/20 14:10:00  tipaul
+ # synch'ing 2.2 and head
+ #
  # Revision 1.18  2005/06/07 10:00:47  tipaul
  # adding $b to mainentry (in UNIMARC, for personal names, $a is the surname, $b is the firstname)

Index: Auth.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Auth.pm,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** Auth.pm	4 May 2005 15:40:01 -0000	1.38
--- Auth.pm	20 Jun 2005 14:10:00 -0000	1.39
***************
*** 400,404 ****
  
  	my $self_url = $query->url(-absolute => 1);
! 	$template->param(url => $self_url);
  	$template->param(\%info);
  	$cookie=$query->cookie(-name => 'sessionID',
--- 400,404 ----
  
  	my $self_url = $query->url(-absolute => 1);
! 	$template->param(url => $self_url, LibraryName=> => C4::Context->preference("LibraryName"),);
  	$template->param(\%info);
  	$cookie=$query->cookie(-name => 'sessionID',

Index: Auth_with_ldap.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Auth_with_ldap.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Auth_with_ldap.pm	4 May 2005 15:40:01 -0000	1.3
--- Auth_with_ldap.pm	20 Jun 2005 14:10:00 -0000	1.4
***************
*** 138,142 ****
  		$template->param(USER_INFO => \@bordat,
  		);
- 		
  		# We are going to use the $flags returned by checkauth
  		# to create the template's parameters that will indicate
--- 138,141 ----
***************
*** 164,167 ****
--- 163,167 ----
  			$template->param(CAN_user_catalogue => 1); }
  		
+ 
  		if ($flags->{parameters} == 1) {
  			$template->param(CAN_user_parameters => 1);	
***************
*** 169,175 ****
--- 169,177 ----
  			$template->param(CAN_user_tools => 1); }
  		
+ 
  		if ($flags->{borrowers} == 1) {
  			$template->param(CAN_user_borrowers => 1); }
  		
+ 
  		if ($flags->{permissions} == 1) {
  			$template->param(CAN_user_permission => 1); }
***************
*** 178,190 ****
--- 180,196 ----
  			$template->param(CAN_user_reserveforothers => 1); }
  		
+ 
  		if ($flags->{borrow} == 1) {
  			$template->param(CAN_user_borrow => 1); }
  		
+ 
  		if ($flags->{reserveforself} == 1) {
  			$template->param(CAN_user_reserveforself => 1); }
  		
+ 
  		if ($flags->{editcatalogue} == 1) {
  			$template->param(CAN_user_editcatalogue => 1); }
  		
+ 
  		if ($flags->{updatecharges} == 1) {
  			$template->param(CAN_user_updatecharge => 1); }

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -r1.120 -r1.121
*** Biblio.pm	15 Jun 2005 16:09:43 -0000	1.120
--- Biblio.pm	20 Jun 2005 14:10:00 -0000	1.121
***************
*** 59,62 ****
--- 59,63 ----
    &NEWmodbiblio &NEWmoditem
    &NEWdelbiblio &NEWdelitem
+   &NEWmodbiblioframework
  
    &MARCaddbiblio &MARCadditem
***************
*** 930,934 ****
              $row->{'author'},'' );
      }
!     my $sth2 =
        $dbh->prepare(" SELECT subject FROM bibliosubject WHERE biblionumber=?");
      $sth2->execute($biblionumber);
--- 931,935 ----
              $row->{'author'},'' );
      }
!     $sth2 =
        $dbh->prepare(" SELECT subject FROM bibliosubject WHERE biblionumber=?");
      $sth2->execute($biblionumber);
***************
*** 937,941 ****
              $row->{'subject'},'' );
      }
!     my $sth2 =
        $dbh->prepare(
          " SELECT subtitle FROM bibliosubtitle WHERE biblionumber=?");
--- 938,942 ----
              $row->{'subject'},'' );
      }
!     $sth2 =
        $dbh->prepare(
          " SELECT subtitle FROM bibliosubtitle WHERE biblionumber=?");
***************
*** 1044,1048 ****
--- 1045,1051 ----
  			if (@$rtags[$i] <10) {
  				$prevvalue= @$rvalues[$i];
+ 				undef $field;
  			} else {
+ 				undef $prevvalue;
  				$field = MARC::Field->new( (sprintf "%03s",@$rtags[$i]), substr($indicators{@$rtags[$i]},0,1),substr($indicators{@$rtags[$i]},1,1), @$rsubfields[$i] => @$rvalues[$i]);
  # 			warn "1=>".@$rtags[$i].@$rsubfields[$i]." = ".@$rvalues[$i].": ".$field->as_formatted;
***************
*** 1062,1066 ****
  	}
  	# the last has not been included inside the loop... do it now !
! 	$record->add_fields($field);
  # 	warn "HTML2MARC=".$record->as_formatted;
  	return $record;
--- 1065,1069 ----
  	}
  	# the last has not been included inside the loop... do it now !
! 	$record->add_fields($field) if $field;
  # 	warn "HTML2MARC=".$record->as_formatted;
  	return $record;
***************
*** 1101,1105 ****
  	}
  # modify publicationyear to keep only the 1st year found
! 	my $temp = $result->{'publicationyear'};
  	$temp =~ m/c(\d\d\d\d)/; # search cYYYY first
  	if ($1>0) {
--- 1104,1108 ----
  	}
  # modify publicationyear to keep only the 1st year found
! 	$temp = $result->{'publicationyear'};
  	$temp =~ m/c(\d\d\d\d)/; # search cYYYY first
  	if ($1>0) {
***************
*** 1275,1278 ****
--- 1278,1287 ----
  }
  
+ sub NEWmodbiblioframework {
+ 	my ($dbh,$bibid,$frameworkcode) =@_;
+ 	my $sth = $dbh->prepare("Update marc_biblio SET frameworkcode=? WHERE bibid=$bibid");
+ 	$sth->execute($frameworkcode);
+ 	return 1;
+ }
  sub NEWmodbiblio {
  	my ($dbh,$record,$bibid,$frameworkcode) =@_;
***************
*** 1348,1352 ****
  
      # add itemnumber to MARC::Record before adding the item.
!     my $sth =
        $dbh->prepare(
  "select tagfield,tagsubfield from marc_subfield_structure where frameworkcode=? and kohafield=?"
--- 1357,1361 ----
  
      # add itemnumber to MARC::Record before adding the item.
!     $sth =
        $dbh->prepare(
  "select tagfield,tagsubfield from marc_subfield_structure where frameworkcode=? and kohafield=?"
***************
*** 1458,1462 ****
      $sth =
        $dbh->prepare(
! "insert into biblio set biblionumber  = ?, title = ?, author = ?, copyrightdate = ?, serial = ?, seriestitle = ?, notes = ?, abstract = ?"
      );
      $sth->execute(
--- 1467,1471 ----
      $sth =
        $dbh->prepare(
! "insert into biblio set biblionumber  = ?, title = ?, author = ?, copyrightdate = ?, serial = ?, seriestitle = ?, notes = ?, abstract = ?, unititle = ?"
      );
      $sth->execute(
***************
*** 1464,1468 ****
          $biblio->{'author'}, $biblio->{'copyrightdate'},
          $biblio->{'serial'},             $biblio->{'seriestitle'},
!         $biblio->{'notes'},  $biblio->{'abstract'}
      );
  
--- 1473,1478 ----
          $biblio->{'author'}, $biblio->{'copyrightdate'},
          $biblio->{'serial'},             $biblio->{'seriestitle'},
!         $biblio->{'notes'},  $biblio->{'abstract'},
! 		$biblio->{'unititle'},
      );
  
***************
*** 2672,2675 ****
--- 2682,2688 ----
  # $Id$
  # $Log$
+ # Revision 1.121  2005/06/20 14:10:00  tipaul
+ # synch'ing 2.2 and head
+ #
  # Revision 1.120  2005/06/15 16:09:43  hdl
  # Displaying dashed isbn.

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** Bull.pm	17 Jun 2005 13:44:25 -0000	1.11
--- Bull.pm	20 Jun 2005 14:10:01 -0000	1.12
***************
*** 47,50 ****
--- 47,51 ----
  @EXPORT = qw(&newsubscription &modsubscription &delsubscription &getsubscriptions &getsubscription 
  			&getsubscriptionfrombiblionumber &get_subscription_list_from_biblionumber
+ 			&get_full_subscription_list_from_biblionumber 
  			&modsubscriptionhistory &newissue
  			&getserials &serialchangestatus
***************
*** 101,104 ****
--- 102,106 ----
  	return @issuelist;
  }
+ 
  sub newsubscription {
  	my ($auser,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber,
***************
*** 140,143 ****
--- 142,146 ----
  	return $subscriptionid;
  }
+ 
  sub getsubscription {
  	my ($subscriptionid) = @_;
***************
*** 167,171 ****
  	my ($biblionumber) = @_;
  	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare('select subscription.*,subscriptionhistory.*,aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle 
  							from subscription 
  							left join subscriptionhistory on subscription.subscriptionid=subscriptionhistory.subscriptionid
--- 170,174 ----
  	my ($biblionumber) = @_;
  	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare('select subscription.*,subscriptionhistory.*,  aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle 
  							from subscription 
  							left join subscriptionhistory on subscription.subscriptionid=subscriptionhistory.subscriptionid
***************
*** 178,184 ****
--- 181,194 ----
  	while (my $subs = $sth->fetchrow_hashref) {
  		$subs->{startdate} = format_date($subs->{startdate});
+ 		$subs->{histstartdate} = format_date($subs->{histstartdate});
  		$subs->{opacnote} =~ s/\n/\<br\/\>/g;
  		$subs->{missinglist} =~ s/\n/\<br\/\>/g;
  		$subs->{recievedlist} =~ s/\n/\<br\/\>/g;
+ 		$subs->{"periodicity".$subs->{periodicity}} = 1;
+ 		if ($subs->{enddate} eq '0000-00-00') {
+ 			$subs->{enddate}='';
+ 		} else {
+ 			$subs->{enddate} = format_date($subs->{enddate});
+ 		}
  		push @res,$subs;
  	}
***************
*** 186,189 ****
--- 196,263 ----
  }
  
+ sub get_full_subscription_list_from_biblionumber {
+ 	my ($biblionumber) = @_;
+ 	my $dbh = C4::Context->dbh;
+ 	my $sth = $dbh->prepare('select serial.serialseq, serial.planneddate, serial.status, year(serial.planneddate) as year,subscription.*, aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle 
+ 							from serial left join subscription on (serial.subscriptionid=subscription.subscriptionid and subscription.biblionumber=serial.biblionumber)
+ 							left join aqbudget on subscription.aqbudgetid=aqbudget.aqbudgetid 
+ 							left join aqbooksellers on subscription.aqbooksellerid=aqbooksellers.id 
+ 							left join biblio on biblio.biblionumber=subscription.biblionumber 
+ 							where subscription.biblionumber = ? order by year,serial.planneddate');
+ 	$sth->execute($biblionumber);
+ 	my @res;
+ 	my $year;
+ 	my $startdate;
+ 	my $aqbooksellername;
+ 	my $bibliotitle;
+ 	my @loopissues;
+ 	my $first;
+ 	while (my $subs = $sth->fetchrow_hashref) {
+ # 		my $sth2 = $dbh->prepare('select * from serial where serial.biblionumber = ? and serial.subscriptionid=? order by serial.planneddate');
+ # 		$sth2->execute($biblionumber,$subs->{'subscriptionid'});
+ # 		while (my $issues = $sth2->fetchrow_hashref){
+ # 				warn "planneddate ".$issues->{'planneddate'};
+ # 				warn "serialseq".$issues->{'serialseq'};
+ # 		}
+ 		if ($year and ($year==$subs->{year})){
+ 			if ($first eq 1){$first=0;}
+ 			my $temp=$res[scalar(@res)-1]->{'serials'};
+ 			push @$temp,
+ 				{'planneddate' => format_date($subs->{'planneddate'}), 
+ 				'serialseq' => $subs->{'serialseq'},
+ 				'status1' => $subs->{'status'}==1,
+ 				'status2' => $subs->{'status'}==2,
+ 				'status3' => $subs->{'status'}==3,
+ 				'status4' => $subs->{'status'}==4,
+ 				};
+ 		}else {
+ 			$first=1 if (not $year);
+ 			$year= $subs->{'year'};
+ 			$startdate= format_date($subs->{'startdate'});
+ 			$aqbooksellername= $subs->{'aqbooksellername'};
+ 			$bibliotitle= $subs->{'bibliotitle'};
+ 			my @temp;
+ 			push @temp,
+ 				{'planneddate' => format_date($subs->{'planneddate'}), 
+ 				'serialseq' => $subs->{'serialseq'},
+ 				'status1' => $subs->{'status'}==1,
+ 				'status2' => $subs->{'status'}==2,
+ 				'status3' => $subs->{'status'}==3,
+ 				'status4' => $subs->{'status'}==4,
+ 				};
+ 			
+ 			push @res,{
+ 				'year'=>$year,
+ 				'startdate'=>$startdate,
+ 				'aqbooksellername'=>$aqbooksellername,
+ 				'bibliotitle'=>$bibliotitle,
+ 				'serials'=>\@temp,
+ 				'first'=>$first 
+ 			};
+ 		}
+ 	}
+ 	return \@res;
+ }
+ 
  
  sub modsubscription {
***************
*** 301,323 ****
  		push @serials,$line;
  	}
! 	return \@serials;
! }
! 
! sub serialdelete {
! 	my ($serialid,$serialseq)=@_;
! 	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare("select subscriptionid,status from serial where serialid=?");
! 	$sth->execute($serialid);
! 	my ($subscriptionid,$oldstatus) = $sth->fetchrow;
! 	# change status & update subscriptionhistory
! 	my $sth = $dbh->prepare("delete * from serial  where serialid = ?");
! 	$sth->execute($serialid);
! 	$sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
  	$sth->execute($subscriptionid);
! 	my ($missinglist,$recievedlist) = $sth->fetchrow;
! 	$recievedlist =~ s/",$serialseq"//;
! 	$missinglist =~ s/",$serialseq"//;
! 	$sth=$dbh->prepare("update subscriptionhistory set recievedlist=?, missinglist=? where subscriptionid=?");
! 	$sth->execute($recievedlist,$missinglist,$subscriptionid);
  }
  
--- 375,382 ----
  		push @serials,$line;
  	}
! 	$sth=$dbh->prepare("select count(*) from serial where subscriptionid=?");
  	$sth->execute($subscriptionid);
! 	my ($totalissues) = $sth->fetchrow;
! 	return ($totalissues, at serials);
  }
  
***************
*** 370,380 ****
  	my $sth = $dbh->prepare("insert into serial (serialseq,subscriptionid,biblionumber,status, planneddate) values (?,?,?,?,?)");
  	$sth->execute($serialseq,$subscriptionid,$biblionumber,$status, $planneddate);
! }
! 
! sub delissue {
! 	my ($serialseq,$subscriptionid) = @_;
! 	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare("delete from serial where serialseq= ? and subscriptionid= ? ");
! 	$sth->execute($serialseq,$subscriptionid);
  }
  
--- 429,443 ----
  	my $sth = $dbh->prepare("insert into serial (serialseq,subscriptionid,biblionumber,status, planneddate) values (?,?,?,?,?)");
  	$sth->execute($serialseq,$subscriptionid,$biblionumber,$status, $planneddate);
! 	$sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
! 	$sth->execute($subscriptionid);
! 	my ($missinglist,$recievedlist) = $sth->fetchrow;
! 	if ($status eq 2) {
! 		$recievedlist .= ",$serialseq";
! 	}
! 	if ($status eq 4) {
! 		$missinglist .= ",$serialseq";
! 	}
! 	$sth=$dbh->prepare("update subscriptionhistory set recievedlist=?, missinglist=? where subscriptionid=?");
! 	$sth->execute($recievedlist,$missinglist,$subscriptionid);
  }
  


Index: Members.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Members.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Members.pm	4 May 2005 15:40:01 -0000	1.7
--- Members.pm	20 Jun 2005 14:10:01 -0000	1.8
***************
*** 100,104 ****
  	my $dbh = C4::Context->dbh;
  	$data{'dateofbirth'}=format_date_in_iso($data{'dateofbirth'});
- 	$data{'joining'}=format_date_in_iso($data{'joining'});
  	$data{'expiry'}=format_date_in_iso($data{'expiry'});
  	my $query="update borrowers set title='$data{'title'}',expiry='$data{'expiry'}',
--- 100,103 ----
***************
*** 106,110 ****
  	streetaddress='$data{'streetaddress'}',faxnumber='$data{'faxnumber'}',firstname='$data{'firstname'}',
  	altnotes='$data{'altnotes'}',dateofbirth='$data{'dateofbirth'}',contactname='$data{'contactname'}',
! 	emailaddress='$data{'emailaddress'}',dateenrolled='$data{'joining'}',streetcity='$data{'streetcity'}',
  	altrelationship='$data{'altrelationship'}',othernames='$data{'othernames'}',phoneday='$data{'phoneday'}',
  	categorycode='$data{'categorycode'}',city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}',
--- 105,109 ----
  	streetaddress='$data{'streetaddress'}',faxnumber='$data{'faxnumber'}',firstname='$data{'firstname'}',
  	altnotes='$data{'altnotes'}',dateofbirth='$data{'dateofbirth'}',contactname='$data{'contactname'}',
! 	emailaddress='$data{'emailaddress'}',streetcity='$data{'streetcity'}',
  	altrelationship='$data{'altrelationship'}',othernames='$data{'othernames'}',phoneday='$data{'phoneday'}',
  	categorycode='$data{'categorycode'}',city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}',
***************
*** 131,135 ****
--- 130,143 ----
  	my $dbh = C4::Context->dbh;
  	$data{'dateofbirth'}=format_date_in_iso($data{'dateofbirth'});
+ 	$data{'joining'} = &ParseDate("today") unless $data{'joining'};
  	$data{'joining'}=format_date_in_iso($data{'joining'});
+ 	# if expirydate is not set, calculate it from borrower category subscription duration
+ 	unless ($data{'expiry'}) {
+ 		my $sth = $dbh->prepare("select enrolmentperiod from categories where categorycode=?");
+ 		$sth->execute($data{'categorycode'});
+ 		my ($enrolmentperiod) = $sth->fetchrow;
+ 		$enrolmentperiod = 12 unless ($enrolmentperiod);
+ 		$data{'expiry'} = &DateCalc($data{'joining'},"$enrolmentperiod years");
+ 	}
  	$data{'expiry'}=format_date_in_iso($data{'expiry'});
  # 	$data{'borrowernumber'}=NewBorrowerNumber();

Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -r1.51 -r1.52
*** Output.pm	3 Jan 2005 10:58:46 -0000	1.51
--- Output.pm	20 Jun 2005 14:10:01 -0000	1.52
***************
*** 84,87 ****
--- 84,88 ----
  							theme => $theme,
  							opacstylesheet => $opacstylesheet,
+ 							opacsmallimage => C4::Context->preference('opacsmallimage'),
  							lang => $lang);
  

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** SearchMarc.pm	15 Jun 2005 13:21:22 -0000	1.45
--- SearchMarc.pm	20 Jun 2005 14:10:01 -0000	1.46
***************
*** 340,344 ****
  	# HINT : biblionumber as bn is important. The hash is fills biblionumber with items.biblionumber.
  	# so if you dont' has an item, you get a not nice empty value.
! 	$sth = $dbh->prepare("SELECT biblio.biblionumber as bn,biblio.*, biblioitems.*,marc_biblio.bibid,itemtypes.notforloan,itemtypes.description
  							FROM biblio, marc_biblio 
  							LEFT JOIN biblioitems on biblio.biblionumber = biblioitems.biblionumber
--- 340,344 ----
  	# HINT : biblionumber as bn is important. The hash is fills biblionumber with items.biblionumber.
  	# so if you dont' has an item, you get a not nice empty value.
! 	$sth = $dbh->prepare("SELECT biblio.biblionumber as bn,biblioitems.*,biblio.*, marc_biblio.bibid,itemtypes.notforloan,itemtypes.description
  							FROM biblio, marc_biblio 
  							LEFT JOIN biblioitems on biblio.biblionumber = biblioitems.biblionumber
***************
*** 351,355 ****
  	my $oldline;
  	my ($oldbibid, $oldauthor, $oldtitle);
! 	my $sth_itemCN = $dbh->prepare("select items.* from items where biblionumber=?");
  	my $sth_issue = $dbh->prepare("select date_due,returndate from issues where itemnumber=?");
  	# parse all biblios between start & end.
--- 351,360 ----
  	my $oldline;
  	my ($oldbibid, $oldauthor, $oldtitle);
! 	my $sth_itemCN;
! 	if (C4::Context->preference('hidelostitem')) {
! 		$sth_itemCN = $dbh->prepare("select items.* from items where biblionumber=? and (itemlost = 0 or itemlost is NULL)");
! 	} else {
! 		$sth_itemCN = $dbh->prepare("select items.* from items where biblionumber=?");
! 	}
  	my $sth_issue = $dbh->prepare("select date_due,returndate from issues where itemnumber=?");
  	# parse all biblios between start & end.




From tipaul at users.sourceforge.net  Mon Jun 20 16:10:42 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:10:42 -0700
Subject: [Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.93,1.94 Fines.pm,1.10,1.11
Message-ID: <E1DkMz4-0000Rg-Pr@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4/Circulation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1597/C4/Circulation

Modified Files:
	Circ2.pm Fines.pm 
Log Message:
synch'ing 2.2 and head

Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -r1.93 -r1.94
*** Circ2.pm	15 May 2005 04:34:09 -0000	1.93
--- Circ2.pm	20 Jun 2005 14:10:30 -0000	1.94
***************
*** 609,613 ****
  	$sth->execute($cat_borrower, $type, $branch_borrower);
  	my $result = $sth->fetchrow_hashref;
! # 	warn "==>".$result->{maxissueqty};
  	if (defined($result)) {
  		$sth2->execute($borrower->{'borrowernumber'}, "%$type%");
--- 609,613 ----
  	$sth->execute($cat_borrower, $type, $branch_borrower);
  	my $result = $sth->fetchrow_hashref;
! #	warn "==>".$result->{maxissueqty};
  	if (defined($result)) {
  		$sth2->execute($borrower->{'borrowernumber'}, "%$type%");
***************
*** 628,632 ****
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my $alreadyissued = $sth2->fetchrow;
  		return ("c $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}
--- 628,633 ----
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my ($alreadyissued) = $sth3->fetchrow;
! 		warn "HERE : $alreadyissued / ($result->{maxissueqty} for $borrower->{'borrowernumber'}";
  		return ("c $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}
***************
*** 644,648 ****
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my $alreadyissued = $sth2->fetchrow;
  		return ("e $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}
--- 645,649 ----
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my $alreadyissued = $sth3->fetchrow;
  		return ("e $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}
***************
*** 668,672 ****
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my $alreadyissued = $sth2->fetchrow;
  		return ("h $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}
--- 669,673 ----
  	if (defined($result)) {
  		$sth3->execute($borrower->{'borrowernumber'});
! 		my $alreadyissued = $sth3->fetchrow;
  		return ("h $alreadyissued / ".($result->{maxissueqty}+0)) if ($result->{'maxissueqty'} <= $alreadyissued);
  	}
***************
*** 699,702 ****
--- 700,706 ----
  		$issuingimpossible{DEBARRED} = 1;
  	}
+ 	if (&Date_Cmp(&ParseDate($borrower->{expiry}),&ParseDate("today"))<0) {
+ 		$issuingimpossible{EXPIRED} = 1;
+ 	}
  #
  # BORROWER STATUS
***************
*** 767,771 ****
  			my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
  			$needsconfirmation{RESERVE_WAITING} = "$resborrower->{'firstname'} $resborrower->{'surname'} ($resborrower->{'cardnumber'}, $branchname)";
! 			CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'});
  		} elsif ($restype eq "Reserved") {
  			# The item is on reserve for someone else.
--- 771,775 ----
  			my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
  			$needsconfirmation{RESERVE_WAITING} = "$resborrower->{'firstname'} $resborrower->{'surname'} ($resborrower->{'cardnumber'}, $branchname)";
! 			# CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'}); Doesn't belong in a checking subroutine.
  		} elsif ($restype eq "Reserved") {
  			# The item is on reserve for someone else.
***************
*** 842,846 ****
  				my $branches = getbranches();
  				my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
! 				CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'});
  			} elsif ($restype eq "Reserved") {
  				warn "Reserved";
--- 846,852 ----
  				my $branches = getbranches();
  				my $branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
!                 if ($cancelreserve){
!     				CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'});
!                 }
  			} elsif ($restype eq "Reserved") {
  				warn "Reserved";
***************
*** 853,861 ****
  					CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'});
  					# also cancel reserve on biblio related to this item
! 					my $st_Fbiblio = $dbh->prepare("select biblionumber from items where itemnumber=?");
! 					$st_Fbiblio->execute($res->{'itemnumber'});
! 					my $biblionumber = $st_Fbiblio->fetchrow;
! 					CancelReserve($biblionumber,0,$res->{'borrowernumber'});
! 					warn "CancelReserve $res->{'itemnumber'}, $res->{'borrowernumber'}";
  				} else {
  # 					my $tobrcd = ReserveWaiting($res->{'itemnumber'}, $res->{'borrowernumber'});
--- 859,867 ----
  					CancelReserve(0, $res->{'itemnumber'}, $res->{'borrowernumber'});
  					# also cancel reserve on biblio related to this item
! 					#my $st_Fbiblio = $dbh->prepare("select biblionumber from items where itemnumber=?");
! 					#$st_Fbiblio->execute($res->{'itemnumber'});
! 					#my $biblionumber = $st_Fbiblio->fetchrow;
! 					#CancelReserve($biblionumber,0,$res->{'borrowernumber'});
! 					#warn "CancelReserve $res->{'itemnumber'}, $res->{'borrowernumber'}";
  				} else {
  # 					my $tobrcd = ReserveWaiting($res->{'itemnumber'}, $res->{'borrowernumber'});
***************
*** 1619,1622 ****
--- 1625,1637 ----
  		}
  		$sth2->finish;
+ 		my ($resfound, $resrec) = CheckReserves($itemno);
+ 		if ($resfound) {
+ 			$renewokay = 0;
+ 		}
+ 		my ($resfound, $resrec) = CheckReserves($itemno);
+                 if ($resfound) {
+                         $renewokay = 0;
+                 }
+ 
  	}
  	$sth1->finish;

Index: Fines.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Fines.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Fines.pm	1 Mar 2005 03:08:00 -0000	1.10
--- Fines.pm	20 Jun 2005 14:10:31 -0000	1.11
***************
*** 152,157 ****
    biblioitems.itemtype=itemtypes.itemtype and
    categoryitem.itemtype=itemtypes.itemtype and
!   categoryitem.categorycode=? and
!   (items.itemlost <> 1 or items.itemlost is NULL)");
  #  print $query;
    $sth->execute($itemnumber,$bortype);
--- 152,156 ----
    biblioitems.itemtype=itemtypes.itemtype and
    categoryitem.itemtype=itemtypes.itemtype and
!   categoryitem.categorycode=? and (items.itemlost <> 1 or items.itemlost is NULL)");
  #  print $query;
    $sth->execute($itemnumber,$bortype);




From tipaul at users.sourceforge.net  Mon Jun 20 16:13:24 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:13:24 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui acqui-home.tmpl,1.14,1.15 basket.tmpl,1.21,1.22 histsearch.tmpl,1.3,1.4
Message-ID: <E1DkN1g-0000uX-Qi@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	acqui-home.tmpl basket.tmpl histsearch.tmpl 
Log Message:
synch'ing 2.2 and head

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** acqui-home.tmpl	19 Oct 2004 12:24:57 -0000	1.14
--- acqui-home.tmpl	20 Jun 2005 14:13:12 -0000	1.15
***************
*** 5,8 ****
--- 5,11 ----
  <div id="bloc25">
  	<h2 class="acquisition">Start, receive, modify order</h2>
+ 	<!-- TMPL_IF name="nobudget" -->
+ 		<p class="problem">You must define a budget in parameters</p>
+ 	<!-- TMPL_ELSE -->
  		<form action="/cgi-bin/koha/acqui/order.pl" method="post">
  			Supplier name : <input type="text"  size="25"   name="supplier">
***************
*** 10,13 ****
--- 13,17 ----
  		</form>
  	<p>or <a href="histsearch.pl" class="button acquisition">Search order history</a></p>
+ 	<!-- /TMPL_IF -->
  </div>
  
***************
*** 38,43 ****
  <!-- showbudget-->
  <div id="bloc25">
! 	<form action="/cgi-bin/koha/search.pl">
! 		<h2 class="acquisition">budgets and bookfunds</h2>
  		<table class="noborder">
  			<tr>
--- 42,49 ----
  <!-- showbudget-->
  <div id="bloc25">
! 	<h2 class="acquisition">budgets and bookfunds</h2>
! 	<!-- TMPL_IF name="nobudget" -->
! 		<p class="problem">You must define a budget in parameters</p>
! 	<!-- TMPL_ELSE -->
  		<table class="noborder">
  			<tr>
***************
*** 68,72 ****
  		Use your reload button to get the most recent figures. Committed figures are approximate only, as exchange rates will affect the amount actually paid.
  		</p>
! 	</form>
  </div>
  
--- 74,78 ----
  		Use your reload button to get the most recent figures. Committed figures are approximate only, as exchange rates will affect the amount actually paid.
  		</p>
! 	<!-- /TMPL_IF -->
  </div>
  

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** basket.tmpl	4 May 2005 08:52:49 -0000	1.21
--- basket.tmpl	20 Jun 2005 14:13:22 -0000	1.22
***************
*** 18,21 ****
--- 18,28 ----
  		</div>
  	<!-- /TMPL_UNLESS -->
+ 	<div id="bloc25" style="align:right">
+ 		<p><!-- TMPL_VAR name="name" --></p>
+ 		<p><!-- TMPL_VAR name="address1" --></p>
+ 		<p><!-- TMPL_VAR name="address2" --></p>
+ 		<p><!-- TMPL_VAR name="address3" --></p>
+ 		<p><!-- TMPL_VAR name="address4" --></p>
+ 	</div>
  	<div id="bloc100">
  	<h2 class="acquisition">Order</h2>
***************
*** 24,31 ****
  			<tr valign="top" bgcolor="#ffdf61">
  				<th class="acquisition doNotPrint">Order</th>
! 				<th class="acquisition">Publisher<a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=biblioitems.publishercode" class="acquisition doNotPrint">[order]</a></th>
! 				<th class="acquisition">Isbn</th>
  				<th class="acquisition">Title</th>
- 				<th class="acquisition">Author</th>
  				<th class="acquisition">rrp</th>
  				<th class="acquisition doNotPrint">est</th>
--- 31,36 ----
  			<tr valign="top" bgcolor="#ffdf61">
  				<th class="acquisition doNotPrint">Order</th>
! 				<th class="acquisition">Publisher<a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=biblioitems.publishercode" class="acquisition">[order]</a></th>
  				<th class="acquisition">Title</th>
  				<th class="acquisition">rrp</th>
  				<th class="acquisition doNotPrint">est</th>
***************
*** 40,57 ****
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
! 				<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="color" -->">
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
- 					<td><!-- TMPL_VAR NAME="isbn" --></td>
  					<!-- TMPL_IF name="closedate" -->
! 						<td><!-- TMPL_VAR NAME="title" --></td>
  					<!-- TMPL_ELSE -->
! 						<td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
  					<!-- /TMPL_IF -->
! 					<td><!-- TMPL_VAR NAME="author" --></td>
! 					<td><!-- TMPL_VAR NAME="rrp" --></td>
! 					<td class="doNotPrint"><!-- TMPL_VAR NAME="ecost" --></td>
! 					<td><!-- TMPL_VAR NAME="quantity" --></td>
! 					<td><!-- TMPL_VAR NAME="line_total" --></td>
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="bookfundid" --></td>
  					<!-- TMPL_IF name="active" -->
--- 45,76 ----
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
! 				<!-- TMPL_IF name="odd" -->
! 				<tr class="hilighted">
! 				<!-- TMPL_ELSE -->
! 				<tr>
! 				<!-- /TMPL_IF -->
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
  					<!-- TMPL_IF name="closedate" -->
! 						<td>
! 							<b><!-- TMPL_VAR NAME="title" --></b><br/>
! 								<!-- TMPL_VAR NAME="author" -->
! 								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --><p class="doNotPrint"><i><!--TMPL_VAR name="notes" --></i></p><!-- /TMPL_IF -->
! 						</td>
  					<!-- TMPL_ELSE -->
! 						<td>
! 							<p>
! 							<a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a><br/>
! 								<!-- TMPL_VAR NAME="author" -->
! 								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! 							</p>
! 						</td>
  					<!-- /TMPL_IF -->
! 					<td class="number"><!-- TMPL_VAR NAME="rrp" --></td>
! 					<td class="doNotPrint number"><!-- TMPL_VAR NAME="ecost" --></td>
! 					<td class="number"><!-- TMPL_VAR NAME="quantity" --></td>
! 					<td class="number"><!-- TMPL_VAR NAME="line_total" --></td>
  					<td class="doNotPrint"><!-- TMPL_VAR NAME="bookfundid" --></td>
  					<!-- TMPL_IF name="active" -->
***************
*** 69,85 ****
  			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
  			<tr>
! 				<td colspan="4" rowspan=3>
  					&nbsp;
  				</td>
! 				<th colspan="2" class="acquisition">SubTotal</th>
! 				<th class="acquisition"><!-- TMPL_VAR NAME="currency" --><!-- TMPL_VAR NAME="sub_total" --></th>
! 			</tr>
! 			<tr>
! 				<th colspan="2" class="acquisition">GST</th>
! 				<th class="acquisition"><!-- TMPL_VAR NAME="currency" --><!-- TMPL_VAR NAME="gist" --></th>
! 			</tr>
! 			<tr>
! 				<th colspan="2" class="acquisition">TOTAL</th>
! 				<th class="acquisition"><!-- TMPL_VAR NAME="currency" --><!-- TMPL_VAR NAME="grand_total" --></th>
  			</tr>
  		</table>
--- 88,124 ----
  			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
  			<tr>
! 				<td colspan="2" class="acquisition">
  					&nbsp;
  				</td>
! 				<td class="acquisition number">
! 					<p>Sub total</p>
! 					<p>GST</p>
! 					<p>TOTAL (<!-- TMPL_VAR NAME="currency" -->)</p>
! 				</td>
! 				<td class="acquisition number">
! 					<p><!-- TMPL_VAR NAME="sub_total_est" --></p>
! 					<p><!-- TMPL_VAR NAME="gist_est" --></p>
! 					<p><!-- TMPL_VAR NAME="grand_total_est" --></p>
! 				</td>
! 				<td class="acquisition number">
! 					<p><!-- TMPL_VAR NAME="sub_total" --></p>
! 					<p><!-- TMPL_VAR NAME="gist" --></p>
! 					<p><!-- TMPL_VAR NAME="grand_total" --></p>
! 				</td>
! 				<td class="acquisition">
! 					<p><!-- TMPL_VAR name="qty_total" --></p>
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 				</td>
! 				<td class="acquisition">
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 				</td>
! 				<td class="acquisition">
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 					<p>&nbsp;</p>
! 				</td>
  			</tr>
  		</table>

Index: histsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** histsearch.tmpl	20 Jun 2005 10:14:12 -0000	1.3
--- histsearch.tmpl	20 Jun 2005 14:13:22 -0000	1.4
***************
*** 31,34 ****
--- 31,93 ----
  				</th>
  				<th class="acquisition">
+ 					From <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
+ 					<input type="text" readonly="readonly" size="10" id="from" name="fromplacedon" value="<!-- TMPL_VAR name="from_placed_on" -->">
+ 					<script language="JavaScript" type="text/javascript">
+ 						function validate1(date) {
+ 							var day = date.getDate();
+ 							var month = date.getMonth() + 1;
+ 							var year = date.getFullYear();
+ 							var weekDay = date.getDay();
+ 							var dayMonth = month + '-' + day;
+ 							var dateString = year + '-' + month + '-' + day;
+ 							var dateTo = document.getElementById('to').value.split("-");
+ 							var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
+ 							if (date > limitDate) {
+ 								return true;
+ 							} else {
+ 								return false;
+ 							}
+ 						}
+ 						Calendar.setup(
+ 							{
+ 								inputField : "from",
+ 								ifFormat : "%Y-%m-%d",
+ 								button : "openCalendarFrom",
+ 								disableFunc : validate1,
+ 								dateStatusFunc : validate1
+ 							}
+ 						);
+ 					</script>
+ 					To <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
+ 					<input readonly="readonly" size="10" id="to" name="toplacedon" value="<!-- TMPL_VAR name="to_placed_on" -->" type="text">
+ 					<script type="text/javascript">
+ 						function validate2(date) {
+ 							var day = date.getDate();
+ 							var month = date.getMonth() + 1;
+ 							var year = date.getFullYear();
+ 							var weekDay = date.getDay();
+ 							var dayMonth = month + '-' + day;
+ 							var dateString = year + '-' + month + '-' + day;
+ 							var dateFrom = document.getElementById('from').value.split("-");
+ 							var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
+ 							if (limitDate > date) {
+ 								return true;
+ 							} else {
+ 								return false;
+ 							}
+ 						}
+ 
+ 						Calendar.setup(
+ 							{
+ 								inputField : "to",
+ 								ifFormat : "%Y-%m-%d",
+ 								button : "openCalendarTo",
+ 								disableFunc : validate2,
+ 								dateStatusFunc : validate2
+ 							}
+ 						);
+ 					</script>
+ 				</th>
+ 				<th class="acquisition">
  					&nbsp;
  				</th>
***************
*** 77,79 ****
--- 136,139 ----
  	</table>
  </div>
+ 
  <!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->




From tipaul at users.sourceforge.net  Mon Jun 20 16:16:06 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:16:06 -0700
Subject: [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
Message-ID: <E1DkN4I-0001E8-1K@sc8-pr-cvs1.sourceforge.net>

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>




From tipaul at users.sourceforge.net  Mon Jun 20 16:17:07 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:17:07 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/authorities authorities.tmpl,1.9,1.10 detail.tmpl,1.4,1.5
Message-ID: <E1DkN5H-0001PQ-Em@sc8-pr-cvs1.sourceforge.net>

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

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

Index: authorities.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** authorities.tmpl	4 May 2005 08:52:51 -0000	1.9
--- authorities.tmpl	20 Jun 2005 14:17:04 -0000	1.10
***************
*** 4,8 ****
  <div class="tabbed">
  	<form method="post" name="f">
! 	<h1 class="authority">Authority number <!-- TMPL_VAR NAME="authid" --></h1>
  	<p>
  		<input type="hidden" name="op" value="add">
--- 4,12 ----
  <div class="tabbed">
  	<form method="post" name="f">
! 	<!-- TMPL_IF name="authid" -->
! 		<h1 class="authority">Modify authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
! 	<!-- TMPL_ELSE -->
! 		<h1 class="authority">Adding authority (<!-- TMPL_VAR name="authtypetext" -->)</h1>
! 	<!-- /TMPL_IF -->
  	<p>
  		<input type="hidden" name="op" value="add">
***************
*** 21,28 ****
  <!-- TMPL_IF name="duplicateauthid" -->
  	<div class="problem">
! 		<p>Duplicate suspected with <a href='javascript:openWindow("detail.pl?authid=<!-- TMPL_VAR name="duplicateauthnumber" -->&popup=1", "Duplicate Authority")' class="button authority"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
  		<p>You must either :</p>
  		<ul>
! 			<p><input type="checkbox" value=1 name="confirm_not_duplicate">confirm it's not a duplicate (and click on Add Auth again)</p>
  			<p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >original authority</a></p>
  		</ul>
--- 25,32 ----
  <!-- TMPL_IF name="duplicateauthid" -->
  	<div class="problem">
! 		<p>Duplicate suspected with <a href='javascript:openWindow("detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&popup=1", "Duplicate Authority")' class="button authority"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
  		<p>You must either :</p>
  		<ul>
! 			<p><input type="checkbox" value=1 name="confirm_not_duplicate">confirm it's not a duplicate (and click on <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority"> again)</p>
  			<p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >original authority</a></p>
  		</ul>
***************
*** 30,43 ****
  <!-- /TMPL_IF -->
  
- <!-- TMPL_IF name="duplicateauthnumber" -->
- 	<div class="problem">
- 		<p>Duplicate suspected with <a href='javascript:openWindow("detail.pl?authid=<!-- TMPL_VAR name="duplicateauthnumber" -->&popup=1", "Duplicate Authority")' class="button authority"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
- 		<p>You must either :</p>
- 		<ul>
- 			<p><input type="checkbox" value=1 name="confirm_not_duplicate">confirm it's not a duplicate (and click on Add Auth again)</p>
- 			<p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >edit items</a> from this duplicate Authority</p>
- 		</ul>
- 	</div>
- <!-- /TMPL_IF -->
  <!-- TMPL_LOOP NAME="0XX" -->
  	<!-- TMPL_IF name="tag" -->
--- 34,37 ----
***************
*** 185,190 ****
  
  function AddField(field) {
! 	document.forms[0].op.value = "addfield";
! 	document.forms[0].addfield_field.value=field;
  	document.f.submit();
  }
--- 179,184 ----
  
  function AddField(field) {
! 	document.forms[1].op.value = "addfield";
! 	document.forms[1].addfield_field.value=field;
  	document.f.submit();
  }

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** detail.tmpl	4 May 2005 08:52:51 -0000	1.4
--- detail.tmpl	20 Jun 2005 14:17:04 -0000	1.5
***************
*** 2,6 ****
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1 class="authority">Authority number : <!-- TMPL_VAR NAME="authid" --></h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
--- 2,6 ----
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1 class="authority">Authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">




From tipaul at users.sourceforge.net  Mon Jun 20 16:17:51 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:17:51 -0700
Subject: [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
Message-ID: <E1DkN5z-0001VY-6o@sc8-pr-cvs1.sourceforge.net>

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>
  




From tipaul at users.sourceforge.net  Mon Jun 20 16:18:44 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:18:44 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ branchtransfers.tmpl,1.12,1.13 circulation.tmpl,1.37,1.38 selectbranchprinter.tmpl,1.6,1.7
Message-ID: <E1DkN6q-0001gB-5T@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	branchtransfers.tmpl circulation.tmpl selectbranchprinter.tmpl 
Log Message:
synch'ing 2.2 and head

Index: branchtransfers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** branchtransfers.tmpl	5 Nov 2004 10:18:24 -0000	1.12
--- branchtransfers.tmpl	20 Jun 2005 14:18:41 -0000	1.13
***************
*** 1,15 ****
  <!-- TMPL_INCLUDE Name="circulation-top.inc" -->
  <div id="mainbloc">
- <div class="bloc25">
- <a class="button" href="circulation.pl">
- Next Borrower</a>
- <a class="button" href="returns.pl">
- Returns</a>
- </div>
  
! <h1>Circulation: Transfers</h1>
  <b>Branch:</b> <!-- TMPL_VAR NAME="genbrname" --> &nbsp;
  <b>Printer:</b> <!-- TMPL_VAR NAME="genprname" -->
! <a href="selectbranchprinter.pl" class="button">Change Settings</a>
  <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
  <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
--- 1,9 ----
  <!-- TMPL_INCLUDE Name="circulation-top.inc" -->
  <div id="mainbloc">
  
! <h1 class="circulation">Circulation: Transfers</h1>
  <b>Branch:</b> <!-- TMPL_VAR NAME="genbrname" --> &nbsp;
  <b>Printer:</b> <!-- TMPL_VAR NAME="genprname" -->
! <a href="selectbranchprinter.pl" class="button circulation">Change Settings</a>
  <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
  <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
***************
*** 17,21 ****
  <!-- TMPL_IF Name="found" -->
  	<table>
! 	<tr><th>Reserve Found</th></tr>
  	<tr><td>
  	<!-- TMPL_IF Name="reserved" -->
--- 11,15 ----
  <!-- TMPL_IF Name="found" -->
  	<table>
! 	<tr><th class="circulation">Reserve Found</th></tr>
  	<tr><td>
  	<!-- TMPL_IF Name="reserved" -->
***************
*** 38,45 ****
  				<!-- TMPL_IF Name="waiting" --><input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
  					<input type="hidden" name="request" value="KillWaiting">
! 					<input type="submit" value="Cancel" class="button">
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF Name="reserved" --><input type="hidden" name="request" value="SetWaiting">
! 					<input type="submit" value="Waiting" class="button"><!-- /TMPL_IF -->
  			</form></p>
  
--- 32,39 ----
  				<!-- TMPL_IF Name="waiting" --><input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
  					<input type="hidden" name="request" value="KillWaiting">
! 					<input type="submit" value="Cancel" class="button circulation">
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF Name="reserved" --><input type="hidden" name="request" value="SetWaiting">
! 					<input type="submit" value="Waiting" class="button circulation"><!-- /TMPL_IF -->
  			</form></p>
  
***************
*** 58,62 ****
  			<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
  			<input type="hidden" name="request" value="KillReserved">
! 			<input type="submit" value="Cancel" class="button">
  			</form></p>
  		<!-- /TMPL_IF -->
--- 52,56 ----
  			<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
  			<input type="hidden" name="request" value="KillReserved">
! 			<input type="submit" value="Cancel" class="button circulation">
  			</form></p>
  		<!-- /TMPL_IF -->
***************
*** 70,74 ****
  				<input type="hidden" name="tb-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="tobrcd" -->">
  			<!-- /TMPL_LOOP -->
! 			<input type="submit" value="Ignore" class="button">
  			</form></p>
  
--- 64,68 ----
  				<input type="hidden" name="tb-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="tobrcd" -->">
  			<!-- /TMPL_LOOP -->
! 			<input type="submit" value="Ignore" class="button circulation">
  			</form></p>
  
***************
*** 77,81 ****
  <!-- TMPL_ELSE -->
  	<table>
! 	<tr><th>Messages</th></tr>
  	<tr><td>
  	<!-- TMPL_IF Name="reqmessage" -->
--- 71,75 ----
  <!-- TMPL_ELSE -->
  	<table>
! 	<tr><th class="circulation">Messages</th></tr>
  	<tr><td>
  	<!-- TMPL_IF Name="reqmessage" -->
***************
*** 125,130 ****
  		<p>
  		<table border="1" cellpadding="5" cellspacing="0" bgcolor="#dddddd">
! 		<tr><th colspan="6">Transfered Items</th></tr>
! 		<tr><th>Barcode</th><th>Title</th><th>Author</th><th>Type</th><th>From</th><th>To</th></tr>
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td align="center" bgcolor="<!-- TMPL_VAR NAME="color" -->">
--- 119,124 ----
  		<p>
  		<table border="1" cellpadding="5" cellspacing="0" bgcolor="#dddddd">
! 		<tr><th colspan="6" class="circulation">Transfered Items</th></tr>
! 		<tr><th class="circulation">Barcode</th><th class="circulation">Title</th><th class="circulation">Author</th><th class="circulation">Type</th><th class="circulation">From</th><th class="circulation">To</th></tr>
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td align="center" bgcolor="<!-- TMPL_VAR NAME="color" -->">
***************
*** 140,143 ****
--- 134,143 ----
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
+ <div class="bloc25">
+ <a class="button circulation" href="circulation.pl">
+ Next Borrower</a>
+ <a class="button circulation" href="returns.pl">
+ Returns</a>
+ </div>
  
  </div>

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** circulation.tmpl	4 May 2005 08:52:53 -0000	1.37
--- circulation.tmpl	20 Jun 2005 14:18:41 -0000	1.38
***************
*** 184,187 ****
--- 184,190 ----
  				<p class="problem">No more renewals possible</p>
  			<!-- /TMPL_IF -->
+ 			<!-- TMPL_IF NAME="EXPIRED" -->
+ 				<p class="problem">Borrower card expired</p>
+ 			<!-- /TMPL_IF -->
  			<br/>
  		<!-- /TMPL_IF -->

Index: selectbranchprinter.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/selectbranchprinter.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** selectbranchprinter.tmpl	19 Jul 2004 19:58:38 -0000	1.6
--- selectbranchprinter.tmpl	20 Jun 2005 14:18:41 -0000	1.7
***************
*** 2,6 ****
  
  <div id="mainbloc">
! <h1>Circulation: Select Printer and Branch Settings</h1>
  
  <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
--- 2,6 ----
  
  <div id="mainbloc">
! <h1 class="circulation">Circulation: Select Printer and Branch Settings</h1>
  
  <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
***************
*** 30,34 ****
  <!-- /TMPL_IF --></p>
  <p><input type="hidden" name="setcookies" value="1">
! <input type="submit" value="Submit" type="changesettings" class="button"></p>
  </form>
  
--- 30,34 ----
  <!-- /TMPL_IF --></p>
  <p><input type="hidden" name="setcookies" value="1">
! <input type="submit" value="Submit" type="changesettings" class="button circulation"></p>
  </form>
  




From tipaul at users.sourceforge.net  Mon Jun 20 16:18:57 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:18:57 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/circ circulation.tmpl,1.1,1.2 returns.tmpl,1.1,1.2
Message-ID: <E1DkN73-0001hW-R5@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	circulation.tmpl returns.tmpl 
Log Message:
synch'ing 2.2 and head






From tipaul at users.sourceforge.net  Mon Jun 20 16:18:57 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:18:57 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/admin marc_subfields_structure.tmpl,1.1,1.2
Message-ID: <E1DkN73-0001hV-QF@sc8-pr-cvs1.sourceforge.net>

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

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

Index: marc_subfields_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** marc_subfields_structure.tmpl	19 Nov 2004 15:13:11 -0000	1.1
--- marc_subfields_structure.tmpl	20 Jun 2005 14:18:55 -0000	1.2
***************
*** 21,25 ****
  <li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
  <li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
! <li>link : useless for instance</li>
  </ul>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- 21,30 ----
  <li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
  <li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
! <li>link : If you enter a field/subfield here (200b), a little glass appears after the subfield. If the user clic on the glass, a search is done on the DB for the field/subfield with the same value. Can be used for 2 main topic : 
! 	<ul>
! 		<li>on a field like author (200f in UNIMARC), put 200f here, you will be able to see all biblios with the same author</li>
! 		<li>on a field that is a link (4xx) to reach another biblio. For example, put 011a in 464$x, will find the serial that was previously with this issn. With the 4xx pligin, you get a powerful tool to manage biblios connected to biblios</li>
! 	</ul>
! </li>
  </ul>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->




From tipaul at users.sourceforge.net  Mon Jun 20 16:18:57 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:18:57 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/export marc.tmpl,1.1,1.2
Message-ID: <E1DkN73-0001hY-SB@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	marc.tmpl 
Log Message:
synch'ing 2.2 and head





From tipaul at users.sourceforge.net  Mon Jun 20 16:19:53 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:19:53 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes/calendar calendar.js,1.1,1.2 calendar-setup.js,1.1,1.2
Message-ID: <E1DkN7x-0001vc-2U@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	calendar.js calendar-setup.js 
Log Message:
synch'ing 2.2 and head






From tipaul at users.sourceforge.net  Mon Jun 20 16:19:53 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:19:53 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes acquisitions-top.inc,1.26,1.27 common-print.css,1.1,1.2 common-style.css,1.35,1.36 intranet-main.css,1.4,1.5 marc-top.inc,1.12,1.13
Message-ID: <E1DkN7x-0001w0-IF@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	acquisitions-top.inc common-print.css common-style.css 
	intranet-main.css marc-top.inc 
Log Message:
synch'ing 2.2 and head

Index: acquisitions-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** acquisitions-top.inc	8 Mar 2005 14:15:29 -0000	1.26
--- acquisitions-top.inc	20 Jun 2005 14:19:50 -0000	1.27
***************
*** 6,9 ****
--- 6,19 ----
  <link rel="stylesheet" type="text/css" media="print" href="<!-- TMPL_VAR name="themelang" -->/includes/common-print.css">
  <link rel="stylesheet" type="text/css" media="screen" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
+ <!-- Additions for Calendar-system -->
+ <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
+ <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar.js">
+ </script>
+ <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-en.js">
+ </script>
+ <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-setup.js">
+ </script>
+ <!-- /Additions for Calendar-system -->
+ 
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  <script language="JavaScript" type="text/javascript">

Index: common-print.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/common-print.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** common-print.css	8 Mar 2005 10:37:31 -0000	1.1
--- common-print.css	20 Jun 2005 14:19:50 -0000	1.2
***************
*** 34,36 ****
  {
  	display: block;
! }
\ No newline at end of file
--- 34,38 ----
  {
  	display: block;
! }
! 
! 

Index: common-style.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** common-style.css	20 Jan 2005 18:03:33 -0000	1.35
--- common-style.css	20 Jun 2005 14:19:50 -0000	1.36
***************
*** 75,78 ****
--- 75,79 ----
  	border:0px;
  	border-collapse:collapse;
+ 	font-size:10pt;
  	margin : auto;
  }

Index: intranet-main.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/intranet-main.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** intranet-main.css	30 Jul 2004 14:29:40 -0000	1.4
--- intranet-main.css	20 Jun 2005 14:19:50 -0000	1.5
***************
*** 55,59 ****
  	text-align:center;
  	background-color:#ad11ad;
! 	color: #FFFFFF;
  	text-decoration: normal;
  	font-weight: bold;
--- 55,59 ----
  	text-align:center;
  	background-color:#ad11ad;
! 	color: #000000;
  	text-decoration: normal;
  	font-weight: bold;
***************
*** 84,87 ****
--- 84,106 ----
  }
  
+ h2 {
+ 	margin-top:0px;
+ 	margin-bottom:4px;
+ 	text-align:center;
+ 	padding:0px;
+ 	font-size:125%;
+ 	padding-left:10px;
+ 	padding-right:10px;
+ 	padding-bottom:3px;
+ 	padding-top:3px;
+ }
+ h2.reports{
+ 	text-align:center;
+ 	background-color: #6b7cbe;
+ 	color: #FFFFFF;
+ 	text-decoration: normal;
+ 	font-weight: bold;
+ }
+ 
  h1.circulation{
  	text-align:center;
***************
*** 92,95 ****
--- 111,123 ----
  }
  
+ h1.authority {
+ 	text-align:center;
+ 	background-color: #6b7cbe;
+ 	color:#000000;
+ 	text-decoration: normal;
+ 	font-weight: bold;
+ 	background-image:none;
+ 	}
+ 
  h1.parameters{
  	text-align:center;
***************
*** 121,125 ****
  	cursor: hand;
  	background-color:#ad11ad;
! 	color:#FFFFFF;
  	font-weight: bold;
  	border:1px solid #000000;
--- 149,153 ----
  	cursor: hand;
  	background-color:#ad11ad;
! 	color:#000000;
  	font-weight: bold;
  	border:1px solid #000000;
***************
*** 127,131 ****
  	}
  
! a.members {
  	font-weight: normal;
  	text-decoration: none;
--- 155,167 ----
  	}
  
! .little {
! 	font-weight: normal;
! 	font-size:10pt;
! 	padding:0px 0px 0px 0px;
! 	text-decoration: none;
! 	line-height:100%;
! 	}
! 
! .members {
  	font-weight: normal;
  	text-decoration: none;
***************
*** 135,139 ****
  	line-height:200%;
  	}
! a.members:hover {
  	background-color: #86c268;
  	border:1px solid #000000;
--- 171,175 ----
  	line-height:200%;
  	}
! .members:hover {
  	background-color: #86c268;
  	border:1px solid #000000;
***************
*** 144,148 ****
  	}
  
! a.acquisition {
  	font-weight: normal;
  	text-decoration: none;
--- 180,200 ----
  	}
  
! a.authority {
! 	font-weight: normal;
! 	text-decoration: none;
! 	cursor: hand;
! 	color:#777777;
! 	font-weight: bold;
! 	line-height:200%;
! 	}
! a.authority:hover {
! 	background-color: #6b7cbe;
! 	border:1px solid #000000;
! 	color: #000000;
! 	text-decoration: none;
! 	font-weight: bold;
! 	}
! 
! .acquisition {
  	font-weight: normal;
  	text-decoration: none;
***************
*** 152,156 ****
  	line-height:200%;
  	}
! a.acquisition:hover {
  	background-color: #ffdf61;
  	border:1px solid #000000;
--- 204,208 ----
  	line-height:200%;
  	}
! .acquisition:hover {
  	background-color: #ffdf61;
  	border:1px solid #000000;
***************
*** 169,172 ****
--- 221,225 ----
  	line-height:200%;
  	}
+ 
  a.reports:hover {
  	background-color: #6b7cbe;
***************
*** 178,182 ****
  	}
  
! a.circulation {
  	font-weight: normal;
  	text-decoration: none;
--- 231,235 ----
  	}
  
! .circulation {
  	font-weight: normal;
  	text-decoration: none;
***************
*** 186,190 ****
  	line-height:200%;
  	}
! a.circulation:hover {
  	background-color: #be6170;
  	border:1px solid #000000;
--- 239,243 ----
  	line-height:200%;
  	}
! .circulation:hover {
  	background-color: #be6170;
  	border:1px solid #000000;
***************
*** 262,263 ****
--- 315,323 ----
  	padding:0px;
  }
+ 
+ #bloc25, .bloc25 {
+ 	float:left;
+ 	border:1px solid #000000;
+ 	margin:0px;
+ 	padding:0px;
+ }

Index: marc-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/marc-top.inc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** marc-top.inc	2 Dec 2004 16:43:28 -0000	1.12
--- marc-top.inc	20 Jun 2005 14:19:50 -0000	1.13
***************
*** 62,67 ****
  <!-- /TMPL_UNLESS -->
  <!-- TMPL_IF NAME="loggedinusername" -->
!     <p align="left">Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
  <!-- TMPL_ELSE -->
!     <p align="left"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
  <!-- /TMPL_IF -->
--- 62,67 ----
  <!-- /TMPL_UNLESS -->
  <!-- TMPL_IF NAME="loggedinusername" -->
!     <p> Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
  <!-- TMPL_ELSE -->
!     <p><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
  <!-- /TMPL_IF -->




From tipaul at users.sourceforge.net  Mon Jun 20 16:20:08 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:20:08 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members memberentry.tmpl,1.35,1.36 pay.tmpl,1.8,1.9
Message-ID: <E1DkN8C-00021G-0u@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	memberentry.tmpl pay.tmpl 
Log Message:
synch'ing 2.2 and head

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** memberentry.tmpl	4 May 2005 08:59:59 -0000	1.35
--- memberentry.tmpl	20 Jun 2005 14:20:05 -0000	1.36
***************
*** 40,45 ****
  	<!-- /TMPL_IF -->
  	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
- 		<input type="hidden" name="joining" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
- 		<input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="expiry" -->">
  		<input type="hidden" name="type" value="borrowers">
  		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
--- 40,43 ----
***************
*** 239,242 ****
--- 237,251 ----
  			</tr>
  			<tr>
+ 				<!-- TMPL_IF NAME="addAction" -->
+ 					<td>Joining date (leave blank for today)</td>
+ 					<td><input type="text" name="joining" size="12" maxlength="10" value="<!-- TMPL_VAR name="joining" -->"></td>
+ 				<!-- TMPL_ELSE -->
+ 					<td>Joining date</td>
+ 					<td><!-- TMPL_VAR name="joining" --></td>
+ 				<!-- /TMPL_IF -->
+ 				<td>Expiry date (leave blank for auto calc)</td>
+ 				<td><input type="text" name="expiry" size="12" maxlength="10" value="<!-- TMPL_VAR name="expiry" -->"></td>
+ 			</tr>
+ 			<tr>
  				<td>Borrower message (appears in OPAC)</td>
  				<td colspan="4"><textarea name="textmessaging" cols="70" rows="3"><!-- TMPL_VAR NAME="textmessaging" --></textarea></td>

Index: pay.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/pay.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** pay.tmpl	19 Jul 2004 20:33:52 -0000	1.8
--- pay.tmpl	20 Jun 2005 14:20:05 -0000	1.9
***************
*** 3,24 ****
  <h1>Pay Fines for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
  
! 	<form action="/cgi-bin/koha/pay.pl" method="post">
! <table cellspacing="0" cellpadding="5" border="1">
! <tr valign="top">
! 	<td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan="4"><b>FINES &amp; CHARGES</b></td>
! 	<td bgcolor="#99cc33" background="/images/background-mem.gif" colspan="4"><b>AMOUNT OWING</b></td>
  </tr>
  	
  <!-- TMPL_LOOP NAME="loop_pay" -->
! <tr valign="top">
! 	<td><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->"><input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="no" checked="checked">Unpaid
! 	<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="yes">Pay
! 	<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="wo">Writeoff
! 	<input type="hidden" name="itemnumber<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="itemnumber" -->">
! 	<input type="hidden" name="accounttype<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="accounttype" -->">
! 	<input type="hidden" name="amount<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="amount'}" -->">
! 	<input type="hidden" name="out<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="amountoutstanding" -->">
! 	<input type="hidden" name="bornum<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="bornum" -->">
! 	<input type="hidden" name="accountno<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="accountno" -->">
  	</td>
  	<td><!-- TMPL_VAR NAME="description" --> <!-- TMPL_VAR NAME="title" --></td>
--- 3,26 ----
  <h1>Pay Fines for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
  
! <form action="/cgi-bin/koha/pay.pl" method="post">
! <table>
! <tr>
! 	<th colspan="3">FINES &amp; CHARGES</th>
! 	<th colspan="2">AMOUNT OWING</th>
  </tr>
  	
  <!-- TMPL_LOOP NAME="loop_pay" -->
! <tr>
! 	<td>
! 		<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
! 		<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="no" checked="checked">Unpaid
! 		<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="yes">Pay
! 		<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="wo">Writeoff
! 		<input type="hidden" name="itemnumber<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="itemnumber" -->">
! 		<input type="hidden" name="accounttype<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="accounttype" -->">
! 		<input type="hidden" name="amount<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="amount'}" -->">
! 		<input type="hidden" name="out<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="amountoutstanding" -->">
! 		<input type="hidden" name="bornum<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="bornum" -->">
! 		<input type="hidden" name="accountno<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="accountno" -->">
  	</td>
  	<td><!-- TMPL_VAR NAME="description" --> <!-- TMPL_VAR NAME="title" --></td>
***************
*** 29,36 ****
  <!-- /TMPL_LOOP -->
  <tr valign="top">
! 	<td colspan="4" align="right"><b>Total Due</b></td>
! 	<td><b><!-- TMPL_VAR NAME="total" --></b></td>
! 	</tr>
! 	<tr valign="top">
  	<td colspan="5" align="right">
  	<input type="submit" name="submit"  value="Pay" class="button"></td>
--- 31,38 ----
  <!-- /TMPL_LOOP -->
  <tr valign="top">
! 	<th colspan="4" align="right">Total Due</th>
! 	<th><!-- TMPL_VAR NAME="total" --></th>
! </tr>
! <tr>
  	<td colspan="5" align="right">
  	<input type="submit" name="submit"  value="Pay" class="button"></td>
***************
*** 39,43 ****
  </form>
  
! <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Return</a> to Member Record
  </div>
  <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
--- 41,45 ----
  </form>
  
! <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" class="button member">Return to Member Record </a>
  </div>
  <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->




From tipaul at users.sourceforge.net  Mon Jun 20 16:21:04 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:21:04 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters admin-home.tmpl,1.36,1.37 checkmarc.tmpl,1.10,1.11 marc_subfields_structure.tmpl,1.41,1.42 marctagstructure.tmpl,1.29,1.30 printers.tmpl,1.12,1.13 z3950servers.tmpl,1.16,1.17
Message-ID: <E1DkN96-0002A8-D8@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	admin-home.tmpl checkmarc.tmpl marc_subfields_structure.tmpl 
	marctagstructure.tmpl printers.tmpl z3950servers.tmpl 
Log Message:
synch'ing 2.2 and head

Index: admin-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** admin-home.tmpl	1 Jun 2005 21:41:03 -0000	1.36
--- admin-home.tmpl	20 Jun 2005 14:21:01 -0000	1.37
***************
*** 36,54 ****
  		</tr>
  
-     <tr>
-       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/itemtypecategory.pl"> Item categories</a></td>
-       <td>Define item categories. (Non-Fiction, Fiction, Non-Fiction and Fiction...)</td>
-     </tr>
- 
-     <tr>
-       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/itemtypesubcategory.pl"> Item subcategories</a></td>
-       <td>Define item Subcategories. (Junior Fiction, Junior Non fiction.... Adult Fiction.)</td>
-     </tr>
- 
-     <tr>
-       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/mediatype.pl"> Item mediatypes</a></td>
-       <td>Define item mediatypes. (CD, Video, Book, Game...)</td>
-     </tr>
- 
  		<tr>
  			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/categorie.pl">Borrower categories</a></td>
--- 36,39 ----

Index: checkmarc.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** checkmarc.tmpl	19 Jul 2004 19:20:29 -0000	1.10
--- checkmarc.tmpl	20 Jun 2005 14:21:01 -0000	1.11
***************
*** 36,39 ****
--- 36,51 ----
  	<!-- /TMPL_IF -->
  	<!-- -------------------------------------------------------------------------------------------------------- -->
+ 	<!-- TMPL_IF NAME="itemtags" -->
+ 		<tr>
+ 			<td><b>Item tag</b></td>
+ 			<td>There is more than 1 MARC tag related to items tab (10) : <!-- TMPL_VAR name="itemtags" --></td>
+ 		</tr>
+ 	<!-- TMPL_ELSE -->
+ 		<tr>
+ 			<td>OK</td>
+ 			<td><i>Only 1 marc tag mapped to items</i></td>
+ 		</tr>
+ 	<!-- /TMPL_IF -->
+ 	<!-- -------------------------------------------------------------------------------------------------------- -->
  	<!-- TMPL_IF NAME="itemtypes_empty" -->
  		<tr>
***************
*** 117,120 ****
--- 129,147 ----
  	<!-- /TMPL_IF -->
  	<!-- -------------------------------------------------------------------------------------------------------- -->
+ 	<!-- TMPL_IF NAME="frameworknull" -->
+ 		<tr>
+ 			<td><b>framework values</b></td>
+ 			<td>there is a null value in a frameworkcode. Check the following tables<br/>
+ 				<li>select * from marc_subfield_structure where frameworkcode is NULL</li>
+ 				<li>select * from marc_tag_structure where frameworkcode is NULL</li>
+ 				<li>select * from marc_biblio where frameworkcode is NULL</li></td>
+ 		</tr>
+ 	<!-- TMPL_ELSE -->
+ 		<tr>
+ 			<td>OK</td>
+ 			<td><i>no NULL value in frameworkcode</i></td>
+ 		</tr>
+ 	<!-- /TMPL_IF -->
+ 	<!-- -------------------------------------------------------------------------------------------------------- -->
  	<!-- TMPL_IF NAME="total" -->
  		<tr>

Index: marc_subfields_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** marc_subfields_structure.tmpl	1 Mar 2005 13:40:55 -0000	1.41
--- marc_subfields_structure.tmpl	20 Jun 2005 14:21:01 -0000	1.42
***************
*** 1,4 ****
- <!-- clarification needed about this page. many questions... what is Lib? a Library? -->
- 
  <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
  
--- 1,2 ----
***************
*** 8,12 ****
  	<h1>
  	<!-- TMPL_IF NAME="use-heading-flags-p" -->
! 	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit MARC subfields constraints<!-- /TMPL_IF -->
  	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
  	</h1>
--- 6,10 ----
  	<h1>
  	<!-- TMPL_IF NAME="use-heading-flags-p" -->
! 	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit MARC subfields constraints for framework <!-- TMPL_IF name="frameworkcode" --><!-- TMPL_VAR NAME="frameworkcode" --><!-- TMPL_ELSE -->default<!-- /TMPL_IF --><!-- /TMPL_IF -->
  	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
  	</h1>
***************
*** 20,50 ****
  			<h2 class="parameters">Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
  			<h3>MARC constraints</h3>
! 			<p>
! 				<label>&nbsp;</label><!-- TMPL_VAR NAME="repeatable" --> repeatable 
! 				<!-- TMPL_VAR NAME="mandatory" --> mandatory
! 			</p>
! 			<p>
! 				<label>&nbsp;</label>
! 				<label>Search also</label><input type="text" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size=20> (example for 200a : '200c','200d','200e'...)
! 			</p>
! 			<p><label>&nbsp;</label><label>Koha link:</label> <!-- TMPL_VAR NAME="kohafield" --></p>
  			<h3>Editor constaints</h3>
! 			<p> <label>&nbsp;</label>
! 				<label>Text for librarian</label>
! 				<input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80">
! 			</p>
! 			<p>
! 				<label>&nbsp;</label>
! 				<label>Text for OPAC</label> <input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80">
! 			</p>
! 			<p><label>&nbsp;</label><label>Managed in tab</label> <!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT managed by Koha)</p>
! 			<p><label>&nbsp;</label><!-- TMPL_VAR NAME="hidden" --> hidden (subfield is managed, but hidden. -should be filled by a plugin or thesaurus-)</p>
! 			<p><label>&nbsp;</label><!-- TMPL_VAR NAME="isurl" --> URL (if checked, it means that the subfield is an URL and can be clicked</p>
! 			<p>
! 				<label>&nbsp;</label><label>Auth value:</label> <!-- TMPL_VAR NAME="authorised_value" -->
! 				or thesaurus: <!-- TMPL_VAR NAME="authtypes" -->
! 				or plugin: <!-- TMPL_VAR NAME="value_builder" -->
! 				or link: <input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5"> (exemple :200b)
! 			</p>
  		</td>
  		</tr>
--- 18,54 ----
  			<h2 class="parameters">Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
  			<h3>MARC constraints</h3>
! 			<ul>
! 				<p>
! 					<!-- TMPL_VAR NAME="repeatable" --> repeatable 
! 					<!-- TMPL_VAR NAME="mandatory" --> mandatory
! 				</p>
! 				<!-- TMPL_IF name="frameworkcode" -->
! 					<p>Search also: <i>(meaningful only for default framework)</i></p>
! 				<!-- TMPL_ELSE -->
! 					<p>
! 						Search also: <input type="text" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size=20> (example for 200a : '200c','200d','200e'...)
! 					</p>
! 				<!-- /TMPL_IF -->
! 				<p>Koha link:<!-- TMPL_VAR NAME="kohafield" --></p>
! 			</ul>
  			<h3>Editor constaints</h3>
! 			<ul>
! 				<p>Text for librarian: <input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80">
! 				</p>
! 				<p>Text for OPAC: <input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80">
! 				</p>
! 				<p>Managed in tab<!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT managed by Koha)</p>
! 				<p><!-- TMPL_VAR NAME="hidden" --> hidden (subfield is managed, but hidden. -should be filled by a plugin or thesaurus-)</p>
! 				<p><!-- TMPL_VAR NAME="isurl" --> URL (if checked, it means that the subfield is an URL and can be clicked</p>
! 				<p>
! 					<label>Auth value:</label> <!-- TMPL_VAR NAME="authorised_value" -->
! 					or thesaurus: <!-- TMPL_VAR NAME="authtypes" -->
! 					or plugin: <!-- TMPL_VAR NAME="value_builder" -->
! 				</p>
! 				<p>
! 					<label>&nbsp;</label>Link to field :
! 					<input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5"> (exemple :200b)
! 				</p>
! 			</ul>
  		</td>
  		</tr>
***************
*** 52,61 ****
  	</table>
  	<input type="submit" value="OK">
- 	<p>Note: in the last column, you can choose:
- 	<ul><li>An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table.</li>
- 	<li>A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table.</li>
- 	<li>A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically.</li>
- 	</ul>
- 	</p>
  	</form>
  <!-- /TMPL_IF -->
--- 56,59 ----

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** marctagstructure.tmpl	14 Apr 2005 14:15:01 -0000	1.29
--- marctagstructure.tmpl	20 Jun 2005 14:21:01 -0000	1.30
***************
*** 112,155 ****
  	</form>
  <!-- /TMPL_IF -->
- 
  <!-- ------------------------------------------------------------------------ -->
  <!-- TMPL_IF NAME="else" -->
! <div id="bloc25">
! <h2 class="parameters">Select a framework</h2>
! <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 	<select name="frameworkcode">
! 		<option value="">Default</option>
! 	<!-- TMPL_LOOP NAME="frameworkloop" -->
! 		<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="frameworktext" --></option>
! 	<!-- /TMPL_LOOP -->
! 	</select>
! 	<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 	<input type="submit" value="OK" class="button">
! </form>
! <b>NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script.</b>
! </div>
! <div id="bloc100">
  	<table>
! 	<tr>
! 		<th>Tag</th>
! 		<th>Lib</th>
! 		<th>Repeatable</th>
! 		<th>Mandatory</th>
! 		<th>Authorised<br />value</th>
! 		<th>Subfields</th>
! 		<th>Edit</th>
! 		<th>Delete</th>
! 	<!-- TMPL_LOOP NAME="loop" -->
! 	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
! 		<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
! 		<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 		<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 		<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 		<td><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->" class="button">subfields</a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkdcode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 	</tr>
! 	<!-- /TMPL_LOOP -->
  	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<input type="hidden" name="op" value="add_form">
--- 112,186 ----
  	</form>
  <!-- /TMPL_IF -->
  <!-- ------------------------------------------------------------------------ -->
  <!-- TMPL_IF NAME="else" -->
! 	<div id="bloc25">
! 	<h2 class="parameters">Select a framework</h2>
! 	<form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 		<select name="frameworkcode">
! 			<option value="">Default</option>
! 		<!-- TMPL_LOOP NAME="frameworkloop" -->
! 			<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="frameworktext" --></option>
! 		<!-- /TMPL_LOOP -->
! 		</select>
! 		<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 		<input type="submit" value="OK" class="button">
! 		<p>
! 		<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True" <!-- TMPL_IF Name="select_display"-->checked<!--/TMPL_IF -->  OnChange="javascript:document.f.submit()">
! 		</p>
! 	</form>
! 	<b>NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script.</b>
! 	</div>
! 	<div id="bloc100">
  	<table>
! 		<tr>
! 			<th>Tag</th>
! 			<th>Lib</th>
! 			<th>Repeatable</th>
! 			<th>Mandatory</th>
! 			<th>Authorised<br />value</th>
! 			<th>Subfields</th>
! 			<th>Edit</th>
! 			<th>Delete</th>
! 		<tr>
! 	<!-- TMPL_IF NAME="select_display" -->
! 		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr class="hilighted">
! 			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
! 			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
! 			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
! 			<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 			<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 		</tr>
! 		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 			<td>
! 				&nbsp;
! 			</td>
! 			<td colspan=7 border=0>
! 				<!-- TMPL_LOOP NAME="subfields" -->
! 					<p><label>&nbsp;</label>
! 							Tab:<!-- TMPL_VAR NAME="tab" --> | $<!-- TMPL_VAR NAME="tagsubfield" -->
! 							<!-- TMPL_VAR NAME="liblibrarian" --> <!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!--/TMPL_IF --><!-- TMPL_IF NAME="repeatable" -->, repeatable<!-- /TMPL_IF --><!-- TMPL_IF NAME="mandatory" -->, Mandatory<!-- /TMPL_IF --><!-- TMPL_IF NAME="seealso" -->, See <!-- TMPL_VAR name="seealso" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authorised_value" -->, <!-- TMPL_VAR NAME="authorised_value" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authtypecode" -->, <!-- TMPL_VAR NAME="authtypecode" --><!--/TMPL_IF --><!-- TMPL_IF NAME="value_builder" -->, <!-- TMPL_VAR NAME="value_builder" --><!--/TMPL_IF -->
! 					</p>
! 				<!-- /TMPL_LOOP -->
! 			</td>
! 		</tr>
! 		<!-- /TMPL_LOOP -->
! 	<!-- TMPL_ELSE -->
! 		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
! 			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
! 			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
! 			<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 			<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 		</tr>
! 		<!-- /TMPL_LOOP -->
! 	<!--/TMPL_IF -->
  	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<input type="hidden" name="op" value="add_form">
***************
*** 160,175 ****
  		<input type="submit" class="button" value="Add Tag" title="Add Tag" alt="Add Tag" >
  		<!-- TMPL_IF NAME="isprevpage" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">
  			<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0">
  			</a>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="nextpage" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">
  				<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0">
  			</a>
  		<!-- /TMPL_IF -->
! 	</form>
  </div>
  <!-- /TMPL_IF -->
  </div>
  <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
--- 191,212 ----
  		<input type="submit" class="button" value="Add Tag" title="Add Tag" alt="Add Tag" >
  		<!-- TMPL_IF NAME="isprevpage" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">
  			<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0">
  			</a>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="nextpage" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">
  				<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0">
  			</a>
  		<!-- /TMPL_IF -->
! </form>
! <script language="javascript" type="text/javascript">
! 	function ChangeDisplay(checkbox) {
! 		window.
! 	}
! </script>
  </div>
  <!-- /TMPL_IF -->
+ 
  </div>
  <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: printers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** printers.tmpl	19 Jul 2004 19:20:29 -0000	1.12
--- printers.tmpl	20 Jun 2005 14:21:01 -0000	1.13
***************
*** 1,205 ****
  <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
  
! <!-- TMPL_IF NAME="add_form" -->
!         <script language="javascript" type="text/javascript">
! 	function _(s) { return s } // dummy function for gettext
!         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
!         function isNotNull(f,noalert) {
!                 if (f.value.length ==0) {
!    return false;
!                 }
!                 return true;
!         }
!         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
!         function toUC(f) {
!                 var x=f.value.toUpperCase();
!                 f.value=x;
!                 return true;
!         }
!         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
!         function isNum(v,maybenull) {
!         var n = new Number(v.value);
!         if (isNaN(n)) {
!                 return false;
!                 }
!         if (maybenull==0 && v.value=='') {
!                 return false;
!         }
!         return true;
!         }
!         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
!         function isDate(f) {
!                 var t = Date.parse(f.value);
!                 if (isNaN(t)) {
!                         return false;
!                 }
!         }
!         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
!         function Check(f) {
!                 var ok=1;
!                 var _alertString="";
!                 var alertString2;
!                 if (f.printername.value.length==0) {
!                         _alertString += "\n- " + _("printer name missing");
!                 }
!                 if (f.printqueue.value.length==0) {
!                         _alertString += "\n- " + _("Queue missing");
!                 }
!                 if (_alertString.length==0) {
!                         document.Aform.submit();
!                 } else {
!                         alertString2  = _("Form not submitted because of the following problem(s)");
!                         alertString2 += "\n------------------------------------------------------------------------------------\n";
!                         alertString2 += _alertString;
!                         alert(alertString2);
!                 }
!         }
!         </script>
! 
! 	<!-- TMPL_IF NAME="searchfield" -->
! 		<h1>Modify printer</h1>
! 	<!-- TMPL_ELSE -->
! 		<h1>Add printer</h1>
  	<!-- /TMPL_IF -->
! 
!         <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
!         <input type="hidden" name="op" value="add_validate">
!         
! 
! 	<table>
! 
! 	<!-- TMPL_IF NAME="searchfield" -->
! 		<tr>
! 			<td>Printer Name</td>
! 			<td>
! 				<input type="hidden" name="printername" value="<!-- TMPL_VAR NAME="searchfield" -->"><!-- TMPL_VAR NAME="searchfield" -->
! 			</td>
! 		</tr>
! 	<!-- TMPL_ELSE -->
! 		<tr>
! 			<td>Printer Name</td>
! 			<td>
! 				<input type="text" name="printername" size="50" maxlength="50">
! 			</td>
! 		</tr>
  	<!-- /TMPL_IF -->
! 
!         	<tr>
! 			<td>Queue</td>
! 			<td><input type="text" name="printqueue" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printqueue" -->"> </td>
! 		</tr>
!         	<tr>
! 			<td>Type</td>
! 			<td><input type="text" name="printtype" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printtype" -->"> </td>
! 		</tr>
!         	<tr>
! 			<td> </td>
! 			<td><input type="button" value="OK" onclick="Check(this.form)"></td>
! 		</tr>
!         </table>
!         </form>
! 
! <!-- /TMPL_IF -->
! 
! <!-- TMPL_IF NAME="add_validate" -->
! 	Data recorded
!         <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
!         <input type="submit" value="OK">
!         </form>
! <!-- /TMPL_IF -->
! 
! <!-- TMPL_IF NAME="delete_confirm" -->
! 	<table border="0" cellspacing="0" cellpadding="5">
! 		<tr bgcolor="#99cc33">
! 			<td background="/images/background-mem.gif"><b>Printer</b></td>
! 			<td background="/images/background-mem.gif"><b><!-- TMPL_VAR NAME="searchfield" --></b></td>
! 		</tr>
! 
!         	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 			<input type="hidden" name="op" value="delete_confirmed">
! 			<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
!         
! 		<tr>
! 			<td>Queue</td>
! 			<td><!-- TMPL_VAR NAME="printqueue" --></td>
! 		</tr>
!         	<tr>
! 			<td>Type</td>
! 			<td><!-- TMPL_VAR NAME="printtype" --></td>
! 		</tr>
!         	<tr>
! 			<td colspan="2" align="center">CONFIRM DELETION</td>
! 		</tr>
!         	<tr>
! 			<td>
! 				<input type="submit" value="YES">
! 				</form>
! 			</td>
! 			<td>
  				<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 				<input type="submit" value="NO">
! 				</form>
! 			</td>
! 		</tr>
! 	</table>
! <!-- /TMPL_IF -->
! 
! <!-- TMPL_IF NAME="delete_confirmed" -->
! 	Data deleted
! 	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 		<input type="submit" value="OK">
! 	</form>
! <!-- /TMPL_IF -->
! 
! <!-- TMPL_IF NAME="else" -->
! 	<h2>Printer admin</h2>
!         <form action="<!-- TMPL_VAR NAME="script_name">" method="post">
!                 <input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
!                 <input type="reset" name="reset" value="clr">
!         </form>
! 
! 	<!-- TMPL_IF NAME="searchfield" -->
! 		You searched for <b><!-- TMPL_VAR NAME="searchfield" --></b>
  	<!-- /TMPL_IF -->
- 
- 	<table border="0" cellspacing="0" cellpadding="5">
- 		<tr bgcolor="#99cc33">
- 			<td background="/images/background-mem.gif"><b>Name</b></td>
- 			<td background="/images/background-mem.gif"><b>Queue</b></td>
- 			<td background="/images/background-mem.gif"><b>Type</b></td>
- 			<td background="/images/background-mem.gif"> </td>
- 			<td background="/images/background-mem.gif"> </td>
- 		</tr>
- 		<!-- TMPL_LOOP NAME="loop" -->
- 		<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
- 			<td><!-- TMPL_VAR NAME="printername" --></td>
- 			<td><!-- TMPL_VAR NAME="printqueue" --></td>
- 			<td><!-- TMPL_VAR NAME="printtype" --></td>
- 			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->">Edit</a></td>
-                         <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->">Delete</a></td>
- 		</tr>
- 		<!-- /TMPL_LOOP -->
- 	</table>
- 
- 	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-         <input type="hidden" name="op" value="add_form">
  	
! 	<!-- TMPL_IF NAME="offsetgtzero" -->
! 		<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Prev</a>
  	<!-- /TMPL_IF -->
! 
! 	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
! 
! 	<!-- TMPL_IF NAME="ltcount" -->
! 		<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">Next &gt;&gt;</a>	
! 	<!-- /TMPL_iF -->
! 
!         <br>
! 	<input type="submit" class="button" value="Add printer" alt="Add printer">
! 	<br>
!         </form>
! 
! <!-- /TMPL_IF -->
! 
  
  <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
--- 1,181 ----
  <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
  
! <div id="mainbloc">
! 		<h1>Printer admin</h1>
! 	<!-- TMPL_IF NAME="add_form" -->
! 			<script language="javascript" type="text/javascript">
! 		function _(s) { return s } // dummy function for gettext
! 			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
! 			function isNotNull(f,noalert) {
! 					if (f.value.length ==0) {
! 	return false;
! 					}
! 					return true;
! 			}
! 			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
! 			function toUC(f) {
! 					var x=f.value.toUpperCase();
! 					f.value=x;
! 					return true;
! 			}
! 			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
! 			function isNum(v,maybenull) {
! 			var n = new Number(v.value);
! 			if (isNaN(n)) {
! 					return false;
! 					}
! 			if (maybenull==0 && v.value=='') {
! 					return false;
! 			}
! 			return true;
! 			}
! 			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
! 			function isDate(f) {
! 					var t = Date.parse(f.value);
! 					if (isNaN(t)) {
! 							return false;
! 					}
! 			}
! 			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
! 			function Check(f) {
! 					var ok=1;
! 					var _alertString="";
! 					var alertString2;
! 					if (f.printername.value.length==0) {
! 							_alertString += "\n- " + _("printer name missing");
! 					}
! 					if (f.printqueue.value.length==0) {
! 							_alertString += "\n- " + _("Queue missing");
! 					}
! 					if (_alertString.length==0) {
! 							document.Aform.submit();
! 					} else {
! 							alertString2  = _("Form not submitted because of the following problem(s)");
! 							alertString2 += "\n------------------------------------------------------------------------------------\n";
! 							alertString2 += _alertString;
! 							alert(alertString2);
! 					}
! 			}
! 			</script>
! 	<div id="bloc25">
! 		<!-- TMPL_IF NAME="searchfield" -->
! 			<h2 class="parameters">Modify printer</h2>
! 		<!-- TMPL_ELSE -->
! 			<h2 class="parameters">Add printer</h2>
! 		<!-- /TMPL_IF -->
! 	
! 			<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
! 				<input type="hidden" name="op" value="add_validate">
! 				<!-- TMPL_IF NAME="searchfield" -->
! 						<p><label>Printer Name</label><input type="hidden" name="printername" value="<!-- TMPL_VAR NAME="searchfield" -->"><!-- TMPL_VAR NAME="searchfield" --></p>
! 				<!-- TMPL_ELSE -->
! 						<p><label>Printer Name</label><input type="text" name="printername" size="50" maxlength="50"></p>
! 				<!-- /TMPL_IF -->
! 				<p><label>Queue</label><input type="text" name="printqueue" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printqueue" -->"> </p>
! 				<p><label>Type</label><input type="text" name="printtype" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printtype" -->"> </p>
! 				<p><input type="button" value="OK" onclick="Check(this.form)" class="button"></p>
! 			</form>
! 	</div>
  	<!-- /TMPL_IF -->
! 	
! 	<!-- TMPL_IF NAME="add_validate" -->
! 		Data recorded
! 			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 			<input type="submit" value="OK" class="button">
! 			</form>
  	<!-- /TMPL_IF -->
! 	
! 	<!-- TMPL_IF NAME="delete_confirm" -->
! 		<table border="0" cellspacing="0" cellpadding="5">
! 			<tr bgcolor="#99cc33">
! 				<td background="/images/background-mem.gif"><b>Printer</b></td>
! 				<td background="/images/background-mem.gif"><b><!-- TMPL_VAR NAME="searchfield" --></b></td>
! 			</tr>
! 	
  				<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 				<input type="hidden" name="op" value="delete_confirmed">
! 				<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 			
! 			<tr>
! 				<td>Queue</td>
! 				<td><!-- TMPL_VAR NAME="printqueue" --></td>
! 			</tr>
! 				<tr>
! 				<td>Type</td>
! 				<td><!-- TMPL_VAR NAME="printtype" --></td>
! 			</tr>
! 				<tr>
! 				<td colspan="2" align="center">CONFIRM DELETION</td>
! 			</tr>
! 				<tr>
! 				<td>
! 					<input type="submit" value="YES">
! 					</form>
! 				</td>
! 				<td>
! 					<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 					<input type="submit" value="NO">
! 					</form>
! 				</td>
! 			</tr>
! 		</table>
  	<!-- /TMPL_IF -->
  	
! 	<!-- TMPL_IF NAME="delete_confirmed" -->
! 		Data deleted
! 		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 			<input type="submit" value="OK">
! 		</form>
  	<!-- /TMPL_IF -->
! 	
! 	<!-- TMPL_IF NAME="else" -->
! 			<form action="<!-- TMPL_VAR NAME="script_name">" method="post">
! 					<input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 					<input type="reset" name="reset" value="clr">
! 			</form>
! 	
! 		<!-- TMPL_IF NAME="searchfield" -->
! 			You searched for <b><!-- TMPL_VAR NAME="searchfield" --></b>
! 		<!-- /TMPL_IF -->
! 	
! 		<table border="0" cellspacing="0" cellpadding="5">
! 			<tr bgcolor="#99cc33">
! 				<td background="/images/background-mem.gif"><b>Name</b></td>
! 				<td background="/images/background-mem.gif"><b>Queue</b></td>
! 				<td background="/images/background-mem.gif"><b>Type</b></td>
! 				<td background="/images/background-mem.gif"> </td>
! 				<td background="/images/background-mem.gif"> </td>
! 			</tr>
! 			<!-- TMPL_LOOP NAME="loop" -->
! 			<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
! 				<td><!-- TMPL_VAR NAME="printername" --></td>
! 				<td><!-- TMPL_VAR NAME="printqueue" --></td>
! 				<td><!-- TMPL_VAR NAME="printtype" --></td>
! 				<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->" class="button">Edit</a></td>
! 							<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->" class="button">Delete</a></td>
! 			</tr>
! 			<!-- /TMPL_LOOP -->
! 		</table>
! 	
! 		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 			<input type="hidden" name="op" value="add_form">
! 		
! 		<!-- TMPL_IF NAME="offsetgtzero" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Prev</a>
! 		<!-- /TMPL_IF -->
! 	
! 		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
! 	
! 		<!-- TMPL_IF NAME="ltcount" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">Next &gt;&gt;</a>	
! 		<!-- /TMPL_iF -->
! 	
! 			<br>
! 		<input type="submit" class="button" value="Add printer" alt="Add printer">
! 		<br>
! 			</form>
! 	
! 	<!-- /TMPL_IF -->
! </div>
  
  <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: z3950servers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** z3950servers.tmpl	13 Sep 2004 15:31:13 -0000	1.16
--- z3950servers.tmpl	20 Jun 2005 14:21:01 -0000	1.17
***************
*** 214,218 ****
  				</tr>
  				<!-- TMPL_LOOP NAME="loop" -->
! 				<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
  					<td><!-- TMPL_VAR NAME="name" --></td>
  					<td><!-- TMPL_VAR NAME="host" --></td>
--- 214,218 ----
  				</tr>
  				<!-- TMPL_LOOP NAME="loop" -->
! 				<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="hilighted"><!-- /TMPL_IF -->
  					<td><!-- TMPL_VAR NAME="name" --></td>
  					<td><!-- TMPL_VAR NAME="host" --></td>




From tipaul at users.sourceforge.net  Mon Jun 20 16:21:20 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:21:20 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/reports borrowers_out.tmpl,1.1,1.2
Message-ID: <E1DkN9M-0002CM-Vo@sc8-pr-cvs1.sourceforge.net>

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

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

Index: borrowers_out.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/reports/borrowers_out.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** borrowers_out.tmpl	24 Mar 2005 15:19:48 -0000	1.1
--- borrowers_out.tmpl	20 Jun 2005 14:21:18 -0000	1.2
***************
*** 73,76 ****
--- 73,92 ----
  				<td><input type="text" name="Filter" value=""></td>
  			</tr>
+ 			<tr class="hilighted">
+ 				<td>&nbsp;</td>
+ 				<td>&nbsp;</td>
+ 				<td>Without issues since</td>
+ 				<td><input size="10" id="to" name="Filter" value="" type="text">
+ 						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
+ 							<script type="text/javascript">
+ 								Calendar.setup(
+ 									{
+ 										inputField : "to",
+ 										ifFormat : "%Y-%m-%d",
+ 										button : "openCalendarTo",
+ 									}
+ 								);
+ 							</script></td>
+ 			</tr>
  		</tbody>
  	</table>




From tipaul at users.sourceforge.net  Mon Jun 20 16:21:42 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:21:42 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en boraccount.tmpl,1.10,1.11 intranet-main.tmpl,1.25,1.26 mancredit.tmpl,1.3,1.4 maninvoice.tmpl,1.3,1.4
Message-ID: <E1DkN9i-0002EO-QO@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	boraccount.tmpl intranet-main.tmpl mancredit.tmpl 
	maninvoice.tmpl 
Log Message:
synch'ing 2.2 and head

Index: boraccount.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/boraccount.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** boraccount.tmpl	26 Nov 2004 20:32:17 -0000	1.10
--- boraccount.tmpl	20 Jun 2005 14:21:39 -0000	1.11
***************
*** 1,47 ****
  <!-- TMPL_INCLUDE NAME="members-top.inc" -->
! 
! <!-- The manual invoice and credit buttons -->
! 
! <h1>Account for <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a></h1><P>
! <a class="button" href="/cgi-bin/koha/maninvoice.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Create Manual Invoice</a>
! &nbsp;
! <a class="button" href="/cgi-bin/koha/mancredit.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Create Manual Credit</a>
! <center>
! <p>
! 
! <!-- The table with the account items -->
! 
! <table  cellspacing="0"  cellpadding="5" border="1" >
! 
!   <tr valign="top">
!     <td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif" colspan="2"><b>FINES &amp; CHARGES</td>
!     <td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif" colspan="1"><b>AMOUNT</td>
!     <td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif" colspan="1"><b>STILL OWING</td>
!   </tr>
! 
!   <!-- TMPL_LOOP NAME="accounts" -->
! 
!     <tr valign="top">
!       <td><!-- TMPL_VAR NAME="date" --></td>
!       <td><!-- TMPL_VAR NAME="description" --><!-- TMPL_IF NAME="printtitle" --> <!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF --></td>
!       <td><!-- TMPL_VAR NAME="amount" --></td>
!       <td><!-- TMPL_VAR NAME="amountoutstanding" --></td>
!     </tr>
! 
!   <!-- /TMPL_LOOP -->
! 
!   <tr valign="top">
!     <td></td>
!     <td colspan="2"><b>Total Due</b></td>
!     <td><b><!-- TMPL_VAR NAME="total" --></b></td>
!   </tr>
! 
! </table>
! 
! <br clear="all">
! <p> &nbsp; </p>
! 
! <!-- endmenu (member) -->
! 
  <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
  
--- 1,39 ----
  <!-- TMPL_INCLUDE NAME="members-top.inc" -->
! <div id="mainbloc">
! 	<!-- The manual invoice and credit buttons -->
! 	
! 	<h1>Account for <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a></h1><P>
! 	<a class="button" href="/cgi-bin/koha/maninvoice.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Create Manual Invoice</a>
! 	&nbsp;
! 	<a class="button" href="/cgi-bin/koha/mancredit.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Create Manual Credit</a>
! 	<!-- The table with the account items -->
! 	
! 	<table>
! 	
! 	<tr>
! 		<th>FINES &amp; CHARGES</th>
! 		<th>AMOUNT</th>
! 		<th>STILL OWING</th>
! 	</tr>
! 	
! 	<!-- TMPL_LOOP NAME="accounts" -->
! 	
! 		<tr>
! 		<td><!-- TMPL_VAR NAME="date" --> <!-- TMPL_VAR NAME="description" --><!-- TMPL_IF NAME="printtitle" --> <!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF --></td>
! 		<td><!-- TMPL_VAR NAME="amount" --></td>
! 		<td><!-- TMPL_VAR NAME="amountoutstanding" --></td>
! 		</tr>
! 	
! 	<!-- /TMPL_LOOP -->
! 	
! 	<tr>
! 		<th>Total Due</th>
! 		<th colspan="2"><!-- TMPL_VAR NAME="total" --></th>
! 	</tr>
! 	
! 	</table>
! 	
! 	<!-- endmenu (member) -->
! </div>
  <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
  

Index: intranet-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** intranet-main.tmpl	20 Sep 2004 15:25:22 -0000	1.25
--- intranet-main.tmpl	20 Jun 2005 14:21:39 -0000	1.26
***************
*** 43,46 ****
--- 43,55 ----
  			layer.style.visibility = 'hidden';
  		}
+ 		function addauthority() {
+ 			X = document.forms["f"].authtype.value;
+ 			window.location="/cgi-bin/koha/authorities/authorities.pl?authtypecode="+X;
+ 		}
+ 		function searchauthority() {
+ 			X = document.forms["f"].authtype2.value;
+ 			Y = document.forms["f"].value.value;
+ 			window.location="/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&authtypecode="+X+"&value="+Y+"&marclist=&and_or=and&excluding=&operator=contains";
+ 		}
  	</script>
  	<script language="javascript" type="text/javascript">
***************
*** 115,126 ****
  			<h1 class="acquisition">Acquisitions</h1>
  			Order items, receive orders, set budgets...
  		</div>
  		<div id="Hint4" class="hint">
  			<h1 class="reports">Reports</h1>
  			All the system reports
  		</div>
  		<div id="Hint5" class="hint">
! 			<h1 class="reports">Authorities</h1>
  			Authorities management &amp; searches
  		</div>
  		<div id="Hint6" class="hint">
--- 124,204 ----
  			<h1 class="acquisition">Acquisitions</h1>
  			Order items, receive orders, set budgets...
+ 			<form action="/cgi-bin/koha/acqui/order.pl" method="post">
+ 			Supplier name : <input type="text"  size="25"   name="supplier">
+ 			<input type="submit" class="button acquisition" value="OK">
+ 			</form>
+ 			<p>or <a href="histsearch.pl" class="button acquisition">Search order history</a></p>
+ 			
  		</div>
  		<div id="Hint4" class="hint">
  			<h1 class="reports">Reports</h1>
  			All the system reports
+ 			<div id="bloc25">
+ 			<h2 class="reports">Stats</h2>
+ 			<ul>
+ 			<li>on catalogue
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/inventory.pl">Inventory/Stocktaking</a></p>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalogue by itemtype</a></p>
+ 			<li>on issues
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/stats.pl?time=yesterday">Till Reconcipation:</a> Daily Report (yesterday)</p>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/stats.pl?time=today">Till Reconcipation:</a> Daily Report (today)</p>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/overdue.pl">Overdue items</a></p>
+ 			</ul>
+ 			</div>
+ 			<div id="bloc25">
+ 			<h2 class="reports">Stat wizards</h2>
+ 			<table>
+ 			<tr>
+ 			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions</a></td>
+ 			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/borrowers_stats.pl">Borrowers</a></td>
+ 			</tr>
+ 			<tr>
+ 			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/catalogue_stats.pl">Catalogue</a></td>
+ 			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/issues_stats.pl">Circulation</a></td>
+ 			</tr>
+ 			</table>
+ 			</div>
+ 			<div id="bloc25">
+ 			<h2 class="reports">Top Lists</h2>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/bor_issues_top.pl">Most issuing Borrowers</a></p>
+ 				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/cat_issues_top.pl">Most issued items</a></p>
+ 			</div>
  		</div>
+ 		
  		<div id="Hint5" class="hint">
! 			<h1 class="authority">Authorities</h1>
  			Authorities management &amp; searches
+ 			<form name="f" >
+ 				<h2 >
+ 					<select name="authtype">
+ 					<!-- TMPL_LOOP NAME="authtypesloop" -->
+ 						<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
+ 							<!-- TMPL_VAR NAME="authtypetext" -->
+ 						</option>
+ 					<!-- /TMPL_LOOP -->
+ 					</select>
+ 					<a href="javascript:addauthority()" class="authority">Add Authority</a>
+ 				</h2>
+ 				<h2>Search 
+ 				<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
+ 				in
+ 					<select name="authtype2">
+ 					<!-- TMPL_LOOP NAME="authtypesloop" -->
+ 						<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
+ 							<!-- TMPL_VAR NAME="authtypetext" -->
+ 						</option>
+ 					<!-- /TMPL_LOOP -->
+ 					</select>
+ 				</h2>
+ 				<input type="hidden" name="marclist" value="">
+ 				<input type="hidden" name="and_or" value="and">
+ 				<input type="hidden" name="excluding" value="">
+ 				<input type="hidden" name="operator" value="contains">
+ 				<input type="hidden" name="op" value="do_search">
+ 				<img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0">
+ 				<a href="javascript:searchauthority()" class="authority">
+ 					Search
+ 				</a>
+ 			</form>
  		</div>
  		<div id="Hint6" class="hint">
***************
*** 133,136 ****
--- 211,230 ----
  			<h1 class="circulation">Circulation</h1>
  			Work at the front desk on Issues and returns using only a barcode reader and a mouse
+ 				<h2 class="circulation">
+ 					Issue
+ 				</h2>
+ 				<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+ 					<p>Enter borrower card number or partial last name <input name="findborrower">
+ 					<input type="submit" value="OK" class="button circulation"></p>
+ 				</form>
+ 				<h2 class="circulation">
+ 					Return
+ 				</h2>
+ 				<form method="post" action="/cgi-bin/koha/circ/returns.pl">
+ 				<p>Enter Book Barcode</p>
+ 				<label class="label20">Item Barcode:</label><input name="barcode" size="10">
+ 				<input type="submit" value="OK" class="button circulation">
+ 				</form>
+ 
  		</div>
  <!-- MAIN MENU -->

Index: mancredit.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/mancredit.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** mancredit.tmpl	19 Jul 2004 21:41:29 -0000	1.3
--- mancredit.tmpl	20 Jun 2005 14:21:40 -0000	1.4
***************
*** 1,22 ****
  <!-- TMPL_INCLUDE Name="members-top.inc" -->
! 
! <Center><h3>Manual Credit</h3></center>
! <form action="/cgi-bin/koha/mancredit.pl" method="post">
! <table cellpadding="2" cellspacing="0" border="0">
! <input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
! <tr><td><b>Borrowernumber<b></td><td><!-- TMPL_VAR NAME="bornum" --></td></tr>
! <tr><td><b>Type</b></td><Td>
! <select name="type">
! <option value="C">Credit</option>
! <option value="BAY">Baycorp Adjustment</option>
! <option value="WORK">Worked off</option>
! </select>
! </td></tr>
! <tr><td><b>Itemnumber</b></td><td><input type="text" name="itemnum"></td></tr>
! <tr><td><b>Description</b></td><td><input type="text" name="desc" size="50"></td></tr>
! <tr><td><b>Amount</b></td><td><input type="text" name="amount"></td></tr>
! <tr><td><input type="submit" name="add" value="Add"></td></tr>
! </table>
! </form>
! 
  <!-- TMPL_INCLUDE Name="members-bottom.inc" -->
\ No newline at end of file
--- 1,20 ----
  <!-- TMPL_INCLUDE Name="members-top.inc" -->
! <div id="mainbloc">
! 	<h1 class="member">Manual Credit</h1>
! 	<form action="/cgi-bin/koha/mancredit.pl" method="post">
! 		<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
! 		<p><label class="label100">Borrowernumber</label><!-- TMPL_VAR NAME="bornum" --></p>
! 		<p><label class="label100">Type</label>
! 			<select name="type">
! 				<option value="C">Credit</option>
! 				<option value="BAY">Baycorp Adjustment</option>
! 				<option value="WORK">Worked off</option>
! 			</select>
! 		</p>
! 		<p><label class="label100">Itemnumber</label><input type="text" name="itemnum"></p>
! 		<p><label class="label100">Description</label><input type="text" name="desc" size="50"></p>
! 		<p><label class="label100">Amount</label><input type="text" name="amount"></p>
! 		<p><input type="submit" name="add" value="Add" class="button"></p>
! 	</form>
! </div>
  <!-- TMPL_INCLUDE Name="members-bottom.inc" -->
\ No newline at end of file

Index: maninvoice.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/maninvoice.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** maninvoice.tmpl	19 Jul 2004 21:41:29 -0000	1.3
--- maninvoice.tmpl	20 Jun 2005 14:21:40 -0000	1.4
***************
*** 1,25 ****
  <!-- TMPL_INCLUDE Name="members-top.inc" -->
! 
! <Center><h3>Manual Invoice</h3></center>
! <form action="/cgi-bin/koha/maninvoice.pl" method="post">
! <table cellpadding="2" cellspacing="0" border="0">
! <input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
! <tr><td><b>Borrowernumber<b></td><td><!-- TMPL_VAR NAME="bornum" --></td></tr>
! <tr><td><b>Type</b></td><Td>
! <select name="type">
! <option value="L">Lost Item</option>
! <option value="F">Fine</option>
! <option value="A">Account Management Fee</option>
! <option value="N">New Card</option>
! <option value="M">Sundry</option>
! <option value="REF">Cash Refund</option>
! </select>
! </td></tr>
! <tr><td><b>Itemnumber</b></td><td><input type="text" name="itemnum"></td></tr>
! <tr><td><b>Description</b></td><td><input type="text" name="desc" size="50"></td></tr>
! <tr><td><b>Amount</b></td><td><input type="text" name="amount"></td></tr>
! <tr><td><input type="submit" name="add" value="Add"></td></tr>
! </table>
! </form>
! 
  <!-- TMPL_INCLUDE Name="members-bottom.inc" -->
--- 1,25 ----
  <!-- TMPL_INCLUDE Name="members-top.inc" -->
! <div id="mainbloc">
! 	<h1 class="member">Manual Invoice</h1>
! 	<form action="/cgi-bin/koha/maninvoice.pl" method="post">
! 	<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
! 	<p><label class="label100">Borrowernumber </label><!-- TMPL_VAR NAME="bornum" --></p>
! 	<p>
! 		<label class="label100"><b>Type</label>
! 		<select name="type">
! 			<option value="L">Lost Item</option>
! 			<option value="F">Fine</option>
! 			<option value="A">Account Management Fee</option>
! 			<option value="N">New Card</option>
! 			<option value="M">Sundry</option>
! 			<option value="REF">Cash Refund</option>
! 		</select>
! 	</p>
! 	<p><label class="label100">Itemnumber</label><input type="text" name="itemnum"></p>
! 	<p><label class="label100">Description</label><input type="text" name="desc" size="50"></p>
! 	<p><label class="label100">Amount</label><input type="text" name="amount"></p>
! 	<p><label class="label100"><input type="submit" class="button" name="add" value="Add"></p>
! 	</table>
! 	</form>
! </div>
  <!-- TMPL_INCLUDE Name="members-bottom.inc" -->




From tipaul at users.sourceforge.net  Mon Jun 20 16:22:32 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:22:32 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/images filefind.png,1.1,1.2
Message-ID: <E1DkNAW-0002Mw-1E@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	filefind.png 
Log Message:
synch'ing 2.2 and head





From tipaul at users.sourceforge.net  Mon Jun 20 16:22:32 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:22:32 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.20,1.21 opac-top.inc,1.10,1.11
Message-ID: <E1DkNAW-0002N6-9J@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac.css opac-top.inc 
Log Message:
synch'ing 2.2 and head

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** opac.css	15 Jun 2005 19:55:14 -0000	1.20
--- opac.css	20 Jun 2005 14:22:29 -0000	1.21
***************
*** 51,55 ****
  	border-width:0px;
  	text-align:left;
! 	position:absolute;
  }
  
--- 51,58 ----
  	border-width:0px;
  	text-align:left;
! 	display:inline;
! 	float:left;
! 	padding-left:10px;
! 	padding-right:10px;
  }
  
***************
*** 91,99 ****
  	font-weight:bold;
  	font-size: 115%;
- 	text-align : center;
  	vertical-align:top;
  	padding: 2px;
  	width:100%;
- 	margin-left:70px;
  }
  
--- 94,100 ----
***************
*** 143,147 ****
  	border:1px solid #000000;
  	border-collapse:collapse;
! 	width:90%;
  }
  /* header */
--- 144,148 ----
  	border:1px solid #000000;
  	border-collapse:collapse;
! 	position:static;
  }
  /* header */
***************
*** 155,165 ****
  	border-bottom:1px solid #000000;
  	border-top:1px solid #000000;
- 	padding:5px;
  }
  /* standard cell */
  td {
  	font-size:10pt;
  	border-left:1px solid #000000;
  	vertical-align:top;
  }
  
--- 156,173 ----
  	border-bottom:1px solid #000000;
  	border-top:1px solid #000000;
  }
  /* standard cell */
+ 
+ tr {
+ 	display:table-row;
+ 	position:static;
+ }
+ 
  td {
  	font-size:10pt;
  	border-left:1px solid #000000;
  	vertical-align:top;
+ 	position:static;
+ 	display:table-cell;
  }
  
***************
*** 355,361 ****
  }
  
  #menuline {
- 	float:left;
  	display:block;
  }
  
--- 363,374 ----
  }
  
+ #title {
+ 	display:block;
+ 	margin-left:0px;
+ }
+ 
  #menuline {
  	display:block;
+ 	margin-left:100px;
  }
  
***************
*** 369,376 ****
  
  /* a little spacer. should not be used */
- .spacer {
- 	padding-left:20pt;
- 	float:left;
- }
  .basketspacer {
  	padding-left:8pt;
--- 382,385 ----
***************
*** 378,388 ****
  }
  
  /* for MARC view  */
  div.tabs {
! 	width:10px;
! 	position:absolute;
  	display:block;
! 	margin-left:50px;
! 	margin-top:150px;
  }
  
--- 387,419 ----
  }
  
+ /* for SubscritptionHistory view  */
+ div.tabsubs {
+ 	margin-left:150px;
+ 	position:inline;
+ }
+ 
+ div.tabsubs a {
+ 	font-size: small;
+ 	border: thin solid black;
+ 	margin-right: 2px;
+ 	padding: 10px 10px;
+ 	-moz-border-radius: 5px 5px 0px 0px;
+ }
+ 
+ div.tabsub {
+ 	background-color: #ACE6E6;
+ 	position:absolute;
+ 	visibility:hidden;
+ 	margin-left:150px;
+ 	margin-top:0px;
+ border:4px;
+ }
+ 
  /* for MARC view  */
  div.tabs {
! 	width:15px;
  	display:block;
! 	margin-top:70px;
! 	margin-left:40px;
  }
  
***************
*** 396,399 ****
--- 427,440 ----
  }
  
+ div.tabbloc {
+ 	position:absolute;
+ 	display:block;
+ 	top:140px;
+ 	left:62px;
+ 	margin-right:0px;
+ 	border: 1px solid black;
+ 	background-color:none;
+ }
+ 
  div.tab {
  	background-color: #ACE6E6;
***************
*** 401,407 ****
  	visibility:hidden;
  	position:absolute;
! 	margin-left:72px;
! 	margin-top:150px;
! 	margin-right:10%;
  }
  
--- 442,448 ----
  	visibility:hidden;
  	position:absolute;
! 	float:left;
! 	margin-right:0px;
! 	background-color:none;
  }
  

Index: opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** opac-top.inc	4 May 2005 08:58:30 -0000	1.10
--- opac-top.inc	20 Jun 2005 14:22:30 -0000	1.11
***************
*** 25,29 ****
  	var MSG_NO_RECORD_ADDED = _("No biblio added");
  	function Dopop(link) {
! 		newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
  	}
  	</script>
--- 25,29 ----
  	var MSG_NO_RECORD_ADDED = _("No biblio added");
  	function Dopop(link) {
! 		newin=window.open(link,'popup','width=700,height=500,toolbar=false,scrollbars=yes');
  	}
  	</script>
***************
*** 31,41 ****
  <body>
  	<!-- MENUS -->
! 	<div id="menuline">
! 		<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo" style="float: left" />
  		<div class="SmallLibraryName"><!--TMPL_VAR name="LibraryName"--></div>
! 		<span class="spacer">&nbsp;</span>
! 		<span class="spacer">&nbsp;</span>
  		<a class="menu" href="/cgi-bin/koha/opac-main.pl" title="Koha home page">Home</a>
- 		<span class="spacer">&nbsp;</span>
  		<a class="menu" href="/cgi-bin/koha/opac-search.pl" title="Advanced search">Advanced search</a>
  		<!-- TMPL_IF NAME="loggedinusername" -->
--- 31,44 ----
  <body>
  	<!-- MENUS -->
! 	<div id="title">
! 		<!-- TMPL_IF name="opacsmallimage" -->
! 			<img src="<!-- TMPL_VAR name="opacsmallimage"-->" height="50" alt="koha logo"/>
! 		<!-- TMPL_ELSE -->
! 			<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo"/>
! 		<!-- /TMPL_IF -->
  		<div class="SmallLibraryName"><!--TMPL_VAR name="LibraryName"--></div>
! 	</div>
! 	<div id="menuline">
  		<a class="menu" href="/cgi-bin/koha/opac-main.pl" title="Koha home page">Home</a>
  		<a class="menu" href="/cgi-bin/koha/opac-search.pl" title="Advanced search">Advanced search</a>
  		<!-- TMPL_IF NAME="loggedinusername" -->
***************
*** 47,53 ****
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_IF -->
- 		<span class="spacer">&nbsp;</span>
  		<a class="menu" href="/cgi-bin/koha/opac-user.pl" title="Member Home page" >Personal page</a>
- 		<span class="spacer">&nbsp;</span>
  		<a class="menu" href="javascript:openBasket()" title="Biblio basket">Biblio basket <span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a>
  	</div>
--- 50,54 ----




From tipaul at users.sourceforge.net  Mon Jun 20 16:25:19 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:25:19 -0700
Subject: [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
Message-ID: <E1DkNDD-0002bu-BQ@sc8-pr-cvs1.sourceforge.net>

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>




From tipaul at users.sourceforge.net  Mon Jun 20 16:26:06 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:26:06 -0700
Subject: [Koha-cvs] CVS: koha/localfile/modified_authorities DO_NOT_REMOVE,1.1,1.2
Message-ID: <E1DkNDy-0002ki-4w@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/localfile/modified_authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10499/localfile/modified_authorities

Added Files:
	DO_NOT_REMOVE 
Log Message:
synch'ing 2.2 and head





From tipaul at users.sourceforge.net  Mon Jun 20 16:26:23 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:26:23 -0700
Subject: [Koha-cvs] CVS: koha/misc/release notes release_notes_223.txt,1.1,1.2
Message-ID: <E1DkNEE-0002mc-WE@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/release notes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10680/misc/release notes

Added Files:
	release_notes_223.txt 
Log Message:
synch'ing 2.2 and head

***** Bogus filespec: notes




From tipaul at users.sourceforge.net  Mon Jun 20 16:26:06 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:26:06 -0700
Subject: [Koha-cvs] CVS: koha/members memberentry.pl,1.9,1.10
Message-ID: <E1DkNDy-0002kj-52@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10499/members

Modified Files:
	memberentry.pl 
Log Message:
synch'ing 2.2 and head

Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/memberentry.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** memberentry.pl	4 May 2005 09:01:58 -0000	1.9
--- memberentry.pl	20 Jun 2005 14:26:03 -0000	1.10
***************
*** 129,138 ****
  		print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrowernumber");
  		}
- 		
- 	if($destination eq "circ"){
- 		print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$data{'cardnumber'}");
- 	} else {
- 		print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$data{'borrowernumber'}");
- 		}
  	}
  }
--- 129,132 ----
***************
*** 242,246 ****
  	$template->param(	actionType 		=> $actionType,
  				destination => $destination,
! 				member          => $member,
  				address         => $data->{'streetaddress'},
  				firstname       => $data->{'firstname'},
--- 236,240 ----
  	$template->param(	actionType 		=> $actionType,
  				destination => $destination,
! 				borrowernumber          => $borrowernumber,
  				address         => $data->{'streetaddress'},
  				firstname       => $data->{'firstname'},
***************
*** 268,273 ****
  				relshiploop	=> \@relshipdata,
  				"title_".$data->{'title'} => " SELECTED ",
! 				dateenrolled	=> $data->{'dateenrolled'},
! 				expiry		=> $data->{'expiry'},
  				cardnumber	=> $cardnumber,
  				dateofbirth	=> $data->{'dateofbirth'},
--- 262,267 ----
  				relshiploop	=> \@relshipdata,
  				"title_".$data->{'title'} => " SELECTED ",
! 				joining	=> format_date($data->{'dateenrolled'}),
! 				expiry		=> format_date($data->{'expiry'}),
  				cardnumber	=> $cardnumber,
  				dateofbirth	=> $data->{'dateofbirth'},




From tipaul at users.sourceforge.net  Mon Jun 20 16:27:51 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:27:51 -0700
Subject: [Koha-cvs] CVS: koha/misc/sql-datas/english sample_usmarc.mrc,1.1,1.2 sample_usmarc.readme,1.1,1.2
Message-ID: <E1DkNFf-0002yC-ST@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/sql-datas/english
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10788/misc/sql-datas/english

Added Files:
	sample_usmarc.mrc sample_usmarc.readme 
Log Message:
synch'ing 2.2 and head






From tipaul at users.sourceforge.net  Mon Jun 20 16:28:23 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:28:23 -0700
Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.90,1.91 overduenotices.pl,1.3,1.4
Message-ID: <E1DkNGB-00030Y-OG@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11485/misc

Modified Files:
	Install.pm overduenotices.pl 
Log Message:
synch'ing 2.2 and head

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -r1.90 -r1.91
*** Install.pm	27 May 2005 13:33:42 -0000	1.90
--- Install.pm	20 Jun 2005 14:28:10 -0000	1.91
***************
*** 3,7 ****
  
  # Copyright 2000-2002 Katipo Communications
! # Contains parts Copyright 2003-5 MJ Ray
  #
  # This file is part of Koha.
--- 3,7 ----
  
  # Copyright 2000-2002 Katipo Communications
! # Contains parts Copyright 2003-4 MJ Ray
  #
  # This file is part of Koha.
***************
*** 860,865 ****
  	unless (eval {require MARC::Record})     { push @missing,"MARC::Record" };
  	unless (eval {require Mail::Sendmail})   { push @missing,"Mail::Sendmail" };
- 	unless (eval {require PDF::API2})   { push @missing,"PDF::API2" };
  # The following modules are not mandatory, depends on how the library want to use Koha
  	unless (eval {require Net::LDAP})       {
  		if ($#missing>=0) { # only when $#missing >= 0 so this isn't fatal
--- 860,869 ----
  	unless (eval {require MARC::Record})     { push @missing,"MARC::Record" };
  	unless (eval {require Mail::Sendmail})   { push @missing,"Mail::Sendmail" };
  # The following modules are not mandatory, depends on how the library want to use Koha
+ 	unless (eval {require PDF::API2})   { 
+ 			if ($#missing>=0) { # only when $#missing >= 0 so this isn't fatal
+ 				push @missing,"You will need PDF::API2 for barcode generator" 
+ 			}
+ 	}
  	unless (eval {require Net::LDAP})       {
  		if ($#missing>=0) { # only when $#missing >= 0 so this isn't fatal
***************
*** 1952,1958 ****
  
  		startsysout();
! 		system("$mysqldir/bin/mysql '-u$user' -e \"insert into branches (branchcode,branchname,issuing) values ('$branchcode', '$branch', 1)\" '$database'");
! 		system("$mysqldir/bin/mysql '-u$user' -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\" '$database'");
! 		system("$mysqldir/bin/mysql '-u$user' -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\" '$database'");
  
  		my $printername='lp';
--- 1956,1962 ----
  
  		startsysout();
! 		system("$mysqldir/bin/mysql -u$user -e \"insert into branches (branchcode,branchname,issuing) values ('$branchcode', '$branch', 1)\" $database");
! 		system("$mysqldir/bin/mysql -u$user -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\" $database");
! 		system("$mysqldir/bin/mysql -u$user -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\" $database");
  
  		my $printername='lp';
***************
*** 1973,1977 ****
  		}
  		startsysout();	
! 		system("$mysqldir/bin/mysql '-u$user' -e \"insert into printers (printername,printqueue,printtype) values ('$printername', '$printerqueue', '')\" '$database'");
  	}
  	my $language;
--- 1977,1981 ----
  		}
  		startsysout();	
! 		system("$mysqldir/bin/mysql -u$user -e \"insert into printers (printername,printqueue,printtype) values ('$printername', '$printerqueue', '')\" $database");
  	}
  	my $language;
***************
*** 1983,1987 ****
  	}
  	startsysout();	
! 	system("$mysqldir/bin/mysql '-u$user' -e \"update systempreferences set value='$language' where variable='opaclanguages'\" '$database'");
  	my @dirs;
  	if (-d "scripts/misc/sql-datas") {
--- 1987,1991 ----
  	}
  	startsysout();	
! 	system("$mysqldir/bin/mysql -u$user -e \"update systempreferences set value='$language' where variable='opaclanguages'\" $database");
  	my @dirs;
  	if (-d "scripts/misc/sql-datas") {
***************
*** 2154,2158 ****
  
  setmysqlclipass($pass); 
! open (MD, "$mysqldir/bin/mysqldump '--user=$user' --host=$hostname '$database'|");
  
  (open BF, ">$backupdir/Koha.backup_$date") || (die "Error opening up backup file $backupdir/Koha.backup_$date: $!\n");
--- 2158,2162 ----
  
  setmysqlclipass($pass); 
! open (MD, "$mysqldir/bin/mysqldump --user=$user --host=$hostname $database|");
  
  (open BF, ">$backupdir/Koha.backup_$date") || (die "Error opening up backup file $backupdir/Koha.backup_$date: $!\n");

Index: overduenotices.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/overduenotices.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** overduenotices.pl	4 May 2005 09:02:37 -0000	1.3
--- overduenotices.pl	20 Jun 2005 14:28:12 -0000	1.4
***************
*** 74,78 ****
  # The following fields are available :
  # <date> <itemcount> <firstname> <lastname> <address1> <address2> <address3> <city> <postcode>
! my $mailtext = "\n\n\nDear library borrower\n\n\n       <date>\n\n       According to our records, you have <itemcount> items that are at\n       least a week overdue for return to the library or renewal.\n       If you have registered a password with the library, you may use it\n       and your library card to login at http://XXX.org\n       to check the status of your account, or you may call any of our branch\n       Please be advised that all library services will be blocked\n       if items are allowed to go more than 30 days overdue.\n\n       Thank you for using your public libraries.\n\n\n                                             <firstname> <lastname>\n                                             <address1>\n                                             <address2>\n                                             <city>  <postcode>\n\n\n\n\n\n";
  #
  # END OF PARAMETERS
--- 74,79 ----
  # The following fields are available :
  # <date> <itemcount> <firstname> <lastname> <address1> <address2> <address3> <city> <postcode>
! my $mailtext = "\n\n\nDear library borrower\n\n\n       <date>\n\n       According to our records, you have <itemcount> items, the description of which follows, that are at\n       least a week overdue for return to the library or renewal:\n		title		author		barcode\n<titles>\n
!        If you have registered a password with the library, you may use it\n       and your library card to login at http://XXX.org\n       to check the status of your account, or you may call any of our branch\n       Please be advised that all library services will be blocked\n       if items are allowed to go more than 30 days overdue.\n\n       Thank you for using your public libraries.\n\n\n                                             <firstname> <lastname>\n                                             <address1>\n                                             <address2>\n                                             <city>  <postcode>\n\n\n\n\n\n";
  #
  # END OF PARAMETERS
***************
*** 85,89 ****
  
  my $dbh = C4::Context->dbh;
! my $sth = $dbh->prepare ("SELECT count(*), issues.borrowernumber,firstname,surname,streetaddress,physstreet,city,zipcode,emailaddress FROM issues,borrowers,categories WHERE returndate IS NULL AND TO_DAYS(NOW())-TO_DAYS(date_due) BETWEEN 0 and 500 AND issues.borrowernumber=borrowers.borrowernumber and borrowers.categorycode=categories.categorycode and categories.overduenoticerequired=1 group by issues.borrowernumber");
  $sth->execute;
  # 
--- 86,92 ----
  
  my $dbh = C4::Context->dbh;
! my $sth = $dbh->prepare ("SELECT COUNT(*), issues.borrowernumber,firstname,surname,streetaddress,physstreet,city,zipcode,emailaddress FROM issues,borrowers,categories WHERE returndate IS NULL AND TO_DAYS(NOW())-TO_DAYS(date_due) BETWEEN 0 and 500 AND issues.borrowernumber=borrowers.borrowernumber and borrowers.categorycode=categories.categorycode and categories.overduenoticerequired=1 group by issues.borrowernumber");
! my $sth2 = $dbh->prepare("SELECT biblio.title,biblio.author,items.barcode FROM issues,items,biblio WHERE items.itemnumber=issues.itemnumber and biblio.biblionumber=items.biblionumber AND issues.borrowernumber=? AND returndate IS NULL AND TO_DAYS(NOW())-TO_DAYS(date_due) BETWEEN 0 and 500");
! 
  $sth->execute;
  # 
***************
*** 92,95 ****
--- 95,99 ----
  my $count = 0;   # to keep track of how many notices are printed
  my $e_count = 0;   # and e-mailed
+ my $date=localtime;
  my ($itemcount,$borrnum,$firstname,$lastname,$address1,$address2,$city,$postcode,$email);
  
***************
*** 103,107 ****
  		$notice =~ s/\<city\>/$city/g;
  		$notice =~ s/\<postcode\>/$postcode/g;
! 	
  	# if not using e-mail notices, comment out the following lines
  		if ($email) {   # or you might check for borrowers.preferredcont 
--- 107,120 ----
  		$notice =~ s/\<city\>/$city/g;
  		$notice =~ s/\<postcode\>/$postcode/g;
! 		$notice =~ s/\<date\>/$date/g;
! 
! 		$sth2->execute($borrnum);
! 		my $titles="";
! 		my ($title, $author, $barcode);
! 		while (($title, $author, $barcode) = $sth2->fetchrow){
! 			$titles .= "		".($title?$title:"")."	".($author?$author:"")."	".($barcode?$barcode:"")."\n";
! 		}
! 		$notice =~ s/\<titles\>/$titles/g;
! 		$sth2->finish;
  	# if not using e-mail notices, comment out the following lines
  		if ($email) {   # or you might check for borrowers.preferredcont 
***************
*** 136,140 ****
  		$notice .= <ODUES>;
  		if ($nomail) {
! 			print "TO => $email\n";
  			print "FROM => $from\n";
  			print "SUBJECT => Koha overdue\n";
--- 149,153 ----
  		$notice .= <ODUES>;
  		if ($nomail) {
! 			print "TO => $email\n" if $email;
  			print "FROM => $from\n";
  			print "SUBJECT => Koha overdue\n";




From tipaul at users.sourceforge.net  Mon Jun 20 16:33:35 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:33:35 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-dictionary.pl,1.1,1.2 opac-detail.pl,1.19,1.20 opac-main.pl,1.16,1.17 opac-search.pl,1.29,1.30 opac-sendbasket.pl,1.6,1.7 opac-serial-issues.pl,1.3,1.4 opac-user.pl,1.16,1.17
Message-ID: <E1DkNLD-0003sh-Lt@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14868/opac

Modified Files:
	opac-detail.pl opac-main.pl opac-search.pl opac-sendbasket.pl 
	opac-serial-issues.pl opac-user.pl 
Added Files:
	opac-dictionary.pl 
Log Message:
synch'ing 2.2 and head


Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** opac-detail.pl	17 Jun 2005 13:44:25 -0000	1.19
--- opac-detail.pl	20 Jun 2005 14:33:32 -0000	1.20
***************
*** 30,33 ****
--- 30,34 ----
  my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
  my ($websitecount, @websites)             = &getwebsites($biblionumber);
+ my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
  
  $dat->{'count'}=@items;
***************
*** 85,89 ****
  				SITE_RESULTS => $sitearray,
  				subscriptionsnumber => $subscriptionsnumber,
- 				subscriptions => \@subs,
  			     LibraryName => C4::Context->preference("LibraryName"),
  				suggestion => C4::Context->preference("suggestion"),
--- 86,89 ----
***************
*** 124,125 ****
--- 124,127 ----
  #output_html_with_http_headers $query, $cookie, $template->output;
  
+ output_html_with_http_headers $query, $cookie, $template->output;
+ 

Index: opac-main.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-main.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** opac-main.pl	4 Oct 2004 20:20:25 -0000	1.16
--- opac-main.pl	20 Jun 2005 14:33:32 -0000	1.17
***************
*** 53,56 ****
--- 53,57 ----
  				languages => \@options,
  				textmessaging => $borrower->{textmessaging},
+ 				opaclargeimage => C4::Context->preference("opaclargeimage"),
  );
  output_html_with_http_headers $input, $cookie, $template->output;

Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** opac-search.pl	3 Jun 2005 04:15:29 -0000	1.29
--- opac-search.pl	20 Jun 2005 14:33:32 -0000	1.30
***************
*** 9,13 ****
  use C4::Database;
  use HTML::Template;
! use C4::SearchMarc;
  use C4::Acquisition;
  use C4::Biblio;
--- 9,13 ----
  use C4::Database;
  use HTML::Template;
! use C4::SearchMarcTest;
  use C4::Acquisition;
  use C4::Biblio;
***************
*** 412,416 ****
  }
  # ADDED BY JF
! if ($totalresults == 1){
      # if its a barcode search by definition we will only have one result.
      # And if we have a result
--- 412,416 ----
  }
  # ADDED BY JF
! #if ($totalresults == 1){
      # if its a barcode search by definition we will only have one result.
      # And if we have a result

Index: opac-sendbasket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-sendbasket.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** opac-sendbasket.pl	20 Jun 2005 01:01:06 -0000	1.6
--- opac-sendbasket.pl	20 Jun 2005 14:33:32 -0000	1.7
***************
*** 8,11 ****
--- 8,12 ----
  use C4::Context;
  use C4::Search;
+ use C4::Biblio;
  use C4::Auth;
  use C4::Interface::CGI::Output;
***************
*** 15,106 ****
  my $query = new CGI;
  
! my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
!     {
!         template_name   => "opac-sendbasketform.tmpl",
!         query           => $query,
!         type            => "opac",
!         authnotrequired => 1,
!         flagsrequired   => { borrow => 1 },
!     }
! );
! 
! my $bib_list     = $query->param('bib_list');
! my $email_add    = $query->param('email_add');
! my $email_sender = $query->param('email_sender');
  
- my $dbh = C4::Context->dbh();
  
  if ($email_add) {
!     my $email_from = C4::Context->preference('KohaAdminEmailAddress');
  
!     my %mail = (
!         To   => $email_add,
!         From => $email_from
!     );
! 
!     my ( $template2, $borrowernumber, $cookie ) = get_template_and_user(
!         {
!             template_name   => "opac-sendbasket.tmpl",
!             query           => $query,
!             type            => "opac",
!             authnotrequired => 1,
!             flagsrequired   => { borrow => 1 },
!         }
!     );
! 
!     my @bibs = split ( /\//, $bib_list );
!     my @results;
!     my $iso2709;
!     foreach my $biblionumber (@bibs) {
!         $template2->param( biblionumber => $biblionumber );
! 
!         my $dat = &bibdata($biblionumber);
!         my ( $authorcount, $addauthor ) = &addauthor($biblionumber);
!         my @items = &ItemInfo( undef, $biblionumber, 'opac' );
! 
!         $dat->{'additional'} = $addauthor->[0]->{'author'};
!         for ( my $i = 1 ; $i < $authorcount ; $i++ ) {
!             $dat->{'additional'} .= "|" . $addauthor->[$i]->{'author'};
!         }
! 
!         $dat->{'biblionumber'} = $biblionumber;
!         $dat->{ITEM_RESULTS} = \@items;
!         my $record = MARCgetbiblio( $dbh, $biblionumber );
!         $iso2709 .= $record->as_usmarc();
! 
!         push ( @results, $dat );
!     }
! 
!     my $resultsarray = \@results;
!     $template2->param(
!         BIBLIO_RESULTS => $resultsarray,
!         email_sender   => $email_sender
!     );
! 
!     # Getting template result
!     my $template_res = $template2->output();
! 
!     # Analysing information and getting mail properties
!     if ( $template_res =~ /<SUBJECT>\n(.*)\n<END_SUBJECT>/s ) {
!         $mail{'subject'} = $1;
!     }
!     else { $mail{'subject'} = "no subject"; }
! 
!     my $email_header = "";
!     if ( $template_res =~ /<HEADER>\n(.*)\n<END_HEADER>/s ) {
!         $email_header = $1;
!     }
! 
!     my $email_file = "basket.txt";
!     if ( $template_res =~ /<FILENAME>\n(.*)\n<END_FILENAME>/s ) {
!         $email_file = $1;
!     }
! 
!     if ( $template_res =~ /<MESSAGE>\n(.*)\n<END_MESSAGE>/s ) {
!         $mail{'body'} = $1;
!     }
  
!     my $boundary = "====" . time() . "====";
!     $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
  
      $email_header = encode_qp($email_header);
--- 16,73 ----
  my $query = new CGI;
  
! my ($template, $borrowernumber, $cookie) 
!     = get_template_and_user({template_name => "opac-sendbasketform.tmpl",
! 			     query => $query,
! 			     type => "opac",
! 			     authnotrequired => 1,
! 			     flagsrequired => {borrow => 1},
! 			 });
! 
! my $bib_list=$query->param('bib_list');
! my $email_add=$query->param('email_add');
! my $email_sender=$query->param('email_sender');
! my $dbh=C4::Context->dbh;
! my $sth;
! $sth=$dbh->prepare("select bibid from marc_biblio where biblionumber=? order by bibid");
  
  
  if ($email_add) {
! 	my $email_from = C4::Context->preference('KohaAdminEmailAddress');
! 
! 	my %mail = (	 To      => $email_add,
! 						 From    => $email_from);
  
! 	my ($template2, $borrowernumber, $cookie) 
!     = get_template_and_user({template_name => "opac-sendbasket.tmpl",
! 			     query => $query,
! 			     type => "opac",
! 			     authnotrequired => 1,
! 			     flagsrequired => {borrow => 1},
! 			 });
! 
! 	my @bibs = split(/\//, $bib_list);
! 	my @results;
! 	my $iso2709;
! 	foreach my $biblionumber (@bibs) {
! 		$template2->param(biblionumber => $biblionumber);
! 
! 		my $dat = &bibdata($biblionumber);
! 		my ($authorcount, $addauthor) = &addauthor($biblionumber);
! 		my @items                     = &ItemInfo(undef, $biblionumber, 'opac');
! 
! 		$dat->{'additional'}=$addauthor->[0]->{'author'};
! 		for (my $i = 1; $i < $authorcount; $i++) {
! 			$dat->{'additional'} .= "|" . $addauthor->[$i]->{'author'};
! 		}
! 
! 		$dat->{'biblionumber'} = $biblionumber;
! 		$dat->{ITEM_RESULTS} = \@items;
! 		$sth->execute($biblionumber);
! 		my ($bibid) = $sth->fetchrow;
! 		my $record = MARCgetbiblio($dbh,$bibid);
! 		$iso2709 .= $record->as_usmarc();
  
! 		push (@results, $dat);
! 	}
  
      $email_header = encode_qp($email_header);
***************
*** 108,113 ****
      $boundary = "--" . $boundary;
  
!     # Writing mail
!     $mail{body} = <<END_OF_BODY;
  $boundary
  Content-Type: text/plain; charset="iso-8859-1"
--- 75,129 ----
      $boundary = "--" . $boundary;
  
! 	# Analysing information and getting mail properties
! 	if ($template_res =~ /<SUBJECT>\n(.*)\n<END_SUBJECT>/s) { $mail{'subject'} = $1; }
! 	else { $mail{'subject'} = "no subject"; }
! 
! 	my $email_header = "";
! 	if ($template_res =~ /<HEADER>\n(.*)\n<END_HEADER>/s) { $email_header = $1; }
! 
! 	my $email_file = "basket.txt";
! 	if ($template_res =~ /<FILENAME>\n(.*)\n<END_FILENAME>/s) { $email_file = $1; }
! 
! 	if ($template_res =~ /<MESSAGE>\n(.*)\n<END_MESSAGE>/s) { $mail{'body'} = $1; }
! 
! 	my $boundary = "====" . time() . "====";
! # 	$mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
! # 
! # 	$email_header = encode_qp($email_header);
! # 
! # 	$boundary = "--".$boundary;
! # 
! # 	# Writing mail
! # 	$mail{body} =
! 	$mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
! 
! 	my $message = encode_qp( "" );
! 
! # $file = $^X; # This is the perl executable
! # 
! # open (F, $file) or die "Cannot read $file: $!";
! # binmode F; undef $/;
! $mail{body} = encode_base64($iso2709);
! # close F;
! 
! $boundary = '--'.$boundary;
! $mail{body} = <<END_OF_BODY;
! $boundary
! Content-Type: text/plain; charset="iso-8859-1"
! Content-Transfer-Encoding: quoted-printable
! 
! $message
! $boundary
! Content-Type: application/octet-stream; name="basket"
! Content-Transfer-Encoding: base64
! Content-Disposition: attachment; filename="basket"
! 
! $mail{body}
! $boundary--
! END_OF_BODY
! 
! 
! 
! 	 <<END_OF_BODY;
  $boundary
  Content-Type: text/plain; charset="iso-8859-1"
***************
*** 121,148 ****
  END_OF_BODY
  
!     # Sending mail
!     if ( sendmail %mail ) {
! 
!         # do something if it works....
!         warn "Mail sent ok\n";
!         $template->param( SENT      => "1" );
!         $template->param( email_add => $email_add );
!     }
!     else {
! 
!         # do something if it doesnt work....
!         warn "Error sending mail: $Mail::Sendmail::error \n";
!         warn "$mail{'body'}";
!     }
  
      output_html_with_http_headers $query, $cookie, $template->output;
  }
  else {
!     $template->param( bib_list => $bib_list );
!     $template->param(
!         url            => "/cgi-bin/koha/opac-sendbasket.pl",
!         suggestion     => C4::Context->preference("suggestion"),
!         virtualshelves => C4::Context->preference("virtualshelves"),
!     );
!     output_html_with_http_headers $query, $cookie, $template->output;
  }
--- 137,178 ----
  END_OF_BODY
  
! $mail{attachment} = $iso2709;
! #	$mail{body} = <<END_OF_BODY;
! #$boundary
! #Content-Type: text/plain; charset="iso-8859-1"
! #Content-Transfer-Encoding: quoted-printable
! #
! #$email_header
! #
! #$boundary
! #Content-Type: text/plain; name="$email_file"
! #Content-Transfer-Encoding: quoted-printable
! #Content-Disposition: attachment; filename="$email_file"
! #
! #$mail{'body'}
! #
! #$boundary--
! #END_OF_BODY
! 
! 	# Sending mail
! 	if (sendmail %mail) {
! 	# do something if it works....
! #		warn " ".$mail{body};
! #		warn " ".$mail{PJ};
! 		$template->param(SENT => "1");
! 		$template->param(email_add => $email_add);
! 	} else {
! 		# do something if it doesnt work....
! 		warn "Error sending mail: $Mail::Sendmail::error \n";
! 	}
  
      output_html_with_http_headers $query, $cookie, $template->output;
  }
  else {
! 	$template->param(bib_list => $bib_list);
! 	$template->param(url => "/cgi-bin/koha/opac-sendbasket.pl",
! 	suggestion => C4::Context->preference("suggestion"),
! 	virtualshelves => C4::Context->preference("virtualshelves"),
! 	);
! 	output_html_with_http_headers $query, $cookie, $template->output;
  }

Index: opac-serial-issues.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-serial-issues.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-serial-issues.pl	4 May 2005 09:02:38 -0000	1.3
--- opac-serial-issues.pl	20 Jun 2005 14:33:32 -0000	1.4
***************
*** 15,41 ****
  my $op = $query->param('op');
  my $dbh = C4::Context->dbh;
  my $sth;
  # my $id;
  my ($template, $loggedinuser, $cookie);
  my $biblionumber = $query->param('biblionumber');
! my $subscriptions = get_subscription_list_from_biblionumber($biblionumber);
! 
! ($template, $loggedinuser, $cookie)
! = get_template_and_user({template_name => "opac-serial-issues.tmpl",
! 				query => $query,
! 				type => "opac",
! 				authnotrequired => 1,
! 				debug => 1,
! 				});
! 
! # replace CR by <br> in librarian note
! # $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
! 
! $template->param(
! 	biblionumber => $query->param('biblionumber'),
! 	subscription_LOOP => $subscriptions
! 	suggestion => C4::Context->preference("suggestion"),
! 	virtualshelves => C4::Context->preference("virtualshelves"),
! 	);
  
  output_html_with_http_headers $query, $cookie, $template->output;
--- 15,77 ----
  my $op = $query->param('op');
  my $dbh = C4::Context->dbh;
+ my $selectview = $query->param('selectview');
+ $selectview = C4::Context->preference("SubscriptionHistory") unless $selectview;
+ 
  my $sth;
  # my $id;
  my ($template, $loggedinuser, $cookie);
  my $biblionumber = $query->param('biblionumber');
! if ($selectview eq "full"){
! 	my $subscriptions = get_full_subscription_list_from_biblionumber($biblionumber);
! 	
! 	my $title = $subscriptions->[0]{bibliotitle};
! # 	warn "title ".$title;
! 	my $yearmin=$subscriptions->[0]{year};
! # 	warn "yearmin ".$yearmin;
! 	my $yearmax=$subscriptions->[scalar(@$subscriptions)-1]{year};
! # 	warn "yearmax ".$yearmax;
! 	
! 	
! 	($template, $loggedinuser, $cookie)
! 	= get_template_and_user({template_name => "opac-full-serial-issues.tmpl",
! 					query => $query,
! 					type => "opac",
! 					authnotrequired => 1,
! 					debug => 1,
! 					});
! 	
! 	# replace CR by <br> in librarian note
! 	# $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
! 	
! 	$template->param(
! 		biblionumber => $query->param('biblionumber'),
! 		years => $subscriptions,
! 		yearmin => $yearmin,
! 		yearmax =>$yearmax,
! 		bibliotitle => $title,
! 		suggestion => C4::Context->preference("suggestion"),
! 		virtualshelves => C4::Context->preference("virtualshelves"),
! 		);
  
+ } else {
+ 	my $subscriptions = get_subscription_list_from_biblionumber($biblionumber);
+ 	
+ 	($template, $loggedinuser, $cookie)
+ 	= get_template_and_user({template_name => "opac-serial-issues.tmpl",
+ 					query => $query,
+ 					type => "opac",
+ 					authnotrequired => 1,
+ 					debug => 1,
+ 					});
+ 	
+ 	# replace CR by <br> in librarian note
+ 	# $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
+ 	
+ 	$template->param(
+ 		biblionumber => $query->param('biblionumber'),
+ 		subscription_LOOP => $subscriptions,
+ 		suggestion => C4::Context->preference("suggestion"),
+ 		virtualshelves => C4::Context->preference("virtualshelves"),
+ 		);
+ }
  output_html_with_http_headers $query, $cookie, $template->output;

Index: opac-user.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-user.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** opac-user.pl	4 May 2005 09:02:38 -0000	1.16
--- opac-user.pl	20 Jun 2005 14:33:32 -0000	1.17
***************
*** 137,143 ****
  $template->param(WAITING => \@waiting);
  $template->param(waiting_count => $wcount,
! 			     LibraryName => C4::Context->preference("LibraryName"),
! 					suggestion => C4::Context->preference("suggestion"),
! 					virtualshelves => C4::Context->preference("virtualshelves"),
  );
  
--- 137,144 ----
  $template->param(WAITING => \@waiting);
  $template->param(waiting_count => $wcount,
! 				LibraryName => C4::Context->preference("LibraryName"),
! 				suggestion => C4::Context->preference("suggestion"),
! 				virtualshelves => C4::Context->preference("virtualshelves"),
! 				textmessaging => $borr->{textmessaging},
  );
  




From tipaul at users.sourceforge.net  Mon Jun 20 16:34:47 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:34:47 -0700
Subject: [Koha-cvs] CVS: koha/reports borrowers_out.pl,1.2,1.3
Message-ID: <E1DkNMN-00046z-Mw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/reports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15651/reports

Modified Files:
	borrowers_out.pl 
Log Message:
synch'ing 2.2 and head

Index: borrowers_out.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/borrowers_out.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** borrowers_out.pl	4 May 2005 09:02:38 -0000	1.2
--- borrowers_out.pl	20 Jun 2005 14:34:45 -0000	1.3
***************
*** 160,164 ****
  #
  	my @loopfilter;
! 	for (my $i=0;$i<=6;$i++) {
  		my %cell;
  		if ( @$filters[$i] ) {
--- 160,164 ----
  #
  	my @loopfilter;
! 	for (my $i=0;$i<=2;$i++) {
  		my %cell;
  		if ( @$filters[$i] ) {
***************
*** 168,171 ****
--- 168,172 ----
  			$cell{filter} .= @$filters[$i];
  			$cell{crit} .="Bor Cat" if ($i==0);
+ 			$cell{crit} .="Without issues since" if ($i==1);
  			push @loopfilter, \%cell;
  		}
***************
*** 229,239 ****
  	my $strcalc ;
  	
! # Processing average loanperiods
  	$strcalc .= "SELECT CONCAT( borrowers.surname , \"\\t\",borrowers.firstname, \"\\t\", borrowers.cardnumber)";
  	$strcalc .= " , $colfield " if ($colfield);
! 	$strcalc .= " FROM borrowers LEFT JOIN issues ON  issues.borrowernumber=borrowers.borrowernumber WHERE issues.borrowernumber is null";
  	@$filters[0]=~ s/\*/%/g if (@$filters[0]);
  	$strcalc .= " AND borrowers.categorycode like '" . @$filters[0] ."'" if ( @$filters[0] );
! 	
  	$strcalc .= " group by borrowers.borrowernumber";
  	$strcalc .= ", $colfield" if ($column);
--- 230,253 ----
  	my $strcalc ;
  	
! # Processing calculation
  	$strcalc .= "SELECT CONCAT( borrowers.surname , \"\\t\",borrowers.firstname, \"\\t\", borrowers.cardnumber)";
  	$strcalc .= " , $colfield " if ($colfield);
! 	$strcalc .= " FROM borrowers ";
! 	$strcalc .= "WHERE 1 ";
  	@$filters[0]=~ s/\*/%/g if (@$filters[0]);
  	$strcalc .= " AND borrowers.categorycode like '" . @$filters[0] ."'" if ( @$filters[0] );
! 	if (@$filters[1]){
! 		my $queryfilter = $dbh->prepare("SELECT DISTINCT borrowernumber FROM issues where issues.timestamp>?");
! 		$queryfilter->execute(@$filters[1]);
! 		while (my ($bornum)=$queryfilter->fetchrow){
! 			$strcalc .= " AND borrowers.borrowernumber <> $bornum ";
! 		}
! 	} else {
! 		my $queryfilter = $dbh->prepare("SELECT DISTINCT borrowernumber FROM issues ");
! 		$queryfilter->execute;
! 		while (my ($bornum)=$queryfilter->fetchrow){
! 			$strcalc .= " AND borrowers.borrowernumber <> $bornum ";
! 		}
! 	}
  	$strcalc .= " group by borrowers.borrowernumber";
  	$strcalc .= ", $colfield" if ($column);




From tipaul at users.sourceforge.net  Mon Jun 20 16:36:47 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:36:47 -0700
Subject: [Koha-cvs] CVS: koha/updater updatedatabase,1.104,1.105
Message-ID: <E1DkNOJ-0004MS-Cq@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/updater
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16715/updater

Modified Files:
	updatedatabase 
Log Message:
synch'ing 2.2 and head

Index: updatedatabase
===================================================================
RCS file: /cvsroot/koha/koha/updater/updatedatabase,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -r1.104 -r1.105
*** updatedatabase	1 Jun 2005 21:35:05 -0000	1.104
--- updatedatabase	20 Jun 2005 14:36:44 -0000	1.105
***************
*** 834,837 ****
--- 834,855 ----
          {
              uniquefieldrequired => 'variable',
+             variable            => 'opacsmallimage',
+             value               => '',
+ 	    forceupdate		=> { 'explanation' => 1,
+ 	    			     'type' => 1},
+             explanation         => 'Enter a complete URL to an image, will be on top/left instead of the Koha logo',
+ 	    type		=> 'free',
+         },
+         {
+             uniquefieldrequired => 'variable',
+             variable            => 'opaclargeimage',
+             value               => '',
+ 	    forceupdate		=> { 'explanation' => 1,
+ 	    			     'type' => 1},
+             explanation         => 'Enter a complete URL to an image, will be on the main page, instead of the Koha logo',
+ 	    type		=> 'free',
+         },
+         {
+             uniquefieldrequired => 'variable',
              variable            => 'delimiter',
              value               => ';',
***************
*** 863,866 ****
--- 881,904 ----
  	        options		=> ';|tabulation|,|/|\|#'
          },
+         {
+             uniquefieldrequired => 'variable',
+             variable            => 'SubscriptionHistory',
+             value               => ';',
+ 	        forceupdate		=> { 'explanation' => 1,
+ 	    			     'type' => 1,
+ 				     'options' => 1},
+             explanation         => 'Define the information level for serials history in OPAC',
+ 	        type		=> 'Choice',
+ 	        options		=> 'simplified|full'
+         },
+         {
+             uniquefieldrequired => 'variable',
+             variable            => 'hidelostitems',
+             value               => 'No',
+ 	    forceupdate		=> { 'explanation' => 1,
+ 	    			     'type' => 1},
+             explanation         => 'show or hide "lost" items in OPAC.',
+ 	    type		=> 'YesNo',
+         },
      ],
  
***************
*** 1448,1457 ****
  
  # $Log$
! # Revision 1.104  2005/06/01 21:35:05  genjimoto
! # New Feature: catalogsearch() has a new parameter, $sqlstring. A developer puts into it whatever they want to tack onto the end of the where statement. See usage in opac-search.pl
! #
! # Revision 1.103  2005/05/04 09:04:52  tipaul
  # synch'ing 2.2 and head
  #
  # Revision 1.100.2.2  2005/03/29 15:41:43  tipaul
  # * new permissions : management & tools. You now have 2 new permissions :
--- 1486,1501 ----
  
  # $Log$
! # Revision 1.105  2005/06/20 14:36:44  tipaul
  # synch'ing 2.2 and head
  #
+ # Revision 1.100.2.5  2005/06/06 15:23:36  tipaul
+ # adding a systempref to choose either to show or hide "lost" items. Note that "lost items" can be related to an authorised value list, so does not necessary mean "item definetly lost". Even here, some libraries want to see lost items, and some don't want. This parameter will make everybody happy !
+ #
+ # Revision 1.100.2.4  2005/06/06 14:15:55  tipaul
+ # adding 2 systemparameters to define an alternate image as logo in opac (the image on main page & on each top-left page)
+ #
+ # Revision 1.100.2.3  2005/06/02 21:05:34  hdl
+ # adding variable SubscriptionHistory
+ #
  # Revision 1.100.2.2  2005/03/29 15:41:43  tipaul
  # * new permissions : management & tools. You now have 2 new permissions :




From tipaul at users.sourceforge.net  Mon Jun 20 16:36:47 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:36:47 -0700
Subject: [Koha-cvs] CVS: koha/search.marc dictionary.pl,1.6,1.7
Message-ID: <E1DkNOJ-0004ML-02@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16715/search.marc

Modified Files:
	dictionary.pl 
Log Message:
synch'ing 2.2 and head

Index: dictionary.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.marc/dictionary.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** dictionary.pl	1 Jun 2005 12:51:02 -0000	1.6
--- dictionary.pl	20 Jun 2005 14:36:44 -0000	1.7
***************
*** 106,110 ****
  	}
  	$listtags =~s/,$/)/;
! 	$strsth .= $listtags." and marc_word.tagsubfield=marc_subfield_table.tag+marc_subfield_table.subfieldcode group by subfieldvalue ";
  # 	warn "search in biblio : ".$strsth;
  	my $value = uc($search[0]);
--- 106,110 ----
  	}
  	$listtags =~s/,$/)/;
! 	$strsth .= $listtags." and marc_word.tagsubfield=concat(marc_subfield_table.tag,marc_subfield_table.subfieldcode) group by subfieldvalue ";
  # 	warn "search in biblio : ".$strsth;
  	my $value = uc($search[0]);




From tipaul at users.sourceforge.net  Mon Jun 20 16:37:17 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:37:17 -0700
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_123i.pl,1.1,1.2 unimarc_field_123j.pl,1.1,1.2
Message-ID: <E1DkNOn-0004Q8-PA@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16867/value_builder

Modified Files:
	unimarc_field_123i.pl unimarc_field_123j.pl 
Log Message:
synch'ing 2.2 and head






From tipaul at users.sourceforge.net  Mon Jun 20 16:37:17 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:37:17 -0700
Subject: [Koha-cvs] CVS: koha/z3950/server zed-koha-server.pl,1.4,1.5
Message-ID: <E1DkNOn-0004QA-PJ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/z3950/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16867/z3950/server

Modified Files:
	zed-koha-server.pl 
Log Message:
synch'ing 2.2 and head

Index: zed-koha-server.pl
===================================================================
RCS file: /cvsroot/koha/koha/z3950/server/zed-koha-server.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** zed-koha-server.pl	3 Jun 2004 01:48:19 -0000	1.4
--- zed-koha-server.pl	20 Jun 2005 14:37:15 -0000	1.5
***************
*** 58,62 ****
  use C4::Biblio;
  use strict;
! my $dbh = C4::Context->dbh;
  my @bib_list;		## Stores the list of biblionumbers in a query 
  			## I should eventually move this to different scope
--- 58,62 ----
  use C4::Biblio;
  use strict;
! # my $dbh = C4::Context->dbh;
  my @bib_list;		## Stores the list of biblionumbers in a query 
  			## I should eventually move this to different scope
***************
*** 86,89 ****
--- 86,90 ----
  sub run_query {		## Run the query and store the biblionumbers: 
  	my ($sql_query, $query, $args) = @_;
+ 		my $dbh = C4::Context->dbh;
         	my $sth_get = $dbh->prepare("$sql_query");
  
***************
*** 145,149 ****
  		print "The query was:\n";        
  		print "$query\n";
! 		my $sql_query = "SELECT marc_biblio.bibid FROM marc_biblio RIGHT JOIN biblio ON marc_biblio.biblionumber = biblio.biblionumber WHERE biblio.isbn LIKE ?";
  		&run_query($sql_query, $query, $args);
  
--- 146,150 ----
  		print "The query was:\n";        
  		print "$query\n";
! 		my $sql_query = "SELECT marc_biblio.bibid FROM marc_biblio RIGHT JOIN biblioitems ON marc_biblio.biblionumber = biblioitems.biblionumber WHERE biblioitems.isbn LIKE ?";
  		&run_query($sql_query, $query, $args);
  
***************
*** 269,392 ****
          $offset -= 1;                   ## because $args->{OFFSET} 1 = record #1
          chomp (my $bibid = $bib_list[$offset]); ## Not sure about this
!                 ## print "the bibid is:$bibid\n";
!                 my $MARCRecord = &MARCgetbiblio($dbh,$bibid);
!                 my $recordstring=$MARCRecord->as_usmarc();
!                 ## print "here is my record: $recordstring\n";
! 
! 		## Troubleshooting:
! 		## use Data::Dumper;
! 		## Dumper $recordstring;
! 		## open (MARC, ">/root/marc.dump");
!                 ## print MARC "$recordstring";
! 		## close MARC;
! 		
! 		## Convert from 852/4 to 952:
! 		## 942a --> 852a  Organization code
! 		## 952b --> 852b  Home branch
! 		## 942k --> 852h  Classification
! 		## 952p --> 852p  Barcode
! 
! my $record = MARC::Record->new_from_usmarc($recordstring);
!     my @fields942 = $record->field('942');
!     my $field842 = $fields942[0];
! 	my ($field952, $sub852a, $sub852k, $sub852b, $sub852p, $sub852h);
!        
! 
! ## while ( my $record = $batch->next() ) {
!   ##  my @fields942 = $record->field('942');
!   ##  my $field842 = $fields942[0];
!   ##     #grab first 942 (only need one, they are same for all items)
!   ##  my $sub852a = ($field842->subfield('a') || '');
!   ##  my $sub852h = ($field842->subfield('k') || '');
! 
!   ##  my @fields952 = $record->field('952');
!   ##  foreach my $field952 (@fields952) {   #get all 952s
!   ##      my $sub852b = ($field952->subfield('b') || '');
!   ##      my $sub852p = ($field952->subfield('p') || '');
! 
! 
! #grab first 942 (only need one, they are same for all items)
! 	unless (! $field952){
! 		$sub852a = ($field952->subfield('a') || '') ;
! }
! 	unless (! $field952){ #->subfield('k')) { 
! 		$sub852k = ($field952->subfield('k') || '') ;
! 
! }
! 
!     my @fields952 = $record->field('952');
!     foreach my $field952 (@fields952) {   #get all 952s
!         
!         unless (! $field952) { #->subfield('b')) { 
! 		$sub852b = ($field952->subfield('b') || '') ;
! } 
!  unless (! $field952) { #->subfield('p')) { 
! 		$sub852p = ($field952->subfield('p') || '') ;
! }
!      #make it one big happy family
!         my $new852 = MARC::Field->new(
!                                       852,'','',
!                                       'a' => $sub852a,
! 				      'b' => $sub852b,
!                                       'h' => $sub852h,
!                                       'p' => $sub852p,
!                                       );
!         $record->append_fields($new852);
! 
! }
! 
! my $recordstringdone = $record->as_usmarc();
! 
  		## Set the REP_FORM
! 		$args->{REP_FORM} = &Net::Z3950::OID::usmarc;
  		
  		## Return the record string to the client 
! 	        $args->{RECORD} = $recordstringdone;
  
  }
  
- # That's all folks!
- # 
- # OLD OLD OLD OLD
- 
- sub fetch_handler_old {
- 	my ($args) = @_;	
- 	# warn "in fetch_handler";	## troubleshooting
- 	my $offset = $args->{OFFSET};
- 	$offset -= 1;			## because $args->{OFFSET} 1 = record #1
- 	chomp (my $bibid = $bib_list[$offset]);	## Not sure about this
-         my $sql_query = "SELECT tag, subfieldcode, subfieldvalue FROM marc_subfield_table where bibid=?";
- 	my $sth_get = $dbh->prepare("$sql_query");
-         $sth_get->execute($bibid);
- 	
- 	## create a MARC::Record object 
-         my $rec = MARC::Record->new();
- 
- 	## create the fields
-         while (my @data=$sth_get->fetchrow_array) {
- 
-         	my $tag = $data[0];
-        		my $subfieldcode = $data[1];
-         	my $subfieldvalue = $data[2];
- 
-         	my $field = MARC::Field->new(
-                 	                          $tag,'','',
-                         	                  $subfieldcode => $subfieldvalue,
-                                 	    );
  
-  	       	$rec->append_fields($field);
- 		
- 		## build the marc string and put into $record         
-         	my $tmp_record = $rec->as_usmarc();
- 		my $reclen = length $tmp_record;
- 		my $baseaddr = "$reclen + dirlen";
- #		set_leader_lengths($reclen,$baseaddr);
- 		my $record = $rec->as_usmarc(); 	
- 		$args->{RECORD} = $record;
- 	}
- 
- }
- 
- 	
  ## This stuff doesn't work yet...I should include boolean searching someday
  ## though
--- 270,287 ----
          $offset -= 1;                   ## because $args->{OFFSET} 1 = record #1
          chomp (my $bibid = $bib_list[$offset]); ## Not sure about this
! 				## print "the bibid is:$bibid\n";
! 				my $dbh = C4::Context->dbh;
! 				my $MARCRecord = &MARCgetbiblio($dbh,$bibid);
! 				$MARCRecord->leader('     nac  22     1u 4500');
  		## Set the REP_FORM
! 		$args->{REP_FORM} = &Net::Z3950::OID::unimarc;
  		
  		## Return the record string to the client 
! 			$args->{RECORD} = $MARCRecord->as_usmarc();
! # 	        $args->{RECORD} = $recordstringdone;
  
  }
  
  
  ## This stuff doesn't work yet...I should include boolean searching someday
  ## though




From tipaul at users.sourceforge.net  Mon Jun 20 16:37:53 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:37:53 -0700
Subject: [Koha-cvs] CVS: koha/z3950 processz3950queue,1.14,1.15
Message-ID: <E1DkNPN-0004aL-VM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/z3950
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17418/z3950

Modified Files:
	processz3950queue 
Log Message:
synch'ing 2.2 and head

Index: processz3950queue
===================================================================
RCS file: /cvsroot/koha/koha/z3950/processz3950queue,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** processz3950queue	4 May 2005 09:04:52 -0000	1.14
--- processz3950queue	20 Jun 2005 14:37:51 -0000	1.15
***************
*** 281,292 ****
  									for ($i=1; $i<=(($numresults<80) ? ($numresults) : (80)); $i++) {
  										my $rec=$rs->record($i);
!  										my $marcdata;
! 										# use render() or rawdata() depending on the type of the returned record
! 										if (ref($rec) eq "Net::Z3950::Record::USMARC") {
! 											$marcdata = $rec->rawdata();
! 										}
! 										if (ref($rec) eq "Net::Z3950::Record::UNIMARC") {
! 											$marcdata = $rec->rawdata();
! 										}
  										$globalencoding = ref($rec);
   										$result.=$marcdata;
--- 281,285 ----
  									for ($i=1; $i<=(($numresults<80) ? ($numresults) : (80)); $i++) {
  										my $rec=$rs->record($i);
!  										my $marcdata = $rec->rawdata();
  										$globalencoding = ref($rec);
   										$result.=$marcdata;




From tipaul at users.sourceforge.net  Mon Jun 20 16:37:55 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:37:55 -0700
Subject: [Koha-cvs] CVS: koha help.pl,1.1,1.2 mainpage.pl,1.9,1.10 MARCdetail.pl,1.27,1.28
Message-ID: <E1DkNPP-0004aj-6E@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17418

Modified Files:
	help.pl mainpage.pl MARCdetail.pl 
Log Message:
synch'ing 2.2 and head

Index: help.pl
===================================================================
RCS file: /cvsroot/koha/koha/help.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** help.pl	3 Jun 2004 10:22:59 -0000	1.1
--- help.pl	20 Jun 2005 14:37:51 -0000	1.2
***************
*** 30,34 ****
  	unless (-e "$htdocs/$theme/$lang/$tmplbase") {
  		$tmplbase="help/nohelp.tmpl";
! 		my ($theme, $lang) = themelanguage($htdocs, $tmplbase, "intranet");
  	}
  	my $template = HTML::Template->new(filename      => "$htdocs/$theme/$lang/$tmplbase",
--- 30,34 ----
  	unless (-e "$htdocs/$theme/$lang/$tmplbase") {
  		$tmplbase="help/nohelp.tmpl";
! 		($theme, $lang) = themelanguage($htdocs, $tmplbase, "intranet");
  	}
  	my $template = HTML::Template->new(filename      => "$htdocs/$theme/$lang/$tmplbase",

Index: mainpage.pl
===================================================================
RCS file: /cvsroot/koha/koha/mainpage.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** mainpage.pl	22 Dec 2003 14:54:53 -0000	1.9
--- mainpage.pl	20 Jun 2005 14:37:52 -0000	1.10
***************
*** 8,13 ****
--- 8,24 ----
  use CGI;
  use C4::Auth;
+ use C4::AuthoritiesMarc;
+ use C4::Koha;
  
  my $query = new CGI;
+ my $authtypes = getauthtypes;
+ my @authtypesloop;
+ foreach my $thisauthtype (sort { $authtypes->{$a} <=> $authtypes->{$b} } keys %$authtypes) {
+ 	my %row =(value => $thisauthtype,
+ 				authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
+ 			);
+ 	push @authtypesloop, \%row;
+ }
+ 
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "intranet-main.tmpl",
***************
*** 25,28 ****
--- 36,40 ----
  my $marc_p = C4::Context->boolean_preference("marc");
  $template->param(NOTMARC => !$marc_p);
+ $template->param(authtypesloop => \@authtypesloop);
  
  output_html_with_http_headers $query, $cookie, $template->output;

Index: MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/MARCdetail.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** MARCdetail.pl	15 Jun 2005 16:09:44 -0000	1.27
--- MARCdetail.pl	20 Jun 2005 14:37:52 -0000	1.28
***************
*** 66,74 ****
  my $biblionumber=$query->param('bib');
  my $bibid = $query->param('bibid');
  my $popup = $query->param('popup'); # if set to 1, then don't insert links, it's just to show the biblio
  
  $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber) unless $bibid;
  $biblionumber = &MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid) unless $biblionumber;
! my $itemtype = &MARCfind_frameworkcode($dbh,$bibid);
  my $tagslib = &MARCgettagslib($dbh,1,$itemtype);
  
--- 66,78 ----
  my $biblionumber=$query->param('bib');
  my $bibid = $query->param('bibid');
+ my $itemtype = $query->param('frameworkcode');
  my $popup = $query->param('popup'); # if set to 1, then don't insert links, it's just to show the biblio
  
  $bibid = &MARCfind_MARCbibid_from_oldbiblionumber($dbh,$biblionumber) unless $bibid;
  $biblionumber = &MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid) unless $biblionumber;
! $itemtype = &MARCfind_frameworkcode($dbh,$bibid) if not ($itemtype);
! $itemtype = '' if ($itemtype eq 'Default');
! warn "itemtype :".$itemtype;
! 
  my $tagslib = &MARCgettagslib($dbh,1,$itemtype);
  
***************
*** 84,87 ****
--- 88,115 ----
  			     });
  
+ #Getting the list of all frameworks
+ my $queryfwk =$dbh->prepare("select frameworktext, frameworkcode from biblio_framework");
+ $queryfwk->execute;
+ my %select_fwk;
+ my @select_fwk;
+ my $curfwk;
+ push @select_fwk,"Default";
+ $select_fwk{"Default"} = "Default";
+ while (my ($description, $fwk) =$queryfwk->fetchrow) {
+ 	push @select_fwk, $fwk;
+ 	$select_fwk{$fwk} = $description;
+ }
+ $curfwk=$itemtype;
+ warn "current fwk :".$curfwk ;
+ my $framework=CGI::scrolling_list( -name     => 'Frameworks',
+ 			-id => 'Frameworks',
+ 			-default => $curfwk,
+ 			-OnChange => 'Changefwk(this);',
+ 			-values   => \@select_fwk,
+ 			-labels   => \%select_fwk,
+ 			-size     => 1,
+ 			-multiple => 0 );
+ 
+ $template->param( framework => $framework);
  # fill arrays
  my @loop_data =();




From tipaul at users.sourceforge.net  Mon Jun 20 16:39:15 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 20 Jun 2005 07:39:15 -0700
Subject: [Koha-cvs] CVS: koha pay.pl,1.11,1.12 search.pl,1.35,1.36
Message-ID: <E1DkNQh-0004lu-00@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18131

Modified Files:
	pay.pl search.pl 
Log Message:
synch'ing 2.2 and head

Index: pay.pl
===================================================================
RCS file: /cvsroot/koha/koha/pay.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** pay.pl	1 Mar 2005 13:40:47 -0000	1.11
--- pay.pl	20 Jun 2005 14:39:01 -0000	1.12
***************
*** 56,60 ****
  my $check=0;
  for (my $i=0;$i<@names;$i++){
! 	my$temp=$input->param($names[$i]);
  	if ($temp eq 'wo'){
  		$inp{$names[$i]}=$temp;
--- 56,60 ----
  my $check=0;
  for (my $i=0;$i<@names;$i++){
! 	my $temp=$input->param($names[$i]);
  	if ($temp eq 'wo'){
  		$inp{$names[$i]}=$temp;
***************
*** 65,68 ****
--- 65,69 ----
  		$user=~ s/Foxton/F/i;
  		$user=~ s/Shannon/S/i;
+ 		# FIXME : using array +4, +5, +6 is dirty. Should use arrays for each accountline
  		my $amount=$input->param($names[$i+4]);
  		my $bornum=$input->param($names[$i+5]);
***************
*** 146,150 ****
  	}
  	$bornum=$input->param('bornum');
! 	print $input->redirect("/cgi-bin/koha/pay.pl?bornum=$bornum");
  }
  
--- 147,151 ----
  	}
  	$bornum=$input->param('bornum');
! 	print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$bornum");
  }
  

Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.pl,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** search.pl	7 Apr 2004 22:43:04 -0000	1.35
--- search.pl	20 Jun 2005 14:39:11 -0000	1.36
***************
*** 20,23 ****
--- 20,30 ----
  
  # $Log$
+ # Revision 1.36  2005/06/20 14:39:11  tipaul
+ # synch'ing 2.2 and head
+ #
+ # Revision 1.35.2.1  2005/05/27 10:02:50  hdl
+ # Bug Fixing : Using old search.pl with subjectitems In normal mode display.
+ # Problem : Changing Page doesn't work.
+ #
  # Revision 1.35  2004/04/07 22:43:04  rangi
  # Fix for bug 217
***************
*** 100,104 ****
  foreach my $term (qw(keyword subject author illustrator itemnumber
  		     isbn date-before class dewey branch title abstract
! 		     publisher ttype))
  {
  	my $value = $query->param($term);
--- 107,111 ----
  foreach my $term (qw(keyword subject author illustrator itemnumber
  		     isbn date-before class dewey branch title abstract
! 		     publisher ttype subjectitems))
  {
  	my $value = $query->param($term);




From slef at users.sourceforge.net  Mon Jun 20 19:05:20 2005
From: slef at users.sourceforge.net (MJ Ray)
Date: Mon, 20 Jun 2005 10:05:20 -0700
Subject: [Koha-cvs] CVS: koha/z3950 z3950-daemon-launch.sh,1.4,1.5
Message-ID: <E1DkPi4-0008G5-Ae@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/z3950
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31711

Modified Files:
	z3950-daemon-launch.sh 
Log Message:
Removed -s from su call after Thomas D reports it breaks FreeBSD

Index: z3950-daemon-launch.sh
===================================================================
RCS file: /cvsroot/koha/koha/z3950/z3950-daemon-launch.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** z3950-daemon-launch.sh	5 Nov 2003 23:33:45 -0000	1.4
--- z3950-daemon-launch.sh	20 Jun 2005 17:05:17 -0000	1.5
***************
*** 33,37 ****
  fi
  
! su -s /bin/sh -c $KohaZ3950Shell - $RunAsUser &
  
  exit
--- 33,38 ----
  fi
  
! #MJR: removed -s option, as we have a #! at the start of z3950-daemon-shell.sh
! su -c $KohaZ3950Shell - $RunAsUser &
  
  exit
***************
*** 39,42 ****
--- 40,46 ----
  #--------------
  # $Log$
+ # Revision 1.5  2005/06/20 17:05:17  slef
+ # Removed -s from su call after Thomas D reports it breaks FreeBSD
+ #
  # Revision 1.4  2003/11/05 23:33:45  slef
  # Now figures out what directory the scripts are in




From hdl at users.sourceforge.net  Tue Jun 21 09:39:23 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 21 Jun 2005 00:39:23 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members member.tmpl,1.16,1.17 member-quicksearch-results.tmpl,1.2,1.3
Message-ID: <E1DkdLv-0006BO-4R@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	member.tmpl member-quicksearch-results.tmpl 
Log Message:
Displaying line counter 

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** member.tmpl	20 Jun 2005 10:14:12 -0000	1.16
--- member.tmpl	21 Jun 2005 07:39:20 -0000	1.17
***************
*** 22,25 ****
--- 22,26 ----
  	<table>
  		<tr>
+ 			<th>&nbsp;</th>
  			<th>Card</th>
  			<th>Surname</th>
***************
*** 37,40 ****
--- 38,42 ----
  				<tr bgcolor="white">
  			<!-- /TMPL_IF -->
+ 				<td><!-- TMPL_VAR NAME="count" --></td>
  				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
  				<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" --></a></td>

Index: member-quicksearch-results.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** member-quicksearch-results.tmpl	20 Jun 2005 10:14:12 -0000	1.2
--- member-quicksearch-results.tmpl	21 Jun 2005 07:39:20 -0000	1.3
***************
*** 21,25 ****
  				<tr bgcolor="white">
  			<!-- /TMPL_IF -->
! 				<td><form action="member-search-results.pl" method="get"><input type="button" class="button" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','request','member'); return false;" /></form></td>
  				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
  				<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" --></a></td>
--- 21,25 ----
  				<tr bgcolor="white">
  			<!-- /TMPL_IF -->
! 				<td><!-- TMPL_VAR NAME="count" --><form action="member-search-results.pl" method="get"><input type="button" class="button" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','request','member'); return false;" /></form></td>
  				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
  				<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" --></a></td>




From hdl at users.sourceforge.net  Tue Jun 21 09:42:26 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 21 Jun 2005 00:42:26 -0700
Subject: [Koha-cvs] CVS: koha/members member.pl,1.6,1.7
Message-ID: <E1DkdOs-0006TL-Ee@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24852/members

Modified Files:
	member.pl 
Log Message:
Adding countlines

Index: member.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/member.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** member.pl	20 Jun 2005 10:14:12 -0000	1.6
--- member.pl	21 Jun 2005 07:42:24 -0000	1.7
***************
*** 90,93 ****
--- 90,94 ----
    my %row = (
    	background => $background,
+ 		count => $i + 1,
          borrowernumber => $results->[$i]{'borrowernumber'},
          cardnumber => $results->[$i]{'cardnumber'},




From hdl at users.sourceforge.net  Tue Jun 21 12:09:41 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 21 Jun 2005 03:09:41 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui histsearch.tmpl,1.4,1.5
Message-ID: <E1DkfhN-0000Ec-Lr@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	histsearch.tmpl 
Log Message:
Adding line counter

Index: histsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** histsearch.tmpl	20 Jun 2005 14:13:22 -0000	1.4
--- histsearch.tmpl	21 Jun 2005 10:09:39 -0000	1.5
***************
*** 109,113 ****
  			<tr>
  				<td>
! 					&nbsp;
  				</td>
  				<td>
--- 109,113 ----
  			<tr>
  				<td>
! 					<!-- TMPL_VAR Name="count"-->
  				</td>
  				<td>




From tipaul at users.sourceforge.net  Tue Jun 21 16:50:30 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 21 Jun 2005 07:50:30 -0700
Subject: [Koha-cvs] CVS: koha/authorities auth_finder.pl,1.5.2.2,1.5.2.3
Message-ID: <E1Dkk58-0004Ia-8C@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16360/authorities

Modified Files:
      Tag: rel_2_2
	auth_finder.pl 
Log Message:
bugfix for next/previous and number links on result list, when long list of results

Index: auth_finder.pl
===================================================================
RCS file: /cvsroot/koha/koha/authorities/auth_finder.pl,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -C2 -r1.5.2.2 -r1.5.2.3
*** auth_finder.pl	7 Apr 2005 10:03:24 -0000	1.5.2.2
--- auth_finder.pl	21 Jun 2005 14:50:26 -0000	1.5.2.3
***************
*** 93,98 ****
  
  
  	for(my $i = 0 ; $i <= $#marclist ; $i++) {
! 		push @field_data, { term => "marclist", val=>$marclist[$i] };
  		push @field_data, { term => "and_or", val=>$and_or[$i] };
  		push @field_data, { term => "excluding", val=>$excluding[$i] };
--- 93,99 ----
  
  
+ 	my @marclist_ini = $query->param('marclist'); # get marclist again, as the previous one has been modified by catalogsearch (mainentry replaced by field name
  	for(my $i = 0 ; $i <= $#marclist ; $i++) {
! 		push @field_data, { term => "marclist", val=>$marclist_ini[$i] };
  		push @field_data, { term => "and_or", val=>$and_or[$i] };
  		push @field_data, { term => "excluding", val=>$excluding[$i] };
***************
*** 158,162 ****
  $template->param(authtypesloop => \@authtypesloop,
  				authtypecode => $authtypecode);
- warn "CAT : $authtypecode";
  
  # Print the page
--- 159,162 ----




From tipaul at users.sourceforge.net  Tue Jun 21 16:50:31 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 21 Jun 2005 07:50:31 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/authorities searchresultlist-auth.tmpl,1.5.2.2,1.5.2.3
Message-ID: <E1Dkk59-0004J3-QL@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	searchresultlist-auth.tmpl 
Log Message:
bugfix for next/previous and number links on result list, when long list of results

Index: searchresultlist-auth.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -C2 -r1.5.2.2 -r1.5.2.3
*** searchresultlist-auth.tmpl	18 Mar 2005 09:42:26 -0000	1.5.2.2
--- searchresultlist-auth.tmpl	21 Jun 2005 14:50:26 -0000	1.5.2.3
***************
*** 46,50 ****
  			<p>
  				<!-- TMPL_IF name="displayprev" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  						<img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
  					</a>
--- 46,50 ----
  			<p>
  				<!-- TMPL_IF name="displayprev" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  						<img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
  					</a>
***************
*** 54,63 ****
  						<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
  					<!-- TMPL_ELSE -->
! 						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  							<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
  					<!-- /TMPL_IF -->
  				<!-- /TMPL_LOOP -->
  				<!-- TMPL_IF name="displaynext" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  						<img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
  				<!-- /TMPL_IF -->
--- 54,63 ----
  						<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
  					<!-- TMPL_ELSE -->
! 						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  							<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
  					<!-- /TMPL_IF -->
  				<!-- /TMPL_LOOP -->
  				<!-- TMPL_IF name="displaynext" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  						<img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
  				<!-- /TMPL_IF -->




From tipaul at users.sourceforge.net  Tue Jun 21 15:34:29 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 21 Jun 2005 06:34:29 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marctagstructure.tmpl,1.27.2.6,1.27.2.7
Message-ID: <E1DkitZ-0003bE-8C@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	marctagstructure.tmpl 
Log Message:
template creators : REMEMBER that TRANSLATOR tool really HATES <!-- TMPL_IF --> inside a standard html tag, like :
<td <!-- tmpl_if name="x">class="x"<!-- /TMPL_IF -->> or
<input ... <!-- tmpl_if name="y" --> checked<!-- /TMPL_IF -->>

pls alway write :
<!-- TMPL_IF name="y" -->
	<input ... checked>
<!-- TMPL_ELSE -->
	<input ...>
<!-- /TMPL_IF -->

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.27.2.6
retrieving revision 1.27.2.7
diff -C2 -r1.27.2.6 -r1.27.2.7
*** marctagstructure.tmpl	1 Jun 2005 14:29:21 -0000	1.27.2.6
--- marctagstructure.tmpl	21 Jun 2005 13:34:26 -0000	1.27.2.7
***************
*** 125,130 ****
  		<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
  		<input type="submit" value="OK" class="button">
! 		<p>
! 		<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True" <!-- TMPL_IF Name="select_display"-->checked<!--/TMPL_IF -->  OnChange="javascript:document.f.submit()">
  		</p>
  	</form>
--- 125,133 ----
  		<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
  		<input type="submit" value="OK" class="button">
! 		<p><!-- TMPL_IF Name="select_display"-->
! 				<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True" checked OnChange="javascript:document.f.submit()">
! 			<!-- TMPL_ELSE -->
! 				<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True" OnChange="javascript:document.f.submit()">
! 			<!--/TMPL_IF --> 
  		</p>
  	</form>




From oleonard at users.sourceforge.net  Wed Jun 22 00:05:33 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 21 Jun 2005 15:05:33 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-detail.tmpl,1.1.2.4,1.1.2.5
Message-ID: <E1Dkqs9-0000Ci-2W@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-detail.tmpl 
Log Message:
Removing extra junk from WorldCat query string

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** opac-detail.tmpl	9 Jun 2005 19:21:10 -0000	1.1.2.4
--- opac-detail.tmpl	21 Jun 2005 22:05:30 -0000	1.1.2.5
***************
*** 22,27 ****
  <h4>Search for this title in:</h4>
  <ul><!-- Display for NPL // <li><a href="http://search3.webfeat.org/cgi-bin/webfeat.dll?Command=Search&BypassSessData=yes&noserial=1&Databases=wf_sirsdiscover,wf_elibrary2_e,wf_ebonline,wf_healthsourceconsumer,wf_masterfileprem,wf_newspapersource&wf_cat=0&Client_ID=oplin&wf_all_years=yes&wf_field1=wf_keyword&wf_term1=<!-- TMPL_VAR NAME="title" -->&rurl=http%3A//www.oplin.org/&wut_code=OH0156">Local Databases (OPLIN)</a></li> //Display for NPL -->
! <li><a href="http://www.google.com/search?q=<!-- TMPL_VAR NAME="title" -->%20england+site:worldcatlibraries.org">Other Libraries(WorldCat)</a></li>
! <li><a href="http://www.scholar.google.com/scholar?q=<!-- TMPL_VAR NAME="title" -->">Other Databases (Google Scholar)</a></li></ul></div>
  </div>
  <h2><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="subtitle" --> <span class="subtitle"><!-- TMPL_VAR NAME="subtitle" --></span><!-- /TMPL_IF --></h2>
--- 22,27 ----
  <h4>Search for this title in:</h4>
  <ul><!-- Display for NPL // <li><a href="http://search3.webfeat.org/cgi-bin/webfeat.dll?Command=Search&BypassSessData=yes&noserial=1&Databases=wf_sirsdiscover,wf_elibrary2_e,wf_ebonline,wf_healthsourceconsumer,wf_masterfileprem,wf_newspapersource&wf_cat=0&Client_ID=oplin&wf_all_years=yes&wf_field1=wf_keyword&wf_term1=<!-- TMPL_VAR NAME="title" -->&rurl=http%3A//www.oplin.org/&wut_code=OH0156">Local Databases (OPLIN)</a></li> //Display for NPL -->
! <li><a href="http://www.google.com/search?q=<!-- TMPL_VAR NAME="title" ESCAPE="url" -->+site:worldcatlibraries.org">Other Libraries(WorldCat)</a></li>
! <li><a href="http://www.scholar.google.com/scholar?q=<!-- TMPL_VAR NAME="title" ESCAPE="url" -->">Other Databases (Google Scholar)</a></li></ul></div>
  </div>
  <h2><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="subtitle" --> <span class="subtitle"><!-- TMPL_VAR NAME="subtitle" --></span><!-- /TMPL_IF --></h2>




From hdl at users.sourceforge.net  Wed Jun 22 11:36:26 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 22 Jun 2005 02:36:26 -0700
Subject: [Koha-cvs] CVS: koha/acqui newbiblio.pl,1.21,1.22
Message-ID: <E1Dl1ek-0005Uo-QO@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21033/acqui

Modified Files:
	newbiblio.pl 
Log Message:
Adding scrolling list for sort1 and sort2

Index: newbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** newbiblio.pl	14 Sep 2004 12:09:52 -0000	1.21
--- newbiblio.pl	22 Jun 2005 09:36:24 -0000	1.22
***************
*** 25,28 ****
--- 25,29 ----
  use CGI;
  use C4::Context;
+ use C4::Input;
  use C4::Database;
  use C4::Auth;
***************
*** 140,143 ****
--- 141,159 ----
  			-multiple => 0 );
  
+ my $CGIsort1 = buildCGIsort("Bsort1","sort1",$data->{'sort1'});
+ if ($CGIsort1) {
+ 	$template->param(CGIsort1 => $CGIsort1);
+ } else {
+ 	$template->param( sort1 => $data->{'sort1'});
+ }
+ 
+ my $CGIsort2 = buildCGIsort("Bsort2","sort2",$data->{'sort2'});
+ if ($CGIsort2) {
+ 	$template->param(CGIsort2 =>$CGIsort2);
+ } else {
+ 	$template->param( sort2 => $data->{'sort2'});
+ }
+ 			
+ 			
  # fill template
  $template->param( existing => $biblio,
***************
*** 173,178 ****
  						ecost => $data->{'ecost'},
  						notes => $data->{'notes'},
- 						sort1 => $data->{'sort1'},
- 						sort2 => $data->{'sort2'},
  						publishercode => $data->{'publishercode'});
  
--- 189,192 ----




From hdl at users.sourceforge.net  Wed Jun 22 11:36:26 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 22 Jun 2005 02:36:26 -0700
Subject: [Koha-cvs] CVS: koha/members memberentry.pl,1.10,1.11
Message-ID: <E1Dl1ek-0005UP-Dp@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21033/members

Modified Files:
	memberentry.pl 
Log Message:
Adding scrolling list for sort1 and sort2

Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/memberentry.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** memberentry.pl	20 Jun 2005 14:26:03 -0000	1.10
--- memberentry.pl	22 Jun 2005 09:36:24 -0000	1.11
***************
*** 61,64 ****
--- 61,66 ----
  my $destination=$input->param('destination');
  
+ 
+ 
  my $nok;
  # if a add or modify is requested => check validity of data.
***************
*** 233,237 ****
--- 235,254 ----
  				-size     => 1,
  				-multiple => 0 );
+ 				
  
+ 	my $CGIsort1 = buildCGIsort("Bsort1","sort1",$data->{'sort1'});
+ 	if ($CGIsort1) {
+ 		$template->param(CGIsort1 => $CGIsort1);
+ 	} else {
+ 		$template->param( sort1 => $data->{'sort1'});
+ 	}
+ 
+ 	my $CGIsort2 = buildCGIsort("Bsort2","sort2",$data->{'sort2'});
+ 	if ($CGIsort2) {
+ 		$template->param(CGIsort2 =>$CGIsort2);
+ 	} else {
+ 		$template->param( sort2 => $data->{'sort2'});
+ 	}
+ 	
  	$template->param(	actionType 		=> $actionType,
  				destination => $destination,
***************
*** 266,271 ****
  				cardnumber	=> $cardnumber,
  				dateofbirth	=> $data->{'dateofbirth'},
- 				sort1 => $data->{'sort1'},
- 				sort2 => $data->{'sort2'},
  				dateformat      => display_date_format(),
  			        modify          => $modify,
--- 283,286 ----




From hdl at users.sourceforge.net  Wed Jun 22 11:36:26 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 22 Jun 2005 02:36:26 -0700
Subject: [Koha-cvs] CVS: koha/C4 Input.pm,1.16,1.17
Message-ID: <E1Dl1ek-0005Uh-Na@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21033/C4

Modified Files:
	Input.pm 
Log Message:
Adding scrolling list for sort1 and sort2

Index: Input.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Input.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** Input.pm	28 Nov 2003 14:06:57 -0000	1.16
--- Input.pm	22 Jun 2005 09:36:24 -0000	1.17
***************
*** 22,25 ****
--- 22,26 ----
  require Exporter;
  use C4::Context;
+ use CGI;
  
  use vars qw($VERSION @ISA @EXPORT);
***************
*** 50,53 ****
--- 51,55 ----
  @EXPORT = qw(
  	&checkdigit &checkvalidisbn
+ 	&buildCGIsort
  );
  
***************
*** 141,175 ****
  #   of 10 digits and valid checksum
  sub checkvalidisbn {
!         use strict;
!         my ($q)=@_ ;	# Input: ISBN number
! 
!         my $isbngood = 0; # Return: true or false
! 
!         $q=~s/x$/X/g;           # upshift lower case X
!         $q=~s/[^X\d]//g;
!         $q=~s/X.//g;
!         
! 	#return 0 if $q is not ten digits long
! 	if (length($q)!=10) {
! 		return 0;
! 	}
  	
! 	#If we get to here, length($q) must be 10
!         my $checksum=substr($q,9,1);
!         my $isbn=substr($q,0,9);
!         my $i;
!         my $c=0;
!         for ($i=0; $i<9; $i++) {
!             my $digit=substr($q,$i,1);
!             $c+=$digit*(10-$i);
!         }
  	$c %= 11;
!         ($c==10) && ($c='X');
!         $isbngood = $c eq $checksum;
! 
!         return $isbngood;
  
  } # sub checkvalidisbn
  
  END { }       # module clean-up code here (global destructor)
  
--- 143,214 ----
  #   of 10 digits and valid checksum
  sub checkvalidisbn {
! 	use strict;
! 	my ($q)=@_ ;	# Input: ISBN number
! 	
! 	my $isbngood = 0; # Return: true or false
! 	
! 	$q=~s/x$/X/g;   # upshift lower case X
! 	$q=~s/[^X\d]//g;
! 	$q=~s/X.//g;
  	
! 		#return 0 if $q is not ten digits long
! 		if (length($q)!=10) {
! 			return 0;
! 		}
! 		
! 		#If we get to here, length($q) must be 10
! 	my $checksum=substr($q,9,1);
! 	my $isbn=substr($q,0,9);
! 	my $i;
! 	my $c=0;
! 	for ($i=0; $i<9; $i++) {
! 		my $digit=substr($q,$i,1);
! 		$c+=$digit*(10-$i);
! 	}
  	$c %= 11;
! 	($c==10) && ($c='X');
! 	$isbngood = $c eq $checksum;
! 	return $isbngood;
  
  } # sub checkvalidisbn
  
+ =item buildCGISort
+ 
+   $CGIScrollingList = &BuildCGISort($name string, $input_name string);
+ 
+ Returns the scrolling list with name $input_name, built on authorised Values named $name.
+ Returns NULL if no authorised values found
+ 
+ =cut
+ #'
+ #--------------------------------------
+ # Determine if a number is a valid ISBN number, according to length
+ #   of 10 digits and valid checksum
+ sub buildCGIsort {
+     use strict;
+ 	my ($name,$input_name,$data) = @_;
+ 	my $dbh=C4::Context->dbh;
+ 	my $query=qq{SELECT * FROM authorised_values WHERE category=?};
+ 	my $sth=$dbh->prepare($query);
+ 	$sth->execute($name);
+ 	my $CGISort;
+ 	if ($sth->rows>0){
+ 		my @values;
+ 		my %labels;
+ 		for (my $i =0;$i<=$sth->rows;$i++){
+ 			my $results = $sth->fetchrow_hashref;
+  			push @values, $results->{authorised_value};
+  			$labels{$results->{authorised_value}}=$results->{lib};
+ 		}
+  		$CGISort= CGI::scrolling_list(
+  					-name => $input_name,
+  					-values => \@values,
+  					-labels => \%labels,
+ 					-default=> $data,
+  					-size => 1,
+  					-multiple => 0);
+ 	} 
+ 	return $CGISort;
+ }
  END { }       # module clean-up code here (global destructor)
  




From hdl at users.sourceforge.net  Wed Jun 22 11:36:26 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 22 Jun 2005 02:36:26 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui newbiblio.tmpl,1.19,1.20
Message-ID: <E1Dl1ek-0005Ud-Kv@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	newbiblio.tmpl 
Log Message:
Adding scrolling list for sort1 and sort2

Index: newbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** newbiblio.tmpl	4 May 2005 08:52:49 -0000	1.19
--- newbiblio.tmpl	22 Jun 2005 09:36:24 -0000	1.20
***************
*** 199,207 ****
  		<p>
  			<label class="label100">Sort field 1</label>
! 			<input type="text" size="20" name=sort1 value="<!-- TMPL_VAR NAME="sort1" -->">
  		</p>
  		<p>
  			<label class="label100">Sort field 2</label>
! 			<input type="text" size="20" name=sort2 value="<!-- TMPL_VAR NAME="sort2" -->">
  		</p>
  		<p>
--- 199,215 ----
  		<p>
  			<label class="label100">Sort field 1</label>
! 			<!-- TMPL_IF Name="CGIsort1" -->
! 				<!-- TMPL_VAR Name="CGIsort1" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
! 			<!--/TMPL_IF -->
  		</p>
  		<p>
  			<label class="label100">Sort field 2</label>
! 			<!-- TMPL_IF Name="CGIsort2" -->
! 				<!-- TMPL_VAR Name="CGIsort2" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
! 			<!--/TMPL_IF -->
  		</p>
  		<p>




From hdl at users.sourceforge.net  Wed Jun 22 11:36:26 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 22 Jun 2005 02:36:26 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members memberentry.tmpl,1.36,1.37
Message-ID: <E1Dl1ek-0005UU-I2@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	memberentry.tmpl 
Log Message:
Adding scrolling list for sort1 and sort2

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** memberentry.tmpl	20 Jun 2005 14:20:05 -0000	1.36
--- memberentry.tmpl	22 Jun 2005 09:36:24 -0000	1.37
***************
*** 270,274 ****
  				<td>Sorting field 1</td>
  				<td colspan="4">
! 					<input type="text" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
  				</td>
  			</tr>
--- 270,278 ----
  				<td>Sorting field 1</td>
  				<td colspan="4">
! 					<!-- TMPL_IF Name="CGIsort1" -->
! 						<!-- TMPL_VAR Name="CGIsort1" -->
! 					<!-- TMPL_ELSE -->
! 						<input type="text" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
! 					<!--/TMPL_IF -->
  				</td>
  			</tr>
***************
*** 276,280 ****
  				<td>Sorting field 2</td>
  				<td colspan="4">
! 					<input type="text" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
  				</td>
  			</tr>
--- 280,288 ----
  				<td>Sorting field 2</td>
  				<td colspan="4">
! 					<!-- TMPL_IF Name="CGIsort2" -->
! 						<!-- TMPL_VAR Name="CGIsort2" -->
! 					<!-- TMPL_ELSE -->
! 						<input type="text" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
! 					<!--/TMPL_IF -->
  				</td>
  			</tr>




From tipaul at users.sourceforge.net  Wed Jun 22 14:45:39 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 22 Jun 2005 05:45:39 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac-top.inc,1.8.2.6,1.8.2.7
Message-ID: <E1Dl4br-0003nY-TS@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-top.inc 
Log Message:
changing image size (on top-left)

Index: opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc,v
retrieving revision 1.8.2.6
retrieving revision 1.8.2.7
diff -C2 -r1.8.2.6 -r1.8.2.7
*** opac-top.inc	16 Jun 2005 15:41:09 -0000	1.8.2.6
--- opac-top.inc	22 Jun 2005 12:45:37 -0000	1.8.2.7
***************
*** 33,37 ****
  	<div id="title">
  		<!-- TMPL_IF name="opacsmallimage" -->
! 			<img src="<!-- TMPL_VAR name="opacsmallimage"-->" height="50" alt="koha logo"/>
  		<!-- TMPL_ELSE -->
  			<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo"/>
--- 33,37 ----
  	<div id="title">
  		<!-- TMPL_IF name="opacsmallimage" -->
! 			<img src="<!-- TMPL_VAR name="opacsmallimage"-->" height="65" alt="koha logo"/>
  		<!-- TMPL_ELSE -->
  			<img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo"/>




From tipaul at users.sourceforge.net  Wed Jun 22 14:46:55 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 22 Jun 2005 05:46:55 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-dictionary.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1Dl4d5-0003wq-0O@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-dictionary.tmpl 
Log Message:
small changes in template look

Index: opac-dictionary.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-dictionary.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac-dictionary.tmpl	7 Jun 2005 10:23:13 -0000	1.1.2.1
--- opac-dictionary.tmpl	22 Jun 2005 12:46:52 -0000	1.1.2.2
***************
*** 20,27 ****
  
  <!-- TMPL_IF Name=search -->
! 	<div class="bloc25">
! 	<h2 class="catalogue">Dictionary Search results</h2>
  	<!-- TMPL_IF NAME="authresult" -->
  		<div id="resultnumber">
  			<p><!-- TMPL_IF NAME="displayprev" --> 
  					<a class="resultnumber" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
--- 20,28 ----
  
  <!-- TMPL_IF Name=search -->
! 	<h1>Dictionary Search results</h1>
  	<!-- TMPL_IF NAME="authresult" -->
+ 	<div class="bloc20">
  		<div id="resultnumber">
+ 			<h2>Values in authorities</h2>
  			<p><!-- TMPL_IF NAME="displayprev" --> 
  					<a class="resultnumber" href="opac-dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
***************
*** 82,91 ****
  			</table>
  		</div>
! 		<!-- TMPL_ELSE -->
! 			<h3 class="catalogue">No results in Authorities</h3>
  	<!-- /TMPL_IF -->
  		
  		
  	<!-- TMPL_IF Name=catresult -->	
  		<div id="resultnumber">
  			<p class="resultcount">
--- 83,93 ----
  			</table>
  		</div>
! 	</div>
  	<!-- /TMPL_IF -->
  		
  		
  	<!-- TMPL_IF Name=catresult -->	
+ 	<div class="bloc20">
+ 		<h2>Values in biblios</h2>
  		<div id="resultnumber">
  			<p class="resultcount">




From tipaul at users.sourceforge.net  Wed Jun 22 14:48:10 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 22 Jun 2005 05:48:10 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-MARCdetail.tmpl,1.5.2.3,1.5.2.4
Message-ID: <E1Dl4eI-00047l-A6@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-MARCdetail.tmpl 
Log Message:
minor css changes

Index: opac-MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -C2 -r1.5.2.3 -r1.5.2.4
*** opac-MARCdetail.tmpl	17 Jun 2005 12:31:44 -0000	1.5.2.3
--- opac-MARCdetail.tmpl	22 Jun 2005 12:48:08 -0000	1.5.2.4
***************
*** 77,81 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 77,81 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
***************
*** 101,105 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 101,105 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
***************
*** 125,129 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 125,129 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
***************
*** 149,153 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 149,153 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
***************
*** 173,177 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 173,177 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
***************
*** 197,201 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 197,201 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
***************
*** 221,225 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 221,225 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
***************
*** 245,249 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 245,249 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
***************
*** 269,273 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 269,273 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
***************
*** 293,297 ****
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>
--- 293,297 ----
  					<!-- TMPL_VAR name="marc_value" -->
  					<!-- TMPL_IF name="link" -->
! 						<a href="opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/<!-- TMPL_VAR NAME="lang" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
  						</a>




From tipaul at users.sourceforge.net  Wed Jun 22 14:49:30 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 22 Jun 2005 05:49:30 -0700
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_fr_FR.po,1.5.2.6,1.5.2.7
Message-ID: <E1Dl4fa-0004G0-06@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16133/misc/translator/po

Modified Files:
      Tag: rel_2_2
	default_intranet_fr_FR.po 
Log Message:
updated french translation

Index: default_intranet_fr_FR.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_fr_FR.po,v
retrieving revision 1.5.2.6
retrieving revision 1.5.2.7
diff -C2 -r1.5.2.6 -r1.5.2.7
*** default_intranet_fr_FR.po	13 Jun 2005 15:12:13 -0000	1.5.2.6
--- default_intranet_fr_FR.po	22 Jun 2005 12:49:22 -0000	1.5.2.7
***************
*** 9,14 ****
  msgstr ""
  "Project-Id-Version: default_intranet_fr_FR\n"
! "POT-Creation-Date: 2005-06-07 16:19+0200\n"
! "PO-Revision-Date: 2005-06-10 17:47+0200\n"
  "Last-Translator: POULAIN <paul at koha-fr.org>\n"
  "Language-Team: fr_FR\n"
--- 9,14 ----
  msgstr ""
  "Project-Id-Version: default_intranet_fr_FR\n"
! "POT-Creation-Date: 2005-06-21 15:28+0200\n"
[...1547 lines suppressed...]
--- 13443,13448 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:155
! #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:156
! #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:182
  msgid "subfields"
  msgstr "sous-champs"
***************
*** 13551,13555 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:144
! #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:140
  msgid "value"
  msgstr "valeur"
--- 13609,13613 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:144
! #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:143
  msgid "value"
  msgstr "valeur"




From tipaul at users.sourceforge.net  Wed Jun 22 14:49:53 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 22 Jun 2005 05:49:53 -0700
Subject: [Koha-cvs] CVS: koha/misc/translator/po css_opac_pl_PL.po,NONE,1.1.2.1
Message-ID: <E1Dl4fx-0004Hq-6F@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16462/misc/translator/po

Added Files:
      Tag: rel_2_2
	css_opac_pl_PL.po 
Log Message:
polish translation for OPAC

--- NEW FILE ---
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
#
# --- !! WERSJA ROBOCZA !! --- 
#
# bledy w tlumaczeniu sa sukcesywnie poprawiane
# wszelkie bledy/sugestie prosze zglaszac na emaila
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: css_opac_pl\n"
"POT-Creation-Date: 2005-06-20 14:04+0200\n"
"PO-Revision-Date: 2005-06-21 00:29+0200\n"
"Last-Translator: Wojciech Zatorski <wojciech at zatorski.net>\n"
"Language-Team: Polish \n"
"MIME-Version: 1.0\n"
[...2341 lines suppressed...]
#~ msgid "Only show titles available (Not on loan)"
#~ msgstr "Poka?? tylko tytu??y dost??pnych (nie wypo??yczonych)"

#~ msgid "Search"
#~ msgstr "Wyszukaj"

#~ msgid "Search options"
#~ msgstr "Opcje wyszukiwania"

#~ msgid "Search using keywords or subject."
#~ msgstr "Wyszukiwanie przy u??yciu hase?? kluczowych lub temat??w."

#~ msgid "Select a category"
#~ msgstr "Wybierz kategorie"

#~ msgid "Unititle:"
#~ msgstr "Tytu?? ujednolicony:"

#~ msgid "since <b>%s</b>"
#~ msgstr "od <b>%s</b>"




From tipaul at users.sourceforge.net  Wed Jun 22 14:51:12 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 22 Jun 2005 05:51:12 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-ISBDdetail.pl,1.5.2.3,1.5.2.4
Message-ID: <E1Dl4hE-0004RR-KE@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17046/opac

Modified Files:
      Tag: rel_2_2
	opac-ISBDdetail.pl 
Log Message:
bugfix (in repeated subfield separator position)

Index: opac-ISBDdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-ISBDdetail.pl,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -C2 -r1.5.2.3 -r1.5.2.4
*** opac-ISBDdetail.pl	25 Mar 2005 17:04:27 -0000	1.5.2.3
--- opac-ISBDdetail.pl	22 Jun 2005 12:51:10 -0000	1.5.2.4
***************
*** 115,119 ****
  						my $subfieldvalue = get_authorised_value_desc($tag, $subf[$i][0], $subf[$i][1], '', $dbh);
  						my $tagsubf = $tag.$subfieldcode;
! 						$calculated =~ s/\{(.?.?.?)$tagsubf(.*?)\}/$1$subfieldvalue\{$1$tagsubf$2\}$2/g;
  					}
  					# field builded, store the result
--- 115,119 ----
  						my $subfieldvalue = get_authorised_value_desc($tag, $subf[$i][0], $subf[$i][1], '', $dbh);
  						my $tagsubf = $tag.$subfieldcode;
! 						$calculated =~ s/\{(.?.?.?)$tagsubf(.*?)\}/$1$subfieldvalue$2\{$1$tagsubf$2\}/g;
  					}
  					# field builded, store the result




From hdl at users.sourceforge.net  Wed Jun 22 15:12:22 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 22 Jun 2005 06:12:22 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/acqui - New directory
Message-ID: <E1Dl51i-0006vC-Rd@sc8-pr-cvs1.sourceforge.net>

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

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/help/acqui added to the repository





From hdl at users.sourceforge.net  Wed Jun 22 15:14:14 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 22 Jun 2005 06:14:14 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/acqui newbiblio.tmpl,NONE,1.1
Message-ID: <E1Dl53W-0007Dn-Bp@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
	newbiblio.tmpl 
Log Message:
Online Help on Scrolling_list building for sort1 and sort2.
Minor Bug Fix for newbiblio.pl : Bsort becomes Asort

--- NEW FILE ---
<!-- TMPL_INCLUDE name="help-top.inc" -->
<h1>Add Biblio help</h1>

<p>sort1 and sort2 may now be related to a list of Authorized Values. All you have to do is define a Asort1 or Asort2 category of authorised values and enter the desired values into these categories. You will then be able to use them through Add/Modify Biblio Page</p>





From hdl at users.sourceforge.net  Wed Jun 22 15:14:14 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 22 Jun 2005 06:14:14 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/members memberentry.tmpl,1.1,1.2
Message-ID: <E1Dl53W-0007Dk-B3@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	memberentry.tmpl 
Log Message:
Online Help on Scrolling_list building for sort1 and sort2.
Minor Bug Fix for newbiblio.pl : Bsort becomes Asort

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/help/members/memberentry.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** memberentry.tmpl	22 Dec 2004 16:12:45 -0000	1.1
--- memberentry.tmpl	22 Jun 2005 13:14:12 -0000	1.2
***************
*** 1,4 ****
--- 1,7 ----
  <!-- TMPL_INCLUDE name="help-top.inc" -->
  <h1>Add member help</h1>
+ 
+ <p>sort1 and sort2 may now be related to a list of Authorized Values. All you have to do is define a Bsort1 or Bsort2 category of authorised values and enter the desired values into these categories. You will then be able to use them through Add/Modify Member Page</p>
+ 
  <h2>Add Member, person</h2>
  <p>This is the form for adding a new single member to the database. There is also a form for organisations, such as other libraries and non profit organisations you might lend to. You should use the Add Organisation tab at the top of the Member page for that.</p>




From hdl at users.sourceforge.net  Wed Jun 22 15:14:14 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Wed, 22 Jun 2005 06:14:14 -0700
Subject: [Koha-cvs] CVS: koha/acqui newbiblio.pl,1.22,1.23
Message-ID: <E1Dl53W-0007Dr-Fw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27695/acqui

Modified Files:
	newbiblio.pl 
Log Message:
Online Help on Scrolling_list building for sort1 and sort2.
Minor Bug Fix for newbiblio.pl : Bsort becomes Asort

Index: newbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** newbiblio.pl	22 Jun 2005 09:36:24 -0000	1.22
--- newbiblio.pl	22 Jun 2005 13:14:12 -0000	1.23
***************
*** 141,145 ****
  			-multiple => 0 );
  
! my $CGIsort1 = buildCGIsort("Bsort1","sort1",$data->{'sort1'});
  if ($CGIsort1) {
  	$template->param(CGIsort1 => $CGIsort1);
--- 141,145 ----
  			-multiple => 0 );
  
! my $CGIsort1 = buildCGIsort("Asort1","sort1",$data->{'sort1'});
  if ($CGIsort1) {
  	$template->param(CGIsort1 => $CGIsort1);
***************
*** 148,152 ****
  }
  
! my $CGIsort2 = buildCGIsort("Bsort2","sort2",$data->{'sort2'});
  if ($CGIsort2) {
  	$template->param(CGIsort2 =>$CGIsort2);
--- 148,152 ----
  }
  
! my $CGIsort2 = buildCGIsort("Asort2","sort2",$data->{'sort2'});
  if ($CGIsort2) {
  	$template->param(CGIsort2 =>$CGIsort2);




From hdl at users.sourceforge.net  Thu Jun 23 10:58:34 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 23 Jun 2005 01:58:34 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/search.marc suggest.tmpl,1.2,1.3
Message-ID: <E1DlNXe-0007CW-Ni@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	suggest.tmpl 
Log Message:
Closing suggest window after selection

Index: suggest.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/suggest.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** suggest.tmpl	19 Jul 2004 20:59:34 -0000	1.2
--- suggest.tmpl	23 Jun 2005 08:58:30 -0000	1.3
***************
*** 45,49 ****
  //			}
  //			opener.document.location= "../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR NAME="oldbiblionumber" -->&breedingid="+GetThisOne;
! //			self.close();
  //			return false;
  		}
--- 45,49 ----
  //			}
  //			opener.document.location= "../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR NAME="oldbiblionumber" -->&breedingid="+GetThisOne;
! 			self.close();
  //			return false;
  		}




From shedges at users.sourceforge.net  Thu Jun 23 13:25:04 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 23 Jun 2005 04:25:04 -0700
Subject: [Koha-cvs] CVS: koha-doc/es/sysadmin - New directory
Message-ID: <E1DlPpQ-0001nl-50@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/es/sysadmin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6880/sysadmin

Log Message:
Directory /cvsroot/koha/koha-doc/es/sysadmin added to the repository





From shedges at users.sourceforge.net  Thu Jun 23 13:25:28 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 23 Jun 2005 04:25:28 -0700
Subject: [Koha-cvs] CVS: koha-doc/es/sysadmin/templates - New directory
Message-ID: <E1DlPpo-0001qe-FG@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/es/sysadmin/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7085/sysadmin/templates

Log Message:
Directory /cvsroot/koha/koha-doc/es/sysadmin/templates added to the repository





From shedges at users.sourceforge.net  Thu Jun 23 13:26:21 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 23 Jun 2005 04:26:21 -0700
Subject: [Koha-cvs] CVS: koha-doc/es/sysadmin/templates/imágenes - New directory
Message-ID: <E1DlPqf-0001xn-Gh@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/es/sysadmin/templates/im??genes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7514/sysadmin/templates/im??genes

Log Message:
Directory /cvsroot/koha/koha-doc/es/sysadmin/templates/im??genes added to the repository





From shedges at users.sourceforge.net  Thu Jun 23 13:27:11 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 23 Jun 2005 04:27:11 -0700
Subject: [Koha-cvs] CVS: koha-doc/es/sysadmin/templates traduccion.xml,NONE,1.1
Message-ID: <E1DlPrT-00025u-5v@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/es/sysadmin/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7990/sysadmin/templates

Added Files:
	traduccion.xml 
Log Message:
Initial xml markup

--- NEW FILE ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<article>
  <title>Traducci??n de ???Templates??? de KOHA</title>

  <articleinfo>
    <pubdate>2005-06-22</pubdate>

    <author>
      <firstname>J. Mart??n</firstname>

      <surname>Longo</surname>

      <email>jmlongo AT uncu.edu.ar</email>
    </author>

    <copyright>
      <year>2005</year>

      <holder>J. Mart??n Longo</holder>
    </copyright>

    <legalnotice>
      <para>El documento se entrega bajo licencia GNU-GPL</para>

      <para>This document is related to Koha and is licensed to you under the
      GNU General Public License version 2 or later (<ulink
      url="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</ulink>).</para>

      <para>Koha-related documents may be reproduced and distributed in whole
      or in part, in any medium physical or electronic, as long as this
      copyright notice is retained on all copies.</para>

      <para>You may create a derivative work and distribute it provided that
      you:</para>

      <orderedlist>
        <listitem>
          <para>License the derivative work with this same license, or the
          Linux Documentation Project License (<ulink
          url="http://www.tldp.org/COPYRIGHT.html">http://www.tldp.org/COPYRIGHT.html</ulink>).
          Include a copyright notice and at least a pointer to the license
          used.</para>
        </listitem>

        <listitem>
          <para>Give due credit to previous authors and major
          contributors.</para>
        </listitem>
      </orderedlist>

      <para>Commercial redistribution is allowed and encouraged; however, the
      author would like to be notified of any such distributions.</para>

      <para>No liability for the contents of this document can be accepted.
      Use the concepts, examples and information at your own risk. There may
      be errors and inaccuracies, that could be damaging to your system.
      Proceed with caution, and although this is highly unlikely, the
      author(s) do not take any responsibility.</para>

      <para>All copyrights are held by their by their respective owners,
      unless specifically noted otherwise. Use of a term in this document
      should not be regarded as affecting the validity of any trademark or
      service mark. Naming of particular products or brands should not be seen
      as endorsements.</para>
    </legalnotice>

    <revhistory>
      <revision>
        <revnumber>2.2.2</revnumber>

        <date>2005-06-22</date>

        <revdescription>
          <para>Initial XML markup.</para>
        </revdescription>
      </revision>
    </revhistory>
  </articleinfo>

  <section>
    <title>Introducci??n</title>

    <note>
      <para><emphasis>Nota aclaratoria:</emphasis> Se supone, en todos los
      ejemplos, que se ha descargado el archivo
      <filename>koha-2.1.1.tar.gz</filename> y se lo ha desempaquetado en el
      directorio 'home' del usuario 'usuario'. Por lo tanto, se deber??a contar
      con un directorio <filename>koha-2.1.1</filename> en el directorio
      <filename>/home/usuario/</filename></para>

      <para>En cada sistema, se deber??n adecuar los nombres de directorios y
      de usuarios como corresponda.</para>
    </note>

    <para>La internacionalizaci??n de KOHA puede lograrse mediante la
    traducci??n de los textos contenidos en los archivos '.tmpl' (que viene de
    Template) contenidos en
    <filename>/home/usuario/koha-2.1.1/intranet-html/intranet-tmpl/default/en</filename></para>

    <para>En ocasiones anteriores, el procedimiento de traducci??n que se ha
    seguido ha sido el de copiar todo el contenido del directorio mencionado
    al directorio
    <filename>/home/usuario/koha-2.1.1/intranet-html/intranet-tmpl/default/es</filename>
    y, posteriormente, configurar KOHA para que utilice el idioma
    espa??ol.</para>

    <para>Este procedimiento, si bien ha dado resultados aceptables, es
    bastante lento y trabajoso, ya que se deben buscar una por una las cadenas
    de texto a traducir dentro de cada archivo '.tmpl', al tiempo que quien
    realiza el trabajo se debe cuidar de no modificar ninguna etiqueta o
    marca, ya que eso produce errores en la visualizaci??n.</para>

    <para>Por este motivo, se ha optado por la utilizaci??n del script
    <filename>tmpl_process3.pl</filename> (provisto en la distribuci??n de
    KOHA). Este script toma como entrada el archivo o un directorio que
    contenga los archivos que se quiera traducir y genera como salida un ??nico
    archivo con formato espec??fico y extensi??n '.po' (que viene de Portable
    Object) conteniendo todas las cadenas de texto que pueden ser traducidas.
    Este tipo de archivos es un est??ndar en el trabajo de internacionalizaci??n
    de software en el mundo del Software Libre y, por lo tanto, hay
    herramientas desarrolladas para su tratamiento.</para>

    <para>El presente tutorial pretende mostrar el uso del script
    <filename>tmpl_process3.pl</filename> y, posteriormente, sentar las bases
    para la utilizaci??n de una herramienta para el tratamiento del archivo
    '.po' generado por el mismo (en este caso, la herramienta
    <application>Kbabel</application>).</para>
  </section>

  <section>
    <title>Usando tmpl_process3.pl para generar archivos '.po'</title>

    <para>El script <filename>tmpl_process3.pl</filename> se encuentra ubicado
    en <filename>/home/usuario/koha-2.1.1/scripts/misc/translator/</filename>
    y depende algunos m??dulos ubicados en ese mismo directorio. Por lo tanto,
    para poder ejecutarlo, se deber?? estar ubicado en el directorio
    <filename>/home/usuario/koha-2.1.1/scripts/misc/translator/</filename><example>
        <title>Ejemplo:</title>

        <programlisting>usuario at host: cd /home/usuario/koha-2.1.1/scripts/misc/translator/

usuario at host: ./tmpl_process3.pl --help</programlisting>
      </example></para>

    <para>Los comandos mostrados en el ejemplo producir??n como salida el
    listado de las opciones y el modo de uso del script, como se muestra a
    continuaci??n:</para>

    <programlisting>Usage: ./tmpl_process3.pl create [OPTION]
  or:  ./tmpl_process3.pl update [OPTION]
  or:  ./tmpl_process3.pl install [OPTION]
  or:  ./tmpl_process3.pl --help
Create or update PO files from templates, or install translated templates.

  -i, --input=SOURCE          Get or update strings from SOURCE file.
                              SOURCE is a directory if -r is also specified.
  -o, --outputdir=DIRECTORY   Install translation(s) to specified DIRECTORY
      --pedantic-warnings     Issue warnings even for detected problems
                              which are likely to be harmless
  -r, --recursive             SOURCE in the -i option is a directory
  -s, --str-file=FILE         Specify FILE as the translation (po) file
                              for input (install) or output (create, update)
  -x, --exclude=REGEXP        Exclude files matching the given REGEXP
      --help                  Display this help and exit

The -o option is ignored for the "create" and "update" actions.
Try `perldoc ./tmpl_process3.pl' for perhaps more information.</programlisting>

    <para>Para crear un archivo 'circ_es.po' que contenga los textos de todos
    los templates contenidos en el directorio 'circ' de la intranet de KOHA
    que est??n en ingl??s, el procedimiento ser??a el siguiente:</para>

    <programlisting>usuario at host: cd /home/usuario/koha-2.1.1/scripts/misc/translator/

usuario at host: ./tmpl_process3.pl create -r -i /home/usuario/koha-2.1.1/intranet-html/intranet-tmpl/default/en/circ/ -s /home/usuario/traduccion/circ_es.po</programlisting>

    <para>En el ejemplo anterior:</para>

    <itemizedlist>
      <listitem>
        <para>'<emphasis role="bold">create</emphasis>' indica que se debe
        generar un archivo '.po'.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-r</emphasis> indica que el proceso se
        realizar?? sobre un directorio.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-i</emphasis> indica el directorio en el
        que se encuentran los archivos de los que se extraer??n las cadenas de
        texto.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-s</emphasis> indica el directorio y el
        nombre del archivo '.po' a crear.</para>
      </listitem>
    </itemizedlist>

    <para>Al ejecutar el comando anterior es posible que se generen algunas
    advertencias o 'warnings' por cuestiones de sintaxis.</para>

    <para>Al ejecutar el ejemplo sugerido, se produjo la siguiente salida en
    el equipo de prueba:</para>

    <programlisting>Warning: Can't determine original templates' charset, defaulting to ISO-8859-1
Removing empty file /home/jmlongo/tmp/temp.po
xgettext.pl: Warning (negligible): selectbranchprinter.tmpl: line 15: Suggest ESCAPE=HTML for TMPL_VAR in attribute "value": "&lt;!-- TMPL_VAR NAME="value" --&gt;"
xgettext.pl: Warning (negligible): selectbranchprinter.tmpl: Further similar negligible warnings will not be reported, use --pedantic for details
xgettext.pl: Warning: returns.tmpl: line 17: Strange attribute syntax: /cgi-bin/koha/moremember.pl?bornum=&lt;!-- TMPL_VAR NAME="bornum" --&gt;", "Member"); return false;"
xgettext.pl: Warning: branchtransfers.tmpl: line 20: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
xgettext.pl: Warning: branchtransfers.tmpl: line 22: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
xgettext.pl: Warning: branchtransfers.tmpl: line 98: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
xgettext.pl: Warning: branchtransfers.tmpl: line 128: Probably missing whitespace before or missing quotation mark near: Item", 480, 640); return false;"
The create seems to be successful.</programlisting>

    <para>A pesar de estas advertencias, la ??ltima l??nea (<emphasis
    role="bold">The create seems to be successful.</emphasis>) indica que el
    proceso ha tenido ??xito y que se cuenta con el archivo '.po' en el lugar y
    con el nombre seleccionados. Este archivo deber?? ser abierto usando KBabel
    para iniciar el proceso de traducci??n.</para>
  </section>

  <section>
    <title>Usando KBabel para traducir un archivo '.po'</title>

    <para>La aplicaci??n <application>KBabel</application> presenta cuatro
    ??reas, dentro de la ventana principal, cada una de ellas orientada a una
    utilidad en especial. Con esta aplicaci??n se trabaja traduciendo una a una
    las cadenas de texto que est??n contenidas en el archivo '.po' generado
    anteriormente.</para>

    <para>Para lograr esto de manera eficiente,
    <application>KBabel</application> pone a disposici??n distintas
    herramientas, como se muestra en la siguiente captura de pantalla:</para>

    <figure>
      <title>Screenshot 1</title>

      <mediaobject>
        <imageobject>
          <imagedata fileref="im??genes/image1.gif" />
        </imageobject>
      </mediaobject>
    </figure>

    <itemizedlist>
      <listitem>
        <para>El ??rea marcada en la figura como <emphasis role="bold">Texto
        Original</emphasis> es de s??lo lectura y presenta la cadena de texto
        que se est?? traduciendo.</para>
      </listitem>

      <listitem>
        <para>El ??rea marcada en la figura como <emphasis role="bold">Texto
        Traducido</emphasis> es el lugar donde se escribe la traducci??n de lo
        que aparece en el cuadro <emphasis role="bold">Texto
        Original</emphasis>.</para>
      </listitem>

      <listitem>
        <para>El ??rea marcada en la figura como <emphasis
        role="bold">Comentarios y Nombres de Archivos</emphasis> es el lugar
        donde aparecen los comentarios que los desarrolladores dejaron al
        momento de crear el template que se est?? traduciendo, con el objetivo
        de hacer alguna aclaraci??n. Adem??s, aparece el nombre del o los
        archivos en los cuales est?? contenida la cadena de texto que se est??
        traduciendo.</para>
      </listitem>

      <listitem>
        <para>El ??rea marcada en la figura como <emphasis
        role="bold">Contexto</emphasis> es el lugar en el que aparecen las
        cadenas de texto anteriores y posteriores a la que se est??
        traduciendo, como una ayuda para saber en qu?? contexto se encuentra la
        frase que se est?? traduciendo.</para>
      </listitem>
    </itemizedlist>

    <section>
      <title>Ejemplos</title>

      <para>Algunos delimitadores y etiquetas no deben ser modificados en la
      traducci??n</para>

      <figure>
        <title>Screenshot 2</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="im??genes/image2.gif" />
          </imageobject>
        </mediaobject>
      </figure>

      <para>Cuando la traducci??n implique el uso de acentos y caracteres
      especiales, los mismos deber??n ser reemplazados por las entidades
      correspondientes, para evitar problemas a la hora de la
      visualizaci??n.</para>

      <figure>
        <title>Screenshot 3</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="im??genes/image3.gif" />
          </imageobject>
        </mediaobject>
      </figure>

      <para>Para navegar entre las cadenas de texto y realizar algunas
      funciones ??tiles, se pueden utilizar los ??conos de la barra de
      herramientas o atajos de teclado.</para>

      <informaltable>
        <tgroup cols="2">
          <tbody>
            <row>
              <entry align="center" valign="middle"><emphasis
              role="bold">Funci??n</emphasis></entry>

              <entry align="center" valign="middle"><emphasis
              role="bold">Teclado</emphasis></entry>
            </row>

            <row>
              <entry>Ver el la cadena de texto anterior</entry>

              <entry><emphasis role="bold">ReP??g</emphasis></entry>
            </row>

            <row>
              <entry>Ver el la cadena de texto siguiente</entry>

              <entry><emphasis role="bold">AvP??g</emphasis></entry>
            </row>

            <row>
              <entry>Ver el la cadena de texto anterior no traducida</entry>

              <entry><emphasis role="bold">Alt+ReP??g</emphasis></entry>
            </row>

            <row>
              <entry>Ver el la cadena de texto siguiente no traducida</entry>

              <entry><emphasis role="bold">Alt+AvP??g</emphasis></entry>
            </row>

            <row>
              <entry>Copiar la cadena de texto que est?? en la ventana de Texto
              Original a la ventana de traducci??n</entry>

              <entry><emphasis role="bold">Ctrl+Espacio</emphasis></entry>
            </row>
          </tbody>
        </tgroup>
      </informaltable>
    </section>
  </section>

  <section>
    <title>Usando tmpl_process3.pl para generar ???templates??? traducidos</title>

    <para>Siguiendo los ejemplos anteriores, hemos creado, en primer lugar, un
    archivo '.po' con nombre <filename>circ_es.po</filename> conteniendo todas
    las cadenas de texto extra??das de todos los 'templates' que est??n en el
    directorio
    <filename>/home/usuario/koha-2.1.1/intranet-html/intranet-tmpl/default/en/circ</filename>.</para>

    <para>Por otro lado, ya hemos utilizado <application>KBABEL</application>
    para realizar la traducci??n de todas esas cadenas de texto.</para>

    <para>Finalmente, s??lo resta la generaci??n de los nuevos 'templates'
    traducidos en un directorio a elecci??n, siempre y cuando tenga una copia
    de los 'templates' originales. A los efectos de este ejemplo, crearemos
    los templates traducidos en el directorio
    <filename>/home/usuario/koha-2.1.1/intranet-html/intranet-tmpl/default/es/circ</filename>.</para>

    <para>Para lograr esto, utilizaremos nuevamente el script
    <filename>tmpl_process3.pl</filename> pero con par??metros ligeramente
    distintos:</para>

    <programlisting>usuario at host: cd /home/usuario/koha-2.1.1/scripts/misc/translator/ 

usuario at host: ./tmpl_process3.pl install -s /home/usuario/traduccion/ circ_es.po -r -i /home/usuario/koha-2.1.1/intranet-html/intranet-tmpl/default/en/circ/ -o /home/usuario/koha-2.1.1/intranet-html/intranet-tmpl/default/es/circ/</programlisting>

    <para>En el ejemplo anterior:</para>

    <itemizedlist>
      <listitem>
        <para>'<emphasis role="bold">install</emphasis>' indica que se
        generar??n 'templates' a partir de un archivo '.po'.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-r</emphasis> indica que el proceso se
        realizar?? sobre un directorio.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-i</emphasis> indica el directorio en el
        que se encuentran los 'templates' originales de los cuales se
        extrajeron las cadenas de texto.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-s</emphasis> indica el directorio en el
        que se crear??n los 'templates' traducidos.</para>
      </listitem>
    </itemizedlist>

    <para>Al igual que durante la creaci??n del archivo '.po', al ejecutar el
    comando sugerido, pueden producirse advertencias. La siguiente es la
    salida obtenido en el equipo de prueba:</para>

    <programlisting>Warning: Can't determine original templates' charset, defaulting to ISO-8859-1
Creating /home/jmlongo/documentos/koha/koha-2.1.1/intranet-html/intranet-tmpl/default/pl/circ//selectbranchprinter.tmpl...
tmpl_process3.pl: Warning (negligible): selectbranchprinter.tmpl: line 15: Suggest ESCAPE=HTML for TMPL_VAR in attribute "value": "&lt;!-- TMPL_VAR NAME="value" --&gt;"
tmpl_process3.pl: Warning (negligible): selectbranchprinter.tmpl: Further similar negligible warnings will not be reported, use --pedantic for details
Creating /home/jmlongo/documentos/koha/koha-2.1.1/intranet-html/intranet-tmpl/default/pl/circ//returns.tmpl...
tmpl_process3.pl: Warning: returns.tmpl: line 17: Strange attribute syntax: /cgi-bin/koha/moremember.pl?bornum=&lt;!-- TMPL_VAR NAME="bornum" --&gt;", "Member"); return false;"
Creating /home/jmlongo/documentos/koha/koha-2.1.1/intranet-html/intranet-tmpl/default/pl/circ//circulation.tmpl...
Creating /home/jmlongo/documentos/koha/koha-2.1.1/intranet-html/intranet-tmpl/default/pl/circ//branchtransfers.tmpl...
tmpl_process3.pl: Warning: branchtransfers.tmpl: line 20: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
tmpl_process3.pl: Warning: branchtransfers.tmpl: line 22: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
tmpl_process3.pl: Warning: branchtransfers.tmpl: line 98: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
tmpl_process3.pl: Warning: branchtransfers.tmpl: line 128: Probably missing whitespace before or missing quotation mark near: Item", 480, 640); return false;"
The install seems to be successful.</programlisting>

    <para>A pesar de estas advertencias, la ??ltima l??nea (<emphasis
    role="bold">The install seems to be successful.</emphasis>) indica que el
    proceso ha tenido ??xito y que se cuenta con un juego de 'templates'
    traducidos en
    <filename>/home/usuario/koha-2.1.1/intranet-html/intranet-tmpl/default/es/circ</filename>.</para>

    <para>Para comprobar el ??xito de este proceso, basta con abrir cualquiera
    de los 'templates' contenidos en el directorio mencionado con el editor de
    texto prefereido.</para>
  </section>

  <section>
    <title>Consultas, quejas y propuestas</title>

    <para>Si tiene alguna consulta acerca del proceso descrito en este
    documento, o quiere realizar alguna propuesta (o plantear una queja, ??por
    qu?? no?) que sirva para mejorarlo, puede contactarse con Mart??n Longo
    (<email>jmlongo AT uncu.edu.ar</email>)</para>
  </section>
</article>



From shedges at users.sourceforge.net  Thu Jun 23 13:29:51 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 23 Jun 2005 04:29:51 -0700
Subject: [Koha-cvs] CVS: koha-doc/en/sysadmin/templates/imagesfolder - New directory
Message-ID: <E1DlPu3-0002Yn-IP@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/en/sysadmin/templates/imagesfolder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9833/templates/imagesfolder

Log Message:
Directory /cvsroot/koha/koha-doc/en/sysadmin/templates/imagesfolder added to the repository





From shedges at users.sourceforge.net  Thu Jun 23 13:29:16 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 23 Jun 2005 04:29:16 -0700
Subject: [Koha-cvs] CVS: koha-doc/en/sysadmin/templates - New directory
Message-ID: <E1DlPtU-0002Rs-Ad@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/en/sysadmin/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9367/templates

Log Message:
Directory /cvsroot/koha/koha-doc/en/sysadmin/templates added to the repository





From shedges at users.sourceforge.net  Thu Jun 23 13:30:20 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 23 Jun 2005 04:30:20 -0700
Subject: [Koha-cvs] CVS: koha-doc/en/sysadmin/templates translation.xml,NONE,1.1
Message-ID: <E1DlPuW-0002e4-G0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/en/sysadmin/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10138/templates

Added Files:
	translation.xml 
Log Message:
Initial xml markup

--- NEW FILE ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
<article>
  <title>KOHA's Template Translation</title>

  <articleinfo>
    <pubdate>2005-06-22</pubdate>

    <author>
      <firstname>J. Martin</firstname>

      <surname>Longo</surname>

      <email>jmlongo AT uncu.edu.ar</email>
    </author>

    <copyright>
      <year>2005</year>

      <holder>J. Martin Longo</holder>
    </copyright>

    <legalnotice>
      <para>This document is related to Koha and is licensed to you under the
      GNU General Public License version 2 or later (<ulink
      url="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</ulink>).</para>

      <para>Koha-related documents may be reproduced and distributed in whole
      or in part, in any medium physical or electronic, as long as this
      copyright notice is retained on all copies.</para>

      <para>You may create a derivative work and distribute it provided that
      you:</para>

      <orderedlist>
        <listitem>
          <para>License the derivative work with this same license, or the
          Linux Documentation Project License (<ulink
          url="http://www.tldp.org/COPYRIGHT.html">http://www.tldp.org/COPYRIGHT.html</ulink>).
          Include a copyright notice and at least a pointer to the license
          used.</para>
        </listitem>

        <listitem>
          <para>Give due credit to previous authors and major
          contributors.</para>
        </listitem>
      </orderedlist>

      <para>Commercial redistribution is allowed and encouraged; however, the
      author would like to be notified of any such distributions.</para>

      <para>No liability for the contents of this document can be accepted.
      Use the concepts, examples and information at your own risk. There may
      be errors and inaccuracies, that could be damaging to your system.
      Proceed with caution, and although this is highly unlikely, the
      author(s) do not take any responsibility.</para>

      <para>All copyrights are held by their by their respective owners,
      unless specifically noted otherwise. Use of a term in this document
      should not be regarded as affecting the validity of any trademark or
      service mark. Naming of particular products or brands should not be seen
      as endorsements.</para>
    </legalnotice>

    <revhistory>
      <revision>
        <revnumber>2.2.2</revnumber>

        <date>2005-06-22</date>

        <revdescription>
          <para>Initial XML markup.</para>
        </revdescription>
      </revision>
    </revhistory>
  </articleinfo>

  <section>
    <title>Introduction</title>

    <note>
      <para>It's assumed, in every example, that you have downloaded the file
      <filename>koha-2.x.tar.gz</filename> and that you have unpacked it in
      the 'home' directory of the 'user' user. Provided this, you should have
      a <filename>koha-2.x</filename> directory under
      <filename>/home/user/</filename></para>

      <para>In each system, directory and user names should be replaced
      accordingly.</para>
    </note>

    <para>KOHA internationalization can be achieved in several ways. Not so
    long ago, it was necesary to copy the entire
    <filename>/home/usuario/koha-2.x/intranet-html/intranet-tmpl/default/en</filename>
    directory into another (i.e.
    <filename>/home/usuario/koha-2.x/intranet-html/intranet-tmpl/default/es</filename>)
    then manually edit each one of the templates contained in the newly
    created directory, translating the text strings they contain, trying, of
    course, not to touch or change anything else. Once the translation was
    finished, it was only necesary to configure KOHA's 'opaclanguages' System
    Preference to use the new language (i.e. es).</para>

    <para>This procedure works and has produced acceptable results but is,
    obviously, very slow and difficult.</para>

    <para>Now, thanks to KOHA's developer team, we have the
    <filename>tmpl_process3.pl</filename> script (provided with the KOHA
    distribution).</para>

    <para>In short, this script takes the file or directory that we want to
    translate (i.e.
    <filename>/home/usuario/koha-2.x/intranet-html/intranet-tmpl/default/en</filename>)
    and generates a single '.po' file (.po comes from Portable Object)
    containing only the text strings contained inside KOHA's template files.
    This type of file is a format standard in the software
    internationalization work in the Free Software world and, because of this,
    there are several tools developed to edit them.</para>

    <para>The present tutorial aims to show how to use the
    <filename>tmpl_process3.pl</filename> script to generate a '.po' file from
    KOHA's templates, introduce the use of one of the tools developed for
    '.po' files treatment (<application>Kbabel</application>) and then the use
    of the <filename>tmpl_process3.pl</filename> script again, to generate a
    set of translated templates for use in our KOHA installation.</para>
  </section>

  <section>
    <title>Using tmpl_process3.pl to generate a '.po' file</title>

    <para>The <filename>tmpl_process3.pl</filename> script lives under the
    <filename>/home/usuario/koha-2.x/scripts/misc/translator/</filename>
    directory and depends on some modules located under the same directory.
    Because of this, in order for it to work, the script must be run from
    inside that directory.</para>

    <example>
      <title>Running tmpl_process3.pl</title>

      <programlisting>user at host: cd /home/usuario/koha-2.x/scripts/misc/translator/ 

user at host: ./tmpl_process3.pl --help</programlisting>
    </example>

    <para>The previous command will produce, as output, a list of options and
    a little help about the script's usage, as shown below:</para>

    <programlisting>Usage: ./tmpl_process3.pl create [OPTION]
  or:  ./tmpl_process3.pl update [OPTION]
  or:  ./tmpl_process3.pl install [OPTION]
  or:  ./tmpl_process3.pl --help
Create or update PO files from templates, or install translated templates.

  -i, --input=SOURCE          Get or update strings from SOURCE file.
                              SOURCE is a directory if -r is also specified.
  -o, --outputdir=DIRECTORY   Install translation(s) to specified DIRECTORY
      --pedantic-warnings     Issue warnings even for detected problems
                              which are likely to be harmless
  -r, --recursive             SOURCE in the -i option is a directory
  -s, --str-file=FILE         Specify FILE as the translation (po) file
                              for input (install) or output (create, update)
  -x, --exclude=REGEXP        Exclude files matching the given REGEXP
      --help                  Display this help and exit

The -o option is ignored for the "create" and "update" actions.
Try `perldoc ./tmpl_process3.pl' for perhaps more information.</programlisting>

    <para>To create a 'circ_es.po' containing the text strings of the English
    templates located in the 'circ' directory of the KOHA's intranet, the
    procedure would be:</para>

    <programlisting>user at host: cd /home/user/koha-2.x/scripts/misc/translator/ 

user at host: ./tmpl_process3.pl create -r -i /home/user/koha-2.x/intranet-html/intranet-tmpl/default/en/circ/ -s /home/user/translation/circ_es.po</programlisting>

    <para>In the above example:</para>

    <itemizedlist>
      <listitem>
        <para>'<emphasis role="bold">create</emphasis>' indicates that we want
        to create a new '.po' file.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-r</emphasis> indicates that the source is
        a directory.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-i</emphasis> indicates the path from
        where the text string will be extracted.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-s</emphasis> indicates the path and name
        of the '.po' file that will be created.</para>
      </listitem>
    </itemizedlist>

    <para>When running the script, there may be some 'warnings' about syntax
    errors in the original templates.</para>

    <para>Output will look like this:</para>

    <programlisting>Warning: Can't determine original templates' charset, defaulting to ISO-8859-1
Removing empty file /home/user/tmp/temp.po
xgettext.pl: Warning (negligible): selectbranchprinter.tmpl: line 15: Suggest ESCAPE=HTML for TMPL_VAR in attribute "value": "&lt;!-- TMPL_VAR NAME="value" --&gt;"
xgettext.pl: Warning (negligible): selectbranchprinter.tmpl: Further similar negligible warnings will not be reported, use --pedantic for details
xgettext.pl: Warning: returns.tmpl: line 17: Strange attribute syntax: /cgi-bin/koha/moremember.pl?bornum=&lt;!-- TMPL_VAR NAME="bornum" --&gt;", "Member"); return false;"
xgettext.pl: Warning: branchtransfers.tmpl: line 20: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
xgettext.pl: Warning: branchtransfers.tmpl: line 22: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
xgettext.pl: Warning: branchtransfers.tmpl: line 98: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
xgettext.pl: Warning: branchtransfers.tmpl: line 128: Probably missing whitespace before or missing quotation mark near: Item", 480, 640); return false;"
The create seems to be successful.</programlisting>

    <para>Despite these warnings, the last line (<emphasis role="bold">The
    create seems to be successful.</emphasis>) indicates that the process has
    ended successfully and that now we have our brand new 'circ_es.po' file in
    <filename>/home/user/translation/</filename> so now we can use
    <application>Kbabel</application> to begin the translation process.</para>
  </section>

  <section>
    <title>Using KBabel to translate a '.po' file</title>

    <para>The <application>KBabel</application> application presents four
    areas, inside the mail window, each one oriented to a particular function.
    You'll work translating the text strings extracted from the templates one
    by one.</para>

    <para>To achieve this efficiently, <application>KBabel</application> gives
    you several tools, as can be seen in the next screenshot:</para>

    <figure>
      <title>Screenshot 1</title>

      <mediaobject>
        <imageobject>
          <imagedata fileref="imagesfolder/image1.gif" />
        </imageobject>
      </mediaobject>
    </figure>

    <itemizedlist>
      <listitem>
        <para>The area marked as <emphasis role="bold">Original
        Text</emphasis> is read only and displays the text string to be
        translated.</para>
      </listitem>

      <listitem>
        <para>The area marked as <emphasis role="bold">Translated
        Text</emphasis> is where we will write the translation of the string
        displayed in the <emphasis role="bold">Original Text</emphasis>
        area.</para>
      </listitem>

      <listitem>
        <para>The area marked as <emphasis role="bold">File Names</emphasis>
        displays the path and name of the template files where the text string
        being translated was extracted from.</para>
      </listitem>

      <listitem>
        <para>The area marked as <emphasis role="bold">Context</emphasis>
        displays the previous and next text strings to the one being
        translated, to provide some help about the context of the current text
        string.</para>
      </listitem>
    </itemizedlist>

    <section>
      <title>Examples</title>

      <para>Some tags and markups should not be modified during
      translation:</para>

      <figure>
        <title>Screenshot 2</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="imagesfolder/image2.gif" />
          </imageobject>
        </mediaobject>
      </figure>

      <para>Whenever the translation implies the use of accented words or
      special characters, they should be replaced with the corresponding
      entities, to avoid visualisation problems or errors.</para>

      <figure>
        <title>Screenshot 3</title>

        <mediaobject>
          <imageobject>
            <imagedata fileref="imagesfolder/image3.gif" />
          </imageobject>
        </mediaobject>
      </figure>

      <para>To navigate between text strings and launch some useful commands,
      there are shortcuts in the toolbar and many keyboard key
      combinations.</para>

      <informaltable>
        <tgroup cols="2">
          <tbody>
            <row>
              <entry align="center" valign="middle"><emphasis
              role="bold">Command</emphasis></entry>

              <entry align="center" valign="middle"><emphasis
              role="bold">Keyboard</emphasis></entry>
            </row>

            <row>
              <entry>Next text string</entry>

              <entry><emphasis role="bold">PgDown</emphasis></entry>
            </row>

            <row>
              <entry>Previous text string</entry>

              <entry><emphasis role="bold">PgUp</emphasis></entry>
            </row>

            <row>
              <entry>Next not translated text string</entry>

              <entry><emphasis role="bold">Alt+PgDown</emphasis></entry>
            </row>

            <row>
              <entry>Previous not translated text string</entry>

              <entry><emphasis role="bold">Alt+PgUp</emphasis></entry>
            </row>

            <row>
              <entry>Copy the text string displayed on the Original Text area
              to the Translated Text area</entry>

              <entry><emphasis role="bold">Ctrl+Space</emphasis></entry>
            </row>
          </tbody>
        </tgroup>
      </informaltable>
    </section>
  </section>

  <section>
    <title>Using tmpl_process3.pl to generate translated templates</title>

    <para>Following the previous examples, we have created a '.po' file named
    <filename>circ_es.po</filename> containing all the text strings present in
    the templates located at
    <filename>/home/user/koha-2.x/intranet-html/intranet-tmpl/default/en/circ</filename></para>

    <para>Afterwards, we used <application>Kbabel</application> to translate
    all those text strings.</para>

    <para>Finally, we only need to generate a new set of translated templates,
    using the original ones as a basis. For this example, we will create our
    new set of translated templates in the
    <filename>/home/user/koha-2.x/intranet-html/intranet-tmpl/default/es/circ</filename>
    directory.</para>

    <para>To achieve this, we'll use the <filename>tmpl_process3.pl</filename>
    script again, but with slightly different parameters:</para>

    <programlisting>user at host: cd /home/user/koha-2.x/scripts/misc/translator/ 

user at host: ./tmpl_process3.pl install -s /home/user/translation/circ_es.po -r -i /home/user/koha-2.x/intranet-html/intranet-tmpl/default/en/circ/ -o /home/user/koha-2.x/intranet-html/intranet-tmpl/default/es/circ/</programlisting>

    <para>In the above example:</para>

    <itemizedlist>
      <listitem>
        <para>'<emphasis role="bold">install</emphasis>' indicates that we
        want to create a set of templates from a '.po' file.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-r</emphasis> indicates that the target is
        a directory.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-i</emphasis> indicates the path where the
        original templates are located (the ones we extracted the text strings
        from).</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-s</emphasis> indicates the path and name
        of the '.po' file that will be used in the process.</para>
      </listitem>

      <listitem>
        <para><emphasis role="bold">-o</emphasis> indicates the path where the
        new set of translated templates will be created.</para>
      </listitem>
    </itemizedlist>

    <para>As happened when we launched the script to create the '.po' file,
    there may be some 'warnings' about syntax errors in the original
    templates.</para>

    <para>Output will look like this:</para>

    <programlisting>Warning: Can't determine original templates' charset, defaulting to ISO-8859-1
Creating /home/jmlongo/documentos/koha/koha-2.1.1/intranet-html/intranet-tmpl/default/pl/circ//selectbranchprinter.tmpl...
tmpl_process3.pl: Warning (negligible): selectbranchprinter.tmpl: line 15: Suggest ESCAPE=HTML for TMPL_VAR in attribute "value": "&lt;!-- TMPL_VAR NAME="value" --&gt;"
tmpl_process3.pl: Warning (negligible): selectbranchprinter.tmpl: Further similar negligible warnings will not be reported, use --pedantic for details
Creating /home/jmlongo/documentos/koha/koha-2.1.1/intranet-html/intranet-tmpl/default/pl/circ//returns.tmpl...
tmpl_process3.pl: Warning: returns.tmpl: line 17: Strange attribute syntax: /cgi-bin/koha/moremember.pl?bornum=&lt;!-- TMPL_VAR NAME="bornum" --&gt;", "Member"); return false;"
Creating /home/jmlongo/documentos/koha/koha-2.1.1/intranet-html/intranet-tmpl/default/pl/circ//circulation.tmpl...
Creating /home/jmlongo/documentos/koha/koha-2.1.1/intranet-html/intranet-tmpl/default/pl/circ//branchtransfers.tmpl...
tmpl_process3.pl: Warning: branchtransfers.tmpl: line 20: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
tmpl_process3.pl: Warning: branchtransfers.tmpl: line 22: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
tmpl_process3.pl: Warning: branchtransfers.tmpl: line 98: Probably missing whitespace before or missing quotation mark near: Member", 480, 640); return false;"
tmpl_process3.pl: Warning: branchtransfers.tmpl: line 128: Probably missing whitespace before or missing quotation mark near: Item", 480, 640); return false;"
The install seems to be successful.</programlisting>

    <para>Despite these warnings, the last line (<emphasis role="bold">The
    install seems to be successful.</emphasis>) indicates that the process has
    ended successfully and that now we have our brand new set of translated
    templates at
    <filename>/home/user/koha-2.x/intranet-html/intranet-tmpl/default/es/circ</filename>
    directory.</para>

    <para>To verify this you can use your favorite text editor to open one of
    the various templates located in that directory.</para>
  </section>

  <section>
    <title>Questions, complaints and proposals</title>

    <para>If you have any questions about the process outlined in this
    document or a comment that helps to improve it, you can reach me (Martin
    Longo) at <email>jmlongo AT uncu.edu.ar</email>.</para>
  </section>
</article>



From slef at users.sourceforge.net  Fri Jun 24 14:19:36 2005
From: slef at users.sourceforge.net (MJ Ray)
Date: Fri, 24 Jun 2005 05:19:36 -0700
Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.91,1.92
Message-ID: <E1Dln9k-0007iB-Nm@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29581

Modified Files:
	Install.pm 
Log Message:
perldoc and prototype updates

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -r1.91 -r1.92
*** Install.pm	20 Jun 2005 14:28:10 -0000	1.91
--- Install.pm	24 Jun 2005 12:19:34 -0000	1.92
***************
*** 20,25 ****
  # Suite 330, Boston, MA  02111-1307 USA
  #
! # Recent Authors
! # MJR: my.cnf, etcdir, prefix, new display, apache conf, copying fixups
  
  use strict;
--- 20,24 ----
  # Suite 330, Boston, MA  02111-1307 USA
  #
! # Current maintainer MJR slef at users.sourceforge.net
[...1186 lines suppressed...]
  
  =cut
  
! sub loadconfigfile {
      my %configfile;
  
--- 2174,2186 ----
  
  
! =item C<loadconfigfile()>
  
! Opens the existing koha.conf file and gets its values, saving the
! values to some global variables.  If the existing koha.conf file
! cannot be opened for any reason, the file is silently ignored.
  
  =cut
  
! sub loadconfigfile () {
      my %configfile;
  




From genjimoto at users.sourceforge.net  Sat Jun 25 07:22:02 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Fri, 24 Jun 2005 22:22:02 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-detail.pl,1.20,1.21
Message-ID: <E1Dm37C-0004FY-Ev@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16290

Modified Files:
	opac-detail.pl 
Log Message:
Added code to support search options sidebar ref to http://katipo.co.nz/gallery/koha2-4/search_ideas_details_001

Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** opac-detail.pl	20 Jun 2005 14:33:32 -0000	1.20
--- opac-detail.pl	25 Jun 2005 05:22:00 -0000	1.21
***************
*** 33,40 ****
  
  $dat->{'count'}=@items;
! 
  $dat->{'additional'}=$addauthor->[0]->{'author'};
  for (my $i = 1; $i < $authorcount; $i++) {
          $dat->{'additional'} .= " ; " . $addauthor->[$i]->{'author'};
  } # for
  
--- 33,43 ----
  
  $dat->{'count'}=@items;
! my @author;
  $dat->{'additional'}=$addauthor->[0]->{'author'};
  for (my $i = 1; $i < $authorcount; $i++) {
          $dat->{'additional'} .= " ; " . $addauthor->[$i]->{'author'};
+         my %authorpush;
+         $authorpush{author} =$addauthor->[$i]->{'author'};
+         push @author, \%authorpush
  } # for
  
***************
*** 61,64 ****
--- 64,90 ----
  
  my @results = ($dat,);
+ my @title;
+ 
+ 
+ foreach my $word (split(" ", $dat->{'title'})){
+         unless (length($word) == 4){
+                 $word =~s/\%//g
+         }
+         unless (C4::Context->stopwords->{uc($word)} or length($word)==1) {
+         my %titlepush;
+         $titlepush{title} =$word;
+                 push @title, \%titlepush;
+         }#it's NOT a stopword => use it. Otherwise, ignore
+ }
+ foreach my $word (split(" ", $dat->{'author'})){
+         unless (length($word) == 4){
+                 $word =~s/\%//g
+         }
+         unless (C4::Context->stopwords->{uc($word)} or length($word)==1) {
+         my %authorpush;
+         $authorpush{author}=$word;
+                 push @author, \%authorpush;
+         }#it's NOT a stopword => use it. Otherwise, ignore
+ }
  
  my $resultsarray=\@results;
***************
*** 66,69 ****
--- 92,98 ----
  my $webarray=\@webbiblioitems;
  my $sitearray=\@websites;
+ my $titlewords=\@title;
+ my $authorwords=\@author;
+ 
  
  #coping with subscriptions
***************
*** 89,92 ****
--- 118,123 ----
  				suggestion => C4::Context->preference("suggestion"),
  				virtualshelves => C4::Context->preference("virtualshelves"),
+         titlewords => $titlewords,
+         authorwords => $authorwords,
  );
    ## Amazon.com stuff
***************
*** 121,127 ****
  =cut
  output_html_with_http_headers $query, $cookie, $template->output;
- 
- #output_html_with_http_headers $query, $cookie, $template->output;
- 
- output_html_with_http_headers $query, $cookie, $template->output;
- 
--- 152,153 ----




From genjimoto at users.sourceforge.net  Sat Jun 25 07:26:16 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Fri, 24 Jun 2005 22:26:16 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-search.pl,1.30,1.31
Message-ID: <E1Dm3BI-0004dc-Je@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17784

Modified Files:
	opac-search.pl 
Log Message:
restored search for available books functionality while ensuring that a search not asking about the availablity doesn't take longer than normal. Achieved via new parameter in SearchMarc::Catalogsearch called $extratables.

Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** opac-search.pl	20 Jun 2005 14:33:32 -0000	1.30
--- opac-search.pl	25 Jun 2005 05:26:14 -0000	1.31
***************
*** 9,13 ****
  use C4::Database;
  use HTML::Template;
! use C4::SearchMarcTest;
  use C4::Acquisition;
  use C4::Biblio;
--- 9,13 ----
  use C4::Database;
  use HTML::Template;
! use C4::SearchMarc;
  use C4::Acquisition;
  use C4::Biblio;
***************
*** 117,120 ****
--- 117,121 ----
  	findseealso($dbh,\@tags);
      my $sqlstring;
+     my $extratables;
      if ($itemtypesstring ne ''){
          $sqlstring = 'and (biblioitems.itemtype IN (';
***************
*** 134,137 ****
--- 135,139 ----
          $sqlstring .= 'and biblio.biblionumber=items.biblionumber and (items.holdingbranch IN (';
          my $branchesloop=0;
+         $extratables = ',items';
          foreach my $branch (@branches){
              if ($branch ne ''){
***************
*** 146,154 ****
      }
    if ($avail){
      $sqlstring .= "and biblioitems.biblioitemnumber=items.biblioitemnumber and items.itemnumber !=issues.itemnumber and biblio.biblionumber !=reserves.biblionumber and (items.itemlost IS NULL or items.itemlost = 0) and (items.notforloan IS NULL or items.notforloan =0) and (items.wthdrawn IS NULL or items.wthdrawn =0) ";
    }
  	my ($results,$total) = catalogsearch($dbh, \@tags,\@and_or,
  										\@excluding, \@operator, \@value,
! 										$startfrom*$resultsperpage, $resultsperpage,$orderby,$desc_or_asc,$sqlstring);
  	if ($total ==1) {
  	if (C4::Context->preference("BiblioDefaultView") eq "normal") {
--- 148,157 ----
      }
    if ($avail){
+   	$extratables .= ',items,issues,reserves';
      $sqlstring .= "and biblioitems.biblioitemnumber=items.biblioitemnumber and items.itemnumber !=issues.itemnumber and biblio.biblionumber !=reserves.biblionumber and (items.itemlost IS NULL or items.itemlost = 0) and (items.notforloan IS NULL or items.notforloan =0) and (items.wthdrawn IS NULL or items.wthdrawn =0) ";
    }
  	my ($results,$total) = catalogsearch($dbh, \@tags,\@and_or,
  										\@excluding, \@operator, \@value,
! 										$startfrom*$resultsperpage, $resultsperpage,$orderby,$desc_or_asc,$sqlstring, $extratables);
  	if ($total ==1) {
  	if (C4::Context->preference("BiblioDefaultView") eq "normal") {
***************
*** 412,416 ****
  }
  # ADDED BY JF
! #if ($totalresults == 1){
      # if its a barcode search by definition we will only have one result.
      # And if we have a result
--- 415,419 ----
  }
  # ADDED BY JF
! if ($totalresults == 1){
      # if its a barcode search by definition we will only have one result.
      # And if we have a result




From genjimoto at users.sourceforge.net  Sat Jun 25 07:35:31 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Fri, 24 Jun 2005 22:35:31 -0700
Subject: [Koha-cvs] CVS: koha/C4 SearchMarc.pm,1.46,1.47
Message-ID: <E1Dm3KF-0005oB-UL@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22287

Modified Files:
	SearchMarc.pm 
Log Message:
New code making a search not needing to use tables not already used in searching.. doesn't take longer than normal. Achieved via new parameter in Catalogsearch called $extratables.

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** SearchMarc.pm	20 Jun 2005 14:10:01 -0000	1.46
--- SearchMarc.pm	25 Jun 2005 05:35:29 -0000	1.47
***************
*** 151,154 ****
--- 151,159 ----
  optional argument containing an sql string to be used in the 'where' statement. see usage in opac-search.pl.
  
+ =head2 $extratables
+ 
+ optional argument containing extra tables to search. Used in conjunction with $sqlstring. See usage in opac-search.pl.
+ String... so ',items,issues,reserves' allows the items, issues and reserves tables to be used.in a where.
+ 
  =head2 RETURNS
  
***************
*** 170,174 ****
  
  sub catalogsearch {
! 	my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby,$desc_or_asc,$sqlstring) = @_;
  	# build the sql request. She will look like :
  	# select m1.bibid
--- 175,179 ----
  
  sub catalogsearch {
! 	my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby,$desc_or_asc,$sqlstring, $extratables) = @_;
  	# build the sql request. She will look like :
  	# select m1.bibid
***************
*** 278,281 ****
--- 283,287 ----
  	my ($sql_tables, $sql_where1, $sql_where2) = create_request($dbh,\@normal_tags, \@normal_and_or, \@normal_operator, \@normal_value);
    $sql_where1 .= $sqlstring;
+   $sql_tables .= $extratables;
  	$sql_where1 .= "and TO_DAYS( NOW( ) ) - TO_DAYS( biblio.timestamp ) <30" if $orderby =~ "biblio.timestamp";
  	my $sth;




From genjimoto at users.sourceforge.net  Sat Jun 25 07:59:10 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Fri, 24 Jun 2005 22:59:10 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.20,1.21
Message-ID: <E1Dm3h8-0000IN-6r@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac-detail.tmpl 
Log Message:
New search options bar implemented as per http://katipo.co.nz/gallery/koha2-4/search_ideas_details_001

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** opac-detail.tmpl	20 Jun 2005 14:25:00 -0000	1.20
--- opac-detail.tmpl	25 Jun 2005 05:59:08 -0000	1.21
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
! 
  <div id="bibliomenu">
  	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
--- 1,7 ----
  <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
! <table width="100%">
! <tr>
! <td width="70%">
  <div id="bibliomenu">
  	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
***************
*** 80,84 ****
  				</p>
  				<!-- TMPL_IF name="count" -->
! 					<p><b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" --></p>
  				<!-- /TMPL_IF -->
  			</td>
--- 82,86 ----
  				</p>
  				<!-- TMPL_IF name="count" -->
! 				<p><b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" --></p>
  				<!-- /TMPL_IF -->
  			</td>
***************
*** 169,171 ****
--- 171,206 ----
  	</div>
  </div>
+ </td>
+ <td width="30%">
+ Search Options:<br>
+ Select keywords from list<br>
+ <br>
+ <form name="searchoptions" action="searchoptions.pl" method="get">
+ <input type="hidden" name="searchtype" value="NewSearch">
+ Titles:<br>
+ <!-- TMPL_LOOP NAME="titlewords" -->
+ <input type="checkbox" name="keyword" value="<!-- TMPL_VAR NAME="title" -->"><!-- TMPL_VAR NAME="title" --><br>
+ <!-- /TMPL_LOOP --><br>
+ Authors:<br>
+ <!-- TMPL_LOOP NAME="authorwords" -->
+ <input type="checkbox" name="keyword" value="<!-- TMPL_VAR NAME="author" -->"><!-- TMPL_VAR NAME="author" --><br>
+ <!-- /TMPL_LOOP --><br>
+ Subjects:<br>
+ <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+ <!-- TMPL_LOOP NAME="subjects" -->
+ <input type="checkbox" name="keyword" value="<!-- TMPL_VAR NAME="subject" -->"><!-- TMPL_VAR NAME="subject" --><br>
+ <!-- /TMPL_LOOP --><br>
+ Itemtype:<br>
+ <input type="checkbox" name="itemtypeswanted" value="<!-- TMPL_VAR NAME="itemtype" -->">
+ !-- TMPL_IF name="description" -->
+ <!-- TMPL_VAR name="description" -->
+ <!-- TMPL_ELSE -->
+ <!-- TMPL_VAR NAME="itemtype" -->
+ <!-- /TMPL_IF -->
+ <!-- /TMPL_LOOP --><br>
+ <input type="submit" value="Search">
+ </form>
+ </td>
+ </tr>
+ </table>
  <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->




From genjimoto at users.sourceforge.net  Sat Jun 25 08:56:50 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Fri, 24 Jun 2005 23:56:50 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.21,1.22
Message-ID: <E1Dm4aw-0006zh-0G@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac-detail.tmpl 
Log Message:
minor fix

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** opac-detail.tmpl	25 Jun 2005 05:59:08 -0000	1.21
--- opac-detail.tmpl	25 Jun 2005 06:56:47 -0000	1.22
***************
*** 193,197 ****
  Itemtype:<br>
  <input type="checkbox" name="itemtypeswanted" value="<!-- TMPL_VAR NAME="itemtype" -->">
! !-- TMPL_IF name="description" -->
  <!-- TMPL_VAR name="description" -->
  <!-- TMPL_ELSE -->
--- 193,197 ----
  Itemtype:<br>
  <input type="checkbox" name="itemtypeswanted" value="<!-- TMPL_VAR NAME="itemtype" -->">
! <!-- TMPL_IF name="description" -->
  <!-- TMPL_VAR name="description" -->
  <!-- TMPL_ELSE -->




From genjimoto at users.sourceforge.net  Sat Jun 25 09:26:52 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Sat, 25 Jun 2005 00:26:52 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-searchresults.tmpl,1.25,1.26
Message-ID: <E1Dm540-00024j-3b@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac-searchresults.tmpl 
Log Message:
Fix so clicking on numbers carries over the itemtype and availaiblity search parameters

Index: opac-searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** opac-searchresults.tmpl	20 Jun 2005 14:25:00 -0000	1.25
--- opac-searchresults.tmpl	25 Jun 2005 07:26:49 -0000	1.26
***************
*** 17,29 ****
  		<p class="center">
  			<!-- TMPL_IF NAME=displayprev -->
! 				<a class="results" href="opac-search.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;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search">&lt;&lt;Previous</a>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME="numbers" -->
  				<!-- TMPL_IF NAME="highlight" --><!-- TMPL_VAR NAME="number" --><!-- TMPL_ELSE -->
! 					<a class="results" href="opac-search.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;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
  			<!-- 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;</a>
  				<!-- /TMPL_IF -->
  		</p>
--- 17,32 ----
  		<p class="center">
  			<!-- TMPL_IF NAME=displayprev -->
! 				<a class="results" href="opac-search.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;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search
! 				<!-- TMPL_IF NAME="itemtypesstring">&itemtypesstring=<!-- TMPL_VAR NAME="itemtypesstring"><!-- /TMPL_IF --><!-- TMPL_IF NAME="avail" -->&avail=1<!-- /TMPL_IF -->">&lt;&lt;Previous</a>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME="numbers" -->
  				<!-- TMPL_IF NAME="highlight" --><!-- TMPL_VAR NAME="number" --><!-- TMPL_ELSE -->
! 					<a class="results" href="opac-search.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;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search
! 					<!-- TMPL_IF NAME="itemtypesstring">&itemtypesstring=<!-- TMPL_VAR NAME="itemtypesstring"><!-- /TMPL_IF --><!-- TMPL_IF NAME="avail" -->&avail=1<!-- /TMPL_IF -->"><!-- TMPL_VAR NAME="number" --></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
  			<!-- 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
! 				<!-- TMPL_IF NAME="itemtypesstring">&itemtypesstring=<!-- TMPL_VAR NAME="itemtypesstring"><!-- /TMPL_IF --><!-- TMPL_IF NAME="avail" -->&avail=1<!-- /TMPL_IF -->">Next &gt;&gt;</a>
  				<!-- /TMPL_IF -->
  		</p>
***************
*** 196,208 ****
  		<p class="center">
  			<!-- TMPL_IF NAME="displayprev" -->
! 				<a class="results" href="opac-search.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;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search">&lt;&lt;Previous</a>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME="numbers" -->
  				<!-- TMPL_IF NAME="highlight" --><!-- TMPL_VAR NAME="number" --><!-- TMPL_ELSE -->
! 					<a class="results" href="opac-search.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;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
  			<!-- 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;</a>
  				<!-- /TMPL_IF -->
  		</p>
--- 199,214 ----
  		<p class="center">
  			<!-- TMPL_IF NAME="displayprev" -->
! 				<a class="results" href="opac-search.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;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search
! 				<!-- TMPL_IF NAME="itemtypesstring">&itemtypesstring=<!-- TMPL_VAR NAME="itemtypesstring"><!-- /TMPL_IF --><!-- TMPL_IF NAME="avail" -->&avail=1<!-- /TMPL_IF -->">&lt;&lt;Previous</a>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME="numbers" -->
  				<!-- TMPL_IF NAME="highlight" --><!-- TMPL_VAR NAME="number" --><!-- TMPL_ELSE -->
! 					<a class="results" href="opac-search.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;orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;type=intranet&amp;op=do_search
! 					<!-- TMPL_IF NAME="itemtypesstring">&itemtypesstring=<!-- TMPL_VAR NAME="itemtypesstring"><!-- /TMPL_IF --><!-- TMPL_IF NAME="avail" -->&avail=1<!-- /TMPL_IF -->"><!-- TMPL_VAR NAME="number" --></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
  			<!-- 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
! 				<!-- TMPL_IF NAME="itemtypesstring">&itemtypesstring=<!-- TMPL_VAR NAME="itemtypesstring"><!-- /TMPL_IF --><!-- TMPL_IF NAME="avail" -->&avail=1<!-- /TMPL_IF -->">Next &gt;&gt;</a>
  				<!-- /TMPL_IF -->
  		</p>




From hellen at users.sourceforge.net  Sat Jun 25 14:55:05 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:55:05 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/parameters admin-home.tmpl,1.1,1.2
Message-ID: <E1DmABd-0007ZC-Ai@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28983/koha-tmpl/intranet-tmpl/default/de/parameters

Modified Files:
	admin-home.tmpl 
Log Message:
adjustments for 2.2.3

Index: admin-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/admin-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** admin-home.tmpl	12 May 2005 19:26:35 -0000	1.1
--- admin-home.tmpl	25 Jun 2005 12:55:02 -0000	1.2
***************
*** 35,39 ****
  			<td>Medientypen definieren</td>
  		</tr>
! 
  		<tr>
  			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/categorie.pl">Benutzerkategorien</a></td>
--- 35,52 ----
  			<td>Medientypen definieren</td>
  		</tr>
! <tr>
!       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/itemtypecategory.pl"> Exemplarkategorien</a></td>
!       <td>Definition von Exemplarkategorien. (Sachliteratur, Sch&ouml;ne Literatur...)</td>
!     </tr>
! 
!     <tr>
!       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/itemtypesubcategory.pl"> Exemplarunterkategorien</a></td>
!       <td>Definition der Unterkategorien. (Sch&ouml;ne Literatur Jugendliche, Sachliteratur Jugendliche.... Sch&ouml;ne Literatur Erwachsene.)</td>
!     </tr>
! 
!     <tr>
!       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/mediatype.pl"> Exemplarmedientypen</a></td>
!       <td>Definition der Exemplarmedientypen. (CD, Video, Buch, Spiel...)</td>
!     </tr>
  		<tr>
  			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/categorie.pl">Benutzerkategorien</a></td>




From hellen at users.sourceforge.net  Sat Jun 25 14:58:55 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:55 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de mancredit.tmpl,1.2,1.3
Message-ID: <E1DmAFL-0007xd-HK@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	mancredit.tmpl 
Log Message:
adjustments for 2.2.3

Index: mancredit.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/mancredit.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** mancredit.tmpl	17 May 2005 13:21:35 -0000	1.2
--- mancredit.tmpl	25 Jun 2005 12:58:53 -0000	1.3
***************
*** 10,14 ****
  <option value="C">Gutschrift</option>
  <option value="BAY">Baycorp Adjustment</option>
! <option value="WORK">Arbeitsleistung</option>
  </select>
  </td></tr>
--- 10,14 ----
  <option value="C">Gutschrift</option>
  <option value="BAY">Baycorp Adjustment</option>
! <option value="WORK">Erledigt</option>
  </select>
  </td></tr>




From hellen at users.sourceforge.net  Sat Jun 25 14:58:56 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/bull statecollection.tmpl,1.2,1.3
Message-ID: <E1DmAFM-0007y6-5E@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30254/koha-tmpl/intranet-tmpl/default/de/bull

Modified Files:
	statecollection.tmpl 
Log Message:
adjustments for 2.2.3

Index: statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/bull/statecollection.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** statecollection.tmpl	17 May 2005 13:21:35 -0000	1.2
--- statecollection.tmpl	25 Jun 2005 12:58:53 -0000	1.3
***************
*** 35,43 ****
  			<td>
  				<input type="hidden" name="serialid" value="<!-- TMPL_VAR name="serialid" -->">
! 				<select name="status" size="1">					
! 						<option value="1" <!--TMPL_IF name="status1" -->selected<!-- /TMPL_IF -->>erwartet</option>		
! 						<option value="2" <!--TMPL_IF name="status2" -->selected<!-- /TMPL_IF -->>eingegangen</option>
! 						<option value="3" <!--TMPL_IF name="status3" -->selected<!-- /TMPL_IF -->>versp&auml;tet</option>					
! 						<option value="4" <!--TMPL_IF name="status4" -->selected<!-- /TMPL_IF -->>&uuml;berf&auml;llig</option>					
  				</select>
  			</td>
--- 35,57 ----
  			<td>
  				<input type="hidden" name="serialid" value="<!-- TMPL_VAR name="serialid" -->">
! 				<select name="status" size="1">	
! 					<!--TMPL_IF name="status1" -->				
! 						<option value="1" selected>erwartet</option>
! 						<!-- /TMPL_IF -->
! 						<!--TMPL_IF name="status2" -->		
! 						<option value="2" selected>eingegangen</option>
! 						<!-- /TMPL_ELSE -->
! 						<option value="2" selected>eingegangen</option>
! 						<!-- /TMPL_IF -->
! 						<!--TMPL_IF name="status3" -->
! 						<option value="3"selected>versp&auml;tet</option>
! 						<!-- /TMPL_ELSE -->
! 						<option value="3"selected>versp&auml;tet</option>
! 						<!-- /TMPL_IF -->
! 						 <!--TMPL_IF name="status4" -->					
! 						<option value="4"selected>&uuml;berf&auml;llig</option>
! 						<!-- /TMPL_ELSE -->
! 						<option value="4"selected>&uuml;berf&auml;llig</option>
! 						<!-- /TMPL_IF -->					
  				</select>
  			</td>
***************
*** 55,59 ****
  				<input type="hidden" name="serialid" value="0">
  				<select name="status" size="1">
- 						<option value="1">erwartet</option>				
  						<option value="2">eingegangen</option>
  						<option value="3" selected>versp&auml;tet</option>
--- 69,72 ----




From hellen at users.sourceforge.net  Sat Jun 25 14:58:56 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/authorities authorities.tmpl,1.1,1.2
Message-ID: <E1DmAFM-0007y2-4Q@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30254/koha-tmpl/intranet-tmpl/default/de/authorities

Modified Files:
	authorities.tmpl 
Log Message:
adjustments for 2.2.3

Index: authorities.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities/authorities.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** authorities.tmpl	12 May 2005 19:26:14 -0000	1.1
--- authorities.tmpl	25 Jun 2005 12:58:53 -0000	1.2
***************
*** 4,8 ****
  <div class="tabbed">
  	<form method="post" name="f">
! 	<h1 class="authority">Authority number <!-- TMPL_VAR NAME="authid" --></h1>
  	<p>
  		<input type="hidden" name="op" value="add">
--- 4,12 ----
  <div class="tabbed">
  	<form method="post" name="f">
! 	<!-- TMPL_IF name="authid" -->
! 		<h1 class="authority">Modify authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
! 	<!-- TMPL_ELSE -->
! 		<h1 class="authority">Adding authority (<!-- TMPL_VAR name="authtypetext" -->)</h1>
! 	<!-- /TMPL_IF -->
  	<p>
  		<input type="hidden" name="op" value="add">
***************
*** 11,17 ****
  		<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->">
  		<!-- TMPL_IF name="authid" -->
! 			<input type="button" value="Speichern" onclick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- TMPL_ELSE -->
! 			<input type="button" value="Authority hinzuf&uuml;gen" onclick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- /TMPL_IF -->
  	</p>
--- 15,21 ----
  		<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->">
  		<!-- TMPL_IF name="authid" -->
! 			<input type="button" value="Save" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- TMPL_ELSE -->
! 			<input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- /TMPL_IF -->
  	</p>
***************
*** 19,22 ****
--- 23,36 ----
  
  <br><br><br><br><br><br><br><br><br><br><br>
+ <!-- TMPL_IF name="duplicateauthid" -->
+ 	<div class="problem">
+ 		<p>Duplicate suspected with <a href='javascript:openWindow("detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&popup=1", "Duplicate Authority")' class="button authority"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
+ 		<p>You must either :</p>
+ 		<ul>
+ 			<p><input type="checkbox" value=1 name="confirm_not_duplicate">confirm it's not a duplicate (and click on <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority"> again)</p>
+ 			<p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >original authority</a></p>
+ 		</ul>
+ 	</div>
+ <!-- /TMPL_IF -->
  
  <!-- TMPL_LOOP NAME="0XX" -->
***************
*** 133,138 ****
  		alertString2  = _("Form not submitted because of the following problem(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_missing_mandatory_tags +_("Pflichttags leer");
! 		alertString2 += "\n- "+ total_missing_mandatory_subfields +_("Pflichtfeld leer (sieh fett dargestellte Unterfelder)");
  		alert(alertString2);
  	} else {
--- 147,152 ----
  		alertString2  = _("Form not submitted because of the following problem(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_missing_mandatory_tags +_(" mandatory tags empty");
! 		alertString2 += "\n- "+ total_missing_mandatory_subfields +_(" mandatory fields empty (see bold subfields)");
  		alert(alertString2);
  	} else {
***************
*** 165,170 ****
  
  function AddField(field) {
! 	document.forms[0].op.value = "addfield";
! 	document.forms[0].addfield_field.value=field;
  	document.f.submit();
  }
--- 179,184 ----
  
  function AddField(field) {
! 	document.forms[1].op.value = "addfield";
! 	document.forms[1].addfield_field.value=field;
  	document.f.submit();
  }




From hellen at users.sourceforge.net  Sat Jun 25 14:58:56 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/catalogue MARCdetail.tmpl,1.4,1.5 detail.tmpl,1.3,1.4 searchresults.tmpl,1.2,1.3
Message-ID: <E1DmAFM-0007yJ-Bs@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	MARCdetail.tmpl detail.tmpl searchresults.tmpl 
Log Message:
adjustments for 2.2.3

Index: MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/catalogue/MARCdetail.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** MARCdetail.tmpl	9 Jun 2005 17:54:31 -0000	1.4
--- MARCdetail.tmpl	25 Jun 2005 12:58:53 -0000	1.5
***************
*** 4,8 ****
  	<div class="tabbed">
  		<h1 class="catalogue">Biblionummer : <!-- TMPL_VAR NAME="biblionumber" --></h1>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Biblio bearbeiten  </a>  <a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">  Duplizieren  </a>  <a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue">  Exemplar bearbeiten  </a>   <a href="javascript:confirm_deletion()" class="button catalogue">  L&ouml;schen  </a>  <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Vollanzeige  </a>  <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normalanzeige  </a>  <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD  </a>  <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  zu virtuellem Regal hinzuf&uuml;gen  </a>  <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  Drucken  </a>
  		<!-- TMPL_IF name="subscriptionsnumber" -->
  		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
--- 4,29 ----
  	<div class="tabbed">
  		<h1 class="catalogue">Biblionummer : <!-- TMPL_VAR NAME="biblionumber" --></h1>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Biblio bearbeiten
! 		  </a>
! 		    <a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">
! 		      Duplizieren 
! 		       </a>  <a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue">
! 		         Exemplar bearbeiten
! 			   </a>   <a href="javascript:confirm_deletion()" class="button catalogue">
! 			     L&ouml;schen 
! 			      </a> 
! 			       <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue"> 
! 			        Vollanzeige
! 				  </a> 
! 				   <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normalanzeige
! 				     </a>
! 				       <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD
! 				         </a> 
! 					  <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
! 					    zu vituellem Regal hinzuf&uuml;gen
! 					      </a> 
! 					       <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
! 					         Drucken
! 						   </a>
  		<!-- TMPL_IF name="subscriptionsnumber" -->
  		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
***************
*** 363,367 ****
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Wollen Sie diesen Biblio wirklich l&ouml;schen?');
  	if (is_confirmed) {
  		window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";
--- 384,388 ----
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Are you sure you want to delete this biblio?');
  	if (is_confirmed) {
  		window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/catalogue/detail.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** detail.tmpl	8 Jun 2005 11:28:08 -0000	1.3
--- detail.tmpl	25 Jun 2005 12:58:53 -0000	1.4
***************
*** 5,9 ****
  	<h1 class="catalogue"><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->) <!-- TMPL_VAR NAME="class" --></h1>
  	<div class="bibliomenu">
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Biblio bearbeiten  </a>  <a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">  Duplizieren  </a>  <a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue">  Exemplar bearbeiten  </a>   <a href="javascript:confirm_deletion()" class="button catalogue">  L&ouml;schen  </a>  <a href="MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  MARC-Vollanzeige  </a>  <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normalanzeige  </a>  <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD  </a>  <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  zu virtuellem Regal hinzuf&uuml;gen  </a>  <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  Drucken  </a>
  		<!-- TMPL_IF name="subscriptionsnumber" -->
  		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
--- 5,31 ----
  	<h1 class="catalogue"><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->) <!-- TMPL_VAR NAME="class" --></h1>
  	<div class="bibliomenu">
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Biblio bearbeiten
! 		  </a>
! 		    <a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">
! 		     Duplizieren 
! 		      </a>
! 		        <a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue">
! 			  Exemplar bearbeiten
! 			    </a>
! 			       <a href="javascript:confirm_deletion()" class="button catalogue">
! 			         L&ouml;schen 
! 				  </a>
! 				    <a href="MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  MARC-Vollanzeige
! 				      </a>
! 				        <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normalanzeige
! 					  </a>
! 					    <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD
! 					      </a>
! 					        <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
! 						  zu virtuellem Regal hinzuf&uuml;gen
! 						    </a>
! 						      <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
! 						        Drucken
! 							  </a>
  		<!-- TMPL_IF name="subscriptionsnumber" -->
  		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
***************
*** 34,38 ****
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="author" --><label class="label100"><b>Verfasser</b> </label><!-- TMPL_VAR NAME="author" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="additional" --><label class="label100"><b>Weitere Verfasser:</b></label><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><label class="label100"><b>Verlag:</b></label><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" --><br />
  				<!-- TMPL_IF name="publicationyear" --><label class="label100"><b>Ort:</b></label><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
--- 56,60 ----
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="author" --><label class="label100"><b>Verfasser</b> </label><!-- TMPL_VAR NAME="author" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="additional" --><label class="label100"><b>Additional Author:</b></label><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><label class="label100"><b>Verlag:</b></label><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" --><br />
  				<!-- TMPL_IF name="publicationyear" --><label class="label100"><b>Ort:</b></label><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
***************
*** 72,76 ****
  			<th class="catalogue">Entliehen bis</th>
  			<th class="catalogue">Zuletzt gesehen</th>
! 			<th class="catalogue">Barcode</th>
  			<th class="catalogue">Band</th>
  		</tr>
--- 94,98 ----
  			<th class="catalogue">Entliehen bis</th>
  			<th class="catalogue">Zuletzt gesehen</th>
! 			<th class="catalogue">Strichcode</th>
  			<th class="catalogue">Band</th>
  		</tr>
***************
*** 92,96 ****
  				<!-- TMPL_IF NAME="type" -->
  					<td>
! 						<a href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;item=<!-- TMPL_VAR NAME="itemtype" -->">Medientyp &auml;ndern</a>
  					</td>
  				<!-- /TMPL_IF -->
--- 114,118 ----
  				<!-- TMPL_IF NAME="type" -->
  					<td>
! 						<a href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;item=<!-- TMPL_VAR NAME="itemtype" -->">Fix Itemtype</a>
  					</td>
  				<!-- /TMPL_IF -->

Index: searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/catalogue/searchresults.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** searchresults.tmpl	17 May 2005 13:21:35 -0000	1.2
--- searchresults.tmpl	25 Jun 2005 12:58:53 -0000	1.3
***************
*** 63,67 ****
  		<!-- TMPL_IF NAME=not-available-p -->Nicht verf&uuml;gbar<!-- TMPL_IF NAME=not-available-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME=lost-p -->Exemplar vermi&szlig;t<!-- TMPL_IF NAME=lost-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME=withdrawn-p -->Ausgemustert<!-- TMPL_IF NAME=withdrawn-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME=on-loan-p -->Entliehen<!-- TMPL_IF NAME=on-loan-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
  		<!-- TMPL_ELSE -->
--- 63,67 ----
  		<!-- TMPL_IF NAME=not-available-p -->Nicht verf&uuml;gbar<!-- TMPL_IF NAME=not-available-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME=lost-p -->Exemplar vermi&szlig;t<!-- TMPL_IF NAME=lost-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME=withdrawn-p -->Gel&ouml;scht<!-- TMPL_IF NAME=withdrawn-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME=on-loan-p -->Entliehen<!-- TMPL_IF NAME=on-loan-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
  		<!-- TMPL_ELSE -->




From hellen at users.sourceforge.net  Sat Jun 25 14:58:56 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple addbiblio.tmpl,1.3,1.4 additem.tmpl,1.4,1.5 isbnsearch.tmpl,1.3,1.4
Message-ID: <E1DmAFM-0007yD-7g@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	addbiblio.tmpl additem.tmpl isbnsearch.tmpl 
Log Message:
adjustments for 2.2.3

Index: addbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/addbiblio.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** addbiblio.tmpl	5 Jun 2005 14:45:17 -0000	1.3
--- addbiblio.tmpl	25 Jun 2005 12:58:53 -0000	1.4
***************
*** 2,6 ****
  <div class="tabbed">
  	<form method="post" name="f">
! 	<h1 class="catalogue">Biblionummer : <!-- 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" --></h1>
  	<p>
  		<input type="hidden" name="op" value="addbiblio">
***************
*** 9,15 ****
  		<input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="oldbiblionumber" -->">
  		<!-- TMPL_IF name="bibid" -->
! 			<BUTTON value="Save" onclick="Check(this.form)" accesskey="s" class="button catalogue">&Auml;nderungen <u>s</u>ichern</BUTTON>
  		<!-- TMPL_ELSE -->
! 			<BUTTON value="Add biblio" onclick="Check(this.form)" accesskey="n" class="button catalogue"><u>N</u>euer Eintrag</BUTTON>
  		<!-- /TMPL_IF -->
  		<a href="javascript:PopupZ3950()" class="button catalogue">z3950 Suche</a>
--- 9,15 ----
  		<input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="oldbiblionumber" -->">
  		<!-- TMPL_IF name="bibid" -->
! 			<input type ="button" value="Speichern" onclick="Check(this.form)" accesskey="w" class="button catalogue">
  		<!-- TMPL_ELSE -->
! 			<input type ="button" value="Biblio hinzuf&uuml;gen" onclick="Check(this.form)" accesskey="w" class="button catalogue">
  		<!-- /TMPL_IF -->
  		<a href="javascript:PopupZ3950()" class="button catalogue">z3950 Suche</a>

Index: additem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/additem.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** additem.tmpl	9 Jun 2005 17:54:31 -0000	1.4
--- additem.tmpl	25 Jun 2005 12:58:53 -0000	1.5
***************
*** 5,14 ****
  	<input type="hidden" name="bibid" value="<!-- TMPL_VAR NAME="bibid" -->">
  	<div class="tabbed">
! 		<h1 class="catalogue">Biblionummer: <!-- TMPL_VAR NAME="biblionumber" --></h1>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Bibliografische Daten bearbeiten  </a>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">  Duplizieren  </a>
! 		<a href="../MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  MARC  </a>
! 		<a href="../detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normal  </a>
! 		<a href="../ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD  </a>
  	</div>
  	<!-- TMPL_IF name="item_loop" -->
--- 5,19 ----
  	<input type="hidden" name="bibid" value="<!-- TMPL_VAR NAME="bibid" -->">
  	<div class="tabbed">
! 	<h1 class="catalogue"><!-- TMPL_VAR name="title" --> (<!-- TMPL_VAR name="author" --> Biblionummer:<!-- TMPL_VAR NAME="biblionumber" -->)</h1>
! 				<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
! 				  Biblio bearbeiten  </a>
! 		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">
! 		  Duplizieren  </a>
! 		<a href="../MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
! 		  MARC  </a>
! 		<a href="../detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
! 		  Normal  </a>
! 		<a href="../ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
! 		  ISBD  </a>
  	</div>
  	<!-- TMPL_IF name="item_loop" -->
***************
*** 53,57 ****
  	<input type="hidden" name="itemnum" value="<!-- TMPL_VAR NAME="itemnum" -->">
  	<!-- TMPL_IF name="barcode_not_unique" -->
! 		<div id="problem"><b>FEHLER: Barcode ist bereits vorhanden<b></div>
  	<!-- /TMPL_IF -->
  	<!-- TMPL_IF name="opisadd" -->
--- 58,62 ----
  	<input type="hidden" name="itemnum" value="<!-- TMPL_VAR NAME="itemnum" -->">
  	<!-- TMPL_IF name="barcode_not_unique" -->
! 		<div id="problem"><b>FEHLER: Strichcode ist bereits vorhanden<b></div>
  	<!-- /TMPL_IF -->
  	<!-- TMPL_IF name="opisadd" -->
***************
*** 100,106 ****
  		document.f.submit();
  	} else {
! 		alertString2  = _("Formular nicht bearbeitet wegen der folgenden Probleme");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_errors+_("Pflichtfelder leer (siehe fett dargestellte Unterfelder)");
  		alert(alertString2);
  	}
--- 105,111 ----
  		document.f.submit();
  	} else {
! 		alertString2  = _("Form not submitted because of the following problem(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_errors+_("Pflichtfelder leer (sieh fett dargestellte Unterfelder)");
  		alert(alertString2);
  	}

Index: isbnsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui.simple/isbnsearch.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** isbnsearch.tmpl	8 Jun 2005 11:28:08 -0000	1.3
--- isbnsearch.tmpl	25 Jun 2005 12:58:53 -0000	1.4
***************
*** 12,16 ****
  	</div>
  	<div id="bloc25">
! 		<h2 class="catalogue">Ergebnisse in der Datenbank</h2>
  		<!-- TMPL_IF name="loop" -->
  			<div id="resultnumber">
--- 12,16 ----
  	</div>
  	<div id="bloc25">
! 		<h2 class="catalogue">Biblios in der Datenbank</h2>
  		<!-- TMPL_IF name="loop" -->
  			<div id="resultnumber">
***************
*** 32,36 ****
  					<!-- 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">
! 							Weitere &gt;&gt;
  						</a>
  					<!-- /TMPL_IF -->
--- 32,36 ----
  					<!-- 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">
! 							Weitere&gt;&gt;
  						</a>
  					<!-- /TMPL_IF -->
***************
*** 38,44 ****
  			<p class="resultcount">
  				<!-- TMPL_IF NAME="total" -->
! 					Treffer <i><!-- TMPL_VAR NAME="from" --></i> bis <i><!-- TMPL_VAR NAME="to" --></i>
  				<!-- TMPL_ELSE -->
! 					Keine Treffer
  				<!-- /TMPL_IF -->
  			</p>
--- 38,44 ----
  			<p class="resultcount">
  				<!-- TMPL_IF NAME="total" -->
! 					Ergebnisse <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" -->
  				<!-- TMPL_ELSE -->
! 					Nichts gefunden.
  				<!-- /TMPL_IF -->
  			</p>
***************
*** 62,71 ****
  						<td><a href="additem-nomarc.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Exemplare hinzuf&uuml;gen</a></td>
  						<!-- TMPL_ELSE -->
! 						<td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Bearbeiten</a></td>
  						<!-- /TMPL_IF -->
  						<!-- TMPL_UNLESS NAME="NOTMARC" -->
  						<td>
  							<a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">
! 								Duplizieren
  							</a>
  						</td>
--- 62,71 ----
  						<td><a href="additem-nomarc.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Exemplare hinzuf&uuml;gen</a></td>
  						<!-- TMPL_ELSE -->
! 						<td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Bearbeiten...</a></td>
  						<!-- /TMPL_IF -->
  						<!-- TMPL_UNLESS NAME="NOTMARC" -->
  						<td>
  							<a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">
! 								Duplikate
  							</a>
  						</td>
***************
*** 92,96 ****
  					<!-- 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">
! 							Weitere &gt;&gt;
  						</a>
  					<!-- /TMPL_IF -->
--- 92,96 ----
  					<!-- 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">
! 							Weitere&gt;&gt;
  						</a>
  					<!-- /TMPL_IF -->
***************
*** 98,113 ****
  			<p class="resultcount">
  				<!-- TMPL_IF NAME="total" -->
! 					Treffer <i><!-- TMPL_VAR NAME="from" --></i> bis <i><!-- TMPL_VAR NAME="to" --></i>
  				<!-- TMPL_ELSE -->
! 					Keine Treffer
  				<!-- /TMPL_IF -->
  			</p>
  		</div>
  		<!-- TMPL_ELSE -->
! 			<p>Keine</p>
  		<!-- /TMPL_IF -->
  	</div>
  	<div id="bloc25">
! 		<h2 class="catalogue">Bibliografische Daten im Fremddatenpool</h2>
  		<!-- TMPL_IF name="breeding_loop" -->
  			<table>
--- 98,113 ----
  			<p class="resultcount">
  				<!-- TMPL_IF NAME="total" -->
! 					Ergebnisse <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" -->
  				<!-- TMPL_ELSE -->
! 					Nichts gefunden.
  				<!-- /TMPL_IF -->
  			</p>
  		</div>
  		<!-- TMPL_ELSE -->
! 			<p>None</p>
  		<!-- /TMPL_IF -->
  	</div>
  	<div id="bloc25">
! 		<h2 class="catalogue">Biblios im fremddatenpool</h2>
  		<!-- TMPL_IF name="breeding_loop" -->
  			<table>
***************
*** 129,133 ****
  							
  							<!-- TMPL_ELSE -->
! 							<td><a href="addbiblio.pl?breedingid=<!-- TMPL_VAR NAME="id" -->" class="button catalogue">Biblio zur Datenbank hinzuf&uuml;gen</a></td>
  							<!-- /TMPL_IF -->
  						</tr>
--- 129,133 ----
  							
  							<!-- TMPL_ELSE -->
! 							<td><a href="addbiblio.pl?breedingid=<!-- TMPL_VAR NAME="id" -->" class="button catalogue">Biblio hinzuf&uuml;gen</a></td>
  							<!-- /TMPL_IF -->
  						</tr>
***************
*** 139,143 ****
  	</div>
  	<div id="bloc25">
! 		<h2 class="catalogue">Biblio zur Datenbank hinzuf&uuml;gen</h2>
  		<p class="center">
  		<!-- TMPL_IF NAME="NOTMARC" -->
--- 139,143 ----
  	</div>
  	<div id="bloc25">
! 		<h2 class="catalogue">Biblio hinzuf&uuml;gen</h2>
  		<p class="center">
  		<!-- TMPL_IF NAME="NOTMARC" -->




From hellen at users.sourceforge.net  Sat Jun 25 14:58:56 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/acqui acqui-home.tmpl,1.4,1.5 basket.tmpl,1.3,1.4 newbiblio.tmpl,1.2,1.3
Message-ID: <E1DmAFM-0007y9-76@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	acqui-home.tmpl basket.tmpl newbiblio.tmpl 
Log Message:
adjustments for 2.2.3

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui/acqui-home.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** acqui-home.tmpl	9 Jun 2005 08:37:41 -0000	1.4
--- acqui-home.tmpl	25 Jun 2005 12:58:53 -0000	1.5
***************
*** 6,18 ****
  <div id="bloc25">
  	<h2 class="acquisition">Beginnen, Eingangsbearbeitung, &auml;ndern von Bestellungen</h2>
! 	<!-- TMPL_IF name="nobudget" -->
!   	                 <p class="problem">Sie m&uuml;ssen unter Parameter ein Budget definieren</p>
!   	         <!-- TMPL_ELSE -->
! 		<form action="/cgi-bin/koha/acqui/order.pl" method="post">
  			Lieferantenname: <input type="text"  size="25"   name="supplier">
  			<input type="submit" class="button acquisition" value="OK">
  		</form>
  	<p>oder <a href="histsearch.pl" class="button acquisition"> Suche Bestellhistorie</a></p>
- 	<!-- /TMPL_IF -->
  </div>
  
--- 6,14 ----
  <div id="bloc25">
  	<h2 class="acquisition">Beginnen, Eingangsbearbeitung, &auml;ndern von Bestellungen</h2>
!   	        <form action="/cgi-bin/koha/acqui/order.pl" method="post">
  			Lieferantenname: <input type="text"  size="25"   name="supplier">
  			<input type="submit" class="button acquisition" value="OK">
  		</form>
  	<p>oder <a href="histsearch.pl" class="button acquisition"> Suche Bestellhistorie</a></p>
  </div>
  
***************
*** 35,39 ****
  	<h2 class="acquisition">zu pr&uuml;fende Vorschl&auml;ge</h2>
  		<!-- TMPL_IF name="suggestion" -->
! 			<!--TMPL_VAR NAME="suggestion" --> offene Anschaffungsvorschl%auml;ge <a href="/cgi-bin/koha/suggestion/acceptorreject.pl" class="button acquisition">Manage</a>
  		<!-- TMPL_ELSE -->
  			Keine Anschaffungsvorschl&auml;ge offen
--- 31,35 ----
  	<h2 class="acquisition">zu pr&uuml;fende Vorschl&auml;ge</h2>
  		<!-- TMPL_IF name="suggestion" -->
! 			<!--TMPL_VAR NAME="suggestion" --> suggestions waiting <a href="/cgi-bin/koha/suggestion/acceptorreject.pl" class="button acquisition">Manage</a>
  		<!-- TMPL_ELSE -->
  			Keine Anschaffungsvorschl&auml;ge offen
***************
*** 43,58 ****
  <!-- showbudget-->
  <div id="bloc25">
! 	<form action="/cgi-bin/koha/search.pl">
  		<h2 class="acquisition">Etats und Budgets</h2>
- 		<!-- TMPL_IF name="nobudget" -->
-   	                 <p class="problem">Sie m&uuml;sen unter Parameter ein Budget definieren</p>
-   	         <!-- TMPL_ELSE -->
  		<table class="noborder">
  			<tr>
  				<th class="acquisition">Etats</th>
! 				<th class="acquisition">Gesamt</th>
  				<th class="acquisition">Geschenkt</th>
  				<th class="acquisition">Verausgabt</th>
! 				<th class="acquisition">Verf&uuml;gbar </th>
  			</tr>
  			<!-- TMPL_LOOP NAME="loop_budget" -->
--- 39,51 ----
  <!-- showbudget-->
  <div id="bloc25">
! 		<form action="/cgi-bin/koha/search.pl">	
  		<h2 class="acquisition">Etats und Budgets</h2>
  		<table class="noborder">
  			<tr>
  				<th class="acquisition">Etats</th>
! 				<th class="acquisition">Total</th>
  				<th class="acquisition">Geschenkt</th>
  				<th class="acquisition">Verausgabt</th>
! 				<th class="acquisition">Verf&uuml;gbar</th>
  			</tr>
  			<!-- TMPL_LOOP NAME="loop_budget" -->
***************
*** 66,70 ****
  			<!-- /TMPL_LOOP -->
  			<tr>
! 				<th class="acquisition" align="right">Gesamt</th>
  				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="total" --></th>
  				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="totspent" --></th>
--- 59,63 ----
  			<!-- /TMPL_LOOP -->
  			<tr>
! 				<th class="acquisition" align="right">Total</th>
  				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="total" --></th>
  				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="totspent" --></th>
***************
*** 74,80 ****
  		</table>
  		<p>
! Benutzen Sie den "neu laden"-Button des Browsers zur Anzeige der aktuellen Betr&auml;ge. Die angezeigten Werte sind nur ungef&auml;hre Werte, da bei Zahlung eines Betrags der dann aktuelle Wechselkurs berechnet wird.
  		</p>
! 	<!-- /TMPL_IF -->
  </div>
  
--- 67,73 ----
  		</table>
  		<p>
! 		Benutzen Sie den "neu laden"-Button des Browsers zur Anzeige der aktuellen Betr&auml;ge. Die angezeigten Werte sind nur ungef&auml;hre Werte, da bei Zahlung eines Betrags der dann aktuelle Wechselkurs berechnet wird.
  		</p>
! 	 </form>
  </div>
  

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui/basket.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** basket.tmpl	5 Jun 2005 18:10:13 -0000	1.3
--- basket.tmpl	25 Jun 2005 12:58:53 -0000	1.4
***************
*** 1,4 ****
  <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
! 
  <div id="mainbloc">
  	<h1 class="acquisition"><!-- TMPL_UNLESS name="basketno" -->Neu <!-- /TMPL_UNLESS -->Einkaufskorb <b><!-- TMPL_VAR NAME="basketno" --> </b>f&uuml;r <a href="supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a></h1><br />
--- 1,4 ----
  <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
! <!-- angepasst fuer 2.2.3, hellen, 24/06/05 -->
  <div id="mainbloc">
  	<h1 class="acquisition"><!-- TMPL_UNLESS name="basketno" -->Neu <!-- /TMPL_UNLESS -->Einkaufskorb <b><!-- TMPL_VAR NAME="basketno" --> </b>f&uuml;r <a href="supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a></h1><br />
***************
*** 7,12 ****
  			<h2 class="acquisition">Korb-Info</h2>
  			<p><label class="label100">Korb-Nummer<label> <!-- TMPL_VAR NAME="basketno" --></p>
! 			<p><label class="label100">Bearbeitet von<label><!-- TMPL_VAR NAME="authorisedbyname" --></p>
! 			<p><label class="label100">Begonnen am<label> <!-- TMPL_VAR NAME="creationdate" --></p>
  			<p><label class="label100">f&uuml;r<label> <!-- TMPL_VAR NAME="booksellerid" --></p>
  			<p><label class="label100">Rechnungsnummer </label><!-- TMPL_VAR NAME="booksellerinvoicenumber" --></p>
--- 7,12 ----
  			<h2 class="acquisition">Korb-Info</h2>
  			<p><label class="label100">Korb-Nummer<label> <!-- TMPL_VAR NAME="basketno" --></p>
! 			<p><label class="label100">Managed by<label><!-- TMPL_VAR NAME="authorisedbyname" --></p>
! 			<p><label class="label100">open on<label> <!-- TMPL_VAR NAME="creationdate" --></p>
  			<p><label class="label100">f&uuml;r<label> <!-- TMPL_VAR NAME="booksellerid" --></p>
  			<p><label class="label100">Rechnungsnummer </label><!-- TMPL_VAR NAME="booksellerinvoicenumber" --></p>
***************
*** 28,35 ****
  				<th class="acquisition">Titel</th>
  				<th class="acquisition">Verfasser</th>
! 				<th class="acquisition">EK-Preis</th>
! 				<th class="acquisition doNotPrint">Nettopreis</th>
! 				<th class="acquisition">Menge</th>
! 				<th class="acquisition">Gesamt</th>
  				<th class="acquisition doNotPrint">Etat <a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=aqorderbreakdown.bookfundid,biblioitems.publishercode">[Bestellung]</a></th>
  				<!-- TMPL_IF name="active" -->
--- 28,35 ----
  				<th class="acquisition">Titel</th>
  				<th class="acquisition">Verfasser</th>
! 				<th class="acquisition">rrp</th>
! 				<th class="acquisition doNotPrint">est</th>
! 				<th class="acquisition">Qty</th>
! 				<th class="acquisition">Total</th>
  				<th class="acquisition doNotPrint">Etat <a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=aqorderbreakdown.bookfundid,biblioitems.publishercode">[Bestellung]</a></th>
  				<!-- TMPL_IF name="active" -->
***************
*** 91,100 ****
  		<!-- TMPL_UNLESS name="closedate" -->
  		<div id="bloc25">
! 			<h2 class="acquisition">Weitere Bestellung</h2>
  			<form action="/cgi-bin/koha/acqui/newbasket2.pl" method="post">
  				<input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->">
  				<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
  				<p>von einem vorhandenen Biblio </b><input type="text"  size="25"   name="search"><input type="submit" class="button acquisition" value="Suche"></p>
! 				<p>oder <a href="/cgi-bin/koha/acqui/suggestion-select.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition"> f&uuml;r einen Anschaffungsvorschlag </a> <a href="/cgi-bin/koha/acqui/newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition"> Neuer Biblio </a>
  				</p>
  			</form>
--- 91,105 ----
  		<!-- TMPL_UNLESS name="closedate" -->
  		<div id="bloc25">
! 			<h2 class="acquisition">Add order line</h2>
  			<form action="/cgi-bin/koha/acqui/newbasket2.pl" method="post">
  				<input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->">
  				<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
  				<p>von einem vorhandenen Biblio </b><input type="text"  size="25"   name="search"><input type="submit" class="button acquisition" value="Suche"></p>
! 				<p>oder
! 				 <a href="/cgi-bin/koha/acqui/suggestion-select.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">
! 				  f&uuml;r einen Anschaffungsvorschlag
! 				   </a> <a href="/cgi-bin/koha/acqui/newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">
! 				    Neuer Biblio
! 				     </a>
  				</p>
  			</form>

Index: newbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/acqui/newbiblio.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** newbiblio.tmpl	4 Jun 2005 14:10:26 -0000	1.2
--- newbiblio.tmpl	25 Jun 2005 12:58:53 -0000	1.3
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  <script language="javascript" type="text/javascript">
! 
  <!--
  function update(f){
--- 1,5 ----
  <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  <script language="javascript" type="text/javascript">
! <!-- aktualisiert fuer 2.2.3, hellen 24/06/05 -->
  <!--
  function update(f){
***************
*** 87,90 ****
--- 87,91 ----
  	<!-- /TMPL_LOOP -->
  	<a href="basket.pl?basket=<!-- TMPL_VAR NAME="basket" -->" class="button acquisition">Korb ansehen</a> <h1 class="acquisition">
+ 	<h1 class="acquisition">
  		<!-- TMPL_IF name="ordnum" -->
  			Bestellung bearbeiten (Zeile #<!-- TMPL_VAR NAME="ordnum" -->)
***************
*** 94,98 ****
  		 <!-- TMPL_IF name="suggestionid" -->(bestimmt durch Vorschlag)<!-- /TMPL_IF -->
  	</h1>
! 	Einkaufkorb f&uuml;r <!-- TMPL_VAR NAME="name" -->
  	<div id="bloc25">
  		<h2 class="acquisition">Katalog-Details</h2>
--- 95,99 ----
  		 <!-- TMPL_IF name="suggestionid" -->(bestimmt durch Vorschlag)<!-- /TMPL_IF -->
  	</h1>
! 	Shopping Basket For <!-- TMPL_VAR NAME="name" -->
  	<div id="bloc25">
  		<h2 class="acquisition">Katalog-Details</h2>
***************
*** 142,146 ****
  		</p>
  		<p>
! 			<label class="label100">Serie</label>
  			<!-- TMPL_IF name="biblio" -->
  				<input type="hidden" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->"><!-- TMPL_VAR NAME="seriestitle" -->
--- 143,147 ----
  		</p>
  		<p>
! 			<label class="label100">Serien</label>
  			<!-- TMPL_IF name="biblio" -->
  				<input type="hidden" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->"><!-- TMPL_VAR NAME="seriestitle" -->
***************
*** 181,185 ****
  		</p>
  		<p>
! 			<label class="label100"><b>GESAMTSUMME</b></label>
  			<input type="text" size="20" name="total" value="" onchange="update(this.form)">
  		</p>
--- 182,186 ----
  		</p>
  		<p>
! 			<label class="label100"><b>BUDGETED TOTAL</b></label>
  			<input type="text" size="20" name="total" value="" onchange="update(this.form)">
  		</p>




From hellen at users.sourceforge.net  Sat Jun 25 14:58:56 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/help/members memberentry.tmpl,1.1,1.2
Message-ID: <E1DmAFM-0007yG-8t@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/help/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30254/koha-tmpl/intranet-tmpl/default/de/help/members

Modified Files:
	memberentry.tmpl 
Log Message:
adjustments for 2.2.3

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/help/members/memberentry.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** memberentry.tmpl	12 May 2005 19:26:15 -0000	1.1
--- memberentry.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE name="help-top.inc" -->
! <h1>Hilfe f&uuml;r Benutzer hinzuf&uuml;gen</h1>
! <h2>Benutzer hinzuf&uuml;gen, Person</h2>
  <p>This is the form for adding a new single member to the database. There is also a form for organisations, such as other libraries and non profit organisations you might lend to. You should use the Add Organisation tab at the top of the Member page for that.</p>
  <p>Every field with an asterisk must be filled out, or you will get an error, and the record will not be added to the database.</p>
--- 1,8 ----
  <!-- TMPL_INCLUDE name="help-top.inc" -->
! <h1>Hilfe: Benutzer hinzuf&uuml;gen</h1>
! 
! <p>sort1 and sort2 may now be related to a list of Authorized Values. All you have to do is define a Bsort1 or Bsort2 category of authorised values and enter the desired values into these categories. You will then be able to use them through Add/Modify Member Page</p>
! 
! <h2>Add Member, person</h2>
  <p>This is the form for adding a new single member to the database. There is also a form for organisations, such as other libraries and non profit organisations you might lend to. You should use the Add Organisation tab at the top of the Member page for that.</p>
  <p>Every field with an asterisk must be filled out, or you will get an error, and the record will not be added to the database.</p>
***************
*** 8,12 ****
  <p>The clear all Fields button will reset the page to a blank form in case you made a mistake.</p>
  
! <h2>Benutzer hinzuf&uuml;gen, Institution</h2>
  <p>This is the form for adding a group of members. Suppose you had a YMCA group, or lend books to other Libraries. This would be the form to use for that purpose.</p>
  <p>Every field with an asterisk must be filled out, or you will get an error, and the record will not be added to the database.</p>
--- 11,15 ----
  <p>The clear all Fields button will reset the page to a blank form in case you made a mistake.</p>
  
! <h2>Add Member, Institutional</h2>
  <p>This is the form for adding a group of members. Suppose you had a YMCA group, or lend books to other Libraries. This would be the form to use for that purpose.</p>
  <p>Every field with an asterisk must be filled out, or you will get an error, and the record will not be added to the database.</p>




From hellen at users.sourceforge.net  Sat Jun 25 14:58:57 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:57 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/parameters marc_subfields_structure.tmpl,1.1,1.2 marctagstructure.tmpl,1.1,1.2 printers.tmpl,1.1,1.2 systempreferences.tmpl,1.1,1.2 z3950servers.tmpl,1.1,1.2
Message-ID: <E1DmAFN-0007z9-GB@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30254/koha-tmpl/intranet-tmpl/default/de/parameters

Modified Files:
	marc_subfields_structure.tmpl marctagstructure.tmpl 
	printers.tmpl systempreferences.tmpl z3950servers.tmpl 
Log Message:
adjustments for 2.2.3

Index: marc_subfields_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/marc_subfields_structure.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** marc_subfields_structure.tmpl	12 May 2005 19:26:35 -0000	1.1
--- marc_subfields_structure.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 20,24 ****
  			<ul>
  				<p>
! 					<!-- TMPL_VAR NAME="repeatable" --> repeatable  <!-- TMPL_VAR NAME="mandatory" --> mandatory
  				</p>
  				<!-- TMPL_IF name="frameworkcode" -->
--- 20,25 ----
  			<ul>
  				<p>
! 					<!-- TMPL_VAR NAME="repeatable" --> repeatable 
! 					<!-- TMPL_VAR NAME="mandatory" --> mandatory
  				</p>
  				<!-- TMPL_IF name="frameworkcode" -->
***************
*** 41,48 ****
  				<p><!-- TMPL_VAR NAME="isurl" --> URL (if checked, it means that the subfield is an URL and can be clicked</p>
  				<p>
! 					<label>Auth value:</label> <!-- TMPL_VAR NAME="authorised_value" --> oder Thesaurus: <!-- TMPL_VAR NAME="authtypes" --> oder Plugin: <!-- TMPL_VAR NAME="value_builder" -->
  				</p>
  				<p>
! 					<label>&nbsp;</label>Link to field :  <input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5"> (exemple :200b)
  				</p>
  			</ul>
--- 42,52 ----
  				<p><!-- TMPL_VAR NAME="isurl" --> URL (if checked, it means that the subfield is an URL and can be clicked</p>
  				<p>
! 					<label>Auth value:</label> <!-- TMPL_VAR NAME="authorised_value" -->
! 					or thesaurus: <!-- TMPL_VAR NAME="authtypes" -->
! 					or plugin: <!-- TMPL_VAR NAME="value_builder" -->
  				</p>
  				<p>
! 					<label>&nbsp;</label>Link to field :
! 					<input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5"> (exemple :200b)
  				</p>
  			</ul>
***************
*** 63,67 ****
  	</tr>
  	<tr><td>&nbsp;</td><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
! 	<tr><td colspan="2" align="center">L&ouml;schen best&auml;tigen</td></tr>
  	<tr>
  		<td>
--- 67,71 ----
  	</tr>
  	<tr><td>&nbsp;</td><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
! 	<tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>
  	<tr>
  		<td>
***************
*** 72,76 ****
  				<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->">
  				<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
! 				<input type="submit" value="JA">
  			</form>
  		</td>
--- 76,80 ----
  				<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->">
  				<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
! 				<input type="submit" value="YES">
  			</form>
  		</td>
***************
*** 81,85 ****
  				<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->">
  				<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
! 				<input type="submit" value="NEIN">
  			</form>
  		</td>
--- 85,89 ----
  				<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->">
  				<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
! 				<input type="submit" value="NO">
  			</form>
  		</td>
***************
*** 89,93 ****
  <!-- TMPL_IF NAME="delete_confirmed" -->
  <!-- ------------------------------------------------------------------------ -->
! 	Daten gel&ouml;scht
  	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
  	<input type="submit" value="OK">
--- 93,97 ----
  <!-- TMPL_IF NAME="delete_confirmed" -->
  <!-- ------------------------------------------------------------------------ -->
! 	Data deleted
  	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
  	<input type="submit" value="OK">
***************
*** 104,110 ****
  <tr>
  	<th>Subfield</th>
! 	<th>Texte</th>
  	<th>Constraints</th>
! 	<th>L&ouml;schen</th>
  <!-- TMPL_LOOP NAME="loop" -->
  <tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
--- 108,114 ----
  <tr>
  	<th>Subfield</th>
! 	<th>Text</th>
  	<th>Constraints</th>
! 	<th>Delete</th>
  <!-- TMPL_LOOP NAME="loop" -->
  <tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
***************
*** 122,131 ****
  		<!-- TMPL_ELSE -->
  			Tab :<!-- TMPL_VAR NAME="tab" -->,
! 			<!-- TMPL_IF NAME="kohafield" -->Koha-Feld : <!-- TMPL_VAR NAME="kohafield" -->, <!--/TMPL_IF -->
! 			<!-- TMPL_IF NAME="repeatable" -->Wiederholbar, <!-- TMPL_ELSE -->Nicht wiederholbar<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="mandatory" -->Obligatorisch, <!-- TMPL_ELSE -->Nicht obligatorisch,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="seealso" -->siehe auch: <!-- TMPL_VAR NAME="seealso" --><!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="hidden" -->versteckt<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="isurl" -->ist ein URL<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="authorised_value" --> Auth value :<!-- TMPL_VAR NAME="authorised_value" -->,<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="authtypecode" --> Authority :<!-- TMPL_VAR NAME="authtypecode" -->,<!-- /TMPL_IF -->
--- 126,135 ----
  		<!-- TMPL_ELSE -->
  			Tab :<!-- TMPL_VAR NAME="tab" -->,
! 			<!-- TMPL_IF NAME="kohafield" -->Koha field : <!-- TMPL_VAR NAME="kohafield" -->, <!--/TMPL_IF -->
! 			<!-- TMPL_IF NAME="repeatable" -->Repeatable, <!-- TMPL_ELSE -->Not repeatable,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="mandatory" -->Mandatory, <!-- TMPL_ELSE -->Not mandatory,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="seealso" -->see also : <!-- TMPL_VAR NAME="seealso" -->,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="hidden" -->hidden,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="isurl" -->is an url,<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="authorised_value" --> Auth value :<!-- TMPL_VAR NAME="authorised_value" -->,<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="authtypecode" --> Authority :<!-- TMPL_VAR NAME="authtypecode" -->,<!-- /TMPL_IF -->
***************
*** 143,147 ****
  </a>
  <!-- TMPL_IF NAME="previous" -->
! 	<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="vorheriges" alt="vorheriges" border="0">
  	</a><!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="next" -->
--- 147,151 ----
  </a>
  <!-- TMPL_IF NAME="previous" -->
! 	<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0" >
  	</a><!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="next" -->

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/marctagstructure.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** marctagstructure.tmpl	12 May 2005 19:26:35 -0000	1.1
--- marctagstructure.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 116,120 ****
  <!-- TMPL_IF NAME="else" -->
  <div id="bloc25">
! <h2 class="parameters">Framework ausw%auml;hlen</h2>
  <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<select name="frameworkcode">
--- 116,120 ----
  <!-- TMPL_IF NAME="else" -->
  <div id="bloc25">
! <h2 class="parameters">Framework ausw&auml;hlen</h2>
  <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<select name="frameworkcode">

Index: printers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/printers.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** printers.tmpl	12 May 2005 19:26:35 -0000	1.1
--- printers.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 43,47 ****
  					var alertString2;
  					if (f.printername.value.length==0) {
! 							_alertString += "\n- " + _("Druckername fehlt ");
  					}
  					if (f.printqueue.value.length==0) {
--- 43,47 ----
  					var alertString2;
  					if (f.printername.value.length==0) {
! 							_alertString += "\n- " + _("Druckername fehlt");
  					}
  					if (f.printqueue.value.length==0) {
***************
*** 51,55 ****
  							document.Aform.submit();
  					} else {
! 							alertString2  = _("Form not submitted because of the following problem(s)");
  							alertString2 += "\n------------------------------------------------------------------------------------\n";
  							alertString2 += _alertString;
--- 51,55 ----
  							document.Aform.submit();
  					} else {
! 							alertString2  = _("Form wird nicht unterstuetzt wegen der folgenden Probleme");
  							alertString2 += "\n------------------------------------------------------------------------------------\n";
  							alertString2 += _alertString;
***************
*** 60,64 ****
  	<div id="bloc25">
  		<!-- TMPL_IF NAME="searchfield" -->
! 			<h2 class="parameters">Drucker bearbeiten</h2>
  		<!-- TMPL_ELSE -->
  			<h2 class="parameters">Drucker hinzuf&uuml;gen</h2>
--- 60,64 ----
  	<div id="bloc25">
  		<!-- TMPL_IF NAME="searchfield" -->
! 			<h2 class="parameters">Drucker &auml;ndern</h2>
  		<!-- TMPL_ELSE -->
  			<h2 class="parameters">Drucker hinzuf&uuml;gen</h2>
***************
*** 80,84 ****
  	
  	<!-- TMPL_IF NAME="add_validate" -->
! 		Daten gespeichert
  			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  			<input type="submit" value="OK" class="button">
--- 80,84 ----
  	
  	<!-- TMPL_IF NAME="add_validate" -->
! 		Daten hinzugef&uuml;gt
  			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  			<input type="submit" value="OK" class="button">
***************
*** 106,110 ****
  			</tr>
  				<tr>
! 				<td colspan="2" align="center">L&ouml;schen best&auml;tigen</td>
  			</tr>
  				<tr>
--- 106,110 ----
  			</tr>
  				<tr>
! 				<td colspan="2" align="center">L&Ouml;SCHUNG BEST&Auml;TIGEN</td>
  			</tr>
  				<tr>
***************
*** 132,140 ****
  			<form action="<!-- TMPL_VAR NAME="script_name">" method="post">
  					<input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 					<input type="reset" name="reset" value="l&ouml;schen">
  			</form>
  	
  		<!-- TMPL_IF NAME="searchfield" -->
! 			You searched for <b><!-- TMPL_VAR NAME="searchfield" --></b>
  		<!-- /TMPL_IF -->
  	
--- 132,140 ----
  			<form action="<!-- TMPL_VAR NAME="script_name">" method="post">
  					<input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 					<input type="reset" name="reset" value="clr">
  			</form>
  	
  		<!-- TMPL_IF NAME="searchfield" -->
! 			Sie suchten nach <b><!-- TMPL_VAR NAME="searchfield" --></b>
  		<!-- /TMPL_IF -->
  	
***************
*** 153,157 ****
  				<td><!-- TMPL_VAR NAME="printtype" --></td>
  				<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->" class="button">Bearbeiten</a></td>
! 							<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->" class="button">L&ouml;schen</a></td>
  			</tr>
  			<!-- /TMPL_LOOP -->
--- 153,157 ----
  				<td><!-- TMPL_VAR NAME="printtype" --></td>
  				<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->" class="button">Bearbeiten</a></td>
! 				<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->" class="button">L&ouml;schen</a></td>
  			</tr>
  			<!-- /TMPL_LOOP -->
***************
*** 162,166 ****
  		
  		<!-- TMPL_IF NAME="offsetgtzero" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Prev</a>
  		<!-- /TMPL_IF -->
  	
--- 162,166 ----
  		
  		<!-- TMPL_IF NAME="offsetgtzero" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Vorherige</a>
  		<!-- /TMPL_IF -->
  	
***************
*** 168,176 ****
  	
  		<!-- TMPL_IF NAME="ltcount" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">N&auml;chster &gt;&gt;</a>	
  		<!-- /TMPL_iF -->
  	
  			<br>
! 		<input type="submit" class="button" value="Drucker hinzuf&uuml;gen" alt="Drucker hinzuf&uuml;gen">
  		<br>
  			</form>
--- 168,176 ----
  	
  		<!-- TMPL_IF NAME="ltcount" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">N&auml;chste &gt;&gt;</a>	
  		<!-- /TMPL_iF -->
  	
  			<br>
! 		<input type="submit" class="button" value="Drucker hinzuf&uuml;gen" alt="Add printer">
  		<br>
  			</form>

Index: systempreferences.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/systempreferences.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** systempreferences.tmpl	12 May 2005 19:26:35 -0000	1.1
--- systempreferences.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 40,52 ****
  			var alertString2;
  			if (f.variable.value.length==0) {
! 				_alertString += "\n- " + _("variable missing");
  			}
  			if (f.value.value.length==0) {
! 				_alertString += "\n- " + _("value missing");
  			}
  			if (_alertString.length==0) {
  				document.Aform.submit();
  			} else {
! 				alertString2  = _("Form not submitted because of the following problem(s)");
  				alertString2 += "\n------------------------------------------------------------------------------------\n";
  				alertString2 += _alertString;
--- 40,52 ----
  			var alertString2;
  			if (f.variable.value.length==0) {
! 				_alertString += "\n- " + _("Variable fehlt");
  			}
  			if (f.value.value.length==0) {
! 				_alertString += "\n- " + _("Wert fehlt");
  			}
  			if (_alertString.length==0) {
  				document.Aform.submit();
  			} else {
! 				alertString2  = _("Daten wegen der folgenden Probleme nicht gespeichert");
  				alertString2 += "\n------------------------------------------------------------------------------------\n";
  				alertString2 += _alertString;
***************
*** 89,93 ****
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF NAME="type-yesno" -->
! 					<input type="radio" name="value" value="1"<!-- TMPL_IF NAME="value-yes" --> checked<!-- /TMPL_IF -->>Ja <input type="radio" name="value" value="0"<!-- TMPL_IF NAME="value-no" --> checked<!-- /TMPL_IF -->>Nein
  				<!-- /TMPL_IF -->
  	
--- 89,94 ----
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF NAME="type-yesno" -->
! 					<input type="radio" name="value" value="1"<!-- TMPL_IF NAME="value-yes" --> checked<!-- /TMPL_IF -->>Ja 
! 					<input type="radio" name="value" value="0"<!-- TMPL_IF NAME="value-no" --> checked<!-- /TMPL_IF -->>Nein
  				<!-- /TMPL_IF -->
  	

Index: z3950servers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/parameters/z3950servers.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** z3950servers.tmpl	12 May 2005 19:26:35 -0000	1.1
--- z3950servers.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 64,68 ****
  							document.Aform.submit();
  					} else {
! 							alertString2  = _("Form not submitted because of the following problem(s)");
  							alertString2 += "\n------------------------------------------------------------------------------------\n";
  							alertString2 += _alertString;
--- 64,68 ----
  							document.Aform.submit();
  					} else {
! 							alertString2  = _("Daten wegen der folgenden Probleme nicht gespeichert");
  							alertString2 += "\n------------------------------------------------------------------------------------\n";
  							alertString2 += _alertString;
***************
*** 191,195 ****
  	
  	<!-- TMPL_IF NAME="else" -->
! 			<h1 class="parameters">Admin Z39.50 Server</h1>
  			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  				<input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
--- 191,195 ----
  	
  	<!-- TMPL_IF NAME="else" -->
! 			<h1 class="parameters">Administration Z39.50 Server</h1>
  			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  				<input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
***************
*** 197,201 ****
  			</form>
  			<!-- TMPL_IF NAME="searchfield" -->
! 				You searched for <b><!-- TMPL_VAR NAME="searchfield" --></b>
  			<!-- /TMPL_IF -->
  			<table>
--- 197,201 ----
  			</form>
  			<!-- TMPL_IF NAME="searchfield" -->
! 				Sie suchten nach <b><!-- TMPL_VAR NAME="searchfield" --></b>
  			<!-- /TMPL_IF -->
  			<table>




From hellen at users.sourceforge.net  Sat Jun 25 14:58:57 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:57 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/reports borrowers_out.tmpl,1.1,1.2
Message-ID: <E1DmAFN-0007yy-0a@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/reports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30254/koha-tmpl/intranet-tmpl/default/de/reports

Modified Files:
	borrowers_out.tmpl 
Log Message:
adjustments for 2.2.3

Index: borrowers_out.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/reports/borrowers_out.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** borrowers_out.tmpl	12 May 2005 19:26:35 -0000	1.1
--- borrowers_out.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 1,3 ****
--- 1,4 ----
  <!-- TMPL_INCLUDE NAME="reportswcal-top.inc" -->
+ <!-- angepasst fuer 2.2.3, hellen 24/06/05 -->
  <div id="mainbloc" >
  
***************
*** 80,84 ****
  		<input type="radio" checked name="output" value="screen" > In ein Browserfenster
  		<br>
! 		<input type="radio" name="output" value="file"> In eine Datei <input type="text" name="basename" value="Export"> In eine Anwendung <!-- TMPL_VAR NAME="CGIextChoice" --> <!-- TMPL_VAR NAME="CGIsepChoice" -->
  	</p>
  	</div>
--- 81,87 ----
  		<input type="radio" checked name="output" value="screen" > In ein Browserfenster
  		<br>
! 		<input type="radio" name="output" value="file"> In eine Datei <input type="text" name="basename" value="Export"> In eine Anwendung
! 		<!-- TMPL_VAR NAME="CGIextChoice" -->
! 		<!-- TMPL_VAR NAME="CGIsepChoice" -->
  	</p>
  	</div>




From hellen at users.sourceforge.net  Sat Jun 25 14:58:56 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/includes acquisitions-top.inc,1.1,1.2 common-style.css,1.1,1.2 marc-top.inc,1.1,1.2
Message-ID: <E1DmAFM-0007ye-MX@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30254/koha-tmpl/intranet-tmpl/default/de/includes

Modified Files:
	acquisitions-top.inc common-style.css marc-top.inc 
Log Message:
adjustments for 2.2.3

Index: acquisitions-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/includes/acquisitions-top.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** acquisitions-top.inc	12 May 2005 19:26:16 -0000	1.1
--- acquisitions-top.inc	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 34,38 ****
  <div id="menubar">
  	<span class="koha"><a class="home" href="/cgi-bin/koha/mainpage.pl">Koha</a></span>
! 	<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Erwerbung</a> <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Katalog</a> <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Ausleihe</a> <a class="members" href="/cgi-bin/koha/members/members-home.pl">Benutzer</a> <a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> <a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a> <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameter</a> <a class="about" href="/cgi-bin/koha/about.pl">&Uuml;ber</a> <a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Hilfe</a>
  </div>
  <!-- TMPL_IF NAME="loggedinusername" -->
--- 34,46 ----
  <div id="menubar">
  	<span class="koha"><a class="home" href="/cgi-bin/koha/mainpage.pl">Koha</a></span>
! 	<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Erwerbung</a> 
! 	<a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Katalog</a>
! 	<a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Ausleihe</a> 
! 	<a class="members" href="/cgi-bin/koha/members/members-home.pl">Benutzer</a> 
! 	<a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> 
! 	<a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a> 
! 	<a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameter</a> 
! 	<a class="about" href="/cgi-bin/koha/about.pl">&Uuml;ber</a> 
! 	<a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Hilfe</a>
  </div>
  <!-- TMPL_IF NAME="loggedinusername" -->

Index: common-style.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/includes/common-style.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** common-style.css	12 May 2005 19:26:16 -0000	1.1
--- common-style.css	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 75,79 ****
  	border:0px;
  	border-collapse:collapse;
- 	font-size:10pt;
  	margin : auto;
  }
--- 75,78 ----

Index: marc-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/includes/marc-top.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** marc-top.inc	12 May 2005 19:26:16 -0000	1.1
--- marc-top.inc	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 43,51 ****
  	<div id="menubar">
  		<span class="koha"><a class="home" href="/cgi-bin/koha/mainpage.pl">Koha</a></span>
! 		<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Erwerbung</a> <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Katalog</a> <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Ausleihe</a> <a class="members" href="/cgi-bin/koha/members/members-home.pl">Benutzer</a> <a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> <a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a> <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameter</a> <a class="about" href="/cgi-bin/koha/about.pl">&Uuml;ber</a> <a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Hilfe</a>
  	</div>
  	<div id="submenu">
  		<span class="koha">Optionen &gt;&gt;&nbsp;&nbsp;</span>
! 		<a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&amp;type=intranet" class="submenu2">Suche</a> <a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&amp;type=intranet" class="submenu">Biblio hinzuf&uuml;gen</a> <a class="submenu2" href="/cgi-bin/koha/bull-home.pl">Serie</a> <a href="/cgi-bin/koha/bookshelves/shelves.pl" class="submenu">Virtuelle Regale</a>
  	</div>
  <!-- /TMPL_UNLESS -->
--- 43,62 ----
  	<div id="menubar">
  		<span class="koha"><a class="home" href="/cgi-bin/koha/mainpage.pl">Koha</a></span>
! 		<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Erwerbung</a> 
! 		<a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Katalog</a> 
! 		<a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Ausleihe</a> 
! 		<a class="members" href="/cgi-bin/koha/members/members-home.pl">Benutzer</a> 
! 		<a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> 
! 		<a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a> 
! 		<a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameter</a> 
! 		<a class="about" href="/cgi-bin/koha/about.pl">&Uuml;ber</a> 
! 		<a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Hilfe</a>
  	</div>
  	<div id="submenu">
  		<span class="koha">Optionen &gt;&gt;&nbsp;&nbsp;</span>
! 		<a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&amp;type=intranet" class="submenu2">Suche</a> 
! 		<a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&amp;type=intranet" class="submenu">Biblio hinzuf&uuml;gen</a> 
! 		<a class="submenu2" href="/cgi-bin/koha/bull-home.pl">Serie</a> 
! 		<a href="/cgi-bin/koha/bookshelves/shelves.pl" class="submenu">Virtuelle Regale</a>
  	</div>
  <!-- /TMPL_UNLESS -->




From hellen at users.sourceforge.net  Sat Jun 25 14:58:56 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/members member.tmpl,1.1,1.2 memberentry.tmpl,1.1,1.2 pay.tmpl,1.1,1.2
Message-ID: <E1DmAFM-0007yn-T6@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30254/koha-tmpl/intranet-tmpl/default/de/members

Modified Files:
	member.tmpl memberentry.tmpl pay.tmpl 
Log Message:
adjustments for 2.2.3

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/members/member.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** member.tmpl	12 May 2005 19:26:35 -0000	1.1
--- member.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 2,10 ****
  <div id="mainbloc">
  <h1>Benutzersuche</h1>
! 
  <div class="bloc100">
  	<div class="bloctitle">Suche nach</div>
  	<form action="/cgi-bin/koha/members/member.pl" method="post">
! 		<input type="text" name="member" value="<!-- TMPL_VAR NAME="member" -->">  order by 
  		<select name="orderby">
  			<option value="surname,firstname">Nachname</option>
--- 2,11 ----
  <div id="mainbloc">
  <h1>Benutzersuche</h1>
! <!-- angepasst fuer 2.2.3, hellen 24/06/05 -->
  <div class="bloc100">
  	<div class="bloctitle">Suche nach</div>
  	<form action="/cgi-bin/koha/members/member.pl" method="post">
! 		<input type="text" name="member" value="<!-- TMPL_VAR NAME="member" -->">
! 		  order by 
  		<select name="orderby">
  			<option value="surname,firstname">Nachname</option>
***************
*** 47,51 ****
  	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
  	<input type="submit" class="button" value="Benutzer hinzuf&uuml;gen" title="Benutzer hinzuf&uuml;gen" alt="Benutzer hinzuf&uuml;gen">
! 	<input type="radio" name="categorycode" value="" checked>Erwachsener <input type="radio" name="categorycode" value="I" >Organisation
  	<input type="hidden" name="actionType" value="Add">
  	</form>
--- 48,53 ----
  	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
  	<input type="submit" class="button" value="Benutzer hinzuf&uuml;gen" title="Benutzer hinzuf&uuml;gen" alt="Benutzer hinzuf&uuml;gen">
! 	<input type="radio" name="categorycode" value="" checked>Erwachsener
! 	<input type="radio" name="categorycode" value="I" >Organisation
  	<input type="hidden" name="actionType" value="Add">
  	</form>

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/members/memberentry.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** memberentry.tmpl	12 May 2005 19:26:35 -0000	1.1
--- memberentry.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 1,4 ****
  <!-- TMPL_INCLUDE NAME="members-top.inc" -->
! 
  <div id="mainbloc">
  	<!-- TMPL_IF NAME="addAction" -->
--- 1,4 ----
  <!-- TMPL_INCLUDE NAME="members-top.inc" -->
! <!-- angepasst fuer 2.2.3, hellen 24/06/05 -->
  <div id="mainbloc">
  	<!-- TMPL_IF NAME="addAction" -->
***************
*** 102,106 ****
  				<td colspan="2">
  				<!-- TMPL_UNLESS name="institution" -->
! 					<input type="radio" name="sex" value="F"<!-- TMPL_IF NAME="female" --> checked<!-- /TMPL_IF -->>F  <input type="radio" name="sex" value="M"<!-- TMPL_UNLESS name="female" --> checked<!-- /TMPL_UNLESS -->> M
  				<!-- /TMPL_UNLESS -->
  
--- 102,109 ----
  				<td colspan="2">
  				<!-- TMPL_UNLESS name="institution" -->
! 					<input type="radio" name="sex" value="F"<!-- TMPL_IF NAME="female" --> checked<!-- /TMPL_IF -->>F  
! 					<input type="radio" name="sex" value="M"<!-- TMPL_UNLESS NAME="female" --> checked<!-- /TMPL_UNLESS -->>M  
! 					
! 
  				<!-- /TMPL_UNLESS -->
  
***************
*** 248,252 ****
  				<tr>
  					<td colspan="2"><!-- TMPL_VAR NAME="html" --></td>
! 					<td colspan="3"><input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR NAME="yes" -->>Ja <input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="0" <!-- TMPL_VAR NAME="no" -->>Nein
  					</td>
  				</tr>
--- 251,256 ----
  				<tr>
  					<td colspan="2"><!-- TMPL_VAR NAME="html" --></td>
! 					<td colspan="3"><input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR NAME="yes" -->>Ja 
! 					<input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="0" <!-- TMPL_VAR NAME="no" -->>Nein
  					</td>
  				</tr>

Index: pay.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/members/pay.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** pay.tmpl	12 May 2005 19:26:35 -0000	1.1
--- pay.tmpl	25 Jun 2005 12:58:54 -0000	1.2
***************
*** 1,3 ****
--- 1,4 ----
  <!-- TMPL_INCLUDE NAME="members-top.inc" -->
+ <!-- angepasst fuer 2.2.3, hellen 24/06/05 -->
  <div id="mainbloc">
  <h1>Zahlung Mahngeb&uuml;hren f&uuml;r <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
***************
*** 12,16 ****
  <!-- TMPL_LOOP NAME="loop_pay" -->
  <tr valign="top">
! 	<td><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->"><input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="no" checked="checked">Unpaid  <input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="yes">Pay  <input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="wo">Writeoff
  	<input type="hidden" name="itemnumber<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="itemnumber" -->">
  	<input type="hidden" name="accounttype<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="accounttype" -->">
--- 13,19 ----
  <!-- TMPL_LOOP NAME="loop_pay" -->
  <tr valign="top">
! 	<td><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->"><input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="no" checked="checked">Unbezahlt
! 	<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="yes">Zahlen 
! 	<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="wo">Abschreiben
  	<input type="hidden" name="itemnumber<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="itemnumber" -->">
  	<input type="hidden" name="accounttype<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="accounttype" -->">




From hellen at users.sourceforge.net  Sat Jun 25 14:58:56 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Sat, 25 Jun 2005 05:58:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/circ branchtransfers.tmpl,1.2,1.3 circulation.tmpl,1.2,1.3 selectbranchprinter.tmpl,1.2,1.3
Message-ID: <E1DmAFM-0007yL-CY@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30254/koha-tmpl/intranet-tmpl/default/de/circ

Modified Files:
	branchtransfers.tmpl circulation.tmpl selectbranchprinter.tmpl 
Log Message:
adjustments for 2.2.3

Index: branchtransfers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/circ/branchtransfers.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** branchtransfers.tmpl	17 May 2005 13:21:35 -0000	1.2
--- branchtransfers.tmpl	25 Jun 2005 12:58:53 -0000	1.3
***************
*** 6,10 ****
  
  <h1>Ausleihe: Leihverkehr</h1>
! <b>Zweigstelle:</b> <!-- TMPL_VAR NAME="genbrname" --> &nbsp; <b>Drucker:</b> <!-- TMPL_VAR NAME="genprname" --> <a href="selectbranchprinter.pl" class="button">Einstellungen &auml;ndern</a>
  <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
  <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
--- 6,12 ----
  
  <h1>Ausleihe: Leihverkehr</h1>
! <b>Zweigstelle:</b> <!-- TMPL_VAR NAME="genbrname" --> &nbsp;
!  <b>Drucker:</b> <!-- TMPL_VAR NAME="genprname" -->
!  <a href="selectbranchprinter.pl" class="button">Einstellungen &auml;ndern</a>
  <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
  <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/circ/circulation.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** circulation.tmpl	17 May 2005 13:21:35 -0000	1.2
--- circulation.tmpl	25 Jun 2005 12:58:53 -0000	1.3
***************
*** 11,15 ****
  		<h2 class="circulation">Parameter</h2>
  		<p>
! 			<b>Zweigstelle:</b> <!-- TMPL_VAR NAME="branchname" --> &nbsp; <b>Drucker:</b> <!-- TMPL_VAR NAME="printername" --> <a href="selectbranchprinter.pl" class="button circulation">Einstellungen &auml;ndern</a>
  		</p>
  	
--- 11,16 ----
  		<h2 class="circulation">Parameter</h2>
  		<p>
! 			<b>Zweigstelle:</b> <!-- TMPL_VAR NAME="branchname" --> &nbsp; 
! 			<b>Drucker:</b> <!-- TMPL_VAR NAME="printername" --> <a href="selectbranchprinter.pl" class="button circulation">Einstellungen &auml;ndern</a>
  		</p>
  	

Index: selectbranchprinter.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/circ/selectbranchprinter.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** selectbranchprinter.tmpl	17 May 2005 13:21:35 -0000	1.2
--- selectbranchprinter.tmpl	25 Jun 2005 12:58:53 -0000	1.3
***************
*** 30,34 ****
  <!-- /TMPL_IF --></p>
  <p><input type="hidden" name="setcookies" value="1">
! <input value="Abschicken" type="changesettings" class="button"></p>
  </form>
  
--- 30,34 ----
  <!-- /TMPL_IF --></p>
  <p><input type="hidden" name="setcookies" value="1">
! <input type="submit" value="Abschicken" type="changesettings" class="button"></p>
  </form>
  




From shedges at users.sourceforge.net  Mon Jun 27 02:47:44 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Sun, 26 Jun 2005 17:47:44 -0700
Subject: [Koha-cvs] CVS: koha-doc codingguidelines.xml,1.1,1.2
Message-ID: <E1Dmhmq-0006gG-DC@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25672

Modified Files:
	codingguidelines.xml 
Log Message:
Added warning about TMPL_IF inside html tags

Index: codingguidelines.xml
===================================================================
RCS file: /cvsroot/koha/koha-doc/codingguidelines.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** codingguidelines.xml	13 Jun 2005 11:08:51 -0000	1.1
--- codingguidelines.xml	27 Jun 2005 00:47:42 -0000	1.2
***************
*** 159,162 ****
--- 159,173 ----
  }</programlisting>
  
+         <para>Be aware that Koha's translation tool cannot handle
+         <userinput>&lt;!-- TMPL_IF --&gt;</userinput> inside a standard HTML
+         tag, like:<programlisting>&lt;td &lt;!-- tmpl_if name="x"&gt;class="x"&lt;!-- /TMPL_IF --&gt;&gt; or
+ &lt;input ... &lt;!-- tmpl_if name="y" --&gt; checked&lt;!-- /TMPL_IF --&gt;&gt;</programlisting></para>
+ 
+         <para>PLEASE always write:<programlisting>&lt;!-- TMPL_IF name="y" --&gt;
+     &lt;input ... checked&gt;
+ &lt;!-- TMPL_ELSE --&gt;
+     &lt;input ...&gt;
+ &lt;!-- /TMPL_IF --&gt;</programlisting></para>
+ 
          <para>Note that some scripts use two different templates, depending on
          what the user wants to do. This is sometimes a mistake in Koha design,




From tipaul at users.sourceforge.net  Mon Jun 27 15:11:24 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 27 Jun 2005 06:11:24 -0700
Subject: [Koha-cvs] CVS: koha/misc/zebra/unimarc - New directory
Message-ID: <E1DmtOW-0002JJ-2M@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/zebra/unimarc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8833/misc/zebra/unimarc

Log Message:
Directory /cvsroot/koha/koha/misc/zebra/unimarc added to the repository





From tipaul at users.sourceforge.net  Mon Jun 27 15:11:12 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 27 Jun 2005 06:11:12 -0700
Subject: [Koha-cvs] CVS: koha/misc/zebra - New directory
Message-ID: <E1DmtOK-0002H4-97@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/zebra
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8723/misc/zebra

Log Message:
Directory /cvsroot/koha/koha/misc/zebra added to the repository





From tipaul at users.sourceforge.net  Mon Jun 27 15:13:20 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 27 Jun 2005 06:13:20 -0700
Subject: [Koha-cvs] CVS: koha/misc/zebra/unimarc explain.att,NONE,1.1 unimarc.abs,NONE,1.1 unimarc.mar,NONE,1.1 unimarc.tag,NONE,1.1 zebra.cfg,NONE,1.1
Message-ID: <E1DmtQO-0002Yd-Uf@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/zebra/unimarc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9796

Added Files:
	explain.att unimarc.abs unimarc.mar unimarc.tag zebra.cfg 
Log Message:
some parameter files for zebra for UNIMARC. Just for testing & sharing purposes for instance.

--- NEW FILE ---
# The Explain Attribute Set
#
# $Id: explain.att,v 1.1 2005/06/27 13:13:17 tipaul Exp $
name explain
reference Exp-1

att 1			ExplainCategory
att 2			HumanStringLanguage
att 3			DatabaseName
att 4			Targetname
att 5			AttributeSetOID
att 6			RecordSyntaxOID
att 7			TagSetOID
att 8			ExtendedServicesOID
att 9			DateAdded
att 10			DateChanged
att 11			DateExpired
att 12			ElementSetName
att 13			ProcessingContext
att 14			ProcessingName
att 15			TermListName
att 16			SchemaOID
att 17			Producer
att 18			Supplier
att 19			Availability
att 20			Proprietary
att 21			UserFee

--- NEW FILE ---
name unimarc
reference Usmarc
attset bib1.att
tagset unimarc.tag

marc unimarc.mar

esetname B @
esetname F @

elm 700            Author                  -
elm 700/?          Author                  -
elm 700/?/a        Author                  !:w

#elm 701            Author                  -
#elm 701/?          Author                  -
#elm 701/?/a        Author                  !:w

elm 200            Title                   -
elm 200/?          Title                   -
elm 200/?/a        Title                   !:w,!:p
elm 200/?/e        Title                   !:w,!:p 

elm 210            Publisher               -
elm 210/?          Publisher               -
elm 210/?/c        Publisher               !:w
elm 210/?/d        Date-of-publication     !:w



--- NEW FILE ---
name unimarc
reference Usmarc

--- NEW FILE ---
# pseudo-tagset for unimarc (bib)

name unimarc
type 4

tag 701 701 string
tag 200 200 string
tag 210 210 string
tag 225 225 string
tag 010 010 string
tag 100 100 string
tag 005 005 generalizedtime
tag 615 615 string
tag 995 995 string



--- NEW FILE ---
# Simple Zebra configuration file that defines
# a database with USMARC records.
# $Id: zebra.cfg,v 1.1 2005/06/27 13:13:17 tipaul Exp $
#
# Where are the config files located?
profilePath: ${srcdir:-.}:${srcdir:-.}/../tab

# Files that describe the attribute sets supported.
attset: bib1.att
attset: explain.att

# Specify record type
recordType: grs.marc.unimarc

# Lock File Area
lockDir: lock

# Temp File area for result sets
setTmpDir: tmp

# Temp File area for index program
keyTmpDir: tmp

# Approx. Memory usage during indexing
memMax: 4




From hellen at users.sourceforge.net  Mon Jun 27 21:24:02 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Mon, 27 Jun 2005 12:24:02 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/includes auth-bottom.inc,1.1,1.2 auth-top.inc,1.1,1.2
Message-ID: <E1DmzD8-0005ap-9b@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21124/koha-tmpl/intranet-tmpl/default/de/includes

Modified Files:
	auth-bottom.inc auth-top.inc 
Log Message:
adjustments for 2.2.3

Index: auth-bottom.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/includes/auth-bottom.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** auth-bottom.inc	12 May 2005 19:26:16 -0000	1.1
--- auth-bottom.inc	27 Jun 2005 19:23:33 -0000	1.2
***************
*** 8,12 ****
  <a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Erwerbung</a> ||
  <a href="/cgi-bin/koha/circ/circulation.pl">Ausleihe</a> ||
! <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> ||
  <a href="/cgi-bin/koha/reports-home.pl">Reports</a> ||
  <a href="/cgi-bin/koha/admin-home.pl">Parameter</a> ||
--- 8,12 ----
  <a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Erwerbung</a> ||
  <a href="/cgi-bin/koha/circ/circulation.pl">Ausleihe</a> ||
! <a href="/cgi-bin/koha/authorities/authorities-home.pl">Autorit&auml;ten</a> ||
  <a href="/cgi-bin/koha/reports-home.pl">Reports</a> ||
  <a href="/cgi-bin/koha/admin-home.pl">Parameter</a> ||

Index: auth-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/includes/auth-top.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** auth-top.inc	12 May 2005 19:26:16 -0000	1.1
--- auth-top.inc	27 Jun 2005 19:23:36 -0000	1.2
***************
*** 3,7 ****
  <html>
  <head>
! <title>KOHA INTRANET: Authorities</title>
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  
--- 3,7 ----
  <html>
  <head>
! <title>KOHA INTRANET: Authorit&auml;ten</title>
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  
***************
*** 17,21 ****
  <script language="JavaScript" type="text/javascript">
  function Help() {
! 	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
  }
  
--- 17,21 ----
  <script language="JavaScript" type="text/javascript">
  function Help() {
! 	newin=window.open("/cgi-bin/koha/help.pl","Koha Hilfe",'width=600,height=600,toolbar=false,scrollbars=yes');
  }
  
***************
*** 74,78 ****
  	</select>
  	<a href="javascript:addauthority()" class="submenu2">
! 		Authority hinzuf&uuml;gen
  	</a>
  </div>
--- 74,78 ----
  	</select>
  	<a href="javascript:addauthority()" class="submenu2">
! 		Autorit&auml;t hinzuf&uuml;gen
  	</a>
  </div>
***************
*** 81,84 ****
      <p align="left">Angemeldet als: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Abmelden</a>]</p>
  <!-- TMPL_ELSE -->
!     <p align="left"><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
  <!-- /TMPL_IF -->
--- 81,84 ----
      <p align="left">Angemeldet als: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Abmelden</a>]</p>
  <!-- TMPL_ELSE -->
!     <p align="left"><a href="/cgi-bin/koha/opac-user.pl">Anmelden</a> bei Koha</p>
  <!-- /TMPL_IF -->




From hellen at users.sourceforge.net  Mon Jun 27 21:25:15 2005
From: hellen at users.sourceforge.net (Friedrich zur Hellen)
Date: Mon, 27 Jun 2005 12:25:15 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/de/authorities auth_finder.tmpl,1.1,1.2 authorities-home.tmpl,1.1,1.2 authorities.tmpl,1.2,1.3 detail-biblio-search.tmpl,1.1,1.2 detail.tmpl,1.1,1.2 searchresultlist-auth.tmpl,1.1,1.2 searchresultlist.tmpl,1.1,1.2
Message-ID: <E1DmzEJ-0005jM-GM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21124/koha-tmpl/intranet-tmpl/default/de/authorities

Modified Files:
	auth_finder.tmpl authorities-home.tmpl authorities.tmpl 
	detail-biblio-search.tmpl detail.tmpl 
	searchresultlist-auth.tmpl searchresultlist.tmpl 
Log Message:
adjustments for 2.2.3

Index: auth_finder.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities/auth_finder.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** auth_finder.tmpl	12 May 2005 19:26:14 -0000	1.1
--- auth_finder.tmpl	27 Jun 2005 19:23:28 -0000	1.2
***************
*** 2,6 ****
  <div id="mainbloc">
  
! <h1 class="authority">Authority search</h1>
  
  <form name="f" method="post">
--- 2,6 ----
  <div id="mainbloc">
  
! <h1 class="authority">Autorit&auml;tensuche</h1>
  
  <form name="f" method="post">
***************
*** 11,37 ****
  		<h2 class="authority">Suche nach</h2>
  		<p>
! 			<label class="label100">Authority type</label>
  			<!-- TMPL_VAR NAME="authtypecode" -->
  			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
  		</p>
  		<p>
! 			<label class="label100">Main entry</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->">
  			<input type="hidden" name="marclist" value="mainentry">
  			<input type="hidden" name="and_or" value="and">
  			<input type="hidden" name="excluding" value="">
  			<select name="operator">
! 				<option value="start">start by</option>
! 				<option value="contains">contains</option>
  			</select>
  			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
  		</p>
  		<p>
! 			<label class="label100">Anywhere</label><input type="text" name="value">
  			<input type="hidden" name="marclist" value="">
  			<input type="hidden" name="and_or" value="and">
  			<input type="hidden" name="excluding" value="">
  			<select name="operator">
! 				<option value="contains">contains</option>
! 				<option value="start">start by</option>
  			</select>
  			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
--- 11,37 ----
  		<h2 class="authority">Suche nach</h2>
  		<p>
! 			<label class="label100">Autorit&auml;tstyp</label>
  			<!-- TMPL_VAR NAME="authtypecode" -->
  			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
  		</p>
  		<p>
! 			<label class="label100">Haupteintrag</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->">
  			<input type="hidden" name="marclist" value="mainentry">
  			<input type="hidden" name="and_or" value="and">
  			<input type="hidden" name="excluding" value="">
  			<select name="operator">
! 				<option value="start">starten mit</option>
! 				<option value="contains">enth&auml;lt</option>
  			</select>
  			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
  		</p>
  		<p>
! 			<label class="label100">Irgendwo</label><input type="text" name="value">
  			<input type="hidden" name="marclist" value="">
  			<input type="hidden" name="and_or" value="and">
  			<input type="hidden" name="excluding" value="">
  			<select name="operator">
! 				<option value="contains">enth&auml;lt</option>
! 				<option value="start">starten mit</option>
  			</select>
  			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">

Index: authorities-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities/authorities-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** authorities-home.tmpl	12 May 2005 19:26:14 -0000	1.1
--- authorities-home.tmpl	27 Jun 2005 19:23:31 -0000	1.2
***************
*** 2,6 ****
  <div id="mainbloc">
  
! <h1 class="authority">Authority search</h1>
  
  <form name="f" method="post">
--- 2,6 ----
  <div id="mainbloc">
  
! <h1 class="authority">Autorit&auml;tensuche</h1>
  
  <form name="f" method="post">
***************
*** 19,23 ****
  		</h2>
  		<p>
! 			<label class="label100">Main entry</label>
  			<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
  			<input type="hidden" name="marclist" value="mainentry">
--- 19,23 ----
  		</h2>
  		<p>
! 			<label class="label100">Haupteintrag</label>
  			<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
  			<input type="hidden" name="marclist" value="mainentry">
***************
*** 25,34 ****
  			<input type="hidden" name="excluding" value="">
  			<select name="operator">
! 				<option value="contains">contains</option>
! 				<option value="start">start by</option>
  			</select>
  		</p>
  		<p>
! 			<label class="label100">Anywhere</label>
  			<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
  			<input type="hidden" name="marclist" value="">
--- 25,34 ----
  			<input type="hidden" name="excluding" value="">
  			<select name="operator">
! 				<option value="contains">enth&auml;lt</option>
! 				<option value="start">starten mit</option>
  			</select>
  		</p>
  		<p>
! 			<label class="label100">Irgendwo</label>
  			<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
  			<input type="hidden" name="marclist" value="">
***************
*** 36,41 ****
  			<input type="hidden" name="excluding" value="">
  			<select name="operator">
! 				<option value="contains">contains</option>
! 				<option value="start">start by</option>
  			</select>
  		</p>
--- 36,41 ----
  			<input type="hidden" name="excluding" value="">
  			<select name="operator">
! 				<option value="contains">enth&auml;lt</option>
! 				<option value="start">starten mit</option>
  			</select>
  		</p>

Index: authorities.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities/authorities.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** authorities.tmpl	25 Jun 2005 12:58:53 -0000	1.2
--- authorities.tmpl	27 Jun 2005 19:23:32 -0000	1.3
***************
*** 5,11 ****
  	<form method="post" name="f">
  	<!-- TMPL_IF name="authid" -->
! 		<h1 class="authority">Modify authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
  	<!-- TMPL_ELSE -->
! 		<h1 class="authority">Adding authority (<!-- TMPL_VAR name="authtypetext" -->)</h1>
  	<!-- /TMPL_IF -->
  	<p>
--- 5,11 ----
  	<form method="post" name="f">
  	<!-- TMPL_IF name="authid" -->
! 		<h1 class="authority">Autorit&auml;t &auml;ndern<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
  	<!-- TMPL_ELSE -->
! 		<h1 class="authority">Autorit&auml;t hinzuf&uuml;gen (<!-- TMPL_VAR name="authtypetext" -->)</h1>
  	<!-- /TMPL_IF -->
  	<p>
***************
*** 15,21 ****
  		<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->">
  		<!-- TMPL_IF name="authid" -->
! 			<input type="button" value="Save" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- TMPL_ELSE -->
! 			<input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- /TMPL_IF -->
  	</p>
--- 15,21 ----
  		<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->">
  		<!-- TMPL_IF name="authid" -->
! 			<input type="button" value="Speichern" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- TMPL_ELSE -->
! 			<input type="button" value="Autorit&auml;t hinzuf&uuml;gen" onClick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- /TMPL_IF -->
  	</p>
***************
*** 25,33 ****
  <!-- TMPL_IF name="duplicateauthid" -->
  	<div class="problem">
! 		<p>Duplicate suspected with <a href='javascript:openWindow("detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&popup=1", "Duplicate Authority")' class="button authority"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
! 		<p>You must either :</p>
  		<ul>
! 			<p><input type="checkbox" value=1 name="confirm_not_duplicate">confirm it's not a duplicate (and click on <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority"> again)</p>
! 			<p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >original authority</a></p>
  		</ul>
  	</div>
--- 25,33 ----
  <!-- TMPL_IF name="duplicateauthid" -->
  	<div class="problem">
! 		<p>Duplikat vermutlich mit <a href='javascript:openWindow("detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&popup=1", "Duplicate Authority")' class="button authority"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
! 		<p>Sie m&uuml;sen entweder :</p>
  		<ul>
! 			<p><input type="checkbox" value=1 name="confirm_not_duplicate">best&auml;tigen, da&szlig; es kein Duplikat ist (und auf den Button <input type="button" value="Autorit&auml;t hinzuf&uuml;gen" onClick="Check(this.form)" accesskey="w" class="button authority"> klicken)</p>
! 			<p>oder zur <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >originalen Autorit&auml;t gehen</a></p>
  		</ul>
  	</div>
***************
*** 145,152 ****
  	var alertString2;
  	if (total_errors!=0) {
! 		alertString2  = _("Form not submitted because of the following problem(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_missing_mandatory_tags +_(" mandatory tags empty");
! 		alertString2 += "\n- "+ total_missing_mandatory_subfields +_(" mandatory fields empty (see bold subfields)");
  		alert(alertString2);
  	} else {
--- 145,152 ----
  	var alertString2;
  	if (total_errors!=0) {
! 		alertString2  = _("Daten wegen der folgenden Probleme nicht gespeichert");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_missing_mandatory_tags +_(" Pflichttag leer");
! 		alertString2 += "\n- "+ total_missing_mandatory_subfields +_(" Pflichttags leer (siehe fett abgebildete Subfields)");
  		alert(alertString2);
  	} else {

Index: detail-biblio-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities/detail-biblio-search.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** detail-biblio-search.tmpl	12 May 2005 19:26:14 -0000	1.1
--- detail-biblio-search.tmpl	27 Jun 2005 19:23:32 -0000	1.2
***************
*** 2,6 ****
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1 class="authority">Authority number : <!-- TMPL_VAR NAME="authid" --></h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
--- 2,6 ----
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1 class="authority">Autorit&auml;tsnummer : <!-- TMPL_VAR NAME="authid" --></h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
***************
*** 39,43 ****
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Are you sure you want to delete this biblio?');
  	if (is_confirmed) {
  		window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";
--- 39,43 ----
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Sind Sie sicher, da&szlig Sie diesen Biblio l&ouml;schen wollen?');
  	if (is_confirmed) {
  		window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities/detail.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** detail.tmpl	12 May 2005 19:26:14 -0000	1.1
--- detail.tmpl	27 Jun 2005 19:23:32 -0000	1.2
***************
*** 2,6 ****
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1 class="authority">Authority number : <!-- TMPL_VAR NAME="authid" --></h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
--- 2,6 ----
  <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
  <div class="tabbed">
! 	<h1 class="authority">Autorit&auml;tsnummer: <!-- TMPL_VAR NAME="authid" --></h1>
  	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
***************
*** 9,13 ****
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png">
  	</a>
! 	<a href="javascript:Dopop('detailprint.pl?authid=<!-- TMPL_VAR NAME="authid" -->')" class="button authority">  Print  </a>  <a href="../search.marc/search.pl?type=intranet&amp;op=do_search&amp;marclist=<!-- TMPL_VAR NAME="biblio_fields" -->&amp;operator==&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;and_or=and&amp;excluding=" class="button authority"><!-- TMPL_VAR name="count" --> biblios</a>
  </div>
  
--- 9,13 ----
  		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png">
  	</a>
! 	<a href="javascript:Dopop('detailprint.pl?authid=<!-- TMPL_VAR NAME="authid" -->')" class="button authority">  Drucken  </a>  <a href="../search.marc/search.pl?type=intranet&amp;op=do_search&amp;marclist=<!-- TMPL_VAR NAME="biblio_fields" -->&amp;operator==&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;and_or=and&amp;excluding=" class="button authority"><!-- TMPL_VAR name="count" --> biblios</a>
  </div>
  
***************
*** 34,38 ****
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Are you sure you want to delete this authority?');
  	if (is_confirmed) {
  		window.location="authorities-home.pl?op=delete&amp;authid=<!-- TMPL_VAR NAME="authid" -->";
--- 34,38 ----
  
  function confirm_deletion() {
! 	var is_confirmed = confirm('Sid Sie sicher, da&szlig Sie diese Autorit&auml;t l&ouml;schen wollen?');
  	if (is_confirmed) {
  		window.location="authorities-home.pl?op=delete&amp;authid=<!-- TMPL_VAR NAME="authid" -->";

Index: searchresultlist-auth.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities/searchresultlist-auth.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** searchresultlist-auth.tmpl	12 May 2005 19:26:14 -0000	1.1
--- searchresultlist-auth.tmpl	27 Jun 2005 19:23:33 -0000	1.2
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE NAME="auth-search-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="authority">Authority search results</h1>
  	<div id="bloc25">
  		<form name="f" method="post" action="auth_finder.pl">
--- 1,5 ----
  <!-- TMPL_INCLUDE NAME="auth-search-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="authority">Autorit&auml;ten: Suchergebnisse</h1>
  	<div id="bloc25">
  		<form name="f" method="post" action="auth_finder.pl">
***************
*** 10,36 ****
  				<h2 class="authority">Suche nach</h2>
  				<p>
! 					<label class="label100">Authority type</label>
  					<!-- TMPL_VAR NAME="authtypecode" -->
  					<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
  				</p>
  				<p>
! 					<label class="label100">Main entry</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->">
  					<input type="hidden" name="marclist" value="mainentry">
  					<input type="hidden" name="and_or" value="and">
  					<input type="hidden" name="excluding" value="">
  					<select name="operator">
! 						<option value="start">start by</option>
! 						<option value="contains">contains</option>
  					</select>
  					<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
  				</p>
  				<p>
! 					<label class="label100">Anywhere</label><input type="text" name="value">
  					<input type="hidden" name="marclist" value="">
  					<input type="hidden" name="and_or" value="and">
  					<input type="hidden" name="excluding" value="">
  					<select name="operator">
! 						<option value="contains">contains</option>
! 						<option value="start">start by</option>
  					</select>
  					<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
--- 10,36 ----
  				<h2 class="authority">Suche nach</h2>
  				<p>
! 					<label class="label100">Autorit&auml;tstyp</label>
  					<!-- TMPL_VAR NAME="authtypecode" -->
  					<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
  				</p>
  				<p>
! 					<label class="label100">Haupteintrag</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->">
  					<input type="hidden" name="marclist" value="mainentry">
  					<input type="hidden" name="and_or" value="and">
  					<input type="hidden" name="excluding" value="">
  					<select name="operator">
! 						<option value="start">Start mit</option>
! 						<option value="contains">enth&auml;lt</option>
  					</select>
  					<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
  				</p>
  				<p>
! 					<label class="label100">Irgendwo</label><input type="text" name="value">
  					<input type="hidden" name="marclist" value="">
  					<input type="hidden" name="and_or" value="and">
  					<input type="hidden" name="excluding" value="">
  					<select name="operator">
! 						<option value="contains">enth&auml;lt</option>
! 						<option value="start">Start mit</option>
  					</select>
  					<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
***************
*** 75,80 ****
  				<tr>
  					<th class="authority">Zusammenfassung</th>
! 					<th class="authority">Used</th>
! 					<th class="authority">Get It!</th>
  				</tr>
  				<tr>
--- 75,80 ----
  				<tr>
  					<th class="authority">Zusammenfassung</th>
! 					<th class="authority">Verwendet</th>
! 					<th class="authority">Nehmen!</th>
  				</tr>
  				<tr>

Index: searchresultlist.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/de/authorities/searchresultlist.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** searchresultlist.tmpl	12 May 2005 19:26:14 -0000	1.1
--- searchresultlist.tmpl	27 Jun 2005 19:23:33 -0000	1.2
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE NAME="auth-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="authority">Authority search results</h1>
  	<div id="resultnumber">
  		<p>
--- 1,5 ----
  <!-- TMPL_INCLUDE NAME="auth-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="authority">Autorit&auml;ten-Suchergebnisse</h1>
  	<div id="resultnumber">
  		<p>
***************
*** 36,40 ****
  			<tr>
  				<th class="authority">Zusammenfassung</th>
! 				<th class="authority">Used in</th>
  				<th class="authority">Zeige</th>
  				<th class="authority">L&ouml;schen</th>
--- 36,40 ----
  			<tr>
  				<th class="authority">Zusammenfassung</th>
! 				<th class="authority">Verwendet in</th>
  				<th class="authority">Zeige</th>
  				<th class="authority">L&ouml;schen</th>




From genjimoto at users.sourceforge.net  Tue Jun 28 00:22:56 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Mon, 27 Jun 2005 15:22:56 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.22,1.23
Message-ID: <E1Dn20G-0007kh-DJ@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac-detail.tmpl 
Log Message:
CSSed the sidebar implementation

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** opac-detail.tmpl	25 Jun 2005 06:56:47 -0000	1.22
--- opac-detail.tmpl	27 Jun 2005 22:22:52 -0000	1.23
***************
*** 1,7 ****
  <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
! <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
! <table width="100%">
! <tr>
! <td width="70%">
  <div id="bibliomenu">
  	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
--- 1,5 ----
  <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
! <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css"/>
! 
  <div id="bibliomenu">
  	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
***************
*** 32,36 ****
  	<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Add to basket</a>
  </div>
! 
  <div id="mainbloc">
  	<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
--- 30,34 ----
  	<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Add to basket</a>
  </div>
! <div id="homebloc">
  <div id="mainbloc">
  	<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
***************
*** 171,176 ****
  	</div>
  </div>
! </td>
! <td width="30%">
  Search Options:<br>
  Select keywords from list<br>
--- 169,174 ----
  	</div>
  </div>
! </div>
! <div id="rightbloc">
  Search Options:<br>
  Select keywords from list<br>
***************
*** 201,206 ****
  <input type="submit" value="Search">
  </form>
! </td>
! </tr>
! </table>
  <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
--- 199,202 ----
  <input type="submit" value="Search">
  </form>
! </div>
  <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->




From genjimoto at users.sourceforge.net  Tue Jun 28 00:24:01 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Mon, 27 Jun 2005 15:24:01 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.21,1.22
Message-ID: <E1Dn21J-0007t8-Jm@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	opac.css 
Log Message:
theres a leftbloc. Why not a rightbloc? There is now.

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** opac.css	20 Jun 2005 14:22:29 -0000	1.21
--- opac.css	27 Jun 2005 22:23:58 -0000	1.22
***************
*** 312,316 ****
  	border:0;
  }
! 
  #bottombloc {
  	width:100%;
--- 312,320 ----
  	border:0;
  }
! #rightbloc {
! 	float:right;
! 	width:40%;
! 	border:0;
! }
  #bottombloc {
  	width:100%;




From genjimoto at users.sourceforge.net  Tue Jun 28 00:26:31 2005
From: genjimoto at users.sourceforge.net (Waylon Robertson)
Date: Mon, 27 Jun 2005 15:26:31 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-detail.pl,1.21,1.22
Message-ID: <E1Dn23j-00087x-0U@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31154

Modified Files:
	opac-detail.pl 
Log Message:
Moved the title words splitting, changed the authorwords routine abit. added a check for author and additionalauthors. No use having checkboxes for non-existant data.

Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** opac-detail.pl	25 Jun 2005 05:22:00 -0000	1.21
--- opac-detail.pl	27 Jun 2005 22:26:16 -0000	1.22
***************
*** 32,42 ****
  my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
  
  $dat->{'count'}=@items;
  my @author;
  $dat->{'additional'}=$addauthor->[0]->{'author'};
  for (my $i = 1; $i < $authorcount; $i++) {
          $dat->{'additional'} .= " ; " . $addauthor->[$i]->{'author'};
          my %authorpush;
!         $authorpush{author} =$addauthor->[$i]->{'author'};
          push @author, \%authorpush
  } # for
--- 32,66 ----
  my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
  
+ my @title;
  $dat->{'count'}=@items;
  my @author;
+ if ($dat->{'author'}){
+ 	my %authorpush; 
+ 	$authorpush{author}=$dat->{'author'};
+ 	push @author, \%authorpush
+ }
  $dat->{'additional'}=$addauthor->[0]->{'author'};
+ if ($dat->{'additional'}){
+ 	my %authorpush;
+ 	$authorpush{author} =$addauthor->[0]->{'author'};
+ 	push @author, \%authorpush
+ }
+ 
+ foreach my $word (split(" ", $dat->{'title'})){
+         unless (length($word) == 4){
+                 $word =~s/\%//g
+         }
+         unless (C4::Context->stopwords->{uc($word)} or length($word)==1) {
+         my %titlepush;
+         $titlepush{title} =$word;
+                 push @title, \%titlepush;
+         }#it's NOT a stopword => use it. Otherwise, ignore
+ }
+ 
  for (my $i = 1; $i < $authorcount; $i++) {
          $dat->{'additional'} .= " ; " . $addauthor->[$i]->{'author'};
+     
          my %authorpush;
!         $authorpush{author}=$addauthor->[$i]->{'author'};
          push @author, \%authorpush
  } # for
***************
*** 64,90 ****
  
  my @results = ($dat,);
- my @title;
  
  
! foreach my $word (split(" ", $dat->{'title'})){
!         unless (length($word) == 4){
!                 $word =~s/\%//g
!         }
!         unless (C4::Context->stopwords->{uc($word)} or length($word)==1) {
!         my %titlepush;
!         $titlepush{title} =$word;
!                 push @title, \%titlepush;
!         }#it's NOT a stopword => use it. Otherwise, ignore
! }
! foreach my $word (split(" ", $dat->{'author'})){
!         unless (length($word) == 4){
!                 $word =~s/\%//g
!         }
!         unless (C4::Context->stopwords->{uc($word)} or length($word)==1) {
!         my %authorpush;
!         $authorpush{author}=$word;
!                 push @author, \%authorpush;
!         }#it's NOT a stopword => use it. Otherwise, ignore
! }
  
  my $resultsarray=\@results;
--- 88,96 ----
  
  my @results = ($dat,);
  
  
! 
! 
! 
  
  my $resultsarray=\@results;




From hdl at users.sourceforge.net  Tue Jun 28 00:58:44 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 27 Jun 2005 15:58:44 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl favicon.ico,NONE,1.1.2.2
Message-ID: <E1Dn2Yu-0003Ip-2v@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12657/koha-tmpl

Added Files:
      Tag: rel_2_2
	favicon.ico 
Log Message:
Adding favicon.ico

--- NEW FILE ---


>????

???67789:;???

???010234?5???

???,-./?????

???'()*+??????

???
$

????

?????	?????

????



From hdl at users.sourceforge.net  Tue Jun 28 01:03:11 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 27 Jun 2005 16:03:11 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes favicon.ico,NONE,1.1.2.1
Message-ID: <E1Dn2dD-0003oi-KH@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
      Tag: rel_2_2
	favicon.ico 
Log Message:
Adding favicon.ico to default en... Getting rid of favicon.ico warning in logs

--- NEW FILE ---


>????

???67789:;???

???010234?5???

???,-./?????

???'()*+??????

???
$

????

?????	?????

????



From hdl at users.sourceforge.net  Tue Jun 28 01:06:59 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 27 Jun 2005 16:06:59 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/catalogue detail.tmpl,1.9.2.1,1.9.2.2
Message-ID: <E1Dn2gt-0004FV-CW@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	detail.tmpl 
Log Message:
Reporting Doxulting Fix on a french template.

Index: detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/catalogue/detail.tmpl,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -r1.9.2.1 -r1.9.2.2
*** detail.tmpl	17 Feb 2005 13:06:28 -0000	1.9.2.1
--- detail.tmpl	27 Jun 2005 23:06:42 -0000	1.9.2.2
***************
*** 29,33 ****
  				<!-- TMPL_IF name="additional" --><label class="label100"><b>Additional Author:</b></label><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><label class="label100"><b>?dit? par :</b></label><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" --><br />
! 				<!-- TMPL_IF name="publicationyear" --><label class="label100"><b>S'inscrire </b></label><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
  				<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
  				<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br />
--- 29,33 ----
  				<!-- TMPL_IF name="additional" --><label class="label100"><b>Additional Author:</b></label><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><label class="label100"><b>?dit? par :</b></label><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" --><br />
! 				<!-- TMPL_IF name="publicationyear" --><label class="label100"><b>en </b></label><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
  				<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
  				<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br />




From hdl at users.sourceforge.net  Tue Jun 28 01:10:59 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 27 Jun 2005 16:10:59 -0700
Subject: [Koha-cvs] CVS: koha/z3950 z3950-daemon-launch.sh,1.4,1.4.4.1
Message-ID: <E1Dn2kl-0004fz-1f@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/z3950
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17937/z3950

Modified Files:
      Tag: rel_2_2
	z3950-daemon-launch.sh 
Log Message:
Removing -s from su call after Thomas D reports it breaks FreeBSD

Index: z3950-daemon-launch.sh
===================================================================
RCS file: /cvsroot/koha/koha/z3950/z3950-daemon-launch.sh,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -r1.4 -r1.4.4.1
*** z3950-daemon-launch.sh	5 Nov 2003 23:33:45 -0000	1.4
--- z3950-daemon-launch.sh	27 Jun 2005 23:10:55 -0000	1.4.4.1
***************
*** 33,37 ****
  fi
  
! su -s /bin/sh -c $KohaZ3950Shell - $RunAsUser &
  
  exit
--- 33,37 ----
  fi
  
! su -c $KohaZ3950Shell - $RunAsUser &
  
  exit
***************
*** 39,42 ****
--- 39,45 ----
  #--------------
  # $Log$
+ # Revision 1.4.4.1  2005/06/27 23:10:55  hdl
+ # Removing -s from su call after Thomas D reports it breaks FreeBSD
+ #
  # Revision 1.4  2003/11/05 23:33:45  slef
  # Now figures out what directory the scripts are in




From hdl at users.sourceforge.net  Tue Jun 28 01:24:10 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 27 Jun 2005 16:24:10 -0700
Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.115.2.13,1.115.2.14
Message-ID: <E1Dn2xW-0006E7-AF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23754/C4

Modified Files:
      Tag: rel_2_2
	Biblio.pm 
Log Message:
Display dashed ISBN


Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.115.2.13
retrieving revision 1.115.2.14
diff -C2 -r1.115.2.13 -r1.115.2.14
*** Biblio.pm	31 May 2005 12:44:26 -0000	1.115.2.13
--- Biblio.pm	27 Jun 2005 23:24:06 -0000	1.115.2.14
***************
*** 72,75 ****
--- 72,76 ----
    
    &FindDuplicate
+   &DisplayISBN
  );
  
***************
*** 2630,2633 ****
--- 2631,2671 ----
  }
  
+ sub DisplayISBN {
+ 	my ($isbn)=@_;
+ 	my $seg1;
+ 	if(substr($isbn, 0, 1) <=7) {
+ 		$seg1 = substr($isbn, 0, 1);
+ 	} elsif(substr($isbn, 0, 2) <= 94) {
+ 		$seg1 = substr($isbn, 0, 2);
+ 	} elsif(substr($isbn, 0, 3) <= 995) {
+ 		$seg1 = substr($isbn, 0, 3);
+ 	} elsif(substr($isbn, 0, 4) <= 9989) {
+ 		$seg1 = substr($isbn, 0, 4);
+ 	} else {
+ 		$seg1 = substr($isbn, 0, 5);
+ 	}
+ 	my $x = substr($isbn, length($seg1));
+ 	my $seg2;
+ 	if(substr($x, 0, 2) <= 19) {
+ # 		if(sTmp2 < 10) sTmp2 = "0" sTmp2;
+ 		$seg2 = substr($x, 0, 2);
+ 	} elsif(substr($x, 0, 3) <= 699) {
+ 		$seg2 = substr($x, 0, 3);
+ 	} elsif(substr($x, 0, 4) <= 8399) {
+ 		$seg2 = substr($x, 0, 4);
+ 	} elsif(substr($x, 0, 5) <= 89999) {
+ 		$seg2 = substr($x, 0, 5);
+ 	} elsif(substr($x, 0, 6) <= 9499999) {
+ 		$seg2 = substr($x, 0, 6);
+ 	} else {
+ 		$seg2 = substr($x, 0, 7);
+ 	}
+ 	my $seg3=substr($x,length($seg2));
+ 	$seg3=substr($seg3,0,length($seg3)-1) ;
+ 	my $seg4 = substr($x, -1, 1);
+ 	return "$seg1-$seg2-$seg3-$seg4";
+ }
+ 
+ 
  END { }    # module clean-up code here (global destructor)
  
***************
*** 2644,2647 ****
--- 2682,2688 ----
  # $Id$
  # $Log$
+ # Revision 1.115.2.14  2005/06/27 23:24:06  hdl
+ # Display dashed ISBN
+ #
  # Revision 1.115.2.13  2005/05/31 12:44:26  tipaul
  # patch from Genji (Waylon R.) to update subjects in MARC tables when systempref has MARC=OFF




From hdl at users.sourceforge.net  Tue Jun 28 01:24:38 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 27 Jun 2005 16:24:38 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-MARCdetail.pl,1.4.2.3,1.4.2.4
Message-ID: <E1Dn2xy-0006K0-Qm@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23754/opac

Modified Files:
      Tag: rel_2_2
	opac-MARCdetail.pl 
Log Message:
Display dashed ISBN


Index: opac-MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-MARCdetail.pl,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -r1.4.2.3 -r1.4.2.4
*** opac-MARCdetail.pl	25 Mar 2005 17:04:27 -0000	1.4.2.3
--- opac-MARCdetail.pl	27 Jun 2005 23:24:06 -0000	1.4.2.4
***************
*** 118,121 ****
--- 118,124 ----
  				if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{isurl}) {
  					$subfield_data{marc_value}="<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";
+ 				} elsif ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{kohafield} eq "biblioitems.isbn") {
+ #					warn " tag : ".$tagslib->{$fields[$x_i]->tag()}." subfield :".$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}. "ISBN : ".$subf[$i][1]."PosttraitementISBN :".DisplayISBN($subf[$i][1]);
+ 					$subfield_data{marc_value}=DisplayISBN($subf[$i][1]);
  				} else {
  					if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{authtypecode}) {




From hdl at users.sourceforge.net  Tue Jun 28 01:24:10 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 27 Jun 2005 16:24:10 -0700
Subject: [Koha-cvs] CVS: koha MARCdetail.pl,1.25.2.9,1.25.2.10
Message-ID: <E1Dn2xW-0006EI-S3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23754

Modified Files:
      Tag: rel_2_2
	MARCdetail.pl 
Log Message:
Display dashed ISBN


Index: MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/MARCdetail.pl,v
retrieving revision 1.25.2.9
retrieving revision 1.25.2.10
diff -C2 -r1.25.2.9 -r1.25.2.10
*** MARCdetail.pl	25 May 2005 09:34:40 -0000	1.25.2.9
--- MARCdetail.pl	27 Jun 2005 23:24:08 -0000	1.25.2.10
***************
*** 146,149 ****
--- 146,152 ----
  				if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{isurl}) {
  					$subfield_data{marc_value}="<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";
+ 				} elsif ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{kohafield} eq "biblioitems.isbn") {
+ #					warn " tag : ".$tagslib->{$fields[$x_i]->tag()}." subfield :".$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}. "ISBN : ".$subf[$i][1]."PosttraitementISBN :".DisplayISBN($subf[$i][1]);
+ 					$subfield_data{marc_value}=DisplayISBN($subf[$i][1]);
  				} else {
  					if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{authtypecode}) {




From hdl at users.sourceforge.net  Tue Jun 28 02:08:23 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 27 Jun 2005 17:08:23 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.17.2.8,1.17.2.9
Message-ID: <E1Dn3eJ-000457-3Q@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac.css 
Log Message:
Displaying overdue items  with red color... English version

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.17.2.8
retrieving revision 1.17.2.9
diff -C2 -r1.17.2.8 -r1.17.2.9
*** opac.css	17 Jun 2005 12:31:44 -0000	1.17.2.8
--- opac.css	28 Jun 2005 00:08:20 -0000	1.17.2.9
***************
*** 276,279 ****
--- 276,290 ----
  /* BLOCS */
  
+ #problem {
+ 	color: white;
+ 	font-weight:bold;
+ 	background-color:red;
+ }
+ .problem {
+ 	color: white;
+ 	font-weight:bold;
+ 	background-color:red;
+ }
+ 
  /* the mainbloc : everything is in mainbloc, except menu */
  #mainbloc {




From hdl at users.sourceforge.net  Tue Jun 28 02:08:23 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Mon, 27 Jun 2005 17:08:23 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-user.tmpl,1.8.2.4,1.8.2.5
Message-ID: <E1Dn3eJ-00045D-Fp@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-user.tmpl 
Log Message:
Displaying overdue items  with red color... English version

Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -C2 -r1.8.2.4 -r1.8.2.5
*** opac-user.tmpl	17 Jun 2005 12:31:44 -0000	1.8.2.4
--- opac-user.tmpl	28 Jun 2005 00:08:20 -0000	1.8.2.5
***************
*** 67,81 ****
  				<!-- 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>
--- 67,74 ----
  				<!-- TMPL_LOOP NAME="ISSUES" -->
  					<!-- TMPL_IF name="overdue"-->
! 						<tr class="problem">
  					<!-- TMPL_ELSE -->
  						<tr>
+ 					<!-- /TMPL_IF-->
  							<td><!-- TMPL_VAR NAME="title" --></td>
  							<td><!-- TMPL_VAR NAME="author" --></td>
***************
*** 86,90 ****
  							<td><!-- TMPL_IF NAME="status" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
  						</tr>
- 					<!-- /TMPL_IF -->
  				<!-- /TMPL_LOOP -->
  			</table>
--- 79,82 ----




From hdl at users.sourceforge.net  Tue Jun 28 09:35:51 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 00:35:51 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-detail.pl,1.14.2.3,1.14.2.4
Message-ID: <E1DnAdL-0005Fn-4u@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20116/opac

Modified Files:
      Tag: rel_2_2
	opac-detail.pl 
Log Message:
Adding not issued and delete state to state collection
And display the three latest numbers of every subscription received or lacked in opac.

Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.14.2.3
retrieving revision 1.14.2.4
diff -C2 -r1.14.2.3 -r1.14.2.4
*** opac-detail.pl	25 Mar 2005 17:04:27 -0000	1.14.2.3
--- opac-detail.pl	28 Jun 2005 07:35:48 -0000	1.14.2.4
***************
*** 30,35 ****
  my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
  my ($websitecount, @websites)             = &getwebsites($biblionumber);
- my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
  
  $dat->{'count'}=@items;
  
--- 30,48 ----
  my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
  my ($websitecount, @websites)             = &getwebsites($biblionumber);
  
+  #coping with subscriptions
+  my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
+  my @subscriptions = getsubscriptions($dat->{title},$dat->{issn},$biblionumber);
+  my @subs;
+  foreach my $subscription (@subscriptions){
+  	warn "subsid :".$subscription->{subscriptionid};
+  	my %cell;
+  	$cell{subscriptionid}= $subscription->{subscriptionid};
+  	$cell{subscriptionnotes}= $subscription->{notes};
+  	#get the three latest serials.
+  	$cell{latestserials}=getlatestserials($subscription->{subscriptionid},3);
+  	push @subs, \%cell;
+  }
+  
  $dat->{'count'}=@items;
  
***************
*** 71,74 ****
--- 84,88 ----
  				WEB_RESULTS => $webarray,
  				SITE_RESULTS => $sitearray,
+ 				subscriptions => \@subs,
  				subscriptionsnumber => $subscriptionsnumber,
  			     LibraryName => C4::Context->preference("LibraryName"),




From hdl at users.sourceforge.net  Tue Jun 28 09:35:51 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 00:35:51 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.15.2.11,1.15.2.12
Message-ID: <E1DnAdL-0005G1-MC@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	opac-detail.tmpl 
Log Message:
Adding not issued and delete state to state collection
And display the three latest numbers of every subscription received or lacked in opac.

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.15.2.11
retrieving revision 1.15.2.12
diff -C2 -r1.15.2.11 -r1.15.2.12
*** opac-detail.tmpl	6 Jun 2005 11:41:08 -0000	1.15.2.11
--- opac-detail.tmpl	28 Jun 2005 07:35:49 -0000	1.15.2.12
***************
*** 158,170 ****
  			</tr>
  		<!-- /TMPL_LOOP -->
  	</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>
  </div>
--- 158,204 ----
  			</tr>
  		<!-- /TMPL_LOOP -->
+ 	
  	</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 :Click <a href="/cgi-bin/koha/opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" title="Serial issues"> here to look for Issues</a> we have or don't have</p>
! 		</div>
!  	<!-- /TMPL_IF -->
  	</div>
  </div>




From hdl at users.sourceforge.net  Tue Jun 28 09:35:51 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 00:35:51 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bull statecollection.tmpl,1.4.2.1,1.4.2.2
Message-ID: <E1DnAdL-0005G0-MI@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	statecollection.tmpl 
Log Message:
Adding not issued and delete state to state collection
And display the three latest numbers of every subscription received or lacked in opac.

Index: statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** statecollection.tmpl	25 Mar 2005 16:46:40 -0000	1.4.2.1
--- statecollection.tmpl	28 Jun 2005 07:35:49 -0000	1.4.2.2
***************
*** 54,57 ****
--- 54,67 ----
  						<option value="4">Missing</option>
  					<!-- /TMPL_IF -->
+ 					<!--TMPL_IF name="status5" -->
+ 						<option value="5" selected>Not issued</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="5">Not issued</option>
+ 					<!-- /TMPL_IF -->
+ 					<!--TMPL_IF name="status6" -->
+ 						<option value="6" selected>Delete</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="6">Delete</option>
+ 					<!-- /TMPL_IF -->
  				</select>
  			</td>




From hdl at users.sourceforge.net  Tue Jun 28 09:35:51 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 00:35:51 -0700
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.6.2.10,1.6.2.11
Message-ID: <E1DnAdL-0005G6-PV@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20116/C4

Modified Files:
      Tag: rel_2_2
	Bull.pm 
Log Message:
Adding not issued and delete state to state collection
And display the three latest numbers of every subscription received or lacked in opac.

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.6.2.10
retrieving revision 1.6.2.11
diff -C2 -r1.6.2.10 -r1.6.2.11
*** Bull.pm	17 Jun 2005 15:51:54 -0000	1.6.2.10
--- Bull.pm	28 Jun 2005 07:35:49 -0000	1.6.2.11
***************
*** 49,53 ****
  			&get_full_subscription_list_from_biblionumber 
  			&modsubscriptionhistory &newissue
! 			&getserials &serialchangestatus
  			&Find_Next_Date, &Get_Next_Seq
  			&hassubscriptionexpired &subscriptionexpirationdate &subscriptionrenew
--- 49,53 ----
  			&get_full_subscription_list_from_biblionumber 
  			&modsubscriptionhistory &newissue
! 			&getserials &getlatestserials &serialchangestatus
  			&Find_Next_Date, &Get_Next_Seq
  			&hassubscriptionexpired &subscriptionexpirationdate &subscriptionrenew
***************
*** 348,352 ****
  	my $dbh = C4::Context->dbh;
  	# status = 2 is "arrived"
! 	my $sth=$dbh->prepare("select serialid,serialseq, status, planneddate from serial where subscriptionid = ? and status <>2 and status <>4");
  	$sth->execute($subscriptionid);
  	my @serials;
--- 348,352 ----
  	my $dbh = C4::Context->dbh;
  	# status = 2 is "arrived"
! 	my $sth=$dbh->prepare("select serialid,serialseq, status, planneddate from serial where subscriptionid = ? and status <>2 and status <>4 and status <>5");
  	$sth->execute($subscriptionid);
  	my @serials;
***************
*** 362,365 ****
--- 362,385 ----
  }
  
+ # get the $limit's latest serials arrived or missing for a given subscription
+ sub getlatestserials{
+ 	my ($subscriptionid,$limit) =@_;
+ 	my $dbh = C4::Context->dbh;
+ 	# status = 2 is "arrived"
+ 	my $strsth="select serialid,serialseq, status, planneddate from serial where subscriptionid = ? and (status =2 or status=4) order by planneddate DESC LIMIT 0,$limit";
+ 	my $sth=$dbh->prepare($strsth);
+ 	$sth->execute($subscriptionid);
+ 	my @serials;
+ 	while(my $line = $sth->fetchrow_hashref) {
+ 		$line->{"status".$line->{status}} = 1; # fills a "statusX" value, used for template status select list
+ 		$line->{"planneddate"} = format_date($line->{"planneddate"});
+ 		push @serials,$line;
+ 	}
+ 	$sth=$dbh->prepare("select count(*) from serial where subscriptionid=?");
+ 	$sth->execute($subscriptionid);
+ 	my ($totalissues) = $sth->fetchrow;
+ 	return \@serials;
+ }
+ 
  sub serialchangestatus {
  	my ($serialid,$serialseq,$planneddate,$status)=@_;
***************
*** 371,387 ****
  	my ($subscriptionid,$oldstatus) = $sth->fetchrow;
  	# change status & update subscriptionhistory
! 	$sth = $dbh->prepare("update serial set serialseq=?,planneddate=?,status=? where serialid = ?");
! 	$sth->execute($serialseq,$planneddate,$status,$serialid);
! 	$sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
! 	$sth->execute($subscriptionid);
! 	my ($missinglist,$recievedlist) = $sth->fetchrow;
! 	if ($status eq 2) {
! 		$recievedlist .= ",$serialseq";
! 	}
! 	if ($status eq 4) {
! 		$missinglist .= ",$serialseq";
  	}
- 	$sth=$dbh->prepare("update subscriptionhistory set recievedlist=?, missinglist=? where subscriptionid=?");
- 	$sth->execute($recievedlist,$missinglist,$subscriptionid);
  	# create new waited entry if needed (ie : was a "waited" and has changed)
  	if ($oldstatus eq 1 && $status ne 1) {
--- 391,410 ----
  	my ($subscriptionid,$oldstatus) = $sth->fetchrow;
  	# change status & update subscriptionhistory
! 	if ($status eq 6){
! 		delissue($serialseq, $subscriptionid) 
! 	}else{
! 		$sth = $dbh->prepare("update serial set serialseq=?,planneddate=?,status=? where serialid = ?");
! 		$sth->execute($serialseq,$planneddate,$status,$serialid);
! 		$sth = $dbh->prepare("select missinglist,recievedlist from subscriptionhistory where subscriptionid=?");
! 		$sth->execute($subscriptionid);
! 		my ($missinglist,$recievedlist) = $sth->fetchrow;
! 		if ($status eq 2) {
! 			$recievedlist .= ",$serialseq";
! 		}
! 		$missinglist .= ",$serialseq" if ($status eq 4) ;
! 		$missinglist .= ",not issued $serialseq" if ($status eq 5);
! 		$sth=$dbh->prepare("update subscriptionhistory set recievedlist=?, missinglist=? where subscriptionid=?");
! 		$sth->execute($recievedlist,$missinglist,$subscriptionid);
  	}
  	# create new waited entry if needed (ie : was a "waited" and has changed)
  	if ($oldstatus eq 1 && $status ne 1) {
***************
*** 419,422 ****
--- 442,452 ----
  }
  
+ sub delissue {
+ 	my ($serialseq,$subscriptionid) = @_;
+ 	my $dbh = C4::Context->dbh;
+ 	my $sth = $dbh->prepare("delete from serial where serialseq= ? and subscriptionid= ? ");
+ 	$sth->execute($serialseq,$subscriptionid);
+ }
+ 
  sub Get_Next_Date(@) {
  	my ($planneddate,$subscription) = @_;




From hdl at users.sourceforge.net  Tue Jun 28 11:37:19 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 02:37:19 -0700
Subject: [Koha-cvs] CVS: koha/admin systempreferences.pl,1.22.2.1,1.22.2.2
Message-ID: <E1DnCWt-0005f1-JZ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21713/admin

Modified Files:
      Tag: rel_2_2
	systempreferences.pl 
Log Message:
Adding system preference category.
Managing them in tabs.
Taking Paul's first improvements on Head Version into account.

Index: systempreferences.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -C2 -r1.22.2.1 -r1.22.2.2
*** systempreferences.pl	11 Feb 2005 16:23:31 -0000	1.22.2.1
--- systempreferences.pl	28 Jun 2005 09:37:17 -0000	1.22.2.2
***************
*** 49,52 ****
--- 49,80 ----
  use C4::Context;
  
+ my %tabsysprefs;
+ $tabsysprefs{acquisitions}="Acquisitions";
+ $tabsysprefs{gist}="Acquisitions";
+ $tabsysprefs{authoritysep}="Authorities";
+ $tabsysprefs{ISBD}="Catalogue";
+ $tabsysprefs{marc}="Catalogue";
+ $tabsysprefs{marcflavour}="Catalogue";
+ $tabsysprefs{SubscriptionHistory}="Catalogue";
+ $tabsysprefs{maxoutstanding}="Circulation";
+ $tabsysprefs{printcirculationslips}="Circulation";
+ $tabsysprefs{suggestion}="Acquisitions";
+ $tabsysprefs{automembernum}="Members";
+ $tabsysprefs{noissuescharge}="Circulation";
+ $tabsysprefs{opacthemes}="OPAC";
+ $tabsysprefs{opaclanguages}="OPAC";
+ $tabsysprefs{LibraryName}="OPAC";
+ $tabsysprefs{opacstylesheet}="OPAC";
+ $tabsysprefs{BiblioDefaultView}="OPAC";
+ $tabsysprefs{hidelostitem}="OPAC";
+ $tabsysprefs{KohaAdmin}="Admin";
+ $tabsysprefs{checkdigit}="Admin";
+ $tabsysprefs{dateformat}="Admin";
+ $tabsysprefs{insecure}="Admin";
+ $tabsysprefs{ldapinfos}="Admin";
+ $tabsysprefs{ldapserver}="Admin";
+ $tabsysprefs{itemcallnumber}="Catalogue";
+ $tabsysprefs{maxreserves}="Circulation";
+ $tabsysprefs{virtualshelves}="OPAC";
  
  sub StringSearch  {
***************
*** 56,68 ****
  	my @data=split(' ',$searchstring);
  	my $count=@data;
- 	my $sth=$dbh->prepare("Select variable,value,explanation,type,options from systempreferences where (variable like ?) order by variable");
- 	$sth->execute("$data[0]%");
  	my @results;
  	my $cnt=0;
! 	while (my $data=$sth->fetchrow_hashref){
! 		push(@results,$data);
! 		$cnt ++;
  	}
- 	$sth->finish;
  	return ($cnt,\@results);
  }
--- 84,117 ----
  	my @data=split(' ',$searchstring);
  	my $count=@data;
  	my @results;
  	my $cnt=0;
! 	if ($type){
! 		foreach my $syspref (sort keys %tabsysprefs){
! 			if ($tabsysprefs{$syspref} eq $type){
! 				my $sth=$dbh->prepare("Select variable,value,explanation,type,options from systempreferences where (variable like ?) order by variable");
! 				$sth->execute($syspref);
! 				while (my $data=$sth->fetchrow_hashref){
! 					push(@results,$data);
! 					$cnt++;
! 				}
! 				$sth->finish;
! 			}
! 		}
! 	} else {
! 		my $strsth ="Select variable,value,explanation,type,options from systempreferences where variable not in (";  
! 		foreach my $syspref (keys %tabsysprefs){
! 			$strsth .= $dbh->quote($syspref).",";
! 		}
! 		$strsth =~ s/,$/) /;
! 		$strsth .= " order by variable";
! 		warn $strsth;
! 		my $sth=$dbh->prepare($strsth);
! 		$sth->execute();
! 		while (my $data=$sth->fetchrow_hashref){
! 			push(@results,$data);
! 			$cnt++;
! 		}
! 		$sth->finish;
  	}
  	return ($cnt,\@results);
  }
***************
*** 279,287 ****
  ################## DEFAULT ##################################
  } else { # DEFAULT
! 	if  ($searchfield ne '') {
! 		 $template->param(searchfield => "<p>You Searched for <strong>$searchfield</strong></p>");
! 	}
  	my $env;
! 	my ($count,$results)=StringSearch($env,$searchfield,'web');
  	my $toggle=0;
  	my @loop_data = ();
--- 328,336 ----
  ################## DEFAULT ##################################
  } else { # DEFAULT
! 	#Adding tab management for system preferences
! 	my $tab=$input->param('tab');
! 	
  	my $env;
! 	my ($count,$results)=StringSearch($env,$searchfield,$tab);
  	my $toggle=0;
  	my @loop_data = ();
***************
*** 301,305 ****
  		push(@loop_data, \%row_data);
  	}
! 	$template->param(loop => \@loop_data);
  	if ($offset>0) {
  		my $prevpage = $offset-$pagesize;
--- 350,355 ----
  		push(@loop_data, \%row_data);
  	}
! 	$tab=($tab?$tab:"Others");
! 	$template->param(loop => \@loop_data, $tab => 1);
  	if ($offset>0) {
  		my $prevpage = $offset-$pagesize;




From hdl at users.sourceforge.net  Tue Jun 28 11:37:19 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 02:37:19 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters systempreferences.tmpl,1.29.2.2,1.29.2.3
Message-ID: <E1DnCWt-0005ew-FS@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	systempreferences.tmpl 
Log Message:
Adding system preference category.
Managing them in tabs.
Taking Paul's first improvements on Head Version into account.

Index: systempreferences.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl,v
retrieving revision 1.29.2.2
retrieving revision 1.29.2.3
diff -C2 -r1.29.2.2 -r1.29.2.3
*** systempreferences.tmpl	11 Feb 2005 16:48:13 -0000	1.29.2.2
--- systempreferences.tmpl	28 Jun 2005 09:37:17 -0000	1.29.2.3
***************
*** 137,145 ****
  	<!-- TMPL_IF NAME="else" -->
  	<h1>System preferences admin</h1>
! 	<form action="/cgi-bin/koha/admin/systempreferences.pl" method="post">
! 		<input type="text" name="searchfield" value="">
! 		<input type="reset" name="reset" value="clr">
! 	</form>
! 	<!-- TMPL_VAR NAME="searchfield" -->
  	<table border="0" cellspacing="0" cellpadding="2">
  	<tr valign="top" bgcolor="#99cc33">
--- 137,216 ----
  	<!-- TMPL_IF NAME="else" -->
  	<h1>System preferences admin</h1>
! 	<table>
! 		<tr>
! 			<td>
! 				<!--TMPL_IF Name="Admin"-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin" class="button">Admin
! 					</a>
! 				<!--TMPL_ELSE-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin">Admin
! 					</a>
! 				<!--/TMPL_IF-->
! 			</td>
! 			<td>
! 				<!--TMPL_IF Name="Acquisitions"-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions" class="button">Acquisitions
! 					</a>
! 				<!--TMPL_ELSE-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions">Acquisitions
! 					</a>
! 				<!--/TMPL_IF-->
! 			</td>
! 			<td>
! 				<!--TMPL_IF Name="Authorities"-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities" class="button">Authorities
! 					</a>
! 				<!--TMPL_ELSE-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities">Authorities
! 					</a>
! 				<!--/TMPL_IF-->
! 			</td>
! 			<td>
! 				<!--TMPL_IF Name="Catalogue"-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue" class="button">Catalogue
! 					</a>
! 				<!--TMPL_ELSE-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue">Catalogue
! 					</a>
! 				<!--/TMPL_IF-->
! 			</td>
! 			<td>
! 				<!--TMPL_IF Name="Circulation"-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation" class="button">Circulation
! 					</a>
! 				<!--TMPL_ELSE-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation">Circulation
! 					</a>
! 				<!--/TMPL_IF-->
! 			</td>
! 			<td>
! 				<!--TMPL_IF Name="Members"-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members" class="button">Members
! 					</a>
! 				<!--TMPL_ELSE-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members">Members
! 					</a>
! 				<!--/TMPL_IF-->
! 			</td>
! 			<td>
! 				<!--TMPL_IF Name="OPAC"-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC" class="button">OPAC
! 					</a>
! 				<!--TMPL_ELSE-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC">OPAC
! 					</a>
! 				<!--/TMPL_IF-->
! 			</td>
! 			<td>
! 				<!--TMPL_IF Name="Others"-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=" class="button">Others
! 					</a>
! 				<!--TMPL_ELSE-->
! 					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=">Others
! 					</a>
! 				<!--/TMPL_IF-->
! 			</td>
! 		</tr>
! 	</table>
  	<table border="0" cellspacing="0" cellpadding="2">
  	<tr valign="top" bgcolor="#99cc33">




From hdl at users.sourceforge.net  Tue Jun 28 12:15:14 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 03:15:14 -0700
Subject: [Koha-cvs] CVS: koha/reports acquisitions_stats.pl,1.4.2.2,1.4.2.3
Message-ID: <E1DnD7a-00024a-6R@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/reports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7912/reports

Modified Files:
      Tag: rel_2_2
	acquisitions_stats.pl 
Log Message:
Minor bug Fix: Displaying Months and day in usual order.

Index: acquisitions_stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/reports/acquisitions_stats.pl,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -r1.4.2.2 -r1.4.2.3
*** acquisitions_stats.pl	7 Apr 2005 12:18:43 -0000	1.4.2.2
--- acquisitions_stats.pl	28 Jun 2005 10:15:11 -0000	1.4.2.3
***************
*** 272,296 ****
                                                
  # 1st, loop rows.                             
! 	my $linefield;                               
  	if (($line =~/closedate/) and ($podsp == 1)) {
  		#Display by day
  		$linefield .="dayname($line)";  
  	} elsif (($line=~/closedate/) and ($podsp == 2)) {
  		#Display by Month
  		$linefield .="monthname($line)";  
  	} elsif (($line=~/closedate/) and ($podsp == 3)) {
  		#Display by Year
  		$linefield .="Year($line)";
  	} elsif (($line =~/received/) and ($rodsp == 1)) {
  		#Display by day
  		$linefield .="dayname($line)";  
  	} elsif (($line=~/received/) and ($rodsp == 2)) {
  		#Display by Month
  		$linefield .="monthname($line)";  
  	} elsif (($line=~/received/) and ($rodsp == 3)) {
  		#Display by Year
  		$linefield .="Year($line)";
  	} else {
  		$linefield .= $line;
  	}  
  	
--- 272,304 ----
                                                
  # 1st, loop rows.                             
! 	my $linefield;
! 	my $lineorder;                               
  	if (($line =~/closedate/) and ($podsp == 1)) {
  		#Display by day
  		$linefield .="dayname($line)";  
+ 		$lineorder .="weekday($line)";  
  	} elsif (($line=~/closedate/) and ($podsp == 2)) {
  		#Display by Month
  		$linefield .="monthname($line)";  
+ 		$lineorder .="month($line)";  
  	} elsif (($line=~/closedate/) and ($podsp == 3)) {
  		#Display by Year
  		$linefield .="Year($line)";
+ 		$lineorder .=$linefield;  
  	} elsif (($line =~/received/) and ($rodsp == 1)) {
  		#Display by day
  		$linefield .="dayname($line)";  
+ 		$lineorder .="weekday($line)";  
  	} elsif (($line=~/received/) and ($rodsp == 2)) {
  		#Display by Month
  		$linefield .="monthname($line)";  
+ 		$lineorder .="month($line)";  
  	} elsif (($line=~/received/) and ($rodsp == 3)) {
  		#Display by Year
  		$linefield .="Year($line)";
+ 		$lineorder .=$linefield;  
  	} else {
  		$linefield .= $line;
+ 		$lineorder .=$linefield;  
  	}  
  	
***************
*** 313,317 ****
   	}
  	$strsth .=" group by $linefield";
! 	$strsth .=" order by $linefield";
  	warn "". $strsth;
  	
--- 321,325 ----
   	}
  	$strsth .=" group by $linefield";
! 	$strsth .=" order by $lineorder";
  	warn "". $strsth;
  	
***************
*** 338,361 ****
  # 2nd, loop cols.
  	my $colfield;
  	if (($column =~/closedate/) and ($podsp == 1)) {
  		#Display by day
! 		$colfield .="dayname($column)";  
  	} elsif (($column=~/closedate/) and ($podsp == 2)) {
  		#Display by Month
  		$colfield .="monthname($column)";  
  	} elsif (($column=~/closedate/) and ($podsp == 3)) {
  		#Display by Year
  		$colfield .="Year($column)";
  	} elsif (($column =~/received/) and ($rodsp == 1)) {
  		#Display by day
  		$colfield .="dayname($column)";  
  	} elsif (($column=~/received/) and ($rodsp == 2)) {
  		#Display by Month
  		$colfield .="monthname($column)";  
  	} elsif (($column=~/received/) and ($rodsp == 3)) {
  		#Display by Year
  		$colfield .="Year($column)";
  	} else {
  		$colfield .= $column;
  	}  
  	
--- 346,377 ----
  # 2nd, loop cols.
  	my $colfield;
+ 	my $colorder;
  	if (($column =~/closedate/) and ($podsp == 1)) {
  		#Display by day
! 		$colfield .="dayname($column)";
! 		$colorder .="weekday($column)";
  	} elsif (($column=~/closedate/) and ($podsp == 2)) {
  		#Display by Month
  		$colfield .="monthname($column)";  
+ 		$colorder .="month($column)";
  	} elsif (($column=~/closedate/) and ($podsp == 3)) {
  		#Display by Year
  		$colfield .="Year($column)";
+ 		$colorder .= $colfield;
  	} elsif (($column =~/received/) and ($rodsp == 1)) {
  		#Display by day
  		$colfield .="dayname($column)";  
+ 		$colorder .="weekday($column)";
  	} elsif (($column=~/received/) and ($rodsp == 2)) {
  		#Display by Month
  		$colfield .="monthname($column)";  
+ 		$colorder .="month($column)";
  	} elsif (($column=~/received/) and ($rodsp == 3)) {
  		#Display by Year
  		$colfield .="Year($column)";
+ 		$colorder .= $colfield;
  	} else {
  		$colfield .= $column;
+ 		$colorder .= $colfield;
  	}  
  	
***************
*** 378,382 ****
   	}
  	$strsth2 .=" group by $colfield";
! 	$strsth2 .=" order by $colfield";
   	warn "". $strsth2;
  	
--- 394,398 ----
   	}
  	$strsth2 .=" group by $colfield";
! 	$strsth2 .=" order by $colorder";
   	warn "". $strsth2;
  	
***************
*** 439,443 ****
  	@$filters[7]=~ s/\*/%/g if (@$filters[7]);
  	$strcalc .= " AND aqorders.sort2 like '" . @$filters[7] ."'" if ( @$filters[7] );
! 	$strcalc .= " group by $linefield, $colfield order by $linefield,$colfield";
  	warn "". $strcalc;
  	my $dbcalc = $dbh->prepare($strcalc);
--- 455,459 ----
  	@$filters[7]=~ s/\*/%/g if (@$filters[7]);
  	$strcalc .= " AND aqorders.sort2 like '" . @$filters[7] ."'" if ( @$filters[7] );
! 	$strcalc .= " group by $linefield, $colfield order by $lineorder,$colorder";
  	warn "". $strcalc;
  	my $dbcalc = $dbh->prepare($strcalc);




From hdl at users.sourceforge.net  Tue Jun 28 12:17:57 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 03:17:57 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/search.marc suggest.tmpl,1.2,1.2.2.1
Message-ID: <E1DnDAD-0002Oj-HC@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	suggest.tmpl 
Log Message:
Closing Suggest Window choice made

Index: suggest.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/suggest.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** suggest.tmpl	19 Jul 2004 20:59:34 -0000	1.2
--- suggest.tmpl	28 Jun 2005 10:17:55 -0000	1.2.2.1
***************
*** 45,49 ****
  //			}
  //			opener.document.location= "../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR NAME="oldbiblionumber" -->&breedingid="+GetThisOne;
! //			self.close();
  //			return false;
  		}
--- 45,49 ----
  //			}
  //			opener.document.location= "../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR NAME="oldbiblionumber" -->&breedingid="+GetThisOne;
! 			self.close();
  //			return false;
  		}




From hdl at users.sourceforge.net  Tue Jun 28 12:21:31 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 03:21:31 -0700
Subject: [Koha-cvs] CVS: koha/members member.pl,1.2.2.3,1.2.2.4
Message-ID: <E1DnDDf-0002yl-Bx@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11373/members

Modified Files:
      Tag: rel_2_2
	member.pl 
Log Message:
Adding Result counts and line counters to 
- histsearch (search order)
- members search

Index: member.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/member.pl,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -r1.2.2.3 -r1.2.2.4
*** member.pl	1 Mar 2005 13:13:42 -0000	1.2.2.3
--- member.pl	28 Jun 2005 10:21:29 -0000	1.2.2.4
***************
*** 90,93 ****
--- 90,94 ----
    my %row = (
    	background => $background,
+ 	count => $i+1,
          borrowernumber => $results->[$i]{'borrowernumber'},
          cardnumber => $results->[$i]{'cardnumber'},
***************
*** 106,109 ****
--- 107,111 ----
  $template->param( 
  			member          => $member,
+ 			numresults		=> $count,
  			resultsloop     => \@resultsdata );
  




From hdl at users.sourceforge.net  Tue Jun 28 12:21:31 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 03:21:31 -0700
Subject: [Koha-cvs] CVS: koha/C4 Acquisition.pm,1.9.2.5,1.9.2.6
Message-ID: <E1DnDDf-0002z4-NK@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11373/C4

Modified Files:
      Tag: rel_2_2
	Acquisition.pm 
Log Message:
Adding Result counts and line counters to 
- histsearch (search order)
- members search

Index: Acquisition.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.9.2.5
retrieving revision 1.9.2.6
diff -C2 -r1.9.2.5 -r1.9.2.6
*** Acquisition.pm	7 Jun 2005 12:56:37 -0000	1.9.2.5
--- Acquisition.pm	28 Jun 2005 10:21:29 -0000	1.9.2.6
***************
*** 612,616 ****
--- 612,618 ----
  	$sth->execute;
  	my @order_loop;
+ 	my $cnt=1;
  	while (my $line = $sth->fetchrow_hashref) {
+ 		$line->{count}=$cnt++;
  		push @order_loop, $line;
  	}




From hdl at users.sourceforge.net  Tue Jun 28 12:21:31 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 03:21:31 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui histsearch.tmpl,1.1.2.2,1.1.2.3
Message-ID: <E1DnDDf-0002z0-JY@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	histsearch.tmpl 
Log Message:
Adding Result counts and line counters to 
- histsearch (search order)
- members search

Index: histsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** histsearch.tmpl	26 May 2005 09:21:29 -0000	1.1.2.2
--- histsearch.tmpl	28 Jun 2005 10:21:29 -0000	1.1.2.3
***************
*** 2,5 ****
--- 2,7 ----
  <div id="mainbloc">
  	<h1 class="acquisition">Order search</h1>
+ 	<p class="resultcount"><!-- TMPL_VAR Name ="numresults" --> orders were found.
+ 	 </p>
  	<table>
  		<tr>
***************
*** 104,108 ****
  			<tr>
  				<td>
! 					&nbsp;
  				</td>
  				<td>
--- 106,110 ----
  			<tr>
  				<td>
! 					<!-- TMPL_VAR NAME="count" -->
  				</td>
  				<td>




From hdl at users.sourceforge.net  Tue Jun 28 12:21:31 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 03:21:31 -0700
Subject: [Koha-cvs] CVS: koha/acqui histsearch.pl,1.1.2.1,1.1.2.2
Message-ID: <E1DnDDf-0002z9-Py@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11373/acqui

Modified Files:
      Tag: rel_2_2
	histsearch.pl 
Log Message:
Adding Result counts and line counters to 
- histsearch (search order)
- members search

Index: histsearch.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/histsearch.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** histsearch.pl	26 May 2005 09:21:30 -0000	1.1.2.1
--- histsearch.pl	28 Jun 2005 10:21:29 -0000	1.1.2.2
***************
*** 27,30 ****
--- 27,31 ----
  my $order_loop= &histsearch($title,$author,$name,$from_placed_on,$to_placed_on);
  $template->param(suggestions_loop => $order_loop,
+ 				numresults => scalar(@$order_loop),
  				title => $title,
  				author => $author,




From hdl at users.sourceforge.net  Tue Jun 28 12:21:31 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 03:21:31 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members member.tmpl,1.14.2.1,1.14.2.2 member-quicksearch-results.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1DnDDf-0002ys-I1@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	member.tmpl member-quicksearch-results.tmpl 
Log Message:
Adding Result counts and line counters to 
- histsearch (search order)
- members search

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member.tmpl,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -C2 -r1.14.2.1 -r1.14.2.2
*** member.tmpl	17 Feb 2005 12:49:09 -0000	1.14.2.1
--- member.tmpl	28 Jun 2005 10:21:29 -0000	1.14.2.2
***************
*** 18,23 ****
--- 18,26 ----
  <div class="bloc100">
  	<div class="bloctitle">You Searched for <!-- TMPL_VAR NAME="member" --></div>
+ 	<p class="resultcount"><!-- TMPL_VAR Name ="numresults" --> members were found.
+ 	 </p>
  	<table>
  		<tr>
+ 			<th>&nbsp;</th>
  			<th>Card</th>
  			<th>Surname</th>
***************
*** 35,38 ****
--- 38,42 ----
  				<tr bgcolor="white">
  			<!-- /TMPL_IF -->
+ 				<td><!-- TMPL_VAR NAME="count" --></td>
  				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
  				<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" --></a></td>

Index: member-quicksearch-results.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/member-quicksearch-results.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** member-quicksearch-results.tmpl	18 Jan 2005 21:57:05 -0000	1.1.2.1
--- member-quicksearch-results.tmpl	28 Jun 2005 10:21:29 -0000	1.1.2.2
***************
*** 5,8 ****
--- 5,10 ----
  
  <div class="bloc100">
+ 	<p class="resultcount"><!-- TMPL_VAR Name ="numresults" --> members were found.
+ 	 </p>
  	<table>
  		<tr>
***************
*** 19,23 ****
  				<tr bgcolor="white">
  			<!-- /TMPL_IF -->
! 				<td><form action="member-search-results.pl" method="get"><input type="button" class="button" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','request','member'); return false;" /></form></td>
  				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
  				<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" --></a></td>
--- 21,26 ----
  				<tr bgcolor="white">
  			<!-- /TMPL_IF -->
! 				<td><!-- TMPL_VAR NAME="count" -->
! <form action="member-search-results.pl" method="get"><input type="button" class="button" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','request','member'); return false;" /></form></td>
  				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
  				<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" --></a></td>




From hdl at users.sourceforge.net  Tue Jun 28 13:52:00 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 04:52:00 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members memberentry.tmpl,1.33.2.4,1.33.2.5
Message-ID: <E1DnEdE-0007Ma-JP@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	memberentry.tmpl 
Log Message:
Adding choice lists for sort1/Sort2 For biblios and patrons management.
Commiting along Help Modifications

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl,v
retrieving revision 1.33.2.4
retrieving revision 1.33.2.5
diff -C2 -r1.33.2.4 -r1.33.2.5
*** memberentry.tmpl	19 May 2005 21:52:46 -0000	1.33.2.4
--- memberentry.tmpl	28 Jun 2005 11:51:58 -0000	1.33.2.5
***************
*** 270,274 ****
  				<td>Sorting field 1</td>
  				<td colspan="4">
! 					<input type="text" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
  				</td>
  			</tr>
--- 270,278 ----
  				<td>Sorting field 1</td>
  				<td colspan="4">
! 					<!-- TMPL_IF Name="CGIsort1" -->
! 						<!-- TMPL_VAR Name="CGIsort1" -->
! 					<!-- TMPL_ELSE -->
! 						<input type="text" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
! 					<!--/TMPL_IF -->
  				</td>
  			</tr>
***************
*** 276,280 ****
  				<td>Sorting field 2</td>
  				<td colspan="4">
! 					<input type="text" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
  				</td>
  			</tr>
--- 280,288 ----
  				<td>Sorting field 2</td>
  				<td colspan="4">
! 					<!-- TMPL_IF Name="CGIsort2" -->
! 						<!-- TMPL_VAR Name="CGIsort2" -->
! 					<!-- TMPL_ELSE -->
! 						<input type="text" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
! 					<!--/TMPL_IF -->
  				</td>
  			</tr>




From hdl at users.sourceforge.net  Tue Jun 28 13:52:00 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 04:52:00 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/acqui newbiblio.tmpl,NONE,1.1.2.2
Message-ID: <E1DnEdE-0007Mg-OT@sc8-pr-cvs1.sourceforge.net>

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

Added Files:
      Tag: rel_2_2
	newbiblio.tmpl 
Log Message:
Adding choice lists for sort1/Sort2 For biblios and patrons management.
Commiting along Help Modifications

--- NEW FILE ---
<!-- TMPL_INCLUDE name="help-top.inc" -->
<h1>Add Biblio help</h1>

<p>sort1 and sort2 may now be related to a list of Authorized Values. All you have to do is define a Asort1 or Asort2 category of authorised values and enter the desired values into these categories. You will then be able to use them through Add/Modify Biblio Page</p>





From hdl at users.sourceforge.net  Tue Jun 28 13:52:00 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 04:52:00 -0700
Subject: [Koha-cvs] CVS: koha/members memberentry.pl,1.5.2.4,1.5.2.5
Message-ID: <E1DnEdE-0007MP-6Q@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28209/members

Modified Files:
      Tag: rel_2_2
	memberentry.pl 
Log Message:
Adding choice lists for sort1/Sort2 For biblios and patrons management.
Commiting along Help Modifications

Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/memberentry.pl,v
retrieving revision 1.5.2.4
retrieving revision 1.5.2.5
diff -C2 -r1.5.2.4 -r1.5.2.5
*** memberentry.pl	19 May 2005 21:52:46 -0000	1.5.2.4
--- memberentry.pl	28 Jun 2005 11:51:57 -0000	1.5.2.5
***************
*** 233,236 ****
--- 233,250 ----
  				-size     => 1,
  				-multiple => 0 );
+ 	
+ 	my $CGIsort1 = buildCGIsort("Bsort1","sort1",$data->{'sort1'});
+ 	if ($CGIsort1) {
+ 		$template->param(CGIsort1 => $CGIsort1);
+ 	} else {
+ 		$template->param( sort1 => $data->{'sort1'});
+ 	}
+ 	
+ 	my $CGIsort2 = buildCGIsort("Bsort2","sort2",$data->{'sort2'});
+ 	if ($CGIsort2) {
+ 		$template->param(CGIsort2 =>$CGIsort2);
+ 	} else {
+ 		$template->param( sort2 => $data->{'sort2'});
+ 	}
  
  	$template->param(	actionType 		=> $actionType,
***************
*** 266,271 ****
  				cardnumber	=> $cardnumber,
  				dateofbirth	=> $data->{'dateofbirth'},
- 				sort1 => $data->{'sort1'},
- 				sort2 => $data->{'sort2'},
  				dateformat      => display_date_format(),
  			        modify          => $modify,
--- 280,283 ----




From hdl at users.sourceforge.net  Tue Jun 28 13:52:01 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 04:52:01 -0700
Subject: [Koha-cvs] CVS: koha/C4 Input.pm,1.16,1.16.4.1
Message-ID: <E1DnEdF-0007N9-PJ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28209/C4

Modified Files:
      Tag: rel_2_2
	Input.pm 
Log Message:
Adding choice lists for sort1/Sort2 For biblios and patrons management.
Commiting along Help Modifications

Index: Input.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Input.pm,v
retrieving revision 1.16
retrieving revision 1.16.4.1
diff -C2 -r1.16 -r1.16.4.1
*** Input.pm	28 Nov 2003 14:06:57 -0000	1.16
--- Input.pm	28 Jun 2005 11:51:58 -0000	1.16.4.1
***************
*** 50,53 ****
--- 50,54 ----
  @EXPORT = qw(
  	&checkdigit &checkvalidisbn
+ 	&buildCGIsort
  );
  
***************
*** 172,175 ****
--- 173,211 ----
  } # sub checkvalidisbn
  
+ =item buildCGISort
+ 
+   $CGIScrollingList = &BuildCGISort($name string, $input_name string);
+ 
+ Returns the scrolling list with name $input_name, built on authorised Values named $name.
+ Returns NULL if no authorised values found
+ 
+ =cut
+ sub buildCGIsort {
+     use strict;
+ 	my ($name,$input_name,$data) = @_;
+ 	my $dbh=C4::Context->dbh;
+ 	my $query=qq{SELECT * FROM authorised_values WHERE category=?};
+ 	my $sth=$dbh->prepare($query);
+ 	$sth->execute($name);
+ 	my $CGISort;
+ 	if ($sth->rows>0){
+ 		my @values;
+ 		my %labels;
+ 		for (my $i =0;$i<=$sth->rows;$i++){
+ 			my $results = $sth->fetchrow_hashref;
+  			push @values, $results->{authorised_value};
+  			$labels{$results->{authorised_value}}=$results->{lib};
+ 		}
+  		$CGISort= CGI::scrolling_list(
+  					-name => $input_name,
+  					-values => \@values,
+  					-labels => \%labels,
+ 					-default=> $data,
+  					-size => 1,
+  					-multiple => 0);
+ 	}
+ 	$sth->finish; 
+ 	return $CGISort;
+ }
  END { }       # module clean-up code here (global destructor)
  




From hdl at users.sourceforge.net  Tue Jun 28 13:52:01 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 04:52:01 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui newbiblio.tmpl,1.15.2.2,1.15.2.3
Message-ID: <E1DnEdF-0007Mn-2s@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	newbiblio.tmpl 
Log Message:
Adding choice lists for sort1/Sort2 For biblios and patrons management.
Commiting along Help Modifications

Index: newbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl,v
retrieving revision 1.15.2.2
retrieving revision 1.15.2.3
diff -C2 -r1.15.2.2 -r1.15.2.3
*** newbiblio.tmpl	8 Mar 2005 14:02:17 -0000	1.15.2.2
--- newbiblio.tmpl	28 Jun 2005 11:51:58 -0000	1.15.2.3
***************
*** 199,207 ****
  		<p>
  			<label class="label100">Sort field 1</label>
! 			<input type="text" size="20" name=sort1 value="<!-- TMPL_VAR NAME="sort1" -->">
  		</p>
  		<p>
  			<label class="label100">Sort field 2</label>
! 			<input type="text" size="20" name=sort2 value="<!-- TMPL_VAR NAME="sort2" -->">
  		</p>
  		<p>
--- 199,215 ----
  		<p>
  			<label class="label100">Sort field 1</label>
! 			<!-- TMPL_IF Name="CGIsort1" -->
! 				<!-- TMPL_VAR Name="CGIsort1" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
! 			<!--/TMPL_IF -->
  		</p>
  		<p>
  			<label class="label100">Sort field 2</label>
! 			<!-- TMPL_IF Name="CGIsort2" -->
! 				<!-- TMPL_VAR Name="CGIsort2" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
! 			<!--/TMPL_IF -->
  		</p>
  		<p>




From hdl at users.sourceforge.net  Tue Jun 28 13:52:01 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 04:52:01 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/help/members memberentry.tmpl,1.1,1.1.2.1
Message-ID: <E1DnEdF-0007Ml-2H@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	memberentry.tmpl 
Log Message:
Adding choice lists for sort1/Sort2 For biblios and patrons management.
Commiting along Help Modifications

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/help/members/memberentry.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** memberentry.tmpl	22 Dec 2004 16:12:45 -0000	1.1
--- memberentry.tmpl	28 Jun 2005 11:51:58 -0000	1.1.2.1
***************
*** 1,4 ****
--- 1,8 ----
  <!-- TMPL_INCLUDE name="help-top.inc" -->
  <h1>Add member help</h1>
+ 
+ 
+ <p>sort1 and sort2 may now be related to a list of Authorized Values. All you have to do is define a Bsort1 or Bsort2 category of authorised values and enter the desired values into these categories. You will then be able to use them through Add/Modify Member Page</p>
+ 
  <h2>Add Member, person</h2>
  <p>This is the form for adding a new single member to the database. There is also a form for organisations, such as other libraries and non profit organisations you might lend to. You should use the Add Organisation tab at the top of the Member page for that.</p>




From hdl at users.sourceforge.net  Tue Jun 28 13:52:02 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Tue, 28 Jun 2005 04:52:02 -0700
Subject: [Koha-cvs] CVS: koha/acqui newbiblio.pl,1.21,1.21.2.1
Message-ID: <E1DnEdG-0007NK-DT@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28209/acqui

Modified Files:
      Tag: rel_2_2
	newbiblio.pl 
Log Message:
Adding choice lists for sort1/Sort2 For biblios and patrons management.
Commiting along Help Modifications

Index: newbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -C2 -r1.21 -r1.21.2.1
*** newbiblio.pl	14 Sep 2004 12:09:52 -0000	1.21
--- newbiblio.pl	28 Jun 2005 11:51:59 -0000	1.21.2.1
***************
*** 31,34 ****
--- 31,35 ----
  use C4::Search;
  use C4::Output;
+ use C4::Input;
  use C4::Interface::CGI::Output;
  use HTML::Template;
***************
*** 140,143 ****
--- 141,159 ----
  			-multiple => 0 );
  
+ #Build sort lists
+ my $CGIsort1 = buildCGIsort("Asort1","sort1",$data->{'sort1'});
+ if ($CGIsort1) {
+ 	$template->param(CGIsort1 => $CGIsort1);
+ } else {
+ 	$template->param( sort1 => $data->{'sort1'});
+ }
+ 
+ my $CGIsort2 = buildCGIsort("Asort2","sort2",$data->{'sort2'});
+ if ($CGIsort2) {
+ 	$template->param(CGIsort2 =>$CGIsort2);
+ } else {
+ 	$template->param( sort2 => $data->{'sort2'});
+ }
+ 
  # fill template
  $template->param( existing => $biblio,
***************
*** 173,178 ****
  						ecost => $data->{'ecost'},
  						notes => $data->{'notes'},
- 						sort1 => $data->{'sort1'},
- 						sort2 => $data->{'sort2'},
  						publishercode => $data->{'publishercode'});
  
--- 189,192 ----




From rangi at users.sourceforge.net  Wed Jun 29 02:05:23 2005
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Tue, 28 Jun 2005 17:05:23 -0700
Subject: [Koha-cvs] CVS: koha modbibitem.pl,1.14,1.15
Message-ID: <E1DnQ4x-0007qi-Gp@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29825

Modified Files:
	modbibitem.pl 
Log Message:
We dont use images as buttons in the templates anymore, fixing the code to reflect that


Index: modbibitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/modbibitem.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** modbibitem.pl	13 Jul 2004 12:55:01 -0000	1.14
--- modbibitem.pl	29 Jun 2005 00:05:21 -0000	1.15
***************
*** 44,48 ****
  my $data=bibitemdata($bibitemnum);
  my $biblio=$input->param('biblio');
! my $submit=$input->param('submit.x');
  if ($submit eq ''){
    print $input->redirect("deletebiblioitem.pl?biblioitemnumber=$bibitemnum&biblionumber=$biblio");
--- 44,48 ----
  my $data=bibitemdata($bibitemnum);
  my $biblio=$input->param('biblio');
! my $submit=$input->param('submit');
  if ($submit eq ''){
    print $input->redirect("deletebiblioitem.pl?biblioitemnumber=$bibitemnum&biblionumber=$biblio");




From rangi at users.sourceforge.net  Wed Jun 29 03:00:51 2005
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Tue, 28 Jun 2005 18:00:51 -0700
Subject: [Koha-cvs] CVS: koha/acqui newbiblio.pl,1.23,1.24
Message-ID: <E1DnQwd-0007HT-T2@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27605

Modified Files:
	newbiblio.pl 
Log Message:
Some of the values from the bookseller table werent being passed through to the templates


Index: newbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** newbiblio.pl	22 Jun 2005 13:14:12 -0000	1.23
--- newbiblio.pl	29 Jun 2005 01:00:49 -0000	1.24
***************
*** 170,173 ****
--- 170,176 ----
  						listprice => $booksellers[0]->{'listprice'},
  						gstreg => $booksellers[0]->{'gstreg'},
+                                                 invoiceinc => $booksellers[0]->{'invoiceincgst'},                              
+                                                 invoicedisc => $booksellers[0]->{'invoicedisc'},                               
+                                                 nocalc => $booksellers[0]->{'nocalc'},
  						name => $booksellers[0]->{'name'},
  						currency => $booksellers[0]->{'listprice'},




From rangi at users.sourceforge.net  Wed Jun 29 03:03:08 2005
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Tue, 28 Jun 2005 18:03:08 -0700
Subject: [Koha-cvs] CVS: koha/acqui updatesupplier.pl,1.5,1.6
Message-ID: <E1DnQyq-0007Wt-Cv@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28793

Modified Files:
	updatesupplier.pl 
Log Message:
Removing a line that was adding a \ in front of every ' in a suppliers name


Index: updatesupplier.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/updatesupplier.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** updatesupplier.pl	13 Jul 2004 12:53:00 -0000	1.5
--- updatesupplier.pl	29 Jun 2005 01:03:06 -0000	1.6
***************
*** 36,40 ****
  
  $data{'name'}=$input->param('company');
- $data{'name'}=~ s/\'/\\\'/g;
  $data{'postal'}=$input->param('company_postal');
  my $address=$input->param('physical');
--- 36,39 ----




From rangi at users.sourceforge.net  Wed Jun 29 03:16:39 2005
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Tue, 28 Jun 2005 18:16:39 -0700
Subject: [Koha-cvs] CVS: koha/acqui basket.pl,1.26,1.27
Message-ID: <E1DnRBv-0000ht-UA@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2657

Modified Files:
	basket.pl 
Log Message:
Formatting the creation date correctly


Index: basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/basket.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** basket.pl	20 Jun 2005 13:15:46 -0000	1.26
--- basket.pl	29 Jun 2005 01:16:37 -0000	1.27
***************
*** 110,114 ****
  $gist_est = sprintf("%.2f",$sub_total_est*$prefgist);
  $template->param(basketno => $basketno,
! 				creationdate => $basket->{creationdate},
  				authorisedby => $basket->{authorisedby},
  				authorisedbyname => $basket->{authorisedbyname},
--- 110,114 ----
  $gist_est = sprintf("%.2f",$sub_total_est*$prefgist);
  $template->param(basketno => $basketno,
! 				creationdate => format_date($basket->{creationdate}),
  				authorisedby => $basket->{authorisedby},
  				authorisedbyname => $basket->{authorisedbyname},




From rangi at users.sourceforge.net  Wed Jun 29 04:01:05 2005
From: rangi at users.sourceforge.net (Chris Cormack)
Date: Tue, 28 Jun 2005 19:01:05 -0700
Subject: [Koha-cvs] CVS: koha/opac opac-sendbasket.pl,1.7,1.8
Message-ID: <E1DnRsv-0006x2-QR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26427

Modified Files:
	opac-sendbasket.pl 
Log Message:
Fixing a bug caused by the syncing with the 2.2 branch


Index: opac-sendbasket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-sendbasket.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** opac-sendbasket.pl	20 Jun 2005 14:33:32 -0000	1.7
--- opac-sendbasket.pl	29 Jun 2005 02:01:03 -0000	1.8
***************
*** 71,78 ****
  	}
  
!     $email_header = encode_qp($email_header);
! 
!     $boundary = "--" . $boundary;
! 
  	# Analysing information and getting mail properties
  	if ($template_res =~ /<SUBJECT>\n(.*)\n<END_SUBJECT>/s) { $mail{'subject'} = $1; }
--- 71,76 ----
  	}
  
!     # Getting template result                                                                                             
!     my $template_res = $template2->output();
  	# Analysing information and getting mail properties
  	if ($template_res =~ /<SUBJECT>\n(.*)\n<END_SUBJECT>/s) { $mail{'subject'} = $1; }




From hdl at users.sourceforge.net  Thu Jun 30 10:56:35 2005
From: hdl at users.sourceforge.net (Henri-Damien LAURENT)
Date: Thu, 30 Jun 2005 01:56:35 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marctagstructure.tmpl,1.27.2.7,1.27.2.8
Message-ID: <E1DnuqZ-00012N-5T@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	marctagstructure.tmpl 
Log Message:
Adding TAG Input Field to MARCtagstructure When adding a field.

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.27.2.7
retrieving revision 1.27.2.8
diff -C2 -r1.27.2.7 -r1.27.2.8
*** marctagstructure.tmpl	21 Jun 2005 13:34:26 -0000	1.27.2.7
--- marctagstructure.tmpl	30 Jun 2005 08:56:32 -0000	1.27.2.8
***************
*** 66,70 ****
  		<input type="hidden" name="op" value="add_validate">
  		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
! 		<p><label>Tag<label><!-- TMPL_VAR NAME="searchfield" --></p>
  		<p><label>Lib for librarians</label><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape=HTML -->" size="80" maxlength="100"></p>
  		<p><label>Lib for opac</label><input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="80" maxlength="100"></p>
--- 66,75 ----
  		<input type="hidden" name="op" value="add_validate">
  		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
! 		<p><label>Tag<label><!-- TMPL_IF Name="searchfield" -->
! 		<!-- TMPL_VAR NAME="searchfield" -->
! 		<!-- TMPL_ELSE -->
! 		<input type="text" name="tagfield" value="" escape=HTML -->
! 		<!-- /TMPL_IF -->
! 		</p>
  		<p><label>Lib for librarians</label><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape=HTML -->" size="80" maxlength="100"></p>
  		<p><label>Lib for opac</label><input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="80" maxlength="100"></p>




From oleonard at users.sourceforge.net  Thu Jun 30 21:53:32 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 12:53:32 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui histsearch.tmpl,1.1.2.3,1.1.2.4
Message-ID: <E1Do56K-00044A-Vs@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	histsearch.tmpl 
Log Message:
Synching with default template

Index: histsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/histsearch.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** histsearch.tmpl	8 Jun 2005 17:13:55 -0000	1.1.2.3
--- histsearch.tmpl	30 Jun 2005 19:53:20 -0000	1.1.2.4
***************
*** 5,8 ****
--- 5,9 ----
  <div id="main">
  	<h1>Order search</h3>
+ 	<div class="results"><!-- TMPL_VAR Name ="numresults" --> orders were found.</div>
  	<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post"><table>
  		<tr>
***************
*** 87,91 ****
  		<!-- TMPL_LOOP NAME="suggestions_loop" -->
  			<tr>
! 				<td>&nbsp;</td>
  				<td><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
  				<td><!-- TMPL_VAR NAME="author" --></td>
--- 88,92 ----
  		<!-- TMPL_LOOP NAME="suggestions_loop" -->
  			<tr>
! 				<td><!-- TMPL_VAR NAME="count" --></td>
  				<td><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
  				<td><!-- TMPL_VAR NAME="author" --></td>




From oleonard at users.sourceforge.net  Thu Jun 30 21:54:31 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 12:54:31 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui histsearch.tmpl,1.4,1.5
Message-ID: <E1Do57H-00049p-S2@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	histsearch.tmpl 
Log Message:
Synching with rel_2_2.

Index: histsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/histsearch.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** histsearch.tmpl	8 Jun 2005 18:38:19 -0000	1.4
--- histsearch.tmpl	30 Jun 2005 19:54:23 -0000	1.5
***************
*** 5,8 ****
--- 5,9 ----
  <div id="main">
  	<h1>Order search</h3>
+ 	<div class="results"><!-- TMPL_VAR Name ="numresults" --> orders were found.</div>
  	<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post"><table>
  		<tr>
***************
*** 87,91 ****
  		<!-- TMPL_LOOP NAME="suggestions_loop" -->
  			<tr>
! 				<td>&nbsp;</td>
  				<td><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
  				<td><!-- TMPL_VAR NAME="author" --></td>
--- 88,92 ----
  		<!-- TMPL_LOOP NAME="suggestions_loop" -->
  			<tr>
! 				<td><!-- TMPL_VAR NAME="count" --></td>
  				<td><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
  				<td><!-- TMPL_VAR NAME="author" --></td>




From oleonard at users.sourceforge.net  Thu Jun 30 22:01:17 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:01:17 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui newbiblio.tmpl,1.3,1.4
Message-ID: <E1Do5Dp-00057x-Qg@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	newbiblio.tmpl 
Log Message:
Synching with rel_2_2.

Index: newbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** newbiblio.tmpl	2 May 2005 18:06:49 -0000	1.3
--- newbiblio.tmpl	30 Jun 2005 20:01:15 -0000	1.4
***************
*** 144,149 ****
  		<tr><th><label for="invoice">Invoice Number *</label></th><td><input type="text" size="20" id="invoice" name="invoice"  value="<!-- TMPL_VAR name="invoice" -->" /></td></tr>
  		<tr><th><label for="notes-details">Notes</label></th><td><input type="text" size="20" id="notes-details" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" /></td></tr>
! 		<tr><th><label for="sort1">Sort field 1</label></th><td><input type="text" size="20" id="sort1" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" /></td></tr>
! 		<tr><th><label for="sort2">Sort field 2</label></th><td><input type="text" size="20" id="sort2" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" /></td></tr>
  		</table></div>
  		<p>The 'Sort' fields are available for your own usage. They can be useful for stat purposes</p>	
--- 144,159 ----
  		<tr><th><label for="invoice">Invoice Number *</label></th><td><input type="text" size="20" id="invoice" name="invoice"  value="<!-- TMPL_VAR name="invoice" -->" /></td></tr>
  		<tr><th><label for="notes-details">Notes</label></th><td><input type="text" size="20" id="notes-details" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" /></td></tr>
! 		<tr><th><label for="sort1">Sort field 1</label></th><td>
! 		<!-- TMPL_IF Name="CGIsort1" -->
! 				<!-- TMPL_VAR Name="CGIsort1" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" id="sort1" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
! 			<!--/TMPL_IF -->
! 	</td></tr>
! 		<tr><th><label for="sort2">Sort field 2</label></th><td><!-- TMPL_IF Name="CGIsort2" -->
! 				<!-- TMPL_VAR Name="CGIsort2" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" id="sort2" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
! 			<!--/TMPL_IF --></td></tr>
  		</table></div>
  		<p>The 'Sort' fields are available for your own usage. They can be useful for stat purposes</p>	




From oleonard at users.sourceforge.net  Thu Jun 30 22:02:43 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:02:43 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui newbiblio.tmpl,1.2.2.1,1.2.2.2
Message-ID: <E1Do5FD-0005JW-EG@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
      Tag: rel_2_2
	newbiblio.tmpl 
Log Message:
Synching with default template

Index: newbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** newbiblio.tmpl	14 Apr 2005 21:28:27 -0000	1.2.2.1
--- newbiblio.tmpl	30 Jun 2005 20:02:40 -0000	1.2.2.2
***************
*** 144,149 ****
  		<tr><th><label for="invoice">Invoice Number *</label></th><td><input type="text" size="20" id="invoice" name="invoice"  value="<!-- TMPL_VAR name="invoice" -->" /></td></tr>
  		<tr><th><label for="notes-details">Notes</label></th><td><input type="text" size="20" id="notes-details" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" /></td></tr>
! 		<tr><th><label for="sort1">Sort field 1</label></th><td><input type="text" size="20" id="sort1" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" /></td></tr>
! 		<tr><th><label for="sort2">Sort field 2</label></th><td><input type="text" size="20" id="sort2" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" /></td></tr>
  		</table></div>
  		<p>The 'Sort' fields are available for your own usage. They can be useful for stat purposes</p>	
--- 144,159 ----
  		<tr><th><label for="invoice">Invoice Number *</label></th><td><input type="text" size="20" id="invoice" name="invoice"  value="<!-- TMPL_VAR name="invoice" -->" /></td></tr>
  		<tr><th><label for="notes-details">Notes</label></th><td><input type="text" size="20" id="notes-details" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" /></td></tr>
! 		<tr><th><label for="sort1">Sort field 1</label></th><td>
! 		<!-- TMPL_IF Name="CGIsort1" -->
! 				<!-- TMPL_VAR Name="CGIsort1" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" id="sort1" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
! 			<!--/TMPL_IF -->
! 	</td></tr>
! 		<tr><th><label for="sort2">Sort field 2</label></th><td><!-- TMPL_IF Name="CGIsort2" -->
! 				<!-- TMPL_VAR Name="CGIsort2" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" id="sort2" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
! 			<!--/TMPL_IF --></td></tr>
  		</table></div>
  		<p>The 'Sort' fields are available for your own usage. They can be useful for stat purposes</p>	




From oleonard at users.sourceforge.net  Thu Jun 30 22:09:09 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:09:09 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/authorities searchresultlist-auth.tmpl,1.2,1.3
Message-ID: <E1Do5LR-0006BN-6i@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23723/koha-tmpl/intranet-tmpl/npl/en/authorities

Modified Files:
	searchresultlist-auth.tmpl 
Log Message:
Synching with rel_2_2.

Index: searchresultlist-auth.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/searchresultlist-auth.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** searchresultlist-auth.tmpl	2 May 2005 18:15:31 -0000	1.2
--- searchresultlist-auth.tmpl	30 Jun 2005 20:09:06 -0000	1.3
***************
*** 37,41 ****
  			<p>
  				<!-- TMPL_IF name="displayprev" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet">
  						<img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
  					</a>
--- 37,41 ----
  			<p>
  				<!-- TMPL_IF name="displayprev" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  						<img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
  					</a>
***************
*** 45,54 ****
  						<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
  					<!-- TMPL_ELSE -->
! 						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet">
  							<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
  					<!-- /TMPL_IF -->
  				<!-- /TMPL_LOOP -->
  				<!-- TMPL_IF name="displaynext" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet">
  						<img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
  				<!-- /TMPL_IF -->
--- 45,54 ----
  						<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
  					<!-- TMPL_ELSE -->
! 						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  							<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
  					<!-- /TMPL_IF -->
  				<!-- /TMPL_LOOP -->
  				<!-- TMPL_IF name="displaynext" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  						<img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
  				<!-- /TMPL_IF -->




From oleonard at users.sourceforge.net  Thu Jun 30 22:11:43 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:11:43 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/authorities searchresultlist-auth.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1Do5Nv-0006hL-FJ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25735/koha-tmpl/intranet-tmpl/npl/en/authorities

Modified Files:
      Tag: rel_2_2
	searchresultlist-auth.tmpl 
Log Message:
Synching with default template

Index: searchresultlist-auth.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/searchresultlist-auth.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** searchresultlist-auth.tmpl	19 Apr 2005 19:13:34 -0000	1.1.2.1
--- searchresultlist-auth.tmpl	30 Jun 2005 20:11:41 -0000	1.1.2.2
***************
*** 37,41 ****
  			<p>
  				<!-- TMPL_IF name="displayprev" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet">
  						<img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
  					</a>
--- 37,41 ----
  			<p>
  				<!-- TMPL_IF name="displayprev" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  						<img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
  					</a>
***************
*** 45,54 ****
  						<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
  					<!-- TMPL_ELSE -->
! 						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet">
  							<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
  					<!-- /TMPL_IF -->
  				<!-- /TMPL_LOOP -->
  				<!-- TMPL_IF name="displaynext" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet">
  						<img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
  				<!-- /TMPL_IF -->
--- 45,54 ----
  						<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
  					<!-- TMPL_ELSE -->
! 						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  							<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
  					<!-- /TMPL_IF -->
  				<!-- /TMPL_LOOP -->
  				<!-- TMPL_IF name="displaynext" -->
! 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->">
  						<img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
  				<!-- /TMPL_IF -->




From oleonard at users.sourceforge.net  Thu Jun 30 22:17:23 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:17:23 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull statecollection.tmpl,1.2.2.1,1.2.2.2
Message-ID: <E1Do5TP-0007Sz-Vv@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28637/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
      Tag: rel_2_2
	statecollection.tmpl 
Log Message:
Synching with default template

Index: statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/statecollection.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** statecollection.tmpl	10 Jan 2005 17:05:03 -0000	1.2.2.1
--- statecollection.tmpl	30 Jun 2005 20:17:20 -0000	1.2.2.2
***************
*** 70,73 ****
--- 70,83 ----
  						<option value="4">Missing</option>
  					<!-- /TMPL_IF -->
+ 					<!--TMPL_IF name="status5" -->
+ 						<option value="5" selected>Not issued</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="5">Not issued</option>
+ 					<!-- /TMPL_IF -->
+ 					<!--TMPL_IF name="status6" -->
+ 						<option value="6" selected>Delete</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="6">Delete</option>
+ 					<!-- /TMPL_IF -->
  				</select>
  			</td>




From oleonard at users.sourceforge.net  Thu Jun 30 22:19:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:19:18 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull statecollection.tmpl,1.3,1.4
Message-ID: <E1Do5VG-0007hj-71@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29578/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
	statecollection.tmpl 
Log Message:
Synching with rel_2_2.

Index: statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/statecollection.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** statecollection.tmpl	10 Jan 2005 17:02:54 -0000	1.3
--- statecollection.tmpl	30 Jun 2005 20:19:15 -0000	1.4
***************
*** 70,73 ****
--- 70,83 ----
  						<option value="4">Missing</option>
  					<!-- /TMPL_IF -->
+ 					<!--TMPL_IF name="status5" -->
+ 						<option value="5" selected>Not issued</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="5">Not issued</option>
+ 					<!-- /TMPL_IF -->
+ 					<!--TMPL_IF name="status6" -->
+ 						<option value="6" selected>Delete</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="6">Delete</option>
+ 					<!-- /TMPL_IF -->
  				</select>
  			</td>




From oleonard at users.sourceforge.net  Thu Jun 30 22:26:39 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:26:39 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member-quicksearch-results.tmpl,1.1,1.2
Message-ID: <E1Do5cN-0000CC-MR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv699/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
	member-quicksearch-results.tmpl 
Log Message:
Synching with rel_2_2.

Index: member-quicksearch-results.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/member-quicksearch-results.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** member-quicksearch-results.tmpl	13 Jan 2005 21:50:28 -0000	1.1
--- member-quicksearch-results.tmpl	30 Jun 2005 20:26:37 -0000	1.2
***************
*** 2,9 ****
  
  <div id="main-compact">
! 
! <div class="table"><table>
    <tr>
!   	<th>&nbsp;</th>
      <th>Card</th>
      <th>Name (Cat.)</th>
--- 2,9 ----
  
  <div id="main-compact">
! <div class="results"><!-- TMPL_VAR Name ="numresults" --> patrons found.</div>
! <table>
    <tr>
!   	<th colspan="2">&nbsp;</th>
      <th>Card</th>
      <th>Name (Cat.)</th>
***************
*** 17,21 ****
      <tr>
      <!-- /TMPL_IF -->
! 	 <td><form action="member-search-results.pl" method="get"><input type="button" class="submit" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','mainform','member'); return false;" /></form></td>
        <td><!-- TMPL_VAR NAME="cardnumber" --></td>
        <td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> (<!-- TMPL_VAR NAME="categorycode" -->)</td>
--- 17,21 ----
      <tr>
      <!-- /TMPL_IF -->
! 	 <td><!-- TMPL_VAR NAME="count" --></td><td><form action="member-search-results.pl" method="get"><input type="button" class="submit" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','mainform','member'); return false;" /></form></td>
        <td><!-- TMPL_VAR NAME="cardnumber" --></td>
        <td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> (<!-- TMPL_VAR NAME="categorycode" -->)</td>
***************
*** 24,28 ****
    <!-- /TMPL_LOOP -->
    <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
! </table></div>
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
--- 24,28 ----
    <!-- /TMPL_LOOP -->
    <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
! </table>
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file




From oleonard at users.sourceforge.net  Thu Jun 30 22:27:09 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:27:09 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member-quicksearch-results.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1Do5cr-0000G0-QU@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv691/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
      Tag: rel_2_2
	member-quicksearch-results.tmpl 
Log Message:
Synching with default template

Index: member-quicksearch-results.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/member-quicksearch-results.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** member-quicksearch-results.tmpl	18 Jan 2005 21:55:17 -0000	1.1.2.1
--- member-quicksearch-results.tmpl	30 Jun 2005 20:27:07 -0000	1.1.2.2
***************
*** 2,9 ****
  
  <div id="main-compact">
! 
! <div class="table"><table>
    <tr>
!   	<th>&nbsp;</th>
      <th>Card</th>
      <th>Name (Cat.)</th>
--- 2,9 ----
  
  <div id="main-compact">
! <div class="results"><!-- TMPL_VAR Name ="numresults" --> patrons found.</div>
! <table>
    <tr>
!   	<th colspan="2">&nbsp;</th>
      <th>Card</th>
      <th>Name (Cat.)</th>
***************
*** 17,21 ****
      <tr>
      <!-- /TMPL_IF -->
! 	 <td><form action="member-search-results.pl" method="get"><input type="button" class="submit" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','mainform','member'); return false;" /></form></td>
        <td><!-- TMPL_VAR NAME="cardnumber" --></td>
        <td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> (<!-- TMPL_VAR NAME="categorycode" -->)</td>
--- 17,21 ----
      <tr>
      <!-- /TMPL_IF -->
! 	 <td><!-- TMPL_VAR NAME="count" --></td><td><form action="member-search-results.pl" method="get"><input type="button" class="submit" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','mainform','member'); return false;" /></form></td>
        <td><!-- TMPL_VAR NAME="cardnumber" --></td>
        <td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> (<!-- TMPL_VAR NAME="categorycode" -->)</td>
***************
*** 24,28 ****
    <!-- /TMPL_LOOP -->
    <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
! </table></div>
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
--- 24,28 ----
    <!-- /TMPL_LOOP -->
    <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
! </table>
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file




From oleonard at users.sourceforge.net  Thu Jun 30 22:34:11 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:34:11 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member.tmpl,1.4.2.3,1.4.2.4
Message-ID: <E1Do5jf-0001K0-Pi@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5043/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
      Tag: rel_2_2
	member.tmpl 
Log Message:
Synching with default template

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/member.tmpl,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -r1.4.2.3 -r1.4.2.4
*** member.tmpl	7 Apr 2005 17:03:31 -0000	1.4.2.3
--- member.tmpl	30 Jun 2005 20:34:09 -0000	1.4.2.4
***************
*** 5,11 ****
  
  <div id="main">
! <div class="table"><table>
! 	<caption>Patron Search Results</caption>
    <tr>
      <th>Card</th>
      <th>Name</th>
--- 5,13 ----
  
  <div id="main">
!     <h3>Results for Search: <span class="ex"><!-- TMPL_VAR NAME="member" --></span></h3>
! 	<div class="results"><!-- TMPL_VAR Name ="numresults" --> patrons found.</div>
! <table>
    <tr>
+   	<th>&nbsp;</th>
      <th>Card</th>
      <th>Name</th>
***************
*** 13,17 ****
      <th>Address</th>
      <th>OD/Issues</th>
! <!--     <th>Charges</th> -->
      <th>Notes</th>
  	<th>&nbsp;</th>
--- 15,19 ----
      <th>Address</th>
      <th>OD/Issues</th>
! 	<!-- Hide from NPL --><th>Charges</th><!-- /Hide from NPL -->
      <th>Notes</th>
  	<th>&nbsp;</th>
***************
*** 24,27 ****
--- 26,30 ----
      <tr>
      <!-- /TMPL_IF -->
+ 		<td><!-- TMPL_VAR NAME="count" --></td>
        <td><!-- TMPL_VAR NAME="cardnumber" --> (<a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->" title="Issue to this Patron">Issue</a>)</td>
        <td><a class="searchresults" href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> </td>
***************
*** 29,33 ****
        <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></td>
        <td><!-- TMPL_VAR NAME="odissue" --></td>
! <!--       <td><!-- TMPL_VAR NAME="fines" --></td> -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
  	  <td><a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;modify=edit">Edit</a></td>
--- 32,36 ----
        <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></td>
        <td><!-- TMPL_VAR NAME="odissue" --></td>
! 		<!-- Hide from NPL --><td><!-- TMPL_VAR NAME="fines" --></td><!-- /Hide from NPL -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
  	  <td><a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;modify=edit">Edit</a></td>
***************
*** 35,39 ****
    <!-- /TMPL_LOOP -->
    <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
! </table></div>
  <div class="tabitem"><form action="/cgi-bin/koha/members/memberentry.pl" method="post"><input type="hidden" name="categorycode" value="" /><input type="hidden" name="actionType" value="Add" />
  	<input type="submit" class="submit" value="Add New Patron" /></form>
--- 38,43 ----
    <!-- /TMPL_LOOP -->
    <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
! </table>
! 
  <div class="tabitem"><form action="/cgi-bin/koha/members/memberentry.pl" method="post"><input type="hidden" name="categorycode" value="" /><input type="hidden" name="actionType" value="Add" />
  	<input type="submit" class="submit" value="Add New Patron" /></form>




From oleonard at users.sourceforge.net  Thu Jun 30 22:34:12 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:34:12 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member.tmpl,1.6,1.7
Message-ID: <E1Do5jg-0001KA-3e@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5053/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
	member.tmpl 
Log Message:
Synching with rel_2_2.

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/member.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** member.tmpl	2 May 2005 20:21:12 -0000	1.6
--- member.tmpl	30 Jun 2005 20:34:09 -0000	1.7
***************
*** 5,11 ****
  
  <div id="main">
! <div class="table"><table>
! 	<caption>Patron Search Results</caption>
    <tr>
      <th>Card</th>
      <th>Name</th>
--- 5,13 ----
  
  <div id="main">
!     <h3>Results for Search: <span class="ex"><!-- TMPL_VAR NAME="member" --></span></h3>
! 	<div class="results"><!-- TMPL_VAR Name ="numresults" --> patrons found.</div>
! <table>
    <tr>
+   	<th>&nbsp;</th>
      <th>Card</th>
      <th>Name</th>
***************
*** 13,17 ****
      <th>Address</th>
      <th>OD/Issues</th>
! <!--     <th>Charges</th> -->
      <th>Notes</th>
  	<th>&nbsp;</th>
--- 15,19 ----
      <th>Address</th>
      <th>OD/Issues</th>
! 	<!-- Hide from NPL --><th>Charges</th><!-- /Hide from NPL -->
      <th>Notes</th>
  	<th>&nbsp;</th>
***************
*** 24,27 ****
--- 26,30 ----
      <tr>
      <!-- /TMPL_IF -->
+ 		<td><!-- TMPL_VAR NAME="count" --></td>
        <td><!-- TMPL_VAR NAME="cardnumber" --> (<a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->" title="Issue to this Patron">Issue</a>)</td>
        <td><a class="searchresults" href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> </td>
***************
*** 29,33 ****
        <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></td>
        <td><!-- TMPL_VAR NAME="odissue" --></td>
! <!--       <td><!-- TMPL_VAR NAME="fines" --></td> -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
  	  <td><a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;modify=edit">Edit</a></td>
--- 32,36 ----
        <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></td>
        <td><!-- TMPL_VAR NAME="odissue" --></td>
! 		<!-- Hide from NPL --><td><!-- TMPL_VAR NAME="fines" --></td><!-- /Hide from NPL -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
  	  <td><a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;modify=edit">Edit</a></td>
***************
*** 35,39 ****
    <!-- /TMPL_LOOP -->
    <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
! </table></div>
  <div class="tabitem"><form action="/cgi-bin/koha/members/memberentry.pl" method="post"><input type="hidden" name="categorycode" value="" /><input type="hidden" name="actionType" value="Add" />
  	<input type="submit" class="submit" value="Add New Patron" /></form>
--- 38,43 ----
    <!-- /TMPL_LOOP -->
    <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
! </table>
! 
  <div class="tabitem"><form action="/cgi-bin/koha/members/memberentry.pl" method="post"><input type="hidden" name="categorycode" value="" /><input type="hidden" name="actionType" value="Add" />
  	<input type="submit" class="submit" value="Add New Patron" /></form>




From oleonard at users.sourceforge.net  Thu Jun 30 22:36:51 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:36:51 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members memberentry.tmpl,1.3.2.4,1.3.2.5
Message-ID: <E1Do5mF-0001hE-Fb@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6465/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
      Tag: rel_2_2
	memberentry.tmpl 
Log Message:
Synching with default template

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/memberentry.tmpl,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -C2 -r1.3.2.4 -r1.3.2.5
*** memberentry.tmpl	8 Jun 2005 20:36:30 -0000	1.3.2.4
--- memberentry.tmpl	30 Jun 2005 20:36:49 -0000	1.3.2.5
***************
*** 146,151 ****
  </table>
  <table><caption>Additional Fields</caption>
! 	<tr><th><label for="sort1">Sorting field 1</label></th><td><input type="text" id="sort1" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->"></td><td rowspan="2"><p>These fields are available for your own usage. They can be useful for statistical purposes</p></td></tr>
! 	<tr><th><label for="sort2">Sorting field 2</label></th><td><input type="text" id="sort2" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->"></td></tr>
  </table>
  </div>
--- 146,159 ----
  </table>
  <table><caption>Additional Fields</caption>
! 	<tr><th><label for="sort1">Sorting field 1</label></th><td><!-- TMPL_IF Name="CGIsort1" -->
! 						<!-- TMPL_VAR Name="CGIsort1" -->
! 					<!-- TMPL_ELSE -->
! 						<input type="text" name="sort1" id="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
! 					<!--/TMPL_IF --></td><td rowspan="2"><p>These fields are available for your own usage. They can be useful for statistical purposes</p></td></tr>
! 	<tr><th><label for="sort2">Sorting field 2</label></th><td><!-- TMPL_IF Name="CGIsort2" -->
! 						<!-- TMPL_VAR Name="CGIsort2" -->
! 					<!-- TMPL_ELSE -->
! 						<input type="text" name="sort2" id="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
! 					<!--/TMPL_IF --></td></tr>
  </table>
  </div>




From oleonard at users.sourceforge.net  Thu Jun 30 22:37:17 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 30 Jun 2005 13:37:17 -0700
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members memberentry.tmpl,1.7,1.8
Message-ID: <E1Do5mf-0001kw-VT@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6642/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
	memberentry.tmpl 
Log Message:
Synching with rel_2_2.

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/memberentry.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** memberentry.tmpl	8 Jun 2005 20:36:32 -0000	1.7
--- memberentry.tmpl	30 Jun 2005 20:37:00 -0000	1.8
***************
*** 146,151 ****
  </table>
  <table><caption>Additional Fields</caption>
! 	<tr><th><label for="sort1">Sorting field 1</label></th><td><input type="text" id="sort1" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->"></td><td rowspan="2"><p>These fields are available for your own usage. They can be useful for statistical purposes</p></td></tr>
! 	<tr><th><label for="sort2">Sorting field 2</label></th><td><input type="text" id="sort2" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->"></td></tr>
  </table>
  </div>
--- 146,159 ----
  </table>
  <table><caption>Additional Fields</caption>
! 	<tr><th><label for="sort1">Sorting field 1</label></th><td><!-- TMPL_IF Name="CGIsort1" -->
! 						<!-- TMPL_VAR Name="CGIsort1" -->
! 					<!-- TMPL_ELSE -->
! 						<input type="text" name="sort1" id="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
! 					<!--/TMPL_IF --></td><td rowspan="2"><p>These fields are available for your own usage. They can be useful for statistical purposes</p></td></tr>
! 	<tr><th><label for="sort2">Sorting field 2</label></th><td><!-- TMPL_IF Name="CGIsort2" -->
! 						<!-- TMPL_VAR Name="CGIsort2" -->
! 					<!-- TMPL_ELSE -->
! 						<input type="text" name="sort2" id="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
! 					<!--/TMPL_IF --></td></tr>
  </table>
  </div>




From shedges at users.sourceforge.net  Mon Jun 13 12:28:58 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Mon, 13 Jun 2005 03:28:58 -0700
Subject: [Koha-cvs] CVS: koha-doc/fr/opac/CatKOHAimages image10.gif,NONE,1.1 image11.gif,NONE,1.1 image12.gif,NONE,1.1 image13.gif,NONE,1.1 image14.gif,NONE,1.1 image15.gif,NONE,1.1 image1.gif,NONE,1.1 image2.gif,NONE,1.1 image3.gif,NONE,1.1 image4.gif,NONE,1.1 image5.gif,NONE,1.1 image6.gif,NONE,1.1 image7.gif,NONE,1.1 image8.gif,NONE,1.1 image9.gif,NONE,1.1
Message-ID: <E1DhmBe-0004Ng-Ib@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/fr/opac/CatKOHAimages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16589/fr/opac/CatKOHAimages

Added Files:
	image10.gif image11.gif image12.gif image13.gif image14.gif 
	image15.gif image1.gif image2.gif image3.gif image4.gif 
	image5.gif image6.gif image7.gif image8.gif image9.gif 
Log Message:
images for CatKOHA.xml document

--- NEW FILE ---
GIF89a?

?
-<?	>N>I%5A3;@7D;CD
BRGOKWO`Ud'DH(JW(RZ7IH9LU;QK7PV&Oa*Ve1N`5Vd(bp6am7gv@@ 	AKICNPBRHGWT@\dAkyEn?o????}??x????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
?
v????rG???&w?d????f??v?????r;/t?*X\????????Kn?6?f??????w??F??t?+d?N1?t?ab???q???;??"?????"?m????T??5????E?}T!;??U?z>?L+2??sH??

4?4
Q?B?@?'P?
RxB??A(D??(<?
S?????0|?cH???
7??	q?B???@?????B>?
$????&F
?&?A?(???M at C???&DaM??
R !?PALr2???B9?
?R??%;??NZr
Tpea)K,????%.g?KL???d?+KyAT~2
???oiJT6???L?(W?I
?????e/-MN
3????8E?JpZ????)U??j^0???&&??TN?p,??p??
@mmh?????!	MC? ?ap??p?aDH???"t?u??2X?g??????9?	Ne>1??l?q?Ij???$&T???!??H]?TGT????jP?: ??.???IP?*??5?J??V?Z??Z??FM]U???R??K??T??????7?*Y??U????p?+T?????'}?U?:W???O?kZ???Z?_??b????$????*Z?:?@???elc??W??5?j?*^?
V?v?&v?k????
?P??`rH@?????p?K?????M?r????:?????t?K??Zw?^??sq????-
?Cz(Q??'x?	`?^??`?p!?	L(?=?P%z??D?B? ?&6?X?A2	*oqS?
"31?M??Sh?3i???>??M?D 2?=?a
?%|E???????`
2b?

=?!l??)??????)??
,
?`???Qq??#
??}?!? BA	rp??
7???}?31h?5
?28?p??h?	?!gr??[@	??Rq??h???	}?Tb?VYv	?0?b_u
?h[????7???Py'??
,??*?w?5???x%??????x??
~0b?
@?@????	h ?l?
?
e?nj??P_up????xP&	P??i??
Q??????c?|u	?????y??A%?T??
?y	??
x0`?xfZ?	???a????????)?
?Y9??
?0??A?iu??Eb??#J????@bZYP??)??Yia?0??
Zv ????QQ???????2?)??A??WiQ*?2
<??%??????e??J??y_?9:Cq???u`[?p???7??c0
Y?	?`?u}?`?u????????????????z?:??z???????0
??
??`??:??
?????????
?J?????
?????*??:???????
??Z?????z
+??z?????????j????
???:???????????????
???
?
[?
;???+?+??????[?+??? ??3??#?????K?? ??????????????????P{k?pk,??????K?? 

????+;??:?????z??
?+?A??=???@????Z??;??
?????????
fg~
l?s?
?-J;??P?
?n??=q	~@?=b?=????#FP?d
1????g??g?=A?
1???7vc????=???????}??a??-??
?2?f??M??8?????]?>b.b
?????"?? ??}??]?0??;n?N?9?8??D???????En?F??N?G?J??L~??B	??k????????k??	??_
	?@	????x?O

yw?!,??_?746S?Qnv5?+?!??u??2cv?H3?hw?Q??!,`!4W?*?????F?u?>?p????43???Jqw??]??ua?+????Nw?^??w?nvcW+???n?4????,U^????k?????f?	9xS??T??f_Cxq(???P?@
?9???I^???q5	?	h {?{x?f0? H??x	?	??zZz???????
?x?	???? "?/?&?K??pX?@?S?
X'g?
A?;(??????!?r?C????
H?+Yp???????A????? ?	?G+03r@?h ?P?1??;???
???????03?f-?T"?+?s?	}g?u???S??%?g?3???????#371x?	??4*??t"	?-
U???\???E?cD64H??PA/&??EJ?????~2H???1???2. }?.???????C)???G???2H?
?r???s?
Mt+?$a???5????-?s???2?9????r?F??C%??2>
?3?@kT?O+?<1?0??F?Q??N????|?(B?
??@:a#?????L?0'??xJ?
?O??i??????M?^?????T?c???'????b??G ????_??F#???9??2?H?"?????$??f?????9i?Q??????!?8?A?????#yC?????`??C?9??`a-(?`????d&
 ???????t`k?L>
????!?Y?R
0{?p`3,?=6?O
@?????
?&?	 ?????6?Y at e?o?`?8??NP??^?.??z?????h
?8??PX?R?_?d??Dy??g?^5YIN?r??Dd
??JT???K?##9IGYvOo?GU?(?i&R??,?+)?9R???`?
#[?????cc??Zt??D?%?????s?y?*\9?W???????=R???v?????R??Q{??Y??]????/???ie??y?
?<1]m???-f?iC
??L.N
pR=??P/MiC?>??mPq&V{|d?;????c????
?F3?\4o?Jz??C???I_??	????'"??	L?Jm{?s2??*??1!???b0{?.f?hCmW????mXW-+?YFd	k?????????(7??/_6???l-?????u?G???u?e?Z???????1O???d?$?L?2U?r?rO??H9?
r?%?pW?!??x?K@??:?
??.???S??????KH=????-???>m?R????6??a?C????~??T?z???
?a??d3??n?[??mn?z??????nr[???>????,?????"B?'H@?i?#$q?U`!M??!?>p?<??&u?g??o??????"???<??@O~
3?????????c???
???K???{=w ?>4??K??s??L?????[??d??a??@P?8??A?(??????#?????c>	?#!???'Y?b??)?x?????w?~hvh~??wh?m??h?FzhpG|Fo4?sD?s??/dGm?FmL?x??s?Bo?GM??|\?}??y??r??nL??+Gs\?wAx??t|=???v?Z??4X???X?^??SP
??	uP????P?P???}P=?E??P
???Pu?P[P
M?U?E?E?-?
??R???	P?0???8
?X
4??L??>H????M?L???g??8??V??|CkM?W?c????????:?W?Ux?A	?DeJ?sM ?:??-???ms??????t?h0?
J??Ex?(???? J??A?4PQf"?N_????
?F?dLp?9pL?E?????:
????????????6,8??
??L???]?????,?e?_??????????}??
???}?73???}??}???_}????}??}??}??~??}?w~??~????W~a???~a?~?????}aF?????7?????'~??~????}?G?g?>0??N?x?g?K?5??
6;vna?r?V|?pZ?|6??r???)?f<X/??u?%??c??;Sf?V?&8
&X???'???~??_xK?7av????e?i_?q???WfGv??xyr?#?&?L?????>?(???????q?Q9i??$??=?\?\?:6??m??$?W????5#"
$??_??Tz?=?y?<?C?????!{D*Hbx?????E?f=]??=????q??z&m?xw*?W^Z??2g^xI?????Y_??"Y?u?<? ?.?,???#???0??q[????E{3?!I/??aZ???sp?k
0???"Lk?"?????6????-B??"??i?T?;c??R?2
|e???{?
??3Z?'??M7?uuV???a?f]????2?-sz1
`-???
,d??X0?*b?K??MP%2L?,?)?#??V??e?iM
???5?m]G?Z????e?kNP?????xm#????"r?????????eE?[k????M,Zk??????,c???~6?o?k_qGY????q5,#^?[??L???+m?Z???????-j??W??v???ko{[?????9F
@?????G???(E?????%^??|??PDo1??@x0HO


l??ep???=p&??o??l???	-x?X?8?J?L\?{0???	S?a	??Mq?K??,!9D#r??),`?dh?7??L???oaC#?`Q????}?D
4h"?fu&2??C???????$?c??
????vJ]$C???
L$@
?????C?l??^p?
2l?'??
t?Hv?h"?'|?Jz6?>?
!i?.??6)?>??&i?
?Vi???^??Zi???~??zi????P???(?????AO?????s???? MJxR?|?????)?X????z2T??'?\???????w?i???ixd??<?+j0???B?dM}???j0??]??$?u???E???A&???P	r?R}????{???z?G?	
???TJ???}??w?28??P??P+
??-?|L?N?y.Q??z??????P+<?h????>????k?xN?d?@@i??n??????+?J?.??????4C
XG?
7?,I1??i0K???????,e??x
?Bp8uKc??D?H?????Q?=???!d0P??1??$H??G??:??J?/??	ON??H????????b
??0?K???%?x????_*?Hra???Bf?)sf??0c??w?bJ??????"<????c?R???q??hQn??{???{????o???;?n???G??<P?L?]?]]?t???7J?<9o????N?{????????<??]??//~;??k????|???lC0???+.???#?6??+?????????E?-?8???O?U\1E]d??E*Pl??iT1?y|?Ge??G!???#?r?[??%?,2Jod?? ???-?|rJ.o??G(??J$Q4?G(?rM/??Q?9???I/?L??,?lQ
,4??;c
)??"?*???G!?T?I)???K1?T?I?t?OA
U?QI-R(??T?NS5??PY?B
TU}5T4??????0?0?K???}??c?M?e?m??g???i????k???m????o?
?q?-?\hO[??
y??^|????{??W_?	???>X??	?8???????????#8?????_???WdI?????????a?y?(T)?H?f1????)Z6b?"?B?
2`W?$?u?D?e>??????cD?F?e?K???:	?,28?'?mB?&???ow
?[?????p?	?;q?g???
?<??%????1\s?9o<??w<??I????Q?\??S?`???w?(
z0?<?%T?	????W?
P?t??xB:p?9D C
??1???,??0???	M?Sx?"?
?a
)???u??j? ?FX?????????8-$#?P??:Tk???V????d????j?R???+???Q?????L?*a??Td?`}LX!?U?u????Z?jV????a+???	<p??3B?01VS?a?0?#?am0??+??N?????e1?Y?n?????gAZ?????5?iQ?Z??????C@??D???mo{?F
c
?@?7???E|?p????
??!?XC???@
?x?H
?1p?? C&?a=
8bl??v?!Ot???	41op?'x ?"???o??l ?8?"?X^f?+:Q?5xc9??????	E?!
?8*?p	oh?~`C P??#{?
 ??=q?LL?
eA
(qG)??)?_? ?:????????=P??5?P6|?
??B??:l?????s?a
???=?s\b???<?Mr????C??@?5PZ??D?@??h?6
?+?`??
?.?a
??? ?`N?	?`?????????J?`?
*???AR?6??A???
????
? (????`? ?.?	??8?D?2? .????R?
Ra??<?????`2?????"
%?z?3J?2
1~??J?3?0??/:?/?+?@
??
?B?3L???8CPN?^K?B
0zo?D????? ?Ba!!??Fa4??z??C????g?A??
??0?-?T?X?%-??,??&)A2j?????04?p?r2Do/~r4???$4 ?o+???4r??@1?0!
??
?5?6C]\a?@? P?
?
j??????B?\!?o
0A?|E???)P?@4??j?????`
????fj?
?
??#
L?j???Z7?dZ?G?H?h??7?6?LcS?U??3b???`?3
`?I?????n??`???
??????@:???+0O?8?????t?????A???(X?

ZC<???V?a?>L
~????3e? ?201X??{????????.??
?
?S?
e:????N[#Om9??OI?&??,??
0???O??/??#X	?W(As?p/?U? [#]?"??k/f?s{???`X?s??

?
Hh?n?{??2?~??c?V?
?"ZH!q?@????WX??t6?? s?>?F??TA
??@???Gr?=A
?
???_??????q_????5?:??
???!?
???>????{???????%????_???
??TE?T????x????!?V[-R?cSI?e?}??f?g?\??K????)??
+????????C?q?b(=d?=?tGT3???z??f?iCiT?i??"I?j??F}r??H????B?E??????@?v???????EJ?B?E??Dl1??=?2?g3???@F????'??|
??B????x?@?8t?=?d???????"??rH????@??D?
)??$	?CFI,?J?nk?"?P???u?t???E?;?t?m\???
??DN???i#eD??!73vt?v?L
??;??uG?-]t?FW?~?,????C??U??t?????t?6G?Q?"!f??8?#x??N????M?@l??w!=9??Y9?fGyI?i??J?{$???Gd?
`$e?????yMG??????=?mH??(C+??h
x??\	1????Y?P??h?w0{??)??h?? }$m"?
?c?
h&??E ???&Q??????Q?
?????q}caIF$
[??r???/W?M?
`-?u?T?"#????q???T=???M???kN??/?5C0b?
)r?\?)???(??*???h??!?@??e?-??!?F????q??yQU?Ub???IS??>?m?-[?????
iI&?>ErL$
R??r?????BT<??){Q@?????c?ER*Y)??????	?c?_7????#???P??m??C"?O?h\X1???C
4?A[X#??	?S????=#|?????????|???????|?3b????????oo????%??????W?????'????????????????,?}?g????|??~?}?p~x}??}}????~	?-?????'??'~?'?8????!??'??????????@?&???
????$n?0?p	???p?@	?????}e??
??	?
??u?	??	epyl{?????
u?	u?	????h
X?
a
[?	)
z??
x???	,?S????5????w????	.?	??z!Z$??p???p??pZ????pW??z?'y??lX?
?`???????????N?5`?z?W{??xh?O
??
???RZ????P???????	? z?Wr`h`??
u????
Rz??@
?@?
Z???@c?z
????
e@
4:})?	? ???p?Y??@
????e?	? ??
[?
}P?????
[???v?py?lh
?
d????
????	??y? ?p??T`
?
g 
2t?
?	yugy?P?	S
g?	???	t?I?
Y0zu

F0
c?X?

??l?	lp	?
?
??{??	0?k?
m?'?
W???`j?	0??	1
{???I????z????`?e???	P??@????0??????S?
?`??`?c0
?`???	j`???
????d???
Q`?PzRJ???y?z>j??
?
h?
Xg?
??#?g????"????{?}0~BXwxp
e???X?? ?)??`??	AH???{u?	??A|za}????????????Y?yj`@?u?
?{p{?I
?J????r?? ?c?	f y?W?k??????????W|g?r?????}j?-	? ???g??	u?	?????)???:ea-?????f?
????u?Q
????l?????
u??f?
9???????????
???G	?P????'??Wz????????W???v7????????`?e???P? y3????	a?0?
?
??}?
???U?~??@?l?{????l
~??k?:?????h,1?l??????:?	?g??????????????g???????Ch??]?????9?SV???0??????OI?)??????6???Q?????H??)??N??9e????X?Y??w???????9??	???????8?=?W??h??~	dN?^?D?
0?d???{??
X?x???|h??)????;??2	?*???}?)~?)??i??i???{
x??????.?????;i??^?i?#???x???????
??|f???????l???+????=??lM???}?Pi????_h?'{
??	????|??????R
jp???	?????
?[??
g
??2c???
???	;5
?+n??T???c?qF???E_??F{?qG??qH!??G"[T???d?C"??rF(!?JBL??????K|??2U??9?T??{

<???????G\?@??????;??ms??[??z????N\?-U
4??]??P?????v+@? ?>f&?dV?d92??Sx?iG????m1P	j?NS?9?R7?1??F?"?<R|[?S?$p???	??,??D3?C????<.??$w?o??t???{\	??P?m??^h?????????Z6?H??????Q??ZfF??/"???@s?
mC?}?FFB?????2d??-??s?N??W?o|?X??? ????5?j>??
=???gx?m??.CX?u7???@?~cI?!{
?5?C?T?x??x????x	??	????????M????D?????	70?^?L???b?I?M?\?????\??J??????b?pKzPN?\??l?b????L??bp???L????<O????J?$??|O?4??????b??tL??K"?C8?;???
 
?
?)E%[p?cOv?6???p???E???[??????H?????V??Hk??????p?R?t?zxUeU?TF?K?TK?t?SUWx%?1MWxU????5UUz?????z?W??IU???-Xe?a?sUWcP?%??]?5?Xx?N?eR
@?wHX??a?
X[j???5U?????Z????%?U???I??0e?\
?X?5??@???x?`???8?E??,??whIOM?Ru????MX?%h??
F????
??	?????M?%??(V	???????????E?
???\??????[?????T?w??
?:!???
#?????d?dUvHX???5~K??Z:QHU??z?Z<??Z??s?E??~uW^??(n?q???ES?=T`eU??:?????X?k?H?????M??aJ??7}K?????I?K?L???FJ.FcT???}i]??K?~??TF???????????X.????C
???]?a???T?m?4Y???'^??N??L?U??K0fdc(???
??f?<Y?.S?<H??\??m??i??c??NHk????L??N???Z
???
Y|?d.?
???c??????F`?&?M?
?bMf R}??vN?|??dS?Q??J????N<]W^?P
????K
????pw??_e??mP??
?`???U??
?Vp???????F?p??N>H?
8??|G?>??M??@??E?>????K@??G=?ox<?<?<`???x=x??x?????????:?6??_??x?O???_y?oy?y??x??x??<??K?x?G?>????y6??????x??x??????E`??G=?0??{x??88???????O??'y??????K?O8?S??E?5??g??oH?{???oz????????`???????z?G??g?@?x????'????????; ?X9?s9??|??|?????|?w9?}?/??}????|?}L?L?? ?1?)1??}18?~??}%
,x??C?5
??????/??r???/[???1????8M?1h??;c????3???K6=9?e??WG?????F?9??l?v?C??>?z?????c???st??/+?=|9?>?PwV{?????#??H????CWL?}??~%?>?q|??}??z??&u??M
\ ??B0?t?d?
R0	F
N0????? ??d$'A????.?1?[??I??-?1?h\c?x?6???r$???E0???c????E5??rd??G?????#!?G=?d$????
X ?%`?
`b
+?=q

2??P#?
?T??pI8?

?#[??F4???lK?w?F!???????z??^????e?{?+??Z??5??.6?????5[S$_?x??-o???_?M
]?|??]?t??P?yx??WM
`??!	?
^?`B1L??(?>??&4
$???P:?D?!Z??&?A?b ????,??	E?????^?8??????e?J
??o?@?a??nq??&?)8J0?r?3??l?9?y??????????4?m?9+?u?????8???
,???#?%??
2?g???E?PP"????']iE?Y?vN???<?K:???????E??c??7??}???;????w????y???wo???;?	8???o?[hk?V8?
N????#???G?"#,?!
F?P???*S??qp?$?!
H?xbR 6?
??@n-4A#???6?q?g??k8?~???h???????EQ
?N????u
Z{??LHP?aNT???u?GA?d_;??n???]???{????]???{???cI?}?8^;0??7?cO??#_w??}?U?z?-?????#?_<??w????}_???n??w=???2;??~??Kx????]??????.???7?{????i???/?'?R?_??7?uHm???O??	????]?Z?Z????h?Z,]????????????J?_?????_???_?????_?
`
d at VGAB?AdB"?B*d?CjGC2dDB?A?>>$fTdFjd>NdDn?G??@?
?t?,i???L??'?C*???8iJ?
J??????????+???? ???O???X???????k?????+?????I
l?l????????\cdB
?>??dJr&p?*	?*?Ax?|f?7@??>)B?>??&??i???:??3?

????????*l??n?????.?J????2?J?' ?	?%????f,????
&???*BJ????A????@??}?????r????4?!(?B??????l,?kb?
???^?7`kp?
%,%???pBwm
????????p?>?
#<?o
2??{?/??r?J????B??5#?G~???Bw?41B?(Di)?&{?? H?@Yb(B:?d??u?&???xB?>L<?#??2?hwpB?&?b{
"??*????%p)|-&??c??$??$)@??)?
?%??&B?!?ul?Bjz9??c???f?&x?Rt)?c?J?o?w9???>?y?;9qJ#H??+B%??"(B(8???Y????3??h???*6?M?y?e???;;????;??8?/N?#??O??" /???????&j?%?NR?????,???M??;;????N???d;&?Y='???+?K???+?&?s??n?????x???$k??8??????5?b6???f/Bx{?U?Ap???N)?w,?ex???
?OA;@ Tk??RP@7lB7<{
????K??B?
E?M?!?
<(???H?-??????c?0????*?DM4qC?_s??
r?G_?$?2H?n??&
?W??i????T?2?s??U?/???7?A? ??iq???/Y??Y	!
uO@/???c??
?
`

p?A?x?ZC?<!7T`?(?}?p??=(Bx?
t???qh!??C??r5JLC???%n?>W??I?x
G%?F?"?`q??X
?4G?DX????B?Kp?$?C7)Br??x?%???i?-}?????M4?:?|??,h"???}?V?o??C&??2??Tp@???????{?p?
?=h??$??KHp???x2??.XH??#/<<????t??Ag?C8???Y??? ?? ???B?H?4;?(2?cB????r
,?CB??,"	J??lrJ&4??2Da
!+???
#2!?*?!??!??
?6e?Lg????:??BCb$????J?f?-??????HA
8
.:????l?d*#F?oJ?S?10?
3o?x??(Ad??R/9$q*???? >oD!?)@q>?j?"??:?c???2?*???????+1:'???4EL?"?? ?F
5!??<? ,'??"dj? HDf?V???Q?n??????#?T?0z	?????(p??1?8o"#B*?"??A?;!:?&?IM
?????j??+?I
??V?
`?(7<?;?
%??P??$???
?P?$`?	?????N????
K.i??
??2??1??2?0?l??o2)Q2'232???8S4G34E?
7s1S2Q?1??03?) ?4??
??0m11m?6??4{?17s0G?3a?1	I<v#L?
?BL?F?&D?
A
|??@?F??!?
????
????V,5`?????Af??`f?a???mT??B???N?,`m??I????9)?9?3C
%Vn?t?/X??m.???`??
?
??jR.???$D?f/? Qj??
??????}xQ??	!6???@?`\?^??F?hf%??
?R<?ao@??P????@C!?????q??????.?q]:??1s?17???s#s!?s+W?pC?r5?qP1K??q?1?v??vm?3w?s??uyWtw?wiwuGsU7m1iC?0Yt?wv?t??w???y?7z?7r?jrR?p??A\O?+??%???a?Hf??l?^? ???`*8AM?@f?B_x??"(???? *??wD?
??a?!

???????????X!
?


??
??@?	???@?????
???a?

?!F?V?7?d??,?y=
?7V??#
?A????<8d?i?3?=????@??z??}???05???U?????x???&D??:?@?b??????V??5??????;_3??dN?????????2?.Ko?5??)E0???k?,N
????K?"?4??2??????l??>????t?P??L??
qA??K?@?dK???v?2?3??X5??????5Se?Ld????t??j???A?????|??5[s???AsV?|?
}s?YG?/?Qs?v??>??Ng????
?????\??X??O?1=H?m????I %q?)?????<???
??-?8????8?\.??b~??mk?????/?A??????J???z?w??????C??w????>???AS???w??}?????e????]??h+?9=??ud???S%?Wk???????\q??x5??-b???ZU??M?xc*??F???`)??????xhMK??????!??On??V?J?[?Ns??X+H
M?l?!??t???RRC?!)JC??f?"=????
?F?????g6E???+i??27??!d6<???b??bN???
B???5.?.?Q??F%?@?-&?X3?C?'?d^t	?????D?? "?E?s0<]??x?*c?$#???KkE?
?&b%?GT????sKAy?d5???%??62??y????Y?????-Q{W?????7??G%????4?!????4?r?Bm)<?!
??$0??[>+7JI=??L]???L???9hDVT??-p2?5?e?z?[Y???]
?"??Z5d????wa?DX?)?uv?/?q???J???? AH?8???)b?1????V?????E?=?????*B???_??"L?y??s???????????c?H??]??Ez??d?W?aADQ8???????%+?????
m
F?????????????>h??p7C????6U???u???????np9???????w?h?b8Bj_?(F??n????/gLm??J<Z
???W?H???5l~?????????~?^?n6?}?a?39?H??
]k
|??X?5??_??:???c?????\??7???@w???&???j,??????f?J>%7?
??o?,RnYs??"3??O?<?n??F??\64E???8???V????o????efse0+Of(??O?G? 
t5??y/?B???y?b
?U:??i %?F?H?!?
?fJ??????1:????????#??????????K?Jp?K`?6z??:?)*??
??Z?(?!*????5Z??@?(
????????
??Z?6:?????J??*??z?6??z??Z??p??
@??{???
??	???0vp	??	??~??	??{?{?p	?9?@	l??{@	????	?P??h h?a@	?p{?D
?P+;???
hpJ{??	? ???	???I? ??P?T{?2?\??[??[;?SK??q	?I??{????`?[??kk?aK?R?e?	Z??[?	??{Z??Z??K?};?|K?j????	!? ??N[???	X??h?(??A[?	?A???!k?ZK??;?c?????~???;??k????k?????????K??{??????
??
up
Y?	[`7???	u?	??}??}P?`??7{Q??]???	?????????OK?<?S;?f???
,?O??l? ??&????L?.???;?x?y??!<?<???????l?;l?8???????]??/\??Q?????1??+????-l?/???{?3??K|?\??]??
gg???	?P? /k?Pk???&2:??F\??[???eK???p??f|??K<??L?U??%?9>?????z?*??;?????????=L???7??"L?A?#????-????G??S??%?A????1L??L???R???<?????<??k?q?	~??	??`? 
???????(`?H

?????
?C??j
????x?f??N??&L?h???????bm????
L????a????????L??
??N?=??	??????M?????t????
;?x????M???#p???
??????	?0??????L???????
d????
j0??????
=
?-5??U]?S????*???????_??hK??]?????L?d?x??p???
?a??/|?h-????????\?????r??\
?h???,?O????zm?~?=?z??h??q}?*~????+
??l
u0x?
??ip	????????P? ?
,??
Q???l?????
f?	????'{?{??ph?
?,?C???	u??????
???5???Rk?o?~?N??????????b????+??l????f????6??
????????B<?r]?g????y????N??+????w??U?-?%l????????]?VL???3???L?[?????-?|????
?	??????	?m???[k??{???f?X????	????W??h????u?
U???P?PO[W?	Yp??\y????-K	4+???
Y?V??????7????
???WF????d?L?K?}?,b??
W(a?6\sE?>D??/M????D?D?
?4?p}L5?X@6
}c
?X8`"???f"??BS?5u?
f
<h?c??G$6???F<?????.r??|??E? B=
_ZM_/???]??GE?@??X???"?X?
=?=??????4	?6\???C?Pvb?????o??	?!??
?DG???)t?&A?+?:#?
h??0??r?o????P??M???S`???D5^Q
]<R5?
C(`?
3?7??C??????C
qA;??Lw?=|?`???M?[T????P?o?
Q0?O
?<s????R7t??P??h??;??=T?????????l0T????~?e??????
???2|H??@?o??o??Q???9o?:A????+hKa??`*?[?bC?1????a?QC?????N?
,?????IQ	[Q
???W ????W????N?-p?H??W?
?>;P?qy??P?(?o(???NP?
??K??Q?Y?p?9?'6????$;J??K8???/?s?????p??8?;???`F 
*????"UY
??????1????$
????
5?U?:1?????q
???6d?X?-??????b????-????:A?-h?CH?d?????X??,0?R??H
S?Ox?, ????O??{4??p?PG[t?.??MNxm????????0?THF	?X?Z?0?y????
O??8
:	eT??x?P?M???@R??[

????`??@?????C@?JX=8?J8S??XP??Q?G????????????????	?"????.R
??M??7??????A3?E?~????0???h	????F?a??x?A?
?qh
L(?@u?Fq$????????9???"?A?H,m??????b???	?|M?hM??????K?,JI???"??????@???????L???m???M????$N?|M??+???DN?\N+bK?h????h?#???????l????
T????6

?[???
?q(?fRT???*1???&

Y
??N??4????I???[??W?u???_?LV??Q?L?%b?M^?"??
???.?^r??+.u?`?? ?4??S`?>s_?U?o-?_?? V_a???a???????L,b???????????3??Q??o??0?-
L?%>?z??j??j2?K?K0????6j#??&?j??Chh?>?[?E? BH?"?Nr??QT@??????I??6?y?3???y?	?I??	
ZT9??H??Z?z???MP???>h?^???h?n??^j????n????????^??????j????????h??j?N????&???k?>????????Fj????>j??j??k?1l?n9???????J?M?y????}?}?l??m?}??t??{??
?p~??v(
lfOYD?!?????N?A?j????@??T?S?P?F?j?*S?M?6E?U?W?Y??-?+??]?2Z???E??T???????y???7?`???l???g??I'?????Df
B8??<?=JF?r???<Kl?????S??g??a???Mlf[?S??wk???7p??q??xp???3o???9???y???Lp????!?*^?`?BE6??
ec????H#??e????=?5
??T??)`?y?R??y??????L???=d?e=Fli??M???4????(?6?_?@?~|P???????
wX
????A?????????	
????9)?????WH3??~d?H\M???n??G at g+63??8ZF??d?
???@(mD
`??E8?g?Q???7???????G0??E?`?Q?v??	?N
?[%?^r???%?!ZE??????zd??=?A?????D??+?(fH?b0D`?
????J.??T6??????:???H$u5??????In?????f??Y?2
?4????0u??-?dS?*??+??x?s??5B???dJBl?/???H
?g???$?A?????;???C???1???hpXl?O???E'M???
)???f?Q??%A??@T????	?<??Zo?????h?N$????e????B????????????B?J?@FE?????????P???????=5CBQm?.q??Q????8???^Al??Pj ????
?{PWZ?F??=?OlpK???@??
 ??<DMD$`R?X??D??N????V??`d%???H?<#????[|?I?X	%?[???c???M=T?N@??U????d?[iI?????@????N??h?d??d?Z?}}Y?tm???Dx?D???ia_??????"?V?
`n??pm???`j???<?cX??,":??w?MyUO>????Hr<S????pE~d??????=
--- NEW FILE ---
GIF89a9?
?


!&$+*,,2
0-
333:	=;&*,436>G?DA@LYPZK`Qghl
????
????
??????????%??$??$??#??*??*??*??*??%??#??&?? ??$??$??"??)??)??+??2??0??=??0??6??$??0??#??%??,??,??(??/??6??F??A??K??~??{????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
??}@??????c?-?n?????c?f???l?????????xW??Nxm??i????<??|????7}??????|?3h"??`????Q?s4]l?w
u???k?u????!??r$qHM_???(a
t,???
J.??????r?
L??o0??????
`
??M9??;??_???X;?6?\.????-?0?2?zc?????L;)%?O4?t??H???X???l?L??o?79?r?m?F3h?4??[?j???T6n???D?@&(`?6?AX?	????`5?8?IlW[???
??	
S?????iP[?R?|A}??I??????O%?H;JS?nE(?4'PIZ???4?'?B?????3??fB??M???W5?U?0@?

???????k,???4?G?h?#
??8u
o????????v
 ?G??Q
Dc?P?
?3?;?????N?g???Ow.???o??~x?^?v???#/??????????>??g??j?{?+?????|/?????2??q4??U/y?7???{????????????{??^S4|}???&??^???????y?W_??/?
4
?T*?&-?KBYP}?)?0??'??/??,?4??F??)}??n???
??D??????s??'??C
???F?R?2??A?
2?'??B
	?
t?
,4???3??dw??0
?,??
v?9C?R8?@?????????
S/?b5U3/?p??
?

??B3??(??????25mB??????????
`??C?
?
P???
n
 
x???8o??M??l6l???????6q?|p,?2n???C?0???$0
rI???x???i??j?f2?????/?"?K2D3???oM-??????????
??3?\?N??qP???S????DT???-?????=5z?LH?|?Bo?`?TD/??z
??h,D?8l?1??????B
?:?4??V+???_7z????u2????#????@c??6????k?b?HXk?C?Wd{%??g?;?Z???U?r?????????[7T??do???u??w?c?]k???????
k??0T5QV
	V7????&???Cq???{?X??;??zI>?c??3???N???Wa?YfPi~???s?y??y>?????d??eh???5?????n??9??TcU?-?9MZ?	?q???M6?T????7h
??d?Ik?f???d?
[?o?i&?eV|?e?
^?p??he?:>-l2[L?DZ?f
????i?l?g:?]_y?c????.???j????Gj???
?9?\?H????a?|jqFZ??<??oxjQF??1??u???`C???????2??iL?9?@?4????yc?x?2??=?4cxI?a??a at K??D??$h?q?y???p?g?p$?u???8l??q?????Z??b??w?????C???}_l?2V????7md????0???s??G??@E?Q?<\?5?
??e?????!?@?D_??H??
?u?WG????????W??1D)?c??,?)??Jc$??H1?!?Y&C???-???
?P????
n???l+0?rN?{U??C??h?z?{??????F
,?a??R[d??&g0?e-??H6???z?#??G?? ?f??????
p0?i#????3?.t??S????Kw????8????2??X
B?V$(`?7??S??D??(j???Y?????h?4;?O????$&?m7G5[?y?92?
A.?h?s?jgF.??_???>??????
????
???????nP??N*.?(7R?S99?????nY?s?

*????
?i?(s?&?h5??*v0???(?B&%?A>}?
?`?kP,??^???9????

zP?T?A?R?n?B? $)?B+D?k
??
?????*?+?
?????????????????
??d?E_?????P?z
???L?=V??r?!#pX??y::?#??1?P?????18?2??G?????????????C?qDHHC7????,	??c???D?l??{?`???q?????	???X&
?f?w????'c"??	???0Bw???5?z?i??i ?V?J????R?!?kH)??
Y?A??B?-??u?
k???XD???B?j5w
????0~???(?P	?????t0W???8?N?G?0?,/?E??0??L??????tA???????!M???????????Cp??6;?QY??P?q????D???Hv?/
?
?????????o(#?wH#???p
J??/?
?`?M?0&Sq(???"b???ix??P:?
?H???F?D?o(?g??R?!???????rPr?i0 l	???]5???????H
?D5?O[4M????i??l????.?d??????!?
??????????z?^jK??*?-?
???????`????AY????~?N.aV????a6`??????:??bga?aK#b9????????$???6????G????R
??jB?>Ud!!?X5??PP?81i???p
<??????s??k????????=,?5?B4r@??"???=b??|
xh
?F2q0	?@4?:m"??
x?Jl?J(?+A?r?=x?i?q3??g??g|?????g?;k|FkWZ?|~g?hT??Qk?h???v?gw???v????	????Z?L?b0?????x?P?m0????lP?o??l?LD????:h(/1?-??c
???kp??
?9
w???j?W???I(?????z?&[??@??????'??=?)?q??q#'??n???V??;?
???m????h??M?@l?r?O??z???l9????????%?i??????8or+??????"??-h??K3~sZ??S?Y?&t??Y??
???S?S?je???V?i?2?
?.^?L?f??t?Y?T????W?Z???r??.???m{#'?7v?????s0_:f???_?q????5???
???S?7??<x?o???'??mZ???V?<??`K???6S?Mn?n?[?$*??e??{&?2qv????7}???Aqb&Z?2?f??%??_??`S??q???2?y?
F???6?(??~]
??8?H??[??aVa??Tk?mU
??\?q??Y?iU??c???_??xXd??ZR:?-b??l??f@~?
h??%a?Y???L???5?X??A]r0???N?h
?s?oT?G5{{Eu??Y?T37u??x??}{????Xo
WvF?i??????6?>u?RA}?6?Pi????Qm????l[??Z??{??6?\
(.?"??[?O?)???n????G????f4?%
-?[(F??Tn??:?x?2R?(???<?? w?!T???g??L?R?e???hR?6}????????<???_????????kO>????=????o????/?????????>???g?`?@??o? ?
x=?/~???????"??L_8A?P?#a%x>?P?+Da???*?
4?+H???????	
???0J???A?C?1?yK<????D(&??S?^??D,V{U??F,?Q?d????E3??M?????5fQ?q|??(G8??V?c???@zq?],??hH&???{?hL??m`pD,`??1?k7A?oh?$@qc%	??7?
?h??)3?q??G????7?1?e?9??=???,Y???"???'+?????U;?,
**??n??? s6?9K???r?c?
|??no?k???68?%??:???u????t??????VJ2^??I???y?}?
?u???n????IKj??8
?<???y???????
zc?t????L???t????|(
?3?o>?y???+????|??O??7O???~??/??;?y???????'??_0C?y?3????????????????UO???_?q????y??i??=??}_?%`?U?????Q???L ???D??!`R??=??E_?I?z ?u ?p?g<-? ?????,B
!;???C6(?????
?O?0?
j 
??=?U??? ?m? ??
PZ??$?"1z?
c?qb&??:^?!.???R#??????_
V^*^????c
??#??"??7c.?"9??AFb*$CrP8b M$q?F>R$??@2?"?c?X?%??)??H???"~$0?c?"=?U%B?D??J#???Hb?$BvQE?.rb<??? ?&
RP????:?O??GRbSb$@?"?0?HF?Ic,??I"?
I?'???d-??N?aV??
*???a\???H`?????????F????NL??H????.??8?`???????FEj???????\?h?V???8?1D/?1?0????0$?0 ??2?+2$1?+2?????&???k??+?????????k2??????+?C?
,?,?l??????rl?Zl??+?
???+????l???J??.???+???????R,?:,2???Nl??,?m?????l?J??~l????"??"C1?l?^??N??f-???"??J???k??l????+??k??-???????-??????1C/?k???|?U??>??pF?a?g??V?X??????Y??.i
_?
?L?/????0?@J$?4???k2$C-GC
HT??<??J??v?????o?Me4?Q??e?e(W???e?DE??E4?????D941??
6?/?2??1_t??DMcCQ?2??SR
g?1??:?g?=!??
9?e??(?X?KL+??|8?P??4n?Je?1?EpRn?47L???D?????Gp?E04SsC??ge???P6O?
7??W?o	?(=?C?D??Y??D< ??qT????^?J#????,???9??1?B??2??????BE*????????I?7d?7l??C>?C??q?>?Y??8??k<?I?????@G???????\??t??Foxw?xZK?????w?????z?7{G?8\y|??u?8?wo?w???}?7|??y?wK?{?w?????|?????#?~#?|/?z??;??????g8?O????{;?Sx?G??sx?{8???'8~S???8??8?C??????????s?}?	L??C
0K2 ?~????
?4C8??8?K:W?2W?4?SHX3?SF?Ju????J?t<
??8SL/???eX?f??g?b???m?3??????$??????"p'??Qf?d?)?/?J????t??q?);!?c??t???"Qm(???????!????
CN?V-A???K0??s
r?5?
?d?-??p???JX?(?5?q?C]ce?p???:,??K?I??6????:u?[VR?q??fC?r?Y?*?l?Uqk????W??U?r?\?
????????X?j?m???]?^?????????a??X?J??v?+[??????b}?_k???vL??^CK????v??Z?J???5???ki7+??v??|mos???F?
NE???$??h8MiUh???aL=MM`4C]S?$??m?N??&??e6??Kr??]??f&??Im???zCJ9+???????5?%/|Iy????K^?o?????????-?@??????????I???H`aJhJK?HeH???=?r???R?F??w?VMvk\????;?q?e???y?u??Y?S$7X?D???b?d?p;???,????r'?y2W??
?"???1??f5???h?F??g9???u?????g9?y?|>?????4:??6???hE????f????hEK????Zd'?R!?;??\??Lw??1?????%Y,??
?m?????d?????8?]S8@???mdK??Z5??qT??
?4???????g??t??E@@~)w???Dwc#??
????????rG3????????@Q??W?*q'UFG?'???O>??D)?i ?B???
??k??p?1???|???F??^r ??????????Q???<?KL8?6?????0?E?.?O#P9?!
5
n,*?
?\???
Q?S?
?R??W??aQ@?Xe??
(
E??????A
?HI#???G??V????1?A???
?????Qx??zd~??????
>O???A???!???kmvM??????
??????3??P
z??S??)? ????P?????bL??Ib??*???~?JzT??
???
a???g?rE8??]:Np??hTE\??[Ia?U`0???a??x??[?????A.B?ak?|??\?G???;????V?_??j?????H?5?,???cJfS#?j?z?Dz\?F?qY-r!wr?DE'wLP??6
T????f	9???JV4?1?????Zu?o%h????v?!VE???p?!???(?a?
>J?R??`Vi?CENn???EX
?ek`h?mU?ak?(l??'?u??'?*???
?o!???l7d??N?F?)3y??+7???(w?N
8???F????cwB?E?_????/dje?#?d??*?F]??W@?!
??????zU?'??z?jr?'?gH?!>??:?in?k????~dE????G;?????|??C??q??:??????Z?a?A$I?,e?c&;n8?#?????
h??Z?%d?FJG??sfwx?\J?t?'?C?
??2
0R,?4?5?'???-?/(*2?d=y??i&nT,8????q5?7?$x?i ??B<?<F?w
??ty??w$:?E??@ N?????|??qg:`?(?|?G??|?u<0??q?#??\G?????x:B??.?(?>?#???a?'|/BVL5???#/??\??<?t??|??????I???C????????d?n<???U?"?:?`?C#??I??????? ??
?{?(??=28???a?~9p+???
????V2"7?D???Gt????????~?9/7???mh????O????$?#??G?E??,??v"@?AlW?I7?0?G-?????????d??!jH?#??3??
?m?AE??0??;????]?7???W?4?q??A??"?N????%B?0C??kO?6??*??pO?~?????????q?/????????N???????G?e^??z!
R

(|?2
????Y)???w0?@?b???c?qC?7??NNX?Y?a??Ym??&?6?????K????p
7??j[m?v?`??	??4??U?n????ne5Cc?B??n[??c?}??2???-nb%6N6?dc?8?<K???6??2
?o?\?r??r??n???!n?MQ"??*p??"??l??,??1???X?D?)?cN?e?
?l?w3`

+K???n???U????T??V!??~&s{.?*A6
?????????A????\c??W?=??? ?$b?)??bW?????xc????
?|?#?4??.o8??*?L???V??U??d?WH?
?]?_Q?H1?.U?M??^u??P?,biP??????y??>(??
?a??Q?6Z??-r???j?z?EB?U#\?v_?*QJ???<e(???[?2?7ay???R??0??"#??? ?U??!??p???WWY??&??8qaC"K??J?,?\?+??5?a????
)
??w?
I??T???a?hU?0??
?}}?_??yck
(????X??m(o????n xn"x?$??&?yy??x???.?(?H?88?,?98?;X?@??B??n:?u??X?e0	?C9?
??
9A?@;?q]]?
? 
??S?&???LAfE??
A??9AH??????0X?Y?	???V???p
?5? RF?Z"!"?9
d?
?u??]p?1qY?a?????e????H?????Gd?phv??H???rh?!???h-??
??@e??
?
??-F~&
X?;?%D??At8?
?p?|?L?l?T?Q???????_`??
?a?:??,#F??? R?*????:??<?O?)Tzs7 	c
???
?cd?:??QP>2!Q??
?
P?y?? e?>?
?r]f?D?6

 ?W&
9e(?D?@	
????eq?=??

?I?P
??9?????
?:??????m??x
?k
3?	???Z???-}P
??=????,?
=?qc???IM??@
L0[??w?Wv??Q??S???x`??N?z??I@	
P???
D???h
EqM???HF?p?
t??A??E?
??N???Pt?
?Z?}?7????~`S?X??y\m???}???-??Wo?'{??|?]+?R?????0~ _??#8S
X?????wn'?????w?m+??^s??p9G??V???x??	???O?????'q??o??Ro?k????I?m?o??~?$F ?}??1?%??/e??A?????3?	Cp????b??0???K??$??1f<??d??)ej??Q#??>}?$	R?K?5W?	????.O?tY??J?AGV}?????"???*u?W?LK"uh??0i??k??U?G??,rf_?J?.;????Q?r]*??@7?2?SL?S5o???.???EO?R???C???Y?OM???e??L)??F?1??,[m????J?Q/F?uy?=z?'[??^?*?ks?p??/gI5o[??????<??rW</????o?1v`?d?????s?????????
l?]+N??(|??T????{????k?9?&????$??<????b??;_??,3??/?hji???????G?E?????9??'?*T????\?#????>??
Q???\L ?8??'??2?)+t????$+??0\P?(dR??
w98m
?IH[??[??4`?^;?,;
U(???lA?r?????c??????ft??3C??BUw?}=??7???k?Vat:m??P?M?V*Un??E????n?l??E??Sw?]J?d,oX?=?z????i????????^??R???{n???????-?{o????o?|p?7?p??;q??{q?!w|r?%????#???????I??
?/?$;??Q?mT??l?y=??e?=??qW]w?s?}??W??v?g??w??w]y?_????G~z?y??????&z??g?????????{??W?????y???????????7z?o??{??Oz?K_????yc{
4??????P??#`???
?]pu??
???@D&@Y]	??
?)d?
Y?B???C??!?????8?a}???P?@"WWD#?3????D(Fq?R<??v??%RQ?0l???????8.hFqh?
R?????
iCE*2?U??iGq2?.?????L???VL?$??BL?2??td+?FJ???S?S)?~c?? /??F:t&0)D?M)?.J?uM,"GI?zr???eII?zR????3W?Ek??????&??+?3??d?uy??????la,M??O?s?a?!;i??J3??$?e?O}??
??

??h/???#G7r?W^N???(??????#???G??-?zL??????arw???:??q?
]??P|??^???P??A?f?Cb??j??u???,o?8?Mw?{???X????q???????C|:??4??o2???????qvp`?c????0X?h
?i?????H?NpHn?h?Gw????"m
h6*??*|C?A??B
?[?}C???fc??????[?????[??[??[?M??]\???????????A????\??B??\?????\?
???\?]??\?M??M?	D]?U\?u\?-???\?5??}]??\?E]??[????^?%???]??\?????[
P
?'*?afg?"!???Rg???^.f????~fP??rv?z?)d??N???}??b?y!?O??d?&??^?M;wE???;????*???1
=??,?^#6t?}???=p=?:;0j<j???>ix?Y???K??w?!M??q???k1{?Yc??hp?????[?Y???Ll@?#?{????lGJ*?nm?~m??m?*q???(?-?	;?'? ???/????%??#??D????D?S???8?}=?S???~??L?r8;nH;rH????U???|???f??7
?;J6j?`??)??-i;?m?=????u??B?xO?k?x???7?-T?;??$?5E)P?m?r?C???pWcm?p ?pR*$wZ^.%=r???^?15mA?.f%????3J2_n0???f?
??l?%
h??f??w??
??lM??9?x?h0?x@!4??4
??????B???????E7)u8?$5Oz6ZP9xi;U???q??o?yH?7?9??PIM'???
G?[?}?]???H??x?
g??a?N
d\
>?E6???N??h???????????U?t?8?4#(g?y&?????6?.4?o??eq??]uxQ?S??5?????!%v1????7Z?]?Pd???t?%8??97`N?$?YjK???????f	???N9??NB?qTi*N9?????"?$2?$?_?????#?7?0<0?%????7M=??S?4??l??Glp?~E??;?HC?V?	?F?s????[s?-g#?3g=?TDkg?	XN??dC?~?? ?>O??:a??B[????mfU_uWQ????2m????
;?=?Eb?1f?2??m??,?;
?h?
???,??X?`?@?i$????4?n??t?(G????	@*
?_?A?????""?RF?f)*??????j??????aPE\B?`?R?qH?`Z6?#i?B??i`?'?	???@?d%!?G4?????$????P/?R?*?@tu(??ip?????? ??K!;?9??CQ? ??B??0$}??9AJ4b?c??Q?h{???q???&Y/f3???S/?h<v?%??M??h?"???????7?E??MW??h?C

?:?JTy??5??J._?zC??I(7qj??]??k??PQ?##?	?1mE1q??$Jh??y?
???y?^?<?z?Q?x??
h6(?8!5??4?b??#;h}(??????7f??.???Y`:??8??~?}???c>????|I&~ ???%??=?h??[??&!F`d??qS?
)?i??????f??2i???o?D????N?Od?Q???%}5???Abg?6?D???R
\??@vE?z?????)?????i??W???w?i??G???????!?l????x??a???V????o??p8?1,K<X???
x!?ftj??
b?????T?rj????????j?nF?n???*?????j???????????*??V?*??*??*?"&????????j??j?B+??j??E?.+?f??"+???????r???*?Z??bk?????j%?????Z???+?6???k?J???+??+?n??^+?H?;?????;`F?????L????#|?a?
{X?q?K?bfPFf?P4C???1?????????1??????????,??l??,??l????????????????l?????l?"??>??????Rm?J??^m??l????Vm?r???m?????-?>-?F?fTF?^????zl??2??'??2?h%ff????0?m2C2 ??&?JC?8?G?R?KGl?7
?.???N??La!???t*1O,"_<???Da?C5D???7?C4??@D+v??a???6?Y7????CM,????????e???0 ?YDPD7???b?QlK?;?VI
?0 8c?q??_,Q??Q??Z<,?????p?p?H????2?????C5??W???j??C5?.-
?6LOH`?$=??^????M???6?g??"?\?q??8T3H??
?LE\?)r???DIs7LV9$????f???1?[?u??97q??(j?????H???[???????:??=?>??>??>??-?ZH?????#?z????5???????????S????)????????J???T\???=?J????C???	?pEP?C???PD*??Z?M?O$?]????i??H?P<????=?????>???????;~??=?LE??~???????'H?$;?b?;?N?????????A&WCI????|??>?}????????
??????;c??q?w??5z??
{wM\?i??i???
F0Yv???%????w???s???????_?^?????#??|z????????
*?#c?!???????<????=?????B???+???7N?a b?c?a?c?]??f?u?????C??Jb,uf???????a?????+Y??;V?e?lf?????l?c?k?S?:??rF??d?q
p?T?G???3??7?|??W?P?-t???i&????
Eh%?P?"t?x;?*
??2VT??D??????jt?'?(C3Q????U(D+???>??3UiDi?S??T?(u?K

Q>???L?Q?B4???&?qJ>G3?!???u(x???`??H??:??_?$s??D?&??G=r??
?J~??_?????kVT?????Y???
?	????L??1f
{2???8???S?&??????#?q??P??w?nm
???????6??????	'?>G??D???]??6????"e??j???L=b2?@?|?P5?5??`
?
??????]l??n??S?	???|R5a]l???J?????cs???N????9`"m 

4???H?A????J?p!?a?6?$?6Je[z?p??8????%

q%?8e??X~(oD#*Fc?`P?&??@M???60L
???AV??tl?T?
*??P(?L%?:???Y~?&?N4x????v???V2??a??+3???????XZ???W???!?NSl???aW?A`??????f?V?
?????U?Q9??Y???<Hk?????q?:??V??t1????l?zQC04?KV/?D_???bQc???p?(?q???????BP?zG?aB??rBV?t?
&???i?p?????i??aD?A?

?2????
'c??
?aV?A
??qj)5???R.??[
???+??2?D???
	Q?V?????,?,0	?ECO6???????rG*??`?aC`?I]??P??,?
`A?2????b?S??&7?????^n?6??r??o>0H??n???x]?8Q?&??jKP4???N?y??xy??nL???9?????x??9?}Y?	??
A???uy?-(??????9???????Y?M???C?????Q????F???????J^[???hSp?v?ZT????Js????l???6$????$Z?'?$?,??+?2??7:7??s????.#?1z?i??5?[??;??H??r?-?m??y3?b??_??k?'??iZ?m??5??9???z????a???h?????z?o:?hz?
,?S?????:??:??z??a??Z???5Z?o??????:?A-????=?????w?????:?????A?C???*hp"??F?oR???/?,?6	?????L?H???P>L[???c?7??X;?T??Z{?O_???s??????h?Rv;[p[?k?y;?'??s[?1???{\??R???a???&?2D[??#?~?:5?@???M0!?????)0
??0c?l???D??#
b$?>1c1?>#zF"???"?????/?~??
???1?A ?

Z???????2??|`?@jP??AX??`?????'??u?>>????kY?t???????+%c>H?\???@@???
???9?????W
D#M???4?

wH?G?F<?X??e?86?H?i???????W?c??????^??&??????g?&l/???BE?69R??@???a?4??s?$?xCB^iY??M*mh?U?R????*?U?=?2?{R?o??"o??0??V.?9K??)??Af2?sK????t?.?y?`R?????4?y??i????f6?)Kn????|S?v(;e!N????Ngt???v>?MV?????4 ??????J
L????
??Z?
?H??%?'?@<~?OiE?????#wG??'??g?7z
???4+?vy?"e?????TD??Qt?u$?p$??
?PN?#"?x??T??
B?4?j?F?7?IF?
?P????F??B?"+h?
?a???E??M?NaxE6???9????NA?i?QO?6X?#iNPo??6???h
?E?\9?t?U??y<ih^	???}?oN	P??
???>?y???,?O????wVwa??-Xh?~???F??7?M?vEeVC???-???yzy?@??
@,>???F???,?H????=R??!?(b
?:/??
??hj|5d(??!?""? ??"?V?@??A??#?`f??????????
c?3?l??A?{?@#??
1?"???[x?i%?k4lX?*v?l'?y
??#?_m?P?
P?D?2='?Bq?
?????f???&?^^8y?????
{
C??:&??If.c?9g
#?*9?r#??8?
?q??n??*&i?1?q????6?????????GA#?JS?k@C?0? ??r?	G??K?i??F?8???)??J??N???*??&??\??!??
uO?J5???&
q?9??X/???r????I??
V??F??k?a?Yn?
0?0?
#?.hJ????)???K?c
`?5??
kt?M?E=x?8?}#f???
???1TBgKCcT??
u?.
`?J
h7b4?????
???wz???|?
f??i8?????
?@o?D
9?F???U????P78????WvXDZ???????g???q????s???u
?
<????18???z??EU?">????(x0?C$?a?	 ??S$DSL1?@ ?Bg?
??
m????????????%\0?>*Ro?QM%??u????EZ=R?????[p?\??\?-kZo?V??A??????R?=	?u???.c)????Y??

???x?????????l?5?]?8?6!??
I????f?igT?'9&fm?E?*w_???Y~??l?j%??:g?r_r???h?~??#yVE??Q?u??_?Zn????U
w??]F??[???:EhphC2XR?k????!?k???N?-a(/f??????#?????R?b??y?^??8??X?????1?

?4CVM??_????:UZq?%???????;+g???{+3?1??]??Pq??????4o?C}b{???????&>vk?Zj?t?\!???1?C???&?h?^?R]??&??????.??g?_jS?)?_,c??k????v???#r????w+8???6Es?Y???k????D????M?}??????~?8????q?;9???J?{
DD
??Op?k?/???n|c?02??e?#??G9???z?#?X?2?q?u???G@?q?y|d!??H?q???$&3YI?.???,C???=????$??IHZ????cA)IO????T%,???M?????? q	?X??????.YYJD????/??`R????3??d"??v???0?.?!SZM?N??
?\g;??y??????=?)?v??????<
?O~??<?A:???S?
e?@*?}N???hB
Q?t???G+R??????HK??????(=)AG???^4
@???
V?u?Y??????o,[
U??????7??
?rc??H?8?q?4?"[x?@??
od??Vc?????????l]??????[??mc+?l??????n{??w???mk??Z??????mr?k????????w??]??????y?+??????E/|????b??u?x?;??
?????zg???????????;]?????mt????bW?n?}?{??r?????u#,?O8?%?????
n???h1?????!!?PPj??Uq|??=6*???
?x???qQ?Y$C??I?????&9?D?2???'s???Gl????-{9?W?2V??e #Y????????8??V.??{g#W9?xnsQ?\g-???Xf???g??y?nl?{,?H_??_????gD?Y???4???;[y??.?????;???5?CMhY?????4??*?@w????8?QT?X?
??QY?
r???????`CY??.4?wld0?X???9??l?`??:?9?g~?C???7v??????B:??>?B=?U?z?}?b???7???~???|?\?????u0?=?f???u?3??Xvz??Nu??}?k?;?_????5????.??#^?????e]q?????0
:??e??)??e z f?
v?~?	?^?QZ	z??^?=??m[?5??q????tQDH??)????????^???F????????^?????B ????a??????m\??????ZY??!"?*b??[??  ?`)bQ?\?m?8la?HA?dQ"!?????\????a???] ??`???U?$?"??"+?"????)???_??b?M?,Z??5??a?%????+&#???4*c0?????2*????-??4???M]3?????????Y??!1V"??XgU????Q????3?#?Q?m????@d@
d7d"B?B"dB6?B>$?A?A6$CN?A:$Cb?B??Db$GRdD?dG>dfi$En?I???I??FN$J?dJf?J?dG?$A?$G*?H??E?$M?dE??C?\MeI??HeI??EBdP?$N??Q?$P"$?m?6?b?m?????a???O??>????V??88
?1{?g{?|?'}??}??}?'~?'~?'}?'"????g}("h?.?|"(|:h~??~*h?6??.???g?^???g????(??(?Rh???z??^??
???????C2$?1 Cz??1?8??#N?q?%???OT???????@?e6?64S?C3P)?&8X)?N??U?v??z??~???)?N?X???????)?????)???X???6C??i??)???)??)??)??)?V???i?v)?????i?&*?????)nEi
????6??9k???????[??*?Z??R???U2?0??0?j?F???m?>6?a??u?&?N'F??U??U???c
@4??1C?&??
C9?8tV<x??M7,9??4,????4??4,?8(ChI9`6, 7???.C??M?7????C<D?
8??1?????5??6?-
?$???f?,???.?????o1,???yFC
?q??/Go"?e?)G?e??'	\F???!??c?riv$gn??Rn?q??e?,g??IFCd???v??@!???F-??f?q?)?c??f?r???e?$&#q?A??<??
??p?!G?i??F?/#?F?d???e???e?
'?m???-????L??4#??<?Nr???x?
M??HB	"?K??,??(?
R?q??????k?_?T?Ea|,'??Y?Ll??s?n<?v?a??O?J%0#o??G?
??)A?vHm??-?df?fo?9?T
S?4lf?n??Nr*?w???x????dP6Tc5v &s?w?4Xq"???m?=??El? ??d?E
??C=Z?A+?0?	?D??\??fv?ig|??'????in@??oio?????Fc?A?oc
??{?!???lb.?+?|?0?H)J?>??]'9?J?o???)?B??}'}?

%??6?0??????X?K?#????n? ?Arv??r*?c??Z/???
u???iF?:??iw<?????9?qv?z??f?6???T_????4y??[???????q
?Roc??6??mlLw?????M^]????v???`o????4????q???????nc?????6???m?c{??V6????s??????6???m?????G?M???q?s??[?(??uP??V?/??K??F.??}?\?D??w??*qr?LC08?a??0?a???]~#
??ZR??j???{,g????,??)??K_?rmu?O??U?????u?o??]??????qX?(G??> ??(?"???ZR??m?l?7~??h=?
v??!?`?XFh???C

b9??*?5?%?A?a$??F???;,@??a< ?b
???
5????

??
???????"- 
?!??5???\?N??p1? s??P?1??Y??U??&S
?D?!???jAL??v,L?,??	????K??J???????sOB?9'??Aj$S????a<"??CXPK?*?tR??z??$?????L???!???Z?F?????9?????2!?#uR)?R???S???E??O?@dA?`???$;?????dDLF?~q??$#\O????t?Z?@\EK???@?$WFJ?%`?nMmG4?G?????X?u*??*?
S??_??C?A?"e*?kC????s??Z?c?tOLQdM?*-p\S?R?U?5Wt3-UD:???????oU5?i@??p4??.dcd?????T??
/]5%?2a?E?X??Yf?%gZ2#??J1?N??~?p?K?D???{?79?zQ4???{=4{?W{?02?????{?C??|?7~??|???Wi?5
U?!
S?/i#x?O?V
?u???
"H?!
?2?d3e@???
U???????s1DB9=?K(??Kc?+e?
.?????
??Y? ? ??|F ??5?k??'?E9|?=???w?D<?6?}?????q!?E?f~?W?M????%???	???c???????DCD5?G??9?a??O?5??@?9?H?4????????G?:?tN??#??'{D?T??4I6? ?????,8l!r?V?!??e??tV????L?cQ??L??G"?9 ?T????!U??H#&?
??N??H?A????????2
?[???M??&tq?|??8%6?Nz???D#???p?M???????j??D?????|I?W|`J9DU??h??9#f*P??hxd??????AZydb?TB?dV????
S??hD<wKVJ?2Cu?KO?UZ?a??aC??`<?O?{My?Y??O?kR?a??[??????!Cv???W?a?~?V?z??w@???`/???v?.??3>?U\3a??vw????V	?1D??
q??0r???????>
I???w??}?????6??\'?
?6???g	?iw)SX7d}??h???]?
U?$Y????FOn??????5S*??Q
?P??C~7???a?5\?#??|[u??R?[t?A]?KC?jS??&???N??N?a???C??C]??/1?9???R???No?SK?`?
???M??6|8P`?????H???9V??c?oI??G?,=???
eK?
i???????yR?f"H?DEzCirhGp5???P"??#?f??R?
g??@N?$O?k??y??Q?qW?7?)D???&&"p???u???{gP??????>z?m1q??Z*Y??MY??3\Dg??U???w??"f???\??4?4??U??l???7?2?????C+c?N4N?{#5?????a?:??D+s,Fz?4:?a???=?N?dW?]????U8y
?Lu?j?A?M???$T?g??????.???i??tkv4?q??
????o?1???-DU?q?3???+T?J`?	fz???<?q?x?7?q2E?!?SH3?Qq,#~?@??A??u?E???@?m-?W?0?2?q????1??????ix?tL|?N?b=l??z?FB?1#NP??????]HG[S?(???f(?????,?Y?n??????8??Q5?B
??	)????[#
E???v?`#??;?q?x~??????C"?????H
Di?CK-??????C??O)????0?;7`?U??<??"i??f? ?
?Zx??b???1P???l
????;p
x????L_?8n?u?/??????x
8??
???T?8G
?wlX???F<??h
???3m0\?N??@????HwX
??<???n??
???9
??G???p?????*6?A?x?Z3M??e?????fjZ??n?
p?"Ck?i
y??z??~?`Z?pT?f
@f	?V??pf?#`W??[?pp
p
a`???'?|
?/Y?EW?<?H]?E~pn#?gLbu?DS/
?T?b!	5?WN?}????}zfXJ?-T?0'??
?3??@??Q??*??B?U^M?
??WQ9J7b!I{????QC???p??TA?
p
??
??W?`?1??/??
??W?ec?G?P?U?w_^$zv%b??P??PP?;???4?	26??IhXs? c?@m????SC?I3R??u5,*Zqb??
??2?t`???h?wG?
?V%g?4Qe1F?(3?.?+E?j?O??'?????
 f?54?a1??FW??pJGD,f1?r?5?????'?t(????Eq??^(?t?G?B?c>1
B?c,A<?9
Q>Z?
	???3??2<f`?5?0??C?{???s??1?V????bB????8(c2994??<??tv??:@?F??E?94??
aP?<??????z?v??q??2??????3b?????2?*?*??tA?B,?EM
5?
??\1
p?#Wr?/#i???-?c?Q z???T ??u?s???=dRi
?r?79??A%" yq
??<4?\ea??Z?d6&?_C"?$R3
??DCsM541??:??S`?C?qBG?s?34S>"?\;??2?#4??A?-s;?S:??O56???????;?????;;4?p?a???5-
C??B?+4z5?5?
??Yr&9b???\,??CT1??e? ?k'??????A??\??_??y'/?r>/??5?(+?d;;'?|?"? 
??Q/v.ni
??[7u?|?f?U?F?=j?i?o]n?????d?~??T"??p??M;?a??b???k?o??v??<??`?}N\????h?6^??????	?;qk`???"?K?r?????F\????[?n??-9??#??hSqP?X?Z<?/?????mX?_??c?|?7??????[??_??][oX?n????}l{????~?????v?G??\{?????????????FA
?R?:?Z[??23???q??"?7??B???????D??s?A!+?Bg?
?F???-??pK?)??0?(????0I?X????????=,?c;??s?K???r?(?4??'??L2?,?LuC3I0?l??5??qO>?t??9??N6]S:??:??N?>?tq???r??3+?????;???$.+?'N??????#??????=
?L+????KOA?$S?>?W^
%Xc	O?2?,VX@?5Q?a??????(Q?t?3X?H?6?4???d???t????f?n?\??<%r??H???k?,?]?&?X?.?`???7???%xa??t.b?}?8??3?XP?7fxb????Kn?+J??? ???D?9L?t????|???T??e?????/??H	E????z?????O??n?^?U?,?X?(????*?O??T9?8??l?8???a??Vi???Q???????\???!n?h??%:ob?M?????c??v?B?C\
?????v?\9??H]?J???5?&?k?iCDZH???u??&??;[W?????=?L?]??s?v)??=p???x??
?v???a?'??7??6????>Ru5}???????????HQ[Fm?2#?????]??&?????
??G1?P????.u?B?Q?????Lu
?????)?hCy??c??0jM????c?
F2?9??U?+Ui???~???E4 ?@?K>:?Yp??????e?c?^J?"N?(?LF2*??&???jO
*??
????2?????Fi?R????L??2l?q????
?A?	q?A?d???u?l?
?i?????4V???V?)??
?:;???x?>??!n`?|%#????_ppc?g7???n?&??	?????f???H?F9?q?h??????K???R?]???6fY????3?`ck?'???7???m?????;??k??c?$n?????s5?-qp??\w(???c=rp$C??-7Z??i?c???4~{v? F?u?o?????F2???h?????x8t?
?????o??????v??QQf=??:???uxC??]nS2?8?3?wL??
?I
Al?????i??j???siP
?x??qx????	t?e????_{???dH`??h???[???*?????9y??PQ???p?a?G??
0
0
???#G?5?9?
?8??x?????(???I?
???	'??s???|A`i?t?L??-*BlkG??z??K|??n??y?!
5

5
w??j?z?Hk?? ?Ky<G?3???P|????Pm???dE
?v@?E????j??j8?s?Fz?BtdzY?x@??
"!???????????A?I???S??????3Rt???????SM
EY?k(9?????:eV(?T0?Ml??Vhp??|
???n0
P??J=?	?R?TB??z ??+?9=?mp>_?u??hHIz??46?e?k?:?V6??5M
t\F??O}
z
??J??U???}|
?
?Um??H?|?/p?c??
????h?x .???]???S??0?q(@??Zn?-q???9??=????l?k???G?6??jnpNQ??
?@??
?e
??D???M??	??\?4?k???j??;???????w?j??????P?m?V??y??
LL
???~??m?	k??oh?????o?6oj???q?????qOp?J?~?_?????s???j???????"?Gp??q?.??N????6??Sj???V?W?????V/???t??{?9???8??K???
l?h?:??b@?8;?dx?7k?B??8???-?l?^IO?b?tK?tK?Db8?EGb(a,?y?W,/?RrL?^d
???8?Q?xP???i????j???9??Z[p?O??M?uc??po?q?tqwb??r?tclwF?tMG?BG???uP/????_?tF?tV?uV?|??I?wL?u\?t??tb??8C?At?)???l???2/?,??????y9lq!? /??+?
y?????~?y?}?
w??
??_Y??r?Pv??????
$??q??8?_#??cz?????z??0????k? ????_?V?G?8???qX?
VI'??y???~????
w?K{J??n
?oF?q??J???[??????/????"???	?k???ndLq
?F???
#???dCKi?UGo???R#???G.?d?k?#!?l??R9 ?X??F?E3R??CIq
??t?Ih%FCR??%)?W?S??G??5???o????#T?*ol?G?{IL,w k?????
???GO??4?
?????(??1?a?_
7?' ?m?&]?????6zQ]
:????????U?!??Ld{?U???gZ?e;Y?6????`)?X??;??-?3[?f7??3e	C?]?Z?p??cw??]X?Hc!?84?&??B???M`?*???x?
?E??W?n???l?"????????`[k??:???-?a?\8??95?'=?-0Z??????*??1??\?S?XKd?T?h m`???.w???Eu???8?6?k]u????%?6??]??W?U?|????7???/?k_??c??0?l?X?V?z?q???y??
?o7??`??>??el???8?:???c??
???<2?#?]q?#??"
??b????#.Mt\??.?dd?~b?eY?
??H???M?`??},??
????r?D?S?????g
??Y? ???98?;?4?6?H?x????~ ?s?J!)U)??*??L?dM??????%	??N!?*E????????	??U?!W??
G
???'Q??
Z3?'?
P?????6???????
?+???Y7$
?`??i?9?K?????O?aKC?\????y??!P?0?????
?4?

s?(5?./?1e???Q?????p&???m?2V??v??1`?}53??*????6?.??O???1?g&o<(?1t??JCx???h1?a??"!????\?qh??28l??Cr?
?R`
???uV??4\@?>??yK}??
?a???8??>.K??5
i?~.???{W.I?R??R?????
??09y??8P???+????y???Y??k&??;?H???Hp?R?t?C?3? y?+?tN?????Nc???0?Oc?
qus?????0?4n?sq?
??????0?V?7???T??1?Z?7?1t?7lZS?(???p?~??i#??=?V??/t?(?9?????*??D%???s;??f?
????o\?F7????y66?F???6?0??e?6?I4Lg?%
?%
?C????<-??>??O?EQ+?
X6	?????????}=????
2?i??I
m?@m\I?
Pw8"m??6?A?1??ih,?
7?Q?P?a52??*??C
h<H?i`@,?@J?!
??qoSjR???N-?q?|Y&?T?	J??R?????,?J?Rb?8U??????e?b???w?@F<?d??IG%F9???e0???@HW?
?r ?Z4B??
??vt?
q$%?????3?D?)??|?????hb??f&{????(g?j1U29???+E??.K1d?k???m?A??/d?h9s????'??:??
?r??4????cNRtg?pdG!?j[?/??V?	?G??APK7?G??wm;a?[?Q???5?v???>v????e'[??f????lk'??~H??eoC?p*z???M?e_[??>Z^v"a??)My???????aUg??:uI??8m?t0??
eA?N38?-e?=|?ox7??
u8
?N;?!~p?<?!??I???/|???????qh??/G???p?W?6??An????/9???r?c| ?j??t?}????????kc?8???w???;]??7??}?r???i;??.??G??^???>?????n????pU2?8?Dt(?d???I?-P??Sf????S?m?i?-4???dn??"?,q?0???'y%????L?m[
?3w?????H?(!?C??U????;zU??A??O???=n?{8??xZ?/}?_?-??K?????p?W????<~????e"%+??????X?bL

???
???_*???-?9\B???.??,?*?6C??
%D?O??
??J??<?+??*<P?.?A?
QoCl?z????V,pd???-?A???o??&?gO??n&	????V&g?`2
??j?????
??-??????Z???B?q????xO??q????B??????I??
?I???S???O?Q?q?LQK(??.? ?????T??r"?o%?d??f0??)?(VfR?L?&)2$??V8?!?o?V'i?????R???(Obm?dG????b?)?????*???? ???T???R?????GFde??F??-?H????(%-??O?r.??.???R.??P??0_???f,G?-?-?0??/s?H-??Q????,???.S/5?l??-?o??h3??/?2.OS+2s+:?,?h4G3??!'S?l

gT?%F?fFS??|?F?*PP+?"F/??????*zTGa?HIPIutI?G3?HO"J?tI??%??K?tK????bHe?-???MOPJw0K??K??HiTJ???G??K?"G?4?tMw?L?KQ?!????*/'???	
?T
??$C8?b??2c????S???p?T{?I?M?IK?TG?U;?U?U?"Ui?IUVQUT5?m5Qs?W?UW{?Uk?W]?U[???M???UX;?U?uT;uVo???CxR"??Z?'?R?02(unJr}T]?@E2&?,??F????m_N?^???*g??E??UE,m_
?`??M?`m?_??a	v`?Pa????????a}-b/6c
6??*V??
b1v`
?b??6????dMe????a??dQ?c?ua7?rH?b?mfmve?h-?dK?c#Vb?_!Vew-bo?iVj%?e?5i?f??hvf??c??eVl?UfV??"<b	/???????p?S???&??-C??H??!????p?pqWq?q?qr#WrW&wp?ar+?r?
s1ws?tCWtG?tK?t?
??n

??6??????^?T?qR?2]/??l????B?2* ?!????x??Ay??y??y?z?Wz???z?{?7y?y?w{?W?7|??z??{????????z?
~??x??~?w??~???!~????~????~x????x8?7~??7?????x+x?F?a???x??~?W??????????w~	?~???X???EX?a?!|???ap8??)X?W???x??}??|??z?8z?X{??y?W??X???z?Wy?????w???|?w~?a
??????/w?o'n???Z??q??X?uXw??o?
K??P?3H??e[?8p"%?"
J??Q?????vm?Nq????&??U??????0a?~	??R?}?I??q??????n6m??mSVn??i>??v[
??4r0?a?wL??

??s'.^?i????L+?i?t.+?M?m??E'N\?c?h??6??3?4??#?4??7????4???4
7&?y??o??????o??\?????H?1????8Q1P|b?H?*Z??UL??E,z??I????2F???8F??D4???##????????
?9???6z??@B?P??x?i
??
dI?hlr???	HhD???c ??5b???\?q0??O????Q?mZ?	?]????ei??Jc???T?+}??9?????3?	&.???if?????????4u?Fn?S????8!EMp?S????v???-tkIJ????Eme?b
?W|??q??L?8??1?|?????>?
?w??tE?\<`
?
R
??!??
P?
:
OC
??8??mh??F??B?Z?=!bJ???
id??`?
rwm??b?F??q???]C??
?qP6K??0?[d$????????INFO/la+v?J?|2?????r=?????w(????r?{???'?'??coz???P>?|O??/????>???}?????>??}?w???o=6????ssF????g??	?C??????d	??J???(??p

P?
??(??#yh

?]?!?0RPy(??p-s0Q??h?HD??????C
??U?RY?S?tK?qI???y?j?@`8??	d?
?H/???????&?6?P;w?	?MG??9'???????!e?O?!??
@g?ZszaB? C at G?
9Z?+9j1f??&D????a?????zB???s8"4&??#?&.?????????)BX??:QaR???Z?g??yO?x?C??BA?m$gs????@????i?A??B???uQr??!?x?6lr?o7P??#???-??j??!"?
??osv?u?/???i??i??2?????????0?b#?&??
??
?b&??Ot{?h=Qq??]?23?`??i??jI?O9????L???:?f?c???z?S?:??B$?oJ?5m~?,????Zi&x?&nms?O1D?(Z?f2????
34'?)???R/??:	Ts??????????!?C?I*??"g??/?'????6E?
C
??0?0g??9E??i??8e??Qj:J?(b:?i?.???Y????#?R*?T:W???? 
r???YQD
??Pma?QJ?"?R?4?aV=? 
i?
????Sx?rf?R??O????a??????K?Q????
?9?i????k??\]?^z????????P	.1?.???be ????"?????j??s?Oj?M9y*?PV??????Bqh??c??|??
JO d???-??l?B??sB?cs&A?-?]?[?2.???>?p9??Z6????*?$??}I????Jn?]??~.????'s??h??P~??-L???%	
??e/???x?=2.`?
?Q?w?&???@?w????i??A??f?
 ??'+?}??j?aNX??F??d????T??n??'?n???<wv?GG??f?z?)???????r???"w????wJ2&?q?
`??1??h?I??f??_w?AK?x~)@?IM?mH]T?DW??2?&?s2qpMo??????,/?N?????U????F
??)Z?-??9:??lx????xG?	x'??e???=V??????#???f#Brd?????FA?8?8??m?Y?0@??<}O??$?H?
--- NEW FILE ---
GIF89ax

?
????
????????????????????????????????	??????????&??"??%??(??4??5??5??#??D??z??z???~u?}d?rF?~X?~b?\?X?c?d	?i?p?h%?m2?p*?u8?l%?o0?r)?s1?\
?^?]
?k?p?f
?j?q	?s?m#?r$?z6?x$?|4?zI?}R?zC??v??m??y??|??\??N??Y??j??y??}??d??p??q??<??)??8??'??8??N??T??G??U??o??i??v??G??U??W??D??K??V??e??r??f??Z??\????h??t??j??x??{???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
M???N?*??t???X?fe??+??P?z
???X?g??E?V???e?? ???a)??<?f1c?nl3p??>#??_?Cy2???/'???????53???h??Q{&=tk??mj~)?f?`1?C??/K????N??????#W?\8s???K>??u??m+K)???c?s?c?7??a??C?^/????????~|?????????X????z???????G????*!|
J? ??4?a9??]r?1?n"?X??(????,??"??QV]???I?\b?s ?Fn???nY??By??L?1??tD?$?K?!??t?A??R???W2?Hv)%?a*?	?Y????Z??d?r?$?E:?g^~i??o?i??wj??[~9?tH??>??2L?*R*?M???????)??z??????n??zj????j??????J&u?W1????s?qE`+???k??`p
?V@????!?P|?????-?????&+n??+??K.??*?l??*K??????????-?`?/6_?+??]pa0?b?p????=????0?nG??1????e?L??~???-??1f!{??????JS

???Q????(=Gb??}??#?\???,b??'???+5V?o ????%

7<,???????T?E?_l-=?D???K?5??-???
??7qq?!
??F8?&Ai???(?? ??Mv~X????j$Mi???7???.P
I????u.??????@???oo+?????-???}???????(E#s?o???M?&E?+?>?"???%?[?o?????F|??:???4??p?c??#2la]??PGr!???!??5,??/X?:????Dy???????~?F??o
C??(???_?? ???:?????B??/?AX??!?u/d"L}?]$?u?_???
?d%?g"?
D?$#?,%?w??y??Y;?y??U>?b"B#xn??_\?G~??"??P$J?s?????+X?l????
U?(>??jT??h?5?1?1t

???<?!QB???PUX??|??????)??ef"????*??}?d?TY??y"W?
8wQ%?1&]??L??X??dVd?M???%"`v??R{?????Y;O	????5'U
*W??!??Mv?S?:???MW1???fB?t??#?u?
??w?!?s
<qk??r?@?k<??
*?>@
?d?i}Q>4c3
?QE??"R[:fU?d#????1??"l?[vx??q?a???@
????C:?0?
??5??ZZ??i???????H=??U ?b??"xx[??i???BV??b??"$?ed??2A4?5?@4????
???p?J? ??`4>?Sj4?Z?>???z??0`:?
??e?p%?B?a\???l?????Y???
?`f)?ql?$J??2?"??????f?e??cg"??l?:??Ji???1?@
????NK?(v??VF7&??8??b?i?t???;e???a??0??|?IQ+?{2?;?F??K??K ??jUl?k??;?v?????3??&?=$#?bD????I?S???)???????i$?{" ;?"?i??}"????I??{i???7r?????+???????,???<d?;??????{?,????	?\?*b?l?????s??s?)?;u???(??*??,??.?0<?2\?4|?6??:t;??D??#?C?3G??y?F??E??H??J??P??R??T?Ut???g7?V?????'?>?s6?tE??h\?i??j??l??n?(?s-?u?YuF??0??6w?w??d?D??H??????L???wt?Y??\?v??zL?s?6????????F\??)????????Wg??	8
F???Pp??
?<?????
???`
xQ
6?dB&*/*J3??????????????=??]??}????????????????=??]????0f#?+d?Zgl?g????j????(H?????m?Q???]????????=?????]??M??}???m7?vac=V<6S??=)?M???mw?1)?si???]3$e?]??!?^?g???~??1!???{^????
>	?~???>??A?w???{?/#f_?l#R?$>?&~1%??'.?*??,??!??)
W?m}??X???????=???
?B??
Dh???.b"?Qb?0????L?(_?h?p?H?I?c2%F?+]?<y??|??+?S?Nc?r??sgN?C?
ZT???@?&??(R?Sw
]Z+P?K????SY???u???Ls?`?Sn??.?4?7%o????&?6o??y???K?2??E????????b???fk?
w????0]?`?V?/_"
??7????
?K?m??Y??%/w#??IWbr?3???G?+?????5???R?P???:?????+[l?????z??t}?b
?3?$?3$???p9?D?2?yn?d???'??+??b??????*??)?R???~??=???2?,w??K??A?6?d????3?3????I? ?"??C???
?P??H??MT?F??G%?TRM-?s???
 `??I?b???`?uRY??_63f?Y??`?i?9g?W??e?w??g?o??g???g???9?b???*????d2??r>????????jj]?????@?d?????|?	?u?	o?c??X?	???f?m)???`?/f?Z????a?q;???D|?X?I?ab9&????)'?oY??N??J?t^??u?c?v`??v?i?????=x?M ?x???x??_?w?y7^??s?z???}??M?
???J???a~Ke2
2e???9Z
?????9tQ
? 3x??d?cT?0??????`?Si'2????2V??v
C?8
?


X;h`??????@?I[;??s$u
?x??r,/1??s???
??????????I>????b???8?b	?????Sy;rs?0i?a;??????G?@.?+?b1?=<??:d=??9?A8??R;;T??[???@???%L?H????T[??[??????T	??#7??E3?????
???BO??L?%4?X?:V!??????)??,cL??i?;]??)????Y:7,??
=???Oz{8?
??8N??L?<N
????*UO}?1C??h?]
?`v??
?`???`
v\?x??
????Y?L??D?????a&>NG????Ub ?M?M??7??7?$~?%Nb?H?'Vb(??(Vb'^?#?b&??-??)>b+N?*??).?"~?3N?">b*.?3^b%v?6?c%nc3??:?b-??<??0??8~?0??%.?'?"??Lp?D?L?S?????S??k????L??B???"K???:????/@?TV?T??VF??XeU?eT&?3 ?[??V&/ ?/h?Y??2X?[??U?
_Fe+ ?_??/??]??f?fNe2?e??a??^v?m?fj?ehveU~fd?eavfX?f/@?XgV.fw??^?(8?5??x??????K??sS??D??V\????+?
i<9	/??ph<n?e?>?H?DY?1??1X?v???H?	9????@?)??#dG_??<%s,?????I??h????'?.?????[????J?k?J?v?????!?'8?I?????_	???3@I?yk??H@?/????-x?{W?- l?X?2HI?????IH???=?yk??'	1????J?k?.E?>?yIP>???P??&??j?t??^?\E???????:;
???0??^`?x?q?p???
????t9?V????w????b??LX????????O?N?????????iCq??h???m????oi??	?O??'q?/P?d??	80Y0c?
l??!??
#R,??"D
?
3H??Ls?`	?$??*W?D?????'e??	&???&S?Q??%??4U?????5o??U???'P0;??\?????Y?V???eT?X??????????5?b0???Tx?b0e

??Q???{???e???]????X?a???Y2,??4qn?9*=??a?m?"hI?:???.?$A?f?t5I??<9)?L%????)	??Iz????il???a?E?#J?H_??&
??c*??F?P!I??y?z5?f?\?????(??e?????1E
%T???5?Z?? A???Em??`?5???z????9&PG??H\?YN(??"W?}??NeX?7?D??g,?
=?GFZ???[?qE ?|??mWp?tCO7??a?<????W}?M8???
QD?M??R?h%a@?M=?t??@n????????e6V>f??A
???.?`??
& F???aX?\?6??ak
??@?XZ?9?\??&??"???
?h.i
ud???????E%?,??!W8?M7Kbc?IW??#6_xa?5K2?^???5W\

7SzS?]?!?Q]?a?????{??;?TO?a?U?*)?f??ZZ? ??????&????6?W2
#t?????d?X???????a ??7???7?,w????d8??3??Xx??Zc??'{??[(?
8?D??h(??7???
??PRFP ???7????d?eV2?%?b???	"?P?m????(]n????zq???B???5???Q?=ZcF??[uo??E????T8?-?A>e?L?Da1>?6E?\????/?????????? ??0?h?I
X? ???????H??c???u???? !d.?D????nl3?C4"?C??9??}???F<"???%2??ND?>??'R??I?????-r?? ?;???ec'L[? B:??Bx???Z(??a.\A?8?Qu?#}1?2??c#t?,$"??HE2r??|d##	?IF22??#i??n????&??Bj???e&?I?D?????d)U?Q?r???*#C?e$C???B:	Il`l?c
g71????Z[^?????-
???1?+?0???$??~	?2??^$?e\?2?r?f?31??L`?J???R?'?!?U^0#?p?F1b?a?????-nq?Y?B?}?.p??Z????,.fA???B???E-h???B?=l_gqX?????-<???6?x??h?zZ\?????gm???????jg{[?????}?ni??~V???-hm!?W2??Xc??N??!a?B??

e???????%?????1?b?NX??1??
|
??
?`?`????????
?,C??MK5
?1?=)?????1,3?B,??
?+pJ,??14Z.???/A?2??
?+?C,t?2d?D?C,??9M!2?)??2??*?+X? ??????pJ*?E*?a??3???h?2????J,?E$*?P??1\b]"&??@??|bu??(?????)?"*??*?"+??+?",??,?+",?B[??$??h?Q??Ea`?-????	];??:D????0?\??/?B1????SZT?2??U7r?HE
?-?8?E?M VW???'c?
?>J	-?K-Lc$???`?
%9?$Q??]?&b?N?#!DP?Uf?J-(_E?-?V-??,?BdU?uZg-?Vhu?vZ'v*?la?d?gv??v?'wb?,t?iIVd?gxn'z?gwf'~??v?g?'v?g}??{????w??q??u??,?&J?#u5?C-xc???(?? ?!/??T??
@?YA?UFd?lV??AF
?B1,?uR???t?M'??u????:??_?9
???j?`?????
??dPUi?x??&~
?	C?E?:?94??1G?Oq??2?<??5B??	yf?T?1?q8bT?*?1I?1j????GE?????(?
??Sh??&?.?P?p
??F?
P)T?q	U????4?Y	?8?>$K7?C?$??|?=|C?|r(??'??(?r??L*?2*??6??<
o??4??1??
?<??=d?,
5?0?Q???D??o>?0???21
q&???e??g?}0?????R?=S:????fj&d?=6???f?>??{??}?\???*?R???4c???G&?'}?3??o~Pf??_>???c???????f??~???????????>g??c@?AT??;?????,K:?'|A???J*K.??z?7??U??'??o????????_?S??:????K??s?????1?????#?#???
L?
?
N?.)?i?4N?;i????b*OV0??\~!??a?q?c?IF?e-??c$-?QI)???L%e4?H??4?d??r?#???N???I0??Cu)m?0??T??V<??S??|	'?-?cP 
???k-5?Ne???????????????????z???
??????5?<?s??p?#&?N)V??T?x?&?A0H`?% AH?A?0?,?MHB???(t?	a???0?-??mHC???8??
???
1?=,??HD%&??Ht??8??????X?
h?]???F1???e4???F5???mt??G9?Q
??4f1?ILes?????F?2I?*T?"5?I7l?J?~3?*OIMp?????6?i?r????t'6?	?w?S????=?9?|?s??T?????????
T?r)?`??O?????Maz?????/??{??S?u?C5?P?Z????Ju*S??S??O?jS????F??[?jW??U?j5??*?
??H??)e_J#????5
?N??6u?-]?Z\z?????I??M???????e}i\?z???u?i}k^?:?????H?V????n????PM;???v??}mm[?????????j?4????6?a?JW?S?&??	k^???????=oL????>??
??[?'??y???vJr?h???g?A?????A?C?y?T?@>)?<?
??G??M?<??b9?W?M?\?5?y?[>s???'???p??|?=?y??N?N?U?5??D?mB?????q?m\d?o??\?z???u?_=?dOr????'w?p????/~1?q
?
???P
?@	?
??
?0?????
?
????'?0???m[?RO?
?$
?\
???!B+D6???
?
?
?a?!?
6?ac?;?3??j?!?AB??r?????]??1
?2=??=??1????`?t?J??I????,?M_q?d4?4? 
L?n?qw? ??AdE????&5B?
????bE???+
j??@?@x???@??aG?>7$?? ??J??????????Yst????
!??s??H?
??|????K%?A;??\????J?t???o?K?????NM?2???>eq'x/?I???-2?{?&??:??
??.????????B?68?}a?,?????A?`?3?vj??
??
?4|??!? xvQ)?
?aw??,??v?Vj_?????
?!|??L??WJ'??
?S??,?m??n?GYR?1?K??
?
?????%%???(s???f??kM??0.T??7X!/sM?t#???4?Q??CK????U
(!~???
\?7H??????????#A?'T"JU:??x???? '???_r}???`?shC???
??? 
?`??yQ?
?TQ?A?c?8????
\?

&R??????
r???
?rA??E8?C?D?Zd????????dO??????? ?a?????G?@"?zG6Nv]E?????"?vM??@?7dE?
]sthi{t?z;4Wy????X?WQ??/?SE?q??8?
9?)?}??????o?z??TN
???
_??p8??J????a)?P:????2?;? ??&???
? z?
??
?`??s?`??@??/??C??
??
? ?	???@r??AC?9?C4????????7??????C??I????.??7IT?E??
????H)?	?@??

fHC??(D?c?B!?@?-??m[???H.?p?;L?):?!??R???>:Q?y???T?C;?????,??K[?P?v?	Y????A?/zs??M9????E8??;??4?t;?ifN???@?)??R?A?g?\??W?
???u?[??b?{4?f=?T??V???)0?IY?
???U?s5?}dbW<???qka????V*?????S????A?????????s?U?+
??j??2S?MAx!?_`??????
???v????mo????v???o{????????mq????w??E?>??Z@????E3??l?????????q?G:??h???^?V?"?1?U?????@:?A?????
?,xx}?J??????
?Bv?Qtxv?`EuX"h#H?%H?&??+h?*??/X??p2H?????
??6e??????????S?0
?0
A???2?????$ ?U	?! mi????m???y??9??	?9??x??9????????Y??????	?????y???????????????Y??)??	Y	=HU???????TT??2?
??X??*?????????????????????)??h??????????=`??{?{
??Hbh?1@<y??
h???0????
????P
}v$??
??c+??I??
?
??????i?? 
<?}?{VD??P?????Z)??????B??E?
V?@??I?C??O?????NL?U???x?T\?V<?[??^<?????}f#?6?xwK9o?Gw??1???????i???0??
?????
??@?p????????
??th?p??g????
???Y???p?|?b??F??
l?3=? ?5??9??;??=???
?A-?CM?E???
I?!?q?%????^?$~??,????X??????*?k
?????xd=?
=?6.y?d?s??????~fd?/-x?dd??`b???s_x?~?"4???p?AGzn????8(U4?k???????
o9????N????g?g????k$??q??Zl}???s??+?$^???uY|&????f?q??a
82?{?<???}?~???M??m????????]?j?{??????,???i?&?w
??P
??p?6r?????5Z?p???dH???{hr?*3)#<qx?1<??I~?FF??????lTm?SA6^t?zp^?!#?H~??}Dr??{?|?8?????a^???
?_6ji????????|??wM2?7??R???{????y????y?D??%i???lN????wh???m?????n*??????*?<??-??b???+?????{??#???wn???ZF????
?

??
?~??
?|??$
2LU????,B?V???q?t?M??:2???M???s???]?????w}?A???
???l?nA?@?Ex??=V^?$??????Y????+??@??h0H}.?{??}????/??O?A?>h??} O{??????e???????J??t???J?I????B|&g#snd.M??+?Q<???*?????0p?+????)`???????????????<0????0???????_??O????????o????????????????<P
D?
?aqG?f?????_??"r?H?Nu???$k??X?d??*???e???Y0X??m<?J????xS?,/X??)3????c?H?IRe1c	??L?J^Q[6??+W?(?l?l?
1D?@|k?8LqE??"??m??M?Q?E???Q?EuT?Fc??EsTK?[zMB? ???|?*?????d??
??A?]?1Uc???vg???m??oi?????K?k?-?78Y
7|`??T?}?f??U??K????ADb???8??Ri1?+$?*?q?y??	3???:?\?#?K?Q	H?1?#d\Rn???9f???D?j??%??Y??HM?r?B??3'?TmC??}???????:_8??N???g?:???	}?@??H??@????-???
?-]iL_Z?????=???ld=?}?e?K??|?>?a??sV???D???PyZ?1?f=#
???|Z:?y?????????lK??8G/8w&
?^X??y?????u?wo??*
????3c???/?s@%[?Y?}#.:1????36??$
?+>???3@?2>??56!?#6d????
?9R<
??K??
??;?6?>4????K?NTB?\
S?:+????K
t1???7?$??|?-?E??H???:??0?0Z?=??5??H?T??r5.??????Ky?????????C????|(LTN?s???E?
TK,???<??lM
BO3?[;?q?6{???{P?P	?????P????P=?
???s??I??H???{??Y?<??$?d???-?A5?<?K?<'`?7??:;?????(??l?{5DQ???	?	??K????a?r??,-?R/?R/%r0t@?_@.S0=S'?
_?!S???S??K%+:??<????QtCZ????0??3???>????7????2D??F?
?S??_?5???[E?)u[O??H??*K?:T??E????J???X?7k??<????=????<?L?2lK"???\?????:K?;tc?I?B?S?????$??4U9??????<I=????[aM???+P(?
D?QT????E=??sH???@eR?|?=??f??o%Uv??????1?mqV???
K???*??H<?3?X_??x??,T?{?????(?+s?}?_??s=????V?U???};-w???B?,S????	Y??: 3K?	?????y?M%!.?,{T????S????????=?,C??>????#????Y3H?A???5???????OY#??u?C]:????????X?C ??\lXq???4O}?;i?0%?7
???7?|?UE
)????+K??[J-??0??a[Q?Xu?
CU?f?C1?&???X$5?6?VS?>?d???b????;;Z?U?%??K0?eh?h?2?}h?NZ?~???h??h,?????&i??h?>i??h?????,5???\??:??i??i??i??i??i?j????j?>j?Nj?^j??:?.???lA??0@??j??j??j??j??j??j?k?k?.k?>????y???~k??k??k??k?
?????k?
?o3'?5W?4???g????s
?s
uO 0??/?:oqd?I??
B?;_s`?X?????g???0?w n??[wpwq'q?I?7??8?v?svOuc'?3op ??F?rz??jw?j????v?skwrc?v]?wrO?rWx?O?0?&' 
_?_Wut?v?&???h??#???O?X?i??? (_???t???f_x?ox??????/?sh ??r,????_t?g?Pwt??????? x???o???]????	?????r????K??&????u?????tWoz'?z??y?????q!?w??6??n??y/??9w?|?Wx?????

?
f??*}>??T?O?HW?????
?N??9u,??d??M?v???g??t?5K?+6?X?d??	?+8??????????Q???,O?`?^f{?h??Q??,????3?Z?Z?ig??u?6-[????oO????\??!??o.x??
????
??uNX?
?J2?@?
eT?R&Yhn&???m????????bh)??W2??Y1???_??2 at 2?????4??_??(L??
???2? ?D???t???*?[L;?0?L1?0?????"q;???s??1'?0s??O?:o??Rve~X?&g????iXq?%?4?K???u???$a2????-S?bK-?????Q??
2???*? SK-??"u??L??,egm?+S?"-$x?7???V4??? ???V*?y_??G3?7?E???"t??
?
--- NEW FILE ---
GIF89a?
?

HI
????
??'??)??!??$??U??h??e??h??t??v??w??x??z??w???3?F?U-?d:?T?Y'?c,?f7?d)?j7?t;?\D?lQ?xf?}y?|f?xP?a?`?Z?\$?h?t-?\
J????H?*]?????GU?d?????T[&{??eW?`]~E6v???d??M+v?Y?l???????t??]?????y?,????????????3???0e??%[??7?g??;????g??I?V
:?kbX?e5?:???P????R?????_???????'???9????;?}?????k??=;????w????????7?>}?????????|???+?j1?+13oj???mf??UV?
???M^aKj?? ?
,?l??'???~?
_l
l??dCO6??J??T??6??J?6?l1"?bF?\x?M!&?\???"R3?-k?1~~?????*??x?aH????!?*???PG-??????>????@?;?V??5??h9Lc???????Fj<??t?mw?w?<??^l?
+?_??????=xx??a<??r"?w?M?=l??Gl2??Zn????m????^m??????T?o??
k???
0?1]??*)??K??ad?B6P}?30LW??T??2??&]?c?8?.2??\???xF-????
???O3????????a?3?1ev<
C'w?n^k,B?(H??=0?ml???F)??

,?????{??]?@??:?w??tLb?$????wX????3????@P????7/????
'
fP
?F
)????? v??v??`?	0???v?P
?p
.p?v
&@?

????xF?p
??@?
o??p??!??????Y?????tak?3l?$Y?!<?kZ?MGd?P1;d?%'??0??O?`?U?tD???nq&?
??.??H??C?U(E??D???b(??YM,?&?yl]q?3YM??%X????;=a6?N?$??vC\#F?!???T`?????^&?\??<???????e? ?	??F_Ql3?)?F?U?t??e.?j2!?D '& 
???)lp:??l
 y??:q?:??VV
?d[qJ
??E?ZI??\"E5?6?H|z?r
??Ew??z?}??CtD?
???5T3?
?`1???Z?@s1"c??Z??@
???"#??r??s1????
??z????????????*?*??
!?9?;?x?A??y?/F?Gc???c6??H\??OU;,?x??
3?3??

*?????33?0%L??;;?E

?lj????`???|+w??-
?*l?
?6???Y?# &*??Ya??f??^?`?3S?E{?g?.?*?;?????K????K??+???;3????[?{??*?;?????r??
??F?y?xR*?R??HL/\?M???KI?e???t?????!D}j?L???k?c&??????,D??C?y??k????E~??1?G#;?q??-<?????z?d?|?z???K?6????;^???A?=????????k?????I5?.a|N?G?T??
?????S?|<??L????<K.u???I?????O????????????L??
C???? ???]?U
????n
??
?P
??_?e_?`???`??
w?@
??`n ?0?'
?%?[s?s?U^??
g?0?_?5_?u
e?_?`?`?_???p?P???
?-D??D?%B??????5vYq???E?D?R?E?!+?\????-S?|9??J?;}?D	?c??2qE
4???K?6?j?d?j1c6????BMvt?2d?j]?F
=yk????V???k????u_???z?2??
?"Wj?\?q??nl?HU
??$kz?+'j?&c?)??*?J?b???)?kH?D:R??P?qJ?D&????
Fev?j??n?r"?:?!
?J!:??4?u	N???$6O?(IP???F??T???*??K???	?q?l(?s?-???????%?z1Ui???a)??w#~EZ????I???
?G??8?Q4^?&??ABq[-?X???&)?y???Y?????Q?H&uA?Z8???0?%kQ?ZPRT?#?\?#W?ia?.?Q???+?xD?q??D
?????R?af??KC????LbB?}???XRG/)??$n??E???L??????????v,??6I'???H[??
?U???NI.?????}?aC??9??)o%a??b2b
R`?Oc?X3x?v? ?_??/?gR?f????&?1?2???rJ?r?#?I??6?'?dO?!?M???Ni=qt??0F?	L?g?????VI??3????????
5IPWT+?Lh??Jy???\?3g?b
}j?2fO[?2?y??m1?1Eo`'
?
?n
@@?1?
r 
?>;D???I?l4?? 5???????A?=??4?*??Z??Q"tY!,??h?V??JFB??z??A?;?qI<??4???C?
92?6??gP?q??(??p??'??l|??#d?8???#??C???x?I??p?F6????9?
??9kcC>????*??i?????t at CC??\???Dq???.??????K??T??[?CCN??P|3?	?????j/j at e???#?B+I2?
????
??????lv?
???+3)VX?????@?????????????j?

?f?
2R??

A???:??@????V??}!?8B???_hX?L?Bg?G??'??
???i?3?N
????f8?
0cU?
f?Z??Z3?S???~I7??,???(>6???"5S?el??????=d???"??=??1??????????gX??A0g???2b`H?????2???*#{?vP?W??M??? ?9??d	?P?9??Y_??\?E?
???0I?~?????L??A?-???-??I??
O????i%?M??V
\?\?53r,??Em????2?!?Z0#ZE??]$I??Yx?WI9j??I"}??	?bR
?"?,~?U?c}??Z?Uq?.??A???LN???	?d?????7N?"???=?????><[???????f???
???????d?H???E?E?q? 
5??
L?????????0;;a????t????2z????w???r???N?F?b?l?+"*?;?fM?w 
9??

$c?a?d??
??
??????"Pv8??y?N?????W8???
dCO??s?P\??E??Q?M?*uN????N?;1k?
\??p^j?;@?R?Z??#k?????V??z??????????"\h?
?????+???cx?6?c????h{E0y
]H?b(?	o???g?;??;???????Y??q?R?c??h%?????e?S????wh#?2zG??^???????k???O??U!#?x02'6?qy
V2K5:????T+C1K???G?8sQP<%?o<eej???j*???????40??z+???z?????*~??:???e?I?
?+????+~?%m??N?(???b0??Ry??	?L???w????+??????VqeZ???
6??>9?a{?6IT?%R?????4$3f???Tp90f??QW????1??P=??32=??r?6??,r?*??
???#r64??2?(?|s?#?L??0?L3????6H-??6?L??F??2
?w'?.??b?^?X?KR`?U???g??{???:Y?K)??4??y??.^x??1Nz?c???q????6?,r=?|C
T
??z??#????t??x?=?
&z?L???S;s??>;??
??????%??M1???c?
X?h?B?5M???W?B??GPmuT???K??:J%T]y????;??k\?:S?
Sq5?R5?????]#?&??dM?uki?A?F??"??*$5?#?m?Kc?????G?owF	mx????U?J	?R$%?I?u'???L;?@?NI?M?I?
???t%KI?f{??>?????{???v)?i?_??[$9?#?u.qw???????]L+z?Ky?
?9lc????R0??Ta]Y?O?ipH0\a?j?!N0?{?`,kY/_^s???????q^X??(?Y?(????$,??YzN????l;!??-C.s?|h8;??q??r?Kd???3
?????jZI3?"??(#*??HT6?d??????????U??#???F???Y?S?>v??]?X???????_}?aC???^v???j?W????5a?Mlb?????v???m?8{???????m?,??N7?a
m^/[???vR??T?`????]???$??u?|-???[??67??p\[|??N???qc??0/??C>n??{?*??a??k???/?x????z???
I%?`?1??????y??UTHX?HR<??A]????????a?!?????a???!???!???a?a?
"??!&? "?"*b!6"$>?$??#Rb$Z?$"&n?&v"#f?'rb(zb%??%?"(?b6+??+?",??,?"-??-?".??.?"/??/?"0??.?lC1?%V?-?26#3>?3F#4N?4V#5^?5f#6n?6v#7~?7?#8??8?#9??9?#:?c7&??<N?D	??x=r??p????",??A??@???A$B&?B.$C6?C>$DF?DN$EV?E^$Ff?Fn$Gv?G~$H??H?$I??In???
?4?A?r?}&(}"?y?g??????4???
{(b?Y^%sr?vJ'w?hdb'u?%?v??V???&?v????w?????Q?f=??>???a??
6`Q???????3
l?b??^l?nl?z,?R??f,?:??Vl??l??,?????,?R,??,?????,??l????v??f,??????zl?~??~??.-?v??&-??,?*????^??F??>,?~??jm?f-????N???-?Zm?*-?Z???-???1??10????F?Ez??? ?R+f???b|Do?F?.nG0.G8.B5??>??Ano\??F?.?j??N.?n??r.?v??????.?~n?:???n?f???n??n?????n???????n?*?????Vn????/????o?2??????????.??Vo?b??b??2o?2??B????1!??????M????3t
4???y??r??i??????

??
?? ??B?0?
?A@??0B
F????>??>?I??(	?>???N,?H??G??2(?1??d@?O?h4???yvA??4
?
?????
?p??GA??L????O?!??O???0!?????P?u?B!
<|?(
???7V???????????
?_?Zs???A'?A4?p,????q4?
(??????:?WC??@|X-Z?:???F?S??IE???*??B?Z???E?5~T?1?*Q?z???*Jc%U?DY??-^?r+???
?P?-????F??C??k??c1???????f?D[?????*]??u$???D???0E
???2V??
????i????k??V?m????o?
?[{
??S(e?,?b?J??i???l
??:Vm?DQ?*??op???????@?)K?#T????Xe???U?????)#???r1?!?/M9KS?????`?R ]x??=??????? ??$k'??OG?TK?fDR!r=y?o$E?)iD[??7?Y????xeg???????9?????q?		?K?26U?s*Q???C??k???V2g6oFI????ma?+)?=?Q?^????R?)M|"???+?4?5u?r?>??t????L{??D????e$? #???eQ~.??????)??V?cB?"G?0h??????+??C?????I???
jP?,5?Z????????HT?=/????$???y??OUZa?????3T???
??n???
??0????!?a?`? ?????? ?N??A??????????.:?
??
? ??"OoQ!F???
?? "??!>?H!??b!8Q!?aH???aJ?I??aH?,?`??v??p?%t???v????Q'~?,?-??G?d,xE????P?1??????
????<R~??????qP|???U?'??$L^!/D?
z?&??@k???, q2
,
?`
5??`
??o? ??? ;?!Mr?
??????P????A;????
@???)3?0?????v?`^?z?#??$???n?q?%^?|??y1??7??4?????f???Eh?{????'??dE^G1??aF?@?????R???c$???????(?:????DF??h2+i??J2kgxfL?8??'2I?d?*?)E?ASh?I??{

8)?yh?+?yv%?,?J/\?d?Xt??Oe?
H?!???A+???a>3???T?JsvyR?,??-??W?T i?vz??z??z?7{?w{??{?Wh ??M>?[c???4?$??WD?5Oj??Lpgf????W]{G?2C??J]??a????~?b?O??c?B0e?y??cF???3??(*?>?
???0?bb+??D1dXA?CXaX?|??9XaX?m????NfiDJ?z?J?<l?-??X!?uA
y~E?)xN?	????Ca???&?\9?G?J^LL]?:
?b?
4?X?A?&??A;
????!???Z?Fx?)??'???B;t-???r
?!?t?.?7
M?(`?jx?)K
????T??|?B?iE???6?b2&=??/??<??C?O???5eC8w???\e?????
R?9?W????B?z?.???:??P-g???jS=?ju??:
??P??fjv??K=????YE]???
?Q???p?l???v;?:??=p????a?*+ I?C??jC3??$E at H?CB?I??r?]???O?VmGZAU?B?A????T?X???1?m
Ss	J??:??K?7?,ff4?*??PE??3?????)?CF????
??W????x??T_?B??????]??g???ad???????]??z??9??????)?=[??[???5m?1???Gw-?u%??'?Q???d,W| ?
?t8?mr??????????fwL?0?{|?S?^Q?x.*?
%w(m??~?d?D^?a???1?Vh~?k???g?????]???Y}??}?I?&>N@??8_Rh?b???&?????5????X?????E??"4B8???T
?:<?V?i??I?Lj?-^??e???a3?[`?xr???Q???t??e&??a
X??.??@u???_???3!??5@3?4??????32=??/
??3???'@1???L.???
?????+?*?6:_9B?*
?L?
a
]M??xL.?
}???
?^???*!??M?2^??kI5O?R?????y43;]1??!Zi?F?Y?+??KU??YZ???IY???v?>?K??W???9?? ???1?]?q????????RGC?a??23u:??^`?c?"???A

??2? ???0?yM?_?"4s&|??4!??-BvE?"?"c}??>M?3M
??t?XC?s????9?X??{?#B*n???N	?#<WQ?qD?e!??$?"q?aG?X(-Et.2@?,?f<E?%?+???Zwt???a+?&H?B\Gq
??@?Nx
????(?`???4?wS?Y??
??q??1&
h&??o8?U?
??!?`(?E0?@*G5
????%?????.*y?az???H??I?Q?9M1??z????x?'*?9I??F&2??fA?%??
?T1yA

?|?8?j????????
??*??J?????Z??z????????????
?
??%??`uHK??B?Uz[?p???8?+
?7Jn?E*?L???Q?)?]*???y


,E???M??p???u/F8
???PQ??j??
5:??+c???	????
??
?-?

????<??2????i?????a????K8Z?????GzJ?)???7D?	?7???Q??*MPqMN??X$?????v???????eMf]?g??c??j?V$?b?????XD?s??w]?QEy??p?`
?Al??iM?X-??{???s????v?d?p?R?,RqMr??n?????{????T=?w??"?????[}????
??
?f??i??^????c??????=? +??}?]???-??=?r-??
??????c???]?????-?Q?????M}???#?Q?S&???B??m
??)??<??'??0~?W??M???F?N?*n?[?H??^?N??B??~,{V???:???Sl8??[s?c???x???o>??????
uv??c???yq?????????o:?qa???'-??(??????.???'?????L?B??&[?M??8:??????J?????????)?'{9???????>??^?PV????>????;?+Z?}
?g??aP6?K??????sQF???????|????????y????d?y????>????9????A???.???F-?????-??z???????\???V?????u?????D?? }?]?!???.???????q?????\y???????.e?,?za?k:??i?*?????0??r???A????@??
%<??	#??b?e+???D?Zd???`t1Fg?QFk??F{?????QH ?4?H$?T??%?d?I'?lrJ(???J,???J.??rK/?sL?*??a????????????JN3?*P!f?9?EI??D?\dPB5t?D}??D]d?GM?QD?RF+?RE???I	??SR
uS?KK???Q#uuUQS}TMk?t?XY???\c5?RIkmXS??5X]U??d%VT???fo??Z_?]??h????jK??l?E?\q????b?uu?SmM?]t?UW^{?55P~????4jS????????c?C??\?8?
??@`??????i????J?:?.???????
?!??)????i?
7???/*??r???|??;????-}t?9/?s??Wt?[O?t?_w???9??v?c???;?]??w>??g'^x?C??t??/=t?Y?^t?+?|z????t????x??G^w??'_|??7???W???????????}?S_?y?????z???AX?V?$o\??X>D'?U$+?8???p?5laz????W<???z!$a??G??0??[??rW?b/????4???l`C?:?F??/|
=?"?p?&?$?!zh
?O?S?_??*f??/D!U??-J??b??8???????9)d`
D??????)oe? A,?(?O????eH=?a??$??????? 9FF?1?.??/??????XL??;1?`%=z??q??b-gy?????=<D!l?
D?t[??!???iL?x?.?8Dl,???8?4??0?E?f?B???d??2YIE??{&?#??HJv??????!?i?zn0??T????7?E?w??&????h??A??G?]???K???~??3?d;?O4j?????GA??U???0?Jzd?b??????3E?????e+??!~xm?~N?!J`???8????P???t?g?6b??BpA?8dj(fN+???c?Z??HCvt??T?\?YR???]???!???%???@??(,?;??bX??I+???1
??jQ???lg=?Y??V?[??J9:???@????
??????&(??Rov?7??!*???N,???no???-?c?!4???Q??T%])Z?fW???nwA?z?c?F?b??A?xd?c??P?F
???0xZ??W???o?h???T?????????x?6l?"?z?$b???x?D?aU??C?~?7??J??_fC?;??!??]??W?3?1w?????'??W ? ??!??S????@C????X?S?r????%f9z?\?
??C>????$g??le4?Y?i??_?1"
?E1q??+??`G?????c4??C.?D':?vX????GC????B?+M?KK????4?1?iGZ??&??I?iT??????C}?V????5?a]kS?????u?w?kL?
?_?????0HL?\p???&?D???fS??=1^[?????????_o??^u??}nW?[??V5????v?;??????=ny????6??@????B?u???0D)E??A??!e?GO?HG??a?|???8?5?q??o<??x?;.??????x?Y?r????+?9?S?q?{\?/???k?s???B???a????7??g?t????Q?9??>?????,7:?o.???\?C????.u????*O{??^t????qw????s??=?u????r?????????.?????C<??>x???}G<?_y?S??'|?'??}d|zz?1?Q%??+???X
zp8?~Bp.{???f0o?X??????+??
?b???????>??|?????????W????>??????????>??????????>X??????+????}??_?^????_?????@?????????????a??z??08?@=?=??@
?@?@?@AL8?p?c@???9R??"?Z? ??
????
??W?4D]H?%????bx???????P????O??O????}C??5??#}Q?&????Q?Q??
P???R?R?0?
5?*???Re????Vp?v
x?	??$??
&?(?
@?kPNx?????2?
?@e^??K???????B<]<????j?^??K?c |??:F}?2?	???%?#X????>6Q?_=???????[?a, ?;XL.?>`
W_?
=?s???2G>6?7?j???????qK???bP???1??\?$?????.? *L?7??????d?Ud7BZ%??a??Z???,M?????????<????VA??i?M6?i?V?th??A?
?6?:|FSmB??V??Z?j?6F?M??O?LV?f-?'k+???F???U4c^#?j??U?????s??n?v?2?K??^???2v??????Z
s??+???`?6?A?n?^-???W4????X8?????,????y??F?????7>??H{??a?ZG?????T??R?#2???; ??(D$1?E$???????-F?"????2M?D?3R???#j?`T??8>9?KN ?'u?Df??^C???/c?/??eL???%+i?Kb2???$';??J??jq?????E??kc
M(C???B??
?g8
IH???s\]??N???j7%L????z???])L?????W?2?x?4_???????q?*Hp"?}<2L"?eH?t??,b?qX
UGL?Mq?'_???v1}??T??(???o??;???(??????|<4?O?<??Q}?]?I???c_?O??j???x???XK?m?K??j
??x|^"t=???j????c????&U???j????r??
O0P?[?9?????4??f??????Kx3????.<???*sW~???R?????aS?=}s????P2z`??z???0?i?YY???N'-f????V??%,c?~u?????vl@?????K?-f	[??RC
??`?`??Q?AL[?0<?{??J?rN9?YQ?-??????I?Q??R&?+?H
???Q?\I?!?^???LPW?Hr?bz??7!?+??+??,?"? ???"??b-?"+?+?b-?"???U?n????%????"~q???)b?!???U????Y5.S?,??Yn????^??E?r	S????? &?????T`?\p???
?=?5jJ?????2$?U*?-?m?7???S????j*7yjN?*??????2j?:???6u?1?Y;?}e\??Z?m??n5?t+???8?c??O+?a?XO
??H??JN?	9??v+??k?????k?jk??k??Y?r?9%???4'????E?????? +?????U?U????M???jQz??
?a?
??????]%W
?j?|???Pa(!q???|???v?0n??
?? DA ? L?B?0C?0F@?O?GLCD?pD??DHT?I??5|BK??L4?L?B?B??O??c?5?B/??S???Qpq/??kJ/??.?B1??1?q1???h*??m*U??&m?v.	?U-Wq.????T????Y???	6?? 	???????v?s42??]"G?????vn'?m(??$32(??(?'K2*?1(?.%;???2)?2,?r??,??_(F
????!?0 
?v(h1oqr??5
??V??549L??*??
pZ?/4???SzZO?
??
ws7?8??b?:??<?s;???p!?p
;?	?0??:Bt ??tWF,?
3q5?X?nEl?Hl?m??H<9r[1P?4??=rk??7?/??L?/??.?????p??/????%S?<_8?????<???????k ?I>`???T?u%?o?Y???????z???<=2????Y?N?6?q^??w???N???U?kR?-Iv??!?~??????^?H?
?!V?!2?_5??P!????b?0bH?	S,0?+Y?t?fL?096L??#3?
??Ti?e??"S6CI?%?d,??)?????#???'??Ry?L?5??????J?*??j#jmkv%??V????uj?U?t????%[?o?r??l_?C3z?.??%s??????~~<?
?)?N??'~???K????w?6uJb??V????p????W?????????n????
???s?.??C??c???? ????<,+??*?
3??2??????
'??????!?,C0??
??c?!m)??????jO9???)5?k?????,+<?tj?????????\????M?Xb?
?\??6i??7?t??:???<????>??
d????n??C??Q+?,*?[?2HC???	?*????kj?G?bn%,?
)?L??rL?B?B?U?J?D#2u&?j
?!Y{????&?Rj??aJ?
]tq&
l?????J8K_??W<?`(D?{??c!???lW??;??#??gf????(3"??w=??i[??y??M??F?el
?e????
?????)??|?????3?????2(!l+?
w?RW?/Zy?\????X??o
?b????3?/?_?"p??MS?
??/??p?q?R!W????q[%????}j?P???Q??1???q???Y??D?qm?i[4??m? ??!??$H???''??IH/???9?.????SgZ?!d???1???
??????RC?
????
???1?
o?n
)???E???fX???????\?ABij???.??l???Z?\?#?E???^? ???????r?t
?L?n#??????rg4?? ?]?P]ZA4?-?h,?D?:*?fe???Wn?@?s??D??B????|?? 	???w??Q?P???Rr?=.?/??ht???BE?."QUL8<????!Z0???T??A???~?$?.??paFx?]L?$N?5?A?P???!??\???E????
?	K?|????s^????????#WIUP??BK??&??
?&k?"??????Q?r?D???kx?^z?CT
???C.E+?&R~??$'???GY~B?????a?.\??JX??P
e`?3/?/???3???????$8%??2
'zdp?qM?T"&u"Js?
h@t`
h???:#???B&33TB???y??jR?0>?nc??'?S??}??
??V?R??)????3$??VcY??q??f?Yf???HQ"?Z????s????1?/F?K?[
?^I????%!??[NI?"H?*F>?p!mER????TCYf?$?0?$uh?N??????M4?Mp?
???A?As9W4???????B?*??t?gG?-T????F'g2iY????^??BXb?rv????|?/cM?;
u)?r??FKu?????kv?O?R????F.^?2*P??Lmu<b_??*&"%??$=""?w#p??tf&?g+????QiS????(T?4A?!z? J???U????
????K???*?? X???~6Xq??p?^?Q??qv???|???{?7&Z?*
?*??w?
??v?s{1?????????hy	?4?c?e??s(???T?xQxz??V???l??f??t"j?GGl:??Y?49?C9x6?B5?8K?8?-?+????^??U?%|jm??v
?!?????~KK$
?q??,?R?r?

0?0??.????K-?S_????\??
;;Ft?2$?jw??????e?J;???t???z??=??? ???Q?15?X???5???/q?R;??e??0?93???-/??~???c ?
?	{???	K?????????ne???????	Lj?{.?E?8*?D<O??
????H?`??F2???)?A?BD??4dt????(-v-?pE2?Q?Q?j?y?BZ3?}/|??????????b?PI*?/??1k??I????p??_
$b???0D!"L2?1?,?0?p??4&?@m ???C?>???!-s??4?D?w_?Z+^)"?Ix?s?2?"??E??#?b?#,/<??x4
? ??_???	???g?????E?"????d???	bG?J?????&"??PD^\?-??O`3@Y??Rd<#-&{??!??n?xG???MB?????*V?fli???$?????y1????^}-QU0??I?"e<*H??!?Y? ???p??X???P ?????&?b?I?3????????[Xy?#??b?e???J?1[&Nce?" ?h??!???em
??*]Z????&n?hB?A0)???)i????%??n?=JF?
0??_?3j3?zSL?V??[???
?6
tsE?j-?????Kc??n??
?0????z&?>?<Tq?3@'UU?5?
[a?
?;R??y???<)??&"???H?
n!H$?0W??"?T2*?/W?
??PA0
?uU?8,A?Q?
?'`?tU?
Vcx??{ &!?A?fjQ1#na ?^?R?&
7Q??g??c1q????&???
?h???7?0Y?xy
~??=?a?~??0c? <J?O?a=3???m F?1??F??)QGha??s?*P?*d?p?-?B9u?i2X?1???]?SA!sC3?x??r5g?5A?UUI??J?:57UX.?r?1??Cy?????+1?+?!?a7??
RDB?V?
????@?d???+?3@!?ad?1?	?,?OA???qA??e?+
?Fa???>??X??Z?sR??] #L?A8?Y?y!^?F6?2???~6j?=$?#?K??*??li6? ^? P'?%:??p?Ue???1?`R??2CU\?i6?4j???+?iR?? ?N?@0??4?
???	l
?pA1????mT\)cd?2??d?
yY????????PS??J3(
?
?c6??/`?E3b???N???B??36jR?+S???@??e?}?/3s?I?&wHw?1?0??G9?Os?
?!"B?#??%Q;?YI-?'?*??7:)R?????3?jA5:??AA?I?20?g
??>C??!?b!`#???+@???i$??????	?FZ??4?0D'??d?y?
<`?}?4sx3BF?????J8T?
??)?K_???????????+R?{HS-??r?????S??S?k?`XA/g0C?r?\
S??????&w?Ow8ft5?u2?!????)????[Av?&??}???co??!?
??!??tS?W?qA)?H1}??:??*1YD?G`??b???r??{G??_!?1?,?)g??)??????5{&!????	q??r?i??Iq8?(2'?%????b??~Fb??
??~~?z.aq?? ?
?9??S??????!

???*1??IQ?I?w??BT????\j? ?
&?-s,3?P??a]v1HY?^a0?
Eq??RC?
?E?"?HG?i?c????W9dKa.?1D1?.????G'???
?w????? Y/~?!?sV??8??Z?0???]^????????H???
>?????E?M?h???J??|???1??????0d
?^????	?"??!o?$?0?<?	~?,??.?/?0??)?????
?/8_HK?%????rf??Ag?t??;?????{???
c?D?0#?)?G	?]??/???3??Po????????????<Y?????G???<?????b1t??\??2???z?.?,??%HN?????jp?e??1??/??S???????co???1???
?O_X?.?R?e?x???]???Z????????O?2x?I??O????W??h??]????????l/??t??y?A?????g????_?r?????!?????????9Z?????P?????/I?oA???:???
?:??A?`!

Zv#???f?k?cP?Y?????X?p?v}??ff?3???{W???y	???6*Z??%???R?????&??W"???13?	?????K6???a??{???[???????
;t_??w???/o??C7_>??c??o?=????????.?y?????b?r?)????i??????dR????? ???ehr(?;?!?Z????*???Sd?B?Zq?]??D??1GulF?dn
?$e?*$_?Q??4i?&q<	-?nr??Y~LL?*
??n?r???:?6?~?????bs??l??7??j??????<?l??X?sO9{??2?tO?????9!????J?H???ag$??h5??h??~?]????????l\?5?Wg???Ze??Xc?u?^w??W`???\_???di??Yd??
??????<)??[?
???W??n??\?
?L?@	???	??C???6?
?????,.h??R
$??GO??\ed#
?
???dne???<T?q
nC	U?????\?<??(OIQuZ?B?&s???-??\?$7?!??Y?k?
V+#F?3??Cq???Q`??
?@K@??????Y???
?
?X?W
@%
Ec?,????=U???CtT???C%??b?
???
??&?aN?.aF?>a???a?????a???a???? &??F?#6b%n?"Nb(&?????K+?
???-v-.??.?/?9?b2c3?+>c5N?,F?7fc8v?8??9??2?c<??5??6????c@??@&?A6d9dD.dE>?<^dGn?>f?I?dJ??J??K??D?dN???G??H?dO??5?SF?TV?Uf?Vv?W??X??Y??Z??[??\??]??^??_????a&?b6?cF?dV?eNe?#<?p???????'$?i?fg????f????fj?fi?fr??q?fkgsVgt^?t?fw??r?gn??s??w??{n?|??x???????g?h??g?.??>h?Nh???~h??h?n???h??h?gt6k6<????&B?&?*4?),??F??>i?6?K???v?????????i????N???i?????i????????&j?F?????j?^??~j?f?????????j????k??????? 	??fzfk?v????q?@4?
?pP=????P?Gh?Mp?384xx??????????????????????????'??7??G??W??g??w????????7?M8?F?P???d?Z???R?
???~?(A??X4h?8X5?5P?5??????z?_?????????'??7??G??W??g??w???????????????????????????(P1?V?rp?4e??r??4??Vl???H?E8?8
T????	6?(p??0?????Y???j}Df2???)K??2?G?-_?l	?eMd7U???r??b?1K????5["d??)??R?FH?*??Z?r???+??b?Z+? ??X??Uk?-??r???k?n?-?????(??????iJ?&?L????F??Q???D?b?~???3W?[E?mkz?????He??m??w?p??? Z?U??????U?T?O%?5???w3???E?}?S,dM??
?6t?v???5??w????Ujrr?/???Vk?????33d??????
?_SX`?
.???:8`?Fa?
Rx?~]???_l1?\lqfw?q??y??gx??6??? ?????????C=????C^(??	"9??E&???LBy??2????=?t????u:}t^c^???N??T???UL:?Pf?M???u.?g?|??y?Y???T??
?#??
?T???3i6?js)6?u?6?f??)?;z??4?r?VK???|??\????????j(??yk???j'????+?Y?z?T[??Od???v?%C?e>v?z8m7?u??Dm?3u;?1?}??"n4??|9???fSz?n???????I+??????V????
??o[h?
=?P?}qG2M6?|
??VQ???"?Z??????"?"`?
q?
?X
<?
???6 ???Q+?aQD^???@P?????5?
?6??I%?)?M?tHDF+&?)F1?????#]???4?)?y?3U?j6~??H]1T_ ????B-V???g?T??Z?6??ek"???x?
??j?-?lD?	??zy?(&??&=)J?i?-?????0\?????:???8s???M&7?I??)?????H?*328??_?
T????BuQT?jU????j??\??W?
??$3G?XYV4:J??g_???Q?BX?r?? =a?R????F-eE.3?>C?5? D?^?9/??Z?X!????E?QA?jS?%U???v??=?iS??????/??>`*SdT?}6q? 9&??G?3??`????M?s?R???2????T????,"???"(?????a?;!???[n???h at q???S?z
?&?L???tX?ji??????`Se$??@)????j?)<???N????R%FI?N????Ia?0???9???$>??Slb?8V????Z?????Y??z?'"{???	2?["?z`?~?/vJ??(?"??T?D???????????C"*?F???"^1?[?f?9?m^??????q??n?V?~???f\`R???(??8?&?@J???2???v&[D??;<???J??l?J=#`VV??	???>?I?r??C? J#?\??oM???TH????BC??hT??'????r???3F?\??#?????g5??
sQX[?xp??i?3????6?w^??E&?t?&?`??IF?>??%??|???????
????
?8?n??3|?W8???K??_??RD?o??
?+?\????=??N??$???,T_9?@?????????os??_|?>???{????A?:??n??'?rv??K?Ab<?lk????w?tr?9L??q?G4b??????????n;??.?????v?;??????}?p??6??v???s?<???????Ri???/y??h??}?3???s????<?C???CD??????T???c????b????
(?????/??????{?~?/??>?/|????G?????|??????????H????>???}?X_???~??O}?G????>??~????7???~?o??????_??? ?=?
?>?????K- ?"`?I`???????F`??N?K_?-??`
??	r?z?
6 ??`?-??????y?`??
? ???
????????!??.!>???_??B!^!f??C2a???
>??<?C??MY??????N?!????[??D18C1?<??7?xC:?a ?? n??!C"n6?!b: b"F?#6?$2"$b#"%V"'b?'b(&b&v?%v?'j"(?*??&?b'?b+N?,??#??(?")??)?b*?"/??-?"*??N?2:"!n?'~b F?$?*>c5*?4?"!2?2V?&#(? ??0^c%?b+R# F?1?4??&
"-zc4n?92?;??$??9??=?c=??*??@?<??A??5$B??B??A?c,?c.?????yK???aTK??u?qQ?L?:??b???c??w?p??K???d?pM??M?dM??N?$O??v?$P??N?dP??P?dR?$O?Q%Q?$S?Ya,?M??J??JVeT?dT~?Mr%S*%??[S?SN?Y???????[^?m????e9??[?OZ??]?e[?e]?_?]?eO????J8?L8K?
??N??"e?rh?z(?~??.?O???~?S?(X??Y???????h???????????hcT?T??r(????N"i?)?)M)??%???z??L??`(hM ?I???(vh^?YVGKr??????)?????)?????)?????)?????)?????WN?3@?l??Gn?erdH?_xK!k&??u?JP*2??IX*?^jJhj?vjIx???j`xj?????*`?*??j??*P??????????*?????D?????j??????????j?fj????*??"+?B+?>???*?
k?:+????jk????~k?zk?B??^???*???????????+?????*??k??????????c?'?f?K??M?n???	RH???.???{D(u????f,?*???????zl????>i?????2jy??W??,????2C3pK???8uKw(??????e?E???1????Gg690?/??M
??j%ah%?Z?N??V0?m????N???-m?M{?TRnP?Zy43?T?N?ELQ??T-0D??Zm{?m???n?dm?*C{???*?
????????.???1??????~??u?????.?o???n?z??Mo????Z?????.????V??jo?r[?v??C??/m1ouD???-??m?bn???3???????M??o???~??^/??o?n/?F???/??????P?/3??.??3?B?n???'?yd?????^??z????61
?#H??2?i?,??B?6d?h	??C?,??A??d?A????A??&?:???N??Yq?h????j???F?Q?Qk?!Ek>?FSRH??N5?f?UH
eiJ?f?P?"%?U???Uz??[????^????]??5?^r???c|??n|!'"V^	??cr????|??.???6?w?i??a?R??bJ
?kCs%?b???Y?\yFv?Q?wt?g??9??at??c?a??{sy?]?e???z??fR?c?b??w???c_?a??bXN?c?yV\>i,wF??v?i??fZ?????????x??u??c??y?d?Q???\??y?
?b???Y??!????w??}?w???i?`].?H?w?!??w???%s?:????1??yX9???
?'??
????
@???<?,????????????S/??????c"S?\=o]?^???"'?@?,?
	????(?
??h
?
9DFJ?
??B.0$!I
???<>	z
 


?????C??7?a
?@B?D/z9??B?u?r?b<F1Z????8o
?pQ2?E?db?w}@?r!?pC+?EFg????????1D1Kv??B)?f?
?pL(?Ho
???W??3??9?!
???B??zD???$
O~z?P?ZJ?}j
($@D?)R??????N??m?b???w?3
e?0?Vj??R????O?A?R:1?? zr\c?c-?1E????4l|???W`?#(???????
n?????C?$?;???Z ?D??/?e?BiC(?R??L??4??/?}A[a?v:??Ef??????????k??]O+???y???????

e??`??????0?p??	
????I??c??2?????;@N??,?Z"?
?`?????`???DL$G?
?
? ???L?`1??Js0	?M
?L?
K?, ??<?8?W?r??@?,??,??F?u??ry??xDF?{??G? ??? 2?
]?1?R?)O'*yRA?C
E
?T?2???v?0?#?J?Ro.??##8??!??z???!???W{?!?!|????z?az??z?????A|?????7|???|??
?
|?W??7|?????W???A????!|??????????!????B??A?V??
J???X??A?R?<8f??U?=X??i?f/X??uX??????^A????
??%???dXA???<F?<???>^?q$?dzC*?#)?B=,Nfknr??:??7?#9PBuS?!???4*^F??h)"?}?$??&l?#????)?f
!?&2b:?)?0???v??y28?b3K)????^?60?;??)?????&??i??(?7h?i?FP??#??!C4+8n?"??-?-#??#D?lT?29
!??"?#??
?r6yy#$6R?p*kgvA?wa,?>?+WU(w?q?y<
?x?#u??xcu<?Y>??r?5??
??v???=?s??????O??????l?#(?c??|???#???l?1?i????|??|???@V0?i?oLTC?t?V?????i?)????<?KN??	?????u$?;???y?klR??U?|????g???R??	[\?P?ZnOl?;\???,????k?*??????????#0????a??j?+5U????y??!}<h?[???????????\??=??y????|???????}?????+???-5S???^lS?y???>?y?:?qLy?Y?O????u??r?;?I??[???i}?u?????Y?qn???|?|??????^??C?????}?3??!?????QL?=???]
";??Q?	???fn?q#
]???<V??3??
??????"|?IL??C?yh???A)Hf?=??Y???H????????>????w??h???>??>???w??????^?????????p@?5?=
????t`?@ ?C.??I?{???V?\?}????9??????q|?"~????W????u??s???;?sT?????????]?x]?i?+??????????U%<??c??c?G?2??j
?I??G??????????>6K????o??Z???^?l[?z?
????d??-?????i?
?
?-?????NU?l???b?(
?
???|#?5U??????M=?~3
=]?*?]?????WE?>?N?2??7t??1??????????76?dK??
U+h?<? oT??1G????J"?"?7F??P?#???M?	5????^E???b<?U"n?k?U???!??n?eGd??o?x?.<?????s ?????d???_??\k??l\?f?z??5)AS????V???J??v?x????.?-??L??Y_;.G??????Z??d6?d!G?J????cB?rD??G?yf]
`?5????D??`?L?\?L???2??Q?????(????
?c
??>???m???Gi?5?)???2\??V0?13Ww???O?i?????(??U$3UW^U?B??p?
Wu???
?'!f???R???c?D??W???4????????V??H?~????L?
BhEVm~??????$?(P??F	?8 ??V^?Or?????]??pj_??>???A???j??Y?????7??`{??.?????d?+{?^?2t?Z?<???????OZF~?%?Z???J-?W*u???SI?&??DUt?F?(???N??h???????I*	?F?8?+???,??87??mo??R??
?SCHt?(KD_[?o?oU:??&??p???r_??+Gy1?
????/?y?i~s????.???m.s???3???^s???</??u?
d8?H?$?R4_EV?????Q*???v?L?L8??-?IhSx???J?v??=?m*G<?T`?y?K?]?oo?Y?|?E??rM????{?}v?E?(??m??>Y???	?0i}?H?????%S?pDq?????????kx????t???n??p???o)????u????>?2ZL2t
]??0?1oPI?????u???Bv???&??c?-"z?]hz??X-????????}y?(?a?@???yEHY?ZJsh?j?&y?n?A~gXnVhx&kn?#??M??????0wK?QI?KVS?A$?QV7?R????????'???!?'(0????0IU?*Xu??I%?mS?vK	?,Hs?G$??Yb?`?9??)?a?Q???6?Vw??b??J+dr>_rg?6I??a!?Aw#Z???Q??q%om?X,X??.?g??cn??X?R/ZgS?!??T?
?tX???.1????`?nY?.!TP9?m??"?3>?OEQ46i???q??w??
????6??-??B4FXtf,?c??R????$w?aQF???qg?Qq??yF?_?Q??h??gURKC607{?0??
????????Tw?_#P?
?I?]2?_?z	Y???????D?I???,@???h???u??A?H?n?dm?X???b?6???????{wv????q????i&?7ZH5??S?!?(,?????l?H7H?d$_??CBB??+??;?G??????s?g?a+vA?ei?a??H?0kY|`)??7?m??n?hY?u?1X?]?b}?A??uxt?_????WJr(z???q?GB?6????p???sp?&~?[??J?C+??"???%;5w
g+iH?????y?uI??X??8?~?c?!gj?????(?!C????A.Zbzr??S?x0???(??I??I??O??9????????????5????
G?^?~??_35???%j???
H??i??h?????9?Ab	u#?o|y???@zn?4%??H??{g?8??~?>???
?#j?2Z?6???={E?K=j?C*b=J?:j?Ij?*??4?7??Q?;??Fh?9??>??N*?\??/*?#Z?Pz?Y??A?^??D?VJ?a
?hJ?\??vJ?ljdr?
???????zO?z????????
??
????????????????????zK?*???????????z????:???????????:?????*???

???a??QO
??2???%{.=zud??%?^?:\?t?R??y????_???/x??????;??????|
4?@CL??Bd??B"$B

dB@???A
	?d?qDK?f?i??hX\q???(????F??!???@?? mrWi??]??e?kV1f??r?I??z1?,y?FK^????b?
?K??{j?a?qnM6?t?M8??sN:?\;??sO>?|O???@???C?SQ?]Q=%??<?q?v?
?:??K?f??.?Z????ux?>/???>/??U=???b=???`?	??b?Y?????????
P??`?5+?	???I???????
?L@?
?P?4?M?}?"??Z$?U
?j??^0Z??&2?{?S`"?I*?Px0?J??	?\%F*?6h?&??IRja?r?1?Y?? ;F.N?1 R?e?A##KzR??T?+eiK?8H???T?3?iMmzS????9-? ?
*Q5:?(?T2?2&??v????h??X!???P?d!?a^??p?]e?ap?V9<??
N?
~*	
z
tUlD7?YYAC?@*	0??a???A4?YUn`
????W???
???<?5??u??PG	#?\??D'N??9?Q????E?/XH-?????i?H?v???']?
i?;????/!??R?????m?|9y^=?.????J?;^B??U??_?H4??v????
?>?v.;?v?\???ybE??P
]??;U?	i?
???4:??n??f?q
<?	????-??????%JZ????!???Mf???VT?1??G?r?^t?????!?t?;Q!r?{?/Oc?`W???>5???????????Ma??0?z?
vY?X??P??V/3>?o@
#?y???-?X?????????Le? ?c??a{
;f??bX?&???xe??Z
?????kP4p?`???Gp?Z!B??M???[9?j9F?????Y??"?????H$@????"?/??"?l??$)?L$3?K?J??TEl?)??E?K?b??@???,??;??q?N??'??/B??s/'b?U;0??\????.2?LT???F"
????1???<??c???`??(K???b?????????D?t?y&hYNi??j??????n??p?
??;??9?,q?:(?)??Q???D
i???h??	?????
??8??J??Jz???B\?\P?.Y9]???
??j?T3J?P?	m??$
}??$MO?E?L?????X?:uT@??u???gK??c??????c???L??R?5?W??3??
Fn??a??P1Rq?v0??T??
K??QFd??A??1?Y?;O???????)?m??i?!???];"G??f?@e?V??	?W`?r?9?4V??97
?cP??Ug?[?e???%?Z?SXCj?\?F?\L?EFTL?!E??$??mL_;?S???}0O??]\??F[D??]F	?E^?\#???M???:JQz=#?X?<??5L??????????
3?????y

](?o????["??????e?e??:??}?i??E*?????K???u?Zx`X???gP?%??????P?7"???0???M??U??A???.?????????Y??Q?5?1Z]?}???D#??\???)??
.?P??Z?a?b??
f?ULXkj?\'*QP"??d?=?????fC??Q?=?????????sD)t4???l?Vb8l1B??b?M?09Z??)v\?????s?Y?m?m0??Nm?^m?????~m?6m?>???m??m?~m??m??m??m??????>n?????Vh?o$L??j_??&$?tE????????`?? ?aV~`????????oQ??A2E;?\?????Qb??J"Zstlwu]r???.????5??$????o(???
F?O??-*?5"?f?J
??f
FX??NH??Sq???
N??T2???V%K-+?e?n??%n??_L??Wgy?t??4?g???X??(Q6dc0%?kp??cd9)V???
???[?Xi?&R???T????????K$!w??E?	gF
????B?k
9?2K2??8RFsN	c?&5?L???'%nB??%f???k\"Y??7??c~G??%a?e??????nK?z?0m???????|???fs?vh???*H?&7??d???????+??b???L.,??*4#??C*??}????W?*?I??+??????l????A???
0??C?_s???>q???[?Pv?^????b?M?O^??Sr??S?b???f?}??o?]??s????p???-?
??f?~I}???????L?$1_??I?^?????;1???paM???|-??????t???{VizQ&1?=?q???Jfa??VG?D?Jp????+??|L????Lpjn??L??s?[l\??e?fK???????A? 

gf??f<???\?\??'?
?:?E???v?:Z]???<C]??????=e??,}z|?2??R????<??O??$??!?????z????X??~????zT??(QwD2	??v??i????9L	VS????;uI37???2S?Q??$S?d???w?T????w????????iFr???h?tM1C??
??7?YF2??fr?H?hHB?K
h?EL(???V??)c#SB4W???3RA?t/(
?I???2b?????1?H?3Z?g?Bh????`&?Vt?$?
$?di?g?qc??PYU?4?#mR?5????1??4	?c????sFFlaH??#?]5????;?0?r$?+Q+??#}?>F[??`???'???^S#??"?j?=?;??<?n?HT???15?2+
\?&????/?A?B
?????N?\???c1??e^?E
?????e???/?4E?k?R+?+??3???A?6=?(?C|q?c?B"??c3&??G?B?x+@??[?
????W?S0???y?KH[?
{@?;??
???o???????????_???T
?????)1Jp
y?
??s	???????
+?????
*??%?;?
?1R?/l????2?o?%jG??+P_.X]???
@?8?TB?P????n
?/??z?????@?????6?i???	???U?@??]???n8?;?W;?]???Z\A??????I???????r????}?9?gE?h<%????O??n!C???_)?B
??g?t
,?? at?Bo?2|?L?i
j????0?y*3?c*??vj??9uI`4Q0U?X5??GK?<v??Lj? kB???P????AOl?@j?:??hi^????_<?<????????BZ~O??Q??z?0`?Q	??Z??????????R?

?RD??,5?G???@??b??c??/4?3??0m?:?i=m?J??b??>?
???????/??f???IA??\U?Ol?A???HH?`=R?a?d?B+??)
??
??
????X?D!S?Wh????<C<?C<??9??9?C9?1C0?D?|??Fv?}????4??EO??Mg?0???c$??rN??p9????g>o?R??z?c.?????
??z??	?:*[/{`???Ae??-&[G?:??o????-yP?0?{$ 0?I?.??1?H?????EJY???=
%R+?
???
?o
?@
?z?x?G????3?BKX2??
?@?v?H?
4
?@???P??/?t9|*p?0lr0C90#??iF???.????u????????q???2????b???*F?y??<
	?????W;???c\???p?S??]???????`?:r]???j????l?????AD??3?B??C?
??(???y???J???eGD?gkjS)?),CFX?;??"m??[\?7?????@?LP"???
0@???
?q??
G??l????cHQ??;1P~?S>??/?B'
9$f?Oi??y?}???\?k6???7ru???????#S?*!@r??`5????v<?????{????":??w7:
???????F?? ?Is????Qk???lHQ?E???-??????hO???h???G??	t????9?1?<ISC2d?4(?Y3`&k6P?1o
? ??f??M*??R?j??-?Z?t???z?????&M??p??x{U??mX?????,?a?]?~???Ab	Sf9?0
4???K3
?j??:"?O??2?J??`D??!??q???????vL? ????4??4rL??4??.?+3+/??H?d4??????H+?"j;f?Q????*??
?,hf?A?T?E???.???ZP	>?/???0!=?Q2?-??vg?k?3?:??B??L.???????>?pA?m/?a?2?gsl2?????^?c?Rl????1=??s?C?!n??$?????G?dW}??B]???,??!g?3???T?:N?gZ32??:ff;g?%??'?<?,?3G???z?'?Or??;q??Z?????w???USc??<}?i?????.??Y??>?/2???6E???*{???????eI`AL?.?90{!f?????.???????????;?e?@???l??S??????}??????b???NRXw????b??????i?xE??2B(9??{???9??3hl??E??9??;???v?%???owJ??B?%
>
?@? ?????!Lu5#T???m/????7??????]h?????t?,???A?qbT?UDW?Q?0??t?A>.*????n?(8?Mp????????u?Z[]W7<?/?B???~????\`Ia?^#??!f?????{?u?l*,+??V/??.??sw?B`/??>????Y	C)?|?!??????U?Nq?T(o?$'21[?R??&<??u$#\T???x^?@Z????O??2`??(?vD?
??n???0??1??3?dRD???@\??>r??p??]??xP??????q*????[|?)?*I@??0j~TY?%??6):???	??
F????;*????07?e???~I|?cb?Ss?1?W??E?????W3q($L???LR??6;??>???3(???)??40?\?1?9BI0?<-???5DV??9mZP[??<?-???m.f??*?Q?C?$?G3?fvMl
?J?"??>???+D??s?o]'BI?? ??l???????9???????(9?=:????aX?*/????p???]?^)5?tU?????Q5R?a??4?????R^?$?~?????r_????i?
9?BV??????;?
?8???Rz????>?F?Y?^"	??`n??Y????V?)?4??b???G=????F?V$??~?2Z?c??8?? ?l???
o??Y???"%5??!F&????T\2rn?&(g?F?`???,??V?????&I[Z?
?]:$So?d?&?4F?J?KO???
?2?u!2?
???Ei??i(S?33??XU^?#??!|????I?V????.???u%????f?h??,Z\?C?3?q?f@??xF?O[?ZF=?H???
??G???Zj???4??`E????$>?(??v2to#v?L?#???-??G?]?;\????x?????yY???T???3*~?>??`????o?.????S??*???????%>?%???s?????_??J??i?? je?????C?
fHG!QF?b?9
QF#
???e?????o???????$?Q0U?.2???
ugt?Jq??d???????
???
k?
????M?Q?P??!
ap???gL??
?
?XC?C?
 ???Z?%??-?S?
?C
?A???vX}?i9?(;?(????S??\?a^s.
?d
??O?	i?u
????????????B??nP???s-?????????\????u
RT??????
*]!l*.?,hh?h@??l????y
??5??,??S1??cF=?8-?????#???q??|?G/?M??R
Q??Y=Y0???)???7hj:?$??l|`?(??kY[!*uhB??"E?
???????h??5??????,?$uM?R?X?l???0b0l@?b?X????s?T?e??z?!t??!???L???9??xtF??YC9HRU?A?`??N???Oj?m???(t????m????^R???????]?????C???:?"hFf:?!?*?d~Uj:?o?6????=9Z????u U??]?h????v}-RB??&K?d?(?
ff???;f;?
?W???o??~:???>????hJ?g?
I?z?c?
gK??vt?l9Z???A??\? ?
?%??b??1s??a??
cV?3d-:??
Y?f??9{?
??
slWV?
/??8p?X?W?!s????%^U???E?k????(??Z
F?O????3???J3??2?
S?.?N??3?U"F?	??A?Y??F????3??QT???+T?`?kyD,NT??P??=?T??fW?n?j)?
2????3?????8?V?l??b?@?1?L?????j?N?[??=*??????*N???y???,?53??y????????w?{r?>?_-:?????, 3???hO???????V??w2????!0????^?I$?;?}???T??X2L?????????????3+??W??Rq?????????R?%?6N?IDF????/?YDl?I??????Llo??N?f8?QF??????o?.??
3??i??$
k?1
5?????&???EI??I@??N7>/T2"??*????L
?J?s????0??N??????n?:?3?u:g
??0????$?j?O?x???%#$?*?YH??l?)&%?P3v?.???W	;][8???m\?(F2??'???W?4U????V kg????[M?"????Z??+.h<c?c??
W?? ??9????{?dcc1?`?????iKRb'?
-?R??r????XK}!_?c.???`?CuE?@??F?????lI?-|??D?y??F???????T?<?1?x?n%
?x??c?????3??-??U?????Tw??5)F+?????E?2)?&r?1?`? F?1??yK1??Q?V?kQ? k"	0?*?????8?+?RK??x????R???'V?ET???\h???V??????C5?G.??^????0Zl??_???{G???*??J!@9pN4??f?D?????
???-?L?
5?$]??L?????P?9?F?BM?????Q??c?N??<??????
???#?t????W?>??Y??Bc
~??H?m^G??<!E??K?&~?v??????M9J?C???.|a?'^I

?Au??????s?>?v$???A8?m??X?????H????p??
?RAl[?i??H?!?6??
?ElR!7??
a^??*???p
??jVkRu?v?????F??
s!?`?????p???U?6!x????Y6?qw$??i?\;??????8?
????6???&?]

?

?}??'{xS?Ul]?PgA?z?????(~Zo??
!Zn???0g8>B"
??Y?Wu??Q?	?n?bW???Z??	?aq?v??(?FV?i??%?&W?@u??l??q?
Fd?? nd&E??
?e=????o{Qxg:?j??? ???,?t?am<?K?&|?q???(?BC??&?~~[??|?v(??ky???~iq?g?g?j'?3?1P???4?
??0?(Hc(?*"&94e?[?8q:?p?F?%?!X2QW?$Va???^?0S	?]????&?U%8??
?R?UW?U??[?
2 ?;??@y?_c/g?L?!?yU-?V^
??1??????P~jX~?
????U*??j{?E??!J}??-?r?+?q?@5A$!?!_1<?@B?%?a.itW??^5?x??&??#CB!?jd>u7z1
5???+??Y???uf??!X?Qe??![R??q.????,I1??a
?5?54?1<?
_<???P}?
??
???"`?]>?aA[?Uo?
??*?*
qE???? ?P???????w?3(?
L?Q W4R?7g?3aK??z??}P???Q???*?R?? ??\,?Z?R?t<$	?f,????Qa?!?q+???
(???O??R?????3w??
??sP??<5M?;?u?Gm?#)bz&?Y???<&?}B?a????r??1&?????U???]?Pj???2}?"?+?"?5B%???B??U!?~*~*???X?Q+m=v?'a?
??a4v???&D?_?????T|e??,(Fj??????J?c8Q-F?O't?R??-:?'L??FAju????W]L?rn1?b??u?C????L???D76?B(?*?}-??U????QG?-?@M??c??'?a)??
]?c!H1??bI@^"?qr!V??R?????i??*?? ??=????"????????	??I???Ru:?????*??,??C{?!Q?`?j;O?C
??????????<)(a9='n?~f??????S?Y??"???,?(qG???GG?1?
?
RkXp??k? ?R>].2D??Rl$Y(?{?a1??^Q???2?????\CC???g_???E
BE}?? ?-;?-8QW\?? A?U?:?&?X/??:?*AT?NH?6?ua???o????	!Ml?U?$?iv??'
{A?7$q]?????e??
:????i????%???{?U????b?)?????wNi?>eF??1^?Cf??bE
???I:W??J_??\,???
??~X?
@???????a?M?{???}?s??6?lF0?a?
?lX??pb???t*\?Dtan??vX??x??/C????[8??c?e??wIi}???h??^
??{D?@r
Io`?1?a??T?^???d???U?]?d?Je+?|"U?BP???K,???\????4?HB\
++Qb?U=,?vE[T?VKb?j}?2?h?.P???~dF?[f?X?%?m?`?A..??2K???^6?-!?eNY`?Itz?7?P?????W?1???k????b
[????V?~
??6??/A?k^?V?
;?-???????[h?B??V????q ?yet!gX??c?a*p?oa??????"hbO?????!?g?F???
??????s???z?????`?9?yr?.???xs,??8@??????/yv>?|,????????Y??????W?URU??' NX??TcWYu?Kv?j?|pYm?5??O+
?p????^?L?f3S?"Qq9????????
^??A???G?A?A??V?????1??v8
!??Vh????b?@??p???@??*?0?0%????
?1?
????Bj????(??p???
R?@\??????S???x?PY?`??-? Z?
??K{?xJ?a????8??[{K??	s???????????1?7?CW at AwP???yx??
=<?)??|?xB?x?@|???:?a?x!d??z=???Vp???wx?y??^????M???(?@A??W?
_??v??
q??????y? ?????
?C?Qk?????/??*Z?>???????????F????H??X?X?
??????Tk*???????0?$????c???
??????????q
?Td1???h?ryW?<??%??H?(??>]?	?Q?V??U?9??????@???
g??@???L9?SY??$C?L
.??ABA2KBK? ?9?x??\
N?L???4??Cq?????`?$??????Df2F??K?????????=??t???@>????*?l?+?lG???????Nu<	g??^YG?P>m? ??? ??`5???!?l*q????-rOu????G?xOO#P???4U?U???N?j???	?????5P?P???
5v?u??J??rL????q???*>?? ?????U?	??o????Q?xP?(?a0?????>tl?HC?wl>=P?????%??)e?Y1 uR*???EQ?
????R???
5????JK?MR*???W???GL??0S??VY?X?R???5Tc??n$T?I??,?P(m?M??	?T?TG?s?'u>%O?+Q??R?????S
?>I5gyOZ??p??P?	???????F????T U???(?<e??sS"u?Bu?T?R?-?NE?Vm	P??7?T6%??	qE?-?4s?U-?TjWDeGb?E?TF??Oz?W]??????4?r???>??OnU?J?????	?!{?V????P
`?&XQ?Y5?$???Q?Gs????m?-?F??????2?~\T
??UgU??r???n?4?`SKsG???xd?iO?l?I+EY?$????u?C?W
?yPp?>??+?3?V?X%Q??V?US?[??e???T??QSuP|]Wwu???}:?4q??UXm=\^% ?????[?u?
S??W=?Q?e?m$Y|e?'??o?-?????U????Z?*???z:T<?
e
???p?s???e?
?FUe]????=?^???tZd?Y?k??MG?4??]????5??]R?=>???nm??]j?T}%?T??????>n?Fr?\?O?]??U?'m?f%Wm??uOdy??x	?O??J.?????M?g!+?\?U??%??EP??*?m?0??K;5}??????R#Rv???5?
?~?=??]??U???Yu???%a?????`Z?]??Or?U?=YV	=S??a???"??&.???????P[???^?-??E???5?@??5??[?c?dh?eh?dp?
?:T??W[?eHf?d8
?=?M*?dX`????g f?hc
t??fW?pQ?
5??b'v?J??EO???e?pD_h??M???W?ugI??*P????}[f????? ?x???bV??K`0F???V??f??v?????n??
???????i???725??????"????"Ai?~??? `???p?K???jY:?T?S?????
???(b??4?g???5?
?E??n?]???a??a?????UY?1_?6["&O???Y??
??{[???`5k?S
?Q?$?W????P?????0z
?qz?q w?
?????"??#q#??p
?tV???PmXml???c????S??m'????\?pR?u!???p?wOuz??I??s?w!??Z'?t??J/?J?M?N?j?t
?
?M
r7]s?A?w?Y?*2?!+x?y?????k???7???{???)?,???k???r
?'}?Y??u????\3?
??0F?-u
????? pY????????=?7"?P"????1?lzl!H;?1O
2O??a?D???(Q?J?^R?U?1?aJ??????
^???r??,?d+@?*?(??u?V???vu???U?2???s??@?r??r?3FdEt????????'zk????b???l?;$WaK??i?????MH5?A8?r?|h/
KK?bMV?1w1?L?N??/??Y\8???? $kH
??"??@? ??
R??\?b#s%5?????},??>?????	1#??]?????r ??
2???Q?@
R"r??ADQ
?Q
sD(??c+"J??1
?I*?u[??$?$i?(g??XI<d?G?(E???j??b??4?????C????9k???'???kUy?c??92?
W????l?S?`	g??r?GY?R????oD)N?? ?8?X?8
??????A??c1Ds?
??+"?&A????%???,?????Z?Y??l ??c??c3???/~4??Mp???0ceRK?,?D???lq?Q?$I?dFh?q????2f?N?PU?::??cE??^????*Mi?9?]???lM0?????go	I????h???V??
?47??????A~?%,?zk???m?R??*???Zpe?Q?2??:?y\???V
?????(???Gp?? ?
R?????Jj1???\l???F`?????m???+S"I?u4E?{??????$????,?
v?=?p1|

??_??D??=???a??$???1????Vv
NH?i????sN?s???Y????&?8eH(?XF"???.x?f4?p???a*???????*=?
?s????4?\L
-zr??'????0?_??#?????z??SF?.^'?k/???]4???9|?i????tO??3??_????`??9?????????}w_??????0??w??????9r?Zrh~???;??.??????>}????n?n<????M{???v;/??x?CT?x?3X?d???n??!w??.??z8?lU?TY?5?\u???jZ???	? ?J<AGO?Yg2_6??#GK???????	??	H0O???i|?+??,HR1Cl???8???>??4`?M E`?\b??I?F ??id`&`m<?6??????-??;??3?Bt?D???? ?Y??my?\???h??aG
?y??n???9?zqI
!K???=??)?a~??2??3,C+?F???pQ??????????!a?mwq\?F????_???it?????@!A???P?u?i
?
s0b.^?/"?/>a??"1?"??1a""?p9aJ1]?%?yH?m]sc^!i`]6b?q??(:R??"
?a?A#(>?}?5??"#??qt8??j!??K4?c7F???0?#3??m`?;?????:?@&$/?"m$q?c7?c
j????A?D$'$?c??7?#=$&*?qa?J"]"?b9?VGr?>??9???=d???x
aY?e-??SZd-?e8J%[?K^V??Cb?8
?]N?]?%IA?bj?a??BreJ?%e??7b\?;J?fb!3f?<V?djac??c*????e??S??G?fiZ??fh?&G?%.??m?|0?0<?%?Yx?k??A?8j]5FNQ???e?s6?t2g?qNs?5?vV?r.gO??z}?r?
5f'?\?y??uF?xN?{??{??|z?o????gx??~??r?g???z?3?j????$??0?\-????B?-M??Fh#??
NhA?
v(?~(??????J(?vh?V??f(?j(???????z?
???f????z??nh??(??(????N?????h?????(?R(??f?Z??rh?R(????Z??"i??G?:????????????G??h??i?*??Z(2?h?r??B)*?)??)????????)?ji?
*?n??N?????)??i?*K?b,??_K1?????z?'?1????	???(???v???.]????????'?X????????J#i??*x?j~l???\???2)~?jQ???2+???%r??N???*?n?
RN??kC ??}*+=?0??j??F??????h????
??h??
?+??????????+???h??i
?Bl??`?-????V??v-??-??????~-?"[????"l?????????r??,?F??6??6?????V,??,?^???+?r??nl????Z.?:???`???g?1\?-??$??z9
??J/??o/?n0?p??/?0?/?????0?Z??n0?:??/K0?&0???np??o
70_??????0?????0wp??0?p?~??Ro?.????o?*???k??*1??.??0??
W??????s]?6C??J??!e?C???~Kv??(?9;3?a_o`??????T8????s ???J?aj?8w?0ckA+q??4?j?d???Y???-?3d??0W4v??<?gD??I?set?? ?=45??7?Qzps?%??????sNW?5?0?2?$???3??!M33C?*>??J_????1?Q????g?
????-?+<??d???H??QV?w1u????%?D?4G7M?4P???xt?g???D?????TU????Q??h?u????QK???=?J?m?G?Y<c?p??{?GQ6?t?J??tvT0C?l%??2??g?r???[?Fa?u,?U3?
???*?????8C?D?WR?6???%?u???2.?]TO?3?v?u?V7?]R5w??dp??N??J????
H?+?\??-r1?.?vK?Y??1q???}"?X??;?6??z?$~????@??n=?9?C??766t?rj?????N??t5?I?/o???FQY?3K????syX?p??B????J???M??O?.;?JQ"9??)5a?????w_v?Qh??`??U???oW?J?5U?Y?^w]?T?9??r?>1?g?|??m?7r!?J??t???p??R*5W??z7cm?????){???7pS+??9s???y?B?4L?Nt55?4_?Dy?}?D??f?????cx??6????
}??{?k?W???S??g??????
[??}???k??+{d\???zu?~???S"w????=y??????<H???O?*??????R??cNU9o??$<????c???{i?u??g?-???`???%^;N???8??}~Vg6???f_???*?G@
--- NEW FILE ---
GIF89ax
?

<!423<@&;C!8d

Jt?Q?G?&-???R?L?J?Ju?U?W?f????V?\??
Kv?Y?g??-???Z?l???Kw?]?w??????^?|?
Lx?a??'.???b??|?,?We??(c??YX???#??\?3?????>?Y?i??C_N?vk??Y?&??????u?[?k??eG??????C7??y???o??N}{??????O???p????w?????????>?u??????~y?????t??8?{	2??x?A?_
???????s?z??C??0???0???g??b?l?4?Ki??6g?M+???j????"7-e?X??e??k???M?/?].???????Kn????????????+n????????????o????Kf??K??2?.i?"??w?????o?s?l?????0?XL?.[z??H*????:???
/,2??????
????}K??????f?"??d
7L??#?/?|?,/?????G4?
???k?6??,??????l???p?q????j?????-d??+?#????????v-????$??y$???y???.:j??>Z?C??????>{??wn????????????^|????????;??;?<??_?+jd?"L6??1GO?q?T????????????????/????o?????>??~X????p~X??? 1??|\?? ?
fa? ???-?????HA+
T??? ????)???H?"?|??A~???`V?e?'Y??WU?xE,
??Z???????}??dL#?x?6???otc?P??Qen???-pA~? I?B???L?"??F:?????$Y??2?\???e4C??F4?1
jP#?@??P@V??le+??JX??????GMr?????/_	?_??????/???a?2	??)? ?*T?U(D3?Q?BL???????LVja???$+q)?a
?????!??Lkn!?%5????*X
?(?2? AY.??<&1[?Kt??W?F4?Y/?????&?QAV!???g4?Q?idA????$W??????0?)$??&X??p9??$^
???5R9>???E?f???+d!???<??B??1?H??i???Z?B)9?"???5?`?) ???(D???J?Q?B?
???
	G D5?
??*?c??J/yQ????a???{[??????B?0??B???t???.\??????X&???l??Z?B
?SH??OZ???@??)?}N	???b!??&;???\r!i
?j?#?????x?&]&Ia??qf?(??k?A
??6????y?tof]?_7???Y?B????|f+??IVR?c??B???W???\?^?m?C??*???????,L&!=?fu	q4?!?Z?!?MB??	???u???1?Z???]k(???L?????@???p?pW?*?0~???)?@?
?w?? ???B?? ?????f?X ??I?"?
w D7??dA?S???]Ro!???7'!Q+??d??9e*????????yC0??`??mP+?????+uH?;?????
Q?n?o?-??(????? /`iB???c ?7M??]??L$??Dz??We|??=??zh???>Ch?(???Q9?&?????B????$????p????4? ?Hw?c??.?S?)?`W????5?a??G=^[k?c?x|?y?O??????3?y?{??????E???~??'??S?z?????_??eO??W>???}?m?x??~?????y????????}??1|?7_???}?wzz@????=?????[c???}???O???_??O??3????>?????????????????o?w???G??M???????3??TMf?Qg??-b/?QT??gG?Vq??_?Frt& ??"Gh?%?S??+?E?V?)?2?C)?"?6x?8??:??<??>??@?B8?DX?D?:???;?q9?q5?RT?q1<???1??=?S,?????;H-]Hd???1?H(??Q?j????K?2q??0?56(?f(#uF??~??????7H-|(?ChE7X???2??C6l???????.?,???????(??????,5?>?????C?Xx??8????:h?????H?y??[8???????????(~Ew?cw??wu?Ez:e?9?A??
?p????uW??i???????????VxA??????x??$??????mG-?0?X??8$?(???????ui%??
y??3???????i?)$?(?)??@?0?DBW??WX?x?(x	?????*???qI?8?????
9?'?????(i?;i???5??q3s?????]?J??I??6??L?w)W,?h?Oy?>?????;9?Ii??q???????R??[?)?a???A?hi?ev%????)?x??1
????P?
1s??)???
??e??X????3,??
?
?P?@????????	???5???89?P?????
??
?!??,?@?K???????????
????Q??VY???
??S?i?K?2Z?3Z??Y????Z?e?9
???@R?-yB???8?	?8??X????
???Y???Qz-??????i????`???2?i??????
.S????Z??x?5??8?R???
?X/?9,V8,	??e?*
PZF??????
?????C,X???i?V	????
?0??:?=P?????j?????j??
?????@??z????j??Z???
?
???[??z?????????
?
 
{	???@?????j?.[?-??
/?{?8[??0??
????
?p
?
?
?p
Hk??
???:?9{??
4?
?
`K???+? ??J???
z[?g????8???
Xk	?????? ?????n
Q+????#{	T+
?
??k??0?B
C??@?0	?
??
$[?O???P???
?P??[??p
K;?
???A????p?? ????!?
?
???0??+?X
?0	K?????;?p	!??
?P

?P	0????\????
???
?P
a???
?????l??4+??????z??|L??????m??????{??4???0
`,w???z??????????????L?????l??<????z<????????\?4??@??`?????<????????J
????\?~K?????????~?????????
?p
????????;
?????????????????????????????????|???? <
<
Y{????|???????????,??l??,?????
?????
 
???y???<?G????
F?? ???|?????,	?LFm??l?]??@???????U?
????????????(??q???f???G??^t=??+t?}?S?
/?+??&???%?(???n???????n????$???????%P?+??(???^?????^?????????^??^?&?????*?/`?f;?????!???^?????.?????.????) ????????.??N????????-p?(@?qN??
??	?%?
??????"?o?<~VE}?????M?z???a????w???
??N??0?E????	????P??o?O?????*{
?0	O??????{
N??0	*MN????,???N&0'??%?+ ???????,`-p&?>p??_?l????=@????????%??
$L?0?`
?%`?H?B??14? ??
	4??i3?A?4?l???@-H??\???yK|?T.p??9????S?"?v|`??/???????0P?@??????f???
C?
?,?&$Z0a???x?n?v?@?jG?V[? ?[???F?>?^?x??9OY??????Q?&?
x?????L
<??????>i??h???
?a?	@??y???yj?P*?8#%
6?a?%???B`?`XY?_=??UVa??@????V}ITXZ??YT
J?;+??>bW,?#;?!??G??????_*v??Y%?W??)?A??????+?
????b??@{-?a
?8G??*F??hG????w?+?8?$?B
??Z???8\[+k9?I?d?Rt_??F?%jk?H+IX??\$?l?"??????0
?v?O?X@?
^??>?1?}^`?5???~bP?Qx)B???|=??	t`x????A?&i?b??u(?S [Eb???????b?x??`?U?^???-Z?,???K?0]???ZG?0t?:?J?C??R<?k#/??"?%l??????Xr?0b?"?\??/?9?\??????\x??a?`T?TYb?|
|?X/????	U???[?????]?????+??L??x?2xW_??5?l??c??
KN??????+?F,?sL????\?g???j\/????v?.`?u%C??xpq??/???X?a??Y??rn????{?nk???o??w?u??????/????[>???a?????[??{?]g]{ ???z?U|???????f?qv:??KF??BK??#
N
3????~??p*d????t???????/??a?&???????{?#??t-v?#]?6???pB????B????[$?
????Q?l???X8?????O?V3E?q5a|a???E?
?????sx?E??mB?#??7??nm{^??H???AM|$A	?	???)?egGK~.????y\?D=???l[?i?D?Q???ducF?????s?uXG?!3?V&
???`? ??? 
??
? ??? ?`r
	!!jA??`
?????????r?P?P?T?|??`??&a??V
l?h?&!Z
.?????r?	? ???a?! ? ?
??!V?8?5?C??C?e?EH??i
?E??\?g?S^??'vb8}"?e?(?)?"(r?*?"Ei??l"+?",??)?"-?b)Z?3??0?#?
?
l??1#2&?2? ?!Z
4C5H54?x
r
z 	V?45TC3?`??c5LC!??6?B4???4L8R5?#X
??2DC:N?8??5X?8f
	Z
??4V5XC5*C \
1?? ?4Z@?c!?A4C3P#=??=?c?9?c3LL
PdJJ?=FC3?t
??4??4!L?=V?2d?!?A (F?G6!?c???
!?$A??<?<??4\?n?!??Mn
N??=??L*%???AQz???c3(??AL?5H?O
?<?$9Z?L??<VCR?4?? ?#?#5 at CH??8???2^&ff?f???>?b
T?=??;??U??$??B?SY	?f??F?6}_?Ml?&%??g??l??l
????fn?fng%?fm
'n?&r?n?s.?q?t?sZgu6?rbgwJ?vR?M??5e???A@
l&{??{^?!? tc!?At?T
\?L?4T?5??g4P?54
??=&?>:f5?
 AG??=??\
!??<?? 
??<:
XA X<H?4(??!??h??
A"??4`?5(?P??V?3?C4??
a?A4P?V6C?AO2?4?
`?4C4?? T?DVVc?^??6?g ??(?$? ??=reVA???A ???=z
???A!?44??A3?<v?PAOd4?H?L????R??zh??OBC5B
???f3?????6??f(CVj?\???ag????*??`?>??&#??4?wx????Jab?9p?u]?n???
?rD+?B???P?b???Q?r???Q??V0?/?B6d??A?)???????????J!?+
??+?&?E?#F?c4
ZAcz?Y??L???`?+?? ?????V?!???d!")?Z????rl?l?'?Nl?.*??!?'???????r?S??????faJ???!
?S????r??j????e???N?2?,?v#
&?5?C#??kx????t??-??/9G-??C9V?M?]?y(?a??V?P?Z???-??-??m-?m??????????
;?-????H/,I?&?????.??r	?????n??.?????.?????.??n?????.?????n??n?l??^`9C\ln?%??C???????C9??t.?????B?~??
/?:?0\`?:o?????	??D??C/L/????
????????/?/?v/????^`?<??/??oH?/????o?pI??ERx???u?I???X09?/??D????rpp
?"?
?J[??^???V#?#?_4?%_??L'{?(??)?j?W	SvMR:?B??(??+??+?2,??-?r-??.??.?2.?20??+??+?13.#33?23?/31C34;35'?4/35?B*??(?B\?(??1?39G30?33;???/??;?3<??<?s<?s;??;O?1g?2???g?/7s0?s9?B9{3837?5?s??3/?sA??+??E?3F?>?3>K4 at kt/41??1?B7??:CsEk?1wt=?4,LB?B+L?7O?A#tJ?39sM?s+??C??0??Q'?/SsI?S?SG5TO?TW5U?Aw3Bs+t5P;4XC?E7?X{?Yk?Es?I#u4?4K4>G5E?3B??M?tC??C??C7?U+3Z??`[u-?5Bou*?sP?3_w?>4H4`??0?A???7??8?Bc?uKS?UKtd?6h??
?lS` ???j?+?c?<c????|???-?|??????/
- @
8??H?
?Y?*?+,)z???rzS??????
0??o?'???~"Ya%N8?????
4?
?@.??
t?!????&h??R??_H}?F. ??
?B??A	V?J??-t?aC
u????o
x

?P?? ?3??
[??JP}\'J??K??yl???FnaD?mJ?M?Jx?0????|F??????~?pzt?u?-w??Kd0w??~\"}?$B?????'}<4CD?	?BK<?M(??B?r-%b????K????$z.??P
?d1??????d+&F??|x?@?b3Q???C0???O??m??????L ?LX
~?z?	
?D}2?
,?rc?d??,?+1D???L???2C????L?L?/??0,??/
??$?wPbzqw?F??,???n-b?R/s/QR2kj/]?#?r

????????a?a??a<??<'J<??s??TM??3=????s??A??!?A??
?R+??uCJ???p????^?/??9/?8??C??D#IC3?`???0?b?-+SI
3E;:?P3}A9?G*J2???H???2$'?K??????A
J?D

???:??W?>????a????:R5u????:???*E3??Y????????????,??????Y??z??9,???Y??????L_?8;??t?HQI???????1???;,??#???	???????f??;
?	t?y:?
??A;Sz??:??Wy?:???x5??!??:??{????sV{5??;???--???p???:?~5?bu?????
??o????U??z?u:?|????????????Z??D???

 ???^\A(??1_?R????CZ???J at p@?a?`
kH0?
?u??/_
h
vKJ?Z7???x?V_Z?\D&??VB"?=?r?uB??r/??"?0?CApD?0?
M
hu?????_i??-?>???????G????N??RL???]*??gXRGY?[sI??;????
R7??R
??{????
Z?"UF???[$? ??W???d???t??"????7??i%???[
??F9Y
PX??a?b
?"Z+?!<%T??,H*??+V??u???XHKbCS`??p??M?q
!?L#??I??
?????0\????M???G????Ie????:/Lc?
??<
?????R???l'7?H??#_?i

?p8???E?b?D?+??0?\HF?(??)?|x1%?Q??9 ?B??[0f^L9J:?ri?G^???
???f?Oj?&6?t?|?R6?O?MC??f??}??l
I?B?4Y??D?? 	^???&????h1
?D?#*??J?I??'???-R1??h
H?+???
?,????????A?????M??'????}?????re?Y?:>=?u?}?@>?`?zp/Xdy???????????:pr?V?/{?W~?T}?[_?|
???c?'wb?f??dfy??|g?y
8b[#z?}?G@??x{(?xb?}??GZ?dH~P?{.??'??"x?"?0fzS???d??"??eW??}???R??0H?Lv?E???x??,??<??F??tw|??'????-?~=3?aYX|k?vJ?ekVx????GS1?h?|????~???p??b?|z???????T?y?(?????G1?wI?w?G?N??X????n?/$??'aqx?.(?O???W?e?'x,???/K??(x???,%???be^??8?????a&?{8{_X?=x?4?????rv?7????'&?%X???`m?z??L?~?2f^??????????????C8cpHb?X?/???????w?????????w?X??(c??}Wb?G?v(???vug??a?????5????????)?e?????.??v?h?#?~@H??????c??C?~yeg6??Hy?w7??9??;??=???	?A)?CI?Ei?G??I??K??M??O	?Q)?SI??Ui?W??Y??[??]??_	?a)?cI?E?e??i??k??m??o	?q)?sI?ui?w??y9????}???????/????I?|i??	????y??I??)?????i????Y?????	????}??	??9??i??Y??i?????I????????	??Y?????y?????????????Y??9??i????????)?????I?????	??I??)1?E?	I??G?)1??/????G%???$?P??+???y??1??WE5???????????i??	?
???
*?J?????$
???:?z?*?,??Z?0??2??&???"Z?:??<??6??z?B??D?H??3j?A??N
?E??R?I??8z?WJ?P??.??Z??T??X??L:?Vj?U??7??b
?g??C??j??n??c?????8?{??
??*??J??j??????????????
??*??J??j????'????vW????$????g6??X??????h??Z??:??Z???????j?Rx????&?????????J?????Z??*?????
??J?????
??*??J??Z??z????????:????:??j??:????Pha???&V?:x????^???:??J???????
??'?=??K??=?y?x??Ck??????dKK?M[?L???Q??S;?UK?W??[K?\??]?_+????I+}^K?h+?a??l??c??m?G??t;?J[?x{?g??|?????v+????+?????{??j,?Q??
?@?0??????????
???????K??????k??????????K??????????k??+????????k????????k???????[???????????????
???p
??
?k??????+?????;??;??{????????????K?@???????????+???????????
?Kl??????????K?????????K??????[??|????'???k??+??K?????[?L?????????????<?=L????[?>????@??;??@?0??h?????W;?l?[|?\??x?"?_l?;??X?h|???f??n??^??u,??a????? A?epeP??f???????????yp?????|??\??,?????l?<??L?????l??l??????L??l??,??????????L?xP??\f@?e????,???????????L?????|?????g??????????\??|??????????????|??????????????|????l??,???????l??????????=??l???????
????
??<?]??|??L?f??x
?????#??N?i??
$??&!0?p??f???9%?h?i??.*o?+????h???#2?.?S&?i?[."B?Pm??J??*?+??y???6???be@?F??P&?????????)??):x?k?	*??.??????&?#?=?A)"&???F???"&/e??O@T?+B??-????~?)??????@?t2?????6&/????P??????:TTW????XU5?Wg??,[Q??T?h?
?[y???_s??T_SE6X`u?uYg?%V?^?5?Vh'+?T?F?6?????5?\t?u
&+????f@?n?hN?F?@??qA???_??{??h???0??g?f??a,?Lx?y?Q??)???F$`?B?+???i?
??]??[?xw???s?
?Kc'?????????y?{?~????zm?u?M)FZ?a??9??b>=W}?{B???i*?7*???6/?FR?*??(*?"c !???2?a??S3??'.?e??? %m?
]??$%?H~?????C??=?:????$,`?6E?
?P?=im?k/A???p???7?_O????)??[??	?(?C?][SR?Rh8*?0s0??	??5)???g?fC?????ra??F8?O?;?	?c?z0???W??)^PE????@S)?t?*?[????HER??????*I?K"/?]???:II?}?T??)?e???R??J%+Q?JB???X?9?8?

?c}?K`??&?R1s?'d?~\J[o??$??
??!????1da`??h#@???VDf8???	??H???0???uZ????9?????sr????Mz??^jAG??'nl"?b??P*??2?9?=I(?4Lg?S??`fT??
B??$Tc??:z?G?x%Y????"i*?dj,???K!9???????iO??SVuwB?QgT??T???%?)???B?8D'???c??G????~?c? +X?:V???kM+Y??V????p?k[??V???l?k[??W??u?q
l_
[X????b
?_????B??^??=*[??vU???GX??Y??C?fmi????n???em?kW?U??6???jY%;??.E??-?hY[?????}ll]??????_??e????vV??]mk???J?_??j?Z????o?Gf?KV??5??eot?;??*??%,}?Z??????o?_??????`??X??v?$??;??b?b??
?"#?E??wv?U?a;??TS??)cF??[m%,\??X??xW+??gP?,???4???uc????r??|?G
9?@>?W????U?+?/n
Z???U?"??J???J?q?jf4?Y?if????f8?Y?q????\g<?Y?p?WR????.??X~??>??Ht????>??'?J???=?@:?3?']f`@???Ty?E????????R????N??@??Q?:???4??1?-????fq???e_?",}q??2iho????cV??k???{??t??8S????N$???gt?Y??f????nx???d9)???????V???b?Lj.%66d9)D??5???
?)?F\v??!>q?W<??x?9????Ur[?s?#?????\?+O??#?j????3?y,K????1???????o?[?|??Z(Lt?<??0???7?t??J??1?S+???t?U?:?Qzu???`????
7??i??????[?H???]j?]?z?????w??]??'??
_x?g?+?f{?W^??O}.P??c??????:??5O??g?.?0?\N??[??_}?)?????????????'=???=?
mi?????g??]???_????#k????^??O????|?????O?a?'???????q?T????E??????y??_????????S??????????k??????
?TA<@tA?A?1????1;
t*d???[)?{?????Al?? B,?$<B'4??X???F???1*?BK8???
]??axW?2aC5?]hC]H?7lC8t?8|CZ?CZ
?V
??Xa?????Y?5???Y?[??
??Y?dCD
b(P_x?aaH_(2,?aHT??t?d?0?U???
?uY?????YZ
??[_?6?
r5Z]x\	}?v@
 ?aP?]?.?

??c?X????t?B????n?????LR{^KWh	5?E?g?N???R??k?
???_:??#?TY??}^????}??# .??
?u+p]?

?\??T;???8??U7?M|?k?Z?XI???jX?U?`???|aC?
Wc5<?0??*t?6?W?=A??)>)????*z/?

<?B???????$??J?(??r?%?`r?1+m
/?
3?}?(???b?P~Pim??e'?I??8??9Goe?_?R$?Ar7~??E??????2
??p6?a(k?3?v??m2?*??x?H0????V?b??U?b[!SY??u?Qx?f??W?2??S?+_????6?? -0?	L????+?%/{??_3??&1?i?c?`??d
-?g????[s?$U??????%2???o?3??d?	T?L????????u?jf???+M at K\???'????
?!?A?	-v??Y?x
T????*?F_ ??J4?)E?J[???T?%?iDQ ?@???>?????@?O??D??JW?V1?
T ?`)
`

`c???<?!
i?????<?!?y,????lfGK
?????Ge?qZ?????<??
v9Kn?R?
????>P
/g????:??1I???B??V?S????wY???
?Il7
/??&P?+c????'&p??
?1p?????.j
\???x?z_\w??]1???//???}/??u?N?X??2?$_
2y????8?=??(?
?=?A??????%-?????>?pF???nv????
d??gW?d?~?????0WI???x1?????X?d????C???.h??X?b
`??`$<w?x??{?C??|????
?x:b??P??O`?mr^??=?;??????$x
+X???f!$W?0???Y??W??? Q{? 
)?r?
4
?@LU?
??H
?T?
?????YnZI????e.?-?>??????a????.??.?C-?Z#4?Ba?A??
???????h???
.???0??????
?E????C/?:?C???????0?????z???n??.??.??Q????
C7??7??u./??,p???{??0/??b??7??hp?@?:?Bu????fOe?n??n??n?????n?????????.d-,/9F :?/:?????????:0,??X????
?%?0???
PWu?Ss2?)W?)=?CK?D?SU^tEc?<?R"??[tF?tH????<?B%D?%8tH?I?tK?tR??C?L'N??LWO??L?tK?BM??P3?O[4R??E'u)8
?
????p*???????y?9??????y?K?Wy?????p??????
?P|8_??;A(?/???z?c<?,
K??
F??????3:????'??
?HQ
????OcQMC?A?/{???
??????gD*hj?????.??q|?]B?????????2iQZ??{???.???iVs???&5??MmJ?????5?IMZ????.???q???`-tq?[???0?>???}?S??]?OX???EJAPc???h@?P??S?q?g?(?Q?V????C?YR???)=iG?I??????(=??O|?4n4(G!??r??'I?????;?)Naz?????FE?G	*???T????R?)?6????iN5???Bu?/?EP??Y???X??T??V0 ?p?+
???t?Ei`??U??t? }hb?Z?????!?jc?*??b??M?E?Wr?"(?_V???#?*f?*Y?J?????a?J?????-j/?!???D?lX??T???DUneM???????kZw??b?4)auJS|J??
??wKX?Z?E??u??]?????{??X?v??7e)l?zS??t0S{0<tt??S?{Z?>4?]??[?*VQ???#??T'-????~?????L???????Y?bg?0Nq?U?Os??8?q?Q|b?????y[????7N1J;??%??!v???+Wrx/??E??%??8?A`.????y????Ts??#f^??????47??
?3/?t?8?Y??+3?	?gi?9??23??|'Ds?r?BW???B????E1?"?m??b??X???R??#S?HV-?P????~5???T?Z?#???u??Z????????D?Y???V??s-?dSe ??????2
??^3??`??????3?r????\d D`??;u?&w??3ou?.^?n?c???x????w?t?????	wo??nt????!?`?|??^???Y????????d(o??%?PvR??v?{?'??9?n??\?0?8??M/?cEN1O{s???r*??A?	#]wD(#Q?<?
??ti???4@??]?[o?JL???#?h'5?T?%{H??Y?)w?{??l?X?(f?y@???GJ?aT=$????Aj???J??2:B???}???H?*???#j???
{8C
?2<????z??0
ab??{?KB??a?G???
??M?*M?D??q??/T????3?1?"????T??Ow*??@C???%&?#:%d?&?A
f?|"	`?$??U)z
)?e$????_?H??f?*??x?????&?	`?1%???H??I???L???\b)??$???

????n???????f???!?[!?+;g???@<??F?{< ???Za??
??pS?Z?f?????a??c?0???	??????z??V?=?izw?g/[???!?t??????????=?"??I??w??{??`?b????-7??{w?If?
M|???W
?Q[??wS(?t2??/	??,???c??I
??B?y?C2:vR?
?K+	,??;_??
??O-5?I????#???@?2?u?+ltg??,??4e?(?2 at P??*-????/??????Z??`_?#l:bZ7 at x??r_I???JU'??7?g?g?`%???KY?s?l?;???,ta\???d\????XvV%???r?H????-??g?(?VX?	??.?fj?h:?0??rg?!WJ?0?O???^Ij??%/}???X3	+z??_:???Y;<???-??4?A(??0???O??????|~T<?????????C?!0????*(-? 1|?"?:?]?3?/A"W?*???/?4?????1o???F?f??-?+KX"?bF?XK?"??ES??[??q?_HOTjF+\&"??m?????A?TP??m????"?~TPFA???g
??n??V?b???`??0?/?A???F??q?z
?R3"?ZC?S<?w?AI1???	?-?[?;Rq?-?%?p????
??"?h?>F3????~81??0?@M??N?`$?G!a?
?`???????|??v?O	??'???R??TPr??<9?R?.rI???;?C? #?2,8??????T0??
?*??????0R?????@????:?BM?????????a0=?
V?????Jf?
?Dp
rrO???

??Y?pEH?`?q??^p1h<U?ohi?e??5?p9??W?	v<oi?Uynh?`X?l??	'?Cpw??`Mx??n<Ho?v?
F?eI???gx???^???V??9????s??(?
BN??r?.Z?=7
? ?X??r????#w??

 g#?

?M??c??hr
Z?!E????q47
MBAR
??
??W?`*&2
}???
???3rp???~6(??q??
}?/
 eC??q??K(w2?r??R?P;l????g???@{]?>1??RA?4gtK?K??Q???\(?[??p??s?<TI??????i?<????V<?)????zY?b??8??
?_??????*???>?	?E??K?????mI????T8??
'}iE
'???????
??f??????:?5??????j??j????Vy??????c4$H?fc?????????M?#_?:?W<7X??*???<?:????e?m??'????????>?FQ???\?????WpU???Z???????????<?Z?c???j?[????
$?zn????j??p?j????4???Z??9?SI<F??q?:???<wo?Z????2??6;??v???+???X??
?E??Wx???????? ?e*U+??j???????
?	??j??V???{??F!u)?ZAg????;<?!U
?_?????'Kq??j?m?????F??|??ah?h????????F??[?*K??????woK???
?aX??????M??W??=??b	?????K????B??Fk??+???;????kq{??????z?S?????\p'??o????y?8[????4?????{???f+???? ??G????7?@,?????????n#??J+??{???????J??????????W???:<?Y<?;?	?C??
??????c??koWl?6??{?p??YIp#?o????[????j??c?-,??+??i?????l????i??|>'???????(,??
????I?<????????????
?Xi??J???Y??{???[??x?????,???p?{?????G(L??????U???v?????a?o???????9??????\??J??zq]\????????<??+?[?Ah?o\????9q??????~???l?2??!?????$???<?b??@?????;?TH?
V?
??7?*??"??a??A{?????\o???#?? +$!k?]?3?b)iE???,???????????3??<??C??j??K?`???a??1????\
?????z??z?z?^L??,?Vl???f??4????UR???K????w\?6????4K?X-?|??o'????????=??]??}????????????????=??]??}????????????????=??]??}????????????????=??]??}???????????]?,p????]??}?????????????????)???(???)???????????=??]??}??????????
?????????>??^?~??????? ??"?$>?&^?(~?*??,????T?? ??3^???
?@9N?6?
6??9??=??@~??N?a?An?J.?G?O??H>?<?????I~?P??V^?Y^?:??T.?d?f?9??c??Q??g??b>?h?n??t.?i??zn?|??[~?s????????????]>???????e???????.?un??N??n????????????}.??n??N??????????~??????????????????N??>?????^????n?????????????????N?????n?????????.?S0?N??>??^n?~???????????>??n??^????????????????.??????o??^?
????	/??
O?O?????n??????.?!??#O???)??'O????//?%??3??5???6??4?8?o?>?;??F??7??=/???G??L??J_?S??Q??OO? o?[??U??<??D/?8x]??
??????j]??n/?q?r??u??v??{??~??y?w??t_?|??????????y??????????????????/???????|??????/??O??????????????O??/??O???????????????????/?????_??????????O??o??????????????????????O??_????/?????o??????????/??]?????????0
?i??*?R???hU?Z?zU
?)A_e?3??Z?l???W?\?u????W?^?}??X?`??
F?X?b????Y?d??-_??X?]?u?u????h??=??k???????N?.??????m[-????????,????n?????/w}????OO?^=?u???_m=??????oM>????c??>????????????nA?eK4?f[k@?t3
A??S?,????$\??(?????P??8????@?pB?#?C;d1?K??Ect?F3?q?m?Gu????KH?????Q? {??"?<?$?\??&?|???2?1??|?33?,/??<PM7?Z3?79??.9????;???O>??3?????B
?S?6
M??A???F}??E)??PM'??RL#?.I=?4SNO%USS
??1???H???b?K??X	???t].?^w?
X2q6??_?=Vf????h?}v?iw3Zb??V?m???o???n?-??q?M??u?=??v??w?x??7\o???Yz??7?{??]??5?`y?]??eX`?#??a??
?b?^?b?7n?_?Ey??3>?c?S??+????????J???bG??g??h?|????^????N?V???_?&????~?????????zi??[??.???N???n????;??????Hu???)??eG??B?X?O?-?	W\T???q?O\?-???<??2g???'?t?E7?s?+??I??u_L????Uo???]?}v?S?}u?s?=???????1?=???????o_>????}z???{????z???~{???{????|????????|p??
??aV?l3?????~??/???[?j@????+&?_
P???J?L?1h@
J????;7
??N????z???eE?AX??v? ??xa?%?DdbMU?T!???aY??W?J??F????W??U.]u?a%?[??V????l?$^7?W????[??X?f92????$?Cb
?@Dd%;Y?V????lf5?Y?v???mhE;Z?B???E-#?Z???????jY????5?iq???B???l"Vk?6?6?E?o?+??54???]?????z??m?????v???oxG??d???E?m???????/
a?????
'Gy?U????!C??~?$@?	7g??`?(0!?
P?C?Y?r????E???@??G
????_>u0x????@.??w??_{????',<?Q??%?!???9???rnpv??n?@?s???????J??????
????*??W<????'??????2??????L?|?em??4??.??7?
Q????-?????}?u???W??????u????Z ~????7_??_>??|??>???~???}?W????=???k???/~?????O???????@~.?>???????0??????G????3?+?????????>??>???[@-?-??	@????>?c???l?|???>?#@<AL????????d@?$????$?z?~?;??0p?????????H????%??',(?)<???????&??.?B/??/C???vA=t????3`?????8??9??:??;?????=????<?@TA???B?C????@?s???>??)??F|C@????>???K??C4?G??Q$?R4?9?@,pj??}????b???I;??*\$??E^??6?$?*%???`D?P:?b?^?e?EP1F?RFd?F_?Fb?Fg<$?0??(`??h?98(?=N?NdD?dGE\GutGwT?ydGz??z??{??|??}??~???$?N??)???LHJ?A???x,?w???HN?"??-??DD?)?1p'???????*????G?\I}D?*??1??,???+?.?$H?4??H-??-?$??1H?vL at x?A+???-?A??}?I??D?????????????D?*?I??+`k??{?r????(?????"S*???KG?????????$?<?%????$??,??4??D????
Y?o?(???<?1 at IF<?????????????/@?A ?f0?f ?@?2?????LH?B(?f?B?s?????,?4??????)??f?j??$??)?????f???H??@??0(kh????It??*??; ???M????{??t?????AU?{???|p??`??)????%\??KR??-PSa?,y?'?P??P?????P??????fs<
u??PQ???%?I?~????<??
???????>??*??@?x??h8M???j?/????H,0@?-????E??>??.HH,??.????Bd????)???TH??>J\???I*?@??(?j??y??/???#???;8??????B????=+??????-K?$???=+-Sx$?MD?,??+@?f???P????1 ?i?e0????4???,8I?????l?*???,?fp???H?S??KH,??Hm????f? ?(?R-????j??k-@(?z?Ou????*?Z?;*??q2??Q?teW?YWwm?!???Wz??{?W??|}s??k???????5?G?C?T]%?:?N= ?>??#(?A0I*8M??-m!??1?A+???l?B????
??)??-e(?@??,?A
?_"??1???=??(p4???????#H0???v?h?c??Sf??h??"`?6???>??$?,??N???,?p?????S6?_~???????????h$i[=jQ????5??????d???$hk?X;=?h?X???y?i}??_+?|R$??]??f????U#~????`(???izH???n?T???N`v?*?????H5?+x???'??f]??,b!?1???uR/?/h ?%?I?? ?k???	l>(?a!??Kn????|?) ???????1??"??/??=4????f`?+?c?t&??????x??????	?a?O???j?>?=????O^?e??????'??01<rU???WR2'?)?r(or+w*?r???r??	+C0??,???,ses3?r??3??=??s?m?3?k??<?L????]\?u??<T}???aC?i????V,?o?&&?????i??-eh?V8M???Z%???d? ]????i?-@=???}?x??yP?.??i??Z??0`H-
,???`pWX+???}??V;P????pe?i?'?.??D?~??w?+(???d(??0`??n&??)?f
k08?CMX=?x??L???M??~p????n??{?r
I?h~?z????0~?0??E???????????y?????????]:(?mJ???W?;??7?B6?z??M?j??X?-P?y.R>??????'V???Xw??M??cB?4???a??;??P5?,?j2B@?1?Y4p(????qv???h?e???w????m{mW?}[???Ne?|?????t??-????/p> ??????V??k??UNu???$?cGUk??3???f??vQm?@
.Z??b?(??J?2m??)??R?R?j?*T?V?jV-Z4j??Q;-P?-T?lA???f??6k???"??F?Zv?3k??e???? ???1?6?Y\(V?????b????????d???fm?$S?L??yl??w???\mZ!(X??)???h??'w?7??+????E4X???B???u???\.?8Z3?q?'=L?O?j?3G?<o???T?R,M?????P??waV?GV3I`A?[?QsZ5
??EU\?Z4??W?GUVz?!?!?8"R*E^[0a?=??SN/5?04ZLJ?HSJ;6??I
?X??m?#?3?R?/
???AI??E9??Ui$?RZ?%?_j?%?c?YfB[t??b?I??`??&?p?h??q????g??g?5???/?0Y?0?C"nQ?bl??aD?x)??j??UE
?u?`?1??v![&ja??v?Er????V?EPD?DP??4?r?jZ?a?Q8???HCV!I?J?^!????ei???A??XXa?\l??PdqD?N?v???[p??Wt1???VQk`d??Z?P?Q???1??Jz]P?eTl!??dQhcl???%??a???	?QQ\t???Y?j|??V`q??`?{X?7??I?-??s?]?\3?Yk?5?Yyj??&J??5????;?4???.????6??cC?dt(M?&SGxCd??9*???$?-8??~??????E?'	yH?#I9N?'???)jg?n'?M"l?
?TX?5?????v?]|??FX.???????LS?fb-F?b??~a?H?j???_+%T??+U???W?|y??;????a7E????>=?[????4?>T?c<???VZ???[?>??r???N{???a?2??O?P??5?

?0[>??????4?`??
??
NG&?\?"??Uoq!????77??N%??Kr????2?a?*'?.??1???C%??H\"
??C7
? 0?1:??^ ?
p?C??O??~F?????F3??j|c???8?q?v?#??G:???z?#??F??1}lJ
? ?h~GA????Q?????vFA?,???Y???<?Eo?6?????????(?+??D?H>?vDi???@???-??"?'=?
0??
????D??d???<A???}?&8
??q????,'9??N?6j?|????4???
F5???b4&?POBR??"gE?m?s?????#??Yh!???F??]?$?%?r????FA?Q?~?2??II?R???'???????l????+?,???? ????F=*R????2??N}*T?*??2?
Y?)????&a``HXs5??	W-?Y???k??
N??
T?
w?`
? ?
*?/???"
?`????B??
??@T?_C?"
&`
B`????M?b
?`???-#C?5?`)6*z???&
?_?|?	r &V"A??%JM??j#??/???#4????"???
?
F??
]$?4?K?F?dJj$?DL""E??I?dJ???U?NVd??J%N
?Q?Q?$O?$Hr$S*?MndSbdQR%V&e?Tv?Q^XE?[?@Y????????????-Hf[?!T??L?e???^??^?%_??_f^?`
f_&b?b?%a?dDP???W?????S?HB&K??JIU"JG??c:?H"?^??h?$Jvfi??c?f??lr?.?fmF???bK???%fc??a?o'q?q?????A??]ne?!'??????,Dm??@\?M	^??u'c?''?WW?.I/?%y
g?g???G??z?aq???gq???=??A5^?
?????@?`)h??T??????Vh?^(?b??n??f??r????;*??v(?~??????(????6??mD?f????????h?!?&??????)0??0(?
??*??Z??b??????	D ???????f(??h???F)??????&_???R??.h?.	?~h?????(?????)??????)????j?B??6(????,??0??6*?>??:(???????}^??W??1V?
??vj5???!????x??"?????????i'?*?N????l?*?j?'??
??????v[???????E????}
C?n?????T~^?e?\????'?????????}.??\?!?W?)Is??t??jN?aDX?&H?a????$?k*+?n+?,?v??B??J[????.l?b??F?'???J?&R?Z,?^?Z?!F?%I?l?z?IT??.?~E??jlA:?K	(?$?V???lCX(??????
?T+?$???	?????M???&?????l????F-?N??V-?^??f-?n??>??J??Z???,?4????~?????m??,??-??m?2??R???-?@-?r?~Mm????????-????*.??f????????	?!J??0??0l?.l??vfrB????F????&P??????????.??d/?:p?.????.???????n???/?/??nw.??"er*???,????.??:4b?u??>n??????H~??zok?!V?+?????n?????.?."-??????n??-??0?C??.?%T0??o
?
'0/??&??????0?????\??9?????????????????J?r?????
C?ANhn?{&??:?o???0?p??++??'_Bp??0??K?i?P&?2?=?E??+??/?:?????&?p?`????D?kL????
?
!<??9?tJ????*Dc4F?tOC?-u?(?=?F?tH?3F??@{tI??Q5f?T?*=??0?0:?#&$??7?????S_?T??/??JC?\?5]??]?5^??^?5?,???`???
,??Bi?vV?t=??k?6p7M+???Z?B??vb???l??t?jO7[?5/?)6	??	??
????D5??
C
?????.?B
@+??W]o?Z??1??K%??.X&Q?T?s&??
_??????????"(u,??RS?+?h_???
????b?v???:a??e?K!L?>???|????????????q5#_?????NL????u???j???R?;\??,/???~f[\s??v1
??[???%?VQ? ?<j?t)f??ra??????y???????[[?X
??rh*bRDh?WV
??X??$+?X??e??|Y???v:	]?H?fW?y??[R???z??????HZ?
?&a?%? ??????Z??.?	Z???nii?ErK(oS????????????JHX*"?(?N??????L?????????;??*??S?z??Q%5?Va?5UVK?EU?bU?[O??p??T?-6??%?b?]??d??V?i?u??h??6ZWZ?l????d??VYs???
8 
?
 _;X?
??1
???V??5

!
?"????#2q?7??b??X$BW??? W$dA	?gZ??V???Qi=K??6??]m?XKZ?*???!?h???*?5l?f???6?
2l?R[?T????0hA?}#?sG6??????@G?Z?????[?
???mUh	$?
$?"?m?}?[?8?8?Q
p??^?"T??*:?x
Y|C?????t? ?)-l???d??%m0`?Z?.v)?E/BGZ?Ct??E,?A??????G?0?^H???n?\????V??J??GK???8?K?<?"??(P\??????M???????,?Q????Pi!tX???%m?S\??J?(?5?I;?;S%m?C
^?
:????LB??????c??c9m?8p/????r?.????Q????^????,??Y?
?6??>???<6
K??9KEw	?&

p.???n?

n@'???I_8JC6I??`?"1?v??VcF?V?~x ??e@Oz??i ur?]?n?? ????`?ZI~
#w?????vq???$?X?h???0???1Y at J?M
b????gd?????????&?	??&
@j?F
+????=??X?????X???nL??MmJe?mB?n??y
"-"EqS5s?</?(h6?T6
???lP??#??,?BC?
??1j?F???4?
&?"Un??L5?;?,>?BD??=E?4]?R??1@?It???"??"5WU??A~!J%???A?c?6????R???N$CD?Q?lT??I|4D?#??"|!<-#8?*???LE?+R?M%d `?nn?F??lL???`?L$5?E??AC\a???|?A?aI?S?A??1#????4"??,:?c!??A??Cv?7??j??n?FNb??>??BT?n?M+d?5U!V61D*Z??n?6a+Te7????a?m?aI?t??:?A5BlW?Q^????,"(??7?!|?2+?1??`e??UUX?F?U?????gf??fk?fo6givgsVg	?gq?g?VX??h???z`da??ll?
?6???hmvjm?j6k?vk?6??vzh?j??gvj?6j?Vluv|fV|&
?6m??p3?h7kO?t??jM???ja?f????|6s?kG?s???Vh??y??o??wmWp?qgq[??
???6l??d?t?`c?G?fFgRw?
ls7xgvnaXR?s
7x?pX??d?n?	??v}O?f??um6??K??g??fQ?gy
R??x?-'?y?a~X??xl??\??o?????c8??8???????
F??u????X???????????!7???h?x?8??????????39??r9YrYRZ?????1???X?o.?Sx23??D??T??y?V8G=@?C???0F?!80DW>??KT???????V?9?y.?/?U?Y?\?\EM?Ie]??`V???Y,??????/D?????????T?????I????????F???ad????
???y?Z?EE??H?C?????????yU?F@E?k*Xe?EmU?Y????z??????W???9?w??oe??;?9?_z???????Y?1D??S?z?E??F???o?:??
o?v????????????i??????????/M?ZU???1???Y??C?a
????[???d\???\?Y
?-??%|?3??fLA
_?\??BV%????&A?&wmH?J^?@?
??a??y6?yb?????b?_ 5Z?)hH?O????????_?,????e??z}	???f??4??K?E?????????4?
??0a??Z?+ch_???????0??K???Wl??8??}[W
j??z*j????j???jj?)?(&???J*????k??????
(??>gd????
??.????>????=)
MK?m?i????iu?&???
??-????`???0??s1?s?0?
>L=?.??6`???+1?`y???^????|?????'??+?l-fx
?Ka4=?KC?6?7???Qj4??x???O???????-?
?
??????A?q0?
JpRL?%]?:?w???t?*-)J5?R??t??[????q????i7???n????G#(Am%	?
?Q?"???.r??n???@D+?{?W?S?m4{????b????3?Q?<??????h?Q??z???E?i3K
z@???@?i9?j?JC??
8?????Wp?)?)+`N?%|??\?K??d?
G???E 4qH*?wL;o
?????Wr????????Z?o???q??m?3?????I?6\??J??:??&????l???Z??0
?s	?4
?


's
?p		
D?
??#x	&3)??
???z?
;??
d1;8
?4?
?5??"N=>Y9?$9???CN???????x????j?9?????N%?@ ??!?

???????"?
?K?s,J?-?u2?	???@?@-?@????p	P?2?`	8S????I?0??????0	H?h4
?0	
?
?`	???
`&?u.?? ???(0g&p90F>?:?iy??s?3v?tQvfM??
?
p?9??????>|?idIGV??0??0????V?j
@??

?F?\?F G??c	??Xo??D?W??k??z??l?
?I????d???'L?a?r}??0m????
.??
?@?y
??
??B??
`????
?
??@?????
$@S??/?p?.???j??8
'3?(s	??
#?
<?T{u??^R?U???b??(??C??????K?????L?d????m??c;<-?v??
?",?xhhP?q#?)-??eX???3??l>??/?? 7h$?$???
|?d????g?(?? e??k?????)}-?	>?XmT???XY?\?ZBY?N??????WI??*?d?}3?8]Z?Z??????
?????D?????:?&?B<?]m???(???e?h?QPC(]??@??
??K??8???*???N???}
?-??D??????}????}}????????-??}??M???v??(
???Kb*????{???m??}?????}??-??}??-??}??????(??P'>`M??#??,?qe?bO?h(??
!P????s
???????
??=?????]?????
???<?@*??
r?5? ?A/
??!E??@b.???y,???;?YQ????w?dM??z????P???p>?RP
?p}qTZ?uH??Y??GT?YZNZ\N?$
?0???Z??7???6oI?o3?U}T??s?4E?EB??]?r
a???????6?{??]q??Q??????]??????W?????F?g??W?????
??
???^??~??>???????n?????^??
_??`&??????????????????????????????????~????R???.?{?~\??'??
$z?U??
I)\?????(?zUA?%?t)2?A?-?%;s'X?-??$??%Y?0???uT??D? q??S?d??#?!G8%b?x????7?<??D?)o?1c:eftHc?#?????????|u)G9t?H???"G?[V??xg???7?????G72#?19?
?5<???S-$?U????????S??P?P@^?y?????????
??ASy%???c??S`(?FC]TK?h????)-5M???zo?ID?U?:K5?N?Z???N?t5?A?
?Vd?B?*U????WN?o?VP)??i_???V@??5o[??[j????s??????z??%?#? 
6??C^?	??_p???[?Q?_????????1??c???f?[^qDI??A?EdVFdW)???[?C?_????]??f?MF??k?ya9?XT?X?[<??D???????????c???i?K??_?=?z??[?zc_J?8????c``?%??W9?^_?
1_??Z??	??j_?????N?p??v\m?C?8??=?E
_?"
DS?L?2??og*??
Wf3?L?X???6'B?5?s
?\??:?????K??W????|$"????7??M? ?T$????E/??b???lk'J?%&??Na?^?P???C4iUX??rG:*$???#???>?Q&???MF

r?Ch+jZ?
??5=?????q?;I?Q?????T?5??J???@?q??????U>-.q?K?e???`h<????K??Ny?????W???????`
????*|-?bKX?>????bu??X\
?9???n????#?x?E?p}????8?????w??NG??Y?l?/<?X????M??[?'{??n???:?4w????sq?}??n???
???W4??DHM??R<H??????|?|??}AI3@??????????????J\K??EJ`?Jt???~?IB??JE??3???????UX???h i??y?i?j ??<M?L??,????lMsLM??M?$Gn 
,Dd??\#??@?;???????K??d?	5???????????TM??]N
?V?Q????dJax??Y=O?,?
L?????
??V?=?K??H@?Q?????U??5
???D??????|??l??KQ_??????9T?4?????E???????Ur
???E"?\[?Y_?[?
????|1????lHW?????i?????b_#?\??[??C????H??"#??Z???5????W:}?????ez????$
,80\?%	w4??#I?v????r??w.??p?????
??????	??9x5???
?e:3??w????%???/???6?_?-??)7i?yukF??v???
?`???B?K?????????????S??X?]??-??~?zg????Xk??"[/??VK?MW?}??6?c??'?????f??W~?	(?0??#/?x?s?
r?=6?m?Q?z?I
?r?H?u??0?l??$t )?g@?x?qN6d?&??c?UWn?X???!?"^m??G(???9??C!???D.??O:???m4?4?I,c1E??,??#;???-?LJK??^?)??j:i6????????5?R:?;??2?:?B?y?J??/?
d??j\zd*9????
,?p	??a??Zmj??h?w????+?
++'???
<??.?q??&??-Cm??!???y&3??n??5?U?
,?????=?[???????- z`???_f?L??k??2?_#?v?:?
oGh????????/~???-=?gL9My|?r?
??O4????n/0???;?H?
???$'8?M
?0?=?	???T?X-?P?9??bU?6??Q??N?"T???i9?	V?v?b??C?????5?i?f5????F?L?+a?J???T???kG?zW??t?g??;??T?jK??Hp??;AN&qT|r?????%???a^?U?a??E???
??%?(?HI?X??}???.?????r?JlPf????@Ow??.t????E7??????????n???n*??E??C?-H?z???????/}?k?_???6??|S?_??W???o?\?
#8??=????C???o?+l?O8'?u	?H??:???!vI*V?W????\1?[???8?2?1?kl??8?86?
???}?2.??u???5??G???e??????	??/#9\???`3??6?imu???i?3???YY???????b@
?9
$@#??M????]H<Lp
?X?<nZ?@GJ"<<FFEG*????4?$
??=?<C?-@bdG:_?y$
????aG??Hz?%J?3?$<??R<"????C<(?<??:????????!?I"n%4`%
0?V??G?e??e
?0=h?#v$=0?W???Svd
??=?e<?d??%
?l??0??d?(??]i????W??;?Y-???j??????????j6??i???fi???0<?-???q????q&????????O2*?Y@?Y?>(
??}??!,?? ?9)??`?????V?Z??mY?????V.?+j??a?7???l?J?
S???????jnV?0??6?$?>,>??i%/?????n????&?(&?>?i.????R?????R)/?k???????m^??V?-?BE??uZ?
??q??}?3H???A????9?=??? H[???
[4@?=L4XC=?????
???	??????\????????Jp??C2D???#?{?aF????a??4DCT??"?=??	?J?
??M??o???q?u??q??BOl?9v?o/	??i???g???)/?Y.?-\co%+?d????*dbr?r?"?????,?)??)/??#?Rn??[?
cB7???????o?	fB??j????A??'l??	
??%#???? ??t?yq?????. at .t??.D?fIw?&???f??????.??tM??????&?k?????k}??I at uR?h?F/l?2?EY8?X?u]BEV???i?E??Y????uZ?5N?]??X?5T??\?5]??]?u\6_#?\?u[gU??_??S?uU?jY??`[??5(??^9????1?(&?1L??f4??l?Y?>7V,h?tk??GS5???<???????10?o??2S?k??b.??~??R4DK?N???l????x?o??????+???/I?kv5N?????X??!Q?&%c???,e???F.?}???)t?????????????$9?9???|?,?Q???5d??C??/x?[???B?p
??mJ?[x??C?L8?????8?s??{J??8????38????x??8?????
?{?,?J??
?{???
?L
*????M1???HD/???"Z?x???a?????S?c??[ItP????qAsn????S??2x?]?,4????zz????.???mH5W/???$?X?z?p`m?4s?X???xW?Y??"?tMoDo2?icB????V??9?=tz?????2XA??L?n??vH??/??.?1??<DJ?"19~??Ht??????)*?D??nO??/@?{I??????K???????)???K7Dy??pNp???f??	!??r???????;Rw>nuR7?Jr?w???iko?#)Ab D???e??c?2??d.%?4??74M??N?q?J,??v?M7?????q?a{c?????|??.7?li?9?r?M[??????9wk?4?N?p???xw??^?W??LWw?C???????BZ??U??Ep?BDALq?VD?P??k????D$oE??????????#7~???[?F??h2?Y??.???;A?= /?????:?i????????/??l?c????p??v????N?y???j??????S??G???=A ?=???Z???~?;:?Wc?????~??????n??8???Y???k???>???aZq?7$#G????{?N
 ???)?<:?a?*=??~x?~????????6k?=???????M????@
?K??^????=?????c?<l6_??*?~???ux?	
?b???``??6
s??	K?~?e
?2???V???bT?,Q????T???????i
?,wJIG-Z???I?(??e?06?<j[?|!????>???j>??V?D???!?^@e??dPrax???,?????#?JEbw?????I0?4$?'hSG
g?u??>y??????#??`gD?
??k?PG??&??h
*?Pb??C??d't"+0"uu??C????Hba??-???????Q$?H?n
D?%;3	?T at ROCR??0????M*&B??hz????bT {
B?????D?X?1r>?!?|????????L?UWI??j????DJ???5?T?(??N?BB???
?NkV? ??5?|???Q(
!dQ?:?W^R?U?d#%?F??A&9????bi??t?B'Jt??&????p%1?	???"d?Eh?
Y????%???w?RY??VeOy???V?w?f}?+?0??W?&9%?L????e??9u???C???w????7?,???%?[??$???|???e'??????????N???%yt??M? I-??????"?:?]????;5y
-@??x???H?02	?0%2!??>g?
?T?S??+T
+??xX?$9e3<?:??h??|??,?E/??W??"?8G??b?b???(?RS??P?3<B????Tu???A?A?'ieF????TS]3W]?^?$?;Ik?84???x??[?3?6h4?S???W???m?*\???P?O??@:?%??J?
??Ays??M???V??7+X{???V$6??g^1?X???a??S?
0??
?Z?~+?p?s?B

\???%n???F???:??

i??
??F?u@?`?
$2	?????? "?L`,P'b1~?*4?$Rd>??68???
?-_??????LQB	?$?a
??4??1\?Y??e?:'.0??rBG-Xr??,???8?PIG0??C?/???CliW???<??O8Q??uF???????s<?
?C?:?A??V=?	
,???"1LQ@Q??G?b
?H?:d+"
\OWL???f?????Mt?iUx

?-Sh"p&?*9tV??????` S?YIhL??n??0e$$o?%KA????U#???k?"?W??????`$D??"-????-(b;X?"?A9?9?d?????`??!?m?-?s?g~)N?9?x??:?4?? ??????k?X[)?????Bp?O?j??m?@c??????? ?NT?%L?????S?v
???+?ix,??y??tS???????u|?q???rFL?????B????K*$P7{!?kd?3|?``

}{?vfL&
??4??V8E??,??!??S<

i
??"
b"~?(X?*?cI??bH?L??|?????3?a;????SvE?:??f?r???????m6L?,D?v"5N!'<??P???&*h?a?J?????hIZ?P|B.??,d?"%H&T?)%?e3F?$v*dV?^?V?b??(\?[?QJC???Qj??M??kSc??h*H??c?w?3T??*??7v at V??|0F9??&(?v????????$?F?Z?-E?}u???R?????$8dm6?SN-?Jd?R?E?b{J????(bEV{?E?E???F0???/0??????,???8??Nm?????4Pc,?F"6?Ch??? z?Z'???b?h?B??]*Yn	v??w??	P+??a????ER,^????(?/b?t?\?n?:?$a#F,1X?v??E???u?`M???/W0o???m?G?J???:1??a?`????V*a?~
????/?&??j?Ua???F???^a??5??W*??Bw
1n8RQ??r0?sVTD7??i??^????I?
fx?
cY??|?\x[!??/:?????/Q??li???X???????&?G??2cZZ????u???V)??Oz??V??Ulhd??IbR|I??zF:\P???Z???{[?$b???H???U???O??h??$?K?Us??????XZ?z+??
@
?.u<?
Sh`?_8k??/???M?<EQ???AC????bK{?#?? ?c?a?s?D0??ie'???
H?V???????H?_R*X??	/?C
??
??vhr??@+6?????b??E?Y??V??\fF8t^??????KMH??/y?C??%D??E??
ap/
^
??%?d?j???
G??D at v??0?q1???fV?2?=f"??m?0t
??l?W'?
	`fb{?
?KE?z??
y+??0r9?
?
???
?=???v???%?r'wY?H?E9??(=?i?d*!~? ??g)??'L:?-?hh\??	 ?1?
? Hi?7"?=mB????!????]|???~?	??~?U??5c??*?????@I+???
???X.?iCa?P?(H*n?3??|?10*x??"??

?_B?2??(???????0??[zRs?x??e?Qz1??6P#a???+??L???H?v?F???????Vg_?(?Y'?????OI?b?9?9qV??d????????????Tbn(????????D??????????Ct?(?'6??Uu????GOTw???? 	?M?}r??g+?
?6l???&????{?~:#
??,??+&????!~?ciK1?U?6
?t
??
?C???0W3???=
@?c?7u?
?dG?M??4F?rS?P??=?"???q??????a
??6?7?*???+?w?????}e'??jF(
???F?Q?(2???6ih2
ip?x??[??g?u8AT?h?A*(??(??+A<??>??R(?)ah??0CR$4"??XZ?1H?
?c2?)7Ji?2cA??????qC7??F?2uV??7?ud?c2?=?&?
8?
?9???????????%???$?7Lb???Vs?b??????????{?f?G<??I???kNoX?}????-L?3???I??Yt??
?`J?N?a???M??
?
	p!?)r!??M????
??}??I?N?tl??(vM?=???smX`????yp???m??#?MF<????=<??)t@?????:????
?N??u?
?	???&??7O?mT@r???-2???????!??t????????_??A=??-N8?6??,?CF#q?B?????o?HA?????
???^?M_r-?
?u??s??7=??I?>M??=??]?p?-???<???(/???????X??9%???C?b
???]??????=?a??????t?$]tS]???s.?????3$1k5??q???db??=?K???oQ??0?y?"N%^??M??t?^??{?:???????????o?>?C]?S6?YO?u~???I?c????s=???
n?&??X?8??(??X]^??u??????M?????}?????	?\gtF??i???:?ND\?=J??q?#?*|?n??K???Mt???????????????????}??;?i?J\,>c$????}??.?Da??'???9?F?????8s?y??!&??????`?,0
!??6????b??L??? ???F?-?.????o???N(<vAl?
??P???	?4v*?N???:?????d`???*?????????O??^????"? m?????M.?????U????i??>?G'?B?O/.??mO+???j??h?Tm?-??.?9?????	????y?T7N???R???N??M?f?t%?4???.???{??4?????.??E?????
??????}?r?????]????????1??V???n?u??	??oPx???O???n????n_?b??e%????}????I???&??Y??-????+?????o>????g???????h??????bX??!???4'?????_?Wa3?Q??I?#>q????
t?P?@?+?8Q???=&??1c???B???a?_#t?r`??_??9??D?W*?9?d???y??1???K??t?N?
?>????!?X??L??	?n%?1???????P???U??????K?C???ucE?>?9????
?}KTqJ?Fk??F?I?*?;??I??3?}HZih?W
????5??	??2+A?'ek.??????????W?A??&?|q??l?R???????S???};U????>?;???%F?|?Q?3?{/??*?????_
!?ZS=?+?)??????????X?L???;????O??^b?8?^{???B?!??7?:???bp2??K?_?M:???
?8q{P???b???\T??
?L?C}D?I????????J?^\????????n?1???#?&052	?????:t?@?????tD??,?|????Q??j?????m???dd?????G2???*Ga?t?.??M4?+??;?;T???T?<W<5AC?L?;/??XIL??????W8g?SD????2Y??h?aK??O%?T1C???(
???????R/?Z?4?s?*O:??,E?8?l?^IZ??????^:??o:??=i?A?-S&?6]????[???;???K]????X???P????I%??bH???3?t?3???ZT?5c?????????^e?,?;$?t??8?J?????b??(??=?U???M??%sM5?X?????b??:_??v?M???XMmM??Bx??K|?Ag?<???]n4cq????6^?r????_?????p???V?qs?????Oou??vc?1???n
.?zQ?l??f????1F(?>??"]?E?)c3^?kfK6?:???-????cK?K??D?J???6o??yd?(?;?9A*W/???7??????D-fON?????C?2N?4$??GQ??????3?qn6U???RC???
3???TPv?[QP([K?aj?!p;????????oG??
???%}/A???O<??]ftEL!??A??sW?
?Dw???m:^???AB??]e?a=v?M=???) ??W?m?fiCI???F:?0qG????????V?C	???
Iqd8?TD?A<:|????qHR$z?J	Y???-/q??{????~;Sdx??:??????&??(??/???2?:8?oY?U?T??,?w;
--- NEW FILE ---
GIF89aoP
?
;A@>UV\bb\ii)VX0]a4a]8hjD/S;)ZE2hO:PXPYbYGuwqZExePisl?O}?c??}!?~O?l?~
??????
??(??5??*??2??W??M??M??H??g??o??k??u??s??I??n??^??u??t??}??~???j2?ZJ?nX?wc?{f?yG?}W?mE?xE?{P?|g?U?[?[?[?]#?b?c?h?r?f&?k5?q.?u9?k$?k2?r)?u6?\?^?]?_?d	?h?q?f?h?r?s?k$?n0?t'?x4?l#?x(?{6?}K?}R?yC?|D??{??m??r??}??Y??K??Y??i??u??}??e??x??|??>????-??:??>??+??7??=??K??T??J??V??Z??g??F??T??K??Z??F??S??J??W??b??e??t??f??q??E??Y??m??x??{??h??u??j??x??z??w????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
?(1??+^??cC?????$0?"A,V?!??0Uv???fD?7mj?i??F??V
LY?WQ?e???????<+J5???H}ju?5gS?P???*0h??h??]?????p???w?+]????%-/?\?r??E?????.??p^??K?<?2e???
???of??2??;3???`eV?YWf??	#V???b??7??{????mC?;n??]???????????7??x???}[?????\???.??????sg?r????????=???n?*?? ?b$4]h??&h`J0???t???Vh??f???j?G at R
8?\RM5?T??G?SL??O??\l!??ZTq?!6vqD@\aE?F??a????Sd
??FT?EXh#?GT???Ya?*N?eVaEX??SL??Bx?D1jq?nZA??`LAE"?XS?`c?Y\??B\?&?1Va??iN??UX?e?U??xNh?B????kZq?_??YHT???
TH?zH?E7
?fTl???Fk??F+??j?6???D 1???V?????????Z?.?B??.?U??????n?H??n?h???eX?&?>K??k?G"?$Z
&?L??%?x?7? rE"?x?"{S?%?X!?7{q	8??X???\?	???q!?`C?+[?TR?5???G?m?QI8???G????D"?\cM5??QE?`??%(S?g??N%y?Mu??d?H?`c?!_T??%MxAI5?\?s
&{hg"??
%yq?%~3%?^L?7?\b??X??L?Q?Tw?M5?Sr???@r?1?????s?z?Xt"~RB""f`r
$??????k??7????0?4??0?4LJ?4?@?s?@?$?u_????$????_?????~0?g?}??s?>?????????>?
?_V?c???=?e.w??;?PM
X?6/?A?_p?q??z?????1Z????$$Ihs???
????-J????:0????@?X????*???Jza????e?
Da[???.T?Q? ?-F-z??V???????{??
???P??o???????EDQ?|???EQ??Q|???????Q?B?h?m?O???>?]?
?b??b??^X???D??X?B?0Z1Y???p??S?x???3K??&E$??3?q?g????xp/?
O??????FU??Zy????
c??Y???2VHT?
H?0v.??`? ?=???o?
??????????%C?B?(D??S?????4s??eQ?t???
j??3???g?\,??P?1TP?8????Sxic at y????o?Z?b???@?q!A/????g?h?????X?+?caW????(\a?b???`?9U?
K?:????:	N?#?F???c?? ??F?E?cqI\????5???;????h?u?K7?Zv?9]Aq??f?V/.
Q?c?:??
??????EX ??????{+????x??<K?XP	?)0?:R??C
0;6?
W,??Pl?/?????H at +J????B????c?#??(????W?B?q
J??v,@??':'"???O??)???Q??#3?P?g??t????Bl;????"+??Dr[?x???%>????z??%??FzT???yt??d7??????????:??4?? ?>???Q?????O?UO?wJ7?L??=?%
??
h?
??q??H??P)????@g??w??B?c)?
??
?
?8y???????m??P??Q?X?`??

?	`???
????
?????*
p?8?9CDz??
???%?c7R?b,@
?O??Y!K?? ??*!?H??
?(@Tx??@?DL?L2a??=?4M?7Mj??r?Msu??Y?ha[??=Yq=Z
}h!?z}j?1? ??GM?#?K?>bJ>?G?tI????uNnJI??~??<B%`??/?.?4???.i?P
???????????Z?????j???????????????????
????`
?/]?-?j??s???>? ?
L?Z;??z??S???V?)??-?
????dxH}}????????K?A???*>S?MD??T??Q{@
??3010220?L???L???????#,?$|?&??%????.??,??0<?2 ?1b????R???=?:??R?>?E???ma??.F?K?J?
?K+????????R?Vk?k1 ????r?

??????A??????{?dX4?I?????Q?d??Q|?X?O?? %?`" $?$
1I?'XB?$???4?0?????S= ??u???%???>?k?"????????$N??->??qQqz?????<????^?=??.}???????^?G??)>??M?L?
Mw?%?????9?Cdv?G`???x???
w?&
?e9n, ???,p??$??l??-????%?????~??>??.?????^?????~???????????.??n????Z*?DN?t
.?L??????/
?b
UkzXE??`??y'P?`??v?0D-???T|/OJ=1???

?q`F??2I????*O2??????.[???2X??=%~v?WH?AW?DJ3gN?&7??ePX?U?z??U?U?]?~????c???*??V?\????v-Z?[???JW???{????l^????=lx?V?!?+hq?M?/????Ss0?:?\?2a???o?d??s???+??)???N?GY??y?h???F?
?j?????/??
?M?7?t?????~??????=?s?U[??[???RS?li26m??y???^4L?O9??H>?p?????)??6??sP8??*;???.??4???
??C'4?9/????P??:?;???~?H=7????:??2??k?7U???D??$t???|?'
q?l??:?H?D????2??8????[????C39?O:??s??TLM?????
2*	?/?#??D5???B??'?l?(??03)KGZ???z;A?`2?GO?????F??3????4??Z?C????[G??Y[????{3.???A?S??,Ajr#?H??Fk??BhO???l[?&-?C?!?Zr\??e?[?f????X?!?b????_9L?D_???8??K????N^f???4/?gw
?????Ga?4???TTK????????2?w??Q?Ok?f?$?U?cw?S:?j?7:??uN?Wdz?4?l_>??F?E?????????????sC+t?TyU!??D??ji????????%3%M??8?<??,b???M?	.?:???^.??? ?n??>???N4g???T???U??)I?s??????JY!???q8????q?o??p??_?N?????s???^?e????X?W???n?5?09g????f????	?Il??=F?????.?~6?B?V?6x????????????q?D@???	,?
x at 65???????a?"cqT14????+|3+????
?mi??	?72#9????L
??v?|)?T?~?C?D????&??1M??????7A.?E?k????D
>??\????E2??Q,?m'#a????@F??Q?(??Rgn??C??cpC??E>??puQ??x??)u??^h??^?b?
Yn??E'1??L?????d&i?K[?????-m??Xb2??4e0/?_??B?<C3???e?????/G??_?r??\?-QyK`
{<?XS?q
???p??a?	lC9??<?PS7?A?p
)p???7?9?o>???\?+??a?,A?8A?0jN?'??K??{u???U??/??t?#2]?:C????W??<?:????????m{?e7????w?{???w??"?hO???o????7?8<?> ?V???0y?K>??B.?y?o???}?C???>Z??#?y+X
?????0??_
???B?]??)d!?Z???9???[????<?MOz??
???HO??7_???>?????[?????"_??O!
T??@*H!???=?1O?????/=??z????V?o??r?cp?:?=C?d??/c?[&?<???????
?????@)?J?k?l?Kx?"?H??hk ?'H?p??B l?j??B`+?o?Jxk??jX?#??(??.??o?(8l?&Po@?
kh??C?o?h0?k???&xB?o?B?pH0?p???
.??BC?o??Kh?A??.T?J??B??K?n??Kx?K??E?o?&Ch(?k?n?.Hx????p?h?Hh"0Dk??>??o??D??2Ph?hp?A??E ?FxEBpkx?E?B\?13H?Z?k ??s?(??\(??p??&`!?>??!??=4?r4?s<?,ho?w
???9v&?a6????	cX??Pc???
??$^?&??K=?=???0?uab_?
L?a:?a??^?????_?_V
??P?????t??	,??T???0??????1?`a??????aJ?_??
.	?	a???&??? 
????H\@^V?YF?_????v?????[?e5?&?K?T???^h?$ml?C?\h????g?d?z:?a??^??????xXG??*\_???
?Y6???T!.?dbn.????}#??X??c.?5??(???T h!6?X
k&	???8?Tu(??p?7?a???*\??????:[(_???`??????b??h?? ni??A?a????X?N?~a?[9?K?A??.5g????Vh?&hL??z?`i????
s?? ??u?5>.??????^Pc?0?<f?W??v?PcA?g??????e!??.h;f!????P??????e??W??X
??;???v???????b?h`?ZPu?f?NT??@???7??/b??,???
?R?V??+R?bQB?^%?JQ?W/Q??B?X??F???@T
c?J?u??S\~????!C??????>?yt?1???k?;x??_??????????z???_]_?????????>~1
6?????\6P[?g`?z??W^?E z5?i?EXY?u???n
3?R???N;???
? @>)??

??L?R????zE?T\x?9"YfQ??ZF?VYs?????????{$>??W?V???x?U?0??L/?cL/?X??????c?0?(?????ja?K?j?01?B???0,
?*????.????K?4H[-??&+-??B?-??^km????????@m????.??6?,??B?????;,??2+?????/????m???K????B2?
)???*??B;%???e?X?B	??SK1?l?J	?#?i? s??w?8??J?\?ng
I???|?????D@?S?282qB
??=???p?Y?6w)???O?_T??8?`Q?z??9??g}l?EiPr#c??,?E1|!?X??????[?9[?????A?\?w*?d+2*
~?bi?Z+6j?B??h?f?^????xh0Z1?X?!
t4P%??:??N>??
?9B=*Q}ZT
t??N??4?%?J?A?j?l??Z?*W;V?jU?^%+?Z??V?v??eM?[?????u?k??]?*V
??D?X0?d=m??Az???XFm?c?k?u???@bL??I????}?" ?>?????????|??u?X??f???B???:X ???NE?UA0|q??c?k?Y?F*??K????*????M??&?????????^??????
y?;^?????IOx?????>?u?x?+???7+
?
??????>???????Y|???=?x?????I???8??%????Rl?J~?b??u??&I????'?n8GE?RM(?????9?	??iPu??>?JG?@O??S???C}rT???:???ij???J?J]??O???/?Y?:?O?*f0???^~???0???k?3????5?y?}?r?????y??.4????_??s?;??>??s?j???%7F???}?%?\?GIc?????????????2\x?X??j?????S??pJa????\??nj????l?.???^[??Tlg'?m?n???t??l???????B??? ?C^??(??zXe??#h9'??????&,?S?y?;???q?l????~v?.m??m???#?bL?&?XQi??k?K?????(u?@????i???\q?~??"O???q?$??0?s?CUL????????????v???&?w??u??1T?|?5s?9g?9???y??_?E
8??-&?^?gZ?3n?c???"??%?W??A??6?3;????????_??=????x?K??~W??
/yhS?g?f?|??q??GLu??a3f??y\#gmv?{?c?3{??s?z?PB?0|o?o??VZv??+y?c??????dt???H'???o???)???<?7?q .????_??.??Kq?4=?t?Q?%~?W?\??=~???????>8??m:???I?9?=??M??-??????5?`?!`?,???I?qOP?Q??????????<????cU??MP`]?Y?
?1J???]? ??_RC?Y?????` ? ??5???%aV?%??_???Q??^?M]??W??????	??J??6E???;yQ??`?%?	??}^?OxD????Q!?]_?0?Q?6??Y`&!"B ?9?!?I???TP??(?_?a???7???$???!aVg???? ???|,
??"?T
?
"
a#B`2!.b? &"?H? *]????"?m`R?????x!????m??4Y?(??YLb?P??X?7P
????w\c???0LIs???,b?<????,B_!>??RW/??.?	?I?0?Q"g?Z?| ?5????
F???%"9f????E????c???T?	???????????d?9J?$K?$L?d???K?d?!N?dL????$M?dN??N??P?dP?$QeM??Y??O?"??*???PZe???lcVrc??????? Z????e6?a}?F&J6
???\?,TYT?Sa??$?P=?_6`??SE?`?a&b&a?a.fb??c2?cJ&eN&a?e`F?]R??f.`Z?eg?%i6?hVGiR?i?&j??R??i?T?i?_??
??(B?Y?O?h
V??D?????p????:??3r$?D??ud?q@)??<?
8?4?<?C=?C7t'x?C=?gx~Cx?z?zF?|Cy?g7t?w~Cwv?}n?=??7??=?g}n?FC6(Cx?g6?C=?'F???7??2??6??L???'n?7DC4??wf?z.?z??24}?g4???(|?g?y?B4??=??6??3$Cx?g=dC6?????t?'??(~|??wF?g?`H^????z_6?)f?)v??^??H??B'?N8nV}xV=E??%q
???Q??BP?>?=??>??>?)=??=?C??>?5?????>X'????=?i?F*?????i???????z*??=??>?????????j?????<?*=??=???n?<???f???>???b??????C9???
h?J*?v???*??i??*???????C)l?:???VdX.???+?m?f??3j]Y??*V"???S???Gz??i%?5?q?_f9?7y????9'?p??U?!$J'?8H
?a?&?E?>??^?6??W??M?c?????????X?r?k&???Y????????t???UV??A?ov?u"?R%?????k??,a? ?)?L???CjSJ?B????a?E??_[??9?
l???'r??~+?0??A??h?C???,o?????c?????????V????8?]??)??-*?????d????????]?`??!nB????fy??$?-??l9?l??,??????YN?V?????}???&????5??a????}V????m4??b??????I??
?ZV?????)z0U?V???DR?@?f???J`?`?b???(U?L??a-!?d?2%?K?)?4?e?,4_N?R??O?E
?T?3iQ?L?F????S?N?R5X?	7|?z???0????-[Lm[?o???;?n]?w?????/[??TI???>|??%??/qc??!G?<?r???????/?e{?'?g?1???^<?4?~?Q?v????????S\?3?????????i??0#7?o?????{??9???o????7c??#F?o4l??}?FM??????M7?5??????MX?o???A????C?@??s???l????'u???????/?6Lk??:?/?2&.??0QT?EW?????-]??Fo?1??v?G?Tl?????/1L?'7???`????+?D?I(?|??-??%E_???C,??P-???D1?????6$L-=??=?"?'???C;??NC?TO???.DU46??M??4M?????$??4?IS??T??Ls?6Cm??T??????,?-?,fVH?j?-?j???M]?X\????N??M5?2?c?4??_?U?O_Y???^?,KO????JI??v?s?-vEq?P???v?x9u?C?????N}?]?O????Se?R??H7?????-?Nq????h?%?`*?vC???kWaiE??~i???????b?]6?C^?,NI?twe???2?,M5?,?te
X?
?&????.?i?
?k?
??d???\Vg???^????e?x?3?a??=??o??_??%c????Zq??eh??@?D?d??Z?r]??':? C?@??NG??D?md???69?cx?0?:?V?I?-n?
???Z?????:Z????p'/?QQh????-??>Q???0;n??
???g+0?P?Cx?:??uH@??:t!?|(@*PA>?a???0/??W?@???
H?-]
P?4rn?G+?)?
?U-%(A-?H?<4?*??;A????*
??*??
???hE	r	?b?u|?3Q/$P??#?$,??x???#2-?=o?^?s?)u?.rY?VH@?k??(???8?sn?
?????HS???2??|??j?&??ym??*.????"

^?8}^_???6????4
?m?m?,?[??n???1l?4Q?????}?`?t???;iK????=)?R_?8d?L}j
???????????e?|???R=???k?*?E,X?
[0m??h????:a4?Cgke+C7???:[>dv?5??C?n?? ???"?V?c??????X8???&???Jt????&?LmJ?h??@$??=???H??????&?\??-?????8?V[-|
7?i???
1???E+??D5a??q!??w]??????[]\a?{r?f2???u7?i?nLzm????Q??f??_?u??>j???pT/~?a?e,??v??B*?)<,?z72\?nR????e???? B?????y??N)?{??i????????E
 ?_ ,H??V`??????d)?p?
V0
??
	,`,(????uu???T24???(DY?P?0???n?9?JM]1?D????CG?0?.????d????&"???J?:?
n?q???
w??
E???SU?~????????
?:?????:?)??????/?m???Ct%O6??DD???p!??b^?fx/????
??????M??/F???p?P?-?B?.n????Ddi|?
??????lA?~)m^???m???vNz???{0e?|o??hI@???6?7I-?(?????S|?!??{??hy??t\'?sGc?j????v<QH?\?A
`L?????kJ??r,?f	-?

Dgu?5????a?~??
?L??>??8?L???\kT?h?????!
??pA?ja???
????Z
`*
?A??k
??l!??M at U1?i?t
?(k^j?!
l
?4???<j?i??0
???T at 1A
x????<K<?????)???X??T oJ@?Z!|???5?^??Za??)?lF?R?j(Ki??D!
\??j?m2?~????h?t!r?6??????_k?l$`??k?"U?|??? 
?/?!2 : ?Y??Z|?<?????????3?2 ??:???:??z??;@????-

,???,?;?lP?+???a_?UV??b"??!??~	?w2d
?????????l???*?
??
,???BK@???Zm
?n????N;???z?,?????????-?&??K0#?RM???Q???8?v???_?sZ???????Z??~?J0W???w???Q
?1??7<?zzRt???U??w?:L???[?9?o?^'???????H?(??
)?????^??
???@>?$`?
9?a)??>r?#
?@B??N??????
Q??(D?^??b??
??????K?a????k??H?
a?$^YEl???~$F8??N7?S?
_s';?Mr??#?? <?I??????'E?Z???'???N?3?
F??]1l??b???
?_?????
lc??$??+?a?J??+?dA,b
Q??7FKD1??????#?^?A+I?z?gBa?"???Y???Y??"??T???3?DS!$a5???6[??t?3?&rg?d?$)U?#?y?qc/2???N????1?t<S???
c???K?`??isA??NO??????`0??I"Cy??T;X??^89R??G???wT??0F-
T?@???2?c

h@^Q*$?v??*uZ/w??i{???????ncGO?????s???T?????nw???^???t<?-???:C?h?.???)??w??Q????OS??????
??jq??7??"?EF?
?X??u+.0j_?B?h??J`]Q?b?]H????^?/F??|
2????F??XJb???????=??"K?u?#?????????U???~???}?????;???/??????+?????]?????M????C5un"x?V--????Oo??+\?Gc??Y?tNc???@??@;??	?c??h??%??,?2? ;?J?
?P???;W-0B?A?18?w?(?"(?*%gwv?!?}\?+q?$?*??+??/??1??3??5??$?6??7??4X????@??6?&?H?/>Xg???up??}??F&?*????xSH3"?a?q??a	?
5?P????
??k(

?I??
??;????s?` ???P?;%?
?q?u?Mp!??$q(a???[79?Qi?$q?gw??~??+R?
?a?[?))?FR?VuqF??m
K?x@?CN?$?8
????/?-@??????(????????????(??h??8*$
?H???6??`????F?r???x?
??
	?/R"iD?I/??????????)???X?#y???+?,??-	?+i"ZF#?v.1?M??d(?$i??~C?`C(V???[,r"???0z?	???&;??
? 
k?
????Q?P??j*`?@?{E9?S?Y~P?"0p???????????????????UOX???v@??1	S:?8h?I0?h??U??1
Y?bBiFB?&)?
??>???}vx?????
z??~?'O?G;Yg?*iW?`x?????(??=!??*?pDyqX1(?Y#c2${J?u????uv?#?a?z$/???j=?????=w??h??`??K:??1O??????73Tu(?%??'?
?????q????9?T?OX=^'????????Q?:???j?????a?????+;???JZ???O???Z???i?i	{[?????GF??
S????g1`?????*???#?z????X??~?y???jv?z?
??
??%??.hg?E??k?`{G???V?/K??Q??t?8C??????/#?A#]n7*>???:?.Z>Y+??#?c???X?e?=Y+?A????A?>??!???v????:????????>????zK?LApo;?????m?
?";??
??i??a???????I? ?%0?????V{?T;?????u???@????9%'+0|g??'?H?U6??9??????=?
?????k???{??+?d;????a{?Z????1?{?O????T??0????Yh??TX?R?????^?e?;???????z??????l???b?????d??{?/?????$??????n"?WQw??`???'????m?Z?DI??3?Nx?????)|n???K?Z[??>???S{?3??????;vnL?????A?$_JU???x??^*?O???Q}
C????*|?}????b??sL?o?<??????Kf??
|v???=???-?????j??r"?y?????[C^????G???w??????!?P?)??yV?N??{?e???????v?????";?u<???v|l?4??
1????*????z?????}DT?? ???\??{S????m${??:??,??????f?????b??:b??:?{??{b?X???,Z?9?l??<?W9??U????R??????i?7????m?Y?b??}9?%[??????9,?[??>|?	
?8-??z?
????????????N????????>???
/?x!????`?F????????Fx?????????u??
?`?0?p?@??
?P? ?`?`?
??? ???	???@?o?????
9O???????-o??
o?
??5??~?U???n?????????p?pE?e?Y????
U?K???Q}Vg
7?o???]????/???	? 7??0
??9p???~?0
7?9 ???@
0
??
???

0o@
8`i ?r????8??@p`
????
???????????0?7?
?
??
O
?0????p??
h?
h
?,P?&?:zS*???>??tJ??l????M^?n????'oN2|??4?w/??o???????9???m??p?l??1?6??3f?iS??<S??}?[???l????ko??g?????-?2???=?????p?(8??
?3????}?6'Z?9???uv/?f??Oc6?????k?6M??f?lGl?Y???YF??q&?lS???  ?%?~F?? ?j$?????j
?-?6???2|??????+Y?	D?rb?+?F\?C?T?q+_???a??'?fJ??21&?zF?u?Y??v?1F,?9?-?1fuz??*????b?IL6}YL_?Qg?x|aG?;?T??,???Ou????u?a?@?4?Lcp?sNv|?r?wx??O7?L9?l??)?4?D?,fQ?v?T?J^???K,a???=??c??sTatr?]?5,???Hbv?a????|1'_?|??ds?V?%?z??e?????
W$??W??J_h??Yz????s??G?fw?pq??_??????????+%w??1?r??????R*?y?????z?j?|C?V'_#?X_cuZ?*d=??_o?
??$K?6??T??f?it?f`]?JX??U?B??z?f??*???J??g?)6?X?????
?[??%??C??xl?????d??e???
??????(a?F{b??
?fy?????????'?????;f??<??/|??D?k?
n???/?Zl??Zz????????U?Cco???e<6????=??I7?[??>s?I????9?[??{??j|??u????Wry?I/k?K7?????????1Z?Q????l?????~???lwnS	??v5??i??
;'2?].o?S`Y??>??-xdk	?*?A{?o{|??M?????+MY???5@???u?3^??w?~%?C,B??r?C??(kIZ?h??nC??!I??A???w1;???m??r
??6?
/?4?I??1??e)D??7???Fd????Eh??,]Y
???G4b?k????9C2?'???H%?o??c ??V???1?j+??|r???QiYi???????e?tc?(I??2s^?	?5:"?`??e/q?>?p}/???????R%D\&?pX???f??%*??K+???d?W??;P?
?jc?FhLn*????P???7??qF????
????m??{?O???zYN??"f5/?????W??c	#WP?.|q?b.7x.?Y,?h??%??Q']h?ONe[?|#I?????y??& ??n???
?)???4?2?*y)??&?W??W????4??????<b$??8\???l?M%???0?u????	<???Q
*??H/???w?W???1?{}_???3Pj??+?%????v??S?H`??#!??0??V????e1KY?rV????f3Z?D?$?0??/??_#??%]l??Z?????i{K??????oK??$??j%???????q???`Dv?aT?r??Z???\$?ny?{??ZW??%nz?[Na?????I?z??ZH???o~??_???0??{`
X?6p??9?f?#?m?/x+[#)????:?/?>7r??C????????]?c??5#?\{?a<????g1k$?]3????.?6i????'??o9,R.	?[c,??#?
F?*??
???~o}??%?r-?u?lf??)?W?q??w\? ?x?I>r????+o?.8??4?
??????'t?	N???{?|??>?@,@?s?1?~?]H5????$??iB???@?@
??
?@
A? O??%?-?,?TAL?|???tA?A?A??L?,??*???)
?{??{?l?????D?&ED"?k??b?G????D??J??D? ? ?5`1t?:?CR,E??+?D?K?D#?C??,??L??<?*??,P?/D?L??W?E??c?A$4?-?Ct?g?1,?Q?E_,?,?,?D??k8;?FKP?]?EiT?3?E34??E?*?Gr??D??D?(J??K?^?Ad??HS,H?4?#??{?\xB+??#??H?4?? R?&@f<H???"?j?I?X?G?)??G??j??F?!?????*?D?KH?<??0??K?+??K?D??Dx?%?h?0?h??<?C?J?H??=??x??????:|?,HKJH0J:??0??K??-??= ?0??|E???"??<??.8K???*p??X%?o????J??D???+????G??=?K?1?=?G< J?|?:??-8J???K?,?/?GL??:?-x????G
O^*?:O??????q ?O???$E-??v?N????Kl????+?/??Bk?k8?&?n?B(o?I??B.0?p?Fphk(?DMD>h??nx?C??D ?E?o??E?l??&?k??I at Pl??<@?-h???E??p??C??B??I?l?"??
?(??JH?H?P at pDh??D??p???%X?#U%??n?'??TG???D?-?K?n??(;??J?k???Gh?CP?JPnP?'??<??"?n8?#?n??@n?Q(P?C???nh38L?nX?0???DhI??p`????D??<GdF??B???_%???&??t??
k??Q???B9%??*?j??l??X??n?o??j??r?Vo%?t?Vr??q5????6?+?N{MG+?'(?DH?j
?yz??	???z???????l1?????2'?<?b(??rD*?r??.j?a??+k?'???@?!h}6??.??R?2"@???????H??????
?/)?????!o	?????	????)S??}x?{v?0?7
??{?c?.?<r}??|?|??<??.?c?b??o?H?????/?o??}?Y??(?????/?
/?4???????{?o?k-?/???8??53???~?q???+??}????????a{????%?W???,(,??Bd???,Lc??	>?(Q!D?r4?1?Ha?h??L_3#??????39b???"K?C????'D?G?	sS??bT?*?Q?V?K????4???XsN48li???
,s???a_^,?keQ?:??T?????D	.T?,??:??N?O????7?????j,\????s??^lgb???]???????v?67????Zt}t?e?w?.?;y??
7o?|??_C???i????z?=4H?amF6??h??Zy?w?6???!???????l??F?f8
??z??w?|d??W?AX?PLQ?|???x??H]9xYg#W???????$`_+??[R*?tS{??7?v??n
YeY???Hd?0f?!??)?AfX???h.*???/??bL/&3??? cb/???F??RL+?c???????s?-?d??0???1? ?K/?????????,H??-??bg1?jUg?r*Z?Fg?yi?????0?3?1"?'????Q???:S??*d2????-???h1?????u?z????u???K????t??1?????
??-???K??H[??u????)(Zf/??B?Z_??????Bj??~L,??SP??s???"p1? sKA???????3pF,?)???<r??g0???2?U??C|.?
?(.? ??m?9??m?-?2???c???Z}??:?z????~?-?b?Q?^??5?u???/???P?????
7??-??Yi<??f?3?}2???Ko
?$;????,??s?O? S???:??@nL
?$--}
?4?????k/?tm?1??#?F??Q-?3?:=???/?????l?tZ0,?O/,??N-	H??:)H??+D?B+H?@+???
??R}??r?`????N	?#?J0|"??????@???YL,
????#
?????6
??
;??[`?XW?F?N?*A	???]?z?E	. 
[?"
(?EV ?c?"???h???`vZ?P?X??%??1X 
_?????:??
79/u?
???Q??-d??V??*
	 ???E<jQ[?p??0?-?
=/Vk???b+bQ=?#
@%&???B&/???-??'???1P? ?/.?M%0Q-?V'[s
??E%?[?o?^b??. ???cz	P
?????|???????\ 
???4qq>,???#???Q?4J@
??E at 7?G??b<?-T?'Qp,???[??(??%`R~j
??
"@??F???b????(R?L?1
???.P??L??L^;??C?????hELKP?,??
???Z
]??????*D??????(.??L49??%?c-???b?b
?PG+6?Wv?b?(?x??Z `?????
@?e??^?R%?@1?a???C???]??
)?Z` ???E0?j????9S??Z6?p?:?xO
?b$??i?<?|C
eQ????+7]YP???@???<?o{hQ???+X??ua?b??x??z/??q?\??E?
?R??????G^(?x? %n/?t?{??u?kp%pd?"?s?R??w??r??q?KJ??K?
?????+hZ
? ?1
????
?????B<?????8P? ??C???/?H;J???1?`1`??(????mK#>L?|?q??F ?Z<???I?}?I??N??	??D?h?$?
???C?J???B$?/X?!??%?W????2D??D????I?H????F0??L??$?F?!}?L????
?J??I??"?XG18K????"??u??-??? ???P?^T?????T
Xvd????T??T
0L??hNU?D?????
M?D?h?iV
??
?bh?ij?<JKg?o??P??i>fV
qRJG?EJcA?
?P??\L??J?@?i??t>m?NGj?O??ld'B???(c?|?n?b?l???A?OTf/?	??2?%I=?|n???y?
.,?q*?i}?qV?2??G????cI?H?xN????$
?
??E ??????^??1????yZ?0Ha?KU?'q*?s??s?l<?e?}?'=I[?	????[)m
???ru?????&G???l???U?????????Z??????,???(??g?@
??rv'??Gm?J4?
?`&??B??q?i????
????r"h?????P???(t&gt?T?????Q????(??*????r???
4?i??f?????No??FH?|*???e???^?vd???t
CR???B???*??0?g?D+{?&???8gtr???&??(m?'?
j??+?"?s??n??slE????n?r??y??n0#4N??2
????H??_F?B??(?
GQt'?B?u??A?^??????6????A?D????Z?(GTeu2?F?i??m??D\??C?(?l?i??Q?
Gt????uP???Z??1\@x??Y?~}U?!?= ?yJ??
????pjv?q?$
????????$}?,^?Q???????#?lKo???H???????c?L??IO??iX)#?????,k??B!}kuP???1??,iQ?L,J?%??-?pz'??Jz?"???$????L?D2???????4???EO??i?????Z?k?D?
?D???u?K???F??g>rr+??DCtfh?????=??
??:?o.WK??"?"?
?%?0?B??h8???????IM?BF?M?N?`$h^prLJ/??:????Jz?Ux?%U?-X?I#
?R?k?"?
??????z&????(?/?	A?v?
?xv?G?H??zfNcn{????
H`K?g?????&?????I?????j??L???8%~L,*
E?????????(??IZ?!I?"k?C????L???jC?iQJ??? ?	???????L???I,????M?L+L????w???I??v+`,??Bx??0?????b?6C0w%??0n?D? ????y?L????F4?1j?pc?????Om?%=??'7?V?K?
(M??????????:Z??????
$?@??=}?5???m??
??/O?
?7,yQ???^Ym??K

?Ah???+???d	2??;'?u?
lK?????w|??s???T?
 ?????-\?=-
?.???)??Y???X?=?C?V??`?(?-?C,??????D???aX?
?F{!mg1?v?SWK8????v;I??
?Vzn?l9?_?)&;??lN\KH??0??bzQ?R?.pe$?8???[>|p?V?Q?[DS?U[???V8?U??N??6d?d	?Z??9???$?z?

???`??^j???ke!?b???q?J'wK ?0E?PJ?XbK???b????@#\8????????,EY??p?????_????\?,?Zj????Y?^?*?FCkdI?^^
P??XPe?
<???b>?-???????D@?pm????R?,??XO?
yH??b ?	g?
b?p?)??Oq?2b[??"K??W8E??O?a???%???1??MXE#?bx"I8??Sd?I(????F?a?1??O..x???b.????zQ'?@?{.?????; ?$?='?"w??4?I?;Fh????<?J?CRw??$?)????1H????jH?????????6??ES?Dn?7??&?A?v??bx?X?????]	????0?J?j?/Hi?a??)?E?h??n?????f???????~?F?A????8XwZu%u?#Iq??\g?`?rZV"?J???Ua?t??-?
`~??N?R?+MS??8?????^n?
{?Oc????t??T?;
?/;?@2???~?@+W?0?x??]??
??u?n5+\=?
??@? ??X?jW??u?f?@_?*????zu??????{=?X3@??NV???+`	?V?j??_G?U?V????\?Y????[-kB?
?I???0WQh?Tu???L??in??C?0L?)???D+\M?fZ???8?i0???9
?t]??d?????M???B??oiS?????c?R??????`t?.????&??^?g??&???8?^|?@?????m?0???i??J?????Q Y`???<i???$??4m???]X
?'Mk|.?1"?
"??<?T??J??7???jZ?????n?SZkL???+=??????Ov??}qS?B 9???R???J?s]?Lu?v??R??@M??&$??????u.??8m=?y?nq?E[??????<?u3?Q?z??????[??????n????#?u?:>????Mx?2?????o?)?l|???}??4;???s???x?9???o`j|???E??????????|?c=?f_??????e}???'?/^n?v??]??F2??????e/8??go
?
?p????
????????
???H?????H
y??a~!LE??~?0?6????D??*?E?I-C?
?$h:/
2EKK???;?<?s?f??\??a?????0Q9?????????2??&53?L?(+*??*?2(1n/oCw????
?LJ??????4?L?8???[??2??
 ??j?DmE??Dw???O??Fc??Z?Ek?FeGq?h4G???EM?K(?J/?????F?&??F?N?I???3??@
?)?Q4?+?2??rJ??+#m|?"????t??L??J????{:?|:?N9t?fp?(FN?d*)-L@N@P?F?H PE at QPQ`Q?PO ?'#+5?.?J\?T
?:??8T35B?F???4U??K?T?U?U+US7?R??|Z?VWWo??l??
?|6u{?q???k?????N?FS???+??@?Q@??K???U|??Z?3?s
?I?M$??.N??rM.?B???t]?C&???;*?:7?W?'\W

?}Q??m??l;?L<?n??^??Ir$!?????`??e???B at 2O??(?I.?x??X?V??7?E?	??????RQ?[sz	?@??JDa
???????+?}?q?A???????????B?????]????????=???<?k???????????}????????????????????J2?*???y?C	Z??W??[??P????}W?O3?.kM??O?????R??????6r????M?|,?A?O[??.?(]IwZ?^ ^?b?^?f?v>n?i>??o>?e??g^?k~??~?y??i??????????c~?????~???????{?m???>??^??>?????????^????]????????>Z?(gL^i?Cx?K?r????[??R???0??v?E??3>???K???qZN>??m
F?n????Ux?(8?Q9?r???
?K??:????K?m??e??i??x?o_?y??w_?q?????????????M????}?????????H?|?K`okU????Y|?1?????C|('???)k,@?????j??8FH@)X p???]?c?z???k?b?V?B????c??
?8?X??=??QdF????9RX???`t?Is?5s???S????{?????By??$???O?M?.5??&T?V???i
??_??+?????,??]??#[?+?j4???I?,???????o????n^?G?U?R?a???Wp????,??D??j]h?N?D	?K(?U
d?.?BV?,$????_r???2???9?|???i???k^??<z??5?c??=*O??+k??_?i1?UO?x????????G???g^?mp??U?|???\o
3?Xg??@-???A<?? ?-??/J????;t?L;?	???0?#?{??I4???u???<????@r?-???0????~???dN"?$d??Q?m???z\(X?r5Y????$0af??
?B?e?!tP??T????N?????
)??*j???j???j???z????
+??zk???Z????????J**?(3?/5n$|q?????9??I?9?F??7??Q???HJ?f???f?n???l?5?1????"o???-???[1???P????,?$|?H??U.}????
?????-?R1?-?P?(??1????('????)??2)????-????%?|s?8??3?3?|3?<?l??E?4?0???G?u?7W?3?)W?J;
??}s???g???J?S?!?w?e??P?;$p]H????^????
(?@
$PU8H??P?????(@??
??Q`?b???+?r?bTNQ?(??O?????)??eR?n?(?????"c??ky??????yU/?????/??I?V#c???7?b?f6?U??ZiUk???q?y?JXkU???E?#???_<B?a???
Nc?C?)?2pQ
?p????a3v?"?+?E	PO]

/[???*??????XGgZq
?
*
C. at bQT??8R@?v? ??P0b!P?`?$??@Z??>???}?3J)2?bl???????i
??C????5g?M???Lsj??Zk????????F_??yyd?GjB??W?l???~K???i7[]AG?h??.%??p???p`??#z[	,`?
?Q?(h????o?!???G??|?-???h?????????{???O=?G?z????????gO???????}?q??^N>?W?f??|??}?6?I?????w-??-???n?g?W?n9?Q??g??&??X??o?8??l??b??|?k?@l??:
?#??Z?????ot?)`'-0x??v?~??x?
?+?x)aD??$<K3???????? ??"?#??%????G1]
:??kJ?g??h Z{?ge4Lu SUm|#g.?Fg?"ap??t?P???,?
dL(?h?7?@??u{FaM?u?G?G?t7	F7?4&?6a\?O??	`?
?qc?eN?eNt?
* 
)p3`'p%
??$
?A'?Y??	?&??????4p??`kF?&@y0p???y???
I?2$qaVe?B-?AIh|?D{??X?|YEM?????nQ?hU?Z?%}aW???- J?!??p????Vi???r35??c? 
s?A??%
???)?o?P&&
?@1?
  9?DY??j???p?>?
"
&mW5@vP?_
?>?'x??J< ?"??Rqw(???g'??'??R???@40
?DB *??@eDR?$??*:.J? ??D???E2T??????W>??@?B:?DZ?Fz?H??J??D:?0???p??e?YL?3??W#,Gr???suM?T?})????`???h?%???0
?!s(
???0k??WH?v??%???!R#?;??E%T1?MAQ?qo?:?A ?
???g??F?????????<?#U0??o)??1K?+??????*m
?<???t&E?za??s??E???Z`j?Z?????'?J?HRiN????
??Oo????5??????'H?x
k????v???xi????4?2???3H??J??L?A$1O??R;?T[?V{?X??Q[?[?^?????
cT?0HK?Q?rj??iE??
g????&Fm?_?s?]?F??6??
?NV??|???ryQ3!Y8?! ?W0?9??;??;a6?av(?
Lr?)v:??F?
?h%[????????kU{??R?0
?\a??pu?Oq83(RA	r?????'??(u(????????)?????	???????????+;?E??%'?S
??"|0W`???9L?Z?Ze????????{T?v?G???EJ?&e??\?p??????7{???[?b-?? b<?1 al?h\?a?e<k??o?3p?c<?2 4P???
b\?~,??<?1 ???~??????|??,2????????l???????????L?????<??|?3p?33??y	????[?[J???|?????$d-??up;Z??O???@\|?zU9|E8??$?r??%????R??:??>?3?D????????:?s???:??
 ?:??
?lQ?????:?<???EQf)Q???????AQ????|?
??|8p?
??+?)p???:?.??eA??h? ?q??????*???Wq?'8??*?r-q??w?{??(?x??[Q?~??py?Q??L8Vx?????m?a??n?i??6????{?"c????s?
?
?pc,?
,p??>????L??(????????????m6(??????????:u?4g?V??[3?F??@?rb?
?l[W?%?a?\:n
??
??}?????}?A??A??p?kK????>???|???M?7?B?_?J?X??R???/?bJ??!??z??I?WG???????????8?~?#??%n????t??R
????)~????+N????????D?F?ZeE6l??97oFVK??????4????_F??Ty?0??????g`??~??=Q#N?@k?B??v??	9K6?p>???pM?????d?}?b??B??[2?nE?????
}[e
?0WF??I???E??0?(??????????
?$nq>?ID??x??=m^?-N?6???????:???h)??-1?}?(9??????l;m????k??_??>8 at k;gm1?R??R7???-(?(??n?????3?{}?v>????)>?????n????x^???:|??"????
?5????Z?N??
???}g??Y?????Gro{?u1R6??Dp??QA?j.????$H?$??????x??????>?~???????????s?w???m?a???p??h?s??N?[-%|?????'/?9>??
?..????x?S????????@?b????????????I????@???????????????q????in?7~?[O??}????_??h??Q	???
A??d??????&uZ???,?3? ??.cM?>mZ<g???jA:???????#'?????????????^?yN?\??aOl??&E??YT???s???m??.D|?cJ?/
?.?>?m????o?X????;"??\?M???/?"??)?????x?]??
>????8?F1????<????.?4?m??(?tkNM1c??????\u??C??}???$?_n????`?%????0K??O?C??z??
????D|?r?GF?@??%;e]??W?V?5n?e?YnT?Z??4??;?g?X%??\??R{????CY???q`?x??ij??Ic?7?o?%5?????p?u??\?#}nZ???U??e2???????_Z??E?'??v?c?$?
??j$??an#????C????r?{??qPaI{Z???'>?T(fn??????,[!U?h?3?
3???????T?????ugo??^????1L??J?`???@???qJ?01q?B!2?*u???L???v?+????t]???????-??3????? ?????T?^?B?yP#????i??T?????b?k??F????[?i????22j??????y?l*<?????N??>??????????7??.gG?
]??E?MEI?Yg?J:fk?
??;??*)??S-M????"???Kl-??t?`?h)?=??ev???T?A-????r?[?????h?M??;H?8/???,<????`h^????Y??q???Q?KE
?_???$/{ME[??????zA??w?W?Z??o;;?3z3???F???[?1S??????r(?T`@#?S;[P0???/??v???m&L??8???g2??????4??/??uB<???J?,??=6???l{?j??w0@????$????7???>??W-???V.64????x_x[H?b?f???L?`?????\X?g"???I?!c?X?[?8?:??l?-????]????????t?????<_?=???55???f??????|xr?;1i????j??$5??<y.?\,"vo0??&_?G?I?u??????u_?L)q2?Q7{???<?_?qh????O0??????w??j????	%??D??[v^??^?Z???
;??x??2????J?P;?~:?,???&?????=}K??d??J???Up?a??}?uj?'#?p\???$y?}c???F??O?V???^5y??
???Xb?????1?#??I?#z
Bl-???????ey??y3?c?-?8?#TJ=????-F,?m???K7?V@d+;j?>V??k,?
a'?`???#F_???$???2G?b?? ?"?DOT3'b%???>BAT*?%??
?
?B??T?d????H?TH?l????????l@????????H??H?X??(??9I?H?X????
b??Z=!??<???#?I??	
[*AS
2?E???d5n??a?'@???
??	?P
??O
?P?Pu?P?P??
O]?chUc8?a@?X??3S?????	A???Y?N	???Bq????8>?;P??g28=,D_
PeH??90]}?
x?g???Q8???	??z8?78??H?7H?S?
??8
?f??Q0{x?gx?S@??7~???Q?
???	(~?a
`
`U???	?`
p?7?W??gX?g?????}?3??Q`&v
`
X?	?c
?afx4p?fXdy?
P
O.?L
??`n??????????$??S?e??.<4?er{?????~N??	??p?j?c??]?b??a?a0N?%?E?x?`0dr,?ra@\?r??ac s*7?!????^???rc7?c??`??v??_??*?!?Q???*/3??1???????0?c??_?s\?Q??a????1_??^x*?m??pt?l????T_???????G???????^??nJ?h?#6??#???u#?????7?cGvg?-8?'?	??????BO?D?z?????????_o6?6k????G m?Y?????}??j"????[???!??=?1]??&?q
???%a?,*T?~??{_????m=x???H?????25lq[d'.????"?&???
??m2)?V???kR':n?(F4n????T%WGq?T????
V??A?*l?????'*4H1???1B?P???/9p#??;?dY??Da##J?R%N?6O?T)se??MF?I????:;?DJ?????J?*u???0?*??????([?L????
?r??????j1z?
6"Z?<^ei??@?A??t?n^?8	C????`?#G?,rR?{?????"???5???7sb??}K?"D?y'???zb???7?~M??i??S???U?Q???????5j?????:M?]u?????lU/?X??p????)w?v?6	????d??eA??x?t??e?t????w??G?y*h?n]}T?C??Z?e`~@ux`????]?YhbU????X{,BW?c3J5????V5?????Eau}x!P??EdC?1IW?Vu????a`	?fT?8?S:??fD~??w>??K
jhcIP}??n%?_Z?=???E???e???IV??"F????
????????????A?di?=?ye??H?a??U[??1j!??
???p?G[?5"?KF???A????mL??%?/BX???)ds??*?)?\???&C??[B
??tF^???VU^|?????G??i	?Y??E???i?????????Z%)s3??U??&0Ed^f???i?VB?X???????*1t}????Y??????+kM.?{??????	?+??r:-? ?q?y?3^??kb????qq???RU????"
???????'q?wMQ#?S????Nav????2?S77G??Kv??b?jmZB?????4???hVf??
wT+R''
o{?*???]#,??????@??????F???????Wv???w4???xJ?Q?8??7?y??;??9;a??UG???k????N????ty2??????????k?\???^????n???w-t?_????????~?4?? ???z?s??75
6?70q^i?'???_'bT????|}?v4??U(q?cY??t?,^?9?J??<??p?6tM?z? ?]N(?"???FC?x? h???jCt?aI$????G?RX??
?$c??>c>
--- NEW FILE ---
GIF89a?
?
tSiF%hK7jV)b[2vJ'wR#wU8{cfd5QWNHT{PyWFihGbG{fGzsXliWl}UzeQ{wm\HsZ`okRlsj|?7R?+|?K\?Pj?\r?dp?dz??{)?k(?x'?|7?k5?y6?zS?XF?mh?Wn?r??????
<(pa??#J?H????3j?????? C?I????(S?\?? 8??????8s??y0M0f?H?L;??$??;?D$???N?.?:U???V?f
+???c?b?Jv?W?l?????n\?o?????m??|??
,w???????0c????w????)??????9??L??h??5?^Uj??A|? 2???9??M????w?=?w????W?|?????Kg>?y??p???q??2\ ???I???t????"?4???9Sg`5i??~9??4?
?@i<?_??W?Q.??	
h??ZT?D15H!p?4??%????dA??g?????????M1??F?+R$?????zFx?@?IH|<2??K?!?F;??????r?8??t`(?A)??REY????<??#m???????b?|????>?'??
???????&?(??6?k??Cw?????lv?`Mi|??=???O\|??>????:z??d?:???O?g??"????>?H?gP??:??3f\S?7?X?F? ??:_L????S?"?q?????>????q?????6?n3???a???3m????u???????>?|#?m?6?zjp?? ?x??>?H??n?1+?k??????|
??????0?C???????yp_??v???
??:? >?c?mp?????????ATG D?????_?C8A?at?????O7iC?Ax???A?1?I???!y??Tx?d??????IAxd???	D!?M{j?'N??`CH?v????K
a??`r?N??&OR?9??u
dBQ?ibH9
Q1k?"???1?h<??9O?E#DW?N???F?'<:1?R??	??8Z#?IT]?8??"??aV?p???@l#\
??'?:?dG??nIHg???S
??O1??<?]??dD!JI??F?!u4D??nh??%?)????l?W+?}!Fr?Qa{?Q?<&P}???????
?	??4#??C?l?M?3??A?*?:???,??
?%b????:???QN?0??????OS|'????"?/?
??p?P???*???
n??????y?K??????B??MZ$?=???0q?U?D 
A????sg ?:???h?
?h?????.??GC?!???Z?,?r4????Fup"?>`)
2?!D?9???~?'??r>??%Q?t??A??h(????>??;A?
??t!?
?B??????H??=j?`?????R*??p??V???`???????`?a??@?fZ??p????l??@
kk
s??ow???P
?
?@-j
"p???

%P

?f?jJ?fz???????v
?x?????}~?j?}*??:??z????*??????H?AK?????z????Q???p???R??z?#1??ZU??q?\???M\???)?cV???q?G?@'???????
?x??????P?P??
?*?{????J
????_Z?O??k?k?[??^??e?? ????hZ?j?)??2??r??xz???????`???????{????E{????J?I?K????M?????k?3#?	AA?n[??zf$A??k??j??'???+????????!7d&'5-?Q?????.qCPi??IR\SE?5?G??!?NQ???7?Q??Q????e???????|v??+???y?????B?,????8??><?f;?k?I?k?|?)<?) ?y ???5?O?y'=?ah? BX??? ???#?Q| ??%???c?J????k
?S??P<v?D|?(?lo?]????|????>???c??
???s  \U#Y,n?y??$??O?s
q?q??1[?<r[""0q?????$
??>????>?^?~??????
 .u@P=?jR?O????]??m?91?I?????L?&Q?5?v ????*?@?3?????=#?sm??M???@?=l?F??Bv???

??q?D7]u?}????<?x??*???:?\??(??Zl0?K?1?h?l1\???Z?3?? +F?Z ?e3?/??3b*6F??K??4??M7?dc9????????S&???????qf5T??[???~&5<???????)/>???O????q'????????kd|p?%??ED?C??F?C??)gs?9????\k^z????????^???{???o??\?]!k?.???	F?????????	??q???H??G???bZ=%?-????dO?/????[vK??}?*q?PO????<??????????j
=(???h??a?????????{??G?*??p?z???^$???F:?g??8?
8
*]O??7?!"0aH
??#
"?r???F`???N
\y???;????y4	\7"1
???KV??7?

G
?@L(??To%???Q\xA?M_;?^?'C4?a|t]?:???1?+C?V
?7??}?!?CGx-f0/?P9?(m???F6v?
6yHE?w???kpt?K?b?6??:I??P??P?g?"?w?3?? 	1#	?F??(t??M??9$R?????KRR$g??"? 9?? ??`(eID%?!?N,?9?$
m??>???~?c??@f2??h ??8??A,?????????#?9????t?C+??
pN!n??5??A62"t??
X??
??
?	?P?>?z9????k?? U??]?Tt??rz
l???????????
??T
i|??1????b???Aw
Cb????W$????;???X?n0/??????sh\;R?DS?V?0?
q??b?FG?3B>rh??1G???~??/?V7???.?????\?9??>v?????-?X??IQ%?b?gK??}Q??u:=???y??QY???9??)/a?9;V??%x^?-??-R6DJ|?{???C?e???O?NjXy?|?3??yC?h??eU???;????????{???[???OL????J???r???2???J??
?4??g???"|??]\Q=^??
??nz?	??(?+Z???|????????}?????|?{ve??????=??<

?????K??)???8q	???@?? =?3?q
$A?	vB???A???^? ?????B%??@?	??@?!d=#D?$??9??@???1??4Z ?)?Y-?5Y?H????????X3???b8?5??P? ?? 
?(?eH<??e?
e??<?????????e??Ky

???L?1?)D']?????J?????Mr+??2=???t?;?????1?x!B??0 5p????B=:h??y?P:
??>T???3??9??yTpb<2?U????I?V*???#R%x2?:X	B??1R??0 ????Y????-OEO'Z???
?Pm?
6P?l?R???
9C???Y
?g???M-M??

\????tZ??J??
??Vl???(??R???s"l???>6?????H:??q???,?@????\?@?K????$ ??3 ???3*??_????X??E??UF4??$??]?m??Ll]B?O???s??b?m?^??f+??????`?7J?/???,8,~?^??Z8????*,?2?.??[8?*??a6??K?f8!???????????R,f???!~a
k?5?:?<p,6,8?'&
c&C at d5x?9?0??~?e!???baf??????X6h?^>?fh?^?~^???J???g?V??^a~h????g|
?DB?!ABfV?-^f?l?m?kN????m&?.?Vm5????>h??|???A????b??U??V?%ODPn????N???????F?????#??P	?9??~?????j?k?Q??Nk?I?8???&??Xk?~k??k?
????q????????S?fk?6??F???j????????U?Fk?????????Nl???8???????f???(?? ??>m??'q????????D??????????l?????l???????	????&?????n??k,??????k??k??l?&l?v?????fA?>?????^??l????.m?&n??n?>???
?6<??????1c?5?
??c?D?4QE?	?)HZ???Ub??Z)??$?"o?@2?4p???M????2
?l??jE??????-E?$B???A?(2?K?&???1B'?B?D?SKZnJ????2$=eTd<!G??7???????R?2?>
$6?R????:?[r!!??D
R??????)X|-?
R= ?W?????"J3/?c$?;7{3!???????;`?NB%???'U??????4??F?Z???*??1-??1 1???"
F??d<??&73????? $%oT?:A?c?:M??(?s????????a?w??????&?A?|
X??I?Y??Fj%????????3
???.pG?<??30y??????b??:. at -sy?b.????"y???N?-?6?%
?
??B??P$6??
??Z?G???+gn??h???-[?.R?h*?=?????n?????+???g???s???i??a?3k?64?b?8
5)	????b??zc????v??p????
??th??s??)__????9t???C?}?>r???[?wq???k/n?<p???w?~?/r`'6?8luq]h
??^???^-?v?"?TTj?!?!???%?x?#????'~H"R0???y??\?T?V?ki???}??A
?????y?184????I'3O??@?G=?122[??-??E?6?A?TE??!?#\??T?y?}?C?0)? K ?d\??6???y,???P?Q@??C?S 2???P?
z?h?????d??5 ~U?}hVs$??? ?S??>YC ?????(2?????
????O????y?C?p??up?????>???>p?6x@???n???#K???@,??Z~????Sz??}P??x?*?|?o0RV>H?;??n?$?
Bp???@?K(b*%??0t?????%????!??}
?Z??gfiQ??6???I?!.?L??1???}??????R?[?????>??L?jT;E??f??B)???#=f??@??]7????-!?]???1D?????8??-lq?'?<??0K?v?D(e???e?W9Ke?
b??????Mg
?>X???>????AH\?^???????`?{??)]@?e?>tAA?5??>\?@?")????(?T???t?U?x?D(?.?? ??
S?;?p
?C<????
??<?G8?C8?p8?0??8???1>?:?'?'1:<1???KqS1??:??9?E?R??????	???$?q]????1?????????????????????????-?B?Jo,???@.ho????22/?B.0r??!?/;$2.,C-??.,2
?+?
?2?p2??3??4??5?8?p8?C1/q84q81:???1G??_??:??:?Gy?_|q???'?1?V??????$???????\??n??s??A
/T?_?DO4E_o?j/Fo?~???o??B-?o??o1?oI'?.??.?4??o
n?e??
K?????o?G??J???-?
?????	F??V??s?%??F??$???La6?-q?WRr6????\a8n?^?tKE`???P??????6???nme?nn4i;v?
?8????A
F?a?F?d????v*??b?/?xc?????x?!9??9?j?q??j\??e??ew????wg???	:?q?z???FG???Nu?V??t?Ngu?.??s?a?SO+?M`I?XW????LQ?Wk5{??m-VmZ?8??gg??#?
?
`A
y?Q???
???/?G
w<$??4?W?g,???4
S??t
mX?Mk??????3?iNm??S7??
y?iPk??6 KQU?R?ZQ.t??k?hN?jS7t
l(*?0T??a
nP*?`??*j?aU?Z?
????
tU??4??I|U?^????V????Y?::4?/?rQ=???t3o[???DY?
h?1cU(N??????l????

y
y???
?gNb
j???
@p??!????i?????g8????3
h6y??R.@0gh??}?
??q^O}@

????H`?/B?????ZL???
?????&QG???`?S?????T??Lp??
????? ?l??L??lP???@???????l??
????

???
?
??`1?/?/??????F??|p?????
?J(?PX??R????L
????QL)?K?x??4??B?*?,??K$?,?F???Z??????0-C0???B?G?RR??X?J\?????T?2&?+#??
???t?Y?r!t??>?appAb???aA??]??]??@?e^?AA?a\?%`????fg?%^R5~?????(^?
???"?b????
??`??????f?????????m(??U xO?V??,e?????
??0J????xD4?Q ??B?-?
????O/?XDZ?:?22q????5K?(??v?8?i?swWn%dw9v'Y?v?c??w
?'m?
?!
?`
&?
??????X??*??
?@?^??
?d??:???
?@
 ?CN
L?m/#U??Z???
???r??/??
???
??E?C???x?
????:??J ?	?
L??

r??
???=v
?f`?(
X???o?l}?P?????m?=kO?(?n???c?VY?6o?]Mg????\???????4^T?? ?=??????l???????????"?v?j??
???_?6??.??;??A???C
?????+,?TqAbX?0?	4?:???]YmT????Zq????[?4????%???7?????H?u?m??&?????????q?@i6??b???Z???o?_?g	?)??6??+???\?????0?=T.D7b???OF??
??V?u]???&??Q<?om}???
a??A??k???,?????@	?'?>??}????>?????C?X?????^?|0v?}??3%??'??kbH]x??jAq?jJE,mp&???{??}?gP?e;{?W{?7T??j??{???4?&???A_??p??^
gl?g???Uw??????b??????~?d ?Ggc~Z}?????d ??
???????????^3???Pd?OP??
?>X??WY?>??B%|?S?????
\???T??
d@??m?`x???? ???t?????XfP?H?B??0????p`0??????"9??Jif?G??0??g+v???f?????pYa^????qwv?	??@??0?@???
??K????p??Z?0?Y??0d?pz?8??`J ????8????@| 
xp?????Jt???
Q????????`d
XIR{??z??}F?d?* 8~??=y?`???QZOXg`???yp?)?~??J?M??4??????s?S???b:l{%?^P???P??xWnH????S?&??*??F
?l?"?G????-qt ?b??tH{????G?b7St??4?????jh`P?Ox By????C?v.y
??9??\ ]??xm???x4v????\???UIb?
/??4??p+[2????
&???J??????R???8?p{J????p???*K_?@?=Z?? ????????5?????hMe?
?%
???????&??????
?t??b?^??G?A?\???g?^?/&????o?t?D????_J~???aC?m??;??4x???;5M????z9?Z?~?I??,B}k???o?K??[?"???Q??o??5????j?_?B?r?MH???????8o?qH=???6a???7??f??F_?|y8??SoH?=?????/?~}???????????SO<8? C?K.??.
???;???I}??
2????|C?M?EdC??>?h???????
?U?}@?F??9??B65?7??FU~????5Y?NP?
?M??)D?p;?????;???'}0]?n??f?6??vD?
D|?????$61?DH?@?p?3?p?]??6?	?|????;?Su????6?????#??K???D??;?S???????@?'4?pC}?!?u?`sF?????????<??b?u??(?5?? ???d???8??!?LK??q??.?
O>???q?#?|r???p?.?a2?p??6?ct??Xr??GDAg?????6Adu???m!D4??R????v?? ??}?Q????9'??????s??}?W?F?@L??ul[??9??C???A????a??F?????as??u7''?x!???:?1?5??u?????~?(x0?>???????;??Lb?@??}?S?"A?q???9??%Dlr? X??p?{???@x?o??.$\U7$6DI"?_?^???
&
????;"b.?I???(B?DG??? )????h:??!?H?v?"??o BF?????4x?8?s:q?|?x?; ?
gX???<??38?(?p<X,??X?
???AL?	s??+?1?3??#?$61??l?;XFq??q?"'Y?4>??G???IV1???cG??,.????b???????o???????l?o??r?2?????#_?1?c<h7???G8? ?
?x??S????n??Y??U???y??M?jt?
??????0?;`????0?5???????U}?0?Z?{???i??]???@??Q]ji???
?[???U?????????_?Z?v6????W???]?w??}?l????V???`?Y?Z?2?u?I?s?;??V:?'?kl=?????!nl=??+??<?p???;???8?[?Z???gv??-+????vx??Q???=?????w?s????5??-??\??^?????=?T9??????W;??x??8J???t?M_4??????^gZT???q?y?{????????l?(?f	)x-5i?????M???aK?!????}?"???g?_???~????O???????~?B????(??|g??:?w,???|??????Ux??|??=
??p???'?/Z">4>?2?"?C?<=??@?@??@
?????[??A? A
=n?[nH
????`0??/?????b)?2??A??h??????(/???????%???
<f?=?@???'???
	tn?</vVgs??)?????\??=^????|?g.??~>??.??#,?:???????	??n????!?-?z?d?%?>??)?Z
.?????sfgU.???????k\??????X?gy?N|?i???h?I?=?B??@?X?0???=?Ph???Yx???S)1t?1S??e????Y? @??>???x;9?K8V?
?h??
???

????!~?p
g)????y??????>???@CG
A:s&?!?p??4t??a?f?????9??LB9n??a??
6i??L????6([?T)3&??6k???3'??;???I?
P?m??$?f$?51????0
"
?B?*???l??2???>???!?????,
O???C??Z?<??j????J??
;?`??VJ
^????1x\???=??{ld ??F??l`<R0?A?*[9U??ap???8??<?3???P?0?|?3??o5?1
:??u?3????????s5?Q?B:??8t7?
?jpC??8*MipP????7:??o?:??&?7??R????
Gi?
<K
pa??B?d	d&>??B???b>K???	??`bB?%1(?|@.????
AD?D?aD?????	??	???M?N??9????+?@??K
@?4??#?3?\0d?0?NNC?$
?E:?FyyQT?????X??cX??Z<D???????.
??d)?L)?P??y=Dl??l??P???a+p!Xp)\-?????-q
x????U???x?P!?a??m?t??G?eG??Y?#??j???(?h?b?+?\???????J,???k?????~YF??Vq?E^?WD$??RVf??g?????6??4k
r???;????+?Z? ?9+?",????v?0?h?4WK?Ts??j??f?B???2??PoIm?j,??&^9??????l??Z?mkY?[?????????????dH??F`y???W??????_To1[B??Z?f?AB?%?Z???TVs??(?
?n?p?q?r??????B-??VLE????V??Te??k??_i?t???:h???Kq-s?,q?]n???l?#bQ?Zt?^?ms/u??m8?4n??
??????K???/?
?>?C???! Q8D????Ez??E??M?leXP?m?^????n?,R?.L=??v???WA????@?????ZD???h??q?mA@??UB4??.??
????nF{y1?We-??T?B?D

 L2H??C.?(???
??rN??P?H????J&???I??{????Y'?t??&l??&?t??h?b
????s??*?|??Rz% ?`????D? i
.$5$??Y7)?;?11K???3??(??????A??1&?L??3?U?=?D????/?
???i??U?
-T??????-?V ??^?
??6???Y3??5`p	}V?A????3?=	???=#89???????0s?	??#US?t5$8???=??^g?d?O]??N?QQ?*

%)??u?l?!??'<
??$?(?=???2\d?V9??U??I????F???????*?=8r??S??\??	??T?2????~1C?%e??g^Sl???6?vI???2???*?!7????T?5Ii?U???b?#???zv?Pg??.?	???
D???H??rs?U?B[yL???`gD)??}jm???h?6??}Ac??PR???'5)IE???*??N?N?????9?i??S???J?M?
T????:?R??04?H
?? U2?
?X??U?P??????`
V?ZV?v^(?Z??V?U?^???ZW???u?@^?j/???~???W?r_??b????yEn?\?f?8??-n??A???V??Ea?>??Jr???5?jY??#~???m??d??5?a???-lq????..nA\\???=?r???b?????n2?Q?d???%u???d???o2??e???5?2?k??????2???c???E?2?+?c??p;<`d??&??
??v<????????xP?????p5??aw??18H\?p?8?H1?O<??@???1??C??1:??c???=?1??Ld ???p?/???????e????"+;??O 7E??ozT?????^?e???)?????Z-?v??|?I?pW????
???`?f?
P??CA???E??nuj???v????i?X?$v?W,?{;??????w?X?A????
?r???hC??V?{3s?????\[?{??a??$I???W???O3??-z??/
_(?+x1r?g????m->`u``???8.?i???B???E-?{??????EE?K?
b,??(?2ta??????/?e?u????}?u???j???Z?????O8????*??gX???g_;??m?g???-??.???
?!ll
?!??m?o?????A??y???(???F?:p?~???@?H??6p??m=???????	^?????????hA A?r????? ??>?r??&-.
?<?
?@
&?-?@q?`^".?`?@&?%??I??6?C^gG!?c+V2?`(??
???=?@
Tv
?m0&^r*???e?Bj??.`
???@(?????+??<?4
?V&?@???9?f3??'?&??~???N3VY?wAK?*?4Q$4[55g?
???S?q?7syr?8???w????8kS??S?9$v?bH?@<??X4?
?([??
??BD?4	yS???c?
???<89??T?N??Q]&
68?Iw?c?????T??G?$*??[2dO?@??*U
:?e??YB???
??1???^?)?%8??

? G3???O?9?%F
z???D$??#;?:eY3???L??<?W?;?Ea??B(??=?C???U?`??
?????????Z??????HdiV????-3%5j????#1?OxQs?")E?@
d@?A???f?@?a[?d?{????w?A?[@?[???o?@?;?s;@?A
?????S?????I?~?2a0%7
<??
???D$?K??C????A??!?!???R2?L?I?
?i|$?@^@
?  ?R0?[-<??\?????????]????<?=}?e{??,??<?k?@>?@????????\\??!?kM??i??i-?????]??]?-??? +U3$??a?#7>?'??%?????I????{????)3lhd??%??*??8?`?????R???w??)??k?Ln"????@??@\??C???@0???a????/?????	\?/|@p???B??
$?9?????[h?!
??????"?????,??)??
:????C_???
????>?-??a??????rB34??+'v??y
V?/????'n??g?r
n???????q???_?_????% ??@??|??\??????>?????=~;??#?????D'??x`F$??Z?+?%h?V? ??A#G?8p? 4H?`??
Fl??!?)b|?1bE?=V4??@?%b??!????????8s???R??@?
?	?'??C??&%jt?R?M?J?????U?Zu???W?]?R????S?f?

{t-S?h???Q???h?t???A???
???/???7E?7?a????,?q???&,Ys???-??zp??|?o?yZ?e?y	j^<tj??q?m06n??????z?????'??\M??A?h&??n???;????p??o7??8fn???7????u?????99x?????ox?????r????m
?Zy
??????IjxZb?i?*?t??[????????????*????.;???6l????,??j?m??n??J;?????\??>+???????k?h?N???n???;???b?????.????\??~kl???1??[???/?
??9?H at t?dx????
X???0?p
?g?
r(???7???&e%?
}????s?U?h]bMKD?	?-~???0?6?J?1??

h?????
???
? ?Z?.??g
Az?p?l?I???"R??n??V??
?q???Xq???Uc6O??Y?n????0;?L?
????S?iX?v6?:,R!??
p?@?vRa??CB=??{??x???s?????g?T?
O??w?M?9???m??~{???RY??B???`,???]?
??=!m?F'REE?????Q?A???r?\?#N?
Xz9?
P?
???[:?XJ??ZC!???????z?ZzZQ?_???
???ra?????Iu&g?&k
xF}?EG?`???aHV0x??v??u?o?a??Ir"a?m)t???z+?rw?H??C1??????4a3??RNP
??NF??*gz??YtF???
?^??NZ?iA?K?????nq??{t???;??:?eK?M?????????{?I??p????????????c???????Wm??)?_???K?Aw???g?z??aa???&??'l/??$\????.??(??5??q??=
?lA??*?:\?61?)???Z????
????P??<??Rl?S???J+?????2???:?f|?h??j??????/??r????'qXH?+z?&y??{???????????<?????????????????????<??\???????????????<??,????d(E
?s?????/??|???????s#>?5????&?+^?a
}?-?]?m?????M????? ]?"??#??(????-??L???????8??;?s9??:??@??B??C??F?D??G]?H??S?_?3??@	?`??????	\?	Y??Z
?_??[??aM?\??h]??j??nm?c??m??p??i}?r??l??w?{??}m?u??-?s???=?t}??M??????????????M????????]??-???????????=????????}????????-????um	U}?(?
??????A?G???	??	;p????????=??]??}????????????????=??]??}?????????????A?A0A>???p
?@??
,????Z?J@904?6?IA???????F??1???J?~?n?.?^????$.?!??'>?&^?(??*??+?0>?/^?)~?.??2n?9??;??4?<??>?E>?FN?J??A?
?^@?P?0K`X
??D
l?Pp	??d?y&u?S!??d?????v??n??l??&z#vA#???\i????}?r?>??7?v'??K$??S-!+<q?t~?p??sn?{~????>E+??????????.?~?????>???????F??
?X??Q???)???[????
1Z??3???.?Y??d???
:?@d??	o?u2?'?)?(^?????I??g?!???p??????.}FKC ???	Mc
c????
?M0i??:FT>%?!?X??p?0?MR??@f??6?1?r?>
?0???I
D
D????|??F?C?e?	??)?C?BC????@]????d?8????&2?VMa2mj??Z???????zIK????H	?XHG'?P?J?ERq.?,?x
-\????/p
k[>???S??A ???sp}8????	h?h?}@?oP?A??3?????uXCu???8?4??s??|0?T#??x
D
?7?B?}??BX ,?>p9X??9o?C??CBH?????C???<|PAH?4 27?SrX??c??h???Tl??(??????s??9@?;?H?}??mPi?	???= i|???????o0?o?}??	??A??q??| ?;?;(?9??Bxo1>H??0?????P1??w?????5??:(?b??q@m??yN??
:?}@?'??P?? ;??'@tD?9<L9????????????-?-?P-?b???j??rJ?????J???5P?B??D?&???D?<d???]:5??3H
L	y???9?%"
??)jK?X9?
??'??%??&??
???K???R5
??? ???"???LzK???X?
??cB???]?	?B?5H?7
?P.??y??P???E??????T5???????Q*mR??)??B??????
?>???????P?|??An??:x?8&???	?)?`P?4???P?H?)??(?O=
P?z?)??,=?
I??B????????T??P???P???U?0K^???R??P??P?S?????B?!???TJ??W=?[???"??X??lW?|?F=BMSWG?W??-9)??P??T at u????4A??d	(Y?Q?TP??a	4??X5N[Q?,	?|????~?P?%??????	*?R	?N=???0???y??O??????W%???!-[?U?UK?m??XB??4u?;9??R9???W?x?0???MH?)q???{?????VBP?
7
?)????5?f??85?M????U?
	~?P4???37<@??
??cNU?H???s??u??p1??G?????[8p?	 ?9?5????m??w???(Q???????H
??
?????^?M?w
?I?+
i??3H.x???????{S?Pf]?O4 ?E?EoAr@>??:??(??uX=p	9?"??I????????;T?
UBPr?Ft??m?>X??H???z.??`?;T}
??(???	8@?[L??XP??TN?m????H???~?
?????~?V0????U	
??#?`???Jxe??m?+I???J?$??~U??l?E??	)?B,?m&????qL?@?\??:Z?Ex+k\?o
8
???%??%????????????????Z"6t(??ud?M??????k??1?vIT?+
????"?i??A!gn<?YI??,}8#D?>???6xo?????A??d?}?1X????aC7??%x?M????;H?4????H???
v?,sy.?n,?xo????+e?	???p?W?<p??,#0??????PA???S??6??????????G???E??;???w&}?
m??0??m?#
????~a?L??@??R?<S=
??w?K???????F??z/????f?????y?#F]?????????j??M?????????81z{2n???#K?l?2???7s??y2O?;??!r??2\????????.yQ????}a$??6/?<3]????_?jZ????.?K7??t??GL3???\?????r?@??o??~|??9???=rm?x!)v??6_?E??O?]?_U????y??S[i??l?p?O!_??VP?H??@??6?w??W?K?xHM??sn,?R=???
?1
???????Av??u????`?}??1??F7<??N??~???!??
?HJ
??dmdNX??N????*??=?????VWHM/i?l-?3O4z??TD/u???D??H?8ft??p??hd?g????B!?5???i4??X?x?0V?E?EF?@b?s
Rq?!?rp???H[?QHZ?3?C??F?^???\?<TEk??E ??&U???
"^)??C?a??#?8[F?d????,??2?1?L????x???cn8??K???}/???>?N??C???O??3+??{,$?>??Q=?????`????Q?$}?k?u?l???X??!]???s?[$??W??V??^%?I?????????0&??cq!???<?>\?tN ??`u???XF??O=??*X??c{?$???t
???0?y;/'Ay??eBm?????K?X/??)?????O????Mg?J?KaHg??^|?Aa?G???F?)???.?_,?.;t?H???3??4	}?A?A?9X?	????%?I??T??u?!]{a??
Q:%??E9??\@?:????!???!.p????a\?{D?p!-?
?`?????`????+??F?(????&OyZ??<??0??
D??>???;?C??????92?\?Ct?
;?????>=??U.$??C%??'?A#\??N????!?IX0_YM7???I?????%??
KV????pGdH?=?????
>?X%??B?u?_???:@<n????L5\?$??|V??-??L???DX??????FH?HLS_
w???u
?I??a??C|?????B?!'s?C<P	???Yk???????%[?S???????L?`??a>:?!9??C,???A??????????a"?B?p?`v?,7??%.???
}?AhA???{G5???4q???@?q0????A??>??'`&?????? ??????????b?G~?A?1??? ???3???.?W??4l?%?(9
U/B?hC{$?)?????V8?A????q?+?o?
V&?"?6?I#??mc?d]?>?8?w?#???x?4???
x?G9?????M???IA?y?????8N???!+????0?o?#&????g{?n????>A?;???g????!6??i????^|]=??\???S??|a?>?1+???HD9?????g
?xwf]#/(%PXH
???? :QOL????d?{?
???%?c?Q?`?aM?????q??a???X??A(Q??h???<???1Mmc<?????Q4??8?-C?5(?43 ?B???-?P?TS???$Ji??"??V??D`??_>? ??E_9?z????Q{?r??u@%???????
???}???:bb?A??*L#GLh?b?I/?b?Z??B??!i
>?a?3????m?K5l??vJZU?!4:?!?M???q>D??p?>??Y	???@G?????d\??h?i??c?I?%??t0?!??????.?AJ?e??'0u?'<sNC?1??Qt????@????????????!\???F"?.|3A?HU 
@L??
?^L??}?;??????@w?+|??=???b;$-xx????????????\_??"?C?8??8????YO?Q???P??????Aya???????7??s@?>??pZ? ???~??
?A?????
??`????????x
???????[?%?????
????C????C??H?
yg?2??D(X??^????r??`?Vr??$&?????L??g??^{??	?L???Q@???i?
c???G??'vDV?-?????-?\?'zb*????->??'Z??f%*?e^xd*T?X?FZ?f%??YB??z???-???E6nG?-?n????_~.?
???e?"?_?td?Z??J?n?DnVV??????-?f??????J???-??????JnG?.???. ?->???.?fo??
???N/?J.?4o?n?I?PN??tA??n???\???o??n??????G^/????:n?.?????J???%?f???A????Lq?ac\-?X??f?d??%?3??;???p?p?C	?0
??	?p=?<??	???0	?0?0??????
???;C
???pq??	?7?71?0?0??1
?p=?p??
7??p/1_1?q????
?????0??K????????;0?[qs?_??1?????q?rCr
?? 1??1?????%C2'??s?[?
?1%?1#_???-f?f`p?2.??N?%P?i?0?<?C<?C132'30s2?03a0?1Cs4/s2?3?C0;?2[373?0??4ws8?31?0G33?6s;w?<`30??/?4377?5?s03?:?s8s>?38?s8?s;??>'3> ?1?;??13=?30?H?sC?3=??/?3443CsD?/?E??HKsA?As4;7?4??1?4K/sL?????0?4=;s<??MO?B?s23?L?3Ao?;+56??9??Nss=?C:g4K?K??J;?</?J????tE??B?3R3K??8?]Y0?l?r?R!\?2]???.T??,??g?5Fu??k?,+?!`oL??,????+???`,?`??v?J???c????L?)?Hq??????????'aO???NF?Z???????=??2[I?l?>6gO
??gfc6`??f?f??v!?vf at vt1G??X????qf??*??^*?i?[?v?"???????v?\e??jFt?)jD???_G?q7???g?Q?^?qQ?~???~?!??u????q?O?c`w???^??(hC?x#?hn??s??!c??V?z??z'wh???ow????g?vkv??Q??u??8?s???5???\w?p?r?c??)???~?z?)????o8q1??|?^Jx?;?f??j/y??,????OymRm?V??[?c??g?8??????????9??9??u:y_?w*?{s???Oy????6???u?:???,:?vf??q?w???????[???ykbz??y??g?:??????r&V?????6zw?^?lt?8??????l??u???ze??C?xm;x?c??>xr{ze????y?????WkV??G{~O;??u????f;?????ygH??o??F|+?F??r:?l#?o?,nAvo???+?r????o(??{Ot?o?n?Q??w\w?z??_???W?pO????G8?????g???w;?????2f`<??|?????O?
fKj????oF|?|g?P??zhB8~s??o???|IQ?q?????&Eg?l??8????3;c???#??|??????]}??x.8?k?????8??|pAFG?
?
t
/????^t{
y??j?p??P??"?,??Z???H???u?9?/5?-??(s???F?.????t?????F????LRI?rT??1v?
?Zr???h???>??8??n??n)?L?2???4"??
??*T
-?0t0??,??DWG?K.???K??i?/:?X?2$9+?5a
6H_?Hd+?Hc3??Xf'??2b?\?Xl?e6?4???Zp??8??? b8??\j???sHM? ??96?;7??@?N`???;??????f?? ~&?\??PE???&?Ej??(Y??3?????yJA	5TwD???q?1?f??P-Ww~?????u??9'??????_???Fk??Z??U#?jj?m?????b?^<1wKNr9%-	???8?q????7"??,F??t????2??
f:>?z`>?	???????/??!F???^?/QEo?i???;?????)t
?v|P*O#?}B?l>CT??},?{1?Y?j?D?Q??]???Fb??v6?]LX?_??l-SVI??W??????5?(?
??\
jY?b?R](U7?]???;??D@:?V+MW,??B??5?y??"d???,?(y?????EEO?????7?4??d0??
???F7????d??w??%H?,???8}?"??c-(?c??\???2j!c?o?:? ??ed0N?p?/?????&?(O?L?????b?c	}F?????c)?5 at f??nu???V?????e?"?Vf?L???Td?[@?????r???P??]??z?c?|?E0V?????????e??P\?;???5(?X?&??+??M??@.09'Z?p?B1????B?\[0&??;)?|???.hPt
?az??D???HN=?t?2p???p?'D?X2]2?RSI?????Ie?0?!WfV??
Qgg??T?Y???#???x?i?S?_??????????|VVaS?mF4?3?9?
;?&'?#??U?[??]
?k???%????E)????
7c?o
????'????H401???? p
?1?fo5C4 at OS??cE?/}1F?/?Q?????Q
?(???nP??/???
k?F27?m67?(ir???(S3]Re??X?8??1?1?P?3?v??&????11qs2???p?2????&??0?2?
,
aBU?]?
ZD/`?S??
>q4Gu4G?S
?????bQ?I?ve???o/?
P??4tL?u0,q?ddYj??ijpS1
?`

???`???
??B/??J?`??? U??
??[????n?T??H?`zS???H?
???@/?
 ++w
?7j??[?Z???` 
?W
.? 
a???%
??a?@@???8???
? 
????0
?`
?????0?????#?&/?xi0????
?x?f??V??
f?
y_>c
??x
?`R+7
?w
??
X??x?

0?
P?
o???G?
? ????51Q?????????/??/?,{?S?O!??O=?
`/????z1???k?Y???}?{????????}????????=?kX???????????]?????7b???????h???????f??
?a
??????EA?T?3??@??X;?????(;;?1]2??]?	???}??o;	#??O??B?(6?+?P???!?{??????oQ???-??!??a??2?1??????N???R?lQ?_?v?P??g	{????????v?OI?8|?3H?kl????d
???x??~???d?_???????d????^???x?????????X??\?5;q????w???T?8????????1????
?sf*??j??? ?*g?j?-? ??-? ?Z?aw&^xam?m???(??V????????]?p
Z?`?8???"*???h).?
?3$?2?hd??????x??+z??ej(?|
:d?z"???6ZJ?j|F*?????hf??f?e-???????#.
????	????
?zZ?????&?c??f?h????#>
????'??z?j??v??e
b??p?u>;???)c???????????????c??i*mo???e?kf?y`n???????|???J0
9?	fN*?#b?s?x???????s????2??&
pJ??l?!
????yh_?"?k???*????w?}??5?R\0[???
???]
?A??Qf?|??f?O??)O@???>?+
?P?9k???Yz?c$8'??????S??
?"??B7????6???U5:???;2?8?p,}?I8?ew??<?IE?
A??_????\?
?@???P???D*G???K??:?,X??t??????z_????)??`m?bK*??TG?%
I???*??O??A?r?2sf???B{?D1^!?s?}/aY?? ?j??2_??????????<??#??R
?Nt,(?????$????9@^?t??x?~?
s at OQ?f?xz?J????????????z?a?"U??G?K~OS?<61
??rM??|iWW???????????bX???z/h??T???'?)
?????E??}'j?;???u??X??r?K???v??}??5J??????,?????"&??.???????O?z??D??`??iU??{,~cs??-7y???q?_?????e??G??h??%????j9?\~_r?'??&?	?}???,????<????0u??O???4u?{?M????????>G??????Z{O???^T?y??|??oyw???w|??}}?x??vx??Dq4Gs}bz??ye2~?u?'t\dz??c?'{P?z?w]?Vow?r??I#bW6?a%;?z?g=f!`?6Vp???W}K?}??|??}??c?xa?{????G??x, ??c?B~??&McF(????chk??=ID?<8}R?q?$p=?A4?"?F?o???w??????m?uW?q?w&????og?da?M?v>?????~Q?zhh~U??|??W?0pRR?~??r
?\????|?M(????Qh?$?????(????<??V?uF?|??v*H]K5?Je??HU??=??nZ?MR#&??kb?^H%7??p!??2??????x?A????8n???Th???Tgv???Ex??(?l?
????P??y?????Y?????i????`???????????i????	?*? ???
:????:J
??
?@
?0??????`??*???????*????????-??/?0j?9:5?????
?
?
??????z??97???????p9??????j?????????????:??*??? ????????
?S
{
???y?{7???w#??k
????6??c??
?5V??*?????;?????p?R?l?Z
S`??f
FEI?????L	?`?? \??	?F<????l?????L

:
??????`?????0
??????+??F??
??g??7%i@??p??????
????\????Z?V???6?P???????f]-???	
}7???????I???\??V?h?lj????~???????
?????????f?????
??Ij???!?x????????:??
?0?~??f??+????`???
?????l????
?>?
?`?
N
?>j?????????A*????#???Ps??`(?5???$?1
?N???#?????=\?????}k????|??@??b???`?????D?????/??
??;?0??8???c??%??XC?;??0?3bdg??a??!?HR$?v???K?%?a?^??6??L???U??sg?5w<?????7p??%]??[?p??y?Ju?U???m????Vu???Sg??:uh??=???9????????]?x????W?_?w??
\?/a??'f???b??!????e??gf???g?j@??th??1???:14v?<)3???#????=fL???&x2??\?? P%??Q?[Iu???k??H0?;??^	?=\?L?0d??!f?{????CF??0?
?O]lSD,?????7??/e3%???m?b???0???i?2$????1?jJSa
?"?+???`??????v?c??????Mr??K??1?h?h[???E~

|????mE)
	F?h?gN??
:?R??\???l???t\i??87-0u0 ????R9?R_?_?L?????~??PY????M??c?V?H?U9???????(&q

??1;??Qc?+_???/?!??`s>???|?#??????B?O:C?????J?#????&n?ql?????1?ar???*`(=)?
?\?lj??@??	????o????L??}?)a2
??iX?nx?	-f?):?l??????s*???y????b,????p?q?z(fa??L~??????A????u&
??:?????|(e?????9
?BA6???a????3&??M ?A???3?
@?N?+`<?E
CL	?,?#.p????6?N/?EA?~#8b?=?*h????^??<??`??5?=?
?????1??\<?:?H9?P?t.??%
?+??=W?
????(??v}P0?KJ
h
h?]??<z\??;?T^4???MX5???x?W??

?	?5??t!6h?????w??:?v?LZ{????;??>=?+?>0????'????????"?=?R??????7Q???$iG"
{?"?	{?#!?;?|???,6:????4?=,??7??i+?r4sI}????b*???vy?Cb?t!tL??Y??w?8??BG?Q_?Q?J?S?o?*????G?"?E???G????#?1fG?=G?)?5???d;?9rm?I?N??A?????8g????|??R??
K$Ri??C?>uY*???F?7i?x??@5r?
?C???/
??
?P?3?F?g+??\o????T??`{kB?^zd?gnO?%A0V7Zi}???o}V9??l???9??????'?
??goo~??y?-??s?K?!I?(??????!?4u???????v?:?f"Z?$?S???f5.?g????)N?i?)?{"?v	?	-o?JY??>"?)?:)????n?
??L???Np???L?
&M?o????n???pNdZ?[??1Z??4U?S?e?????IZ???p??F??Z????jk?*S??xu?????.Wg?iz!K)1s?.=??~'m7bL?mv]?????7?G3?3=Xi???l?yN?Y???????????WT%K?)?????u?1????uW?2?
c???2}??{O???????
S?F?c?
??iO?R?-Wx?O,??9P)V?????(????i2???s??"?:mn??bc???i/W??}?-??????<?????C?m??C;????S???y??Z?d???1{k3?Y>???h??/???vO??????????k.??YS?v'?!?{	??9?<8Y?z
? ?(??Mt???
Q(:&KdF/z?$%*????#???My???|^64?]???+MF????p??]?X?1?J??u????]?VO? z"?%y?F??I??d??pja?Q	???g;@T^???2?s?A????FUJ]K?c?
?GFMqz??#!?(??yt,?`}?<Y??
\?B?`?/???<????5????lC'I)?S?????XyR?r
?<%h??Z?R???ef?KWv???&)_??c"?
?<f.
??(?!??4???6T??????	M?I?
k??3?)?3D$?L?:?)???

lH?J????s@"iBf8?%??
MAY??B?
??
??@???^?`(C/v?^????F;
Yx?i/???`???(]i0Vz?^?(?L??t???N{??????>??/?j???????R?
?R??O?jT?J??j#???V????~???F7?AV?vciM?6???m????+]?ZW?n?y??^????????%?9k??"6??5?9????:????,e+kYG?Ar?;h
!?P?H?U???? j???6?)?	???.?a??mkK[[?????m{{???"???np???b ???P.r?[b#?En2?!?d\????1???dtw?0?2?A^c???0?x??^e ????|??f????~??_?"????????v 8?
?F<?`38????;*\ap?#??p<?!ph8"??8??q?C????1t?8?0?1:jl??9V?y?cu???<^?:&??????r$C???G?8???g??r9LK??=??,?Q????|+??<?L???????????n??[?7???s?q????7??-?.?;??Z????v??h??W??H?x?qK[????tz??_O??o?E-?f(??x????O???G5>yx????!?_?x?>\?b????P??o?????Br???O
Rl?5?Yja?4?
?M?\??????;t???!hf???L??
Y9??c???l??!O 
TT?]%?O?!???"1?)f?A/l?/r`@)??2`0?#.??/?m`rC?E?a+?.?0?C,?z?(?F|?14????1?????1?C????!?a????`2`eN&"?ef????4@?<?]???e??M???Fn???&???I??l?X??n????#????_?P'?
??[??????r????$??_??????)(c.??/????%
?B+?ep? A.?%1??0"?.?.~?&?+??Z?h?,C+h?t????1??]?x?!??z?FL?0*
?B02 ,???????'
??Q?????K.?"?$L?90??Jb??"????b?r.?6i????-?}t9?I??8?/????n??4r??.???[	le>?-L&(??g@??1??a?
?F at A
?~?0?@~??-(??`!??@*??~5f??,
?1???/?????oK?0?oK?o??o???0C0?T
?N5L?F???R?0<??B?N=pOpW5PC5l?sp5|0??6t7h?	sC
sCY?p?0{?7xC??7?C?????:?09???1q?%19?C7?94?oJ?oV?dI?oN?#???<????N^???????'6??U-?'??h??J?r?$??A,?>
??\?t?P?P????????X	??hp?@?
??Jo4?
L?????????u??T?
e?82
??1
s?p?5?L?(?
.?? ????B

?t3??FB? 7?h??B??)
???J2B??PT??!Ne{??
?@X&PB??
C?0
??d8??(2???yY?h?
@?@|=_?s??????_?????????????????_????????O?????????
??llm?lLfB?Z?>e??@?$?
g?0?0?!?
??0????2?T>????????
?)D??P?NO?\?????????	??C??D?????E???"??????A???????>?????

P?/q51;??(?????f????
?$??]??\o?.oh%]?
??fR
/p
??
w,a??p???
?Rq p ???2?.???R???

?
e?N?p%g?????B?A;?P??(??4"<`?"???"be?????E?R+?F?!ht;???:o:?S????N0?USJ	?????`?")Q.????Vu??29/_9O??s?N??M{?$???n&B9?'}F????D?OkOZ??Zt\S?5??
>
G
07 ??r?b?v'
??^???*9?S?22?
?''a?,<?k?:N?
??RWuWwu?QQn"??qV0k?vowsWww?v?
?
a{?{?{
??|???|
??
?W|??|
}?w?? *?&rgP??T????? ?^?c0?Cx??+???????????o+???M-w??$N?^?qM?Au?O3Pz??M??g-W3?M?&w=8?J?h\X	_Ox"???
X????%?
->? .>?7>?-L??????7reV?b?????????8??8?;????????f???@?8@??+?x"?hj66%?A?_?4YSB=?e?x?A??kr??Uhj???>?D????$?????K?T^?{6?L?.rd0??00?????t?l????K??U??SY?W???W'?p????-x?X??c?o??kY?y??uy?+D???????
B??????>???c???Y??y??Y?????XCPy?z????>????#??Y?-???Y?????Y??????????y????'s[??????????@???#?	??????????{??
??b?>(??????
?2:??7:A? "A:??;D????5@e?+R:?H???`Zhh?A\Bp?>tz>xZ?|:??h??:???????#?e??Nz?yJ@?B?8O>?>??y9?????????+x?i???z??
?????Z?v???????5Y????p?"J????:?7???????:?????????W???:????#??);?;?/??:????Z?}???z?[??.???????e??	[??z????o?^????m?!{?/?;?m??{?E??????????
MrD?????n?	m??Q?????L?????
???????????????p????????????{?????????????{??{??;??X?x:??X??>????-??????????<???|??;?????[??{?????[?	-??????U<??{?Gy??[??[?)b?w??O\?1<????+?????3\?D?wm???????VM?????<??\???????????|?????|?????\??|??\?????\???????n???????????n??K????
?????}?????????? =???=?]?=?7]?;=?#]?G}???&??J?'V?t#,^?Pb}???????a??c}??c?{?P?B?G??}?e=?=,????]?a?5G2V??????}?q=
?
Wj??u???{??^?Y7?93???
??f?4.?n??C??
?i3 ?h.y??<X???n??LG?4?5????H?<??A???????Q_?r5?A???^??<m?f~???Z????P??Td5U??
6e?\P?e?G?]??y???!ih????X??u9
?SN
s?6??
?m??>??f?Z??8?1???MKK	??U???????u?????L#?I?U?3??
???m??5?Q)p??p
???<#?? @*,?
~??6G??`
yH????BT??4b+?!????<"
?g`???
???)?
SU|Y?
0
??g@\?Yl0??Tr&BJ^ tr??
?I?!
?S??BbS8?
?I???????c???6r}PhF!.??*cW?B?'??}+???B#Aw ?W
?*2f?7?dNd?S??E?2
h???8j`8
KTKS??!Ys`"BFct1??x??
+V?r\n? ??d3&J?Z6?,?4?h?N ?r?>???3csI??8??c?r?1

?=Hv4+b+???en???_??K??0?}Ae?"?7???c)?=?D??3@?Hk!??K+&??bu`?{?=?Z?? ???g71Lh?0???+0?.Y??P?FK
??%??#Ad?Q-]:?????
jD?b)?A.D? ??0?Fe???<?}!y???(?q??5???s??X?1?b+?B'E(?r?p0,?g????1 ?
"#??;a+*
???????+&????"9?x???h{??,???,5
,?1??!???<?H?$\???8?!c?w/p?(;?}w?Bv?B/bA??nn?*?A??U??
??[??wa?d?j?_?4?L?????\??^???DQu?Q6/tV?!?3u???sv??!qo at B2
??9??R???;\5Q(?\??k????????????????`?l????`??l?P?FI??????"????/???????2?M??<????????b$,F?s???5WL???-?qB?t??????a??>|????[h??$?[??
!?!?R??
/?C???@???\
???P`???????^?????x?`-?]?h?????j=+???B??0?-?(?AK?? ??"?8*??3*?(y?F??DB??J?IOB???FVh??9??K??X<=5C
?c?)?E?\?0N???0?|
??[??[??	????P?pEM? ???
?P?`????	S?????#?m=?????]xg?K??B?K???ta?`???-?@???a?@<??C14&Vt 

@
?4Q
@=G#L	4*?+?3??? ????a?0??OP%l
??6??WN?N?O??b??0????)??B?4>.ch3R?wZ)V?k?????U?
?/A?
??@?0l??	?R/??8?p?????C????1G?????;1E_????????Z?G?t?=?p??F!U??????qH%G?LC??;$K?r>"?L?J??|?F??????p????D3?#??????74?$m8/,p?}?O????:??TS???????H??????6=$???v?0??#???84P:???98?????????t??????HC???%?T7???BE?L??1 
--- NEW FILE ---
GIF89as?
?s?l#?o3?t'?w4?n"?v&?{4?{K?|U?|D?|S??}??o??z??y??M??]??h??{??b??q????9??8??H??H??V??\??c??f????G??V??V??E??H??V??h??q??e??L??Y??W??y??g??u??k??w??z???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????
?;?o???V<???E? C??5r??_)k???l??^;#?
&??????I?Qi?? +KvQlI???n+Zmo??????:-???!Z~VLY?????~??b???K??}{?????????+Dc?p??DJ?)S?Dy????%???????~??
?X??&???6x??
B???FX??f??????~??Q?W?~'????S??I???|??7?{????6??????????E?~5&1?????$???(d??h_;??!<r???M~?e?a??`?c??`?f????b????k????sFQ?-?d?Hz\ !???j???&????6????F*??????S(??6??#7EYbP???5?"G??pC?????{LC
7?8??1R?????
5??!???R8qk??vs?!O4A?5????5?ps?=??ZRh1
7?h3??KP????JHZ(?D}?5?p?L!t\q/?X??=????7?<?D?h???O???P?????!E$F????>?|$???????0?,3????K8d????.9??@-??DC?c}L(Q???BA??GP??<?hSE?Y?6???????S?><
??1NA????j?
.5N,???pC??$???5?Vs??R--?%f??7?????C
J???>
?????/???o?p?/P
?u????H?>??????0??gH????8??w?????@???H?"??HL????&:q????ItQ????"T???g?+F???b?xE2?Q$^4?@??5$?nd????2v?*V??-?x*~q<???/jA?.???bdc??E:??????HH3??????
y?DZ???L?y!]???q\#!C??????x?b&?HJ?t??f%+???Z??????'?X?C?????I)?^??????%c?I.?????&-??BZ???????i?c???z??+!I?p?s??<'9?YKu????,H????*:O?x^/kf
??R???)?i?XC???B???Xp???D*?!Q*&???D9??=rB?H?D????B?5#F,??X?T???K%?P????0?1MaSl??`i,L?
???
???
????-?U???'????3?!??F???d-?;?q??? ?Oshc??!_\?G8?7?[???g.L~??????}1/?br?b??4{U1?L???
?J??
sT?#
U?b
??a?_??
? ?p	??'z?K"Gd???
??0pI?d(?x?e??!Pm)?? ??(??'?.8?&??*x?7He8??J??5 Xm1??0?	??q??O?\??p??p+?r??p?p??pGx$?z??[?[{???h_Xh??r?5z??ZM(Z)?z&A{?l|?sv?s??????wS?'w?
?P3?&????
lvX???Z	??t?@??l???nvy?'{g?Z-g
??P?@?0???
?8???R5??>U?PK?T/e?H?%?w?8?W?T????X3???????Y???f[?W?}?G5????Y??\?x\??K?twt??\H?hSh???Y?x??{?whs????Z?rmhfc????qC???(p???mv???y???7??#W???b??G8??Gg??{u??q6?]?[mv?P
?
??
?`S??q'???{7p?pI{???J????{n??Q??7????I??[
?{Q?????K	|\Ui[MY????
A??g1AfYY?e9???z9?)x?????zf???
{?
??L??h?U?????z?7???{w????v?h????[kV{??{v?y???{i?????q]y??????f?7???lZ?q??o???x?X????h?????Xz??
?
???y??v???y?F?d??j?yh6|QH??9Z??Y??m?????U???g?sY???pe??%g?@Z\T?????_9?zY?bV?K?dy?????y?p??h?l?f???'
G?U$???wp?g???!?FZ?\W3?`\?0r??P??V?????)Zr????????[???1jr???????f???zty?????:??Y?o)??j????(
?
??????X?Z*??8?`i?I???Xq??pBJ?h????yg???????d9????:???????*????f??[??
????`X????'??Z??:??y?
???????T(????I??*??????p?:?Ji???UY{k??
?S?????s??s??????????OJz?????b??y9???px?????
?^?|I?"7?TH???J?
??????????;zOi?????G?_+?R	????W?ph??Ejg???Q????g??
???;j?\(?VY????#q?r????g??&??????e??????IZ?*???gZ???O{?L*??z?{?f??????j?????h
????CZ?9z^	?%??????[??J?????{?Ry?{????????^p?J?????????????|??4?????w???i?"????f????g?>k????:????X?????????:??????;??8?????g?z#x
` f??qVPWPU?N
?<????3@?q/Z@??-?B
?`?
??`????8?^`B`D`E???]x??|??~??x?????????~??n??^????????????.??~??n??^???????~?Ep?{???n?E`?????????z??}^??????????.?Fp?>????????^????{~?????????????????????}???????????>?????
????????????????????????????~?????~????????7H?9F??}'
????oJ?????|???? ??!??"_?$?o?)????+??-??1??A?0??7?3oo?;??8?C??=??
?E????J??F??K/?Q??S??L???L|??xFqS??E`??y	?{?ol??([/????s??
??s? ???????z/?w????~?????{?'|??~????????????o???)???U???&??X|???????>??????????????[?i?	
 w??VG????<?uMEEHU??_????@??P@?E??
???E?
???P?0??
??	?U?X^?`s?0??		?????8g
?

 
U?`?l?????1
??]
?n??T?2?#6@??a?P	@?
?*t????j+
T?0?@??&?L?`&?gJ???a????V?????:k?????????k?CH?k??v??g??J???/?t?[0?U?un??h?.?E?
?'[?@?	??`
?@?!?T???@Rp?
??X??O??W??[???????XQBUWR?8^???/:??>???$?rr[??l??A?J?1<?g9 ?nI?????????T?bW??C?I????jU-(V?.???.raR???0?9?aT??? ,?8?4??q??+`??W???????GB????9???W???pd9?Q	]?B??D????X??p?		???-??V"LV?R?E?-?na",??;?}}?b?BX9!?RW???m?6f}eU?d?W4%^?????e3?B%a??2FT???????$?X?+
{?q??[?*?|??
L?????*aRxE?z?]?
??????
????$???_hXX?E?I838?3xAI?????????? ?!?"$?#4?$D?%T?&d?'t?(??)??"??0H????A1?B1?0??3??A?A???4?3t?|C!$?-?A,C7<?|A2?
,??=?3?C3??B???AE?4<EP?4L?F??:?K4?4??4?B*?O?P$?Q4?RD?&???p?W
?????k????n????l?????nX[?;?7?
.?9Z??^?:??-?o[?o,Q???
?V?U?o???^???X???Y?c??cWpp<??Qy
??p ?pS??	??j
		???W?p?p'?Q?(???z5???V?=`4?i7:??i?$??+?l?5Rz?$C?w;???"?????V???{??? ?:???#?-??7??o
3???9??q??u?u ?{1?????c??1Z0?V?u????	??b??0m[?ud?MN N0???V?L?NPN??Y??Y??UPM(????U(???[ b?aS?wO
???
:(?{}l?Q??mr???{??w????x?:G???v??z????r?9?(v?????:?|?u??w???^??r???~*Z/???SN9?bl????&d?c?);2??[<U?1?`rdX?Tk?????/????????????n-??:,\???????[L2??j??F&%?????p
r???P?????L??
=??Y??V??!?S?[?"?^??j??^?t&0[??;?$U?0?)?\'y????>O?!?`
X`?,9?qV@?`;F?X?B
P?g?b
?x????W???

??,?y?_.3????9??oVs???:?y?u?3??|?=???Ns???]???????hQ???????s"?|???5???h?9]?D?
?H??'???K6Q?.5?!???An?{P?n#?;TK?-????y?6
?6Y??+????M??-d"??H05????????h_+????????_???(?&6?Pl??f??3?????Ld?xo??TK??????c
?>??~A#x?I?HLNW??;/|^)????Vxy???,???LJJU?5??Y{????Y??;??lqc\?<r?x??=?;?!?y}?C/z??N??+??L???n
?m????U
.?9N??N?J~!???]???P9^B??u
@U????Q?
?la?Y'u????3???h?[?	c???_I?	+?B _7??=?>h?6?C?b??5?C>l"6??bC?i?<\?E
$f?=?C>d??
dA??A?
?D9??
??<??;??<
\???uiNcc??xe!??X??Y????(r???J?ta&?^^??O?!??#???W??~?)Ja??~???)?+??hn?&6?&V?6b?????r??z???e??T??_n+?&?Lz
?Zf???N??j??(????????]??jx???j????&e??%????]???i??_??)?_??+V^&????j??'hbio???ee?9!???y???Na6?o6??57?*??+S!??*$?Ox??n??c???~&???h?
iPqjW^??]???6?,??????????f???S???g9rO;N?fjk??R?B??~j?????J?
!??[y!@-Q4>%d????S???$l?e%Ej?R??)Q
)|e0???R,???!?m??jc??-?B?????6????hi?R?i?f????9?????mb??Z???d?}?????m???k?F,N?,?>Z?N????I(wq??j??&?}
?????,???f????^_?`?J??Sb??n??"i 
??.?=?h~*??U-???????q?M??o??{?)o?????S?(?B\??(?~?????
????dj????j*??
??f%?F???????????.?}??????????#??m?
L?UJ?_?Y??*??????Q=??m???6R?y?8??q?:/?p?B???-???6U?.c??????Z??F??j?2???.????s?p????,?4?K.??b1?U*?Z???G#?d?*???,????f?????|??*d?a??,????6r??/?J)????aF?n?
i?]?????j????????'??.,!?/_?q?MO
???^q???R-??????????=(?F!Q?0???n_?5*oY?"?`-Ou???5S
8/mXz&
/o?>n?J?)?fm??'????ufQ ??]&C3??3?&??u?2?
\?
?"w?4{?c???8.??3???f?c??1?0V???i???????v??^o??3??q?2s+???Qe[??n9?n?Fs?????4O??O5P?P5Q?Q'5R/?R75S??SG5TO?TW5U_?U[?o5Ww?W5X??X?5Y??Y?5Z??Z??V?r
??[?5\??\?5]??]?5^??^?5_??_6`?`6a?a'6b/?b??2f5VG6dO?dW6e_??eg6fo?fw6g?g?6??5i??i?6j??j?6k??k?vc3?l?6m??m?6n??n?6o??o?6p??p??c??q?6r?r'7s/?s77t??tG??????0??vo7ww?w7x??x?7y??y?7z??z?7{?7zg7|?v?w-?|?7~??~??v??zg7x??v?w?>
?}?R8
I??A?h??(?-??,??B?4d?C?<?0?A$qD?:4QD?.??Q?.??V
?D$1??!?
]y5??]??a?-6?c?E??d?]?Ye?m6?g??v???Hb??s?n?q#?+?J??@???Jm?)bS??x?????????"?@???7?'?Z?"????m???M??X.?*?(?n.????@H??~p??]???_?????%j
'????n???6?8?*??ue????	~?5??&?]?X?qM:Y??>:Wh?V?????6j???z?????X?{?z?_l?%D???/Um?????[n??V??#???Lm~??	-???o?q?Rn?QX?'????m?fm??C?$?
H?7???-??p?h???A?	???<??,d?b???????5??????1NB?C?T8/?)
????
CjXA	R at B????A
?
Y???T????N??G&k
	?#5????P?8Y???A?A?????1??Q?J0[?B????	?h??n?#?p?W??P@^A
???6	J?ntH?4"???!??%5?I?R6=*!R????'?A?<?B??7_R?R???a????@X?
???#?p???
v0j?L
E@%??1??\?}??x?CnA+?7bj?NUh?Vmrgt???p??1bZ
;?=?4V'$A(tj?*?P1<?????B?-,a?8?eP?Y?zt?i?$I5Z?2p??i???Tjh3dU D??q??]?{
???%?3n??X??j?%?
5??5?;???
@?B?????????<m?gW?=?5?
k?A?@jxC=?h? ?
z?{???}?????'???/~?
?p
??
??
?0?p?????0?p?????pf?
?a???!?
`?`?_
?paa??
??P	Qq
1q???%1)-q/?1q5?3??0?pE?IqQ#?Y?[?]?CQm1o?g?
?w??0??q?q?Q????Q???oanaj?x?lAm?l?c??1??????1???1?q?????????1?q?1 
r ???qrR?R!R 
????%2 5? 3?#??1$?#2#G?"K?#??$I?%)2"Q?%W?n?{!'{??&?l!?r!?1(m?(?(?2)?R)??)?r)??)??)??*??*?2+?R+?r+??+??+??+?R)??)?R(?R-??,??)?-??'??(??-??2/R(}2-?R*??/?/??.??0??.??/?0?R0??.??0
0?2.??+)?2??,1?2?r3=?3?-??*
3yaR?janAxA'?q????6?q7{!???Q5?s?7U3'gS?s9??9??w?-?S(?3?7??i?:?s;?s'?<?3?q6???S8??8?38}S'?s?1'?<?7{S<????>????????????g?>g?@??>
4???<??A?=u?7??q7??yS:!'?sC???A?B??-?37wsD?77?CI?C?S(W?<?3D3T7oS7?3:M?<?6?sDk!ES?A??8?4I?TC??C?H?DITI?tI?t7??E??D?tG?K?TKY=?QV/????'?M??8?tN??N3T9?O?sO??@?~R?4PU?
????A
????*?????J;Buz5?V?\9N??#??M?n????V?l????????f???V?Z? ?VE???V?r?L???_?2vb?
???T?G?? 0^?
???@*?`b?/?l?JY^???F??2(??R?!p?a?"?Hb?&??b?*?4(o?5Hj??Ym?%W?z??\?5????USWi?\?%abq???bk	f??A?x?????S??%cZZ???D?5XT\u?J0?T?J/?C?fo????????9??s:??K0??2L*??V?m
P?m ??`/?(\??D$?.<??K-? {?/?Xz?^??s_??\?;G]?Q?lV??????K"???*?@"?0B?#?
w?h?7?p?=??x??w?z?]7?w?Mx??N??r??Tb??WHV?
\?c???q?:.l?_?????S%;??C\:F?Z???Ug?j*??r?)?Um?)?t?Y
#?d;/
?^???-?p????g?qD?g????_!/`??????S
1??"?,?S??????
p?,?
??*p??????J?G?Z???1?il[???6G?|5?+yq?????0Afr??`??yI?b?K????$??b????&??M#=?-h
ZP??D.*???D???U??n??KS??7?N??X
?F??4??@???G8? ?r???h???1?{?c???=
?m??#!??
xF?????*?????u\??P?#??eb???s?????`??")??Y?-??d,?J?n_?j/xQ???6???1fQ????????? Z?b#J???L?Y ????R?i?jb?RA??r??^??0?&6?	?lj#?D?*+????
P???5???`???'
?.~??
??J?~"??Z(B
???&t???B-:??V?t??g	\dAi?_Y?W??NNQL???F???G???(O?%?????	?'A?-2?E-?l???9?????9_?B??E(S4u?b??PG?????2?'bq4\?B???)??+bp"$"F* ????*???,pc
??????x??_xJ???ClVS8"+\$???^4?#X????!???-?Hk?}?vC??PkC@?r???zmlW????????ho???????-("????q????vI?
?v?%RY?EK???!?dR{?E??u?,?s'???0?????>?=`?
R$
%Q????J+k?f??????E*Xq??Vx?? e?@C??,???i?rD|?g
'???u@U

??????v?P
??
? l???I?^(? d?Y(?O?TQ*?2q?)?*?-h???/(?08./X?78?(??,??,?????-????]?49fVYr&rz?z:?8d?R?g02?B!gR??f*?;??0?n*4%?TAr?fV?S?uI??
`?UP?*??s?1(??0 ?c-z?
?j???u(
??
??Va
??
?0U?P??????AX???"?p(?????P4?`?>?v??	)y??U??	?	?K??	?
a????]e&??rP?	????F%?6%!?%Q?Ui?W??Y??[??]??_	?a)?YI?pJwxfx|#?0'?skQgG?rT?E???^??T???/??!??x??GXBgb?;?W%?R?@??-??	<I=??	A?????+??
?V??AIL??,?`S?(?G}????04i?`?u<?P??	?B??	JT??????C?A??IHh?a?NHB ! ???
pa?
?m?N??f	2???????	???3'%b?\??[??]???J~??`??~?@5?E?g:s?v?h?Y????I??:yV??eft??V?{iY????fW?????5?HS~???+????
SEa?d??????*b????ZK"??"??@???	???????|\t????????A?i???????f????h???jB??? ??ObJI8???~??T???9??5???q/WT?ggx?j??^??r??]d???'???????
?
+?K??w
? ??	? b%?#b?^?SS?3??]]A??c????h??? ?U?^e?????0E&?%?J???^??}ZT??CMhC?V??qqj?s*??Hs?	?'??????H1??

?^m\??:?94^?|A?????r?s
s?=,????????dL?}???]????)w???
??????J9Q(??T???E????M??=????(??????????}I?3??s??1)???

L???
?
n^k~??
????r??ry??????gR?Q??K??*?Y\?0e?;???`????{?????\~????v
0??????????^??~???{??????8,??
?@
?#????#?||?B??????P?)?1?S?cIxl?KlgTL????C-???"T^tJ$?+?????M???^?/?>?]??????z?=VQ5?????????
??
???????/???????????/???
?
?
=?T![*+??D?L?^#mJ???4I1?T?????
DLiu??%??Ve???3XQ???]????'?
K??U0<
=???k??1P$g?S??{
:X??1?o?K??dA??)em?JiG??L??U?9P?????eW??\a?*?U}+????zur[??y	???Aq?oX??u??2y??C?(S?Q???\??]^"???r?d?????j?UU?LC#O=??E??????b???R>?V????0?4g?8?Y]U?Z???5L7]S$Zb?,?5??lOc?l??9????h?M????N?~?7re]}??.l?????R3?_4+O?GW?qu??V?y??M?7?m5_??d???W1???Y3/?8?K?N?F,????6c?@u???n?x????D???????????R?\S???????sMp????i??Uu|???@
??????!?A????????1?K??h??L4G???G#?a?P?[O?)?!0R*????%el?Y?H7?*?P?5+??????)????||?%??`r+??G8?-?z
)???d??4???p?3a?????u?x\K??B???????P?'B??*t?2['9B???~ijc??????,.;??F>|?L?g??????4OL?'?d?_?[??????2?5??3e???A??Mb?^?2d7???t????D&@??y/f-??;?-VsD???	Ch.????V???=?,J?Q?V???tZ	R?,???HtF?{1?_??6?D????????R?1??w??A???L???4????????jp???????R4H_?Z?????2?
?P?;K??????kF??K?v?b???
?.?BF:??^
?B?B?IV??u?????L??)?\?}?v[G??K~?|?`?e??D?????gs???1?g\?l?T?+7???@????W?$??p?r??wP????L)0?9????@??O@??`?j(?-SB????T?[f??????&?"??S?G?rB?8???9N?Z?v???X?:T?d??,????I?4?
LR#z??)?^?m?-??????????q??F?b???:?G?!'??57?4w?7C??R?RU???zY??}?zw$?g????sxS?l?1j?????
?@W???T??&? ???|e????8????c??????FmWQVV?(?k?T?;"??8?3?8?>????#$d?9b?]4??? ??????B-????m??zML?t*?F?????l?l?????=??5m?gE5?3??ZuHk?+S?C???kq?X????????dd?w?i??w??=c1???
?Q??q?\.???H?q??w?~M?J???_??V?l?-????V??????l?[?????rEf7??'f??????cC-S?r??W?yOm?????-?'?q;T?????N???j~?#??????\??j1?c?%!??@?/?=T??????????-????????#]j?q)???;$i?7D???[AT
`?=?[4w
?)?J???9ub??????|{??
--- NEW FILE ---
GIF89a?
d
	
9|???C?0???	?fO??~?@???O?<{96?yOf??N?	??B?N*D????N?????)T??:?
7?R?y	??k??^?\?????W?a??N+?\??c?????\?????N??]??????=;????{????????;&??<h?A?=H?=? ?`46??4?H#?4?HN8?\????\(?? ??a9?|C9?h?M?d?JV?(??4?h??8?(#O>??I)@"


!vD	?VJ0?U~i%
?????C	???F`zie,??bf
i??+?d???????.??^x????-??r???j??-???<??c??????{?S?<???#+???w????k?&? ?2???a8???
? "?????X??????67??P:v?????{cD??UCF? FnXa??
g?????Z??!??9?,v
-
??Z????F7?Q?N4? ??H5???????$y ??
?~?????a???\k?L??G5??????M?m.?v?1?V?Mx?sk?^???:?/
?Y?????|???j:w???a????6I???
?????w?n?7??M2?
9ko[????vAn?????)w?O??*c??G?H???d???5?.r??@???_???g
R???????S???O????|R?z??`?????p??????n?{????F0?????`?7?A??|?#
78~?h????	??w????"a?`?P vY?an??q?b? ??0
?????)S??b?q
?p
YB
?
?`??
u?
?`&??
??
??0?
?r?"2?
X??
?
?p???
fB]??
? vB
??}@|?~?~?z????@?????G??	?0??a
??????
?Q
????? 
???A?H??0???1$8???(.??(??x?????a3:???q;	??*??????*?0?????b???M??P?T? b5????!??,\Y"???_y"e8?p??J?dN??l??p????}?Cdk	e8?r?Ba?;?4By??ln?lK?T?R?v)89?d?????6???u)?fq?}?;?sd?I?"?L>7?o?D2?9????EV??Z^%
`
??j??????????Hd??j::we?CeH&
J??????3??V(?????*??.A&!?z);A=??Dm?N1mM?6?K 
??
b?????
??
??? 
???????
??
?P???
??
????p???
???$????
???0??L?l?`?????)?`??)??)???P?
??????P???????????`I??`??????I?????p???????
???????????
????????
???????
?@?
?????
?d???
????
?~????:??'
?Q
sP'0?!
?q???q?X?
?0?0s???\??
?`?1????q?1??
N]?P1??
?X?Wm2? ???????0??`?0??2+?,?+3?H????7???;??D)4?!+?
 Hs+O??O5?=5?-???Z?????`3-'26?????O???9A?-Re 2v?$~ ?~PcS/v???&U????
??V??c'?P??1
?r	??	?H?P"?	C???^???a?*?2???.h)7??:??mM????A?w-+x=+???J?4O??n?`?Wh??[?5??????c??sq??????yH%+
?m'?q`0$?M?R$v0?`
Q2?p/?P
???vr?Q???U?
??q`?"(v??3?@H^$??P??	??? 2C~?$x2??2/??-?2)8?????????hsM?Fh?????????LS?+?? ?m?.!??!???B"?@"	m"?-?d?
7p.W???????N??h#9m? ??
n??t0
@?p??}?$?`???-o@??0?	?@?v?
?`?1i@???
?}?x???
?
??
?P#?(??(?A2???,?0X????6???r???r*????A?EH4????????B ???? w
?0,??5??,?R???^???h?`hS???~?????!-?w(?
s???I?J
k????6??$?5n??S??%+V)??N?.Xf??|kp=\????6;V+u????gi?????v?sh?p=S??7?P??[%?????%),)?[w?$?w?(?#??u?
<?????U3w}?ds???j?l?o???W6??<?x?~?8O??
@??t 8}@??q???>??d??
fxb??<?
?:?/'/?zB?a?@????a?P?:
?GO????O@
?????I?
nV?H??(??iO?Y???](qPR??E??O?H"??HE*.q#H$%?????????GA>Mq8
HP?"
?>??<?C???@[??????A?m5????v???+]??D??uU?}??@???n??i??Y?x???=?!;?>?????\??W??,?s??\?a?"Xc@li?'?.?
S8???-}9???*vv
??`[???9?P@?(d?
??"?????? ?a??(???????"????8d????8?x???T???!?`?-?"!*?P??"?????"?;?'4@4
?
(????,4?j
&0????`?/??0?B?B(
???
?	Cq?
+L
?	?#@??C??
<?CP?
??
7D???C?qx?D<P
?<DD??%FdD1|??XP?????`???G??? $??H:?S<?? ????9???$I:? ?S??
?????V,?_|EFzE?8

??d??&???I
@?GHIH?j|?G??k?FH?Fn?Fo??H?FK?H0Gsl?tl?s\Gs??H??x?L??N?O?G{?L?GG?G?GHa?ap?<H?,?_pH?T?_
?<???K?r%
d?*?2??8???<??@?=,??w?
(?w?
????a?Q?Y????S?&Y_??o$VTE]?\??N?[PsN???YM]^,????sx??>/Z?c1??????$pXPY5??V??H?t?._y?M?n?
??@?F??`?0??x?Li?Ei???Ei> ???????!?R??z?S??BP?,?%??/A(rR8??-^(j???:?M?????X??S?$?;Y????<??e??s????N_Pb\?Y?7????I??u
^w"\?%xch???o?u]? F???
J?^??}?!?M???&Y????b??
?%???u)??M?_a?Q9&?Fb?e?d*??????L?	??m??$?u???z

???1??s??)??~??et??(??ZJ%?R>???!Rz)??b????H???b?????yr??i??Jk????????9k???je?E???[z?,???e?{??0?????m?f?m
?r;Ck??
?/V'
?? ??|t
?i???9?<
m?_???=?
O?Gt ??*/????Bm*??iq???????E???!?=???L?jV?NH#x?`-????? ???W?/??+????=?????S???/???}?????o???_?$L?G??W???_????o
?? Ju?????_????
????J4qfx?A?I??.?????.U???
@????=\????YI???
??e*?????mp??a?????R???1?!?!???????v?a?a???
?)m"'??1?K&j'?bn?+e?%)?"?5
?
]&?]???Y??? ? ?^r?8??s??

ej6p6W?h?ZfTM??C
^?\e???d????V&??)s?f????Q???Hr?????Xj(0`???tjb?EHcs
??k
	H8	h?
`???nx??w4A?????^
?????w??wg??w??w?_???A???
?W?8T?7?
v??|??H???PJ?l????IMe??:?{-p?6??3???q?:?tp??I????Y????s??D??;s?G\?hy?09??I@
--- NEW FILE ---
GIF89a?9
?
Lx????+N?x????K?Ly????/k??y??????Mz?i?????$??;sA?bva???O??*?%6q?`????????+_???????K?N?????k??%?????G????zy???8??^<{???7????u???????=~??C?O??vUmsTX>)?`n??p}\?\y?y??z?????"r?E6???
5]??????"q?I
	5?l????tC?#R\?E7??c??P#?YP?#7?D??6?PvR<B?6(RIe6??5??H
4IRIQd???(f??[\??=?p	
?;n??}???FR??#R$'dqcDrd??t?????Q?Ir?????
?5:*??8fcj$cl?^@???TJ??????7???|q?#?B??^t'??]<
7?pM??Y??#_,?d?<V?
?C&)i?}????Nj???kna?N&?$Q?????R????
M??jZ%???X?a?K(?h@????B?????? z(q??8??/?????@G)?????&?2?,rD%??`?ZQ5P?4?l??8??s?;????<?s?D]?%??[od???PG-]:??MW???6?????t#.4h0??{l!?#???[H!??5:)?6R|?%??X?????B?Fyh_'E?;RS?\|????hA\c<???yf?kd?H?a???x?x?k	????????(j??W??)74n??=??p??j??#|T???????5?:?Dz?
$?K?v??i
??;i?c@??N"???????????f;???l???y?I????B?d?
GD!
????7?{?(H??G??!??ta?????5??Y??=?
	@Y'Q???
W(5??????Q???
?A??!A?C?
?c&;F???B???d34o?D?4?hO\??E*J??X????E???m`?t!=??hL#w0f5Bl?g?X??F:?1????t????<?|R?????oMG?nL?"?#?n??? ?1?!cXdR?'?V??:??mD?U?? F*??JU?r?? ?9`)?T?????%.w??^????&0?)?b???L?2_Ir?R??le+c)Mf?????f+?9i????\?-???Y?????7?YMqZ???g:??Jw?r?? 0????|?S????8?IM~J???t?=??J?64??LG*???Zf3???hF??Q?????g9?yM?"?????9???W?e%=???????8-?N??S????@??P}J??u?FM*R?J?V&??7??T~?E"J$?CL??????????A?z???? g??BJ?C?t??TY\?
W????s?+^???????G???b????!Xd?!?#?M+W
R?S?p?J??c{???$R??\"??>V??t	[o?X?V?A=?,_?&?J?A)+n???"???-H0
???`?!?@??44?@???p4#d??J;#???3???gt?????4D-?i?Z??E??1?V??????7zA?Y????E/t}?^?b??.??a????0R?`C??v2,?
C??1
?P????v? k??k#8?!?w??'??&m0x1V1?4X?J?eF?x????Ve???V??C?HU>?A???
??
.??09?k4I?? ?7?ik?k??????w?0??vx*?l??x?h??Z??????Y
?2P?z??oaa?W4?@
??
/9
1??2	k????H???k??w?6??6??????J??W?YR?2V?Y?x???2??U?E?p??>??@?2????@?W`7?`
"UC?`?P?0?)?
????\?2GJ??PXW	VMyU8??hU??A?@Dl???????
????k???+?????????????????{?????
? [?k?@I?T??? 2?oZ???????????Q`
?????????2?Z????Y`?

|?
?$???????? ?6<?? QC???I?^??@??
??c{?6?????????<??\??|????????????????(;??KC??u????*2]??am?6?VI?\I4x??0??`I?\???L???A`??C?Ce*?p?1SI????M??y??
?}
j??)?f??Zq?p?+???0?????+???????|?8??:????=??	?]?V[?zw???LD????2?GZEt?j???M*?Z??R`
X??[?Xt[?)3?

??
R?[A?Wm?????7I????Y?":?5.?5d?f[a??E??4X?a?K}?_eC43?53.?KM?3??? 8????En???ZN????	???? +??+????N????=?G????k/?R?0mh?? ?1??????9??W???te???>?PM?w???<?5??2U??_???|l??K?n.?i?X:J??X0cy2???????^???y?#n?????.*?R??????????	????????^ ?? 
???????%K?????/??????????)??\?Z?2)+<???????J?$???
3?O?}?s??F????4Y????2#?????U?n{?.]????7???
?J?????????T&D????I?'???m?W?^xS??@l??[?X?4?r??E
??d(I??@???[8?e?5yY?"eha
????p!?j???????3????????o???i1&?????@?)a?D%??3"R
?l? K????07???????????`l????k)?H"P!????7??\/

?@i(??
??%oz?*%??H	}/BjP??7I??+??E?X"?3J???!eP??ml?????
??)i?H2(
S$??]???Y??w?"O???[???t??{????@??+.????hVa???$W^?r?????B?T+?]?w????%????4rE???Z??c??	Q-?x??e??-??J??????????O,%sG??8??JS(-uop
??q?' ??R}#@??6z5?V?jU?(?'?u?g?k??G?~u??]kV????Fu
^??}?????/??
j??p??&Q???`?X???J???????j?e??j(??Z?|??f???K
?!??B?P?????????-)JQ???j?b??'a?s__C3??????.??}?C5L?Q?><1??	????Aq??d???
Y?jIn??Vv?Z??V?`?p?7???vP??8?7^?`s?
??N7W?,?5??bqi0?+?e?^)????(??1?h?q??V?????????E??
?!
xQD?;?OJ?g???`-???F????)<
???0?JY?r"?J%[.???R?H~??<?C? ?H??@"??H*???H????8???&$?????B?5??9	?uX???C???P?'??c?:?8L?
?r9??S?????6???|??/???$5<?g3?g?wx???M?????j$NJ?W????0
$??`??k?????gb?b???
	A=^?0???m?????u ]?/???<?????L?\?1??&???$e3?b?9??$??1#i>??(??(??/?J1?c??.(????g3?9??hB69?q?T3?/???)??q([?)?/???3L6??Y?X
vP?DP?kMj{Mn????2l2z?????????3?????/41N?{*??????M??cR?{?o???	|??+?R? ????????%??u?
M?91????5?O6u?6??7??8?S??>%???J5l?>m??{Q?M ?2?R3?R??+?RF=J&-????vk?;
H?N??????	I???=f??S??q????\8?\`?3!_??Q????x?Ir?D?R0?U?U/-E?Cya-? 	?(SI??B?"C?B??2??
?
??#?t?oFL?T??Ml??c=????V$+g&s?3?(??'
do?,{?:?8|?\~?t????:G??EF??;P??nVL???????=?????W?
?p
[??r?N???8?]????6i??Z?9i!???F??v??????lj???&i???v?????6??v!?Y
c??????????-??vi????????i?}???_?????>?p@?]PTp????g~L*M???f?1h?0?}????
w.??$???w??N????k?????e?.?X\gF>`6???d????6?hm???z&h?>7?{??????z??{??z
In???h??do??????????'g?2x?&D?lt^??^g??0????????kc???TlO???bgL????w???_?*???V??G|??????ks?o?
?z/o????????????'??7??G??W??g??w???????????????????}???[v?A??????&P!??7??~?/??w???~?~??~????????~?????????~??'??7???/??w??????????????????????d??%H?`??	*D??!D??LFa?0v?H??B?,i?$??*W?l??%??2g?')??&V?t?????B{?R????H?*m?????P?J?J????X?j??????`??-K????h??m?????p??ES???x3F?.??>???K?pH? ?-??????On??d??5[??y????G??k:?9Jl????'??>???=[6??o???[?n??????;???\?mk??[?l??q??hp?????B??={?????yr??????e[?z??}Q_???.??=???l?x?a|??6??~{???#?d?\=?uCM$??`n?m3?6W???lYl?M7?Ps????? ???& z?G#?7?h\?<????Iq???C?H4?4?aL?4JN*9%?UZy?????r???r???]?A*?#?fXcl??G]=?u?
u??AmRD??=???5}B?]P?]uw????t??=?Iq?????6?`?M6??Y'5:J}?u	??????G?@?Y!}<E?????:!5Y??[?pZ????I?6?u??#?@"!7???O?r?g?]x
?????@?]??[??T?Ma?zO?MWO5????t?mfo_0????MKM???3?R?&h@
4?T??O?I,???v??hL]??<?i?\?1j?u????|D?9g?&{??^lOu,?(??i?y??????k}??D??1?$???R??%AZR
?? i?5?]{???%??ZoLq.z???6???7??p????o???x?
??v????0???>????Q?b4???B?????H??@???[y$bp???FRxn??
I??<B9{?&?#2??B#y#???8????:P^4?;????a4?0???>_$n1??B?F$?Vo?????G???????k????7??ng??????a?{c4?8??4"?l??<hp?|#???'9H???;4??<?N????r?????=q??F ?c-c?&?0?ot\????9???g;???C??Mot???x?C??p?x??m??
}??iL	G?A?=fk?1?H??i-$?????E?%?N??acF5.J?Y?f??F7F?u?c??<?Q?v?c???aP?Ih???{????|$$#)?IR????$&3?IG:R????=B?M?????(??U>????l?*??IWj2???e+Y??Q?R???e/_IKN6???<f0??ks??T?3E??\?r???%+C?LU????,f6???UJ3??l?"???Rr2??|'<?)?y???0R???b(??(F?N?5??q?&???t5-??????"*???$TK(?0z?r4$??GC
??nT?%??_R??Q?k-?"D[?R?f0E?L?????Tj?????F?N
?)?)No?R???J=?D[?R?B??IUIN????b??U??UW*%?	5?????C?J?????(e?[[??????}?]?S???EUR
k??????=?`KR?f??DU)M??$???4??L%;Y???S??@Ck%&???+!?O?A.??Q]?WO???Djd}-nsQ???I<uLi
W??q$?m?X/?Y???j???c?????t%?
??Kp
???2+??-?DTZ??N)?U?!1]??PZ??Sb??f??>Cn?)?
?n??n??j??.??.??.???????????.??.??????????o????&/??n??n???/?"o?*?????
gg?U??kjf?.???E?l?.???2C-lm0Dn?Fjjr?0?0?\??.???????B0
01???0?B??VW???Fm?1???????0?R???.?b??????????:??1??j
??-T??J8?l?p???s?????g=?H=?eu? *-?F!3?a???;0?1,?-??0??00C-??2??&?.???_?F?????B04?-????2?Bj??1???????1;??U?M%???+?*<????j??h??wr-?p@?2-??-?2.??.?r??l
?@???Bg?????lU?????1?0??"w?"??&;l?	?n.r??2HH2%?qH??20l0(??7;M???k2?#W--0??*;??#???r?G?r1t?7????3/?-<????B??*[??vQ??.?./W?E_??r?/??	?l?fs?Fb?U???\_???Z?VL??????&A?-??Y+-??1?
q?j??n??#??F/??ww8?_8?.??8??7??8?????x????BGt?)R????C??4I??$Gj2?C0?7;,2F???:?0????/;?fc?q?9MT@??Y.??fb-1????B??\ ????;
C.?0-??.?-;T?9#(_??(Pry.????8???o?g???z??x???t?:?????
;~4??".\+N?D???N?=???FuMz?R?B?"u?T????)rb?5??G???d?rl?d.??T	%K?k1?m??l??g7??KX?t
qeT,?^?%kHw|w??%I?Lv??e
??%?.?S???LRE???R,,??O%u???b?m??HZ?yIM??Kc-U?}???5?H
=??#???????b?`,?k^&n?=?,?2F/???????L+??5?b??h? ???A
L04?X?:?c?N"?^1????.??WR???,??+???uG??Y??@2??-?P.?x`B,"???!??DT??hD(>1?S????E$Z??G???(E*R??Z$???E,???b#??.:??\db	JPD<??}t??`r-??cm??~?v?,?-?=??-????gv????8??bXP6a?-?q?e??haF-h?"?#??Sb??,??b?LZ?XT??8??@,c??F6>Q?ol#??L6???Y?c???h??M????<.k??e?ly.??'NN{_?rC??3AS1??1??0Y?2?Q?
]???. 3???C-k?f6#I?U??)??5??Ak3}?P2?xP???A???dD?MB?0?Q????????!???e?*FB??j?y?T?73v???e?_E?????T?.???yR???4?"??H??S?C?$X,??L?????@.????
?????Qvc??2Pz?"
??n?@61P/?,?2??Xt&B?$^,?????2?????G???s6'4?1??TM?R??K[?aY|C??(?_y??????????@u?,)A?????Cm?7S????? ?"?Y=o?(?)C???*u??\
0??O?Z1
dg?ny?Y?	'S9???c?@u?%?is%???t?!?.h&?]??c6q*i{m#??*q??h??6?7????l?(??e?v.=??W??a???M????i&??P????
?L??
^f?Y??,Jr?\?K?v???(p0??scu?F7??]?x.?? F8??G|??n71??:x????`??
~??+<???79?n{???N???'C???f???n?W??Nx???oz.? ?8?s????H?94N????#YmQG*",?Z?D_???[?1c???1???X?2?E`
fD??????9%q?D.????D1???D??F?m2?X?
#?????]?sc|?!9?
????????Yj??|?J"?Qg]????J2D??H?z??D?0?yQ??t??"??_??????yS???M?????P?^H<-???	?2vA???=03<?!?d??4?P?.??`P?1??p?@I????g???eF?9???t?%????l?YPG)\3
???C????f??B???va|F??4???&CB
d;DB?
?>B???d"?4*j??f*1r!u(?I??????t?y??Id??>????:?gp??X?5Y?uY???Y??|\?lF`H????^A.
w?BuW7z??v[7??E?????<?/x?ER??r?zt&B)|(? 	W??DWYX?Z B0?0f?%[?CR)s????z?Buz??~?
?X????{??L-{?fo?#?)}?x5X:=??BJy???
L8+?~??:oK??_?VFN?tl'R@n?|?fR?69`kX`'8@??@e'H,+.??Vqj?GEX*]?y???$L?s?F0j?4H[??KbT#?I?j?W3?r??no,????x!??W?K??86?1?x?&k!??
??X?3??5??9??x???9?9?
9??x??8??"??r?	?8?????8?pm7.?x?wA_????????`?,??!r?
cf?I$?GiZy???6b???06/?????'?"??B???/9?%Y??8????y?????"p????r??h??????????"??S+?R???o???E????????1????/??????Q!,?`??-YI??!??;?B??v??u?Fz?4??0A9??k?????Ez??2?vCWM???)=S???\?????O{????4??SIxz????7???J?ibKz?a,)??}E?+&\???1c?1a?%?/???$aZ?????????????b
???E??J??]A?YX
??????P?????qsh?E?F?G???????7?????b@??@zW?J??D;?
[A?y??cZd?C:?-??<{??U?!{????G??/??%[?J?
?C?
?VQ?U?]???^
??a
`?

K??}?i????f???P F~??Jd???SaL?@!?J)?
???G??D5???T?Z??5???\?z?
6???d??=?6???l??}7???t??k,Y??{????7p???	.???b??7^?82???+K?L?????1{???3???K?>M????W?V
?u???k??=;?m??w?~
? 2f??
+?`?b??:^?9A???S?n=?t???{??w?????o>?x????o?{?????o??|????? ~?	 ?h`?*X??6!?>w?1??"L?????^yxW?"???????.??b8?cN:??#?96??c?:??c?>?d?BId?F?d?J.?d?N>	e?RNIe?V^???0??/???0?,W?^?U2?&Tm"???k????v?y'?y??g?z?????Jh??:(???I?T?Hb?n8A?f?AF??f?i??~
j???Jj????j????j???
k???Jk????k????k???q????????T ?Y???	?????9????y???nK-??z?-??vK????;?9?BAFRp
o???Ko????o????o???p?Lp??p?
/?p??q??+E=???0?????q?i.U;?Hr?U???9??!GW?1???L/???l/???\s?<????A?|??b\??^d??LK??Ao???6??G$?lM?S?/?\Mo?d?
5??A6?0???MM$0?-??D3???Px$^?sWt?E_D??Yx??c?;?????8?-t?b??|?????????z???|???vq????A?0??WA???????r*??r??_
???????=;4?6{?
7?t?
H?
I??p	??JA??_|????v???L???ts7?tER,????+.>?=?](??F?-?Oh
?jli_???)?!j??Y?0?/??7?`?h?8???s??7??
j
?????????ze@?iV?+`AZ?!????n\O}??!??.<?fc? ?/|?W`???P
??fb????E?P2??H????u?c??J??S?r}????u??+*d??,
?\??Q???/??;?/}???4????r????'S?<Sms?2????
3?q?@?=?1?E???^6 q)GP?n?k???
h8
h g$?W???c??=nDB}|????=8b???	??=nlhp????np??X?B# a7fC??F#
??m#Y?bA??
Gh???^C??F^h?F7H
?A
????@t&p??,??J0?t?`Je)?U?y????AEem???:?!?????}?]??W????5????Vok?????0?md#Wx'???????Y????	=?5a
????bxD60s??1??^??f??0#d???-??60?j??+????
F?~?C?H?_?A??H+?M???
mjG???8?o??|u?%5??M(??????????c????e?i???W???Z???3?? ?iF??????????>??_?6?b??[?a0?\?W?C3F:8ca?U6_f??lz?6?Gg???5??:?.Dtfg?\?$H?
???{??{?Wl???? ;?(??H??h????????????????(??Xl????????(????????????????????????(?????h??H?9????????
???8????????I??????;???H?
.??_!?
A? 
????k????,????f+
?????}Y.??m
*?]???R?r??y???MJ?v!^?I.Rj?U??S??VJ?W??K???"(?r?????W??	??G??dZ????J?S?l???6?q*K??Z?n??;*?j?e:?b??'??^????W??	?]???Y?_?
????~0????????@??????z????j?0????????????????????????????????
??0
+???
?p??0?0
??;????
?@?[?{??
??z??????@?????J?????????`??`????????;
??
?
?+?{???????;?#????)[?????*???*????r[?[??K??N???(?R[?r??ZK?f??T+?<???X????K?{l?h[?r?g?&|?J+?????1??4k?/<?m??b[?*l?
l?0????@#
?????[??????,?"K?|??p?f|???f?!?an??????h??????nY????w]??6?y????]??!r?&U
???*
?}???????????????
??????n?
???????Z???%???? ???%a}?????h??/;?,????s??&~???k9??&???-nq??????m?????,??}????d???#?Z 3` 
?M?
xp??z??Py
???????p?
???
????]???
?????+????????;?;?;
??	??? ?
?n?.???"~?'??B?k?>??(??/?????s?&??<????=n????4?????;????????X8???J\?
_
y0?
????P??????? ?? ?p+?E????

q??v?
I/?+??L???
???
?0
^O??,????S??d????,????????0r/_??|O{?v??~O?h1|?
???????????^?c??
~???????
?ULX1?o??1?G?!E~<6??I?)U?di?dK??^?$Y,Y2?/o8
??)??1b??)?P???p??4VJ;?vJo????r?L??g??M?%?+Y????F}???^???????/????
_>?Ab?F???-??'??6ufL??d?2Z???l???
(?2?1?`?
??5??i?dY%?#v?&???{?QG?s.:V??n?N??n:o??;????<???a?;o?_?I?Vav?UW??+??*?i&er??B?C?6<????o???mI?b?Q?	;?0?c?Ev???????I'Db
??F?0?5?6?7??iE??:?hZ?
P?
??7??Mm??[???????i?uoQe?????+??^
???W?<?
"?\"?=[y????T?V?????c??\??]?d??P@|???T??C??#m?)q+??"_???#)??"
?	?"0"?.??Qx>?
T.?D?s?????9ukX
R?IG?+^(w?2F0J?.??+???!8????F9?Q?r??z?#?
p??{? ?H<??? ?!?G"???l$8???r?x?d"3?HP?? ?09T????$*]?JW?r?F8?AJ\?????e,?
?p
W????kQ????U??S/z?jV&?$n5od??z+??l????????nBdew?V?Q???,G?\??]?M/?Af$6????2v?!3??#??0?1Z???v??,?1Bc(???Z?E?p?~?2??????,????k?U{??5Q5?[??[?:???u?y?k_??????ll_'{??F6???????tw7?[?????@???j
?V?`
	Npw??]?{?{???w?=????
x?'^??g|?????) Ap??M??[??????	a?B
??OL??Z^X?]
c??????S??T?d0?#>e????v3?3B?,\M????L??lJ
?P
?M??????,??P5Q%QMQ%?????Q??Q_?<??.?{??Z?????8C????lGa?x???|?5
,c,8'T????3??3b??b?
????]?d???e?x?1a????@5'
X??8??e????xTc$????eP`L;'ah?FqE???<[??o???=^??9%?8n????c??	i???b
?b|F?_]?S???e?
?wm??l?H@?X???b&,???%& ?d
y????Y?e??y\V???c?????????n13V?X2?3o???s???>g?t?3???5??Lf????3[>??k???UQX???V?]?z?
vkW?f????v,??j?~}?5???l???{wo]?~??????T???A?Y?a?t
?l-e?+??
??%??\>???%??n?wr?????R???I?
? 1?sK2?|$]c?
????
?.??n.?c?:
?0??;?BXd?@d???MK,???d|?9T`1"UwbI????~??a????#??y???????y???}?Zta7l???j?@6?X?qfXu??g??	C?
?$k*?>)????????L????3?H???
2?_?q?2???3?bT:?
??-???KE??L?X?/??p?@?rK??D?M????dy??u?T,??????r?&?	??*?/?????>?????z'?1?P?9M?<&Y
?M1?G=?0? ?;a??&?b='1???????O|iY_??T8??od??
{???aE?YH??S$??%Gz??
x?&b
????J?<??k'???jbF???!?I????D????;^?XU?q4% ?i?A+?Q1??? 2??\$#??GB2???$%+i?Kb2??4?-?bd4?$? ???? ??sx*N???t$c!??P??<??????1@?????XPL???9?]??u??N?>$BR???&5???[???????tLh???I????>
)B??	
???
??.`?1hNg}.i?I?9i???)?b???s???S????YX?d??ED$??L0f?0?P]?Z?0?A
?"?
?i4????????gD[$?????-~z)??L?;???Z??6?7SK?jK?????U??n??????D???z?Z?v?=Z??q?+???????^?k\?0??'hA'?y?R
M ??@8?f?Dl?hG0?E??$?"[???(C??PFy
j<c????????b????l??Y"????????_3?:?)+?????$????[?Y?b??t?K???+
z?/7???P2r???K???-:?[??6??B?1T?\???? ???u?0?,g??|P?e??(D????=??jf?{t????????t?
?nG?????vqV?4???
??G?X??Y?(????S+SUhWb}S2
??Qw4e??y?0!/`??Z\V#???K??#?bRI?????Dn5???m.(????O??1??
& Q?N?b???j  ???`n?	:	?i?pHI?
!H??O??y)FI?!??????B	?CB???\o,L???????|???S1??H???QU
I} ???S??D??I/??? ?v`f  ?P??!????:?P?????.? ?? ??` j"???0P".?L?EM???s??1???Q_f1??h%
-jQ?y????????????HD,???
bIb?L?????1?_-,B`:?Jh???>??=?M?D,?????D??h(?3)CF??H8OKd?1l^?\`?ii?W????c@
?@?Gk?]??/??n????YLa=????$<,?j`??<??Sk\Lq??R?/iD;?F??2?BB?L?cF\?RC?;??	9O??????????|0?r?cO`F)?@???
(F??8?;???????
D8Mk??
F
-?;(C,?2??;B??,
?
??S=?:?d)??\Y2@N%?<m?F+d(m$L???~G????ZN??]??u??x????[I???0???K:?BlOj?.|??<?z???Y?_?Z?-.?9E??
?P?P?R?!?5??P?5??
?*??G??:??H?PF?
??+?????7??\??\I?V????)2??%?B??jM??^}????1??
L^???
?????M?3?FF??c4J
b????/????
J?`S	tX???n?s&?w?????????5N?9??.??En???WHE?(??
{QCt?bL???c??Q???????!k@??b?n?gNU??q???(?13?;?W('?qW?G????.??f?????
?wq?rBWk?qD??DS?C?q/3;?(WtG??Cg?&??TI??????JK4?O?I?4?3?I<2U*E43?J?
?l?87?O???
?d?O:??:?`&3 *??p?a??t????d????@??&/[407?I?uIc@;??2??5&F,??RaU??!#F]?D,???,???[?5??0CTy???Q???*D?
?9??;??;?79?7,??~?C&T0????l2I)?Mp20k4[?Q???\?Ld0(V??Hc????N?2Dc?&hp?FDX&<LY?i.??-?dd?e?PF?FD?N?
{si?????'???!i?y??!???;?.?TMy?b?%p??c?????2T
???3C?O:D&???@??:?w??YZ???TFE?????C???l????f~???????e?????C;
?,@?o1hm????O?DZ??????{S?z(???~??\@?79?@?
#????3?!???B>??J?H?F?.???????h???w?a,CP?t2?<*????G??????C??F.D;???????0[?????>?@??PIq;C
xC;8?;??:?B???X?@T???
??
???????O???'N??|C}??;??
@??????L?L??eKy=???????
??X;]x?E??0?G?c?@?\????[?0?\N?{?.?1a`???k????

???l??X????&;?6?c????kN?D]??Em??HU?PH)U?RE?tRG/?T?P%?4????????N????'?Jfb?!??<5ri??`?>`?3????Zi??????h]????Q?^????_???!?,???c???&5u??B?>l?J??VEvc??lg?H?z????7eJ?b????x??u????i?K???j????xJ?g?+??R??
??H??R?/"?ZHR??M?H?_*????B!`??????Yoj???,???U?H??`8,P*q?3??^?Y??0O??D??f0#
<??s?S?i}E;5q?a??OJ??J??|J??X?J?a????+RaNw????H?/????d??2y?IN4B?De??U??#/U??R??O
??????'e?0`??
??'
a???0?? R?K?J?u??#?p}E?????tJ/i????L?
eNT6???. ??Y*?vl3???:?N:?q	Y??~k?'f???4Ea??2???x(e??db??F$???|?&b`5?%??'nw???y??I;?N?????YQV???i]k[9T??eXY??;?
????p?U?*d??y??J??U??A????U9?e?T??`?%?Dp?;???x?q?~?r9&cYrZp???8-[
	?
??"?)?4\b/????_?????????iRs??"?p??~*}?(?}??S?[???m.?s????~e?a??>^?}Q ?(?&R??eG;????<??4y??j?b2
?#?Q?L?P
???V?I}?:??}"???e\R??+F2?}?2t1??+Cn|??@??:?i????$??`b?????Fc?f??9~?S?.p???>p
;????g??*ab?)
??X?Gp
?CGp7?N????H`???Y?|??|??a?"????t?oV-%2?J4dn??W?D???P$&?ZB?Z?%.?'?BCJ?
?V?+?N?P?'Jd?(E?N??O??["?~???Az?E$FP?/?9M?tE?g%C?V??O~d#8??"
(M?a?M??1]????O\?;???????]????????^??^????Z?????????Q???A?
?
?
\????????=???>????????????:??!???????>?]???>??????:??Y??]\??}????????%9?eZ??=?)??????'?j????{q?X??^l0?????g?} ???
??kI@\???w???????s???@?'=??{???N?W??????6x????7
5?????{????????>??VB? ??b?K??z?j?f?7m??esXo?=m??q{x?Z???e?qc=?
??,i????n\x??B??u????E?4??8T???w?6?x??????????bX?6??k??????`?{$}j??"G????t??)O?<?9?	??Q??4Z?x???r?x1[???b?K?L?????/c??s2??-?],4dc???N??t???W#?Z?k??'???:7e??%??<????u+???wV??sC=]t?b?7C?}}s??X?k}?3x???.??????-?????z??ug????????'Zu?i|??W?f?5X??
r???H'???L7?t??E????b?X-Tg???\w????$??-?,vqbS??1k?????????t?]??v????r?}??z????^???'?8t?????D???_Wn???g??1?C?c???2[?????	#1?????S???
Z????7??z?? ?GH????(L?
W?Bb????$@???E??f?!?6X"q??@?:
s??l?1?)?d?????e6??LlFS????5?IMrv????0?9?s???|?7???t?s???&>?yOx?S???'@???m???5?@?????s??dh@JQ,?A????~???u?1??\?&???C?n?B??.???{x?LgJ?????8???Nw??????@
?P?J????HM?R????:??P??Tq??,????G8????4??O??c?????["?Y?:/????jm+\?*?????t?kZ?????UB?1?$?2ta??M?b???:?????d'K??U
?????:?6HjV???F??????W??j??R?JA
.mi? ?Ju[??F)??r??.
?M?KS?????=??+??v??M.t_?0x??
?t?@\???[????????<?i?p????>m??k??^.????%?}?K???w?
?'?	???'e????x???e??]?'{%????p???@]?]{??{????[a0?7e??|?G\??z_ N?zc?[R
???R{Qp???G??hr??ff`?1?x????
F??)Q w?u???
?	?I
`yg
??7eY????
??????@?S??H
???B??49?-?Ni?#??VI`6vW?ab u?Q4Aa'?V??G?l?rRj cY??M??L??%
?+y?J:??8g??&G???ov?e??!?
?0[????5j???i?*?x????|Qfn?@s_?????p?P{'?|H
X??/???He??f?eP	???a????i[`???? 7gRVS?x????gss???yH
8??6|Y6w.htvX&?????T?????jp8U??H?%?
	??E?:^?X???&r1???[????8njFc??im	????[R	????f???r?:?z?{??ykx??!??$??S??FXSHX`_wvT?v??L???Z??C)(??@*}0?:?F??(?????K:?9%?
?
T`T???`?5???????
z`S_??"'\X
?R?G?X?i?^???hd??I	hx?n????'?H?_-??%???z?^???~?
h?S h???x8g?
X0i?I??????U ????)??????1e??????I
>??????
C??S?????4{j???????+?+n????@?V ;:?0??2??1?"??!?
?;??;'\??@	l??S?t
??K%^??
??r????q?`?v(?R???{??F
???I???????z??7?j??f??Pz???%?
+5???????gz?up??p?e??p?\
?%?p??h????m???????yJl?????Y?
??	??+?B?D????!?P?A???t??wH?u?????e??hMmj-?o???\b0JW Q?_R?f0????????sp????????4
?b?}f\w=???t????VS??`p??r??`Po?Jz	?V???ep?U?45??L^c???|????9`
q?|`?Em????=????T?????5??U?I_???8?h? ?P?|whrn???Ty???t:?9?a? ???!?Y??JV>)v???????????n4?N&5?????>b8J??`	O?*%???????~???????????????????m?kL????????.??5^?
??]???[z?\/??	?????m]??????]?????U]????e??m?U ???\?]??????????????.????o???O??.??[?}??}????}????5???>^??????^[?8????&???>???????q???U???Z??????O??A????9??t_?v?x????fpU?????????AW?Q??!R??????U????<????`????
???`j@
?`?>Q`\w??????????????????_????????u??5????????????????????????????\???/?????/?IH??o??????????????O??O?J???/???????????e??????????_???
f?????x?Z????h???F?w?`????????i??
g^?>???Y?L??s??
gG?|?????????}???????
??Z3?@Ct?O%??sJQ?Tu?VC]?TA=4?Q}??E??K?????T????:?BUF?}??K????7??VZk??V?k????m?
?YT-???Mt?!???O??t7]"??7_}??
M{y?7`?&?`??58?~?x?|???^>?X^?/V???1Nxc????U????
?K~?d??t??Qe6??Ck?u}\UF_E??P?????}F?h?p??]???????Z????????
?Q?9;l?U????{???e????????x????2?tR???;`?qvdx<????U?&;I&???????????I??^?3??r?17???C??Ca,?h???Z???~??\???-;?w?9]Q/G\p??????a>?x??G?y???=???^U?}??????a??.}???[w????rE?*???~yE???[?????}?q??G?S?_?
!???M?_??????7?1lD????????,z????pX?	???{??1?????z??bH@N?q???????
n??\D??t??
??R?Y????MT?C??\'?????'?]+G3Qs?????7HA2y?d?!??9??+?6??W?tE?p????DTF}?w
???H???n????7HXQ????z??P
??D?-iI??????l?$?@Y^?Es%Iy/???????y?"-??!????F?U??D?D??)?p???<g9??Nu????D????.???"[?D1.R?.?f%?G8?????3???B?}I???l`,?Ui????}?????|???X?hHA????r?B?$>fK???v`???8???Ylt?#?5??4??iPy
T????@E?P?j????L%?S?
U?V??W%FT?JU?R5S?9?J??j??_EkT?j?????Y-?[??U??U?o%+0?
??????+`???VC?=l2?Xb$???}lQ ;Y?C????e1?Y?v???mhE???L?P?5eL????E?R?:??????=?R?b?S??O?ZU?
w???*q?j?V?6???}?p?
???5????]?;]?
V???t????????=/z?;Z?^???-meA????????o~K

????!?a?~??#L?;?6C?]y?!f8C ???>?$x?@?8?86??c??????q"
qC?????????d%#??wr3??f0?B?2#T.?S??y8E??|?4?y???9??1?9?y??x??>?;????s?
?Az?(??{??a$??????1??Lw????jV?1k?|???6?[?U\kw?s??9p
wV?????{Z?~vZ?????.????k?{?C????U??=5`5?

??
?????]
???<?????<???/H-??;??SH?4H??=0??1??/0?=8?Fp?7lC=????C?A84
???	????IU?hU?X??x?X??W-ZE
[?????\????U`EZ
?W??b?aH???eH?
Z??pJ?????
?%'??
?E????V?U[]Uu??X?NY`
??
h???&??Z??X???C?}??
@)???{???k?D#0
?~'???o?D?&?f?w:??di??_?~??n?md?.n?F?????iE??N????=N

~
??9C?n?\hO??A=m?c?Y)wm?d?????????m`???K??????[}s??w}?!$??!?w?A?C%7'xG.d2???
%Vm???
P?!X?9\a=C
??/??6r?????? G?y?$??$W&S???K?.S?????M???m???'Hc1?~d?r???Fmv?1Y:
?@?,f
x?R?
A???
H?{(\`??
Qp?!	p.?????9XA`
??????0t??b??/3$?Uh??P?$`?hD ???$Z
??R???(@!
Clf??v??
U?m?Lf????????:??@??B?AB??jx?dP??[??0??\{?0?(?{??c??XtF????J!]6`?Q?L??????wz??a?Y=} ?^6??8????#JV?A<b&s???????$??h?!????k`]??????nuS??DGh?????*?????{?4x*U?c????0z
?W??[u`X?+?
iKY????*8BHn??3X?
?r???q??6U?? ???U?Al???~{E?f?XNA?????
??[?;!G/????????K?m?6??
??

JP>gi?X???v)LI??D]Z?Wq?c|???,????fu?w?
?f????"b????	?5@$?FH???Z8X??&??2s???Y??y??m.?iQ??????|?
@"6?a???W???
F:?o??$?<??
yb??'????I?3A?????,?????0]DEh.?M
^?????
??\?
??)??`?1L?
?>"1@"	?
	~?H?#R!&??#n?f ?l?iK~?)?G"?
_?%????a??b????	?&????@?+???U?E?????N??a?? V??-`1P??p??0?????
??r??????_$nK????1???c?h.?4z???}D0????-T?N?v?Fh?
V?A
??P	%?2?b??1?Bu???\?H,C?2(G$
b??aX??
????
Pa??/??	?UQp???M*S.HC]?$!9,!???0|??	?-$%H????]%#??1?????nK2<???Z%???T6??$?-t!/p??r?ma?9?FP???%G?aB??j!?X%F?H
??X$??1?_f???-d[>$?$ _z???"(:$4E?/?U?M/K	1S?	???b?<?????????H????UUZ-c4?6J????~I&[???T?f?U?$f??_rP:?>?
]$????????Y??F?a??^?ofgJ?t??t??????????eB6???-?
??R$???i??
???!?L?d??g????)?!??}??yKBX2???1?
?~?_??H?dz?0!%??????#??L???'?????I????A?D??Ub??(
B#?$????F??3:c	b?	"????\??'.?d?"Y9??B`?AKL_?nDC?'?>??hJ-???yfW>??\?.?G?P<????r?dk6HB??!3l/0C?0?F0?.?
]?
????\G?&??D_?I??bZ?q/?$3?????
?H?3???&H?b???K?$?*|B???dQ???}???b????M?b?n?fO|?D?#J_?yK?2
????0N2?????%???'?:\_?ba???G2-?^.?f??v?-?h??B??k??"???E????,???.fZ????T?@6??"????VvDG/????C1??
?????r?-p
p??/	p
41?"p?z???2?q??6?E?2?-
;T4??.??CD??1(?- at t?B>.C.-?JF$3i$/??:?????
w?4???Z??GLX&??1?(??S71T??TG5U??*O5VS?SC?Usu;??Wk?U?5XKuV;5Z??Z?5;??Xg?[?5Y??Xk?Y?uU?uWG???5Y??'?????????V?5??.@+??&?B???:$sZ?O?U.?0x?2L?2??
??NH?CE:?0?Cz??u?,??O|63??2?neE0?g?
-??&m????[G7\c5Z??[_wUs?VO?_w5v??wkw;?5u??W?o
?s???????-??????????
-?n at wD>?%??
@?9??zRb1x0?CTT?.|89?9D?:?????5fE:?81h??E?B?????,'??b?	5-????r?K?????y
q
t?`g)????]1?d?=???7?M???)1???	??G
N?Yh;nJ????JD??0
?S<?????
??_????_DV?928??;
C??~?g:?o???
l?.`???",????>|x?!??~Z?P??'P??,92???+C??93e???9c=Ztd??O?Fm?5???W?~<???-N?B&?????%<??`???'GX?????+??9??%??$.?7??,?Qv?
H??,fq~[??	J??0r
?#??L??
??G?3z!k8T???S?x?q???GH??x???Ct??5?r?3x??ccGRF-??9?4DBI9H?C???H??1???Z+a?BxD?&oB?a??yY??q?Q?Ka?c?Y?x????!?KZ0j1LSN?%Q???????>$?w??_'???
v"A?U?j???5?t??~?ZW?F?N?	a?jW?f6??m?g3????6???_X???%9dm??buP*????S?d?=???FXI?}?!?A&??
?c??P??z?!?8i???? ?jLIb?Z?k%?8???g0????.? -?K<?2??s???G????/N?;lAY????f-j+Y?????i???
?6??Ul???`???-??T?DT?????H???????xBq
?????.?)!S?"*!I-M??c
?????<D?rI!??4?0??#4?????(P	??,?3??A??#????b?WT?&
?Ro???K?c#f???'?bPbV[?d^C???p?H?c]??b???
h???Xd?L?1
sS?c'$?+0?????Tf1?&?TV?&'?O*y?V?????(??i%<d?KkD???"?p at N&1?\??($?#?b6b')?&>??pb,?A*??+?S?N?cFvTva%??5??????,????.???GG??R???"H!???d?a??_Z??4Qj@?L
??FV2on?j?"?n?>mz????EN:???7?8???_??k?p?8???MHy?L?\L??Qy????Gya??e??Y?k?_??Ky?S??s?????y??o???y??9?????h??p???b?0,??!u?!????q??8
L???h?????je????0??9???)"??????F Z???????Q???g??
????z???????:?Cyp$????l?G.Y\???/??^N?as?,qY?%v"?`ExqI??$?6?H?g???+h=x??o???_?~?%vR??=????Z??t?????:
??x??#b")??.(?kg?_Z??<??$??I??I?I??x????9?x?Vc/g????_?89?????Y?c??W~,z!???g"l????W????]?a?!`KaF
\??y?2d?d?>??h,???!O?Y,???/E??)?&L?,Y???K??<???,?d?
m???>??O$%??c1??16?"t9??L0???X?\1??fB?L;|?GV2??%?0???.???0???.?x?NS???T|?
?^z?(L1

9??
??d?X#J:????@?4?a??rRg?ak%?6??N?hn?z?[?!n?!??6????I
??	T?-??%Va6?@??t??:?Tb???c|KI??0??"?^p???/????0?p),xK?_??D?1?cL???T????w?????4???0[??Z:???~H??f??????D)??N??D??<??.d7?(K????;?$?f??T??RS{?U,zhNi?0xy??:?Y??.S??^z?L)%0??%9S)#??0E??M???c??M?0M+m6!?~?)???Z????????rz!?Y?????vm??
|\r
"?`2???.RY)?Tem%
K#a??XY????U`X?+
?;?S?.???X?Ce?X?2???????(I?U??&?4=?Mr????c??????0??2??,H*Ns?bs?5=Zh?"?C?'H	??E~ZKO?P_?H-???????]?????R?e)-?Qf%u?-??O???l%)C??2???E??(???K???-]?R??V????@?l]?[?
???5?t??]?????5?|??_?
??
6?' A
J?\q??#??????????
/A"???D?g?8Z<???@T2????[??-G?????x?hCk??sn?#,?+	???v??%?q??V?
7h
?h[7?m1D#dJ?([?`?h??n???1!?t???XNC??p+???bNRb??AQ????j?.?u7P_??u?S?sr?`FP+??dTv?m0?|??K8?fpR&,?
SX????1?x????K?a
_?v0?QL????O?/|c???%N0?u>^??2:d?+Y??3o6!?`??E"]?????J?T
R+???Y?z?????????b?"p0????X?-?q???y?=?3???a???z??=e?2)?5$s????????e??9????R?y??<????E?8CR?%?b????6? ?Z&????D'?K?9??R?:?Q???R[A????b??i????8;??6v???h3;??????m?po???????
nl????f??Y@x???oew??????`??or
???>V?#???+f'GdFQ???Z?%@?8JGJ?9V?I?????E????5??m\{??,O???
???[??~9??j???)?7ZA???V?????Ek?>F? /???^	????C?e}
?{N?#HT?2>???@??\+????Zi?????P?==?B'???HRh(PQ?R????=?`~???x???W?E???K>??w????3???_<?7_????*???????{?UDz?????7}?A?y??M -P???*??<2??????D? ??@??R???WE??$h???Czx?I???i???&DJ?'????>????????????o???o??????????x?'?+???P??]d?O?q??EL7w??}1?t?%[Q? ??X1?SU?`kv+pbC?? 
rP
??hr?OA+?T++?k??B?t??4[?71zw@4A??"?;??;A????w?K(MLh!stQ??@
?C&?
?R????H?
*HJ?W*??OI?S??Y????~1U??'?}?i?????!?q??
l
2+??&J???Cr?,J2??$?"????D???? ????:?.^?(!?P?KB?N??W?L????)?LZ5???I?????I?PY,?$?????MS?T?J?x??r:C???SJbZn??`?????-??N?%'C??9ZK%N7?pa?*W~,?u_?f?W'?z1
?}????YQ??j?)!?L????FW)?)???????j??QT?"?v???9??x7?q5?9N!?32l"???????=>'???p??D???0()??}??i=?p?U7$???7K?8!?@?d?F?D?M??????#?3??E?????1?J?U ?_e?qS???E=??`
?????K)`??????k??????????6???2"?f?_IQ?b?J??#???&?D@?@?!????>??{??u
J??{?D???Q yb????n?^??B2A'_i?j#5QY*?-8l?????D??P????????+y??
+????
????C???u
I??????Y???]??tY?t????!+???c???	?P??u
? ??o&??$+???@?
<?G?#?H?HQ??v??U????O&<
]?????U[?}h?i?-?Hk????? A????CN?M?fAK?In???????q?}?Ji??????	?Z&J???Dw`Ao??1????p?P?D???&?GEq??-?b??x(??]vy"???l???pf?%qD=??-\?-?????????
??0?Z???:?L	0????N??N?F??_?!?X?}4????>O?????JHtD?"??V??Sy7??pOE?/n?Mw"?^??????.J?Ay
?I8Nt????D?????+??g%???O?A <????sD"zG?Jy???x?A0?????X?}L????
?/%_?a?:??F????????Rd?
 ?
????2??#????e??S ?*???G?
g[2nq?.?&??????0e????:??(Nh??bl?????]??n??
L$?*F?`,I
?5b?Q?u????&??q?????"w??_??+/3?R?`xtQ????C@?????
?A??'??????
?-b?5?i?
n")?H?%
S?]?"???[8???p5G?????
???]?QnT`??tR!$}??E:??????7?L7u
?'?!?A?? ?Z??VC?L.??a$M???C?
????(??	?b????%he+??A?Y?qR?
	?????E????d??h?ir?N???(??t??$J???????3?i??5?83L?Ma(C??S5??NIr???9?@???3`(??Q?1?Q!?(?0?h??>Z0#7;S?.?{H
pL0 ????j??&??A????l?yK??e??q33Z??F??????H6?0? T?edC??Z?2*???e=?Y?8?u?efi	?????lu?????s??K??!?P?K[?????,.
@????(???????F?
I?g1??%.?GJt???
??b?I?c\??A
\d?s???'?R??^????)!??P??4?????;????-2????E??-?#YIV?1?B?A?.>???2C???V2D???????-25?Oi?h???`??d????,"G0???,$?(????|z??[??:N????
?mNKB??O????%??u?:?uTR"?(??q????0{???????wl{??????(N]?? ?\U???y???!2??Q??fZ?&|^????!s?1???B?????*???????????R-?WB>s*??j?ph?L??M\?@[???R???
q??????X??,?????g'I?????ix1??4???@i1?????!dC??????^8??????????O??	???????Er?RKm???uo?dj*?}O?J@????'(??SPt???;FO?????uG]?O?:??u?_]?T?????~u??=?c?:??~t?? ?@Wz???\]?+???-j???v?;??~??????<??Nw #.?????,???Y?bFyl
?L/????Ty????g?<
????q?????~Eg??>??S?x
?8??D	
??<?8?
??l????(
????M?,N?<N?LN?\N?lN?|??,???N?|?x
v??N??N}????N???0????i??7r-*8?1??!?y?`:d=09???P??SD?LQ????B??,	,?L6?Hm)G??D?J	?4??Q.	
	f`?0$2??bh???~
?*??????AH????K??xhf?v???Z?B?1????
"??4UmUWm??!
??
w??~??`3L?N]6???O??S??e??$???oIZ??r=????I@???
????0?q]["
x??]^r?UX??o??I??8????HJ????-??J???? ?b?V^???8+I|U/??????(????"?d?????Z???,?5??[??(bF????R????:?V0???(????\??B*?`x?
H`??#XQ\???X`#?*??`?	@??
??????????????@?r???!?????9=?V?#`Z?A^?#?h?n]	 ?*? #
..s???E??	7?`?(
^???
(?"?9`??up?(?c???}??Y?X???]??q
?J???????R?\h???>????????y]JU??a^1U???1d?]?U?d????o????|8??ar?S??????????/nGZ??k?E4J?????Y??I???i???P?????????
W)????&
?;??
_?]`f?d?????U?-??_^fU??c h.^r??
X
??f????????
n??X?`?????T?H?8?@?Q?????9?
????>?
h???me??^?`?e??J?;)n?^???ur??&^W

W?U_?? ??KtD-?????6??p+??3??#?`??V
?!5E?D????..k??S?1?q?'wV?D???R2?R?????
???%
`3?[&??b??3?&A??`0?0?V??
?a???????????? #
H?4???????b?Yof_wn???? V%fV?l&^e??x????M??z?g????????>???
&X??o?,I?(l?$?:??????O?X-??????5???????:&L0
??
F?$?L(?	2XaQ>h??F?!?J??z?a?$??!?(vH?P)p
C
??
,?0?
$????P? !Q2?3?;L9LSN?2?&????bf-iV`????s?WBFV?r???ha{????K???&???u??VX??e f
)?m??V?"A???HQ?K?U9?????C??????Kf6?@?D-bjz??$?`,D????D??@???rNb2%???;?Dv?/?@;#w??-?q9????F6?q?nT??8?7??q??'???7??yl??x?.????c?8????c???O?????%2??K\????(IA?#Tb???J?]??S??????[???g?K`8?ZF??RZ`1???b??Qw??V!?h?aG-???c$?"&??XJXC?DQ?????u?,
?J??#??h,5???N???X?E?2???G??W7w?????7!?0??N?<=b-?A??Z?g<??B??E- at S?Oth!DQ???)']?E??????W\p????$??,ak??"6??],c???>6"*??^?8?\~sI}	?f:??qG/??*Wr???F;#??"M???Pl?.???6??u?+9????#??.q?k??V
HcLP?1W?????
F+???_PR????/???W$?3a?B??%;n?Ck?????tg?C??@?4????&????o
{?/?	?f?<?
0??1???a????????<?Y??1???3?*??gL?K?????D'b??	?
%^?? ??	???????	=?u`??.?1?)?bLl???@F?0'`?????\?V
??
Ht?
+??^7????w?;???7???n??(??_???????5??9???e1?)???
?fyQ0[????$ +yJO*r0?????u
p@???
?

, at R??/20*??M%??U\????D?P!|??T$?Y???
??N?M?@??L?
.?F"fb*?bR???`?0d
?@?-?7??|
L?D??h
??/?%0?DZ??f????*???e?Y??1&?hR`F??(dr?
TY?qff?a??h??E`??eZ ?>FI	
?_?!o%?u?9??Ul~E??I?
???u??x?2\??
?h?????.?G
H?a?$?"1|????!k/??>TBU?3?o?????$??
??u???PS??0??Z
45?E??U??????Q???,
?uV?????
d???d;???$?p??4;
???p?b`?h???0e??H???k?????+???F?j?.F?????????4Co%???*'???1?e?rr)?X?
0
q[s?lV?_?UQUj;5?????)???=8&m???d?P|#n?-zMuV?_??br9.???Bjd?<???w???]?5mY??,Nv? ???N???V??U6??%F?6H????????UO>?zO5e"s???5?gcZ????y.?7?????
????/b[??Id:????[???]?A5???iM?i???????\????A?z??z? '???????????&z+??rF!W?h?}?5nxwN9???.?_?/'?N?a??U?[?????W?p??d?v??
4d?k??{'w^?M?%????>????]?x?.?x]?[?Y?3??pB??=n?U????????Cn@??&?|>c~D???)?{???J'???~ks[?&(??]0f
W????6lj?a?mVB?p???S?`~V???
t?? ????%f?[?Z??);,|??l?A?u?=??[???D??	?4\?"??j??"??X;??+??????d:??j@?2]??H?*??????XG?Q?v??`XB?7??`??+??m?#1?4?
F???)G	??~??!??82????+?	;??<6?{??	?0??L???,iYKZ?)????,q?K_????K??W*???T?,s??o5???L?4???BNs?d<c?7?A
[???W(m?"kM????????;u????]
w;?QW?D?&?v?X??{
f??
(h?]?L???f??x?_1=?????O?Y????0;5lr???$f1~-????
#????wo)??-?V?7?dz?[????t?<?H?mQ,??????unrI?Xs??V5aW?
T?6???F=`??U????un?1??????2?
?
?yYp?#??IEq~??0?????g?U51??/??4??tE???,7P??????m5@?j????+?y??qsiWC?? 
?
?????
d??????/f'??+o??p?l?N?m???&L?vJe?U??'??p?0???0???G?????????J?p?Es*N??%?~?????BP?@??b??4o????A		
???&?(?L<Q? ?Q???P???XK?
a?k?????+????6?
??
QO?O?????,???????????p'}Dn?D?????$??k7?$Tx?????C?D?????p#{#????
M?Gk???p?m??J???B??k=5????"?
???????^?M??%??&b?

%L??l ??????M??d-r??E??n?&F?=??8?K?????Z?T???Y?URq&p??Z??j?)$)a???p$TH&;-M%h??F??D?
????n4?????A?`
??p???/????j???@P\?1??w5???5s6??[q6????0?q?I7?$???L??
--- NEW FILE ---
GIF89a???
?T????(+?$????? K????L?3e???q???>?
????|?p*???&>?&
?I???~MC?|?????`???JV???3?????_???	?Gt?I?1?????_}o??}?0I??
???p????>?wrd???J????b??5+fL8.???S?^}??j??_??<[4???m????w???=?n;?mq???+O??xs???;??8????k??????????O???????_??}?x???#:_>?????????>???????W|????
6???B?`?N?O<?|??!???"^??&??b???"?%????#?H??"????????;?c????7???a??3?<?3?Nn?O:????[^??:{E)?@1?
??D?
y?`A???P?
??[???X???V??/???;jd??FX?{?q?&1???s??i?60>???mH?e?S$[Lr???v?m?p[~wqd7???5S?????W?H??]?A'?tv?M?????%??????ul?'??d?m6z+??ev???6?(o)????5??(????y??|7?~s)x?\jh???w????3???`??Kn??G? ????k(??N)7?#n??{+h??k?g??$?._?'v???"???+b???bhx=?????????!&/??Ph}??g????_/f??? ??H"??S;?(?H#,??<?SO*?$7????J*L?<??(7??U
?A???X?(?
?@?????JCr?BW?
(t?M?????0Y
???m?Drb??r?6x?inv???v4ua?g???Q??y:*??X?????p?K??R????H?4P??gp#nJ
???R??`j!r???b??@????+?&????8??#{????X?r?@??&?:j"R!?L?z??I*w???J????I!??aN
???e?'

_+?p?K?&\?a_??V??><U>zh?p?]EZ?$n???-?\E?+%9???7)?@?s{?.??=1U????%?5#kX?>?K???@VD??w3???z?+?lf-l??%?Bfk???N???lr-*???$??i
?D?Q??????0?'??
7???0?)??knX?D???'?a?|???????a/; ^?8??b	k???)'2???u????ffvR,N???:?qq?f<?i?????26?,e?}??GN??!/??I"J????.c?CJn???J3????jf????e-???Jb?????k>qw????%?y???F3?>w?C???~t?P?????H
??m?????*?8?a?r??\}??????tJ???A}(????????<[?x?>^?z?;??hD"?^??Ml1??{????M-%"????G<x??????E?p?mL??0??B????&|Q???Y?D???1N?r?*U&?s?4?_Qi ??G+r??8??
qp??P7??w??.rq?^?????
?\?ac@???*4?a?g???3?j??1??c?
S???????U?Q??
?9??f?/^??A?N???*?m;DH??]?_?I??d?????b?!??nw?g?{???????=?Y'???nx???L?o??
???O??????7???{?????GO?????v'H9?Q?k???p?5Z?c?C??G=???T?K??-hq?dx???Wu<??{?[t?p>L+*??????HJ!4PA
Tp??$?
[...1391 lines suppressed...]
?F??
,*?J??
????k`?:??n??p??W?J???u?~
k]??K??U???%
W???5???T???????
aC??E*?Q?Z?z??NE*X?`????@?3lm?c?:???5????ZK????v???l;[????????p#{???2?}mn????F?????r?;???v????l?????7???r????????
?u3?????????kC???v???}??|???8???q???'y??????\?,_??n?????n??1^?????8?9?5^r?????N??'^?o??:????????|??y???t????Ty*?n?'=?X6?N????C????v???8?6??n??g??|Ow?9??????)???m~m????????Nw?????G62??pz7=?Aw???????M???1/?X??????e}k]??????0?dO??????w=?q????z???=?u{?????0??|??B??????QwX#?h%>??
~?????>???x???x????u?c??P?????w?c????Q?
??"??
??????}?????
???? ???????y????i?j?*?????9?"
????????>??=??>??y???????"??????@
???0??????9???%?]??`???Iz?[?????<?V??G????????????I?????i??I????`J?W?????????????????
?????Y??????S??"????D:?????????d??2???z????9*?mj?
?????Y?@?????j??)????????)??9?g:????tz?x:?????@??I?0??)?y????P
K????k??????????+~?J??	?E??"?????!???
???+?Q???Q?A??T+?p??G
??p????b?Z[?X??^??j??G?R??V???	?g+??7?UK?N??h??g??]k?G:?t??????J????p??]+?h??m??b??u???{?2??8??6??{{????_??p?????y???W?P?????k??????W?k??;?2????W;?????;?;k??J??'????K??;?"?????2??????;???}z??????Z???K????????[?K?\+?8+?9{?M?G;?7+??	?
????????
??+~?;??????????????'+??????!???????????{?!??J:?#\??????	?'?

???L?
??LM?=????N??&??M?q??X??a?????	?AK??j?????
??+????? ? /????2??K]?;??=o??O??>??'??6????"??p??`
To?U??W??Y??T?&X
&X?aO?H?g??i??k??m??o?q/?sO?uo?w??y??{??}????/??O??o????????????????/??O?i_?
--- NEW FILE ---
GIF89a?4?


?m?y?{'?y7?{<?}@?|{?|??
????
2A?????"^?Q???8s???s???(	??I?#????\Z????
mJ??$??X?j??????kR!h?I?"(?<yr?Z$mS??4?Z?k?????^?m?%(?$?)H?ar??????$?v????????9?]?y???9???R#???#c-?m???????~{????R?????	;????????uo?KZ4????S??z??x?[??}z^????/?^?????o????&?????e????yH?g??R[?U?jM?t?M??^x_Al97?f?u_???x??$??Y???8??*???/?kM????<??#O?dAC????B"I??F&???O6??q? 
j;?????n????+??i??,?5?.w]f??r????z?????
?u?????Z??.;g?k?9k?w??????7
?F;?????	???k
(`?7??N?kG<?G??q+N????0?)~
T????p?Z?+T<??&p
K
??
Eh??I???PF???>u???????@?}N
?
?#?p?x&f?#~?:???1?N)c???;V(???r?h?
???N1cc"??t&?OZ??_??A?=? ??????.?V/S????
??N
???Pq??%iI9r????;???WMn??P?????OqbS/???R??T?)???0M)?:GJ?U????J???@??L??`?42=?UO|?#?}???????AE?Q????:??P?S?U?R????}:?=??f"??X????z??[=+Y?????u&)+WYR??yC??(??2m?4`f2??d?'D
vg?:l'hl
????%?'??W>?????%_??Q?r????7???M?s???2??e^??????H+R?	?+}??h???N???"?V??????S??P?:??N???}?"G{????????/W?????????'o?*>!?T???V????>w?~?`?{?o??+??t???#???S??y7y??????e'z?#r?????;???z?w>?hwE?#/?????u???w?w????=?{???\?H7??i???_??g>?????????~????????"???>>?T???s???^v??????:??ou?????????O??????z?w{h??Grg?z????s?{?'??w??~Vv??	Xt??v?Gy???H??7u)?u?W?H?
?~?u?g?gy?G?_??8????7?x??rxy?'v???'? ?|?7????+|??rP?C??=8?E?
X?yU?]hzXW??
?"7
??
?
??8???????Gsu(?xW???~???u??
q??Hr?ss8?@?
???P?y??w'(s?X???t??t???yu?0v????w?S?	????hs?X?????????X?H???(?????H??x??xr?u)?s?s??w?hsX??h??x??s???	?????????y???H???H??8|??
[...1009 lines suppressed...]
:???@??b????(??'
,???J*?0Ji??R?N????9? 
98u?N'a???f?~?d???	F??e??JZ??[8A???\??9???^E???[i??V?U??
???E??f?X_??1?n?{Y?p??j?$?6?????#?C8)?F?.??l????[a?<?^ O??td|?p??U??#?[J*]?-As??%,? ?????@(?|?I
???????z?
*???A??i'????,a??'A???N*?@?'??r?~??B?`B??
[????';??\???	K?R???3?
O_?{??)?Hk?(??
rl?0?X??"?+?'Z????h)U??
X?9aK*6??4I?dB?(H?_?bP?????&f??W?`(`??Se?? ?
NS^Eq
?|{0?r0G@?@??@$@zBzVNp\*K8????C%D?UZSh????l?`P(\OX#9????B??+???]???F&?Xh???C&?DR?	?i???X??])??P
?L?:Q?x???B'|?????h?1UzZ+???m?????a?????D??a???Z???????U*@?|?,???Y*??xu^Q??	????yF?8Y ??8??y1?9	???M?
???|???mE&????q?8,Q+t??"??v
?b??j?A?r?Tg-?P???H?/?b?^c?V???l??pS1???^?)??????ft%_?g,??#2?+U??2Y[??u?????uiD????h?sV??r?w?
[$
T??k????g?Ic??NtC??]h4 z??C???y?,t???)?v?????9??(??????$I?\?Wb???{?Eb??????????ch?i8??{:\|????k8t??q????R?????R?!^9di?+??]c??R?????L??)?D??,,?F7???B7|(N??:?9,?9~?????????a????+?+,p??j?)<??u?????-??????KT*???H?9????4,?JK???$A??^?
???-N?-\D??a@k.W??)??,>???Rm??????+Bn'?????!?l??????-?|S?*.?)k?u.?Shj??????R?(???&???h)??Z????v?@(?@????
?
?$??^??`??H?BX?r???B??K????
}BM??Z?4?N&?4
5,?4,g2J?Q??
?????A\4BltG?tO_KPuQ??F?4C??@?1DS?z|?!ER|??Z????????K??MO???4????F9???	???=XG<t-???n?+??df????s?n?q??_????"?7???Z`??s2?OXo[A???:?%JDD?vh???up???"?????`62N2?s%??7??;G??t?o???
k;??????n:??n??7-??_D?R????'.x'v19??J?h{??
]???????Q???fL?
??<J3?O??9?\yS???%?*?*0i??????0?A?F??????O?:?????Q?
y???kS?lM???U"??UYN?W?&G?@?????LI??x?pa?
YY??90???c????+?????5?F??=????I??ic?\{?b?v?3?Wh??8???5jI???BW{??????og?T<s?,k?U??{??????????????5?[????j??^?4????????6???????@2?\????.???	KA?{(??2*?C?f??
?]|???XN??????W?????3k??T???z?q??PT?A???-??
Ln???k?I?S?@'??o7?	E??RF??L?????H????JMUT????L&???G???&04????r?@?<L-?A??0??TP?*r?4?t?hQG?#????H??3SOs[?JW?????????n?*5??3?<?-G?J6???T?*?@????Zbp????T?????MM???K)c????mp+W???e]?iH??t?G???????iO???[??$1\??-??hi??.??H]?eQ???T1R?G4?S?????'m5-(I??*???t?M??j5??KSe-O?4&???,?f??,8?Y?3??V=????MEl5J??2???ap[?-H}???@?b?Tk?\<?l?~eH=?&?,??F[<S?vx??=?9???
WZ?E??????E??jSS???T?L??c?+2J?:??,K??:????l??#?u'?
,O??j???urO???1g?9?}????7u?

--- NEW FILE ---
GIF89a??
?
	
<%=AB>GIu\ljnr|nxveaum{w3GF(jh'tm&{u1kg3tn<|{J

G(G4V%[-^0U5L6)e
????????"??#??&??&??3??4??7??4??%??4??)??:??&??(??(??6?????7????G??A??C??C??X??{???1?7?I?T,?d6?M?W$?m5?\B?kN?yg?yL?X
?h?u1?\
??p???	?0!?w?????
%H?`H?[???hs???z???8x???9	j????]&E???K$J??-?^M0??&??????%??KPw?*80`??
????E?/?
I
5+n???PH??????5?L???T6?b??`a??C???C?;C??b?1^sM8?!EHS?.H
(!?
.	c?fH??f??iO?1
???GJH*?
Z???>?N????#?0R? ????f??*(?;<?b??.X???FiM???Q?@;@A?+i?^???v????zZ?????n?!J?#??Z?f???C>\??e=?`?Hl:????!4???N?-B?,???????? ?B???k????V&???
???????^?????????4r?0???D
????|;??????=aW?s?g??1?gJ;???#
??Hs????s?o?M????w????[7?^?F\??'?L at A?
???E???^??5%?gXH?)J??(??x
]
???mLV????t
?M?D????????~?W58????Vv?`?$?%u?9??G4?
}QCQ?5??(???K???7 at t?E???
?.?????????)?}???;?%?I
,?q?@?3H???????T?3???)w??B??3??Iw?R?!J?)?4?OIc?.Z??????o^????RI?^??K?t4$P?h??D?LU?
@?C?E?
?p?!??
T????8E?U?
U?????GOzU????G??_????????r,??hO????vu????????????=?????O~?????;??????u??(?	M??????F?(
t??j??H"??D????y??/	@H
Oh?@??p?W??y??
????y??y??z??
?p???
?{??
g?
z{??l??m???]6}|??~???????7??x?????6{`}???
`?f??
?@?G(?q?`?W ?g7@(?N?0~y
^Fg??
QF???
??h?7i??
Q?
?P:k??
m????&? ??@??
???Q?fj??@?*????P$:k*?X??&J?k"??Y??}f??v?:i	l:?
:????I???h?0?e??e????
*lZ??'kJ?????
Y?
T??d??}f?T???K??0??X&?*e*????)?????R??P?????R}???	lV????'!?e#?? Z?f??F?z??J??V?zJl?9j??
?F??0?J?@?fb6i?*e?
?h?????=Zj??k?o????P??y?mKze???W??cZ?'??P ?? ?
?p??

?
?
???b?
of??`???
j6?
@q???
?jh?
+f? ???j????0?R?
?Z??g????)?g?z?:????
?d??+K?E?????[J?;???????R???f???d?f]z???? 
x?????a????^Ke????z????@q?Zq??i?????????V??"?e
? 
?6
?z?)e1?zR??I?l????Jj?h`6??+?p?????z?8???`?
?
?y???Q:?tf?????Kg?????]???y?\?dj?^??
???{???h??
????Ge;?#\?k:w????????r??????????????n??OF?Q?????E??*?????
?@?
NK??7?
K?j??;
????lT[???????l??{??J??j?
??????K?s(%?????
?????
?
YL?????+?]????eY?ep? jRM{[?#J??????X??<??p]???}????Fg??????hKg????;?0???`?W??0???}M????
M-
??"?z????8????3-??;??k???
?+????B|????????[??@??mhV?
???M?P??&h\??
.??\q??
Y????+?H?J+?v&????=?.??z???????]???
m]???????????
??????g?~6?l.
gR?h\K???h?Y?9?_m?/????R??ve0???????????????Vh???_?????Q@??????
??m@&W???2?AV???:?J?r???rU???U?Z?"?J??V]?j?kj?r??Zk??V?Y????,????z?????????;?U???X)??*?^Y??N??W???Z?]?j?+??v?>|???Y?zo?F?Z?j??]??[??l??m??)?	?)??Hjq ??
Hk at bX???
?>?8
4Y?	??X?CN?
??+W??"????
?
Z??Y?R?*???????*??g-??\???1^y???^{?????v??'????V#??
??/?b??Q?@?L?d?????? ?c%J?????3??
????t???F??N??q??V??K,	???!???W?XJ?
?b?
??b+3???y=?'??M?ba???	??????-W[)?K?9?`????L?F)??H0A? ~E????*K?29q???Y?&*T?????
????H?]F%X?#?A;??(??M? ?NN?Q?oL?@KyN?,5?T	#???r?E
)?h??hL#IhY???L?V8??j?7<$"?>ma??
??+?xIOf?#???,??JF?$?4e-?H^?????e1????TR-???*5?J?
w???j??JT?R??HT  ?*????j??TJ"??1?.??????3Y%ZQ+G??e? ???Qp?U??@???)R,?R??	
?R?tS?q?UQ???+???g
?j:??5%?@??g??"E4(????????)??'???V??g/y-????????,%?????@e ~?[_?G?1??jJJ?Y
???a???v???Sa??:?sQK??+b?R??u??\InQ??T?k+??k??I???%A`???|??????#LX?BOl
?9??T|???C
Z????h?5?v?XZ2??Uq?5?`
?????M|j7???J(?3\?????????\??)!?B`?????4,T?`???????*u?+??M?(?	`??74
????>C????G??Ih??C??E=?)
\?G?7!?>?+\?9M?B-V:?`?G???H???3???EB?SKVU?T????N?8?A? ???*G)?'3
??!7[???_??r@?j??*?????r??p????-11???T??\?&jZ?????
?????,?`??1??????'n??Sr??`???'??+3??~J?1???Z
?0D?d??9Dv?2??C???????!
?????B2_	4I?j?$???? ??8s???+?Z?????R?	?????	+!???b??-???B??(0?DJ?q?D??1?B?ij/?:????????????.zb???+?????????d??b??21/?J?rP)?B??12s??(???-????*?m?<J)fs$???.?D? "?????R'???/?????YA??HF????0??????t??L,???a??sI??@?[??/?-?=??=??/?Z???%??.'K????:G#R`I?+#?.?zW???@??G]Q?????j??I???*?CO\??8??B
#???????????
??BD0?}y?r2??q?? ?9k#
????T?????+??\
???s,i??9?s??7b*??
"?:A??!B?????y??G?
?7??Y???c???E??s(O3??????O??????[?????
,r?
B?????(??885??Nm?@O(??UH:X??S???A??.?Q?????Y??+??????Q=0\:????6?8
L?b??JM??^C??0???	???$??????6??R@?k#
??Q1:???6Z???T?????X?#J????qXAu?????-??nX???n?????8?8?e?nP?-??8?
2?]?E??)??1-?#?	??R?:~:?????????h?ym???????&?7ROue???5r???i??????"`?:G]????`???}-?b?? ??
?T[???3???
!n?????????
??Q??????%??C+CE?????Vq??H??)???F??q?E??-q?
???2?j??Y4??
??????$???=?]Z?????+?_??QF?;?B at 28?X???Qb?Q?%??B????YK??_?-?N?lq??e??!?/?
?]??5^R??:?0???M??$??HjJ???$?$?@	9??}s?
?%???`A???^????????????????l?]?`??????????B?^?E?b???n??]?(^Z!?>?????+?8&
??kj??(8?8%O=#?!?MiQqx	Q?Q??c?3m??ee\?C?[`S?`[?e???T? 
?T;???Y???2
s5At	?j?n^??	
???????$?
?F?'FdqB??x??t	J?*?????K??q?;(0? I".?????M9Cb??!?C???%?ue??=?*e(?%??b6f???'>???%p?Rf	n
h??c??d?	If?J?b???
?	f?ke????fh?lh{???^	v~h??h??g?~????qv??&??U??&??6???h???v??????Hi?A?=i?h?z??hG??Y>??????????P??>?H??Hj??d?Xj????\r???I{,?5

?RXgA??
?Q
D?1?y?2??3E#C??g???z??g?
Od??|I?
O?????
?|???C????vA/j?0jl??10????0
??z???????F???(?<????(?????l?C?
??HD??p?f???n?????h???j'??9k??????*??
PP???? Y????????;?!?*?A??}{?9>W?K?EU"&1??k???K+?6???p?Lc?U
?UX??:???
sx?7_U??3???3?LrHRM;?8?
`???B/?)L[S?? ??S??UGB??
????y????)m?X?a??????R???? ?5f6???? K_????/??Tu??????)?????c;???i??????J??pF?3?U?><K$?@??????t????p????T=??YYM??
?8?
I$u???6??'???D??X?]ul??w?gjN?'??l+V??Z??D???*???
?U??V?U???H????L?e??dhz????g?|???Y,h? ??
2?M@&S?\qe
????L2|?f[n?
??????+??R\,?F
`|?Zz)??j??|?q?)???*???
,????}LTt?u????8?M:????,%??!5??8?4lI&?t?JK??$(?H???bU??h?R(j+?%cM????\"??nM??#?X?&??8-?Xb?,?<?W`??I?b?
&0b?YB??j>&?-?@F?fnN???Yl?j?i(??
6??p?`32?p?$??????M,?6:iy??:??9??3?=??3C??<twB}4?I??9??????#C?4???F?U
?c3??s]????-Ps8???qd???y?6??
?s?n?????4???l?B?(?x??K>??j]_NW$E
+??
,_?2N????8?_
?Ai????9.K9?U??+??}???.9??.8?|O^??O?????R?*??O)???y???/?*??"~??a?
Dt?#?,?
q?#
???
`	?]?{???3??8?#.??S??S??@???

?:L?-^#.??K"&;
"!V	H?<?Y@\
 ????CB+??6?'?4X?????g=?!??:8?2h?$.?Y??*"!N"
?^1?\1$??	"U??E:?:?!??5?????/?":BCC??-?bU??<gG??a?"?$??5b?"?2tcv?^H\B????(???????????(????(????)???????5?4A???V??J?????

??0?_0??'0
?p,
?@up[p?/0??	?o?0???0?
???:?4
@?0Kp????0?/C??p?
?p?pc?
???
K01??pg?[??pp
?
k1???1??+p@?h
4?@j??s?N??
?H?K???????? ?L????????Ny8??<??N9N?|W ????~??}]?82??Y,<??@?P??L?*S???????B?????Y?)????i?.??t??/3ux?
??M????
M??"\?!??O,BH@?
2?FJ?F2?n?q??*x??????P?-3O?03?ODP?????=
@2G?,xC3!??U8?TE
L????L????2?<7t????8Q??{]?2?????J?{?7???y?S?5??V?-??`9?o9?wy?????5???????????r?X???`??s?????)3?(?'?? ??
??h?@?F-?[Uw?+t????2?2????>?GL????x?+O???+d???r?y??????*z??:????OP???ywP??/???:u?BU?r(?z?????9??????\??Q??+?P?????M?
?U?l???N??B??????g????z?????O?9BX9?B
?
?SG???????`T=?? ?8:???TU??x?{?s??8;t?U?;??+x????w$P#w?Um|"'?tYYY]???!?N?D??$??
???8??*(?????J7??3uC+

?,
??*Y??Il9?%???Z1?66???
?
?p+????c?
k1?????Hr???<t-????9WZ"??R`?-?(?f"???V"r??V??s?yO??????c??rX)'?q?	??n?C??
HY????i??6?UT?d 
'?pBU)@??<[y???R???.ZH?Wx%o??z??]sH??.Z??rLq?Ieu?2r???&?b"%???W?S??{?Gr`)2?UL?.	?$???B?S:c??s??\??L?????9??`??????I??Rbp!?4?^/zL?"*gOoS??[/ji?d????M
?r:mh^??9??~?u??$T?X$t?.S?j?[??I??]E???r?^?r:????j=??r??^?h?^?Z?????\}N????????????Fc*????Qn??k?S??????k2?/? ?S&h?n9??&?v??????JRD7I?{???
V8
k????Bu?/u?iOe??*gj???n????S????????	??[?&?????l?YwN??s????cW\YhZ??(!?:??/v?N???3<??
aV?n?q??|??4>?/D??^:????3!??>?"??	c	
?????m.Y???R?????b?ZH???7?/O??S[?????N??i??U?EX?)?!'?
,"??k`?jOnD|?]H?
?	?"?????5!?X?/{??5C-Y?IB??NCZd??Ig?+?y??-pU*m??]?4W??d5rK???-?d?*P??????????h@??? 	I??T?JZ?i??;DO?5???R
(D
O?'%??????<Jn
@?z??+?0Hb???NJ?
Y
?
?JHj?K???1
???
??^????E???E?|???<?o?}K???m?????!?C?)???L*Q??4lM~?!q,?+??-,G????C`d???H-???@?DmL3?s??Ar????^??%?
???<L9?c*???	M?=A?R?*?n?b?I?Q??+J??
p??`a??d??8?!????[??]???`R?tf=??
N???W???H?J?!????G???c??? J?u?.????XD
???b?? ?Z?"??
gz???am?!???"-?qO ?????
0???????3??N?!?? i!?IL????d*?&????}?o??3?B?Y?n??D@???Dc???dZ!????PNS?Ht^4??@???"???,Gh??jH!??EW ??N??La_?'????zc1,m??e
b[bb
,???X$?b?"1?( |d[zd?zi=?b
G?i??g3#NA*??C,-Tl?N?E???P?(?O?8?#??P??C(?????j 6(???2????+??!?#i?3tG"???p	?????gF?6 V??????u'VZ?
?f"2?'?e?R?q?? ?i????;?6?
?*?_<?C?&|?"??6?bb"

??k&?i ???b%#kzi?L%?QX?-(C'2????
0J!.*R?:???c?Xs???2
?4?2b?	&??2??P?JL??0????>W?$???@N?"<N??t??!}?K??)??;??;?	&Z???SX??;i&BL???'VO
.4DEds?*??
?BA
+;??/W
,????*
?L.X?";????cb?f?'?&A???$?1??&=D?p	{B????\5?????<???8
Y|?a:??j???+?B?]Z!?bn-2??/~?#?eH>?+c?????.??? +?N>???d???"??????`?(;??????X???H??
$?I???f?/s?GfpaA"???ek"?y.9|TI#?$
k?!??<7(J??O#T\???U????C}?J?(l$w
???N{?o&<e??o\??W"?0o?YW?H
??I"
~??hc"??hO?Aj?X!??*??$Xj?k??.?L?9.??IY?;V#???????B#?)G?
?m???"o?,?D?dB?	?	?"?m^uz)?#??Jm"|?.?????G?bk??2??U}??reZ?????_???f???9:'+h?b?\/?Dzq??e??f?/???J?%???cf,?Q?????J?L??OP???t????w??qH?uA?6t???*j%b|h ?<p"'?/dFi?
?Bk*?7??E????%Rjdn????m???f??J??I??A??1t???HQ??a?????Xs?Ih4+?g??.?????cv?F??'%??_?DB?jEv?U?"?W4\?????!?80"tX?????C????>B?@0BD???@??I?EI????|?$???M:?/s3R??+????|??I??!`bH?/?>?[\a-??44'?*???!?yt??<?e_??+,?
a?[?"?H?_??U???d~??~?????*$?6DX?e??ib?q=?F
?=?!???"??(E+???L????M2?????5=?"b??#(TX???2<?!??5>'???$nCn??w??????K??G?0q?B?L?"?t?{M?C!?????)"l2?E???*J????"`%DP?
8P?#??J)QP?(?g????jb
??BfD?0&???*?jX??:?F3|$A???^?@p?v-*?y XHov?*L?e
?B'?CK????p??L?=??0.??\???'dO3?*???Q?M??(
o}?????!
??IFK3??L
}??G.p?W$-1???B?^?c????L??>o'?y??$Z?=\?,d/7#.,#??y@??m?=??Ed??W ???a??*9b)?.?1S?=?`???):??Yv?A`r?#kR???,????
??v!9?o]?sn?n?8?r???
??q???.?J?U_??????W+??Z
??t?
l???W??k?j??g??R??Vel???J;?z?"??PP??,b???+????
)????+??fJ?YN,???Ms???J+>??J9U?Ns?D@9??
p???M_*\?Z???[??#?n????9?tCZr??e?n???\e??K9,??????R?u?	??,8???6??Y)2DN+oir9??f?,??r?+,k?ri???A?6??Z???@???j???@:,?]/???_?u???`%]rl??\???????'?1,??r?f?P?]?{??sr?y?????R0??????8
T\?D??29???Smni?`?4
pmFj???dT?2???
??H??n?.
I?????B:0????!?s?p
O`?Y??-Da0?Yd*F!?Q?blf??Gq?S?"r??*???W???z??*V?g='ga?X??m$???>??.z
i?$???+??
]D?R?(??}?? D@
!	?Bb???%|	C??????%??F????u&F??_???8?$???I4??X&01?EtX? @,	0?c??p?$V?aHh??x%4qcw???F0??7???%Q	\?"?pD?;a?G??0??%l?[H?????o??[?bL????q?C?#y/P?
c?\??h92P?rd???y*d??QdC????+F??l?9z????Lh??8F?a?????W?"??????/FaMJ?B??
i4b ?
$@@b???"?PvT ?{??$l?j?
>(???
?`??0?D?
??
J?
M(???J?
D?
WRE?
Fx?I?????V????
d??g?
`??R???j???$?RRt?~??Fw$[?8|Xe??t<Q?~?1GR????H?????$V????? ??!???-NR#J1?x]????? ?B?*?2B??p?,??X???h??h!??D?!???
q
?r20
s<?"
??
?3?/%.AH???
?#4?p?1?cHj??qF?

???????85?H??)&\???t?Z??f??!3}?
[Q??? ???
g
??B???t
??????r"?& y"?z??q*?*??e??J-h"]m[?????????S?+??J??????????%)?5A`???j&?z?? ??)????J?p????Z???o??*?????????J?????:??-??w??z?????????n??????:??z!?*??j??h?u??i??h#??nJ??J??j??$???h]W1????e??J?k?[h?R?????P??;??(K?????????????B??J??Z??'?????SZ????1k[? ?4;?O????????5r#5?3?6K?Ck?B??E??.??:??<??!q??JK?Sk?K??U??W??]kM?a?^??e??o*?Q??i??c??n??o+?qK?pk?s{?u??{??}????????K??k???????????????????`??W?
iR??p
.
?@
??
n??????????:
???
O9uTR;5T?S?=uUU[M?UTce?Yeu?VZo?uW]{??W\???a???Xb?-vYeKu?
Q????Q=???k??v[m???[o?w\qG??	&?
?????HqE???d%)yIKf???d'9?IO?r??l?I*S??	M(e???+?r????,m)K\?2???e/y??]S???????p??J???K&F??8?*???}?s$.f1??Qc?1???F?1??3?\??p`B0
x?q?jT?????)?@# ???"??bX?8?K
?O#??)?OU?C??a?*}??K0?z?)?0=???2A????FW`2?k???&j?AP|?L???b??4???yD???a???f!F??X	@c(??[????d??\M*@??x??
P?
	eaW9?
z?|??TR1???b<????iM?T?I?????????1^??<??
M??*?->$'?????lW?[??IB???+W?zu?V??'??!
??Vp?0?Q?3??=(???-??.???????hu?????U0?e?=+4O???p?H????X%w?*d0ja??+|5Z>??????\D?=?Z?y?B
L+]?JZ"??\????d&C??Q????l?\fY?X??????/{??b????|?0???if???\f8?Y?j??P??&??
K?????gtZZ??V?M?C:Z?64??hG/????t?)?h@;??K??P?0???`
O(??b#???&6???? ???OP???]ll?????????Og[???v? ???
L???P?(??%?v????b??E?????}A?G??z??L??Y?"??H(?*N?f#???=?o?????w??]??w|???6?[??j?|?)Pu
HM???
?'?9?????????w??.np??"0>??EjZ?Mp9??mS?|?*???y?jUC???Vv??-p???FP?@:?%0

c???
L??BLCtD[|??4?LLD
DCRdB^??OLEbL??{@3|@rx?p\V??Wxqp?t?^????G?A44@`@5???@34A?C??H???S,?0?LH@<?&lBq??p$X ?
?B?H??H??H??H??H?I?I???n
?	??$=???
h?C ?1?X5??5m?8??4??7??K
????
????`?`u???(?Y??zmB?W at X(
?}\CH?C`*??)U]
?a?\X??m????Fp?
^-;@)?l??D??????v?*?????G"??u???D??V???Ro?0?D??6?n?2N?<bX?`??I?????_i??hi???,??S?J??V?L7e??l???+????2iPnO????H????5uQ?J7
?<?v>??'t?~??O=?d^+^a??[;??P8qE?NH??	)?C???u?B???R?\?z?N???i?:}??9{5?ua2ah?,L?d?^6??g/??T?vo???Ww?f~d?+vSTP?dZ?????G??1?=;???{????,??8???Au9v?uP?
)?R?s???????t??u?????Nm:???UFom:?g/Y?~?<???G?x??&
??p??0????????3qDt???$^?h?M)
??t4?u?(??
?B?"?
??B??H????e;KZ\??4 X|f2?X?94?6??C'?H
R??d????R
?e????K?????eQ???M4? ??Q"c?$v?'!?O2`a?????Ed???t?"???DA<
k???(9%~?1???????#)`?????ot)
?J=%5>??Dh????(qT[?="??C???t??h?U]V%w??^?A?9???pM?
?? ?+?k:9?N??5??3b??%?r,|bd??\>???d-*??????I*?r??
????????UA7?????h?FX??tl))Mik?;??M???W???(?MlRH?D^rD?0??HP@?+??g
??????
1f$???H??WD at A|?? i??L?9??P?Qv??
???????g?)?^
?a??
?"G?V4??Q+
#?h?????????L7=?Y??R?-?????8)?-MH???:F)??)?
?O? ?]ZO]????Z0?,???E???ub?_?X+?.

???$_R
??S?.R"?]E
q,?z??R?c:??y?g?h???w?`??
??I?P9K??????v
?&H8???H?D%o??-??oQ??f?_?=??b??W?0????_eM?+???@?u???3I[?????I?J~v????.???vh_?dD<4?kz??v?,DG??,??x????3z?u8?????-6?A????l<0?????????!??K?TgGw???0???"E???'E???gZRs???b?i??T?(?.????~vz????	=???d|?-Kk	?l????C?y?X?Ze?u?9Zy?v[??j^?1???
i??u`^v?G^???x???mH?"?ZE	V}T?H????MP?Z???y????u<?:^??S?????a-
Z?
y??V???J?i?Dg?x??\?A?G?KF? ?P[
(c????%?NZ;
???ee2??Bh????Rh?Z??
$????TBlJ??Ri?E?H????????n??J???0Z?R??F?d?nP?|?
?C?K?????
R?Nd??B6p????xE:?[a?????W??Vt???P?!???]??r$o2??B fG?????B?D
??(?R_T?t~b7??\?.?)???^?A???_?N(??????????&??????k??G=
???D
s?????YB?c???k?Z???:??Bl?J??Rl?Z??Z&?ff?z
????zl?????l?????l???W???p?????????l?????l?????,??,???????????"m?*??2m?:m;?D0???]???L=B??9??J?
?P7PH???????r???j,???d?bo?j??ro?~,fR?f???a???tO:??U?b4PP2???Vq ????,??LIQ???
?]?2Z???BW??
?+??N5dJ?d?J?t?d G,????K?"%DD?z??p	??	?p^f?Xm(N?=?rK????B??Fx?LADVD?Sq??$?,J??K
???q?1????N??8?8?L?d?KIN????I!J??-C?l???j?T?'
???ZFaG???T???I?4f2??<???(H)???????JZ#'?3????v ???0Y???+????2pi
Z???b?/???S\r?c?v<?>>?
,??=?????dP*????L??u??o?
???0?3??)?Qm??K??t?xWR7|C mS??"UQ?)??H?I????P9`?h??9??7?

?????l??,?%?<??>?????7eI?S$,?|W?????P?!???'u????I=WM?R
?k??!??????=P???O??I}????$????x????a???S?????G???}??._?I??????3????X!???,????+B%Tf?)?^??u<????X??S?;^????	??Y????
?(v???_INa?d4T??_!S9LEi??????????QTS??\?1?2o?Ns/c1.'K??V???P??K????R+?RK]x??g4??LX6??(???E,{??,???t??+fO???0????
0 at V,q?^?L?@?+r??"???*???2IQV??HQ.dc???Z??%`U,??bu?d?V7???X??????v6
/^zU9
????-k?8?W?@j r?K'
??7???$WLie
YJ????
*?W\)N???????????tz%3??+)?X?c,N<y4???G??
??Vj"Y?+?E%m2R'#?^1?nV????V+???	???Z"O8I???X
 CX??(??(*???dY?$k	??"<T7??+O@??s[([)>??!?!A{?????+i??e?>q???U?1???^aLFn?+i?????4q at K2=Ia9G`?:???q.??O??an5?^A?<?`	??J???;u\7C[Q<?}?Nd??!n?U3??^?
4Q{"

&??3?>$'?_?
h???	@,??#???V?G	@????e??
3??5`A<?Ph??Q*J????F8???<? ?$e,	*h'???X????????_+??>???-?????d ??&#?
A)%?KpT>s??P?)F??S?+?29?}?????9?X??
 zcJ??????
Z?n?p(?2??H	? tc?)??d???24(D???4?X???+?A?(??????R?>?x?na????g0
??????!E`?U@?H?:uHDK5r??K?wY??o??R$??A`T?
?L,Q??~?b? {*?2?g(h?0?D3^?M??HL
h???l",:"I&d)?B (^L?I??;?kE??+j?O?!D"z?	H??%???ZB:?4\hkBT?cc?????V???????)???pL~???,Bd?u|T~?A?G5??9fhh??f%@$?Q2?$L?6L%1H?o O ?r???";r?h?t|?q?
?a?h?????E??"C~?>???x"w?j5$???x?T\Hgg??I(E4T??N
?
"LR?p??3%Z?'??L ?3B(?C\?g?0zP?Tf?1%P?c#rb?|?O'B[?5?\?#??M?0??:?OH
??M#R"H?C;?
O?X
??0???s??!??4\?C?$T??w??.:t7????T5)?#?J??E?D&??6??:sF?U??
DUbk8`MlsF?<#2??20<6C$?#Ih?!r4??H
dgS?:BJ8\Jt0?((6??"??*?2qj
D????k
?g ????e?9???g??`??J???????u ??w^??
?f=??CZa??*??h???5s?M,??nF??(h)X?H?$?6k?6??6
????`9?$??7m???.?|=J-fp???1Rt?5??_d^?6
7kjc??%VA6$wl-??
t%??o??Whv?na??l?VAl'??V{?	}?9???h??>j???nd??Ro?-MLa?5?5C?
^?22c3?4?c?D???Kl:??Z??L?~?????QRF?p??????+ at j$??sG??z	?????6M+??k'?Y?s?`?????q??`?,WjyB*??d???$,????n??-3??|??k???!??7?$?J?????/????A??)
#h?f?*kg?L5&iaV?:????m?2(??X??????PX??q?t?????v
?9?Arm??IB????-?5?W3??;c?6F?DQJ;T9??Y	??oF4(????'l??n??d??
???(?.???JV
4OF??4??At#?|??+Yn
?A????	?`???CJ?
)?62??????(??n[V/Wt???+r?E4l?6nLe?my??kaH???}???z?????<I D;???V??P(>~?X?AD?<n??
$
???8$?m????5??[?]??%`5B????????re?Ja??????u??C???V?90{?j}???~??#?#Y?{?28dL?FW?????,%U?G??"2~?3??/??$?v??AwU?a#eh?????
?D,)?????%??h?&???,????<R?d?"Z^n~#$?
@|?h?????5??M?(e???<*'$?nG??W?E???O
r?G?<KBDXOD$K??\p?C(??h#*????A?<?G???2MPL'Bd?Y?Rl<?`&G!??!?<;N"AH??p?QrR?8???l??XX?R???plA?Y??AS???S????c?B???n[?o?p??F<~?Y??<?I>7?5V
???:?D)5?^?M&_???E?@Jv?e?$??	(?????$?'x?? \Ce?d"H&L?e<hoI?C? ????<f/(d????y?F?j?H?6l???Ah"B?C>9D,? `??U?+??b$'KV?????K?,X?\?j?Q?Fq?XI?%?\CX?6??(+V??/7n<?????^4XP?8?%I?3I?U,??V??[??bK?	??XNf9N?L?|y???n??
P??(?XK?W.V?????:?M+??2?X??V:?6???T?q"?Be*k?E???)?+???X?K??X?\+??????4?fX?^????l??]?,(?????^u????8?#?^tu?C<*????CY?H?+????/z?X0zE?7{G?????r?c\?GQ?T(???oz_M???Cr??3NN???TV?|??8
y4?@???D0???5@N\??RP?K	>DU?qR?e
?PKf1??G????Y/???+Lg?*/??JBFATG	?????C@?J?
J?BSNm?[?-??*?H??@"P'q?:)&?/??
g4/????????s??s?0??!?[
????????????"}??X?Z]?F????Y?=??d?s??54?.:?r?/
?
+??????x3C9?Y4?gW?w?w
8?+???D????z?!?e%j?
?i.5&!EC
?@?
@
??!??!Cb?RZ????1?pScBz1?s?A?L?#?ek??_Q?s????K??KC?6? `
 !\?
???@?rF<2r????HG+?
?x?(1	???,??i????b??|?"???#??=??I?e|xc(??`|n?O?C?HjY???????(
?b7??
	WCg?0*??? ????
9?8<?et?'aj2?<%?"
?
??t?x)?
??~?BS?8$T?????
?#
"?_?
?p[??QIA$B@$r4G8?6=Sq;
???VBC?A??taa
?Q:F?fABR?rA+?@?7!,63c?T?Hv????Z-?D??WWtJ_XK?E?"??+#?Sqg2wc	!&?-??TA7?a??Lqo?Bj%a9?hQ t?A4???
????????????????]?x?w#$?	!3?9?*y@?3??,???a>u??a??????a?!%??r@???1$q-
???Y?b?r?b2??%&??aa?J???f?g
????=? "x?;???????Hg??k?6`??7??0???<x??Qr????ka?}? #? ?Pn??s??e ?6e!>$!BJ/??
??i??
8Z&????s?????hy

 ???"Y?? A:WfdGq#??`S???b at Z?1A uR7?p!??X??X???Q5??=*VK??+??}?&??b?a)??H??X?9?????,??R????:???
JZ84???$???-d3M??????j)??$kX0?
????????W??H?%?zI??l3V??:?????
??jV/1@?????)???05?;??WK'?z?
?Z??!?*-??P??& ?-kI5??????k>??m??r_?NE{0?+/a???
??
?????????????
@????????{??p?(
????paw???????+???O	?????V??e????N?]?c&?P
???????[??[?????????????????????+	???????
?p?8|????;|??
????
B?
??
B|?J?
?????
O??????[??k?)
?*1??^??$???$?d?Q????Q?C?
???P
0?t<?P
?k????+???????????k? 	?p?p	????{????????{?P?
?<??????l?@????
?<?C?
?l?J?
???P????
O??S?
?;??
??
Z?+5e??#?I???????u|?tU??*?
??? ? 
?
5<???9??????
?@??p????J????
G???
?Sq??G????.?w?J??-?w?????b&#??m?m?l?K??
????
??????????0?N?N??]?"??"???X??o
v??.?\??2???
?i??&w??
L??????]??M1??]]<????k?"?????W0S at GPa!???`?????{?????????,??+?????????????|?????K???????\??k???	l???l???????`	? ?o???????????|?2???
???<
?l??p
!????
?P
?-?P?????K,?1.?"??_??$O\?R?????H,OS?!&#?2`?????a`??5
?>v?*06?|?)???*??S(???????rGT?`g??^?5?z?^?__MT?`????9????upm?p9?6Z?>soQJo+4??b+S?Fd???(!??tX*?S??2?1#?a?? EE???r???3??|?'`S??B[?2???~DWIC???W&????Utb??q?????6By%??,?fy?m?
SxL!????$?FF#:????y???-??$A.!????
xEN??V?d????!C????
??EY?Z?????
???b??T??
???&k?????"???*????????X ???8?4b?X?USY??;???q@??Uj&+?
?vd??OX&?:???U???j+??X
????T?U???r?U
??n`?q?/
?

?LJ???"???R ??rc/?o ?&
?Q??
&?N8??ue$??????bY5??????L??X@?)0
.???vL`??????,???+??s2,???;????b??
?[??=t#? ???k???=??X?(u%Nd?????/?rg????T.???i??J???r??U??T
??0
+???l
?KI-j?.?'???`i??G7r?e?????X??!??rS?
?<#???'?C??d7???8WB?????=?/q9z??ud2???kR????????R??y?5N!???r??"?S??A?7D??N{=d]?8??$??g??O?:4?????V?z?'?.{?A?>8B\?7~$
M~A?5? ??HF?Q????kIJV?6q|e??I??3?Q??D9??<?2??H!'c??tR3???"yuH???8?|edPY;???i?q?%9?"?	???Df2sL??J???&f?;:FaH?af4S??Z?R??g8??Fq????<#&?kz???<?7]?????
=??O~????g at W???=?????g
????%?hJU?R????/}c??I'??8??&9???????Ja:T??????N??Ti?,
4??dbrn??3?-?j`	M?2??_kX?:??L?	??iH??????Q*YW????w?k??
??zk?S?P9????&Z?+%??X?6?????L??V???Q?b+C???????lhE;????????,
W??3??%?=cKF???????%?IW:???t?1??GcZ???t?A=jQ????65?QM?T?????(ekZ/d???5?s}k]????6???kb?z??.v??}le#????6???lj?{???v??}mmc???7???mr{??.w??}nu?????7??M???c
O?B?
Z??0?%??F0??`??O|?*7y?x??|?F????%l?
g????"???x????n?????e|??y???#?|??P?'?!?]g??e?????? ?????"??7?q?>??G>??Ov????????GA?A?
???" ?d?M??.u?G?^?<?O?u???P?=??_??{?`?@???0 l?	[X?&x???8?<?????:?;???D>?S:???(?8??%:??&??s>???4A????#A???D??K????????sA?;AT>l??=#?(?8?+??)
UM?|?j?M???z??wHM???Q-Q?O?,?k?N????7H??|pQR?M??M?M???&}M?L?$??}???P?l$P?"XNi???N?tM?Q?Q???)mMRDk??{hH?P?& 

??]?	??wt~XW???"??#
V}}??,V{??b?W`????$??TP?u`?
D????P??k]??l?z??_`?i??4d?y?v?
0DD-M????^.??????^%??% ???-?Cv[]tQ?DM?}Qx
j??W?v?D?k??]??-?6???s???????{/.?8????3???????C?.?:o?W??6]?{?????/o?<???]?
0??4?G?????????E??O'?ePGI??<(???????2=q?M???_~?5?5??u?Q<I??:?H?SK???5Ic?3??PQ.?4E?h0-(

H??E0??N;
?!?
@PJeP??w??j.?IE???gR/?
4K at D?5?V?9I?h?RE??B?? oD at iV&??4???PJ$a?y-D?JO?yJ~?\S????????]{?a?h
i?O???:B?z?
??PB5??\S?????Q?k??K@?
?2"1?9?1J?B

;tVi at 0Y?_??
"??&O~???dAbr???|
j?c:!??P??#??X?A??????tmV?Jr?I??r??R????PrO??*V-???>???????]?J?+?Ic?X????:?%?/`??V2:?*????5?*h5?	???????,<?N6????fC{???6????ko????6????n?{??.7????s?[oM??Kij??:A???)????{????????o?|??~?L?P
?PY?_???z??0???	??2E??%#l|?3
???zQy"?????+??,$?3?I?Q?????x??1p/=??????*?C@????1?H??d{q?????z^O???
P?W0?F???d_|??EA?0Y?y??
????
??`?0K~?C8@`

TtX???S?Q,R)f?3????e?X??Ev?<?E]v"<`?x
X
K?[K5b#>"?!?r?rB?qgs"?s?&'sV?s2"u^gtB?uJ'v2?vf?w?'xv'wj?"??iAlL?Mm?|?????|?'}?'~??~??}?g~???h~N?}^??U???	,
?	4
|P?`??@?vh????"????????(?
?DA?????4A?2???A??v,?.l?&l?BA?j]??????,????B??N+????????lA?Ao??H?6?????z+?j???+??k?Zl?F?<
?+?VAhA?V??
?vl?v???l??-??+????n??????????,???????v-????
l
?-?????m?????m???????zl??.
???2
8N?l?b?J???????m?~???+?,????*?b??A?}??+D??E??
0????????????l?????k?vn?6?H?@?
/?^/????@??A
?p?0??o?
???0?p????F?
??B7?8?Bw1'?/17??1Gq??7x?71,?B,??+dC??+?q,hq???1?q7?1?q7?1??1??9tC6
;V??^f{?U{?W/To??}?**??R?????)?
?????o???E???X?!??%??d??1g????f???;???ti??Q?V??uk??a??=?vm??q????wo???>?x?n?0????)`avU???C!Zx0Q???JD?PQyI??{<??=G??=z?h??J?,]???f???*????v?d??|JP?)I?(??:?)??????
???[>q[???c?9??V???^P???B/dp?1?v?k???/??I??XSI???l?V??R?)????+??RK?v???/?S??? 
??s"

?g?o?!???*?@?????
Z`?????@?CO?E$???E.)/?? mI???s???h
'
n??%I ?C??%??Bhn?R?*??????????(M?N5?Y???V/?~????????
?j?K<X???j/SAF/??M[m????Z??.$??Is?????8?.??
t o7?>????????5
L3???????%?
??#?
?(H jb#??f
AP6?@#(! ?????Ed?#-a??^ Ki?f8?Y%??Q?z?K??r=?QE{Q??U??4??W?;?n????hFX3?1?H?1?Y>???????!F?P????o??????.???]???'AJQ?????W???A5	?w??7?A??)?/??
L??C(????"
??@??B?		aB?
??m?????#O???????G\?}?????*???J?D$>??C???8$0?q^#y?8??"0???M"?3????????????I??J	GL??h??e???8?(<??%|??GXB??x-1Z?M??#<?4???J??X?O?s?\??Y?"?^d???0{???	T??F?
?d?X????>PEp6??]?0J?????	5ci?
?p6X*M?@
?P?O??
?t`BA*U`'U?OcM_a[
~h??@?
?
?C}%w?k:?<?M8??a?S}?e???

?`?Wq???*?
e6?R?I??
U?<4&F?Th?,	D?P,??Ve???Js?2?
+????P<???^??
U??#)???Z?v??[??")[5&??"??KiT??W??w?~?S8q?R0}?+a?4J?!{S9?4??8?!??W???Q%??UG^??N7?$),B	?9r???W??GQLa??r?%E???j????????g_P?r??Wn@
?WC????J?
?r?z??w%???Z?s???]}??YJ???

?J???!?Y??{|???&C?+?T%???mC??R??8)??\1??9B???)?S?P??????q???IW?
??N?????9?4????a??!?U1;?;??|?(???g?
?l
??L?*d?????x??ida??Z\@??q?B,f??+??????x??"S?p
????N?I?
$3xH\?
?]'\??Jq????L???G?2?:??G??K=%??
?k?Z at F??xe#w?K?????P?0?o?gz?D?6??'JiA?^?????'??R>R e??wE
??hS;.V?<v???????Ud}?Nd???@?V?2?+???q??"
s?
W$?a?	 ,L??????iE|??	???0??J???$
?m?Cr??Id??8PRr&???????VN?VY????*?j?c???$?D>?2Ro8Y?p?????d????p???{??-?,???Xj?sQ$j?S?* 
xNQE??Q??CVtm#\?#E?V?W??`l????ua?$?g]O^????"?p?F?5?`V???G????N&p??V?????#^V?sM????#??PC?2'??m*???n
S????-
}:L1avW8???u.???p'%???W??i?%Y?E7?z?>f1o?"TQ/?U_?U=? ?P??B??5?GY??y?A??:????~??<7
,???ezc??&????\5g???#$6!n?????|r?v???,??$q??voE?!?UcN???W7?uJ?[?hR?c?0y????r?.(x?D-?W?Bi??hj?[?	?5?S)(w??"?fG15	)'?c??H?X?wJ
-?65\Qz8F
?G??!?85#?3??Gxf??z??G(??o1?qE?n1$?f{bxP?4)k7!P?M?)?;?
??
?b6(8\z?;X?1??PL?ux#V_WVM?F?;!?y??%??;d<?ga>z?0??cP?!UL??m?$q.	r,rD?N?7C$?SEl?Ce? ?7MFtDH?*1?m?$P3?6?-S??Q&>?V8F??L?/???`c??Wym?;?? &1!@%???4i8D?0?,?20?0z?QW???da?w???#zw????S???52:^B???";?2??t)???Q*?#C
??{Xy??
?`c?c9k??}??CB!??D?o?c8p"??a.???1G!%$???"E????cD?'C?:??0$QSSr?6? ????S;g!giam?`6???2=h80y??q1??2?>??v??????L??m??????)?!???;??P?A|Fh? ??A??;_?;4??7i!Q!k9!|?'????X???@
????3??I?????C??R?2?#????2C?V?hO?5E?Yi?z*R??? ?G????6?F5?q?[?%?????U?y??
????y9iS'
????+"?.;?o?x????)?
s?Q??
?r?/I??:?5???GF????a?c7??F?56?j%.;?wJE??ew????y?}?1|z????zIL???????????{??x?D??iNj??;4??c??0gSK?&?)???	
;??(?/
m?_?*"?.A??	?S&1?S?m??E???Y?|??D?v.???I?9z?? *?V@?Q???Y7?1?[v4f?????8???SP?Cs/??483wa8?
!W??	?/?6?h?s??s?m?8????
?U!
PB?q-%???y???m?????~x????;???ER?j?t?H?!
?\????y?????|?7?
?nm??L?????????7?j?TR?S+*?q???=?MP(??H A??S?
????-??-|???;;? ???"9cd??u:^?C??G?q??;?
???f?B?c?\?4B ?;G?t??Id?"Q%??B'B???#1??p??{??
??G????N?GP.?~??S???,????_??V??^???^W?w}??9??)??&?W????"2??
'?B2??`1?
?'?c?a????
?=qd/+?
??{f?c?U?)???~?+???????1O?4?
?e8O@?r?v? ??M(?
?????`2%$; ??3{??8!T
$?vs?;??Q?8{?R69!????s?"z?e????)Oi8??w?J?-???t??f?R?0?NQ?3_????-?O?y,???????~?P??N?r7W?????????????u(???/??O?X=???????R~?q???]??/?S???o??????UY????s?B??-??o???????????????e?? Z?????????????????o???4???????????/?????????e??As??4???????$X??A?	?R???C?%N?X??E?5n????G?!E?$YRV?
Q?\Y?$??X?
?3Y??M?9u??????O?A?%Z??Q?I?.??R%K?/c?b??jBW???U???Y???ukW?b?:????[?q??eZ??]?y??????_??#t????
L?:IW?%B\?4??F7???W,?W?????f'???I?M"?2???{???v??-?e1X?~?
??m?+??Z!=???{McL9>???hr??
/?/RdH??8?'?q?BF?
t?7(?F;9?e2?ic??^??)W??A???n4&????JF????b?6?.=??JOE?}? G+H?x8pz@??HV.
?b?h??$]P?J=?2L:Ho????0?;I?JVB??0d9??YXqsP%':?????+s?U?{??O??A?u???)b[((?h???dH?V?Rbq?c????*d??Q?+??3?&?d??b	#?0?1,??P1???L?m??
iV
??5-?!HPcC??>???l??z????- at Ic????7??A*???\?????]?P?@??-?X?
??j=???2?SW??U???o}?rA<?*b@?6????|?(z???? ???<m|#)????k	?????9?H5?uda??@G-
DCR???&?<???9?Q??5#?@?m?
???c|??l5?Mf?()?W?s??|-?<?G??ivx????2?y?s??LGV{?1fe??U??=?.?#KMO4??WHh?
 ?[??j
5??
????Cq?"??????x??Pe[o??L?\????`!??m?1???Vd?-~?Be????+.=!?Q?X?	?=??2?sL?`???D?@&V?p?+???1?????R???t"?>?D??O??)?F?.m???
L4???b?X)??y????????G??J
X$
M?5?h?!E?oy?`?~???h?-z?<???
SP??C2??
0Y
?s\9??NK >??uQ??1$LY???$?
4Km?????c??'g:??\.?o????M??????????\???	??!ns???????gI??X.hR?oZ
,,=)v?
Q?%u??YI!(?Za:????????K???;RX??(????
????6??P?IS?ta??x???a?
(5?X8c??(S at G??:????i;??oL?	??=?%Rh
L??
????:?@?MG???\?h????NE?M??? -D??G???8??	L??P?T?JU??TO??h??????#?1
1G??'??3?????y)?+3C3??z?
?2????}`-?0?@?
Ai8(??23?l?8??(?rHq??`?y"=?0?q?Gyr(???2&QM?w
R?V??S??I?j2?(??Y?p??
@???e??t?i?VF?T??????U??????"b"
????b????S
4?*?1?A??????e(d?0wr'?dH????#?`??Q#??????&a)?IR???
c?
?????????
????????T?
???M?
0??l6?z?
??U?J?
???@?
`#?r5??????*???
?Vp???;?y?????]??v895?Y
?/?
M???v??*?Q??????z??????Y?E??{???:???H?????k-?U??E?ES????\?Y???Um[?6?_S?Kc)oc>y:????b??d??1??mq??4?5???cQi??????j?v?p??????z???
??1?nY???\l??????
1?0$r1?6?q
??|y???E??
????%??`?q?N????9&ii?R????\??r?U???a??'??J??r?Z,'?
?V?TH???
r9RX?3? ?7?f_	?????t?
?1avN)????(?+???J
?WG???W\?'?^~?2@:e?a?
LZ8?R??x7??b?h??#???C?`??f"?V)`1$?SR?2???y8??8?rr
G2l+I???H???
F8?$?O???>;?S????+?\X|??y?m)R[?+Q?kl???\?0
\ 
??8?1??I_?2@?jB
?????&??h?z?>~?8p??@nL.??p???\E?}?L?2??t?T??????"?EYj
??V?.????#=????nH??????c??"V??
???g?F-E???T?,%q???????p???jIL?A??E,??	+Z??.D(?B_??x12"????W??#?K? ???T?+a?QX,5+?)?$	???D??pd?bHCh?&???~T??9R??h??L-1U??*_{??U?5%??*,1??h?e???c8??k?

}V??f????gE?H?"JO}?#???*w??aQn??cz???h1|]?F!??lta9`_?6??+???72??~??s2?Sth)?\???lS_6p
E????"???
GvV?R-?M?J3?|??=?P
	????T?cXJ??

dL?EV`1
FP(?S'?T
|??\????)?6s?-??@???g,Ho??T?Bkm?????P???????K1??Em???
?j}T?y?d?V7T???
CL??#???"?i??).cd?Ya??????l????9??c???R??Y??*q?Ti?RKyKq!s?????8Tq???1?"4F??????@F?4?0?%N?? I???m?>?????*?i?!
[*?	?U??0\??R????#B?!	??????*g?_T??"H??????Y??CDM?{?%?`jB???8F???*)	Y??"?Cf6?C$?6??o8&?P?	B&U	UZp?rD???:?3
8?????~?_?_g$??iII??M??#GfW!?X??\D?,??u?+??????)4
?+ @} ET\?U?,Hu??RdG
ND(?[?KP???B*??@c??>???9?P|??????
???\?\'?D:?????N8W???+?'?[?HI?Xv????&J???$?SPP9?????4D?F???????M?%J98D?Y}??Ddd3??)?DH<???H?19y)iGo?l????Gp???l`Jd???Rg???)?LHD?F? ^?????LN???D[?D??'0?
"mIo?C????Gb?????F???L????	p??h?RP???E???i??X??P??d??%
j2?PUN?c??^p?zdG??f???*
??????@?o??Fp?????'?X??I??l?c6I,'??h???Pdg]?7???:
????
?,?Ie??5?T:??N??????????r?]?me????U?s?m5X??\X??\?p?CS?N:~????V??
Gn?W?l???Y???Nfz?e9X+a! M??^???????Rj,sN?3?f+?n???T?V??d]Exp!O?`?[?V????(?(

????l???j?0???????????;'?R??4???	???"?;?b?;N?*?'??Zm&+???????????,??r0g5??
??????\m*iQe5=??G ?G?^??QVXs*???-GY?:?R??e???HQ(??(r???q ?05EYL? ??R???o
y?a???-?iJ,Z?????9Vyf';???4???7????g@?`?*|?vVy:?
d????(?<<@?E??,?X??P????b?
Y
Z?
?(?)??
??N'%iR7
??W`
&?I?H??\???#W!?OM7???K??~d0?IH???k????J6???h?D?7Vq=??&???
]`:Y)???&/?I:??Z/??^?D at 3???7!+	
???T??4????D???IR??xhR? i?/Z?l:LjYp?P???Ra??,?CU?L??%??P??x???m%SC??ye"kY ???}@
V?6?l??>?<???r-@3Q??#??j	??n?????&?????v??)ES??Qxgg-c2?E4IU??tS???1>B????w
?M?&b_?T7??
U??{^!kY_??hI?Jz2?@w?>O??.?h??f2-S?"???l:??Z?2]?^??)
?A???j?#??Dsz??.???$i$iF?+?????{??????>=??6'?,?m7?4????k?D?"?9???C???c?;??i?|Lt???5d?$????????Z?7@?`n at Y???Iq????F?YE?v???V&?????)?@?S???j
?o???y?
?f?t???b????
???A???Iouq5-??????UD?&?I??C0&??3??q?1]?U??)?U??(q\?'}?t??h)??m?n?qS??????d?\???????1o?n`?!k? w?+??h?#-?h?A?o?????OL??c???x??"s?/?\?I*???b??S?oU0?Q^???C"??+D???'?'R2N?J?:u6d4??O?$??Q???
7~Z????F?XC??O"??`z?J??#??????
?L??EN,w?N|B
8??
? ?ve&????h????'
#???c?j?7??Pl,???0???b2
c?~4(?:??^ ?????)?B 
0	*?Q!??tCD??I???dJ?????-
?"??,?t????C?1??fi??Z????L??ZJ*?????%\?-?5???`?z?C>'.?????5????-(5:
cFDc??t >8)qF??~?4?(? 6??2C?O???%
$???_??/nf-D?"?f+?C]Wy5?p*f&G?O?&)??qt2%0K???Ba?S??-	??cF?$w???e!???0"p
??/?N<??Y??"?B??U??F|??h&? ?wZ?*Do?I??I@??"?(%????>?2?N?i??Y N???%B?|?Q4?40?bK_?h????S???B!?iW?E?? ??????6?h?\?	?`?;?%J
??3?S"?vk??r3#??7??Of??urK?z??q??W???P?Bz??V??????Z]??u7????d?.%JvY?0zs?6??vhDc8
?a???{????C???wp?E?'b?"["?#????F?=??W?K[?[???^?uq?-f?O???Q??q????C?????w??s[p{?~?[???</????[?ou??)?/bJ??%{R>e78?\"6|????U???dd[m?{p?[?{?6#[???v???O>{`??????w[~Gwy3??C??C??x?$?<P5tH?F?q~??"??H??m?Ac??+??*,O?c???UV????;?7["???UZ?C???;??????d???#{?m??U??f?w?
?8
?0N?AY???*?
r???%??\?XDW?E???V?V???:????T?+?U?
?a?(??????$?*????*??5n[???k???T????|?w???#M/??TX?c?W?}=w????????~??????P`M???Z2??8('!,?E?*1A?
F?`(?
p?
0@????d???
???^L????|R????T^???]Y??A?G^[Z"}RFeR?9=??%????,j?e??j????V?????5u??W7Y??&?q?$?L?1J?8_F???B???pf8??)7)kN???Y?L?6u^???t?XJ?W?\???u??j^???Z??5
?T~??tW??U??2?Z?1=??Oh%J~?.?h????+????{?_|?Vg.????lRc?U?b??^??:E??????g????:W?=?^?u`?A!???w????hdv??1w????G?<]??????l?+q?$G?qNq?????L}	:#?[???N??
J
??v?k???
v??m?c/???R?ce?h?!w????=|??v?????pw4?!	???~	1bZ
P^?BC????
?a???E????c?:???{g????3?
GwjL?M??8?zX??X????+??#??t?4??|	???H??\o&y???I?J~P???dS%II????+&5Y,?-?z???L?E??i????[?$I&?????%?h?y???T??Ot?FF>?Z??.{?e:q?????n???.??l?3ubJ???????6?8??iI?????8?Eu?,'?IET>R%?4????x?	????%*O??;??:?WP*???nL??`9?6??9?E??????r???E7???%??????W??'??TL????Q&q???b?S????@??P??L?'GU?JHrTn)?8!?TeB???K?2"HK??xy(J5jT?U?N?V}*??WV?F?+c?	R?z????5?b}?^?
?s?????U??
??U??5?^??x1??j??U'?-?
????I,???T??C?M=??1%?5K\?????OjEi??'??QO
3b??FB??I$*q?D?:??H&?)n?ZQ???"H?Y?s/??Vl?2?H?
i8???[]Y8???0s 
?[??q?sc>?86~?Wa??.
1?T??l??Zj?????	=????0?>:jG<?`???1I?)8\
c33??k?C????h<&?o????t?Y??T>B??^z!I?Lb?A?E
??T???]?t$
??#3?h??J????Y?aC?t#V
?&q?-?a h?5?3R?U7?L?&M?q+UE-?-
O?`p
\W???	?\??
?
O??? $??!?g?0?h??$"?#?
??
.?
???(??!?!d?
???k+?g???q??R??b?t??(?m?	?1???&?p?RS?q?
?gG7?0'
G?!#r?x???J*Hi	"Q?u??1ca???jz?H?Yr?i??!x?)??
l??N?k???eG?*
?3??[O2d?????????
?{Qr??'I?!?
?
l?A?a#????'?
???N?????EY-?pi?9??@!?vp1Xs???(
$???????????????
??'a????g)???????|yb??F8p??a?
?"|?????2#????u?Xk?y????
+?X	s??ie
????DS??u?"+?R?g?v??#c?8?? 'd"??aH?Q???
??'\??,q]??GF?	????F?????????8?a????????j\_?*?p1?
w?#?v???1l?A??y???8?
?h???51?

??T?]??"?v?z???E
??2
7x?7g???N8c??
?yDI?\_q?N)d*
??V
Oi??4??g6???s?T?N?2?O0A???.S???X?:??2??Uc???A.?h?f??{GJ?{?ts?x???2C?d??0??-?#a???G1d??O1hE?C2;*r?$?^T?fM~????OIz?????Q??'??&??U??????D8oO?$?y2D????_???<?R???R???)/uE?????x??????1 ?????r??_T ???aZ?c4e??B??*?Rbt???>5O?????b?21CM`_{?%?
??
??

??K&????/9??A/?d?J'?$?L'??SJ>??QE???R5	?U-?dUW_?%?X-?[n???[m?u?[n???[r??c?E?Xc?e??c????c|?V?c???CE?pE???U???[???c???(??7^y???^{e?4X???_????*?`?????2&r???2yx?3?T3b???SN=????9??$?DEtdII???IN^?L6-??Og??UQ)-?OE???V[????]?%??W??]l??[u?U?[t?e[??E?]????e?e?^?=?Yk?E??c(?p??.?[?Q?\c?{???b???
?_?'????4<q?W?q?o,?lx????
??????Z??	F=??x?6UO?N9%q?cCBv?P?
ETPHp4?A'!?
??Y?	Q?\^Z?
q?B?i??&?<????@?? F'7?Id?????4'HdBd?8?$?8(HD?c?Z???(??

?P??????\QJRi?V4D?	a,??9?????e.u?K^&p??W7Xc9'??%zq9Zi??#@
	E?????C@W?CH?6??6??'H?????
?
?l????????L?
?z????#?	????&?!au?]	qx???8]???n.???'?
?_}????	?IL:????
???>?e\4?>h????#,?Q	L??????F?????@A?G???
?<q%u?W?{?????????s??&???+??-
??Y?jp??A?#4?#,?A?5??"R5"Z???$?H?r????"?aBqN??!C?????3\???)sCJX????
?]??D?????:<???f???I*???C????%???A%?o????????Lt????D???OE?P??q?+????? ??fP(?"E??T??X4?n??c#?E?&o??(??c?????????????F8?/???J??O1#??????`K`?xn?G??o?F?yq??Op??a?\????[
????4????X???K???1??l??4??d??????$?L?\W?N???tLJ???????l??=?????M???(???
??????h????$0????<??$?$?
%P?i?=?R4??,??t???|
P?\?H?	????%????HN?P??8?}???lI
?L??????P??M??M???,L#??
?RYH??LY???h?]?
~????5?4M??????%???&?P??O3uK0?A}??/???
?{VX?n???e?B?b?J?T?????q8]?
???l	?V
X?.?VW?n?nH?~X??4)E?%NP?$&?h?iqX?XX
X???????WX??M?PM

x?r?L?YqU\H????V??X&Uv^?]J-a?0????????U?8?E
%f???[??????l?G?????
(?.?
dn????
?? X
?U??Pc???*~?s


A+Y?`?'?a9V?V?c??`?X?^-????X?6????*??R?s???+?2g???i?&??:w????'??B?-jgL??2m??)??R?R?j?*??4?	????W'P??5??B????:??Y?K?"?pa?X?\?ke??B???n?K?E??]??????????mUw?8
7/d5??8?
??E?!,?0?*N?:?B?????j5????B???*r
?r??W????? ??W?A????????F+Z????[?D??L?r3&zX??kd=uI??[}?4?CK?e?E?2?B????A???Pjv?CNJ
?b??e?q??"RB1
??-??"?1?8#?M%???5??#?=>??
e??0?%????k?N?;???;-??
k?????/???XQ?W???.??.?0?K?U??9o?k?f?a9????DT???#?'????%??f?/???????7[????W?W????i?P?<3?I+MT?r-???5c?????c?G+;??A??5?a?=6?e???!&&??????Rq???
?m6?y????@B???U?4N?s???o~??G5N????7??[>v??_?yMR????6?????r?"????:????Nv6<?????$??O?????f?x???<??6?z?'?ym??u?g???<??????'?=??{_6???Z???r????????K?=??g???/?J;??Q#?F??????????l?
?V-??w??^?
?n&?J?R(????"%??k.?!??A
??????Nn?%?+'#??y?D!R??V?"??"??	.LH?'?^?f<#??@#?m&??s??E??[Pc???=.p|2|?,?v?9:+?f????E2?(??!??8'CZ??6)??,L????$(?gD@??kr%*S??U???~?$
?DI8NE?dD?nX??]?0vO
O??2??)S??X%??????4u%??J?o?
W???????J??
z??@?I?A????_???8?C.??o|?O??S??????,??K?q????)o9?Y??????<?9?wt???F?y?1s?3}?H?9?)u??K?U??????s=?]/??????;?I?z??>?h??mo;?Y?v??}?+????n??k<?}?;??^?$?????;??>????O??#?x??}?vw??o??/?????A?y?w~?????M???????o??Uz????????a_z??????}???{????'??i?{?/???}???|?G????~????+??o/?:???!< 
--- NEW FILE ---
GIF89a?
?
K\??? BA*|???Z???? ???%?
?cf{?x?2??[??;???????r+?%??????????bN??sN
?????^.?H/?
?d??h?p??
???)?????@???Yj`g?A????Ryb?|^8J??????p?y?CqPD?|??g?
??
?C;?cB??v?`??:????L??F?:?6\cA?`I??B?@:7?3??D???`??@;k?3&?????;???$??i?
???r?px???
?J?;?????l??%{?$?DZo??D???????NH;l
??
? G?{&?????P??#??2??C?P??/????5p3??2?????3h?o?i?????H)???i?
4/????????v???[???????
j?I$)??T>?Zm??P&?m?????/q?fq??? /g??[??sz:
?K^???d4~?D&???Ah?&F??
???.?????3Exz????*'9???????y?4S??(?Bv?v?p?E??S?&???e????
	?3????p
????c??`{K3|J]83?ci??l??Di??45{F??????IE
?
?8???w??B?3??8&tIq$?3,<5??h?dj?E?
??f??????Dp?G?G0??&GuK?I?jhj:|?C??G??5?????uw???(*??%`
n??
?~?N?2.???????L???}??=C>??P????'0
? ??!Quk@?V??*??^??`??O?!?@????M\`^?"K?7Ra???*??V??"?rpM???,\?+bp???%?z???????Z?D?L0?[}d?r?8????Ud~?H0?????????
??O?
???D@??IrOHWW%W?R-?+O+??!?+??!?~T?b+?+-?O??+j? Y?Ge$2W?~*???	o???-/,	/WT???^????p??$w???????d???>?;??|????sJ??K #?
9??i^M?5?^M??vI?3:?6EH?B#4>#7eX4G?vZ?????3???r4JIo??P??0??
5????4?
?$/
p?C?T?@
??? 
;??{
?
??
&?9S(
??i??6??0??9L?D?3?25b?l??)?9z?|twTy??9?? '?O??
l???g/)??s????????????x|Rs??v??6?D??l?(?0?,K_?s?x???t?,Kx?1?????'??????A!Es?S???<??;?D(?B????????f?:q?v??9&Kj?
8
?S??)?S???F?:?h?s??.MZ?[???F?z?????S?&
;?l??	jL+??p???????\??	?-~<.t??????????Wm?-	?)D?ABE
?'\X?Y?
*&??t?????)?s?:??a~Qf?V??>??:?Pb~?T#????^~???a5?a???TU??B\?ke/?D??]C??;
??U?IG?p?

?d?(QA@?!???? ??N1P?e?:qT???l?F9??t??????Je?Q1\Q??I?9
??C?!?F?`:X? ???????D?P?E?"???v??|?,??b?8t???ph1?
2?T?D?qJV2??QLe???3G=??Z???"0?5J'?B?
?Q+zc?????<r??8??d?hCGI?E[?$??4Y???O?R?z??$K??]?Z????????u?K^?2b??????d?? !?.L?C?D&??EWDf?
??q(k?T
w??PK?A???7??ti?????E?a?????Z?[
!???XE??????X

??H??????^?a??_?b$?d<?dDF?X?fdF??i??h?????????1Vb?B?(???C??q ?r?q@?r@?tLGrp?x??x?Gw\?y?Gu??vt?\?G{??rP?]?]XG??t???\?R??|??z??w?H?s?????????????H??????$I???]?????d?tdG?TGvlG???`(??I~D?x?Gt???IuP?R H?T?lI????4??l??l?r(??4I????????G????"?O?????J??f*?$K;2??0??F?s???"? ?
 ?????#??^??????e????uP??		???b?

??L?0?Z???	s???H?q?	

??8?"?"?>%TE%?r:?rJVdE?g]Sf?V9?VH??:??,?b
?`??<??(d??,Kr?????H2;??0?Q??0
-m?///?j?
?3B4?????>x?D?
9H?(???{??z??=
?Y?9]??CL~-?`??
?y??????@[??`p???
a?H?9??2??L	??O^A??P?P?

`?c
?????t

sp&a?O??Toe??8Q?
?)
`??r?
UF?_??t??boB???????H??\?????!?Z@?@?7?
??? ?v??3
?^0l?a`\????#????5?$???"I
J???pj?????N?Q?????????Nah?Z???????????'?P
?H?Z??u?>????(??
???t?,?b???Q?b??d8????????v??>????t??Z???|?@A??}_??Q???q2
^ ??$ft?"e?R???s?n2?Q|I?X?7???	?L?c?????)p
H???.?atL/???x;2??9L=5?ZTe?K;?B"0*yxPG?v?9N?[2+9?
?H??KDM?sm?1?L?,R?7?x!???
?+5?a2?	??Zv6?8c1?)??0???T2?	4ZS????????2D??97Ry??Dv0??W??0?TV+5u????J?!?X?a???[+?2???X??y(S?X?b 0j???Mvd?
??BR1????"?W?zK?
c?W???026xA
?W[}??R?v?alq?)??z'g?s??0??
?EG?1T0
G???f22???9??NY????0?S???0?M
&c??Y??????K???????y??v?????F??\?}????~???F?TW2	???E???e1H????1???L??.?f?LX~??5
?Q.&?b2Kv??9??s?

??l??1
????L`]d??U?VDr??uD?8@???C?4?*?%
???>??ztC?????!?}?#{8?"??~?????kkp$B?u,l??}8?Ix=??(?v???m>v?X?2????Gk?X?R????.v????r????.b?;]?????=/z????h+?$$???
???e#~???L??????#??V?6w?"sH@?+??:??X??????g3@t??{?cI?l????#a?Gl???'?X??G?@??:?????<???p???=?<?`{?????C?
?8????@???????=?[?6???????3?cn8<;?????n~3??,?9??????? `?f?x??????
G?N(=)????SD??????
J????"??`??mh?	Vo?~?k=XW??C?@??c<?.?Q;?O ?

?JFF??p?<EYU??F???_?????>?????????? ???
?,?*X?y?C m??????B??a??*hR?RZ????P??H?x?????
?Pa??D:???2??????
?????x$
&,?`??b$q?G???
Gx?`????????/??	c~??3*#?9?q? 	????W?$X
?@??9X??????? ?w???-?|
cn????!@

F?????????w?#?cf0N?M
?-?????.?F??o4?????8?`???r?x?e???:?Gm ?] o?\V`$????G/ ????0?B???T?
l?-? F???H?0??B%`)D:d?
PU??p?*P?
? ????/??DKta+?B????????h6???FC?G?=?Q?~ @Z8?VCr?^???d"+(?0??c?+,@??S?(?H`
????(l?.??????(Xg??0\K>?Pg`?,????
C'???a2??}q?/6g?z??j?-.?J?h?C?V?$?b?$?%-????R?&lj??&??f?e????6^?Z#????c6?u?0?&??"g/?\1r?z(?m??f??/4?!??N	?-?aB?TD?!W?C:(??}
/?C-?D?L?2?F?Q??:???d?(C	A?F?????=?Np?D?^;?Wd?????WQ	?,??,?

]?^???0??7????????
?@?
?1?q?q?1?q???1???0???????n????mH?
???q?1#w?9rK?#W?%_2&g?&o2's2%w2(?r'??b_aG}=?Fp????E ??
??'1G??2/??.?20?0????0??1'?(?7?r? 	?#????F??Q?,??
???28Oq$?.73o?2s???3???/?3??????<?0<??s|q9?3????3<??
4>?8???$??
?3;C4As??sp?>S43?$C?C1G????3I??9s??B??H??@?39????p??{Vh???
?
H?
?7(S??9?fM?7q????gO???:?hQ??;6l??_K?2???jU?T?^?j5?V?M?????X?U??-K?D
?oI?p;??
h??:?,

?)???
p?????J??!w?q??RW>??{??????*?5??h?%?)?'T
u??;&0sxI?
~?E?a????id?O5??e
??X?
?:~AMi???P?1???-?"a?\?V?5?o?r??#??zP?.X	-?2??1?M	?Vsh???mCT???????(SB:???n???bG?9??`+??"??H?t???)
???9??T.l	^?q??m?????	???=?? l?#??e???
?"?A?&o?bN??i??0???g??\??t91M??=R?z at B?V?>??_G????Jv?o??C?????BC????d?J???D?.B?
nG???qr?4??+a?????1*??~i?X@??????S%?"TC?? ?*?p?`??\&.??b
??|??
o?????.=@2v?????-*:?
7?P??????~?tD??gRz??uaEdx???fDqG??SJ,????#??NY?06h?{1V?`?{??,\?TIR?e?(V+TmX?n.?w
uai2%y?St?R?*????)??d
+y
yZ?TU?X???B?Gr??
uS1??
??h?l??
????XKo?y??
? TLp???p*

9??
0??rV?0z?
c?0???g???*???Kl?>v?
???e?9
???X?
???#gZ?l'?#?A?a*???px
???z???)/????=??!?Hl??|??uN?????I??????b??(FN;??)???I????.?`?k9???????F"?!???"?????1
e  P????Q?R?

??bn?K.G9?U??????
0?=??=?d4:F%&g1I1Z??????$???i8??h
qY?:?????"H?"2??
e??h
R;?N?S???U?J????"hcu	??B!?"V?2??R?+'0?)?LG@?)???x????D1/????b?%???	?????nA????icTf???`?f|?h\|???MG8?1?*??,[?k??
Y?/???'q
$ ???zK?<L????J?p??!?1??2a??]?ki????e
??HU????ZS??9[??M?&V??8ssJ\??????)PT?????b??4?a?????X1?O??RHS??c=?(?k?Mp??
???[??]??Ldt$!6eEVT???w6?c;???lrU%!Tu?h???pA??}?F?w??{2?*(???:?q?8????t?
[J?????CBy??{?VC?
?p
qg??I????@?@??
q??0??m?0???r?`??
Xp	0????? ?P6???I?@????0?0????[?P????0?#????#Z?????`? ?6?=??i??k??m??o
?q???)?uj?w?????n?????4????Z?GHE3tz}I?<?l????f[??F??????g???Sq??N?I
?
h`?????z?{
?
+?K?k???i???|??2????????k????D?m???	Z???m?6?????V?2?J?
7?:q 0?????aP?Pj??I??i?
?0????
???:??}???0? ???	V@6?YP??Y?????+?????+??????????????????????+??????????????????????Yj??????%z?F? ?l?hC?}?{?x?D?j????)T% ?Bq
z?u?P??fZ???Nj??????????M???[T????????Tj???????N???+??+??????????M
?????;?????+???l??k?
???????,?<????`?p?5?;???k??h???????*H$?|???[
?
@????T????????`?
?A??Q)at ??T???4???? ??i?3Z?D??z???F??(??D
f???`>?
MQ?N??????l;'??????K??+?.\??????????????????h?3!????n?pe?9R$?|???z??C?????~?W?l?!bh??02z?
"?m???B5?

?????e?4u?9?;?r?h\?t?2??W??"U4? ??:??)??"?Pw?!?1$!@3$.1??gQj??w?
$
 ??A?b???"
n????>.??;?CaV??r
?,???????N?h?<.>??m?.??.hUC
(??????W,???=
???I??<?*???????1-b?
p
?}#7?
`Y??;?a
6r+??wAL????P?~L??5X??????~?W?????U???????.??e?n??-?n??2?za??|?????h?????+>D?
i??(-:d?3N/??Q?nL"Z|#??hs?:??h	?G?E]G?
?r??E??P?NU??P?S??>??K?WZ?1g&????????1;N??`???dLddsF??U5Y?sX??????,?IE]N?%?
??t9Q?u~?EVI???t???:???d?sH^?K?vp?n?(?&]p
6?nM?U???1?`3?-?vXUs?u2*?L?H???hD???I????Q????5?p-?0?z9F?t\	j?_2?%?pA?9\??????E?
???dCa?$,"?D#?????Art	?a?[????y??z	?@a??`??M?T?

%J
???9@a|aTh??%H;t?]?y9sR?	,
X?
{??r
N2???_??4?X?SR??
C?P~?"???"%?II/Rw???H ???}?@??C??nn??D?ZI?wz'?U??V?X
??s?F\?"??0Tb???,??M%??????0?u??|e,L U?'????c??????"??b8?4?
D?F?9?/Jk????b?U?;G9???/??%??r4???g??[?gii?2??
?l??V@?	??|?U&?0Y??^??
C?L@*???d??i????!?)???)??Ae?U??(?U?KV?,i?2P
FV|o?P?+\
??B??%??????$(Z)?)?bzbH|(????
?XE?????G?`E:X?-?S!??0????"???A?#?
h?0z{?
t??8bmsnq?UP?7j-Ff?e????Hc???[???8?s|6s?j??????9??9BS???0?X ???????KZ||?h???<?K??q?#;?0H?+lS?AD?Y`??7??F??b?s;cY9???eY??X??y??????;UI6???1?R?3??Q??I??=(??!?
]	???.?????P2bG<P!/?cP?q;??
????????/4???8g???X????4G&Q?9?(DE?????>H?*z?'??=>???g|???#???G??8??H?G$???!8??????F??
???????y?Y???w|ig:?	?r?+Z??&g?w???~_??kY??]???jr????	@I E?@ a?H
`C?}?-$!_?b
?
????m?????>???TU??C?x?.?!?Z
???
]?}P?Q????EK
???????Q??Q??L$??	??!??&?P???}?+U?'????Q?4?"-?eK#?H?<?????dL??@bB%w?Vp??Ae0??<?hI?/???\H??R???I5u??4ReS1eT?T?CeP?lO`RR*TJ??B??<?%R?,?N%SRM??????u?EM?*uU?$T?lP??OQ5?I??????J?|????s
?8
???y??.l?yMW????E?--WI?Zu???Y?R??Z?-O?}Z????m[???-?}?W?u??eS????
\??V?l??U??u???V?,O5??g?Z?-??\E|??
??&???y????}P?<??x3???????m?-?????E??}??????=@??????Q?K>???r%??._??)s&??6o???s'??>?o??a??!V?QbG?BUz????H?R?Z???V?j?*?kR???v?????n?fm;VmY?h???Z???$??P1?o
$F?x1?/?cV?2???y??l????69z???l???y??????H5{???d? H??(??h?^? ?@?v?1??.s?q3/%?}?????_?~?5??hy?????/~<??????????N??x>S?H????~]?????U~I??~?W }?
??!?
?(???Y(??B???F????>:??uF?_???_#p8??? ?K/?s@*??
??kk????Z???:???"????>;m??F????r?????n??z??i???A?>Kk???/??"T???b,J??????p???_T?@jU{?~??c+???qR[L1????uj?a?n8?????
? ?/
"?5???>|LQ??L+???>R0??0??I?/?????v??????	?H?0nq^ ?)?32xa???H??
	?
"???_???O1?^????;8?????0?????
G?]u????U??1
5??-6?&?7?'e?M1?P????5?N7???2)???\??C4?b$#D??!/?\HF?
??Y?Q????? ?/???z(??	???_??????????gALg??SITA?[??I????5?\Z?=??D?TM!???fU?????@?	??
(L?!?????
?f
????S?G?X?0???%^?!?S?Y;
??b?~	Q?5?Up?0
??
h`
L?P?m?R?-
????@	p1P?)?B2[g??D?\?f?C"??=???@?DF??8???????hA????H?Al???6p?<???g??l?8??8p?"H?%
=;u&{?S?	?z??
Z|rXo???????V!?R??|$?s??}'?U??~??r?`u{
C;?J??L G@=?	G4K=?=(	=????????F?R?E?CH??G$???B??<?5aoF?$?_#???A?.
K?i?vj?D0x2?4?(G?At?{d?lu?n???n3?u?m?I????
??AK???:?F??6?H??`???f,K?vi???vowv?F{s+{??{??|?w}??}?7~?w~??~???xK???8m?8???3x?;?????6]?A??G??z~?n??oG??f?VC??ty"?c4??^'?H[?????Q??
??C)
J`?y)
<	???W?}y?W??E/?
CY??n
d???a??le???h?
?3??]^?@?<0????W???gb+8A|t?N????=??????????Z"
d??$?$?uut????r2?M?"??E??????.v??={?=r??~7}??d?????oa?f???cg??x?!???B?(?XCR???s4rYg<??
?B?f??Oz?-^?c???l?W?{?Zi\	+@???Y??\0?1?+?????*?
??=?????C?Ol?/C?|5??????uq?T?<??$??/
??P??%?????lE%?]?'|B?0??o?fI??-??	?<m?x?{???
,?e`??? ???d?
?l<?.?i?"???@?!?x

?????????a??df.?J??'?????DJP?+??????l
0?????
=X?
#?> 0m}X?-q_n?|*?Z?(???4??:??%.i?
r?o???RT?DuA)??B?DHbN????D?D7UaT![4??!???B??B???!??$? ?hAH!0??B?,l<
fzAO>b?????c???+????????d	?r?????-?r???????,Q????	y?+?C?"f~?13???4O?IdE??G.t?
.??Z?H(e?????V????/??M???Y?k	g2Z?<??frcN??o?b?H??gm{$???!??M??G??C?-Z???! ??bB.w?{???0?r.
V???t`?wH#?uKg5ou??z,b??I??/?????Z-r??7LB???_ zo???/??
??:?U??K??H*#3*c%tb???l?$???a???5??@q?AN?!???0???l?%:?u>"?Kc?~?y?d?VOz????f~&L???
???T??H!??%?+?4B?.???$.C???????1?&??N?X??0L?A??<?B?l?c]b=L??i?\?gt????0R!}C?}Nk??m7P??M
?8,[Sz?v???r?a?::?LVA8>?G\!?V?A???*??????^?F?z?$d1??????&N?%?$???A2_?4&???a??V?'?(???9?kkNC?
]?5"?'?DV?bEJB??T?f??B????/??[P68??/.?A?}q??? ?Wm???FA?l?ml??
:9?:>&z&%oB?]?YX?l???k(@???(S????'?
??9
T??A_???:?,lo1??$O?*???p??7??&?7*??	?c?&?+&Za??1??H
??V????I????_k???p?
7?
?\??Uu?????????????!??3????5??.??????e@?2V
??:?*?
?????W??T/??c@*?O??1iQg??i
 ?9h???.???|`?

/\h????#???m?????y??B??	 }?*??8
X]p??$B??U?#???8/?/]??UP?/L?-?/}LA?$???
?`b8
?[???V?????JN????a?h$?Y#?e?BE8@?z?? K%????3`? 
?G??a?8????
$+)K???P2K?.1)??	? -?\X??q?-?
)oz??-??tL?#?0???-?il??(?] ?c	?*\??(???f?
??U ?a?K?
=?Im'CE
?/????@?P??V1=??hH?H????HS6K?E&2s??q
!H?A<?fw??9#Wp????+?H??x
$?Gb?\s??D[??ELC8r??A?r??xX!??`	$??	s??
\??0?U/????%?Z? N:D??^????08?K???r?X?????Z5?K?xZ?(????O??E??(???_"Y?o@??@??X??Q{X8N?F?
?#?BlX2?@.??!H?A
??6G8?DE?a ug?R??!??)?<_?
V???
??{!??Q???%	?"f%1 ??>^?0?o???

s?/9?R??????(?
??^??tXB?*?^?D??u	??	L?X??V.C1?xB6v?
?~b?Q?P at C!??0?^?X"?CY?b???Q?0???!!??0E?^>i+??d???E
?O?y??C+?XX?
){???M?"bh????)h????(uIS??v9??!x????w$??2|g?%?-??&??[?"'~????x???Aw?Wu???Ck??J???P2?qp????{??3#?fq<Q???yG???????P??}?
??r8d0???w-?X?M?g???dRn\v2???
2
?%
x??S?
????2?Dc?]?I?@cB
}????w\?
?V??@THz ??[?gHu??4E???PW2?$!??W??b??q<A?TVR?B"??R)2?
s?yJ?A??@???|?x?w(<????bY.Iq
??/N???qxu?????`?F?B??
!?1!?BR(b???N?O??@???*??C?
=?& ?*Z??^"_?9`Z.???AVj7bQ??D???g??	??HR?
??E???e(m?(?zS?3f4??z	??)oBJ????
RYnbD}?q?$H'PT?? T?t?5>?"Q?3?a%?P??'8?V=q$?7?bN/g??]9??O)5]"??:+?V???-??-!?T???,???s?3?? ????C??2CD?$<?v??]?U]?C1Z12m??????]t??7Q?a?#*?g?\ra??U)?r10
v??!-??D
?S????-?Q?$,@"&??;?C51_?D?j?$2??A??|t<??G?tH?7IR?eUT? 0Z48??????c??2???$B5C9?]

????a??)f????#??:???`?q?E/?
U?`3????P??C?=4????????F??L?(*?(?
?~:{G?h??mS?'?b??????L??????9??E??.8?1??[2?3
?V??L"=??d??s??qO>???[OqD?2?`??h??Q??f]Q???&m?R?6???8:?!3???$?0?.!1T4?5?4F?W??$?f???????m????,l?1????2??2?.nR??mf<s??????$?h8??[??^?a???????????NH<?9b????f?q1\}??h0D?????"????P?G?`??"i?2:??! !Vf? 'E)q??2&?????s??2?bS7?eW???

?0??g?Kr c
K?t3?L?KM!A??
YD?F?g???W?E2L9(??rL??X?

?Y?t? ?#
?G?%?3c?
?(&p)_^???C?t6x??
uE???<?
$?L??^S?V0^?iK6??/a???*vWLa?N??kS???h??j?C??q???R????7W??N??
??P<??"O?nL?GP?r<??
?????
E??M`=?1?#
[#?W-?-\w??
V???$?B??z?A?p;???0|A`Q??pL}??e?\???F??Pb?F??E
y5???X`??n??<g:???&Q$????R???fE+?M?
??????????*k??0
f`
y?B????w??y?=?)0??Q`?S^r(\7B?s?????????????67????<?FD?0?=?<?_Bv~????	_T? ?p???aKX???????=?4???Nv)?|	SW????????{?:??~????|?/?>???(?-?!??Ax[??7??V??s??l7'??I?U?qc$
??"1?1?ulR ?
?9F?b?4`?????n???.??EA?
??|(<=I>???????;??#???e???	??????_?%?????C??@?3^??v???????D?D4r???d??????=??	C????k4???y7?(=8=?#?
?
s
?"??
B?
bDFf,Cft???
?`)??;
?????
9???G???
^?	+?%?[???9]X?
???n??^G|??<rDO
T???k)TE??p1?)?(
@8e?Ie`????????1?+\??U?U??L_?ATU???L~?~?@?+?*?
?H??
]
????????k?+5*????\???{]???
?`G8?B?#??t?s????[l???,aSlY_AUpE
??D?B4T?T????B?E^??U?=
??~G?!I
i
?&Q?????q???8J???V??0??.?=K??
a??????f/Fd?`????5?"G?
_ ?
xI????U????^

???)]??>?????
?e.
c??4????s)???C?B49q=?3V?:[??V??????nIe????jd3?i?O???/g?:D????~?p??@??$?pAr+M?1V??X1eu?)?h??F?R?xe02??wL1+?W(205?c??R?????7???o??T0?0Jj?`??x??t?a???r?????Z????????sp?1!J?cGh??	Q????
:^?~??ct?)"c??????????0
?
|h)+0
?$??NI4s?Sz?RK?3
b???y??@P?4Uh?%?H1X???|??iE?)??
?C;???A0?b?b?@Q)?m??	F??6H
`?c??"}=???lD?
HhB?o'???????hh?f?????<h-|3b???????e
????V?-1E????$ ?`?ATq?@??[????.(???}??.?
rF+??*???X???B?yWB?J(I?y?????G9
?A?????2?????U;?2?????}1(Fe?-?ryQ:?W,$?x??
@?h???

N?:????2(C7F?#??V?G???
]D
?/??'???h?F?Q?PR
z????/@/??h?6???",^?b?_FgQ??1????1?:?]?R->??X?
/2?#Or??/(????$k???"????????VV#D?^???K<}?Yx???UG?????*o?1?/?1???????=??0???Hg???U?<????V?U
H??*??{?Z?l?M??7
?&N?g	N?dL??L?????%??J??????^??D\?^]
],4??[????`?P?uWiX?*?5
Z?:?????:HD9?x????????}???O1s1Q?%?L#??r5?t,"s??tMuO?1?[??23ER?????N+s"???sM??TWc2??O?rMctQ'3T?tNsF???lW??W_5N?}?4[?W?uQ??T??M?u1{?q???r????A????8?,?B,??,?B,8?c?BbKvbWv,\6fg?eO?b[?eC?c??h??h_61h?bgve[?j??k'6,?-??l??k?ve??+??1?*,
,y
?Kp at 9?L9?W9? ??S9??o?3S?py??
???79?7???9?g?????o;?w?	???@
???s;??9??@?:?z?_{?gz??{??{p????{q???_Z?w??????<?'??/<?3???<?G|?????;?G??W<???b?Fe??L???@??9??????

=??|???+=?7}l?y?????|??|?S=??|?;=??|??|??}??=?????}3????=??=?????=??=????k??H???d??G??
9?????=?'??/~?>??>??z????;?;}?c>???????o???>?3???4?]?3???"??G????3??w???~?g>??>?O~????????>?????>?y??}???>?z???^
?1p(??s????y???/?????????????????????????qdZ#????Z?y??w???????@?8?`A?&T??aC?!F?8?bE?1f???cG?S??????$O?0?0???
+?*]:`??%[??X?
5J??b???ILz?iS?O?F?:?jU?W??\*0i?
1c?t	,Y2
????,??#?oD????????:?H)???/???? ??LrM=q????<??%?(?0?R?$??r??
??B[AfP`??q?P`???(Mm?
P???L??9A??S.??/?/?z0?;u?s?WB??7G??TP???H??<???t??P?$QW4C???X??K???s??:Xi?Aer)?api?\\??
6?T?8="??I??U?Ye?o?+K??^bo??Nta?t?7?/???}V}?T??_?,??M]?Y?#Z????nB??-?`
?U?????b??N_~?e?d? ?Z?6?fv????Y?S?c??!?_Mv????y??5?V9??^?b?aNS???X??????#>????=?8?LZ?ElO?_?q??GM	0??????[+8??A=:_?A4???????Dq? ???i?	?:??=??q?????9??K???q\y?yS???<ie?fW??%eZ?e?_z1??_?`;??????4\?<??y????!??6u??oFU?Vycxj??}]{???????'????????
??c?=?7???sV???????m)p[?P?"d?????
???
??Q???/???_????/???
?Q=??"?H9=???g????JV.?A+????C2%??`O{?#M?yEEy??e?4?A?EO?)l????]????
X?????d9FIA?J?ct??N2?(???X?9c??OZ?Ot?l?~??B?%r|???F???=?`
???t9?@??7???????)h1
?B??AgK??$?c?)0????????M?!
B??d???<?a`(j?8?N?R?.?/???=Q????w?p,?z)????
q
?Q+[|I?2???|??.?x?}????Y?X????GY?????1#XA??[?C?(?1?qerl?[??.???(??{????b*???Ta^\?VJ?FW??}?PV2f?d???"Y??5?}??C??x??[?h??)='??L@
--- NEW FILE ---
GIF89a?g
?
??
??????????&??%??%??%??4??5??7??5??)??%??&??.?? ??'??5??3??7??M??M??E??r??}??w??z??|??~??x??y???
Y?e?hP-??j??_??
?5`??W?}x???/??}???_;??=xl????5??W?|?	??z?????
#?1??_5??G!}?Y?y???!|????{$?'^???????1?`?z?^?x?#? ??^????D??`?H&???L6??~G?d??!????`#e~????7z??3K?'6vg?5K??} ?H??6?G#?x??^?? }?Yh^?z????uX#yv?^???(i?%??????Y?~?acb?KvY????j*?Q>??????xj????!(???}9?6?e?K??+???[?6? ?,6?L?
5(Q?BLlWM7?!?Lw?Pp$?TRI???[?"??k??????$?zb?'????'?x?I'???H*?`bo*??"J*????_R?(?@??(O\?(?R????2?*??b?????????))????0???????8???s???<N???LN??]?,C#
9?,M??LCN8LO]????S?-?????^{?5:?<???f??L:kG?N4?D?????
?:???4?H?
5??-?4?P3???P??6?7????P??4?pc
5??3?5?L3???.????n?????M??k?97??????oc?4???
7?w.
7?$KM??S??5?????Hz{;4?????n%???%?^?????[????+?????I?S<
??~??l??????J)c???????Lq??u???0+V?2???e4?*?Q??M6???6x??5MNk????4?E
kTC???6??b??a?q??5?a4?7??-zs?4??6??E?o?\??H???r????h????p??G=??lQ????F7x??yl#w?03?a?itcW????????1?xL\??7<c????? ??-e??K?
P??[?!`
P?#??(???U?????&?QLS`S?`?&\?	???/+Nq?	?c?4*8a??M
P?B????????L?p?&??NT??e??84~??33'???cjK??"?4??????d?Y??}?5??Y??]E?3f!???????rI??f?????<??/?jp???j4??h?;????"l"P3??:g +???O?|????m????E???`?b???lt???\Q?q
?\?(?<?F?7r??AE?????uzqR??4?
??6?????.??:6???g?????w~?x???????%???AkiX?t?GWQ???f?;??O6????
???N????)Y?b?5?H(<????o??hP
V?@'@,d??X|?
?
ft r\M~-"'??????z?'

T?L? r02.?
VHa?@
?d
??sBe
'fb.?puYT Du
PgQG?B??B???@6]?w?
?C/?e?? T????
?
?`w
l.?
??? ??
0?V?
?g:???<?S???iH??#?
?????*????z??z?????z???$???"?<??+?J????????????????????j???"???S<?@
?;?5?>?j?#k?k??$+?!;?&[?(??'??*??)?,??4+?0?????8??,??H?T????BW?
-}?? I8
??? 9
0
#???s??
n?I??i??,$?"??)?????????
??L??Z????????l????????l??l??????$????|????y?$?f??\??????????\??|????????????d,I;{H????????D?]? ?
K???z?????0
??<??A?)
*?'g???n[
????o,?N?????S??V?*?[? ??s??<???M???????|?~???;??<?[??*?!K?D????????=?????=*????C????k-Ck??:
MV`9{?V~??(??p???:?=P-Z?-???<?"
?U???Fc????????`?q??????#U??
?8?????G??
????X????Y?%?7N&~?
 ??]"????s??u-??"?@?lzc?c?f?'?J??C8?????i?a???V??#?j&?zX
???,h%???S5
??F?]?? {UF??m???%?
{u
?0?9???
??~*??.[?qV????v??????V?q???[W<
???f?~j???G???~?i?c8??l??N?=?????"?????=^????.??9?z??
??.???????<???????~??5;?N??A/?N???j??i?"?$#K?M??=??k??y??|????>>?B_?????
??*??J??j????h????s"?R:??]??#?\??#?^
n?h?#n?w?m???S:
{K
?5?4}-???????
|4??:?
??????m???;???&????{???g??f?|???i????y|Y??n???9?l.???C?@??E??????8?E?P????????X?????:??%%C??m?
+?(??K????&?
+?????Q&??,????k????+??N[2M??"??>??lM???B24?0+??>Asm???j
(=U??5k?N??????6S?/?
?8/?R#,???H??(?e?LLS??3?^?f
j?r?/g?5???K?E??3.????L???+4??[?0???S??/M?????o?c?oC?J??d????>?*I?k??=???5]o???A?Iv??"s????IO?
Zi????#?@?m?????????z3*?1G5?C)??>~?
??X????yL<d
?4l??
??$3???)P?
OH?3{??iF??@Nr?Q9?:?A
Y?E???N??ll?0????#uC??Q???!???|g?
??zj`-4h~)L???y~v???U??
???N:&f??T?,??`7?g.?&o??jJ??J7??{?%'?8KJC?(?e)}mFT?JJ??P?\??;????3??j????1???;w?c_I??DQ??Tk?#0?7Y?)Y??k0????>@j
?>?????g#-Z=?6?]?K?<??2u?l
?h??;k????GT?*
H??=?4??Q??-?#G?#O?<???:!?W?38??8??7??JlH??_9<?+<$
??????<c
Rj?Y<?????????c?$;??W_t$??F]D? ?Z??'0?????????????y
2{????<PQ	????QTD$)\?IH??????+?y<#??????b??B???KE>QVc????IAc???E??@??H<?q???JO?4???h??S?$??$@?v@?&?????}?L??~????s ?~??s?????DM~?L~X???s8???T???M?????M??l???M?????M????dM~~0??\???M?
M?,?)????N???<??L?2J?T?<N??LF?,M	?e??l4?l?8<?"5?j??L.??Zsk?L??LgY
???\R??M?M?\?\
??u??&??q
 S?DN?~????L????s?
d?I?)?????t;??%??E?t??<?J?U?d?$V?r??c?K????#33R?VR4V?Ef$P5????=??x?R?h???L?ETm?QYc3i??}?Wkx??x?~?W}Ux ??3X}e????????
X???X?=??E??U????6#???X??k???-??b?
??!	x??]???$J??M????,K???????Y??6???
?Ui????2?A???#?????
X???I?0?DL?UY??e},a?
?????,??
#bLv?
$8??B??1]??Z?"+
???-??m??????p?"?!??|???]??;???????]????=?<?I?????$???^????M??]?????^???5??M???
;??????m??????^?A???????1????x?Td??T$?S?3??????F?????RnT????Q?j??=e?????
?r
??\4?????j5?????J??It?h^?? ?[?
?p??=?I?????%fb?Tb$n?(??)??*??}?R?????p??Y?r?P??O?4?OQVQ-??e?j?=??[i?;??DS?F????}?Ke?H<?4&??V?
G???q?J`?+?Q=Ev???H?????^??h?p?e??vM?'0!?_?????6?????b%`o?????u
?5Ug=??=???4[?????;I??H??Tb!???G????e?ek,??D???W?<L2G?Y?,?Nb?48?%9?O???V
?/^?\\=?z?.~,d??.[?f??g??J?????bj???a??4???Y[?j9P???5?dUg???]]?_?T??a?9?`d?
?fe?U?DK?|?8vI?.Re5?h??????}3:r??H]E?V??V???5?g=N???c]`P?hI?a|~???????6???,?hT?*6JaY~KW?????SBgZ%??.</?fG^	jZ????!}?????	?[???8?c.?_N?)y?2??H?]?g??????E???e?L
E+?d???t&i???\??Es?????dQ??~????q???^ZjmEi?5??N???i???z????^??\?Lb?p<????Xfe^???;d?????????R??I???\=(????&ShO??P?5!v?l?Y?9??iEq??L??I??
??+??%J?fW?????Y5??\E???J$?*?P????@?e???]lR?e2??Gy.?rf??=e?ubC??j???a
/?o?$4e<?6l	?\?NP??????E????$O?/??.io??o"???^jG???f???????IU?????6?o<?F??[dN??6??6??.p?????d????h?o??G????q?6W!7?K=@V?{??+??;?????n`V????W??.?r??y?	??K???_?J?.E4????uHG??julH??x!??Q?
Q?w?yfV???lS^fD??dq?[??o??*?4?d??iD?s?V???%Lg?u?ug???Fwi????iFqFdp]FG?rx??M???uw???rpw??a??pW<[?????h^p??[o??x?k?e??u8S??q5@?????l???t??'???p?{??f???33?kj?a?!??J*??????f'?S?!?r??d{?J?????rZguBB,GD?V?w0??#^q??F?K???2'???x??L?iN?%.?<B?O??xj?Vg??=?n??r????Uw?&{s???Im??F?j?JVnU?I?~?"????p??a??d???b???2j????
??Z????Q?4z???%??f?-?l=????K???Wr}?JK&?p??2?3??%|?k??#?o?B??da?w?
o???H?????;?g?UB*uv???'?YE?????Wr???b?c????\g_G"?R??wLQ???6???4;?k??M?A?lx
???	
?qbD?r???`??!n???E?;.???$??''??f?L???3???}???$P?:???x??J?,?JD(tcR??*64	??R?_??Jt?Y?@?j?s"?mcc??	??\?1ov-Hu'?????:??p?????e1???Q;J6X?C?>5??{?r??^2???4????2?lr??WT???????]?fm
?w??5^??u??x??D?l??Qu6????r&n???my??V??#IV??????BE?b????OB*n????A
???6q
W'?O(??
P& 
???
|?(??!?`	R?
:0???1ABP???cB?v?Y?`??B?0?l?9H????0,ao?A!???
??????=? O?? ?0?$?
?h@1'K"y?B???6#7?B^??P\?aXD3?1?%t?Q"?*???]Lb???%???B?#???Cv???4???G6N2"?U5?Q?n???q?$?P?R?P(%*S??U?R???l%,c)?Y?????%.s??W???s??/)LW&??P??1???dS??l???LgS8M??I?mn?N???6A?Me????S??9???I???fq??Mtv??k??F9??/??|@
??j???<???Olr???&???Jp??????Ki?t3??????y?????&J????6s????+?IJu?R??,gq????v???$2?P$(???'R5?J?.??'?'T??R???
&V????r??4?%M?
K???]=+?Z???????ne+8?`?%4?c0??`?!???Q??Q( ?8Fp?a?w)V?H?Ba????Nv?D??a??$??
BH??`?#?v????^??Y?R??T ?`?S$H??H?+?N?+?U
??H?9[?b??F??_[??Z
~??$l?)?f??N}?a???#\??P0BpM?Za?QPB???w?|?A??^24a
?l?????????f??0@? ??? ?)?	m???O;%A
Rx??j??J????4????.???7??l????7??o????F6x?
?`#?!??????j??
a?8lp???/h
???n}??%??H`????,?
?f@??-0?	Lx?
????3A?^???!?@
vC?	?<???^5 ?<? 
??l?2??(?c;&?1??3
???,???GF?[+N???U>???-
821^c?i?<??<?#=&?A??4R?1?c?ac<?c;~?D$7????,?;?????K???!L?$M??M??!???-b)??'??O??sy?@?bq??*?*??Q?)!?R??X????Nr?H?T*!eD??,A?,)eN?%+U%U5%&%MeW?Y?QZ%Z??Nz?]??Z?'?%_??_?%`?`&a?a&b?RKBeV?IB!?p??6<??f^?ff?&gn?gv&h~?h?&i??i?&j??j?&k??k?&l??l?&m??m?&n??n?&o??o?&p??p'q?q'r?r&'s.?s6't>?tF'uN?u?U7
*?}??m?*?A?	??~???h	????N?????????&M??HM???0	????x?l?J???&??(i?.???H??K? ??Ri?%a?d?X??Od??eC7l??$?6x0??	~Z??L?5d&??????:Q?`C??G~h~^????}6{??CTY??ioL??]??R(?fh6?_?F??????E?@??g?i?????

??5d???
?j??*??E7??S???N@?i?x???J???i?	?6)???VH??_?t??Bi?F???m7??:?f??n+?v??t??
?rH?c&?q????HB%?k%,??$H?%L?$H$X??R??V??+??????%?'?$??\???(x?$x???z?(Hl???)??T
?N????.??j?t_N\D?B$DB"T%???NB#@?"?k?&o????6??>o?,&L??Jl'??'|???P???*?????*?????????????????????,?
????m??C?&m?fm??
@

L??C/??/<?5?^?*
??B>??H4?x?G?x??J?D???
\$??????6xB%DB?vDB*?
s4?$<B?(\r*cB(Kr

?2<???C???:X????7??1?NK3l?Y?SdC?m?=??4???9?:C26870?<?3??Q?SO?>x_7P??O?|?J?HL?54>?3PY?uC=pY?!h?m?yC?[???7??/H50?=p????38C?I3x??zC??????<t???<?`7??????/??F??50Z?)??z|??}?<??uK~?gO??KE`C5?
???$`#$??1?2?7{?Z?$?k'`?(<?!\B?? ????2?,?v?*4?(??*??#??)?{??@?*???R?@?B??T(S?X?Z???*S7?B????R?BqB?'p#??WR?,p????f???/

?z"?
????-??? 5??1_8*l?:?w?? Q?E$???D#*?Ktb??D)>1u?
Q????0??	I0?????4?U
???u?jW??F
_????s?}??*??=j???o~
???6???m9???Q???cQv?*?FW???p?ea
t??????m\?:U??4?????????y?
?1@???5c
@=vLU?M
?(*??(????F?K?xd??#?~????????-?2L???q/?^e???Vbq????Q????/?<E????b?o?m??%e??Z
?~?:?????1?QaGZ@??????? nM:??\La?Y???.	q
qQ?8n?w!
-d??
?
??F?t?T???
O??????r2?????L?s?v?g?4?
?`O9?3?
6??Qy????/????<qd?
??X?s?lT?3U9OPR?V??D?Twt?M?V3
?^??%Q??U?3T?t???N}?S'??h	D??h??L?
???W1u?J3??M???????k8&????g$c??
?m??x?????SO?8-u:????
k?C??.?;???Dn|??q?i?R'lU?o?u:??????
/qpxA??o??x
????}??nRc??a?????
X????C?J20i??H???????|??v??>??4?p??oom~#{?>Ev??O???U????~Gc???I?8b?8?#~Gqx??s?_??Lgx?r?k9D???????X4|A<rc0?\9??8R????5fx??z??7'~?o;?z;?????M??M5???e?m?x?[?]??Vs?+????	???????MO?;??????
?_???o6?8}
???
??Nj
b?v???
L?X??D??
?&??6@?Q??
?h?%x????f???F?z?? ruDa|?y??A???RC?dcMt5?:?p??X???qw??	???GZL?????=?	?????K??D??]z?X???9 ??j-?GUzn???hb?c?gil?2?nw??+l???(nP???*I???S?Q?c?U???F?0
???w@??~| ?WA?o~ ??=8??o?)D!??A
n?c?p??6??ZeG>?[???V;???;??????
H>??K??:??.\?????????q+1?WN?,???9h<V?6??fY??????D???w8?????I%ow??????_5NU at q_Ex?#?%?z???Mb?|?T??d-??N??4?<?(O??@????%JP?)T?2l???'Yy???*???e+{?????????.?i?\SC?T&??i?W????wNgn??m?,?????h??4RP??6#???x??W&?6?-f?#?K?!W"????????|?;??t?d?-?sN%??rJDW?f??	1no??Q:G'*7?N?U??h?<?DOzH?X%?????&?
bjZ:PI?`?j?~?? ???l??E?%?2?T??j(AU????3?:
?FY?Dj?FoT?????8?DgT??:?????"??Jc?I???(R?Nq?`SChP???^?(y??'!????????c<?u????sC?[	?O???=e?g?n7??|?#N?
5F?'X	?$N5??????;?<?????6mt????P???mX4?u@???R?`\r?????s??W?0k?ok?U?,A?;?z?`?s?i\???Sa??a??7)6QR?-^??/????U????;E??6^V??Ew??????-f?????W??~'??RG?3aMg?Z?>!	HB?rZ??q???h<?????Xjk???X???c?Y'r?X?bVC??b??Y???7??{2?9c???????'c?
e??L?}??6???C??iZO?`??v??????Z?ZTv?1oG`???r???8??S?????m.J??????
IJ?c??nm?V??	TeC?:?.b??U(Y/t???Z????|?????fF?,?rIX`???!?j???????_???t???c?3????y?Q?h???Jl?????9?x??F;?S]???U}js????t{?^cZ?n??e?hY?Z?u?io???[????V????r#??1.j??e?gu???{?0\i?@?zB2m?*j?u:??v??????kr69?????Y?5?bV??[????_?88Y??jo??M?li?V??F6?X???9?h???t?????]???f???rr???[????@=???]u?
%????r???3??i0????]?W?sk?=??3?\?.???ky??4]????*??qW?whU?*_??C?^qq?????|????O7?qt??w(?H??+?:?E??/?^?T?????????y7??????????E??#)=1?'??>?????w??;??P7?l??t??6??8?U?I?6??|??i??M??y@VU??uSq?r??o?FG:?-?76?W*.?T???,?vGV/?hC<x4yE*lw???v9q?G?}?'?}tT?rD&?\??????Wo?;m4??bQpc}?%Y?%ws?`4?y???
xR!xc[?1??Oz>uE1EkY4wa?EE??d??y?6?gn?Gw0??t??uWHx(???g????{CVy1<??m?6_?#`Q?e{XjH?:??&?a?'???;?U7?};?sJ?W?EuZ???^??? ?6?????P????zOrRgqt]?|??0???S?@?p/?6?6p?8b6("?5??HD?x?t??????gn??
?"??+@???`?wm??S??8??U??k?j3H_??rC?~?U??(fW?dA?~w(Wv9fjdE???h?Us7^?W	GLs?????rb5*??)Y???j??ry???8YZ#?GK?g7?X?+ya?P
kHZB?5xl???,??"i???fu??}UY-?V???F#w??x.tHs?(?&?V?;?Q[?Vw??Z4v^a??G???V
?TW??J??W???????????????
??*??1?MP1G?#O& B?L?Z?\P?J??Z??????????????????J??:??$?j????????????:??j?????Z????J??????j?????
?J??z????
??z???????]??
???????????+?{??J??z??????z?;?	??Z?K ???k?????L??????8;???:????J????(??/??@???G??/???E??????B??3?????:;?<??CK?W{?
????
?e??V??????
?k??O??j???o??T???:?9??V+?x??[+?&+???]?BPB?V?????????????????+??K??k???????????'=?"
W!ZG?????V???k??r????W???K?f??+??{??6xM???K1?%??????
?"?a???????%Z?;??:???????????K1??#??W
????????;?OpP???#
????K??????P`H??'???+??<?L1P????Z???+????P??!,?%L?L?Cx
?????????;x??#S ?B at x????????K?
??O??),????????????????O
????d?B???l????????
!??A'?P?+?pC91DA4?CG<Q?KlqEY?1Fa??Eg?Q?k?qGy?Q="??????????Ho
??~|??7?|???|
T????`*zP???`(CM!T???h('8!?f??%G?!r???
????k(

u?R??6
iP
??](B?!?o4???e?76z??~???
?????@??
U4?U?78Q
?=???@???vt?????K???T?)%?JOz?[?w?0?){???w@???vO?{m?6U?N?v4  ?H???5?!? wiS?? 
???D?;?I
????
Q????'
?????3?o1?????)"
?X?@
?C4??y?
$
?p????o???????s8)????1

????NX.$???????????B1b)??#?$?MD?Lh?????z?"`>
p??y?M0o5?0?
KY?}9N??xKH?X??q???J???"pt?K???
???O???&s?QX?OPO?
VX'L?P?1R0?<0W???<
??)?N???
?t?n?2?h?Ik??^?ZH?%??:
0k??e
@?R8??V?_?r???R?_
$??4?%??K'?w?u?????,???9?8??9?t#?5???e?`?5Z]CMW_?O ??
@?????????4B??34??
?????U5?]?|L)l<??S_???c????c??	]???m?????????????>u???????>????uFe?*r??????MI U????,??`??P???
x???F???'?=???V??\???<?a'<??????\%?
H?????v?????F?a9Z?????
???S&1????g.???L?4???`.Y?
??22'=?([??????En|??rF?
??6???-3???????/?Q
.e?2????t_?%Q?h##?nD?
??]??d.???V???D??S???c?a??&???7?dg????4?a??H4
?L?X?=n??!??\d-b??.??AZ??k\T??A7P???H%z?<j0s?-?UE????/;FV?)???X?V
?9?-??,???vM_???????P?%?Z?????Kc
,c?z?
?1???Q?rJ?JV?0&qqS?#ay??]rc*?????gY^????q?;P?J???/?????[?q??X????P4????9?w?r?????????p??~???,???;=?M?:??.??i??C?,?x????-X??B?J?L?p?X
??????PV`&R?XS?P?<?8M	9U?f?[^ ??????O?C
?1??? [??T?~#?hIy??????{???????Hz???%di"?ij?;???????Z???,i?4???2?#;>???&?`#?P?????u?NF$\?E[Ec3???c7??F<c6=?eU??YwR????8 at ha/???h?9?B/x???
F
?s??<??d?3?%???}S?S??|?M?XNJ?Q?%P?????????k??
???7??>?Z?Y???x?0\N???.D???????]?md?k??>$?=?Zt?zJ?<?Wn?D??3?????????.2?ki??"=<?.4@?vb??p.g1?`???6??????????]??????$M?-???9?=M(???	g0d??????"c?p#>^Gqfjt?????)?B&?????X???????a:???H??H??j??*^?^4?
=???]???[??A?>0? R???FWhJ?????4C??y?;?I??H??????8M?
T
???I???'b???C??????|(W|4?<<MqC?MN???Q?E??@0C@C??Pr??????	???J????9C=t	???
5?J?l??S6d??????/?C??M?]?
??4?o?8b???>??i?Y???`?G? ?<?&0?]$
*&h
Vb-f@?q????fi?qJg??K6?6]C7u]@
Y??)eV??G=?????!??????S?H?(?iUCR	C?y?Bb?<
u??h?>??>]?Gz?/??n
3???e5?Q=?'{=%?>??yP)?=|??q????????????L????K??V/???P??)?x?E??Q??`?E7?Y??|???? ?da?N?o?\n??S
?IA??????SE??F-A1?d
j=????h
0?;???`?GK??s3?Q?R?
?TG?
?



#??5?K]???3????#Tw>????G??w??Q??;?x????\8??????][?j???PI?s????.AL??.?A???b??9??
+??|?zn???e?K
??j{??&???A?M???_z???Tf?????	?O^L}?O?F????[??????\}+k?yl???u]:??eKSg/5????O6y?d[?k=????B?????????Pu?????3hY?7?P/?>q?nvk?U??b?u??????}???????fz??_?x?????+?P??? %?	Jx?,???1?i? ??Tr??!?%T?=~?!n$@ ????!

lu??????DaT?*?0?%?A*??,?????d$?h???)m???`??#V?i?42?T??W|?
?P?????Im?F5|R
DJI
N????c????Qj@?hk????mu?,L??=??4=?4?^??T>f?"???W????+[??cdU<a?????A!?x??~?/?wMa?=??_?5P??R??2???'j?8?T????p????1?'???'??????W??IS[???6c???^?Y??d5;??0@m?????V?0????W?^8C????2??
fT?C???x?
od?;??G6?&#??QG?[?G?*?M??5{????k???f

?#?b
#?Vz???t??????D{????m??9?????p?S-m??V??B?1??a???6????#JLy)[gB???i!\i???
$_LIO
?F?????U??gR8?V.?7QHMs????B"?X?Lz?
??:???? ??g?
?wf?  d
??????c??8???0	+???r.??
g 
?H??|R?8p????;??zR???m??????j??#?0c5^q9bg??N^???V???N#???]<?8bG???@?p?9x+????a-~?????i^?C??"?"i??-A?`j?0??B?MQlPoF??d
i??"?D?Jr
??b?(????

??|0)??,0

?tD
?d
@??t?n??
???M?K]?X??????"?n?#Z?
mJ?$f"???K??-??^b???-?"z-?. ???5z?????K_?C?
?t???H?_;????<????E{???]???
V?S^A?<B?8?????hy??xY??:i??W*c??c$???iA?%??????8??3????e?_?Q?????????x20CM?? ?XXB(?f??
\??	??????`s???K??+????????E{?eb[?????iO?|0
??-???????)?>B?4
+-p?]???\??P?#}???#t6???
}???C;???????T6|?J|?Z???A?z?K?=??
F??sf??v?'?GE?]???B??W_>???Q.Pv???b%???u???V????S??????;?L|?i:?;???/&?Z?? ?C????K?????
?j?
	??R?X?????Lb?c?3??Y6?	s^y???i?
7X????o{9g??????t???g~???Yt?=??ki????1??????????'?????'uw?G?????]u???gh?Mj??.
Xh???jn?^???????\???~???&???y
5?
x??&???C?%j?I?)??F????v?-}?Z?????k??????????.z????????k?]?{???????{??]x??[?x????????????????kir??(p?Z????a??
?f??F????j?j???|????W?~{??t?&\o????
?H?6&?`?H ?C?j?6S[V?{?e????v+?
z)\?
'??am?u???.??<1X6U
!8????g,??.85?
{K??V$6?U?}
T??&????=?? 
?s0G=???o?A?e??7\?x?<@q?S????Dh?3????,N'&?
??:lYqF????w??\? Y??u-;????V?-&?v?_?RI??lo k???(??i?=?????@:??nX??"shG?Koh??
?FJx???{? (
?"+@??????#<j??d-	?+??/??%w)*???g?+[???q.~?;?_????r3<???B?<?????2??v?k2?\???	?\f????g?#9?y???J?g????5q?9???e9OJ&w?
"2i????\??:1'P??.?/??7u?>N
R????8???'?U?8Y?g??@??????#LqB??a;??P1??>?(.???Z??Z?g\R?:?qm?"&W%Qv?K?
5b??Y2????]?&)????x?r^5+.?1?????*?ROcQ?R,a,e?
u???F?8Z???l!???????s????M?????4?a?Y???
?Y
??
[??G1 ??~?A]M.r????D?oI?d?q?3?e4?5?Y???g(?8W??[?k<?????U??????*K?Q?O?*jt8?A??????f?zE?R?P?u?FQ9?B??q?c??<??T=t???8
8?M8?????Bc?Sf?
MpN??P?j???:???M0???#???|??8??zE?????????i?"?
???
??Yb??<?N??????,?P2??4?O????Jw?I?1m?d 
??fF??-?T??_?Ur?\?G??t?s?q??SV??s"?N;[??_??_?X?????f?GL?q?^??`+V???^??K!?SS!?b?eS???F3l??%?r?3_z?]???%????r?z??0ce?2?	???JNHK??o????;?Z6?u???l?F?udlX?{?O#qU??k?/C???r?0?J?k"?v?#=????????!???H?p???.&?-?M.????d???bv??a???
?????6~m????
?????h;7|B?e?5+?9?2Cz?If??a9??!x9?I????i2???T?2???O?s0??lx?3??V?x??q?"4??IX,???M??h?????ss?c&Z????Mi?r3.4Z

l??x0v?"c$?x?d??YN?tAD??P?,Y?Uw?E6?F?4????G??>?6????_???_?^f?q"?z??e???????{?S??9^?n??Zd}?gjW>??i:?E??O?`G??????-??M??S:P'?x5??c?S?g?}g}qZf|??WG????%z?_?q5??!??{???[6
u?d??rW???U???^?*?f(?&E??'CT?*????#[)t]<?????t?tl?I?}???+????
N??a?y~?Y??EO??\???Hu|?d(???_<&:?7????H?8D???t??-?q???????au??,?R?y??;K?S??K??T?2?TUU?5?}?8????????I?KJ?x???bK??`?O??Zp??????m?????o?9uIh??f?w??J???YdN???-Y[???t?\??r??P????Z?y?+-'??"?cD??E5E/?5Tx?-HW?Z^????F??Y_??
7?s?G??{???LsM??.?}??????i4??J??g??????'?u?u??SM???(?D[??b1?????????9????)???Sp???9
?h??F??<??	????
??????Vl????:;?[?<G?{???Y?F?????SSp?c??S
?B??0??=?????_n??8u?lg??6s(?O?dK{???&%Q?iN8I??0???6z?=f?????zVX???F??im;d??^??;=???:;c?*?R?NQk2??????&{m!D??!??a<?
????9?/"??Z
I??nZ~?Ya)??)dX???x??q3?????+?V=??=pY???f7kb%G??????ham??t?g?{?b?N?h???z??G?~!x?????K???????D?????h???8}|?&???????n?(??e??????Qb??*???????n??*??<l???rh??I% +??
?,?!???XQv???bFw:?????G????~k%?(Z?w?fQ????k???'?|2?&?i???*???hG[?<????Qh??y?????(?sf?A??????????????krT??Z?KH?i????
j?????'????
??<y1????T???????k?8??z?^j??dfi
<}?,~?VK?i??:?R??<A?'??(?h+7????Qzy-%??w7i?u?%l?
fs4?
???????????	? Uu%l(??kv?????h?H??X?????|??|T{???????m?lj;;k??l?F5Wvo?t?<?&??;=????W?????/?xcP?l9????D????5??R^??}??	?D?'$\II8?\%=KImd???H??],?)???C?U7???l}??????5-o???)???[?J?3?R?}???????&P?t??+L?]?]m??
??????????{1$????Y?,????Y\?Y???:)7??i?E??M???????u3|???0?*e??v?X?W?y??q?>??iN??i?nI????4??Dw???W?f?8FQf#??=??????????G
3??>U????p??????u Gp0?J0
?H?q????1R<X??H? 7???Q???#YT?R?B?/[zDY??M?6E???h??3C?x2fN?Fk
Lj??J?A???y????K?
]?)X?1/f?y????kQ??????lu?mK???t????7?V?	???3)a??????Xk??v???????S?tr?I??? ?????#I.??ZU?l??m???[?n??}?\???P???$$??	???r????g;:?8Z??&?!ByRQ??'??wT^?!????cW?y???o?H:???????N???`??5?:BN?? rO?'?;)=?\9?

@?(??9$?S?J??????	(?ZqE??k?W?;)f?.Gu??F'R???qtB?yT?8%?rGi42?%u???
?P/?$??	W+??)?TrF???0?<R?$?{3N7?t??)U;	E??8??4PA?OBE4QEe?QGe?o 	jm??B?4?5??>?*%?A
#??Q??&?l?5;m??f?m???:??c?%?^?
#?3E*?P??'??"?$?@????Lm?$????)V?"?:,Z?	#?b?????	#??	)n?????????\?#D???.H7?8?????G???	???0??`??$7??H<??s??o,HO.?{B	P?;??	??B???0b
r?3????'??E??? ???,????2?
?c ???8`)X
M?@T?!??=?@(??? a??|????"??$?w?) ?0?F??`	?f????l??{??W$??Nos%??P/<	(??
# Z?u">??`
???$?????|?????xL??????d???Y??q
??X?Z?????M??	???????9T?K?\?????p????D?5????A?"??,e)I?!??????????????????????	??? ??????V????y????k???????|j?\???
??D???L
Py????A?Y?????K??????PI?
8?i???
???Si?
??o)Q?\?^
?[??H?<P????????L?R=P??[?E?TN_?N?dR[k?'??(}?\?P)?R?N???@???????-
?_??,U????5u?7??8??9-?3?A;??<???Mg????@?A?B%?C5?DE?EU?Fe?Gu?H??I??J??K??L??M??N??O???P?Q?R%?S5?TE?UU?Ve?Wu?X??Y??Z??[?UImOd1??L-???`%?a5?bE?cU?de?eu?f??g??h??i??j??k??l??m??n?o?p%?q5?rE?sU?te?uu?v??w??x??y??z??{??|%?????????%??5??E????2??I? ?#m?????????X???????Y?????%??5??-??EY?U??????Y?????????????????Y??????%Z?5??=??E???U??M??eZ?u????????????K?p3?#?/?+[???5??-??%??E[?}[?U[?????????????????[??[??[???
??5??-??%??E\?}\?U\?????????????????\??\??\???
??5??-??%??E]?}]?U]?????????<?=a????`#?????k???-???e??u??????????????????????????????%??5??E??U??e??u???????????????-???-?j?J?"tL#??%#ra???S?f?v?????	??
??????
??????&?6?F?V?f?v????????a??ajJj??4bP??&??>4=??/J?%f?&v?'?bb??0?)??+??,??-??.??/?0?1&?26c,??+?3>c<Jc6??8??9??:??;??<??=??9vc#?k?4???????&)?@Im
?c?c'FH#B?e?JU.?X"3=?e?????dZ?0?I?dO??N^?^??@N???>f?'^e;^?x6?nfJ??Nn?)vA???h??????J at V`p???e??en??'F?I^?U?em^bz??????el?]?hi???nbmB?c6ii???Nibz????0ziUfig?i?NisV?,F0?=0bhm6?pn??fg@???B???n???d???&m?0?????j-.H/?j1??
??D??D???:?m????/?u!?Q??nh??$?#?L?n??[?>??\?d??e???>???iH?4?????%^?3?ft?h?ezN?Q~#???fk????j??????f???r?g?l?L#Ae@?fl?e?l??b?T?d?H?4j?N????&??6??F??V???mb.e?^??n??i?&&?~l#zd?????"??H?V??v??>hrVb?Vb?g??\?d???g??e????V??N???b??#dnbl??)?k#???n?vek???~f??????^?X??]Z???5^?????????'q?p???Gq?f??vqopk??g???i(??$?#???????n&? r#/r!O?#Wr$w?&?r&??%??'?r+??(??+ob??????
`?+%bO?"@???wx?{hx?yh?9wup?;Wxh?t??tx???suxA'?</tu at t@?sxP?Fx?j?sipJW?h??K??L??x?tL??h?ti?D7?MGtRWR??:??G?u8??Y?sk??	?H?uYw]?u[?t`?y??[?tkp?	??`G?H?t?kv\????=hgveG????=k?j?1????qg?r??n`j_?[????w?={V?nhwv?h??	S`??<z
???Ga???$J??Kq???[W(???????o???6?2?	????7?j???o???f???M??q????o?9?

????O?n?Z8?????
??,??r?".?????>???[??,?'p?s???K???`??:dhQ?:h??e?6~#????4????????_>?y'w?|????	?_I>HA8S}
&w??????YJ)??R?*?$??)??b?????
????
*?j?
+?z?*8?l?8???)???s?????8??F????vk8??Z????+:??L9?v
?C9?F?4??6?|4?4Xi{!??n3
7?83?4
e?SNu?.????.???;?C?4?4?\3?6??+/??T3Q?8??6?8E
6Q?"M
<???P???`?%?]v???f?	??%?\'?nb?2?|????????'??Y?(??h??6??)?4?s??b?i??v*?7?2?t???"j????n??:+????+9????????????M??D???
A$?B?DcM4?,?5}W?????m???0???K??s?05??k???[?!.????3??;3?W3:I??????????"!po?_>;???~;?????=b?M?C
?$J:????h??;@?%?^f?q?b?\&?l?%?$??Y&?uZ?f*:???(???(???~??#J???
}
????
???
?<UTHMj?`?jVcppbU?j?l????H????9?16Z?bl?q5???M:??;B?h4c!-l????f?f??h?<?QC?9)y??}(?j?cZ??E7???y???
???}?#E)H!?B??~????r???
????4L???, kV??	vm7?qp???j??E<d??V????7???>o?????x?p5?z?F???????????k<??r?!@?(?????5?}A?m??
?
R???? ??O6??*??????~?zk?$E)_?S?
`?Nc??f??XeQU]MU????f?X
???i,?f?n
???
?8Y8N??-???;>+?w4????F=v?7?Vq?
??=?????a????\40k8`
????S?rM?????05
#(??P?%?L???Bh?
??&?
SdJ????03?@p?
????^'_)5|,?9y??2???]u??C?jX/?Q???:S??"b V??ZZ??*????)??%(;???qO[]??Ra
???? ??KR??AE?3?J???v???????????Z?	?X?????w??&??k?9?I?l
 ?g???'?#??w,??????????I)g??G?D??^-_)??????$??-n????
??)???Q^|?C?^#a\?MG0?
,t??????
?%????5??{?5?????*??%???????#
?IIx?[R9?4h?5H?B
???@",?"T$?
?T
h?
?!
?
@?@?9?y?g-?
?-4Cq'??
??+\\
'?d???+
?["&b9?[8?!
??0??4P',?<4C???????5X5?C\??p???N?m??
?????z3*?I???,??@`???xkgr?x?
?/*kp?Ds?&P
????F?0????&b??a??J9?? l??+,?C,???z[
l???+???!G8?,?D?:???r??
?3?C4?7???????x??P?B?Bu?RC?>??3???HC\?4??P?/dC??4?C????
??Di?)?R?Q_??????4??0?8?W?3T2??5Dvsu??2???X/95??-]`?????6\??X4??????"?????????MLWu??!E?G?_	C???,G??O??LW????????MAE?l?<?&0?X??"%$D?h`T??&??XB$`?%`?"?@s/
?@#?:???(??qOB???)/n@)?sr?)?z[?b??*?(?u?U(??U??.?7???BA????@?B&`$
9????K/?,T4DplU?l??pk9?p???uli
;?P9?<l?i
?@?4?}l?53dC/(r6<????&?????$????"???f
??Ax??Z???=x???cV?Z???Y;{?Z???n?Fm
?:?q?O?<1\4u!??C?
r"8>????,S(%j?q?.
\8?
PN?!??A4
KRq!?<?4???
)??O??$?R	C
P?$9?L%?TH???RBO9C?*?RF????oNiq?
?? ?q??8?a0?rF?EqPaS2
T`1?N???n??6\
?kMQzF:???[?B"???!?f<????3.bi?C]???
?
L,"???D'>Q??B?-?!????m????x0pQ\
?p??4q?S???"h

?aQ at gk
@?d??????H???;=?`?kiI?????<???N at Bi?Q?0?^?*?j???(.??U?B??Z*VQ????? ??X1
U????*LAqV???G?YQ_???%oQ(Z?
?np:??????
D
??
?p??E_z??Q?+E?J?p??????]?-?::n??h?????F:v'??????F3la?hH?3??5?????&??Fa?R
?#a??3???????X?V?q
{8#2/?I6|???O???G7???????? ?W??n??n??~?3???\?? =7???????3??x?;S?p?[_??f??7?
_??:?
?????e??/|/4__x???F??nz?t#???6"??z8c?.36??6??b!??t???b1????????l????????M? 	=R??v???$
?=?+i????&a????Ra?+kH?V!@
Da?PaHAi??kp)BBA?(??XApZ?MAZ?DD????
???????F?)
06??e(??|A'?A????zO2?"?
??|??!??
???_
H???1?????j??5$?&?A???.c$????t??a?rO?Jqp!??_??H?h??????to?$??:???h??????1?q????????2?m?6??6t?7|-??A$?h*A,a?"A"/R?:?R???AFR??B?;??&??R?%??>!!>BAB?>@?l@!??>ABaB?j??Qa)i??????????E???p?
c????+?RP
El-=p?D?.??F??jd??gA?p???
0s0o??ZL???v??N??~j?w??~???zA??2??2???N$ ????0???Bh?????
?|?<+?A??6eS)H?,?!????B2?"-??+J?)~?,
0???1??ra8kO??O5?Q??/8DO?E??8q-$6?o1?
???5T??@??A??7??s5?s???|?a?O??????w-?c$
?B?+9?HiN?8A	????,?T-??H<d????p?P?Hda
I?/?2L??-??^?t?r/?n??.0	0???
??S5CWCV?3Q
??????1??XA"?Z???!k?>???52F"?`4m???V??D?S?V?Y?3?
5??BU??a???,#?:c?????"_P_u?_?q_?5?`
?_?_?`?`?`6ava	vb???b#???6?H??7&r?,??47#V~?)"?, at j(X?A?1cV#
?X?U????????S??f? ?7? 	?m?!/c?O???~??????y?z9?Yg?3???
??yv?9?7?e????
Za???'??_y????hi}x?????9^Y8lC??[#?Iz%-?|:m-??m'?????vv?z?Q?Z?????????#?}#??9'??}E?y?:??z??Y6$? ?7?` ?	Z???????r???VAC?}!??"3&B<]?????9?1?????3?ArA&S???x??m???{8qh?)?
5??????"???
??=/??]?v?cx??y?k?b?34???gW?k?{??????!?;??m?w?w5?mA????!?a?O????}:??{??;'???????;'?b5??2?;???5????;?}z?I?????;??;?\????
\?????;??????<??
\??{?????????%|??;???`?,??W{U<?Y?{W??[????5?96??|k?	???8#?eY<?Q?c9f?
????"?/????o)2/??Q?xA?<?5??3?????kya?M?Y?????\?@???x?Zh
????*?QNq5?]Y???!H?69)??%v?)v1l??w????????[j?????Y?K???_??y???!?3bc???,??[??&c????[_]?c??h]?Y?g=?a]?k}???????a????????{??y=?sb?c]?????=?}}??=?%???]????}}??]??}?e??????=?????????????}??[??????/?
?????X???	????4b?5???2	? ?g9??!
???lQ?2??5k???j?*?)??d?????W?k????z????*???6l?mn??M[Q?5?rV?vx??
H?L/??sb5?4c?<??s
???Feo?l??????K,?U????]R?y?N???8?
??qdP??d?b?P?dS???6s?M=@?5?@?
`?6?x?M.?????Dd7????3?X??
?`

&`%?E7???kTCL!?????nd#?lsF5??
 ??h?W?????nV?+k????U??????O??]??G??|p???"?k1?Q??]b?<:6o?O???>gI?h?`???$%???Pn2?|$)O?Iu??+???(S	??1K{?:?`$?

@G?F?R?7z?#
Q?.?*?6??H?2??!k[x?Vh?U?e????z?u?j????]?ZW??U???$??????+??<&??:?5?z????X?B?????d5I?QJC_?f?"v??p?O????Q????!???5b??d?O
??qa^xc??I????????`L8??8?z???1}0p?X?5g&}L?'?-?*??2?4m?=|q]?V?O
	/?v
_?B???CU
{?)h???u??
V??n)?Z4?
`L???\Wx??
?
?rap.?i??N?B?b???w?+7?z????D?`??9???!`??I??V??<????%???2???+??7W?~?V?zd???U?Tf+e
?b&[??X????z?m^?`?;H?:??$8,	O8??N4??`,?NqU????y????hR?????Nr???0??[`??!??7????d@c?/W??p??<?5?A??^&?ZE?
?lx?Q??b?\?02?!????-r??
cw? \?^?U??Y????3?????PFC?2???
9????e<??y/????5??S???qY?????q-???????$23?*?@??dk.z???????!?8?N?&???C?7??p?K<?G?e??T5|??7???q?W|/xY?3?x[$???j){?n??@4OP?!d???\?9???q>???\?`)?37??4?hDon??\??$T??5z???:????a???Q??HQ????????77(
????2{6??y#???B?J???2?p???^?yD?!?({f??(2??0????"_F2^?I???r?8c5?
?P?45??
.v?~myd??nH??~	X??9]V??X?f??ij?;???7?????s9?K7?;+??6	?????dMXq?"Fi?l?0?+?;@??A????E[?&??8??$????5f2
?#T'?`*
*0%???'?t?
???

?f?;????<z?)Q???$?R?a??"???r??-x;???????.???!:?K}]????+y?????=?g????k??k?U??.F>??????'2/|6jZ?W&???
od?????[??e?Yu??x???????^w?Q#
o????5?$?E????.l?2??F?D?????1
<*?
???
????l?11????;?????^H?0???`????o
?????@???h?????????;k?B?H????? ?0?	Ey??X?i?/???l??nk????
Y????b???????l8 ??:?6D????\R5?-H??v?>???c?Z&?b???????c???]???K??7
??^?????l ?2?9? Cm??1>????????? ?c?i??????(????*^???p????fx?2<I{?4??????a?3?8???
M?
???:
o??q???????0??????@?
???4?????(???m?m?<{??????C?f|>?F????f35?>???????qOr?^??9&W????K???E\????gFC?????l?????,?FZ/?k.??????FE"G?KpT??????RC????i??b?????=}????7???`???K??????6???v??A@?Q@??9??G?P????????
?0	
??????e
??
??????????qlP???????
???I?z??
??!f?6??L+e?O?^c??Hz?kk?v????&I
ER???54A?)ZhR?????.?h?????Q5)????7M??m_?P=?u>?%1&????D5uK(15ZDF?AK??M???]?o#???Q:?? 1M>?S??^?$??m<!@?Y?
38???Z???
?
@"???z
lx?i??sY??????B?????????k`??!`h?qi!r??V???`???%???
???Os???l??Xi8?*l???????2C+??h????O ?? ?I?4???x"R??????
??;????(????R??0?????	????Q?+?,Wj-???i??o?}???1
#X??lTg????m??
??J??t_??6?
E?$K3	MX
_?8?b??a?-]?U????^jD?y?	?fi&/????j????????S?e0??x????%|???UL??DW????MS??f???
)Z??{????o??7?CA?Cm?D}?x???0?H?@?
??bz??
N??????Q?!?
^?v??i?
`?d)?$H?Y?f
g?0??wp???R?U?bz?X???[r?*F<?z'sp?
?[??6+,R??(?M??%}.?;4???|??J??n???^M'?L0?Z?[??U?d`?.?????D6??[?@?yTRK?	?i??f5
??UJL
??R?
O???c????i??5?3????0S?3? *?4

C?"?25?n??????
?5????V??NZ???UMjI???w??????????u??(???e?)?P?fQ???5)?????????H?@-??z??(&?'5?2v??U-? ?J?h3??l?K	????a8?F??$?H0????F??4N???gC?R$~meSQP"?1??)LQ%8U?D	?L?%<z?I???/??.B?G?!??$'??A?@X^c?n@)??Q???Oq#Z???4?
-?
&???>?????.
?Av??>??`F?
?v9O]??7?Zi8c
???????pN???????K~y[?`?cP??Pwy-?]Df????Q@A
W?\B???X???????s0????q??_?/(?A??7?]??C/xj<?5?C/8C5T?31?,?2-Ch???P ]?]l5?????Qp??0?_\?{P????	??R???/??8C?dZ8?e?r0????i??@8??|?= 
c?idC??B7????4??3e?3???,,?????S}F?f??4h^b??aY???V0????HfD?D!hl?I?6b#nG6

????lT??#??c}T??
???K???=??]??V-?SD?W?e?XA?`?E?=DA?E?X?K??jlE???LLX??????<?5I3?68?!?Y??4DV7???|d?B~??f?e ZC4?VLs? gT??}?m9?/??]L?0N?t??8C????7??]??}??I?\h?eP?Y%9l????b?X?? IY?Eh???????|b?0?]???e\??b?k`Jb

?#??_3"Mf??;??=-?4
??y??$_???dN?UxV???)A??I?
????e??ej?K????|E?aDS
??Xl?0????E?YK5T????~?N??????A?
??x?FL? d?
???8???go\??e^s????x??3??k<aM?/T?1??h????B?EA?????3?(BN?5?/????!6??C ?@??5??s??u??.?Jr???tgH?	B)?`?\)?y?X?L?-?@
?3?6?]?4^?&y??Ydl?`?}??
6??r?#??M?b7j?s??wTL?d?V???H??M??????5xC?9C=TC=L?f??q????N?t?h? CNC=F=?!Am?-l??q??*?1!?>???,Cl9K??	?XZ/P?$W5<GVd??PC?M?P??7t?4YZ?I?l?.,??{ML????????E??
??1
????????<G????5J??p?/p?d5,?60??
?4??
kLFe?Ja8?4
?4??5?`?(???ae|?X?g4G7?yR??-??$V ?Qr??JkES???.-?$@??=??{f?J??f?-??L????B???#t?cjV	
sF???.H?>????5XN?@#
?,?6,?T?4?+5?U

?p3????C-?w

7?5?.
/@?7p0? ????K?
;?????n?Ji?`?5pa,???:???7v?????????=zs????i??F.??
?`.{??W??q?5Q?7?2,?&U???
?!??i???5???d
?<??^ol??V_;B0??>_x1}?0?!??M#Y???}?1?_(??d??????r#=??0
??a??????b??????7?OW?%?c}????+?????Nt???????Z?;??6f???e???Q??y??????\?.?# ??R???*1Y7j:???3??p?H?Su?+e??yL}7G???z??\??(?T???8??K?????o?????zS0????"??E?DR?
<?3m<?i'0???b
N???0??d<
?)yr?S?P??L?@;?W)????????????<??>?Ld!y?:?q?}??&;??;?r???????R?2???? sY?`????

??
eo ???(@?8????
?l??6.????
??
??"m??)W??y ???oH??.u??XMG6p?8,r?k??)?g??)}MHz0?`??????JI+$?"??f???L$mk?i??M#?????t?K??/u?????????p'M)>?P??m????C?????????
?`(n0
?
?
cI?Q?cz?G?&?2???$?01?T4)?t?d?x?vnN*??	?C?(?@*H?????<
??S?????[7???rD???|?^?/?U???n$?)??pV??qT??T?k?hG??Sm?OIM??V?fg?Gi??*W????C????6?@1DgD>LL>.O??????m?P???	?,7????AN5)?
c??
wI?5\
?K??A?????zs'?????5'	??7??g??A??
??8??0??QMN;?'?????????W????;1?M;
?c??m;???e;?]?????D???????5??'I?q???????1G+?A?
???Q-??&?c?l?8?\???er??m?????????Y
2???t?H$????v0?;??$????l	?s??K/c?RKg???.?(vI???v?qDn????M?s??v?&?????q?????6`?5?f????L??Qo?5?_\????E1????}N?%3?K3-`?I'?u?/Z??f2G?[??r?/??m????????M???(?\???%w?O;??F8?*?m?2?<????H?????~??8u???{??4?M?n?x????mr??r?7?p?_?|^zG??^?????4c%??s?????????)??x!?|??G?<??+/???c?}???=??;O???oo~????????~??W??t????????'Z???
k??????Yi??L??????^?yW^&h?e.t????f??
._y??W??G???????m?Mp??W?V?0??/?	`??$"v?&?\k???T
?O?????%aM>K?
???)R??X?????.??????(?.m???VnxD???l?*????Bo?????v4?P?G??|? ?n6???2???p??$Wr?eE??nk????????P?d'#?%8>v??]???'$
w????xF?mP8{[jZ??KL?????#OC???9?????9oI?C?DR/m??`??_1?%Kv?n??b?d?DD??a
1??????}F??,%k??6????????b??E??J_,]???\?k	????????rq??2??'Gqt??'ChH??G???J"?E??t?DS3???L9c??~?I&U?????1?	???rr?,?PISS@?qxG*(0?????p?kA???K???^\?n???f??????L?C??R`0???????2d??? ?z??????D??????????l?-??B
?AZQ^5UHv??
???t?Xq???4??????????'N??<?{b+_9?
lj?e?-YvL???aY??????
n???-?LI????g*??????u????G^L?	-'
???#?K?LEb?,???!??N?ccQ??plQ???;1?H?7?EZr?5???S????A?SU???r?tjZ??bo?T[`ut???:?L?k????6?q??Z?rO/i????Fju?&???????Q?R?????/)?6??:?d????0#a>???*<{??G? ?G|G????C???i???????(???m???u0?????Y???nX&J$????$??zR?N??????{??n???1(??X??W??????????<Z??*u?6?G+?????Un7?h?2X?;?5?????:8?U??g?-?e?z???/rs?Y?o??9]??W?0N????????'??qI???|5??9??*N?z?"7YJ?N?*???????7j???????:?%#???YPN?q??-??
m?????Vmn?G=??T??R'??g???c?w7???5???$1???u?U?}?`??
?7w!?r?#z???na?}j
????]??
y?0;4?{???e,????F!.?~{~???1lk???V?[?<?Y????Dy??n?y?kY????????,n?by??4E!Z??D?????w????)??K`?Dk?k???#? ?}?B??]??????????????o[?ey\?vJW\??5????C?Y??4???Zn?yt???\??Y??????6???????????????9??V??n
??????W?{j1|y9????l?)?k???h???????????7?f???t#??B??k??{3ai?~?71???CF<Z?Gld?[P?#??ToZ?n??p?1mhs??z(s(?rLvw4GXb~gWlH?I#?Bv~L????q?'??e?&i?1??H(@?&g??n?T??Q???m>We??a??M?3li?F??|??%J?R?S9K$?V??X?}?w??"Fkn???7f???TA?U??%??w[??y1?p?W$?1???%'?j??H?'/d????_V6pp?R
e%m
z]?Q?V6??q?
?4???sHz?{?I`p???n?&???a+?~??z?1e??w?x??	???1???????Q????g??Qb'Zj?$G?w?y?O?7i???s*z?3v	wY?&3?)??????????5?6.E?X:???\?i_Y%?
o??K?QVtQ??~?g?i?JQ?
J????j?????]TY?7????t?????I	P'4y???r?t?H? rE?+??(YpD?S????v?@?U?3???FVy????p???D?????Zz???z??0gb?&Q???NE?5?Y>x#fY???%P&7?y?B???xX??o?????M??4cx<?H?Z~'d?b~??t??????Lru??u?D?g?b??(?-??Z?IE???/%z6?63?j?yD:???R?f?X[?2i?!m????umvy??u?r h??Et|'?P??m???M?fv?J???6??3?j????)ztkFY???7?R3z??i????	?9&?W?fzVVq"???9:c{	?1hG%}???=7?4?r
6?#W?Dv??? ?tC??2?y{(?8?6s?Q??E?|?H??XhJ???
{?????l????BlZ??
?U????P?????T ??CT????@w?????)???????ehqk?&(:?????y?Q??
?69????Ed??v~?jI?'/????n??LY5??U=???????Z??8a????S???ub?%??m?U?`,0??H?Z?
??8??H?kt??kh?N{?y??+?t6?#???????3??7??Z???mb??r?{?I?????
(?0\v?j???hTIRdL??ig??4`
?6?/??T?d?M????av???A????????h????I?p??3??'>?????l???@?>????*L??~?
N?)???.????D\$???B?????b??i?K{???????U?????a3<?-???OL
?a? oF?x.[??3?Q?f?v?B^\?,b?,=?>MR?b??igk<wmA?2)#????L?gyb6?Xm??4u???^??}??aM???R??9;Wn?Ig?L????E?H1	?'I?P-qr??mc?????
?-?0?9?t3????;??X?O@??????z??9????B?$?k8?J,????B????
-??D<??????7???5???J???0??????b?G!?,?%??rEkS2'?8???+
?f?"?C??2MA????bS6?~?9????.?
?	,????84?c??m??H"?.J	&6??E???????D?H5?d:/5??,)?z+??^?U?Dm?571??.?5??le?;???@???7wRq37?2?, %?M?^
?5?2\?Kq?A
?U?+??q?i
]??N5?P??U5V/{}?$??+
9???1El=#-W??;,' i?p^)??Bv????????BP?
???xB?=E??/#HQ?o1?~m?F?"??[??Lo??????_?????xL1?O?Z??Z??D????R?G???xSV	o??r??RYe??????;?mR????<9??6??+T???y??`????m????m?y???O
PkN?c??-??{f?o?5i?
??4Zhu?N????\?S:-???
?[??j>?6???Na?c?n??2??z,sUd3k????;?1??6?'??c??"?jY??2=??kA?&@?F????*7?S1?*c?QY???????L?A????2??????v?U???u?S???Wy??
L_^????o{??*?KTi?*???$5?]?&??6Z
??K??B,??????????WQ??d??e>???&???Te$&J?S???x1?????>4?j?j?I???H?M?|J?q?lu?FY????(T
?%?I/?Oe????8*91??Q?YMe??b?X)????
????NDu?????kS???.V?H?m???[%Y??nV?ol&`????Y??[Y?/?Iks????*?pM?[??V?)??6:??F??t?a??????????e??
??c??_??2???X?X????9??????uFN{kw?d?????]?K`???[???5?Ar??:Y?H???M&??Q??e???????v?`???<aE???|m?????v???J?=A	?J?
5?lZ?????P?mU?)???q@???=?r<x?????LeG????Y??n0?W???#?B?Y???8V@O~a-???:Oe??6?aA8A?u??y?NYt??*??Ra?c?4*??? ?g?[?(?+UF??w?(??%?}S?%;XF?????J?6??
o?????a&????U????y??X???:?!????B7.WZ???gw/4??[ny?#??N??n?S??K?????5?????6????????8?,e1ukm2,4n?????Z?s?^?f???Q
??Pl??mJ?s%??a?RK???Gh??`??a?1(4
??{?c;??:??g??
?Q??s????w???e?;??0{?>????#???(?+???a????B<a=?!???q<??????{?????;3?"2?Bu?"??5???)?O??r.m?9????$b??????2?????????%u??A#
??4qs????y!<0????z?v?/
????j?3+?????r????58? ????c5?
????0??A??"?
???? ?r?S?6B??'????
?9?4???vt<???K?,????????<?SD??%ZB????D?'?I???C7M????????"??t??kK??F13&j?c?G????N??/?L?TJ??>?????.k?<<???,??b:?d???????y??Nj??Q???O?R?l,K ??????x???????^C5:Mc?!??$?v??<<+??8????????!K;???01??0}?0	S
3,??5??4??g??2?S??
<e?xS??@'??S?
??c??y?>?S>?S	?E????T?*T3??F??d??@S?p????E?8??8?T???HU??0??X?~Y??@???5C	?	?B?S:??A]?L?D??\?UBE??b2@?T9?????3V;U?h?M?8\E?O?S???T?VLSi??2?(q
Wm=?????V?"W]???men}???;s?TH?VpM?j?o%?d??i-A???,?]5T
#?E?	R?:?Xo?A??S??X???T??k=??8?y ??T???y0?CQ52??
1U?E??}?????|u????vU?k??v??????j??Q??Y??SUL??HZ?,
??X?????W???)?a??????wE?]9[^??KM+??$???q?>i!Z?].?????SZ{5????Z???????????Z???@?W?)?}? 	?]U??:?M?rU?c????=?-????T-????5}EX????]?????i???????W??\a???????M}?Z?$??"?@??j
?cXY?????$??K???*?a
E???)??,M?Z???":Mt6F>?5+?t?
???BR?L?a)6 Mb?C2Q+6??_v??bXT?0?H????K?i;?	L?"??7??%???u+<A?Rc1?%NA?bAV?m??m%?h?y??5I??d???
?B#??DA?$??\???d?<R?KFA^b9?E?	??
???-???wo7??h$p?oz?Wu(???gzz/x?i???J????Lw)?z?????/????N|vw?????j????o????E1I?d???????b??z??y{???????|???????ovU?^?7Ig??????}?????????????7u???????|?????^p?4H?J??_x{????/?H??G??????}F??N?????EI?\?~?
?#?r???"??3w???3e??W;??:?c???(?8????'???k?.??z?????/??????0???3n??1???4?? ??E?kw?????}x???I??n??M?I=??????K???????a?&N??m?A+g]}? ?l[?8?`???N???&>??-{???G?Di???{&H???o?>????3????
*Q?}LH`?%?`????????
!EF??@[x?@>?
bGN,?
(?k?Q<?#????n??F.?
@	??k??1?_ ?>?	?B)?Q??f?<%*S??!!??????%4?B{?????	?
Q???`?(X!	X??????(?	YH?	?????zo{B???/,?m?D[.?pb?.*l?????	
	F?Q7?0??X?	(H??f3??vF`B??????d
???>V????3??F?????2?E??ha
??bI?"&
c
????sB(???4@@J`????t?	?????
1??	&xe???? =??@4h3
JC???A	'??{??4
^??
?? u????
8?>?7???????S;?
L`??????^?z.A?#=*?b?~??@LQ	d2	?#,?j#!??|??1\Y?,??DSD?
,?SCO?4?0?
0?T???	???
????`4

?#b#
?]??V?@?jA???R At	D?
2@)?Q58??!?
?E?MX?,A(??(E??h??IXM,?|ANDBhP??
4
?m??lZD??$???
?????????C!
?q?8???????D4?R?N?????,??9?Q??.A??<%?pA
??????W?6?????p?V
[??
??;??4?\??\
?%??A?RLr?L?$?-1???G?E?	X%T??1??U?HS??@?SD?????
??y??-)Ah

(
X???
???%@69??I?M????|??t?<R9?*N???vU=??@?4??=NC???3l????	??0??0?5\???9?

??HAI?-??0???F?D??G???;???MA?J?k???`	??REG]?E???nYV??Y?tp??xP
A??HL[J>???A???;?
\"
l
?-?cZM? 
??
2!1??V.O?;?AK5LC.??;?D?64?h?CG?DC????KD?[
f??1t60H?2pjkCn??.?q2`?dW?h?k#?nc'1?dg?c??es'E6fk?0?k?U@??m??@
-s??1?50?d????wd?=??f?6vg?/@vg?v~_62?72???l?}??m#w?j??dw?7?6m?Jg?w~?vj?e'?r?
1??hL4?7	Dw8??xdH?_?IV??i?hn?aDw??i?xKO0???ip6~?????eX?C?	f?FX?I6F?k8F,???A|????G?F?X?\
Q0????R?J???F??????86??c?Z`??????
]?9?[G?Dw???O4S?hI`???WI?SEBd	??6
zE??uP:???rP?[9?;EPk???F????O??????z?a ?]y???1????dIh9]?t???????????pF]lt?'	s8??}U???a????M|M?tk4?s?
??xn?	?????|	?pI?gG??DW???k?h4??a?;??????i?x?x?l?{?cGz`#z??Whop{N??rj??z??????Q???t??:??E?w<??|]O]\??????nd????B?Ip8?????_???E??y??????O???a??G??:D$EL_9?{????X????G???o???
??=N?k??/?n?|h?????????{I???k???M??{i,???{?[?g0??c???z??=??I?o??????|?{z|??7~?;>?G~?E???f



From shedges at users.sourceforge.net  Thu Jun 23 13:28:29 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 23 Jun 2005 04:28:29 -0700
Subject: [Koha-cvs] CVS: koha-doc/es/sysadmin/templates/imágenes image1.gif,NONE,1.1 image2.gif,NONE,1.1 image3.gif,NONE,1.1
Message-ID: <E1DlPsj-0002Io-6Z@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/es/sysadmin/templates/im??genes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8780/sysadmin/templates/im??genes

Added Files:
	image1.gif image2.gif image3.gif 
Log Message:
Graphics for traduccion.xml

--- NEW FILE ---
GIF87a??
??
?q???>{
U??h?? u
?"`??`???h??M?Vm??p%?}k?m??JP+7?Y?v??+a???+??8qc	?!'?Y/???#g???????A?M???
2dV}????aC???????s?~?:?????N?5????|????;x.z????k???{?????/}??????_??}y?*??O>~|?????>???y@?LxUa??TT?DCQ
~???X?"lt??5??hb??x?)??b?(????|P"?%jP??5??b?i??:??"??????Cyd?P????#?8?U???Qv???=? f?d??%?b???i?)f
?9fb?Y??#??g?|??B?*????B???????(???P?5 Z)??*
??-l?)???*????J?0?j???nzC
???z?
2?????zC?2???0??????????@+???J????Z???.;k??
????j???2!???{??????
???7????B?ko??????????????o?
?????f?H??
??PD
v`q
5t0?l??N??

$??5?kN??[??i??Z???IZ???_??f?UB???t?p&?????
???i????{????????)??/*??'?????*-????+??F????n?+??????o????,????~??R??qT`?`@
??XD??V??R?d,
E??? ?0iE^Xa??`?)@?l?R???)??K`???7?????????&?I?Mn??$?????Y?r????$?&?}r????P??T??O???
A,?????
!Xua?0?"??ep??D%?C3???MD?
???x?7??2?E!?S?D??P"N?0????_?kS?????"~??~?cJ???zU
???p*????,BnP
>c/???v(?T?aC=(*??x?}?i?>??
AS???pP??
fI?N??!?x$?8??R???$?4??.2?!????>	n??<???????s??????INn????'I????n?nM?IU?rr?L??n?JV???{B%+o?'xw???-;]???????n??\>?v????w+?b????e?~?L?O'YX2?"t?+E :@
68(???0?v"??
k?????	*X-???\?a??&5?E?fA??9m??y:?0?b??x%/e???,??????&???l???H?]????ml?V[???r????~?'?Z.???r[I?Q?r??#T?????7???.t?+K?j??Xb????&?
??A??'
HD??-?iB??P2@"N>???h????(*?<?AL?S???t?F?b*:??@n???????|????????L?*?<
5T,Q%??_?BWDP(?T?
NP
2(ER.?
?cx?W?
?
j??	????	xj??????y?
?? ?????Y?
x?`????j???????,?????6
?:??4???I?"???A:?3??)??+???????BJ?9*?8J?j?M??F??BZ?Y?????*??$?.j?h??5*?j?_???)*???t??
??f??U??+??.Z?????u??g??{*?`?[??AJ?YJ
*????j???????`??????:??J??
?????Z???????? ?????:???????????:??:???????J?????j??z????p??????????z??:???????*??z????????:????????z?????:?????Z??
?????Z????????j??*??j????????J?????z??j????????????z??????Z????K??Z???!??[?????????*?2??%?????*?<+????????P????
?o;?j??C[?;??J??$???w???[?.??
k_???Z?????????J?,?????J???????j;?B???K????:???????;??Z?0??w?????????<k????+??z?[??J????
?|????k????????+???|???*????%???Z??K????z??Z?????;???????q???[??[?Vk?t?d;?????????
???H{??:??+?cK??K?f;??????`#l??;?{????l?'??#?'??3,?&|????????+??+??+?)+?E??&?????.l?.?'??<??????%?Vl?V???k????.<???%\?d???k?9,????K????????Il?????z??j?E\??b???P?Elgl??
4,???????=f?	???\?
??=?1l??@
???????]*?/????-L????8L?I?,?????9??
-???}0	???	m
?????\??P=,?AM????-???Z=??"?????L?aM?E?????U-?*?dl?v??0???|??L?cL?=?3-????/|?!??(??"L?\\?Cm?c??????c??m?3??M??W???}?x=?p=?4<??=?c?? ???????f\????"=????-?????f??b???
?m??????M???????(l???l??????c?1??
? ?
??-,lN??????5`
aZ???? +???
a?????T?u~?	?0	??	?<|T????????`
K?	???? ?????	10?<???v?0????????
?@????
???^?
?0s*
?j
?`vf??`?Vn?
In*-C ?S????n?"?f??`?0+?	wn?????,?@?? ?v~???q?????q??|?tn????VN??>??n?o?m}?on?o????7??~?"?|?7/??=??????{??o>??>??_??n??O?r???o??N?to?h?h-?~?h]????-<??/?q/?j-???????jo??????"??}??~?v~????o????nm?io?)`?P??c??? ?0?.v~??@1?4	? ?P??

WR?3???'????g???	y?h)?>B??g???e*?????N???xv?G??,??:?z???=???W>?t??^[??9\???D={???a???.???????m??=?????T?Xd?r?[???7????????\??^k??]?p??\????'????Y?-??]i?????????j??Vi?????n$V?r?m????^?????zI?[t)????bF?V>?q?B???u?T?5???n??v?oTP?????W?%3????}?Y???qB???"??	?D|??Zl???^*???l??[???C ?v??A??	D??*S31'?,??u????/???J????N?>?*
????2A?)????v<??????Rb&?B?????ot??'?P?L/????<?B?E?wD|L?sk?????s?????~?{??G?m??W?va?[?WZn,[?w???`-t6X}t????????&~?????????L????G,??FQ????5????'?[W???9??s??@?}??|?yU??EOm$?m????8ma?4?0E]???r?i?o7????U??PG??????????????jc???
};!????v\#?P:???Y??? F&Dis?B'???,??Q\#??G^?
kX??01??k??N??,????k????3pa\?a??_V
?l???0?=?2?b"????????g?C'??e5??
??c??(?2f?MYr?5?x>??t?b? ?;M	?a>????G?
??#???gR?kdc?@?,?IJ?<?3??????]Q??G??7?~?4??L>?(???\?<??D???As?
D?
??4F??
?_??	??A3~cmj ??R??s?i\j??x?#}?4?nM?x?"??Q??Y??W?Jk?C?iI????F??_N??? ?U??$N??+?S?dt????'Vg0l???x#t?	N??;v???????U?n?*Y at f?
?uBYX??~?????>??T?L?tUj ????k???????}l??]?v???}?4??@?N????n??p???0*??T??-	F1??????mYp*??????n????V???nvu???v??+][JS????/?????b??N?]5??????/??AZ?6?&>q?qa at Nx??????{?????2_?[?'?????n?ib????4????T????\?|^3???J
??U:d???@Vj{?|?_7??-oK??B????x???}?#??PAMR????#?i??l?s??q??R?Z?Os????t?[??T??????K5]c@???
?t?U|c	????-???<b???????Pc????.?y
M`?:??~??m=TO?Z???5?S=?I????7[?{???>??0.u??
?r???1??S??r???lm???
??[???????]G????+???????w??n?g<??4_j?o?#??0y?R?rN???%/????o???Ny?S|s??\?,oy?W?r??<?q?_????[?9?u???s?????:?cp??'?y?una???2g???s?+??89???s??}?N????>????[9??s???\?????w????m???}???#=?Vo|??t?+??w???g>o???????:?+????>??w??g?????HW}?=?u????
???o???=??6???.u??}?O?????????)????~t?w??B??????????G??/??????????}?;????~???????????????#???????3@
??L@????@???3A????r?????T???????!?? $?#?>#D?%4??'&??(??)??T??*???????.??/?0?1$C?[~(?4T?5d?6<:?r?8??9??x??<??:?g????:??w ?>?C|?r`&C3&C44c?A?DG???<DH?=4?L?1w?^??I?4|??e ?Ak??:??V?=\?k`:/:??Y??[??9??\??]??`?a$?b4?c<1?
D?k6?H?<HkP?w?0??
?????!??e0???.t??P?
"?*(/???u?!@6?op?Y??Q??DP??NqP?!??}?Rd?????:??@YYD(^??(??}%|?d??s?8?r?bIP???V}P?j??2m????+}V??	r????z????i8Xa?_?H??xq?K?ap&".#??K??"(?l???*?^????I??A??K?\?^?aX??[HX?qHH??T?Q??VT?L???^kqk???!?	t@?4?4????????,??NP?E?7????!?	x?[?z?g????\h?Y??rP?3>??q???u????????<uH??,1???>J
}??u?M??cx?j0rP1{ WI???N?z?E??m$???j@{?bu?)??Xao?R?E?S?E??8?q?-?b?????pc2?y????nEDq
u???*???????Q??T?wn?f!??<PU???@?(6?
'??5?
'???????3??d?dv`0
?
??
????????LT?A??3????;?7?$??T??Jz??h7?FJ?(P?Z????v,V??????w.?8????w??9sBORo]???????&?W?=?%I??KhH?.X6t??Q?l?/?h5w???Ls?0?3?4]??<4?S
LQH?DL?HD?8?H?s??s?10Q?Dz?X??7???"+??
??????????8????<??2q?3$)???c????????+?pO>????4?1?``~??0?]e??|?E*B?
????t????c?
Y4N??????/?KN?????&??????????????
???/????&?]s???q
,L??'q?T??	Y??l3/???
??I?/L????r???0i\?F8??l?|#M??58?%N&?<??%?7V?8y??d?????X?
^sM.??qM'?X3??a1?LSi?4n?????F??????????Kc
??r??c?9?U??????
*?s?5??^$&v3??
???H?P???? #?
9?I'J#?SJ)?4??2???=m??X??JL?4??"????<?!;???6?`?+?D?????????P?
5P?d??1?	`?`?
P???
???#?Pe?,?@? ??
???LF?'?p,Vt?
H?Hy
?;???1lC?xU?
PIG??
'???`C?7?!?!?Ce????C?H7~a
??N
?4?%???Y?*bc?A?g?
( !?

@
`?`?2?R???	?X?
??7????`:???>???h?/2?P?*~??r@?b??:?B6
h????5db$??F
??g@??Xy?(?1?<????OIc??L\c?<?t]C
?\%+???^?W?v??Y?????V????}p&?`*?2,?"?10<?FL`"?X
V??26?X???=??Zq0k??a??0X
V
??W?CE?;?C7?$D?
h?1p?????????~?U???)??*8?????E?ey?Pi
?,??h[?^e
??u?ju??H??As})??7???H??!<???????? (???D?h??	?
UB?N?`?(???a eM\.?4????????i??N??A????%???????S?
??S?e??`?<@`C
??????C?=?8?4>??X?H?LA
??.0$A???A%????? ?AV?8??H???&lB??-R?t.xA?@ X?(??@?]?=?|?w?_E???*?
??(m?NH??"H-HBI??/`?=	H???E???(? 9?1?O(?$?i?/8?YQ2???7?

??VlB.\-?W
"?L??7?B.`??L\F>C???|?????:????c??5t??l?? I??????_h??3(??)"9?H??H?-L?/?Nd?4??,?%?e?CzUw?%h?b??9?v????P??,?&#??????=A_uJ?4??5????MuC5?B5?N?=?w)???b?N?`|?'|*?A-XC?D?

<??I??-V:?B????<tgF?pU?P?%t???*x9?b-4?|?????P,!??z??[???:x	???A??TeU??<C*?L?
h?????,???P@?L?o?J;<?m?c?l??N*?A???e5?&10???8??@	
(??
?@&
?l?"??H@???????4?
???????P?B
d??.?2t0A?
s?q ???r??3?9?ZaTp	??3?
-
???ICI???.G?D}?8??=??[??=,O??U0??{?????37?r s}????e????73_???01)G%?p	???N/s??Os??=????7?;?0#?q7??;?n}?f??_`????%?Gp
????????????Kl%o$??ttK?\??F?????F?4F????????t? NM?tL?4o?4??KK`tJ?4L??> ?I??P??>?4??tK???4G?CR??S???11K??????\R'?F??P?t???TO????sQ??Y?E??F?t;\??"]????KK at X',?]ct9????sO??[?tQ;?\?N??R?5\[???<?FKH??|??6`?tXG?t?]5V?ZtU?C??t]?????]?pg?6V??a?6P[tTstc?3`c???????><6]?p?6g??V??h????h?tm7]5F??k??F??HK?r??F?N??%??Y4K#?R??[??x?5{[?[35m?HggtG??I???uGv???7?@
|?5`??p?????T?5X???M8|?W8?;x?[??[????;8?Wx?s????7t???x?_x?[?%M8?w???x?XC?o8??x?C????wy??x?'???x?9G??5???+y?t8?c?w???G??Gx?_?????[??/??9?c???K?d??S?w???'y??x?Z???x??N?W?7???_??;8?w????7l??W??|???7??o??C9??y??9??8?K?????9?????K?S8??8??:?s???y?c???9????g???y??)?wx????G??????z8???[x?_?7?8???3???y??x????k??/C
8
??
*R?n:xI???@DJ*pA?
'j??,/??
sm?F
CZDjX	?S?!F)"!?????
?E ?(<c ?y
???|@?k???D?2y????eC?????F5?]-E?'9????D
?&
?<??5e??]?????M???t?a??2?????b???d?<?\?+1?1%b???SS?4??@?k???S??$?????al????????!??????O???	?BRj???;x?????u???J?E?????	?*??3m?	?a"????<
`?????/?w?^b?"?Kf2?q,????No?7?d;???3/??Le*???%???<gE+??n???GL?=c??Hv1?	Lc-OZ?Cq
Ntb??XC?MkY?z???5?M1?\?:8t`?#x?P?Z?????f?kN???5??m?TG??????
?`????6?y}?jc???7?Omn]?z??N??k}?q????Fw?gq?u????5?s?n[???7?)??nn?{?W??>?i?;??&7?	~?iw???f??-.ko?[????,
!??????N???????z??x6?A??krw??-???#??vw??E/??'r}???
????-?o??? Ov*.?o?#]?L???i??d?b?
'??U?nNT??=?7??mo?G[??{p??S?????????~?c???????+????{??>??/~??h?????}??????3???/<?/?????????5?~
????_?K/
?/?f/
???*????]/?"P??Oa??O????!?^??d?i????8?????!?????
<m
p??A?a???0
?????p?P????
?p?0
?p??0
?0?O
?0?????Q
Q
?p
??	???????0#

?????
?0???q3?????
??q??=1I?q?p??dq+??????
?
?QTr!??&?
??#??
???'??L?$??,??'?2&U?(kR(O?'Q./r;?)???q;??)U/??$??%_r ??1?,Q?#?*????
q?5A!4! ???a??A??
?F,???
?Js:?3???A4???? }???V?-i?-??8??8?s)?s9??)??9?s8?3:??8??U?*?
?
?aB-}d?L
A?!F???af???
? ?T??`
@FFM??$?/&???+?4TEuT3?2=??d???8?!?AE??
???A8????L!h?z?????U????G5
6?????
??????,H?Z?5[?u[?;?
?@?
??da?
?!?!
?
????	?a
?`????||????h5??n?j??? ?` La?
??^?`?
H???z!??	?t????[a6fC?2=t???3;3V5!Vg?!????

<?<3iu?	<?gc??
G?
??gu??y?Wu????\?AR?p?u??
a
???
????????@F??A?a?A???@|{
&
?
?@?a?A? ??	?!?!H&
a?a0?UH????
?3z9Xki?Cg
??????<s?????????a?????c????
???????????8J??k'?
?

??sl?#{?12?q0q9??R11r Oy/?R ?a?Y????>x?6?????$}??9????????A?}%K?@?.???3??R&??8??)?y?-??? ???B???????k{???B\?&??s??yZ8[r?,??2???????f??jv&:?5z?iR/?K??dy??I??L?6?+??5s????*??{?al?L??Z?t?o?qa?
ksZ?s??:B;o?{?
uo???Z??(??q?	?	??q?>??v	T9?Z????????????\=IK??x?
??H???@???
v???<?k?
z??y??<?a??????a
?
: ?1c?d5qa
?w
????,?	fa\u?A:?K?u?? ?
r@P?2v3BM??\?
:?|??S ??W??|??=<?M?????M??#	?
?2? ^??|b??`|`????1??M??
~?
??
A]????d??????x????G~?
DC??????W?????,{?A??!!?b:??????A}??>?'??-???;?p???"=??>?=~>!?=|?I?
?~?	??g}?1Z??????X??P?Y?? ?? ??;??]??q?t??p?^
w???#?v?F??A??Y?
	???q???a??)??	~?g??;????
?B
??&???-?*
????
?? ?bk?J?a??m ?$????????j%?Db????? ?*??
?o?B9i?X~??????F?Go???y?.?)?5N??????@A
?|?Mk`&?????)??N
l???2?C'N?#3N???2nz!??????L???A?k???,n?a1C????l|??T?AG?J??\Y??w???/
?
C?~???A--<B??????
Q??H??7fc?!??6A?
?	??~?)!fif??o?u?$
?~A$"?????U?!$%????q.l?3?	????1?	P???&XN???	NLb"???F1?k?^??7A?<??		c?(??N?1?
1?????8B9A?Q??G??P1?~??y?#1j`EbX
}?:f0?G?_?E
?1?\<?$?C|????`??H!D??_?0???Q??U??+?\&0??????nK;

f#
  op
k~?
?uVkz??O????u,?=4?!~F2?aa?1?>
????+?!?V?bk??z"??&m4???-?D?????!I????ff???TU6U???gO???I???$	D?Ib???}?c??l?W?&??(?'@?
????|?{?3?!O?)?V?????S??~??(??X~N}?x?? ??W??&?E?^}H?9:B-e?W?k[???5????@^%B?????)?us???!=WHN??Y?{?D/:I?%??f?"&[:I???v?xg???R???lcQ?:=?!?}???????GJ?? d??K????[W?E%???h?Z??{=??[?-?/????o??:????i??K~??f|D?"$?pO?u?le??w6W?1^lX???????b??0?(??I??tH6????a/?]?????E1??bK#4N??aI\#???~r???\b??#??dHSp?r??i.??z|??b?????kx??@7???????!u?z?0?p`
?py???T`
??F{??p??
_?l???4	??
L?? t?T0(<?
b??@?
?0FG0[t`	?
? ?0?	??b???`	?PX@?@Mb?O?D{?{??p
b?z??T????C?
C???d?Y???>?T????%?%J?DBsa0?f4o????
??(??h??$?????L(x?????/???U?0
0???vjRn??`	`0k??0?F?cI?hB9??&x???????2??????
s"??F? ???D??(k?>PF?C?
N0??2??	??`??Jb)O? ??rj?q+?H6???Ss??(i?d??%+T?d??sAh%?c)&u??
?&te???I
j???Rj???P????P?@?5????
?@?cdYq
??????	??
??0	??N?@??
?pD??0
?
u????bU??`	???0>pa???a?W~?2~
?}??)???/j8Kr?ld?+?BB1??LcL??UyC6?q*z'$A??????%WlQ? z?`?? N?&????]J??&??9V?IQ???
???g?Wb|c\??bAk;Tkt???N($N
?
.?
?,?&?S;
+??Aa?-????w?A?r)B?,?3Upq-???#?
$T)
????? ?PK)W???!
S?*??R5?q??
7D5
^9
:`S[??nt?p?l??4?:?p
Y?t?Z??.???	????
{??0???????t??`
^P??0
l?????c????:k??????l??+? ????`
^?^9??pa\??H?A?A????????\$8@9?A6K??J?????J???8P???? 
??/?=;?q??11??
?cP??H?'?P3??+?V???W4_u??jqH?'??????a????
1? f ~???/???!?@?*?`??I??B?P???LSm??
??????b6??Uye?[?8??`c
|??'D??gf??g?52%x:?	z
l?X?G??ff???5

??
?u?7???
?	w?zl??6??a?eK?<??g?r??g?I???f*?????|??G???yG?~p???o???????Sr?OvN?3?|?^??????? &?)?R?|u??[W?[?}v???????q??5??????vk7?l?e3?x??g?s??(?8????z%?{???O??:?w???=??7?W}`Z????ik??????)??5L{->??t?0G@&?,
?Z?03?)P?u???&xA^eX!Z?A~?? a	MxB?P?+da]?B?P?3?a
???v?P?;?a}?C ?0!$b???7?/?K?`?b&?I?B?S?".???U??Y????E-?Q?b???h?3???id???
H??r?c&*?F4?1?]???G=?q?yTc* ??e$R??dd#?HH:r??b%-)Eb?+l?cb'?9?????G)?
?R??f??.?W?2???,a\?R???%.]??^?R??f1?IL`V????/??[????4f1e	?j?????/?yLf??$g9?yNt????Dg;??	s?????)Ki?v?
???d?1?6D????B'???pt?o??G;???nD4??h7*:Q?RT??hF??
?j???hDE?Q????'??E]Z?h?b??\fZ?????#]?E]?????????JyZR???AE?.V?t?R?S?jU?!?b??[??j; 
?x??????e
K???l??????O"Z ??{?X??5??JjDT??%la?T?&????ic?X?.???B4?QYh?t????K;?Y???????uZ~??????Z?????_?=H*?????j???#?a?5?
{=??O%?U???S??2J}Pa
S?r? 
/FA?Q?N???/w?^????0m?y????Z4??c4?]<$?/y?[_?????u/EL?????????x+?T?v??5?**aV??N????J?1x?_GXAF?k?
??-
|?T?KK=<???f??)A3
???X$!2Ek??`??ST?oX?P$!o???p?EM|NTGm?E]l?b?Fu4ER?DQ??u?Dn?FU??LL?~\BG??/X??D??????5hy??u???Y?}8?w????H??H?9?I??H??H?????H???l?u????H?yI?|?}???d??|???H??I????I?I?\??I?J?4?????J?T??,I????$?w???|J????DI???????J????l??????E/???[H?J4?I??<????????DD?K??????4L?T??A$??TL?L???L???,L?????L?DL??L?????L??L?4L?DL??K??K??L????LM?????M????M?$M??M???????h??L?????\???w?u??QP?N?????N?N??????????????N??NN?Nu!?N????O????N????LO??N?$O????DO?L?t?????O?O
?N
H4??x?b%?au?}@?f=??x??(VNB?1?Q?p?
???`?
j??@????hM?dM??Va}u-?e%?x???a-x=?o(???gL??]?:
c??*??A~???i?????{X???ru?c?
?x?? ????
z??d??Y?X~?o?B
??@??
???u??o(??,.?x????aX???k????!WN???xY??6??z??w?Pu?:?U?!X?????u?u?0(?1p???D?????jYH????|???Y??(?Q0?m??N????*???f?w??kp*??w?&??r(?w??<?X\8S?J;/x????N8D??o??MN(6P[?*??xb?4??'??~??????Y??~????U??Z!
[????:????w0?YX=?Y??????`?H
f(K(?(z?????(?=??#p_I?0?b???B??0?l??B8NX?af??!????{?,?:Xzp?X?X??*
~?~(08uU???`?l?#??B0z?0X???6X?B??^??N?fX?u`4??ah1??\Yp???r0?x
D0??o????u .0
U?*??Sv?<?o??N??`?_6LDHa?x?<Xb0,p?N`?5??e?"y????]&PEzPE????hT'f'??k?
/(?QX?2?
oo`l?J?~??!@0??~A'X?Q???Sp??)*?$?z?#??B?
?????8???`???y?I?f??I(?N?_~?????p??l?
'???????d??
{s 6(????s?o??~?
M?????[?K?f??^ :P

YP?@?N??=???G?,?a$?& ??fY???=]y
b N??Y??}?B?':8z@-_?u??Q?D??!??"??O{?gY'x\S8????????v&
O???z????oUoz???? [?p?o?H:????`S@?rh???V??|?X??{A?y???????:??PwY?k???w??^?{????7
0f????'?	??!{????y?X?	?????7???T???}???i?uz???k?+c?????u???)?r??/N}??V??
??????\??}??[?????V?]???DY_??-???{???????7?u?H????~?N???~??????u?V|%?{???-?r?/?`????[m??????????y?is???l??E?K
lz???p!??B?(q"??/b??q#?????<??1a??QCo????????Q?????/?B?"J?	?'P?D?"MJ???o??????@g?S?u+??^??
+r?B??Qa?mC\l&?[HoO!6?Lq?{T,_????
?q?/tO
$h????C?,?"?=g??TH
1t?D4D?)D?
G?$?@??lV:??x??C?9?`)???iY???5#Z66???oVW?<G??UJ?????a?Gpk?????hV??]H???d???????WD?>??,???N??DO/?x????ch?Y??L\?`#??U???O:Zk??0#?,?????*??????u`6$?bn???a?????)?MIj-3???????7.??$?DZ???????????:???;y?2
>?0"=?`????Vz???z?g?
yC?????7C$?.?Q?:???<y??W?58??5bt?.5\CL?l\????????#[?x??[7??>?????^Q?$?S????y??
1???????8C?N?
?3?;
??D~??b???S??WM[??~A9??r?S?0???05????1??"?n?[???c?l?,5???X8b?5R[?S???e?;????8b???(??0????F/???y??R?B???
5??H!???j??#?xF???F???AE????:t??=3X??????Q'???]?sO?%?s?G?0??;???	\??7?A?????????b??
??;??*?#htXF!81?e|c
????????AS>????B??1?-??f?r?<j??z??*?"?E
:?`Ny??1	D?A??????=0?f???P?X?}???#????"?@6?fF)&0?b?'?G?1?`8B!?0
?
A???7F
?<??o??O.?0??`B?
????'?:Ay?l?bF?"?~????#??bt`^??,?p|C???7??N?a??
?l?Y ???#?0??9bX?E!(?
?9
???"?za????7,&D8?N?DU0???\?4???.?DCC??$???w?0D???p3,"4???????4??YG/?
?????B?2%????h.\????AY??????
?X
a?(O??x??f??~?`0'?Ytb`?"&??0???????(F?tp?(?
?Y`c??&?	)r!?pD,qoC?&?&???2?G??g8??&????4?$???????P>???x?`z?1	K????H??N?!???G8???{?????B'f!?Y??kF?Di??H"??Y"p
?L?????+???I??>?/%P??MnI?.???DioO??#??0??5F?B?a
??T???5???B??\???#?q
otB??F;??q???#?Af???X??+????)4~?5???$?K??D9?A?o????F??????d]:j??v??p????1L?z?f??'?0O?+.?J?,t?k6!? ?;:??c?O????BL?,??? ?<&??~??W?Z????A??V????.??h!?Z??K]???Z=\????ol??;Y?
?????%;2??P??b?
?n&??B
(?????2???!?^???
?+R????;<)???1?|1?J?~??????o?;?X??g?i?[d/q???=2y???!?r??\??=?w??eTt??bdg}C???d??'?????p????5>??cp?J??&?r?????7R???
K????Wob)?$?!?B?Q???C??/????>????B????????P????Tn??NK?$Z?0?@O?]??????;???????j1??B/\???U?,|??JP??Y5Dv?3???4??#|S????Y_?\K?C',?;
x
"xPN?<?|?;t?;PA??V??????$@??]?v>x1?.?????[??=?v?7?N?!??su?@` ?Ie??????,?????XB???@???s?
?Y????16?P?:0?p??????<??7x?"t?=?
6?8?;,?
.?A??B!tBY4
`?,O??B)IfE?%?
'??K?????H=t??,?,????5Z???XB??T0-??4c?8A=z?%)D*u
??)??)X?xYBo?O?]?1?%\???\?? ???$p??C?M???P?0?7???
8?????B7?S???:??<XB-??h?T??+?L4???f
X???dB???>^N?g??ua3??
??2l??I?C!8U?X^??&??????A??)f^?A!?C???%@G
??7`AP???(GY??5????B???????
0?d??A!??U?)??;?<?)|J??0n&??Y?d?I`??D??#????A ??M?B6"???%T?R??:?
)??Y???$?
?CX??????a??Tv?????A?8?
'??????%?C?(??5?C???Mm6?A??M?M
O|???????.??????DY!???L??????H?R~?L??(2?Z?`?
I??7??`??
?B_??h??m?7??
?A8?zp?YQ?,0?)8?,3?A9?????,??%0.???=xC8X?|SX}??????J?A8lV??????(LHF???k??`?V??@;??Z?CHM~??7|C?fHQ?$t
?f?H?7H???????)?@T)?S???2???X??=p?2????`j?n*??A???*?.34c?9B9P???
??&?^?P????????d?????~?]Z?P`?%????????1?EQ?m?X??????Y0??????a?G???Z????1?HT!????]	?e,??Hb?]????a?????????????????P?"1?@-A??????\????????0m ?!?h?%E?!??qqFPE??????_?9?????)`?(	A??M&???N???F??EP0???~??W?reD![????? ?q$O?=]!??B$??C'?a???I2F(rH?0F?YlZ???*K??=T??a???@??(????,:??<|?+?S|v,??2?%?^?`??v?g??:?Sn(???(\?h'?d?7?"y?\?(g???:?s;??;?s<??<?s=??=?s>??>????Ca
???7C4?x???#x?#x:d?++Z?L?^I????R/@??6??`?H??;D??x?x?????? ????< ?ry?T?v?C?.????x???W?C at -4?kRg??
?,+M?~r?
"?AHQ??a
C?????Ea?|?x??????xg??k??2?\??????y??yJ??????$?P#?????:<?e??7????M??)?6D"Q??6]?????0??a8'??"a?	-?2???????:?Y??H?wOq2;W?????z?????58?xi3???????????:?7?T'x?h????????;l?t???????L??=?C
B???8G[i?(??#`
[??C?????6`>??R??a???T???:?=????oyb?C???
:dSP??9q
jth???As?Y?Q?Rp	???????Iqj?C?M?B???	?Q?0c??Y????n???ih????9l???9y???%?6?8?u?rd??)W?|sf?w]??W,h????]Z?i??U?6?:5l??i????6k???^=
??5D{>Ra????~??2????~?????H}c???%????=??9J??X?!?@??m??=???m~
? 
?L;U?X??M?Yd?%??c??V?j??v?h?m??
?!?????????D???<??K?????-^?:??R
h? p0
	w?q
RM?V????}=??Ch????Elp??hXC??)M4?}<;???A???(D?q?F?a?xD%??Ktb?8???k4^???d0%???G?F??'cq?m????S/
?[NX??
??EB?a?
$M}+8?Ar?c?LG???
?:4?W??r?`'?G?@w@>??A(Ld #*?????0(
?????m???mx?y	???`?baS
??qr?	\X=???%ybP??<?3	?r??De-Az??}3g
?Z?G?.?4umr?	k???HmR?K?u[??h?a$l
%@B5???N??tFl&	?/?	??ax? I
??%-uQ?eS?d?gq???i?^?g?6?s;).
??
??@&~Qo`?(?p?Q1????]?;?
9??v??'x?An?????J?	?++?r{0L"nt
6??[n??K???K??d???2??@?!?A??z?1?A^b
?????A2??1?
^?????.dA6??PC?0ieJe?Ef??d????Q
?l?7?_??8E?^k??E??E??
DCV
\Jhd?r?
kDizk????RP???
????	,????
??P
?(?<???,????? ??`????
z?S??a"P9T?$?!:?!?
?$?z
7b???d#?A??J?5D*??(?P?j??|P,???^?Q?g??v:kv?i4??G?"????j????|??l???Pk???K???}?b?????@??\?6
??i??p
??
?	?`???a?
Ad!?i??$??b`F*???3?????f?J8Nc???	?P.N??5???e???
?D?|&mLN??Q3i???p11???k??/???P0??&??*(&????????K??I$+????pH???
?+???F?7?
qP?d?o????*???l0?g^????????d?
F?.-??`??
?A?
?a????pQ>}????`?(?!Ga<???
????F
???P??4??m?I	KH?z"????8???QY?????3?I?r???
?l#??A???!?'?6?G7#yX?=B?XD?)
?
????
aa
6p?`????VaF
??B0?3O???
6FEO??z?7????	_?O??S at To:[?1@?2?3c?G??2R,?l?Cd0?F???&??b????@??I_???????4g??`=?
?I?/)?t???
?|
i?")????X?-
?`.Y`6?a?kDe?dy?h?
?YM\
????@?Q\?`^9T??N?}?F?|???';??!??;??????d}??M???????[????3?j??=?B??????`?Y1?????g?o?2????9?n!%E7????q?s??)??N????
0m?0$/(:
???'??5fb???????
I?&$.?m}?????l??K?x??????!h?5Vo/???Dv???5,s??????=??Y??0?%p???
?G???9?P?q??X?n|\E.?r?V?g?^x?r
?~.?U?????B??n?D5<C+?w\???h?<`d??	/?f????N#?1DY?V??zw%F/l???O?????&?/V?D.???P????
??H7?X???{?v?????fJ??
d???)?^??.q|b?~?5?V*?Qd???????????zX???}?X??M?:??[6n??y=???[??;??H6lLv\?!?\??????????\??A????????A?????|????2YG?G?;??u?ZN&?q??z&]?????n????%?4??u?3????~????'6??????D??N.??];}??c??C;&???M]?Q?????????9?)??????8?????????????f]H??p?<q???$???6
?CYiS?Tz2??yZ0GT??oMH????:?.l????]?ie???p???5N?k??q??[???	?=??f?_??m????[??|?6x?Y?~\?????GL?X?UNX????H?
<z???>?>??5v???=~?W???z?>????,?;l???!????
lz?c????? C?I???t???L?????0[?c?%M?8k??	s&O?6e?*???E??L??'??????h??oT?xs$??

m?.D??????l??)?g6&1b`)$?_?<?? :?ml??|???=N?|????
?u??????&{T
?f3?????????c??M[v;_?????X/*0??M????"%??
??r???s??<???	?9?^?????	nGX]?A?wo???:??'	?c?:~?a????y??a	"???(????,Nx11???'?Tx?;?t??,k?"??????#?!b?
"?\??;l?????$"?h????r@)$r???vY??FC6???PF)???Qe|[	$?????`???7y?Q?:b????7`0??(?Q?#f.F".?C???1??lt't???otP??B????
6???W!f??L!?Z2???\??????;???\o???,_?*????j??????i'?7??C?;j???w?\??????2???N????.?H??7?|?O??0???d?>???,1}??O;?|?>?????z?<^a??0C???l?A???D]??yG,???j?UYe??@???sK(r??7P?
??^z?\?r?0)O????*p????<??3H???
?
?qz??l??u??X??l??"???CY?tI:?$?`?-????V\-?'\?D{/??I??p??????2???vH?????N?3????????7???????E??????ol??H9?1\??P???S??L?s/???_??sO???{????????DO???.??????????5X????????????w?A?y?	??d?K?=?????P??Mn
N8???`???7?
[?????? ?I?	p1T??!|?@D??#?????5?&?DP???(?@?k?b????????l??
??D??????)TP??
?????y???p.BD??	?????<??b??}.???
?#??P??U)?U?
??????????7??
?!Bz?????~?CpY??5??y$6???	X
1(????9?%dQ!,8``??	/\C?|\??)???a????)??C5
??PW0M??u
?
?\	?Wp??,???|??0E?B??G???
?8??hGQ??f??????d??<??_????Kxay?C
?A?^x???????:b
k??#,???N??J?F'?0l
???#????b!?X?47????,?i????S7?G????~ ?d??????e?????:?$?Q?????????HBC8? (?~|????2???5????V?
??#???)L??u???h??
?l605b?:Q?Y?c+??74?|D?D? ?7?a
|t?'?G???<?????n????gtPA? R?tB@{~?A6v??8?d????1?
c????
?(D(???QYt@???#??6?MH/?0?QC?r?????????#8a
f?????,????(.?lh??$?3?\
M?(h????/???5oH=???g?@p?

t
????C0
??SNP)???!?A!L
???0	?a
?`
Y?b
X?S???qR?????wh?0>?}t?)`W>?G0?
??l\UFE?8iT??dn?d??``
?????iH,???
????Z
B58??Rk?T55?y??Z?????PM?`?D??j?'?-??B??l?????g??k???QT??:????????P???@d^????{??7v???o`???P<???C?1?3???m%;?s/`f?b-???@??Q?`t?0k?pb?E?p?PTT????6??6????5??Fm????>?W4J#5??Wk??4i
??Sr??4??Ih?i?????i?)??f??e???????j?0d+iN????t???e???9?FP?k?	h?)ig????s?^5jF??0<?y????????????????9??Y??y???????????pRB?O?k
???q? ?"!2?Z?Y???UX?-?8??J?S ???	J8X?@?????z?8??X?????#??cX??o???Q.??cx?
??H.??a??A:??	?
??????lp?$7?AP?R:?TZ?Vz?X??Z??\??^??`?b:?dZ?fz?^@WW???
?WeQ?#T??(m?`O??????p?q`?	?
???fOtcX?R?2M??	?p#?rK??3?/;?
??B?Q?C?????P?(????C??mT?????33?k-?^P`\8	Yq/|t
?Q??????U?????`/??7???R??C"?7p?6??4m?vUdD?0t?JlPOLY??bO?P<????@??l??9??V??mg?sLa??
?R???3k j?4{???
???????;?[?{????????qV?iv)@??p??Ry?^?_l?bp
9
v*MCi){B??P!9AT?i?k+m?J)1@???E1{b? ???~*??gI?@
)??
?2??0I
2#?Y*?E]+UT? ??*??	 ??BG?
?????
U???E???p?|?
?{????????????????;??[??{???????????{
EPm?N?u??"?J?a?F?Mtp9??h	7?wdQ????C?fB7??
5?|?????Ax ?a
H(?dp?p}E????	??
J?uXP??*0?@!??
.?&??I?b0
>?????:?4?e???"??@??'?9??`	m%?a
E?4(?@???R??m?@?yS?@??0Y9pS?T?}?`
^`
58y??a?
?
(W???G^?1?{l???L??+??
L???`l???3
?
eQbX??qI??(x??M??????????D??J??)?wSq???W?? b?P?k0??*? t T??y?@??r??C"s?
3?}t???7?
]????t?.??T
9k??w&Ul?1?;7???[?B???????
????!{?	1?.??S,Mn??T??@?@?&`???)8E3??M???`?E0?N^?V??h??5{???gh???N>	\n?+?Qe^?lp
?????p?r>?W^^@x??D N?"?G?\?xz??(?G?U?a???
??<?D????m~\\?a?,??????X?p7?",?????P??0??-?
?W?????@]?? z??	?????_h??tr$?`?<??Nk???????<Bu????
??
??B?/?1???????J??(-?X??m????
???0??????w?????ak?/?
?'q??D?pB?N?? +??~J4????(F???C?rT?yj?:?H?
^nC?'???f/???)b?X?
1p?r1????QR??\?????j?<?|'b??&?Qz)b?k?Z?????r?oT[?ND??a?e??????S=?4K?D?RT??+???z????x
?"??????YG?o:	???^e?7?:???!?b-??
??`?%?:?pM*b?&?`??}T{?6yNM??U!
?`???C8Z????"?1?-?????$[h|???C?Q?8	yH??4?&?	/?1?c?!2|t?>??+s?D???\?X?'AIJT????C?Q?c??D??'\ ?Y???????%???}?S\?F7???5???P
??	:q
????N?C8FQ?="BL????????D?2(B?q??-T??;?q??E??a?pqH1P!????R???
f0C?Z0A??6?Z???L</sz?7?4???e?
B?;??
??L?	?!??y???v???=??L?D
?P?N?!??P?f??lhb??)?_0P???AC???<??m???Ets??!b??(?d?0?????%1Zo?????6?`
???.????fP??`FL?
o??
A?y??[?%???ITE?
??rpb??D??0????
v??<?
????/?b
?X?7????U??,???Q8???N!??F????R????hA???]6-?w?????x??????D?oxn? l??%????C%?`H
I?!?Sv??;?'???????w??Y?w??~s??{?7?T?b??]^x?????Xb?|?>?????=?x?7????>?Y????????"L???_?)????CX??????>?e??;???????V'4?a???
??uX&
'?sY?bP??:`f(?r???z ??)?#@/?B?k????~(S?10?:?????c?~?C:X??A*???&!????N?
k??<d at S??q?~??NXb?0?5??=????B?????=???0bX??Cl??^??????P"t8??????hb?b??d?\HFd??Y??Y at Fl??kL?r?@gDFj?FY??l?etFj?Fl2Gq|Fb(n?@=??i?Fh?F\Gm?F{?G}l????~??{dF}?F?G^8?m???G??fDF??Gw???LGj??g??u\?l?F??G????)klGe?H?aH}l?u?H??od????4?{???,Hv?G????F??????
;??~?????a???y???PDS(/(?#????<@?*??B?0??f?6~??=X9C<??I0??:?B???K0?E?u?%???????Z?e
~0????}?bX?k??()?0/N???j60
?3A*??~p?r??{??]iUb?6XYL?b?k`???p?N???<X?Q?YhG ?=Q%z??w?K?:~(K???
)Fx??????0???YX]??}??u??X??????X?<P????X?5Y?uQlX?y??X?i?
5P!??/ ?
???
???u?	???Y???????5X??Y?p????"9?~??o?Y??PeX??	??	?mX"Y??;dR7???M?s?}???K???Q8????zx[??Q???:???Z	????\Q????Y
?Y?}\??
5\}???]???? ]?%]?m????!??k??Y=?????[=	?]?Y
???}????9??-??Xf?? ???]?
??`??Xyxa?1?y,?HMH?6?{??
?\?%?r(?{8?ch?m?=?c??s?Uo`,H??S?????
??
>[?K[???sx?68??h?&?^b???AA?"??#??m?s??D`?D@???0?r?=??6?#F?$V?%f??]??r?????%?r?Y??]??G@?&?0c$?Q???w???5??????a??Dx?6?|???:o?
":?ah?ar???m?z0,`??
l
p?[B@?0?#/?#y?????1?t?E\???&???&i	??;]V??}??}?9Nj???%?Z??????h?y??c?6???F??}??5l`,?kVk?y??P]8-"???t?h?z???&l~@a??~????MH??] )	@Y?-???l???n?I?O?)#W?w?N????l?Y?BX?]?*h=?@,
??!'??f???0??"??8R?!,?
E??????k?:?"?	?)??!????!HR|????"Gn??'z??v??g?;?s&?of??*6?E\??U???0*H6?p?x??~??<
?bn??4fS????e?y???n?wc??n???G?[??'~67z
G??????`?P?????0?????????h????{2 ?????????dy7?wp.	???%?&???X??g{??????)??????,h? ??
??h???oN?xs?????jdh?FG?,i?$??*W?,n??n?????<^T8`3?_??B?-j?(??J?b????oL?|???*??Z?b??2f?h?bQ?I?K???:rm??-??r?:???
E?s???????U????6?&??<}???1???K:?z??????????{?G?.????h3??%??Z??g??m[e??x+?????(*N&?q?H???????eL?X?_r??9k9???'7}ujU??5???y;??,??????l???o?>???yg???? ?7 ?}?j??d??Y?X?J8aw?a????K?Tk8?&}?x"z?M??-j??L
R2`,???9?XZe?a?#??}??{v|????$?m???^??a	=?xs6?d????I?`??:??S?)???:????:??L/M???`1?8E|??)??:(??z(??*?(??:?(??Jz?HU^U?7J??
?5???N?w??L?b?r?5)??
????M???#.???6????[??.???>l????,C?7?0s???s
????????7ZzSN??.3?;?????F?!L?I??8???/????/?
<0?|0?	+??'
=??@???????y???%?p???`?a	3??;?8?G9y???k???2?x??@??????yp'^?s6`,F!b,????`SC!?0???0C?? 2
6k??D???=l,???}u??af??X??#?y??7?}??7??>8??~8?z??qH?]*??????????%??C???*?93k?F/T`??2C??7?X??%??R?l8?G/?2Cb?2
'5?1)0C'??Q??P0J???m'??F!?t2??`#?????f???Fd???]b?{??0????????8B??8!??
?pB/???o?A`"????9b?(??p?????`????OqB?v??5?e13|??r??xJ?6>???a?"D??e\??Y*?????9??un?%??n???!??+fq?X?"??E/v1?dc?h?5???i|#?x?9??tt???G<?1??`?Bz???'#?@????5?????:A??BG??5?`
?0???F8?S?;C?@?Q?^?!?`???B\???????;:??y???9?{??t#?:????????????&?/?????6ine~??&8?)?q?????C"?"?h?M??????e?#???:???k?S8????!~??????????~Xc?X?,???w?#??G9J?o???`????o?????D???r?3??1?pNn???????????q???T}
??B?#Q?j????L}?R?Z??*??N?jU?zU?B??X?jV????<<??O?1????"?H;?&?(????@D?D?!J$!F?3??6F??+6
?J??%0??W??4??26)VL*R?????1?C?lg9??~???=?hM?Z?????e?kW+???k??;G????s?[xk)?2DI?
	q+{?R?"5??N??C7?v3???u????bQ???.Q?+???7??=?y??]??w??m/|??^????
?X??????%Hr?K] ??C??IY? Y?
?*??WQ???	????0?/?a?n??0?C????#???ML^?3!?U?a?wn??e???u?????V??!??_5?W??#3Y??B???A?U?V^H??K?#???S????d>s???f???l~s??|f?V??K??~r?=??N-n?c???(V?c???/.Z???.?-?HS??????3??M???????/jP??f*w??_Bf??|n???7????(?dtP=?T?JA
H?u?-?0???K??f??k`/??[<6??|???!???W???,??x^g???\'?h:y????=??FX?)D0?L`
@
"Z#??????X?y??u[C???=
????#?'pB?????;???x
3X???a?=x30?)???$P?	D!?a! ????#???)|?7?a???$r????x=8???Bg?
3?8)Z?(V????'??)?"?B?$?=H???]???? 2C(?????)?'bC?:??b?'??D?7?"????|?s???t]G:?i?X??????
E?L
?
`?	#FlM9????@-?
.??
????9????????g
??????@?t?!????D.?@??b?Cb9?#?
6l? ?$L?U??:TJn?<?
??|?
,???#?????,L.L??:??6?<??r?%\?,???t?,^N
??!r?q!?E?(???1???????tF_???	?_	???F???\}??d??r%???U^}??MHD(?XG??p%??j???O?V`?'??)G?F4?kL??<???D/?u]???????!??=?L??

?!????
?>??7??j/A06????/1<???	34?=?)??mr3?=??0"e??
??`C?K?0?K?"=\??X?)dT9$&6p{??A?!n????hb???mT??j9?T/(?????<K????C!?
O9P?L?7?M??
??O2? ?
<0!
$?!=?c?C$T??C:(?	??B
A?	?p ?JQ??L??E/<??"EA??d???Ady?q?
o??:?b??i??^z???B"?/?X?|?x?"~??1??y??A/??$D????<????<<?e?=???/*?'?b?a??<?b?#??c,????^?????:???BF?&6&?G???Y?wp?;?`??<??G-??a??O/?@?R*j ??<?a?
XB??Q?XfLYNe?QD?A??89?N,???w&?K??a
D8?D&???A7b??y?{gc?????"???<????Y?-???N??tr???NPRB?CQ???j@?p?;&QA	9?x??W&H??g,E14hf+???.????&???Q?X??uL??A???Dj8b?ez9BD???6f???&L??'??j?Nz
GJc?S???&?X?1??*????????e,????,?d?B??f?e?Y????F????l0??*,Q??Q?0?nG??l?B?^'"z?`???????5Lg?u???????F9Y???9?LU??sl
??Q0T?A?Q
	}
Gv??l???_?=/???X#??z??????? ^?????a
t??86!1?b+?X?H?1?uD?c`CF@
Z???????#"h?8?????T"Ud?s??6?#E???????sG]=?#V?X?uZ?(H?Oy?<o?+w????J?z?])?W??t? ?'>z?A~\???(`+?S?|?<???~9Sa?????g???e?a<M?
N??[????,#???.?Z?IT?ue????\??D?e??z%B?<D?J??????!"y?
??
_
a???5???
?|r?ULz??uJ?nS??e BV???;??]v%w???????/?e?x?~?8?<|?V???;???{??<??,6K?o????8S?S?>P?9??
????V?????? h?v??Qk??u7Sg?!.G???8??l??H[?060CVb???E-yxK?X???Fa?#??F?p??<??	?
V?D'8?%D??m???	??X???D$t?{[??_
>?c??*?94???????~??@s??Ar??????YF<XL??B??`
?23?L????#R
??`?E?`:ao???????X????????????r`?`
T :?E?l?&mp?	zA? 
-%2?<??`???????	??
????L??M?f?&a
fa??Dq+??`????o9?a?j xJ?lDX?z???????X+??o??+?pL?rK?HL?D??N???
???
?????
?!?@??%
?Rz???`p?	|
?	La?T?,??Y??*b@?
4??P??Y???????F?? ??h??L????H&??r???? ???a,?b ??)????????Xz?
?!%}?
?????d??
?
k"?S?9?c??8?????tr ? ?`1+a1??2??4?)????033Y?6?35?3=S33?Hs47S4M?3C5Y?5??3A?3E36K??5g?617Is5a?7G?7k?6ss7YA??????(???*b?
z??
??????:9!???L]??:b?+?
Z?
?@q6C???!
??4?`???)??"?????,L?"?s?)"0?.p????q? ?a??
??+??.?d??F??!zaT?R?a??? ?A?@X??9????f??q??
?0"?
?a,?)??r
;????: ?e|
Hq??4k?:?2
??j	??????jQ??Q?R??(?`.??+S?k?>"'-?L?z??F?*pAV?$f?:a?a??-?A8??V??\????Z??	? #?`?$??;????@?]?`?Pf??????a&?(??O???L?>????.8a	]N?uz?R???N???
??-?$??%?
??
??%8??A???,d???ULa?=?B"??MX5-??s?b?AL?!+?`e?'?P??=?'?uj??j??`??@??k?*BR/j?""?
?"?hl-?k????$????
????k?"???N??k>??m?Co??o?l?6?*o)?'?l%???n?Vi???&w??6q??<??,?R?V??k?0?t1Wnl??k,d?p??o???s???? 2S?juwwy?w??"0B#?????J?x7?x!?????????Vz?cS)B???"+{Q*<?????Q_7|;JhH$??Q????k?K?HWj??}@??6v???|#??? ??~/j}w?	??
5k??>???7?$??????W~?)?(??#zm??????7??%'??
??w#?q"??C?B?>n?T????????k?am?vU2???????;?OH???@e?"?@???s?	:????)?iR";oR#?8??/??1E??ow???P????8??????(??B"?
TZ?'?	?%%??N?`??	
?ke?~Bn?Vz{B?Ft?????|??iZ?"L,???
??j????>?9?.?????nQ???????|x	}
?$???Z?o:?1??9???????$??????2?I??q?h?S?D?!???-??>?+?G???z??z???_?????????#???H??FUT????al??&pA????4??b?\???NL^?D_?z?????p??]?\BTo??&?????*:?A????????????????????:?pa???S??5???B?n??????O?F?????`V??
??mpAX
\`??@w?
Vza? ????+???x?_?E?UQ?)??;????????A.????s???%/?a???!?6?FA(\???Y?VK?!x?i?
.@???)??g??v?1?
Ag???m????????????x???UrN&??L?@R???p@i3?$??$???
paC#????p???D%???L????L.?
R
?=??
2?k??<!n??!C?9??p-\Cb???|?za?H????????
??-????9~w![?=J"?J}???:u1* ?V?
{?b?(*???x?)S;?^?Y??????s>??8????????$?~j??w?g?]'"}[~|#???>a\
?!??	5?????x?J
???*y????>|?????_?]????9???>p??=??:_???*??	?? ?S??\??????'3?%???????{?I???#??i?5???'?EZT?\N??

?E???M?=???[??&??k??l????????sZ????}??????FQ??|?????<(}P??????c??????9??#????????l?7???????|p??????]u?r??;?T????????
????<?0???:|1??p??U?V-Z?Hv?????
?YK?<?2???,[?|	3&Bl???F???I????4J?u?}?????F?}#v???~??#??`?QI?:???a?eRe?=?V&E]???E?H??: E???6???|???{??=?p???H??5LL????[/N?La?e
?7~?8???=G??????t?r?L????@o`&a????:o???3???,???y?f??:z?,???{i?w?
1?????u????&?9?????l??V4?p;~T!r?x???????>^?6?1??S??P?????C ??,??U?(????2)??F'y?r?l\??;????;L?3?)=???^8?O???0?75???$?x11l ?1???$4??????? ?	nbpu??t2db?m??US?8o?t???]\??f?n?Y?`???@???={p?????O??8?3``??>?cJ!??!?=?\'?$?8Q??O9kt??({??G/1??#???
???L9??????|X????C?,?????#?2?pB?x???^???^FuD|#??l??n??I??t
?O?N?H?2H?3.??C???\??2^?3?<? ?N'T???????``??5>?Q??P?N??`?[?y?R?5^???$y??????M??q ??8A????????E?6??????I?f????7Mt???Y??i?L0??>0??)1??g?q'????L?B?u??%??C?(B?CG'{d??k?$?G???r??0???????P??XA??`x#F?C?q???7?V[?r???$]z?????M????????O?P??????#???S{?????????>???7kx?=??S?(??S>??????,?
??#?<????=??OO???c??_??????????V4b?G?@?)???_???i=!'?2 AS?d	k??S??(??u8????Vz??r)???
?D??????\|F0?I>)??
k????u????@r? t`A?A??e??k ??+!&D?Q?<?x???????[4B???A?v?`??F?	0'uJ?B??q?o?????-1???H?3-?
???::Q????cFh?/???#??I????????? T1c
???7z?????9?S?,?@f Q;yb??k`?j?
C
???{8???8Mi???^??????d???IQ???9`=Oj?i?L#???n4????
??T?
&??N^?.??D?bJC?1???X"G?p????N?d?6x?&?p?J(iIY?:??N0?y???P?Ixa?? m??$???U/~t!%Gz?t?v??k?+???t??x?
?P??g
?8?R??6?#5eBr
?CGi??S??1K/s
]:??ox?)?Fm??y??It???F???0??Y-???b???? ???0???*?????e??bh?@?a0>?
x??3?1??wUH????[~?t
?`?,?g
0?
?6?c??6?Q?p?=?!`KX?????G1+?.#,bvI?jI?	?z??????Q}?C@|s?????9?Q????????>Q`86"T????d8bt?~??v????q ?????Y?V?d????H?9q?{K?|'??AN?p???7)?@?U<H{??uKd?]l??8??bR???`
?F?*??\"?G??<?d?v?7??F?~7\"?\?8?A??	w?,?KJ?G?Tfx???E3???*9
=?????d?	?@?sl$??Dt??=
????'A?FlF?aw??k??=
J??	~<??*=???~?&?`???!?=D????????D|??<?&qA????o??,???????h???A?J?	?????????
5?Zy:Lb{h6?t??kA\l??a 2?gO-"??8??(?7?????@N??Q???^??Np?u?q
*8??XF?GA5?R^`
??4????g$??|"dC?
???P C???
N?0?)X??????J?*??????y?
????'??c??u}H??	?P?Qx@d`AH???O???2?amT2?
??V8???? ??C?.?`X5l?C0??1?C?!(?	9?.?7	???"?>P ?@W?6?Z?
GhW43&'S
u??5 ?X?	?????P?5??k`
b?=? )???^
Sh
l??Ps`?P??*?'? S??>
/?"_?0}?'??1r`01?(?b?H``^?%??L?*@?1?A? ??]?83>?x	%?15???x?
??z?8
g?????X??Cr
?0???y
??*??=? =Pb
??@?????q?3!1?? :??F?s
????
??	???0?v
N?????Gt???D? ? 4W)???????? u?#????KY?Q?Iuro?)???G????At?0foN:E??K???g?P?o?&G?X?DT?C???????IHJ??n????L?D.q?qR?oM?oB?X?0????qzs!??*r!?!?Eto?p
??t??o?ZDN??jC?@??v?Y???z??HH?D|*s??;??-L7q?g????F?^E???7I?BU?????G???W<?`?,??D?P?gDqo?Ze?
?Q?aw?r??????z??I$??????o??x???:D??La
J?)????Y?S?)???(o?}??[
l?tp
?p??5?h?r;uZ?
A? ????7	????????e:C???^P=1	9???0	3?p(B?????:W??	????Q2?tb
???*?@@?i3??R1??P??????K?%H??bpEGWt@f??E??'UU` ^?_???G??h
	`?_G??6JG??
{???*???{z&?????????)??^??R???cv?L??Wi?????X???^pyE?F]l?Z?0?w>p7?P?jF??5?;	~??
C`i??bhxk???
)!?????dE????	??=?1?;;??,?`y9Q???@\???
>???P9@??t??H;???????
j(?p
5???e??[???X????T??#??b`%????	??*?/??
C?	??X??$?@k??Pb?`???c??5dI%?8???@[?@??)??#??
R??
?5X???B)P???	dk??????j??
1?)???? ?|??` ?
X?TG?b?S,bp??	????{h?A5
1C?? ?2|?d7b??vI?)?]i??/d?tZ???'?Pg???nX?y??????$????P?P?sLh??Z? X??#??":;>D?g1F;AU`(C???????4?0
?5
??X??|?L?.-/k?S%mH;????b?	?
??g???y?	???X??? ?
??g???H!{]?@%?9?S??????	?0

??`	g??{???n?	S??pv??ZE?-J? 2F?a
??hX??7{??{?kP?Tp%??????*?0??P????b6?0
?
T????"^ 8?? ?g
?????@?Pv
?????$?P4S?UJ?	?u<???kV??Qj?{????r+??sA[?$?????'????????l
"t
bX?12????/??'??aEz>?@????
~?N%U?^???QfB????????#G?;?JE?So????@?>"???z????A??????*o?F????RT.??,"???N?????"???h????Jo(T?#???????z???`???????I?u?z???qOJ?n:???A?nD????vG?Zoz?oo&???o?d???u??:?
1??f??>~?w?yj?E??|??k@??$??Q?Yg?t?Ag?_??'??q?H?!s?q!Nk@uo?q???????/????H?o_???
PE???????Pv/?$D)?|}?U*H??cA????!T??????{
0?o??fyG?!"??w@?w????
?>?'???????=S??????X
G?zy?V?_Bf?FMz?f?2o?d?[?d
3l????b???Dz??1??g???Q?"[9?????w-?;D???????,b???2
L??b?o?#0^? "6???!b?!?(??uGz1Y3?P?<b???E???<N? ??=6???1???G?????m
'zb?yc??!?<?k8??ML/0?!??H?QDb??d????b8?a????I??????X/Nk???4?_kY??o~?)??B?
??I?O:?{oD????B8?
?kF????R?6:a??=??'????<??????806?Q?6?,??	6??C*????o??eG6d???;?9????
????o?
?u?A?/T?j??TsM6?t?M8??S-l?[06???!fb??
K?Y'?Q:?o8)l??K\;"\Dd?<`???B?C?<?!f
z??=??a?or??????Q????~???&qb??'??`oE-?d
S8A?6??0?????k:8?K??CoLAt
0??o?k?8?
6T????????!|??<??5?IF?!?Re?v*????r?h?????~d#N?a?,??d??Y?/??af??5?k???Y???-?\G??&?XFl8qq?T???2??wLQ???!???
'R?g*??x????????k??{l???????0K??wp?g&???#/?@D?I&9y'*$fYY?4&??uN????R?L??e??{G???g?S??,Hu???{?Ayl????r??
?Q?Yc1 ?c?o?m?????
q?u??b?r1A?!D???;jBGD2?y?7?@?5??^?`?7Q`????:"?G?#'>K%3aD??q?5&??^???????X?_B?p???,?@\?p,?????Q?-?k8?b?i:?`???f?x

W??N???vH???1??P??
????E?{]?f?H??7?????J9'"?xsB^??w,???X??^??H9bi?y?"7??????ox??_?(G????x?`??E???oZ???????/Cd?
;8'??G!2r??Z8??@hM??}?Ckd?????b?X?x??_jG???8?c10y-?c\????eoYL??"x??????c????KN??<_????=? y?_?%X?:?x?,b?7?
??????zX?
V??8??:?A?h?q???g@'q?MT3Zt1A??1?????c???v???K??syt?3?e?^<???E??fu?)Z???x,k??Z"????c
?vu???_??@
??yS?@???? ?/?P?>?"?}?D*? ?T???0C&???)??0???|j?"???~??O
_T_?????????c?H??_??[???
?
?H?O|L?\O?\O?|O???j`???O????t????Lc?Ia?I[??????O?O5???????b3???????_???
?D?a~????a?r?N
N?VaV?&?
?b?`?&??n?&?fa%a'?b Qa1c2.c2^/??_r?Hb:??vc???Jzc6?c6?c7?c??>?c+~c=?`?v0X???`E?:o%
6H????C??th(?EJ?dJVJ?d?3K6Ys@??A-\???!??Uv??2??~?DZ??Wf/Uf?Y??}?"b??H~M?H.ee.eR.GS?M6?o e3P?O&ff?7i?dO.eI.?P?????j(m.grn?~?gFWt?<\???Nz?g{?a{[??k??w??k??{?E.?V??B???X??e9?k(?~??f?zx?~?z?????!?????M*K0J???*K?{(?a???nu?????v?h{?v????h?&?????????i????F?>?i??Vjx?!?v)???I .k=???gD??z?[??g??g??SD?N?Km5h?~?	??????vhr?!u??????f??V??????*??*??&??	??0????^/?Z?Q@???vh?jq???v???i??l6h??v???l???z at j?!j?f??f9???T???6?~?K??S?6Q????.Q???k???Nk??7l(?<HN??&q????g????kq???7?????7t8?kP???N???"??r???k???D{o????I?M?0y?Tpk??????v?k????vGt5??&t??>t??^g?V??f?rD??nt?T??}???????h?Np????a???]???8???????K?????M?k??>n ??~??B?56??as?1?`_??fq??~?!tx?<pksP?oOf	??	????W?b:K?f0????`?u?zZz???X7,8??*Dg~?LHc1
?fnn?
???n	o(3?dO?1??au?r??-g?f???>?d?%k??)?eu?N??-to?rE7kH??8??[CLQ??m^n????Y???\?g7??D??qpf7??.? ?vV???y6`hT?)???X???y/?T?]'?
?3Y????o?Q?v??~??Y@? ?? ?L?1??Kg????Q?????? ??IxRg??????!?p/ /?tuwH@??QR?ft??O!ut??E??!?H?'??pPpret0?x???]??????+?Y?x??(?!?l?e???ub?u?j\?j?q?jD??D?V??j??z>????fQko??K"y??58??,*@tH???N?!??Xa?g?TH
??y??jP|?g???*??"? D?Z??]? ?|?bp?o???b'?'P
?????e???_A??H???LxV?|???g??T??!X?nDt0??_?>?ru\'???>??gPAkP????,gY???N8~
?????3x'8?@????????'??o???BH????????z??h?g?6Q?????>??,?p??W?B?(q"??/b??q#????)r$??$?-C???7*l???f-[6H?R	?4???)??LI?G?/?T?QK5?K???Y{??Y?^?????Vy?
D4)+>&????5??<'?????FL?5T&??H?\Y??????$_Pe????J??tB???F?"??x???Z?)9R9?6?)?)4?=}???5_f??H????S?
2~1??????9N>?YZ???8??<J????.??&??1z?.???lcbf1@???|?#???0rq0?$?8IE?r?_????]???8?V5?_?
??q????u??i??#2,)3??&I??y????3??LH8?+?l?X??LkN???[?G;??i??<????i:#??$???k>?????<?)w?????=???j?s?????h)?
c?????3??{8?1?I,????*61?S???8?v??q?	???A{?1?
?????=2??,?"W?J2?
?d???;~r!???(???Q>?????'/y/B??????#???O?&????7'u?m?1???fk?9???%
b z?%??^4???GC:???4?+m?Kc:???4?;??O+????5?
iS/??Ft???jE??w???;?Y?r?:+^
Ap??X?z????<r?hD?:??0vWm?C?????6Y???\S?/?h??M?K_&???5`?mb?z?dA+ASNt????vw?	"????Ul???XZ???I???1{~D?,xd?p?C?|??0??+~
??x`'~??w????8u??\?????tIr????"w??9???\?7w??m?s????=z??.???]?U?rU???bw????????
:?:???u?'?1_;????u?a
e_?M?\???r????5
0?}?????
?B'??(N`??x?|?"`?5??;?A??7?1??^????H
?Ay??zu?2:

.(???B?+??|>?CP
?Ih??5?Ey1?z?Jn?]??%?/????(?Z
??z!?)??@?????-N?T!?/0?1????? ??>?E??xy?(x?3"
B:?[?1??>??7L<!"?b???+??$
?E
H ?#/??
?c??@&/?7

?$G?C?5??y
NBtB????F+??v?
0?(?%?C'x
??"HHx??^?CF?&C
"8?2?^??,?"A?
?
?
.m??q??q???5??8A??.'?e?v?)?
/??)f?$??54d'?E??1'/?24d
????A?L???x?
lf?aA??P? a^
1??v,C
l/???-Q%{,ewlh?r?,uh????*???(??!???C-"NTj??^??????
LBX????}?t?dv?!?V?@"?L?
??7`Njpg?}E
?L??C3?G??m?
tRA???x??F
???(?X?u??
???LA??m?A
T	??D\CA???]C
XB?A_\??C???dv?`6K
?@????2PH?i_O?>?Z?
Z???O?0l^1?%.?+??@????k?:????????@h?8??Y?Zv	??
???Z????O%~Sb%????????[??
m
?'?c??2?)|??
??^v?,PA???`2A??4??:t0N*d?!B
?zP??:

ha?????+lL%??;?j? P4h??"???	?q??O????8lt?	Bs_?[??+J?????9?>??#oJ??@$4?????`?4KL!6?C???@8(???6-b???[?u\i[?u?(\+
??o\"?D%S?K?/?z??o[_????(]???>s{????a\)??"??(%?/?"zDT66???V?C???h?v???O?
?vh?V?[??????+y?????p???b;????5????E&??:?L4MAP??
?T?q?y?y?????y?{
?;?q?
??9?@?9?Aq?y??"?'?????O????:??

\???9????:?'????;???????????:????????y?Oz?':??9?:b?z\:???5?:???y?7??z?{
?+{????S{?Kz?k?????w;
????W?K????3???3?R?2??{???
????@??@???????|????????|??|??<??d??|??|?{@
??
?
\
???}??=?????=,??X
|?????~?7>??=t@??
%L?hbF?3???#?
)?h?
@	@JQ& ? ??@? (?pm5??#]????X???\?????????????2??d	?????&yBN??`?????j?+Q?@??i"??0?9B?t?QK???&?WNQdI??I3mr?
? ??>krH?tT???????)???3*?????3?@Se? %<
4???L?c6Hd??\?s?	???7??"D???x?!
?!???@??G?~?I??jt?+???V[H?$~ cFkV?I.QP!?X?B|?X_a???|!?d?B?.?R?:?GE??l?d?J?????>?>???_*?%?2X)????2?????f??b??2E??MS2#P????g??r?J$?*???3j???k? }?Aw2??Nk?j8???G??K	??b
--- NEW FILE ---
GIF87a?n??


???P
U3??*???D?? A?(????r|X??F
?K`?b??DsS?R?4?	??%??<?1G??i???;7??4?????n????:2??D?
<???+'????W??{?E??[?@?BM??tl2?2?9\???
?,.[????????????????M??N???????i[??Y???3?T?????2v???F????T????gN??vS
4@?}&???,@???D?$???h?4???Hd?M/H??.
<?
/Dq!SL1
?%5?M;
???N???o,??c????????U/???5???I)?D??)?????0?H0??S??_?i???R???2y??e?TG???
????t??t??	`?tk????3_??&???4&???O=w?y???^?????\P?%(:k?????#f(b?#?
?N?z?G|?eAy?v??w,?~Qq?????oo?+???q?P??-n?B????.????????d-??:????v????C.??X???????
cp\?P?iH???L)?y?;??j
??BEQ??Dm??>???P#la?K??B{[#?Y??2Qa??"?HD?2?V??X?????H???q?D?)I?i??iN?%?a??R?m<R???-@#?`
???p?)\???&?? 	-!Bz ??A^?2\?lF at M??(?)?jR
???gt?z*Y^
?A:)?"?D]??VC"?y??D??.?"?HF,???b$??????j(aL???b0?q}?22f?WZ=?t?&???mlIA?i??1?q?k?G?Za?l?`F??
n?o?2???
[Xb??????W??~iM?,?]uWl??G???AD??@????^??
???? ~???h]?8??!?,SQ}??-8.s?BVM

?`??0?
mP???b$??M)??????V??J&?;??J%?"I?\/[cu?n?b?0G32
l#?h??/N?Q)???H02p???45D????!?-??x?7zj??ua?Ft	??b???rBm???TJ?Q?@N?{40
C??P^,?Js?d??u????n???w=Gcs???C?`??/??*d?????8?1????.?????3>?c????1?=x???E???f^b????
???1a'?
m?@?/?????d????1dNHR???'1?Aet???G;???TL???T????{?1??A3???i??? ?
?  ?????@??x\c4=a???>???x?8???w<C.?CT?P?q??t??h_??????????s?d?pD????o
?
??	#(??P??[eDn?cUm%u??V??}?`pA?r??
??p???({ck	V;}?l?5

?e??g
0
?4???"P
? ?
=??0@R?
?	,Pd0?}??dW???w????H;?G?7~?r7?z?
??
0@@	?p???p?@7vb?????"S?qQ?Q?F??o???@
???@?[?v??6e6?fG??Y??
?b1??|??t????)u??`e ?G??T??,?3a"v,??(?@
|?'id?ZG'
?V??Ac
?uA^?1}!uh
??
,5n?@
~d?`???
F?t1??dT9????!?p?0b??A??v@?H???bZ??n
??
??b?B]?
 ]?c?x\?Pr$?ye
(@bp??8 ?
?
;??Q~?)0c???OQ?????????Jv
?0?)????Ua
?p
?`
w`
????8?p
???(p?Hg?t!f? "??g??s??6E`B/#C?}?B???
E??M???5?Z?z"?i56EH??	?6?!O
;xo?PX???{3??????o>{fdE??AC9 Xl`?U?D?K???e4??D?F????AA?	?
?D????`h??d?dM}Qi+?Z??"2^???????c??1Z??q????e??H*?IDa?
C??????
=r`?f?j(????DM@?b?=???bA?p? ?84p?@1??@@)?I ?
p??J????y???????d??
w??JDIX????9k?
w`
t?;??a???b@	?#???????`&? ?1Uz??0F*??g??S??gx????ZC??G?9w??s?o???`
??1???(G(v?V???p
?h@?`7: n?T???????sz??h;a??H?s???y??{{?D???????Y??K}???K?Z????	G?C?p?????K?????=	o???P?????[???aZ?0??????k??
A0?n??K
?????
? 
? 
?@{C??
?{[k
?	?j????`?????????
L????????????+?????t??b?0Kz@	zp
?????ap??
?`z+`9???DKe~k?`?"??????vP~?????0?????
??????=??}??~??o??<??|?????`?p	v????\?*???A
? ???.????{??????V?Li??????
???????<??`?L???a???H??????K??pR??`??Q?p
??(??L??R? ?`Z~??W???0???`b????????\-?~?O~?9?:
C{?E?r????vMeY}?N|Zh????O???x???m???zz?J??"=???? 
??`?m?k??????r??Li?p??=????????????
??l??~??V?n???z{?u=??	??(
0??????t???N??~?~<?\??? ????N^??T??o?m?.?q??@?h?????????????????q?o??!?'??~??ER??q???g??8??c????~????[u.?7??>O$G??h?????S_?
????q?_???/???????/?d???????????????????
?Z]??#??^?Y??
??B ??@??pv??

??
p?,???l?(3?J?Zr????E=????T?????8?????g?(?>H?????%?)NOi???T???Iy?QL>??E)Mo:????L??Fs
U?*????*R????Fu??+a??g?} ?a?T??Z?K?n??@???=d?`
? ?Dg?
N?S??
???\?i???5???i??S?E?????p_3??Jw4&?
????@???Af?.??{m?*?????#??????Q??5k?v???
7?P+?;?K??6?eK.p?H?J?h?m.s?{\?"??-"???]?Wx??.w????????}?r?????7k???o?[_?
????=\V
??n??/??+??7????L?2?j??=??Ap
Sh?4?@?????????z?
sz_?lt??i??9???????f?9???4?-??T?Z?n?tsIh?	?????+y?K3??JN??L?6L?BF%(A??c??k?-(?u.?
M?1"
?>?1F?Ej??	???<K?9{Ll?:
?)d??c??D?||?j,3???(????B???f?B?9??t?04*?;?)?h???3????/?9?F?????"?8????????{???&?$'dB?\??D?2QY?5@?????3??c???4??J??Z????????L`l??P?1?[?5?,G?j?O`???a??P?"~?xP?
f?????a?????????n?	?a?u???????]]8?O???p?p?k?Bcl8c5N?4?5nc7~c??????5?+8~?:>???c<?c46???p?4&?3??t?:?@~clB?IvcD?c;??1>?9>$2?d1Vd5???=??>f?Sn?F??Q^c?Zel?@v?R6dY?c[VeT>?M?e?>?S?cS?d?ZcV?c=?dB??:F?_cMVe3??9^?K??F.?1?f@?+b?dLNfc??M?c5?????9?cGs?^?ep?y?c{?Ne:~d??jNdT??>??O~R??v?ck?f]??3Ff_?dcp?`?f1~?	??????c[?+F??{fgjvhv?emiV>hz??h.iO?????u?02?1????????i??????&?~
???????6j????Nj?v
??j?xk??
??}x? ?~pk??	?????k????k?p??j????????k????Hj????f????F???	??6?????^??>??^	???????j??j?.j?X??N??p????????@?????m??????????P?
???8?????m?.????^?s?T2
g???o??	/????.??>????
_?i?vPuB?rn?vR?r????o?q"??\??C???H?Ts??:??qf?|?
???$%???H?fD?Z?????0?w???k
,&Nc?5?S
F?????
?X
?? ?l$+K?U6W??????B?\??5?S??\3?%@?ew?????
;?0?K|??
c(?!1???X?7?/??,A,"?(?)?&>????z%?'R??^??;?????f<#???2?'?n|#??????Ld?#???=?e?
m(D*Q?R4???E3???^???(G?*????
?",?O?Fl?d????	OXb???Lkz????4?)Ow?S?????E
?Q?:??U?G]*R?
??>??N?jS????J??Z?*V?JU?????X)L????0?X?&$?RK??s??]?J??U?t?+_?j??V?y-l`??"???},a!k??Rv??Ulc3+Y?n??}]Da????Y??mm??aW????`?>_{P??????mkq???????-po??
???=?n??\??v??m.t{+??>w????\I?Z??vVGlkw??`?2??5?A?[??????=?{k_????m?}????????????K?
????
0?	|`??4?+h!????j????zG?r???0??,??x?&.1?O???x?.n1?_,??x????ki??	c?K?}g?o%P?v??(rJ??a?"??KV????$K??O?r????,s??[?r???)??f.3???f,?y?K??^9?c??8?[?p/?<??????m???<WA?y??-4?
m?@Z??&??#
?I7??????3??Js?????;mhH??? ?i????mY?m??j???"??????>i?k[??(???}?a????.6????`3???vv??
?iK????????gR???l?]??v?W?r
??M]j?{??u????Zy?{???7???o|?;???????????>??^??#?????Oi
	?????6?z?P???1?e??sL??????69?O?????._??[?????1?9?qn???|?>??I??"?????K?x????G?vy+??N??o?zM??u?o??]?:???u??}?f/;??Nv????i??:?????O???<?]????oi?c?{\?;?"???:??[??Z??o<?y?K????<?1???s~????;z??~????????????}??z?4??-(nA?n??~???=?{??????>k??|?/??w??????S????l#n?o???e??g????-? ?>oS?z???????%????????????????? 
?@??R?
<
??-?@8???"'J?hwn?km??)?z%???R???!l???&i?Y??Y?h??H??L?`)???IJ\&l'?d??	??u?h??Z?????)??hx
????
l??AM???&*
eP??"??**?N???X??_???R???_Qj???e?]????j3r??r????T?rh????=f?6?%??A??f??Z?!B??
H????2?m?*???n'nJ@@+?>??Z+?nk2?Z??2B)wf_?j??>#??#)??8??f+N=????;??6?U?*??????H@???d???F?????M?I???"+Z?(???Ll??"??????&tl?U??@|A$??j???(?????A|AB???^?0??z
\eh??f?M??|???,???j(?
????ji.]\?????k#^V?Q!?	b??+?lO|m????????Yj|?'?.???????@?lZ?
`@??@?@?
H1n????
+d?_;
??M]r.?l??
????Lz`????B??p?`
B???4?%4F\H??
???|???`(?k)O
LP)???	F???c??????H??C????H??CP???l?
???2
?8?A*?0?F???x,??L!??r?;???H)K2Qh@?<9(B????????S?9A??&???>:???O??!q#]4??:!????kH;??LP??J4?????t??2?j!H
j(R?<M??7>?

?
)???u? ?[l??f-?o?y#WT*??:?5?;???W?~C?X???}????!4$?@4?
a1:t???`2/???G?r^??j~???-s#??;????t???IrY???/_??*N?????:|??HQM?>?(?6?E?Yc?6??
U?i?????Ae"n?y???@	R?G`?????5+	??@?Os!??r4d?luQK??g>q???f??9?#"?+???r??M?}K?????G}J_???$B?Qe?gO<???????%k???l???
Y
:V?????I?i????&?PXM<??????:)???%?????L??%G??j;?3S?????Yesy?`???:*^???b?????fM?????S2?????T?q????Q??E??$????x?&?')?
A~4?1?TC?h??tfP?@????8????F??Y?,TT??????W?`?Fi?E~2r??H??D?;??U=?TDP??W)????O???1?3a#??1?v??
??? ??P??r???
)?|s?z???"U?%3hJ?Y
???!?L-u???5?_??{????????E???Vz?bI?}?$[???'????<j??9Q?E??!?T?* R?h????1??k><??Z?????m????:?F?p?`?L?B???K?c?????ea
o??????.LY?\???4??p+?{,??U??D|y??fA?D?nd?$??H??%4T??S?;??j?|?$????%?sE??????Rn@?'??(?'*???S??:?\["???ZQ???e?????DTC???[7oVm&(0>`\c??_T??n[*??2?N?QoEf?i;?* ?h??}C?/3"9?-??T????_F?M?hYu?:a???@s?R[?3????qYy?Z?gn?(20??C??4_TC?u-????1Pa?????s??l.|?7??9??R??????;???j!??a?????L?N'*????P?e?GUgf??#?$c???_J?x???C????p??J}?9???M?
7?&??G??^???;`$?0A?Jr?k?Z?N?L?????Y$???\4E?1y?j-DSlj at 2??????Nv????X3V????X??HE????Y?j??[?3?^]?????E???x	s}??T??<&7??s
???j?*??????ek[?>?P?\?KC?????}????????6K???V??Je?6)I?K.ks????:?q??????t???b?vVR?Vi???d??\f?-^T?)??.JT(?qW?l?2???h??Mg??%???.0?i?\j+?q
??-?
?%?g??o??t???-?F?S???s?\?Ue&?
????P??U???9t???i5?????v????t?K6R???????U~O?bdM?XJ???s? ??(??Av?"F{x!????p??c?$3"??]?8?`?LxT	??h??g7w?&f??????I?f????????f]*)???E?o??RWb?1??Zn??9???~?U???o?VW?oM_%??D????TT???9?Wb??$3???#7I9????su??>????????Z????g4??F??IT8???*??E_
d#?n????:+?:P?x?X??,(s?J?T?6????mzeSn-??#????,k\????@??|?"???Fi????%???????rpN/?Id?*?&g?BP????p(??m??,?ZG?6???)??
A????l??K?????
????z??iv?h?I)??@D??%??;?g??J?6.?????l`????'_8????`?0??p???
??<?S?xp??$L?,JQ??&lyL	?v????Js??;??SL?j?"Ff%??;???J?	?~??
?i??WL??#???qZ
oF&??Z????x??,%??O?m?tnQ????u?+?)k?g
???????P?OFrD??N?I'? ?(?X?K??????Vn"
????????Y????E?:??B	?Hi ?????????????K._??
%f?4'?L?r*???_&	?h??|????-?{?????f???r*??*??*?2+?r+??+??+?2,?r,??,????g"S--?e????r.?a.??.??.??.?R/??/?R.?R0
?0
30??0??0
?1??1?/S2?2
?-?)?	3G???.?b(??HS4??4??3?J?L?5Y?4?4M$H34U?5Y?3as4=s6Q?qVS4?2$js4?S7u?4U34q36Q36ys.??9i?3)?8?:58y?;W???6??5??$?=??<?????-?s???S(?3>?#=??'???#???p>P????3@????|???t?rsA?c@T?4?3B-?B1Z?? 4C=?CA4(*2DI?DM??q???DY?E]t$F?EetFIT3i?FqC?3Gy?G??=??G?tH1????H?4I[.AWTI??I?mB+J??J??Z?C?tK?T?b?K?4L
?)?PL??L??K?tM?tfl?M?4N?eG??N??O??N?tO??H??O
u=????4P
?PWBJ?Q?Q7?C5R?TM%?R
?L-?5S?R5?S??M=5T??NE?T?4OM5U??OU?U??I??Ue?JuVm?J?Vu?I9uW}?F1?W??G{uX??DA?X??EIuY?5DQ?Y??CYuZ??Ba?Z?5Bku[???s?[?U;?u\???\?u"?u]????]????u^?uIS???^?U???_
???5`	????`6??5av???a!vL?UA#?b?a-6c?'^5?cs?^=6d?'ZE?d??_M6e	g`U?ei?`]6f?eae?f?cm6g?#]u?g?g}6h?K?m3??h?d?vi?v???i??<P6j?&X?j??%`6k?6%h?k??$?6l??g??l?d-?g_?6k9?m?Vi??kIvn?Vm=?m?j?vo?vk??m?U?o?v???p??l?j??qs?m!?i?vr??n-?r?3?o?;?j
7t??kIWh?tM?qU?gS?uCVra?f+wv]sm?v7@s?f??wevt?WeMwx[?u??aY7yMy?ae?y=?v?7cq?z?ww{?w??c??{+?x??b??|?uy??b?w}?5z?a?7~?z?W~??~??s)V6|??_?7?
?}	x[???????Z????u~!X]?w?#8-X???P3x^
???u?A?\x??5?MX\K8?}??YX[%?????e?1??Cx?c????y?YE???u??XUQ???????T]x??5??????i??Z?????{??X}x?u5??xW?8?%????V???????U???M????U?x?gU??XV?8?E???T???????S???uby?h???s???xJ#??S???;?1YS?x??xp???M??E?L	????QL?x?
??]yO?8???i?Ru??3??u?N????T???IOy??T??I[9????Mg??????9N5??????YLy????Xy??9?????????????&x??Ou??W??????K?9??T????AR??I?y?kt?
zU???Z??????????4?)I????Z??5J???q??E?G????QGOz?t?]zF?9?]??iZ?o???t?u?F?C??K????Yz??T???D[:????Dg??3????s??e???:Dz?T???B?:?C???A????????@?????????$o?Ys???z-Q???z=???????C???13?[??????!?%{?)??-??1;?5{?9??=??A;?E{?I??M??Q;?U{?Y??]??a;?e;???!? ?u{?y??}???;??{????????;??{????????;??{????????;???????`a~a?????????;??{????????;??{????????;??{???????
<?|?|(?x??!y?S??a
`?=U'?A,??1<?5|?9??=??A<?E|?I??M??Q<?U|?Y??]??a<?e|?i??m?????
N?@a?????<??|????????<??|???????
=?}?	??
??=?}????n???mx??-??1=?5}?9??=??A=?E}?I??M??Q=?U}?Y??]??a=?e}?i??k?x?????g???=??}????????=??}?a?????=z}????????=??}????????=??}????????
"`?????=?
????o??????`??}?????????~?	??????>?]??`<????A?<?????a???x??)????>4??

~?Y^?=`
??b~?A?k??P?n?????????m~??	Na?C???A?A???D^??
?!?x???[??A
D??g
??5??	^?%|
~z??A???}
P????	??????
?@????????~
n???xkf?s7?#?_0
tG??B???h+??-?0g?+`J??)y????pw????
?
k@
? !3?#Q:??(?t????
@hh?>?x8!??c
'???!k?CH???d4S.p??0f??-???
&?
'???N:?(??H1??;gN???%??????F??<?

*f??S??\??K??G?xp????'?????K=??`WPX`b(??I=????6??U)hM;Z??????O??71?5,A??G?? ???c4"8b?E?-c??
0???;x??@,e\HS??
wqT3f???\k%wb??th;??l?0
K?l?0???????/y?;~?Uw???iKk:"??Af?I2"???idL?k4?L1????{?di?j?<??S7?F????X?!k?
Z?8??
B?PBkM???G??????,?5?2??S?????u;d?????eO??#?:???
?????gT???p?k?g?N`T??2OS??P??;?I,u+?k??QH??????Rn<?5?2??5"6???7)3?????l?????????=????K??c?LiP??.	???a??t"H?@?4???th"
?
????E?<???S
u?W???? ?5+3?&????qa
R`?'S??h??Q?0J??????A	O?
??~D;?
@?cU?mL??????p
?@	
_?A??????
??r^?2??M???RIb?	??

??c??????(???????3?`L
??'?1?eh
i?j???p?|(v?1o??~?y??edX?M&??(&X?
?X??H?`?XwD??????gh1?H?????[?j?????????????	????7?I
?>??1??3??c????cD.? ??0??F?1<?b?(??T6??X(?'YO?'=??G(??2:3_?? ?U447???4?t{????2?e	Xc??f?Kiy??D?T?6q??@?ui?tI	???8%?
[??_???@YJ?ej??g??d*?c??a??n??f??d


	???^???@!q
?Y?
??*?????:??Z??z???0??5O?&a???????????????a"????
?a????????
+?a??SP??
?hb?O??
??{????
[?;?k???[??J????&"???
?&??
?9?3??Sp
;?{??? k?+????K?P???????j
b?uk<?a??0???e{?g+?k??m??k{????sk?t??t?r??e+?d?~[??;??+?z????j???????????????????????m??i?????
??,?|+?0<???7
L?/<????H???k??K?F???Wl????J<????_|?E??l?e?k??<??b????=|?l?J??r?8|???|?U??\??;\??|????Z??O????d{???"7?t????????N?p|?q?????<M??[???n??D??B???L????\????r?v\?	??~??
???\?i??,??O,?I<???B???+????\??l??\?2??_??:?????????????????|??????????????F\???????????,??l?>L????
??C|?m???
<?M??[??+???m?????p
?b
Py?? 
??????P??
??
????c???P????
d?????*??k??CA?`:J7@???O???
*P??????8?????t] _?????U?}%#$?@
???$,`K??^m????\??6V???`9?Y??V??e?
@
,"8?@
? U??????z????w?%?ceX??????	
?Z????????,l.P?#?b?~??V2??71Z?Y?????(???????
??F????{?a?:???????W~?????q?8????<?x???B????y??
T?XI???!?t5??8?[??????\?.s?X0???4?"?,?>?+ ????3?,?yz?8?<??TC+@?
?-,??<???#B,,RP-?7+?
L?)l?f? ?z+?<??|???4d??;C5LC?????/N???2%3??>W"#???>D)\:)]D???$D@?C?????*P
@*RH????r
#?

P?<?	p
P??2???????
?
?*DE4D??J??J?????6?????R??
p[????????k??,J8??Y\#??K3???a?"??K.*?
2??E4xG4RGhP??L?t
??
?J? 
???	?/????????.]2?e??>?E?[?0

?
(
J?&?
?a?.????^?P???Z

H
?
??5?G??20
-?h????????!????
r;??A??0k?z?Z
?-?.??????X???<;I&5RB??X??^????e^nj_???*????2gF???Z:&i?Wf?7L??C+Z.???;??A+k?F?T?????<@?????0Q?*?????7{f???A????5??ITnT?[?z,???R
_?	G?
??5??*?
?m?e?A?XK0??
=???d?gO??66?WE?l~?nM?&|????1?)V?8?"?Og???D'p??

??i>L??????n?x??
?.R?mMj?[?v?5??d?
\???M???Y??8??
o
??KAmt??<[???<~??o???J4????0??H*? ?8P???E??4d)?	
H/
D??F
?p]^?B?

S????c4???M??Uj????.g?
????????????TL??????????*???=??A?&;?DF??&?dR???`ZX@??	??????x?Th$??E?&G_?pZX???N^
?)???-?D?L?!???'q<???8?@?????hH,lB?F?!?7???!?l????];XHo? ?T??!=7??=???~[?S??,?R?;????p?1E??P?a\??]U??^??eVb??[??^??waQ???;k????7??~D????2e?h??6????|uQ?Q?%2???N?C/?N????h?qL?(Z??K=wq?1?S?!?<F????????y????????
?m??^~X?@b????_?2????'7?_??
??J?;?p(5,???rR?pS81e(???Wp*?$?		??V??+^+??K?
(??$?@b?^uN??J-gY?D?2??S?2F???2a??%-C??)?t?:?	I?D?d?????WH?+2?CJ?t??<??u???????re?8?K&?2??
?JI:L??1GA^?x???<?/2?&b?9??r
`?\?5?i?R*EQ?L$???"EL?J??PO(??Uc3.?PQ?P6??Bb??
g?X?*?&??l????t??E?1/OG?%u???>_???7???KO?+??IWS>^Ul?t~????_??h????qidP.???R?dfOy????????Y????}??J}?P????jP???iB7E?P???M????Q???Y<mT?5?? ?}?d??????l?I5LV?J?D??Q^???=??&dJ?M??F=3s??_?)*az?5?;??????}??????@UT?Ge??4$N???23xH?	+)?)??-??T	h???? ?-NTo??Q??su??9'\????????[?N1#????3?????S
	?E?E?
?{?}+?mU??????Nb??C|?????H?
O???ODA???D??	??\??u?? 
?????uP?????E??UZ?!2?]\?P??n????Ad
?l???)
?	8@?(?
??@????b????A?Ty^
:?[???P?o2[~a?>?{Pb	"??K|M
`f?o??????????i??A?I|@0??d?|????qxA#???@?
$?}LEU??K??o?p
?e???Fj??DG??	I?P????XA?@?F?^???B??H?$~\'?????	}??P??!?@tPA???L?s?
E??\
?@??????A@riX?u
?
????I,?6????8@?????(@??A?s4Gl??@??????c`?	?
????KR?l?r??
?4?H??
??MA?@??????
?&aow~{AS???B??????
@??@
4
? ????,-????A?
!D??`??y?? C??2
???G?L?ea?????????u??th??I??N?-
??t4???!?!p????;?UU?????*j???%?2?h?.
?z??72??)????

 A??*t?K?
??? H@??
?
A????"?2?M?7??
???7>p`
??????????Dq???@???d???O]`?>??.-??>R???F+?0?z ?)*>H?
4?|??
?2$a
?p????x??,????1!?+?X S)P	??9?A??>???%?bE?h=h????bC\`???????C??L?z??3?(#???>4?T??5o??|?u??????^G??fW?02???@??3??d?	
t???L?l=?JRJLP
??Q?l?%H??	?
??
P?_fR
?????KS(??wY"P2?*?(	?hyy?"???9??%
??U|T??&???Uv,B,g?&?]
BR?
)?0B ;??6*2
????9
?
E"??{??? /IopR
?
u$??u???
????(C?	
????????X?TXU???A
?????`???	R?bV?vLT-?h??nd>e?????	O
.??~$@?d`P?2????x?I???p?A?[-?z?(?sf"<E?a?P?C?@???^_v{
L?
?[???.??xR???5??$pA???+?
s?<?+?\?????7???1pv[?x
;IIb?????,?0?:0D?P~?F?C?Z??f???:
?#R`?
p?V?
2bO2?SB@???W@
???M?+0?
??z ??*?zMOf]?)?f????5??kQ\tCd(%(?vx*? }	*??V$??.??J?@x??<s??C? ?0G}???f&?D?? ~c?-z?'??U?(???'|?]??Gb??????h"d????w??Q???????*V??Q-?'?QK??L?"?B?"?%?V??Bc??s?7~q?0G-??*2M&R???Km??1Y)o?????????C???J-R???gV???K??G?QK????mQ	)Q?C|,=?"?PY?!?*z?k??%}???C?P??z???K#?"
nC=a=????NfB?+???&lI?e?\?}??*?d?????k.*A?N
????2??j
?u??r?K????[??p??;eeQ?x?mQ?YSQe?q`?2T?Q3.#qn?h??SOV?*cG]VG?v_
3
kq.X?_??tV??d?w'??2??wCUF?6A\M2?i<#?l??J]6N?(e????f"?W??a??J+ik?P?E?u??]??_??mM?0??w?"l0 ?Gyw????>Xye???6[??K?wz?'?2S.C
o?%??;?c?uj??n?5JY?{E?R??)?s_??%s???>T???O??%?84???P?/]22?ton???L_?P?uRKnp????T???]??P?izj	Y?t??5 ??Dk?U??8??MPe???hj4?x2??'??2T?{U?>??B??0B????#Tz??zy?Z????G??dM?{?????R?8xk?@$?p??YMpP??]{??o?=?vO???Gr?Sw??v<?y??\??A	?O%?c????6L%s"????8_[V?????( ??RyDVY????????){??w
??k? 
?a??&?43u\??H?3J?dj{?

? ?M?z?E2!C&|a ????????a???@?(?GF?@A????IT?`??2??UF=????!?j	=??
	Qa?
kR?CxQz|0?Xoq??z?E?T`>?DTd`y
p??FI??G?05TJ?nB?`?	`?|??Z?t?F??
????0?<,?? ?3?B??AY?#1?o?????@mG?[z???',???c?)V`?q0c??9??
?`?(
???????6?s
?2`??}@
??@ ??R

T0AL(???&?B??

??y
aX?0?????i.?B?C?4?)??
??`z??	*W???!4j??

?????K"???.(
??~@???/V??r`w?B?$`?g"?o?~Y?H\?
c??@V?I??*
??#??1JLa??/?????m??1??$n?D?`
xtTH1L_?4?#????"??$r
???1?gY[?`?A&
????
r)??(~:????
??
?eQ4q??D??X\?^??`?`????q$??!&h?BQ>
`H8????X
@1Be#?!?
?KoA

?>?5~??\?Axx)jl?=?
?$0??K<?k?A
??\?}Ps~?@.?
[	
4?YVd:?`:m?W6?3?W2a1???,$??g??$u
??
C??u?? 
???gi-&?%X??
%F?????????Jo?^>????
?
q?$6I??v??	Yj?e[?a1u?e*!?(z5ts??b??????	)???k
3i
?r)u?qW??`??czV(????Hs4???.?5^?s??J=?
?bq@??
	^?cq?5&??bw?K?!cz72M?i+?`	??!?
'++^??F08=????G?dO?iXBI?Ter90??bK?s??&L7?@F0???8 at Uj2?T?????TF???@?t:Os?Z?4.p7:z?7^???e?V:?C???h??
???+E??L??C?38g?1jw^?@9`8??!?
N?&|31>E:zdG?t??=P&y????Z?>r???@?????89?ARK????\)@????V?%\?=???2?(???\?GYc8?J0hPZ?V?8O?W)?2.3(???????????k}???y???X??s???/q?iq??)??T1?Lh?)?6g??X-????)P?????]q?Qai?,A???????}?????@??????S?7?hP?a-?/?	???8??????+?=\??-??Q1,??[??h
??
?-???z/????????????j??LV{p(?0Z?!M??!??????K2B?J?h5
?;???????w????5???0?d?M7?c????B????KlF??(*??l*I?$??.???@??qQ?2?/C*??/!?D????\???DQ??t??f???L?2O??J?.??>?x
4'??Q&????G???????n/\y?s????!??T?dsuqBO?R??"w?/??jtCR????b???????6?x?@?t??7_?}??'N?4??<	%5-?t??);DP??<k(??z?T,?
w?Q,Mb???3,?Z*???&??Gu-??:??????4????\??;??s??Lr?Eo??)??+?Z????<??U???,?????Q???;?<???Do6/?
??)&

????d???H?r????7^1?43???;p??c?P???[?n??.??T???R?I??GBTZ?Lv????]+???N/F??"???2?&?s???_YS???:	?e'gj???ey?J7%)?A????&?^????;?&?lW?rre"????????P:???.???R??????????bC?Z,??v?4?\??y?D??7@??_???649?xF*>????+(?%G6????v;d??q??]X??4?(??R	?(?v-j~?????????f?)~?????G at M???|t???i?Y?]?(???B??H????'_????uo?)??$B?S!%W"4?a??P??A?	??>????S\?R
	7?2?8j?c ?'?-?`?RD???|*.?q?^hr????4?E??E??qA	]j?????r??O??:EN?4g|W?B??Ve?????5N?GJrJ
W3GM??3;*??????Y?YEK?z??????b?4??R?8B?H?c?D')?$M&??f?8???E/?? ????	_??'??!??-??Z??C7??`??I??(?sH?t[?^?N?(;?!RiP?LB?E????>J??????!?F?"?$?k?A????A?5q&?te??'
? "b?s?e?9??>??U??$??I?A&{??????Ai,??????>
r?S????h?ET?c>???>??oj????g?.U???_J?T??????G?!]?h U\P????(n?H$=?:??Y?l??v?D???? [Z???,?)/&s4??|v?Y??k?3d??CKY?N?f?h?&*O?[?j?X??Tm?Z?R?0?N/U??:?n?I0?????x??6???=?;^??5G"?Q?x????P?:?R??.???????????.(Aj?????J???O,?[^???CIU??.??#.EIJ???y??h??RK??_?	LN{????eTen?YIK???PPQ|?Bm???h????1I??NR??
??v?un i%?
?@?#?W.s????U??5?\ ??]I
?`??ngEU?%d?=???r?????K|??;E.>4?]Wd?.??u?$???b?????-~I??\\qPy??l??S??"???j?<2?s??Z?c?????$?*4cJ(/*-????P$Kd??)?|?s?
>???lq??
???L???G??a?D	??C???	h?3????<?=?B?4??<??lUj^??????0??c[??uE????F]w??"?*?I
??Wm?U?@Y?l?2???s-???B??	??????8???~kS??b=l4?f4:e?D
I?im???]<????H?)h?????]?7???k
??<?9????????s???^M?R?)(1B?
???8?Pa????p???@?qU???_???Y;??????7?%}??
??c?B&T?Qy??????A?S??c?????6?	???b??|E??S?F??"???
T?8????y1?+??s6?Gy%N9????Ur/?#?u
@???i?%???0? ,	q??4`???)??(????i???D?%?Q?={?Y?q3$??8????????q??p?:1j????;?j6??C???<
??0??3?5A+????@?? #???? ?Lc-*?&???`)?r:??1???<??	???!?4?p?E??:
T;??P*Yl?????
?_aD?I???????S???0?)??H?X7?????2?9??BK???(??????????Z)???D][<Y??5???q???I=???CG???2!?#???r???!H? E?"?3??"????LK
????<??TT????)9?Ro??#Z?

c=???????[j?E4?"?j??????&gq?	??z3@???`?'#G???*???C??0??!?q
?X?}d??H:??+?4?[?G?(?(?l???8B???!?@?#????3w1<x????4?YaI??<???? ??+?
-V
??TJ?????
?? ???=???'??-????&???????,)??z+5??	?&t??Ca?'18????8??)???J????"9??0E5#?????8&??E?jN
?????J??Nb?????=?J??/H???????D
	??kMJ??????????k?iS?}????90????????	<?,?"?)??Bf??-?5H??Q?????5;%?????-\?????-Mr2c???3#??K?3??3?1.??a?J?$????!<I?	?	?-9,?|3??N??fl6S?c!?`?@????1? ;????i?????1-???*??)?l??????qe????/Cr????P,sJ?;T???H??L???*??8R??????XC?EA0^y???
1|????
k?$?0?%2???i?`???
\????`
???=??XA???Z?Sv??DZR`??2?W?T??&???????-l???XL?H?+??{????'?
??=
W????kv????,??~?????1???S??;$
"??????0?|?A?)%???x??E9?PX????4?$??3"?:?pc#?,?	???^???P(?!???$?8D}C??p????hK??{>?)???K?
??3???A}J??.-?(2_???}s#??&?i??7T?????#?W?<?]??#???/)?????????=?=???	??j7?b???N????}??^~??
???
????P??J???;???W?a??@???"?r??>?	?)??&q2?9MHj)??RN?A??$???]
$?????, at 1fv???,$?(??Q%?
?????Ic?B?'4?[?N?,I??D??????Qid??d?]??=????I??(?U??r/v?439??dEF_^G??????V?]]?;2Z??R?ET??8???E?d-
?doY??
Fv3?C'?id?p?(????c???~?z??}?g{??z??y??|?g??g}??{h?6h????&?}?g?f??.h?Nh???&h????N???h????.h???????~h?????h??h}?????h??h?h??g??h???Vi?f?????V??6i????.??????i?????=?{??x.?~??~???>?s|
??j???????k??j? ?k?n??>??V?e??????k?Vk????6???k?l?????????k???e{l????n???l??k?F???l???????l?^??>??m??
?^l?????l?vl?&???m?6???m??~?k??`C?jA?m?????m?Nm?m???????????.m?>???n?^???n????^??Nk??m?????m?Fo?Nn????F??vn?^??fl??o?nm?k?.o?V????????\??.???o?o7?????????o?nm?????n	???q??o/o??_q???????Op????o
?p??p?Q???7??v??.r/??p???q??p??l?F???????????q?l?q?^??N?$??*???^?+G?n(??&_???s?N??fs
wm???.??????s8)p@?qu%6ccW!?,o??o????vo???4???~??r?6?C??)m?s?F?K?r?????gqI'?U?q???27??V?W??pP?
3??2??K??>?C?A
 F????[O??u??qi?
:??B?k?qc?vL_?
?qwn??0!??vjW?X?vo?q??tgw=2wx?w??w6??Z??|?d?M?'??7??G???>$n?w????????|g??????????x?p???????'y???/??W??gye??m??????yA?MB????????w?w?????'?ex?-??W??W??]t?????????????????>|z?????@???4	??7???.z?j?g??w???z???????=>=?????{??y
???|?W{???G???y?O??w|?????????????|?gx?????|???????'}???.??W?????w??g???z?????@?-T?????}???????????7~yrz????g?gn?o???????d?????,{?????~?P{???????'?????G??7??g??/???}???_?????W?????w???,h? ??
2l??!???'R?h?"??7j\'?
 ???&???k?.??z?}?)2????.l?0G?Qy?E??1?????
??????7s?,?-?t?=?.m?4????N??5??w?-?6??????yy7?????]?1????3?[*????SwM[n????O?-?,?????5??<????z???=??TC???o?>?????????C?????s@? ??]?Z?J(?~Zxav??U?z\o??!?%Z?QO???"????Y?1?8?S


--- NEW FILE ---
GIF87a???


]?^UCb]YWZ~Vd]*Wd+?][^5uE?
usw
	?,??8?azL91"(Ax??Q
a?B??(:d???^
E@???/\W?sp????"?`?W?c?`????s?0 ???
Z?T
??F??5????@?&c?/???9z1?:
??%=???`??????<?!t0Q?h:?i??wG?T?*5?t`???`#q?D?????k;?aB?????GB??
?????2????r?,gq?r1<?`np??\*2_??`??	L|????M?	??????????P??sQ?????5h??(?????KC?9]<?O?.???5??ziM9stI??	?^??R?p?_l??<???????/W???N?"???(~A?[?!
?8Gf??????9???j?E??????%*4?????P ?DLj??X?<?(|???1X??hG<,?	[???1?
'???????[\?????iu8?R?Q?k??	?CS?
p*? ? ???s
l?????=?v/
???????!(OD???8]???6 .u????+?]?CP?8?(?O????j?H?Q??d??0?"???h??h~???W???V?F=8?????`J,p?F??gp?
????uEZ0??	?P???"?P???&q??
?K~????
B0ik4?O?@?7)?Y?{??#>?`??
\FPPbP
?_?
?RIgj}???]p????pr-?	=@H??f?s??iY?X?]???qt?pY?????t??	??	?
?8?(
??1???
?>?i'???5?0LXs?`	i?????xY??R-?{??v?&
!
C?r05??	???`s1aufh?,?????i*?qw6q8q	*??8??????7iB?|
?Q3?R??b??m?}??}???c????q????C&^h?iU?e??R: 
)g?4}?????8d?"?qj	#?????f?6y?u???P~???? $VPT?BP
?@?(d??9?	??
?`
??
fS
?p
4??y
???@??r???k??+;??]?u]2?C?X????iBV?a???S!??0k1?4????Kw??Ho@? ???@???

??????-E
???~D?2?E}?`??? ???Xv? 
?Pj;???q??b???-????Z???*c	}`	?1
u
CBP	?B??0?????8?
??N?T
p??6S??'6??????@r????)?-5
Z ????A3@?
?Pv?
?q??????*G????w??E??L??U??	e?? 
???\?-?????y??`??,?
???*p?	??	??
???}j?l???	/?
-????L+?B{{???85@
?7??
?Sg
"??o?<z?\`
????J
?K??
??????|?	^0N?
?cN????j	?
V?\@t@?s
?~m?I-?????Y??SP?`
???3??? ? ?w0h
?????8? ??	?
?????'1^8`HC??'!??Zd??J?`,?(?????2yp`???L??_??P??
??-/%s??T????o?????FG?%?6??:<?????`????	O?y1
l??J
q???{
??q??	???p????{??f?o?H?t,Y???l?????
G?X&??
??}-????qS
??e???N??-?	+mp?x?i ?P?w??>???
u??m@a???fw??K??(??`_?P???`
???~?9~??"p
=?N":??????H?&R??[???1r???"%??Q?Y?j?????|??????K??%/?N?=??????r??AFw????)?!???W?('?v%???Y??$?Zb??H?^f}N
??????????-????&:???z2??,G>???/??\??4?)aD??M??d] F???%m?0??WOb???|Y??-???'9L??8?`
???c???+`??cS?i
T???%?Dq??a.??
?Q??????%????6?b????s?????5<??	$ !}???7n^????v???!?a????x?4??jq???????j?|C?l?/????Z^?BI6N?cad???z?????d???0?9?
u??:??*?J
??????????\s???`4?7??
?]L??????h?????iV???????q???6?Q???cZ5/??#?G??????-6???F??'??mj?C??????|?mn?A????z?????	w>nO{??l????t?zz?c?@>4z?d???????v0?E????O?y???]???????{???8?1???5???
??????_???T_?????????@T{??{?|???H&W???I?gh?U???3@????+??c=~????????{=L?>?r>??>?B.????}??z??
????L?wP?[?~??
??|
?????
???P?P??

?Q??5??P]Q??-Q?%'e??Q
?P6???	?? ?QRU??P??R&}?E?Q?R6LQ(?R!-?uR??!]R?R?YX
~_??	??
?_??
??u??EZ????_??`>`F???[?a???ua???`f?na? ?????^?
?!F??
v`>a"?aFb'.?
??(?b?#6a,F?%??)b???n?
???
???-p{?Z[?l?=?????5?Gp?p'.mF?p?gR??T???????kg??M??N?Wq?bjV^?mN&rn???vg?p?nq!?\???}?>????e???????qx?g-@?3`???????????H?3??3?w`??^??YSTZ??w??6????<????u??:w^tph#??Lx(??8
-??X8
???\l?x???A??0z39o
`?#??A?^??A[y
@etx?eXyJg???&?b?fnr?Mg//ww7|d7?Ul
???\xh ???.?d?v??jAvp??q?^??'?p???Z
"Pt?|-Z$;?C?2}??&H?4
*M?I5?R?>??[??*?zS?vM??k??L??]?m?z???u*??R?A??E???\?G????"M?M?J?t?A?C?>$?o?_?y5??'O??
????oV?Zb
?p??h?H???2????- FX??Ew?i???#k
?????


??B`?@9	c?V9?	???8?}V)r=?{?n??v??[?>bZ&???~?%????!????O???3(_Mm{T????mP??"??????b??????9?Y??L??_????ZV????VQ?.?	?V???[????E?w?Ij?A4>?wP?#5?AQ@?;?q????'?????Y?F?IN(?????? ??
?????j??8?3?????%?t??F&?Cj???`?j??uNxO?????=H9????9B?H?H??H??)?s ?
???FtF???n?D?T?????'?,?cXcV?~]%->?????vm?.???SB?\S?#?(?Y?%_?c
??R/?	?+/S?????yh???#B)??
#h3???dA	OT?B??N)#?V?????,?Y??3?X?#?C?L<"?FD`XV?????'1-??E???G?r?rff????d#????:???????3?'?z???"??@?<?qN??
???????;J??Z????5?#?a??.?&2????**?Jz?G&:]f?Q ??L???o?>y?\???`zq1?b???kLv?$T??B??D?8.	j?I\?K=? ?1?0C??????< Y(????x?{\?*:,V$2??A]V??G?h?B? ?Z?V*???
????`?i?*?v]?
2?P'U?+f?)?????? -?R????k^L,?c~????*?a?O?9:1?f,??"?#E3?=?k=?K?<?zp?#d3j6F,??K\}+?????3
;RR91?`tX??4?9?e???4	?uD??	r?M??GhAg??2RW&f? ???{????%a\??M!???78????'?
?
E??w?@?\?0?????).??Ekz??s?;-?Q'??o5?S
jK?Z???t?_??O??????5?k?fpp?6?Go????
???6????c+??^6????)p???N?????)\????6???mpW???&????n?
???nv???lk?;??v?????{?????v??????[?/x?
?oq???F8?	mq_;??v???p?<??8?C???|???7??
?{?-?w???q?s??
?7?1~???????v?g??C?????m??\??^?l?????????u?g??\?G?????}?a????.v?{??]G????n????a???v????co???v??=?l????N??????_|?!????=?????O??o}??????~y?+?z???K???????o|?????^??'??R???????}?????>?Z???5?x?#??W}????????{?}???{???????	_??s7??
????????{??/?????????z??????????
??????_??_???
6 ??_???>?2`.??a?`?I`& ^????n`?-?*`
? 6`
??:????>??? ?.?? ?`>?NaR?b`Z?J?n?:`N`VaB?? ??
?
mH??????!???!???!??~aF?L]??!""&?"."#6?#>"$?!?????)?B
? P?2?
#??A?(?")??)?"*?C ?8?_f?p
>?	L??xB,??<?
b*?"0?0#16?$?a?Y%`???B?:Y???C,??0P%L??9c,P?2??)P8T????5???X?P
Nr
4?G?? ?????'?$Q?%P?
??0?@N?.@
??bU???
???A
?8
??f??A
#??b???,???*?C3N
rp?h??0?????? ???????M?$x%0@?P?Md?4V?+?	?p?c??)?,f?f???????|(8r??G??
?'/?oj????
(??
???;??????????."?k
?
4zZ4z?????Q?8x??i5v??>C??c?e?'??2h?d? ??????_Q??3d?
/??3H'lj?2T*???o`??b#?X%<?nRB&
?5<B?a]???:A?????/??a??$R 	?]&??Z`?V?'????_Ab,?a?
p
?]=
??l"?
?!	n1?1?f?cq?1w??m????dB1?1?10v?????"?1 2!2??!'?"/2?222$G?$?O?%_r!2&o2'?1"w2(?r??(??)?p%??*???j2+?2,??'?2-?????-??.h*??/??H?2031???,32's$:2f??2?34?? b4W?5??0_?6o?37387r6s8??9?`/??:?s	3s+j0;??:{?<?37??=??5??>??3g??41??@?/??A't.??B74,?CG?)?DWt(#?Eg4'3?Fw?$C?G??"S?H?t&????J?4JR?J?4!?4L???4M??c?B??:??O?4P?P5Q?Q5R'?R/5S7?:xqAs?A??/@?U_5Vg?Vo5Ww?W5X??X?5Y??YCB78?L4.??[??5\??\??Y?uC??@?C[w?!??_?5`6`??B?tBW?!t?`/6c7vc'?UvBK?A?u_C_gvbo?fw6g?g?6h??h?6i??i?6j??j??io6Z;38??@??fd??b?6$??o?6p?vp??p??p7q#?q'7s/?s7t+wt7?t/wo+?d4^?voc6l??g{wx??f?wy??w?vz??z??y??y?w_??{??|??{?7~?w~?7{6l?vCveo?z8z??'?q/??'??#8?#??G8?O8????k8?K??{??[uvGuK??E??Ugx??????????8??8?8???|?xz???6J??D????6??????_??????y??x?_?oy?9?_8Z;?v??^g?}{??g???9?C9|??~?y??y??y??????7xA???Sy???????c??????9???bo?]?8T74?z?;:?????9zO?z??9??7n????xF???c???z??:??:ls????@w??[6y??l
?:??????????:?B???z???l??:??
$;?G?!?A??v??xB??@???A
p??@
?@p@???s??
?W??????;????[?HA
?@
??????8n?@???:$4A?o???zo?A??@?7??8?+?E????H?d@
?@H

)%90!??B? ?D
!"^3?-?8|???????R@?S????? ??L?, ??@? L
?d?u??R??Qv2????*??a&rJ{??h?Yo?NR?!"??& ???,ru?=? ????w???]`????7??LB+#
?@
????#?b?????????????@?7?C?R?>?(7??1^cn????e????)?,fIj??72??3?
`?	-=?????|??#H?=? ????hp5_:???,|???? ??9??!	????????v(????Zz?R#"??h??d??O??$oR????:????-??????rW??
U?i?*??0?t?Q?RZ?@3M?;X??
?"?
?MKc?"5????L3?????U??f)??e m
T??7?`?^???Bf?J??~???N.?]???GXm???I,???2???P?J????
!\???0/.q&sR????2o!W2?Q????++6?5o!jD M??q?
?r?w?<?N3??9?????_???>?/
??/-??uw??[??????d4Y??e'?".????4????A?
??R?R???u??????k???r;{??$vb????w?>?@a??2b:N?????\F?$?uPB??d!8?Tr	??{???(??u? ?:?XV5??~jfA]?/?[+?M?&'?,???u?_?^H7|?_5%/??7?W?^????G???eo1??F???5rlO?]h7}??~n??O?g}??(???7?????y????p??e??mK\??w??[O??_[?4????xS?{???????s??%????n>?w???ouu:???7F?Xn?/k??????b??u???Qi"???#s??????O???
?MK??
s????P?21?|/??	?1?$.????P??&?
??
y????kH???u??????'??
???xB?????1?q????
2 r 	? ???1?'R??'???!"#?'("!r"?"/?#3?!R#?R#??9D?"7?"'62%=2"W?#/?$%&9?$/?P?"M?%#R'?
'1r(U??tr"e2!}`q)2(??I?g*?"}?*A$?n+?B)????,?B???+??(??)??}(???R!?2f??-1??.?2/??!??/??/??)
s0	s0??031??.?1???1%s2[P0)?213?339?3??1=34E?????F?4Q??,35Y?5-i3]36e?}@s6m?6c&2qs7yS???e??7?s8?6??8??9j39??9??4??9?s:?b5??:?s}??9?2;??;}b9?s<?S7??<??:?s=??8???=yS<?s>e?<??>]S=?s?O?=???=S>
t@)?>	?@%S?tA???AS@!tB??@)?B?RA1tC??A9?C?QBAtD?BI?D?PCQtE?CY?E?ODatF??Di?F!NEqtG??Ey?G}?7)	???H??F?4I?KG??I#?G?4JwJF??J/	I?4K!?I??K?J?4L??J??LK?4Mc?K??MOL?4N??L??N?:W?N??e?tO?tH??O:?tP
u8??P?8??*?sQ!5:5R)*
?R1?5??t.3?S??O=5T?bRE?T?RM?T5UYTY?TI?UCUe?SW?Vg?Q+??p?W}"V}?Ri5X!?V?UXu?Q?UV?uYuX?uP?5Z?5Yy?ZUO?[EZ?UO??[??U??O??\??[??M?u]??\?UN?5^?T]??L??^?^?5M??_??^
VK?u`??_
?K?5a?T`6J?a?a%?J?b??a1?H#vc??b=VI/6d?TcIvG;?ddU?GG?eo?daFSvfi?em?F_6gYTfy?Dk?g?Wg?vEw?hG?g??C?viA?h?D?6j1Ti?vB??j/j??B??k?j?A?vl?k??A?6m	Tl?????mm?v@??n??m??>?vo??n???6p?So	w=??p?p?=?q??p!<wr??q-?<7s?Sr9?:+?s?sE7;7?t??sQ?9Cwu??t]?<?5v?VW??v!?uq9aww??t}w8U7xySw??7{?x{x?7??yg?x??6?wzm?y?76?7{YSz??5??{[{?5??|E?{?w?4?w}G?|?7 at m?H?Ws7?~??}??3?w/?|?w2?7?)S	X?g??;w~?;????!X1?w??-?08?	S?9?0????E?/7?????QX/+x????]?.O8??Zix8[????u?!g??R????Cx?g???2?7??????>???Y????Q???D?x?E???X?8?+???8}???3??X?????O????rx????????8??N??X3????y????????x?{n?????(???-??19?5y?9??=??A9?Ey?I??M??Q9?Uy?Y??]??a9?ey?i??????a??x??}???9??y????????9??y????????9??y????????9??y?????
??Aj??????9??y????????9??y????????9??y???????
:?z?	??
??
:?`?????!:?%z?)??-??1:?5z?9??=??A:?Ez?I??M??Q:?Uz?Y??]Z?????Y1?a?y;?A???????:??z????????:??z????????:??z????????:??z??????????Z`???????z????????:??z????????????????
;?{?	??
??;?{?????!;?%{?)??-??1;?5{?9??=????????a@;?U{?Y??]??a;?e{?i??S;?`;?x??}???;??{????????;??{????????;?c???????=
?{?{{?
????e??????????;?c??????????Q?a???????[da??[?{?;???\?
\????????\??
?A
??'??3??%\?=???
????A<?K??M<?Q|?O??U????:?
(??m??q<?
|?u??_<?c|?????????????
?????????A?
?????A<b??|??????????|???A?;?ub??A??????<
?al|^??(??
V!??_(??A 
5???\u????V?0x#?)?.?????A??&E?????t????g???u?nJ?G??;
???????????g??|?Q??3-dv?h9?????q?????? Z????d1?[?.??)?f?r?@???)<:?U?J????u???%
?{?v???sw;]????????????GW?9:vI?s??F?L?j?=s??d??;{eR?p?P@?;????xU?,????'????P??'?e#?#???3SD??;tp?3?????x?C?W?
?'?uhT5<r?BNX??~-hV??"
:?x?????f?n?	g?r???:K5?TSA?^{??#
??=lr? :??XR
??8?t??0E? b
u??j?
J????{?U??;ct<CN?
????
?????)O?rB
P???x?
?c?p?A^B?GL?	C?????m1?`???w?fq?X?????/?1?Y?_R"??5(
?????
gRIG??y???!	d"??#???L?p*G	":???[??s???o?L???0u????)?t at U?:?5??wv<?K????? ?@Q6
0w?'??pc??
p
t?i??.x|?kx?r$qJt?+?zFR?Vp????C8?????D1iE)LE??S????{?QRER??u?\L??R????????@??
H?'W?2|`????-{ i??A?~???|?L????3H???e)?@?]???a????X(?????????0M??L?p`?y>Z??l?,>??U???	?X??a?^d#E:?@??L??P=??"w??/???,4"]?~?a?X?#???8?#F??K?b???+N1?_?b??oh???????V??k]??2Slho*$?H???????U??
?u7m???lR&????O????o???m??Z?z?
?tL?%?
K??? bG[&??y?1n??9??N??f?????I&??s???1?? ??E??1?z???'???s?-Y?U??F?'4kY??H?xD?VA

P?V?ty"hGx??????B"(?&?^+???	?

???[?3????????wg??NL?Y?????????]?a???g?E ?????B??E
He??`??#?&N?????n?
|????M?
??r{???2???\??79J? ?9$??(tg?h1Iz#??
"p?`7???q!V?x?V?	s?i?????????????z??5aE??
?0g??)?q??j?(??RZ?R&??C?? ??????@???E??xP?&?A??O
zE?t??A?t???Z???zHj???x?s??ch'X"??'?	???3*?5J?or???\?wP?
?u??A?&A*?FJ??Z?H??u??N??H??JJ?@zC:?F??Pz?B?1
?xz?vz?u??y??z?????{Z????{?M??mj?U??N??P??N????????*?bj??z????f:??:?Z???
????i???Z?????B??j??:???????????
?????Z????????????????
???!?
??*??z??
??*??:??Z??z??j?????????????????????????j????????????????"[???,K?
k??:??:?3??
????
????4??.??3K?!k?
[?E??5{?	?????
???????Y???[??\?????a??cK?f;?? ?a??b??]??a??e??[;?t??wk?p??h??v??qk?`{?Y?????i??[?????y?????k??[?????+?+?q?????k;?????[??k?r??z???
???	????????????PQ????w?
??????`?N`
Xk
???F?O?,'
Xk
??\??? ???
??j?Xwp?Ptb?t?Y+d;?NP?|?Y?V?ON????O???????
???0{?Y?{=k{?[?c??I?z???`???OK?G??
m?????m???5
?i
??
(0??.?????J??=?V??'??)??????|??pp????@Lh? ????P??p5??l????P?p!????p
?M	?;t?F???????@?<-??????????p?X?
Z??
??=?cp??p?[????0?????X{
( ??t??(??P?x??`+?@	????????.???????Z+R?4??F????"`
bk??
V???"??
F?j?
;b??c?0????
?p4??P(P?_-?$Q(C??>???|??????	e???k?1?Z???L,?G??"?pB
+??B3?P?u?XE-?j????(??Da?Q
?q?? 0???!?A??yj?!???"????X?w???}b?`)?????"X??X?8@"?N???????X??g?6)?F?X??????GTD??;??
*k????e?A?~???p???<A???S|fp??%	_a?]?????wb&_??A7^E/+?Dq?-W)??W3??Q??????p?ye~??|?i??k~?9?z?A?g???????? ????uV?hZ??V{m??~????AY????D???'E??{(????:?
,?J??????{????
W?K`???f1???ZS???.?99u?C???f5?yMlfS???f7??Mp?S??$g9?yNt?S??d'8???_>sr??D=?yO|?S???g???O?T?%hA
zP?&T?ehC?P?vM!?<?2?fT??hG=?Q??T?#??!fQ?dZ?n%iK]?R??T?3??@'jg??),?iO}?S?U?15D' 1xz?vb???X???F?S?jU?zU?f?[??jW??U???ckY?zV???kUk[??V???s?k\

????M-?,QTH????
,`	{X?&v??-?b?X?"????,c){Y?fv????f=?Y?b???
-gI{Z??v??-?j]?Z??????'R
?R?????*$?ZU?????o?J?????.s??\?.W???nt?[]?f??-.w??]?vW??ox?{^?????]/z??^??7???/|?[?????
?o???M?e?Z???f1X??v@??
a??F??????d???+???u??Ka
O??q?kb?~x?)F1?U??;8??5?Vl?
'?1?C??????D?E?#??$?1??d%??????Q???Q?~]?????A??v,e$Gu?[???????	183?K?f;W?{????\;!D?k??Lg????l>3????G/?M ?_??d>G:??????_?
Xnj<????[H?A
!?@
R`?V??	>,??|?_xD
???;??5?9mX[?8??????7}kd?????2
AA
?`?Db?&?u?Y?lp????.?
20
)8[??F?????g?[???q?
k??*?ZR??Axz?<`??k0?_???P
?R?
?9????????? ????(7??? ????xBH(@_?
H????{?p??{0"????,??=xF?F?k
??hL????6h?@?{? hh^
?;?"CPF?$??9K????,?? B?
q?=C?G?
H
A?F1k???1d?1???@K?1"?4?/???e?
???H"?F2?0???}$H?c??7?B?3Je??";;?3
???????q,4?????+,??l???[?& K?GX?????s???uD?x?$?HK???H?o?
(H???+[*-S)??/j{???h=??*?&???l???(?#.????????;??????	p?'??X??D
??-??`???`???A??????=??	?N
=??=N8R!,?|
??????Y??????????]I???z?>?C?= ???o?????=???I)????q??M??
?k?cW"?L0Hp<H??@&?&H?_? gb?Ux3??YpN????M??Yv?????L??.^?r??zBb4????
<???3???RD_?'?
W??N;.???2???q?\H

?h??1?,
\Kf3*4??d?=`?????29???Z??VcL?;&???CM??-dCg?[??Cd?;d????d?*?N@?????dT??.,m?a???	?Xu5eh?7<??,??k??&?PV??
M???Qu??V]a?B?0i??'C;_??`??%??<f??Vlc??e?z?2???3?{?f??+0?B??
/>??;??Y<???
;?????s.??|?u.?L????>???`[???Ctj"+???_i?c??? ?X??1??>]????Ph
CTOM1;???~]?}???]a???FS?CA<?	`????%??-
$H[&
){?I	a??4??	???
?1H??	??D
6?I?PH>
"??A
?@?	?4?MX?R?u?P?
h???xKJ1B1u$???????W
?8????????????U'6X?	???!
??|??
r??P1X ?????S????I???|?f?A???1H?,L
?cZ?I0???????2?cHL{ w?eT??*E ????&H1???4??I????????
???G??~?%AD???l?	SHp?>0lB?2?2~???\?Dq`?i??|??a??[0QDAD??p?0?????V 9M???B?m??v?6|?
????[?pq?C?NcMPZ?????#15g???Ff?Tj?)d?F)??iu??D??va??????Z?I\s?uW^{?C??????;g?o,i?MH!??BbGRhn?=2???{?\Zvl?S?dG??k^??[4??Gn
??F?cZ?2?G?Yh???;?m8??r?)L?S????????/-e?_???
?c^??	j?H;
??p43?FV[ ` ???z?d??	S
?!??+?<,??y??%,<?{?-us?rJpJ???|j?=B??2jA/z??-?`w??(??z~z???S?8-?G?w??:C;????Y??W
??r??????Z{I?{E??*wd???n?Jj$???I???ct???mTw?m`?? U8_?j??S?OK????G?;??^??o??Ho??A?????R????????Knr? K?64(?;?P2????^n??		
L??
???`o???m????y????Z??-[??
??_?????
?????`?????|?"HA?h??A??JI?@
A0L[?KH???????e?H
X at t??d????l
DAl?d@
JK?
d?K @
P???Gjx?
W??0K7?`'??$??#{B A
H???+?F T?A
D??H??K?N??hf?}<?4G4v?pT???Y????????Q??Pj???????dt?Y"!Y???w?]$??R&??G?Fp????\u??U?x??V?B0?@$????
,Gb^???I?9???d
??;N???J???X???B?D?dS?????IX at GT??`?????????E????Y
NH?\?I??Z?d?!????
?l????z?@? @r???T??#?P?????J???F??j<R???????`???P?$?????Ug??J???!?b,S=????F??qj?5?Z?????y?#
V?)-
?Q?W4???E??????
??(m?j??$W!0eAK|?[H
??[????|
i

?H??|??p???eI
6[?????o?????=VE@?????e?(??U?0??#S
D(h?F
?
D{??h??t???n\
;?<???LQ?O?XYc?4L#3f???V??W??Q???Sw?#T5??p??M???d?6????????t?gJ?d??p??,@???\????z?6??"?[?
zD??q??C?V???5?FHY9Pj4????T?8OIiD??@???f??P??H?tHU/A????????}?x?S??KO?x?^??Q????p?r?C|??>????+???nC????p0?Zu???????h?p??.
??y?8?#V???q?H???y4Q??-O?????)q???~PPT?cO??L}??j?g}&?u?d5?u??????Z??p?y??\Y??Rh?A?-S???x~h,?c ???JH`?C????<?G??s?[?j??!??2X????I2?????	?2d?BH&d?????V|?b'?7N?a????*?t?F?
#?t?r#C?$U????J?5]?<??g??8[????!N?8u?ifQ?5#Z?
??P?&??L?Th??U?j??5E?5c??1?T?Q???Zjh??g7????ss??Z7?Y?w,?|???G???>??T???+??9-g???*w?V>????CD?? w??E0?t???\??|P?Y???>????5??M?-,?????#???j)?\?????K????B???h???q?L.?bBnE???QC?dlE?R?? 
l0pj??>???@1?L????h???\?#?? ?>???6KT&q??G?6?:-["?Q???<??No?
????C???Q?v?.??)#?&?!)????,b???????J?=?*?/?i?Ki>??u(????	
,??v}?hv??,?B??H?e?Q!Y??Fqu???8lo?b9=?????L;?WY?3*?Qb??V
U%?;?f]?x>n?-?U???1?Sg??eE???4Y??)???m????????-o????:?????LN??kG????????aj?4Y?ECu3f?9M?4?????7?k.???????????m??S?????????=#??o??=Q???????????_???W?_???+????4jb?Y???????^?d?b??0f??u??????y?j3????0?Oo??
???CM?cq????c+3
?[?????9s??|1????5!??w??P?l???E`t??Vv????%z?????]$cS2 ?????)Z????'8?)??jB???>?T?f?C???&?7?K#??G???????"??F???S[?????~+ml?[???Y+ux?$?????j@?q???????9,?[???f??^?:?='0?RuDd\#3?????BPy?KIz?C?]??8?e???C??<c?+	?~_????8??)?????|H??ec???	M?y?????h@%?N??#?9?r??{9?a??K??2C??,ZP\t%?A?P?.??
e?AJQ?N???hC1???b????HJ??j?-?DOJR?2??1?)K]S?"??&??Cs??&?+?hG[?R???8??Fu?Q?F???)Q??S???
??`P?~?1?????:V????"?Z???????k5???
W????y?+^??V????j?+_?:???5???????V?????5?c??????????c?Y?6?y=,b???]?????E?jUk??.??]ldG?Z?????=?a?:??V???m]???:???U+bv)??:72?}.q	2??L??Y?vc]?dW2??.f6??????????????r??]?z????f???}?}_?^??+???nr	??
??????`????XA?kw??_?BX??}lt??\?B?1?=m~?????A
????+a???(vo|eLawX???S?y?c??A2?|?!?IV????U:??M????\e+_?1E?0???e/?3?S@



From shedges at users.sourceforge.net  Thu Jun 23 13:31:18 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 23 Jun 2005 04:31:18 -0700
Subject: [Koha-cvs] CVS: koha-doc/en/sysadmin/templates/imagesfolder image1.gif,NONE,1.1 image2.gif,NONE,1.1 image3.gif,NONE,1.1
Message-ID: <E1DlPvS-0002is-SV@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/en/sysadmin/templates/imagesfolder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10446/templates/imagesfolder

Added Files:
	image1.gif image2.gif image3.gif 
Log Message:
Graphics for translation.xml

--- NEW FILE ---
GIF87a??
??
ROH?Ve at VnSQV?,?:Zo?7;TTQJY`SRnjE{oMJZ`Uc_E]^[FezJetWakc`YRfn?V/^fgz[W~T?egd?`3;h?hr:?bIA?@?c*?dmio_rzWt?jqsrqouqiZw??f?D~?e??|}|j???w/???z:?7`?????o?p?}G??H??4s???????X??j??:z??x???|??????????{??h?^??~??\?r?????????K?????????????????S?????????h?f????????????????????G???????????A??i??p?????Y???????????????????????)??6?????*??B??=??;??3??L??4??J??*??*?????3??)??????????????^???????????T??v??????????????????????????????????????????????????x???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????,
J??Q?-&<zN??N?Dm?T??0U?j??4*Q?*y??TaA?:???K!?1?"?k?.S?`?|???b??,Kfz???/4	????	??LJ`???r?
?3|?????$6?????&c ??????c?~=?u?%pg(?y???????-???????&?f??????
???????o????SV?zE???I?v??????]gp]?B?	?[?????????h??&?f%?PA?????A??k?Mm?
?	??j??p?u"???$???????z??????W??7??n&???@??		???2?$????d	,<)??D.Id?>^Y%?S7??+?@??3?f?az?b	""??3?)??t?J?1?d?4Fcc8A?EP??^P??D?1??4L??NAD4A??4?AL
????
??X at .??F?_??fA??{mj?^????V????0f?VV??
???????n>??s?:?Ldr??<?(????F
?3??D8
`?#??lK?	??
?C??)IH<?????8??mL?d?8o/???ea-*?4X?)?AL&???,E"??pJQw+\U?`??????Ge-Y,$?`?0?y.f?";v:`?.A?Y	?`?y??,?w??$F?s???????s{??z7??Moe??X?R3????z?S??63???fN?A?L?"%?6]????V??D???
?????fM?????&x?g?
??$]G3	b?h?3Z'4&?<?#??oD??!??p??t?GI?dP?I??P?;?@???"4TI?`????|?34?S?????t?G=R=?6??}Rh???"???#??I???6???sZ???????I?+(?A?)?A9A
`?????!?`SN??	0`'LJPs?V?"8?qV?????HsytgM??2??q
5?I"%?H?!??
???v??"?
I?9???H?$q?(??8?`??	w%l@???????p??rb
?I6????&iO(-Q????"<?1^?|j???W?$p?F{????G;t??$?C??.?????"??Hl
??`<?P?4pq;???
???r?p?JE??`8???H8/?	?Z?????U??YU??@???]??O??0?I?Zo`??]?H???p?x?%?9W?%mk1[??f?+??&?(??d?o2??{j?????#}???????
?p?
?0)????%5?I5jo??A{??
?????H?8N V%??n??k?pN 

mtU?fUn?8?`?p"?F?fl??8s?jp
?v[?$???ei?cI?Y???&?z???pb?Q8?
]&U?C]?*??F6?Z6?46r ?X????#?O??[?	\jZ\?H"2`???6??q?y?????G?P??8?5??v2?rc?>???z???3?r?8??~`??i???zV?^p$t(??'??G??GNk?~?~?oT4Ns????h6?~?f???ir??Y)?:|???Z%???nLVq?:k?Zms?6??????U?GT??n??X???z?Z?m?%7??q????\?7?297z?z??`'7?=??<zS+??s]?@
?6*?
??l?uI@?a	Q]?
'U?????T???p?v?'p4?FI?)?<???_ ??;J?H?t??Fv?$l?*???t?5??j???F?'??'j!,?"LYJz?'|?BLY???,<?Q?p??_??_4 at Y6`N???+vt?)?_,]N?F?b??t?z??ku??Tc]??Tf8,`f(,?)?t???nx?b???K????t???R|?Fk??[)???P??b
\?O?.P#w0??,
????????NY???}??21?????????"?.???n?#???=?(??0?????????y?j???????-?1?A?Z]?%?)&@A?1`C`P????N?p
?p??P?p
???_????^??? 
a?_>?a????\^???b^?j~
j??]??\~?cN?^.
d.????b.?w?u??^??????~?????.?d????[>??^?r??_.?p??P?rp
?p?^???~
???????0?s????????WN?p?p???.????P?n??0??^?|???^???????p??p??qN_?????????r???^?`?[N?`??NY^??~??0?l^??N?\N?Xn???s???^r>??P?????N????????_??P?p?O???0?????^???????[????
?~
V???n?o?.o
??4(???? ???
???<???`
D_?2?/?o??p?[~?(?
? ???H??o??N??n????x??	_?V/??>?.???n??`??n??p
?p
v_?wo?t?
u_???~??~_?x??v?z?
?P???{??{??|o?~????? ??????p?t?????/?????_?????`???x?
???????????????????
??
???????o???
???????/??_??????????????????u
???????v??????/??/?z?
??
?????
?O??O?
???????,^?F??F??8.<?q?????C(?`??G.??0???"j{???E??y????P?yrIr?F??p????X??k?|i?"?????MdW?&_??????klyFi??[?o?S?Q?X?s?25??X?|w????o??57?
w?N?=)l???a??9??U?R??g?<kp??????93?B?#k?|X[???3o?lYZ????}:4?
????S?L?????_;?M?!???Y+???w???	]9??T??7?C?0Y?	c?x3t?v???K???(???????o????????+??Z?"?|???

??????D??????C?E?\t?;?{1F?????d?Q???c?&?b,???;SKiF'???F????Z>??3n??+>?4??
??1??O?r?? ?h?r??????5??C??L4??mH?F??I?$?JnH,?????;?????44(???sLL???R(?@B???'We??1[?BDc???%kW]wuR??	Q?8???L???s?R?'?fK?Q:????i???L??h?C?23Y?4??qp?sRe????3????k?56X=????h??s?r?|5?r??0[L?43?2??jYi)x?w????3g????S??c9
??c??2??Ev?.?/?A?&\?0Y??Idy
???7
??3????q??K=
~?Y?CD??s????<????7\h??vhx
4v?o?Exk?	???nGmn??"??4???=?zl?V?????ly?4S???x?q???]a??D???<j?;]6???];???????z?L?D?t?U7?b?}?v?}}^?????i??????=v?g?P?[?=?rxg^`??D^?y%??????~???-?T??V??????o??:?s??m?1???e?Y????LLA%?Z?q?C??>.-N|???7?f?
S4?*?
G8D6?0CHN??@?2??	?r,e^\
2??	-????Z;?1`$@?@E
???,???$<?q??$?b??6?
?s????\?;???p??
?Hl(??
?'qH;??H=@????0??7????8?1???lP??|?3?1?_???&????IV2?$?"?R?B??????q?
?
???	??R1p??al?????BK??*??E??P?O?S?8???R????
??Y?~{,*Ww???ru?|?O,u(???Q??#???C?"L-?Ve?U??J?W5+U?Z??
????8?Q$?@
?x'??5$#T??7?p?7?
m?e??,u??&?+??$4?nPC???# !??????v?#???!6;H?#
?(G-???!,#?n8'?`?Cb?b?E&??#??=??5???jXF*Z;?fmP?1Q1?"
C0B?p??<?m?0??6
?0/'?@?r?
	b?=???r??
?x?!\????n?A2?(?B
?m?h?p?&??	#?A????(?GPC1&??r?c?{?X!1??????!F`???x??=?)???#,b?H@* ?Y,y??P+???#,?????y?a
5???X??m??hJ??8J?,??c~Vc;x?Fy???O???
?7?=??fj?8b?A~?k?v4?
-KDZ??p4=?J????t?+?i"???~???u?c?????	?i???????S??T??}??????d?C??????_?z????<]MOk???&?mm?A?????qT??ix?H?h??6?X?i???h??m??5@9Fp?c ?G??6???w?v????-d	??/+?p???????B1&??l???b ????_??`#h?6?
v*v
?5??6??5??&x?????_?H~4IZ???$??#?>#6;?????4??,HqCHE????-?I??H?\??J????|"??6x??b?w??c??Lh??c?P??( ?#?((???q?-??3;?J??=
.?3????:1???+????????C?x?????<8???\?;\1???H????[X?c???N7?C??D??K?,??,??[?B:?rh?j%1????M1??????SI???H?7???w?KA?5a??L?}??v??
=Dx ?vh?
J?P???|???U?=???I
=Q?Q4??B
$?v Q?Q=?%????
??B?D?u??p?Kk{H2?]xx?,?RC?R????}??)??$?
??
?x S??Q?JRmR?$??m???D?<?[??^??v
-?#?rS??a??H??Kd!??!???Z???`@?ch??<?y@?{h?6?<7X?b??3D?p??l`??;?lH.??c?mhS ?}?V`P?{@?}Oi?i?????p9?L?Z??J?
x8?u@???p
?E?3US??R/???m?
?
U????E?<?Z?Z?US?mW??2?R8EQ0?S???w????P??[????mQ?
????w?T?}?U??}?C<S}0Z?]Z??Zf?P0??eZ?????[??S????5???????}S???9?[??Z???u(?|`?r??5??x?K+?+??xP?eV???v? ??*?3u
?}Xfl??Qn?.Z??^?UcW????b??c??d??????6?[?}??f_??c????h????V?}??5???niLM???f???D~Z6??C?d??i?????b??i8???e??b8?[F??~Z?g????????yNd?]?p>????}??f??vi??^?????XF????a??>?,~c?Vi?????c???k~Z?g??\???kw?e?^z?????S~Z??e?viv?v?`??\????fm?^f?$???m?ng?Y??l?
[???YN??>c?&?w0???b??\?e?fcE?l6j?&dB?i?~??[?~??n??f[??d?j:v???f??e?.?????>?8f?????h:?i??y
.?s???8a
4!?{T*M ??j?????????j?j?$
z?z?#Z?H4<?G}T?z?hE'n1???b?0?=?w??C?z??\??????}w??,?A?X?'?nP4?Z-,Dm?:(??[???&?A
L??RD??g;?13m??0?5:x?J?l??BT?a
mP!?J???U<?#eA?B-???&?an at B&??1u??H???j?
 ????.^?8?}C
m?"R??A ?QXD9t????????0?a?Y????U??OxX?Hg*q?=d?y|?????c8?Nu
???!?#?W???F
lp??nu??]?qWp?X?n?S??g???u[??x??????.u?`?????kT<?????W
????s+?????MU?d?^??7????we??7??do~????M'?(Fp?q?pl?r(=?kc??t?+?.y??a?t?>???/?Bk????[
W}??`a=??n	t?(g????[??V?R?8?<?jj&????4b?Nc?F'Z??gD#l^???Qh?A?????????
"	???
7?=?????7???u???8?q?4!?0FX???????
/?A^A???[?P?#??<?iF?p<x??	?"9z?
xx???=?N6X????8?"??=?????0?a?=?????(?et???F?u??x?_/???c:?~)??7???P??????????1??^??W????:?????=?G?g?8?u???x?????j?t?Cv??zt#???9?n8x???P?;?!y~c??U?&&c?????e??Ocl4?????PW?????;????????G7V??<??'C.??{??^n???w?????7??86W????0d1qh???U9??
p4C?H??p?h???#:d-+c??F:??Tw~,`??????8?A????
p??,P
9L? ???@
9B6?Q???6?Q??9???????C8???aT?(?L?????yyP>??????? ???!?E?"?!6"A?"6%.?%nb?U]???$4|C2?+?B??B.?????8?:H[?u?5DK+*d?E??6??y?exC>,???????;????????????8?X8?<?C?eA??*|?*??+?C;D??!?C8?C9,,?
,(4?#???m???????1??8??9?308?4xCG-?5(?:?:??
??aC:Td?t??????:vZa?A?,??	?
Z????4$?4?(B?C??,????54O??C0?c??3?3??@??4HuC*?R?U8??8????EVd:l)? ?8???-???
1HpF???\?p*?]?thP?@????i??H?:u?R(??@M}Z4?S?U?B??U???e??-?6l??Q???:????J?^?
?U?w?e?[?4v??=??[?<??U[????%=z??????l??-+4???\?
??b?k(W?????:eNu3?Z?5n??e?????US.c?<?1ht?^????U??
????@]?"5????TBK?,*T?Py?W??;o?=_??X? R?4?a???q?1&`?[??h??fX?PD?d????N&?@??F?hH?Ko?yC	8Pb?z?	?????C?b????1XtQ?9?~??d1??;\$????yP1m????|
)<y??????&?H?n?iC5?9?Anz9E?9?(B?/??R,?B??B	?i???Fg))?????=jZE?Q??
?(?
,?????+?<S???fLV????VVceU0V??j???"V??t??tXa/5??_?MV.]?m????M*[i??6?c?'????$????t?!&?U??#?$r1?3??)$	S???"??l??%?2f???]P{CcV,?? ??`??#?)???k???$6??b4???(?L??V>?f@??B????P?&C????>o??%????@?^Cq?q?x?1?U????`R???^??/I?????f?a?B?z???9??N?!?YfV??H$???????q?4???7vVo(?Jf?x?L?B?*?g?z?3?(?t??N?LI	G?Yf $nL	?d??#"l???9??
??????d"	#d"??Yf??c?*F58??T.?pC?E?
TW/??\??v?[?B_[??Z????r??????$??O	G??w??/YsB????\]??p????o4???F}???<?!	?0?8????hCc?? ?`B?????7?

??
a???`!cx???P????????.p?.?|?3?Q?^@??o??]?P?O????g<????4?A?@?!????P2hdj??O7????	&k?B??N??B3?,?'B???&?P/???mcl??B'*?D>q%Dc
*???Z aF?(Gw?oxc??0z??&??g&	G$?????b?[D2?t
tD??@?(???!?j??vp*?0LA?>?
)L?kB]???????PC???6}?	?"^?N!ax???8?G@?5?A?9z?C?,????q)???2???Zt?6yI?
F???D!??RQ?a?-I?E?rQn??q?c?H?c????Mi?]:??d3YRIOL??R?4E??J8?3?i}??.]?s*"??n?/E?f^??M:???????WT?4??L!?P2?
??8??p?=?a?"`
V??G9???W??e
]p?4??X?1ie"???c???8?8???V at O???n?w{?d?c?
o`???6"??Y	???a9?5??j(?9~?M7?
5p???K????????AK?4?Y?5??k?5?Y????l??`,?R??U?????Y;kV?o3???f7?l?mf]?:????f?a???????rnl?5??8W??kl?k\?S[???N0:???v??P^?7r??C???:??x?y?????`x???xG????????9Y?z??>?1?z?c??6:?
a?????v????|?#?&v9?Q|????????|?C??????h????.??cC??GO???rck?x0?????c???1,$?o|#?(y>?1?Nt????????y??0???ktd??U?<
v??MogL+\?:???}_l?:???n}?{_?x;??~??]?nw?>??_=?Qo?????>=?
?|????????ogw????u?|??????g~???l??C?F??{o???????tn?m?-??????o?aH???ao?a?M????n???Z?!?!????(o?AF?@?f?p?t??a?A???.???A
???????
d?[???????!P|???
??
?m???
????
????1p??
?!j?A??M?p`??
?
????A?M???a{P?0??a	9?	?!?????a?<P(Hp?????p?0??ja
????A
G{???1????
)???S??0j??N?00?0p?m??0{????q{0?Q}q=?i??????
c0?=0I???????q7????hq?Q???q[O	?
I?
?? ?q?????q??Pg3??
M????????2??9????A?q??!G?#}?????P1????!??????a?A?????ZP???|??r)???????????p
??+??
?????}?('0????10????R?m+?????r?r)?-?R?Gp??7p????????+0$c??1??)qSq'3=P??r07?DP?R1C3$wR?A.y?3]s2i?A??R???+ws??Cr7=S??9	????1$?!)?S??,?
+m?*???r
?p)?2;??6?0?4?P
??e;9s?s?s???:??,???=??@??>?rR?5m??6???3?+?)?? ?;I?;?1?0??@?p@/?C???D??3??3?s;??930+T:?r
#s?7??(???7??=??(Cr???<A????S>u4??S6?s1?????AFo?:?16?S1?
?D'?B??.?SA?3>S???Jg??R?s?ATKA?
?S??{1??P?)?SE?8???2?;?O????q:=?C?qA?SMA?3??O??<I3??=?M?Q?D?2<	H?p0?,9TA?.??5!?4[?V?S=q;??9/U=?2YT=7?3?T)????9??:5pP?9??G/TY??Y?S:?P???HS?V?[?5Y/?Cm?Hu?]??^?5??Q?[?UZgH??\]?DcUZ'?W'?9??59?B?5>?8?Q?>?q?n??
?aA??IW0j??=9???=-?
D3e?)SST????!??Re???s>?U:?q2??AR??c?T',/?4	6H?8??D?US?Dw:]?I?g?0$?1)q?0.?? C?J?t??j7p?????D??6oS?S3??o??*s?t
?2>gK?&tT'?(osW???k??V??T?lU????GC?/?b?1?/7\?`?6_t-?3?T`?6Y?s??s??k?>??52$?[?vCWuVT:	;??VW?^??=g?@A?:W?>s?m?3U7Y?VC??vP'?c1Qj??`!??o0?'{?M??????
K/?{????
?!J}ovRC??!?%d????????A???/1?$SQ)?Q?fl?f?\nr??o??qQ??1vp>?Aeq?4d9?E?(??W=????3es?<09P??????c??1?Ing?q'??f???y??r3z}????![1?21R??q4?Pd-u}?0??C?7?{?
?1'?qs_3/?W??!??S?Y1?1tm?ueW?l??1?qs??W{??\#y???.-;?34t??l???Ct;%?FA?/??#yu	?(??iYY?u??	?.#?5_9huY???.9?:??i?????
?a?d,??\?????\A??A?q?????*?@???
?L?(???????nV?i?f]!???????)????Fo???????????A{o?!?	j 
fm??ALa2???
??#?q???}?a?3???w?X?RA??
??m???L????l?zR??2P?
Vz??A?rn8??O?????!?:?a?_?m??@???????????~????|
Xd!\2??CPr3?MZ?1?x?XQ??q???p????Qc?
???0?F?$?;?p??O???q?w:??qIX?oK??;{????? ?6???mw?,5?IR?IR?Q;?q??S;?I[-?O?C????U????6??C??!??5??~?&?W!??a:??>.???A????????d!?z0?:3??W?1??
??A?b?????x??r!?dA(?????????k??6???
????R??F??k
?A?j?g
??n??T?j?j`j??U??I???
!?Xa?R???h???2az?NXA(??H|???%'p?a?`aa`?
?+
????????j???:???fnn??p?)?l??lf?!?Nq??A7?Y?.??W?xMj???!???"?>?A>???z?jM??
?/?!???x~??]??m?i=????o?t?Z?K???m??m??/????|o?2??o??????????<?L??????O????Yo?=_????\}?j_?U??T???_?So
??,?????'??DW????h<?;xNk?]?.\??N?FFg?~x???#??F??W??3 |b????{?-??S???{N???.H?????ad%z??:"?"?8"?'?&?;??u??-????	??T?O??c??X$?0??N1????6?N8?2?,????J??B?}ts?81Y?P0?t?1`fa<??>????E?S????Y?"|x??\.?????a??Qd???H????7H!u?6??g??Aj?a?f??L9????6?8r?:??S???<?7?t??Twp:?0?dR?5??	Oi?p?I*??s:????]?h??5????	?j6?Q?q
??:?N???*? ????f7?????dc?#????S??&R
??????m?#K0?X??1}???t???N?"W?????3?8U?7?????m???r8???~N??a??':???l8??\e?6???|U?SmXu4?X-?c???N??Q??x:?????|H???7o??Qm\?UW+?????qO???PK?T?%c???X?J????7??%?????w?9|O??6~g=?q????'w?7?7G\??%g????O?2?????q???$;?X#N6?B??????OH?>?77[????uC?;????S?"?7??M;1???v???~7afAF0ewS<_:$?+a.?<??7?f???~mj)X??;?
???'?1???@U??F????6??3??0????A???2?7?2,Ne?
,\7??2O?
j?j?????0????
2P	?8?L0?(,#????:r?Z??5?B?,v3 at VX??(?8??0?????,2??pt????(w?c???@v???[?MP?v?#$? ;?3?
?neL?M????1?d83??(??l?*??
??Mzrf????Q-?4??I??*?v3?-9Z?e?liKI??????|:?4?????Y%??5W????,e????1q????4?i????:?\f
GP?Mk?\Y'???r??????.??IR?????????`?a
???????C?Y?B??e]?a?x??S
\???e8??
k???yXE?N?\d!??7"?U??k?G???28?U?????48?
wA????ph?AC8???`^)?
?????p5?G?8Qz??1??(@?!???t?;??X??M?t?]?8???-`j]]}?W??U?n?{
#+???
???_o?j?N?v????.8??M.??Mnq?????~???Mm'<???/??V?l?[???????mr?6??????hO???w`???d at cJ?
?*?0?V????B????o???6'F????X?(???8d???T#??_????v?-^?x]
;?D????1f?	<t"???7?????u'?R4????zv?>???	=??me?7???hxK??e?6L???/??&3???=C?f?????d???8j
[y?S?~f???>?????o_???w??_~????A=???~??????~?????????????????7~?~?
h???
@?[??&e?
?=1w0?|?`?
??OS
3cX????H??h????????????????????}DQ>??E?
?Bz?<????)C?y@?H?!(1t?V=?-??c?A=$F??PEa<?6?&6F???/?}??
?p???AyS??h?q??????PU?P??u?r}??v?VU?u?g????w
?W?VU?X?w????8??
?P??-?`?????GFx`o????mg???W???*^?}U???(Y@>9??6?
?w??a
??|?@? WYH?p?x?&)?_	????aI??8?eg??H~?%?@
??1Qy?'`b?y 
C?)??O??????d`k????l?
?

?`?t?!hB??V;??@3Gv?
Q?|HF?P?????? ????HY?7????????R)_?mr?hg?????-?@F?)j?
???8
?~?dr??????z X??y?
;?{
????hU5?????w?{.?i*d@>?????P??Hh
?p???????
?#????kI?d?V???8?	???w??1??&?]M4?v???y0??r??[?0Gj??!?@
?@
9X?????*yP-!j???@u???Y?	
|SQ??7??
??I??j?F???&?
??
f?S+?????P?4?Z?k+Jdt??V??*?o?emS???,?
Wi?J~?Fkkeo)fd??m?\
W?U??????????v??Zr?x\7???\?????????:?????n?????H??\?n???
??
???0u?????%???????v??????`?OR2W????$#???DUc(?A
qQUb??P?@???0??DA? ba?1+js?"?,.??P???O??9?v? ?sQ>+5H? i??A?Q$;$???@4???????R??*D3???v+&?33?3?c!??B??? 5?#5?#U?;;?.6cb
2b?9?buk?*r?q#?8? I+?
R?Q??6bk"
????&R6?1!Us0??8/S??a???+?1 ??$?$??$?3!a ??f?c#?N
?)???@$/{????]sl?.H$???r65???r???{?H?Qv??
?????<????????? ????
??
??	?`????
.???
??p
?-?`
?p???????
??
?0
????'?????/??^??	(n?"?	n?&??n
??	I??,N???
(?	???? ?H??[???	????Zn???[?
M??I-??R.??0?F>?E??e??w??R~?f~
GN?j??w??7??@^?m??_??\??&??Q????~?\?????t??????N????N??n?z>??~?p??????N?????????]???PM??????@?????????p?~?}Q?????P????p
????P?P?????0?? }???@??????????~??.??N????????^?PX??}??????
???o??^??.????#O??^???????"??+???/???????^?m`?nG?
??C9?;'?o???
???S??:|???{7N?:??{?.?u???C???w??a?h0?:t?\?G??{?^?z?R???
1*|????!???Q!N?>??|?R(??fTHT?????bL
?):??v}*4???????"??I?~???,Zv??:??????F7B5:h??(??D?R???~??D,??????K??[?????nQ/-??????q?X?S??????a?S+UqJ?n_????5?pF?K???]?p?1D?????8???k??G?????n???F??????r???9?????n?Yk?<w??YN?u?q,?vC?9?V????pJ?'???7?????p?9i9?;h?
s?f?n?:\???U?_?ym???VG??S?????:q??b-
\?=?Ch?!???R^???MBus?o??nD?f?7?t?S?d??k???Q}c?U???:????pZ?P??kL???[?T??bL?????KN??q?.S?L??Z??h?v?y?=????b??
????J?d8Q?U?)?Y?1??[?????qK9F???X?
?+c?yX??S???+[#?V??e???bH?;hQ?Z?*??C?P??fkU{?ujq????S?c??????#??Y?1???:???{?/#?.?!;??v? n?p?k?.x?)?P?M?b??Z	?!?Q'z!?x?+9??"!?Zh?{?PG/T?1h??H?7?A>~c??E2pr?9~?~???5?Q`,??[-z?
h
M?E??????h???CD?
H?C\
q-?@Hh?v??&P!
?0E-b??2+?-h4R?d?r?S?1j9??W1??JS?.??ZM$\f?fZISo??`go'2??:?????C0??8D[A??6 a#V?Z??	8?5n??:F??&p???+???VBu5??!?0Z 
7?hC-?
U??2
zr??`?(?A
?p?K?`
??&X?U??L??Mc?;f?????)[?a?5M????B?[??)?????;t?g?????F???F7?AT(FR%0?
 Ab??!??	`Xs???-??b=?K
????i;T?Z???U??V?yc?V-}??`/?? E?dy2????|n?E/?`
$(??*????S???5????6QXD81X)'?
mP?5?p??;
?
??@1?????
? ????U'=?Jg?????
#?C
^??0,b;????(;?_????S?1
;
???a$??H?A`??TS?A???FO?U~?\??_?C? ???*F??#??	 m
.-B?m?[??v??a?f?*p]F?F?X?*@?q?xGA?9???{z0??qe1?`????^M????O>n??	??????[?g4?
???E|W}??M??m(M?????z?6e?{???X????0Z?????*???}?
????
-???Z???2=?ZX?U*??/
??E???p???B??
A3?^x?0?!??!-????*??&q??8?-YJ?!\???;-
*?1?
???A?R???-???????j3'????!????s?e?1???(?e??dR??(')???P?, at T???c??#S?}?c?m??p at 3???k?k?ZD?>#8?1
?E?3:E??S?(??(?2??E??#e??S?Y?h`Fh@???i?Fm8??????
thEp?????Ef\?oLG??E?J??Y?[\Gx???Q??Y?v?FY??e??_$?l?G????t?t??????Gw$?
???M\??_?-c?M\?e`?a?? ?a7??
???%[@&dA.?6d">dD?Ffd at 6???`G^?@??D?d?Ud??dO?bL?a??[w??e????????`
?]??X?]d??4?]#?K?aB6?V?A??K??E??ad??d?5fM~d>?Ev?
ff`?fl?eG??fh?`O?dp??L6f
&fH??q?'???}??o???e?s?e??ZYVc??f?[?]?~?e??c??g?]??}\??_?_Ff?K??o?h??ac????hC?h?~f??]G?hn6???d??fK??qP?Q?T???\:??????h~?:?e?E????m???h?n???h??i?j?^j?n?J??e?m0.U?m?.``%u at a??????mf?N??????Z?F\8??5_??d?Mf*?e??\??]Xvj?f??dr?c??h????Fk??i?&j???
j?U??zhi4?[??h???4Nc^f???cNc?.??e`?elYNl?=h?N??????f>v???m??????s??a?5?
-U?q????Cj?Pa???
?2Q???!-&T?H?o$??&O?L?r%??._??)s&??+????ul??^???n?ZT???W?[??t?????c#?R???T?-??FM?J???C'Woy`??H-5;v????7~6?,x0???_???n??d?h??????EU????????????N\?q1?q?	i?jhqR?N?	w8?
?gm??C{?%S????6Hi??".Y?C?(j?lO?CTT?2?.??e&?X???-C?8N?~=??????[?k???vL?!Z^???T=M??????dX??=??????A???XcJM
?????$C?Q
?8?yy??MC???(rDTT??"	???*???4C???Q????
z9RZ??9?c?\p?)n?q0c??????7??M??M=~?h?H?c?5?h?????Z??????x?Y=??3N1?|?L2??u???b??f?i?#-/????>???????4????;?
?N<e???r?h?4?X#?l?
?O2h??\2????7?
????+???(??=?I?3|?[?i4??2?[$?y?+?????"?g=c??ZVbG+P?f`???C?~F?_?m????9???qil???????2????????@NVB_??.?i?h??\???>???rz?f??wI3?r$??;\?Q???-??{?2?cN
&???L'???De?\??
)T??
o???U2?=M?????Q?z<A?H
?R??????????lf???K????f??n}#?Y}I=w??~?<	?v?B????x????2?o%??L????
?|???-{)??
?"D*O]??cz?/??g*????
?8?du?X? t???iR}?5?"W???=z??C	?????????RX?T?-????]&w?0??]??d?VW~?t3SE???P?r?~?Z???$?N~????
G???BRH??hR???I???7Rq?i?Jc?"?9?1???m?#?j??a??5???Li?{2??gX?+??S<?0?:?????<?@?b?8??>???TQn??b???wp?	i????8fS????-zqh???%?h??4?b???uz??^?Z??2-?!?T?Y?????lf`?qr&??7?A??X???FR???w
(???\&??6??D??-?!?????????B?TG<4A2$J?@*h?Z????*?-?"??
?B*??Z!?
A?eB<?	?[&??A&?\??A??7$?h??jHq?D???=L?3??0H?3X?%R?%^b%J?0hb'Zb'V?%z?&??)?b*??*?b)J"?`??)6(??*R?,:?4?C?????>??
???u`1&???U24???
??????28?>X??e?"????h??
?@-4#????e??A5???BJ2?*?y??y??W???pF??Ko?????VI?H?????2??I??s|?Py_???qni??F?}?.%A @???At??$uz?P*/?BWz?Y??OvgZzeN.0[4*??C??Dw??B'???
?P?du??N??j?%??<@??+q"h/?.1/5?<??x?d?E<???=hF2????B_???e0?@???$????9P?6??l`&Kz?a?????=??:??h????J<???Z?u?0???&b?Z????F\?u=\	b???(?NR`?;X?!?????x*gp???????>????m???vZ+&@?
-??)?
?CH?,&?,??B ???Q???|?8?
4?!$'??!l@??C??
d?-$??i?$Q???x???@?!dboF&lH@C*???l????|?6????C??:?t4`D(?k?x?-?????z\? i??D??2?????Z????^?
?g?f???MLV??????i????\?ClF?9?!B?(?84???ba2?????????????^?

?
4"?P?*?v??@k?txb)???Jb?YJ^>~?F?????-[???Ee?:?;?v?vl??i??}wn??y???{5Fw{?XSWK--??A?BK?^???????4?74i?j??
jR??AEQ2Z???;r??k??kQ???h????D?e?Pc*????T1D?&??e ??
hiB?#i#?=??dC?h?
kT???=?Q?
?8?
h?kB??????!??'?hC?T?h??6iQ
hh?oqh1??[???f??RF*i??H*J?H*??.???K?&?DJD 
`?@??+
XP?J
N?`
P?+R???<??u??
p??(??#???(a?C}?|]VLW?~?O?
?'%R??bq
 ??h?+????@e&?OPX???AVv?w?m?@??"?%]??W0]?3f*??6????"N?H????x}??I?
\?#?US	?[3??T?V????O???X?*-?:???,Y??4YX??[*??????r??????=?=fJ?&??TJ+}????T?4?2?xBP?? ??xBQ
?
~R???WE?????^??,?%6I]
?$??Jl ?????
?
??
?????
?qj6f????^??????nAJ
?xd4?nA???h??z????PMRa??F`(??8?G???!F?n??N?i?????l?n?P?????e? ???FT???c??8A`??????%?
???&??!???q?
???R??F??jG2Rb????1???(?%?f?rB!??L??6?v???i?&A"y?V?pl?l.
W"#%LH?*? ?
??????????F%?NL2_?????|???????4ha????(?????? ???j?"?????`?a??????#?q??na
?dT?2????J?a@?C
""E??R?ha?A!/?@2A
?A ?`za,?C,???&?
??!E?@
??6D??	?
1?r@>D8
?@
z?I??d$P?	z?>a2?2!6?9BEP$s8ANd6???j ??v?$k??k?&
K?!??2 at 2k*rrob:????q%???S?X?l?i2????;?S?J%x?Vn??R(?h???i"??l??V???h???k??r??(?A-
???)q??A???~???????? A? 0????8????@"S?`C?c??C???/j hT
??
zA0?`??IT
p@?@??/9A
??2D? ?B?:D
2?
? 
j L?13!?????
??F???`b`zA??T? 2
(??$s?
??RaVD?S/2<U?&L2?rM?v?P??D"?3MZr$QbL?%?W??:g?<%?"A?hL??:?Ig????$n?<GR?n?"+?U"?\?W?A?o?JNx?????A?Z?JZ??8??&?=?T .?]J	`T?????
??A0Ua????M?E0o?G?`d?@???2?@ h?D?A?@
?ab`E?
	?M?k.?$^???o?.?!2?vT????????W?V?6
$G'?s>?W?D#?VOG%
kl??k?kTJ i?$A ?????B?{r??k?1ZWq?z 4h???@ja?t?
??????_z!?c?
(oaD
?
d!g?A?????@?????	S
?A? E?a,?H??
??J?,??
!?KS?Sg??3?	??
??=TA????@? uf.?
6?O??TA
T?Y?J????L`dA]??L!.?=??|?A?!
CUc2k??"M2M?"qUM??gG&?!?MD<??V?	!O?kdP=?	l?V?P( ?:xM???m?iKWT"Kb?`?rRp???O??x?rq?????50s_?aB??zAc?A?_??g???!`????????i??qk????fV?"????!
???AC????i!?
?????!????z!?A>?(DT
_za>?
`V?+9
??????2^Uc?l???????n?h?????T?3jQ?K"? ?9?3[x2J8K??4?????a'K????Y?????gC?????"??e?n????????j
h)d?*?8bi?O??a??-m%#>-?

?

@dG:?s%??v??&8L??U?Y??pm=?l?p??z??-L?:'?6%???J,?(??(??:n at E??K
?:
AWA???F?8?
??#?#f??]?K??I?<Z?hJ0???*??'??GjD??0??cz?
?niz?????P??dz?]??~
?????]???n
?????	?a????z
?b2?????x?????q]?_??G

J?s????:!(Ak '???W????y5=	j?????%??0?:?m??!???i$?-D?V4.??	"Ja?[?0%??(W??W???????????????????????"?????????G??'??V??4?]?????rm????}.??
??j??U?f??o\?.????&?????I???p?`k/?^nfb?>
?&?

?	 ?
?
????}???YF?V
ZjX???.??~.??3???>^?????}???C{???{??u?'v,??q????????h??????>?[????v???`Y?=l??K~w1?????r??????^c?{/??w???%	?$ImG?R 

q?*? $"\A\ ?P?@?T??

???"???Z?%?Q'?0?
 ??? ????5?Z??(?P/?B???p.0l
?q?w$?
??B??
?aGX?%?~????4???x5hA??
?1?+??[???CFt<_5L%?#	Jh@=
HX??A?e????
??fx???,Ap" 
?Drn
?~-g@?p@??z5p
>L?????? ?>????x?
?*b??l?q?O??P?$'?4?MH?????H?ni??qw
??r?R?SBs??C??O????haq???P?58a
-??
?xm?kt3A??&??????W??? 

}5????J???
>tA<? ?/???b???
?b?"?R?1??Z???/9??G.r??gI?A-???o?
?????A????q??-8
?LX??M?n?aEm??
[Q?"F?6??u?m????h??F???!2quV
{H]R??Q[c?????%T??O>D0?f???}???-?J?^?????D2?
?????S??!?N?????2RQ?&??
?pC"@!?_i?J???;me?f#
??
?F
?p
z?64c???x??zInq$??c??/?3?????A????h?V?r?'?h??a2?']q??yoB	I3w?r'?a%i?????1*R$????&\?&???`?1<??k??A??6??h	O?)?????n????????+?F?A??=7??|? B?|??<??>??	Bp??m?????????>|?????A1h??r???@?(Wa
z?B?? q?P?`????
??z08?w????r\!=v???9??X?A???'ob??U???? ????xq?Nz?Q&+??.??-Q?%*?+3?Wu???&?#???WQ?w9?IZ!???%]?BA??????-?H1?A"?H?????>?j????'_?Z??????R???m?	bj???p??N?1"{+z	????(?j?k?q<?`(?T??Z at I?P??b??2?:?4[c?3IdQQ??a?H??Il?I
>???2??J?????????b??Q??J??b?"Z$?%*??r??En!@???I???????+????!]{??p???mh_?B?M|?++?ih<e
_?:z??z~???g>lx?+??rksM?Y<{RV?Z??
	h???:6?`
?
?e{d;?}????0?
?@	?????,P?M??OP?R?g	U=?T?,??M??Y

????
?$?P?zUm?-??L?M?d!i=?a??K-?K-?U?g???G
R-?g?My?R? ??p???
??-<?/??c??P??(?????`4???8??
??$????T5Y????g??W&?&?y?9?,1? ????0??@?0???',?[1*??_Q?W???M?R
?????0%??????P?????B??R??i	E???(????M?^?s^???	?????j?0p?p
?????????}2??????
M`?@s?????F3;?JT?i???g2??Vj@Z?L?*??5????`??????	2{'?N%A?????)?A?h.?>
F
_???I<??:i????*??
????y!?P?
?5Q?0??h?0????b??-???Cm?$?1??ZA?l4>???????e??Pg??????G
9[L[eq%?@3>?PE?ANk?bA)[N[??j??l??n??p?r??o??e_?P$????8J%?`?Y??)?~?I?i?[^?i
[?????????a???>???bgO%??&???FCE]!i???PK??:?P??0?
?????
?K?1 at Fh'[?5\S6[#??_6?27?o?s#?????????????_??????????????????????7q????????????????????????_??????????
qd%d??@??61%??`	g???AqxI?`G???d????D
???p@"* ?B?D:???F2?h?9????c???;~??0
$?x?k????
w???]??Y???O-&????L<$???*??x?R?Pk???@????Q??V????F;?1??c??7?V??,z???5R???d?}E?!?qh????XU2^*O&??K?yh???^????7L1?w???Y0v(??~???H(k%????q??-?iW%?#???-m;?&???Z?Ki?
?????6h??q(????+k??]??????M?d3??n#_%]z??r????F-?Q????#??c{??_	?cV???B??:?xw?k-?????'??,?CW8%??vn?M
N??/??>??>??#o??;X??e\???5q?yih
?? ?j??&??????m+dQ???&?ma?i??\??zY?&???G?????????J?????????#??????????v??I?
?:?y?
Z$C
{??`:7?????%L????=?x????`??????????CS?_???.?E*???o?c?0???y?'??9??[4^?V?yo????H9?????5h1?[???(??v'???B???E??;?@??[?K??!e??U?)??=????GQ?t:6
(???C?W???=???????f<
?????10?N??j???+?v?WbpBO?#1???7f[?????~??????-?,4??k????|?O+???uLL?\t?|?D??t?M|l??+Z??%?Y???=?????28???? 9????=??	\???@??<????
?@???????i-X?}?W??!1???????L/??@??A??Z#<????j??+^R?mr?;?????Q???+?a?)?a/???i.???A???x`?c?S?#W?0??{???YC?kC9?=P?@~?m???P???)????C????x????????Q??+}`????*0L???	?3??;TS???z
?@??>?<
?D????2?????+????1?@????8??<?GL?C??I?[?{P?w8
?Q?h?A?#8?8qc?o??s8??q 8?q?t?xP1??s??K?\?q@?o?0??}@??Svx??d?O#?o?w????wpKw?-wP?*AL|;??????Q??<???=??????"??E??#????3??*?X??FYH???q?5
-h???:M`@*0?ex?QN8?Lp6(q?xp???N??e?	l!k6N 0???o
*?u?*??LP?g????[??????x6m?9-??T?S<[q??gK?!??^??Th?^?4W?D)?2m??@=???10v0?PwhP?SH`HV?`K?18?5Mqh?!(UhV`??w??
?\-x?T
NKd??=0?=1??%u#Z:Z%.s????{[Bh`???V`?????X5?C8E8E??????5?eha??=?_k?4-???????U?P??]???????W`h? X5)?3?????}6*p[?m?,S?[?L?[?9C0-??P?`(?J??7?<m?[??h#0?)?[P??h?UY?C?(3?gN?????[??=HbN7??{?g?E!??6??o??m?L?????;?U??0Y]i?????C|3*??V?D??M??dU???
5??>??u65???<?	??
???r???<@<???????????????l??<??5?$@`0a}ht?zp?`??[h?(Uq0?d?{??[??????Rv?4<K?L?????????-Sh???K8Y0?X,EKk??????z?b?
S-??d?????
o????q??qa???H??ZPb??Q/?N?QwPk??`o??-
?	]??o?w?d
??\???]??^???T??I?o????K??????,????(	???6?L?BE??0??G{\?>????C??-tV??1G/G?????T??B?????,?t????i????M??Sw $???tO|??a??+3???20?T?$?M\?=?M?????????'??7??G??W??gy?'g??n?`???DLL?Tu?#7&?Ay7???A(4w??`?W"?wpD?r????V1??D?Gp??yN?+?,Md,A?????wx?
w?B??B??^	?B
6?????6???T?;*b?|?01??/?u"?un?@L|?{?yH|?_???????????????????????W|?g|sH.??i???
?y?????M??U?D??w3?@??LUu??sF?tlI??iFQ????z??0j????z?????8e?S?J???Y??nE???z?;?L??_J????;?[????B??{??{???????x??x?,?}?|?a
??p!???
F????E?3V?H???? C2,8q`?@
G?????=~2????o??~????Gs???2w???'?4i????)??Co??(?=ym??O?2o??w?_??:{???*??]?N??.??D??=?gY?9?*-k?g??????????[?f?S?M?h+o??W???sA?Z,????????u^h?????7??????5????/n?8??????W?%J??G??:????s???;?????/o	%P?F???J?\????2?j?g??N????iR?E?QXi?\BU_}p???????
?OL??t?c?????eE?L??[H???H=V?bKfUzuE??H
?YoM[e??EUVw????Ne?"?^
W?6?h??ZYC?nT????y?%?a?i?>????%?H2?&?L???H?	?u?)'?v???&y??'?~???????????h??*????)??k?	J+5?2L*?s?<>9?cd?)???z%?e\???X??jd[Y#?<~?a??1????]?&?????[x???}u
???_A??W?zvT^?{??????6n&~<j-V???-q??f^?e??oc?{/??z??<?Q"	&?L?	??????O20?
????
?	???Dl??'l??s?q?{??3??????-/?r$?3?0???W>????;?"??6Z4q?;?$`??v?*?y{???"+?`?I-???6M?k[{??b_????v??????M-SV???Yn)??u?}????#?%s^br%?`B??&2?.?S?0??????x??K?8?-O~y??/????[?1??/??2?p??????"1?0?5??D?!{???"$?x?<??{y????6???????kd??[o?N?b???.\??n|0???/?????I????????~???????????????????
S8&???nls??????-\*?!?t??4U?O??	L??a????X@!,??|[??#FQ??b???)b???S???????N?%QZ?????)j0?!(??>???Lh?
MhB?C??,??<$"s??B??y??^n???%?????<@a?G?O|
???&06??ql??&P)?I?Rc*Y)?Sr?`??e-S)?U?u??X,u??[??????+A??????+e?b?7T?R
??,z?
}??T?qv?*[?p?"??6

??F:^w?o&?U??6?D?"a1??R?T?#?V:q????
%q	&??jr%'5??6pbpR?%J9'7?or:?]?????O?D??
M??2??k?
??7???{e?&?&?)vQjE?j'J0Jd?%?y?^~?6m??5x?,?o?TV?9????g??????I?????Z?{J?3?|[?hP?
w?g???8?W???re???'8???@l#J??ZqMl????T?qa?X%5????N???z]i0??e?T+?@?R??t??}??5?	??????c\?<??mH$?*???B??j???S??F?.?}ntU$????M$??4????0OGZ??	??(?$!???UN???F10?"?{Zl`5?X?f???+??90????o??'?????6??U?`$QZ?zr????D'U'?Y?8?f?.4??&?$??3?T"'g?-tb`??Q?81?Z
w?s??@7X??.??s]~f???M?@?!?#'?R?k#???5???^( ???6????&z??9m"?;m????.P???d?iZ??? ?M?oS?
k?B???>
????l????6?T????
@?H??N![????WTnB0@??IX?
8O5!5^??
?I??$???Z?G?A????
?????$pR^	?c!?BE?8?Y?Di?J?zd
!??(	???a??m???5X??	h??)@???$?
h_D?'?A|"?=??
$\
p
P???????@\A???
(?=?B?
-DAM?A2??????B???O
???;P
oA&??`?C1????"?
;pC?@P!?$?@04???!????R?A0x????xJM?|\d=??7?C/?g/0|???X?;??2??X??2??8@?P?o0?!???(b["?>??Qa?	?|???\?%??d_
x@
??"(?;?C??g0???n0XCP??9??;????4???4?A2dB*??hA&?"?*|???????~?;???'???rWZ?K??\?*???9La???%?"??*(?%!|?
?????%@?B@@?	?/Vf??
)???&
???\???B??9??????,hAQ
??j?k
???!?P?X??B??P?B
?n2h??BpS7|CM?
Z|???-???()???
?V????8p??@8?L*(?6
d/,C2?g2????C=o?????'4D*0\?8XC????????C<8?7C2???z?9\mwjA???-?nj?@?;@????????j???:??5h???Ga??'?k)4??;??;L?,???k
@@?W/Y<??
??M?;~?????o???A??O?5m???7???e???[?+0k??
?????q????=q??U?W1??}??}?w.Y?d??BK???8Z????W????.n??S??s&??6?p^;?n]?w?????o?y?|Q??i?$M?	??C?
?@
:;??i???< MbT???K?$

$ ?
,??i\?ETD?C!??0P
#??H?????Ku??}????????KD?"j,??
??A
????
rP?w?IL3?i1?;????c??S?,Jh???IF?d??k??i(??t:??_?y?????B??I9??+k?+?B???[??4=K'?F}+?V9?????z?Ya??H???VH?}b
?p@?
 @>
??3
n06 at K?
@X??"????	Hd??A?N%??e?G?k?
4??Y?A
(?- ?'<2"(?
??)P%$?	R
8???pN ?)?B1Ea??U6??4?????Uk?"sp???ol?c??}c?|N?t?d?aNGH???7$'Q7?y
?$@??5
Jg???0?7S9(;?i?&??C??>????{$?8p? clz????i??w?Tg?????Dg??u<??`???%? ?1?
??3>#A\i1?)????KL??:??	?~Bu??x????GH?:
?.?	??M`b:?'?'??M2???ENaJ??P?	?V??v?&F?b'?A
? D??A???
?"?!(??T????A??O???bnA2A
??>?z!?&XK?????T?(?z?Jp???aS
i?J??8??a???
??????? ?? ?!??&??7na?
??I?I?h??azp/????
2?wP??p"?A
?????SB??.1?H8
+?P??aA2P??(??#??B
?`L@???`do?M'???????d?x?????@????????:N@?%????????????Q,!a*?????n??*??ndtn_?n?p/_???i?M?&_???j?????v?_???k?
?@,?z???a?`L`T??q?t??????@?"?@
????"?!?@!(?A?`>r?@
???@
8
??$??P
RA??????
??TA?@?
???@
?!zabp? 3a.?
???TAZr?D??Taf,?????~R
A?@na??%?AR?
|?.??$?
?RZR'i??@
A??"i?.?"e?3???.??
???A0S
n?j
z?z?
a"!n?
n?&_?h?n?E??N?&mTR??.?`???TJo?n,/R?taE?A?tNI????
??	?????0
8?8'?"/??@R?3$
?
?
????%? v at 7?TN??H?aD??
Gd,R)??gjqmV??dh:?tn?????3???Vf????pe2???c??????=DdtL?x.??@??>????V????s]???u?1???#4???&	Ak??td???"A??Xfj
	h?h???F?????HVRK4HS?v?I??t(??
???
H?
????
nt?p~?h????	? ??#?0?RAj??$'?&??k?p'c?$?h?JRR??FiAj?
R?V??A'?A?6,?D??h3???kSAo{v8?R
???
 {?o?!??$zs??p?dWrt?"?A??P??
|?f? !??cxSD?.9!?A>!v?!?a"r3?ahA>?-pX-|???-????
EXr'?\?%<?Bo?z??A???/??%?Ai?P1#?

ax?z??U
"&?G?
? #?B*??.??:???!?u_?????9c?H?aV?7S"?O??{??a*?AV??{?{a??aS?R??
yS/-????????."??Mc<?~Q??,??,?>!?$C3???df2??????l??{?$A????L??[3?[3?w=??_?[??;?????C?
???;????{???????(?Z!?A??KDj?|?q??o????F??I?HC y?
e?%gl??G???~??!?N??fr|hF???~?('????D?KvDf?!Dj?F??o??????.?'?n&lB?&??AR?Mb
???r??"#????{???o?
?A?\?}?|??\|a??????????}a??\??????????|??\??<??|??|??|????????a???????8??F?j?R?"<?Q2mCR??`(?.Eg?&?,Oh?B?"i?mpzf?6?C8
?K??:? ??Ip(?x???H?B-q?fnB?A>j?|ntMh@?BH??c??fM?$??g?("R
,fj?BB6???+p??C?W?n?9};??????'?!?=????a?=??????
"?v+?**{???0???$K?<??d??)C?D????/?Lh??A?3?????d??C+??W??!5????A?V?}??|y????^"???_??be?,*????s??????Q?ldyW`Z???]I?n??v?^????[?2???kA?;m????W?y??????H???yp???CVd?V????hiW??d??ll#N?????G??????[
i??N??????????Ts???????1??9zr??m3w?u?????7??????
??w
_[
???O???~z??__?I'[A??2Qt%?-yD ?~?????e$7?8?haM<?B?,????U????d???Wd+?uU????????d?J.i?K?????AEp?1?e? ???]?$?:?%??S?HE?>??r?,?YeUp?s'S??Y??R<?$?Rk_Jh???$!???!?9xh??NJi???b2??X?*???N&G???V???!???O<? a?*{?R-?
[;a?n-?????v?p?_L???j??;f?b?_? ?????YT???5???	'G?
4m??K*m,E1{?Lo41??+	?q?J?d?	%??m?s??V_]?wb???SP???:?4A?5??sSX???7mhz?!b??L&m???C?9Z?r?-?4?????4??/?R??&dM??v??_?9?f
??R???T????h?H*U???q-?<{?8{4?'???4?p???h??Z?B?5?e?|?	5m9??z????_??@?????]G??i??5Y
???5??y?C???S?x??????9?j??p?,?
??*p?l??Jp?? SL?a"?
??q<?'5Z??=?????0??P?eF3??o????B?w?6??/-??? 
q?D,????$*q?Ll???%?.?R?5?Q?l?[	a?4$??g<1??2??1N4l#??WF?Eff?;?1?w?q?|????@
r??,?!??D*r??l?#)Hq??lz???p
v?<E???i?????F}?
?>????#
?_y5>-j?3?-Uu?\?r????/	?`
s??,?1???d*s??&'q]??k?x?0d?
???7?W?94^F?T??\??t.???????dc???=???|?s??????	?????-h????e????B????>?|?\??"?P?b4??h???QM-zP}??\?2??? ZI
H,?/*M?<I?????%I??a????x?C??Q?J?u(u?EE?S??T?J?U?T??Q?U?ju?A??W??u??lW]jW??V??z?;???????E??:????6??{+_?:??*5??8???8I?V??
n??{^?????/}????7f??o??`
K7??8EvM,^N???e??K?]U????z?[??J?????u<f???BJ???>??6???"????????-??p?8?????+???8??
b?fs-{?YLs&?X???4??0s?Xg?-?N3:S??z??x at 2?=+???Z?a?=?a??????F/?g??4???Lkz????!m?PW?????'?hOw??????9??X{????? ?D???^??5??V???????k??]?z?????jY?z??u?S
?C`????????L????f??q}?^/????t?G
?x?????v??P?=????????*?????F/???*?W???????O{???BMT?&T??*??
w?1???6??q?q%o&8G??@???+h?F*L
?@G +????!C?g/?p?4rS7t?Q??-?@0??3????t??,?5Zp??{??uY?[Gufz?@u??u??u??H??q?yY?xE?w['W?PuZ8??7?NW???LH?T?xe8Tb??e??m(??n??&?n??????OWHH????Z(??8u~??? u?s?qXn??Hvs?{OXvy4ZhY?W|?????P?
?p??
??	M?h??	?`Fb?i??@??`?? ???$)?'??)??+??-??/	?1????_?trb at T~8w?h?Vz]??NhY?0?g??0????WuE??V(y?e|??u??vE?TNIu??W???l?{]?T?0f?9??i??????z?@?sGT??UU)VKYb??9?}?i@??E???xF?{?XY??u??vJ?GJ???H??9??Qp
?
?*?J?j?????????????F:?$??8?w?W???r?y???JU???W?p
Z?yVgu?'?EHuR???8w???;Zv??x?X???Q
????eWC??
?????p????:u???f?w??xZ?
?0??9u?cY?H
?WuO??[??\??Q`v??>??w?UWL??AI{_?vp??T???z?5?:C+?	
?\3~?$????
??
?Ek3?`G8`??*?????'????
U?	?`7??@??*????
K	?`?P(?%7?NZ?Kj?z07z??*??iY{??LhT??xqWu?E?[?
?PUWn ?`I???6???f??L??? ~??	?0?P??5?J???^j
Z?rP?gY????w???VN?
L
QW?:?????g?W?"??
f!r?`
ms??d??????Wph???Cj??T????k>?1'F?
???F f#?
? ?pY?3?0????d{??r8?@}?p?B^?!!?A??
ss?b1??b
b`/.<?/??P??}?B???0|???b@S???mn?/??{?*wh??@H?j`?B????x??????k
\|?Ub?e?fWT??. ?????z?
?
???z??s??T???b&?J?q??;?/)?c?3f,
?
?;?H????)H?~?H?	5p]b?8-?????E-??{??n?h{?m0u??H?;`?5p
1?mZ?	?rQ???T?>?;??0?r??\+?
??0Y??]#P/?
H`
D??{?Q????A+?????A??h????????? ?I???;Pj??M2g?h-?4?)???P??(|r'??!??>??6??1B8e??>??BN?<??! ????%??}?|??????????????
?,??P???	<??%?
%7$??+w?m?
???z?#P???/@j?0???	?93???(???7B??a`?p?b
7?m[L?K???x??_72i?;??;?[?H??/z0n?J?s??h?
?o=?xeW??i??.@?C
p?aZ????i?Z?)~
M?0?h|???Q?	r?hQ`????VY???[?o w-l
i??1?T?]??Q?
M??VT?|
V??????a0x?M???T?LR?A?VC?)?-?+	?N??P??o??????????????????|	?p??O	?`
?%??&??????e??k?W??E?F[??~??\{p???{?????5^?T}?]????
??ygn?????JT???????o?Q???AQ???-??y??kV?&m??DYC??^??F?q?QFtL?B$?@R?u???=La'Gu,S???d?u?y??v?bk$?$?E?9'O??fu`?f?o?Y'6a?v?HJv?<g??E?:???h?r?k?a
H;?(?q????qD}gC??#nR\?53?d??o@????
	?2??C??h1
Yn	?????g?i!?V?????':????[????z????F?#P?K?u?]w?%P^v?m??z??_~?]??~?w<M0/
QV?I??W?l?(B?%=c\
?d
???T????1F??tg????Q??u$?W?1hC??Uq?{R?
m?#?S$?r?T7I?&?=j?T??jUFm?~M$V?92Rv?q?Pm,7??U?F?n=G<?????F??[T??ds?E??&?[<?%n?{?Y?)?N;?7?x????_??]??DH??^u	??w?~?
?_W????W|?
???J?b??=?qn????1?0?=???1??
Z?B
	????	?

(?(?????????
f??t`3xA
rP? T?K?A
??? D?
7xA???$?
	8????64?]?????A??
A(??P?0day8Dz??a`b
???C?A
????hA??h????Vv??<?O9??q??F??????U??M?|b?$>?	[???
J?ga??T/????<2?(?	J
p?'????`T????J??P??#.	B 
?`=fo<?9??"??UR
?*

?0?f?a???bo[?:?????.=F?6????Bh5K?i?c???&w??e:??}?w?{??R?:????;??????ro?\???;%?????'?c[??m?AU???P'??>sBmL?o??cD?????MS?	T??I 
?l?????o)???O\A??%FMj????|X??@|au??~??O?????
k???
wp?z ob?kRm ?6?o[,??2?B?H??+#*!<?xJ?"lB%\?B;??H#)??%????#9S?'??/?
zsz?C[>3T??c4???R?*??x??I@?
???
??k
??zH6??{4K???K
^D?,n?i?s??Xp?V?S?
Y?6c($??|=%????8FFo??r`Wd??@?Ni????\d/?3h?L?`????#?2N?g?)~???oM^NP?TP??e?????CH?T??sPUX??????[p???wP?uP?P*Ql?d??N?=E???8
?????
X?
[
)}4??S'?"3
f'?*y?2y?'y?Jy?_y?oyO~y?7???y???????'??Q_?v??????|??\L>E???O?#??#??dP*?uC??l?6??;?Xk5Xd Ktn?)??C???!??=???h0??5?En-??6??7???&uP?{Y??
??&?3-(u?*C???????
~S?)??&Z??"Y0U*EZ?)?????o#???gD
?d??$s????}?V?
+v?X~?????r>_?4m?????t'???w??J~???+xo????5??o???4M??	??O???CKv3??d?E?%?8p???tfTZT?lU??3???o??-?????J?"e????#O?|?9????C?.}:uB?%?Q???{???????N??????_G????Cy???{?
?Sy??????y??E?y?x????8????????=???NT??V<???Nx?$?E??F?Y??w?I??"?&q5?e?IR?&??%??o???c=?hc$o?H#???Xc?:????B?c?5?#?>V??#?H?????fX?<?J3??f?-?l1?????J)?Y??w?fZ???)In"I#?????*I$?(Z(??B???????C2:)???^z???rZi??6????~Ji?????????#?z1*	(??`
w'?%?9????Y??U?(?xZ??D_?+Ut?J^1??W???:?L????98gE*??V}
??????dX???Ro_??U;?@&t)???B>Vc?r???\??%E:*?%T"9???J0??%k?[|p??aB?9???=??om??98???K m?F??????;??+???C????8??????^&?.?4????$O??_??P+6?_K]v???????S?}5?l????Y?-5&?N??$?d?-???Y???X??h9?????O???Oz`??^~?:?8???Y???7?V??????\?	`?]??3??C??1????????????aw?N?????????;???0eLn??4??n?????.??i????R?-6???????|??#
%?H????ql#???*????u???7o`
R????(
)?Q??&??$9BIn?#??F:??m|c ?8H???x??i??]?~K?	z?Z+?9'?????Z???l??B??X?Y%?L?'^??N?Y!?P???!?D:?M??!y????0??c"S???>???a&??l?4?)?g.???,&3??M|@????G??(??pM??? ??&???????YfIFJ<?.z???(?HDF	~v?$"??????z!??Z??????A%??D6
??h at 7??>?nl
.X??1u(?U?^y???fN;?VY??iq??????X???D?*;KX?C?N????=??????+?Co???h???9?/l13S?
????2?$?d?S?YD?P?h-?;m????)??j???p!*ag??????e?)?j?O??6?x2?%
X??????9`w|??????b??e???:e?V?????
=?(?4??tW?J??????-??6?I"???K?F+?MB??F??????
??
??X?Xs,????o?\;?I?(??&lY??Q?????W?2Q??%b??[??)???{6F??????t????-???VK????v|H^j???B?vZ27?%H

JX?8?8%dw?K???t?]?rc???/?[??rTpJ?/?????"M?P?)?$ I?O??7%$?????2?????-*???e<?????w???Wz?)"u,??L?]???*ZRW??]'!??7??qZ??=f??5?????????Qo???
x??????h{?????e?x??3?#s???J???D?j??????]p?
?0?K?mP?y?????O at bHW??c?$H?
G???y???Cb
7?
???????^_G?o\????'(??Y?Q????d?I?k?3)s?
??????4?/?VX????]??Vh5T??????LS?????]??*Yf? {Of?y??_????c??$?P


H?
"?~?.e

?A??%?H6
?d-s:*%?gHe???\
H+??- \?RR"?Z??8?
??p%rn?$X?|?

?XC?RA0???j?0/4??!?CX?'
 ?p?;C???j?-'?3
?%??d` ?$C?R
!X4;{
????4??"?ZB?(???*`^#??
?t%B
M????|
?flDK???4???|?T?U{?h?&u???	???$?9<i?~y???>?["Bj????v?v?????k???s
B
?s
??E? ??P??`@
|?+?&?/?M<???(A?JD).?X$Z?hC??T????T2??G4??8L0??P?
>???P
GQ???	????G??$,M"???????d??/>y?0Q?I??8T???d??~z??|~m?E?>??????????C%5,L?g>,???????'????>T?j?nqTp??X?;,???Q????;???p???x?2??
?a? zC?????p?BJ???#?(?I????!????%?E?#??OG??g9?#	
[h???SG?1?????bG-Z??8t???QT??,?(a?9*v???,e???'??'Tx????C????dx?#??GUr,?:?"?C?=*/??d$?7?<????&6????1y?d??IN??c|,hQ@~?C????!R!?]????pu???P0T1AZ??
j????j?$???G-??D?5dW<??	m
??B'Z?Etb/?AC??cZ6,\E??d??q,?	?
?=$?o?C?BM??k$?`-X?h??)???	,?;J????+$q?C??exD?#RZ?#?1c)U?L?	????#)LM:????,G?)I
??
?,G??J]Z??.?8?8RT?T??R??V???H?X???:F#h!?????????=!???5?Mdrb??-2?k
??w??;?q#?3$/Vt!?X?!?H????H??????G|?A	?cg??~?b??????i#h???7?	???????_?p??+a?^??v??7??{?????
l?~???Agi??s??F`CZ1*^"??XF=?q5?m?????6???p?J????f???
/??#?D?'n??64??????6??ZPE??Vw Ho?B??d?
?B?X?)r0?1????=h?Ea??-??	#S?8h/?a]?x????s/??uE???F??
+?}???z?Py??IE??b???0?
???l?j???j?0??py??Wba????????????@?
?a2AJKf?h???	????$?>jk?l?@
??????!?????!a?z???2?d.?J(#J???A??
?!?!??na???
?AzA?Ap!?R?bKTAR???O"???????!
(??A?r)uH?!Z???a#Z@?!?????dHGBH]??!?%@N?sX"??*\b???&d+?r2?#njs??? ?!?
sx???3=cS?O??? !Aw"??
??-?b?FkT?lGi4`?Ek4?!G??THc4?aH??FcH?tG??I?4G?Axi??L??d?Ea??b?^~(p?A????????i?bB?D?T^?eAy?$s@??B"?0	??0^?%??Y/rRBq@?bt?????E?_?p?Q K??0?>?Q??$p???$FT7@F?TGdTQHCN?U[?s??UcUVgUS5U??T?? ?K
?
n
<?qZ8?&?NsUC?I?6?Z??$???H?5U??>?+Qwh"??@??Ju]??t?VuY=?O!(@??%s?7U??P`H?D}?5mDEC^???P,)bB?t|&x?G4?'?X?t?&???????P?
??XgB?D<?#?T???#?C??nNV?X?(?D>?N??^Fnr?[,4s(?'b%n/??&tv_C4???^O?R]?v?V_&??
q>???i???????z?)d
n?IS?N??&n?T\??ca"$4?%?e??T???A?	/??Pc^N?%n?%@0?? `?in?4C?M??&?k???F???2??qK??G%b?\3kbJ??ki?jahADp?&H?o?E$4?\??g?g?V?4P7B??^??rZ6v?Jsp?G^?p$>????IM???u??t?+DT&5}??0?5?zbC?t[?k+????)R>?A?)45"????A?
?
+?.???nh?a?u@&4D$??T????
A??n
b%?B@?%q?!G?El	B?????p?h?z
]?h"?A?+?DuS?4c?HlAiG??U???E???}X ?a?`?h?Ft[???@?[???????????h???	?????lC??2???R?? ?!?X$,(??e????`?0?u	]?!????.?c3?!??s+????B??hi/1??I\???a?-?3!&3>g#??
?NgV!?5??+'?R}???j???7?SD??7?E??ak?
?k?j??a?@6?za[I$?R???A????Q?????p?zA/?#?a??
???w L@??
8??b???????c??????!
C?
z
?@[??v??? ?9D??dS?
[????y	wX	?v???9? ??Wu?FhA?6`L???`??
???S????+*?????Oh#,(???`???4??1??!??[??
 Z???? ???3???a??@
????n???????????????,.l?@?InM
?????
??????@?1??
n???
g?
?At???U? ? ?7??<?Dr9???#??
8A??>$(|Q???????
J?
???L???/?8A?????	????X
???h[m
??q
??????L????}?I??p?>~ ?z??????\?????Re??+
z?=??:y0????%Mj???a??	J]?$??"d???K?N)?zu???h??]??]?V??????-AgF??Ee?:?lL?????+^????????Y??VY?h!?h????~L???@?L?&??1?G?8?>??,???!?.?&S???m}?X?3K?<??I??{?F?sgE?????8??o?\?6uL?0?g????????-?^???F????????????	?#4??b0???TAHM????q??@?QxY???Z+5??UEH?MU?9??o:?l??$?H??vO%?D?:5??+??ZG8q??h"?HV???N4?43?\v??W|?X?Xf???\vIr???5??B?,?T?:?|??wR???8????2??T2:Q??????OSu$?8??cM??#??]y?:??6?h????8????;.?#NC?}??L????:????:?r??;??&)A
?C?;?
??8??zV?Fm??Y?J*?h??5? t??^&??=?$???t5????@}??X???????
J?L<???r?*???J??S??Hm??8?y?6?s?=k?
??G1%o??zZ<?|?I2??r?7?:??*o???#?d?=?
??u?T-??Z?z??!???eb???:???E??^???k?`????
???8???=?@1PEL^??k,B???3t?Q]D?f_}?H?????l1H???
x?RcL?E??`
Y??9????T?1`?1?@+?:hD!???*???&??f???	??
U?N?;?%??	]???@B&?
?a-??(?3?!-ha??8????vXs?-??gN???]?? ?#??p0????????[?R!?6$?
G????HUV?I????d?_~@?m??>???%c40FJo??Z???%???Z? 3?0?:???N??,?????oX?????Amk ??P?;?1Z???AMF??&hL??4??o??????8za?W??u??F???`\?j????0&???????ie
???)+???-?e???????h?cf??D?M&wX????E??My8???F?N?yg???E2?a;`@??Z?6?-mt?M5?????>S$???G??b
?A???#7>????$C&?-??????	??c??[?%V??KZ2????9??Q?RU???CS???G????ueH8O??A??L?o?????iA?NI?NRb??h??0?Q???xJN8}=?}- ??^?G<?????#,V?f???[$??????Q?Z5?5???MH??k??????1??Zg??????????T????A2??E"?@??r???????	??????h9N?
??*???(U?x?:8?F?'???????6R???A+?'?j?"|??2??"^?*+?*G??b0]?q~CRv?P???@??a1p
cg.???<?%3!S??ke? K??q?B(dA???4f??AtW0?\3-?A??!???!b$R,?qHX?`*
???_2~Yq??#????}?:1?|u7HA1!$?C?u/x
??\?r;pE????????2?n6U9??+???
??C???VQ???qI???1!F???F??`?%\?$q!?9r0?P?V?k?4????#'?1??)?a8 b????"??u?p?'1:l?????????
(?C5?0?????1^??#?rx/R0?W??"?L(????w'c#[A!M?T,A?????q???w?-!??!??!&#2z?g?h!AE$}????Oh2?QX+q?6t??(??6H8*?}???J9,! ??6Eh?5[A69^???!$r??M??k??"^A?????"6q?6?#?a?P
?a??"#???????????hs!??S??????????z??#E1(aQ!??uw?"?????K???i:?v?B%?????????q[???P?p@??B??:? ???T???w????8???ww|21~????Po!??+'H+?u????!???#B+?|rg? ?&6??Iw????)??w;#?B+?2Pxk?0??<2}?x??Y??? ?@|l'~-??,?6??w ??m?'9l4?0??	&(#?V?'???x???f@?B1?V'?g???
(??p)??E?p1G&??*?0??3?x?y?Bl\????s?x-[(?"rnDt?#S1??DA~??=y}I?}?I?#??????v?PF???????Ev?????E ?F9
??F?Vu???t:???B&??P5G???9,:~??B?vp??q?f
3
j
Z?
?
?v??up??????????p????a??
?@??PO?Df5?q!V??
27l??Lz$?????T?
-??9??? /U???
qV-
??????
?E@[?:??A???D?R???G?o`
?7?`?p?????s??<??
M?5?awg?K?S??:???j?
D?`?%??	|&D??Z??B@?c??X??L??
<t5?<j0@?U?U?G?[???H?f?d=n?
?0>z????rB{kc??r??@Ur????????k?kF???^+Ur?0`?	??n??????P>4W|???o?+%?K??UW?	S?8~??T?
??W??`
@EA??<??V????
?T&={p??o?=??
?C??P???l??j??M???4?$;T@?AD\??V7?Z??
?3\???A$D?Ayr)???WkqjA???Q??p|?X??.f?f???
/?S?:?2????????%?a	Yx"?:?ob~=??!p?A6	,}???????w-?q????1????1?Q??i?a?A?TJ.w???????q?W??T~(?~?i?i<
??????E?7 ?yh??&a????F?????sh??)?[?????????s??<?/????7???x??"?H??2??C1?w*d????An0???x??gx???cq?Yv????R?;.}?????I???I?????
E??AB*??!L?4?Z??????)-(??eI????)*?"Q?9????S??'????J?????)??r0B?79?Rx|_>??Q?M!mku?
??u?
???.?Wg??x""P_??N^??P)???????????v????2
'?JqK???[?n????TwHM?Z5h???O?5*&??TbI*F?????
7MvhIFe??Gb?P?a??x#?bh!J?a??]??=?s~???j?E??j?+??*??d?A'?????q??[nI??u8Q??a????{?P???????#??E???E5?9??C???C?P???|??-?Z?(??(??A%?IZZ?(%?d???%??2K-??I??)???Yg	6?@wbs?}v???^??C????6?P??L?iB-d??
*8?b?}D"??????>????*? ?2S?$?&?w???B0'MOE5U?(????*?8??i???T?I%??XU??&????i?C?P?Gf??x???5??Z61m+??x?Zm??TUq?@m????)??2?q??7??$rG8h???8U6?g?5??e?\R??d?i(E???w?y???G????u???@y?????r??Q?"???WfY??????0??R??A?'?T?(??:ct?xz??e??6??
?,]P??l?/??$???\?&?dZ????Z??7????????
8PA*?=??#j0D&8??e?	???31U?4??j?B?!Z(?
???b0??Q?\!?&*?????D0#??<s_?0Q>?uY?
??@6PY???8i,?d?&??
?`d ?d?B8Z ???EhR??-??# ???;??5
?{H??@va?U?d/?0?6?FZ Q2?R??x%oM ?P?=p??2D(? ?*"Z???q?

#I ???L?????D?a?[`
?`y???W?~s?_???tkV?????(E?J?????k?]
	D?
?%D????O)?(??
?????%??{?1
z-?OKO(b????a?%?A????wx
9??????kxq:h??^?x?d`?DuNh??S?3?	R/????L??M?c=???Z8???
X?pXS?5
???#8??
????
???O?????q0C??L??w(N??o??qf7???k??? P?=?3GHU8???c?2.????R?[???????'???yA??????Dp???q???????'????|@?F??
rDT?d0T? ?Dt????bX?Rg
?aj?R??V???`?)?&:`????c0.??3??'????3??g??w???|????????.?|??|?_????????|?'}?????}??=
2L?????'F4E?"?D?4?j5???b?z?V?2`(U?\??%L?2_?L?,%??+c??????e?L&+j?(????+f*??[PU?Re??U?O?????????}??l-*m??k??-??r???k?.??z?????/?????o??Cj????V*?%k?Er?0??D???s?(Z?P?!mz?e?T:o?ly??l??]??M6???w??????b??i?q??xg???yo???_???3k????????e??W??Ig1a??c?}i?????o_???????}?>~
??h???{*8Z?????Z???g?)h?y
???g??j?p{??????"?-??"?1?X?>????j$??-??0?3?2???L1??r?JM?R0L?Tq??L1?`y??S??%NM-??8??#?8??#?;h??M?n?9?;q?????l?c?:??yg8???N8g???;??yN????????&4?h?0??TR1??R?V~?e?MN?L???R??
|<??+?|?)V??2??RC*Q??8??O?jrCh8????7d?N8}
*?7??>??^?8??h-?h???6??3?j?3???F6????q??#E?mQ???3??0????i?f?j?????w??O?:?;???@JPeB?????l?a?S??P???	?????????*?qCxb???????c?GT}H?"???Y?S(????8?pC8l??4?w?K???;?|?va?:??9??w?????????<$!u?????G$??2v??????a'?????@?Q?m2??8F-????ym?]Xi???????2Z?,.???;??
t?/???%?I<???Sb?X?rd#?
???}??????k???@8????f?[6?
Tc?:??8?!

S??=??\?kDr]????9Z??????D????Xw?}??G??!???Ev?????ms?EF]??h?SD?IZ?g*B2?????????X?n?i?8??rBf)_??R?@g$?:?6??
???;??4????X??q]~?)??w??p?????x????
5?|????

vw*????T??DW?][:???J??7?????a????0R??L<\%?
m,%????&n?????o????r1j??T???#?M???*?>???y?s,?`,?????h???9????????w????[DZ&*?n3?????ms?
?????H?0$A???n???u**^?R1T?
?e??5p?????bD???x?=?T?epB
??a???<?	{H?????qDeDX????Q?T???T??????L?
jp????=X???5S??p?d?{j???a,5,*O?E?h?
1"S

???
???)\???1DJ?BWhCQ?H!??D??Z 
??Hq??p??\??4??TLI????,???y`??????=??????j??:\[???=!:?9(F24F?5??,??1?A
??e??!????)p??u??S??L?"wl?)d?e??H?????1,B*X;?<?
??6???a6?xe$??2?
5E??0??@??,?" ?
?@*
#?A?
2?!???HF
CP???`???dB?t???,B-?
?A?Ah4?????L&eNFAr^(6ALV	G?<??L????}?F~??9???)!?????{??!e?j????B?H?A6r?&f?A5"?"?a*???~AP
?a-??)???l
????I1 ?!???@P??A?5?Bz?
0\????"?d?8f-`i]?A 
glaW?@???04?	P?BA?@$R?PAd<?L?F??B[????]??!G&?-|?*?L?P\?XCc?@-`a??A?&W>gORA??jP?
t?e j??!?!????

W??zf[???????L???C??#?*?b*?&@BE?56???h???1??'?a
(h
???z?)$??DLm?+x????=?ll?8xC?e?6???d7?m????X???8?_???????,???f&??????n??)??????`?2??u?)\?????#?????8%@??!,??
?q1d?q??T?:\?1d1?qk!	?H?+??1???q1NG?b?mn??^????i
?E>??/??E????5!l)?!r_???}'?}?W/?D???DQHr??,?oR1q ?2@??B?????.n??8??a????O?9WZ?L8hK?	??F???wO???:Z?QT??? ?=r#?%??\??????[??#C?? 	q?J?!?????????mF?-,?D6Gq@?Hh?;??8??:?B83?A?)???J?????'????Q
??G"?B/?\8?8?H2?m?Q?)
??Q??"?7z???7}"?w???!D??C=zB?g??[???????`?T}?????=???????/=?{}"??????o?????????=??????!????}B???#???6?#???}????????}????#?R?B??=??=D??????!0????i?6?5~?/???~???~??
d~???>??>?#@?p???'?b??~?
u?8h??N?????g*uU,`?
Q:??D??w?A?????E??z?HU??bd?UA	VE?UGz?j?E?A}??Kg
u??z????"j?*???$?2???j???
??]6?[4u?>??u?jNP????#]??/J?6oY?????????????????*u??W?*????+m??????
??P??b??@JjP4?tth??"5P11??o)???*?_M?+??4?''4?	?[??L?2?Oa?R^u6Y7???x??Q???,?????^???2)?N?,y??M\?)X??? m??5??<?j???RS?J???:JurF??X?[???v?
iLAi?????????^H(?P%r@<'}??D?loS??./qw?
lH??+?????G?????l"??Bd???T?\???uS]?m?Em?ai?,,7U??????gO)8?I?0???T?c????1?u?z?
??x????U?????{??v@
?d4T???/l?C
0????
??E?@???	?
?#Z???G?a*?h?
$,????daH
Xolg$??=??M????cb??????LA??	d?3 ?:??
N
q8?Y4?`??HF;??
Lq ?T?
T?Y?@???za???H4K?? 
P?
La???????F??P$,8????A??lT"B8Cpjj
	??
??=?A.b?jA
??a?O??i????F??
?l?@??fE?????J????Zt??8?J??????/?<*?b.?
(b???@???.?
??? j??B?
?!L???
?"BQ?A???
??zA??@?r?!
8?|h?N?B? 
L!Bh!9?+??!
?Lja?!
Az?"??0??"?.q????=?r???,_??`$?I?$+???_?OWb,?\e??????k?????@M??^nq?????????????Q?R?????d???J??????b??.??????X?E?????a{?1?@? '?`8
??@.??hh?/?b ?n
	?????!gP??
?@T?|j???No?>(
B?R?@
?
?@
??? HXrv G8?
?{?ga????@w?/y??????p?Gtt??S
0???+k??^?
Q.r,??To?A
!U*?rf?)?a~tr	?jS???'??28A3??"	?Nh?,O~?`??)?Mh?b??
?fJS???r????W??n?H8???p????????,??????RI?"LT 
v????-C??U?????????z?
!@?????6?}tj??????<???JI?n???D??O	&F?`?M&????
??????P???!
!??
6P.k?PS
b`T`QZ?`.?d?!z??`U??
???!0R b?A?j?	^1?? ??? ?v?)?@????HC?`?@Eoa?@?"???a?q at If?-? ??n00?p?bd?2?J??s??Ls???1B??????dI?b??z??2/u??tKdt5nt?-???W?*?????y??K7]???S?^?????~??M????D/U?n:??????V?8??X?K?t?>??{???`R??jt? v
`(e??JR}???????
??gS???0C{!?
???B6HT?!??????01
??$???????`??D?v?@??T?K?2F?4
*c?G??GJ?`?0?!????2A?R?
?An?9!0-???c?s??
^??|l???l?1sB?`?G2????k9hE9??h?2??P?`E$?g@??3)s??H"?`?(??QE?F??
?~	?>N????.?
?????+?Y?fM?D/?3$?7o?f?s??ti?N<d??e`???+*?.Bf,vc??vW?#???S
2
R????Aj?? ?
?Rn?D(???,????????
?aL?:?l?0C??????0&?Pdn!O?@*a???Du?
ZG?$??8???a$?KaX	?
B?P?U?<????N?M:?r2Az??o????d?U?"???A0V?T!???+???I?5???J??le??Z?z??@Gs???%?N!????na;z???-?

??p??OFrJp3
?v?w?K???U????B?OD????V?L?????_?+?m??m??d?f?uc?`*??x??6?_0	?gM?Pd?X??)L??{???W(????[?.?????A?jK?.d????Dn?^??S???;??mN?
????U????C????F:+v%??\?T
EL?Dd??a?W??????:?\*???????N??A?!
|DZ????CZ$`|??=I at l?????????f??D????!?P??.????Z?K?
yo%LJ?????y?k??w??????????????^??d???k?,?
~9?4j?m??A?
-?*.B?????Xz???m???r_C????y?W????B???o?X????y??y?.?R??~??{??0dBsC???4l?j?&M??;?op??b??^??$??<]?^L??]@(??	w?9??1=?5>??????????????B??????L?o9}E?^J?S??Y??9~?p1??????V??V?????;??7}?k=F?D?j1?a????A???a?
?????????1D?????)??-?a?!lN???????a<????>?~??N???????~?????~???yo??~????A?{3?^?2?Y????l,???????J2????a?m??Y??^?~I?????????~J?????*N?n??"?\?Y???_??_????^??????????~??^???"???^??$?m????2???	C
l????Mz?f?M*j??nj*??????w??g+??i???9+??z
?
?Zjk?4h*???jj??b?????6Zg??n)-?\??)??2i-?????1?
?~k?+?k?
/t?????-??^????;,?????????+??\??
??p???j??,0?
??p??;??????
?b??=?r?@Z??DPB?A%? ?6AF?s???L?<??4?G?D??ACG+?e?H7?sV?)4E
i?8????\?I????~???+?f?s?????????_Y?
1??l???j??3'??r%????????????Ryg??B:
??n>????>???????<C????1??;o???_???nT?+`
pV&T????<@?9?k=???d?&?i-i/?Y
?v??iMU?????C?5?Z??
?	N]?
^??E?*N??????X??Q?????=??P???????@U?_
??*?N`?[??E??
3P+E?	F-?M????BsP???9V??-?iO[Y??V??`?V?jSQ>??j?
?SG?Eom:??
7???-lc[YW?B?REenQaaS?>???h.Q?K??????v?kT?~????	0??????3??yI????????`	*p_"???x?n6K???
F@
--- NEW FILE ---
GIF87a?3??
o???????M
Ov0????7B???f1#\??6??e,U????9??C?9?l?3??|??Yj?M\??????g????V+??Ov?????'???C\?K?????5???p???8?7?1?t?????=?????? ?8??2??L?!??E:???<?$9?G?????5HW?????HI?a*??????????3^
p??9n???a?m`???BG?#V??'??*??*??l??Cf?v?F,j+f??]??8??MkfF???????????????6?r????L?:???v??????<?I?z??????g=???r??(????
R
c?????Z?~??3"OU????q?b?oiS!???5?????z_?V?31?s?'?Y)?????v\&,1J>p?Wk??1K??t{??f8??E[.?n?K??zT?6??H??S????R??S??T?jU?v??X?W???????cM?X?jV????he??,??B???P??Fy??????Sh????{?qp?
?VE?????k^_?XQ`2?_l??9??q??3m????>f??f?"F??B+?????f5?M?rx?9e&NeGF????????gL????8???kl`?e
??:E?h???M????S??y->???bj??R??????????}E??>???&????f?&??o????)?E????>??~%3?
?^?[??????Y?;N????F;???n???1:R????MB?g?????^????A
G?:?????????1?8???)3`??VV-3?Zf?-?????vCl@??o+,4?Y?????a
o?m??B??x)n??Rk)?????`G7?Q?-??????M?zCZ[?{??J?EC??-??|,Yk???pP0?	??
???yu,?X?^?r
????Z???????y?6??Z\?(?????h?(
?wi??
Z?x?B??y?O????????[?oZ????`????zG5??JZ[
????8f6a??#>a?G9Tu?Dh
a??`?P?JPU?2?u??uP?h??6(?l
h???n????
??????0
???
IP??p?
? w	???(????????
??~??Z?t?
	
???:???	Z?
?????
???:???Z???3C
rP?????gLWF!f?M??4pB0???1??
M???0
?v5?????
?(
#??(?h
?R(p???
?@
!?#`??
??b)??
?=4
uFB*?0?
h{?P???l 3(??
??>?@Z?3y,?`???1???P?
r ???q)????`0 ?@????R u06?@?B;??tRE?
?
???*$Q~UuE?C-As?hd5?`O?W4A*???2?
0	?v_{U?%???
?0
?
??m?x??????P?>J
???:7??)g@?{??????X4J????(??;???[??k?????K??????f?s?r?A
J???`????0|?
?PQ??
?
?k?*????
7?
-??h0-?z_??`
?p?}?*?
P
??????P44l??`eu3?=gT??Z???
^@?????
?
# ??????)?@<?-[M*#Q????:
??Y<
2??;??????D???WY@?E?

GP@????????U0?e??PpZ?#5]?????`4?-?%M? ???&??'??,??+?*=?.-?5M?0??6??7??<??;?:=?>-?E=???bi?7p'
s?????dcK`cK??m%w<???p?aP???3???

l???????uJ????6?l ??V??????!???3o??w?X???
??S?
????Y????PQ?????????D[?F~?H~N??1?d??????0<U?K?Z?bW??.?5?";l;??s??22#8??35?e"4?mO?
??
l@g?W???4?s???????????????????>??^??N?WTF^d)???p??BdJ
Pn???[V>W?[s3|?Sy?????^FCs??X??>??6??<,?>/z?????>??????K??d^a??S??4?.g??6?
???I??$I5y I^?.?Nn?zz???????Y3?'7?@?bj?RpF???V+??Y?"????Ol??v???Z??|Z?j??7s>?b3??(R???U
???O?G?a??Z??P?a???l?nf???????????w?`?p?r????5?i?I?6lR???]wc?iy[?
?wp?????<6p????=\??????~|???????n?vR?i{???=?????z?v|???S????????w?-???????????l?????1??Fl?HE?'???y??I	i?j????
/T??E-T?
-V?F_??E/???-???0j|
?????????"J_?RI*g?"?+?x??&????$c??E(?h?
-???
7??R?2???qG7???L???I?@#J???w?1H(?t??4???I3}R?!????-????,m|???|??gT1?PW???QGuU?QC?T?#IUFQu5u?M]5?SYU5VT?|U?[???[id5?]I???R?
?J[[??n????psm?ZjA??mU]W?d????f???:a?\t?eUm???Xo????y???S/?c?D??"C(??G?u??#???????,??eF&?di?II?fN^????q??hLY?eRY????????[??y??]??d??q????^???anF??Rq??e?V9i?Q??g?a??h?Mn????9?f??:??nNg???????&???y?????????&Zp??~?o????	zp??6p?????zq?????3g?r??>?q?G???W?s??|??g?;t????n?m??t?Y7???
?]s?#_???k???W??j??P?r???k
???????D??H??
??
??
	?M;???-?? ??D%???????9Mp?S@?`[??N?Q??4f>??O~~??
?g0?9P??
Y?????/??b#b???=??zk?e??xq('???.(?"??o`?t??O at 4K{???|?9?
8%?gH?'?&???**GK>`H?il"*[2m
????b4?ct?l??y?0??????@:?	?P?$0lp@??o(?|???x ?=`???'??g??Oxr?:At(@?h?i???o Gp?P?Ak8?H??H?k??E?
uh?P?I??q????{H?.??m??o$?<T??c?M`?
?G}????}PH??t7?>???f??xH??u?P??$H?Phw g
?i?Dn??D3?C??????9n???qF????3????9?
?	??K?M??(=??i??qH??,?w?K??:
?He}?Q?A??m ??,?st?P?q?
8????R?????
??m
???????.`??L?m??@UkP?~?u?3p[p?vI
???q!??!?-F+%<g??#
??E??^'??1?*
?Z't??{?gI]y??F??`E\m$???r????B9<?s?!o2?_?[???!??<?Bx?q?A#?O?&??????7}_??????zA??c??Q?|E?!???????/1Q?-??v
9?X???EN[t??O????F??9??2C?P 	?]z?%?a?6HJC8?????R?>	?C%)ZH????'?}???<??4aOM
e?^J?#?7??!EmP???Zz)????7TH?Y=2p&T?
???X?.Q?B?xIu9???j?=eJ?$??)!??u-?R???;?}fn??i
????9`???;??????????&h?GYP???<?????V?
???f????????(0?AR??????*??Z??9H??3$BK??$*-	Ag????"???$ 
?Z?	gTZ?a???~7k?b?08]??????????????l?X??????n#???????P8poD?Of<%?od?d|?eL?????,4?[?	???N"=,9????A????(?????d????z/?ep?<?zJ????p\?/??J???!??(a???D???F*t?f?.v???????,x@??}?n??Hm?#=??|??0)???n??~g??%??9???[?;?`l????%l??Y?Z|?/8h?m?
??|?%4??}N???
?0[E)>W4?
????eH???RD??}Q}?_b	?Tt?q!?AP=???A?`T??????/??9?P??Cj!W?????_?E????a???h????O??\"?5!?{d??8W?????_?!
???b??S!f????x?U???R??$?"fi???"M5?R?
^Q?2HC?4FI?$?Lb
FaPN5eP??G)
Aah?U c?	8??nT?S?(*?P?UM?E?DX?-R?????-O;?#I??<?#=?c???>??B?c?*??????#;?#@?@"dA??@?#C?c?>?C?cBBd)$E?O?"??b???w??u??K	?`
q):!E??OeJ?a???U!????0??41????<?]9?C(t?my???U?9>?V??[??3R]?h?RV??p???H78??mG?BH?
?!Z?UWlE??a.fS)&b^cB&?L?e:fe.fdj&f2fgn?f&?eR&i6?gv?_e>?%???*??
???,M???
#0+?C?'?
?fc5?X0K?o??C5P?t?PA??TA(?.?	=PC,??n?vm??1|?$??R????1<?1?_?O??9?B??r??o?6^ow5??
?sp#C,To?#E%B?v,????o@?w????4????5?V?C???$_y?v???7p#?????o??{?x?#??6?r??$??
G?Uq2???N?
?i??dA?J?lp????f6??Y??W<y8,?	?N|(?ys??5??????T??????e?$??%?Py???CW??}{?????G-Vk?[?????,?k??Ck????????)k??????"?2???K)?j?*,?"??1?J,?a?f????,c?!??^@?????/???????,???z/?\?F?r?KC????/ddl??pJ("????-??R:?????Y??????q?8??0??SN6?`??;??s???:*?o??-?h,??L????I?f?o)b?????8Dk????KF?pd0?f?-?
?
?S-}m)??
???d?)?B??0?h??*??*?O;?????
V?f??0?1????X??????h9=?
?'?
??f?A??z???}??^y?y??{?W?}??H:}??????W????j?0?dI??Dbj?%?1^x8?R??
)^0kmQ(oA???4???????*?B[????????L??S??xS?6Zi??D?p?p2???T?j?*??.?????2x???y2h[?6?_???P??1?U???K??)?j?????m???y.!??:t?n????g?'??$H ?{H$???????????}??????c??5??*???,??dJW\

d1?\Es%r?0???%L4?(?L6#??&f]?????b??)????lS??Ou?Vd???B0fj
???0K???){"????$?X;???j?CTh?C&?-T?2}?CJ????1-*G???$? cV4c1??,??Hqf?X?T2c???%{?Zx??c@&Zu??
??a??6ZM??y?_
f4?????jb2Q????#Z?F???z?3??jH?????$b?????O<???n??%.??>???f<?!P??I?U7??
@???q?OuT-F\?7?|???/tq?2l??????V?6O
?6{ZM??Br??pT???I??O
3 5*0?H??&T+=N5F:?@*?1??F3!K??X5?5??C?)?gJ?KU??I??.kx? ??4z?????????/??????!
1bU?"?f??6)?9???E1T???f1??Uv?X?"??F??n
?D??5?X???5k?h?c???.H?\?????
F0Zq
??^??Xs???i?!??>??,??'??
ZX?b???/X???h
Al???x7?b??p?/D,?mL.Ye?+^q?U????
?04?	???j????W????ggFe??????+^??/y9>?-rwZ?C7???
F?iF?0?]j?F%??{QZ2@????2?'?u???u???
D???@?EpB??#?Qk?+d??B???IWzX-u?.@?ix?R?Yh?UIp??m^?1?%,
?bX?1@?fcB????l,a??&??-?;?X)d??>t?[?T?@U?hcQ??0???s?b?g?Z???mt?%?V?CE?????m????Q??ZjUh???0?
?:?p???0???
N%?P?
p?C@A"c?BU??%ta(????$?C??(??????<`yh???T???1/???G???L??_?A8
b?s??H?
?
!?a?????.p?????v???*??@??.`?`??8?
???
?`?????ra:?tA?q?j????Q????-??n@
Z?

???
?xn.?

?`???QvA
:<?B,C??
?P
l?
H?U

t??|!?P
?Xa?????2??????
T]?!??O??~j??@
T?
?
?V`
?-`A
Z?J???D@@A0?"??&S?????r??? LS?`?RX?? 8????

Th??"??pc??!?`
h
4??`??6kY???|?dW ?
? DAF!N?&??G?"f?f?VA02$?^?^Av??a/? o???`?
v 
,?L?j?fi6's?'?G??
??b??'}??????!?(L?e`?z????a?v??7>??1I??*?i???i?A?WRk?`?p?f
a??Z?!?
?A,CzM0??f?
?
??@?n?L?T`
@6 
?z?AHhNwm?B?????}??f?
Y ?????
?A???a?v8?X8u?y????!??V?"?s?.!
n@.`
??fw\?L????q?vAZ?/?????
??,-??S????`Z!??
 ?aS?????H??8?

??]?A????1/A	?1??)z?p
,??[$??Z?
B??T?@l0
r
?
X??
,!?2?or
????{?
???<?0???:|1???+N??O_?z???2flV?d?~???W'<"
.??{???=??b?t$??I?J-p?GB"S?@?
?U?t?^?	0[?
?Xt???L@*???@Q?
?3?@
,??r?
:	???b<?"j4D???+?rC
?C)??@@
c?r
*?G \?%H?m?dpG.?E??-}ZxJ????,"Nx??g???n?9{???
?HCE7???6???_3??????vN{??G??F.??/??.?e?V??D???
???	D?`?
8?N
/?
,?2?`J?
D??pp?!p??TS????????t
_$?2#?H~??z???MX??{?X%???U?P?????PV???f?heEmJhV?e??,ly8?^?:&!	o?!??r?:?????2?@8?O????U?1?y?H????B)?x-?$???iA??`??^(-mjik/^?2;??Lk????MP? 8

W/??
????N>Y?O???H?ez????,?8?Z?g?Q/z1`?D??0n=?????j???J???EX?M?XF?*K????C2?
?b?????z???	??<????N???N??	7??]c<?#tS??i????????#`xQ??X?B????
??>?QP??;???6#
????n!#G?c??Plfd?j?-????N?,?|?r?A???\Z???}??@???-y;l4????????????8??p?x?D?!?7U??i?2B???5???)?r???0M???C???~@VZX??`??_?ck#d"r??t??y??R?F/?c???8??;!7kb%?^?+????egF??7?#?A??nQ
h?
:T?S?Z`??gx?g?;|T?g pv?y? ?.????tbK??+??R??H???&A??3d?fR????5??
?
J??Z????+?q?(/?gOr!?'t??h?S???????8?
????E??y?Bwkl?y??c????SzXo?!???p^s?o?G
7??!;???U??!:2??????H?oG???n?(?(n?!?v????+????x???wkK?????H??X??x???+g?????A	???V?]:Gn"1??
??]?U?m???V.?C-=%~?g? ???`,g?1i??x???8?#U??#1n?y?U/?e4A?/E?th????k?Q?e at i/?F?e?G`J?l?6[N??<?BnU?|R)BQ#y[?hJw???'?T?TI[$An_i???m>I???Th?/Ui?U???!??l??9o1U?2g? ????S?B??
?[?8gl^??B???8U?????pye{z??
?"X??????OZH??S[?
??S?"?I ??gm?????:??{?g||?m?#V???(?l?4??Qvl?r+???]Ji xZ??????
?u?_???$????????Osl?? 7?p???YZ=H??UZ
	????z?
d???
?q?v??????=????^
?z-?P???
???Y??j??z???8r~j?????`s??	?F?????????g???J??/?;? y?yU?????R?????[8????+???????JU?!???c??y?????Ix?2??????qJ????8,+???y??R??sD????Xk;?
???Qj????B?,y?
Z?
??:???
?
??
???W\%??`Vn??^?gnV\??i?
f???j^t^?v??y??w>????q?g??r~??^f??uN????????^????^??n^?i??????n?k??h???.???{??sN??N?k??x?
tC7a4??:?V?,?:??SDj????@?N???
?`?vg?????????0?0???
?6?v?F?????
?
????????_?_????????? ???$??????#/??%??$??./?&O??[?s??6??>o?)??5??7??/?:????m?????? i?
??w?*?+9GF?
[@4??-??Fx???????k??????i??m?.ax?U,vO?????<
!?P??8.M*?c???jH??
n??O???F..i???A|.????r???z?,??Y?????
q?a?B}.??????HG&?t???????i$4?8?Z???%+"M6(?sL2??HpN? ??q#?"!*sN:??3&%?TL?k
E8??N???a???Q?t??=F??n???S}????pa??K%??HL????D!?h??/Y2????????>?i??x?)]??#?1-????z????T???4n?1?YG?|?K^&3>?K?@??=Er???Sf5?C5???c?S6??c??@?$'u??2Z?e)r?e.}???S????)?F??#2??G??Rx??
?$?nY?N??5?1H>??6x`(hEmc5?Z?P?2??|?? <p???3D????*i???)>?q
G??*??fh6??E??@??<???s
?
?B[(G=?Q???(\???G7??
?
?~"???????	???????D??<b??]??????V?7??5??V???zJ??7+Y??f&?Y`Z?!???H*2??v?+??fg??Fh?x??\?6???Jh??a}???c?<"???$?*?
????%38I??X[$??Q%E?$q???`?L?m1?tyL3k?P?i?????"?nF???< ?K.?-??[T?????
?s8"	??????]SkM???2????????k?B?s?????uz????#??
m@[?????O????0G`P
?@??E???[?
?
?N?9?@?l???V.?=H??C??????R?
?(,?y?W5
??_f?????#	?(2 ,??gMI-?*?c???p.????Y{??O?????SF?c???0??S????????A?-%Q?&/K?5????Z???????8[?C-
?b=??Xp9N?-]????k?U??G9F?2?^?}?1o???
X???Z?b????W???|?\???g?R???7?M????:?s8r[??F
???>???.a?J%r5*??c?("5?9?????#??Se??V???w?v^;???????D2????7?mj?wm?NdCx?+??R`?????RbCn???m!p?????9?m???!?????T???????2????D??+(?0????'r?????*?DH?$(}?(`"?)????vp??$??y??GJ?$???uk?|(G`?k0A????
?@P%`A*???)|p3 ??Ak?%D???C???~x??|??r???
&`$??%Y???q?[??,??z?oP???$??.$??r?e ????L?h?B?!?xh?@?t0?9LBu?*??????Ac?
?,)?i?C?BDq????????C?t

????i??L??X9
R?zX?>?Ad???E??U|??q.??=???D???g??]T&?	?a?2T?T? ??A?K?L*Y????1%XA}s????&???Q??;8XD?????????K2?Q????![?>Y?j0??3???$Hz,??Yc?YTl8?*+/
??w?H???xP?x?H??H??H??H?I?I?,I?<I?LI?\I?lI?|I??I??I??I??I??vxx??;?;?G??????J??L?jXJk???|J??J??J??J??J??J??J??J??J?K?K?,K?<K?LK?\K?l?????????g;???at?y??'????*?K?L?,L?<L?LL?\L??lL?|L??L??L??L??L??L??L??L??L?4?-??'
P\M??
???G?^?uH??????????^??^??^?
_???????^?=??E??]_??^??_????m??u???_?u?????e??]???_????u?D???]?
`??_
?a??_.aHX`&`	???a?_ at P`6x?;v??h????
?g?( ????'?b+&L+?b???+??.?K+??*??(?,?b.Nc)Vc6??3?b->L6^?9?c6L#??-p?/?c5Fc?.?9L=?@??<?+??=?6?@?c-c???'c2??2?????J??C?b-
7???m
/s???0?sB?o$G?]?Ucw?B?Wb-?s
6T?N???tHa;w-??????
??+?#E?+??YP????????J?p?????'?l??iiV?_?????#??????*V5??V????
??D?+??h??????R?[??????*Cx	'i????w'^?Z? a?g+?e??????????u???{8???_?r???????????:?????Fo0P??-??????y?8?sI?v#g
	nH????7+u??	?3xF8p?4?????7?w"??'<z?B????2???+??V?b ?d??
?Rd??
z????????a?,D?f
???{Wy??g??s]Y???Dm??t?
?i
y5?`5??H9???>
u
 I$Q?>?H!M?L9?tW???{)??AW???{_?|XY6?{$??e^?S?b3&???V??7?h?XY^V?mF?!???%;W^taQV?^??????I??2yy??aVV?_!??LF??F?????*r?q?U*???k??h'u???_i?VX_???RX???
???????j????bXynUbB??S[mU??%?[V?NB??i?Y?=:??????A???^*
@?,????*?X?e?????eja??H?[YGtu??DTfY'V???e?^?i????%a?????#;????????RK???9??
????(t}??[,?\}knG?q?+m??9Q?)B??WT?????K.???????ka?)?^v??J?g?????7i?U??????????8?;.???[???k?8Q?(
OX?	????}4eA????Vaj?f??????5?Y??9.?2???4~???
?HG??4???%??I??P0
`??9B?????%C?K?????????D.??ir?.k??\9?Z?T(M}$L???h??????|a???f???2????
?+
TJe?D?h?
4 ??,$hP???+??N?~???ko?
????D?}R%??T???A?5 ?8?
l????P??}??
?????R?
?P`?5?]??P?|_?0????!?;T??fCy^?V???a?	???o+???X?"?E?.?,}??L???-%J??%C	?K?? ?.?????E??$I????@
Z?b??P????aH???E2??	&H?????;????h?/????
???????	????|????o?0Nv??8?q
oH?l~?X??+z???y(;Hq???e??F4???bJq.???:?1
Go#?" H???l??$?7H???T????\A?6(?<1??2	?
h??[^#?0?8????zO?XG*??L?8?ZV?nP?6,?>??M?g7? ?]????1!	? ???LB
?Ws?F`????????? ?S???H?2$U"?YD?????????K>?iT?B?F??5?e
??????~"?	L"?H3?s??v?c!?qm?E?3?/S????f#4(l???f???|F???A?q1u??/%?T	?
????Bu??,?UD?l??lP?i???z??????,v?)@3????I
??8
D\?TA?l
<?! hJ*@
7??4?A0?
 ??t?#H#??#l?6D?PB8?C7??(??AF_S???S?$??d??`?Nu??
h
@?7H?DN??5??A"(??#??x?I>
$??9h?4B
D??:DL??A??7x
)t$?A?4????B??X?:4???p??dG?%%
\R????????q??????@LB*????,B?,?
6??5 ?
)x
?Ic?8??T?d

x?9h?A?
?8??@?
??h
??A?
??w??2? ?L("?s???VA
x?8?
lAF ?<^?{8B
?N(
M????Xoj?$????4 at B??A?^??d?????J'????
??$A7??U<\?(??Km7B?/%??

$Tzt??????v?:\C?bd????8X?$??8x?(5;$nx
?d?v?434?&N?j"????????9??l]?????VEF7?N???&	?8n?M????5g??yy???:i|?????????3?c<w?y0???.S?v??$???W??&?4*???[W??$????q?hF????Qp5u???????G3o
L??&1S??%?x?/?y??u?!Sq???S??????k?Qv??l?&?$
?`
k??d?f????T ??
R?q???
i??"[???`J
?5??n@ ?	R?????{?hHH???6??q?0???p<??O/?G??Q'?????f?z?t#?0??&?'0?od#p?A)7?p???j?????&?&???
i?????1??f/
???sh??2?? ?v???3?????B4??a??R?G??fb???2?X?>????%?	????6D9JR??S?0???ac??????0\?)???VH?2??B????`Zc?hFd?+k???Y???m?{I???u???F7R?R??Y??
??1h?
?hX?C
L<?9>?
?P?:@$ l?CZp?????)???L?4?????H ?????'?
??+??5???D,W?}T?9??Pl??? ;???k
?xc??$B????'.?n=?????????:?!?w?y???TI?Q3|???x?;?!Y$sgB??qI?wT??F4???H????,8?
??J?M????1	?4C???;???M
#????????#s?Z???Z??????)?a?P?rs	G????,i?1!q$?(?-?5?uH?????Qp?;#Ya???
n???)p??8Jr???)???Ds8???0?v???oe??????0P?gY"??????~|??Tb??????	#P$B"=x=*)??O??M	aS????j????????v%$???O?H
?
?BY?
(?e{X??4?#A2>V??~?))?$?++???A??
$???S??$|+???Y|N?*2????*E??r?"?F%*R)'??????g@?G?A??G???A??!?N??oY?Q}?Q?Y??!?p?????????P$????Q/???L?r-????/?Xb??.>H??aQ?E2*?z???6??
?@????R?-?????"%
?C??.?c??2?o%???*?)??'???$?X@/	?X?RN?.#?P*Y?2{Z???'???2?e?q/??|???3	{3Y?ec??c??%?2"??"2,?$$R)Y?;?sc?RB,?=??%$d??V??$???4	?q'?O+??;??++@?$????a{?2?~37?e?.l??!B
?
D	?????a1	?~?
K?AK??K??K?!?L?
L??L?4K??a?4L?TL?N?tM??KmK??K??_??T?!?
Q??
?f?(}??ea?I?df?D	t?eQ6f??fgV_?
?`hD_???$fgVf??i?h?Vh??j??j?vj?Vg?Gb?	P?f{h?vkwV
?
S?
R??7?x?4	?*d????
??-T(vL?6????o???:T???S?_?W??q?]?????7?????u???????yqp?????????????O!8*?F??wzgO}???_a?n?q??ZD??U/5%w??>??U`Y??On?-??<??????&??????\5???+a?]V?x?c??X??@)??DV6g?Z7???j????>????????S?(??].(&?V?a?.Q???7???_?	??UEu?b??U8!_
?5Pl?uQQ???Yl.!Z???6???D????4#?8???k?LyepWNH?W?g????T??U?????TB/?????J7[?L???a$rj:?????xi?VS=?HQZ9^g??W-x?f????v?Q????_????>?h?\?L?Qx?C?7?<?M<???9 ??*S????8`-'"????M<???:??zfY(??

?`O:?|??7???p???6?8??#?A?n??t???T3?`??a	???<??s?^??L3O?????P?W-w?%?T:??
ul?*9???????
r?

 ?y,?
$?s?`??G?0 at y??.?????v?b
?`G3(??\?,?????Q???W???A???x???H?*{?@B???8?J?????p?3R!?0`?@?-S%???|x???????(gH
?@0}??;?`??K?*[y3O?i3?QW&?\R????B?R???pc:?W?.<?!cl?????h(aI??<0?@?ceu??@?
E
????C?????WPR?X??X?>?!?V/?%^PB??????B??u????wP?n??l?2	7????Pr ??d
4??K????Nu?dE?@?[??s?p??????
?C????aF???????
LQ???!?-@?|@
7?
	
X?m?F???
P 	?????w?m??tL???O????8{R?z?{$??7??l!o?`
??0H?/3?7??
?v??0?S?!?,/??;C?1????OU????>??&???Fu??????EJ?G;???t???D???f}t!??4h9J????3?D(`?M*,]??I`EuEE?g?%??
Z
.???rpn?p?Ql??
?B???EzXUi?"?p?l
?!	???@
r
??????S???qI?''_??2??y??!?:?J????
?%???.?p?Av?x???[b(uqu?.????s??"??y?o1<???o?21??e
??P??`Z?4[?]?{??}7?u??4k1?BB7)?k?l?!?vq-?Z?z??hr6]?????"?#+???5?????J?Y?^?B!d0)?P?@?	?K+????:?O31?:???^??~K???O????????9???j???2??????M????????"??1O?)????@K[21?)????@h??????$q?p???????????q??Q#?f??[??
?{[ ??`{]Z 
????;?K????{?????Q??????f?+5??????R??T
4?:???P !d???????U?[Z?OP3????pQB????
|Jz
)?A???}Q?|??3???J?p??k?<?$\:1??T?d;???2%??0?()0]??!,???1??<?#.??????K?????:??J??&
??Y?BU????y?L??ZL??AO0?Y)??E?Ja6X??h???k
Z?
?a?
7\????j|?wl????Q?7*????5x\??#?q?i:]?4????[?Q?p??l??Q?????j????
???????
???e???
"y?"???{??z
?|}??M?]?~]??\8???=???,?=?????M??????????????|m??
?????}?????=??]?????m??-????????m?????????'Z??c
T??J???????W??g??[R8
?K??.??????????-?i????????-????}????a??m??M?????
????????=????????-???????????
????
n??????n????>-??.b]??WI+lK?$f/??1O?????c?????????n?N?~??B??:??C??<n???G???h?5??5?'^?Q?D?J??W?????~?Bn?9??[??H.?U?????????}&.	?f?G?)?@????????<???????@?
}?Z?????Y???"?????????n????n?????n?????>??^????????????????????q??T???2?.????????[????n????+)?????.?X?M?'hI?A{?Y??????:?-?????;??fur!f+gY???Y?,???N?c79??????b<nBA?C
?j???~?YtrT .?k?c+
??M???"'U???????? ??$_?&?(??*??,??.??0?2??4_?6?8??:??<??>??@?/O?@?Zi?
6|??4!]?!??jK?????p????
\?????]?b??d_?f?h??j??l??n??p?r??t_?v?x??z??|??~???p?A?/s?G?
I??k:T??4(??9r??P
?????????
???P?
??
????	??z????? \?	7r
?p?p
???0?p?????????????????_???????????????
?????$??g??x???}??*?a?3??cz???_??d??DC$qD?JkD?+?E?]lqE?b?Ea?q?I?Go??Ds?? ??H"u???T??#????)????+???J,?l2K1?drL/???K#?L?L?????qa?A???I????A??x???i??ml??q?p?A????\?0C?>t.OO??4TP?Z?Q??PTUM]?CTY%5UVgm?V[]-??Xo???]u}?Vaa
??\{E?cq?uXgi???f??5Zf?u?Zk??U?b?WZb??VUo?
7?s?Mw?f?
u??;??Zn	F4?
	??Ulq?rX?
???vtO?(<???x?c]
S???Y?????N6?????L?gB???YT?]c??????1M???U9?e?????n?=???????a??????-??=???q?i?|?)?????l+.??&????No???????sqyHF??el?>??????q??B?Z???)?pX{??].R?Pt???:G?Q?!?u???\??~?.t,Y?
?????????C?FJ??8?C?7@?NiBl?<|?j\Cn3??k?hb?;|?1#!oL?j,??8KTB??"w?????Ay 2??-?????J
8?9h??????
??l?I?????1!?J?H?Z:???Z(?Q"???Il9???
?4V?????a???&D?+??????=??]?
9:?
?f4:A?[`??*?M?`?L??k
?@?;??t)D???3?P5?Z??t?D??yF???q??\???$??????(??????H??%Z???8c?G&?	??	?igh-v????7*h?????Vh??C??1????????-???.??6???? 9????????x??.??/
1C?I?b&?t??:f?$`??TJJM1?D[(C??????+?	??N*/R!????c???????g!;??)?$h???*?4???????!M?1M?x?j?
3????P??O??Q?J=????S9K?T??G???*?Q?s"?)??#???@yn??y??d?|C#???X?%???P?T????8 KB?Q??6a?;a?2\T?UK???K????*?!????.?0??O?B???P??
T???V???J^????????Q????@?X???
?????[?????2K/?C?_b????????9???O???
Y??? I?H?
??9??????????RT:???\???d)??SqF(?z?:6k=?S???????0??(A;\?;Y?d???b+???W????a^?cVt?GK??qFd??:?5??5,\w??e??
?N96Y%L???????????$:fI-?ji??fb???!Z?RU???x??~P2?_}??@yP-???:1?g?Y??Q
??P??T??m??m??2D<??QU?PV&
y
}?????
U????a>??*t?A6#&?,???Q?+Bm???:??C???E?=VK?:<???O???u?	9???V??X(X??`???\??[g?m???S???83R?b9???:jz:snV????;?????W?`O+V(U`]?3}J???+??T?X??v.?A??R??\?]??x???????????5_4?W?p??9#m????4????????????Bu????7?IG%*]>c]?HOCR
/?E9??xM??a?t?9?????>Z??i/??????r?U????1????z?r?"?A?K[?K??A?m>?A???{?v??Xb.r?????
?? V????/$??0???3SP? ?"8"?{"?{"@.O???????.???*bC@?m???[?l?c?U?
(?
?b??X2;???0?15@????S[?????l????;@
>??;sk?,'?t??2???J???ep???,A6S??????`?;??Mi+D,e???F%U?s?}???????n?????&I?l??ii?O?>??q?O?????{???_??%3fl??d-o?t??V2?-?????1?)o???2h??8u??9?iP?+kJ?y4???+?m??&X?2i?z??J?D??-:??J?A??b9?nJ?<??d?

?
??s?.???.?|??????J?#?G?,?&(?zRi??Z???J?'?>-???"?s?LkJ)??6??U[??[?.U?gK?4??EO?Se?_r?E3?P?????s??I43?????x?#N ??I?+u?lL2?|??D?/???</???????;6z??AJy?9+-h?,>?l0???/????t?A????}?1"????/??R????K1??r|.????f???{'??'??4?????K0???J?????+???J~???=?N,???

|?BX?q^?`
_?? ??1,???h?/?q-v?!?k?1?Q?!/Z??N,??
[?O#L?????Hh`0	???(b?
q>$TVr6)?ing????*?9?}.?P??T?~"5?=NqH????????B3????$??M?"U??<???T?
xcG5?f
3Q?nm????x?+I,N???d%rB??-"???-M???\T????	?*u?Jm?HJz
Q?b?&!9???,???d???????+^A??
S?^q?;$sw?2?
FB
c??2?)J?0?9 ?n??d??Xf:?`V?%?w?4??2??\??"^N???T? :??[9o??f??7
J0?b?2?p?E?$????81<XX??<E?????
??&6/T?s?V?C$????BA
\:WU4?"??L?E??U???*l?????%?????%(U)$??a???~?#?????(?~????p+??bL!??$???,Et_??[b?Dbe???uN|???l
.?
???!??D9R?VTB??
??A9???=:>a?2????????^*?q?]?"8@
?
??????,?
?@8???@??u>??|8???e%?5("W*?-???4?!e?j8RJ?~??=Z=????????$q??????/4g?
EH??b?c_??f??+?Lt??s??B?UF??
???A ?/??p???,????????J??????????+hB8?@??|A|
?@??$?
?h??Y!A:??
?t??H?	
?

U8d,?
?Ji?D?#`?+?????????&?h$?A#d?n??jC&(!???)D?)??j??A#?i??
W???h??a?Ml???Y?????????
`B.\/?? \A
??T
?@??x?
???,d	?h|?)??
?FG)
u?
???????
?
(?K??
????
?
????@!???p?z?\?bH4??E?\?/??O??????, at N????T/
?@E???f
?,?%]b????/?*??
??
??>RNs>c?(?????"^??L?x??
 
?X?^???E
?
?D*?J&??&?	?A?'???
D??\Bx?A$??!?%L]??B4?????L?.T?6c???x??????d???}?+?????c)????<??j]??e?ok?p?M?d?qoH?M?8?X
??i~	{0?B?NR (+u2??+}?z??V?????o?RR??R?\h?zU????@???4???
tXr?+lj????
?qh?*D??`??T?
?
??/
?J<(?@?c
?*??)tD???Q@?????;@? A`??U??
??r??d??My@??A!x@	???cA&;??`qB?`??? @?W	??S?V?4?` ?@B???k?.d?~??el[c.??}??m]ck????????v??+??^????5????_n_?Z?8????1??k??K??>;^????Y/o
Cv4?p??????Ovl?b???%??'?b???'Ig??Qq?_????=???^?W???}?8???q?j??p????
?,??f?u?????=c?u?oo???????
??>???k????/P?@?
?pE?aR???0`?bTC&U??a@???????r??\?0??
\?D?aX???
?8?? @????Q
TH?]XY??
@?b????
?
(?
????t(??ZC^????Hr?`???"`?`??XE!??(4)F?P??AZ!&O?P
?$@
P ?bv1?G"?f`X\:K?????
\?2?F??`???
X
?Y
;?9VYe?5?P???$????]|o??SA?????&????h???va$?,????(K???@EDh?
A:??;???Fd?T?!??Z[k?R????|?Vb???;?PAsSE?a?;2
???c??O;|??
???^b???*P?????d<?W;??5???gm????b2o??i?????"@	Jf2-????Z?v	-[(?X?A
&??y?e?????e5-IF1?%?L?6??G??q?T4?7???;?S??%g9???l???^?ds????!J
4UDM????c??;???\b??%?h"????c?5????3~????"?Zf?/?e???kPc@?%^2/81B ?:?0t?D "?K?f?(????(|
?C,???-1?K\?%????@PCW?`D!&?D???EY??KLR???%:?KD????.??????? !`?O?D?`?"2??G?!??%??(1??D?%N?	e^?=????AVtB???e4???N?r??,?"<?	Xtb??8(t!d????e&Z?^????.?
]$H?]?4??F8????zx????]mPw
_??n?J?.?W[X#p??1????b??.isK<?%;B?uy????????lkK?\?????H?`X?"???!???\??????J3?H?cl????HS]????b?h?AC??X??U3??k^??2?53??i0?3z?pb3??????P
8?
?A?@?X?CNC/??????B%X"-K? ??b??f
?0???ED??*?_?c_fHv?x8???a&????ck?`f?f?????n
??"AqIhc??c<k?
1@?3?4J???p????
D?6?]???t*?f7?<F?Zn.?rLi?yH?o??j_(??o`?Q??C9????????p????d?
??h????2??????f?2?????O4????gT?/??\4r.?iZc[????Mj???D? ??&-??C?.??Ro??@??-?NM?Tc?BD?zA?????X"?-????U?????/-???va??N??o?????&?R???aq?x?05Ulg8???-1????r-?(??????????4-??&?+???:+C+qQ??r?\?[?.u?K^<????'?j_??7|??Af??*????????:V
;?O.?m?^r???????:?-
??N????+???A?????.????C?????vA???%D??4o?RbqJ
????????4?g?A??
z3G??$?[???????B??? ??V?8Q?~?;???F?E+?0?h??????f?,??0?Vc7??N=???,:O?&??~?<???<??^???,O?E?8(?? !#??.!???????????1]?'e?6?(6???
??9???O:0n??:?
??E%??????????-?Dl,????????X3?,\???????C/ef?h???mx?}Zf?B]\?d?????VC?q??2?Vc23??????e?????X???`????E??mM?%??s/8?\????@?Lo? E??ne???????q??.6?0?+k??K??;:??BM????r??z?hR6h)M??d&?3??60??M????g???,??c??&]?e?0R???=-._????
`zC???aD???a
Q?,?:\A????n????\b!?0 ?O?a???l??\?\
T2??B!c?/"????f
????@mn%R?n?`?l???44????<@S???
(hW&e.??'N-?H?
???X?NPW??cn??N)?`aE?Q??}?J?;?.????B???`-;?	w!p!-?
??P3"???bF?ztN[????8???~?!2F?:??k?R?8-4?rs%?Nx3??RB??aI2??/?4?Z@?
pb?n>?MsT????v??X?	??.,/U?ft,????Jp?6??lQT????a????r9???6???
?0??@?=q???Z?)8Ql????)?X?~y?-?-?T6?n???7?w+?2??Q!???+R<&?jyx???krta?f??l?L#
?~?y?0w???AD$????0???1?c?h!.??40??D??vtw?.`+?A???Q
C?????V????BP??'-D?,B/"?b???/?/Ym??L4??"Y??17R??.????`?1?ya????"????8`?cW}M5E???7????O?Nc
????-;???L?p{??4iTv?n3r??P"?<??.A5p
^?}?uv?5/%(???j??&?C??S?V???%?
?q@?(f??a???a??)?c|??!????#_l??*y?????~@@
?D<j
??3??2????MD???D?"???Q|%z???Tt`?*l /???N,?CD'????X???????
1?*?+?e????nQ?7???v??X?1??,\v+Y-:?`!2 at v@
w`??
?g???ec??%??
V?(A?'j,??????8?~K??;??P at f8???????mhBx<?1a?!?????/???7?:??R???R???1?v?u?`??????L?1??9=?????b?j
_[?f?@??????qV3?!\?M????s???8??.Ar`?m?????W~C?6
?`?????{?f"?*??x?"f?T
??????Z?
??*	?k??????f
???6aaL?
??b??V?X?!NAld
??A??? 	
"?[?v?Z????d[???K1??X6?R?U??]?0???????6uA???,?????????_??"??E?i?
?Pku????@m??1@@?/??u4]???????d?X?a????u?X?bV?3???-`?6Wm?;lGc???2?
,
?fWDk??	&?D??j?N;2??????r?0???????K}????j??2??\kn?)????
????????L#??????2X??\???RK-?b[???18?K????
M4?(????\?????xv?
j8D.?1??x?x?%fb)?X??pC"?
v?DG|r?????>?/
.? ??h?1x??@
???'1%?0
i(?"???1???W
a#!Y!??<?\H?0Kx"???
?
???h?#??X?
l
??Y^?h?
?
[?
*?
?3
.`
?j??
1?8,?.???$X+(a? ??:f7b0H?D?KZb????Z?TKgeQ????E???_i?G'}`??hF?w Q???8????c???P??$L???I??>UI?K_??{?-????dM??W!T???? ????????^
.???q?
 
B????
???4?D??
?@? b at o?a??'?~??}P?
2M?%
i	v~??
?PTV|`?
?@!???0p
??o`
??
sPX8?
hR3k?
??0d`	????
Cf
? ???_?.IG jp?p?? y???QrB?`?`	;???	??
??
Kh?q??
?`
0
?@?
0?;@Gi@~?3V% 
??0T*@?pI?p*P
}?pp?~?	?`+??s?op0?n$`	???	
\?9
?
Sp??	qp
{d
4i	>?
XXp??	??
p??Q0,??.z????
i?{$f 
?:
3?i>????w?7?@??R?9?|)0?@5_@
???y?
??@}SC?&
x??GQ`	??
?`KH
??.z
?P??C????pC&
???+?`??bP
??5Q?*f?!??????C??7???&????Cx!????? 
??#c?Q?Op}?
????-?P?'Gf	?p??@tP???	`??#q	d+
?P??
i???DX
? ??0+P??????p~>P?I?
?U?
o??O??K??0T/?	???
k??3???b???31B
???p
?
?w6?X?Y??w??L?3??fqHh??????m???
P???j`	7?????f?o<3?p?
??N
?
??	7??y ?C?
~??r??Yhq?"Ck$9???r????P?6???W???V?G!??G?
??eC?p??
?i=b ??????Pi:??y?b\?
B??Ut?O?
?p?UD??P???o??p?H?/???7????\?
??
l?/?	4B?
?+?
!?-f0H?
??y?Bu
???-X?q????~A<]?w?zt???????%Rg???????'
xQ3Qxq
qP?5??D?
k/0R?p8?p@
?pg_?	? ??
??F?Y]?
??	?j?@??/?`F?`
???!*?A?
V????4??@6?'?r??
t??C`?????	
????rH?
x?
??q????Y??pP?l?@Q?bh??G??^???	?????/3?? j?(7PN??
? ?2?)?

?4{U???C??A???5]?x6??Y??s?Yk???????yr?????(? ??5???(i?u?}?t?A}-?`?\?8?Dg?X?????,d?{??7?-
K?????p??
8??cP?pm?????
^?n???6??#??p?\???w7???????(?	t-w???
H???q?P
Pm
?iP?(??
vr?B???-??f??e?d?[&U?K???J?*]??r??)?????}????WT?<ng?I{n_?v??$I?M?8*??????V}????*1?,C????$K?&C?M?r??_m?
Kv??-b???8
f??/+
?`?d??D?,?r?/c??
;??++?,???UsS70???X?U}????1?X???
Z??/??
eiA?Yh??:??WP?????
?g??%
Ka?0W?D0
??
2(L
?P???B!?#^??g??S?-?q

;??i#V?cBB???)??p	X|O	9
2aShB?#
N?<???H,A6??o?0"?0????6???J?&?
??a?b/8??0J?t???? h?UL?F???%L1?
?fHdv?
/%?8BN???m?i=??????d=R??	X??z>??^0?E???2
P??F???P
q^?b8?
L
 PQ??4?
??)"4??,?
??	??
0@
Y??7cU??0X?	R??1D??/T<??J?3???????C?hEJX?c?,
A??D\????
P??
??	(??I2??X^L?ZX?8????
?P???9?????
?
)????W
8?
| ?8???q@
??@??%(8??2`u
(Ai?,??
?m%P?B

?=??m???)??
????Mx
-]
??8,?4??
gp????????????t&A??UA?9U<??y???|??A?.(????N@K
??????f8'?L~?~`%?`????r??H]?:?Qn??b]??	?P??q???1?eJ????P?:????????X???Jbh!
????*??
?X(?l?R??KL ?^????????b(#?M????
?bP??`???(X??`(???WN????>?????6i&?9`?^0?b0jA?_??u??????#??3????%??
??8??S?j?8???C????>???+bXU?1???`Y?????+shBi?%???h?yF/
??H??????+??2??*Z???`EkV?`???YT?FT?	<???(1?X??d??c
??????xh?P`?G.?????

??}????~?*??pe?	??_???????R??????n?0	V at S"@A??Ql??????U?Z?+??#????????e?D???c?cc jq??)o???
7???J?p^??????4??2Qo?????c?A??#8
/?
B??U?U4>+;mhL?v??K??5??>???<8??@?N????p?|??????c
?0???V??
y8o???"?n??????V?@????/????T?0????????`??x??xp?
???(?w??>??O3??z??a??F?N?S?)????J??e6
F?"?????y??J?2W????:?L?h??QeC$????d?5?4?
I????lfJ???.s??-?ik???4C???T?LE?d3b?"?h?F?B$F	?	r?6???i?K?1??????`??~Q???lE??f?R/?????B?]?????FzR??D?H?
/(?$9???F)?oV?/B?(???MZ?=???'?yp?2???
$7?????+?????qH2????Y?!CJ???%??q?Z]?
X????&(7???J??H%?_?2^?NbI?v??.?3??*?{1??
?G?GzB?@????p?9????gd?HB??W?+?$?]??*!?X?y???)]?B???D?t??
G#i??e???????^M6?$??0?e??V?"K????-rd??H??R??qas??x&V?t0??x(??IC??V?7QQ"^?c=??9?$'IX????$?L(????p?0t????[??,??????03[0?gB'?<??R???x????u?E?E??jU+?|
???=n?/???\?v?"?U^9KH?F??jJuE??h???p3'?	?.J???R'M	r?mp???\?5F,x?7??d???.U????ga?????
?5???a?52?1?,????Gx4H??d?(?*??-aQ?y??_D????2?(?/|1?[??/Q?N.`?76?f??0RtD???,Q???B???EV??V??y??|?P?y?,?)?&;e?????G?????/b??=??]??g??O??#??>7???P???T??	^?8O??B	#;???z?'??[1t??$__???????c?e????u?dM?F?g?2
?????p}gH???i???.r???q??U?s??E\?;p??*???^??`?a?tzN?H?*TQg]?)l)?Ju%2??~?w???/?L6??Z.e?????#??.?z?#y?c???|?A_?:???????????+b??l?g??wdA???+??@???\t?R?2/?????l???x???m/K?H???8?J)V??Sd
3??|A?J?\?$?'??jhX??aBF?P)!?`?N?jR
??????%?xx8?
^?xI??q??#
)C?;?Z?\??f"h??
?8?
?P??????Q??$e?dV?+?2??????Cv??k?
i7??x:?JI?]PGj7<Bf\r?F?
??|?_[
2(?II?X`ED?,?????Z?????
????E???[,?^x?qXO2E?c?I?W?^???w?Z1?Q,??0?(t???v1!E???J)??????eOZ?bx?Q?DWUDQ?(??'??M,H2?Q
?????P
-$???M?QN??
@

??1?B'????
??,???? ??8?q??|-??G???9G?$???????4?\1^N?2???jr?*???????H8?XE?Eml?TX??K^??/?
???1((C??*?
7?d0??
@??'\?^???B?Y??8H?E)???~ o???vX???????F???L?

???
?@x?`?(?
????-?'????ws?Ju??l???
?@?
?@?
??-PC
?+d?????,,???*?7???
? Y???????7%??-????3"????8H?u??R????7?/c-y?\??????? PM????'p
?t1'??
?9h(7?3?B???\+\?????Bl???P????[
*???????Z'?
?vB 21,Yx?
L)???
y??????7l??G=??{????C~0
??=PA 8C"?A??:?_+, ?*?Kp? 
?s\0???
??%??%\Ap?
h?
?,"4?S???C\(G0+?y?@ ?
?
?A?7?r??I"??4$
????h2d?n??eC?
?S?!]??????
??.??
g?????G?i?	?{????pN?e????
 ?o?;
ox?08??)&K???9>0!?T?T
}?R?
???UX??
?!?*PM?ae?_?
????!??;N4vP
??C??e
?????XXZ!??alZE? ?LYA????.??VR%??clyu?
N?? ~?L|???d?I?y^????? D?T9?BVa?1
???<???3%
?0??4?}?K?8?>???l,???"1?H?!? lB1??eYlV?C????q@?`4G??????8@)
V
7?	?	q?a
-?BQz???"???
???&??b?xu?>??1|????;??,
P?b?x
@&???F???`
??1|
??.R?$|\?JP?R???{t)X?F????j?
Mad?3?Q(???4??>?A?l?"?"&??QD??
`@??
D??
V ?+P??ln
???kp?8d"??8?"?
?????%
Fp??g)0??????
?"%{A.r??$?u???/(?F?K?????1?0?C??ZX?&???0x)????8?w??s?p*????!???n7???'???.??$Ip?rB???`U?????s?8`????"B?p???]0R  ????vH?S????????S`?
?t1?V??W
?Aj?BNky`??@r??l!???]??n???
9~?P`?x?$?????0d??,AI?a? ?0!2
`rv?D?L?r)+?????@A????? ?r??~a??
paA?e
??p?L?????In?n??a\???
???0N?
6@@F
? 
T?t@?n 
!La??
0
??????!?f???BH0!?`???X
????,??
?
??(-
??????`?P	?`&??
??
H??????????\?I????d??D????	??
b`@(??!???,??6b
rm??`^
a*N???
"?gJ"4?
^?G?
8??
? j??
??
`
 ?5$????!??????jD??K?*O!??b?@?
<l?j?Z7?B? ?Z+z?
:??
???	?`?]?? ?R????U??????B?
l???????hJ$P??B
L???L??7????
??M??OPa;+i?????	R5?X??_?X
????@?n????????NN
??????'?t
??
??	??to1??T`?v`?
c?:

P??f?R?wN?y??V??

??
???e(???*q?t??4?????
?'q?! m[j?p???H&J???@@^???c?)X????~??q?t?"?\![?(???
 4A!&??>kS-?:??F,??C/Z?&S?/???
?K??g????
"f???8j!t?b[??
?????
A?
?Ak?????M????????(?!?????
z??|B???
???a-????X?????S??l?$????;???r ^`??"
??@^??`
"???D?*?]yp5 3U?*?H?<
 ??( `?<?"?????!?T
K??a????2?O?Ff`?`J.b???ZE??H
?
?????Gx?4)??X??L??*k????n????
+????
,?X??
Gvn??$?
w?"*{)?g?1??<
?,??`?
??&???????
H?#??uf???*c?_?? ?E+lf?
?&0?Bp>
,
E?Hnp?
U?B??T??
?????8 V4L??
??H!??8
F??-??
??t`5?B&?<`
h?????tJ?/n?	<<(?iP+?A?c??j??
8?
??
? 
?(kz:?b???X_????.?-p?
l?????|
v??@?p`??D??v???V????D???? 8?V
N??48???h+\??
lp?X???????@M`u'??N$? ???^?"?+=?0F+A? ??E{a?btB??????p?5????????Xxv????


V?;`?
.,??4C?*
???W^
???*p??1X??0'F??]?`????u:?r8?7 v?	?p.O?Q?5k`	?????u??
?
b5p??=?pI?`hr?*??I????
O ? ??J???@??I????????0G?s
???p??
??	?p????
?P??T??
??p?"P?
??
?????)1
_????la?p
t?'?
0E??pV?
P?Y8l? ???#????{?tx
?
V?Y(?????@`EG@'???P?hEqU8???T? ??d??????2
??)6?????
N??Ox?5ZX??
RN??uC??#??twS???kH??H4fh_q??h
PX?(?fd?
???
=?	???P??1?`[$sE!?xu8?W?h	?%A0C??y?q??.?X??S?Q??????$r
?????	qSNHC?)J?s?
??C????
?A*E	???????N???h?
Q?Qn???0W]?x
N?!I?????z?e?? =????@fE)??P4??	j?
I??bS?Xn?g?6g8?*vf+Z?
??+???`T 
pf?q???<????&FqO7?1N?D????:6????
?Rk?
N?d]??#?5|?0L7?????7?el
seu.??TeUd
sk?Pd?6In?QN?l??.????%n|????x?
?
?? ??)?@K?#+??Gw?N?t??
/"W?1L??!?"??0*#?ek?
??e*=e??uSy?P???
?	0???e???c?"?d??
H`	W??????I$?,?J??T?+?P??+????8X?
+?b?PK>?E*?c???f-????#??F3????@3|	y?s?????P? o????}	lY??
??+???????	??YJ??I?`K?`??z4?K0A??H?"??G??????????W0????D_?<X??????e?>,N????<?G??L??3?????=????????++N?p??
????<?hx????%l:i??l???L6[c6?h[?X??q?l6??H?????]?@\_z]?????l??,??\?0i????R?:???[???
B?f??{4?l4?L???2??9\?????PQ8LQ;[??nV,??I????yf?
.??,N?x??`?
?s??Y???????????3??b?????n????:<?????\??y???-{?}i??+??4????RNX?G?6?????a
???8"??I0`-?1^? ??n:???g4L????m??? o??.?D?????c???I???????N?
?s?`?????p??~??N?H???
?I N??<?*+N??a????5????%?
t?k??_#"Y2d?vU<??VAc?N:??e?????????A?+????!3?Pc?????JV?$2\SC"4v???d
?:D??!I?+V$:??Z?1#.tS?/`?~?<?5?L????%?$?V??EL&L???[?????Z??????dI??6$Fo?a;?
??????\?f????x???j???~???I??>qT????_?~??x
-????Jf??Z?*,'R?+??2???r+??&?2?D
??	?j????AI?^?,?j???????&?~Z??zO??nq???+J?????? ????B?????Z???j??*?
??+K????h?e*???L?3?"?????B?????????I???)!?~??0?0????JR???s??d`=??>???????Z?

??:?5?^C??Z??*??f?n???l?K???B?????|???Rfh??}???[?4<9Z???(G?n??*	?p<?BK??_?d?Q?@??;????H1???&?*????LW????"?@
?`??,???n??>?.??P?2?l$i?kE?~)H???M?G???1.??7"???k$?y???HN8???r????b?%???????~??{?=????
o!?~?i??@Uq???"??s???{?????:?;?N?l??[?????? ??{??E????-?i
5??)7[?!?x?9??v??/?%?	??????v46???YV]{lsf*?	?????f?q?X??q??g9&?F?|?	g?X4c*??z"???8?>:??"???????V?B????"????????.??Th*??????xJ?;
???????|???w"?]q?|N?X`n1?]
??S?AZ0D ??A "?L?K~W?!?8?S?!??a????)? A?1z???hl33`??w?xI?_?R??B?
?N+?H2??m/ab\>h?????????."M?K?LIZ?`?	I??W??u????y???%???o-]|???????<????>v c?Nw???????-??O?r??
la??xr?u?rL"???????hORK??F"??
?^;?FxL???3M??
Q??2??O6#?Z
U?%??m??#?6b?me!z??^eq????H25dEZRL?:?\(@q(?????&J3?L????????F?L??8???M
?I??@u?*?`Q??5?uOMIt zZ??U??%"??$k?EJSo9????????9?8G7~?
?uW???B????+S"~?N????y?1)%???K?p-???#?y?e0??Zc Ck^sK??????nn??1?F???leB????"Q?@	-_?cV?!?b?ih\?D??????+?L?
??,-?(1k???&??
H??"1?qe(???? ??0S??xP???:
#o?l?@???+IO?l????d*???Z?D?j???RHIN???h?????XU??-?D\9?Zh?#?|?sh???<???h?U????p?Cw?
??$??Z?q?3??T?)???t??????????f??8?`?g?.??H?'??SG??R&?8???`flL?
???^w3Q ,/[?2q'&?\*??z???A6r??#z=?L?{L??#u???$?c??T
bFT?bI?l?`????
fxQT?????7?????|wQ0#????|?2vvH&?v??n,??@?|,}??????ksl<A?qG7?m????2m???u??y???/?E??#C*?g????????C???$???(? ??a??????????0)b"*??/3
=?&???-?r??)2?'?J'L!??=??1?i@?I?pJ ????c??i??????'??????k???	.??$??}????)o?1????AL?:?"????
?iJ?p??a*"???T??????H=?:@-?#?#
:[?k?
C-?IA????]?c??pY(????H?+?v??+,?Se??Qt
|?_????????????#????3?????w?Ef???a??????E?#F???t???\4?}iB:???h??!??:??iDzj?Ky?????*??<?\,??i????n$???	???3???:4?{????c?n???:?????E???lB7?????=|=???n??zC?E???1J??='4F??#(?(o:????????q#?????>????%??lxi?,,l?q?????}x?)?J?W????w???-??##w?Fo???v?+??w2F?F	?<
L4?2????[??M???K	??l?9#?t???K???Y)N???l?$L????:??B??k???R???c"x?=?????L???iTB??L??G;4>?lK???z??????t?RL?K	T??#??Nw?)?|C????G?\?A?|????u
????f???8?l?????e
E???^?^???H?K??;ct??dOG?G?l??dKnDH??6Gi?|C???lOR??T??$\?K
??al???4b????????K
?N??O?d?
?M?4N??	
?	?M<?d?U?7<1??????lP??P?aM
=N?Q?C??,???M"Q????kH??S?E???B?x JS??z?w?2??/,????	??T
W??:Q???TP?@????G
?E4?GAU'?Sw?j?M?????dA;?P?l?
????K????O>??????TM??Mx?1???*???O?Q?tM?$TM
P?????YeMa
??4Mrl6??:!e?
????????U??PS???Su?<?X???T?BMi[????p?)O-E?Li?q??0?Nlh?ga?}
??%;?~??;YX$??x?Y???=X7????;1X?
????W?????????????bX????X???????S??????}X??????]????uY???X????]1*???=???
?r???Y????Y?5????-????=?a??
??|Wei
d???
U???????Q??{hSX?,????;?
???j)??W????YH?~+T??=??T?	??"J??P???{?U$L]T??KQ??Vt4??0??/2?S??S ???ER?U7b??AL?@2????????
???RGL?EfZ^??st?3a???&i???}?e???????)l??????
?_???i????i-N???@?]????:????n??w}J??
P??/;9?	?kX?2u???|??W(??)???=?i?\??_??dQ?d?LM??\???l??-U?$??A???????I?O?T??K*?A?4??Ttb??????@nV%$??DQ	/d???B?dB
?P???k@??Ll?K?$??????"M_?lIe??N=????&??j?v?b8??i?Nb?Q???8?SH???
???d??R/?????Nd?.kJ??$}?{?Wh`
!????2D??b?,Uv??=#5?G????m??Nb??\;?????l???M_}[An
B]??U?l??X ???Da	?a??^7$e<m?????Q?l?+*?\???<?b??4:???Af???3?p?]??V?
??TT?
H?????@\??C??@?	????k??p?H?S<]A?|?
??V??|?Wd???uJ}??3H????j	??`W??d?Jr??6??b?]Pi]P?]?????Xh^?V?i?6??im??????n???im
jb?i?????i?6jb?i??i^????????&??Vj?>??V???j?????????n??????j??i?&??~?????i??k?nk????j?&j?v?????j?????i????????k??j?F??????????fj?&k????^?????k????k?>lmR??^m????~l??k?f??m?Vj?f?VVX????D?~????r}?i?1UJFn??+x???o!??PTx_?n?v????\X??^????o?V?\????U ??fo??n?V????o?V??o?p?N??~o??o?~o
7r?6r?o7??q????o??r?r.??
7?p	??
?r)?p?_??Fs???3?????(???p?o
??s??o4?o???:O???nWp?WPt8??$???R??M\?v=?Q???t?|??sePj?TO?T??VguTw?WwuXo?Z??W_uZ??l`?^?u^Wu\??Y?uY_?lP^??Z_?VOvjxv_?Xv]??]?vU?vc?vm??\Ovdov\W?avfGwk?o?u_??o??fO?n?s/?lwvW_?Y??m?v]/wlxb?vy?vh?vmwzgwb?u???kvw??zW?[g????q?x`'xe?x?7?x????k?w???we7?s
G^?????-a????e??7!?D(???@??$y?R??????o??}M?6???J?j[??????$I??3???S}j??k?/???l????ti??y?????/???.l?0???3n??1???'S?l?2???7s?????~??????mT?T????%?4*???cg-?X}??8[?-??k??+?V?[????n??9????S?J?:????OU??;????[????????o????????c;_?i???SUw??4O?&;??????l??[????8???rj?W?\oY?\Z?a\???a?k?(????8?o(??"???b?jxb?????p???
?#??d?;Yd?K#?9>?c?T??d?UR?c?Iz)??F
w??"?I??`F?$?Xv???R2???8Ye??i?)??,??!?)???}vHT?%?OS:6?Tk^
???6??????,??AUk?S??l????9??l????????-???&%???K,??5Wct?????z???????????????j+???:?\??N?/??>G?j????R????vX2??????n??p??N[?????2?3+?\}??Lo????
??4#??????????E3???m??J?9Ed????5?5?{h???????J9???????g??????
????-7?y?
wp??Jk?j?=8???M??c??????v?o~y??Q??{?Ma??o?9????v?}???O?????}????
?????y????aT??k??U??
6?????bU??nh?6u??H?{????~???????????VZiy?Vj^?????????'????_?????~?6?>?}m~????=?!?Y?\???G?d???d?????"^?????????Q?R 
S???}???V?A>???
!?*t??0|>?`TB$?%K}??aH?\Mp??P?JS??<?6???????
?jf??4???K9????I?/?? d@??
?x?
S|??0???a??YB#??????D??Q?b?:???P6??r??%iI??1??g)?2Y?T34-??H?;????)~?>?A?<
R??????-p?+\?r?ZXm??????6?O`????@H?m0?p????r????kT??
??????-o:d?x???`?w?+???????N[?????C?<?????????>0????y????d????q?	?0?3??
??-??????_???o?Oq9????????x?Z?X
?c????\??????]?<?6?..??ga???xZ3??N~2S?7?z??5aY???O??^?2???F???E????>q???n~???R?P??6?p?bu?^???~?3?9????x???rY
il?? Pb??S?b???~7???
I??4????{?C???.pXkH??NZ????????
????S???.?<?-??????)????I?!	??8?S????hG??R?
D???
M(4??qH"
?????D??J??W????#8T?v?yo?)*?8???$? 	kd??~??|?
bS?;??9?P?u$???v??Z*??????65~?E???C/?P????s????M???q??~>???>?r)??)??|??	?J[,??z\-??=??_W????????`s????H?8????s????*??V}?qS?p$k????????a??s?4???K?Z??????G*?q?????7q? BG=??~y???V?K?% V`?h]W!?????e????Ca??y??)??????????M??????9M???V`??ZVh`??T???!????T??i?>??i??e?`??<?!?n???E????J?????U8??????????????6???eZ?????IJ?????b?!?U
?????
?_f}??k????
?!bF????????[??
?8?dvfp}"?Q?7?%?y&jW?????p????f?&mzV?p??8??Q??-Km?gI?j???????
's?VPJ?2?$,b[sVg?9??B??eOM?u~g^?e??
?V??J??]?N??rzl??E?6?"?4?+?z).:?b?Z??????m?]??Q'???pEm???m??)%?&??b?*????j`9???J??F?U???????&?jm?f???"?5$?&??hV??"Z??%A5??2??????:????????E?
????5
?????>??8??B??R?k?B5??+b??>W?jnj?????????fJ???????-C5h
Q>?(??^???.x?^????=??9?<????^??V?-?\?,?4??,?3????f?b?3????+66???o????fom
???-N??8,C(?/??/)?B(?op?Q??F=?C?&?4)$??TAC?(?@???/h??????n3?Z3 at C*D?{z?{H????X??4D?5`6?C9??8??9????[?3?-<???,n5???07??????
??j???$?
w4??A??G??z?3Z
?
?E3??4?q?q?q$&"
??]?GC(,H4t?6????(#&??6?????G64C7d;$??,?e kc3"
?A?b)lA4T?;r
?r1?ek?!??(??*???6?5\qW??]3\J??voW|???E"7C4h?5??8????C0??3\6????	r{
/??8?C
?C
w;??X:?6??{?5(??24?/6??9??A?C
;?C?????r??*{?
?2Hs?=??H?$;??2[??^???16pH?8p???X???
ti?q??4,C7?08??845
uS???Mt??GC??/ot7?r7??TS?O>E?
???C?:3A?s5457??ScCY??K???IC??\??q7X?7t?7l?7??]?5L?f??????<??\?5X/6c?$???W?JC"?p3X?a??5?74fg?E??:_[????vSw?j?6C?S?L??????_C7?5X?5TC4??n?#??rM???IC3?c?8?0mks7?5??r?)?*o
4t/??7XC\?x?E?^?5X?nuw?p?66?07@|3?mR?2??y?7y?2e?X75L?w:?%WUrM??
--- NEW FILE ---
GIF87a?K??

6??t????7v4?E4?????<r?#?5T?3?I??5?t3??`??o4??3??W#4N??S?u??B?l#?????q\vF%?Hc?d??n??4vw"??x3?????????%An??I?AF5n?XS???K	?ZUt?X????>?
B???%??
 [?1?5?|?ft2?4???6???H]???16?]?
?T??^24?|s??
}#d?TS????7dlq?????#?#?\?4?
9?H(?.}?"f?????2??eGZ??"?4#?4?h??|???6?\?!? ????RH???Hu`??)j0pAZ
\???X?{???q??0?aek?CAR	??X??@???0?;?R?xt?/?bU?r??l???v??^?????s??
?`???zm???????
m[??H?.%??KT???b??????d??A?S??!`
?.?dC?i?m??
?M__??Pw?????N?????l?????g0?.3)IM?
?t?#
#?N?9??h???]????
???#r1?u?T:*d]???c???0&?!l>#?i@??????????#NKE?c?(	??/xl???P???e?&I?4?<???-???C?2?+$?0??F?*uC`D?	??2N?f???E
3???\???jl?%o?A??q:?X?ra??S=??\?@V1Gi)? H????*S?*aH#?Yz???????cJ?iz?k??y?????`/?<H#SI?Va?50?!?_h??p?3??????B*]I] 7?????????????
?YhE[???hQ4Zj???B??JWLOF	?p7d???Q?l?0??w>?r??$?????????w?W??????r????????
??C?v?v??t?:I???
??4??F9???r?????t???6I0s2?wl???H??
??? ?0	dE???A
_k?????? <????%??g??f\?l?}n??m?hl???	??*?
?p?fI??P?`?Se?????r?0?????????o???T?@Yq??Pl ??????h??r?0?F??/?]?A??K??????hy'??09u?Y?????#?????0
??w.???Zxd0ip??:?t?<?8?
??L?<<??iM??E/?K?l?V30???<i:z??f??$?U???=
??
?+#???*
?`?*??2?>???
?8
???|?R?????:?$R????Z	?P????????]??Vh?q???

??W6??????h5?????c=??/?&1???z????bRx??????hz?BL?)?*????<?*g??9p???l?r)?P1[??@'8	????????9??????????????=??????#?????pc????ua?K?7?o???L?????v=<?8M"
??!U
?[??????]%???????R[???Zq?????k????0_xG??????C?'???A??A
???????hX6??
????????h
l??Y?????@}?X??K&?Z$3
??1???2??20???i/?v????'??*?2{e??
j????.?j
??'=2?j?a}Hp?'u??<hb?9t??4??5?ps?p???????,?:
>)?>??S<	??ok??.?H???a?ze?????z)?%>??I??}????J??W???	qIa??;???Ai`H??p??????`J???2[3?5???????/??{HEuu????'l?U???????U$?Z?????q?S,?P????e,?[Aa?n??WLM??Mz7+?`?????g???)????gi/?*
?i????? M?.-?.
???s????r?????
1?b?r]@c/+??>?w???y79????)a????R=g?.o;XS???{(mZ??ZJ?(????M?gzMN?^??e??????S??y??
?2????h
?
??t???????c.???'T?n??4f5Lg?DQ?h??E?$Jt6TZ5?=??|l?5k??x???jB?hJ????D??)??9&?k??????5a?&?B?X.`?m??5i.a??i??m??P??\
r`?????'???Y???
?yk?i????y??p????[???4`k?<P?"????-?o?IK??8??n?1?jlI?@??HP???p??a,B??????
?R?f?i?#??0??HL?[hI#?k#me?a?o?iH)???4????DLK?+???6???0?m???I??;?3????6:??????S????	??.???mC??m???m????^H!?j?	??p?
T?n???3
?2?P$????Ig????!?I5??qO??
??????>>???J?f?(???OL???m???!??;??f,??@?????=1=!n???=?=f;N?S?/jh?k?Q?}?5??1?
d??,?Ej????m??T?37CgCe??????,?????)G?r??;?j>??k?!g???[G??n?'????!??n?OWr?aXCo??;G?d??%?p??a?I??A?J
y?T??Yg?oWlut?@?m??3????'YET?9?&?^?:SW??r&g?A?[?F?g(r(3??`
?:?g?m????????l?R?7???`?d`+_?h>u??B8?O???$A?c|a?P%#??I7L
7?
td??{??
????=IW[
?H?$??2??8?&1????U?q?{I#??F?d???H??(#h?%???la???-rGB???T
oh????3???p
??2?=?????{?7(?Bq?C????<?????%?9????a/C?e9xg8?3???^?/A??
4??i;{:?????U*?=?7?
?????&?^>??@??}??F=??@?????;?I#?
??????^5???R#jO?H?j>??Q????????@?
jtg??Hc??.???$]???>v????'q?h???????F?~ft?A
??~???C?
???????hE?t?Cn??o}?F
s???????b?y??,9??M?o???E?F??v??d?Q[\??c2??=E:??5???GY?RzW?
????X1?x,???Fg?!*iA??F?q?[?mO?????6?????;?:UG?)|????G<6?K?????7???`o?t
~ K???x(????:|???????????r?3?G??lmv0???,?>???(????8G9???#?<??7?x??S?l???8???wt?C?
>????????O?Qv?????=?A?????{?????H???5?]?Mjc?sT?????A????????????cX???????(?9??h????y?????xfh?)?pu????v??Kpw?|??N??y(f#>?d????Ju??Y???h??y???:??Np#g<?<?];???K??^3??
??????e?9?q?vD???????ys<????:=.(5???<>t?19?'vx8|3??b7??2?8?;???	???S??@???x?@f?@?[?t?<k?l??u??{0?u(9??7?"?#=|?A|?????;
?????uP=th6?;;?3?????v??u?;
???C<{H????}
#9?Jwp?k?????3x????J??D?4????R$????&???$??????????4K??Hn?B??>{???[=?T<??k??v?J?3?x[???C??d???E#32q??G??n??|?L?\J????tA?34???tH??B???lLo?D??K9D?p\?????C?R,?b??;?lF????t??Kl4M?c???F??H??7?,????j4?\???d?x;I???k4HKd?a??spNl?????P?V??;$H??F??C??????\?\??l?G#???<PU?
?i??U?U???&?R9P
?'??klSS??x?M^????E??K>,?jeQi4???|
?m??MZ??PZ???????X]????m?????\?5\??]??????u?????\?m]??????????Z?Y\?%[??\?eZ?=Z?????]?M\????????\??????m]?e??????]?=??@Z?-^???f??u_????_??
??Z????[?%??_?(??0??-??u??i??????u?p@<??^?U?????g?
N?@a?v?~???>??a>?$H???V??a$??$P??a???V???aH?a???*?bVa?b.n?Vb.??$c)b??3N?).?0N?-.????b??1F???0Fb????c@??/?c*&?)>d)?c?c^c7?dB>c&cL?a??Inc%?:?cG??G??C?dLF?5?cB??@?aJ?>?&?d$?d??1?eR??9??-?cM?T?d)(?r???c?@??F????j??j??j??k??N?L
??{S3?m???????d???D8?Nf?????????K???H]W??YrU?v??;?F9$??F/}Wc?C?kRi??=|????ru???L??ne?o??m?^??^R??L???g?H??????#Q??C?CP??C???i=i?E
?????u?J?Kw??f4FWY?,?
????9i?o]?H???????JA??????S?=-m??m/u??.?F?F?3r??Y8?p???/?Rx??b?Ut?p??leMq???y????C>T???????,FlFf?'???3??J?
@???K???4????I??J?p???3E?
Qtkb?n?E7?J?*?1!LWt&?A?#????tk?C???8s?'?a?Stoptsp?BZ????*?JRuZw?k
wP?G/?|??|?y?'x7?????J????????
;?p8?$?4??3??l8!??c????Y?u??wK?&ROtjx)$Hj??sHtx????????np?E?E???uM1??/?T9???w???p?{?wa?|????x??????????_?L?vOGy?????j?sO??v?GyMivJ?????{??vO?UGu??xS}7?z??y?g?d??J?}O???w??wzw???x??p???WN??p?u???a9??3Wn"Aq:??b??
~?\A?!%?S??K?)nd?????5J,????C?$?????
*???)???&?h&I?}z???S`K?1r?h?????47? F?(??$?s??????;???9???SV??1??"$????{????
!???<?Y9????w??9n?w?$?\?k??A.Gn5??2g#?so?s??m?,?F??S???r????u??M??t??=??Y????????Yz?l??p?^????AI:tJ27??[??\:P?EY?dVCcE??A??sS?$?Q??um??a}?]!??SB@?d?DR?H&dMG?n(!?QZ
}(^?????6m5PF?b??18RS??h??5r??@??$]E2???L)y?F??BN?t?Nr????m$?|a?f;?,?D9h??a?!vgSQ???A???Sd?E??@{	W?6??sA?Gj????t??
o?D?5??????y3Zo???i#?:??vN?/???tnj???]7u#?v?A??P?pSj8?????
59??"?v??T?'?t???aF?B????????????o?d????Tn????_t)????@????N?????b??m????^?n??i??D?B8d????n]??V??Xj?c?????????_??:?et??&??8udY66	sc?
E? ???n
??`vh?zv?JL????Z????p??.??u9??<???o???.B4z?/N?,??-^???r,?A????? ??m??:????K?8!??????0*!??c???K)?P??S???
u?&r??9?????Fb???m??5slP???`i?????)5???ifC?hp?1???????t0q???O3??I.????:?????fqB?!|?f?(V?VF,"rJ???UMe??[c?G??H?OE?????->[?c????/1uWJj??????t???????Q???n?xEr%???8???"9??a?{O??L??FJ??L???
9??qU??d????$x?$?6G?A?ZX?"?#?"rJ?8D???}?0F??n?Z?6?I_nxCAu??lz?m2????(r?m0??n,+2O?A<?????ky????!?cP????H8M?)??""??
tL????g???????
Q??????9m?? z:???#	,?&a&3?u.??)??6z-gb???O?B?R??N??|OQw;?boH
?????,???--?2?/'p?
'?%`?"(??ek?"?r????x4n??1G??t?]=??j???X?Zg??E?jQ#?4???)?N???Z??Uj?l????X\U?Q}?!q?V?.?]%?z??????e??[[J??-?s}?$???!s?O?3?r???????8F?r$?fa%?zv????N?&?Kc(?~???Zo??3???3??n\f+g??L?	N??lf?=??8??,<?e83??a?VVe(!?`?7??
N
*?3???g#??S$??2???rl;?0?3[???yS%???|?4???j?j??g9?????3????=?k?z~?????A???*G;????0?hF?ipu`??<?1??)1???$V?1
\|??;?#N=?(????
p
???BN??P?GPI?F52?tV???????$?T??T%?p5?x??????2?x?9L%?
???62W??Ze?S???V?I'??cf'g??6:??CdCk?i?J?z;?????_j(+I\??W???U?{\?????%q???;b??????7????4??-??wz?????}?yc/z???1??x:??	!??0C
???utC:??!e?
??A?:??t??8??e`?~??.???cT??X&x??]T???E8???]????!?B?U?"  t?1????/,??-B???1??.`&d??UB%??7t%Y?C?B'(??? ?A#  ???8?9???/??/?
&?_'X`%

:C??.l?`B'?
AZ?Av?6rA'ts.?sF??U
$
d??R
D???8A%09???
&p?H?.??
 A%?????
???.?c?0`T
fC%
?3
9lj???`?????D;X?2tC?
?

???[?q1|
?}?i??Y??J?
?d???N?T)?j???????A?AUW<M?1XD=?8????:???0????5,10?
w????????}A??&UR?~*e???FiK??????s???E@?t??Yt'
?k?pO?b+U???^?]?6k]?h?.??V+X?H???:????|?*??????s?6??j??Z??*7???y7??Z???$???????E:t?iW.9??9+?m?n???
(?9??????[q???7NZ]?????nn?:??@.?f??8r??y<R??Is?F.>t!e ??]R?XDe??A?l?I????&??????r?!'????p o*??f??8???8??????'??C?l
?A?s?I??k,Z?xv?AF??ij?#?*?3????1???lI(????$3???????/??L?-?m??4??,??)+?2'?r?.?
???????1???0??j?/??\???J?J?l????4??????Csq?4??gs??D?????v???RK"??`? /????????u?yp:;??????"qn?
g6K??5???3? ???6??z?Vo??[)??H?cB'??!	??3')???m??,E
?t??p=???)0q?]??C?T?S??bF?MB?;bB?k?-???????+Iqt?!???s??h?,??Jn?e???H?Ak???????(?P*?C?j?"?f???.???8+??9)?ls??f?<??"
??D??????K????ZF?M?
??2???08cc Tz??m??h?oV?3AEK??
?F?f??aA??p??	2???!?J???-;Iq?J1?
?2?	?m?;?[82A(+??VrH8?b?8.???:???crX?9?Q	|"?? i????LGy$?t?
??t:*]?"?
uH(/?(?z?a?k??]???u??!R/???????aA<i?A*??|]?R? i,?????!????l?D#???y?????#?9?q>?#&???J&?lP?UYS?B???l?U????S?p?x?#:????]0}?l?>????	
Z??I-??
??dU?<[?s.?`?<gDYU??F?????sX!c???Z?????zm?U"5)??,.?#?1?B?yH?g<	I?x??J??!:??>i??cF4kV:w???-dXeh????z????T????n?????????J?h
?5?a????U	?},2{???5??5?iQ?Z?????u?ka[???????kU??=r??

T?5:fT? ?`	?????
?
?H??????? m???Jp????-?(q??q?<-}1?$??\e??1???q??S??Q???P?1?O????0?X?^1=???
5??p3???
#R5?r#??#o$=r$S#I?$??LQ	0??T?
?A	`??P?n1??1'Q$?1N??/???$?1uR?#????"???Pr*??*??*?2+????E	?A\?0??
?q#?l?	??-O??Q$?o?~??????-gN?r+??/
30s0??????A??*?2!-???!??'?%
???????p/??MM????0M?4Q35U?/??+???>E???f?&???/m?q1?0#M2??73?Gn5??9??9??-Ur?
W?????6?{M'?-<{?3C?<?????gp?4??4Iq?s>??>?30W-?????`?Tj?3?s@????????????(3?PR?
AA?|?

????>=?CA4DEt?V???2?5???`;I????:

?*


???!???e??~?V?na?aU??*?0AB?^??a?????g;A???a(?n?M?t??a??*?v????eGv???n??
???Q2
?h??
(??~???@???h????`w???i??}????\??h??????\??*?
?G	??!d
??@??l??"
J????T?<?>??
????p??*@	?!h@
n?
R???

?????
??a?o?z?z??yv????????
?nA
b??2?Hy????
?!v???L?
?
|????	????????k?0???:	U}M???@? z@??aUYn??]n? ??`?????y???v?^?5_??`????!L???a?7A?
?n?n??????a`??"?*K	?;?E?*
?
?
???v!	??P??
P?????:{???
????W??
UDj?,h6??????3.=?F]??D??W?QXQMjQB??#?????O<L??T^?NLq?_???????gr?!?\?7???.?)v?:????{itQ
syZ?|<(????G,??U?q?J/???(%QN??(?"?2?J????!??QV#??Y?/?B???Ii?V?A<?RB??!???0WS
d?gnq?k??Nx????q?*?C??"c???
?\?W?????d?,???
%?????0kGI???B???Se?h?L?????{?Q??B,?4??3??R??>?N??L???^.6?<*?)_???9?R*????\/p??k)?r	??????????????????
?C??H?NyE???????+?M??b#??CX?2???R'??E|^s?;??%??}??'V?????????b???
%v??	????=?kc?Z????<%+??
V4???5?;????>??$*QO?????D??/???T??k/?S????sa??!A?y???4?q?z?_<n)'????2?.?]?TF?2? }?6GbU????D*2#MT\p??????9????v3;??QD|,Ij??E?r?????(???j??
`DW?M?r????-=???	????.?]???,?1?????RE?????2*g???BH??djs???f.?G???e(?nq+XA>?2Y7?	?x&?w+a?P???#? C?1?:4??J(????*?p?????(V????>P
%??K??9?1???t?$e=UGgv?)???.`P???
| ?????t?x?_??e?
??z?Q?d??v ????rA??Ld??k_?????0*?(?{<?d??? z?J>?l???x?c???q???U?v??31?&?u?lr??cZuE0?	????evu??Ss???w?kT?????n?'r>"
??F?
I2??"D?
Kx?????_???V??="L??w?}I%?-??WG?0TG?Ck???%??????:a???\??b',G
??6"?	?Lnr??K(C?8Q~???b'ky????=Q??+?p??/?????X880i?
%?c+?y?t~M??q????``?\?????X!???D!??z????x?vO?M?xRi??/?@1???#???-L????
*y?(????4????F
??kL	????;m?c??E??X??B?->???|?CN?E.?`?????6???
?8?m??'o?????@?i?t?X?M??oR?"
?=(Az??C???????????????6??;?
8????? KK\??SI*#}???? C?!??#????O.`@i6??d???a???u\???o>`/??V?1????@2k?????_V????????`#?@X\?r?S?\w???-?Q}	b ?"??Z?c????j????-??
i?0??t40????V?6??d?;A?ktb???Rvqj~?]?}?:GJfy?1??V/?=?cd??A???z??}\????K???%??d?{?B????????*x????W????z)?;
>?I???+t????????bc<????7???C3{?#??????^??3???/3???????????A;2???D??}]?7<??
??h??W???T)??|???Gd'?? J??Qc@?&?????^??y??6&?`%:?((zDf?????z?rb3??J0 A??\?m?n??Q*?Q??
??z??!c_W57?(yt|!.'a?BVB???????????????????
??*??z?))?b?????I
????6bc0R?r???	????
??????
???UjC????`?E?????? ????V$??
3Y??-??/?1???:&!6k??8??!??`????
Q????K????+??:??6!MqA?????P?P}??u????@??:as?0N?/Y?+Zk???	??????2??2b?????r?o??`6?W?Aa??j?kr1??#L?%l?'??)??+??-??/?.<9?[?"9_
W?r#
???P?P
?
?@
M
??
?@?m?????????
?!-?#M?%m?=???-??0?????,
[x(W!?$+?????P? Y?\?Q??P?
??	??
??
Y??[??]??_
?a-?cM?em?g??i??k???????	? 
s?	P

?????@!VqA?g)????<?
??
?`
??
??	???? ??????????????????
????????????}?????]????
??M??]???????????????????m
??
?
?p????
? ?m
??
?
?N????
??
???????????????

???m?????
???????????-???m?
?.?>??9>????=?9N??]?	??,n?EN??m?1??.?'???
?
?0??
LaS!?xf^???o1*?
?]?Wf????c???	
???]?7.?????
?}
{????E??>??
3??? 
?m?>???#>????x.
??
?~????/n???????C??????0??????????
????????????????`
>??????
?0???sm?+??$?hp???M?????P????.????
????>??@?>^?????=????????'?
???)???~????xn?~???/?*??????
??????
^????M?;N?2?????	?????2???????N??=???
?
?~?4?????\;G?uP?r?6?????????????|??%.
?=???????N??????o?????_?F??
????#???~????>?|?O???????`?????^????????P?]Y?`????S??c????>?F?
?p
????0y??????^?.????M_?????N?N?>?^?#?????
? ?????o?
???%??%??J??????
+??B
???C??F??i??h@??(c2}2t?EcdL?||A?<?~??,?*????N?,?z??????O*???2?a?8??:?9?PR??tp>0??????oG?r:?????r>?p?E!??2?H?.?h?0????9"&???(???"?H?00}?qRJ+?L?p4????Q??OK?RRK5u??6?s??z????$?%:!??HO?JrNY?(K????7?P=???	>??u?????G????????iQh??I@????W?u69??{?$??+? ??2h???s?Q~&<u_~c????????OG+#R?Uxa?i?
Y???j8a???7?F?M????H??-????????e?XX??(d???J9k?K???????>??^?????`???2aH?Olr7VbI?????Y?????G?C?mL?,	?#?'R??V???6?SgJ<Q????;??<?	.sZV????K?Tz??@???LSRq????????M)??????????Y???????%n;?h]:I?????L>??????%?8?\??8r??n	fx???X??'???w^??y{?EFC???~??VP?pC+'???????C?,??s:,??tE??u!???????5)???%]Z?C?%?g+H?I?
????-Z??????'=?`z?????NA?yMh????/?:?????}e?m?"?3????P?0L?[v??1%?e???????,S??*,w??4I?K??:2$??h?JTlf???J:?IL.?#?`g E*??$x+?}$7????????E-?N?"?me.??I??!??P???G?@T?{(???`Z4{?k0??"=Y)?y?(?????n?f?YG\I??H?l-*
?"?hV???(?
?????,?\ad?[h?5??R ???T"??(?-?i?)T:W|? ???1?YLD????????w?R?????O?C2?Ta?q???g??&QD??.?gA-T#U?o??,F1
???#YINn??CA	;???????QO?PE(?cN>?os??????$?s'aI(BQ??L*P?
???Jw??H?+Ox??
n1???j?@:??& ??=?A?$
?M`?%&) ?bO?Ajx?8q????'??o!?7???@??Uv??fq?>?5,K\q	7?Ao?D????B v???X????????*?Y|?????Tp?????????Z??]?R??]U?S>???7???5aL???J??c?B?(6???M2 qW?	
P?
F
nr-xB?Fq?q?F?Dms?z'????qs?6<wc?O?????1?[t??c??B[>??k?X??=?
	?

S?A-(??????R?	(?WK
Q??K??iL,*2	??M
T??8??I?????Q?4 H?0?(G?q??`???#?
?<7X:@??J`??;?*???*?Q
?H??@;4-?


"??Zt?)h
?#?
x??5????S?>J?#?T?
`??R????Z
?c4?Y(?=
??0 0
?`@
?+??V?Vm?c#??D?8!A?C
6???U????j9K?'=,(pD??#??"D?(???
'????
*?L??j?
?F
?)??n??v?j?
t?w
`x???B?@@*??R???+??Nz?|?q`???8Z?)?
?7ND*t??\.??????
????1E D
?B?????W?$????
??}?d??a ?X5
?@?p"	=\QB*?????y?????Tx??????0Ox"E??T?$Q???M??+j????&?:???Hx?x?i? ? 	><?,E*???s]??c?Y???=.?$???Z?i??)??3?
?d???a?
?2????g@#DYM5?a)()]"3?????????.3:a+?&'?q"???f6c!??<?m?P",Rf???E????&"??6?
? S
a
O????c&?????<?\P?:?
1h??D?n?4?B.uqSF??????A? ?(? ?R
+????rR8#?:?L??	`???0
K=??d*&wN?/????>?7????1?K???Z??MXi??L??>?U2?????????)??}&?d??M?0?9+w5???^Fmj?kEG????.{q?????l???%?????h?}?{P???mq?	?J??@'N8?
?*nm??+?B-Xb???E??m??^;???????jU
W??U?????Q<??s?L2?8?P?3?q????O5?M.??+?DWN??{???????BYi????@BpQ?Z?a?[?(??k[??D???	?
nS^???j?S?i:??re?\?B~??7?h?x
 ?$??TA?????<?V/?H???4R?"???d?j?I#?X9???????V9?)????
i?g/K?????&???19?h_?Z???;aLX??q?
U8?p-??
??"u{???$???+s??v?D?|??????????%????n?u?%p?E?I???Y?l_??o??
???????&m?%?|??k??)+?P?????Z????9?{?????A??S?y?????x??g?l????9'??nAA?M?C???[Fvi?????h&S?????????.ot??RS??L?D'H?\^Cs?3
?????j???(????]???????/?-5?%???vj.???S???I?M8?????F?????5?.wF???\????n??$>??.???a?r?f?????o_h/u???????????????mnj????.=?????Ry?
|`?????0d??????{8
???<$C?`?l?E?????)??)????Q??Hf???U]????)YH?H=??P??L4m_	??2 ?~M u9????
???
???_?V???a
d@?T???Y????/??
?O???99?	R????~
?Y????]?????+	Y~???a,??naqd???????!^!???a??!??????YM??i??	F<h???U?Wq??!#R"z??
J??ur???%%?_?Y????}???????!
?^*b?PFSM??%p? ?}?4?\??]?$??
JJ????TP?J????S?eI:???? ?d
?]\?B]??*h) ?"?Y???$??W?&#???????;???????	?p??^J
?`6??`? ???&????t?$??_
f
6 ??g???b'???|?J????I1-cmF?3???	ay?'%Z?n??u????b?b+??Zt?!???F\?c????)Bh.????T??c?Y(+?"??!r??/?L?!?p,'??<?C???}v?#????iH?????=???C2??6?;?Y?'???*E?????:	H91??&??)'8)?$??)?Z)?t??niP?i*iiO
???NO?i9ii?Zi?i?:)?f??)?Z???)??)?n????rS?:???i?"*?n??E?j??*?vi)?LE??&?B[dK-?I>F??h???|????j?
?k??2?j??????j?????j??j2?j??????8??????????j????+?^??????YC?\$F???^???=?C>??<?C??C=xk?????k?????k??C??k?????k?????+?zk<????B?%???X>c}"F1?C?F???YI?W~Y? ?>??????Al?^J?2?^l?r??E????&
??z?W?W??lf????l?
??C:
-??j??0??????Fl at l????"?S??Y?>X?}???Q
?qM???F+???????6-S???F?:?z	??????Cn??b???l?"?|?????,?b^j???
..??{???yY?Z??bn?j??rn?z???n??????aL??
??T??~
??(?>???m?-?n?2?????m??W:[????o??/?/??n?o?:??/?>o?.o?bo?"/?^o?B??j?????
 =X?1?.??n?
mX?2p5[3??+Es(w??a?K?S???.???<@?A.??8WJ=???s{?'???>{M?n4????????<0??
%d?-P??2 at St???+cE/M??C?h??l???:??"%?
7??|@;g????0??UuVkuV24?????=`?A0??\#??%?V??[S????RG??? ?2??<?z???\?`kr??*M?Fl??=??/?4@?7P?UW?0?ec??r?R4??=x2b?c?mlprf?vj[mW?`/?l?-1?vm?vX??\w?,??i??8??m?p?L???????'????'XwtK7#B+g?HOo$3P?Nww{??	t!????<?-???:s?w??{GG??i?:?mz??=t+
'??"?A:4%Dtp???/xu?????Wq-c??1??x???5?3?[?????~5?????8?p???X
?
???zw99??)?3b??"T??z@	?
7?z?????1?????>?1 ???8
???5HA?3?
+?=????????z????}Lz???>?C?????vF?????(???/??C???(x?#~?????????<-??x?S~?
???E2ua0l;[???&????_???h???????6?????5j
??????~??k??{?-,cg^ZB?????tk?	c?l??/????~Dj
?'?-}%????{??r8A?-<h?0o???S??wt????*.??g3????????????0????
]|?ed?????I??l*?C}D$F?????&?Izf\??&??n??????2??P?}??	??;?
m4~?<??vhm??j?IGIb???[k???v???????????\t?a??n???^????E??j?v?R???????
>??5?G?U?????r?\?zB??5v??p?????????????U?h???QT??*^?????u????????c??G??
?Gb?:????~??oSe?k"N???? ?(???1??*?-z ???\??M[?????Va|?????x?'????y??????#?xO3i???e????Gu?E? ????b5?????u???HL??:_?u
???????	p???[??u?}??s$???J3?o?y?y??vi??Jm?x?Lx??'?t<?????c?7Z@?u???2?H??;???????+???$?4??A??????ex??X@?X?72x????
?????????(L?kf?PO?2@?~?[?t???Pu?$?`?P?????????b??&gT???'V?
<?P
?5??M??????_??>??}P?u????-?^?Pk?????0?*W@$Cd??-d@	???1??^AEiu??Z?*??!q.??;Q
< 
"??n???\B!??!??2
??!j?
=?!?????
#b??
"????0?P?P????!1!q!?p0? ?1?
?
???????5q/??Qo??~A
h?*x+????
?
?a_????^?Ub`?U_

bA_v^?v4?`??^???cc;Vc#?dK?d9v_EdY?cv^??a??5^EV_Ivd
a??e??b
Vb?5ia6^Yv
a??b?6b
?c+?e?
4?U?E?N?=[???1?MI??!d?X9'_
|B????FA]?%???H???`BB'4t]????4<?	&??B?TO=?	#3?3??	????khO?TH?6?I?!???#?Mds?
L??	)T-u
VCm??d?cs?Ef?5??s??Qd3t19?{?C????V}x???#?!
tbG
?G???W???=l?s2A?"??8??????#e?a??UU?
?B?5. ???O{z7]?Cm????g?"??????a?
r?v?>???:???~?BI	??9?E?Iv?????_???X?sJ?F?
???DIV??{???<?(?q?E??:?D4>	Y??u+?t,?P???????<0??x<??q?X??}b0?9???K?d???1m&`??
? ????3?
?? x?????&??c![??8??? B!?1???cU????h7?u??@?????gTB??BG>????N??(?????	?J?8?a#tQ?g#??Q ???"f?????!c?9???cq~???D,?,?*'c???}????
m?!?2\K???4???T?
%X?.????&?a?N???_?a???O.??_?hG????
pa??C??("Wr??_\?d????l?d??	?9r??K
?H
????????l?p
?^\
?9J??x7?q*?2>`??:cN?i?e{??(B???????lk?
??e??	\??(U(?H???p?d??`8?p??r?	"?eT??@\??y??u?
H 
?	
????F??-??L?dp?cLS?v???0J???~?
??#??Hi??
????]
?e0?`???s??J?
?e?G=??`??K10~q1??I0?%?????5??P^?
?J?????c`????M?O??
[
???1??/#?.??A?[???j??ma???7~?]X?????`??r? 
P??X	}2K??vz&????)?? ?&@Ty#G??W>=
S*???????7?p??

 `{??%?4???c02?
dU
f?S????
?C)?!?$
?G??:?D;???N?9
????+lGq?!g??r??
??
$???901E?/?
?9F ????k????f?@)4C?  ? Tm?qc??(
?c?????`j?
`??????R??&!?%
BVb?????):?G'*1IJNR???D'0??m?????:???4??> ?:?0?1???(X)!??x
Y9?[\G?????]?rK???2?B&?/???w???_T???Np*??vT*i??>? 	???.? KV????O?bq?,B?????G???k&?C%|???pk3?a?
I??/??N6??,$ 
?`??lt
??eD)A?a T?>??.^H@8e0?Als?k?!?i??????????!d?R???=?????.??
??&R?]
c {2pA
??B%?!
@X???J?{??$o?B
?8?3:A?BL]???
?
;??1f?9
IHup?!?9J9???Cv?"?!?wP}??8'2K
3?k .q1??D,??lt?~q?J<s??????gr?</???w+?9?vNq?l<(
?Qzrp?????xu?f(?
w?F????td??Y?`L?3?.BG?~?E???&?Z1<?h`????}F??a? I??$??@??
#????!???9???X?<E???oce#f??h?q?qCN\0?9DL???|F<?A??s?a?N8U???,6|=^GQX? ?%^?\E??g???_4@?j_??s???3?;??????%???W3?p????????K????NE??f??/??F6??~?r\W$? ?np???8?X&??;??>?R??h?Jo????E????Y?|?@???(??p1??=$?????(?1???#<? ????PC??
??ba?????Q??X9?c???5g*$?@?$??8???@?<BR??????y !P?a?E?ho?t???s<???8.????0????;?`)?`??0?????C?b
+?AA0??k0?c
??"?p??????????A/D??8?? +<?? ??[??R?-?????k1?Y???I$??h8???{@?c?,??<?9????0?c??? ?E<??kF?k?s`??)?#??gxE??E?s??A??p?;$?S9-???p'P?E4JdF?Y<?H????dQ?JH?r?y????|?7?7|?+??????G?>??>t?=$????z:
???+???h???T??c???'#??Y?C????8J?0??
zJ??#?a?&=Z??`??H?
:??&??????@?a$9*?????z(???;?????Su?&e?????R??:?y????}???{?r{??*?8??@?f|?Cb?????s???&?C;?????z?H?\?di?p???\????IK?+????????f?'?????*????hB????h?#??<?a	??\?p?A????+M???z??
???q
0!!????
?e%?U???Z?R
Z??u??u??????[?EZ????????[?????Y????Z????????[?-???????p?t?@rP?E?{??(?
????7|?????] ??5??E??-]]@]?U?????????????V?]-]???[ ]}-]???[0?`??U?V?]??????M]????u]??^??^????m]?]???????????%??-?]?^????^????M??}]L@]?U??????_?%?VU?C?
o?9H??????7???{???]|xp?~??x???`????V?`???q?2.??>???Fa?F/??n?~???a??`??`?a???7{?7????W|??#??)??{??????A???+?x5??1??}??3??
??3vb ?????c.??a^a?a?cf?
N??c&?bC???P| ?*Fc?a?6>dB?a?.SaC>?x8?A??7?`6??Kv?Q?aDbH??3?@??Y6??q?dK????cq??H??^??'f??9??Lb?bb{?a/??????\3??????J???M????	gq&?/?sF?tV?t??r^gq^?N??/?gt?ge?g?????Hw~?y?
???+;?p?gu????h?????hv??}?h|??|????/?gq]yg?^i}?heng??i?>g}?????????????r?i??zVis?g?fi?	?	???y?{???e
??l??Q?2P????k?n????k?????ht]?????}?Y?3?&h?c???????????#????6?????&i?>?[??F??h?$H???r??i??1 f???v8?2??op?)?l?.j?????+
1?????k???uN??Ri	?
?+3~k???~k
A^_?gho??b???hevqJ???????_j?????j??+??}h2?
??X?%?_?W?VH??u]??d????????7b?zmw??u?xh??wp?x
?g?fh??s???????Ntl??1?o)n?n??????|?Nw???~????1????qb?
X?: ?o?n?F???z?
aOxY?+
W????n???x0sux??kJ??)?h??h'??????????DOHl?V??{??{?s?g??w???~?u?:?l???]???:0?_?Cz0x?\?v???%x????w??k???n???'y?}???}?8~

)?
?h?Z?D1?i???V???r?@?|T????*???xoJx??\?(??q????`??W??'?B-?J?????F?$??t???????????dB????w8??n??w?T??*D????h?u?M}F~u?a?c?0?~??=+?O<???p?=?.? ???u?Vf?df?;KD?????%{:^???>J?]I?(?LL?%+?=??3?)??????QA?8?
r?+A,$X????!\(????s?!NH?D?x??-N
????HG1?1?r?
??>t?
FRB*??g(????Ad????B	(?I????%4~y?a???9?*??N@&z/]?r??c#??-?
?(?B@&?
2N??:??
k\H9????^?O8 y!?Ca???
?$???d?-?>^"p??7?1?4????d?J???E??,?????=??x?B??cWL?U
	?.????z??r?????`?3???i?o?A??????L???Q
?M#??G9? |?@
?@?A
??x????
~??Uw????	???$?K???zPJ(N??5??-#???(I?J;b??1?

%?>F?l??-?G7??
?!?p??2???^;?I?F? ?2??6?e?=?\
2?C6??H%?
?&f?
????
?dT?t?????0?A8???z?3t?%XK? 
??????Z????}????gt?E??gL??~LF$IuN?gP?>?A????K?KZ???m???B&T?EgC0,{(?v???,?wH+??g????]??4????kl??>GHKv^???J?T!<d%a~?_6'ak???????
??-?D?k8n??L?2?E??GX??R??~H??????????7\?\???v????????6gB?4(?>D?A???J
??m?????HF?d??Q?????b??H??@?}p??!??b??????}??E??E?W?I~?-z ?kt?????*m?TM?rHI??Z??V?g?G<???O?m??*?34?qD?C1L??C?h*%?_#?B??Z??Kv~n?F?..??l???b?K?roA??HL?????9L?L??o?
???(??jn????E???	>F?X???D]mb?H?o?????F????{-?D
???:????????T?Go???A?*F$?
?F??{|F?r???c???I????um??l?F???????oG<l??1???API??(??V??$FFZ?0?????,?????74?C>??p?m??:?C?u??[???
?????Zq+??zD?0?
??C>?U??_???6.?D???m&??8?D?D??????^??"0??s#??3XX???-???
?m?~/??,?A?C??m???? GI?+9(?d?<?8??&??U???n?????????????q???s?7????8???J??
gD??p<?[???L?1??????9??F?s%K??????4BW?A;?-??.	/????.8A?? ????m
Gs??l?TJ??	5?*???b*?????D;P?(?D????Z?i??=JxI??>??|
?y??;SF?<???w??U?Uwv,???&?7?5?C>\C??gd??;? ?? ?l47sZ???04KJW?h at 5???Y?3'?,?5?q\?5??5,??AS??0?f?d?M8?%W?4??v?$???%{6yo-_?>??D>?f?\=??.??"x???K?_??5??W8?B??..???\'?????Ol<??`??_??}D???%?E
??3?Js/ 3_?L?t?[???.T??U??Q?G$????B/????]???C<??5?AFW@d?,A.?5r??N6?W6??q????0b#9J9?8??E??O??h??3g7?0b??????De?@?mZ??F?????b5?.?>???2??I>4????4
H?yML??rh?L*?9??q??1+o
	?2???X?iMBM??x?06;6??EQ???Kx	7&G?9??F,7<???K0?3$S???c????
>P&X?=?@????/???xz?'??-????O;?K0h,??qD?o?0?0??2????0C??a4C?l$|?????????C???? '???CR??v??C|?C<?????h??D??*D??{??????|?T{?^?zw5?B?J?];?u_???=????/????BDTP1?@o?fy?O=?W?Y?????V?C???,_????=???M?;s??C??Ea??&????????'Tz??r?w1?????}?=X???6g9?
s???>BW???|
??^D?????????}?+?t>\?D??S?>????}?o???????7??7??#??C?C7?7?D??Y???????w@A????W?zX??????????~O????C??6B?m???????????
@??7??=?????b\?:???8?bE?1f???cG?A?9?dI?'Q?T??eK?/an,?(I:4r?3V?
4???A3?{??q3f?J?[%?P?W.fU?W?f???kW?_??%????$?n????Ou????o_>y?
<8??
?e?);?pa??'V??1?p4m????O????????}???"????K(
?G?qk???a??=?vJ}e????o?9e???{[???~u????H
?\%r????vu???g??????i??sV??O?B???|93??@OGo.w???????m?hq
?L?.~??'?|?A?? `????8?0?P?
9?p??$?~????h0???rQ!j:???q?1,?????
?xP??3???.???L?Q?)???????l?s?Y????8}???%????N??g-)z?R?9??s??r?I?I4P????????
????l????G!???,?+g?/??k }?)?|6??D??L?SQMU???p ??J ??)?(?D?D2W???_???C-?;?D???,"~j??L?F?4?i???Q?Jk|??I}???D??)?Q???u?m7GJlg?/3Ko?o????{?q??
X?Vu{Ho??u?q	b??Z?X??]?w s??????8}??X??I????8??O{u?Am????i???a}??^?OD?\}??Uf??.?h??u????X????.?gQ?>??????????"??4??]?.???Q"8????>??NO?QC?v???n?n???2Z\??%?'??<?)?e??+_v?N???n3???[s7???6????n?@???????????C^?u??$j??k?=T\-w?g?pP?cM????g~?q<`?q?kq?}?????^????????_???/????O_????~#??????=J<????s????)?r?g??_?H??ex/Ad?? ???)?? ?+h???
n$!e?????i.??G:??+X?	u?(F?|?)?P?:?R???=???D!??E4???D%.??Mt??E)Nq????<?Q,bQ?????Q???#j??ob??g????B?P?,??xF?t'C??c[|?
HA???4?!?HE.???t?#!IIN?????%1??A?c?'?H?N??#Z??c+?,G
P\??4(8??R??? ?8???$x
??~R.7??d(C%(Q??#????!?w,C9??(R1
???d5k*???????ku?Z?????U?u??]??W???{?k_
?W??u??%?a
????.??Ulc!{???"???'4??Olb?p?W7q	R?C??n
Y?B??]ns??\?:?????t??]?n?????w??]?????5?x?[^??W??M?{?_???????|??\Y?W?X?'2??O???e?+B[?e??$??Z???`a
W?B???v??M?W?b????????i?????v??mmu????Nw????s???????????q????F???-?|g{?
w7?	??~???.??.n??????^???;?w8????s\??6???e??N??Q?T?????G???????????>?a?1??w?????+,!b????!?Sty?]?/??{u????V?:??~??s????7???u?_??g;?????{[?u?/??N???}?].?????????s???w???q??????????v<???u?_?|????????????Kz??????z?%?r,?+w????)RQ
3?cy&)??r=?C]e?O;t?(wL?[?x:(?}?
g??0???????????p???c,
l???LlW,
?m
??????k?0???P?
???	1
??
LM?
9a//
Y?L??n?,??k?ZA???\
?????$??G??gr?(??|?e??Z?]?????NA??l???
????QkLMl?X????P????a???????0?0?????1???P??c?????m0???
???t? i????	??$??(R!??k G?9R'r
??#C??F2Kr#??
?m!??????
,8??(??C7x.H?qqJebY??>??u?qa&?.D?<
?f??N-??K??KQ? [-?N?+??QL??+oq,?2-?R,?????2????r+??,??+?q.?2?-?2.?????2?+?.
S-??/???./R0?R????,Q?-1???q?^2,?0???S4/??4s?5!s4q?3g1-?/??6m?0as?t??p?<?x??j?x???2$?x???@&u?,q8?\ ?^l??D<
c
"??
?rS????/?QS-??Os????l?"?s??s>??S?S>?????/?3Y?+Q???@?3>)?BT&??&?&/????&??@-T?4s?;?[?C??=ETA?2O-C??&?RE??C-?E?2F????/Q5????q
??to?!:????Be??8?E\?Fq?A:H?W?? ?e?
?-!????&?T?,??t??????5?-e???@?QW!N??0?1?p?	4?1
?M??N?/\
??pER)+????M
?D_?1??G?1???C?s-????<
?QL#qLuTR?
??MYRP)??^?PiSF?4B?1e?3??S+qG???nD????$?
?0%Y>l3?''????Z?F"??*??????t?5??
P
?@??]?
????U?T7s5W.D
]QAda?MR]a8?????u?Dad??A???NM?A??
$S??o?T"??w???pn ???l6???l??le!d?"?
b
?`??m???"s?^io??F??????3,c?????VL??s?8tRUM9??q???@??g??B!$vrK?j?^A?n?R??\!?P?
"?
??;7
"
????
?rV?TAb????????x??????v}B?B???|??D6J??
v?-?O???n?<s??ZM??R?xydARVR;????????$A@
`?	
n?0Q9?07
?
?lO?SF?p$???V
?T!uS
??y>?-Q?F?????0U)w?3a9?_.??????L?S	??!?.A 
rz?!w?ZX?L-?%???
??"A??
b?
????vvi???Z??????
??:\N???????
 
??
??[6!,??a??+??y??|?J???TM5?r
]??????F?b?=?????????4?y=[?8??Y!?$~V??-?."?XL|G??(?
*(h?!q_a??Na?l????H\l???????fS?'??x??U??`?
???"7<Ax?N?H?
??T?????`?o??o?? \???2,?QQA~?V?????T`??
$?$?
?`V???@??>?V?d?
?????6K??
??????@?@.
t??
@?
\?8????O?Z?2%K??O??  ??BZb?X
??T?b??)?(7n ?q???MY?2??!?U????
.?`????w???N2??u???J???J+?\??&G\??
\
?X??`D?|"?,??
,~
 ?@?!j'?T
B?8?
?'a?"/?U???n@?o*???c??r ??+h!?(?t??7%6?C:5[?v?=(^8?$??z??M%????u???>j??_?

(A?	(j!???,??"?P\?@A??f|??T??@`$?Ku?(??&E????`{??pC?s@UH??'???b
H???	@?Sb??G
}$?S?S?O?!

Q?L
?H
(r?'
?
Uh??
0:?'$
?a????$
PI???D??;??5]???[?
??B
w??k.?
z?E-??d$
lZ
@x?;eQ?E??????`4?'?h??xp!J
 ??????B?$???
???0C\
	}???6????S??"??$Q?R@?PTA!?`&O?@oU?j?R??x??????????s??[?7@?CR
	?
E@5?P?W?![A
@??@1
`?1)?'	!
{??:8?G??
??M????
??O
?0X??}V,0;???@??_?re6p\
P?GE02?x\b?t??,
??P
K?=B?
?(86?Q ?p????
?l0f?(
5oCqY?
??H]"
?P&?SU~X
?8!
W\?C
?Pz7|??c?#G??
?O??z\??eDp&
?h?
??
?0
?i?R
?
?y?{#?~s	?????ow?`71
'?iL???\3?"?P?mb',?u?-0
?6
1yD`S?
??@p?F<??????JG???3??????-d??ezxUV
Z1
???P0???G?=wP ?m?	?Pf?"??
@#
???	-
I?
8?{?)'P
?$
? ?Zr(
??9+0

%?l?P7pm?
??	=?[??dY;?	F`Q?
b ???
?`??T??;[???!u\
???
~"?rke???????lPF?[?Z ??r	?V<P???P:?9?&????NP@=?p	?H$0?@ ?Fn?$?Y?????q?
m?2?N?	??	z0
uF
?P
?
?`?iWb?; 
po??(????S~?	Z?M??P?#\Z	????P
?pw??	????W
&a6
?KD??S?P??E?tC?
??kBwq	(?-?????0?;? ???*?U
,??
:A97????R9?W?0?p^????8[?
n@??wy?g?@??2i??-?X
.?	?='UYrt
??}??O??se=??x????2
6???3?c/?r8`,HUP=?p?5C?+
k
C??ZPd?
??:l:
+????
?<7???:m?87?
?_??!?0??)
?"??nD(0???A?R?uI?m??$??
(?3j?71.HP??@?&x????#'50
ORA??!?h??NY???M??/??LeW?H/
	b4W\?$??n??>0?K@C<??*PS?C??C?D?D?I=?c?O6Q!
H??ON??P+c?)V?CJTH?????????C??F??9G?h@?}?(??}???~???????????w_~??w+?????d@???h?m%???Z?H????H???????cWN?DQWF1$?@,???
??\Mi
?@?#?H?<j?Y??O>,?C?????U??ZtY??EO=d??TY\c???$dN???M?.
H??P$i??=\?h?1??
?2
?Oa???5AE3???64????
I.???@?0???-?????h?
>?v5gSb?????h?1.?"Y??????p?3L?U?D<Q<??7?????m=??2??N?6?9h="???>?6T??3<?7%YHN??g?/??Bd??W??=???(9?9	??Ot??d=??dI?,f??????E+i
KXy?B???+aV???r??-??
??e???_?"a	Mh??4?1??Le???)?X?x?O??????t????#???&j'?????+?(`

X???x???w!X?B?P??Kf???`????Yk?	Tp?}E* ??M??U]DE???@Ot?h??&???Xx??2_???D)
3????????oF?O?r(??AJ??zJS???"?>???h
!??9?I?(<?DP?1	4? 5Q???Q??Sb??R??}?q?'4?`u?OT?K?u???Q??
R*6ADY??HH?
?B??2HW???7
D???:DE%Ks	P??2c?+???PQ?????(p???????*c?8Zk
?|q-m?[?????a?J?\?r?V?/??]"??	MzR?
&`???^!
Aea???e?-hE?!?????? q??C
?B^7=????#"J?????TD!???b
U<???A?M??S"?*H??"??B??*d!y"?Gb????H

R
g??U?4O?!?Pg4?9?oW?]??=W?g?SRPq?2???)?g>g?0?????3SN????Qbx
?/?g????s???fH 1O5?^'?5=Y`??U??N??P????&?Z????!??R?Z???E
.?qjS}?D?!?T ??r?E,?"42?9??1???>??w???)?o}O?B?@???
?kS?Va
?aR?W??jD??
?[?r????Rr?2S?"?(D?^S??&m4??Y????g%???uG??3\h$?:N?Y???SB?W?$rQ?0R??2Tzss?m,S?0?8*.T?l?z? ???AiE 73?????7?.4?;??i?{?k?<???'C??[e?P?r??b??3?iT??%#???Di d???x3~Vf?????9?? |??ny??,????x?7+??GcDm_T??_+?2&?eg??
?m?e???????????&ZD2?^??H??q	{??p??e?QEq?k3h?H???6a?U!??s?
???$C?????1S?L?? ?S??!6?S W?1Lhf;??0??3?]6??B$#}?(?v6??g)
??????J????H??Q2????a??)?a8?
/*?3??L??r?????*?5XX+????x?b?c?7]h?o???.??Z?Kg?`???w????e?g???3??)??2?0?)?
?
x??K??~???}W??}??x?#?"?w?^???cbV????%???s????;?G?]????w?.??}?????`?*?]???
??P9??????f????^k?s?KHf??????C;??2?8????]?A?$?
J?E?s?[g?
c~G???????%Qo?]???F=
j{??]G?G??;???_?\YiK&?
c??5????b????*ss??e.???Q>??????*??>?
>?*gY9??$"?????{C??Y=?s??:
????A???9??;??5v?<?k=????*???????q*???i?k??b
!	?;z??0?c0??;???Q;[2?x???2.Se????1?C2?1z?Y"?Ox@{?????/?????z4?????~??M{?EH
??1?}??z??y!??[DU{:?z5r??&?C???F?????c??8???1a3????8??
?U?????S?x?F??c??0??????"
?,?????J*??[B???KA????6eqk8h?"v??4?????K?????jz+?4Gs?z?????u+2?B?i,??!????????*?"???i[?G?k????b#?k?C???;??6#?!??????dB?A????}?>?
?q??w
5AD????{@:?BDF|??k??"??R?
????+1 ??Id|L??Gk?P?'???
K????L????0y???2t??Eq=??CM??"??z???????p?4??;8?AD????
??I??/Gd???-?+??S4?*?1??53[???'??????????E??=T
??;+?T??;h????*?
????;6\?0??/??g??V?????R??
2?L???IE??5?.TB3 )6<C,??????????8/?????????????HS???1?P??????#???????Is?B#Y?=M"h#?LT?i?????LI"?+?u9:Dt??????(??D
*?Y??,?,(b????"u?L~????=??5mt?;?>}??p)??y
?,?Dd/??(t?Rx-????!e????5J?0??
T??U\???T??W0'???-?CSH??@?VV]?oD#?HM????"??8?t???j???5m?8??XZ?H a??%????~?.hL??P???7????Y`?JA??*?;
?????????????C0eSG??0??;??#??%??Pu??D???M???L:??T??????T??=/l(?|???R??(?J4X???mI?5p?W???,??????????J??a???S?cK?a?Op????????S?1????AW?PE?Tu?`m??????I#\1??8??B?S?????9W??
???A?S?
#?[^??3`??P???{c???*=0?
?
Tp??	T?&?
????P?d-	e[???RR??3?;??&k at f?:????????9q??>4?y)N?m?x??geH-}f??y}???/???_????!V??-??3?@u??E7HdH^?T$?????l<??;Mf97M??8??hQ??)?q??Q?Wu!?K0????(g
91?B????35??5?V????>??L??
??v ??R??x??x?o+?
~P?2???k/?IX;6???G??P???
?>???D???(??a??H(1?q0?(?kz?:?8*E???(??k???
K?S???????A????R?	`
?(??J?U?&>?/??j?&?_N?J????H????q^z??Jn??
??v?
?
???????"L?p!??B?(Q"?????KJ+S?>?
?????C~??J?????(`
?

( ???#nP???f?L????J
?X?qA
?Z at yJ??S?#!"@p
H?L???,SW?:)J?? ?
X??iTVPj???pt@?'????)?,N??
1???1?h???M?3mFe???L?
???#<?'N?$?0??l??f??%+??H?W?-@ ???K???.1,&??`?
?X?D?aVQ5??@D???(??B
? ?6`?
???lX$;P??|80??x??(?|hRH%?A!8vu0
8????*??-??i?u?M?????
?
$&?8?V?
P
?`w	@Z?*?# 6?BV 

???v???F1
O?A?F
`p?$?(?
???Z0B<0O?M????????$$fZ?+?????P?"???q?J?@Q?r????}???p?n??????Jj??N?T?Z?/?7+\4}??HX??@@?
??
?5HbG?@?x/Q?Mq?mC???(?R?`?-???????$?8?tS
|?ALh??0?"j???Bp?M?!??e%Q??Rbm ('?`?????p?0?H??(???u ??FW??pR??zyb1 ??D?WXp?LO?
?\?????Wl0O???m?D)?Tp)??+"$??h????? ?0?9????	i?
0???6`N@??r??lx?+?@\???g?A$??
? a?D-?p?I????($???p?|h?&~?+?hf??P?{E?
???????o?g+???8h???;?	??0&?0??Cy???>?QJ9?:??2??a?`?Z?2?">?iD#??I??1??$?0??j??M??;??	HA??/(DR=????1???4?$	&e
??+ at 1KP?'?)?5}????*
!???
PL?..(?$
?R?
?>k?x^8????K??j?=u?O?
r9??(?a?h?????9?
??J??\4?]?;?y??????8S?d????/???N?E???`?Rf-????)?8(????ML??P_A]?zP?n
??I@?L]?@?Lx
??V?????P??@h??P??+?P?
????'??]\??x?XQ@???R?@-??%H?M^?G????+????]?",?
???&T?q
D:?&	Q5!?|??/x?%??%?,???
@$????@?qH$t???/?/??O`Ki??b?{?????&?s1?????+X?&????w??%??q?@???2??)?
p?Q?(8Zvh
.?5????#????G???H"+?L?K
ph?F??l`??????+
??@?
<?1????2Y?q[?T???^?)??LE*????]!Ot
??(???3A??"
,e
p@?*)????????LW\?
p?
?Q?2j
'@?	?(??_???u_???$@	?
?l,????=C@XI?t
<G\??? ????*????
E2??C?R??B?????z@@@*X?
P
?@?	W?`\????D
H??9????&`]*?E??s`
7??D?*?"?`?N??k??UXi??X?2H?1p?/?p???0?????K6?H?Q1d6?5???????j???ZE7My?6?(??Z???4??i$?t??cS??:??,2?*?L~??G?f?=?t??K?9-?y???6wK+X|
?M??(?IM.???KO???NP
E?K`?$???:???]?ay????R@
?I???B?@H!??q? ?
@?b??`;i?V??*NNX4Yn?U@???
.? ?E(?	?)?C?
I?\???9???,??U???YN?0I?qQ???LJ??H?0???,f???????L\
R,k]????c?v<?Zh???.????^?q??,????g????+????l?T???f,?y
??G?
?@?`?????b????????*??E+*??	(
kg?????
+a????S?6?xa???R?!??n@???Fb5??rRo?????G?9E@??4?0??TU???RSU??8??b-?S???@?,^qf0y?{RX	?r8????NM!??5?-*]?????m4????@????\?~??`?!9D?0???c?Q.j???A?=(??y???l`j?????????
@q???t?oUY?OV?L@?1???k??????;?????N5`+
A@:??@GpP??RB?m0?|O]???B
/1?d? ??#?
?????%??Zm???k??]???;,?{???????i.??>0?(??:^?A[???l?	>?H???<??f????????4?????:?&??=M?|`????D'?"}??D)^Q?W??x??\?_?????T??/s??j?;?U3?G`???D?%w??m_!?j??p????e?`??????????d??t??U??q6v???]??????
?T!?N????I????A?+sJ???~
?:???X?}M5???g????pF%z???a???et?tRK\5?????{??T"#)/????????(?M??&t?Rr??M?TA????6 ?dHnGqlc?$??D???H??o?d
*???kE???l??i?>??z?_??6r?w??j7???>????"????????g???~??K?MX?R?K?D??n?????`????|z?(???<k???_?*?@?#M????6,?????6TA???p??*?<h????
??f???)]???#2??'???2zK?j+3?%??
q????@as?N7???p06???m?????
?6??f?????|J66+???hO??0??T??4h)??FA??_???j/?,??_Ok?
?bn8?g????J?|0l?g(?m???R??m?~???b?v????W
??LP7?l%????????1??w??:k??I?@???I??
?J?????e??aZ???!????I?q\(#??#i???	???^???$?|???6?_????G?e????mR8f7r?m_??????n??B??bX?????m?'?&lX*
	???N-?gQl?????_?+?f	?~?X?)??.???T
+-??????????????B????T&e?????????~????,?L?m??0??t???)?Tf??%?n?!?e????J?G1&??????2~????!*?#_3?nn???????????x4J7?m}????'
??(??_cW??O??M????????K????:E?????E?????k?8??Z$u????n?^?Sq
u??x??????S??f?pL?2???Bl?'?(??F?(1?)?Q??
?zD???&?0??l7???H?l8?I????F???
v??D????V/?V???%3?e???.?I??A??4J?Z?)?@	?A	??`?
6?T?l?? H???????n-??e?kOl?W:L?T??t?4O?????z??w??????p?????K?0FR???:??0?k????8???'N?f????C??'E???????$?_????????E,??	/N0g??.???/e??M*?o????6???E??h/C:???6.?*?-?P ????n??nm?2~*??	???Y?G0J??a?g2nI?a?!?????A? ???\??]?A1g???A??%??????x?]2gp?f?^?
~??"?z??$9??>?_?]p?v???-@?????t??j?p??|p9?q%ac?V?/p?*??k???????????r?*??z2????p?1???????E
?f???8?????$??,??????fb?l?6X?';V?U?
I???d?h41p?1??.?![?A??2?z?
h??A??n???5]Y??????7??/?B????h?6B??'?2?^	??(???m?,??p?K????0./??s??,??77?,tfQ@??(?p#??8M?xrQ4???M???EW.o???m0???qM??x??d?L??o??L/??P	9?????p?y7?^?tI?y}%???V?S??R????V?J?zc?"???g??@.??Y??Y?'???1p?Hh
*?m?? n??n?4Z]?aH?P&a?'.,?v???98.HG?J'.??tLXoD?v?JL??I?j??6xo???c8????EHot?????;??u8?98?kX?f?w????r?8?sXoB?????{???x?{x?c??Cx9|??????"?ehod??e??m???X?i????8?-g???)???????P?[?f?Ux?
????????x?[??Q?r8??{?e??+??3Y?))????h??{,^??????k?G?Ol??[?)^?A??r!r????
????N?n?ub?j?????N??N??Y???????9??????????n????????????9?????Y?????9?????Y??Y??????9??y????????y??Y????
??????y??y?z??y?	z?!??Z?????????
?????e???!??Y]kF?
?`?F2??t
	? &A??NC?????5?"?????a?A??????????Z??????????:????????:??z????????:??Z??????????????????????????z????:?
??z?????
??]F?I?
??g???]??
|0B,?????o??????:? ???FLP? V??0
B
?9??D????,???81?~??J????B?gv#L?
WH3??J=`J?d???J?F????cM?
?H?"rk????2???8d?????1o????F.pa?.z???:?t??L$j?hhMxP?0???p??????QLa??`??,l??? Y??C??LM??=??E>??S? 'I?J??E$?3????d???G

b?????L?I??N??jvR??lF???e?8s?
z??WhY??F??L&??u??`??1RC?)????^??K&??????8???r??t?$??dK9?aW??9?I??M???X'0??"??CK'????I??B???p%;13"?f?;Q?A'JQ???02J?D"F???hEGJRo1?:?D#X?
)x??! ]NI?gJS]mS|???(U???LE??iM?J?K?S???jJi???T??OQ?J?	?3F????J	+w4??hD%?!?????]a?=???=Q,?0????2(Bh??^cr??????h????h??
}????S????=	3???C?)N???"*??<?
 ??"K??Z??"?h'?}?H?@??
???u?????`l?o/??c
?????-????????J??MDQ??BN)WU???joO??f?v???c?????????R?
????f?
? .??v???u?uuu??v4???U?A?F???????????z??????J??7??b???????k???????m?????t?\l?(#PB'n??2Pc??T`Nt?9?????H?a'??J??0? ?2??X?Y????(????????NT???D??????i?>?@?M}?C?
?Ni?????=4??????
?????r??.c?RJ???~????r???0??dd?:?auP?<q?E>??3c?(M?\0??jo???!?,3
??|?Sk??}??L?S;?P??}d?m0?L??????X??Z;?5?0?????M?U???=??=
S?4Vw??eP??????(??n??T??-?6??u?N??Y?????S???M??????-???h v@?S?c?]?q?????`?P?l?d?2c ? ??P?~?????
?1e???p???D??	c?H?(????I??.?B???????,??L.?
w??x?(?'D^?F~?H??J??G?????z?E#d??P6,??
???????Nhh0??????????p?B`?A?2?/;?$_?&?(??*??c??h0?._?-??3??8??:??9o?0??2??<??D??5??7_?J??L??N?G?\??G_?V???=?_?@??^??L_?/?d??@??B?E_A??v??
=????8??????OADB_|E?x??3??'??y&??~l1?O??0?b{/?I???'
|2?l?a??*???q??2K,??K,???1?,sK2?t?e$2?6????TSg?<??>???@??rKA?$TL0%SQo??-?:???JK?<?PB????A?T?N/]Tf?,?N??TO???,a-?tTN?4?\;??LZe??Vs??]??fOf
???6-???h??R?7??VZfB??6g?i??S?'Yr???A5=S?Wy?UTAe??Q-VV_?t?Ng???K:????r?l??]??R?Mi??*?5??~???_q?ySe0?6?????	??H??$?0y??Wn?e?eF???????s????M?d'i??N????y^z??gV??w??j?c?9k???c?v?9e???yj??.????V?l??V?e??:@?V???????e??:??i???????o?s\k??N?{??E
??????6????1???x???f??9?l?]??i?O??'??g??s?W?
???	??????k?[s?
??w??w???>?????{@?^{???{@???|?cD;???~????????????_|????????!?+??g?????X??????	???5?@Z??a??@
??4??
B(>L??? ??????????~p????$x??!Z??/R?=?a?|????-"??X?"??*???;???C???.1?Eb??QCn???h?4??$?x!?LR?n?#/^?????s4+Cp?#?HG3.??D#$?X??IRq<?"]?s'$?`?.f??n?Q???#/)?C^2??|d*?XI????i??8?a?
?a?q??,a9?I
??"??1???M???td2???T?N?p?'?F?_?`},e'??Is?? ?4g??Bf?7?,?r?R??~??b?H6???????0?Og?$??d@iMp????<?>???nv???3[??i?????-E?????J???N????%??i!???Df?H??#I?????6w?b?T?)?<?i??C?!Y????8
U1??L{*)??T?G??O?D??1?w??HI?ML??J
?N?*W?